diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2011-08-16 10:45:23 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@nokia.com> | 2011-09-23 10:23:15 +0200 |
| commit | 224491182666840def3a551a840c8fa840bfe5c2 (patch) | |
| tree | 0c75ae3cc76819f373c1642ffd598e57568dac54 /src/plugins/cpptools/cpptoolsplugin.cpp | |
| parent | 3955df7855c9d27d8d470f509578bd9004b72ea1 (diff) | |
| download | qt-creator-224491182666840def3a551a840c8fa840bfe5c2.tar.gz | |
Implement Code Style schemes
Task-number: QTCREATORBUG-5092
Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07
Reviewed-on: http://codereview.qt-project.org/5160
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 86484822ef..51a72835b1 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -43,8 +43,6 @@ #include "symbolsfindfilter.h" #include "cppcompletionassist.h" #include "cpptoolssettings.h" -#include "cppcodestylesettingsfactory.h" -#include "cppcodestylesettings.h" #include <extensionsystem/pluginmanager.h> @@ -59,9 +57,6 @@ #include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/vcsmanager.h> #include <coreplugin/filemanager.h> -#include <texteditor/texteditorsettings.h> -#include <texteditor/tabsettings.h> -#include <texteditor/codestylepreferencesmanager.h> #include <cppeditor/cppeditorconstants.h> #include <QtCore/QtConcurrentRun> @@ -107,8 +102,6 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error) Q_UNUSED(arguments) Q_UNUSED(error) - qRegisterMetaType<CppTools::CppCodeStyleSettings>("CppTools::CppCodeStyleSettings"); - Core::ICore *core = Core::ICore::instance(); Core::ActionManager *am = core->actionManager(); @@ -134,9 +127,6 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error) addAutoReleasedObject(new SymbolsFindFilter(m_modelManager)); addAutoReleasedObject(new CppCodeStyleSettingsPage); - TextEditor::CodeStylePreferencesManager::instance()->registerFactory( - new CppTools::CppCodeStylePreferencesFactory()); - // Menus Core::ActionContainer *mtools = am->actionContainer(Core::Constants::M_TOOLS); Core::ActionContainer *mcpptools = am->createMenu(CppTools::Constants::M_TOOLS_CPP); @@ -154,12 +144,6 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error) mcpptools->addAction(command); connect(switchAction, SIGNAL(triggered()), this, SLOT(switchHeaderSource())); - TextEditor::TextEditorSettings *ts = TextEditor::TextEditorSettings::instance(); - ts->registerMimeTypeForLanguageId(QLatin1String(Constants::C_SOURCE_MIMETYPE), Constants::CPP_SETTINGS_ID); - ts->registerMimeTypeForLanguageId(QLatin1String(Constants::C_HEADER_MIMETYPE), Constants::CPP_SETTINGS_ID); - ts->registerMimeTypeForLanguageId(QLatin1String(Constants::CPP_SOURCE_MIMETYPE), Constants::CPP_SETTINGS_ID); - ts->registerMimeTypeForLanguageId(QLatin1String(Constants::CPP_HEADER_MIMETYPE), Constants::CPP_SETTINGS_ID); - return true; } |