Restructured the SqlEngine. Not yet finished (see "TODO" in the code).

[toast/confclerk.git] / src / app / main.cpp

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 0d450f66b08d6191513741264f4b7f9a4111f037..29f36fbec9f3badf2f178a05050ad27de6fa2f55 100644 (file)
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

- * Copyright (C) 2011 Philipp Spitzer, gregor herrmann
+ * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann, Stefan Stahl

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *


@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License along with
  * ConfClerk.  If not, see <http://www.gnu.org/licenses/>.
  */
  * You should have received a copy of the GNU General Public License along with
  * ConfClerk.  If not, see <http://www.gnu.org/licenses/>.
  */

-#include <mainwindow.h>
+#include "mainwindow.h"

 
 

-#include <sqlengine.h>
+#include "sqlengine.h"

 
 #include "eventdialog.h"
 #include "application.h"
 
 #ifdef MAEMO
 
 #include "eventdialog.h"
 #include "application.h"
 
 #ifdef MAEMO

-//#include <alarmdialog.h>
-#include <alarmdbus.h>
-#include <alarmdbusadaptorp.h>
+//#include "alarmdialog.h"
+#include "alarmdbus.h"
+#include "alarmdbusadaptorp.h"

 #endif /* MAEMO */
 
 
 #endif /* MAEMO */
 
 


@@ -43,11 +43,9 @@ int main(int argc, char *argv[])
     // needed by QDesktopServices
     QCoreApplication::setOrganizationName("Toastfreeware");
     QCoreApplication::setApplicationName("ConfClerk");
     // needed by QDesktopServices
     QCoreApplication::setOrganizationName("Toastfreeware");
     QCoreApplication::setApplicationName("ConfClerk");

+    QCoreApplication::setApplicationVersion(VERSION);

  
  

-    SqlEngine::initialize(); // creates "SQLITE" DB connection
-

     QWidget *window;
     QWidget *window;

-

     window = new MainWindow;
 
 
     window = new MainWindow;
 
 


@@ -75,7 +73,7 @@ int main(int argc, char *argv[])
 
     if(argc > 1)
     {
 
     if(argc > 1)
     {

-        EventDialog dialog(atoi(argv[1]),window);
+        EventDialog dialog(atoi(argv[1]), window);

         dialog.exec();
     }
 #endif
         dialog.exec();
     }
 #endif