Change contact email address as the nokia one will be no longer valid soon

[profile/ivi/ofono-qt.git] / lib / ofonomodemmanager.h

diff --git a/lib/ofonomodemmanager.h b/lib/ofonomodemmanager.h
index ed225d0..f5a06d9 100644 (file)
--- a/lib/ofonomodemmanager.h
+++ b/lib/ofonomodemmanager.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
- * Contact: Alexander Kanavin <alexander.kanavin@nokia.com>
+ * Contact: Alexander Kanavin <alex.kanavin@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -24,23 +24,12 @@
 #ifndef OFONOMODEMMANAGER_H
 #define OFONOMODEMMANAGER_H
 
-#include <QtDBus/QtDBus>
 #include <QtCore/QObject>
+#include <QVariant>
+#include <QDBusObjectPath>
+#include <QStringList>
 #include "libofono-qt_global.h"
 
-struct OfonoModemStruct {
-    QDBusObjectPath path;
-    QVariantMap properties;
-};
-typedef QList<OfonoModemStruct> OfonoModemList;
-Q_DECLARE_METATYPE(OfonoModemStruct)
-Q_DECLARE_METATYPE(OfonoModemList)
-// Marshall the ModemStruct data into a D-Bus argument
-QDBusArgument &operator<<(QDBusArgument &argument, const OfonoModemStruct &modem);
-    
-// Retrieve the ModemStruct data from the D-Bus argument
-const QDBusArgument &operator>>(const QDBusArgument &argument, OfonoModemStruct &modem);
-
 //! Provides access to the list of available modems and changes in that list.
 class OFONO_QT_EXPORT OfonoModemManager : public QObject {
 
@@ -53,7 +42,7 @@ public:
     ~OfonoModemManager();
 
     //! Returns a list of d-bus object paths that represent available modems
-    QStringList modems() const;
+    Q_INVOKABLE QStringList modems() const;
 
 signals:
     //! Issued when a modem has been added