Changeset View
Changeset View
Standalone View
Standalone View
src/main.cpp
Show All 33 Lines | |||||
34 | 34 | | |||
35 | #include <QApplication> | 35 | #include <QApplication> | ||
36 | #include <QCommandLineParser> | 36 | #include <QCommandLineParser> | ||
37 | #include <QDBusConnection> | 37 | #include <QDBusConnection> | ||
38 | #include <QDBusInterface> | 38 | #include <QDBusInterface> | ||
39 | #include <QDBusAbstractInterface> | 39 | #include <QDBusAbstractInterface> | ||
40 | #include <QDBusConnectionInterface> | 40 | #include <QDBusConnectionInterface> | ||
41 | 41 | | |||
42 | #include "uiwatchdog.h" | ||||
43 | | ||||
42 | #ifndef Q_OS_WIN | 44 | #ifndef Q_OS_WIN | ||
43 | #include <unistd.h> | 45 | #include <unistd.h> | ||
44 | #endif | 46 | #endif | ||
45 | #include <iostream> | 47 | #include <iostream> | ||
46 | 48 | | |||
47 | extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) | 49 | extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) | ||
48 | { | 50 | { | ||
49 | #ifndef Q_OS_WIN | 51 | #ifndef Q_OS_WIN | ||
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Line(s) | 62 | #endif | |||
135 | parser.process(app); | 137 | parser.process(app); | ||
136 | aboutData.processCommandLine(&parser); | 138 | aboutData.processCommandLine(&parser); | ||
137 | 139 | | |||
138 | const bool splitView = parser.isSet(QStringLiteral("split")) || GeneralSettings::splitView(); | 140 | const bool splitView = parser.isSet(QStringLiteral("split")) || GeneralSettings::splitView(); | ||
139 | const bool openFiles = parser.isSet(QStringLiteral("select")); | 141 | const bool openFiles = parser.isSet(QStringLiteral("select")); | ||
140 | const QStringList args = parser.positionalArguments(); | 142 | const QStringList args = parser.positionalArguments(); | ||
141 | QList<QUrl> urls = Dolphin::validateUris(args); | 143 | QList<QUrl> urls = Dolphin::validateUris(args); | ||
142 | 144 | | |||
145 | UiWatchdog dog(UiWatchdogWorker::Option::OptionDebugBreak); | ||||
146 | dog.start(); | ||||
147 | | ||||
143 | if (parser.isSet(QStringLiteral("daemon"))) { | 148 | if (parser.isSet(QStringLiteral("daemon"))) { | ||
144 | KDBusService dolphinDBusService; | 149 | KDBusService dolphinDBusService; | ||
145 | DBusInterface interface; | 150 | DBusInterface interface; | ||
146 | interface.setAsDaemon(); | 151 | interface.setAsDaemon(); | ||
147 | return app.exec(); | 152 | return app.exec(); | ||
148 | } | 153 | } | ||
149 | 154 | | |||
150 | if (!parser.isSet(QStringLiteral("new-window"))) { | 155 | if (!parser.isSet(QStringLiteral("new-window"))) { | ||
Show All 40 Lines |