Bump copyright years.

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

diff --git a/src/app/main.cpp b/src/app/main.cpp
index cc749b6a623916d5433264ffef250fe2c1b856f0..e67abfb5e92b2b732eca2c1acae87aba459fe41b 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-2012 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2024 Philipp Spitzer, gregor herrmann, Stefan Stahl

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


@@ -24,13 +24,6 @@
 #include "eventdialog.h"
 #include "application.h"
 
 #include "eventdialog.h"
 #include "application.h"
 

-#ifdef MAEMO
-//#include "alarmdialog.h"
-#include "alarmdbus.h"
-#include "alarmdbusadaptorp.h"
-#endif /* MAEMO */
-
-

 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(icons);
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(icons);


@@ -45,39 +38,16 @@ int main(int argc, char *argv[])
     QCoreApplication::setApplicationName("ConfClerk");
     QCoreApplication::setApplicationVersion(VERSION);
 
     QCoreApplication::setApplicationName("ConfClerk");
     QCoreApplication::setApplicationVersion(VERSION);
 

-    QWidget* window = new MainWindow;
-
-#ifdef MAEMO
-    // Alarm Dbus
-    CAlarmDBus *alarmDBus = new CAlarmDBus(window);
-    new AlarmDBusAdaptor(alarmDBus);
-    QDBusConnection connection = QDBusConnection::sessionBus();
-
-    if(connection.registerObject("/ConfClerk", alarmDBus) == true)
-    {
-       if( connection.registerService("at.priv.toastfreeware.confclerk") == false)
-       {
-            if(argc==3)
-               {
-                       QDBusInterface *interface = new QDBusInterface("at.priv.toastfreeware.confclerk",
-                                                                      "/ConfClerk",
-                                                                      "at.priv.toastfreeware.confclerk.AlarmInterface",
-                                                                      connection);
-                interface->call("Alarm",atoi(argv[2]));
-                       return 0;
-               }
-       }
-    }
-#endif
+    MainWindow window;

 
     // If we were started with the parameters confernceid and eventid, show the corresponding event (alarm)
 
     // If we were started with the parameters confernceid and eventid, show the corresponding event (alarm)

-    if (argc == 3) {
+    if (argc >= 3) {

         QString conferenceIdStr = argv[1];
         QString eventIdStr = argv[2];
         QString conferenceIdStr = argv[1];
         QString eventIdStr = argv[2];

-        EventDialog dialog(conferenceIdStr.toInt(), eventIdStr.toInt(), window);
+        EventDialog dialog(conferenceIdStr.toInt(), eventIdStr.toInt(), &window);

         dialog.exec();
     }
         dialog.exec();
     }

-    window->show();
+    window.show();

 
     return a.exec();
 }
 
     return a.exec();
 }