Remove ULB, Campus Solbosch maps.

diff --git a/TODO b/TODO
index 2bd26cb7b6d02b7f0b4957bb0d18285bf24de2cf..6f57c1f981dca74b187f6fc97faf8a508a7135f7 100644 (file)
--- a/TODO
+++ b/TODO
@@ -2,8 +2,7 @@ fosdem-schedule -> confclerk transition:
 - src/gui/about.ui
 
 FOSDEM specifics:
 - src/gui/about.ui
 
 FOSDEM specifics:

-- src/maps
-- schedule.xml
+- schedule.xml, fosdem.sql

 
 other:
 - add contact info
 
 other:
 - add contact info

diff --git a/src/app/app.pro b/src/app/app.pro
index db27fce1f9d107029e8d1649635cac587fab69e2..2fd2c4acb09926d59e0048a379006c34b2c7e54f 100644 (file)
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -31,7 +31,6 @@ SOURCES += main.cpp \
            appsettings.cpp
 
 RESOURCES += ../icons.qrc \
            appsettings.cpp
 
 RESOURCES += ../icons.qrc \

-             ../maps.qrc \

                         ../db.qrc \
                         ../../data/data.qrc
 
                         ../db.qrc \
                         ../../data/data.qrc
 

diff --git a/src/app/main.cpp b/src/app/main.cpp
index a8ca7dbbe7c8502f2a28903fcc2ef96dac314e8e..0d450f66b08d6191513741264f4b7f9a4111f037 100644 (file)
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -34,8 +34,8 @@
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(icons);
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(icons);

-    Q_INIT_RESOURCE(maps);

     Q_INIT_RESOURCE(db);
     Q_INIT_RESOURCE(db);

+    Q_INIT_RESOURCE(data);

 
     Application a(argc, argv);
     Application::setWindowIcon(QIcon(":/confclerk.svg"));
 
     Application a(argc, argv);
     Application::setWindowIcon(QIcon(":/confclerk.svg"));

diff --git a/src/maps.qrc b/src/maps.qrc
deleted file mode 100644 (file)
index de7c368..0000000
--- a/src/maps.qrc
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>maps/campus.png</file>
-    <file>maps/rooms/aw1105.png</file>
-    <file>maps/rooms/aw1115.png</file>
-    <file>maps/rooms/aw1117.png</file>
-    <file>maps/rooms/aw1120.png</file>
-    <file>maps/rooms/aw1121.png</file>
-    <file>maps/rooms/aw1124.png</file>
-    <file>maps/rooms/aw1125.png</file>
-    <file>maps/rooms/aw1126.png</file>
-    <file>maps/rooms/chavanne.png</file>
-    <file>maps/rooms/ferrer.png</file>
-    <file>maps/rooms/guillissen.png</file>
-    <file>maps/rooms/h1301.png</file>
-    <file>maps/rooms/h1302.png</file>
-    <file>maps/rooms/h1308.png</file>
-    <file>maps/rooms/h1309.png</file>
-    <file>maps/rooms/h2111.png</file>
-    <file>maps/rooms/h2213.png</file>
-    <file>maps/rooms/h2214.png</file>
-    <file>maps/rooms/H-WC.png</file>
-    <file>maps/rooms/infodesk.png</file>
-    <file>maps/rooms/janson.png</file>
-    <file>maps/rooms/lameere.png</file>
-    <file>maps/rooms/ua2114.png</file>
-    <file>maps/rooms/not-available.png</file>
-</qresource>
-</RCC>
-

diff --git a/src/maps/campus.png b/src/maps/campus.png
deleted file mode 100644 (file)
index 64346c2..0000000
Binary files a/src/maps/campus.png and /dev/null differ

diff --git a/src/maps/rooms/H-WC.png b/src/maps/rooms/H-WC.png
deleted file mode 100644 (file)
index b5914b4..0000000
Binary files a/src/maps/rooms/H-WC.png and /dev/null differ

diff --git a/src/maps/rooms/aw1105.png b/src/maps/rooms/aw1105.png
deleted file mode 100644 (file)
index ce56059..0000000
Binary files a/src/maps/rooms/aw1105.png and /dev/null differ

diff --git a/src/maps/rooms/aw1115.png b/src/maps/rooms/aw1115.png
deleted file mode 100644 (file)
index 54da95b..0000000
Binary files a/src/maps/rooms/aw1115.png and /dev/null differ

diff --git a/src/maps/rooms/aw1117.png b/src/maps/rooms/aw1117.png
deleted file mode 100644 (file)
index 8829414..0000000
Binary files a/src/maps/rooms/aw1117.png and /dev/null differ

diff --git a/src/maps/rooms/aw1120.png b/src/maps/rooms/aw1120.png
deleted file mode 100644 (file)
index d2b63c4..0000000
Binary files a/src/maps/rooms/aw1120.png and /dev/null differ

