X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6ee9f08e8fc90cc67cd2ed83ae6f2dd5c1846ba3..aa69bcdc64d4cc335da9ab853ace2fbf54157d82:/src/main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 47095c3a5..46ad98bc9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,64 +19,64 @@
  ***************************************************************************/
 
 #include "dolphinapplication.h"
-#include "dolphinmainwindow.h"
+
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <krun.h>
-#include <QDBusInterface>
-#include <QDBusReply>
-
-static KCmdLineOptions options[] =
-{
-    { "+[Url]", I18N_NOOP( "Document to open" ), 0 },
-    KCmdLineLastOption
-};
 
 int main(int argc, char **argv)
 {
-    KAboutData about("dolphin",
-                     I18N_NOOP("Dolphin"),
+    KAboutData about("dolphin", 0,
+                     ki18nc("@info", "Dolphin"),
                      "0.9.0",
-                     I18N_NOOP("File Manager"),
+                     ki18nc("@info", "File Manager"),
                      KAboutData::License_GPL,
-                     "(C) 2006 Peter Penz");
+                     ki18nc("@info:credit", "(C) 2006 Peter Penz"));
     about.setHomepage("http://enzosworld.gmxhome.de");
     about.setBugAddress("peter.penz@gmx.at");
-    about.addAuthor("Peter Penz", I18N_NOOP("Maintainer and developer"), "peter.penz@gmx.at");
-    about.addAuthor("Cvetoslav Ludmiloff", I18N_NOOP("Developer"), "ludmiloff@gmail.com");
-    about.addAuthor("Stefan Monov", I18N_NOOP("Developer"), "logixoul@gmail.com");
-    about.addAuthor("Michael Austin", I18N_NOOP("Documentation"), "tuxedup@users.sourceforge.net");
-    about.addAuthor("Orville Bennett", I18N_NOOP("Documentation"), "obennett@hartford.edu");
-    about.addCredit("Aaron J. Seigo", I18N_NOOP("... for the great support and the amazing patches"));
-    about.addCredit("Patrice Tremblay and Gregor Kalisnik", I18N_NOOP("... for their patches"));
-    about.addCredit("Ain, Itai, Ivan, Stephane, Patrice, Piotr and Stefano",
-                    I18N_NOOP("... for their translations"));
+    about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
+                    ki18nc("@info:credit", "Maintainer and developer"),
+                    "peter.penz@gmx.at");
+    about.addAuthor(ki18nc("@info:credit", "Cvetoslav Ludmiloff"),
+                    ki18nc("@info:credit", "Developer"),
+                    "ludmiloff@gmail.com");
+    about.addAuthor(ki18nc("@info:credit", "Stefan Monov"),
+                    ki18nc("@info:credit", "Developer"),
+                    "logixoul@gmail.com");
+    about.addAuthor(ki18nc("@info:credit", "Michael Austin"),
+                    ki18nc("@info:credit", "Documentation"),
+                    "tuxedup@users.sourceforge.net");
+    about.addAuthor(ki18nc("@info:credit", "Orville Bennett"),
+                    ki18nc("@info:credit", "Documentation"), "obennett@hartford.edu");
+    about.addCredit(ki18nc("@info:credit", "Aaron J. Seigo"),
+                    ki18nc("@info:credit", "... for the great support and the amazing patches"));
+    about.addCredit(ki18nc("@info:credit", "Patrice Tremblay and Gregor Kalisnik"),
+                    ki18nc("@info:credit", "... for their patches"));
+    about.addCredit(ki18nc("@info:credit", "Ain, Itai, Ivan, Stephane, Patrice, Piotr and Stefano"),
+                    ki18nc("@info:credit", "... for their translations"));
 
     KCmdLineArgs::init(argc, argv, &about);
+
+    KCmdLineOptions options;
+    options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
     KCmdLineArgs::addCmdLineOptions(options);
 
-    DolphinApplication* app = 0;
-    if (DolphinApplication::start()) {
-        app = new DolphinApplication();
+    if (!DolphinApplication::start()) {
+        return 0;
+    }
 
+    DolphinApplication app;
 #ifdef __GNUC__
 #warning TODO, SessionManagement
 #endif
 #if 0
     if (false /* KDE4-TODO: app.isSessionRestored() */) {
         int n = 1;
-        while (KMainWindow::canBeRestored(n)){
+        while (KMainWindow::canBeRestored(n)) {
             Dolphin::mainWin().restore(n);
             ++n;
         }
     } else {
 #endif
-        return app->exec();
+        return app.exec();
     }
-
-    static QDBusInterface dbusIface("org.kde.dolphin", "/dolphin/Application", "",
-                                    QDBusConnection::connectToBus(QDBusConnection::SessionBus, "session_bus"));
-    dbusIface.call("openWindow");
-    return 0;
-}