X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorecoreinfo.cpp;h=999c6bc0935875f73c2a446941116b4ff1b00498;hp=d1b3e15a89ebc62862f002c0f1f275c16016d75d;hb=9d54503555534a2c554f09a33df6afa33d6308ec;hpb=5c6804f291a63f978e328aeddcc8448e3443b45e diff --git a/src/core/corecoreinfo.cpp b/src/core/corecoreinfo.cpp index d1b3e15a..999c6bc0 100644 --- a/src/core/corecoreinfo.cpp +++ b/src/core/corecoreinfo.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-2014 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "corecoreinfo.h" @@ -25,17 +25,20 @@ #include "quassel.h" #include "signalproxy.h" +INIT_SYNCABLE_OBJECT(CoreCoreInfo) CoreCoreInfo::CoreCoreInfo(CoreSession *parent) - : CoreInfo(parent), + : CoreInfo(parent), _coreSession(parent) { } -QVariantMap CoreCoreInfo::coreData() const { - QVariantMap data; - data["quasselVersion"] = Global::quasselVersion; - data["quasselBuildDate"] = Global::quasselBuildDate; - data["startTime"] = Core::instance()->startTime(); - data["sessionConnectedClients"] = _coreSession->signalProxy()->peerCount(); - return data; + +QVariantMap CoreCoreInfo::coreData() const +{ + QVariantMap data; + data["quasselVersion"] = Quassel::buildInfo().fancyVersionString; + data["quasselBuildDate"] = Quassel::buildInfo().buildDate; + data["startTime"] = Core::instance()->startTime(); + data["sessionConnectedClients"] = _coreSession->signalProxy()->peerCount(); + return data; }