Changeset 9208bdb in confclerk_git for src/mvc

Timestamp:

01/19/10 21:58:29 (13 years ago)

Author:

korrco <korrco@…>

Branches:

master, qt5

Children:

1fe2f21

Parents:

395d6d3

Message:

support for view activities with their names added

Location:

src/mvc

Files:

• activity.cpp (added)
• activity.h (added)
• eventmodel.cpp (modified) (3 diffs)
• mvc.pro (modified) (3 diffs)

src/mvc/eventmodel.cpp

@@ -1 +1 @@
 #include "eventmodel.h"
 #include <conference.h>
+#include <activity.h>
 
 EventModel::EventModel()
@@ -51 +52 @@
     }
     int activityId = mEvents.first().activityId();
-    //TODO korinpa: get activity name
-    mGroups << EventModel::Group(QString("activity %1").arg(activityId), 0);
+
+    mGroups << EventModel::Group(Activity::getActivityName(activityId), 0);
     int nextActivityId = activityId;
 
@@ -61 +62 @@
         {
             mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;
-            mGroups << EventModel::Group(QString("activity %1").arg(activityId), 0);
-            //int nextActivityId = activityId;
+            mGroups << EventModel::Group(Activity::getActivityName(activityId), i);
+            nextActivityId = activityId;
         }
         // add parent-child relation

src/mvc/mvc.pro

@@ -7 +7 @@
 
 # module dependencies
-LIBS += -L$$DESTDIR -lorm
+LIBS += -L$$DESTDIR \
+    -lorm
 INCLUDEPATH += ../orm
-DEPENDPATH += . ../orm
+DEPENDPATH += . \
+    ../orm
 TARGETDEPS += $$DESTDIR/liborm.a
-maemo {
-    LIBS += -L$$DESTDIR -lqalarm -lalarm
+maemo { 
+    LIBS += -L$$DESTDIR \
+        -lqalarm \
+        -lalarm
     INCLUDEPATH += ../alarm
-    DEPENDPATH +=  ../alarm
+    DEPENDPATH += ../alarm
     TARGETDEPS += $$DESTDIR/libqalarm.a
 }
-
-HEADERS += \
+HEADERS += activity.h \
     event.h \
     conference.h \
@@ -24 +27 @@
     eventmodel.h \
     treeview.h
-SOURCES += \
+SOURCES += activity.cpp \
     event.cpp \
     conference.cpp \
@@ -30 +33 @@
     eventmodel.cpp \
     treeview.cpp
-