X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Finclude%2Fqtrapids%2Fdbus.hpp;h=c7e91c432fcac87a3894b65f9f82a3082d9056f6;hb=d27c2db830de9a65d6a419479ee598cbf3697746;hp=103c950c78c9ba83f40dcc25c3830ec94e19b1db;hpb=6c325f6d191739f115b2df64b7b83949e355e8d6;p=qtrapids

diff --git a/src/include/qtrapids/dbus.hpp b/src/include/qtrapids/dbus.hpp
index 103c950..c7e91c4 100644
--- a/src/include/qtrapids/dbus.hpp
+++ b/src/include/qtrapids/dbus.hpp
@@ -11,17 +11,17 @@
 namespace qtrapids
 {
 
-    struct TorrentState
+struct TorrentState
+{
+
+    enum torrent_action
     {
+        action_add,
+        action_remove,
+        action_update
+    };
 
-        enum torrent_action
-        {
-            action_add,
-            action_remove,
-            action_update
-        };
-        
-        TorrentState() 
+    TorrentState()
             : hash("")
             , name("")
             , state(0)
@@ -32,95 +32,97 @@ namespace qtrapids
             , leeches(0)
             , ratio(0)
             , total_size(0)
-            { }
-
-        QString hash;
-        QString name;
-        torrent_action action;
-        uint state;
-        uint progress;
-        uint down_rate;
-        uint up_rate;
-        uint seeds;
-        uint leeches;
-        uint ratio;
-        qulonglong total_size;
-    };
-
-    typedef QHash<QString, QString> ParamsMap_t;
-    typedef QHash<QString, QString> const ParamsMapConst_t;
-    typedef QHash<QString, QString>::iterator ParamsMapIterator_t;
-    typedef QHash<QString, QString>::const_iterator ParamsMapConstIterator_t;
-
-    static inline QDBusArgument& operator << (QDBusArgument& argument
-                                              , TorrentState const& state)
-    {
-        std::cout << "serialize" << std::endl;
-        argument.beginStructure();
-        argument << state.hash << state.name << (uint)(state.action) << state.state << state.progress 
-                 << state.down_rate << state.up_rate << state.seeds
-                 << state.leeches << state.ratio << state.total_size;
-        argument.endStructure();
-        return argument;
-    }
+    { }
+
+    QString hash;
+    QString name;
+    torrent_action action;
+    uint state;
+    uint progress;
+    uint down_rate;
+    uint up_rate;
+    uint seeds;
+    uint leeches;
+    uint ratio;
+    qulonglong total_size;
+};
+
+typedef QHash<QString, QString> ParamsMap_t;
+typedef QHash<QString, QString> const ParamsMapConst_t;
+typedef QHash<QString, QString>::iterator ParamsMapIterator_t;
+typedef QHash<QString, QString>::const_iterator ParamsMapConstIterator_t;
+
+static inline QDBusArgument& operator << (QDBusArgument& argument
+        , TorrentState const& state)
+{
+    std::cout << "serialize" << std::endl;
+    argument.beginStructure();
+    argument << state.hash << state.name << (uint)(state.action) << state.state << state.progress
+    << state.down_rate << state.up_rate << state.seeds
+    << state.leeches << state.ratio << state.total_size;
+    argument.endStructure();
+    return argument;
+}
 
-    static inline QDBusArgument const& operator >> (QDBusArgument const& argument
-                                                    , TorrentState& state)
-    {
-        std::cout << "deserialize" << std::endl;
-        argument.beginStructure();
-        uint action;
-        argument >> state.hash >> state.name >> action >> state.state >> state.progress 
-                 >> state.down_rate >> state.up_rate >> state.seeds
-                 >> state.leeches >> state.ratio >> state.total_size;
-        state.action = (TorrentState::torrent_action)action;
-        argument.endStructure();
-        return argument;
-    }
+static inline QDBusArgument const& operator >> (QDBusArgument const& argument
+        , TorrentState& state)
+{
+    std::cout << "deserialize" << std::endl;
+    argument.beginStructure();
+    uint action;
+    argument >> state.hash >> state.name >> action >> state.state >> state.progress
+    >> state.down_rate >> state.up_rate >> state.seeds
+    >> state.leeches >> state.ratio >> state.total_size;
+    state.action = (TorrentState::torrent_action)action;
+    argument.endStructure();
+    return argument;
+}
 
-    static inline QDBusArgument& operator << (QDBusArgument& argument
-                                              , ParamsMapConst_t& params)
+static inline QDBusArgument& operator << (QDBusArgument& argument
+        , ParamsMapConst_t& params)
+{
+    ParamsMapConstIterator_t p;
+    std::cout << "serialize params" << std::endl;
+    argument.beginMap();
+    for (p = params.constBegin(); p != params.constEnd(); ++p)
     {
-        ParamsMapConstIterator_t p;
-        std::cout << "serialize params" << std::endl;
-        argument.beginMap();
-        for (p = params.constBegin(); p != params.constEnd(); ++p) {
-            argument.beginMapEntry();
-            argument << p.key() << p.value();
-            argument.endMapEntry();
-        }
-        argument.endMap();
-        return argument;
+        argument.beginMapEntry();
+        argument << p.key() << p.value();
+        argument.endMapEntry();
     }
+    argument.endMap();
+    return argument;
+}
 
-    static inline QDBusArgument const& operator >> (QDBusArgument const& argument
-                                                    , ParamsMap_t& params)
+static inline QDBusArgument const& operator >> (QDBusArgument const& argument
+        , ParamsMap_t& params)
+{
+    ParamsMapConstIterator_t p;
+    QString key, value;
+    std::cout << "deserialize params" << std::endl;
+    argument.beginMap();
+    for (p = params.constBegin(); p != params.constEnd(); ++p)
     {
-        ParamsMapConstIterator_t p;
-        QString key, value;
-        std::cout << "deserialize params" << std::endl;
-        argument.beginMap();
-        for (p = params.constBegin(); p != params.constEnd(); ++p) {
-            argument.beginMapEntry();
-            argument >> key >> value;
-            params[key] = value; 
-            argument.endMapEntry();
-        }
-        argument.endMap();
-        return argument;
+        argument.beginMapEntry();
+        argument >> key >> value;
+        params[key] = value;
+        argument.endMapEntry();
     }
+    argument.endMap();
+    return argument;
+}
 
 
-    // class DBusConnector
-    // {
-    // public:
-    //     DBusConnector()
-    //         : connection_()
-    //     {
-    //     }
-    // private:
-    //     QDBusConnection connection_;
-    // };
+// class DBusConnector
+// {
+// public:
+//     DBusConnector()
+//         : connection_()
+//     {
+//     }
+// private:
+//     QDBusConnection connection_;
+// };
 
 }