Imported Upstream version 0.6.0

[debian/confclerk.git] / src / mvc / room.h

diff --git a/src/mvc/room.h b/src/mvc/room.h
index 2710c24208cf5343e1522907e4a68e31b3682fbf..613a5146b74459f9495059c75e2a0ee824f498a5 100644 (file)
--- a/src/mvc/room.h
+++ b/src/mvc/room.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011 Philipp Spitzer, gregor herrmann
+ * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -21,7 +21,7 @@
 #ifndef ROOM_H_
 #define ROOM_H_
 
-#include <ormrecord.h>
+#include "ormrecord.h"
 
 class Room : public OrmRecord<Room>
 {
@@ -35,14 +35,6 @@ public:
     void setId(int id) { setValue("id", id); }
     QString name() const { return value("name").toString(); }
     void setName(const QString & type) { setValue("name", type); }
-    // TODO: make naming consistent - either "picture" or "map"
-    QVariant map() const { return value("picture"); }
-    bool hasMap() const
-    {
-        // empty strings also treasted as NULL,
-        // as storing NULLs requires rewrite of storing code and DB scheme
-        return !isNull("picture") and !value("picture").toString().isEmpty();
-    }
     int insert();
 public:
     static QList<Room> getAll();