[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libkdegames/frameworks] /: kdelibs4support--
From:       Montel Laurent <montel () kde ! org>
Date:       2014-12-01 6:12:43
Message-ID: E1XvKDz-000570-H3 () scm ! kde ! org
[Download RAW message or body]

Git commit db0899239e3b9ee647aee31a6e77e54ca8f0975c by Montel Laurent.
Committed on 01/12/2014 at 06:12.
Pushed by mlaurent into branch 'frameworks'.

kdelibs4support--

M  +2    -1    highscore/kexthighscore_internal.h
M  +1    -1    kgdifficulty.cpp
M  +1    -1    kgthemeselector.cpp
M  +1    -1    libkdegamesprivate/kchatbaseitemdelegate.cpp
M  +1    -1    libkdegamesprivate/kgame/kgame.cpp
M  +1    -1    libkdegamesprivate/kgame/kgamechat.cpp
M  +1    -1    libkdegamesprivate/kgame/kgamemessage.cpp
M  +2    -2    libkdegamesprivate/kgamedifficulty.cpp

http://commits.kde.org/libkdegames/db0899239e3b9ee647aee31a6e77e54ca8f0975c

diff --git a/highscore/kexthighscore_internal.h b/highscore/kexthighscore_internal.h
index cbb5c55..40f301c 100644
--- a/highscore/kexthighscore_internal.h
+++ b/highscore/kexthighscore_internal.h
@@ -21,7 +21,8 @@
 #define KEXTHIGHSCORE_INTERNAL_H
 
 #include <kconfig.h>
-#include <klocale.h>
+#include <KLocalizedString>
+#include <KSharedConfig>
 
 #include "khighscore.h"
 #include "kexthighscore.h"
diff --git a/kgdifficulty.cpp b/kgdifficulty.cpp
index 693f509..07100ee 100644
--- a/kgdifficulty.cpp
+++ b/kgdifficulty.cpp
@@ -28,11 +28,11 @@
 #include <KDE/KActionCollection>
 #include <KDE/KComboBox>
 #include <KDE/KSelectAction>
-#include <KDE/KStatusBar>
 #include <KDE/KXmlGuiWindow>
 
 #include <QIcon>
 #include <QGlobalStatic>
+#include <QStatusBar>
 
 #include <klocalizedstring.h>
 #include <ksharedconfig.h>
diff --git a/kgthemeselector.cpp b/kgthemeselector.cpp
index 38c6edf..806f9b4 100644
--- a/kgthemeselector.cpp
+++ b/kgthemeselector.cpp
@@ -32,7 +32,7 @@
 #include <QtWidgets/QDialogButtonBox>
 #include <QtWidgets/QDialog>
 
-#include <KDE/KIcon>
+#include <QIcon>
 #include <KDE/KLocalizedString>
 #include <KNS3/DownloadDialog>
 
diff --git a/libkdegamesprivate/kchatbaseitemdelegate.cpp b/libkdegamesprivate/kchatbaseitemdelegate.cpp
index 0408cbd..87cc39f 100644
--- a/libkdegamesprivate/kchatbaseitemdelegate.cpp
+++ b/libkdegamesprivate/kchatbaseitemdelegate.cpp
@@ -20,7 +20,7 @@
 #include "kchatbaseitemdelegate.h"
 #include "kchatbasemodel.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <QPainter>
 #include <QDebug>
 
diff --git a/libkdegamesprivate/kgame/kgame.cpp b/libkdegamesprivate/kgame/kgame.cpp
index 870aa5e..aac8b43 100644
--- a/libkdegamesprivate/kgame/kgame.cpp
+++ b/libkdegamesprivate/kgame/kgame.cpp
@@ -39,7 +39,7 @@
 #include <QList>
 #include <QQueue>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <krandomsequence.h>
 
 #define KGAME_LOAD_COOKIE 4210
diff --git a/libkdegamesprivate/kgame/kgamechat.cpp b/libkdegamesprivate/kgame/kgamechat.cpp
index 06a9ad6..f10eae3 100644
--- a/libkdegamesprivate/kgame/kgamechat.cpp
+++ b/libkdegamesprivate/kgame/kgamechat.cpp
@@ -26,7 +26,7 @@
 #include "kgameproperty.h"
 #include "kgamemessage.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include <QMap>
 #include <QLoggingCategory>
diff --git a/libkdegamesprivate/kgame/kgamemessage.cpp b/libkdegamesprivate/kgame/kgamemessage.cpp
index 4719b06..af4e611 100644
--- a/libkdegamesprivate/kgame/kgamemessage.cpp
+++ b/libkdegamesprivate/kgame/kgamemessage.cpp
@@ -20,7 +20,7 @@
 
 #include "kgamemessage.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #define MESSAGE_VERSION 2
 
diff --git a/libkdegamesprivate/kgamedifficulty.cpp b/libkdegamesprivate/kgamedifficulty.cpp
index fc22a35..7b75c4a 100644
--- a/libkdegamesprivate/kgamedifficulty.cpp
+++ b/libkdegamesprivate/kgamedifficulty.cpp
@@ -19,9 +19,9 @@ You should have received a copy of the GNU Library General Public License along
 #include <kactioncollection.h>
 #include <kcombobox.h>
 #include <QIcon>
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
-#include <kstatusbar.h>
+#include <qstatusbar.h>
 #include <kselectaction.h>
 #include <kxmlguiwindow.h>
 
[prev in list] [next in list] [prev in thread] [next in thread]