Changeset 807cbdb in confclerk_git for src/mvc

Timestamp:

01/20/10 13:26:30 (13 years ago)

Author:

korrco <korrco@…>

Branches:

master, qt5

Children:

b8fda99

Parents:

5d7c9e5

Message:

static allocation instead of dynamic added when creating activity map

Location:

src/mvc

Files:

• activity.cpp (modified) (3 diffs)
• activity.h (modified) (2 diffs)

src/mvc/activity.cpp

@@ -15 +15 @@
     << QSqlField("name", QVariant::String));
 
+QMap<int, Activity> Activity::mIdToActivity;
+
 QList<Activity> Activity::getAll()
 {
@@ -22 +24 @@
 }
 
-QMap<int, Activity>* Activity::mIdToActivity = 0;
-
 void Activity::updateActivityMap()
 {
-    if (mIdToActivity)
-    {
-        delete mIdToActivity;
-    }
-    mIdToActivity = new QMap<int, Activity>;
+    mIdToActivity.clear();
     QList<Activity> activityList = Activity::getAll();
     Activity activity;
     for (int id = 0; id < activityList.count(); ++id) {
         activity = activityList.at(id);
-        mIdToActivity->insert(activity.id(), activity);
+        mIdToActivity.insert(activity.id(), activity);
     }
 }
@@ -41 +37 @@
 QString Activity::getActivityName(int id)
 {
-    QString name = mIdToActivity->value(id).name();
+    QString name = mIdToActivity.value(id).name();
     if (name == "") {
         qDebug() << QString("Error: undefined activity name for id %1").arg(id);

src/mvc/activity.h

@@ -18 +18 @@
     static const int sTableColCount;
 public:
+    static QMap<int, Activity> mIdToActivity;
+public:
     static QList<Activity> getAll();
     int id() const { return value("id").toInt(); }
@@ -26 +28 @@
     static void updateActivityMap();
     static QString getActivityName(int id);
-private:
-    static QMap<int, Activity>* mIdToActivity;
 };