Changeset 21e0eb1 in confclerk_git for src

Timestamp:

10/17/12 23:19:41 (10 years ago)

Author:

gregor herrmann <gregoa@…>

Branches:

master, qt5

Children:

cdbdad7

Parents:

3ecfbf0

Message:

Rip out unused DBUS stuff.

Location:

src

Files:

• alarm/alarm.cpp (modified) (2 diffs)
• alarm/alarm.pro (modified) (2 diffs)
• app/alarmdbus.cpp (deleted)
• app/alarmdbus.h (deleted)
• app/alarmdbusadaptor.cpp (deleted)
• app/alarmdbusadaptorp.h (deleted)
• app/app.pro (modified) (2 diffs)
• app/main.cpp (modified) (2 diffs)

src/alarm/alarm.cpp

@@ -27 +27 @@
 
 #include <QDebug>
-
-//#include "dbus-1.0/dbus/dbus-protocol.h"
 
 int Alarm::addAlarm(int conferenceId, int eventId, QString eventTitle, const QDateTime &alarmDateTime) {
@@ -65 +63 @@
     alarmAction->flags |= ALARM_ACTION_EXEC_ADD_COOKIE; // adds assigned cookie at the end of command string
 
-//    // setup this action to be a "DBus command"
-//    act->flags |= ALARM_ACTION_WHEN_RESPONDED;
-//    act->flags |= ALARM_ACTION_TYPE_DBUS;
-//
-//    // DBus params for this action
-//    alarm_action_set_dbus_interface(act, "at.priv.toastfreeware.confclerk.AlarmInterface");
-//    alarm_action_set_dbus_service(act, "at.priv.toastfreeware.confclerk");
-//    alarm_action_set_dbus_path(act, "/ConfClerk");
-//    alarm_action_set_dbus_name(act, "Alarm");
-//
-//    // DBus arguments for the action
-//    alarm_action_set_dbus_args(act,  DBUS_TYPE_INT32, &aEventId, DBUS_TYPE_INVALID);
-
-    //    act->flags |= ALARM_ACTION_TYPE_EXEC;
-    //     alarm_action_set_exec_command(act, command.toLocal8Bit().data());
-    //    alarm_event_set_icon(eve, "fosdem");
-    //    alarm_event_set_title(eve, "ConfClerk");
-    // adds assigned cookie at the end of command string
-    //    act->flags |= ALARM_ACTION_EXEC_ADD_COOKIE;
-
     /* Add stop button action */
-    /* TODO: send a DBus message to remove that alarm from database */
     alarmAction = alarm_event_add_actions(alarmEvent, 1);
     alarm_action_set_label(alarmAction, "Stop");

src/alarm/alarm.pro

@@ -2 +2 @@
 TARGET = qalarm
 DESTDIR = ../bin
-CONFIG += static qdbus 
-QT += sql dbus
+CONFIG += static
+QT += sql
 QMAKE_CLEAN += ../bin/libqalarm.a
 
@@ -18 +18 @@
     ../orm \
     ../sql
-    
-
-

src/app/app.pro

@@ -5 +5 @@
 QT += sql xml network
 CONFIG(maemo5) {
-    QT += maemo5 dbus
+    QT += maemo5
 }
 
@@ -18 +18 @@
     DEPENDPATH +=  ../alarm
     POST_TARGETDEPS += $$DESTDIR/libqalarm.a
-    HEADERS += alarmdbus.h \
-        alarmdbusadaptorp.h
-    SOURCES += alarmdbus.cpp \
-        alarmdbusadaptor.cpp
 }
 

src/app/main.cpp

@@ -25 +25 @@
 #include "application.h"
 
-#ifdef MAEMO
-//#include "alarmdialog.h"
-#include "alarmdbus.h"
-#include "alarmdbusadaptorp.h"
-#endif /* MAEMO */
-
-
 int main(int argc, char *argv[])
 {
@@ -48 +41 @@
     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
-
     // If we were started with the parameters confernceid and eventid, show the corresponding event (alarm)
     if (argc == 3) {