Commit 48833025 authored by hjk's avatar hjk Committed by hjk
Browse files

core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone

Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 5a6c76a1
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#include <coreplugin/navigationwidget.h> #include <coreplugin/navigationwidget.h>
#include <coreplugin/outputpane.h> #include <coreplugin/outputpane.h>
#include <coreplugin/rightpane.h> #include <coreplugin/rightpane.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <texteditor/itexteditor.h> #include <texteditor/itexteditor.h>
#include <texteditor/texteditorconstants.h> #include <texteditor/texteditorconstants.h>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "command_p.h" #include "command_p.h"
#include "coreconstants.h" #include "coreconstants.h"
#include "uniqueidmanager.h" #include "id.h"
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "actioncontainer_p.h" #include "actioncontainer_p.h"
#include "command_p.h" #include "command_p.h"
#include "uniqueidmanager.h" #include "id.h"
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#define ACTIONMANAGER_H #define ACTIONMANAGER_H
#include "coreplugin/core_global.h" #include "coreplugin/core_global.h"
#include "coreplugin/uniqueidmanager.h" #include "coreplugin/id.h"
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include "coreplugin/icontext.h" #include "coreplugin/icontext.h"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "icore.h" #include "icore.h"
#include "icontext.h" #include "icontext.h"
#include "uniqueidmanager.h" #include "id.h"
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "coreconstants.h" #include "coreconstants.h"
#include "filemanager.h" #include "filemanager.h"
#include "icore.h" #include "icore.h"
#include "uniqueidmanager.h" #include "id.h"
#include <utils/treewidgetcolumnstretcher.h> #include <utils/treewidgetcolumnstretcher.h>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <app/app_version.h> #include <app/app_version.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
......
...@@ -22,7 +22,7 @@ SOURCES += mainwindow.cpp \ ...@@ -22,7 +22,7 @@ SOURCES += mainwindow.cpp \
fancytabwidget.cpp \ fancytabwidget.cpp \
generalsettings.cpp \ generalsettings.cpp \
filemanager.cpp \ filemanager.cpp \
uniqueidmanager.cpp \ id.cpp \
messagemanager.cpp \ messagemanager.cpp \
messageoutputwindow.cpp \ messageoutputwindow.cpp \
outputpane.cpp \ outputpane.cpp \
...@@ -101,7 +101,7 @@ HEADERS += mainwindow.h \ ...@@ -101,7 +101,7 @@ HEADERS += mainwindow.h \
fancytabwidget.h \ fancytabwidget.h \
generalsettings.h \ generalsettings.h \
filemanager.h \ filemanager.h \
uniqueidmanager.h \ id.h \
messagemanager.h \ messagemanager.h \
messageoutputwindow.h \ messageoutputwindow.h \
outputpane.h \ outputpane.h \
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "coreconstants.h" #include "coreconstants.h"
#include "filemanager.h" #include "filemanager.h"
#include "icore.h" #include "icore.h"
#include "uniqueidmanager.h" #include "id.h"
#include <utils/treewidgetcolumnstretcher.h> #include <utils/treewidgetcolumnstretcher.h>
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
#include <coreplugin/imode.h> #include <coreplugin/imode.h>
#include <coreplugin/settingsdatabase.h> #include <coreplugin/settingsdatabase.h>
#include <coreplugin/variablemanager.h> #include <coreplugin/variablemanager.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/fileutils.h> #include <coreplugin/fileutils.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/filemanager.h> #include <coreplugin/filemanager.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/minisplitter.h> #include <coreplugin/minisplitter.h>
#include <coreplugin/sidebar.h> #include <coreplugin/sidebar.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/editormanager/editorview.h> #include <coreplugin/editormanager/editorview.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
** **
**************************************************************************/ **************************************************************************/
#include "uniqueidmanager.h" #include "id.h"
#include "coreconstants.h" #include "coreconstants.h"
#include "icontext.h" #include "icontext.h"
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
** **
**************************************************************************/ **************************************************************************/
#ifndef UNIQUEIDMANAGER_H #ifndef CORE_ID_H
#define UNIQUEIDMANAGER_H #define CORE_ID_H
#include "core_global.h" #include "core_global.h"
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
namespace Core { namespace Core {
// FIXME: Make this a wrapper around an int, not around a QByteArray.
class CORE_EXPORT Id class CORE_EXPORT Id
{ {
public: public:
...@@ -60,8 +61,8 @@ private: ...@@ -60,8 +61,8 @@ private:
QByteArray m_name; QByteArray m_name;
}; };
uint qHash(const Id &id); CORE_EXPORT uint qHash(const Id &id);
} // namespace Core } // namespace Core
#endif // UNIQUEIDMANAGER_H #endif // CORE_ID_H
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
#include "variablemanager.h" #include "variablemanager.h"
#include "versiondialog.h" #include "versiondialog.h"
#include "statusbarmanager.h" #include "statusbarmanager.h"
#include "uniqueidmanager.h" #include "id.h"
#include "manhattanstyle.h" #include "manhattanstyle.h"
#include "navigationwidget.h" #include "navigationwidget.h"
#include "rightpane.h" #include "rightpane.h"
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/imode.h> #include <coreplugin/imode.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "modemanager.h" #include "modemanager.h"
#include "actionmanager/actionmanager.h" #include "actionmanager/actionmanager.h"
#include "actionmanager/command.h" #include "actionmanager/command.h"
#include "uniqueidmanager.h" #include "id.h"
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "modemanager.h" #include "modemanager.h"
#include "actionmanager/actionmanager.h" #include "actionmanager/actionmanager.h"
#include "actionmanager/command.h" #include "actionmanager/command.h"
#include "uniqueidmanager.h" #include "id.h"
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/findplaceholder.h> #include <coreplugin/findplaceholder.h>
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/mimedatabase.h> #include <coreplugin/mimedatabase.h>
......
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/mimedatabase.h> #include <coreplugin/mimedatabase.h>
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/navigationwidget.h> #include <coreplugin/navigationwidget.h>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
#include <utils/stringutils.h> #include <utils/stringutils.h>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/imode.h> #include <coreplugin/imode.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/imode.h> #include <coreplugin/imode.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/dialogs/ioptionspage.h> #include <coreplugin/dialogs/ioptionspage.h>
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/mimedatabase.h> #include <coreplugin/mimedatabase.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <QtCore/QDebug> #include <QtCore/QDebug>
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/minisplitter.h> #include <coreplugin/minisplitter.h>
#include <coreplugin/mimedatabase.h> #include <coreplugin/mimedatabase.h>
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/ifile.h> #include <coreplugin/ifile.h>
#include <coreplugin/messagemanager.h> #include <coreplugin/messagemanager.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/statusbarwidget.h> #include <coreplugin/statusbarwidget.h>
#include <coreplugin/statusbarmanager.h> #include <coreplugin/statusbarmanager.h>
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/icontext.h> #include <coreplugin/icontext.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/findplaceholder.h> #include <coreplugin/findplaceholder.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/icontext.h> #include <coreplugin/icontext.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QtCore/QFile> #include <QtCore/QFile>
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/messagemanager.h> #include <coreplugin/messagemanager.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/id.h>
#include <coreplugin/filemanager.h> #include <coreplugin/filemanager.h>
#include <coreplugin/iversioncontrol.h> #include <coreplugin/iversioncontrol.h>
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>