Skip to content

Commit

Permalink
Style follows the Coding Standard
Browse files Browse the repository at this point in the history
  • Loading branch information
@kuzmas
kuzmas committed Jan 19, 2013
1 parent d8dde19 commit 11cc6ba
Show file tree
Hide file tree
Showing 17 changed files with 110 additions and 110 deletions.
38 changes: 19 additions & 19 deletions CMakeLists.txt
View file
Expand Up @@ -13,20 +13,20 @@ find_package(Qt4 REQUIRED)


set(SYSSTAT_PUBLIC_HDRS
version.hpp
sysstat_global.hpp
basestat.hpp
cpustat.hpp
memstat.hpp
netstat.hpp
version.h
sysstat_global.h
basestat.h
cpustat.h
memstat.h
netstat.h
)

set(SYSSTAT_PRIVATE_HDRS
version_p.hpp
basestat_p.hpp
cpustat_p.hpp
memstat_p.hpp
netstat_p.hpp
version_p.h
basestat_p.h
cpustat_p.h
memstat_p.h
netstat_p.h
)

set(SYSSTAT_SRCS
Expand All @@ -38,14 +38,14 @@ set(SYSSTAT_SRCS
)

set(SYSSTAT_MOCS
basestat.hpp
cpustat.hpp
memstat.hpp
netstat.hpp
basestat_p.hpp
cpustat_p.hpp
memstat_p.hpp
netstat_p.hpp
basestat.h
cpustat.h
memstat.h
netstat.h
basestat_p.h
cpustat_p.h
memstat_p.h
netstat_p.h
)


Expand Down
32 changes: 16 additions & 16 deletions basestat.cpp
View file
Expand Up @@ -29,8 +29,8 @@

#include <cstddef>

#include "basestat.hpp"
#include "basestat_p.hpp"
#include "basestat.h"
#include "basestat_p.h"


namespace SysStat {
Expand All @@ -50,21 +50,21 @@ BaseStatPrivate::~BaseStatPrivate()
{
}

bool BaseStatPrivate::timerIsActive(void) const
bool BaseStatPrivate::timerIsActive() const
{
return mTimer->isActive();
}

int BaseStatPrivate::updateInterval(void) const
int BaseStatPrivate::updateInterval() const
{
return mTimer->interval();
}

void BaseStatPrivate::intervalChanged(void)
void BaseStatPrivate::intervalChanged()
{
}

void BaseStatPrivate::sourceChanged(void)
void BaseStatPrivate::sourceChanged()
{
}

Expand All @@ -81,7 +81,7 @@ void BaseStatPrivate::setUpdateInterval(int msec)
}
}

void BaseStatPrivate::synchroTimeout(void)
void BaseStatPrivate::synchroTimeout()
{
QTime now(QTime::currentTime());
int synchro = ((now.minute() * 60 + now.second()) * 1000 + now.msec() ) / mTimer->interval();
Expand All @@ -93,12 +93,12 @@ void BaseStatPrivate::synchroTimeout(void)
mLastSynchro = synchro;
}

void BaseStatPrivate::stopUpdating(void)
void BaseStatPrivate::stopUpdating()
{
mTimer->stop();
}

QString BaseStatPrivate::monitoredSource(void) const
QString BaseStatPrivate::monitoredSource() const
{
return mSource;
}
Expand All @@ -109,7 +109,7 @@ void BaseStatPrivate::setMonitoredSource(const QString &Source)
this->sourceChanged();
}

void BaseStatPrivate::monitorDefaultSource(void)
void BaseStatPrivate::monitorDefaultSource()
{
mSource = defaultSource();
}
Expand All @@ -133,7 +133,7 @@ QString BaseStatPrivate::readAllFile(const char *filename)
return result;
}

QStringList BaseStatPrivate::sources(void) const
QStringList BaseStatPrivate::sources() const
{
return mSources;
}
Expand All @@ -147,12 +147,12 @@ BaseStat::~BaseStat()
{
}

