Improvements to fix the build and for Doxygen

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 8499e1a..976fccb 100644 (file)
--- 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 e98f6bf..be6b804 100644 (file)
--- 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<Peer*> peers, std::function<void()> closure) {
-        restrictTargetPeers(QSet(peers), std::move(closure));
+        restrictTargetPeers(QSet<Peer*>(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 91b0507..0637d22 100644 (file)
--- 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 3356878..a3f297c 100644 (file)
--- 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 <QtCore/QDateTime>
 #include <client.h>

diff --git a/src/qtui/coresessionwidget.h b/src/qtui/coresessionwidget.h
index f428875..a62e6b0 100644 (file)
--- 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 <QtWidgets/QWidget>
+#include <QWidget>
 #include <ui_coresessionwidget.h>
-#include <QtCore/QMap>
+#include <QMap>
 
 class CoreSessionWidget: public QWidget
 {

diff --git a/src/qtui/ui/coresessionwidget.ui b/src/qtui/ui/coresessionwidget.ui
index 83096f2..203d62e 100644 (file)
--- a/src/qtui/ui/coresessionwidget.ui
+++ b/src/qtui/ui/coresessionwidget.ui
@@ -1,198 +1,198 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
-    <class>CoreSessionWidget</class>
-    <widget class="QWidget" name="CoreSessionWidget">
-        <property name="geometry">
-            <rect>
-                <x>0</x>
-                <y>0</y>
-                <width>509</width>
-                <height>204</height>
-            </rect>
-        </property>
-        <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-            </sizepolicy>
-        </property>
-        <property name="minimumSize">
-            <size>
-                <width>480</width>
-                <height>0</height>
-            </size>
-        </property>
-        <property name="maximumSize">
-            <size>
-                <width>16777215</width>
-                <height>16777215</height>
-            </size>
-        </property>
-        <layout class="QGridLayout" name="gridLayout_4">
-            <item row="0" column="0">
-                <layout class="QGridLayout" name="mainLayout" rowstretch="0,0,0">
-                    <item row="0" column="0">
-                        <layout class="QHBoxLayout" name="titleLayout">
-                            <item>
-                                <widget class="QLabel" name="labelRemoteAddress">
-                                    <property name="font">
-                                        <font>
-                                            <pointsize>13</pointsize>
-                                            <weight>75</weight>
-                                            <bold>true</bold>
-                                        </font>
-                                    </property>
-                                    <property name="text">
-                                        <string>86.103.223.212</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item>
-                                <widget class="QLabel" name="iconSecure">
-                                    <property name="sizePolicy">
-                                        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                    <property name="minimumSize">
-                                        <size>
-                                            <width>32</width>
-                                            <height>32</height>
-                                        </size>
-                                    </property>
-                                    <property name="text">
-                                        <string/>
-                                    </property>
-                                    <property name="alignment">
-                                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                                    </property>
-                                    <property name="textInteractionFlags">
-                                        <set>Qt::NoTextInteraction</set>
-                                    </property>
-                                </widget>
-                            </item>
-                        </layout>
-                    </item>
-                    <item row="1" column="0">
-                        <layout class="QGridLayout" name="contentLayout" columnstretch="1,3">
-                            <item row="0" column="0">
-                                <widget class="QLabel" name="labelClientTitle">
-                                    <property name="styleSheet">
-                                        <string notr="true">color: rgb(119, 119, 119);</string>
-                                    </property>
-                                    <property name="text">
-                                        <string>Client:</string>
-                                    </property>
-                                    <property name="alignment">
-                                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="0" column="1">
-                                <widget class="QLabel" name="labelClient">
-                                    <property name="text">
-                                        <string>v0.13-pre (0.12.0+372 git-12df418)</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="2" column="0">
-                                <widget class="QLabel" name="labelLocationTitle">
-                                    <property name="styleSheet">
-                                        <string notr="true">color: rgb(119, 119, 119);</string>
-                                    </property>
-                                    <property name="text">
-                                        <string>Location:</string>
-                                    </property>
-                                    <property name="alignment">
-                                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="2" column="1">
-                                <widget class="QLabel" name="labelLocation">
-                                    <property name="text">
-                                        <string>Kiel, Germany</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="1" column="1">
-                                <widget class="QLabel" name="labelVersionDate">
-                                    <property name="text">
-                                        <string>Sun Aug 27 04:29:53 2017</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="1" column="0">
-                                <widget class="QLabel" name="labelVersionDateTitle">
-                                    <property name="styleSheet">
-                                        <string notr="true">color: rgb(119, 119, 119);</string>
-                                    </property>
-                                    <property name="text">
-                                        <string>Version Date:</string>
-                                    </property>
-                                    <property name="alignment">
-                                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="3" column="1">
-                                <widget class="QLabel" name="labelUptime">
-                                    <property name="text">
-                                        <string>Sun Aug 27 15:03:10 2017</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="3" column="0">
-                                <widget class="QLabel" name="labelUptimeTitle">
-                                    <property name="styleSheet">
-                                        <string notr="true">color: rgb(119, 119, 119);</string>
-                                    </property>
-                                    <property name="text">
-                                        <string>Connected Since:</string>
-                                    </property>
-                                    <property name="alignment">
-                                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                                    </property>
-                                </widget>
-                            </item>
-                        </layout>
-                    </item>
-                    <item row="2" column="0">
-                        <layout class="QHBoxLayout" name="actionsLayout">
-                            <item>
-                                <spacer name="horizontalSpacer">
-                                    <property name="orientation">
-                                        <enum>Qt::Horizontal</enum>
-                                    </property>
-                                    <property name="sizeHint" stdset="0">
-                                        <size>
-                                            <width>40</width>
-                                            <height>20</height>
-                                        </size>
-                                    </property>
-                                </spacer>
-                            </item>
-                            <item>
-                                <widget class="QPushButton" name="disconnectButton">
-                                    <property name="text">
-                                        <string>End Session</string>
-                                    </property>
-                                </widget>
-                            </item>
-                        </layout>
-                    </item>
-                </layout>
-            </item>
-            <item row="2" column="0">
-                <widget class="Line" name="line">
-                    <property name="orientation">
-                        <enum>Qt::Horizontal</enum>
-                    </property>
-                </widget>
-            </item>
-        </layout>
+ <class>CoreSessionWidget</class>
+ <widget class="QWidget" name="CoreSessionWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>509</width>
+    <height>204</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>480</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>16777215</height>
+   </size>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_4">
+   <item row="0" column="0">
+    <layout class="QGridLayout" name="mainLayout" rowstretch="0,0,0">
+     <item row="0" column="0">
+      <layout class="QHBoxLayout" name="titleLayout">
+       <item>
+        <widget class="QLabel" name="labelRemoteAddress">
+         <property name="font">
+          <font>
+           <pointsize>13</pointsize>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string notr="true">10.104.241.277</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="iconSecure">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>32</width>
+           <height>32</height>
+          </size>
+         </property>
+         <property name="text">
+          <string />
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::NoTextInteraction</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="1" column="0">
+      <layout class="QGridLayout" name="contentLayout" columnstretch="1,3">
+       <item row="0" column="0">
+        <widget class="QLabel" name="labelClientTitle">
+         <property name="styleSheet">
+          <string notr="true">opacity: 0.66;</string>
+         </property>
+         <property name="text">
+          <string>Client:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLabel" name="labelClient">
+         <property name="text">
+          <string notr="true">v0.13-pre (0.12.0+372 git-12df418)</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="labelVersionDateTitle">
+         <property name="styleSheet">
+          <string notr="true">color: rgb(119, 119, 119);</string>
+         </property>
+         <property name="text">
+          <string>Version Date:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLabel" name="labelVersionDate">
+         <property name="text">
+          <string notr="true">Sun Aug 27 04:29:53 2017</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="labelLocationTitle">
+         <property name="styleSheet">
+          <string notr="true">opacity: 0.66;</string>
+         </property>
+         <property name="text">
+          <string>Location:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLabel" name="labelLocation">
+         <property name="text">
+          <string notr="true">Kiel, Germany</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="labelUptimeTitle">
+         <property name="styleSheet">
+          <string notr="true">color: rgb(119, 119, 119);</string>
+         </property>
+         <property name="text">
+          <string>Connected Since:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QLabel" name="labelUptime">
+         <property name="text">
+          <string notr="true">Sun Aug 27 15:03:10 2017</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="2" column="0">
+      <layout class="QHBoxLayout" name="actionsLayout">
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="disconnectButton">
+         <property name="text">
+          <string>End Session</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
     </widget>
-    <resources/>
-    <connections/>
+   </item>
+  </layout>
+ </widget>
+ <resources />
+ <connections />
 </ui>