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

List:       kde-commits
Subject:    [kmplayer/0.12] src: Port away from kapplication, k4aboutdata and kcmdlineargs
From:       Koos Vriezen <koos.vriezen () gmail ! com>
Date:       2016-09-18 16:08:47
Message-ID: E1blee7-0007Lv-EF () code ! kde ! org
[Download RAW message or body]

Git commit 74f50b320263a6f7b27ca64e86a76141ccb1ef80 by Koos Vriezen.
Committed on 18/09/2016 at 16:07.
Pushed by vriezen into branch '0.12'.

Port away from kapplication, k4aboutdata and kcmdlineargs

M  +1    -2    src/kmplayer.cpp
M  +0    -1    src/kmplayerconfig.cpp
M  +0    -1    src/kmplayerprocess.cpp
M  +0    -1    src/kmplayerview.cpp
M  +47   -29   src/main.cpp
M  +1    -2    src/viewarea.cpp

http://commits.kde.org/kmplayer/74f50b320263a6f7b27ca64e86a76141ccb1ef80

diff --git a/src/kmplayer.cpp b/src/kmplayer.cpp
index 4590260..f8add0f 100644
--- a/src/kmplayer.cpp
+++ b/src/kmplayer.cpp
@@ -46,7 +46,6 @@
 #include <QtX11Extras/QX11Info>
 
 // include files for KDE
-#include <kapplication.h>
 #include <kdeversion.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
@@ -1014,7 +1013,7 @@ KDE_NO_EXPORT bool KMPlayerApp::queryClose () {
     // KMPlayerVDRSource has to wait for pending commands like mute and quit
     m_player->stop ();
     //static_cast <KMPlayerVDRSource *> (m_player->sources () \
                ["vdrsource"])->waitForConnectionClose ();
