From 5077794f549d5a63c3718a3b140e077f8d45485d Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 11 Sep 2009 15:37:32 +0200
Subject: [PATCH] debugger: merge symbianengine into gdbengine

---
 src/plugins/debugger/gdb/gdb.pri           |  1 -
 src/plugins/debugger/gdb/gdbengine.cpp     | 15 ++++-
 src/plugins/debugger/gdb/symbianengine.cpp | 64 ----------------------
 3 files changed, 14 insertions(+), 66 deletions(-)
 delete mode 100644 src/plugins/debugger/gdb/symbianengine.cpp

diff --git a/src/plugins/debugger/gdb/gdb.pri b/src/plugins/debugger/gdb/gdb.pri
index 6a6134f1d1d..2a23a4b4e3c 100644
--- a/src/plugins/debugger/gdb/gdb.pri
+++ b/src/plugins/debugger/gdb/gdb.pri
@@ -16,7 +16,6 @@ SOURCES += \
     $$PWD/trkutils.cpp \
     $$PWD/trkclient.cpp \
     $$PWD/symbianadapter.cpp \
-    $$PWD/symbianengine.cpp \
     #$$PWD/gdboptionspage.cpp \
 
 FORMS +=  $$PWD/gdboptionspage.ui
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 452e9908ec4..93986cf44aa 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4238,12 +4238,25 @@ void GdbEngine::handleFetchDisassemblerByAddress0(const GdbResultRecord &record,
     }
 }
 
-IDebuggerEngine *createGdbEngine(DebuggerManager *parent, QList<Core::IOptionsPage*> *opts)
+IDebuggerEngine *createGdbEngine(DebuggerManager *parent,
+    QList<Core::IOptionsPage*> *opts)
 {
     opts->push_back(new GdbOptionsPage);
     return new GdbEngine(parent, new GdbProcess);
 }
 
+IDebuggerEngine *createSymbianEngine(DebuggerManager *parent,
+    QList<Core::IOptionsPage*> *opts)
+{
+    Q_UNUSED(opts);
+    //opts->push_back(new GdbOptionsPage);
+    SymbianAdapter *adapter = new SymbianAdapter;
+    GdbEngine *engine = new GdbEngine(parent, adapter);
+    QObject::connect(adapter, SIGNAL(output(QString)),
+        parent, SLOT(showDebuggerOutput(QString)));
+    return engine;
+}
+
 } // namespace Internal
 } // namespace Debugger
 
diff --git a/src/plugins/debugger/gdb/symbianengine.cpp b/src/plugins/debugger/gdb/symbianengine.cpp
deleted file mode 100644
index b6d202c50b6..00000000000
--- a/src/plugins/debugger/gdb/symbianengine.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#define QT_NO_CAST_FROM_ASCII
-
-#include "gdbengine.h"
-#include "symbianadapter.h"
-#include "debuggermanager.h"
-
-//#include "debuggerdialogs.h"
-
-#include <utils/qtcassert.h>
-#include <texteditor/itexteditor.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/dialogs/ioptionspage.h>
-
-#include <QtCore/QDebug>
-
-
-namespace Debugger {
-namespace Internal {
-
-IDebuggerEngine *createSymbianEngine(DebuggerManager *parent,
-    QList<Core::IOptionsPage*> *opts)
-{
-    Q_UNUSED(opts);
-    //opts->push_back(new GdbOptionsPage);
-    SymbianAdapter *adapter = new SymbianAdapter;
-    GdbEngine *engine = new GdbEngine(parent, adapter);
-    QObject::connect(adapter, SIGNAL(output(QString)),
-        parent, SLOT(showDebuggerOutput(QString)));
-    return engine;
-}
-
-} // namespace Internal
-} // namespace Debugger
-
-