feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Replace PlainTextEditorWidget by Base + a setup function

Browse Source 
Change-Id: I91a3bfb66a72e9234ca59f97d5260bbfc3ccb0d3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-07-30 11:41:06 +02:00
parent ce6f3477b5
commit faa0e5b96c
12 changed files with 50 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidmanifesteditorwidget.cpp
View File

@@ -111,6 +111,7 @@ AndroidManifestEditorWidget::AndroidManifestEditorWidget()
m_appNameInStringsXml(false)
{
m_textEditorWidget = new AndroidManifestTextEditorWidget(this);
m_textEditorWidget->setupAsPlainEditor();
TextEditor::TextEditorSettings::initializeEditor(m_textEditorWidget);
initializePage();
@@ -619,7 +620,7 @@ Core::IEditor *AndroidManifestEditorWidget::editor() const
return m_editor;
}
TextEditor::PlainTextEditorWidget *AndroidManifestEditorWidget::textEditorWidget() const
TextEditor::BaseTextEditorWidget *AndroidManifestEditorWidget::textEditorWidget() const
{
return m_textEditorWidget;
}
@@ -1421,9 +1422,10 @@ int PermissionsModel::rowCount(const QModelIndex &parent) const
AndroidManifestTextEditorWidget::AndroidManifestTextEditorWidget(AndroidManifestEditorWidget *parent)
: TextEditor::PlainTextEditorWidget(new AndroidManifestDocument(parent), parent),
: TextEditor::BaseTextEditorWidget(new AndroidManifestDocument(parent), parent),
m_parent(parent)
{
setupAsPlainEditor();
baseTextDocument()->setMimeType(QLatin1String(Constants::ANDROID_MANIFEST_MIME_TYPE));
}

6
src/plugins/android/androidmanifesteditorwidget.h
View File

@@ -80,7 +80,7 @@ private:
QStringList m_permissions;
};
class AndroidManifestTextEditorWidget : public TextEditor::PlainTextEditorWidget
class AndroidManifestTextEditorWidget : public TextEditor::BaseTextEditorWidget
{
public:
AndroidManifestTextEditorWidget(AndroidManifestEditorWidget *parent = 0);
@@ -109,7 +109,7 @@ public:
void preSave();
Core::IEditor *editor() const;
TextEditor::PlainTextEditorWidget *textEditorWidget() const;
TextEditor::BaseTextEditorWidget *textEditorWidget() const;
public slots:
void setDirty(bool dirty = true);
@@ -193,7 +193,7 @@ private:
QComboBox *m_permissionsComboBox;
QTimer m_timerParseCheck;
TextEditor::PlainTextEditorWidget *m_textEditorWidget;
TextEditor::BaseTextEditorWidget *m_textEditorWidget;
QStackedWidget *m_stackedWidget;
AndroidManifestEditor *m_editor;
};