diff --git a/src/maps/rooms/aw1121.png b/src/maps/rooms/aw1121.png
deleted file mode 100644 (file)
index 0f747d5..0000000
Binary files a/src/maps/rooms/aw1121.png and /dev/null differ

diff --git a/src/maps/rooms/aw1124.png b/src/maps/rooms/aw1124.png
deleted file mode 100644 (file)
index d3dc6fd..0000000
Binary files a/src/maps/rooms/aw1124.png and /dev/null differ

diff --git a/src/maps/rooms/aw1125.png b/src/maps/rooms/aw1125.png
deleted file mode 100644 (file)
index 542b03d..0000000
Binary files a/src/maps/rooms/aw1125.png and /dev/null differ

diff --git a/src/maps/rooms/aw1126.png b/src/maps/rooms/aw1126.png
deleted file mode 100644 (file)
index 83d1630..0000000
Binary files a/src/maps/rooms/aw1126.png and /dev/null differ

diff --git a/src/maps/rooms/chavanne.png b/src/maps/rooms/chavanne.png
deleted file mode 100644 (file)
index 4108e1c..0000000
Binary files a/src/maps/rooms/chavanne.png and /dev/null differ

diff --git a/src/maps/rooms/ferrer.png b/src/maps/rooms/ferrer.png
deleted file mode 100644 (file)
index 39cc6ef..0000000
Binary files a/src/maps/rooms/ferrer.png and /dev/null differ

diff --git a/src/maps/rooms/guillissen.png b/src/maps/rooms/guillissen.png
deleted file mode 100644 (file)
index 392828c..0000000
Binary files a/src/maps/rooms/guillissen.png and /dev/null differ

diff --git a/src/maps/rooms/h1301.png b/src/maps/rooms/h1301.png
deleted file mode 100644 (file)
index a1b76b0..0000000
Binary files a/src/maps/rooms/h1301.png and /dev/null differ

diff --git a/src/maps/rooms/h1302.png b/src/maps/rooms/h1302.png
deleted file mode 100644 (file)
index ff8eeef..0000000
Binary files a/src/maps/rooms/h1302.png and /dev/null differ

diff --git a/src/maps/rooms/h1308.png b/src/maps/rooms/h1308.png
deleted file mode 100644 (file)
index f98121c..0000000
Binary files a/src/maps/rooms/h1308.png and /dev/null differ

diff --git a/src/maps/rooms/h1309.png b/src/maps/rooms/h1309.png
deleted file mode 100644 (file)
index 34b608a..0000000
Binary files a/src/maps/rooms/h1309.png and /dev/null differ

diff --git a/src/maps/rooms/h2111.png b/src/maps/rooms/h2111.png
deleted file mode 100644 (file)
index 3d446b1..0000000
Binary files a/src/maps/rooms/h2111.png and /dev/null differ

diff --git a/src/maps/rooms/h2213.png b/src/maps/rooms/h2213.png
deleted file mode 100644 (file)
index 2e400dd..0000000
Binary files a/src/maps/rooms/h2213.png and /dev/null differ

diff --git a/src/maps/rooms/h2214.png b/src/maps/rooms/h2214.png
deleted file mode 100644 (file)
index 90018e2..0000000
Binary files a/src/maps/rooms/h2214.png and /dev/null differ

diff --git a/src/maps/rooms/infodesk.png b/src/maps/rooms/infodesk.png
deleted file mode 100644 (file)
index 8c392e9..0000000
Binary files a/src/maps/rooms/infodesk.png and /dev/null differ

diff --git a/src/maps/rooms/janson.png b/src/maps/rooms/janson.png
deleted file mode 100644 (file)
index e5e7161..0000000
Binary files a/src/maps/rooms/janson.png and /dev/null differ

diff --git a/src/maps/rooms/lameere.png b/src/maps/rooms/lameere.png
deleted file mode 100644 (file)
index 2018cd5..0000000
Binary files a/src/maps/rooms/lameere.png and /dev/null differ