-    if (m_played_exit || m_player->settings ()->no_intro || kapp->sessionSaving() ) \
{ +    if (m_played_exit || m_player->settings ()->no_intro || \
qApp->isSavingSession()) {  aboutToCloseWindow();
         return true;
     }
diff --git a/src/kmplayerconfig.cpp b/src/kmplayerconfig.cpp
index 9170360..b99e73d 100644
--- a/src/kmplayerconfig.cpp
+++ b/src/kmplayerconfig.cpp
@@ -39,7 +39,6 @@
 
 #include <kconfig.h>
 #include <kconfiggroup.h>
-#include <kapplication.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp
index c6dfc4e..e855483 100644
--- a/src/kmplayerprocess.cpp
+++ b/src/kmplayerprocess.cpp
@@ -46,7 +46,6 @@
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kshell.h>
 #include <kio/job.h>
diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp
index 4af5529..8d2a48a 100644
--- a/src/kmplayerview.cpp
+++ b/src/kmplayerview.cpp
@@ -53,7 +53,6 @@
 #include <kstatusbar.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
 #include <kactioncollection.h>
 #include <kshortcut.h>
 #include <kfinddialog.h>
diff --git a/src/main.cpp b/src/main.cpp
index 1edb30f..1c6312c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,38 +17,58 @@ email                :
 #include <unistd.h>
 
 #include "config-kmplayer.h"
-#include <kcmdlineargs.h>
-#include <k4aboutdata.h>
-#include <klocale.h>
-#include <kdemacros.h>
-#include <kapplication.h>
+#include <KAboutData>
+#include <KLocalizedString>
+#if KCrash_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+ #include <KCrash>
+#endif
 
+#include <QCommandLineParser>
+#include <QApplication>
 #include <QPointer>
 #include <qfileinfo.h>
 
 #include "kmplayer.h"
 
 
-extern "C" KDE_EXPORT int kdemain (int argc, char *argv[]) {
+extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
+{
     setsid ();
-    
+
+    QApplication app(argc, argv);
+    app.setApplicationName(QStringLiteral("kwrite"));
+#if KCrash_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+    KCrash::initialize();
+#endif
     KLocalizedString::setApplicationDomain("kmplayer");
-    K4AboutData aboutData ("kmplayer", 0, ki18n("KMPlayer"),
-            KMPLAYER_VERSION_STRING,
-            ki18n ("Media player."),
-            K4AboutData::License_GPL,
-            ki18n ("(c) 2002-2009, Koos Vriezen"),
-            KLocalizedString(),
-            I18N_NOOP ("http://kmplayer.kde.org"));
-    aboutData.addAuthor(ki18n("Koos Vriezen"), \
                ki18n("Maintainer"),"koos.vriezen@gmail.com");
-    KCmdLineArgs::init (argc, argv, &aboutData);
-    KCmdLineOptions options;
-    options.add ("+[File]", ki18n ("file to open"));
-    KCmdLineArgs::addCmdLineOptions (options);
+
+    KAboutData aboutData(QStringLiteral("kmplayer"),
+            i18n("KMPlayer"),
+            QStringLiteral(KMPLAYER_VERSION_STRING),
+            i18n("Media player"), KAboutLicense::GPL,
+            i18n("(c) 2002-2016, Koos Vriezen"), QString(), \
QStringLiteral("http://kmplayer.kde.org")); +    aboutData.addAuthor(i18n("Koos \
Vriezen"), i18n("Maintainer"), QStringLiteral("koos.vriezen@gmail.com")); +    \
aboutData.setProductName(QByteArray("kmplayer")); +    \
KAboutData::setApplicationData(aboutData); +
+    app.setApplicationName(aboutData.componentName());
+    app.setApplicationDisplayName(aboutData.displayName());
+    app.setOrganizationDomain(aboutData.organizationDomain());
+    app.setApplicationVersion(aboutData.version());
+    QApplication::setWindowIcon(QIcon::fromTheme(QLatin1String("kmplayer")));
+
+    QCommandLineParser parser;
+    aboutData.setupCommandLine(&parser);
+    parser.setApplicationDescription(aboutData.shortDescription());
+    parser.addHelpOption();
+    parser.addVersionOption();
+    parser.addPositionalArgument(QStringLiteral("File"), i18n("file to open"), \
i18n("+[File]")); +    parser.process(app);
+
+    aboutData.processCommandLine(&parser);
 
     KMPlayer::Ids::init();
 
-    KApplication app;
     QPointer <KMPlayerApp> kmplayer;
 
     if (app.isSessionRestored ()) {
@@ -57,21 +77,19 @@ extern "C" KDE_EXPORT int kdemain (int argc, char *argv[]) {
         kmplayer = new KMPlayerApp ();
         kmplayer->show();
 
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-        KUrl url;
-        if (args->count () == 1)
-            url = args->url (0);
-        if (args->count () > 1)
-            for (int i = 0; i < args->count (); i++) {
-                KUrl url = args->url (i);
+        QUrl url;
+        QStringList args = parser.positionalArguments();
+        if (args.size() == 1)
+            url = KUrl(args[0]);
+        if (args.size() > 1)
+            for (int i = 0; i < args.size(); i++) {
+                KUrl url = KUrl(args[i]);
                 if (url.url ().indexOf ("://") < 0)
                     url = KUrl (QFileInfo (url.url ()).absoluteFilePath ());
                 if (url.isValid ())
                     kmplayer->addUrl (url);
             }
         kmplayer->openDocumentFile (url);
-        args->clear ();
     }
     int retvalue = app.exec ();
 
diff --git a/src/viewarea.cpp b/src/viewarea.cpp
index c7df60a..24f68cf 100644
--- a/src/viewarea.cpp
+++ b/src/viewarea.cpp
@@ -39,7 +39,6 @@
 #include <QAbstractNativeEventFilter>
 
 #include <kactioncollection.h>
-#include <kapplication.h>
 #include <kstatusbar.h>
 #include <kshortcut.h>
 #include <klocale.h>
@@ -1905,7 +1904,7 @@ KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (QWidget *, View * view, \
                bool paint_bg)
     //new KAction (i18n ("Fullscreen"), KShortcut (Qt::Key_F), this, SLOT \
(accelActivated ()), m_collection, "view_fullscreen_toggle");  setMouseTracking \
(true);  setFocusPolicy (Qt::ClickFocus);
-    kapp->installNativeEventFilter(this);
+    QCoreApplication::instance()->installNativeEventFilter(this);
 }
 
 KDE_NO_CDTOR_EXPORT ViewArea::~ViewArea () {


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