Changeset 2dffed3 in confclerk_git for src/gui/mainwindow.cpp

Timestamp:

08/22/12 00:11:58 (10 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

7680536

Parents:

ca20842

Message:

On the way to fix #45.

File:

• src/gui/mainwindow.cpp (modified) (7 diffs)

src/gui/mainwindow.cpp

@@ -148 +148 @@
     Conference active = Conference::getById(confId);
     if (active.url().isEmpty()) return;
-    importFromNetwork(active.url());
+    importFromNetwork(active.url(), confId);
     setEnabled(false);
 }
@@ -318 +318 @@
     ConferenceEditor dialog(conferenceModel, this);
 
-    connect(&dialog, SIGNAL(haveConferenceUrl(const QString&)), SLOT(importFromNetwork(const QString&)));
-    connect(&dialog, SIGNAL(haveConferenceFile(const QString&)), SLOT(importFromFile(const QString&)));
+    connect(&dialog, SIGNAL(haveConferenceUrl(const QString&, int)), SLOT(importFromNetwork(const QString&, int)));
+    connect(&dialog, SIGNAL(haveConferenceFile(const QString&, int)), SLOT(importFromFile(const QString&, int)));
     connect(&dialog, SIGNAL(removeConferenceRequested(int)), SLOT(removeConference(int)));
     connect(&dialog, SIGNAL(changeUrlRequested(int, const QString&)),
@@ -350 +350 @@
         if (!redirectUrl.isEmpty()) {
             if (redirectUrl != aReply->request().url()) {
-                importFromNetwork(redirectUrl.toString());
+                importFromNetwork(redirectUrl.toString(), aReply->request().attribute(QNetworkRequest::User).toInt());
                 return; // don't enable controls
             } else {
@@ -356 +356 @@
             }
         } else {
-            importData(aReply->readAll(), aReply->url().toEncoded());
+            importData(aReply->readAll(), aReply->url().toEncoded(), aReply->request().attribute(QNetworkRequest::User).toInt());
         }
     }
@@ -362 +362 @@
 }
 
-void MainWindow::importData(const QByteArray &aData, const QString& url)
-{
-    mXmlParser->parseData(aData, url);
-}
-
-void MainWindow::importFromNetwork(const QString& url)
+void MainWindow::importData(const QByteArray &aData, const QString& url, int conferenceId)
+{
+    mXmlParser->parseData(aData, url, conferenceId);
+}
+
+void MainWindow::importFromNetwork(const QString& url, int conferenceId)
 {
     QNetworkRequest request;
     request.setUrl(QUrl(url));
+    request.setAttribute(QNetworkRequest::User, conferenceId);
 
     mNetworkAccessManager->setProxy(QNetworkProxy::applicationProxy());
@@ -376 +377 @@
 }
 
-void MainWindow::importFromFile(const QString& filename)
+void MainWindow::importFromFile(const QString& filename, int conferenceId)
 {
     QFile file(filename);
@@ -384 +385 @@
     }
 
-    importData(file.readAll(), "");
+    importData(file.readAll(), "", conferenceId);
 }