From 665be39eaaa12622b6baf11ce6b7c8eb600778ea Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <scarpino@kde.org>
Date: Sat, 15 Apr 2017 17:24:00 +0200
Subject: [PATCH 29/97] Do not hardcode "choqok" use applicationName() instead

---
 libchoqok/passwordmanager.cpp               | 6 +++---
 plugins/shorteners/bit_ly/bit_ly.cpp        | 2 +-
 plugins/shorteners/bit_ly/bit_ly_config.cpp | 2 +-
 plugins/uploaders/posterous/posterous.cpp   | 4 ++--
 plugins/uploaders/twitgoo/twitgoo.cpp       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libchoqok/passwordmanager.cpp b/libchoqok/passwordmanager.cpp
index d03fd211..1b2ecec6 100644
--- a/libchoqok/passwordmanager.cpp
+++ b/libchoqok/passwordmanager.cpp
@@ -66,9 +66,9 @@ public:
         }
         wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), id);
         if (wallet) {
-            if (!wallet->setFolder(QLatin1String("choqok"))) {
-                wallet->createFolder(QLatin1String("choqok"));
-                wallet->setFolder(QLatin1String("choqok"));
+            if (!wallet->setFolder(QCoreApplication::applicationName())) {
+                wallet->createFolder(QCoreApplication::applicationName());
+                wallet->setFolder(QCoreApplication::applicationName());
             }
             qCDebug(CHOQOK) << "Wallet successfully opened.";
             return true;
diff --git a/plugins/shorteners/bit_ly/bit_ly.cpp b/plugins/shorteners/bit_ly/bit_ly.cpp
index eca00911..c3bfb7c3 100644
--- a/plugins/shorteners/bit_ly/bit_ly.cpp
+++ b/plugins/shorteners/bit_ly/bit_ly.cpp
@@ -45,7 +45,7 @@ Bit_ly::~Bit_ly()
 
 QString Bit_ly::shorten(const QString &url)
 {
-    QString login = QLatin1String("choqok");
+    QString login = QCoreApplication::applicationName();
     QString apiKey = QLatin1String("R_bdd1ae8b6191dd36e13fc77ca1d4f27f");
     QUrl reqUrl(QLatin1String("http://api.bit.ly/v3/shorten"));
     QUrlQuery reqQuery;
diff --git a/plugins/shorteners/bit_ly/bit_ly_config.cpp b/plugins/shorteners/bit_ly/bit_ly_config.cpp
index 351780d0..4b8babcc 100644
--- a/plugins/shorteners/bit_ly/bit_ly_config.cpp
+++ b/plugins/shorteners/bit_ly/bit_ly_config.cpp
@@ -105,7 +105,7 @@ void Bit_ly_Config::slotValidate()
 {
     ui.validate_button->setEnabled(false);
     ui.validate_button->setText(i18n("Checking..."));
-    QString login = QLatin1String("choqok");
+    QString login = QCoreApplication::applicationName();
     QString apiKey = QLatin1String("R_bdd1ae8b6191dd36e13fc77ca1d4f27f");
     QUrl reqUrl(QLatin1String("http://api.bit.ly/v3/validate"));
     QUrlQuery reqQuery;
diff --git a/plugins/uploaders/posterous/posterous.cpp b/plugins/uploaders/posterous/posterous.cpp
index 890fc200..b00e91fb 100644
--- a/plugins/uploaders/posterous/posterous.cpp
+++ b/plugins/uploaders/posterous/posterous.cpp
@@ -95,7 +95,7 @@ void Posterous::upload(const QUrl &localUrl, const QByteArray &medium, const QBy
             formdata[QLatin1String("post[title]")] = QByteArray();
             formdata[QLatin1String("post[body]")] = QByteArray();
             formdata[QLatin1String("autopost")] = "0";
-            formdata[QLatin1String("source")] = "Choqok";
+            formdata[QLatin1String("source")] = QCoreApplication::applicationName().toLatin1();
             formdata[QLatin1String("api_token")] = token.toUtf8();
 
             QMap<QString, QByteArray> mediafile;
@@ -127,7 +127,7 @@ void Posterous::upload(const QUrl &localUrl, const QByteArray &medium, const QBy
         QUrl url(QLatin1String("http://posterous.com/api2/upload.json"));
 
         QMap<QString, QByteArray> formdata;
-        formdata[QLatin1String("source")] = "Choqok";
+        formdata[QLatin1String("source")] = QCoreApplication::applicationName().toLatin1();
         formdata[QLatin1String("sourceLink")] = "http://choqok.gnufolks.org/";
 
         QMap<QString, QByteArray> mediafile;
diff --git a/plugins/uploaders/twitgoo/twitgoo.cpp b/plugins/uploaders/twitgoo/twitgoo.cpp
index 158fe810..aea403df 100644
--- a/plugins/uploaders/twitgoo/twitgoo.cpp
+++ b/plugins/uploaders/twitgoo/twitgoo.cpp
@@ -69,7 +69,7 @@ void Twitgoo::upload(const QUrl &localUrl, const QByteArray &medium, const QByte
     QUrl url(QLatin1String("http://twitgoo.com/api/upload"));
 
     QMap<QString, QByteArray> formdata;
-    formdata[QLatin1String("source")] = "Choqok";
+    formdata[QLatin1String("source")] = QCoreApplication::applicationName().toLatin1();
     formdata[QLatin1String("format")] = "json";
 
     QMap<QString, QByteArray> mediafile;
-- 
2.17.1