Mark methods with deployment warnings deprecated

Marked methods in public API deprecated, instead of simply removing
those for a smother transition. Also removed all internal occurrences.

Change-Id: I21e36697486d5e5a077d8d52dd998ab42d17a146
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

11 files changed, 40 insertions, 32 deletions

diff --git a/src/application-lib/packagedatabase.cpp b/src/application-lib/packagedatabase.cpp
index de12f572..c7622fbf 100644
--- a/src/application-lib/packagedatabase.cpp
+++ b/src/application-lib/packagedatabase.cpp
@@ -75,8 +75,6 @@ public:
 
     void preProcessSourceContent(QByteArray &, const QString &) { }
     void merge(PackageInfo *, const PackageInfo *) { }
-
-    QStringList *warnings;
 };
 
 
diff --git a/src/common-lib/configcache.cpp b/src/common-lib/configcache.cpp
index 1bbbe9e1..6eec593b 100644
--- a/src/common-lib/configcache.cpp
+++ b/src/common-lib/configcache.cpp
@@ -147,7 +147,7 @@ void *AbstractConfigCache::takeResult(const QString &rawFile) const
     return takeResult(d->cacheIndex.value(rawFile, -1));
 }
 
-void AbstractConfigCache::parse(QStringList *warnings)
+void AbstractConfigCache::parse()
 {
     clear();
 
@@ -229,10 +229,7 @@ void AbstractConfigCache::parse(QStringList *warnings)
 
 
             } catch (const Exception &e) {
-                if (warnings)
-                    *warnings << qL1S("Failed to read cache: ") + qL1S(e.what());
-                else
-                    qWarning(LogCache) << "Failed to read cache:" << e.what();
+                qWarning(LogCache) << "Failed to read cache:" << e.what();
             }
         }
     } else if (d->options.testFlag(ClearCache)) {
@@ -277,7 +274,7 @@ void AbstractConfigCache::parse(QStringList *warnings)
 
     // reads a single config file and calculates its hash - defined as lambda to be usable
     // both via QtConcurrent and via std:for_each
-    auto readConfigFile = [&cacheIsComplete, &warnings, this](ConfigCacheEntry &ce) {
+    auto readConfigFile = [&cacheIsComplete, this](ConfigCacheEntry &ce) {
         QFile file(ce.filePath);
         if (!file.open(QIODevice::ReadOnly))
             throw Exception("Failed to open file '%1' for reading.\n").arg(file.fileName());
@@ -293,10 +290,7 @@ void AbstractConfigCache::parse(QStringList *warnings)
         ce.checksum = checksum;
         if (!ce.checksumMatches) {
             if (ce.content) {
-                if (warnings)
-                    *warnings << qL1S("Failed to read Cache: cached file checksums do not match");
-                else
-                    qWarning(LogCache) << "Failed to read Cache: cached file checksums do not match";
+                qWarning(LogCache) << "Failed to read Cache: cached file checksums do not match";
                 destruct(ce.content);
                 ce.content = nullptr;
             }
@@ -383,10 +377,7 @@ void AbstractConfigCache::parse(QStringList *warnings)
                 if (ds.status() != QDataStream::Ok)
                     throw Exception("error writing content");
             } catch (const Exception &e) {
-                if (warnings)
-                    *warnings << qL1S("Failed to write Cache: ") + qL1S(e.what());
-                else
-                    qCWarning(LogCache) << "Failed to write Cache:" << e.what();
+                qCWarning(LogCache) << "Failed to write Cache:" << e.what();
             }
             qCDebug(LogCache) << d->cacheBaseName << "writing the cache finished after"
                               << (timer.nsecsElapsed() / 1000) << "usec";
diff --git a/src/common-lib/configcache.h b/src/common-lib/configcache.h
index 3c15710a..afcfd00f 100644
--- a/src/common-lib/configcache.h
+++ b/src/common-lib/configcache.h
@@ -62,8 +62,6 @@ public:
     T *loadFromCache(QDataStream &ds);
     void saveToCache(QDataStream &ds, const T *t);
     void merge(T *to, const T *from) { *to = *from; }
-
-    QStringList *warnings;
 };
 
 class AbstractConfigCache
@@ -80,7 +78,7 @@ public:
     AbstractConfigCache(const QStringList &configFiles, const QString &cacheBaseName, Options options = None);
     virtual ~AbstractConfigCache();
 
-    virtual void parse(QStringList *warnings = nullptr);
+    virtual void parse();
 
     void *takeMergedResult() const;
     void *takeResult(int index) const;
@@ -117,10 +115,9 @@ public:
         clear();
     }
 
-    void parse(QStringList *warnings = nullptr) override
+    void parse() override
     {
-        m_adaptor.warnings = warnings;
-        AbstractConfigCache::parse(warnings);
+        AbstractConfigCache::parse();
     }
 
     T *takeMergedResult() const
diff --git a/src/main-lib/configuration.cpp b/src/main-lib/configuration.cpp
index 18353e4f..290ffd7e 100644
--- a/src/main-lib/configuration.cpp
+++ b/src/main-lib/configuration.cpp
@@ -121,7 +121,6 @@ public:
     {
         to->mergeFrom(from);
     }
-    QStringList *warnings;
 };
 
 
