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

List:       kde-commits
Subject:    [kalarm] src: Fix warning message about QCoreApplication::arguments
From:       David Jarvie <djarvie () kde ! org>
Date:       2016-10-30 18:41:06
Message-ID: E1c0v2Y-0008C6-Un () code ! kde ! org
[Download RAW message or body]

Git commit 0797ecec47b1cbd9928cb3ae2cfbe6c7f55b5317 by David Jarvie.
Committed on 30/10/2016 at 18:36.
Pushed by djarvie into branch 'master'.

Fix warning message about QCoreApplication::arguments

M  +4    -0    src/kalarmapp.cpp
M  +0    -4    src/main.cpp

http://commits.kde.org/kalarm/0797ecec47b1cbd9928cb3ae2cfbe6c7f55b5317

diff --git a/src/kalarmapp.cpp b/src/kalarmapp.cpp
index 1e948c5..7987459 100644
--- a/src/kalarmapp.cpp
+++ b/src/kalarmapp.cpp
@@ -34,6 +34,7 @@
 #include "mainwindow.h"
 #include "messagebox.h"
 #include "messagewin.h"
+#include "kalarmmigrateapplication.h"
 #include "preferences.h"
 #include "prefdlg.h"
 #include "shellprocess.h"
@@ -117,6 +118,9 @@ KAlarmApp::KAlarmApp(int& argc, char** argv)
       mAlarmsEnabled(true)
 {
     qCDebug(KALARM_LOG);
+    KAlarmMigrateApplication migrate;
+    migrate.migrate();
+
 #ifndef NDEBUG
     KAlarm::setTestModeConditions();
 #endif
diff --git a/src/main.cpp b/src/main.cpp
index 3eab588..15627ff 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,7 +21,6 @@
 #include "kalarm.h"
 
 #include "kalarmapp.h"
-#include "kalarmmigrateapplication.h"
 #include "kalarm_debug.h"
 
 #include <kalarmcal/version.h>
@@ -37,9 +36,6 @@
 
 int main(int argc, char* argv[])
 {
-    KAlarmMigrateApplication migrate;
-    migrate.migrate();
-
     KAlarmApp* app = KAlarmApp::create(argc, argv);
     QStringList args = app->arguments();
     app->setAttribute(Qt::AA_UseHighDpiPixmaps, true);
[prev in list] [next in list] [prev in thread] [next in thread]