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 32e7d0ac6d9e639e3612636f7e2d6975af048aab..29f36fbec9f3badf2f178a05050ad27de6fa2f55 100644 (file)
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

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

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


@@ -16,33 +17,35 @@
  * 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 */
 
 
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(icons);
 #endif /* MAEMO */
 
 
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(icons);

-    Q_INIT_RESOURCE(maps);

     Q_INIT_RESOURCE(db);
     Q_INIT_RESOURCE(db);

+    Q_INIT_RESOURCE(data);

 
     Application a(argc, argv);
 
     Application a(argc, argv);

-    Application::setWindowIcon(QIcon(":/icons/fosdem.png"));
-
-    SqlEngine::initialize(); // creates "SQLITE" DB connection
+    Application::setWindowIcon(QIcon(":/confclerk.svg"));

 
 

+    // needed by QDesktopServices
+    QCoreApplication::setOrganizationName("Toastfreeware");
+    QCoreApplication::setApplicationName("ConfClerk");
+    QCoreApplication::setApplicationVersion(VERSION);
+ 

     QWidget *window;
     QWidget *window;

-

     window = new MainWindow;
 
 
     window = new MainWindow;
 
 


@@ -52,15 +55,15 @@ int main(int argc, char *argv[])
     new AlarmDBusAdaptor(alarmDBus);
     QDBusConnection connection = QDBusConnection::sessionBus();
 
     new AlarmDBusAdaptor(alarmDBus);
     QDBusConnection connection = QDBusConnection::sessionBus();
 

-    if(connection.registerObject("/Fosdem", alarmDBus) == true)
+    if(connection.registerObject("/ConfClerk", alarmDBus) == true)

     {
     {

-       if( connection.registerService("org.fosdem.schedule") == false)
+       if( connection.registerService("at.priv.toastfreeware.confclerk") == false)

        {
                if(argc>1)
                {
        {
                if(argc>1)
                {

-                       QDBusInterface *interface = new QDBusInterface("org.fosdem.schedule",
-                                                                      "/Fosdem",
-                                                                      "org.fosdem.schedule.AlarmInterface",
+                       QDBusInterface *interface = new QDBusInterface("at.priv.toastfreeware.confclerk",
+                                                                      "/ConfClerk",
+                                                                      "at.priv.toastfreeware.confclerk.AlarmInterface",

                                                                       connection);
                        interface->call("Alarm",atoi(argv[1]));
                        return 0;
                                                                       connection);
                        interface->call("Alarm",atoi(argv[1]));
                        return 0;


@@ -70,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