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

List:       kde-commits
Subject:    [pairs/frameworks] game: getting rid of some deprecated stuff
From:       Marco Calignano <marco.calignano () gmail ! com>
Date:       2014-10-21 7:36:36
Message-ID: E1XgTzg-00022b-Hm () scm ! kde ! org
[Download RAW message or body]

Git commit 9b849502eafb1050cc1ea21e0029fca31897ff76 by Marco Calignano.
Committed on 21/10/2014 at 07:36.
Pushed by calignano into branch 'frameworks'.

getting rid of some deprecated stuff

M  +1    -1    game/carditem.cpp
M  +2    -2    game/main.cpp
M  +0    -3    game/pairs.cpp
M  +0    -1    game/pairsthemebase.cpp

http://commits.kde.org/pairs/9b849502eafb1050cc1ea21e0029fca31897ff76

diff --git a/game/carditem.cpp b/game/carditem.cpp
index 68419f6..4954142 100644
--- a/game/carditem.cpp
+++ b/game/carditem.cpp
@@ -23,7 +23,7 @@
 #include "carditem.h"
 #include <QFile>
 #include <KDE/KLocale>
-#include <KStandardDirs>
+//#include <KStandardDirs>
 =

 CardItem::CardItem(QObject* parent, QImage front, QImage back, QString tex=
t, QString postMessage, QByteArray foundSound, QByteArray missedSound, Card=
Type type, int index)
     : QObject(parent)
diff --git a/game/main.cpp b/game/main.cpp
index cf5ed7d..f460dc3 100644
--- a/game/main.cpp
+++ b/game/main.cpp
@@ -23,7 +23,7 @@
 =

 #include "pairs.h"
 #include "pairsview.h"
-#include <KApplication>
+#include <QApplication>
 #include <KAboutData>
 #include <KCmdLineArgs>
 #include <KLocalizedString>
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
     options.add("+[file]", ki18n("Pairs theme to open")); //new
     KCmdLineArgs::addCmdLineOptions(options); //new
 =

-    KApplication app;
+    QApplication app(argc, argv);
     =

     // see if we are starting with session management
     if (app.isSessionRestored())
diff --git a/game/pairs.cpp b/game/pairs.cpp
index a813218..bfbaf77 100644
--- a/game/pairs.cpp
+++ b/game/pairs.cpp
@@ -35,9 +35,6 @@
 #include <KMessageBox>
 #include <kactioncollection.h>
 #include <kstandardaction.h>
-#include <kstandarddirs.h>
-#include <KDE/KLocale>
-#include <KApplication>
 #include <QQmlEngine>
 #include "playersmodel.h"
 #include <kstatusbar.h>
diff --git a/game/pairsthemebase.cpp b/game/pairsthemebase.cpp
index 9f5f66b..ec5d400 100644
--- a/game/pairsthemebase.cpp
+++ b/game/pairsthemebase.cpp
@@ -24,7 +24,6 @@
 #include <QtCore/QFile>
 #include <QtCore/QDebug>
 #include <KLocalizedString>
-#include <KStandardDirs>
 #include <QtXmlPatterns/QXmlSchemaValidator>
 #include <QtXmlPatterns/QXmlSchema>
 #include "cardtype.h"
[prev in list] [next in list] [prev in thread] [next in thread]