diff --git a/libssu/ssu.cpp b/libssu/ssu.cpp index d6fdeff..82975ef 100644 --- a/libssu/ssu.cpp +++ b/libssu/ssu.cpp @@ -517,7 +517,7 @@ void Ssu::storeAuthorizedKeys(QByteArray data) int uid_min = getdef_num("UID_MIN", -1); QString homePath; - if (getuid() >= uid_min) { + if (getuid() >= static_cast(uid_min)) { homePath = dir.homePath(); } else if (getuid() == 0) { // place authorized_keys in the default users home when run with uid0 diff --git a/libssu/ssucoreconfig.cpp b/libssu/ssucoreconfig.cpp index ee72c85..153af12 100644 --- a/libssu/ssucoreconfig.cpp +++ b/libssu/ssucoreconfig.cpp @@ -37,6 +37,9 @@ QPair SsuCoreConfig::credentials(QString scope) QString SsuCoreConfig::credentialsScope(QString repoName, bool rndRepo) { + Q_UNUSED(repoName) + Q_UNUSED(rndRepo) + if (contains("credentials-scope")) return value("credentials-scope").toString(); else @@ -158,7 +161,7 @@ QDBusConnection SsuCoreConfig::userSessionBus() // For calls from valid UID we assume that they are properly logged in users. // If they are not the call will fail, but it's their fault. - if (getuid() >= uid_min) { + if (getuid() >= static_cast(uid_min)) { return QDBusConnection::sessionBus(); } else { // DBus security policy will prevent this beeing used by callers other diff --git a/libssu/ssudeviceinfo.cpp b/libssu/ssudeviceinfo.cpp index 3da4c0f..deb3a4d 100644 --- a/libssu/ssudeviceinfo.cpp +++ b/libssu/ssudeviceinfo.cpp @@ -53,9 +53,9 @@ QString SsuDeviceInfo::adaptationVariables(const QString &adaptationName, QHash< // - export the entry in the adaptation list as %(adaptation) // - look up variables for that adaptation, and export matching // adaptation variable - QRegExp regex("adaptation\\\d*", Qt::CaseSensitive, QRegExp::RegExp2); + QRegExp regex("adaptation\\d*", Qt::CaseSensitive, QRegExp::RegExp2); if (regex.exactMatch(adaptationName)) { - regex.setPattern("\\\d*"); + regex.setPattern("\\d*"); regex.lastIndexIn(adaptationName); int n = regex.cap().toInt(); diff --git a/libssu/ssufeaturemanager.cpp b/libssu/ssufeaturemanager.cpp index e899f18..42baee5 100644 --- a/libssu/ssufeaturemanager.cpp +++ b/libssu/ssufeaturemanager.cpp @@ -34,8 +34,6 @@ SsuFeatureManager::SsuFeatureManager(): QObject() QStringList SsuFeatureManager::repos(bool rndRepo, int filter) { QStringList r; - QStringList keys; - SsuCoreConfig *settings = SsuCoreConfig::instance(); // @TODO features currently can't be blacklisted, but just ignoring user filter // is still the best way atm diff --git a/libssu/ssusettings.cpp b/libssu/ssusettings.cpp index 894a93c..602fcf3 100644 --- a/libssu/ssusettings.cpp +++ b/libssu/ssusettings.cpp @@ -46,8 +46,6 @@ void SsuSettings::merge(bool keepOld) bool skipMerge = true; - SsuLog *ssuLog = SsuLog::instance(); - QDirIterator it(settingsd, QDir::AllEntries | QDir::NoDot | QDir::NoDotDot, QDirIterator::FollowSymlinks); QStringList settingsFiles; diff --git a/libssu/ssuvariables.cpp b/libssu/ssuvariables.cpp index 9087ac8..8a14666 100644 --- a/libssu/ssuvariables.cpp +++ b/libssu/ssuvariables.cpp @@ -42,7 +42,7 @@ QString SsuVariables::resolveString(QString pattern, QHash *va return "maximum-recursion-level-reached"; } - QRegExp regex("%\\\([^%]*\\\)", Qt::CaseSensitive, QRegExp::RegExp2); + QRegExp regex("%\\([^%]*\\)", Qt::CaseSensitive, QRegExp::RegExp2); regex.setMinimal(true); int pos = 0; @@ -253,6 +253,8 @@ void SsuVariables::readSection(SsuSettings *settings, QString section, QVariant SsuVariables::readVariable(SsuSettings *settings, QString section, const QString &key, int recursionDepth, bool logOverride) { + Q_UNUSED(logOverride) + QVariant value; if (recursionDepth >= SSU_MAX_RECURSION) { diff --git a/ssucli/ssucli.cpp b/ssucli/ssucli.cpp index f0926bc..4258ddb 100644 --- a/ssucli/ssucli.cpp +++ b/ssucli/ssucli.cpp @@ -529,6 +529,8 @@ void SsuCli::optSet(QStringList opt) void SsuCli::optStatus(QStringList opt) { + Q_UNUSED(opt) + QTextStream qout(stdout); QTextStream qerr(stderr); SsuDeviceInfo deviceInfo; @@ -585,6 +587,8 @@ void SsuCli::optUpdateCredentials(QStringList opt) void SsuCli::optUpdateRepos(QStringList opt) { + Q_UNUSED(opt) + QTextStream qerr(stdout); QDBusPendingReply<> reply = ssuProxy->updateRepos(); @@ -647,7 +651,7 @@ void SsuCli::run() bool found = false; int argc = arguments.count() - 2; - for (int i = 0; i < sizeof(handlers) / sizeof(handlers[0]); i++) { + for (unsigned int i = 0; i < sizeof(handlers) / sizeof(handlers[0]); i++) { if ((arguments.at(1) != handlers[i].longopt) && (arguments.at(1) != handlers[i].shortopt)) { continue; diff --git a/tests/tests_common.pri b/tests/tests_common.pri index c166f2f..f9481d1 100644 --- a/tests/tests_common.pri +++ b/tests/tests_common.pri @@ -1,3 +1,5 @@ +CONFIG += c++11 + isEmpty(TARGET):error("TARGET must be defined before this file is included") INCLUDEPATH *= $${PWD}