Use capitalized KDE includes

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index b9e8997a726ea2eb26902552959d90925f7b66be..2cc9ff5d927d0d2989a1c321cc1f1995e444216f 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,24 +23,24 @@
 #include "dolphinmainwindow.h"
 
 #include <kaboutdata.h>
 #include "dolphinmainwindow.h"
 
 #include <kaboutdata.h>

-#include <kcmdlineargs.h>
-#include <kicon.h>
-#include <klocale.h>
+#include <KCmdLineArgs>
+#include <KLocale>

 #include <kmainwindow.h>
 #include <kmainwindow.h>

-#include <kdebug.h>
+#include <KDebug>

 
 

-int main(int argc, char **argv)
+extern "C"
+KDE_EXPORT int kdemain(int argc, char **argv)

 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),

-                     "1.0.99",
+                     "1.6.9",

                      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-2011 Peter Penz"));
+    about.setHomepage("http://dolphin.kde.org");

     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
                     ki18nc("@info:credit", "Maintainer and developer"),
     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
                     ki18nc("@info:credit", "Maintainer and developer"),

-                    "peter.penz@gmx.at");
+                    "peter.penz19@gmail.com");

     about.addAuthor(ki18nc("@info:credit", "David Faure"),
                     ki18nc("@info:credit", "Developer"),
                     "faure@kde.org");
     about.addAuthor(ki18nc("@info:credit", "David Faure"),
                     ki18nc("@info:credit", "Developer"),
                     "faure@kde.org");


@@ -62,10 +62,16 @@ 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("select", ki18nc("@info:shell", "The files and directories passed as arguments "
+                                                "will be selected."));

     options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
     KCmdLineArgs::addCmdLineOptions(options);
 
     options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
     KCmdLineArgs::addCmdLineOptions(options);
 


@@ -74,9 +80,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,10 +94,8 @@ int main(int argc, char **argv)
             }
             ++n;
         }
             }
             ++n;
         }

-        app.exec();
-    } else {
-        app.exec();

     }
     }

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

 
     return 0;
 }
 
     return 0;
 }