summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Caulier <[email protected]>2014-11-23 23:08:07 +0100
committerGilles Caulier <[email protected]>2014-11-23 23:08:07 +0100
commit5dba61225ce7408520b0167470f02638b054a14f (patch)
treedef1b241819702b560f62908d1d739dc6379a979
parent80da4ab5b01d0a99e115799e977d23ea5c578321 (diff)
port ++
-rw-r--r--tests/main.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/tests/main.cpp b/tests/main.cpp
index 61c975b..ac8d365 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -9,7 +9,7 @@
*
* @author Copyright (C) 2009-2010 by Michael G. Hansen
* <a href="mailto:mike at mghansen dot de">mike at mghansen dot de</a>
- * @author Copyright (C) 2011-2012 by Gilles Caulier
+ * @author Copyright (C) 2011-2014 by Gilles Caulier
* <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
* @author Copyright (C) 2012 by Victor Dodon
* <a href="mailto:dodonvictor at gmail dot com">dodonvictor at gmail dot com</a>
@@ -26,15 +26,18 @@
*
* ============================================================ */
+// Qt includes
+
+#include <QUrl>
+#include <QDebug>
+
// KDE includes
#include <kapplication.h>
-#include <K4AboutData>
+#include <k4aboutdata.h>
#include <kcmdlineargs.h>
#include <klocale.h>
#include <kstandarddirs.h>
-#include <QUrl>
-#include <kdebug.h>
// LibKipi includes
@@ -74,7 +77,6 @@ int main(int argc, char* argv[])
KApplication app;
app.setWindowIcon(QIcon(KStandardDirs::locate("data", "kipi/data/kipi-icon.svg")));
-
KCmdLineArgs* const args = KCmdLineArgs::parsedArgs();
QList<QUrl> listSelectedImages;
@@ -121,7 +123,7 @@ int main(int argc, char* argv[])
{
if (startList == 0)
{
- kError() << "startList is null";
+ qCritical() << "startList is null";
args->usageError(i18n("Please specify how the filenames you provided should be used."));
}
else
@@ -131,7 +133,7 @@ int main(int argc, char* argv[])
}
}
- KipiTestMainWindow* mainWindow = new KipiTestMainWindow(listSelectedImages, listSelectedAlbums, listAllAlbums);
+ KipiTestMainWindow* const mainWindow = new KipiTestMainWindow(listSelectedImages, listSelectedAlbums, listAllAlbums);
QObject::connect(mainWindow, &KipiTestMainWindow::destroyed, &app, &KApplication::quit);
app.setTopWidget(mainWindow);