summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-01-21 22:43:36 +0100
committerMontel Laurent <[email protected]>2015-01-21 22:43:36 +0100
commit85900d7de4353937478e60613e1581442efcbf20 (patch)
treebd8457bef51b4e9ab55241909244eb28b0909443
parent14de3f69be1ab48517fdcb0b7347aed8f2e1d5da (diff)
kdelibs4support--
-rw-r--r--src/engine/trigger.cpp5
-rw-r--r--src/file-io/puzzle.cpp3
2 files changed, 3 insertions, 5 deletions
diff --git a/src/engine/trigger.cpp b/src/engine/trigger.cpp
index d8fcbc1..e094e07 100644
--- a/src/engine/trigger.cpp
+++ b/src/engine/trigger.cpp
@@ -19,7 +19,6 @@
#include "trigger.h"
#include <QMap>
-#include <KGlobal>
#include <KLocalizedString>
namespace
@@ -116,8 +115,8 @@ namespace
};
}
-K_GLOBAL_STATIC(TriggerParserData, tParserData)
-K_GLOBAL_STATIC(TriggerPrinterData, tPrinterData)
+Q_GLOBAL_STATIC(TriggerParserData, tParserData)
+Q_GLOBAL_STATIC(TriggerPrinterData, tPrinterData)
Palapeli::Trigger::Trigger()
: m_modifiers(Qt::NoModifier)
diff --git a/src/file-io/puzzle.cpp b/src/file-io/puzzle.cpp
index 353bfd3..ca94e8a 100644
--- a/src/file-io/puzzle.cpp
+++ b/src/file-io/puzzle.cpp
@@ -26,7 +26,6 @@
#include <QtCore/QMutexLocker>
#include <QtCore/QWaitCondition>
#include <QtConcurrentRun>
-#include <KGlobal>
//BEGIN Palapeli::PuzzleComponent
@@ -210,7 +209,7 @@ void Palapeli::Puzzle::dropComponent(Palapeli::PuzzleComponent::Type type)
c = 0;
}
-K_GLOBAL_STATIC(QList<QString>, g_usedIdentifiers)
+Q_GLOBAL_STATIC(QList<QString>, g_usedIdentifiers)
/*static*/ QString Palapeli::Puzzle::fsIdentifier(const QString& location)
{