Changeset e2c612c

Timestamp:

09/25/12 22:50:11 (10 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

f1826af

Parents:

5e50875

Message:

Reloading a conference works now.

Location:

src

Files:

• gui/conferenceeditor.cpp (modified) (2 diffs)
• gui/conferenceeditor.h (modified) (1 diff)
• gui/mainwindow.cpp (modified) (2 diffs)
• mvc/conferencemodel.cpp (modified) (1 diff)
• mvc/conferencemodel.h (modified) (1 diff)
• sql/schedulexmlparser.cpp (modified) (2 diffs)
• sql/schedulexmlparser.h (modified) (1 diff)
• sql/sqlengine.cpp (modified) (1 diff)

src/gui/conferenceeditor.cpp

@@ -179 +179 @@
 }
 
-void ConferenceEditor::importFinished(const QString& title)
-{
+void ConferenceEditor::importFinished(int conferenceId) {
     addBtn->show();
     // removeItem should be shown later, but it takes some time,
@@ -191 +190 @@
     QApplication::processEvents();
 
-    int num = model->rowCount();
-    for (int i = 0; i < num; i++) {
-        QModelIndex item = model->index(i, 0);
-        if (model->data(item) == title) {
-            emit wantCurrent(item, QItemSelectionModel::SelectCurrent);
-            return;
-        }
-    }
-    itemSelected(QModelIndex(), QModelIndex());
+    QModelIndex item = model->indexFromId(conferenceId);
+    if (item.isValid())
+        emit wantCurrent(item, QItemSelectionModel::SelectCurrent);
+    else
+        itemSelected(QModelIndex(), QModelIndex());
 }
 

src/gui/conferenceeditor.h

@@ -56 +56 @@
 public slots:
     void importStarted();
-    void importFinished(const QString& title);
+    void importFinished(int conferenceId);
     void conferenceRemoved();
     void showParsingProgress(int);

src/gui/mainwindow.cpp

@@ -133 +133 @@
 
     connect(mXmlParser, SIGNAL(parsingScheduleBegin()), conferenceModel, SLOT(newConferenceBegin()));
-    connect(mXmlParser, SIGNAL(parsingScheduleEnd(const QString&)), conferenceModel, SLOT(newConferenceEnd(const QString&)));
+    connect(mXmlParser, SIGNAL(parsingScheduleEnd(int)), conferenceModel, SLOT(newConferenceEnd(int)));
 }
 
@@ -341 +341 @@
     connect(mXmlParser, SIGNAL(parsingScheduleBegin()), &dialog, SLOT(importStarted()));
     connect(mXmlParser, SIGNAL(progressStatus(int)), &dialog, SLOT(showParsingProgress(int)));
-    connect(mXmlParser, SIGNAL(parsingScheduleEnd(const QString&)), &dialog, SLOT(importFinished(const QString&)));
+    connect(mXmlParser, SIGNAL(parsingScheduleEnd(int)), &dialog, SLOT(importFinished(int)));
 
     connect(this, SIGNAL(conferenceRemoved()), &dialog, SLOT(conferenceRemoved()));

src/mvc/conferencemodel.cpp

@@ -78 +78 @@
 }
 
-void ConferenceModel::newConferenceEnd(const QString& title)
-{
-    Q_UNUSED(title);
+void ConferenceModel::newConferenceEnd(int conferenceId) {
+    Q_UNUSED(conferenceId);
     reinit();
 }

src/mvc/conferencemodel.h

@@ -47 +47 @@
 public slots:
     void newConferenceBegin();
-    void newConferenceEnd(const QString& title);
+    void newConferenceEnd(int conferenceId);
     void conferenceRemoved();
 private:

src/sql/schedulexmlparser.cpp

@@ -55 +55 @@
             emit(parsingScheduleBegin());
             QHash<QString,QString> conference;
-            conference["id"] = conferenceId; // conference ID is assigned automatically if 0
+            conference["id"] = QVariant(conferenceId).toString(); // conference ID is assigned automatically if 0
             conference["title"] = conferenceElement.firstChildElement("title").text();
             conference["subtitle"] = conferenceElement.firstChildElement("subtitle").text();
@@ -154 +154 @@
     sqlEngine->commitTransaction();
     if (!conference_title.isNull()) {
-        emit parsingScheduleEnd(conference_title);
+        emit parsingScheduleEnd(conferenceId);
     } else {
         error_message("Could not parse schedule");

src/sql/schedulexmlparser.h

@@ -38 +38 @@
         void progressStatus(int aStatus);
         void parsingScheduleBegin();
-        void parsingScheduleEnd(const QString& title);
+        void parsingScheduleEnd(int conferenceId);
 };
 

src/sql/sqlengine.cpp

@@ -163 +163 @@
         query.exec();
         emitSqlQueryError(query);
-        aConference["id"] = conferenceId;
+        aConference["id"] = QVariant(conferenceId).toString();
     }
 }