QStringList BaseStat::sources(void) const
QStringList BaseStat::sources() const
{
return baseimpl->sources();
}

int BaseStat::updateInterval(void) const
int BaseStat::updateInterval() const
{
return baseimpl->updateInterval();
}
Expand All @@ -166,7 +166,7 @@ void BaseStat::setUpdateInterval(int msec)
}
}

void BaseStat::stopUpdating(void)
void BaseStat::stopUpdating()
{
if (updateInterval() != 0)
{
Expand All @@ -175,7 +175,7 @@ void BaseStat::stopUpdating(void)
}
}

QString BaseStat::monitoredSource(void) const
QString BaseStat::monitoredSource() const
{
return baseimpl->monitoredSource();
}
Expand All @@ -189,7 +189,7 @@ void BaseStat::setMonitoredSource(const QString &source)
}
}

void BaseStat::monitorDefaultSource(void)
void BaseStat::monitorDefaultSource()
{
QString oldSource = monitoredSource();
baseimpl->monitorDefaultSource();
Expand Down
12 changes: 6 additions & 6 deletions basestat.hpp → basestat.h
View file
Expand Up @@ -32,7 +32,7 @@
#include <QtCore/QString>
#include <QtCore/QStringList>

#include <sysstat/sysstat_global.hpp>
#include <sysstat/sysstat_global.h>


namespace SysStat {
Expand All @@ -47,7 +47,7 @@ class SYSSTATSHARED_EXPORT BaseStat : public QObject
BaseStat(QObject *parent = NULL);
~BaseStat();

QStringList sources(void) const;
QStringList sources() const;

signals:
void updateIntervalChanged(int);
Expand All @@ -58,13 +58,13 @@ class SYSSTATSHARED_EXPORT BaseStat : public QObject
Q_PROPERTY(QString monitoredSource READ monitoredSource WRITE setMonitoredSource RESET monitorDefaultSource NOTIFY monitoredSourceChanged)

public slots:
int updateInterval(void) const;
int updateInterval() const;
void setUpdateInterval(int msec);
void stopUpdating(void);
void stopUpdating();

QString monitoredSource(void) const;
QString monitoredSource() const;
void setMonitoredSource(const QString &Source);
void monitorDefaultSource(void);
void monitorDefaultSource();

protected:
BaseStatPrivate* baseimpl;
Expand Down
22 changes: 11 additions & 11 deletions basestat_p.hpp → basestat_p.h
View file
Expand Up @@ -34,7 +34,7 @@
#include <QtCore/QTime>
#include <QtCore/QStringList>

#include "cpustat.hpp"
#include "cpustat.h"


namespace SysStat {
Expand All @@ -47,22 +47,22 @@ class BaseStatPrivate : public QObject
BaseStatPrivate(BaseStat *parent = NULL);
~BaseStatPrivate();

QStringList sources(void) const;
QStringList sources() const;

bool timerIsActive(void) const;
int updateInterval(void) const;
bool timerIsActive() const;
int updateInterval() const;
void setUpdateInterval(int msec);
void stopUpdating(void);
void stopUpdating();

QString monitoredSource(void) const;
QString monitoredSource() const;
void setMonitoredSource(const QString &Source);
void monitorDefaultSource(void);
void monitorDefaultSource();

private slots:
void synchroTimeout(void);
void synchroTimeout();

protected:
virtual QString defaultSource(void) = 0;
virtual QString defaultSource() = 0;

QString readAllFile(const char *filename);

Expand All @@ -73,8 +73,8 @@ private slots:

int mLastSynchro;

virtual void intervalChanged(void);
virtual void sourceChanged(void);
virtual void intervalChanged();
virtual void sourceChanged();
};

}
Expand Down
28 changes: 14 additions & 14 deletions cpustat.cpp
View file
Expand Up @@ -26,8 +26,8 @@

#include <unistd.h>

#include "cpustat.hpp"
#include "cpustat_p.hpp"
#include "cpustat.h"
#include "cpustat_p.h"


namespace SysStat {
Expand Down Expand Up @@ -58,7 +58,7 @@ void CpuStatPrivate::addSource(const QString &source)
}
}

