Rename to match actual class name. Fix includes.

12 files changed, 18 insertions, 17 deletions

diff --git a/installerbuilder/libinstaller/qinstallercomponent.cpp b/installerbuilder/libinstaller/component.cpp
index 53749d575..099e06cf7 100644
--- a/installerbuilder/libinstaller/qinstallercomponent.cpp
+++ b/installerbuilder/libinstaller/component.cpp
@@ -30,7 +30,7 @@
 ** (qt-info@nokia.com).
 **
 **************************************************************************/
-#include "qinstallercomponent.h"
+#include "component.h"
 
 #include "common/errors.h"
 #include "common/fileutils.h"
@@ -38,7 +38,6 @@
 #include "fsengineclient.h"
 #include "lib7z_facade.h"
 #include "qinstaller.h"
-#include "qinstallercomponent_p.h"
 #include "qinstallerglobal.h"
 #include "messageboxhandler.h"
 
diff --git a/installerbuilder/libinstaller/qinstallercomponent.h b/installerbuilder/libinstaller/component.h
index de775d5ec..6892bd67d 100644
--- a/installerbuilder/libinstaller/qinstallercomponent.h
+++ b/installerbuilder/libinstaller/component.h
@@ -26,8 +26,8 @@
 #ifndef QINSTALLER_COMPONENT_H
 #define QINSTALLER_COMPONENT_H
 
+#include "component_p.h"
 #include "qinstallerglobal.h"
-#include "qinstallercomponent_p.h"
 
 #include <QtCore/QDir>
 #include <QtCore/QMetaType>
diff --git a/installerbuilder/libinstaller/qinstallercomponent_p.cpp b/installerbuilder/libinstaller/component_p.cpp
index 02fdf1e10..392d66f9c 100644
--- a/installerbuilder/libinstaller/qinstallercomponent_p.cpp
+++ b/installerbuilder/libinstaller/component_p.cpp
@@ -30,15 +30,16 @@
 ** (qt-info@nokia.com).
 **
 **************************************************************************/
-#include "qinstallercomponent_p.h"
+#include "component_p.h"
 
+#include "component.h"
 #include "messageboxhandler.h"
 #include "qinstaller.h"
-#include "qinstallercomponent.h"
 
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopServices>
 
