Added Q_FUNC_INFO macros to some functions.

[qtrapids] / src / include / qtrapids / dbus.hpp

diff --git a/src/include/qtrapids/dbus.hpp b/src/include/qtrapids/dbus.hpp
index 79d1cd5..52462c8 100644 (file)
--- a/src/include/qtrapids/dbus.hpp
+++ b/src/include/qtrapids/dbus.hpp
@@ -29,7 +29,8 @@ struct TorrentState {
                        , seeds(0)
                        , leeches(0)
                        , ratio(0)
-                       , total_size(0) { }
+                       , total_size(0)
+                       , total_done(0){ }
 
        QString hash;
        QString name;
@@ -42,21 +43,24 @@ struct TorrentState {
        uint leeches;
        uint ratio;
        qulonglong total_size;
+       qulonglong total_done;
 };
 
 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;
+typedef ParamsMap_t::iterator ParamsMapIterator_t;
+typedef ParamsMap_t::const_iterator ParamsMapConstIterator_t;
 
 static inline QDBusArgument& operator << (QDBusArgument& argument
         , TorrentState const& state)
 {
+#ifdef QTRAPIDS_DEBUG
        std::cout << "serialize" << std::endl;
+#endif
        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;
+       << state.leeches << state.ratio << state.total_size << state.total_done;
        argument.endStructure();
        return argument;
 }
@@ -64,12 +68,14 @@ static inline QDBusArgument& operator << (QDBusArgument& argument
 static inline QDBusArgument const& operator >> (QDBusArgument const& argument
         , TorrentState& state)
 {
+#ifdef QTRAPIDS_DEBUG
        std::cout << "deserialize" << std::endl;
+#endif
        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.leeches >> state.ratio >> state.total_size >> state.total_done;
        state.action = (TorrentState::torrent_action)action;
        argument.endStructure();
        return argument;
@@ -79,7 +85,10 @@ static inline QDBusArgument& operator << (QDBusArgument& argument
         , ParamsMapConst_t& params)
 {
        ParamsMapConstIterator_t p;
+#ifdef QTRAPIDS_DEBUG
        std::cout << "serialize params" << std::endl;
+#endif
+
        argument.beginMap();
        for (p = params.constBegin(); p != params.constEnd(); ++p) {
                argument.beginMapEntry();
@@ -95,7 +104,9 @@ static inline QDBusArgument const& operator >> (QDBusArgument const& argument
 {
        ParamsMapConstIterator_t p;
        QString key, value;
+#ifdef QTRAPIDS_DEBUG
        std::cout << "deserialize params" << std::endl;
+#endif
        argument.beginMap();
        for (p = params.constBegin(); p != params.constEnd(); ++p) {
                argument.beginMapEntry();