void CpuStatPrivate::updateSources(void)
void CpuStatPrivate::updateSources()
{
mSources.clear();

Expand Down Expand Up @@ -103,17 +103,17 @@ CpuStatPrivate::~CpuStatPrivate()
{
}

void CpuStatPrivate::intervalChanged(void)
void CpuStatPrivate::intervalChanged()
{
recalculateMinMax();
}

void CpuStatPrivate::sourceChanged(void)
void CpuStatPrivate::sourceChanged()
{
recalculateMinMax();
}

void CpuStatPrivate::recalculateMinMax(void)
void CpuStatPrivate::recalculateMinMax()
{
int cores = 1;
if (mSource == "cpu")
Expand All @@ -123,7 +123,7 @@ void CpuStatPrivate::recalculateMinMax(void)
mIntervalMax = static_cast<float>(mTimer->interval()) / 1000 * static_cast<float>(mUserHz) * static_cast<float>(cores) * 1.25; // +25%
}

void CpuStatPrivate::timeout(void)
void CpuStatPrivate::timeout()
{
if ( (mMonitoring == CpuStat::LoadOnly)
|| (mMonitoring == CpuStat::LoadAndFrequency) )
Expand Down Expand Up @@ -260,12 +260,12 @@ void CpuStatPrivate::timeout(void)
}
}

QString CpuStatPrivate::defaultSource(void)
QString CpuStatPrivate::defaultSource()
{
return "cpu";
}

CpuStatPrivate::Values::Values(void)
CpuStatPrivate::Values::Values()
: user(0)
, nice(0)
, system(0)
Expand All @@ -275,17 +275,17 @@ CpuStatPrivate::Values::Values(void)
{
}

void CpuStatPrivate::Values::sum(void)
void CpuStatPrivate::Values::sum()
{
total = user + nice + system + idle + other;
}

void CpuStatPrivate::Values::clear(void)
void CpuStatPrivate::Values::clear()
{
total = user = nice = system = idle = other = 0;
}

CpuStat::Monitoring CpuStatPrivate::monitoring(void) const
CpuStat::Monitoring CpuStatPrivate::monitoring() const
{
return mMonitoring;
}
Expand All @@ -311,12 +311,12 @@ CpuStat::~CpuStat()
{
}

void CpuStat::updateSources(void)
void CpuStat::updateSources()
{
dynamic_cast<CpuStatPrivate*>(impl)->updateSources();
}

CpuStat::Monitoring CpuStat::monitoring(void) const
CpuStat::Monitoring CpuStat::monitoring() const
{
return impl->monitoring();
}
Expand Down
6 changes: 3 additions & 3 deletions cpustat.hpp → cpustat.h
View file
Expand Up @@ -30,7 +30,7 @@

#include <QtCore/QObject>

#include <sysstat/basestat.hpp>
#include <sysstat/basestat.h>


namespace SysStat {
Expand All @@ -50,7 +50,7 @@ class SYSSTATSHARED_EXPORT CpuStat : public BaseStat
CpuStat(QObject *parent = NULL);
~CpuStat();

void updateSources(void);
void updateSources();

uint minFreq(const QString &source) const;
uint maxFreq(const QString &source) const;
Expand All @@ -66,7 +66,7 @@ class SYSSTATSHARED_EXPORT CpuStat : public BaseStat
Q_PROPERTY(Monitoring monitoring READ monitoring WRITE setMonitoring NOTIFY monitoringChanged)

public slots:
Monitoring monitoring(void) const;
Monitoring monitoring() const;
void setMonitoring(Monitoring value);

protected:
Expand Down

0 comments on commit 11cc6ba

Please sign in to comment.