summaryrefslogtreecommitdiffstats
path: root/src/libs/installer
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/installer')
-rw-r--r--src/libs/installer/component.cpp2
-rw-r--r--src/libs/installer/createlocalrepositoryoperation.cpp2
-rw-r--r--src/libs/installer/downloadarchivesjob.cpp4
-rw-r--r--src/libs/installer/downloadarchivesjob.h2
-rw-r--r--src/libs/installer/downloadfiletask.h2
-rw-r--r--src/libs/installer/init.cpp4
-rw-r--r--src/libs/installer/metadatajob.h2
-rw-r--r--src/libs/installer/packagemanagercore.cpp4
-rw-r--r--src/libs/installer/packagemanagercore_p.cpp6
-rw-r--r--src/libs/installer/packagemanagercore_p.h4
-rw-r--r--src/libs/installer/packagemanagergui.cpp2
-rw-r--r--src/libs/installer/packagemanagerpagefactory.h2
-rw-r--r--src/libs/installer/packagemanagerproxyfactory.h2
-rw-r--r--src/libs/installer/qinstallerglobal.h4
-rw-r--r--src/libs/installer/repository.cpp2
-rw-r--r--src/libs/installer/selfrestartoperation.cpp2
-rw-r--r--src/libs/installer/settingsoperation.cpp2
-rw-r--r--src/libs/installer/sysinfo_win.cpp2
-rw-r--r--src/libs/installer/testrepository.h3
19 files changed, 26 insertions, 27 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index 9b8c2a430..cabaa9231 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -43,7 +43,7 @@
#include "remoteclient.h"
#include "settings.h"
-#include <kdupdaterupdateoperationfactory.h>
+#include "updateoperationfactory.h"
#include <productkeycheck.h>
diff --git a/src/libs/installer/createlocalrepositoryoperation.cpp b/src/libs/installer/createlocalrepositoryoperation.cpp
index 5ce08c26f..c4101c3d2 100644
--- a/src/libs/installer/createlocalrepositoryoperation.cpp
+++ b/src/libs/installer/createlocalrepositoryoperation.cpp
@@ -45,7 +45,7 @@
#include "packagemanagercore.h"
#include "productkeycheck.h"
-#include "kdupdaterupdateoperations.h"
+#include "updateoperations.h"
#include <QtCore/QDir>
#include <QtCore/QDirIterator>
diff --git a/src/libs/installer/downloadarchivesjob.cpp b/src/libs/installer/downloadarchivesjob.cpp
index 828e7f99a..536a8963f 100644
--- a/src/libs/installer/downloadarchivesjob.cpp
+++ b/src/libs/installer/downloadarchivesjob.cpp
@@ -39,8 +39,8 @@
#include "packagemanagercore.h"
#include "utils.h"
-#include "kdupdaterfiledownloader.h"
-#include "kdupdaterfiledownloaderfactory.h"
+#include "filedownloader.h"
+#include "filedownloaderfactory.h"
#include <QtCore/QFile>
#include <QtCore/QTimerEvent>
diff --git a/src/libs/installer/downloadarchivesjob.h b/src/libs/installer/downloadarchivesjob.h
index 61600c596..e1359de71 100644
--- a/src/libs/installer/downloadarchivesjob.h
+++ b/src/libs/installer/downloadarchivesjob.h
@@ -35,7 +35,7 @@
#ifndef DOWNLOADARCHIVESJOB_H
#define DOWNLOADARCHIVESJOB_H
-#include <kdjob.h>
+#include "job.h"
#include <QtCore/QPair>
diff --git a/src/libs/installer/downloadfiletask.h b/src/libs/installer/downloadfiletask.h
index 2d0d4cf41..63134e3be 100644
--- a/src/libs/installer/downloadfiletask.h
+++ b/src/libs/installer/downloadfiletask.h
@@ -36,7 +36,7 @@
#define DOWNLOADFILETASK_H
#include "abstractfiletask.h"
-#include "kdupdaterfiledownloaderfactory.h"
+#include "filedownloaderfactory.h"
#include <QAuthenticator>
Q_DECLARE_METATYPE(QAuthenticator)
diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp
index cedf93a8b..117eed54f 100644
--- a/src/libs/installer/init.cpp
+++ b/src/libs/installer/init.cpp
@@ -57,8 +57,8 @@
#include "lib7z_facade.h"
#include "utils.h"
-#include "kdupdaterupdateoperationfactory.h"
-#include "kdupdaterfiledownloaderfactory.h"
+#include "updateoperationfactory.h"
+#include "filedownloaderfactory.h"
#include <QtPlugin>
#include <QElapsedTimer>
diff --git a/src/libs/installer/metadatajob.h b/src/libs/installer/metadatajob.h
index 5dbb5d833..4369c5566 100644
--- a/src/libs/installer/metadatajob.h
+++ b/src/libs/installer/metadatajob.h
@@ -37,7 +37,7 @@
#include "downloadfiletask.h"
#include "fileutils.h"
-#include "kdjob.h"
+#include "job.h"
#include "repository.h"
#include <QFutureWatcher>
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index ddd35b974..7ee6f5e06 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -65,8 +65,8 @@
#include <QDesktopServices>
#include <QFileDialog>
-#include "kdsysinfo.h"
-#include "kdupdaterupdateoperationfactory.h"
+#include "sysinfo.h"
+#include "updateoperationfactory.h"
#ifdef Q_OS_WIN
# include "qt_windows.h"
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index f240a309f..cfa7574ad 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -55,9 +55,9 @@
#include "componentchecker.h"
#include "globals.h"
-#include "kdselfrestarter.h"
-#include "kdupdaterfiledownloaderfactory.h"
-#include "kdupdaterupdateoperationfactory.h"
+#include "selfrestarter.h"
+#include "filedownloaderfactory.h"
+#include "updateoperationfactory.h"
#include <productkeycheck.h>
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index 6a7db3edb..62a36f30f 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -42,8 +42,8 @@
#include "packagesource.h"
#include "qinstallerglobal.h"
-#include "kdsysinfo.h"
-#include "kdupdaterupdatefinder.h"
+#include "sysinfo.h"
+#include "updatefinder.h"
#include <QObject>
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 116a9e039..22092cfdd 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -46,7 +46,7 @@
#include "scriptengine.h"
#include "productkeycheck.h"
-#include "kdsysinfo.h"
+#include "sysinfo.h"
#include <QApplication>
diff --git a/src/libs/installer/packagemanagerpagefactory.h b/src/libs/installer/packagemanagerpagefactory.h
index ee8b8ff66..928fc53bc 100644
--- a/src/libs/installer/packagemanagerpagefactory.h
+++ b/src/libs/installer/packagemanagerpagefactory.h
@@ -35,7 +35,7 @@
#ifndef PACKAGEMANAGERPAGEFACTORY_H
#define PACKAGEMANAGERPAGEFACTORY_H
-#include "kdgenericfactory.h"
+#include "genericfactory.h"
#include "qinstallerglobal.h"
namespace QInstaller {
diff --git a/src/libs/installer/packagemanagerproxyfactory.h b/src/libs/installer/packagemanagerproxyfactory.h
index 34b834807..28f53df6e 100644
--- a/src/libs/installer/packagemanagerproxyfactory.h
+++ b/src/libs/installer/packagemanagerproxyfactory.h
@@ -35,7 +35,7 @@
#ifndef PACKAGEMANAGERPROXYFACTORY_H
#define PACKAGEMANAGERPROXYFACTORY_H
-#include "kdupdaterfiledownloaderfactory.h"
+#include "filedownloaderfactory.h"
namespace QInstaller {
diff --git a/src/libs/installer/qinstallerglobal.h b/src/libs/installer/qinstallerglobal.h
index 4831d99f3..a03daf6a4 100644
--- a/src/libs/installer/qinstallerglobal.h
+++ b/src/libs/installer/qinstallerglobal.h
@@ -37,8 +37,8 @@
#include <installer_global.h>
-#include <kdupdaterupdate.h>
-#include <kdupdaterupdateoperation.h>
+#include "update.h"
+#include "updateoperation.h"
#include "localpackagehub.h"
namespace QInstaller {
diff --git a/src/libs/installer/repository.cpp b/src/libs/installer/repository.cpp
index 8911b3950..dda22bb59 100644
--- a/src/libs/installer/repository.cpp
+++ b/src/libs/installer/repository.cpp
@@ -33,7 +33,7 @@
**************************************************************************/
#include "repository.h"
-#include "kdupdaterfiledownloaderfactory.h"
+#include "filedownloaderfactory.h"
#include <QDataStream>
#include <QFileInfo>
diff --git a/src/libs/installer/selfrestartoperation.cpp b/src/libs/installer/selfrestartoperation.cpp
index 4c6965176..7b0358b86 100644
--- a/src/libs/installer/selfrestartoperation.cpp
+++ b/src/libs/installer/selfrestartoperation.cpp
@@ -35,7 +35,7 @@
#include "selfrestartoperation.h"
#include "packagemanagercore.h"
-#include <kdselfrestarter.h>
+#include "selfrestarter.h"
using namespace QInstaller;
diff --git a/src/libs/installer/settingsoperation.cpp b/src/libs/installer/settingsoperation.cpp
index 9884a95e9..d2d91872c 100644
--- a/src/libs/installer/settingsoperation.cpp
+++ b/src/libs/installer/settingsoperation.cpp
@@ -33,7 +33,7 @@
**************************************************************************/
#include "settingsoperation.h"
#include "packagemanagercore.h"
-#include "kdupdaterupdateoperations.h"
+#include "updateoperations.h"
#include "qsettingswrapper.h"
#include <QDir>
diff --git a/src/libs/installer/sysinfo_win.cpp b/src/libs/installer/sysinfo_win.cpp
index 969ab69d3..6bca3e304 100644
--- a/src/libs/installer/sysinfo_win.cpp
+++ b/src/libs/installer/sysinfo_win.cpp
@@ -32,7 +32,7 @@
**
**************************************************************************/
-#include "kdsysinfo.h"
+#include "sysinfo.h"
#include "link.h"
#ifdef Q_CC_MINGW
diff --git a/src/libs/installer/testrepository.h b/src/libs/installer/testrepository.h
index a056b60e4..4116f1967 100644
--- a/src/libs/installer/testrepository.h
+++ b/src/libs/installer/testrepository.h
@@ -35,7 +35,7 @@
#define TESTREPOSITORY_H
#include "downloadfiletask.h"
-#include "kdjob.h"
+#include "job.h"
#include "repository.h"
#include <QFutureWatcher>
@@ -44,7 +44,6 @@
namespace QInstaller {
class PackageManagerCore;
-class Repository;
class INSTALLER_EXPORT TestRepository : public KDJob
{