projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Make zlib a required dependency, remove bundled miniz
[quassel.git]
/
src
/
uisupport
/
actioncollection.h
diff --git
a/src/uisupport/actioncollection.h
b/src/uisupport/actioncollection.h
index
c920adc
..
5de038f
100644
(file)
--- a/
src/uisupport/actioncollection.h
+++ b/
src/uisupport/actioncollection.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
8
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 *
@@
-95,11
+95,7
@@
signals:
void actionTriggered(QAction *action);
protected slots:
void actionTriggered(QAction *action);
protected slots:
-#if QT_VERSION >= 0x050000
virtual void connectNotify(const QMetaMethod &signal);
virtual void connectNotify(const QMetaMethod &signal);
-#else
- virtual void connectNotify(const char *signal);
-#endif
virtual void slotActionTriggered();
private slots:
virtual void slotActionTriggered();
private slots:
@@
-123,11
+119,7
@@
int ActionCollection::count() const { return actions().count(); }
bool ActionCollection::isEmpty() const { return actions().count(); }
#else /* HAVE_KDE */
bool ActionCollection::isEmpty() const { return actions().count(); }
#else /* HAVE_KDE */
-# ifdef HAVE_KDE4
-# include <KActionCollection>
-# else
-# include <KXmlGui/KActionCollection>
-# endif
+# include <KXmlGui/KActionCollection>
class ActionCollection : public KActionCollection
{
class ActionCollection : public KActionCollection
{