Add .pro.user.* to svn:ignore and remove it in the release target.

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

diff --git a/src/app/main.cpp b/src/app/main.cpp
index aa296942324f54c78c58af14fd07e554c28a3349..c61652b3e67c67394f829ab163a3fee99c12d4e2 100644 (file)
--- 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.
  *
@@ -34,12 +34,17 @@
 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"));
+    Application::setWindowIcon(QIcon(":/confclerk.svg"));
 
+    // needed by QDesktopServices
+    QCoreApplication::setOrganizationName("Toastfreeware");
+    QCoreApplication::setApplicationName("ConfClerk");
+    QCoreApplication::setApplicationVersion(VERSION);
+ 
     SqlEngine::initialize(); // creates "SQLITE" DB connection
 
     QWidget *window;
@@ -53,15 +58,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;