summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2013-04-23 19:20:31 +0200
committerTim Jenssen <tim.jenssen@digia.com>2013-04-24 11:04:33 +0200
commitb8401cdb6408c904e2f9243efe4da7130c33c80b (patch)
treea599fd5159aefeb708d14b9e6bebbae9d808e287 /src
parent20fc67fdf1569dc349ae2b703ff911fbcf72836d (diff)
reformat initialize list of classes
Change-Id: I4107c571497a98b962716bd7915c29fb50d70108 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/libs/installer/binaryformat.cpp24
-rw-r--r--src/libs/installer/binaryformatengine.cpp6
-rw-r--r--src/libs/installer/binaryformatenginehandler.cpp4
-rw-r--r--src/libs/installer/component_p.cpp22
-rw-r--r--src/libs/installer/downloadarchivesjob.cpp16
-rw-r--r--src/libs/installer/elevatedexecuteoperation.cpp4
-rw-r--r--src/libs/installer/fileutils.cpp6
-rw-r--r--src/libs/installer/fsengineclient.cpp20
-rw-r--r--src/libs/installer/fsengineserver.cpp10
-rw-r--r--src/libs/installer/getrepositoriesmetainfojob.cpp10
-rw-r--r--src/libs/installer/getrepositorymetainfojob.cpp14
-rw-r--r--src/libs/installer/lib7z_facade.cpp24
-rw-r--r--src/libs/installer/performinstallationform.cpp12
-rw-r--r--src/libs/installer/progresscoordinator.cpp14
-rw-r--r--src/libs/installer/qprocesswrapper.cpp10
-rw-r--r--src/libs/installer/qsettingswrapper.cpp30
16 files changed, 114 insertions, 112 deletions
diff --git a/src/libs/installer/binaryformat.cpp b/src/libs/installer/binaryformat.cpp
index c5168dcb8..c6562f333 100644
--- a/src/libs/installer/binaryformat.cpp
+++ b/src/libs/installer/binaryformat.cpp
@@ -256,18 +256,18 @@ qint64 QInstaller::findMagicCookie(QFile *in, quint64 magicCookie)
pre-zipped and gets delivered as it is. If it's a directory, it gets zipped by Archive.
*/
Archive::Archive(const QString &path)
- : m_device(0),
- m_isTempFile(false),
- m_path(path),
- m_name(QFileInfo(path).fileName().toUtf8())
+ : m_device(0)
+ , m_isTempFile(false)
+ , m_path(path)
+ , m_name(QFileInfo(path).fileName().toUtf8())
{
}
Archive::Archive(const QByteArray &identifier, const QByteArray &data)
- : m_device(0),
- m_isTempFile(true),
- m_path(generateTemporaryFileName()),
- m_name(identifier)
+ : m_device(0)
+ , m_isTempFile(true)
+ , m_path(generateTemporaryFileName())
+ , m_name(identifier)
{
QFile file(m_path);
file.open(QIODevice::WriteOnly);
@@ -278,10 +278,10 @@ Archive::Archive(const QByteArray &identifier, const QByteArray &data)
Creates an archive identified by \a identifier providing a data \a segment within a \a device.
*/
Archive::Archive(const QByteArray &identifier, const QSharedPointer<QFile> &device, const Range<qint64> &segment)
- : m_device(device),
- m_segment(segment),
- m_isTempFile(false),
- m_name(identifier)
+ : m_device(device)
+ , m_segment(segment)
+ , m_isTempFile(false)
+ , m_name(identifier)
{
}
diff --git a/src/libs/installer/binaryformatengine.cpp b/src/libs/installer/binaryformatengine.cpp
index e2fd00b82..416e8ca56 100644
--- a/src/libs/installer/binaryformatengine.cpp
+++ b/src/libs/installer/binaryformatengine.cpp
@@ -49,9 +49,9 @@ class StringListIterator : public QAbstractFileEngineIterator
{
public:
StringListIterator( const QStringList &list, QDir::Filters filters, const QStringList &nameFilters)
- : QAbstractFileEngineIterator(filters, nameFilters),
- list(list),
- index(-1)
+ : QAbstractFileEngineIterator(filters, nameFilters)
+ , list(list)
+ , index(-1)
{
}
diff --git a/src/libs/installer/binaryformatenginehandler.cpp b/src/libs/installer/binaryformatenginehandler.cpp
index e6bf7864f..d872ed229 100644
--- a/src/libs/installer/binaryformatenginehandler.cpp
+++ b/src/libs/installer/binaryformatenginehandler.cpp
@@ -69,8 +69,8 @@ BinaryFormatEngineHandler::BinaryFormatEngineHandler(const ComponentIndex &index
}
BinaryFormatEngineHandler::BinaryFormatEngineHandler(const BinaryFormatEngineHandler &other)
- : QAbstractFileEngineHandler(),
- d(new Private(other.d->index))
+ : QAbstractFileEngineHandler()
+ , d(new Private(other.d->index))
{
s_instance = this;
}
diff --git a/src/libs/installer/component_p.cpp b/src/libs/installer/component_p.cpp
index 7af7a43b2..621329b50 100644
--- a/src/libs/installer/component_p.cpp
+++ b/src/libs/installer/component_p.cpp
@@ -59,17 +59,17 @@ namespace QInstaller {
// -- ComponentPrivate
ComponentPrivate::ComponentPrivate(PackageManagerCore *core, Component *qq)
- : q(qq),
- m_core(core),
- m_parentComponent(0),
- m_licenseOperation(0),
- m_minimumProgressOperation(0),
- m_newlyInstalled (false),
- m_operationsCreated(false),
- m_autoCreateOperations(true),
- m_operationsCreatedSuccessfully(true),
- m_updateIsAvailable(false),
- m_scriptEngine(0)
+ : q(qq)
+ , m_core(core)
+ , m_parentComponent(0)
+ , m_licenseOperation(0)
+ , m_minimumProgressOperation(0)
+ , m_newlyInstalled (false)
+ , m_operationsCreated(false)
+ , m_autoCreateOperations(true)
+ , m_operationsCreatedSuccessfully(true)
+ , m_updateIsAvailable(false)
+ , m_scriptEngine(0)
{
}
diff --git a/src/libs/installer/downloadarchivesjob.cpp b/src/libs/installer/downloadarchivesjob.cpp
index 1cfb2ffec..24fba689a 100644
--- a/src/libs/installer/downloadarchivesjob.cpp
+++ b/src/libs/installer/downloadarchivesjob.cpp
@@ -60,14 +60,14 @@ using namespace KDUpdater;
Creates a new DownloadArchivesJob with \a parent.
*/
DownloadArchivesJob::DownloadArchivesJob(PackageManagerCore *core)
- : KDJob(core),
- m_core(core),
- m_downloader(0),
- m_archivesDownloaded(0),
- m_archivesToDownloadCount(0),
- m_canceled(false),
- m_lastFileProgress(0),
- m_progressChangedTimerId(0)
+ : KDJob(core)
+ , m_core(core)
+ , m_downloader(0)
+ , m_archivesDownloaded(0)
+ , m_archivesToDownloadCount(0)
+ , m_canceled(false)
+ , m_lastFileProgress(0)
+ , m_progressChangedTimerId(0)
{
setCapabilities(Cancelable);
}
diff --git a/src/libs/installer/elevatedexecuteoperation.cpp b/src/libs/installer/elevatedexecuteoperation.cpp
index 0aa8c101d..04ca8bb91 100644
--- a/src/libs/installer/elevatedexecuteoperation.cpp
+++ b/src/libs/installer/elevatedexecuteoperation.cpp
@@ -54,7 +54,9 @@ class ElevatedExecuteOperation::Private
{
public:
explicit Private(ElevatedExecuteOperation *qq)
- : q(qq), process(0), showStandardError(false)
+ : q(qq)
+ , process(0)
+ , showStandardError(false)
{
}
diff --git a/src/libs/installer/fileutils.cpp b/src/libs/installer/fileutils.cpp
index 87d46282d..77a54ed4d 100644
--- a/src/libs/installer/fileutils.cpp
+++ b/src/libs/installer/fileutils.cpp
@@ -304,9 +304,9 @@ class RemoveDirectoryThread : public QThread
{
public:
explicit RemoveDirectoryThread(const QString &path, bool ignoreErrors = false, QObject *parent = 0)
- : QThread(parent),
- p(path),
- ignore(ignoreErrors)
+ : QThread(parent)
+ , p(path)
+ , ignore(ignoreErrors)
{
}
diff --git a/src/libs/installer/fsengineclient.cpp b/src/libs/installer/fsengineclient.cpp
index 7822ed65b..62e3cf871 100644
--- a/src/libs/installer/fsengineclient.cpp
+++ b/src/libs/installer/fsengineclient.cpp
@@ -169,9 +169,9 @@ class FSEngineClientIterator : public QAbstractFileEngineIterator
{
public:
FSEngineClientIterator(QDir::Filters filters, const QStringList &nameFilters, const QStringList &files)
- : QAbstractFileEngineIterator(filters, nameFilters),
- entries(files),
- index(-1)
+ : QAbstractFileEngineIterator(filters, nameFilters)
+ , entries(files)
+ , index(-1)
{
}
@@ -588,13 +588,13 @@ class FSEngineClientHandler::Private
{
public:
Private()
- : mutex(QMutex::Recursive),
- port(0),
- startServerAsAdmin(false),
- serverStarted(false),
- serverStarting(false),
- active(false),
- thread(new StillAliveThread)
+ : mutex(QMutex::Recursive)
+ , port(0)
+ , startServerAsAdmin(false)
+ , serverStarted(false)
+ , serverStarting(false)
+ , active(false)
+ , thread(new StillAliveThread)
{
thread->moveToThread(thread);
}
diff --git a/src/libs/installer/fsengineserver.cpp b/src/libs/installer/fsengineserver.cpp
index 76992c241..ae8fc0346 100644
--- a/src/libs/installer/fsengineserver.cpp
+++ b/src/libs/installer/fsengineserver.cpp
@@ -129,11 +129,11 @@ class FSEngineConnectionThread : public QThread
Q_OBJECT
public:
FSEngineConnectionThread(descriptor_t socketDescriptor, QObject *parent)
- : QThread(parent),
- descriptor(socketDescriptor),
- settings(0),
- process(0),
- signalReceiver(0)
+ : QThread(parent)
+ , descriptor(socketDescriptor)
+ , settings(0)
+ , process(0)
+ , signalReceiver(0)
{}
protected:
diff --git a/src/libs/installer/getrepositoriesmetainfojob.cpp b/src/libs/installer/getrepositoriesmetainfojob.cpp
index 7604bcf06..99b7e4340 100644
--- a/src/libs/installer/getrepositoriesmetainfojob.cpp
+++ b/src/libs/installer/getrepositoriesmetainfojob.cpp
@@ -53,11 +53,11 @@ using namespace QInstaller;
// -- GetRepositoriesMetaInfoJob
GetRepositoriesMetaInfoJob::GetRepositoriesMetaInfoJob(PackageManagerCorePrivate *corePrivate)
- : KDJob(corePrivate),
- m_canceled(false),
- m_silentRetries(3),
- m_haveIgnoredError(false),
- m_corePrivate(corePrivate)
+ : KDJob(corePrivate)
+ , m_canceled(false)
+ , m_silentRetries(3)
+ , m_haveIgnoredError(false)
+ , m_corePrivate(corePrivate)
{
setCapabilities(Cancelable);
}
diff --git a/src/libs/installer/getrepositorymetainfojob.cpp b/src/libs/installer/getrepositorymetainfojob.cpp
index 20b312376..df7d02744 100644
--- a/src/libs/installer/getrepositorymetainfojob.cpp
+++ b/src/libs/installer/getrepositorymetainfojob.cpp
@@ -112,13 +112,13 @@ private:
// -- GetRepositoryMetaInfoJob
GetRepositoryMetaInfoJob::GetRepositoryMetaInfoJob(PackageManagerCorePrivate *corePrivate, QObject *parent)
- : KDJob(parent),
- m_canceled(false),
- m_silentRetries(4),
- m_retriesLeft(m_silentRetries),
- m_downloader(0),
- m_waitForDone(false),
- m_corePrivate(corePrivate)
+ : KDJob(parent)
+ , m_canceled(false)
+ , m_silentRetries(4)
+ , m_retriesLeft(m_silentRetries)
+ , m_downloader(0)
+ , m_waitForDone(false)
+ , m_corePrivate(corePrivate)
{
setCapabilities(Cancelable);
}
diff --git a/src/libs/installer/lib7z_facade.cpp b/src/libs/installer/lib7z_facade.cpp
index 962a9d46a..545400afb 100644
--- a/src/libs/installer/lib7z_facade.cpp
+++ b/src/libs/installer/lib7z_facade.cpp
@@ -100,9 +100,9 @@ namespace {
*/
struct DirectoryGuard {
explicit DirectoryGuard(const QString &path)
- : m_path(path),
- m_created(false),
- m_released(false)
+ : m_path(path)
+ , m_created(false)
+ , m_released(false)
{
m_path.replace(QLatin1Char('\\'), QLatin1Char('/'));
}
@@ -725,12 +725,12 @@ class Lib7z::ExtractCallbackImpl : public IArchiveExtractCallback, public CMyUnk
public:
MY_UNKNOWN_IMP
explicit ExtractCallbackImpl(ExtractCallback* qq)
- : q(qq),
- currentIndex(0),
- arc(0),
- total(0),
- completed(0),
- device(0)
+ : q(qq)
+ , currentIndex(0)
+ , arc(0)
+ , total(0)
+ , completed(0)
+ , device(0)
{
}
@@ -1173,9 +1173,9 @@ class ExtractItemJob::Private
{
public:
Private(ExtractItemJob* qq)
- : q(qq),
- target(0),
- callback(new ExtractCallbackJobImpl(q))
+ : q(qq)
+ , target(0)
+ , callback(new ExtractCallbackJobImpl(q))
{
}
diff --git a/src/libs/installer/performinstallationform.cpp b/src/libs/installer/performinstallationform.cpp
index fae8eb293..211d8176e 100644
--- a/src/libs/installer/performinstallationform.cpp
+++ b/src/libs/installer/performinstallationform.cpp
@@ -58,12 +58,12 @@ using namespace QInstaller;
// -- PerformInstallationForm
PerformInstallationForm::PerformInstallationForm(QObject *parent)
- : QObject(parent),
- m_progressBar(0),
- m_progressLabel(0),
- m_detailsButton(0),
- m_detailsBrowser(0),
- m_updateTimer(0)
+ : QObject(parent)
+ , m_progressBar(0)
+ , m_progressLabel(0)
+ , m_detailsButton(0)
+ , m_detailsBrowser(0)
+ , m_updateTimer(0)
{
}
diff --git a/src/libs/installer/progresscoordinator.cpp b/src/libs/installer/progresscoordinator.cpp
index a0f664357..4c4a711c7 100644
--- a/src/libs/installer/progresscoordinator.cpp
+++ b/src/libs/installer/progresscoordinator.cpp
@@ -54,13 +54,13 @@ uint qHash(QPointer<QObject> key)
QT_END_NAMESPACE
ProgressCoordinator::ProgressCoordinator(QObject *parent)
- : QObject(parent),
- m_currentCompletePercentage(0),
- m_currentBasePercentage(0),
- m_manualAddedPercentage(0),
- m_reservedPercentage(0),
- m_undoMode(false),
- m_reachedPercentageBeforeUndo(0)
+ : QObject(parent)
+ , m_currentCompletePercentage(0)
+ , m_currentBasePercentage(0)
+ , m_manualAddedPercentage(0)
+ , m_reservedPercentage(0)
+ , m_undoMode(false)
+ , m_reachedPercentageBeforeUndo(0)
{
// it has to be in the main thread to be able refresh the ui with processEvents
Q_ASSERT(thread() == qApp->thread());
diff --git a/src/libs/installer/qprocesswrapper.cpp b/src/libs/installer/qprocesswrapper.cpp
index 020624425..953ad8d5f 100644
--- a/src/libs/installer/qprocesswrapper.cpp
+++ b/src/libs/installer/qprocesswrapper.cpp
@@ -54,9 +54,9 @@ class QProcessWrapper::Private
{
public:
Private(QProcessWrapper *qq)
- : q(qq),
- ignoreTimer(false),
- socket(0)
+ : q(qq)
+ , ignoreTimer(false)
+ , socket(0)
{}
bool createSocket()
@@ -119,8 +119,8 @@ public:
// -- QProcessWrapper
QProcessWrapper::QProcessWrapper(QObject *parent)
- : QObject(parent),
- d(new Private(this))
+ : QObject(parent)
+ , d(new Private(this))
{
connect(&d->process, SIGNAL(bytesWritten(qint64)), SIGNAL(bytesWritten(qint64)));
connect(&d->process, SIGNAL(aboutToClose()), SIGNAL(aboutToClose()));
diff --git a/src/libs/installer/qsettingswrapper.cpp b/src/libs/installer/qsettingswrapper.cpp
index d7cb27828..89f39a14e 100644
--- a/src/libs/installer/qsettingswrapper.cpp
+++ b/src/libs/installer/qsettingswrapper.cpp
@@ -56,38 +56,38 @@ class QSettingsWrapper::Private
{
public:
Private(const QString &organization, const QString &application)
- : native(true),
- settings(organization, application),
- socket(0)
+ : native(true)
+ , settings(organization, application)
+ , socket(0)
{
}
Private(QSettings::Scope scope, const QString &organization, const QString &application)
- : native(true),
- settings(scope, organization, application),
- socket(0)
+ : native(true)
+ , settings(scope, organization, application)
+ , socket(0)
{
}
Private(QSettings::Format format, QSettings::Scope scope, const QString &organization,
const QString &application)
- : native(format == QSettings::NativeFormat),
- settings(format, scope, organization, application),
- socket(0)
+ : native(format == QSettings::NativeFormat)
+ , settings(format, scope, organization, application)
+ , socket(0)
{
}
Private(const QString &fileName, QSettings::Format format)
- : native(format == QSettings::NativeFormat),
- fileName(fileName),
- settings(fileName, format),
- socket(0)
+ : native(format == QSettings::NativeFormat)
+ , fileName(fileName)
+ , settings(fileName, format)
+ , socket(0)
{
}
Private()
- : native(true),
- socket(0)
+ : native(true)
+ , socket(0)
{
}