Changeset 3329d39 in confclerk_git

Timestamp:

04/16/10 14:14:19 (13 years ago)

Author:

kirilma <kirilma@…>

Branches:

master, qt5

Children:

a61c5f5

Parents:

2eda137

Message:

use visible notifications of errors

also early detect parsing errors

Location:

src

Files:

• app/app.pro (modified) (1 diff)
• app/application.cpp (modified) (2 diffs)
• gui/errormessage.cpp (added)
• gui/errormessage.h (added)
• gui/gui.pro (modified) (1 diff)
• gui/importschedulewidget.cpp (modified) (3 diffs)
• sql/schedulexmlparser.cpp (modified) (2 diffs)

src/app/app.pro

@@ -4 +4 @@
 DESTDIR = ../bin
 QT += sql xml network dbus 
+CONFIG(maemo5) {
+    QT += maemo5
+}
 
 # module dependencies

src/app/application.cpp

@@ -18 +18 @@
  */
 #include "application.h"
+#include "errormessage.h"
 
 #include <ormrecord.h>
@@ -29 +30 @@
         return QApplication::notify(receiver, event);
     } catch (OrmException& e) {
-        qWarning() << "UNCAUGHT EXCEPTION: OrmException, text= " << e.text();
+        error_message("UNCAUGHT OrmException: " + e.text());
         return false;
     } catch (...) {
-        qWarning() << "UNCAUGHT EXCEPTION: unknown";
+        error_message("UNCAUGHT EXCEPTION: unknown");
         return false;
     }

src/gui/gui.pro

@@ -82 +82 @@
     settingsdialog.cpp
 
+HEADERS += errormessage.h
+SOURCES += errormessage.cpp
+CONFIG(maemo5) {
+    QT += maemo5
+}
+
 #maemo { 
 #    FORMS += alarmdialog.ui

src/gui/importschedulewidget.cpp

@@ -35 +35 @@
 
 #include "conference.h"
+#include "errormessage.h"
 
 // const QString SCHEDULE_URL = "http://fosdem.org/2010/schedule/xml";
@@ -114 +115 @@
     if ( aReply->error() != QNetworkReply::NoError )
     {
-        qDebug() << "Error occured during download: " << aReply->errorString();
+        error_message(QString("Error occured during download: ") + aReply->errorString());
     }
     else
@@ -209 +210 @@
     importScheduleLabel->setText("Schedule:");
 
-    emit(scheduleImported(confId));
-}
-
+    if (confId > 0) {
+        emit(scheduleImported(confId));
+    }
+}
+

src/sql/schedulexmlparser.cpp

@@ -23 +23 @@
 #include "schedulexmlparser.h"
 #include "sqlengine.h"
+#include "../gui/errormessage.h"
 
 #include <QDebug>
@@ -34 +35 @@
 {
     QDomDocument document;
-    document.setContent (aData, false);
+    QString xml_error;
+    if (!document.setContent (aData, false, &xml_error)) {
+        error_message("Could not parse schedule: " + xml_error);
+        return -1;
+    }
 
     QDomElement scheduleElement = document.firstChildElement("schedule");