projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ChatItems are no longer QGraphicsItems
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
bc4ba1e
..
4f3f750
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-31,8
+31,6
@@
# include <windows.h>
#endif
# include <windows.h>
#endif
-#include <QSystemTrayIcon>
-
#include "qtui.h"
#include "titlesetter.h"
#include "uisettings.h"
#include "qtui.h"
#include "titlesetter.h"
#include "uisettings.h"
@@
-75,9
+73,11
@@
class MainWin
void addBufferView(ClientBufferViewConfig *config);
BufferView *allBuffersView() const;
void addBufferView(ClientBufferViewConfig *config);
BufferView *allBuffersView() const;
- BufferWidget *bufferWidget() const { return _bufferWidget; }
+
inline
BufferWidget *bufferWidget() const { return _bufferWidget; }
- inline SystemTray *systemTray() const;
+#ifndef QT_NO_SYSTEMTRAYICON
+ inline SystemTray *systemTray() const { return _systemTray; }
+#endif
bool event(QEvent *event);
bool event(QEvent *event);
@@
-90,7
+90,9
@@
class MainWin
public slots:
void showStatusBarMessage(const QString &message);
public slots:
void showStatusBarMessage(const QString &message);
+#ifndef QT_NO_SYSTEMTRAYICON
void toggleMinimizedToTray();
void toggleMinimizedToTray();
+#endif
//! Bring window to front and focus it
void forceActivated();
//! Bring window to front and focus it
void forceActivated();
@@
-189,9
+191,10
@@
class MainWin
void updateIcon();
void enableMenus();
void updateIcon();
void enableMenus();
+#ifndef QT_NO_SYSTEMTRAYICON
void hideToTray();
void hideToTray();
-
SystemTray *_systemTray;
SystemTray *_systemTray;
+#endif
QList<BufferViewDock *> _bufferViews;
BufferWidget *_bufferWidget;
QList<BufferViewDock *> _bufferViews;
BufferWidget *_bufferWidget;
@@
-218,8
+221,4
@@
class MainWin
friend class QtUi;
};
friend class QtUi;
};
-SystemTray *MainWin::systemTray() const {
- return _systemTray;
-}
-
#endif
#endif