projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clang-tidy: Mark several settingspage methods as final
[quassel.git]
/
src
/
uisupport
/
actioncollection.h
diff --git
a/src/uisupport/actioncollection.h
b/src/uisupport/actioncollection.h
index
22b0748
..
a675fdd
100644
(file)
--- a/
src/uisupport/actioncollection.h
+++ b/
src/uisupport/actioncollection.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
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 *
@@
-20,8
+20,9
@@
* This is a subset of the API of KDE's KActionCollection. *
***************************************************************************/
* This is a subset of the API of KDE's KActionCollection. *
***************************************************************************/
-#ifndef ACTIONCOLLECTION_H_
-#define ACTIONCOLLECTION_H_
+#pragma once
+
+#include "uisupport-export.h"
#ifndef HAVE_KDE
#ifndef HAVE_KDE
@@
-36,7
+37,7
@@
class QWidget;
class Action;
class QAction;
class Action;
class QAction;
-class ActionCollection : public QObject
+class
UISUPPORT_EXPORT
ActionCollection : public QObject
{
Q_OBJECT
{
Q_OBJECT
@@
-96,11
+97,7
@@
signals:
void actionTriggered(QAction *action);
protected slots:
void actionTriggered(QAction *action);
protected slots:
-#if QT_VERSION >= 0x050000
- virtual void connectNotify(const QMetaMethod &method);
-#else
- virtual void connectNotify(const char *signal);
-#endif
+ virtual void connectNotify(const QMetaMethod &signal);
virtual void slotActionTriggered();
private slots:
virtual void slotActionTriggered();
private slots:
@@
-124,8
+121,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 */
-
-#include <KActionCollection>
+# include <KXmlGui/KActionCollection>
class ActionCollection : public KActionCollection
{
class ActionCollection : public KActionCollection
{
@@
-135,7
+131,4
@@
public:
explicit ActionCollection(QObject *parent) : KActionCollection(parent) {};
};
explicit ActionCollection(QObject *parent) : KActionCollection(parent) {};
};
-
-#endif
-
-#endif
+#endif /* HAVE_KDE */