Changeset 21e0eb1


Ignore:
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:
4 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • src/alarm/alarm.cpp

    r3ecfbf0 r21e0eb1  
    2727
    2828#include <QDebug>
    29 
    30 //#include "dbus-1.0/dbus/dbus-protocol.h"
    3129
    3230int Alarm::addAlarm(int conferenceId, int eventId, QString eventTitle, const QDateTime &alarmDateTime) {
     
    6563    alarmAction->flags |= ALARM_ACTION_EXEC_ADD_COOKIE; // adds assigned cookie at the end of command string
    6664
    67 //    // setup this action to be a "DBus command"
    68 //    act->flags |= ALARM_ACTION_WHEN_RESPONDED;
    69 //    act->flags |= ALARM_ACTION_TYPE_DBUS;
    70 //
    71 //    // DBus params for this action
    72 //    alarm_action_set_dbus_interface(act, "at.priv.toastfreeware.confclerk.AlarmInterface");
    73 //    alarm_action_set_dbus_service(act, "at.priv.toastfreeware.confclerk");
    74 //    alarm_action_set_dbus_path(act, "/ConfClerk");
    75 //    alarm_action_set_dbus_name(act, "Alarm");
    76 //
    77 //    // DBus arguments for the action
    78 //    alarm_action_set_dbus_args(act,  DBUS_TYPE_INT32, &aEventId, DBUS_TYPE_INVALID);
    79 
    80     //    act->flags |= ALARM_ACTION_TYPE_EXEC;
    81     //     alarm_action_set_exec_command(act, command.toLocal8Bit().data());
    82     //    alarm_event_set_icon(eve, "fosdem");
    83     //    alarm_event_set_title(eve, "ConfClerk");
    84     // adds assigned cookie at the end of command string
    85     //    act->flags |= ALARM_ACTION_EXEC_ADD_COOKIE;
    86 
    8765    /* Add stop button action */
    88     /* TODO: send a DBus message to remove that alarm from database */
    8966    alarmAction = alarm_event_add_actions(alarmEvent, 1);
    9067    alarm_action_set_label(alarmAction, "Stop");
  • src/alarm/alarm.pro

    r3ecfbf0 r21e0eb1  
    22TARGET = qalarm
    33DESTDIR = ../bin
    4 CONFIG += static qdbus
    5 QT += sql dbus
     4CONFIG += static
     5QT += sql
    66QMAKE_CLEAN += ../bin/libqalarm.a
    77
     
    1818    ../orm \
    1919    ../sql
    20    
    21 
    22 
  • src/app/app.pro

    r3ecfbf0 r21e0eb1  
    55QT += sql xml network
    66CONFIG(maemo5) {
    7     QT += maemo5 dbus
     7    QT += maemo5
    88}
    99
     
    1818    DEPENDPATH +=  ../alarm
    1919    POST_TARGETDEPS += $$DESTDIR/libqalarm.a
    20     HEADERS += alarmdbus.h \
    21         alarmdbusadaptorp.h
    22     SOURCES += alarmdbus.cpp \
    23         alarmdbusadaptor.cpp
    2420}
    2521
  • src/app/main.cpp

    r3ecfbf0 r21e0eb1  
    2525#include "application.h"
    2626
    27 #ifdef MAEMO
    28 //#include "alarmdialog.h"
    29 #include "alarmdbus.h"
    30 #include "alarmdbusadaptorp.h"
    31 #endif /* MAEMO */
    32 
    33 
    3427int main(int argc, char *argv[])
    3528{
     
    4841    QWidget* window = new MainWindow;
    4942
    50 #ifdef MAEMO
    51     // Alarm Dbus
    52     CAlarmDBus *alarmDBus = new CAlarmDBus(window);
    53     new AlarmDBusAdaptor(alarmDBus);
    54     QDBusConnection connection = QDBusConnection::sessionBus();
    55 
    56     if(connection.registerObject("/ConfClerk", alarmDBus) == true)
    57     {
    58         if( connection.registerService("at.priv.toastfreeware.confclerk") == false)
    59         {
    60             if(argc==3)
    61                 {
    62                         QDBusInterface *interface = new QDBusInterface("at.priv.toastfreeware.confclerk",
    63                                                                        "/ConfClerk",
    64                                                                        "at.priv.toastfreeware.confclerk.AlarmInterface",
    65                                                                        connection);
    66                 interface->call("Alarm",atoi(argv[2]));
    67                         return 0;
    68                 }
    69         }
    70     }
    71 #endif
    72 
    7343    // If we were started with the parameters confernceid and eventid, show the corresponding event (alarm)
    7444    if (argc == 3) {
Note: See TracChangeset for help on using the changeset viewer.