1 files changed, 1 insertions, 23 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 46d8bc5..044f477 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,9 +16,7 @@
 #include "command_line_options.h"
 #include "dialog.h"
 #include "globals.h"
-#include "vsession.h"
 #include "xsession.h"
-#include "httpxmldownloader.h"
 #include "choosersettings.h"
 
 int main(int argc, char *argv[]) {
@@ -288,27 +286,7 @@ int main(int argc, char *argv[]) {
 
     Dialog w(defaultTab, cmdOptions.contains("exam-mode"));
 
-    /* DOWNLOAD VSESSIONS */
-    HttpXmlDownloader httpxmldownloader;
-    httpxmldownloader.connectSlot(&w,
-            SLOT(addSessionsAfterDownload(QNetworkReply*)));
-
-    // read xml and add items later
-    if (cmdOptions.contains("exam-mode")) {
-        httpxmldownloader.makeRequest(g_urlBase + "list?exams=exam-mode", locationIds);
-    } else {
-        httpxmldownloader.makeRequest(g_urlBase + "list", locationIds);
-    }
-
-    /* DOWNLOAD NEWS */
-    HttpXmlDownloader news_downloader;
-    news_downloader.connectSlot(&w, SLOT(addNewsAfterDownload(QNetworkReply*)));
-    news_downloader.makeRequest(g_urlBase + "news");
-
-    /* DOWNLOAD HELP-SECTION */
-    HttpXmlDownloader help_downloader;
-    help_downloader.connectSlot(&w, SLOT(addHelpAfterDownload(QNetworkReply*)));
-    help_downloader.makeRequest(g_urlBase + "help");
+    w.downloadData(locationIds);
 
     w.setTheme();