summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/libs/7zip/unix/unix.pri1
-rw-r--r--src/libs/installer/lib7z_facade.cpp11
-rw-r--r--src/libs/installer/unziptask.cpp1
-rw-r--r--src/libs/installer/updatesettings.cpp8
-rw-r--r--src/libs/kdtools/kdtools.pri1
5 files changed, 6 insertions, 16 deletions
diff --git a/src/libs/7zip/unix/unix.pri b/src/libs/7zip/unix/unix.pri
index 1758357f5..f5c749e24 100644
--- a/src/libs/7zip/unix/unix.pri
+++ b/src/libs/7zip/unix/unix.pri
@@ -68,7 +68,6 @@ SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/MultiStream.cpp
SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/Common/DummyOutStream.cpp
#$(7Z_OBJS): ../../Archive/7z/$(*B).cpp
-SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zCompressionMode.cpp
SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zDecode.cpp
SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zEncode.cpp
SOURCES += $$7ZIP_BASE/CPP/7zip/Archive/7z/7zExtract.cpp
diff --git a/src/libs/installer/lib7z_facade.cpp b/src/libs/installer/lib7z_facade.cpp
index e581647bc..bce30e2d9 100644
--- a/src/libs/installer/lib7z_facade.cpp
+++ b/src/libs/installer/lib7z_facade.cpp
@@ -1076,8 +1076,7 @@ class Lib7z::UpdateCallbackImpl : public IUpdateCallbackUI2, public CMyUnknownIm
{
public:
MY_UNKNOWN_IMP
- explicit UpdateCallbackImpl(UpdateCallback* qq)
- : q(qq)
+ UpdateCallbackImpl()
{
}
virtual ~UpdateCallbackImpl()
@@ -1178,8 +1177,6 @@ public:
}
private:
- UpdateCallback* const q;
-
QIODevice* target;
QStringList sourcePaths;
};
@@ -1187,9 +1184,9 @@ private:
class Lib7z::UpdateCallbackPrivate
{
public:
- explicit UpdateCallbackPrivate(UpdateCallback* qq)
+ UpdateCallbackPrivate()
{
- m_impl = new UpdateCallbackImpl(qq);
+ m_impl = new UpdateCallbackImpl;
}
UpdateCallbackImpl* impl()
@@ -1202,7 +1199,7 @@ private:
};
UpdateCallback::UpdateCallback()
- : d(new UpdateCallbackPrivate(this))
+ : d(new UpdateCallbackPrivate)
{
}
diff --git a/src/libs/installer/unziptask.cpp b/src/libs/installer/unziptask.cpp
index b3a0b6bb2..533bfba65 100644
--- a/src/libs/installer/unziptask.cpp
+++ b/src/libs/installer/unziptask.cpp
@@ -228,7 +228,6 @@ private:
private:
QString m_target;
const CArc &m_arc;
- UnzipTask *m_unzipTask;
QFutureInterface<QString> *m_futureInterface;
UInt32 m_currentIndex;
diff --git a/src/libs/installer/updatesettings.cpp b/src/libs/installer/updatesettings.cpp
index 2e876839f..133c8c98a 100644
--- a/src/libs/installer/updatesettings.cpp
+++ b/src/libs/installer/updatesettings.cpp
@@ -53,11 +53,7 @@ using namespace QInstaller;
class UpdateSettings::Private
{
public:
- Private(UpdateSettings* qq)
- : q(qq) { }
-
-private:
- UpdateSettings *const q;
+ Private() {}
public:
QSettings &settings()
@@ -81,7 +77,7 @@ QSettings *UpdateSettings::Private::externalSettings = 0;
// -- UpdateSettings
UpdateSettings::UpdateSettings()
- : d(new Private(this))
+ : d(new Private)
{
d->settings().sync();
}
diff --git a/src/libs/kdtools/kdtools.pri b/src/libs/kdtools/kdtools.pri
index 3be2550bc..520426096 100644
--- a/src/libs/kdtools/kdtools.pri
+++ b/src/libs/kdtools/kdtools.pri
@@ -13,7 +13,6 @@ HEADERS += $$PWD/kdtoolsglobal.h \
$$PWD/kdsysinfo.h
SOURCES += $$PWD/kdjob.cpp \
- $$PWD/kdgenericfactory.cpp \
$$PWD/kdselfrestarter.cpp \
$$PWD/kdrunoncechecker.cpp \
$$PWD/kdlockfile.cpp \