diff options
78 files changed, 83 insertions, 82 deletions
diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp index 34ed66b9a1..7d5c9cf919 100644 --- a/src/plugins/analyzerbase/analyzermanager.cpp +++ b/src/plugins/analyzerbase/analyzermanager.cpp @@ -51,7 +51,7 @@ #include <coreplugin/navigationwidget.h> #include <coreplugin/outputpane.h> #include <coreplugin/rightpane.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 5c5932ab7b..dd788de262 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -46,7 +46,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/vcsmanager.h> #include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index ece27b9ccb..5498b0d8e6 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -54,7 +54,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/coreconstants.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/icore.h> diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp index e8f0d6d1a4..d7e891b932 100644 --- a/src/plugins/bookmarks/bookmarksplugin.cpp +++ b/src/plugins/bookmarks/bookmarksplugin.cpp @@ -41,7 +41,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <extensionsystem/pluginmanager.h> #include <texteditor/itexteditor.h> #include <texteditor/texteditorconstants.h> diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index fba0bb99d8..b35abef64d 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -39,7 +39,7 @@ #include <utils/qtcprocess.h> #include <coreplugin/icore.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/actioncontainer.h> diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp index 5f444e30c1..453d28dc52 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp @@ -36,7 +36,7 @@ #include "command_p.h" #include "coreconstants.h" -#include "uniqueidmanager.h" +#include "id.h" #include <utils/qtcassert.h> diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index b428616007..43a2efcf2d 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -34,7 +34,7 @@ #include "mainwindow.h" #include "actioncontainer_p.h" #include "command_p.h" -#include "uniqueidmanager.h" +#include "id.h" #include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h index f8de338168..5cfbf95b60 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager.h @@ -34,7 +34,7 @@ #define ACTIONMANAGER_H #include "coreplugin/core_global.h" -#include "coreplugin/uniqueidmanager.h" +#include "coreplugin/id.h" #include <coreplugin/actionmanager/command.h> #include "coreplugin/icontext.h" diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp index 8749e2973c..9bc5d38646 100644 --- a/src/plugins/coreplugin/actionmanager/command.cpp +++ b/src/plugins/coreplugin/actionmanager/command.cpp @@ -34,7 +34,7 @@ #include "icore.h" #include "icontext.h" -#include "uniqueidmanager.h" +#include "id.h" #include <QtCore/QDebug> #include <QtCore/QTextStream> diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp index f7d69a643d..cbc4006cb6 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp +++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp @@ -39,7 +39,7 @@ #include "coreconstants.h" #include "filemanager.h" #include "icore.h" -#include "uniqueidmanager.h" +#include "id.h" #include <utils/treewidgetcolumnstretcher.h> diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp index f504e38b03..63c927942d 100644 --- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp +++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp @@ -36,7 +36,7 @@ #include <app/app_version.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <utils/qtcassert.h> diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index 1c059adfb3..1ad6a685d6 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -22,7 +22,7 @@ SOURCES += mainwindow.cpp \ fancytabwidget.cpp \ generalsettings.cpp \ filemanager.cpp \ - uniqueidmanager.cpp \ + id.cpp \ messagemanager.cpp \ messageoutputwindow.cpp \ outputpane.cpp \ @@ -101,7 +101,7 @@ HEADERS += mainwindow.h \ fancytabwidget.h \ generalsettings.h \ filemanager.h \ - uniqueidmanager.h \ + id.h \ messagemanager.h \ messageoutputwindow.h \ outputpane.h \ diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index 8c6c104164..351b36a81e 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -38,7 +38,7 @@ #include "coreconstants.h" #include "filemanager.h" #include "icore.h" -#include "uniqueidmanager.h" +#include "id.h" #include <utils/treewidgetcolumnstretcher.h> diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 705c389b82..53bb2319b2 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -57,7 +57,7 @@ #include <coreplugin/imode.h> #include <coreplugin/settingsdatabase.h> #include <coreplugin/variablemanager.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/fileutils.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp index 1b3b3c978f..b8e6e19713 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp @@ -39,7 +39,7 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/filemanager.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/actionmanager/actionmanager.h> #include <utils/qtcassert.h> diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp index 76a9ad4855..7aabe29bc8 100644 --- a/src/plugins/coreplugin/editortoolbar.cpp +++ b/src/plugins/coreplugin/editortoolbar.cpp @@ -37,7 +37,7 @@ #include <coreplugin/icore.h> #include <coreplugin/minisplitter.h> #include <coreplugin/sidebar.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/editormanager/editorview.h> #include <coreplugin/editormanager/editormanager.h> diff --git a/src/plugins/coreplugin/uniqueidmanager.cpp b/src/plugins/coreplugin/id.cpp index dc5e1e1667..32b7d4ac8f 100644 --- a/src/plugins/coreplugin/uniqueidmanager.cpp +++ b/src/plugins/coreplugin/id.cpp @@ -30,7 +30,7 @@ ** **************************************************************************/ -#include "uniqueidmanager.h" +#include "id.h" #include "coreconstants.h" #include "icontext.h" diff --git a/src/plugins/coreplugin/uniqueidmanager.h b/src/plugins/coreplugin/id.h index fbf78c2b96..8c4235bbb7 100644 --- a/src/plugins/coreplugin/uniqueidmanager.h +++ b/src/plugins/coreplugin/id.h @@ -30,8 +30,8 @@ ** **************************************************************************/ -#ifndef UNIQUEIDMANAGER_H -#define UNIQUEIDMANAGER_H +#ifndef CORE_ID_H +#define CORE_ID_H #include "core_global.h" @@ -39,6 +39,7 @@ namespace Core { +// FIXME: Make this a wrapper around an int, not around a QByteArray. class CORE_EXPORT Id { public: @@ -60,8 +61,8 @@ private: QByteArray m_name; }; -uint qHash(const Id &id); +CORE_EXPORT uint qHash(const Id &id); } // namespace Core -#endif // UNIQUEIDMANAGER_H +#endif // CORE_ID_H diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 95f0e31046..c6d243f47e 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -64,7 +64,7 @@ #include "variablemanager.h" #include "versiondialog.h" #include "statusbarmanager.h" -#include "uniqueidmanager.h" +#include "id.h" #include "manhattanstyle.h" #include "navigationwidget.h" #include "rightpane.h" diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp index 9bfc9e03f3..43dd6ac5f0 100644 --- a/src/plugins/coreplugin/modemanager.cpp +++ b/src/plugins/coreplugin/modemanager.cpp @@ -43,7 +43,7 @@ #include <coreplugin/actionmanager/command.h> #include <coreplugin/coreconstants.h> #include <coreplugin/imode.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/coreplugin/navigationsubwidget.cpp b/src/plugins/coreplugin/navigationsubwidget.cpp index a41e2e4df2..69bf911b66 100644 --- a/src/plugins/coreplugin/navigationsubwidget.cpp +++ b/src/plugins/coreplugin/navigationsubwidget.cpp @@ -40,7 +40,7 @@ #include "modemanager.h" #include "actionmanager/actionmanager.h" #include "actionmanager/command.h" -#include "uniqueidmanager.h" +#include "id.h" #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp index 7e9354c077..fe7e5f7979 100644 --- a/src/plugins/coreplugin/navigationwidget.cpp +++ b/src/plugins/coreplugin/navigationwidget.cpp @@ -39,7 +39,7 @@ #include "modemanager.h" #include "actionmanager/actionmanager.h" #include "actionmanager/command.h" -#include "uniqueidmanager.h" +#include "id.h" #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index eb40083d38..782a64914b 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -47,7 +47,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/findplaceholder.h> #include <coreplugin/editormanager/ieditor.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index e8eb1e7fb3..205bf46241 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -45,7 +45,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/coreconstants.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/mimedatabase.h> diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 1940e1197a..7fa66457c1 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -73,7 +73,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/mimedatabase.h> diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp index eb4bb5d429..024d7961c2 100644 --- a/src/plugins/cppeditor/cppplugin.cpp +++ b/src/plugins/cppeditor/cppplugin.cpp @@ -49,7 +49,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/navigationwidget.h> diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 1cc5cab5ce..86484822ef 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -54,7 +54,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/vcsmanager.h> diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 9d5255c3ff..84df2acee9 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -56,7 +56,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/vcsmanager.h> #include <utils/stringutils.h> diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index 0c3d59f5bf..52486500e0 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -40,7 +40,7 @@ #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/imode.h> #include <coreplugin/coreconstants.h> #include <coreplugin/editormanager/editormanager.h> diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 89a6a06f83..fca7ed6a0b 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -70,7 +70,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/imode.h> #include <coreplugin/coreconstants.h> #include <coreplugin/dialogs/ioptionspage.h> diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index 8ed5ef828b..fb2b322739 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/src/plugins/designer/formeditorplugin.cpp @@ -47,7 +47,7 @@ #include <coreplugin/icore.h> #include <coreplugin/mimedatabase.h> #include <coreplugin/coreconstants.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <extensionsystem/pluginmanager.h> #include <QtCore/QDebug> diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index 7bb9c56c63..e532a1a80f 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -52,7 +52,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/minisplitter.h> #include <coreplugin/mimedatabase.h> diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 224cb94fcf..a47e5e883c 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -48,7 +48,7 @@ #include <coreplugin/icore.h> #include <coreplugin/ifile.h> #include <coreplugin/messagemanager.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/statusbarwidget.h> #include <coreplugin/statusbarmanager.h> diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp index 6ed68e9bf5..3eb6365713 100644 --- a/src/plugins/find/findplugin.cpp +++ b/src/plugins/find/findplugin.cpp @@ -45,7 +45,7 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> #include <coreplugin/icontext.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp index 7e88eccadb..64a4da2b34 100644 --- a/src/plugins/find/findtoolbar.cpp +++ b/src/plugins/find/findtoolbar.cpp @@ -41,7 +41,7 @@ #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> #include <coreplugin/findplaceholder.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp index c5a622d7bc..d2cc7d94f8 100644 --- a/src/plugins/find/searchresultwindow.cpp +++ b/src/plugins/find/searchresultwindow.cpp @@ -43,7 +43,7 @@ #include <coreplugin/actionmanager/command.h> #include <coreplugin/coreconstants.h> #include <coreplugin/icontext.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <utils/qtcassert.h> #include <QtCore/QFile> diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 89725158a5..5cd1f9bf48 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -46,7 +46,7 @@ #include <coreplugin/icore.h> #include <coreplugin/messagemanager.h> #include <coreplugin/progressmanager/progressmanager.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/filemanager.h> #include <coreplugin/iversioncontrol.h> diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index c157dabd60..57f7b8b76d 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -52,7 +52,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/filemanager.h> diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp index b6d1f32856..81bb7ab966 100644 --- a/src/plugins/glsleditor/glsleditor.cpp +++ b/src/plugins/glsleditor/glsleditor.cpp @@ -47,7 +47,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/actionmanager/command.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/icore.h> diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp index 76e082ad0e..3907e5a0ec 100644 --- a/src/plugins/glsleditor/glsleditorplugin.cpp +++ b/src/plugins/glsleditor/glsleditorplugin.cpp @@ -41,7 +41,7 @@ #include <coreplugin/icore.h> #include <coreplugin/coreconstants.h> #include <coreplugin/mimedatabase.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/fileiconprovider.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> diff --git a/src/plugins/helloworld/helloworldplugin.cpp b/src/plugins/helloworld/helloworldplugin.cpp index a21d73f673..905df9d0c7 100644 --- a/src/plugins/helloworld/helloworldplugin.cpp +++ b/src/plugins/helloworld/helloworldplugin.cpp @@ -38,7 +38,7 @@ #include <coreplugin/icore.h> #include <coreplugin/imode.h> #include <coreplugin/modemanager.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <QtCore/QDebug> #include <QtCore/QtPlugin> diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index c10acf2932..d8a160be4e 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -55,7 +55,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/coreconstants.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> diff --git a/src/plugins/imageviewer/imagevieweractionhandler.cpp b/src/plugins/imageviewer/imagevieweractionhandler.cpp index 3f532e5322..88722201a7 100644 --- a/src/plugins/imageviewer/imagevieweractionhandler.cpp +++ b/src/plugins/imageviewer/imagevieweractionhandler.cpp @@ -43,7 +43,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> #include <coreplugin/editormanager/editormanager.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> namespace ImageViewer { namespace Internal { diff --git a/src/plugins/imageviewer/imagevieweractionhandler.h b/src/plugins/imageviewer/imagevieweractionhandler.h index ff18b707b7..177703f67b 100644 --- a/src/plugins/imageviewer/imagevieweractionhandler.h +++ b/src/plugins/imageviewer/imagevieweractionhandler.h @@ -34,7 +34,7 @@ #ifndef IMAGEVIEWERACTIONHANDLER_H #define IMAGEVIEWERACTIONHANDLER_H -#include "coreplugin/uniqueidmanager.h" +#include "coreplugin/id.h" #include <QtCore/QObject> #include <QtCore/QScopedPointer> diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp index a33e17f200..ad4f7c5f2a 100644 --- a/src/plugins/imageviewer/imageviewerfile.cpp +++ b/src/plugins/imageviewer/imageviewerfile.cpp @@ -35,7 +35,7 @@ #include "imageviewer.h" #include <coreplugin/icore.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <utils/reloadpromptutils.h> diff --git a/src/plugins/imageviewer/imageviewerplugin.cpp b/src/plugins/imageviewer/imageviewerplugin.cpp index 09595f0a17..644830bd21 100644 --- a/src/plugins/imageviewer/imageviewerplugin.cpp +++ b/src/plugins/imageviewer/imageviewerplugin.cpp @@ -39,7 +39,7 @@ #include <coreplugin/icore.h> #include <coreplugin/mimedatabase.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <extensionsystem/pluginmanager.h> namespace ImageViewer { diff --git a/src/plugins/locator/locatorplugin.cpp b/src/plugins/locator/locatorplugin.cpp index 43831ebc56..4a79bd668c 100644 --- a/src/plugins/locator/locatorplugin.cpp +++ b/src/plugins/locator/locatorplugin.cpp @@ -47,7 +47,7 @@ #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/futureprogress.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <extensionsystem/pluginmanager.h> #include <qtconcurrent/QtConcurrentTools> #include <utils/qtcassert.h> diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp index 36019d9c74..174a730054 100644 --- a/src/plugins/macros/actionmacrohandler.cpp +++ b/src/plugins/macros/actionmacrohandler.cpp @@ -40,7 +40,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> #include <coreplugin/coreconstants.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/icontext.h> #include <QtCore/QObject> diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp index 6f799818ab..9d584f8be3 100644 --- a/src/plugins/macros/macromanager.cpp +++ b/src/plugins/macros/macromanager.cpp @@ -48,7 +48,7 @@ #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> #include <coreplugin/icore.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/icontext.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp index 3efc95f168..bb8921c565 100644 --- a/src/plugins/macros/macrooptionswidget.cpp +++ b/src/plugins/macros/macrooptionswidget.cpp @@ -41,7 +41,7 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <QtCore/QDir> #include <QtCore/QFileInfo> diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp index 6cb1853a62..65efbc4716 100644 --- a/src/plugins/macros/macrosplugin.cpp +++ b/src/plugins/macros/macrosplugin.cpp @@ -44,7 +44,7 @@ #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> #include <coreplugin/icore.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/icontext.h> #include <QtCore/QtPlugin> diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp index 543fb87a92..a3c05d4275 100644 --- a/src/plugins/macros/texteditormacrohandler.cpp +++ b/src/plugins/macros/texteditormacrohandler.cpp @@ -42,7 +42,7 @@ #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <QtGui/QWidget> #include <QtGui/QKeyEvent> diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index dfac2ec4fb..14c66b1bcb 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -45,7 +45,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/vcsmanager.h> #include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index a3a68d3a43..b3a74bec12 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -44,7 +44,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/coreconstants.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/filemanager.h> diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 4416923a53..448da71631 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -98,7 +98,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditorfactory.h> diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp index bce7d3830f..6e143b4498 100644 --- a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp +++ b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp @@ -35,7 +35,7 @@ #include "ui_projectwelcomepagewidget.h" #include <coreplugin/coreconstants.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/modemanager.h> #include <coreplugin/icore.h> #include <coreplugin/dialogs/iwizard.h> diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index add3bb1c68..5eeb536f18 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -43,7 +43,7 @@ #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/coreconstants.h> #include <coreplugin/designmode.h> #include <coreplugin/dialogs/iwizard.h> diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 68828f2fb2..b39eec3c42 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -58,7 +58,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/actionmanager/command.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/icore.h> diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index 12a3e2e3f9..02e1af34d9 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -56,7 +56,7 @@ #include <coreplugin/icore.h> #include <coreplugin/coreconstants.h> #include <coreplugin/mimedatabase.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/fileiconprovider.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp index 31c72a7d33..d45bf6a782 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.cpp +++ b/src/plugins/qmljsinspector/qmljsinspector.cpp @@ -62,7 +62,7 @@ #include <coreplugin/navigationwidget.h> #include <coreplugin/icore.h> #include <coreplugin/coreconstants.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> diff --git a/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp b/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp index d93dbab701..674cc4bd32 100644 --- a/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp +++ b/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp @@ -37,7 +37,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/icore.h> #include <debugger/debuggerconstants.h> #include <debugger/debuggermainwindow.h> diff --git a/src/plugins/qmljsinspector/qmljslivetextpreview.cpp b/src/plugins/qmljsinspector/qmljslivetextpreview.cpp index 2ad761bbbb..77e24381ec 100644 --- a/src/plugins/qmljsinspector/qmljslivetextpreview.cpp +++ b/src/plugins/qmljsinspector/qmljslivetextpreview.cpp @@ -49,7 +49,7 @@ #include <coreplugin/icore.h> #include <coreplugin/infobar.h> #include <coreplugin/editormanager/ieditor.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/editormanager/editormanager.h> #include <debugger/debuggerconstants.h> diff --git a/src/plugins/qt4projectmanager/profileeditor.cpp b/src/plugins/qt4projectmanager/profileeditor.cpp index 265229e8b1..1f1fc47d05 100644 --- a/src/plugins/qt4projectmanager/profileeditor.cpp +++ b/src/plugins/qt4projectmanager/profileeditor.cpp @@ -39,7 +39,7 @@ #include <coreplugin/icore.h> #include <coreplugin/actionmanager/actionmanager.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <texteditor/fontsettings.h> #include <texteditor/texteditoractionhandler.h> diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp index bb69f81d10..8167913fe9 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp @@ -46,7 +46,7 @@ #include <coreplugin/icore.h> #include <coreplugin/basefilewizard.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/variablemanager.h> diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp index d45f38e377..00dac5e408 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp @@ -60,7 +60,7 @@ #include "qt-desktop/simulatorqtversionfactory.h" #include "winceqtversionfactory.h" -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/icore.h> #include <extensionsystem/pluginmanager.h> #include <projectexplorer/buildmanager.h> diff --git a/src/plugins/qttest/qttestplugin.cpp b/src/plugins/qttest/qttestplugin.cpp index 0e028c5a86..1f4c3592c6 100644 --- a/src/plugins/qttest/qttestplugin.cpp +++ b/src/plugins/qttest/qttestplugin.cpp @@ -47,7 +47,7 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> #include <coreplugin/modemanager.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/coreconstants.h> #include <coreplugin/mimedatabase.h> #include <coreplugin/progressmanager/progressmanager.h> diff --git a/src/plugins/qttest/resultsview.cpp b/src/plugins/qttest/resultsview.cpp index a0f456af3b..89be797c8b 100644 --- a/src/plugins/qttest/resultsview.cpp +++ b/src/plugins/qttest/resultsview.cpp @@ -38,7 +38,7 @@ #include <coreplugin/icore.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <QHeaderView> #include <QResizeEvent> diff --git a/src/plugins/qttest/testselector.cpp b/src/plugins/qttest/testselector.cpp index 6a3ab03748..5dc0d03619 100644 --- a/src/plugins/qttest/testselector.cpp +++ b/src/plugins/qttest/testselector.cpp @@ -52,7 +52,7 @@ #include <extensionsystem/pluginmanager.h> #include <coreplugin/coreconstants.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <QHeaderView> #include <QDir> diff --git a/src/plugins/remotelinux/maemoqemumanager.cpp b/src/plugins/remotelinux/maemoqemumanager.cpp index 4193d6ecf3..18791c2202 100644 --- a/src/plugins/remotelinux/maemoqemumanager.cpp +++ b/src/plugins/remotelinux/maemoqemumanager.cpp @@ -41,7 +41,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> #include <coreplugin/icontext.h> diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp index 1464c4183d..caa015b85f 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.cpp +++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp @@ -40,7 +40,7 @@ #include <coreplugin/icore.h> #include <coreplugin/mimedatabase.h> #include <coreplugin/coreconstants.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/editormanager/editormanager.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index c4b72d3cc3..fc9b2e1450 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -57,7 +57,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/editormanager/editormanager.h> #include <locator/commandlocator.h> diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp index 997e99fe0e..0a41dced8d 100644 --- a/src/plugins/texteditor/basehoverhandler.cpp +++ b/src/plugins/texteditor/basehoverhandler.cpp @@ -40,7 +40,7 @@ #include <coreplugin/icore.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/helpmanager.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <debugger/debuggerconstants.h> #include <QtCore/QPoint> diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index ee02a9c4fe..03c0b96344 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -63,7 +63,7 @@ #include <coreplugin/icore.h> #include <coreplugin/infobar.h> #include <coreplugin/manhattanstyle.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <extensionsystem/pluginmanager.h> #include <find/basetextfind.h> #include <utils/linecolumnlabel.h> diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index bfaa13bb16..e70b78e02a 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -45,7 +45,7 @@ #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> #include <coreplugin/editormanager/editormanager.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <utils/qtcassert.h> #include <QtCore/QSet> diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp index 4e6564860e..8f4b1dc935 100644 --- a/src/plugins/texteditor/texteditorplugin.cpp +++ b/src/plugins/texteditor/texteditorplugin.cpp @@ -54,7 +54,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/command.h> #include <coreplugin/editormanager/editormanager.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/externaltoolmanager.h> #include <extensionsystem/pluginmanager.h> #include <texteditor/texteditoractionhandler.h> diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 0983d2f5e2..99770b9972 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -63,7 +63,7 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <texteditor/basetexteditor.h> diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 8b4431fe2a..c056d33dc3 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -42,7 +42,7 @@ #include <coreplugin/ifile.h> #include <coreplugin/icore.h> #include <coreplugin/editormanager/editormanager.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/actionmanager/actionmanager.h> #include <utils/submiteditorwidget.h> #include <utils/checkablemessagebox.h> diff --git a/src/plugins/vcsbase/vcsplugin.cpp b/src/plugins/vcsbase/vcsplugin.cpp index ecf71044f6..f35963ac6f 100644 --- a/src/plugins/vcsbase/vcsplugin.cpp +++ b/src/plugins/vcsbase/vcsplugin.cpp @@ -39,7 +39,7 @@ #include <coreplugin/icore.h> #include <coreplugin/coreconstants.h> -#include <coreplugin/uniqueidmanager.h> +#include <coreplugin/id.h> #include <coreplugin/mimedatabase.h> #include <QtCore/QtPlugin> |