Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit icecream-monitor for openSUSE:Factory
Hello community,

here is the log from the commit of package icecream-monitor for
openSUSE:Factory checked in at 2019-04-17 10:09:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icecream-monitor (Old)
and /work/SRC/openSUSE:Factory/.icecream-monitor.new.17052 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "icecream-monitor"

Wed Apr 17 10:09:53 2019 rev:29 rq:694790 version:3.2.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/icecream-monitor/icecream-monitor.changes
2018-02-06 16:48:50.356952371 +0100
+++
/work/SRC/openSUSE:Factory/.icecream-monitor.new.17052/icecream-monitor.changes
2019-04-17 10:10:12.438903797 +0200
@@ -1,0 +2,13 @@
+Tue Apr 16 11:21:54 UTC 2019 - Martin Pluskal <mpluskal@xxxxxxxx>
+
+- Modernise spec file
+
+-------------------------------------------------------------------
+Fri Apr 12 12:51:12 UTC 2019 - Tomas Novotny <tomas@xxxxxxxxxx>
+
+- Update to version 3.2.0:
+ - Fix broken scheduler discovery with newer Icecream
+ - Add some badges to README.md
+ - Coding style improvements
+
+-------------------------------------------------------------------

Old:
----
icemon-3.1.0.tar.xz

New:
----
icemon-3.2.0.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ icecream-monitor.spec ++++++
--- /var/tmp/diff_new_pack.Mx2qUa/_old 2019-04-17 10:10:13.566904999 +0200
+++ /var/tmp/diff_new_pack.Mx2qUa/_new 2019-04-17 10:10:13.566904999 +0200
@@ -1,7 +1,7 @@
#
# spec file for package icecream-monitor
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,27 +12,27 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#


Name: icecream-monitor
+Version: 3.2.0
+Release: 0
+Summary: Monitor Program for the icecream Compile Farm
+License: GPL-2.0-or-later
+Group: Development/Tools/Building
+URL: https://github.com/icecc/icemon
+Source0: icemon-%{version}.tar.xz
BuildRequires: cmake
BuildRequires: docbook2x
BuildRequires: hicolor-icon-theme
-BuildRequires: libicecream-devel
BuildRequires: lzo-devel
+BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: xsltproc
BuildRequires: cmake(Qt5Widgets)
-Summary: Monitor Program for the icecream Compile Farm
-License: GPL-2.0+
-Group: Development/Tools/Building
-Url: https://github.com/icecc/icemon
-Version: 3.1.0
-Release: 0
-Source0: icemon-%{version}.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: pkgconfig(icecc)

%description
icecream is the next generation distcc. This package provides a monitor
@@ -42,21 +42,14 @@
%setup -q -n icemon-%{version}

%build
- mkdir build
- cd build
- cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} ..
- make %{_smp_mflags}
+%cmake
+%make_jobs

%install
- cd build
- make install DESTDIR=%{buildroot}
- %suse_update_desktop_file icemon Development Building
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+%cmake_install
+%suse_update_desktop_file icemon Development Building

