Rename header/ source files to match class name.

Fix includes as well.

29 files changed, 36 insertions, 36 deletions

diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp
index 3c8492003..87cc390d0 100644
--- a/installerbuilder/installerbase/installerbase.cpp
+++ b/installerbuilder/installerbase/installerbase.cpp
@@ -40,11 +40,11 @@
 #include "installerbasecommons.h"
 #include "lib7z_facade.h"
 #include "qinstallerglobal.h"
-#include "qinstallergui.h"
+#include "packagemanagergui.h"
 #include "tabcontroller.h"
 #include "updater.h"
 
-#include <qinstaller.h>
+#include <packagemanagercore.h>
 
 #include <QtCore/QTranslator>
 #include <QtCore/QThread>
diff --git a/installerbuilder/installerbase/installerbasecommons.cpp b/installerbuilder/installerbase/installerbasecommons.cpp
index 207ba722f..ac1e82a9b 100644
--- a/installerbuilder/installerbase/installerbasecommons.cpp
+++ b/installerbuilder/installerbase/installerbasecommons.cpp
@@ -35,7 +35,7 @@
 #include <common/installersettings.h>
 #include <component.h>
 #include <messageboxhandler.h>
-#include <qinstaller.h>
+#include <packagemanagercore.h>
 
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
diff --git a/installerbuilder/installerbase/installerbasecommons.h b/installerbuilder/installerbase/installerbasecommons.h
index 47213f2d0..1237a0560 100644
--- a/installerbuilder/installerbase/installerbasecommons.h
+++ b/installerbuilder/installerbase/installerbasecommons.h
@@ -26,7 +26,7 @@
 #ifndef INSTALLERBASECOMMONS_H
 #define INSTALLERBASECOMMONS_H
 
-#include <qinstallergui.h>
+#include <packagemanagergui.h>
 
 QT_BEGIN_NAMESPACE
 class QLabel;
diff --git a/installerbuilder/installerbase/tabcontroller.cpp b/installerbuilder/installerbase/tabcontroller.cpp
index 08f39eb25..fcff11798 100644
--- a/installerbuilder/installerbase/tabcontroller.cpp
+++ b/installerbuilder/installerbase/tabcontroller.cpp
@@ -35,7 +35,7 @@
 
 #include <common/utils.h>
 #include <component.h>
-#include <qinstaller.h>
+#include <packagemanagercore.h>
 
 #include <QtCore/QTimer>
 
diff --git a/installerbuilder/libinstaller/component.cpp b/installerbuilder/libinstaller/component.cpp
index c500706c3..e85e6681e 100644
--- a/installerbuilder/libinstaller/component.cpp
+++ b/installerbuilder/libinstaller/component.cpp
@@ -37,7 +37,7 @@
 #include "common/utils.h"
 #include "fsengineclient.h"
 #include "lib7z_facade.h"
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 #include "qinstallerglobal.h"
 #include "messageboxhandler.h"
 
