X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/85cc0e78c7fff95cd54c00e7e5e4e3aa07399fa5..340bf76f2aea4476b4e7d173e097d98f9dae4641:/src/main.cpp diff --git a/src/main.cpp b/src/main.cpp index 094402f90..e8d6c2d29 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include "dolphindebug.h" #include extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) @@ -41,7 +41,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) app.setWindowIcon(QIcon::fromTheme("system-file-manager")); - KAboutData aboutData("dolphin", i18n("Dolphin"), "4.60", + KAboutData aboutData("dolphin", i18n("Dolphin"), "14.12.95", i18nc("@title", "File Manager"), KAboutLicense::GPL, i18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta")); @@ -105,9 +105,11 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) QList 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); + } else { + qCWarning(DolphinDebug) << "Invalid URL: " << str; } } @@ -150,7 +152,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) 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!"; } }