%files
-%defattr(-,root,root)
%{_bindir}/icemon
%{_datadir}/applications/icemon.desktop
%{_datadir}/icons/hicolor/*/apps/icemon.*

++++++ _service ++++++
--- /var/tmp/diff_new_pack.Mx2qUa/_old 2019-04-17 10:10:13.638905076 +0200
+++ /var/tmp/diff_new_pack.Mx2qUa/_new 2019-04-17 10:10:13.638905076 +0200
@@ -1,8 +1,8 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="versionformat">3.1.0</param>
+ <param name="versionformat">3.2.0</param>
<param name="url">http://github.com/icecc/icemon.git</param>
- <param name="revision">refs/tags/v3.1.0</param>
+ <param name="revision">refs/tags/v3.2.0</param>
<param name="scm">git</param>
</service>
<service name="recompress" mode="disabled">

++++++ icemon-3.1.0.tar.xz -> icemon-3.2.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/CHANGELOG.md
new/icemon-3.2.0/CHANGELOG.md
--- old/icemon-3.1.0/CHANGELOG.md 2017-04-07 00:20:44.000000000 +0200
+++ new/icemon-3.2.0/CHANGELOG.md 2018-12-10 10:04:43.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/CMakeLists.txt
new/icemon-3.2.0/CMakeLists.txt
--- old/icemon-3.1.0/CMakeLists.txt 2017-04-07 00:20:44.000000000 +0200
+++ new/icemon-3.2.0/CMakeLists.txt 2018-12-10 10:04:43.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/README.md new/icemon-3.2.0/README.md
--- old/icemon-3.1.0/README.md 2017-04-07 00:20:44.000000000 +0200
+++ new/icemon-3.2.0/README.md 2018-12-10 10:04:43.000000000 +0100
@@ -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&amp;utm_medium=referral&amp;utm_content=icecc/icemon&amp;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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/cmake/modules/FindDocbook2X.cmake
new/icemon-3.2.0/cmake/modules/FindDocbook2X.cmake
--- old/icemon-3.1.0/cmake/modules/FindDocbook2X.cmake 2017-04-07
00:20:44.000000000 +0200
+++ new/icemon-3.2.0/cmake/modules/FindDocbook2X.cmake 2018-12-10
10:04:43.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/cmake/modules/FindIcecream.cmake
new/icemon-3.2.0/cmake/modules/FindIcecream.cmake
--- old/icemon-3.1.0/cmake/modules/FindIcecream.cmake 2017-04-07
00:20:44.000000000 +0200
+++ new/icemon-3.2.0/cmake/modules/FindIcecream.cmake 2018-12-10
10:04:43.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/fakemonitor.cc
new/icemon-3.2.0/src/fakemonitor.cc
--- old/icemon-3.1.0/src/fakemonitor.cc 2017-04-07 00:20:44.000000000 +0200
+++ new/icemon-3.2.0/src/fakemonitor.cc 2018-12-10 10:04:43.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/hostinfo.cc
new/icemon-3.2.0/src/hostinfo.cc
--- old/icemon-3.1.0/src/hostinfo.cc 2017-04-07 00:20:44.000000000 +0200
+++ new/icemon-3.2.0/src/hostinfo.cc 2018-12-10 10:04:43.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/hostinfo.h
new/icemon-3.2.0/src/hostinfo.h
--- old/icemon-3.1.0/src/hostinfo.h 2017-04-07 00:20:44.000000000 +0200
+++ new/icemon-3.2.0/src/hostinfo.h 2018-12-10 10:04:43.000000000 +0100
@@ -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<QString, QString> 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<QColor> mColorTable;
static QMap<int, QString> mColorNameMap;
@@ -106,7 +107,7 @@

public:
HostInfoManager();
- ~HostInfoManager();
+ ~HostInfoManager() override;

HostInfo *find(unsigned int hostid) const;

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/icecreammonitor.cc
new/icemon-3.2.0/src/icecreammonitor.cc
--- old/icemon-3.1.0/src/icecreammonitor.cc 2017-04-07 00:20:44.000000000
+0200
+++ new/icemon-3.2.0/src/icecreammonitor.cc 2018-12-10 10:04:43.000000000
+0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/icecreammonitor.h
new/icemon-3.2.0/src/icecreammonitor.h
--- old/icemon-3.1.0/src/icecreammonitor.h 2017-04-07 00:20:44.000000000
+0200
+++ new/icemon-3.2.0/src/icecreammonitor.h 2018-12-10 10:04:43.000000000
+0100
@@ -41,9 +41,9 @@

public:
IcecreamMonitor(HostInfoManager *, QObject *parent);
- ~IcecreamMonitor();
+ ~IcecreamMonitor() override;

- virtual QList<Job> jobHistory() const override;
+ QList<Job> jobHistory() const override;

private slots:
void slotCheckScheduler();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/job.cc new/icemon-3.2.0/src/job.cc
--- old/icemon-3.1.0/src/job.cc 2017-04-07 00:20:44.000000000 +0200
+++ new/icemon-3.2.0/src/job.cc 2018-12-10 10:04:43.000000000 +0100
@@ -32,6 +32,7 @@
, client(client)
, lang(lang)
, state(WaitingForCS)
+ , startTime{}
, real_msec(0)
, user_msec(0)
, sys_msec(0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/mainwindow.h
new/icemon-3.2.0/src/mainwindow.h
--- old/icemon-3.1.0/src/mainwindow.h 2017-04-07 00:20:44.000000000 +0200
+++ new/icemon-3.2.0/src/mainwindow.h 2018-12-10 10:04:43.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/models/hostlistmodel.cc
new/icemon-3.2.0/src/models/hostlistmodel.cc
--- old/icemon-3.1.0/src/models/hostlistmodel.cc 2017-04-07
00:20:44.000000000 +0200
+++ new/icemon-3.2.0/src/models/hostlistmodel.cc 2018-12-10
10:04:43.000000000 +0100
@@ -207,7 +207,7 @@
: public std::unary_function<HostInfo, bool>
{
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<HostInfo>::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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/models/hostlistmodel.h
new/icemon-3.2.0/src/models/hostlistmodel.h
--- old/icemon-3.1.0/src/models/hostlistmodel.h 2017-04-07 00:20:44.000000000
+0200
+++ new/icemon-3.2.0/src/models/hostlistmodel.h 2018-12-10 10:04:43.000000000
+0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/models/joblistmodel.cc
new/icemon-3.2.0/src/models/joblistmodel.cc
--- old/icemon-3.1.0/src/models/joblistmodel.cc 2017-04-07 00:20:44.000000000
+0200
+++ new/icemon-3.2.0/src/models/joblistmodel.cc 2018-12-10 10:04:43.000000000
+0100
@@ -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<Job, bool>
{
public:
- find_jobid(unsigned int jobId)
+ explicit find_jobid(unsigned int jobId)
: m_jobId(jobId) {}

bool operator()(const Job &job) const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/models/joblistmodel.h
new/icemon-3.2.0/src/models/joblistmodel.h
--- old/icemon-3.1.0/src/models/joblistmodel.h 2017-04-07 00:20:44.000000000
+0200
+++ new/icemon-3.2.0/src/models/joblistmodel.h 2018-12-10 10:04:43.000000000
+0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/statusview.h
new/icemon-3.2.0/src/statusview.h
--- old/icemon-3.1.0/src/statusview.h 2017-04-07 00:20:44.000000000 +0200
+++ new/icemon-3.2.0/src/statusview.h 2018-12-10 10:04:43.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/views/detailedhostview.h
new/icemon-3.2.0/src/views/detailedhostview.h
--- old/icemon-3.1.0/src/views/detailedhostview.h 2017-04-07
00:20:44.000000000 +0200
+++ new/icemon-3.2.0/src/views/detailedhostview.h 2018-12-10
10:04:43.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/views/flowtableview.h
new/icemon-3.2.0/src/views/flowtableview.h
--- old/icemon-3.1.0/src/views/flowtableview.h 2017-04-07 00:20:44.000000000
+0200
+++ new/icemon-3.2.0/src/views/flowtableview.h 2018-12-10 10:04:43.000000000
+0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/views/ganttstatusview.cc
new/icemon-3.2.0/src/views/ganttstatusview.cc
--- old/icemon-3.1.0/src/views/ganttstatusview.cc 2017-04-07
00:20:44.000000000 +0200
+++ new/icemon-3.2.0/src/views/ganttstatusview.cc 2018-12-10
10:04:43.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/views/ganttstatusview.h
new/icemon-3.2.0/src/views/ganttstatusview.h
--- old/icemon-3.1.0/src/views/ganttstatusview.h 2017-04-07
00:20:44.000000000 +0200
+++ new/icemon-3.2.0/src/views/ganttstatusview.h 2018-12-10
10:04:43.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/views/hostlistview.h
new/icemon-3.2.0/src/views/hostlistview.h
--- old/icemon-3.1.0/src/views/hostlistview.h 2017-04-07 00:20:44.000000000
+0200
+++ new/icemon-3.2.0/src/views/hostlistview.h 2018-12-10 10:04:43.000000000
+0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/views/joblistview.h
new/icemon-3.2.0/src/views/joblistview.h
--- old/icemon-3.1.0/src/views/joblistview.h 2017-04-07 00:20:44.000000000
+0200
+++ new/icemon-3.2.0/src/views/joblistview.h 2018-12-10 10:04:43.000000000
+0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/views/listview.h
new/icemon-3.2.0/src/views/listview.h
--- old/icemon-3.1.0/src/views/listview.h 2017-04-07 00:20:44.000000000
+0200
+++ new/icemon-3.2.0/src/views/listview.h 2018-12-10 10:04:43.000000000
+0100
@@ -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<QWidget> m_widget;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/views/starview.h
new/icemon-3.2.0/src/views/starview.h
--- old/icemon-3.1.0/src/views/starview.h 2017-04-07 00:20:44.000000000
+0200
+++ new/icemon-3.2.0/src/views/starview.h 2018-12-10 10:04:43.000000000
+0100
@@ -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<HostItem *> 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/views/summaryview.cc
new/icemon-3.2.0/src/views/summaryview.cc
--- old/icemon-3.1.0/src/views/summaryview.cc 2017-04-07 00:20:44.000000000
+0200
+++ new/icemon-3.2.0/src/views/summaryview.cc 2018-12-10 10:04:43.000000000
+0100
@@ -52,7 +52,7 @@
public:
explicit SummaryViewScrollArea(QWidget *parent = nullptr);

- virtual void resizeEvent(QResizeEvent *) override;
+ void resizeEvent(QResizeEvent *) override;
};


////////////////////////////////////////////////////////////////////////////////
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icemon-3.1.0/src/views/summaryview.h
new/icemon-3.2.0/src/views/summaryview.h
--- old/icemon-3.1.0/src/views/summaryview.h 2017-04-07 00:20:44.000000000
+0200
+++ new/icemon-3.2.0/src/views/summaryview.h 2018-12-10 10:04:43.000000000
+0100
@@ -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<SummaryViewScrollArea> m_widget;


< Previous Next >
This Thread
  • No further messages