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

TextEditor: Rename BaseTextEditorWidget to TextEditorWidget

Browse Source 
... and some of the related implementation details

Change-Id: I1f03aa5acf2d3fb2cfc2a6a7845f3d3578b0408d
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
hjk
2014-09-26 11:37:54 +02:00
committed by David Schulz
parent cfaa30d0b9
commit 10c8d5f0ca
137 changed files with 825 additions and 827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidmanifesteditor.cpp
View File

@@ -84,7 +84,7 @@ Core::IDocument *AndroidManifestEditor::document()
return textEditor()->textDocument();
}
TextEditor::BaseTextEditorWidget *AndroidManifestEditor::textEditor() const
TextEditor::TextEditorWidget *AndroidManifestEditor::textEditor() const
{
return widget()->textEditorWidget();
}

2
src/plugins/android/androidmanifesteditor.h
View File

@@ -54,7 +54,7 @@ public:
QWidget *toolBar();
AndroidManifestEditorWidget *widget() const;
Core::IDocument *document();
TextEditor::BaseTextEditorWidget *textEditor() const;
TextEditor::TextEditorWidget *textEditor() const;
int currentLine() const;
int currentColumn() const;

2
src/plugins/android/androidmanifesteditorfactory.cpp
View File

@@ -46,7 +46,7 @@ public:
: TextEditorActionHandler(parent, Constants::ANDROID_MANIFEST_EDITOR_CONTEXT)
{}
private:
TextEditor::BaseTextEditorWidget *resolveTextEditorWidget(Core::IEditor *editor) const
TextEditor::TextEditorWidget *resolveTextEditorWidget(Core::IEditor *editor) const
{
AndroidManifestEditor *androidManifestEditor = static_cast<AndroidManifestEditor *>(editor);
return androidManifestEditor->textEditor();

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

@@ -623,7 +623,7 @@ Core::IEditor *AndroidManifestEditorWidget::editor() const
return m_editor;
}
TextEditor::BaseTextEditorWidget *AndroidManifestEditorWidget::textEditorWidget() const
TextEditor::TextEditorWidget *AndroidManifestEditorWidget::textEditorWidget() const
{
return m_textEditorWidget;
}
@@ -1425,9 +1425,9 @@ int PermissionsModel::rowCount(const QModelIndex &parent) const
AndroidManifestTextEditorWidget::AndroidManifestTextEditorWidget(AndroidManifestEditorWidget *parent)
: TextEditor::BaseTextEditorWidget(parent)
: TextEditor::TextEditorWidget(parent)
{
setTextDocument(TextEditor::BaseTextDocumentPtr(new AndroidManifestDocument(parent)));
setTextDocument(TextEditor::TextDocumentPtr(new AndroidManifestDocument(parent)));
setupAsPlainEditor();
textDocument()->setMimeType(QLatin1String(Constants::ANDROID_MANIFEST_MIME_TYPE));
}

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

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

2
src/plugins/android/javaeditor.cpp
View File

@@ -52,7 +52,7 @@ namespace Internal {
// JavaEditorWidget
//
class JavaEditorWidget : public TextEditor::BaseTextEditorWidget
class JavaEditorWidget : public TextEditor::TextEditorWidget
{
public:
JavaEditorWidget()

2
src/plugins/android/javaeditor.h
View File

@@ -35,7 +35,7 @@
namespace Android {
namespace Internal {
class JavaEditorFactory : public TextEditor::BaseTextEditorFactory
class JavaEditorFactory : public TextEditor::TextEditorFactory
{
Q_OBJECT