debugger: Merge "Start and Debug {Local,Remote} Application" dialogs

Change-Id: I81a95b592c480254d84d45e71d95f924944db1eb
Reviewed-by: hjk <qthjk@ovi.com>

1 files changed, 12 insertions, 43 deletions

diff --git a/src/plugins/debugger/debuggerdialogs.h b/src/plugins/debugger/debuggerdialogs.h
index d38d92f968..24122b9b9d 100644
--- a/src/plugins/debugger/debuggerdialogs.h
+++ b/src/plugins/debugger/debuggerdialogs.h
@@ -44,7 +44,6 @@ class QSettings;
 QT_END_NAMESPACE
 
 namespace Core { class Id; }
-namespace ProjectExplorer { class Profile; }
 
 namespace Debugger {
 class DebuggerStartParameters;
@@ -54,63 +53,33 @@ namespace Internal {
 class AttachCoreDialogPrivate;
 class AttachToQmlPortDialogPrivate;
 class ProcessListFilterModel;
-class StartExternalDialogPrivate;
-class StartExternalParameters;
-class StartRemoteDialogPrivate;
+class StartApplicationParameters;
+class StartApplicationDialogPrivate;
 class StartRemoteEngineDialogPrivate;
-class StartRemoteParameters;
 
-class StartExternalDialog : public QDialog
+class StartApplicationDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit StartExternalDialog(QWidget *parent);
-    ~StartExternalDialog();
-
-    static bool run(QWidget *parent, QSettings *settings, DebuggerStartParameters *sp);
-
-private slots:
-    void changed();
-    void historyIndexChanged(int);
-
-private:
-    StartExternalParameters parameters() const;
-    void setParameters(const StartExternalParameters &p);
-    void setHistory(const QList<StartExternalParameters> &l);
-
-    QString executableFile() const;
-    void setExecutableFile(const QString &executable);
-
-    Core::Id profileId() const;
-    bool isValid() const;
-
-    StartExternalDialogPrivate *d;
-};
-
-class StartRemoteDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit StartRemoteDialog(QWidget *parent, bool enableStartScript);
-    ~StartRemoteDialog();
+    explicit StartApplicationDialog(QWidget *parent);
+    ~StartApplicationDialog();
 
     static bool run(QWidget *parent, QSettings *settings,
-                    bool useScript, DebuggerStartParameters *sp);
+                    DebuggerStartParameters *sp);
 
 private slots:
-    void updateState();
     void historyIndexChanged(int);
+    void updateState();
 
 private:
-    StartRemoteParameters parameters() const;
-    void setParameters(const StartRemoteParameters &);
-    void setHistory(const QList<StartRemoteParameters> &);
-
+    StartApplicationParameters parameters() const;
+    void setParameters(const StartApplicationParameters &p);
+    void setHistory(const QList<StartApplicationParameters> &l);
+    void setScriptVisible(bool on);
     Core::Id profileId() const;
 
-    StartRemoteDialogPrivate *d;
+    StartApplicationDialogPrivate *d;
 };
 
 class AttachToQmlPortDialog : public QDialog