fix some more header includes

[toast/confclerk.git] / src / mvc / conference.h

diff --git a/src/mvc/conference.h b/src/mvc/conference.h
index bc25d08058b2ba1075325046480d26006b8b2bd1..bc296dd809f18c5bad3e553eb9e79cc432fbffce 100644 (file)
--- a/src/mvc/conference.h
+++ b/src/mvc/conference.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
+ * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -23,7 +24,7 @@
 #include <QVector>
 #include <QStringList>
 
-#include <ormrecord.h>
+#include "ormrecord.h"
 
 class Conference : public OrmRecord<Conference>
 {
@@ -34,7 +35,7 @@ public:
 public:
     static Conference getById(int id);
     static QList<Conference> getAll();
-    static int activeConference();
+    static int activeConference(); ///< returns -1 if no conference is active
     static void deleteConference(int id);
 
 public:
@@ -50,7 +51,6 @@ public:
     int timeslotDuration() const { return value("timeslot_duration").toInt(); } // in seconds
     bool isActive() const { return value("active").toBool(); }
     QString url() const { return stringFromNullable(value("url")); }
-    QString map() const { return stringFromNullable(value("map")); }
 
     #if 0
     void setId(int id) { setValue("id", id); }