diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index c46980d296c..31e4fe0d5a9 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -222,33 +222,8 @@ void CppEditorWidget::ctor()
             this, SLOT(onLocalRenamingFinished()));
     connect(&d->m_localRenaming, SIGNAL(processKeyPressNormally(QKeyEvent*)),
             this, SLOT(onLocalRenamingProcessKeyPressNormally(QKeyEvent*)));
-}
 
-CppEditorWidget::~CppEditorWidget()
-{
-    if (d->m_modelManager)
-        d->m_modelManager->deleteCppEditorSupport(editor());
-}
-
-CPPEditorDocument *CppEditorWidget::cppEditorDocument() const
-{
-    return d->m_cppEditorDocument;
-}
-
-CppEditorOutline *CppEditorWidget::outline() const
-{
-    return d->m_cppEditorOutline;
-}
-
-TextEditor::BaseTextEditor *CppEditorWidget::createEditor()
-{
-    CPPEditor *editable = new CPPEditor(this);
-    createToolBar(editable);
-    return editable;
-}
-
-void CppEditorWidget::createToolBar(CPPEditor *editor)
-{
+    // Tool bar creation
     d->m_updateUsesTimer = newSingleShotTimer(this, UPDATE_USES_INTERVAL);
     connect(d->m_updateUsesTimer, SIGNAL(timeout()), this, SLOT(updateUsesNow()));
 
@@ -281,6 +256,27 @@ void CppEditorWidget::createToolBar(CPPEditor *editor)
     insertExtraToolBarWidget(TextEditor::BaseTextEditorWidget::Left, d->m_cppEditorOutline->widget());
 }
 
+CppEditorWidget::~CppEditorWidget()
+{
+    if (d->m_modelManager)
+        d->m_modelManager->deleteCppEditorSupport(editor());
+}
+
+CPPEditorDocument *CppEditorWidget::cppEditorDocument() const
+{
+    return d->m_cppEditorDocument;
+}
+
+CppEditorOutline *CppEditorWidget::outline() const
+{
+    return d->m_cppEditorOutline;
+}
+
+TextEditor::BaseTextEditor *CppEditorWidget::createEditor()
+{
+    return new CPPEditor(this);
+}
+
 void CppEditorWidget::paste()
 {
     if (d->m_localRenaming.handlePaste())
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index 28b9fb7ee5e..d9387629167 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -157,8 +157,6 @@ private:
     CppEditorWidget(TextEditor::BaseTextEditorWidget *); // avoid stupidity
     void ctor();
 
-    void createToolBar(CPPEditor *editable);
-
     unsigned editorRevision() const;
     bool isOutdated() const;