Commit 3251309a authored by hjk's avatar hjk

texteditor: remove traces of TEXTEDITOR_STANDALONE

parent 25e04d8e
......@@ -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)
......
......@@ -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;
......
......@@ -143,9 +143,7 @@ public:
BaseTextEditorPrivate();
~BaseTextEditorPrivate();
#ifndef TEXTEDITOR_STANDALONE
void setupBasicEditActions(TextEditorActionHandler *actionHandler);
#endif
void setupDocumentSignals(BaseTextDocument *document);
void updateLineSelectionColor();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment