Removed CPPEditorActionHandler

Didn't add anything to the TextEditorActionHandler.

src/plugins/cppeditor/cppeditor.pro

@@ -8,7 +8,6 @@ include(../../qworkbenchplugin.pri)
 include(cppeditor_dependencies.pri)
 HEADERS += cppplugin.h \
     cppeditor.h \
-    cppeditoractionhandler.h \
     cpphighlighter.h \
     cpphoverhandler.h \
     cppfilewizard.h \
@@ -16,13 +15,10 @@ HEADERS += cppplugin.h \
     cppeditorenums.h \
     cppeditor_global.h \
     cppclasswizard.h
-
 SOURCES += cppplugin.cpp \
-    cppeditoractionhandler.cpp \
     cppeditor.cpp \
     cpphighlighter.cpp \
     cpphoverhandler.cpp \
     cppfilewizard.cpp \
     cppclasswizard.cpp
-
 RESOURCES += cppeditor.qrc

src/plugins/cppeditor/cppeditoractionhandler.cpp

-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact:  Qt Software Information (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-**
-**************************************************************************/
-
-#include "cppeditoractionhandler.h"
-#include "cppeditorconstants.h"
-#include "cppeditor.h"
-#include <QAction>
-
-using namespace CppEditor::Internal;
-
-CPPEditorActionHandler::CPPEditorActionHandler(const QString &context,
-                                               uint optionalActions)
-    : TextEditor::TextEditorActionHandler(context, optionalActions)
-{ }
-
-CPPEditorActionHandler::~CPPEditorActionHandler()
-{ }
-
-void CPPEditorActionHandler::createActions()
-{
-    TextEditor::TextEditorActionHandler::createActions();
-}
-
-void CPPEditorActionHandler::updateActions(UpdateMode um)
-{
-    TextEditor::TextEditorActionHandler::updateActions(um);
-}

src/plugins/cppeditor/cppeditoractionhandler.h

-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact:  Qt Software Information (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-**
-**************************************************************************/
-
-#ifndef CPPEDITORACTIONHANDLER_H
-#define CPPEDITORACTIONHANDLER_H
-
-#include <texteditor/texteditoractionhandler.h>
-
-namespace CppEditor {
-namespace Internal {
-
-class CPPEditorActionHandler : public TextEditor::TextEditorActionHandler
-{
-    Q_OBJECT
-
-public:
-    CPPEditorActionHandler(const QString &context,
-                           uint optionalActions = None);
-    virtual ~CPPEditorActionHandler();
-
-    using TextEditor::TextEditorActionHandler::updateActions;
-
-protected:
-    virtual void createActions();
-    virtual void updateActions(UpdateMode um);
-};
-
-} // namespace Internal
-} // namespace CppEditor
-
-#endif // CPPEDITORACTIONHANDLER_H

src/plugins/cppeditor/cppplugin.cpp

@@ -30,7 +30,6 @@
 #include "cppplugin.h"
 #include "cppclasswizard.h"
 #include "cppeditor.h"
-#include "cppeditoractionhandler.h"
 #include "cppeditorconstants.h"
 #include "cppeditorenums.h"
 #include "cppfilewizard.h"
@@ -47,6 +46,7 @@
 #include <texteditor/completionsupport.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/storagesettings.h>
+#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorsettings.h>
 #include <cpptools/cpptoolsconstants.h>
 
@@ -207,7 +207,7 @@ bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMess
     am->actionContainer(CppEditor::Constants::M_CONTEXT)->addAction(cmd);
     am->actionContainer(CppTools::Constants::M_TOOLS_CPP)->addAction(cmd);
 
-    m_actionHandler = new CPPEditorActionHandler(CppEditor::Constants::C_CPPEDITOR,
+    m_actionHandler = new TextEditor::TextEditorActionHandler(CppEditor::Constants::C_CPPEDITOR,
         TextEditor::TextEditorActionHandler::Format
         | TextEditor::TextEditorActionHandler::UnCommentSelection
         | TextEditor::TextEditorActionHandler::UnCollapseAll);

src/plugins/cppeditor/cppplugin.h

@@ -44,7 +44,6 @@ namespace CppEditor {
 namespace Internal {
 
 class CPPEditor;
-class CPPEditorActionHandler;
 class CppPluginEditorFactory;
 
 class CppPlugin : public ExtensionSystem::IPlugin
@@ -73,7 +72,7 @@ private:
 
     static CppPlugin *m_instance;
 
-    CPPEditorActionHandler *m_actionHandler;
+    TextEditor::TextEditorActionHandler *m_actionHandler;
     CppPluginEditorFactory *m_factory;
 };