X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=f4fadd4c3cbbb05160663d4cb89ff45a9cf23f21;hb=6f534b8338f9e6cba5bfe7e8183d3a688075f428;hp=0f652d0c675fea5882dc2e7e45356828635c59f5;hpb=4df78c9720ac21137db6e9f3439506d8bc31923b;p=quassel.git
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 0f652d0c..f4fadd4c 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -48,7 +48,7 @@ void Core::destroy() {
}
Core::Core() : storage(0) {
- startTime = QDateTime::currentDateTime(); // for uptime :)
+ _startTime = QDateTime::currentDateTime(); // for uptime :)
// Register storage backends here!
registerStorageBackend(new SqliteStorage(this));
@@ -423,14 +423,14 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
reply["CoreBuild"] = 860; // FIXME legacy
reply["ProtocolVersion"] = Global::protocolVersion;
// TODO: Make the core info configurable
- int uptime = startTime.secsTo(QDateTime::currentDateTime());
+ int uptime = startTime().secsTo(QDateTime::currentDateTime());
int updays = uptime / 86400; uptime %= 86400;
int uphours = uptime / 3600; uptime %= 3600;
int upmins = uptime / 60;
reply["CoreInfo"] = tr("Quassel Core Version %1
"
- "Built: %2
"
- "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuildDate)
- .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime.toString(Qt::TextDate));
+ "Built: %2
"
+ "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuildDate)
+ .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime().toString(Qt::TextDate));
#ifndef QT_NO_OPENSSL
SslServer *sslServer = qobject_cast(&server);