summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-08-28 11:34:19 +0200
committerhjk <hjk121@nokiamail.com>2014-08-28 17:36:36 +0200
commit12642cc49a37e50eb3b099bfd34c28e6259b7526 (patch)
treec6f444c1acfe2d662506c9c77b0a10289eb4da26 /src
parent761f8de751e0d52105dba3df7473f10c0a884e45 (diff)
downloadqt-creator-12642cc49a37e50eb3b099bfd34c28e6259b7526.tar.gz
TextEditor: Remove some *Widget::createEditor implementation
This removes the ones that were not to be used anymore. The fallback in the base class is left in for now. Change-Id: I5e7ab16497a83eff9b11deb9e1feb390757eac0e Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeeditor.cpp6
-rw-r--r--src/plugins/cppeditor/cppeditor.cpp5
-rw-r--r--src/plugins/cppeditor/cppeditor.h1
-rw-r--r--src/plugins/designer/designerxmleditorwidget.cpp5
-rw-r--r--src/plugins/designer/designerxmleditorwidget.h3
-rw-r--r--src/plugins/glsleditor/glsleditor.cpp7
-rw-r--r--src/plugins/pythoneditor/pythoneditor.cpp9
-rw-r--r--src/plugins/qmakeprojectmanager/profileeditor.cpp6
-rw-r--r--src/plugins/qmljseditor/qmljseditor.cpp5
-rw-r--r--src/plugins/qmljseditor/qmljseditor.h1
-rw-r--r--src/plugins/texteditor/snippets/snippeteditor.cpp5
-rw-r--r--src/plugins/texteditor/snippets/snippeteditor.h1
-rw-r--r--src/plugins/vcsbase/vcsbaseeditor.cpp5
-rw-r--r--src/plugins/vcsbase/vcsbaseeditor.h2
14 files changed, 2 insertions, 59 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
index c13e9a5435..3b8b584a4e 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
@@ -155,7 +155,6 @@ public:
private:
bool save(const QString &fileName = QString());
Link findLinkAt(const QTextCursor &cursor, bool resolveTarget = true, bool inNextSplit = false);
- BaseTextEditor *createEditor();
void contextMenuEvent(QContextMenuEvent *e);
};
@@ -164,11 +163,6 @@ CMakeEditorWidget::CMakeEditorWidget()
setCodeFoldingSupported(true);
}
-BaseTextEditor *CMakeEditorWidget::createEditor()
-{
- QTC_ASSERT("should not happen anymore" && false, return 0);
-}
-
void CMakeEditorWidget::contextMenuEvent(QContextMenuEvent *e)
{
showDefaultContextMenu(e, Constants::M_CONTEXT);
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 0770bf8895..7ca2d32cd6 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -250,11 +250,6 @@ CppEditorOutline *CppEditorWidget::outline() const
return d->m_cppEditorOutline;
}
-TextEditor::BaseTextEditor *CppEditorWidget::createEditor()
-{
- QTC_ASSERT("should not happen anymore" && false, return 0);
-}
-
void CppEditorWidget::paste()
{
if (d->m_localRenaming.handlePaste())
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index aa112980b1..4a22d1ec98 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -109,7 +109,6 @@ protected:
void keyPressEvent(QKeyEvent *e) QTC_OVERRIDE;
void applyFontSettings() QTC_OVERRIDE;
- TextEditor::BaseTextEditor *createEditor() QTC_OVERRIDE;
bool openLink(const Link &link, bool inNextSplit) QTC_OVERRIDE
{ return openCppEditorAt(link, inNextSplit); }
diff --git a/src/plugins/designer/designerxmleditorwidget.cpp b/src/plugins/designer/designerxmleditorwidget.cpp
index b5fa519690..3cc41addc6 100644
--- a/src/plugins/designer/designerxmleditorwidget.cpp
+++ b/src/plugins/designer/designerxmleditorwidget.cpp
@@ -49,11 +49,6 @@ DesignerXmlEditorWidget::DesignerXmlEditorWidget(QDesignerFormWindowInterface *f
configureMimeType(doc->mimeType());
}
-TextEditor::BaseTextEditor *DesignerXmlEditorWidget::createEditor()
-{
- QTC_ASSERT("should not happen anymore" && false, return 0);
-}
-
FormWindowEditor *DesignerXmlEditorWidget::designerEditor() const
{
return qobject_cast<FormWindowEditor *>(editor());
diff --git a/src/plugins/designer/designerxmleditorwidget.h b/src/plugins/designer/designerxmleditorwidget.h
index 498be05003..c66872994b 100644
--- a/src/plugins/designer/designerxmleditorwidget.h
+++ b/src/plugins/designer/designerxmleditorwidget.h
@@ -61,9 +61,6 @@ public:
FormWindowEditor *designerEditor() const;
Internal::FormWindowFile *formWindowFile() const;
-
-protected:
- virtual TextEditor::BaseTextEditor *createEditor();
};
} // Internal
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index 48e2faec4a..cdd9888096 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -125,8 +125,6 @@ public:
IAssistInterface *createAssistInterface(AssistKind assistKind, AssistReason reason) const;
private:
- BaseTextEditor *createEditor();
-
void updateDocumentNow();
void setSelectedElements();
QString wordUnderCursor() const;
@@ -210,11 +208,6 @@ QString GlslEditorWidget::wordUnderCursor() const
return word;
}
-BaseTextEditor *GlslEditorWidget::createEditor()
-{
- QTC_ASSERT("should not happen anymore" && false, return 0);
-}
-
void GlslEditorWidget::updateDocumentNow()
{
m_updateDocumentTimer.stop();
diff --git a/src/plugins/pythoneditor/pythoneditor.cpp b/src/plugins/pythoneditor/pythoneditor.cpp
index 1f05378866..96be07bc01 100644
--- a/src/plugins/pythoneditor/pythoneditor.cpp
+++ b/src/plugins/pythoneditor/pythoneditor.cpp
@@ -57,7 +57,7 @@ namespace Internal {
// PythonEditor
//
-class PythonEditor : public TextEditor::BaseTextEditor
+class PythonEditor : public BaseTextEditor
{
public:
PythonEditor()
@@ -80,7 +80,7 @@ public:
// PythonEditorWidget
//
-class PythonEditorWidget : public TextEditor::BaseTextEditorWidget
+class PythonEditorWidget : public BaseTextEditorWidget
{
public:
PythonEditorWidget()
@@ -89,11 +89,6 @@ public:
setMarksVisible(true);
setCodeFoldingSupported(true);
}
-
- TextEditor::BaseTextEditor *createEditor()
- {
- QTC_ASSERT("should not happen anymore" && false, return 0);
- }
};
diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp
index 47dac06826..4b63db0bee 100644
--- a/src/plugins/qmakeprojectmanager/profileeditor.cpp
+++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp
@@ -79,7 +79,6 @@ public:
protected:
virtual Link findLinkAt(const QTextCursor &, bool resolveTarget = true,
bool inNextSplit = false);
- BaseTextEditor *createEditor();
void contextMenuEvent(QContextMenuEvent *);
};
@@ -171,11 +170,6 @@ ProFileEditorWidget::Link ProFileEditorWidget::findLinkAt(const QTextCursor &cur
return link;
}
-BaseTextEditor *ProFileEditorWidget::createEditor()
-{
- QTC_ASSERT("should not happen anymore" && false, return 0);
-}
-
void ProFileEditorWidget::contextMenuEvent(QContextMenuEvent *e)
{
showDefaultContextMenu(e, Constants::M_CONTEXT);
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 179b59d1d6..75bed88a6b 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -526,11 +526,6 @@ bool QmlJSEditorWidget::isClosingBrace(const QList<Token> &tokens) const
return false;
}
-BaseTextEditor *QmlJSEditorWidget::createEditor()
-{
- QTC_ASSERT("should not happen anymore" && false, return 0);
-}
-
void QmlJSEditorWidget::createToolBar()
{
m_outlineCombo = new QComboBox;
diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h
index aed1159aaa..8f89e4f88b 100644
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -105,7 +105,6 @@ protected:
void resizeEvent(QResizeEvent *event);
void scrollContentsBy(int dx, int dy);
void applyFontSettings();
- TextEditor::BaseTextEditor *createEditor();
void createToolBar();
TextEditor::BaseTextEditorWidget::Link findLinkAt(const QTextCursor &cursor,
bool resolveTarget = true,
diff --git a/src/plugins/texteditor/snippets/snippeteditor.cpp b/src/plugins/texteditor/snippets/snippeteditor.cpp
index 3d4dbe17d9..eae0b91be1 100644
--- a/src/plugins/texteditor/snippets/snippeteditor.cpp
+++ b/src/plugins/texteditor/snippets/snippeteditor.cpp
@@ -73,9 +73,4 @@ void SnippetEditorWidget::focusOutEvent(QFocusEvent *event)
BaseTextEditorWidget::focusOutEvent(event);
}
-BaseTextEditor *SnippetEditorWidget::createEditor()
-{
- QTC_ASSERT("should not happen anymore" && false, return 0);
-}
-
} // namespace
diff --git a/src/plugins/texteditor/snippets/snippeteditor.h b/src/plugins/texteditor/snippets/snippeteditor.h
index 1378129a18..21f6f7bcbb 100644
--- a/src/plugins/texteditor/snippets/snippeteditor.h
+++ b/src/plugins/texteditor/snippets/snippeteditor.h
@@ -49,7 +49,6 @@ protected:
virtual void focusOutEvent(QFocusEvent *event);
virtual int extraAreaWidth(int * /* markWidthPtr */ = 0) const { return 0; }
- virtual BaseTextEditor *createEditor();
};
} // namespace TextEditor
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 85ac3e362c..caa3e70b0e 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -827,11 +827,6 @@ bool VcsBaseEditorWidget::isModified() const
return false;
}
-BaseTextEditor *VcsBaseEditorWidget::createEditor()
-{
- QTC_ASSERT("should not happen anymore" && false, return 0);
-}
-
void VcsBaseEditorWidget::slotPopulateDiffBrowser()
{
QComboBox *entriesComboBox = d->entriesComboBox();
diff --git a/src/plugins/vcsbase/vcsbaseeditor.h b/src/plugins/vcsbase/vcsbaseeditor.h
index de3b920526..3470bebd16 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.h
+++ b/src/plugins/vcsbase/vcsbaseeditor.h
@@ -226,8 +226,6 @@ public slots:
void reportCommandFinished(bool ok, int exitCode, const QVariant &data);
protected:
- virtual TextEditor::BaseTextEditor *createEditor();
-
void contextMenuEvent(QContextMenuEvent *e);
void mouseMoveEvent(QMouseEvent *e);
void mouseReleaseEvent(QMouseEvent *e);