summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeo Mrnjavac <[email protected]>2014-03-16 20:18:43 +0100
committerTeo Mrnjavac <[email protected]>2014-03-16 20:18:43 +0100
commitd9eda92584412190bc2b68c7a4ca3f2db61c64d5 (patch)
treed34520b6767982e3b66525a46f4679ea1b3c6ac4
parent0651cb85259ff81c5524edb90b21072a8cf9046a (diff)
Remove K_GLOBAL_STATIC and leftover kglobal.h includes
-rw-r--r--src/manager/allyourbase.cpp2
-rw-r--r--src/manager/kwalletmanagerwidget.cpp1
-rw-r--r--src/manager/registercreateactionmethod.cpp4
3 files changed, 2 insertions, 5 deletions
diff --git a/src/manager/allyourbase.cpp b/src/manager/allyourbase.cpp
index fa166e0..1d42e45 100644
--- a/src/manager/allyourbase.cpp
+++ b/src/manager/allyourbase.cpp
@@ -22,7 +22,6 @@
#include <kdebug.h>
#include <kcomponentdata.h>
-#include <kglobal.h>
#include <kio/netaccess.h>
#include <klocale.h>
#include <kmessagebox.h>
@@ -33,6 +32,7 @@
#include <QFile>
#include <QApplication>
#include <QDrag>
+#include <QMimeData>
//Added by qt3to4:
#include <QPixmap>
#include <QDropEvent>
diff --git a/src/manager/kwalletmanagerwidget.cpp b/src/manager/kwalletmanagerwidget.cpp
index a0195a6..6540b98 100644
--- a/src/manager/kwalletmanagerwidget.cpp
+++ b/src/manager/kwalletmanagerwidget.cpp
@@ -24,7 +24,6 @@
#include <kwallet.h>
#include <kurl.h>
-#include <kglobal.h>
#include <kmessagebox.h>
#include <klocalizedstring.h>
#include <kio/netaccess.h>
diff --git a/src/manager/registercreateactionmethod.cpp b/src/manager/registercreateactionmethod.cpp
index 75d6788..8205f2f 100644
--- a/src/manager/registercreateactionmethod.cpp
+++ b/src/manager/registercreateactionmethod.cpp
@@ -19,9 +19,7 @@
#include "registercreateactionmethod.h"
-#include <kglobal.h>
-
-K_GLOBAL_STATIC(std::list<RegisterCreateActionsMethod::CreateActionsMethod>, createActionMethodList)
+Q_GLOBAL_STATIC(std::list<RegisterCreateActionsMethod::CreateActionsMethod>, createActionMethodList)
RegisterCreateActionsMethod::RegisterCreateActionsMethod(RegisterCreateActionsMethod::CreateActionsMethod method)
{