Changeset View
Changeset View
Standalone View
Standalone View
src/debuggerlaunchers.h
Show All 23 Lines | |||||
24 | 24 | | |||
25 | class DetachedProcessMonitor; | 25 | class DetachedProcessMonitor; | ||
26 | 26 | | |||
27 | class AbstractDebuggerLauncher : public QObject | 27 | class AbstractDebuggerLauncher : public QObject | ||
28 | { | 28 | { | ||
29 | Q_OBJECT | 29 | Q_OBJECT | ||
30 | Q_PROPERTY(QString name READ name) | 30 | Q_PROPERTY(QString name READ name) | ||
31 | public: | 31 | public: | ||
32 | explicit AbstractDebuggerLauncher(DebuggerManager *parent = nullptr) : QObject(parent) {} | 32 | explicit AbstractDebuggerLauncher(QObject *parent = nullptr) : QObject(parent) {} | ||
33 | virtual QString name() const = 0; | 33 | virtual QString name() const = 0; | ||
34 | 34 | | |||
35 | public Q_SLOTS: | 35 | public Q_SLOTS: | ||
36 | virtual void start() = 0; | 36 | virtual void start() = 0; | ||
37 | 37 | | |||
38 | Q_SIGNALS: | 38 | Q_SIGNALS: | ||
39 | void starting(); | 39 | void starting(); | ||
40 | void finished(); | 40 | void finished(); | ||
Show All 25 Lines | |||||
66 | public: | 66 | public: | ||
67 | explicit TerminalDebuggerLauncher(const Debugger & debugger, DebuggerManager *parent = 0); | 67 | explicit TerminalDebuggerLauncher(const Debugger & debugger, DebuggerManager *parent = 0); | ||
68 | 68 | | |||
69 | public slots: | 69 | public slots: | ||
70 | virtual void start(); | 70 | virtual void start(); | ||
71 | }; | 71 | }; | ||
72 | #endif | 72 | #endif | ||
73 | 73 | | |||
74 | class DBusOldInterfaceAdaptor; | 74 | class DBusInterfaceAdaptor; | ||
75 | 75 | | |||
76 | /** This class handles the old drkonqi dbus interface used by kdevelop */ | 76 | /** This class handles the old drkonqi dbus interface used by kdevelop */ | ||
77 | class DBusOldInterfaceLauncher : public AbstractDebuggerLauncher | 77 | class DBusInterfaceLauncher : public AbstractDebuggerLauncher | ||
78 | { | 78 | { | ||
79 | Q_OBJECT | 79 | Q_OBJECT | ||
80 | friend class DBusOldInterfaceAdaptor; | | |||
81 | public: | 80 | public: | ||
82 | explicit DBusOldInterfaceLauncher(DebuggerManager *parent = nullptr); | 81 | explicit DBusInterfaceLauncher(const QString &name, DBusInterfaceAdaptor *parent = nullptr); | ||
mwolff: here and below: style issues, afaik & and * should be next to the var name in frameworks code… | |||||
83 | QString name() const override; | 82 | QString name() const override; | ||
84 | 83 | | |||
85 | public Q_SLOTS: | 84 | public Q_SLOTS: | ||
86 | void start() override; | 85 | void start() override; | ||
87 | 86 | | |||
88 | Q_SIGNALS: | | |||
89 | void available(); | | |||
90 | | ||||
91 | private: | 87 | private: | ||
92 | QString m_name; | 88 | QString m_name; | ||
93 | DBusOldInterfaceAdaptor *m_adaptor; | | |||
94 | }; | 89 | }; | ||
95 | 90 | | |||
96 | class DBusOldInterfaceAdaptor : public QDBusAbstractAdaptor | 91 | class DBusInterfaceAdaptor : public QDBusAbstractAdaptor | ||
97 | { | 92 | { | ||
98 | Q_OBJECT | 93 | Q_OBJECT | ||
99 | Q_CLASSINFO("D-Bus Interface", "org.kde.Krash") | 94 | Q_CLASSINFO("D-Bus Interface", "org.kde.drkonqi") | ||
100 | friend class DBusOldInterfaceLauncher; | | |||
101 | public: | 95 | public: | ||
102 | explicit DBusOldInterfaceAdaptor(DBusOldInterfaceLauncher *parent); | 96 | explicit DBusInterfaceAdaptor(DebuggerManager *parent); | ||
103 | 97 | | |||
104 | public Q_SLOTS: | 98 | public Q_SLOTS: | ||
105 | int pid(); | 99 | int pid(); | ||
106 | Q_NOREPLY void registerDebuggingApplication(const QString & name); | 100 | Q_NOREPLY void registerDebuggingApplication(const QString &name); | ||
101 | Q_NOREPLY void debuggingFinished(const QString &name); | ||||
102 | Q_NOREPLY void debuggerClosed(const QString &name); | ||||
107 | 103 | | |||
108 | Q_SIGNALS: | 104 | Q_SIGNALS: | ||
109 | void acceptDebuggingApplication(); | 105 | void acceptDebuggingApplication(const QString &name); | ||
106 | | ||||
107 | private: | ||||
108 | QHash<QString, DBusInterfaceLauncher*> m_launchers; | ||||
110 | }; | 109 | }; | ||
111 | 110 | | |||
112 | #endif // DEBUGGERLAUNCHERS_H | 111 | #endif // DEBUGGERLAUNCHERS_H |
here and below: style issues, afaik & and * should be next to the var name in frameworks code, like done in Qt