X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fcoreinfo.cpp;fp=src%2Fcore%2Fcorecoreinfo.h;h=e4019c7a2b6246785b581dd9cf86b0f2374b1a00;hp=991ebf9016936aa6eb56ef597df8b0a6161217d8;hb=bd5414d8bfe2be18ba051d4bbf936e9ead0cdf66;hpb=7fe7ca0631d2e8327351806947a1e030eb203cf7 diff --git a/src/core/corecoreinfo.h b/src/common/coreinfo.cpp similarity index 72% rename from src/core/corecoreinfo.h rename to src/common/coreinfo.cpp index 991ebf90..e4019c7a 100644 --- a/src/core/corecoreinfo.h +++ b/src/common/coreinfo.cpp @@ -18,33 +18,26 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef CORECOREINFO_H -#define CORECOREINFO_H - #include "coreinfo.h" -class CoreSession; +INIT_SYNCABLE_OBJECT(CoreInfo) +CoreInfo::CoreInfo(QObject *parent) : SyncableObject(parent) {} -/* - * Yes this name is somewhat stupid... but it fits the general naming scheme - * which is prefixing core specific sync objects with "Core"... ;) - */ -class CoreCoreInfo : public CoreInfo +QVariantMap CoreInfo::coreData() const { - SYNCABLE_OBJECT - Q_OBJECT - -public: - CoreCoreInfo(CoreSession *parent); - - inline virtual const QMetaObject *syncMetaObject() const { return &CoreInfo::staticMetaObject; } - -public slots: - virtual QVariantMap coreData() const; - -private: - CoreSession *_coreSession; -}; + return _coreData; +} +void CoreInfo::setCoreData(const QVariantMap &coreData) +{ + _coreData = coreData; + SYNC(ARG(coreData)); + emit coreDataChanged(coreData); +} -#endif //CORECOREINFO_H +void CoreInfo::setConnectedClientData(const int peerCount, const QVariantList peerData) +{ + _coreData["sessionConnectedClients"] = peerCount; + _coreData["sessionConnectedClientData"] = peerData; + setCoreData(_coreData); +}