diff options
| author | hjk <qtc-committer@nokia.com> | 2010-06-25 17:48:35 +0200 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2010-06-25 17:48:35 +0200 |
| commit | 46e55681a578cf7bb5a0fcd182aa0ee4fb705fbf (patch) | |
| tree | 6cc6093fde5b9b0130d6865b684646c7422d98df | |
| parent | a0d86cd60a339bb7dc54a77ba68f600fe8f48d2b (diff) | |
| download | qt-creator-46e55681a578cf7bb5a0fcd182aa0ee4fb705fbf.tar.gz | |
remove unneeded #includes
| -rw-r--r-- | src/plugins/coreplugin/editmode.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/coreplugin/editormanager/editorsplitter.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/coreplugin/progressmanager/progressmanager.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/coreplugin/statusbarmanager.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/cppeditor/cppplugin.cpp | 1 |
5 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp index 1c2dc8e267..2470c4f4d6 100644 --- a/src/plugins/coreplugin/editmode.cpp +++ b/src/plugins/coreplugin/editmode.cpp @@ -31,7 +31,6 @@ #include "editormanager.h" #include "coreconstants.h" #include "modemanager.h" -#include "uniqueidmanager.h" #include "minisplitter.h" #include "findplaceholder.h" #include "outputpane.h" diff --git a/src/plugins/coreplugin/editormanager/editorsplitter.cpp b/src/plugins/coreplugin/editormanager/editorsplitter.cpp index ccf3409c50..53d3f95c11 100644 --- a/src/plugins/coreplugin/editormanager/editorsplitter.cpp +++ b/src/plugins/coreplugin/editormanager/editorsplitter.cpp @@ -35,7 +35,6 @@ #include "minisplitter.h" #include "openeditorswindow.h" #include "stackededitorgroup.h" -#include "uniqueidmanager.h" #include "actionmanager/actionmanager.h" #include <utils/qtcassert.h> @@ -62,9 +61,8 @@ EditorSplitter::~EditorSplitter() void EditorSplitter::registerActions() { - QList<int> gc = QList<int>() << Constants::C_GLOBAL_ID; - const QList<int> editorManagerContext = - QList<int>() << ICore::instance()->uniqueIDManager()->uniqueIdentifier(Constants::C_EDITORMANAGER); + const Context gc(Constants::C_GLOBAL_ID); + const Context editorManagerContext(Constants::C_EDITORMANAGER); ActionManager *am = ICore::instance()->actionManager(); ActionContainer *mwindow = am->actionContainer(Constants::M_WINDOW); diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp index 4b85487382..022a8760e7 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp @@ -31,7 +31,6 @@ #include "progressview.h" #include "coreconstants.h" #include "icore.h" -#include "uniqueidmanager.h" #include <utils/qtcassert.h> diff --git a/src/plugins/coreplugin/statusbarmanager.cpp b/src/plugins/coreplugin/statusbarmanager.cpp index 1849d81595..d99dfa7e1d 100644 --- a/src/plugins/coreplugin/statusbarmanager.cpp +++ b/src/plugins/coreplugin/statusbarmanager.cpp @@ -31,7 +31,6 @@ #include "coreconstants.h" #include "mainwindow.h" -#include "uniqueidmanager.h" #include "statusbarwidget.h" #include <coreplugin/actionmanager/actionmanager.h> diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp index f9f1de8d40..80daa5b0ea 100644 --- a/src/plugins/cppeditor/cppplugin.cpp +++ b/src/plugins/cppeditor/cppplugin.cpp @@ -39,7 +39,6 @@ #include <coreplugin/icore.h> #include <coreplugin/coreconstants.h> #include <coreplugin/mimedatabase.h> -#include <coreplugin/uniqueidmanager.h> #include <coreplugin/fileiconprovider.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> |