summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <qthjk@ovi.com>2011-11-17 19:29:36 +0100
committerhjk <qthjk@ovi.com>2011-11-18 15:54:11 +0100
commit48654f2d61e9b7065664031d2fecadd7b07ca139 (patch)
tree85297ee0faf0055c604bb477b5b6b3c8d9e0b97f
parentad1b685d349bd29f8abf66b16300a92719af8104 (diff)
Remove KDToolsCore/pimpl_ptr from elavatedexecuteoperation.h
Change-Id: Ia767d4596552e2bba54a1994247a64b20a968000 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
-rw-r--r--installerbuilder/libinstaller/elevatedexecuteoperation.cpp13
-rw-r--r--installerbuilder/libinstaller/elevatedexecuteoperation.h8
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 <KDToolsCore/pimpl_ptr.h>
-
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