@@ -273,11 +272,23 @@ void Configuration::showParserMessage(const QString &message, MessageType type)
 
 // ^^^^ copied from QCommandLineParser ... why is this not public API?
 
+void Configuration::parse(QStringList *deploymentWarnings)
+{
+    Q_UNUSED(deploymentWarnings)
+    parse();
+}
+
 void Configuration::parse()
 {
     parseWithArguments(QCoreApplication::arguments());
 }
 
+void Configuration::parseWithArguments(const QStringList &arguments, QStringList *deploymentWarnings)
+{
+    Q_UNUSED(deploymentWarnings)
+    parseWithArguments(arguments);
+}
+
 void Configuration::parseWithArguments(const QStringList &arguments)
 {
     if (!m_clp.parse(arguments)) {
diff --git a/src/main-lib/configuration.h b/src/main-lib/configuration.h
index d73b2442..0c46a411 100644
--- a/src/main-lib/configuration.h
+++ b/src/main-lib/configuration.h
@@ -61,7 +61,9 @@ public:
     Configuration(const char *additionalDescription = nullptr, bool onlyOnePositionalArgument = true);
 
     virtual ~Configuration();
+    Q_DECL_DEPRECATED void parse(QStringList *deploymentWarnings);
     void parse();
+    Q_DECL_DEPRECATED virtual void parseWithArguments(const QStringList &arguments, QStringList *deploymentWarnings);
     virtual void parseWithArguments(const QStringList &arguments);
     QVariant buildConfig() const;
 
diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp
index df24e516..211c8734 100644
--- a/src/main-lib/main.cpp
+++ b/src/main-lib/main.cpp
@@ -205,7 +205,7 @@ Main::~Main()
 */
 void Main::setup(const Configuration *cfg, const QStringList &deploymentWarnings) Q_DECL_NOEXCEPT_EXPR(false)
 {
-    Q_UNUSED(deploymentWarnings);
+    Q_UNUSED(deploymentWarnings)
     setup(cfg);
 }
 
diff --git a/src/manager-lib/sudo.cpp b/src/manager-lib/sudo.cpp
index e9e4a50a..3a371f51 100644
--- a/src/manager-lib/sudo.cpp
+++ b/src/manager-lib/sudo.cpp
@@ -117,6 +117,12 @@ QT_END_NAMESPACE_AM
 
 QT_BEGIN_NAMESPACE_AM
 
+void Sudo::forkServer(DropPrivileges dropPrivileges, QStringList *warnings)
+{
+    Q_UNUSED(warnings)
+    forkServer(dropPrivileges);
+}
+
 void Sudo::forkServer(DropPrivileges dropPrivileges)
 {
     bool canSudo = false;
diff --git a/src/manager-lib/sudo.h b/src/manager-lib/sudo.h
index ddb99422..775a97bc 100644
--- a/src/manager-lib/sudo.h
+++ b/src/manager-lib/sudo.h
@@ -67,6 +67,8 @@ public:
         DropPrivilegesRegainable, // only use this for auto-tests
     };
 
+    Q_DECL_DEPRECATED static void forkServer(DropPrivileges dropPrivileges, QStringList *warnings)
+                                                                       Q_DECL_NOEXCEPT_EXPR(false);
     static void forkServer(DropPrivileges dropPrivileges) Q_DECL_NOEXCEPT_EXPR(false);
 };
 
diff --git a/src/package-lib/packageutilities.cpp b/src/package-lib/packageutilities.cpp
index be3db8b5..27cdeeb2 100644
--- a/src/package-lib/packageutilities.cpp
+++ b/src/package-lib/packageutilities.cpp
@@ -59,6 +59,12 @@
 
 QT_BEGIN_NAMESPACE_AM
 
+bool PackageUtilities::ensureCorrectLocale(QStringList *warnings)
+{
+    Q_UNUSED(warnings)
+    return ensureCorrectLocale();
+}
+
 bool PackageUtilities::ensureCorrectLocale()
 {
     // We need to make sure we are running in a Unicode locale, since we are
@@ -124,7 +130,6 @@ bool PackageUtilities::ensureCorrectLocale()
 #endif
 }
 
-
 bool PackageUtilities::checkCorrectLocale()
 {
     // see ensureCorrectLocale() above. Call this after the QApplication
diff --git a/src/package-lib/packageutilities.h b/src/package-lib/packageutilities.h
index 97318d04..94ba1f73 100644
--- a/src/package-lib/packageutilities.h
+++ b/src/package-lib/packageutilities.h
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE_AM
 
 namespace PackageUtilities
 {
+Q_DECL_DEPRECATED bool ensureCorrectLocale(QStringList *warnings);
 bool ensureCorrectLocale();
 bool checkCorrectLocale();
 }
diff --git a/tests/yaml/tst_yaml.cpp b/tests/yaml/tst_yaml.cpp
index 1b53e533..74ffd7af 100644
--- a/tests/yaml/tst_yaml.cpp
+++ b/tests/yaml/tst_yaml.cpp
@@ -280,21 +280,18 @@ public:
     {
         sourceContent.replace("${FILE}", fileName.toUtf8());
     }
-    QStringList *warnings;
 };
 QT_END_NAMESPACE_AM
 
 void tst_Yaml::cache()
 {
     QStringList files = { ":/data/cache1.yaml", ":/data/cache2.yaml" };
-    QStringList warnings;
 
     for (int step = 0; step < 2; ++step) {
         try {
             ConfigCache<CacheTest> cache(files, "cache-test", step == 0 ? AbstractConfigCache::ClearCache
                                                                         : AbstractConfigCache::None);
-            cache.parse(&warnings);
-            QVERIFY2(warnings.isEmpty(), qPrintable(warnings.join(qSL("\n"))));
+            cache.parse();
             CacheTest *ct1 = cache.takeResult(0);
             QVERIFY(ct1);
             QCOMPARE(ct1->name, "cache1");
@@ -312,7 +309,6 @@ void tst_Yaml::cache()
 void tst_Yaml::mergedCache()
 {
     QStringList files = { ":/data/cache1.yaml", ":/data/cache2.yaml" };
-    QStringList warnings;
 
     for (int step = 0; step < 4; ++step) {
         AbstractConfigCache::Options options = AbstractConfigCache::MergedResult;
@@ -323,8 +319,7 @@ void tst_Yaml::mergedCache()
 
         try {
             ConfigCache<CacheTest> cache(files, "cache-test", options);
-            cache.parse(&warnings);
-            QVERIFY2(warnings.isEmpty(), qPrintable(warnings.join(qSL("\n"))));
+            cache.parse();
             CacheTest *ct = cache.takeMergedResult();
             QVERIFY(ct);
             QCOMPARE(ct->name, QFileInfo(files.last()).baseName());