[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kmymoney] kmymoney/mymoney: Prevent static initialization order fiasco in onlineJobAdministration
From:       Christian_Dávid <christian-david () web ! de>
Date:       2016-07-31 19:39:50
Message-ID: E1bTwaU-0001ZQ-Lh () code ! kde ! org
[Download RAW message or body]

Git commit b99032b87895ff6f987b4a2a1ff74acf6e5823d6 by Christian Dávid.
Committed on 30/07/2016 at 21:21.
Pushed by christiand into branch 'master'.

Prevent static initialization order fiasco in onlineJobAdministration

Actually there is no use in calling onlineJobAdministration before
KMyMoney was fully loaded but who knows…

M  +0    -2    kmymoney/mymoney/onlinejobadministration.cpp
M  +1    -2    kmymoney/mymoney/onlinejobadministration.h

http://commits.kde.org/kmymoney/b99032b87895ff6f987b4a2a1ff74acf6e5823d6

diff --git a/kmymoney/mymoney/onlinejobadministration.cpp b/kmymoney/mymoney/onlinejobadministration.cpp
index 4542d9b..5265874 100644
--- a/kmymoney/mymoney/onlinejobadministration.cpp
+++ b/kmymoney/mymoney/onlinejobadministration.cpp
@@ -41,8 +41,6 @@
 #include "onlinetasks/unavailabletask/tasks/unavailabletask.h"
 #include "onlinetasks/interfaces/tasks/credittransfer.h"
 
-onlineJobAdministration onlineJobAdministration::m_instance;
-
 onlineJobAdministration::onlineJobAdministration(QObject *parent) :
     QObject(parent)
 {
diff --git a/kmymoney/mymoney/onlinejobadministration.h b/kmymoney/mymoney/onlinejobadministration.h
index 0d668ac..e72d1a6 100644
--- a/kmymoney/mymoney/onlinejobadministration.h
+++ b/kmymoney/mymoney/onlinejobadministration.h
@@ -80,6 +80,7 @@ public:
   QStringList availableOnlineTasks();
 
   static onlineJobAdministration* instance() {
+    static onlineJobAdministration m_instance;
     return &m_instance;
   }
 
@@ -229,8 +230,6 @@ public slots:
   void updateOnlineTaskProperties();
 
 private:
-  static onlineJobAdministration m_instance;
-
   /**
    * @brief Find onlinePlugin which is responsible for accountId
    * @param accountId

[prev in list] [next in list] [prev in thread] [next in thread]