From 3251309ada7e5c2a6e242b4778c7b4075877541b Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 4 Feb 2010 10:33:12 +0100
Subject: [PATCH] texteditor: remove traces of TEXTEDITOR_STANDALONE

---
 src/plugins/texteditor/basetextdocument.cpp |  9 ++-------
 src/plugins/texteditor/basetexteditor.cpp   | 21 +++++++--------------
 src/plugins/texteditor/basetexteditor_p.h   |  2 --
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp
index d3a2696195f..ae743ccb988 100644
--- a/src/plugins/texteditor/basetextdocument.cpp
+++ b/src/plugins/texteditor/basetextdocument.cpp
@@ -39,12 +39,10 @@
 #include <QtGui/QSyntaxHighlighter>
 #include <QtGui/QApplication>
 
-#ifndef TEXTEDITOR_STANDALONE
-#include <utils/reloadpromptutils.h>
-#include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
-#endif
+#include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
+#include <utils/reloadpromptutils.h>
 
 using namespace TextEditor;
 
@@ -271,8 +269,6 @@ void BaseTextDocument::modified(Core::IFile::ReloadBehavior *behavior)
         break;
     }
 
-#ifndef TEXTEDITOR_STANDALONE
-
     switch (Utils::reloadPrompt(m_fileName, isModified(), QApplication::activeWindow())) {
     case Utils::ReloadCurrent:
         reload();
@@ -287,7 +283,6 @@ void BaseTextDocument::modified(Core::IFile::ReloadBehavior *behavior)
         *behavior = Core::IFile::ReloadNone;
         break;
     }
-#endif
 }
 
 void BaseTextDocument::setSyntaxHighlighter(QSyntaxHighlighter *highlighter)
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 48dbcc2d40f..f091f015a01 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -29,31 +29,26 @@
 
 #include "texteditor_global.h"
 
-#include "texteditorconstants.h"
-#ifndef TEXTEDITOR_STANDALONE
-#include "texteditorplugin.h"
-#include "completionsupport.h"
-#endif
-#include "behaviorsettings.h"
 #include "basetextdocument.h"
 #include "basetexteditor_p.h"
+#include "behaviorsettings.h"
 #include "codecselector.h"
+#include "completionsupport.h"
 #include "tabsettings.h"
+#include "texteditorconstants.h"
+#include "texteditorplugin.h"
 
-#ifndef TEXTEDITOR_STANDALONE
 #include <aggregation/aggregate.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/manhattanstyle.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/manhattanstyle.h>
 #include <extensionsystem/pluginmanager.h>
 #include <find/basetextfind.h>
-#include <utils/stylehelper.h>
-#endif
-
 #include <utils/linecolumnlabel.h>
 #include <utils/qtcassert.h>
+#include <utils/stylehelper.h>
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTextCodec>
@@ -5430,7 +5425,6 @@ void BaseTextEditor::insertFromMimeData(const QMimeData *source)
 BaseTextEditorEditable::BaseTextEditorEditable(BaseTextEditor *editor)
   : e(editor)
 {
-#ifndef TEXTEDITOR_STANDALONE
     using namespace Find;
     Aggregation::Aggregate *aggregate = new Aggregation::Aggregate;
     BaseTextFind *baseTextFind = new BaseTextFind(editor);
@@ -5439,7 +5433,6 @@ BaseTextEditorEditable::BaseTextEditorEditable(BaseTextEditor *editor)
     connect(baseTextFind, SIGNAL(findScopeChanged(QTextCursor)), editor, SLOT(setFindScope(QTextCursor)));
     aggregate->add(baseTextFind);
     aggregate->add(editor);
-#endif
 
     m_cursorPositionLabel = new Utils::LineColumnLabel;
 
diff --git a/src/plugins/texteditor/basetexteditor_p.h b/src/plugins/texteditor/basetexteditor_p.h
index 9919f00b6b3..a180cd21da6 100644
--- a/src/plugins/texteditor/basetexteditor_p.h
+++ b/src/plugins/texteditor/basetexteditor_p.h
@@ -143,9 +143,7 @@ public:
     BaseTextEditorPrivate();
     ~BaseTextEditorPrivate();
 
-#ifndef TEXTEDITOR_STANDALONE
     void setupBasicEditActions(TextEditorActionHandler *actionHandler);
-#endif
     void setupDocumentSignals(BaseTextDocument *document);
     void updateLineSelectionColor();