Changeset 3cd9fe6 in confclerk_git for src/mvc

Timestamp:

01/20/17 20:33:09 (6 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

ea8416e

Parents:

8cb2bc7

Message:

favourite is now tristate instead of bool.

Location:

src/mvc

Files:

• event.cpp (modified) (1 diff)
• event.h (modified) (3 diffs)

src/mvc/event.cpp

@@ -32 +32 @@
     << QSqlField("type", QVariant::String)
     << QSqlField("language", QVariant::String)
-    << QSqlField("favourite", QVariant::Bool)
+    << QSqlField("favourite", QVariant::Int)
     << QSqlField("alarm", QVariant::Bool)
     << QSqlField("tag", QVariant::String)

src/mvc/event.h

@@ -36 +36 @@
 };
 
+
+enum Favourite {Favourite_no=0, Favourite_weak=2, Favourite_strong=1};
+
+
 class Event : public OrmRecord<Event>
 {
@@ -60 +64 @@
     QString type() const { return value("type").toString(); }
     QString language() const { return value("language").toString(); }
-    bool isFavourite() const { return value("favourite").toBool(); }
+    Favourite favourite() const { return static_cast<Favourite>(value("favourite").toInt()); }
+    bool isFavourite() const { return favourite() > 0; } // deprecated
     bool hasAlarm() const { return value("alarm").toBool(); }
     bool hasTimeConflict() const;
@@ -82 +87 @@
     void setType(const QString & type) { setValue("type", type); }
     void setLanguage(const QString & language) { setValue("language", language); }
-    void setFavourite(bool favourite) { setValue("favourite", (int)((favourite))); }
+    void setFavourite(Favourite favourite) { setValue("favourite", (int) favourite); }
+    void setFavourite(bool favourite) { setFavourite(favourite ? Favourite_strong : Favourite_no); } // deprecated
     void setHasAlarm(bool alarm) { setValue("alarm", (int)((alarm))); }
     void setTag(const QString& tag) { setValue("tag", tag); }