From: Mikko Keinänen <mikko.keinanen@gmail.com>
Date: Thu, 18 Nov 2010 20:36:59 +0000 (+0200)
Subject: Exception handling.
X-Git-Url: http://vcs.maemo.org/git/?p=emufront;a=commitdiff_plain;h=eadeb5e0530b1aff6e38a0f4e6c65fc2504569d5

Exception handling.
---

diff --git a/src/db/dbmediaimagecontainer.cpp b/src/db/dbmediaimagecontainer.cpp
index 738fd19..86a3031 100644
--- a/src/db/dbmediaimagecontainer.cpp
+++ b/src/db/dbmediaimagecontainer.cpp
@@ -204,6 +204,8 @@ int DbMediaImageContainer::getMediaImageContainer(QString checksum) const
 /**
 * Stores media image containers, including the media images included
 * to database.
+*
+* Throws EmuFrontException
 */
 void DbMediaImageContainer::storeContainers(QList<MediaImageContainer *> lst, FilePathObject *fpo)
 {
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index cdc0f29..91dd252 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -44,6 +44,7 @@ QString MainWindow::aboutTitle = tr("About EmuFront");
 MainWindow::MainWindow(bool reset)
 {
     if (!testDB(reset)) close();
+    errorMessage = new QErrorMessage(this);
     setWindowTitle("EmuFront");
     tmpDirFilePath = DbConfig::getTmpDir();
     if (tmpDirFilePath.isEmpty())
@@ -193,8 +194,7 @@ void MainWindow::resetDb()
         createDB();
     }
     catch (EmuFrontException e) {
-        qDebug() << e.what();
-        QMessageBox::critical(this, "Exception", e.what());
+        errorMessage->showMessage(e.what());
     }
 }
 
@@ -302,12 +302,11 @@ bool MainWindow::testDB(bool reset)
     }
     catch (EmuFrontException e) {
         qDebug() << e.what();
-        QMessageBox::critical(this, "Exception", e.what());
+        errorMessage->showMessage(e.what());
         return false;
     }
 }
 
-/* Throws EmuFrontException */
 void MainWindow::createDB() const
 {
     try
@@ -318,7 +317,7 @@ void MainWindow::createDB() const
     catch (QString str) {
         QString msg(tr("Exception while trying to create"
                        " EmuFront database: %s").arg(str));
-        throw EmuFrontException(msg);
+        errorMessage->showMessage(msg);
     }
 }
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index f28fef0..4ab5e36 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -34,6 +34,7 @@ class DatabaseManager;
 class EmuFrontDialog;
 class EmuLauncher;
 class DatFileUtil;
+class QErrorMessage;
 
 class MainWindow : public QMainWindow
 {
@@ -94,6 +95,7 @@ private:
     DatabaseManager *dbManager;
     EmuLauncher *launcher;
     QString tmpDirFilePath;
+    QErrorMessage *errorMessage;
 };
 
 #endif