Alarm modifications

diff --git a/src/alarm/alarm.cpp b/src/alarm/alarm.cpp
index 73d505613277f98a5c1b685bb18d7a87b348d9b4..c782a29c128db51e57b96a659f8e20c40146fb4c 100644 (file)
--- a/src/alarm/alarm.cpp
+++ b/src/alarm/alarm.cpp
@@ -6,7 +6,7 @@
 #include <QDir>
 #include <QFileInfo>
 
-#include <dbus-1.0/dbus/dbus-protocol.h>
+//#include <dbus-1.0/dbus/dbus-protocol.h>
 
 int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
 {
@@ -22,7 +22,7 @@ int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
     alarm_event_set_message(eve, QString::number(aEventId).toLocal8Bit().data());
 
     /* Use absolute time triggering */
-    eve->alarm_time = time(0) + 5; //aDateTime.toTime_t();
+    eve->alarm_time = aDateTime.toTime_t();
     eve->flags = ALARM_EVENT_BOOT;
 
     /* Add exec command action */

diff --git a/src/app/alarmdbus.h b/src/app/alarmdbus.h
index 6363b95c18e8ee4e68474d33ed1cce72fc9a990c..520894851e4982ba909be5f19c3ec0c73fa9af46 100644 (file)
--- a/src/app/alarmdbus.h
+++ b/src/app/alarmdbus.h
@@ -1,5 +1,5 @@
-#ifndef SINGLE_INSTANCE_H
-#define SINGLE_INSTANCE_H
+#ifndef ALARM_DBUS_H
+#define ALARM_DBUS_H
 
 #include <QObject>
 #include <QtDBus/QtDBus>
@@ -21,4 +21,4 @@ private:
 };
 
 
-#endif // SINGLE_INSTANCE_H
+#endif // ALARM_DBUS_H

diff --git a/src/app/alarmdbusadaptor.cpp b/src/app/alarmdbusadaptor.cpp
index c0c903a362e79411b16501eae70d238cffa3e493..fb593503dcc341a8c26b5cbde259990106a439bf 100644 (file)
--- a/src/app/alarmdbusadaptor.cpp
+++ b/src/app/alarmdbusadaptor.cpp
@@ -1,12 +1,3 @@
-/*
- * This file was generated by dbusxml2cpp version 0.6
- * Command line was: dbusxml2cpp -c CarAdaptor -a car_adaptor_p.h:car_adaptor.cpp car.xml
- *
- * dbusxml2cpp is Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
 
 #include "alarmdbusadaptorp.h"
 #include <QtCore/QMetaObject>
@@ -17,9 +8,6 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 
-/*
- * Implementation of adaptor class CarAdaptor
- */
 
 AlarmDBusAdaptor::AlarmDBusAdaptor(QObject *parent)
     : QDBusAbstractAdaptor(parent)
@@ -35,7 +23,6 @@ AlarmDBusAdaptor::~AlarmDBusAdaptor()
 
 void AlarmDBusAdaptor::Alarm(int aEventId)
 {
-    // handle method call com.trolltech.Examples.CarInterface.accelerate
     QMetaObject::invokeMethod(parent(), "Alarm",Q_ARG(int, aEventId));
 }
 

diff --git a/src/app/alarmdbusadaptorp.h b/src/app/alarmdbusadaptorp.h
index cf22b171a56d57c043b049c62999e6e7c5ff9b48..4ebb979a88e901e64e3cf39f1db24ba68bed80ea 100644 (file)
--- a/src/app/alarmdbusadaptorp.h
+++ b/src/app/alarmdbusadaptorp.h
@@ -1,14 +1,3 @@
-/*
- * This file was generated by dbusxml2cpp version 0.6
- * Command line was: dbusxml2cpp -c CarAdaptor -a car_adaptor_p.h:car_adaptor.cpp car.xml
- *
- * dbusxml2cpp is Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
 #ifndef ALARM_DBUS_ADAPTOR_P_H
 #define ALARM_DBUS_ADAPTOR_P_H
 
@@ -24,9 +13,7 @@ class QStringList;
 class QVariant;
 QT_END_NAMESPACE
 
-/*
- * Adaptor class for interface com.trolltech.Examples.CarInterface
- */
+
 class AlarmDBusAdaptor: public QDBusAbstractAdaptor
 {
     Q_OBJECT