diff --git a/src/maps/rooms/not-available.png b/src/maps/rooms/not-available.png
deleted file mode 100644 (file)
index ebfedad..0000000
Binary files a/src/maps/rooms/not-available.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/H-WC.png b/src/maps/rooms/thumbs/H-WC.png
deleted file mode 100644 (file)
index 0383264..0000000
Binary files a/src/maps/rooms/thumbs/H-WC.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/aw1105.png b/src/maps/rooms/thumbs/aw1105.png
deleted file mode 100644 (file)
index aec3314..0000000
Binary files a/src/maps/rooms/thumbs/aw1105.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/aw1115.png b/src/maps/rooms/thumbs/aw1115.png
deleted file mode 100644 (file)
index e7a33a9..0000000
Binary files a/src/maps/rooms/thumbs/aw1115.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/aw1117.png b/src/maps/rooms/thumbs/aw1117.png
deleted file mode 100644 (file)
index 95aeaae..0000000
Binary files a/src/maps/rooms/thumbs/aw1117.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/aw1120.png b/src/maps/rooms/thumbs/aw1120.png
deleted file mode 100644 (file)
index 86513ea..0000000
Binary files a/src/maps/rooms/thumbs/aw1120.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/aw1121.png b/src/maps/rooms/thumbs/aw1121.png
deleted file mode 100644 (file)
index 691bfd7..0000000
Binary files a/src/maps/rooms/thumbs/aw1121.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/aw1124.png b/src/maps/rooms/thumbs/aw1124.png
deleted file mode 100644 (file)
index 1771b0e..0000000
Binary files a/src/maps/rooms/thumbs/aw1124.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/aw1125.png b/src/maps/rooms/thumbs/aw1125.png
deleted file mode 100644 (file)
index ae3746b..0000000
Binary files a/src/maps/rooms/thumbs/aw1125.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/aw1126.png b/src/maps/rooms/thumbs/aw1126.png
deleted file mode 100644 (file)
index 395cd17..0000000
Binary files a/src/maps/rooms/thumbs/aw1126.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/chavanne.png b/src/maps/rooms/thumbs/chavanne.png
deleted file mode 100644 (file)
index be23ef0..0000000
Binary files a/src/maps/rooms/thumbs/chavanne.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/ferrer.png b/src/maps/rooms/thumbs/ferrer.png
deleted file mode 100644 (file)
index 4c6704f..0000000
Binary files a/src/maps/rooms/thumbs/ferrer.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/guillissen.png b/src/maps/rooms/thumbs/guillissen.png
deleted file mode 100644 (file)
index 22b4ed3..0000000
Binary files a/src/maps/rooms/thumbs/guillissen.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/h1301.png b/src/maps/rooms/thumbs/h1301.png
deleted file mode 100644 (file)
index 7fc2915..0000000
Binary files a/src/maps/rooms/thumbs/h1301.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/h1302.png b/src/maps/rooms/thumbs/h1302.png
deleted file mode 100644 (file)
index 893fccc..0000000
Binary files a/src/maps/rooms/thumbs/h1302.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/h1308.png b/src/maps/rooms/thumbs/h1308.png
deleted file mode 100644 (file)
index d6f9e42..0000000
Binary files a/src/maps/rooms/thumbs/h1308.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/h1309.png b/src/maps/rooms/thumbs/h1309.png
deleted file mode 100644 (file)
index 9086212..0000000
Binary files a/src/maps/rooms/thumbs/h1309.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/h2111.png b/src/maps/rooms/thumbs/h2111.png
deleted file mode 100644 (file)
index 07301cf..0000000
Binary files a/src/maps/rooms/thumbs/h2111.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/h2213.png b/src/maps/rooms/thumbs/h2213.png
deleted file mode 100644 (file)
index ecf8d8c..0000000
Binary files a/src/maps/rooms/thumbs/h2213.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/h2214.png b/src/maps/rooms/thumbs/h2214.png
deleted file mode 100644 (file)
index d1f6ca8..0000000
Binary files a/src/maps/rooms/thumbs/h2214.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/infodesk.png b/src/maps/rooms/thumbs/infodesk.png
deleted file mode 100644 (file)
index a8250dd..0000000
Binary files a/src/maps/rooms/thumbs/infodesk.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/janson.png b/src/maps/rooms/thumbs/janson.png
deleted file mode 100644 (file)
index 28856b9..0000000
Binary files a/src/maps/rooms/thumbs/janson.png and /dev/null differ

diff --git a/src/maps/rooms/thumbs/lameere.png b/src/maps/rooms/thumbs/lameere.png
deleted file mode 100644 (file)
index 94d2b22..0000000
Binary files a/src/maps/rooms/thumbs/lameere.png and /dev/null differ

diff --git a/src/maps/rooms/ua2114.png b/src/maps/rooms/ua2114.png
deleted file mode 100644 (file)
index 1fcdae7..0000000
Binary files a/src/maps/rooms/ua2114.png and /dev/null differ

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index 1a1c7f4a4900b589dff66f86456b8b56200131f5..492c8ab0873b4750362ccec00bdec90e8388fdff 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -425,7 +425,6 @@ void SqlEngine::checkConferenceMap(QSqlDatabase &aDatabase)
     sqlQuery.prepare("SELECT map FROM conference");
     if (!sqlQuery.exec()) {
         qWarning() << "column conference.map is missing; adding";
     sqlQuery.prepare("SELECT map FROM conference");
     if (!sqlQuery.exec()) {
         qWarning() << "column conference.map is missing; adding";

-        execQuery(aDatabase, "ALTER TABLE conference ADD COLUMN map VARCHAR")
-         and execQuery(aDatabase, "UPDATE conference SET map = ':/maps/campus.png' WHERE title = 'FOSDEM 2010'");
+        execQuery(aDatabase, "ALTER TABLE conference ADD COLUMN map VARCHAR");

     }
 }
     }
 }