Location selector and edit window finished

[ptas] / zouba / src / locations.h

diff --git a/zouba/src/locations.h b/zouba/src/locations.h
index fa74faa..0ed119c 100644 (file)
--- a/zouba/src/locations.h
+++ b/zouba/src/locations.h
@@ -4,30 +4,49 @@
 #include "location.h"
 
 #include <QHash>
+#include <QList>
 #include <QString>
 #include <QObject>
 
 class Locations: public QObject
 {
-  Q_OBJECT
+    Q_OBJECT
 
 public:
-  Locations();
-  ~Locations();
+    static Locations *GetInstance();
+    //static void destroyLocations();
 
-  static Locations *instance();
-  bool addLocation( Location *location );
+    bool addEditLocation(Location *location);
+    bool removeLocation(Location *location);
 
-  Location *location( const QString &label );
+    bool increaseLocationIndex(const QString &label);
+    bool lowerLocationIndex(const QString &label);
 
-public Q_SLOTS:
-  void saveLocation();
+    Location *getLocation(const QString &label) const;
+    Location *getLocation(const int&) const;
+    Location *getGpsLocation() const;
+    int size() const;
+
+    //const QHash<QString, Location *>& getLocations() const;
+
+signals:
+    void locationsChanged();
 
 private:
-  void restoreLocations();
-  static QHash<QString,Location *> locationHash;
-  static bool initialised;
+    Locations();
+    //~Locations();
+    Locations(const Locations&);
+    void operator=(const Locations&);
+
+    void restoreLocations();
+    void saveLocation(Location *location);
+    bool findLabel(const int &index, QString &label) const;
+    void changeIndex(const QString &label, const int &index, bool signal = true);
+
+    QHash<QString, Location*> m_locationStorage;
+    QList<QString> m_indexStorage;
+    Location* m_gpsLocation;
 
-  void saveLocation( Location *location );
+    static Locations *m_instance;
 };
 #endif // LOCATIONS_H