Apply clazy fixes + restore Qt backward compatibility

timschneeb · timschneeb · commit b7911084d848 · 2021-12-21T20:11:19.000+01:00
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -717,7 +717,7 @@ void MainWindow::loadConfig()
 
     QVector<float> rawEqData;
 
-    for (auto val : rawEqString.split(";"))
+    for (const auto &val : rawEqString.split(";"))
     {
         if (!val.isEmpty())
         {
diff --git a/src/audio/pipewire/FilterContainer.cpp b/src/audio/pipewire/FilterContainer.cpp
@@ -70,7 +70,7 @@ FilterContainer::FilterContainer(PwPipelineManager* pipe_manager, PwPluginBase*
 
     connect_filters();
 
-    QObject::connect(settings, &AppConfig::updated, [&, this](const auto& key, const auto& value) {
+    QObject::connect(settings, &AppConfig::updated, nullptr, [&, this](const auto& key, const auto& value) {
         if(key != AppConfig::AudioOutputDevice)
             return;
 
diff --git a/src/audio/pipewire/PipewireAudioService.cpp b/src/audio/pipewire/PipewireAudioService.cpp
@@ -147,10 +147,10 @@ IAppManager *PipewireAudioService::appManager()
 std::vector<IOutputDevice> PipewireAudioService::sinkDevices()
 {
     std::vector<IOutputDevice> devices;
-    for(auto [id, node] : mgr.get()->node_map)
+    for(const auto &[id, node] : mgr.get()->node_map)
     {
         if(node.media_class == "Audio/Sink" && node.name != "jamesdsp_sink"){
-            for(auto blacklist : mgr.get()->blocklist_node_name){
+            for(const auto &blacklist : mgr.get()->blocklist_node_name){
                 if(node.name == blacklist)
                 {
                     continue;
diff --git a/src/audio/pipewire/PwAppManager.cpp b/src/audio/pipewire/PwAppManager.cpp
@@ -76,7 +76,7 @@ void PwAppManager::handleSettingsUpdate(const AppConfig::Key& key, const QVarian
     switch(key)
     {
     case AppConfig::AudioAppBlocklist:
-        for (const auto& node : apps)
+        for (const auto& node : qAsConst(apps))
         {
             const auto& app_is_enabled = mgr->stream_is_connected(node.id, node.media_class);
             bool is_blocklisted = AppConfig::instance().isAppBlocked(QString::fromStdString(node.name));
diff --git a/src/config/DspConfig.h b/src/config/DspConfig.h
@@ -241,10 +241,7 @@ class DspConfig :
 
 	void loadDefault()
 	{
-		QString data;
-		QString fileName(":/assets/default.conf");
-
-		QFile   file(fileName);
+        QFile file(":/assets/default.conf");
 
 		if (file.open(QIODevice::ReadOnly))
 		{
diff --git a/src/data/EelParser.cpp b/src/data/EelParser.cpp
@@ -19,7 +19,7 @@ void EELParser::loadFile(QString path)
     // Parse number range parameters
     {
         QRegularExpression descRe(R"((?<var>\w+):(?<def>-?\d+\.?\d*)?<(?<min>-?\d+\.?\d*),(?<max>-?\d+\.?\d*),?(?<step>-?\d+\.?\d*)?>(?<desc>[\s\S][^\n]*))");
-        for (auto line : container.code.split("\n"))
+        for (const auto &line : container.code.split("\n"))
         {
             auto matchIterator = descRe.globalMatch(line);
 
@@ -77,7 +77,7 @@ bool EELParser::loadDefaults()
         return false;
     }
 
-    for(const auto& prop : properties)
+    for(const auto& prop : qAsConst(properties))
     {
         if(prop->getType() == EELPropertyType::NumberRange)
         {
@@ -96,7 +96,7 @@ bool EELParser::hasDefaultsDefined()
         return false;
     }
 
-    for(const auto& prop : properties)
+    for(const auto& prop : qAsConst(properties))
     {
         if(prop->getType() == EELPropertyType::NumberRange)
         {
@@ -116,7 +116,7 @@ bool EELParser::canLoadDefaults()
 		return false;
 	}
 
-    for(auto* prop : properties)
+    for(auto* prop : qAsConst(properties))
     {
         if(prop->getType() == EELPropertyType::NumberRange)
         {
@@ -146,7 +146,7 @@ QString EELParser::getDescription()
 {
 	QRegularExpression descRe(R"((?:^|(?<=\n))(?:desc:)([\s\S][^\n]*))");
 
-	for (auto line : container.code.split("\n"))
+	for (const auto &line : container.code.split("\n"))
 	{
 		auto matchIterator = descRe.globalMatch(line);
 
@@ -198,7 +198,7 @@ QString EELParser::findVariable(QString         key,
 	{
 		QRegularExpression re(QString(R"(%1\s*=\s*(?<val>-?\d+\.?\d*)\s*;)").arg(key));
 
-		for (auto line : container.code.split("\n"))
+		for (const auto &line : container.code.split("\n"))
 		{
 			auto matchIterator = re.globalMatch(line);
 
diff --git a/src/interface/QMenuEditor.cpp b/src/interface/QMenuEditor.cpp
@@ -133,7 +133,7 @@ bool QMenuEditor::insertAction(QAction *new_action)
 {
 	int act_before = ui->list_target->currentRow();
 
-	for (auto item : mTarget)
+	for (auto item : qAsConst(mTarget))
 	{
 		if (item->text() == new_action->text() &&
 		    !item->isSeparator())
@@ -167,7 +167,7 @@ QMenu* QMenuEditor::exportMenu()
 {
 	QMenu *menu = new QMenu();
 
-	for (auto item : mTarget)
+	for (auto item : qAsConst(mTarget))
 	{
 		if (item->isSeparator())
 		{
diff --git a/src/interface/WidgetMarqueeLabel.h b/src/interface/WidgetMarqueeLabel.h
@@ -14,8 +14,6 @@ class ScrollText :
 
 public:
 	explicit ScrollText(QWidget *parent = 0);
-
-public slots:
 	QString      text() const;
 	void         setText(QString text);
 
@@ -46,4 +44,4 @@ private slots:
 
 };
 
-#endif // SCROLLTEXT_H
+#endif // SCROLLTEXT_H
diff --git a/src/subprojects/FlatTabWidget/flattabwidget.cpp b/src/subprojects/FlatTabWidget/flattabwidget.cpp
@@ -57,7 +57,7 @@ FlatTabWidget::~FlatTabWidget()
 {
     lineMorph->deleteLater();
     fade->deleteLater();
-    for(const auto& item : pages)
+    for(const auto& item : qAsConst(pages))
     {
         item.fadeIn->deleteLater();
         item.fadeOut->deleteLater();
@@ -66,7 +66,6 @@ FlatTabWidget::~FlatTabWidget()
 }
 
 void FlatTabWidget::addPage(QString title, QWidget* page, int index){
-    auto pal = palette();
     auto textcolor_active = getColor(ColorRole::Active);
     auto textcolor_disabled = getColor(ColorRole::Inactive);
 
@@ -102,7 +101,7 @@ void FlatTabWidget::updatePages(bool overrideSeparator){
     }
     ui->TabBarContainer->repaint();
 
-    for (auto page : pages) {
+    for (auto page : qAsConst(pages)) {
         ui->TabBarContainer->layout()->addWidget(page.label);
         if(!detachCustomStackedWidget)
             activeContainer->addWidget(page.widget);
@@ -142,7 +141,7 @@ void FlatTabWidget::showEvent(QShowEvent *event)
 }
 
 void FlatTabWidget::redrawTabBar(){
-    for (auto page : pages)
+    for (auto page : qAsConst(pages))
         page.label->setColor(getColor(ColorRole::Inactive));
     int temp = currentSelection;
     setCurrentTab(temp);
diff --git a/src/subprojects/GraphicEQWidget/GraphicEQFilterGUI.cpp b/src/subprojects/GraphicEQWidget/GraphicEQFilterGUI.cpp
@@ -135,7 +135,11 @@ void GraphicEQFilterGUI::load(const QString& parameters)
     std::vector<FilterNode> nodes;
     QStringList nodeList = parameterList.at(1).split(";");
     for(QString nodeStr : nodeList){
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+        QStringList values = nodeStr.trimmed().split(" ", QString::SkipEmptyParts);
+#else
         QStringList values = nodeStr.trimmed().split(" ", Qt::SkipEmptyParts);
+#endif
         if(values.count() != 2)
             continue;
         FilterNode node(values.at(0).toDouble(),values.at(1).toDouble());

Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,7 @@ void MainWindow::loadConfig()`
`717`	`717`
`718`	`718`	`QVector<float> rawEqData;`
`719`	`719`
`720`		`- for (auto val : rawEqString.split(";"))`
	`720`	`+ for (const auto &val : rawEqString.split(";"))`
`721`	`721`	`{`
`722`	`722`	`if (!val.isEmpty())`
`723`	`723`	`{`
Original file line number	Diff line number	Diff line change
`@@ -147,10 +147,10 @@ IAppManager *PipewireAudioService::appManager()`
`147`	`147`	`std::vector<IOutputDevice> PipewireAudioService::sinkDevices()`
`148`	`148`	`{`
`149`	`149`	`std::vector<IOutputDevice> devices;`
`150`		`- for(auto [id, node] : mgr.get()->node_map)`
	`150`	`+ for(const auto &[id, node] : mgr.get()->node_map)`
`151`	`151`	`{`
`152`	`152`	`if(node.media_class == "Audio/Sink" && node.name != "jamesdsp_sink"){`
`153`		`- for(auto blacklist : mgr.get()->blocklist_node_name){`
	`153`	`+ for(const auto &blacklist : mgr.get()->blocklist_node_name){`
`154`	`154`	`if(node.name == blacklist)`
`155`	`155`	`{`
`156`	`156`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ void PwAppManager::handleSettingsUpdate(const AppConfig::Key& key, const QVarian`
`76`	`76`	`switch(key)`
`77`	`77`	`{`
`78`	`78`	`case AppConfig::AudioAppBlocklist:`
`79`		`- for (const auto& node : apps)`
	`79`	`+ for (const auto& node : qAsConst(apps))`
`80`	`80`	`{`
`81`	`81`	`const auto& app_is_enabled = mgr->stream_is_connected(node.id, node.media_class);`
`82`	`82`	`bool is_blocklisted = AppConfig::instance().isAppBlocked(QString::fromStdString(node.name));`
Original file line number	Diff line number	Diff line change
`@@ -241,10 +241,7 @@ class DspConfig :`
`241`	`241`
`242`	`242`	`void loadDefault()`
`243`	`243`	`{`
`244`		`- QString data;`
`245`		`- QString fileName(":/assets/default.conf");`
`246`		`-`
`247`		`- QFile file(fileName);`
	`244`	`+ QFile file(":/assets/default.conf");`
`248`	`245`
`249`	`246`	`if (file.open(QIODevice::ReadOnly))`
`250`	`247`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ void EELParser::loadFile(QString path)`
`19`	`19`	`// Parse number range parameters`
`20`	`20`	`{`
`21`	`21`	`QRegularExpression descRe(R"((?<var>\w+):(?<def>-?\d+\.?\d)?<(?<min>-?\d+\.?\d),(?<max>-?\d+\.?\d),?(?<step>-?\d+\.?\d)?>(?<desc>[\s\S][^\n]*))");`
`22`		`- for (auto line : container.code.split("\n"))`
	`22`	`+ for (const auto &line : container.code.split("\n"))`
`23`	`23`	`{`
`24`	`24`	`auto matchIterator = descRe.globalMatch(line);`
`25`	`25`
`@@ -77,7 +77,7 @@ bool EELParser::loadDefaults()`
`77`	`77`	`return false;`
`78`	`78`	`}`
`79`	`79`
`80`		`- for(const auto& prop : properties)`
	`80`	`+ for(const auto& prop : qAsConst(properties))`
`81`	`81`	`{`
`82`	`82`	`if(prop->getType() == EELPropertyType::NumberRange)`
`83`	`83`	`{`
`@@ -96,7 +96,7 @@ bool EELParser::hasDefaultsDefined()`
`96`	`96`	`return false;`
`97`	`97`	`}`
`98`	`98`
`99`		`- for(const auto& prop : properties)`
	`99`	`+ for(const auto& prop : qAsConst(properties))`
`100`	`100`	`{`
`101`	`101`	`if(prop->getType() == EELPropertyType::NumberRange)`
`102`	`102`	`{`
`@@ -116,7 +116,7 @@ bool EELParser::canLoadDefaults()`
`116`	`116`	`return false;`
`117`	`117`	`}`
`118`	`118`
`119`		`- for(auto* prop : properties)`
	`119`	`+ for(auto* prop : qAsConst(properties))`
`120`	`120`	`{`
`121`	`121`	`if(prop->getType() == EELPropertyType::NumberRange)`
`122`	`122`	`{`
`@@ -146,7 +146,7 @@ QString EELParser::getDescription()`
`146`	`146`	`{`
`147`	`147`	`QRegularExpression descRe(R"((?:^\|(?<=\n))(?:desc:)([\s\S][^\n]*))");`
`148`	`148`
`149`		`- for (auto line : container.code.split("\n"))`
	`149`	`+ for (const auto &line : container.code.split("\n"))`
`150`	`150`	`{`
`151`	`151`	`auto matchIterator = descRe.globalMatch(line);`
`152`	`152`
`@@ -198,7 +198,7 @@ QString EELParser::findVariable(QString key,`
`198`	`198`	`{`
`199`	`199`	`QRegularExpression re(QString(R"(%1\s=\s(?<val>-?\d+\.?\d)\s;)").arg(key));`
`200`	`200`
`201`		`- for (auto line : container.code.split("\n"))`
	`201`	`+ for (const auto &line : container.code.split("\n"))`
`202`	`202`	`{`
`203`	`203`	`auto matchIterator = re.globalMatch(line);`
`204`	`204`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ bool QMenuEditor::insertAction(QAction *new_action)`
`133`	`133`	`{`
`134`	`134`	`int act_before = ui->list_target->currentRow();`
`135`	`135`
`136`		`- for (auto item : mTarget)`
	`136`	`+ for (auto item : qAsConst(mTarget))`
`137`	`137`	`{`
`138`	`138`	`if (item->text() == new_action->text() &&`
`139`	`139`	`!item->isSeparator())`
`@@ -167,7 +167,7 @@ QMenu* QMenuEditor::exportMenu()`
`167`	`167`	`{`
`168`	`168`	`QMenu *menu = new QMenu();`
`169`	`169`
`170`		`- for (auto item : mTarget)`
	`170`	`+ for (auto item : qAsConst(mTarget))`
`171`	`171`	`{`
`172`	`172`	`if (item->isSeparator())`
`173`	`173`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ FlatTabWidget::~FlatTabWidget()`
`57`	`57`	`{`
`58`	`58`	`lineMorph->deleteLater();`
`59`	`59`	`fade->deleteLater();`
`60`		`- for(const auto& item : pages)`
	`60`	`+ for(const auto& item : qAsConst(pages))`
`61`	`61`	`{`
`62`	`62`	`item.fadeIn->deleteLater();`
`63`	`63`	`item.fadeOut->deleteLater();`
`@@ -66,7 +66,6 @@ FlatTabWidget::~FlatTabWidget()`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`void FlatTabWidget::addPage(QString title, QWidget* page, int index){`
`69`		`- auto pal = palette();`
`70`	`69`	`auto textcolor_active = getColor(ColorRole::Active);`
`71`	`70`	`auto textcolor_disabled = getColor(ColorRole::Inactive);`
`72`	`71`
`@@ -102,7 +101,7 @@ void FlatTabWidget::updatePages(bool overrideSeparator){`
`102`	`101`	`}`
`103`	`102`	`ui->TabBarContainer->repaint();`
`104`	`103`
`105`		`- for (auto page : pages) {`
	`104`	`+ for (auto page : qAsConst(pages)) {`
`106`	`105`	`ui->TabBarContainer->layout()->addWidget(page.label);`
`107`	`106`	`if(!detachCustomStackedWidget)`
`108`	`107`	`activeContainer->addWidget(page.widget);`
`@@ -142,7 +141,7 @@ void FlatTabWidget::showEvent(QShowEvent *event)`
`142`	`141`	`}`
`143`	`142`
`144`	`143`	`void FlatTabWidget::redrawTabBar(){`
`145`		`- for (auto page : pages)`
	`144`	`+ for (auto page : qAsConst(pages))`
`146`	`145`	`page.label->setColor(getColor(ColorRole::Inactive));`
`147`	`146`	`int temp = currentSelection;`
`148`	`147`	`setCurrentTab(temp);`