Changes: removed locations singleton.

[ptas] / zouba / src / locations.cpp

diff --git a/zouba/src/locations.cpp b/zouba/src/locations.cpp
index 04cf6ab..358a2cc 100644 (file)
--- a/zouba/src/locations.cpp
+++ b/zouba/src/locations.cpp
@@ -8,26 +8,24 @@
 #include <QCoreApplication>
 
 QHash<QString,Location *> Locations::locationHash;
-Locations Locations::singleton;
+bool Locations::initialised = false;
 
 Locations::Locations()
 {
-  QCoreApplication::setOrganizationName("ZouBa");
-  QCoreApplication::setOrganizationDomain("zouba.yi.org");
-  QCoreApplication::setOrganizationName("ZouBa");
-
-  restoreLocations();
+    if ( !initialised ) {
+        QCoreApplication::setOrganizationName("ZouBa");
+        QCoreApplication::setOrganizationDomain("zouba.yi.org");
+        QCoreApplication::setOrganizationName("ZouBa");
+
+        restoreLocations();
+        initialised = true;
+    }
 }
 
 Locations::~Locations()
 {
 }
 
-Locations *Locations::instance()
-{
-  return &singleton;
-}
-
 bool Locations::addLocation( Location *location )
 {
   bool succeeded=false;