readded missing isVersioned check in VersionControlObserver::actions()

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index ed4c9f9d8258a41ccc9314316693ab329696639c..b8eb9a556ceeb1c0349141765f39260ba2ba60fa 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,11 +28,17 @@
 #include <QCommandLineOption>
 #include <QApplication>
 #include <KLocalizedString>
 #include <QCommandLineOption>
 #include <QApplication>
 #include <KLocalizedString>

-#include <KDebug>
+#include "dolphindebug.h"
+#include <kdelibs4configmigrator.h>

 
 extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 {
     QApplication app(argc, argv);
 
 extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 {
     QApplication app(argc, argv);

+    Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
+    migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
+    migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
+    migrate.migrate();
+

     app.setWindowIcon(QIcon::fromTheme("system-file-manager"));
 
     KAboutData aboutData("dolphin", i18n("Dolphin"), "4.60",
     app.setWindowIcon(QIcon::fromTheme("system-file-manager"));
 
     KAboutData aboutData("dolphin", i18n("Dolphin"), "4.60",


@@ -99,9 +105,11 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     QList<QUrl> urls;
     const QStringList args = parser.positionalArguments();
     foreach (const QString& str,  args) {
     QList<QUrl> urls;
     const QStringList args = parser.positionalArguments();
     foreach (const QString& str,  args) {

-        const QUrl url(str);
+        const QUrl url = QUrl::fromUserInput(str, QString(), QUrl::AssumeLocalFile);

         if (url.isValid()) {
             urls.append(url);
         if (url.isValid()) {
             urls.append(url);

+        } else {
+            qCWarning(DolphinDebug) << "Invalid URL: " << str;

         }
     }
 
         }
     }
 


@@ -144,7 +152,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
         if (className == QLatin1String("DolphinMainWindow")) {
             m_mainWindow->restore(1);
         } else {
         if (className == QLatin1String("DolphinMainWindow")) {
             m_mainWindow->restore(1);
         } else {

-            kWarning() << "Unknown class " << className << " in session saved data!";
+           qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";

         }
     }
 
         }
     }