more correct methods naming, prepare to move to templates

This commit is contained in:
arcan1s
2015-07-25 00:03:45 +03:00
parent 4742617e3e
commit 3b6df44489
17 changed files with 144 additions and 161 deletions

View File

@ -34,20 +34,20 @@ public:
explicit ExtendedSysMon(QObject *parent, const QVariantList &args);
~ExtendedSysMon();
// update functions
QVariantMap getBattery(const QString acpiPath);
QVariantMap getCurrentDesktop();
float getGpu(const QString device);
float getGpuTemp(const QString device);
float getHddTemp(const QString cmd, const QString device);
QString getNetworkDevice();
QVariantMap getBattery(const QString acpiPath) const;
QVariantMap getCurrentDesktop() const;
float getGpu(const QString device) const;
float getGpuTemp(const QString device) const;
float getHddTemp(const QString cmd, const QString device) const;
QString getNetworkDevice() const;
QVariantMap getPlayerInfo(const QString playerName,
const QString mpdAddress = QString(),
const QString mpdPort = QString(),
const QString mpris = QString());
const QString mpris = QString()) const;
QVariantMap getPlayerMpdInfo(const QString mpdAddress = QString(),
const QString mpdPort = QString());
QVariantMap getPlayerMprisInfo(const QString mpris = QString());
QVariantMap getPsStats();
const QString mpdPort = QString()) const;
QVariantMap getPlayerMprisInfo(const QString mpris = QString()) const;
QVariantMap getPsStats() const;
protected:
bool sourceRequestEvent(const QString &source);
@ -63,16 +63,15 @@ private:
QList<ExtWeather *> externalWeather;
bool debug;
// reread configuration
QStringList allHddDevices;
QString getAllHdd();
QString getAutoGpu();
QString getAutoMpris();
QStringList getAllHdd() const;
QString getAutoGpu() const;
QString getAutoMpris() const;
void initQuotes();
void initScripts();
void initUpgrade();
void initWeather();
void readConfiguration();
QMap<QString, QString> updateConfiguration(QMap<QString, QString> rawConfig);
QMap<QString, QString> updateConfiguration(QMap<QString, QString> rawConfig) const;
};