+
 namespace QInstaller {
 
 // -- ComponentPrivate
diff --git a/installerbuilder/libinstaller/qinstallercomponent_p.h b/installerbuilder/libinstaller/component_p.h
index 3a92da6a4..3a92da6a4 100644
--- a/installerbuilder/libinstaller/qinstallercomponent_p.h
+++ b/installerbuilder/libinstaller/component_p.h
diff --git a/installerbuilder/libinstaller/componentmodel.cpp b/installerbuilder/libinstaller/componentmodel.cpp
index 934f59094..1739470c0 100644
--- a/installerbuilder/libinstaller/componentmodel.cpp
+++ b/installerbuilder/libinstaller/componentmodel.cpp
@@ -32,8 +32,8 @@
 **************************************************************************/
 #include "componentmodel.h"
 
+#include "component.h"
 #include "qinstaller.h"
-#include "qinstallercomponent.h"
 
 
 namespace QInstaller {
diff --git a/installerbuilder/libinstaller/downloadarchivesjob.cpp b/installerbuilder/libinstaller/downloadarchivesjob.cpp
index 0767f82ec..708647320 100644
--- a/installerbuilder/libinstaller/downloadarchivesjob.cpp
+++ b/installerbuilder/libinstaller/downloadarchivesjob.cpp
@@ -34,10 +34,10 @@
 
 #include "common/binaryformatenginehandler.h"
 #include "common/utils.h"
+#include "component.h"
 #include "cryptosignatureverifier.h"
 #include "messageboxhandler.h"
 #include "qinstaller.h"
-#include "qinstallercomponent.h"
 
 #include <QtCore/QFile>
 
diff --git a/installerbuilder/libinstaller/libinstaller.pro b/installerbuilder/libinstaller/libinstaller.pro
index 98541cc8a..f0457213e 100644
--- a/installerbuilder/libinstaller/libinstaller.pro
+++ b/installerbuilder/libinstaller/libinstaller.pro
@@ -41,7 +41,7 @@ HEADERS += $$PWD/qinstaller.h \
     ../common/utils.h \
     ../common/errors.h \
     kdmmappedfileiodevice.h \
-    qinstallercomponent.h \
+    component.h \
     componentmodel.h \
     qinstallerglobal.h \
     qtpatch.h \
@@ -89,7 +89,7 @@ HEADERS += $$PWD/qinstaller.h \
     messageboxhandler.h \
     getrepositoriesmetainfojob.h \
     licenseoperation.h \
-    qinstallercomponent_p.h \
+    component_p.h \
     qtcreator_constants.h \
     qtcreatorpersistentsettings.h \
     registerdefaultdebuggeroperation.h \
@@ -109,7 +109,7 @@ SOURCES += $$PWD/qinstaller.cpp \
     ../common/fileutils.cpp \
     ../common/utils.cpp \
     kdmmappedfileiodevice.cpp \
-    qinstallercomponent.cpp \
+    component.cpp \
     componentmodel.cpp \
     qtpatch.cpp \
     persistentsettings.cpp \
@@ -153,7 +153,7 @@ SOURCES += $$PWD/qinstaller.cpp \
     messageboxhandler.cpp \
     getrepositoriesmetainfojob.cpp \
     licenseoperation.cpp \
-    qinstallercomponent_p.cpp \
+    component_p.cpp \
     qtcreatorpersistentsettings.cpp \
     registerdefaultdebuggeroperation.cpp \
     updatecreatorsettingsfrom21to22operation.cpp \
diff --git a/installerbuilder/libinstaller/qinstaller.cpp b/installerbuilder/libinstaller/qinstaller.cpp
index 0d816d184..15d30fe2f 100644
--- a/installerbuilder/libinstaller/qinstaller.cpp
+++ b/installerbuilder/libinstaller/qinstaller.cpp
@@ -37,13 +37,13 @@
 #include "common/errors.h"
 #include "common/installersettings.h"
 #include "common/utils.h"
+#include "component.h"
 #include "downloadarchivesjob.h"
 #include "fsengineclient.h"
 #include "getrepositoriesmetainfojob.h"
 #include "messageboxhandler.h"
 #include "progresscoordinator.h"
 #include "qinstaller_p.h"
-#include "qinstallercomponent.h"
 #include "qinstallerglobal.h"
 #include "qprocesswrapper.h"
 #include "qsettingswrapper.h"
diff --git a/installerbuilder/libinstaller/qinstaller_p.cpp b/installerbuilder/libinstaller/qinstaller_p.cpp
index c9ee1a8ce..29e6e7034 100644
--- a/installerbuilder/libinstaller/qinstaller_p.cpp
+++ b/installerbuilder/libinstaller/qinstaller_p.cpp
@@ -37,11 +37,11 @@
 #include "common/errors.h"
 #include "common/fileutils.h"
 #include "common/utils.h"
+#include "component.h"
 #include "fsengineclient.h"
 #include "messageboxhandler.h"
 #include "progresscoordinator.h"
 #include "qinstaller.h"
-#include "qinstallercomponent.h"
 #include "qprocesswrapper.h"
 #include "qsettingswrapper.h"
 
diff --git a/installerbuilder/libinstaller/qinstallergui.cpp b/installerbuilder/libinstaller/qinstallergui.cpp
index 931c415f8..86e857d41 100644
--- a/installerbuilder/libinstaller/qinstallergui.cpp
+++ b/installerbuilder/libinstaller/qinstallergui.cpp
@@ -32,10 +32,10 @@
 **************************************************************************/
 #include "qinstallergui.h"
 
+#include "component.h"
 #include "componentmodel.h"
 #include "qinstaller.h"
 #include "qinstallerglobal.h"
-#include "qinstallercomponent.h"
 #include "progresscoordinator.h"
 #include "performinstallationform.h"
 
diff --git a/installerbuilder/libinstaller/registerqtoperation.cpp b/installerbuilder/libinstaller/registerqtoperation.cpp
index ac732257e..e4aa33192 100644
--- a/installerbuilder/libinstaller/registerqtoperation.cpp
+++ b/installerbuilder/libinstaller/registerqtoperation.cpp
@@ -31,13 +31,13 @@
 **
 **************************************************************************/
 #include "registerqtoperation.h"
+
+#include "component.h"
 #include "qtcreator_constants.h"
 #include "qinstaller.h"
 #include "registertoolchainoperation.h"
 #include "registerqtv2operation.h"
 #include "qtcreatorpersistentsettings.h"
-#include "qinstallercomponent.h"
-
 
 #include <QString>
 #include <QFileInfo>
@@ -47,6 +47,7 @@
 
 using namespace QInstaller;
 
+
 RegisterQtInCreatorOperation::RegisterQtInCreatorOperation()
 {
     setName(QLatin1String("RegisterQtInCreator"));
diff --git a/installerbuilder/libinstaller/updater.cpp b/installerbuilder/libinstaller/updater.cpp
index 536a1a572..bfea59988 100644
--- a/installerbuilder/libinstaller/updater.cpp
+++ b/installerbuilder/libinstaller/updater.cpp
@@ -34,9 +34,9 @@
 
 #include "common/binaryformat.h"
 #include "common/utils.h"
+#include "component.h"
 #include "init.h"
 #include "qinstaller.h"
-#include "qinstallercomponent.h"
 
 #include <QtXml/QDomDocument>