projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto-resize Settings to fit wide widgets
[quassel.git]
/
src
/
qtui
/
legacysystemtray.h
diff --git
a/src/qtui/legacysystemtray.h
b/src/qtui/legacysystemtray.h
index
635554f
..
90515a6
100644
(file)
--- a/
src/qtui/legacysystemtray.h
+++ b/
src/qtui/legacysystemtray.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This file is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This file is free software; you can redistribute it and/or modify *
@@
-23,12
+23,13
@@
#ifndef QT_NO_SYSTEMTRAYICON
#ifndef QT_NO_SYSTEMTRAYICON
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
# include <KSystemTrayIcon>
#else
# include <QSystemTrayIcon>
#endif
# include <KSystemTrayIcon>
#else
# include <QSystemTrayIcon>
#endif
+#include <QIcon>
#include <QTimer>
#include "systemtray.h"
#include <QTimer>
#include "systemtray.h"
@@
-44,7
+45,7
@@
public:
virtual bool isVisible() const;
virtual inline bool isSystemTrayAvailable() const;
virtual bool isVisible() const;
virtual inline bool isSystemTrayAvailable() const;
- virtual Icon stateIcon() const; // overriden to care about blinkState
+ virtual
Q
Icon stateIcon() const; // overriden to care about blinkState
public slots:
virtual void setState(State state);
public slots:
virtual void setState(State state);
@@
-69,7
+70,7
@@
private:
bool _blinkState;
uint _lastMessageId;
bool _blinkState;
uint _lastMessageId;
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
KSystemTrayIcon *_trayIcon;
#else
QSystemTrayIcon *_trayIcon;
KSystemTrayIcon *_trayIcon;
#else
QSystemTrayIcon *_trayIcon;