Merge remote-tracking branch 'origin/master' into frameworks

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 3ce3204e9b95909954f2b235a41e4fa82e52d7b0..ca047bd16c3be9122bde4035d77bbef4978d9fd6 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,20 +22,22 @@
 
 #include "dolphinmainwindow.h"
 
 
 #include "dolphinmainwindow.h"
 

-#include <KAboutData>
+#include <k4aboutdata.h>

 #include <KCmdLineArgs>
 #include <KLocale>
 #include <kmainwindow.h>
 #include <KCmdLineArgs>
 #include <KLocale>
 #include <kmainwindow.h>

+#include <kdemacros.h>
+#include <kdeversion.h>

 #include <KDebug>
 
 extern "C"
 KDE_EXPORT int kdemain(int argc, char **argv)
 {
 #include <KDebug>
 
 extern "C"
 KDE_EXPORT int kdemain(int argc, char **argv)
 {

-    KAboutData about("dolphin", 0,
+    K4AboutData about("dolphin", 0,

                      ki18nc("@title", "Dolphin"),
                      ki18nc("@title", "Dolphin"),

-                     KDE_VERSION_STRING,
+                     "4.60",

                      ki18nc("@title", "File Manager"),
                      ki18nc("@title", "File Manager"),

-                     KAboutData::License_GPL,
+                     K4AboutData::License_GPL,

                      ki18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));
     about.setHomepage("http://dolphin.kde.org");
     about.addAuthor(ki18nc("@info:credit", "Emmanuel Pescosta"),
                      ki18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));
     about.setHomepage("http://dolphin.kde.org");
     about.addAuthor(ki18nc("@info:credit", "Emmanuel Pescosta"),