[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-pk-updates] src/declarative: Fix build with PackageKit-Qt 1.0.x
From:       Kevin Kofler <null () kde ! org>
Date:       2018-01-21 2:26:47
Message-ID: E1ed5LL-0003Ro-Dy () code ! kde ! org
[Download RAW message or body]

Git commit f2e7381105e212f21c5aaa8e5cb35295b8e51eea by Kevin Kofler.
Committed on 21/01/2018 at 02:26.
Pushed by kkofler into branch 'master'.

Fix build with PackageKit-Qt 1.0.x

Remove unused and obsolete PkStrings::message method. (The
PackageKit::Transaction::Message enum that it converts to a string was
removed from PackageKit-Qt 1.0.0. PackageKit itself has not been using
it since 2013! So remove this method unconditionally.)

src/declarative/PkStrings.h (PkStrings::message): Remove this method.

src/declarative/PkStrings.cpp (PkStrings::message): Remove its
implementation.

M  +0    -43   src/declarative/PkStrings.cpp
M  +0    -1    src/declarative/PkStrings.h

https://commits.kde.org/plasma-pk-updates/f2e7381105e212f21c5aaa8e5cb35295b8e51eea

diff --git a/src/declarative/PkStrings.cpp b/src/declarative/PkStrings.cpp
index 1bcfd0f..b08a7b9 100644
--- a/src/declarative/PkStrings.cpp
+++ b/src/declarative/PkStrings.cpp
@@ -942,49 +942,6 @@ QString PkStrings::mediaMessage(Transaction::MediaType value, \
                const QString &tex
     return i18n("Please insert the medium labeled '%1', and press continue.", text);
 }
 
-QString PkStrings::message(Transaction::Message value)
-{
-    switch (value) {
-    case Transaction::MessageBrokenMirror :
-        return i18n("A mirror is possibly broken");
-    case Transaction::MessageConnectionRefused :
-        return i18n("The connection was refused");
-    case Transaction::MessageParameterInvalid :
-        return i18n("The parameter was invalid");
-    case Transaction::MessagePriorityInvalid :
-        return i18n("The priority was invalid");
-    case Transaction::MessageBackendError :
-        return i18n("Backend warning");
-    case Transaction::MessageDaemonError :
-        return i18n("Daemon warning");
-    case Transaction::MessageCacheBeingRebuilt :
-        return i18n("The package list cache is being rebuilt");
-    case Transaction::MessageUntrustedPackage :
-        return i18n("An untrusted package was installed");
-    case Transaction::MessageNewerPackageExists :
-        return i18n("A newer package exists");
-    case Transaction::MessageCouldNotFindPackage :
-        return i18n("Could not find package");
-    case Transaction::MessageConfigFilesChanged :
-        return i18n("Configuration files were changed");
-    case Transaction::MessagePackageAlreadyInstalled :
-        return i18n("Package is already installed");
-    case Transaction::MessageAutoremoveIgnored :
-        return i18n("Automatic cleanup is being ignored");
-    case Transaction::MessageRepoMetadataDownloadFailed :
-        return i18n("Software source download failed");
-    case Transaction::MessageRepoForDevelopersOnly :
-        return i18n("This software source is for developers only");
-    case Transaction::MessageOtherUpdatesHeldBack :
-        return i18n("Other updates have been held back");
-    case Transaction::MessageUnknown:
-        qWarning() << "message(Enum::UnknownMessageType)";
-        return QString();
-    }
-    qWarning() << "value unrecognised: " << value;
-    return QString();
-}
-
 QString PkStrings::daemonError(int value)
 {
     Transaction::InternalError statusEnum = \
                static_cast<Transaction::InternalError>(value);
diff --git a/src/declarative/PkStrings.h b/src/declarative/PkStrings.h
index b55a039..670215b 100644
--- a/src/declarative/PkStrings.h
+++ b/src/declarative/PkStrings.h
@@ -31,7 +31,6 @@ public slots:
     static QString infoPast(PackageKit::Transaction::Info info);
     static QString error(PackageKit::Transaction::Error error);
     static QString errorMessage(PackageKit::Transaction::Error error);
-    static QString message(PackageKit::Transaction::Message type);
     static QString status(PackageKit::Transaction::Status status, uint speed = 0, \
qulonglong downloadRemaining = 0);  static QString \
statusPast(PackageKit::Transaction::Status status);  static QString \
groups(PackageKit::Transaction::Group group);


[prev in list] [next in list] [prev in thread] [next in thread]