diff --git a/libssu/ssu.cpp b/libssu/ssu.cpp index 82975ef..f8594a7 100644 --- a/libssu/ssu.cpp +++ b/libssu/ssu.cpp @@ -432,10 +432,8 @@ void Ssu::sendRegistration(QString usernameDomain, QString password) ssuLog->print(LOG_DEBUG, QString("Sending request to %1") .arg(request.url().url())); - QNetworkReply *reply; - pendingRequests++; - reply = manager->post(request, form.query(QUrl::FullyEncoded).toStdString().c_str()); + manager->post(request, form.query(QUrl::FullyEncoded).toStdString().c_str()); // we could expose downloadProgress() from reply in case we want progress info QString homeUrl = settings->value("home-url").toString().arg(username); diff --git a/libssu/ssudeviceinfo.cpp b/libssu/ssudeviceinfo.cpp index 64ef858..5278db6 100644 --- a/libssu/ssudeviceinfo.cpp +++ b/libssu/ssudeviceinfo.cpp @@ -148,8 +148,6 @@ QString SsuDeviceInfo::deviceVariant(bool fallback) if (!cachedVariant.isEmpty()) return cachedVariant; - cachedVariant = ""; - if (boardMappings->contains("variants/" + deviceModel())) { cachedVariant = boardMappings->value("variants/" + deviceModel()).toString(); } diff --git a/ssucli/ssucli.cpp b/ssucli/ssucli.cpp index bce565d..1bf5e97 100644 --- a/ssucli/ssucli.cpp +++ b/ssucli/ssucli.cpp @@ -186,7 +186,6 @@ void SsuCli::optModel(QStringList opt) void SsuCli::optModifyRepo(enum Actions action, QStringList opt) { SsuRepoManager repoManager; - QTextStream qout(stdout); QTextStream qerr(stderr); if (opt.count() == 3) { @@ -684,14 +683,11 @@ void SsuCli::run() usage(); } -void SsuCli::uidWarning(QString message) +void SsuCli::uidWarning() { - if (message.isEmpty()) - message = "Run 'ssu ur' as root to recreate repository files"; - if (geteuid() != 0) { QTextStream qout(stderr); - qout << "You're not root. " << message << endl; + qout << "You're not root. Run 'ssu ur' as root to recreate repository files" << endl; } } diff --git a/ssucli/ssucli.h b/ssucli/ssucli.h index d9de605..63a75cc 100644 --- a/ssucli/ssucli.h +++ b/ssucli/ssucli.h @@ -33,7 +33,7 @@ public slots: QSettings settings; int state; void usage(QString message = ""); - void uidWarning(QString message = ""); + void uidWarning(); void optDomain(QStringList opt); void optFlavour(QStringList opt); void optMode(QStringList opt); diff --git a/ssuurlresolver/ssuurlresolver.h b/ssuurlresolver/ssuurlresolver.h index c904664..1145d40 100644 --- a/ssuurlresolver/ssuurlresolver.h +++ b/ssuurlresolver/ssuurlresolver.h @@ -59,7 +59,6 @@ class SsuUrlResolver: public QObject private: Ssu ssu; void error(QString message); - void printJournal(int priority, QString message); bool writeZyppCredentialsIfNeeded(QString credentialsScope); public slots: