Skip to content

Commit 37ce75a

Browse files
author
ThePBone
committed
Fix all compiler warnings and apply clang-tidy and clazy fixes
1 parent eb50892 commit 37ce75a

32 files changed

+128
-136
lines changed

‎V4L_Frontend.pro‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
99

1010
TARGET = V4L_Frontend
1111
TEMPLATE = app
12-
QMAKE_CXXFLAGS += "-Wno-old-style-cast -Wdouble-promotion"
12+
QMAKE_CXXFLAGS += "-Wno-old-style-cast -Wno-unused-function"
1313

1414
include(visualization/SpectrumAudioViewer.pri)
1515

@@ -125,7 +125,6 @@ HEADERS += \
125125
misc/overlaymsgproxy.h \
126126
misc/presetprovider.h \
127127
misc/stylehelper.h \
128-
misc/styles/darkstyle.h \
129128
misc/versioncontainer.h
130129

131130
FORMS += \

‎config/appconfigwrapper.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void AppConfigWrapper::saveAppConfig(){
1515
ConfigIO::writeFile(file,appconf->getConfigMap());
1616
}
1717
void AppConfigWrapper::loadAppConfig(){
18-
auto map = ConfigIO::readFile(QString("%1/.config/viper4linux/ui.2.conf").arg(QDir::homePath()),false);
18+
auto map = ConfigIO::readFile(QString("%1/.config/viper4linux/ui.2.conf").arg(QDir::homePath()));
1919
appconf->setConfigMap(map);
2020
}
2121

@@ -40,7 +40,7 @@ void AppConfigWrapper::setGFix(bool f){
4040
bool AppConfigWrapper::getGFix(){
4141
return appconf->getBool("apply.fixglava");
4242
}
43-
void AppConfigWrapper::setPath(QString npath){
43+
void AppConfigWrapper::setPath(const QString& npath){
4444
appconf->setValue("io.configpath",QVariant(QString("\"%1\"").arg(npath)));
4545
saveAppConfig();
4646
}
@@ -52,7 +52,7 @@ QString AppConfigWrapper::getPath(){
5252
return QString("%1/.config/viper4linux/audio.conf").arg(QDir::homePath());
5353
return path;
5454
}
55-
void AppConfigWrapper::setStylesheet(QString s){
55+
void AppConfigWrapper::setStylesheet(const QString& s){
5656
appconf->setValue("theme.stylesheet",QVariant(s));
5757
m_stylehelper->SetStyle();
5858
emit styleChanged();
@@ -70,7 +70,7 @@ void AppConfigWrapper::setThememode(int mode){
7070
emit styleChanged();
7171
saveAppConfig();
7272
}
73-
void AppConfigWrapper::setColorpalette(QString s){
73+
void AppConfigWrapper::setColorpalette(const QString& s){
7474
appconf->setValue("theme.palette",QVariant(s));
7575
m_stylehelper->SetStyle();
7676
emit styleChanged();
@@ -79,7 +79,7 @@ void AppConfigWrapper::setColorpalette(QString s){
7979
QString AppConfigWrapper::getColorpalette(){
8080
return appconf->getString("theme.palette");
8181
}
82-
void AppConfigWrapper::setCustompalette(QString s){
82+
void AppConfigWrapper::setCustompalette(const QString& s){
8383
appconf->setValue("theme.palette.custom",QVariant(s));
8484
m_stylehelper->SetStyle();
8585
emit styleChanged();
@@ -111,7 +111,7 @@ void AppConfigWrapper::setReloadMethod(ReloadMethod mode){
111111
appconf->setValue("apply.method",QVariant((uint)mode));
112112
saveAppConfig();
113113
}
114-
void AppConfigWrapper::setIrsPath(QString npath){
114+
void AppConfigWrapper::setIrsPath(const QString& npath){
115115
appconf->setValue("convolver.default.irspath",QVariant(QString("\"%1\"").arg(npath)));
116116
saveAppConfig();
117117
}
@@ -122,7 +122,7 @@ void AppConfigWrapper::setConv_DefTab(int mode){
122122
appconf->setValue("convolver.default.tab",QVariant(mode));
123123
saveAppConfig();
124124
}
125-
void AppConfigWrapper::setTheme(QString thm){
125+
void AppConfigWrapper::setTheme(const QString& thm){
126126
appconf->setValue("theme.name",QVariant(thm));
127127
m_stylehelper->SetStyle();
128128
emit styleChanged();
@@ -198,7 +198,7 @@ void AppConfigWrapper::setSpectrumTheme(int number){
198198
emit spectrumChanged();
199199
saveAppConfig();
200200
}
201-
void AppConfigWrapper::setSpectrumInput(QString npath){
201+
void AppConfigWrapper::setSpectrumInput(const QString& npath){
202202
appconf->setValue("visualizer.spectrum.device",QVariant(npath));
203203
emit spectrumReloadRequired();
204204
saveAppConfig();

‎config/appconfigwrapper.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ class AppConfigWrapper : public QObject
3838

3939
void setConv_DefTab(int mode);
4040
int getConv_DefTab();
41-
void setIrsPath(QString npath);
41+
void setIrsPath(const QString& npath);
4242
QString getIrsPath();
43-
void setTheme(QString);
43+
void setTheme(const QString&);
4444
QString getTheme();
4545
void setAutoFxMode(int);
4646
int getAutoFxMode();
4747
void setWhiteIcons(bool b);
4848
bool getWhiteIcons();
49-
void setCustompalette(QString s);
49+
void setCustompalette(const QString& s);
5050
QString getCustompalette();
51-
void setColorpalette(QString);
51+
void setColorpalette(const QString&);
5252
QString getColorpalette();
53-
void setAutoFx(bool autofx);
53+
void setAutoFx(bool afx);
5454
bool getAutoFx();
5555
ReloadMethod getReloadMethod();
5656
void setReloadMethod(ReloadMethod mode);
@@ -61,9 +61,9 @@ class AppConfigWrapper : public QObject
6161
bool getMuteOnRestart();
6262
void setMuteOnRestart(bool on);
6363
QString getPath();
64-
void setPath(QString npath);
64+
void setPath(const QString& npath);
6565
QString getStylesheet();
66-
void setStylesheet(QString);
66+
void setStylesheet(const QString&);
6767
void setTrayMode(int);
6868
int getTrayMode();
6969
void setSpectrumEnable(bool b);
@@ -78,7 +78,7 @@ class AppConfigWrapper : public QObject
7878
bool getSpetrumGrid();
7979
int getSpectrumTheme();
8080
void setSpectrumTheme(int number);
81-
void setSpectrumInput(QString npath);
81+
void setSpectrumInput(const QString& npath);
8282
QString getSpectrumInput();
8383
int getSpectrumRefresh();
8484
void setSpectrumRefresh(int number);

‎config/container.cpp‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,44 @@
11
#include "container.h"
22

33
#include <QDebug>
4-
4+
#include <utility>
55
ConfigContainer::ConfigContainer()
6-
{
7-
}
8-
void ConfigContainer::setValue(QString key,QVariant value){
9-
map[key] = value;
6+
= default;
7+
void ConfigContainer::setValue(const QString& key,QVariant value){
8+
map[key] = std::move(value);
109
}
11-
QVariant ConfigContainer::getVariant(QString key){
10+
QVariant ConfigContainer::getVariant(const QString& key){
1211
if(!map.contains(key)){
1312
qWarning().noquote().nospace() << "[W] Requested key '" << key << "' not found";
1413
return QVariant();
1514
}
1615
return map.find(key).value();
1716
}
18-
QString ConfigContainer::getString(QString key,bool setToDefaultIfMissing){
17+
QString ConfigContainer::getString(const QString& key,bool setToDefaultIfMissing){
1918
if(!map.contains(key)){
2019
qWarning().noquote().nospace() << "[W] Requested key '" << key << "' not found";
2120
if(setToDefaultIfMissing)map[key] = "";
2221
return "";
2322
}
2423
return getVariant(key).toString();
2524
}
26-
int ConfigContainer::getInt(QString key){
25+
int ConfigContainer::getInt(const QString& key){
2726
if(!map.contains(key)){
2827
qWarning().noquote().nospace() << "[W] Requested key '" << key << "' not found";
2928
map[key] = 0;
3029
return 0;
3130
}
3231
return getVariant(key).toInt();
3332
}
34-
float ConfigContainer::getFloat(QString key){
33+
float ConfigContainer::getFloat(const QString& key){
3534
if(!map.contains(key)){
3635
qWarning().noquote().nospace() << "[W] Requested key '" << key << "' not found";
37-
map[key] = 0.0f;
38-
return 0.0f;
36+
map[key] = 0.0F;
37+
return 0.0F;
3938
}
4039
return getVariant(key).toFloat();
4140
}
42-
bool ConfigContainer::getBool(QString key, bool setToDefaultIfMissing){
41+
bool ConfigContainer::getBool(const QString& key, bool setToDefaultIfMissing){
4342
if(!map.contains(key)){
4443
qWarning().noquote().nospace() << "[W] Requested key '" << key << "' not found";
4544
if(setToDefaultIfMissing)map[key] = false;
@@ -50,8 +49,8 @@ bool ConfigContainer::getBool(QString key, bool setToDefaultIfMissing){
5049
QVariantMap ConfigContainer::getConfigMap(){
5150
return map;
5251
}
53-
void ConfigContainer::setConfigMap(QVariantMap newmap){
52+
void ConfigContainer::setConfigMap(const QVariantMap& newmap){
5453
map.clear();
55-
for(auto e : newmap.keys())
54+
for(const auto& e : newmap.keys())
5655
map[e] = newmap.value(e);
5756
}

‎config/container.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ class ConfigContainer
2222
{
2323
public:
2424
ConfigContainer();
25-
void setValue(QString key,QVariant value);
26-
QVariant getVariant(QString key);
27-
QString getString(QString key,bool setToDefaultIfMissing=true);
28-
int getInt(QString key);
29-
float getFloat(QString key);
30-
bool getBool(QString key, bool setToDefaultIfMissing=true);
25+
void setValue(const QString& key,QVariant value);
26+
QVariant getVariant(const QString& key);
27+
QString getString(const QString& key,bool setToDefaultIfMissing=true);
28+
int getInt(const QString& key);
29+
float getFloat(const QString& key);
30+
bool getBool(const QString& key, bool setToDefaultIfMissing=true);
3131

3232
QVariantMap getConfigMap();
33-
void setConfigMap(QVariantMap newmap);
33+
void setConfigMap(const QVariantMap& newmap);
3434

3535
private:
3636
QVariantMap map = QVariantMap();

‎config/dbusproxy.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ int DBusProxy::GetDriverStatus(PARAM_GET param){
5555
}
5656
return -100;
5757
}
58-
bool DBusProxy::SubmitPropertyMap(QVariantMap map){
58+
bool DBusProxy::SubmitPropertyMap(const QVariantMap& map){
5959
if (m_dbInterface->isValid()) {
60-
for(auto e : map.keys()){
60+
for(const auto& e : map.keys()){
6161
m_dbInterface->setProperty(e.toUtf8().constData(),map.value(e));
6262
}
6363
return true;
@@ -73,22 +73,22 @@ QVariantMap DBusProxy::FetchPropertyMap(){
7373
message.setArguments(arguments);
7474
QDBusConnection connection = QDBusConnection::sessionBus();
7575
QDBusMessage reply = connection.call(message);
76-
if(reply.arguments().size() < 1)
76+
if(reply.arguments().empty())
7777
return QVariantMap();
7878
return qdbus_cast<QVariantMap>(*(static_cast<QDBusArgument*>((void*)reply.arguments().at(0).data())));
7979
}
8080
return QVariantMap();
8181
}
8282

83-
bool DBusProxy::SetProperty(QString key, QVariant value){
83+
bool DBusProxy::SetProperty(const QString& key, const QVariant& value){
8484
if (m_dbInterface->isValid()) {
8585
m_dbInterface->setProperty(key.toUtf8().constData(),value);
8686
return true;
8787
}
8888
return false;
8989
}
9090

91-
QVariant DBusProxy::GetProperty(QString key){
91+
QVariant DBusProxy::GetProperty(const QString& key){
9292
if (m_dbInterface->isValid())
9393
return m_dbInterface->property(key.toUtf8().constData());
9494
return QVariant();

‎config/dbusproxy.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,18 @@ class DBusProxy : public QObject
5858
PARAM_GET_CONVKNLID,
5959
PARAM_GET_STATUS_END
6060
} PARAM_GET;
61+
static constexpr int E_INVALID_INTF = -100;
62+
6163
DBusProxy();
6264
bool isValid();
6365
int CommitProperties(PARAM_GROUP pg);
6466
QString GetVersion();
6567
QString GetGstVersion();
6668
int GetDriverStatus(PARAM_GET param);
6769
QVariantMap FetchPropertyMap();
68-
bool SubmitPropertyMap(QVariantMap map);
69-
bool SetProperty(QString key, QVariant value);
70-
QVariant GetProperty(QString key);
70+
bool SubmitPropertyMap(const QVariantMap& map);
71+
bool SetProperty(const QString& key, const QVariant& value);
72+
QVariant GetProperty(const QString& key);
7173
private slots:
7274
void PropertiesSignalReceived(uint);
7375
signals:

‎config/io.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
#include <fstream>
66
#include <string>
77

8-
QString ConfigIO::writeString(QVariantMap map){
8+
QString ConfigIO::writeString(const QVariantMap& map){
99
QString ret("");
10-
for(auto e : map.keys())
10+
for(const auto& e : map.keys())
1111
ret += QString("%1=%2\n").arg(e).arg(map.value(e).toString());
1212
return ret;
1313
}
14-
void ConfigIO::writeFile(QString path,QVariantMap map,QString prefix){
14+
void ConfigIO::writeFile(const QString& path,const QVariantMap& map,const QString& prefix){
1515
std::ofstream myfile(path.toUtf8().constData());
1616
if (myfile.is_open())
1717
{
1818
if(!prefix.isEmpty())
1919
myfile << prefix.toUtf8().constData() << std::endl;
20-
for(auto e : map.keys())
20+
for(const auto& e : map.keys())
2121
myfile << e.toStdString() << "=" << map.value(e).toString().toStdString() << std::endl;
2222
myfile.close();
2323
}
2424
}
25-
QVariantMap ConfigIO::readFile(QString path,bool allowWarning){
25+
QVariantMap ConfigIO::readFile(const QString& path){
2626
QVariantMap map;
2727

2828
std::ifstream cFile(path.toUtf8().constData());

‎config/io.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
class ConfigIO
2222
{
2323
public:
24-
static QString writeString(QVariantMap map);
25-
static void writeFile(QString path,QVariantMap map,QString prefix = "");
26-
static QVariantMap readFile(QString path,bool allowWarning = true);
24+
static QString writeString(const QVariantMap& map);
25+
static void writeFile(const QString& path,const QVariantMap& map,const QString& prefix = "");
26+
static QVariantMap readFile(const QString& path);
2727
};
2828

2929
#endif // CONFIGIO_H

‎dialog/androidimporterdlg.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
#include <iostream>
1010
#include <sstream>
1111
#include <fstream>
12-
12+
#include <utility>
1313
using namespace std;
1414
AndroidImporterDlg::AndroidImporterDlg(QString confpath,QWidget *parent) :
1515
QDialog(parent),
1616
ui(new Ui::importandroid)
1717
{
18-
m_confpath = confpath;
18+
m_confpath = std::move(confpath);
1919
ui->setupUi(this);
2020
ui->comboBox->addItem(tr("Official Viper4Android"),0);
2121
ui->comboBox->addItem(tr("Viper4Android >2.7 by Team DeWitt"),1);

0 commit comments

Comments
 (0)