projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove redundant parameter check from IrcEventCap
[quassel.git]
/
src
/
qtui
/
statusnotifieritem.cpp
diff --git
a/src/qtui/statusnotifieritem.cpp
b/src/qtui/statusnotifieritem.cpp
index
a1d2916
..
9f6f8d7
100644
(file)
--- a/
src/qtui/statusnotifieritem.cpp
+++ b/
src/qtui/statusnotifieritem.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This contains code from KStatusNotifierItem, part of the KDE libs *
* devel@quassel-irc.org *
* *
* This contains code from KStatusNotifierItem, part of the KDE libs *
@@
-52,14
+52,7
@@
protected:
virtual QString iconNameForAction(QAction *action) // TODO Qt 4.7: fixme when we have converted our iconloader
{
QIcon icon(action->icon());
virtual QString iconNameForAction(QAction *action) // TODO Qt 4.7: fixme when we have converted our iconloader
{
QIcon icon(action->icon());
-#if QT_VERSION >= 0x040701
- // QIcon::name() is in the 4.7 git branch, but it is not in 4.7 TP.
- // If you get a build error here, you need to update your pre-release
- // of Qt 4.7.
return icon.isNull() ? QString() : icon.name();
return icon.isNull() ? QString() : icon.name();
-#else
- return QString();
-#endif
}
};
}
};