debugger: remove standalone option

src/plugins/debugger/breakhandler.cpp

@@ -33,7 +33,7 @@
 #include "debuggermanager.h"
 #include "stackframe.h"
 
-#include "imports.h" // TextEditor::BaseTextMark
+#include <texteditor/basetextmark.h>
 
 #include <QtCore/QDebug>
 #include <QtCore/QTextStream>

src/plugins/debugger/debugger.pro

@@ -29,7 +29,6 @@ HEADERS += breakhandler.h \
     debuggerstringutils.h \
     watchutils.h \
     idebuggerengine.h \
-    imports.h \
     moduleshandler.h \
     moduleswindow.h \
     outputcollector.h \

src/plugins/debugger/debuggeroutputwindow.cpp

@@ -45,18 +45,13 @@
 #include <QtGui/QSyntaxHighlighter>
 #include <QtGui/QTextBlock>
 
-#ifndef GDBDEBUGGERLEAN
-
 #include <aggregation/aggregate.h>
 #include <coreplugin/findplaceholder.h>
 #include <find/basetextfind.h>
 
-using namespace Find;
-
-#endif // GDBDEBUGGERLEAN
-
 using namespace Debugger;
 using namespace Debugger::Internal;
+using namespace Find;
 
 static QChar charForChannel(int channel)
 {
@@ -317,12 +312,9 @@ DebuggerOutputWindow::DebuggerOutputWindow(QWidget *parent)
     layout->setMargin(0);
     layout->setSpacing(0);
     layout->addWidget(m_splitter);
-#ifndef GDBDEBUGGERLEAN
     layout->addWidget(new Core::FindToolBarPlaceHolder(this));
-#endif
     setLayout(layout);
 
-#ifndef GDBDEBUGGERLEAN
     Aggregation::Aggregate *aggregate = new Aggregation::Aggregate;
     aggregate->add(m_combinedText);
     aggregate->add(new BaseTextFind(m_combinedText));
@@ -330,7 +322,6 @@ DebuggerOutputWindow::DebuggerOutputWindow(QWidget *parent)
     aggregate = new Aggregation::Aggregate;
     aggregate->add(m_inputText);
     aggregate->add(new BaseTextFind(m_inputText));
-#endif
 
     connect(m_inputText, SIGNAL(statusMessageRequested(QString,int)),
        this, SIGNAL(statusMessageRequested(QString,int)));

src/plugins/debugger/imports.h

-/**************************************************************************
-**
-** 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.
-**
-**************************************************************************/
-
-#ifndef DEBUGGER_IMPORTS_H
-#define DEBUGGER_IMPORTS_H
-
-// FIXME: Plan is to remove this file. It's needed to get "harmless"
-// replacements for GH internals in the standalone version
-
-#ifndef GDBDEBUGGERLEAN
-
-#include <texteditor/basetextmark.h>
-
-#else
-
-#include "lean.h"
-
-#endif
-
-#endif // DEBUGGER_IMPORTS_H