From 48654f2d61e9b7065664031d2fecadd7b07ca139 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 17 Nov 2011 19:29:36 +0100 Subject: Remove KDToolsCore/pimpl_ptr from elavatedexecuteoperation.h Change-Id: Ia767d4596552e2bba54a1994247a64b20a968000 Reviewed-by: Karsten Heimrich Reviewed-by: Niels Weber --- installerbuilder/libinstaller/elevatedexecuteoperation.cpp | 13 +++++++------ installerbuilder/libinstaller/elevatedexecuteoperation.h | 8 +++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/installerbuilder/libinstaller/elevatedexecuteoperation.cpp b/installerbuilder/libinstaller/elevatedexecuteoperation.cpp index e21940c57..2c2bcfcc2 100644 --- a/installerbuilder/libinstaller/elevatedexecuteoperation.cpp +++ b/installerbuilder/libinstaller/elevatedexecuteoperation.cpp @@ -45,7 +45,7 @@ using namespace QInstaller; class ElevatedExecuteOperation::Private { public: - explicit Private(ElevatedExecuteOperation* qq) + explicit Private(ElevatedExecuteOperation *qq) : q(qq), process(0), showStandardError(false) { } @@ -54,13 +54,13 @@ public: } private: - ElevatedExecuteOperation* const q; + ElevatedExecuteOperation *const q; public: void readProcessOutput(); - bool run(const QStringList& arguments); + bool run(const QStringList &arguments); - QProcessWrapper* process; + QProcessWrapper *process; bool showStandardError; }; @@ -73,6 +73,7 @@ ElevatedExecuteOperation::ElevatedExecuteOperation() ElevatedExecuteOperation::~ElevatedExecuteOperation() { + delete d; } bool ElevatedExecuteOperation::performOperation() @@ -96,7 +97,7 @@ bool ElevatedExecuteOperation::performOperation() return d->run(args); } -bool ElevatedExecuteOperation::Private::run(const QStringList& arguments) +bool ElevatedExecuteOperation::Private::run(const QStringList &arguments) { QStringList args = arguments; QString workingDirectory; @@ -270,7 +271,7 @@ bool ElevatedExecuteOperation::testOperation() return true; } -Operation* ElevatedExecuteOperation::clone() const +Operation *ElevatedExecuteOperation::clone() const { return new ElevatedExecuteOperation; } diff --git a/installerbuilder/libinstaller/elevatedexecuteoperation.h b/installerbuilder/libinstaller/elevatedexecuteoperation.h index 50218ee9d..9082b46a6 100644 --- a/installerbuilder/libinstaller/elevatedexecuteoperation.h +++ b/installerbuilder/libinstaller/elevatedexecuteoperation.h @@ -28,8 +28,6 @@ #include "qinstallerglobal.h" -#include - namespace QInstaller { class INSTALLER_EXPORT ElevatedExecuteOperation : public QObject, public Operation @@ -44,7 +42,7 @@ public: virtual bool performOperation(); virtual bool undoOperation(); virtual bool testOperation(); - virtual Operation* clone() const; + virtual Operation *clone() const; Q_SIGNALS: void cancelProcess(); @@ -54,10 +52,10 @@ public Q_SLOTS: void cancelOperation(); private: - Q_PRIVATE_SLOT( d, void readProcessOutput() ); + Q_PRIVATE_SLOT(d, void readProcessOutput()) class Private; - kdtools::pimpl_ptr< Private > d; + Private *d; }; } // namespace -- cgit v1.2.3