Changeset 4d8493b in confclerk_git for src

Timestamp:

05/28/13 20:23:49 (10 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

955f76e

Parents:

5130dc7

Message:

Made sure the mainwindow is destroyed properly and the sql database is closed.

Location:

src

Files:

• app/main.cpp (modified) (2 diffs)
• gui/mainwindow.cpp (modified) (1 diff)
• gui/mainwindow.h (modified) (1 diff)

src/app/main.cpp

@@ -39 +39 @@
     QCoreApplication::setApplicationVersion(VERSION);
 
-    QWidget* window = new MainWindow;
+    MainWindow window;
 
     // If we were started with the parameters confernceid and eventid, show the corresponding event (alarm)
@@ -45 +45 @@
         QString conferenceIdStr = argv[1];
         QString eventIdStr = argv[2];
-        EventDialog dialog(conferenceIdStr.toInt(), eventIdStr.toInt(), window);
+        EventDialog dialog(conferenceIdStr.toInt(), eventIdStr.toInt(), &window);
         dialog.exec();
     }
-    window->show();
+    window.show();
 
     return a.exec();

src/gui/mainwindow.cpp

@@ -128 +128 @@
 
 
+MainWindow::~MainWindow() {
+    sqlEngine->close();
+}
+
+
 void MainWindow::on_aboutAction_triggered()
 {

src/gui/mainwindow.h

@@ -36 +36 @@
 public:
     MainWindow(QWidget *parent = 0);
+    ~MainWindow();
 signals:
     void conferenceRemoved();