summaryrefslogtreecommitdiff
path: root/src/plugins/texteditor/snippets/snippetssettingspage.cpp
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2011-02-21 16:02:26 +0100
committerhjk <qtc-committer@nokia.com>2011-02-22 11:23:53 +0100
commitf576ad9f2c169bfa4d336ba2b3b1918f03df6916 (patch)
treef9e708ea1972b10d5465c915e7b9d0f7572f671f /src/plugins/texteditor/snippets/snippetssettingspage.cpp
parente32cf192f7ba34dda96b61507b440c6a17b51a0c (diff)
downloadqt-creator-f576ad9f2c169bfa4d336ba2b3b1918f03df6916.tar.gz
texteditor: merge ITextEditable into ITextEditor
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor rename BaseTextEditor{,Widget} subclasses rename editableInterface->editorInterface rename createEditableInterface->createEditor minor cleanups after renamings
Diffstat (limited to 'src/plugins/texteditor/snippets/snippetssettingspage.cpp')
-rw-r--r--src/plugins/texteditor/snippets/snippetssettingspage.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
index a1217d16db..bd870a2ea9 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
@@ -292,8 +292,8 @@ private slots:
void updateCurrentSnippetDependent(const QModelIndex &modelIndex = QModelIndex());
private:
- SnippetEditor *currentEditor() const;
- SnippetEditor *editorAt(int i) const;
+ SnippetEditorWidget *currentEditor() const;
+ SnippetEditorWidget *editorAt(int i) const;
void loadSettings();
bool settingsChanged() const;
@@ -317,14 +317,14 @@ SnippetsSettingsPagePrivate::SnippetsSettingsPagePrivate(const QString &id) :
m_snippetsCollectionChanged(false)
{}
-SnippetEditor *SnippetsSettingsPagePrivate::currentEditor() const
+SnippetEditorWidget *SnippetsSettingsPagePrivate::currentEditor() const
{
return editorAt(m_ui.snippetsEditorStack->currentIndex());
}
-SnippetEditor *SnippetsSettingsPagePrivate::editorAt(int i) const
+SnippetEditorWidget *SnippetsSettingsPagePrivate::editorAt(int i) const
{
- return static_cast<SnippetEditor *>(m_ui.snippetsEditorStack->widget(i));
+ return static_cast<SnippetEditorWidget *>(m_ui.snippetsEditorStack->widget(i));
}
void SnippetsSettingsPagePrivate::configureUi(QWidget *w)
@@ -335,7 +335,7 @@ void SnippetsSettingsPagePrivate::configureUi(QWidget *w)
ExtensionSystem::PluginManager::instance()->getObjects<ISnippetProvider>();
foreach (ISnippetProvider *provider, providers) {
m_ui.groupCombo->addItem(provider->displayName(), provider->groupId());
- SnippetEditor *snippetEditor = new SnippetEditor(w);
+ SnippetEditorWidget *snippetEditor = new SnippetEditorWidget(w);
provider->decorateEditor(snippetEditor);
m_ui.snippetsEditorStack->insertWidget(m_ui.groupCombo->count() - 1, snippetEditor);
connect(snippetEditor, SIGNAL(snippetContentChanged()), this, SLOT(setSnippetContent()));