Get back names, and use "using" keyword to keep GCC silent on "method foo on base...

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 2e42cd9be6bfb50aff622aa2dca59b757b3d31d8..3418c333f8790f78960a23b6294a8ed0323e8938 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,7 +24,6 @@
 
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>

-#include <kicon.h>

 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kdebug.h>


@@ -33,11 +32,11 @@ int main(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),

-                     "1.0.99",
+                     "1.4",

                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,

-                     ki18nc("@info:credit", "(C) 2006, 2007 Peter Penz"));
-    about.setHomepage("http://enzosworld.gmxhome.de");
+                     ki18nc("@info:credit", "(C) 2006-2009 Peter Penz"));
+    about.setHomepage("http://dolphin.kde.org");

     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
                     ki18nc("@info:credit", "Maintainer and developer"),
                     "peter.penz@gmx.at");
     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
                     ki18nc("@info:credit", "Maintainer and developer"),
                     "peter.penz@gmx.at");


@@ -62,11 +61,21 @@ int main(int argc, char **argv)
     about.addAuthor(ki18nc("@info:credit", "Michael Austin"),
                     ki18nc("@info:credit", "Documentation"),
                     "tuxedup@users.sourceforge.net");
     about.addAuthor(ki18nc("@info:credit", "Michael Austin"),
                     ki18nc("@info:credit", "Documentation"),
                     "tuxedup@users.sourceforge.net");

+    // the .desktop file is not taken into account when launching manually, so
+    // set the icon precautionally:
+    about.setProgramIconName("system-file-manager");

 
     KCmdLineArgs::init(argc, argv, &about);
 
     KCmdLineOptions options;
 
     KCmdLineArgs::init(argc, argv, &about);
 
     KCmdLineOptions options;

-    options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
+
+    // TODO KDE SC 4.5: The string freeze is valid and no new localized strings are allowed.
+    // To get in the --select option that was available in Konqueror 3, an already existing
+    // string ("Document to open") is used as workaround (the --select option will most probably
+    // anyhow used by applications and not by users).
+    const KLocalizedString& documentToOpen = ki18nc("@info:shell", "Document to open");
+    options.add("select", documentToOpen);
+    options.add("+[Url]", documentToOpen);

     KCmdLineArgs::addCmdLineOptions(options);
 
     if (!DolphinApplication::start()) {
     KCmdLineArgs::addCmdLineOptions(options);
 
     if (!DolphinApplication::start()) {


@@ -74,9 +83,6 @@ int main(int argc, char **argv)
     }
 
     DolphinApplication app;
     }
 
     DolphinApplication app;

-    // the .desktop file is not taken into account when launching manually, so
-    // set the icon precautionally:
-    QApplication::setWindowIcon(KIcon("system-file-manager"));

     KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
 
     if (app.isSessionRestored()) {
     KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
 
     if (app.isSessionRestored()) {


@@ -91,9 +97,8 @@ int main(int argc, char **argv)
             }
             ++n;
         }
             }
             ++n;
         }

-    } else {
-        app.exec();

     }
     }

+    app.exec(); // krazy:exclude=crashy

 
     return 0;
 }
 
     return 0;
 }