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

Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>

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>
 

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>

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"
 

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>

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>
 

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>
 

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 \

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>
 

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>

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>
 

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>

src/plugins/coreplugin/id.cpp

@@ -30,7 +30,7 @@
 **
 **************************************************************************/
 
-#include "uniqueidmanager.h"
+#include "id.h"
 #include "coreconstants.h"
 #include "icontext.h"
 

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

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"

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>
 

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>
 

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>
 

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>