diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-07-28 16:15:13 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-08-29 12:39:58 +0200 |
| commit | cf60ba8b28282d9ab08e53850b5d65a4454966f3 (patch) | |
| tree | e4ca47243445507c84aeae7af1e2b31ad34ece39 /src/libs/installer/binaryformatenginehandler.cpp | |
| parent | 42d2b1ba06ad38fe938bc69f34f0d5714b1f201b (diff) | |
Make BinaryFormatEngineHandler a real singleton.
It is really needed only once.
Change-Id: I0b2231432541c2781afe55105f88809db4fe19e1
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/libs/installer/binaryformatenginehandler.cpp')
| -rw-r--r-- | src/libs/installer/binaryformatenginehandler.cpp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/libs/installer/binaryformatenginehandler.cpp b/src/libs/installer/binaryformatenginehandler.cpp index b5af66493..8df9249bc 100644 --- a/src/libs/installer/binaryformatenginehandler.cpp +++ b/src/libs/installer/binaryformatenginehandler.cpp @@ -46,26 +46,6 @@ namespace QInstaller { -static BinaryFormatEngineHandler *s_instance = 0; - -BinaryFormatEngineHandler::BinaryFormatEngineHandler() -{ - s_instance = this; -} - -BinaryFormatEngineHandler::BinaryFormatEngineHandler(const BinaryFormatEngineHandler &other) - : QAbstractFileEngineHandler() -{ - Q_UNUSED(other) - s_instance = this; -} - -BinaryFormatEngineHandler::~BinaryFormatEngineHandler() -{ - if (s_instance == this) - s_instance = 0; -} - QAbstractFileEngine *BinaryFormatEngineHandler::create(const QString &fileName) const { return fileName.startsWith(QLatin1String("installer://"), Qt::CaseInsensitive ) @@ -79,7 +59,8 @@ void BinaryFormatEngineHandler::reset() BinaryFormatEngineHandler *BinaryFormatEngineHandler::instance() { - return s_instance; + static BinaryFormatEngineHandler instance; + return &instance; } void BinaryFormatEngineHandler::registerResources(const QList<ResourceCollection> &collections) |