diff --git a/installerbuilder/libinstaller/component_p.cpp b/installerbuilder/libinstaller/component_p.cpp
index 6dc676cc9..5fd76a586 100644
--- a/installerbuilder/libinstaller/component_p.cpp
+++ b/installerbuilder/libinstaller/component_p.cpp
@@ -34,7 +34,7 @@
 
 #include "component.h"
 #include "messageboxhandler.h"
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopServices>
diff --git a/installerbuilder/libinstaller/componentmodel.cpp b/installerbuilder/libinstaller/componentmodel.cpp
index 1c648ed60..992f0eb50 100644
--- a/installerbuilder/libinstaller/componentmodel.cpp
+++ b/installerbuilder/libinstaller/componentmodel.cpp
@@ -33,7 +33,7 @@
 #include "componentmodel.h"
 
 #include "component.h"
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 
 
 namespace QInstaller {
diff --git a/installerbuilder/libinstaller/downloadarchivesjob.cpp b/installerbuilder/libinstaller/downloadarchivesjob.cpp
index 7ca6c48f0..a8f69fd17 100644
--- a/installerbuilder/libinstaller/downloadarchivesjob.cpp
+++ b/installerbuilder/libinstaller/downloadarchivesjob.cpp
@@ -37,7 +37,7 @@
 #include "component.h"
 #include "cryptosignatureverifier.h"
 #include "messageboxhandler.h"
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 
 #include <QtCore/QFile>
 
diff --git a/installerbuilder/libinstaller/extractarchiveoperation_p.h b/installerbuilder/libinstaller/extractarchiveoperation_p.h
index 5e5ffcba7..78c98106b 100644
--- a/installerbuilder/libinstaller/extractarchiveoperation_p.h
+++ b/installerbuilder/libinstaller/extractarchiveoperation_p.h
@@ -28,7 +28,7 @@
 
 #include "extractarchiveoperation.h"
 #include "lib7z_facade.h"
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 
 #include <QDir>
 #include <QFile>
diff --git a/installerbuilder/libinstaller/installiconsoperation.cpp b/installerbuilder/libinstaller/installiconsoperation.cpp
index 8adc25e27..2d183e6ed 100644
--- a/installerbuilder/libinstaller/installiconsoperation.cpp
+++ b/installerbuilder/libinstaller/installiconsoperation.cpp
@@ -32,7 +32,7 @@
 **************************************************************************/
 #include "installiconsoperation.h"
 
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 
 #include "common/errors.h"
 #include "common/fileutils.h"
diff --git a/installerbuilder/libinstaller/libinstaller.pro b/installerbuilder/libinstaller/libinstaller.pro
index 9cf4f0f3a..a6fb793a4 100644
--- a/installerbuilder/libinstaller/libinstaller.pro
+++ b/installerbuilder/libinstaller/libinstaller.pro
@@ -30,9 +30,9 @@ include(3rdparty/p7zip_9.04/p7zip.pri)
 include(3rdparty/kdtools/KDUpdater/KDUpdater.pri)
 include(3rdparty/kdtools/KDToolsCore/KDToolsCore.pri)
 
-HEADERS += $$PWD/qinstaller.h \
-    $$PWD/qinstaller_p.h \
-    $$PWD/qinstallergui.h \
+HEADERS += $$PWD/packagemanagercore.h \
+    $$PWD/packagemanagercore_p.h \
+    $$PWD/packagemanagergui.h \
     ../common/binaryformat.h \
     ../common/binaryformatengine.h \
     ../common/binaryformatenginehandler.h \
@@ -95,9 +95,9 @@ HEADERS += $$PWD/qinstaller.h \
     qprocesswrapper.h \
     qsettingswrapper.h
 
-SOURCES += $$PWD/qinstaller.cpp \
-    $$PWD/qinstaller_p.cpp \
-    $$PWD/qinstallergui.cpp \
+SOURCES += $$PWD/packagemanagercore.cpp \
+    $$PWD/packagemanagercore_p.cpp \
+    $$PWD/packagemanagergui.cpp \
     ../common/binaryformat.cpp \
     ../common/binaryformatengine.cpp \
     ../common/binaryformatenginehandler.cpp \
diff --git a/installerbuilder/libinstaller/licenseoperation.cpp b/installerbuilder/libinstaller/licenseoperation.cpp
index 89a26cc15..7fe9ab2db 100644
--- a/installerbuilder/libinstaller/licenseoperation.cpp
+++ b/installerbuilder/libinstaller/licenseoperation.cpp
@@ -32,7 +32,7 @@
 **************************************************************************/
 #include "licenseoperation.h"
 
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 #include "common/installersettings.h"
 
 #include <QtCore/QDir>
diff --git a/installerbuilder/libinstaller/linereplaceoperation.cpp b/installerbuilder/libinstaller/linereplaceoperation.cpp
index b0e5da52c..a32c7d685 100644
--- a/installerbuilder/libinstaller/linereplaceoperation.cpp
+++ b/installerbuilder/libinstaller/linereplaceoperation.cpp
@@ -31,7 +31,7 @@
 **
 **************************************************************************/
 #include "linereplaceoperation.h"
-#include <qinstaller.h>
+#include <packagemanagercore.h>
 #include "common/utils.h"
 
 #include <QFile>
diff --git a/installerbuilder/libinstaller/qinstaller.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp
index 85e4d709a..50e8bf030 100644
--- a/installerbuilder/libinstaller/qinstaller.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore.cpp
@@ -30,7 +30,7 @@
 ** (qt-info@nokia.com).
 **
 **************************************************************************/
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 
 #include "adminauthorization.h"
 #include "common/binaryformat.h"
@@ -42,8 +42,8 @@
 #include "fsengineclient.h"
 #include "getrepositoriesmetainfojob.h"
 #include "messageboxhandler.h"
+#include "packagemanagercore_p.h"
 #include "progresscoordinator.h"
-#include "qinstaller_p.h"
 #include "qinstallerglobal.h"
 #include "qprocesswrapper.h"
 #include "qsettingswrapper.h"
diff --git a/installerbuilder/libinstaller/qinstaller.h b/installerbuilder/libinstaller/packagemanagercore.h
index 3db3e3d6b..3db3e3d6b 100644
--- a/installerbuilder/libinstaller/qinstaller.h
+++ b/installerbuilder/libinstaller/packagemanagercore.h
diff --git a/installerbuilder/libinstaller/qinstaller_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp
index bc29db8f3..bb2c6b6c4 100644
--- a/installerbuilder/libinstaller/qinstaller_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -30,7 +30,7 @@
 ** (qt-info@nokia.com).
 **
 **************************************************************************/
-#include "qinstaller_p.h"
+#include "packagemanagercore_p.h"
 
 #include "adminauthorization.h"
 #include "common/binaryformat.h"
@@ -40,8 +40,8 @@
 #include "component.h"
 #include "fsengineclient.h"
 #include "messageboxhandler.h"
+#include "packagemanagercore.h"
 #include "progresscoordinator.h"
-#include "qinstaller.h"
 #include "qprocesswrapper.h"
 #include "qsettingswrapper.h"
 
diff --git a/installerbuilder/libinstaller/qinstaller_p.h b/installerbuilder/libinstaller/packagemanagercore_p.h
index da6078e59..da6078e59 100644
--- a/installerbuilder/libinstaller/qinstaller_p.h
+++ b/installerbuilder/libinstaller/packagemanagercore_p.h
diff --git a/installerbuilder/libinstaller/qinstallergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp
index 282c9589b..a85f3b5b7 100644
--- a/installerbuilder/libinstaller/qinstallergui.cpp
+++ b/installerbuilder/libinstaller/packagemanagergui.cpp
@@ -30,12 +30,12 @@
 ** (qt-info@nokia.com).
 **
 **************************************************************************/
-#include "qinstallergui.h"
+#include "packagemanagergui.h"
 
 #include "component.h"
 #include "componentmodel.h"
 #include "messageboxhandler.h"
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 #include "qinstallerglobal.h"
 #include "progresscoordinator.h"
 #include "performinstallationform.h"
diff --git a/installerbuilder/libinstaller/qinstallergui.h b/installerbuilder/libinstaller/packagemanagergui.h
index 7f52a7997..da41198d6 100644
--- a/installerbuilder/libinstaller/qinstallergui.h
+++ b/installerbuilder/libinstaller/packagemanagergui.h
@@ -26,7 +26,7 @@
 #ifndef QINSTALLER_GUI_H
 #define QINSTALLER_GUI_H
 
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 
 #include <QtCore/QEvent>
 #include <QtCore/QMetaType>
diff --git a/installerbuilder/libinstaller/qtpatchoperation.cpp b/installerbuilder/libinstaller/qtpatchoperation.cpp
index f47966ddf..0b10cf640 100644
--- a/installerbuilder/libinstaller/qtpatchoperation.cpp
+++ b/installerbuilder/libinstaller/qtpatchoperation.cpp
@@ -37,7 +37,7 @@
 #endif
 
 #include "common/utils.h"
-#include <qinstaller.h>
+#include <packagemanagercore.h>
 
 #include <QMap>
 #include <QSet>
diff --git a/installerbuilder/libinstaller/registerdefaultdebuggeroperation.cpp b/installerbuilder/libinstaller/registerdefaultdebuggeroperation.cpp
index 77c4b6dd1..5affc8688 100644
--- a/installerbuilder/libinstaller/registerdefaultdebuggeroperation.cpp
+++ b/installerbuilder/libinstaller/registerdefaultdebuggeroperation.cpp
@@ -32,7 +32,7 @@
 **************************************************************************/
 #include "registerdefaultdebuggeroperation.h"
 #include "persistentsettings.h"
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 #include "qtcreator_constants.h"
 #include "qtcreatorpersistentsettings.h"
 
diff --git a/installerbuilder/libinstaller/registerqtoperation.cpp b/installerbuilder/libinstaller/registerqtoperation.cpp
index a4aafffbf..3e1d22a6c 100644
--- a/installerbuilder/libinstaller/registerqtoperation.cpp
+++ b/installerbuilder/libinstaller/registerqtoperation.cpp
@@ -33,7 +33,7 @@
 #include "registerqtoperation.h"
 
 #include "component.h"
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 #include "qtcreator_constants.h"
 #include "qtcreatorpersistentsettings.h"
 #include "registertoolchainoperation.h"
diff --git a/installerbuilder/libinstaller/registerqtv2operation.cpp b/installerbuilder/libinstaller/registerqtv2operation.cpp
index b00d15142..201a92fe2 100644
--- a/installerbuilder/libinstaller/registerqtv2operation.cpp
+++ b/installerbuilder/libinstaller/registerqtv2operation.cpp
@@ -31,7 +31,7 @@
 **
 **************************************************************************/
 #include "registerqtv2operation.h"
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 #include "qtcreator_constants.h"
 
 #include <QString>
diff --git a/installerbuilder/libinstaller/registertoolchainoperation.cpp b/installerbuilder/libinstaller/registertoolchainoperation.cpp
index e51c8ea04..a7b100d40 100644
--- a/installerbuilder/libinstaller/registertoolchainoperation.cpp
+++ b/installerbuilder/libinstaller/registertoolchainoperation.cpp
@@ -33,7 +33,7 @@
 #include "registertoolchainoperation.h"
 
 #include "persistentsettings.h"
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 #include "qtcreator_constants.h"
 #include "qtcreatorpersistentsettings.h"
 
diff --git a/installerbuilder/libinstaller/replaceoperation.cpp b/installerbuilder/libinstaller/replaceoperation.cpp
index d7b50d733..0386aa6b0 100644
--- a/installerbuilder/libinstaller/replaceoperation.cpp
+++ b/installerbuilder/libinstaller/replaceoperation.cpp
@@ -31,7 +31,7 @@
 **
 **************************************************************************/
 #include "replaceoperation.h"
-#include <qinstaller.h>
+#include <packagemanagercore.h>
 #include "common/utils.h"
 
 #include <QFile>
diff --git a/installerbuilder/libinstaller/selfrestartoperation.cpp b/installerbuilder/libinstaller/selfrestartoperation.cpp
index db5ea003a..58684ff19 100644
--- a/installerbuilder/libinstaller/selfrestartoperation.cpp
+++ b/installerbuilder/libinstaller/selfrestartoperation.cpp
@@ -31,7 +31,7 @@
 **
 **************************************************************************/
 #include "selfrestartoperation.h"
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 
 #include <KDToolsCore/KDSelfRestarter>
 
diff --git a/installerbuilder/libinstaller/setqtcreatorvalueoperation.cpp b/installerbuilder/libinstaller/setqtcreatorvalueoperation.cpp
index 0c2498ff4..ae5d6be8c 100644
--- a/installerbuilder/libinstaller/setqtcreatorvalueoperation.cpp
+++ b/installerbuilder/libinstaller/setqtcreatorvalueoperation.cpp
@@ -33,7 +33,7 @@
 #include "setqtcreatorvalueoperation.h"
 #include "qtcreator_constants.h"
 #include "updatecreatorsettingsfrom21to22operation.h"
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 
 #include <QString>
 #include <QFileInfo>
diff --git a/installerbuilder/libinstaller/updatecreatorsettingsfrom21to22operation.cpp b/installerbuilder/libinstaller/updatecreatorsettingsfrom21to22operation.cpp
index ac45962e8..f4e08d107 100644
--- a/installerbuilder/libinstaller/updatecreatorsettingsfrom21to22operation.cpp
+++ b/installerbuilder/libinstaller/updatecreatorsettingsfrom21to22operation.cpp
@@ -34,7 +34,7 @@
 #include "registerdefaultdebuggeroperation.h"
 #include "registertoolchainoperation.h"
 #include "qtcreatorpersistentsettings.h"
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 #include "qtcreator_constants.h"
 
 #include <QString>
diff --git a/installerbuilder/libinstaller/updater.cpp b/installerbuilder/libinstaller/updater.cpp
index 6e594ac0d..9adba482c 100644
--- a/installerbuilder/libinstaller/updater.cpp
+++ b/installerbuilder/libinstaller/updater.cpp
@@ -36,7 +36,7 @@
 #include "common/utils.h"
 #include "component.h"
 #include "init.h"
-#include "qinstaller.h"
+#include "packagemanagercore.h"
 
 #include <QtXml/QDomDocument>