From e625531efd04c0e77e540fbb1a0fc80457bc7aba Mon Sep 17 00:00:00 2001 From: Janne Koschinski Date: Mon, 28 Aug 2017 15:01:42 +0200 Subject: [PATCH] Improvements to fix the build and for Doxygen --- src/common/signalproxy.cpp | 2 + src/common/signalproxy.h | 4 +- src/qtui/CMakeLists.txt | 2 +- src/qtui/coresessionwidget.cpp | 20 ++ src/qtui/coresessionwidget.h | 26 ++- src/qtui/ui/coresessionwidget.ui | 388 +++++++++++++++---------------- 6 files changed, 241 insertions(+), 201 deletions(-) diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index 8499e1ad..976fccb2 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -825,6 +825,8 @@ QVariantList SignalProxy::peerData() { QVariantMap data; data["id"] = peer->_id; data["clientVersion"] = peer->_clientVersion; + // We explicitly rename this, as, due to the Debian reproducability changes, buildDate isn’t actually the build + // date anymore, but on newer clients the date of the last git commit data["clientVersionDate"] = peer->_buildDate; data["remoteAddress"] = peer->address(); data["connectedSince"] = peer->_connectedSince; diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index e98f6bfc..be6b804b 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -78,6 +78,7 @@ public: void dumpProxyStats(); void dumpSyncMap(SyncableObject *object); + /**@{*/ /** * This method allows to send a signal only to a limited set of peers * @param peerIds A list of peers that should receive it @@ -94,10 +95,11 @@ public: #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #ifdef Q_COMPILER_INITIALIZER_LISTS void restrictTargetPeers(std::initializer_list peers, std::function closure) { - restrictTargetPeers(QSet(peers), std::move(closure)); + restrictTargetPeers(QSet(peers), std::move(closure)); } #endif #endif + /**}@*/ inline int peerCount() const { return _peers.size(); } QVariantList peerData(); diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt index 91b05077..0637d226 100644 --- a/src/qtui/CMakeLists.txt +++ b/src/qtui/CMakeLists.txt @@ -22,7 +22,7 @@ set(SOURCES coreconnectdlg.cpp coreconnectionstatuswidget.cpp coreinfodlg.cpp - coresessionwidget.cpp + coresessionwidget.cpp debugbufferviewoverlay.cpp debugconsole.cpp debuglogwidget.cpp diff --git a/src/qtui/coresessionwidget.cpp b/src/qtui/coresessionwidget.cpp index 33568789..a3f297cf 100644 --- a/src/qtui/coresessionwidget.cpp +++ b/src/qtui/coresessionwidget.cpp @@ -1,3 +1,23 @@ +/*************************************************************************** + * Copyright (C) 2005-2016 by the Quassel Project * + * devel@quassel-irc.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) version 3. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * 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., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + #include "coresessionwidget.h" #include #include diff --git a/src/qtui/coresessionwidget.h b/src/qtui/coresessionwidget.h index f428875f..a62e6b04 100644 --- a/src/qtui/coresessionwidget.h +++ b/src/qtui/coresessionwidget.h @@ -1,13 +1,29 @@ -// -// Created by kuschku on 27.08.17. -// +/*************************************************************************** + * Copyright (C) 2005-2016 by the Quassel Project * + * devel@quassel-irc.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) version 3. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * 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., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ #ifndef CORESESSIONWIDGET_H #define CORESESSIONWIDGET_H -#include +#include #include -#include +#include class CoreSessionWidget: public QWidget { diff --git a/src/qtui/ui/coresessionwidget.ui b/src/qtui/ui/coresessionwidget.ui index 83096f2b..203d62e9 100644 --- a/src/qtui/ui/coresessionwidget.ui +++ b/src/qtui/ui/coresessionwidget.ui @@ -1,198 +1,198 @@ - CoreSessionWidget - - - - 0 - 0 - 509 - 204 - - - - - 0 - 0 - - - - - 480 - 0 - - - - - 16777215 - 16777215 - - - - - - - - - - - - 13 - 75 - true - - - - 86.103.223.212 - - - - - - - - 0 - 0 - - - - - 32 - 32 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - Qt::NoTextInteraction - - - - - - - - - - - color: rgb(119, 119, 119); - - - Client: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - v0.13-pre (0.12.0+372 git-12df418) - - - - - - - color: rgb(119, 119, 119); - - - Location: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Kiel, Germany - - - - - - - Sun Aug 27 04:29:53 2017 - - - - - - - color: rgb(119, 119, 119); - - - Version Date: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Sun Aug 27 15:03:10 2017 - - - - - - - color: rgb(119, 119, 119); - - - Connected Since: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - End Session - - - - - - - - - - - Qt::Horizontal - - - - + CoreSessionWidget + + + + 0 + 0 + 509 + 204 + + + + + 0 + 0 + + + + + 480 + 0 + + + + + 16777215 + 16777215 + + + + + + + + + + + + 13 + 75 + true + + + + 10.104.241.277 + + + + + + + + 0 + 0 + + + + + 32 + 32 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + Qt::NoTextInteraction + + + + + + + + + + + opacity: 0.66; + + + Client: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + v0.13-pre (0.12.0+372 git-12df418) + + + + + + + color: rgb(119, 119, 119); + + + Version Date: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Sun Aug 27 04:29:53 2017 + + + + + + + opacity: 0.66; + + + Location: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Kiel, Germany + + + + + + + color: rgb(119, 119, 119); + + + Connected Since: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Sun Aug 27 15:03:10 2017 + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + End Session + + + + + + + + + + + Qt::Horizontal + - - + + + + + -- 2.20.1