[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:05:25 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=792768b
The following commit has been merged in the master branch:
commit 792768b2116cc263d346f160fc794c3a4c454006
Author: Lasath Fernando <kde at lasath.org>
Date: Sun Jul 15 00:26:29 2012 +1000
Address George K's issues in review
---
KTp/message-filter-config-manager.cpp | 14 ++++++--------
KTp/message-processor.cpp | 13 +++++--------
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/KTp/message-filter-config-manager.cpp b/KTp/message-filter-config-manager.cpp
index c3c828b..b1a4d5b 100644
--- a/KTp/message-filter-config-manager.cpp
+++ b/KTp/message-filter-config-manager.cpp
@@ -35,16 +35,14 @@ public:
PluginConfigManager *PluginConfigManager::self()
{
- static PluginConfigManager *pcm_instance = new PluginConfigManager();
+ static PluginConfigManager *pcm_instance;
static QMutex mutex;
- if (!pcm_instance)
- {
- mutex.lock();
- if (!pcm_instance) {
- pcm_instance = new PluginConfigManager;
- }
- mutex.unlock();
+ mutex.lock();
+ if (!pcm_instance) {
+ pcm_instance = new PluginConfigManager;
}
+ mutex.unlock();
+
return pcm_instance;
}
diff --git a/KTp/message-processor.cpp b/KTp/message-processor.cpp
index 41213c8..09ab98e 100644
--- a/KTp/message-processor.cpp
+++ b/KTp/message-processor.cpp
@@ -29,21 +29,18 @@
#include <KPluginFactory>
MessageProcessor* MessageProcessor::s_instance = 0;
-static const QString serviceType = QLatin1String("KTpTextUi/MessageFilter");
MessageProcessor* MessageProcessor::instance()
{
kDebug();
static QMutex mutex;
- if (!s_instance)
- {
- mutex.lock();
- if (!s_instance) {
- s_instance = new MessageProcessor;
- }
- mutex.unlock();
+ mutex.lock();
+ if (!s_instance) {
+ s_instance = new MessageProcessor;
}
+ mutex.unlock();
+
return s_instance;
}
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list