X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/blobdiff_plain/68b2df2aae1c3894cb2a720d088b5f41e17a93e1..61346c970d0d600ce7dc5fad4ea8e4a5e629a048:/src/app/main.cpp

diff --git a/src/app/main.cpp b/src/app/main.cpp
index aa29694..29f36fb 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -1,6 +1,6 @@
 /*
  * 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.
  *
@@ -17,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/>.
  */
-#include <mainwindow.h>
+#include "mainwindow.h"
 
-#include <sqlengine.h>
+#include "sqlengine.h"
 
 #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);
-    Q_INIT_RESOURCE(maps);
     Q_INIT_RESOURCE(db);
+    Q_INIT_RESOURCE(data);
 
     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;
-
     window = new MainWindow;
 
 
@@ -53,15 +55,15 @@ int main(int argc, char *argv[])
     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)
     		{
-        		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;
@@ -71,7 +73,7 @@ int main(int argc, char *argv[])
 
     if(argc > 1)
     {
-        EventDialog dialog(atoi(argv[1]),window);
+        EventDialog dialog(atoi(argv[1]), window);
         dialog.exec();
     }
 #endif