Changeset 8bd618c in confclerk_git for src/app

Timestamp:

10/17/12 20:49:16 (10 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

908b4ce

Parents:

95257a6

Message:

We added the conferenceId to some alarm related methods (ticket #41).

File:

• src/app/main.cpp (modified) (3 diffs)

src/app/main.cpp

@@ -45 +45 @@
     QCoreApplication::setApplicationName("ConfClerk");
     QCoreApplication::setApplicationVersion(VERSION);
- 
-    QWidget *window;
-    window = new MainWindow;
 
+    QWidget* window = new MainWindow;
 
 #ifdef MAEMO
@@ -60 +58 @@
         if( connection.registerService("at.priv.toastfreeware.confclerk") == false)
         {
-                if(argc>1)
+            if(argc==3)
                 {
                         QDBusInterface *interface = new QDBusInterface("at.priv.toastfreeware.confclerk",
@@ -66 +64 @@
                                                                        "at.priv.toastfreeware.confclerk.AlarmInterface",
                                                                        connection);
-                        interface->call("Alarm",atoi(argv[1]));
+                interface->call("Alarm",atoi(argv[2]));
                         return 0;
                 }
         }
     }
+#endif
 
-    if(argc > 1)
-    {
-        EventDialog dialog(atoi(argv[1]), window);
+    // If we were started with the parameters confernceid and eventid, show the corresponding event (alarm)
+    if (argc == 3) {
+        QString conferenceIdStr = argv[1];
+        QString eventIdStr = argv[2];
+        EventDialog dialog(conferenceIdStr.toInt(), eventIdStr.toInt(), window);
         dialog.exec();
     }
-#endif
-
     window->show();