projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #104 from mamarley/disconnectdesyncfix
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
7e2cc0e
..
30e5726
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
5
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-21,7
+21,7
@@
#ifndef MAINWIN_H_
#define MAINWIN_H_
#ifndef MAINWIN_H_
#define MAINWIN_H_
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
# include <KMainWindow>
#else
# include <QMainWindow>
# include <KMainWindow>
#else
# include <QMainWindow>
@@
-56,7
+56,7
@@
class KHelpMenu;
//!\brief The main window of Quassel's QtUi.
class MainWin
//!\brief The main window of Quassel's QtUi.
class MainWin
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
: public KMainWindow
{
#else
: public KMainWindow
{
#else
@@
-154,9
+154,7
@@
private slots:
void saveMenuBarStatus(bool enabled);
void saveStatusBarStatus(bool enabled);
void saveMenuBarStatus(bool enabled);
void saveStatusBarStatus(bool enabled);
-#ifndef HAVE_KDE
void saveMainToolBarStatus(bool enabled);
void saveMainToolBarStatus(bool enabled);
-#endif
void loadLayout();
void saveLayout();
void loadLayout();
void saveLayout();
@@
-171,7
+169,7
@@
signals:
void disconnectFromCore();
private:
void disconnectFromCore();
private:
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
KHelpMenu *_kHelpMenu;
#endif
KHelpMenu *_kHelpMenu;
#endif