diff -Nru icecc-monitor-3.1.0/CHANGELOG.md icecc-monitor-3.2.0/CHANGELOG.md --- icecc-monitor-3.1.0/CHANGELOG.md 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/CHANGELOG.md 2018-12-10 09:04:43.000000000 +0000 @@ -1,3 +1,14 @@ +## 3.2.0 (2018-12-10) + +Bugfixes: + +- Fix broken scheduler discovery with newer Icecream (#40) + +Internal Changes: + +- Add some badges to README.md +- Coding style improvements + ## 3.1.0 (2017-04-07) Features: diff -Nru icecc-monitor-3.1.0/cmake/modules/FindDocbook2X.cmake icecc-monitor-3.2.0/cmake/modules/FindDocbook2X.cmake --- icecc-monitor-3.1.0/cmake/modules/FindDocbook2X.cmake 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/cmake/modules/FindDocbook2X.cmake 2018-12-10 09:04:43.000000000 +0000 @@ -51,7 +51,7 @@ if (DOCBOOK_TO_MAN_EXECUTABLE) _check_docbook2x_executable() else() - foreach(test_exec docbook2x-man docbook-to-man docbook2man) + foreach(test_exec docbook2x-man docbook-to-man db2x_docbook2man docbook2man) find_program(DOCBOOK_TO_MAN_EXECUTABLE NAMES ${test_exec} ) diff -Nru icecc-monitor-3.1.0/cmake/modules/FindIcecream.cmake icecc-monitor-3.2.0/cmake/modules/FindIcecream.cmake --- icecc-monitor-3.1.0/cmake/modules/FindIcecream.cmake 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/cmake/modules/FindIcecream.cmake 2018-12-10 09:04:43.000000000 +0000 @@ -26,7 +26,7 @@ if(NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - find_package(PkgConfig) + find_package(PkgConfig REQUIRED) pkg_check_modules(PC_ICECC icecc) # The icecream lib may optionally need linking to -lcap-ng, so dig it out # of pkg-config data. diff -Nru icecc-monitor-3.1.0/CMakeLists.txt icecc-monitor-3.2.0/CMakeLists.txt --- icecc-monitor-3.1.0/CMakeLists.txt 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/CMakeLists.txt 2018-12-10 09:04:43.000000000 +0000 @@ -15,7 +15,7 @@ # version info set(ICEMON_VERSION_MAJOR "3") -set(ICEMON_VERSION_MINOR "1") +set(ICEMON_VERSION_MINOR "2") set(ICEMON_VERSION_PATCH "0") set(ICEMON_VERSION "${ICEMON_VERSION_MAJOR}.${ICEMON_VERSION_MINOR}.${ICEMON_VERSION_PATCH}") set(ICEMON_VERSION_STRING "${ICEMON_VERSION}") diff -Nru icecc-monitor-3.1.0/debian/changelog icecc-monitor-3.2.0/debian/changelog --- icecc-monitor-3.1.0/debian/changelog 2017-06-18 05:46:42.000000000 +0000 +++ icecc-monitor-3.2.0/debian/changelog 2018-12-21 15:07:54.000000000 +0000 @@ -1,3 +1,23 @@ +icecc-monitor (3.2.0-1) unstable; urgency=medium + + * New upstream release. + * Switch Vcs-* fields to salsa.debian.org. + * Bump the debhelper compatibility to 11: + - bump the debhelper build dependency to 11~ + - bump compat to 11 + - remove --parallel for dh, as now done by default + * Remove Fathi Boudra from Uploaders, as requested by the MIA team. + (Closes: #879301) + * Remove the get-orig-source target from rules, as it was broken for a long + time (refers to dpatch, and SVN). + * Bump Standards-Version to 4.2.1, no changes required. + * Remove empty line at the end of changelog. + * Use https for Format in copyright. + * Bump the libicecc-dev build dependency to >= 1.2, to make sure to use the + newer icecc static library. + + -- Pino Toscano Fri, 21 Dec 2018 16:07:54 +0100 + icecc-monitor (3.1.0-1) unstable; urgency=medium * New upstream release. @@ -140,4 +160,3 @@ * Export kde_htmldir to fix doc installation path -- Fathi Boudra Mon, 11 Sep 2006 23:15:00 +0200 - diff -Nru icecc-monitor-3.1.0/debian/compat icecc-monitor-3.2.0/debian/compat --- icecc-monitor-3.1.0/debian/compat 2013-05-25 09:33:10.000000000 +0000 +++ icecc-monitor-3.2.0/debian/compat 2018-12-21 08:53:02.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru icecc-monitor-3.1.0/debian/control icecc-monitor-3.2.0/debian/control --- icecc-monitor-3.1.0/debian/control 2017-06-18 05:46:07.000000000 +0000 +++ icecc-monitor-3.2.0/debian/control 2018-12-21 10:51:07.000000000 +0000 @@ -2,16 +2,16 @@ Section: kde Priority: optional Maintainer: Debian KDE Extras Team -Uploaders: Fathi Boudra , Mark Purcell , +Uploaders: Mark Purcell , Pino Toscano -Build-Depends: debhelper (>= 9), cmake (>= 2.8.9), +Build-Depends: debhelper (>= 11~), cmake (>= 2.8.9), pkg-config, - qtbase5-dev (>= 5.2), libicecc-dev, + qtbase5-dev (>= 5.2), libicecc-dev (>= 1.2~), docbook2x, docbook-xml -Standards-Version: 3.9.8 +Standards-Version: 4.2.1 Homepage: https://github.com/icecc/icemon -Vcs-Svn: svn://anonscm.debian.org/pkg-kde/kde-extras/icemon/trunk/ -Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-kde/kde-extras/icemon/ +Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/icemon.git +Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/icemon Package: icecc-monitor Architecture: any diff -Nru icecc-monitor-3.1.0/debian/copyright icecc-monitor-3.2.0/debian/copyright --- icecc-monitor-3.1.0/debian/copyright 2015-11-29 08:06:21.000000000 +0000 +++ icecc-monitor-3.2.0/debian/copyright 2018-12-21 09:04:47.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: icemon Source: https://github.com/icecc/icemon diff -Nru icecc-monitor-3.1.0/debian/rules icecc-monitor-3.2.0/debian/rules --- icecc-monitor-3.1.0/debian/rules 2015-11-29 07:30:10.000000000 +0000 +++ icecc-monitor-3.2.0/debian/rules 2018-12-21 08:56:27.000000000 +0000 @@ -10,12 +10,7 @@ ICECC_DEV_VERSION = $(shell dpkg-query -Wf '$${source:Package} (= $${source:Version})' libicecc-dev) %: - dh $@ --parallel + dh $@ override_dh_gencontrol: dh_gencontrol -- -Vicecc:Built-Using='$(ICECC_DEV_VERSION)' - -get-orig-source: - @@dh_testdir - @@[ -d ../tarballs/. ] - @@dpatch-get-origtargz ../tarballs diff -Nru icecc-monitor-3.1.0/.gitignore icecc-monitor-3.2.0/.gitignore --- icecc-monitor-3.1.0/.gitignore 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/.gitignore 2018-12-10 09:04:43.000000000 +0000 @@ -28,7 +28,7 @@ ui_*.h qrc_*.cpp Thumbs.db -*.pro.user* +*.user* # xemacs temporary files # --------------------- diff -Nru icecc-monitor-3.1.0/README.md icecc-monitor-3.2.0/README.md --- icecc-monitor-3.1.0/README.md 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/README.md 2018-12-10 09:04:43.000000000 +0000 @@ -1,3 +1,6 @@ +[![Build Status](https://travis-ci.org/icecc/icemon.svg?branch=master)](https://travis-ci.org/icecc/icemon) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/b8bc2d59bad544258a47209cc9bfb8e7)](https://www.codacy.com/app/icecc/icemon?utm_source=github.com&utm_medium=referral&utm_content=icecc/icemon&utm_campaign=Badge_Grade) + Icemon ====== @@ -8,14 +11,12 @@ ![Screenshot: Star View](https://github.com/icecc/icemon/wiki/screenshots/icemon-starview.png) -[![Build Status](https://travis-ci.org/icecc/icemon.svg?branch=master)](https://travis-ci.org/icecc/icemon) - Installation ------------ To compile icemon, install, the icecc development package, e.g. for Debian/Ubuntu: - $ apt-get install libicecc-dev + $ apt-get install pkg-config libicecc-dev Finally, make sure you have g++, Qt and cmake installed diff -Nru icecc-monitor-3.1.0/src/fakemonitor.cc icecc-monitor-3.2.0/src/fakemonitor.cc --- icecc-monitor-3.1.0/src/fakemonitor.cc 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/fakemonitor.cc 2018-12-10 09:04:43.000000000 +0000 @@ -53,7 +53,7 @@ { static const QStringList hostNames = {QStringLiteral("Linux 2.6"), QStringLiteral("Linux 3.2"), QStringLiteral("Linux 3.6")}; return hostNames[qrand() % hostNames.size()]; -}; +} } FakeMonitor::FakeMonitor(HostInfoManager *manager, QObject *parent) @@ -81,6 +81,7 @@ info.setName(HOST_NAMES[id % HOST_NAMES.length()] + QString::number(id)); info.setColor(info.createColor(info.name())); info.setOffline(false); + info.setNoRemote(false); info.setPlatform(randomPlatform()); info.setServerLoad(1.0); info.setServerSpeed(10); diff -Nru icecc-monitor-3.1.0/src/hostinfo.cc icecc-monitor-3.2.0/src/hostinfo.cc --- icecc-monitor-3.1.0/src/hostinfo.cc 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/hostinfo.cc 2018-12-10 09:04:43.000000000 +0000 @@ -122,13 +122,12 @@ QColor HostInfo::createColor(const QString &name) { unsigned long h = 0; - unsigned long g; - int ch; for (uint i = 0; i < ( uint )name.length(); ++i) { - ch = name[i].unicode(); + const int ch = name[i].unicode(); h = (h << 4) + ch; - if ((g = (h & 0xf0000000)) != 0) { + const unsigned long g = h & 0xf0000000; + if (g != 0) { h ^= g >> 24; h ^= g; } diff -Nru icecc-monitor-3.1.0/src/hostinfo.h icecc-monitor-3.2.0/src/hostinfo.h --- icecc-monitor-3.1.0/src/hostinfo.h 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/hostinfo.h 2018-12-10 09:04:43.000000000 +0000 @@ -51,6 +51,7 @@ void setOffline(bool offline) { mOffline = offline; } bool isOffline() const { return mOffline; } + void setNoRemote(bool noRemote) { mNoRemote = noRemote; } bool noRemote() const { return mNoRemote; } typedef QMap StatsMap; @@ -80,20 +81,20 @@ QColor createColor(const QString &name); private: - unsigned int mId; + unsigned int mId = 0; QString mName; QColor mColor; QString mPlatform; QString mIp; - unsigned int mMaxJobs; - bool mOffline; - bool mNoRemote; + unsigned int mMaxJobs = 0; + bool mOffline = false; + bool mNoRemote = true; - float mServerSpeed; + float mServerSpeed = 0.0; - unsigned int mServerLoad; + unsigned int mServerLoad = 0; static QVector mColorTable; static QMap mColorNameMap; @@ -106,7 +107,7 @@ public: HostInfoManager(); - ~HostInfoManager(); + ~HostInfoManager() override; HostInfo *find(unsigned int hostid) const; diff -Nru icecc-monitor-3.1.0/src/icecreammonitor.cc icecc-monitor-3.2.0/src/icecreammonitor.cc --- icecc-monitor-3.1.0/src/icecreammonitor.cc 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/icecreammonitor.cc 2018-12-10 09:04:43.000000000 +0000 @@ -126,13 +126,11 @@ ++it) { setCurrentNetname(QBA_fromStdString(*it)); if (!m_discover - || m_discover->timed_out()) { + || ((m_scheduler = m_discover->try_get_scheduler()) == NULL && m_discover->timed_out())) { delete m_discover; m_discover = new DiscoverSched(QBA_toStdString(currentNetname()), 2, hostname); } - m_scheduler = m_discover->try_get_scheduler(); - if (m_scheduler) { hostInfoManager()->setSchedulerName(QString::fromLatin1(m_discover->schedulerName().data())); hostInfoManager()->setNetworkName(QString::fromLatin1(m_discover->networkName().data())); diff -Nru icecc-monitor-3.1.0/src/icecreammonitor.h icecc-monitor-3.2.0/src/icecreammonitor.h --- icecc-monitor-3.1.0/src/icecreammonitor.h 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/icecreammonitor.h 2018-12-10 09:04:43.000000000 +0000 @@ -41,9 +41,9 @@ public: IcecreamMonitor(HostInfoManager *, QObject *parent); - ~IcecreamMonitor(); + ~IcecreamMonitor() override; - virtual QList jobHistory() const override; + QList jobHistory() const override; private slots: void slotCheckScheduler(); diff -Nru icecc-monitor-3.1.0/src/job.cc icecc-monitor-3.2.0/src/job.cc --- icecc-monitor-3.1.0/src/job.cc 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/job.cc 2018-12-10 09:04:43.000000000 +0000 @@ -32,6 +32,7 @@ , client(client) , lang(lang) , state(WaitingForCS) + , startTime{} , real_msec(0) , user_msec(0) , sys_msec(0) diff -Nru icecc-monitor-3.1.0/src/mainwindow.h icecc-monitor-3.2.0/src/mainwindow.h --- icecc-monitor-3.1.0/src/mainwindow.h 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/mainwindow.h 2018-12-10 09:04:43.000000000 +0000 @@ -42,8 +42,8 @@ Q_OBJECT public: - MainWindow(QWidget *parent = nullptr); - virtual ~MainWindow(); + explicit MainWindow(QWidget *parent = nullptr); + ~MainWindow() override; void setCurrentNet(const QByteArray &netname); void setCurrentSched(const QByteArray &schedname); diff -Nru icecc-monitor-3.1.0/src/models/hostlistmodel.cc icecc-monitor-3.2.0/src/models/hostlistmodel.cc --- icecc-monitor-3.1.0/src/models/hostlistmodel.cc 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/models/hostlistmodel.cc 2018-12-10 09:04:43.000000000 +0000 @@ -207,7 +207,7 @@ : public std::unary_function { public: - find_hostid(unsigned int hostId) + explicit find_hostid(unsigned int hostId) : m_hostId(hostId) {} bool operator()(const HostInfo &info) const @@ -222,6 +222,9 @@ void HostListModel::removeNodeById(unsigned int hostId) { QVector::iterator it = std::find_if(m_hostInfos.begin(), m_hostInfos.end(), find_hostid(hostId)); + if (it == m_hostInfos.end()) { + return; + } int index = std::distance(m_hostInfos.begin(), it); beginRemoveRows(QModelIndex(), index, index); m_hostInfos.erase(it); diff -Nru icecc-monitor-3.1.0/src/models/hostlistmodel.h icecc-monitor-3.2.0/src/models/hostlistmodel.h --- icecc-monitor-3.1.0/src/models/hostlistmodel.h 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/models/hostlistmodel.h 2018-12-10 09:04:43.000000000 +0000 @@ -56,11 +56,11 @@ explicit HostListModel(QObject *parent = nullptr); - virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - virtual QVariant data(const QModelIndex &index, int role) const override; - virtual int columnCount(const QModelIndex &parent) const override; - virtual int rowCount(const QModelIndex &parent) const override; - virtual QModelIndex parent(const QModelIndex &child) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex &index, int role) const override; + int columnCount(const QModelIndex &parent) const override; + int rowCount(const QModelIndex &parent) const override; + QModelIndex parent(const QModelIndex &child) const override; Monitor *monitor() const; void setMonitor(Monitor *monitor); diff -Nru icecc-monitor-3.1.0/src/models/joblistmodel.cc icecc-monitor-3.2.0/src/models/joblistmodel.cc --- icecc-monitor-3.1.0/src/models/joblistmodel.cc 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/models/joblistmodel.cc 2018-12-10 09:04:43.000000000 +0000 @@ -83,7 +83,7 @@ , m_expireDuration(-1) , m_expireTimer(new QTimer(this)) , m_jobType(AllJobs) - , m_hostid(0) + , m_hostId(0) { connect(m_expireTimer, SIGNAL(timeout()), this, SLOT(slotExpireFinishedJobs())); @@ -109,11 +109,13 @@ } } -void JobListModel::setHostId(unsigned int hostid) +void JobListModel::setHostId(unsigned int hostId) { - if (m_hostid == hostid) + if (m_hostId == hostId) { return; - m_hostid = hostid; + } + + m_hostId = hostId; clear(); } @@ -124,9 +126,9 @@ m_jobs[index] = job; emit dataChanged(indexForJob(job, 0), indexForJob(job, _JobColumnCount - 1)); } else { - if (m_hostid && m_jobType == RemoteJobs && job.server != m_hostid) + if (m_hostId && m_jobType == RemoteJobs && job.server != m_hostId) return; - if (m_hostid && m_jobType == LocalJobs && job.client != m_hostid) + if (m_hostId && m_jobType == LocalJobs && job.client != m_hostId) return; beginInsertRows(QModelIndex(), m_jobs.size(), m_jobs.size()); m_jobs << job; @@ -265,7 +267,7 @@ : public std::unary_function { public: - find_jobid(unsigned int jobId) + explicit find_jobid(unsigned int jobId) : m_jobId(jobId) {} bool operator()(const Job &job) const diff -Nru icecc-monitor-3.1.0/src/models/joblistmodel.h icecc-monitor-3.2.0/src/models/joblistmodel.h --- icecc-monitor-3.1.0/src/models/joblistmodel.h 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/models/joblistmodel.h 2018-12-10 09:04:43.000000000 +0000 @@ -72,17 +72,17 @@ m_expireDuration = duration; } - virtual int columnCount(const QModelIndex &parent = QModelIndex()) const override; - virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - virtual QModelIndex parent(const QModelIndex &child) const override; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QModelIndex parent(const QModelIndex &child) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; Job jobForIndex(const QModelIndex &index) const; QModelIndex indexForJob(const Job &job, int column); - void setHostId(unsigned int hostid); - unsigned int hostId() const { return m_hostid; } + void setHostId(unsigned int hostId); + unsigned int hostId() const { return m_hostId; } void setJobType(JobType type) { m_jobType = type; } JobType jobType() const { return m_jobType; } @@ -122,7 +122,7 @@ struct FinishedJob { - FinishedJob(uint _time = 0, uint _jobId = 0) + explicit FinishedJob(uint _time = 0, uint _jobId = 0) : time(_time) , jobId(_jobId) {} uint time; @@ -135,7 +135,7 @@ QTimer *m_expireTimer; JobType m_jobType; - unsigned int m_hostid; + unsigned int m_hostId; }; class JobListSortFilterProxyModel @@ -143,10 +143,10 @@ { Q_OBJECT public: - JobListSortFilterProxyModel(QObject *parent = nullptr); + explicit JobListSortFilterProxyModel(QObject *parent = nullptr); protected: - virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; + bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; }; #endif diff -Nru icecc-monitor-3.1.0/src/statusview.h icecc-monitor-3.2.0/src/statusview.h --- icecc-monitor-3.1.0/src/statusview.h 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/statusview.h 2018-12-10 09:04:43.000000000 +0000 @@ -48,8 +48,8 @@ }; Q_DECLARE_FLAGS(Options, Option) - StatusView(QObject *parent = nullptr); - virtual ~StatusView(); + explicit StatusView(QObject *parent = nullptr); + ~StatusView() override; virtual Options options() const; diff -Nru icecc-monitor-3.1.0/src/views/detailedhostview.h icecc-monitor-3.2.0/src/views/detailedhostview.h --- icecc-monitor-3.1.0/src/views/detailedhostview.h 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/views/detailedhostview.h 2018-12-10 09:04:43.000000000 +0000 @@ -39,9 +39,9 @@ Q_OBJECT public: - DetailedHostView(QObject *parent); + explicit DetailedHostView(QObject *parent); - virtual void setMonitor(Monitor *monitor) override; + void setMonitor(Monitor *monitor) override; QWidget *widget() const override; diff -Nru icecc-monitor-3.1.0/src/views/flowtableview.h icecc-monitor-3.2.0/src/views/flowtableview.h --- icecc-monitor-3.1.0/src/views/flowtableview.h 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/views/flowtableview.h 2018-12-10 09:04:43.000000000 +0000 @@ -60,7 +60,7 @@ public: explicit FlowTableView(QObject *parent); - virtual QWidget *widget() const override; + QWidget *widget() const override; void update(const Job &job) override; void checkNode(unsigned int hostid) override; diff -Nru icecc-monitor-3.1.0/src/views/ganttstatusview.cc icecc-monitor-3.2.0/src/views/ganttstatusview.cc --- icecc-monitor-3.1.0/src/views/ganttstatusview.cc 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/views/ganttstatusview.cc 2018-12-10 09:04:43.000000000 +0000 @@ -422,14 +422,13 @@ { // qDebug() << "GanttStatusView::registerNode(): " << ip << endl; - static int lastRow = 0; - QColor color = hostColor(hostid); QVBoxLayout *nodeLayout; NodeLayoutMap::ConstIterator it = mNodeLayouts.constFind(hostid); if (it == mNodeLayouts.constEnd()) { + static int lastRow = 0; ++lastRow; nodeLayout = new QVBoxLayout(); diff -Nru icecc-monitor-3.1.0/src/views/ganttstatusview.h icecc-monitor-3.2.0/src/views/ganttstatusview.h --- icecc-monitor-3.1.0/src/views/ganttstatusview.h 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/views/ganttstatusview.h 2018-12-10 09:04:43.000000000 +0000 @@ -40,7 +40,7 @@ { Q_OBJECT public: - GanttConfigDialog(QWidget *parent); + explicit GanttConfigDialog(QWidget *parent); bool isTimeScaleVisible(); @@ -56,12 +56,12 @@ { Q_OBJECT public: - GanttTimeScaleWidget(QWidget *parent); + explicit GanttTimeScaleWidget(QWidget *parent); void setPixelsPerSecond(int); protected: - virtual void paintEvent(QPaintEvent *e) override; + void paintEvent(QPaintEvent *e) override; private: int mPixelsPerSecond; @@ -83,8 +83,8 @@ void update(const Job &job); protected: - virtual void paintEvent(QPaintEvent *e) override; - virtual void resizeEvent(QResizeEvent *e) override; + void paintEvent(QPaintEvent *e) override; + void resizeEvent(QResizeEvent *e) override; private: void adjustGraph(); @@ -124,12 +124,12 @@ { Q_OBJECT public: - GanttStatusView(QObject *parent = nullptr); - virtual ~GanttStatusView() {} + explicit GanttStatusView(QObject *parent = nullptr); + ~GanttStatusView() override {} QString id() const override { return QStringLiteral("gantt"); } - virtual void checkNode(unsigned int hostid) override; + void checkNode(unsigned int hostid) override; void start() override; void stop() override; @@ -138,10 +138,10 @@ bool isPausable() override { return true; } bool isConfigurable() override { return true; } - virtual QWidget *widget() const override; + QWidget *widget() const override; public slots: - virtual void update(const Job &job) override; + void update(const Job &job) override; private slots: void slotConfigChanged(); diff -Nru icecc-monitor-3.1.0/src/views/hostlistview.h icecc-monitor-3.2.0/src/views/hostlistview.h --- icecc-monitor-3.1.0/src/views/hostlistview.h 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/views/hostlistview.h 2018-12-10 09:04:43.000000000 +0000 @@ -32,9 +32,9 @@ Q_OBJECT public: - HostListView(QWidget *parent); + explicit HostListView(QWidget *parent); - virtual void setModel(QAbstractItemModel *model) override; + void setModel(QAbstractItemModel *model) override; }; #endif diff -Nru icecc-monitor-3.1.0/src/views/joblistview.h icecc-monitor-3.2.0/src/views/joblistview.h --- icecc-monitor-3.1.0/src/views/joblistview.h 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/views/joblistview.h 2018-12-10 09:04:43.000000000 +0000 @@ -37,9 +37,9 @@ Q_OBJECT public: - JobListView(QWidget *parent = nullptr); + explicit JobListView(QWidget *parent = nullptr); - virtual void setModel(QAbstractItemModel *model) override; + void setModel(QAbstractItemModel *model) override; bool isClientColumnVisible() const; void setClientColumnVisible(bool visible); diff -Nru icecc-monitor-3.1.0/src/views/listview.h icecc-monitor-3.2.0/src/views/listview.h --- icecc-monitor-3.1.0/src/views/listview.h 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/views/listview.h 2018-12-10 09:04:43.000000000 +0000 @@ -35,13 +35,13 @@ { Q_OBJECT public: - ListStatusView(QObject *parent); + explicit ListStatusView(QObject *parent); - virtual Options options() const override; - virtual QWidget *widget() const override; - virtual QString id() const override { return QStringLiteral("list"); } + Options options() const override; + QWidget *widget() const override; + QString id() const override { return QStringLiteral("list"); } - virtual void setMonitor(Monitor *monitor) override; + void setMonitor(Monitor *monitor) override; private: QScopedPointer m_widget; diff -Nru icecc-monitor-3.1.0/src/views/starview.h icecc-monitor-3.2.0/src/views/starview.h --- icecc-monitor-3.1.0/src/views/starview.h 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/views/starview.h 2018-12-10 09:04:43.000000000 +0000 @@ -45,7 +45,7 @@ Q_OBJECT public: - StarViewConfigDialog(QWidget *parent); + explicit StarViewConfigDialog(QWidget *parent); int nodesPerRing(); void setNodesPerRing(int nodes); @@ -80,9 +80,9 @@ enum { RttiHostItem = 1000 }; - HostItem(const QString &text); + explicit HostItem(const QString &text); HostItem(HostInfo *hostInfo, HostInfoManager *); - ~HostItem(); + ~HostItem() override; void init(); @@ -158,8 +158,8 @@ void drawNodeStatus(); protected: - virtual void resizeEvent(QResizeEvent *e) override; - virtual bool event(QEvent *event) override; + void resizeEvent(QResizeEvent *e) override; + bool event(QEvent *event) override; private: void arrangeHostItems(); @@ -176,21 +176,21 @@ Q_OBJECT public: - StarView(QObject *parent); - virtual ~StarView(); + explicit StarView(QObject *parent); + ~StarView() override; void readSettings(); void writeSettings(); void update(const Job &job) override; - virtual QWidget *widget() const override; + QWidget *widget() const override; QString id() const override { return QStringLiteral("star"); } QList hostItems() const; HostItem *findHostItem(unsigned int hostid) const; - virtual void setMonitor(Monitor *monitor) override; + void setMonitor(Monitor *monitor) override; void checkNode(unsigned int hostid) override; void removeNode(unsigned int hostid) override; diff -Nru icecc-monitor-3.1.0/src/views/summaryview.cc icecc-monitor-3.2.0/src/views/summaryview.cc --- icecc-monitor-3.1.0/src/views/summaryview.cc 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/views/summaryview.cc 2018-12-10 09:04:43.000000000 +0000 @@ -52,7 +52,7 @@ public: explicit SummaryViewScrollArea(QWidget *parent = nullptr); - virtual void resizeEvent(QResizeEvent *) override; + void resizeEvent(QResizeEvent *) override; }; //////////////////////////////////////////////////////////////////////////////// diff -Nru icecc-monitor-3.1.0/src/views/summaryview.h icecc-monitor-3.2.0/src/views/summaryview.h --- icecc-monitor-3.1.0/src/views/summaryview.h 2017-04-06 22:20:44.000000000 +0000 +++ icecc-monitor-3.2.0/src/views/summaryview.h 2018-12-10 09:04:43.000000000 +0000 @@ -81,13 +81,13 @@ Q_OBJECT public: - SummaryView(QObject *parent = nullptr); - ~SummaryView(); + explicit SummaryView(QObject *parent = nullptr); + ~SummaryView() override; - virtual QWidget *widget() const override; - virtual void update(const Job &job) override; - virtual void checkNode(unsigned int hostid) override; - virtual QString id() const override { return QStringLiteral("summary"); } + QWidget *widget() const override; + void update(const Job &job) override; + void checkNode(unsigned int hostid) override; + QString id() const override { return QStringLiteral("summary"); } private: QScopedPointer m_widget;