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
/
legacysystemtray.h
diff --git
a/src/qtui/legacysystemtray.h
b/src/qtui/legacysystemtray.h
index
1bbef64
..
f366fbd
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
5
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,7
+23,7
@@
#ifndef QT_NO_SYSTEMTRAYICON
#ifndef QT_NO_SYSTEMTRAYICON
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE
4
# include <KSystemTrayIcon>
#else
# include <QSystemTrayIcon>
# include <KSystemTrayIcon>
#else
# include <QSystemTrayIcon>
@@
-70,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;