From 23a737bbfabaaa411fba9723ed9228d3d83959d5 Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Sat, 11 Jan 2020 00:18:05 +0100 Subject: [PATCH] Constify getLibExtensions() --- lib/func.cpp | 12 ++++++------ lib/func.h | 2 +- widgets/SearchPkcs11.cpp | 2 +- widgets/SearchPkcs11.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/func.cpp b/lib/func.cpp index ba057b3b..880040cb 100644 --- a/lib/func.cpp +++ b/lib/func.cpp @@ -52,17 +52,17 @@ QPixmap *loadImg(const char *name ) return new QPixmap(QString(":") + name); } -QStringList getLibExtensions() +const QStringList getLibExtensions() { - QStringList l; + return QStringList { #if defined(Q_OS_WIN32) - l << QString("*.dll") << QString("*.DLL"); + QString("*.dll"), QString("*.DLL"), #elif defined(Q_OS_MAC) - l << QString("*.dylib") << QString("*.so"); + QString("*.dylib"), QString("*.so"), #else - l << QString("*.so"); + QString("*.so"), #endif - return l; + }; } int portable_app() diff --git a/lib/func.h b/lib/func.h index 42bb0c59..34e06c4c 100644 --- a/lib/func.h +++ b/lib/func.h @@ -30,7 +30,7 @@ QString getLibDir(); QString getDocDir(); QString getUserSettingsDir(); QString getFullFilename(const QString &filename, const QString &selectedFilter); -QStringList getLibExtensions(); +const QStringList getLibExtensions(); QString hostId(); QString formatHash(const QByteArray &data, QString sep = ":", int width = 2); diff --git a/widgets/SearchPkcs11.cpp b/widgets/SearchPkcs11.cpp index b39db3d2..74beb213 100644 --- a/widgets/SearchPkcs11.cpp +++ b/widgets/SearchPkcs11.cpp @@ -130,7 +130,7 @@ void SearchPkcs11::updateLibs(QString f) liblist->update(); } -searchThread::searchThread(QString _dir, QStringList _ext, bool _recursive) +searchThread::searchThread(QString _dir, const QStringList _ext, bool _recursive) { dirname = _dir; ext = _ext; diff --git a/widgets/SearchPkcs11.h b/widgets/SearchPkcs11.h index fa4a355c..10dafeb3 100644 --- a/widgets/SearchPkcs11.h +++ b/widgets/SearchPkcs11.h @@ -25,7 +25,7 @@ class searchThread: public QThread bool checkLib(QString file); public: - searchThread(QString _dir, QStringList _ext, bool _recursive); + searchThread(QString _dir, const QStringList _ext, bool _recursive); void search(QString mydir); void run() {