API rename: ::client* -> ::booted*

The API documentation already reflected the real
meaning.

Change-Id: Ic2f042bb7c7368349adaf49e45e21c3c92c3866e
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>

6 files changed, 51 insertions, 51 deletions

diff --git a/src/imports/pluginmain.cpp b/src/imports/pluginmain.cpp
index 80947b0..19f237d 100644
--- a/src/imports/pluginmain.cpp
+++ b/src/imports/pluginmain.cpp
@@ -42,27 +42,27 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty string OTAClient::clientVersion
+    \qmlproperty string OTAClient::bootedVersion
     \readonly
 
     This is a convenience property that holds a string containing the booted
     system's version.
 
-    \sa clientInfo
+    \sa bootedInfo
 */
 
 /*!
-    \qmlproperty string OTAClient::clientDescription
+    \qmlproperty string OTAClient::bootedDescription
     \readonly
 
     This is a convenience property that holds a string containing the booted
     system's description.
 
-    \sa clientInfo
+    \sa bootedInfo
 */
 
 /*!
-    \qmlproperty string OTAClient::clientRevision
+    \qmlproperty string OTAClient::bootedRevision
     \readonly
 
     This property holds a string containing the booted system's revision
@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty string OTAClient::clientInfo
+    \qmlproperty string OTAClient::bootedInfo
     \readonly
 
     This property holds a JSON-formatted string containing the booted system's
diff --git a/src/lib/qotaclient.cpp b/src/lib/qotaclient.cpp
index a5d8abb..131e202 100644
--- a/src/lib/qotaclient.cpp
+++ b/src/lib/qotaclient.cpp
@@ -105,13 +105,13 @@ void QOTAClientPrivate::refreshState()
 {
     Q_Q(QOTAClient);
 
-    bool updateAvailable = m_defaultRev != m_serverRev && m_serverRev != m_clientRev;
+    bool updateAvailable = m_defaultRev != m_serverRev && m_serverRev != m_bootedRev;
     if (m_updateAvailable != updateAvailable) {
         m_updateAvailable = updateAvailable;
         emit q->updateAvailableChanged(m_updateAvailable);
     }
 
-    bool restartRequired = m_clientRev != m_defaultRev;
+    bool restartRequired = m_bootedRev != m_defaultRev;
     if (m_restartRequired != restartRequired) {
         m_restartRequired = restartRequired;
         emit q->restartRequiredChanged(m_restartRequired);
@@ -119,13 +119,13 @@ void QOTAClientPrivate::refreshState()
 }
 
 void QOTAClientPrivate::initializeFinished(const QString &defaultRev,
-                                           const QString &clientRev, const QJsonDocument &clientInfo,
+                                           const QString &bootedRev, const QJsonDocument &bootedInfo,
                                            const QString &serverRev, const QJsonDocument &serverInfo)
 {
     Q_Q(QOTAClient);
     m_defaultRev = defaultRev;
-    m_clientRev = clientRev;
-    updateInfoMembers(clientInfo, &m_clientInfo, &m_clientVersion, &m_clientDescription);
+    m_bootedRev = bootedRev;
+    updateInfoMembers(bootedInfo, &m_bootedInfo, &m_bootedVersion, &m_bootedDescription);
     updateServerInfo(serverRev, serverInfo);
     refreshState();
     m_initialized = true;
@@ -194,8 +194,8 @@ QString QOTAClientPrivate::version(QueryTarget target) const
         return QString();
 
     switch (target) {
-    case QueryTarget::Client:
-        return m_clientVersion.isEmpty() ? QStringLiteral("unknown") : m_clientVersion;
+    case QueryTarget::Booted:
+        return m_bootedVersion.isEmpty() ? QStringLiteral("unknown") : m_bootedVersion;
     case QueryTarget::Server:
         return m_serverVersion.isEmpty() ? QStringLiteral("unknown") : m_serverVersion;
     case QueryTarget::Rollback:
@@ -211,8 +211,8 @@ QByteArray QOTAClientPrivate::info(QueryTarget target) const
         return QByteArray();
 
     switch (target) {
-    case QueryTarget::Client:
-        return m_clientInfo;
+    case QueryTarget::Booted:
+        return m_bootedInfo;
     case QueryTarget::Server:
         return m_serverInfo;
     case QueryTarget::Rollback:
@@ -228,8 +228,8 @@ QString QOTAClientPrivate::description(QueryTarget target) const
         return QString();
 
     switch (target) {
-    case QueryTarget::Client:
-        return m_clientDescription.isEmpty() ? QStringLiteral("unknown") : m_clientDescription;
+    case QueryTarget::Booted:
+        return m_bootedDescription.isEmpty() ? QStringLiteral("unknown") : m_bootedDescription;
     case QueryTarget::Server:
         return m_serverDescription.isEmpty() ? QStringLiteral("unknown") : m_serverDescription;
     case QueryTarget::Rollback:
@@ -245,8 +245,8 @@ QString QOTAClientPrivate::revision(QueryTarget target) const
         return QString();
 
     switch (target) {
-    case QueryTarget::Client:
-        return m_clientRev.isEmpty() ? QStringLiteral("unknown") : m_clientRev;
+    case QueryTarget::Booted:
+        return m_bootedRev.isEmpty() ? QStringLiteral("unknown") : m_bootedRev;
     case QueryTarget::Server:
         return m_serverRev.isEmpty() ? QStringLiteral("unknown") : m_serverRev;
     case QueryTarget::Rollback:
@@ -563,52 +563,52 @@ bool QOTAClient::restartRequired() const
 }
 
 /*!
-    \property QOTAClient::clientVersion
+    \property QOTAClient::bootedVersion
     \brief a QString containing the booted system's version.
 
     This is a convenience method.
 
     \sa clientInfo
 */
-QString QOTAClient::clientVersion() const
+QString QOTAClient::bootedVersion() const
 {
-    return d_func()->version(QOTAClientPrivate::QueryTarget::Client);
+    return d_func()->version(QOTAClientPrivate::QueryTarget::Booted);
 }
 
 /*!
-    \property QOTAClient::clientDescription
+    \property QOTAClient::bootedDescription
     \brief a QString containing the booted system's description.
 
     This is a convenience method.
 
     \sa clientInfo
 */
-QString QOTAClient::clientDescription() const
+QString QOTAClient::bootedDescription() const
 {
-    return d_func()->description(QOTAClientPrivate::QueryTarget::Client);
+    return d_func()->description(QOTAClientPrivate::QueryTarget::Booted);
 }
 
 /*!
-    \property QOTAClient::clientRevision
+    \property QOTAClient::bootedRevision
     \brief a QString containing the booted system's revision.
 
-    A client revision is a checksum in the OSTree repository.
+    A booted revision is a checksum in the OSTree repository.
 */
-QString QOTAClient::clientRevision() const
+QString QOTAClient::bootedRevision() const
 {
-    return d_func()->revision(QOTAClientPrivate::QueryTarget::Client);
+    return d_func()->revision(QOTAClientPrivate::QueryTarget::Booted);
 }
 
 /*!
-    \property QOTAClient::clientInfo
+    \property QOTAClient::bootedInfo
     \brief a QByteArray containing the booted system's OTA metadata.
 
     Returns a JSON-formatted QByteArray containing OTA metadata for the booted
     system. Metadata is bundled with each system's version.
 */
-QByteArray QOTAClient::clientInfo() const
+QByteArray QOTAClient::bootedInfo() const
 {
-    return d_func()->info(QOTAClientPrivate::QueryTarget::Client);
+    return d_func()->info(QOTAClientPrivate::QueryTarget::Booted);
 }
 
 /*!
diff --git a/src/lib/qotaclient.h b/src/lib/qotaclient.h
index faa1a24..da772a8 100644
--- a/src/lib/qotaclient.h
+++ b/src/lib/qotaclient.h
@@ -47,10 +47,10 @@ class Q_DECL_EXPORT QOTAClient : public QObject
     Q_PROPERTY(bool restartRequired READ restartRequired NOTIFY restartRequiredChanged)
     Q_PROPERTY(QString error READ errorString NOTIFY errorOccurred)
     Q_PROPERTY(QString status READ statusString NOTIFY statusStringChanged)
-    Q_PROPERTY(QString clientVersion READ clientVersion NOTIFY initializationFinished)
-    Q_PROPERTY(QString clientDescription READ clientDescription NOTIFY initializationFinished)
-    Q_PROPERTY(QString clientRevision READ clientRevision NOTIFY initializationFinished)
-    Q_PROPERTY(QByteArray clientInfo READ clientInfo NOTIFY initializationFinished)
+    Q_PROPERTY(QString bootedVersion READ bootedVersion NOTIFY initializationFinished)
+    Q_PROPERTY(QString bootedDescription READ bootedDescription NOTIFY initializationFinished)
+    Q_PROPERTY(QString bootedRevision READ bootedRevision NOTIFY initializationFinished)
+    Q_PROPERTY(QByteArray bootedInfo READ bootedInfo NOTIFY initializationFinished)
     Q_PROPERTY(QString serverVersion READ serverVersion NOTIFY serverInfoChanged)
     Q_PROPERTY(QString serverDescription READ serverDescription NOTIFY serverInfoChanged)
     Q_PROPERTY(QString serverRevision READ serverRevision NOTIFY serverInfoChanged)
@@ -75,10 +75,10 @@ public:
     Q_INVOKABLE bool update() const;
     Q_INVOKABLE bool rollback() const;
 
-    QString clientVersion() const;
-    QString clientDescription() const;
-    QString clientRevision() const;
-    QByteArray clientInfo() const;
+    QString bootedVersion() const;
+    QString bootedDescription() const;
+    QString bootedRevision() const;
+    QByteArray bootedInfo() const;
 
     QString serverVersion() const;
     QString serverDescription() const;
diff --git a/src/lib/qotaclient_p.h b/src/lib/qotaclient_p.h
index 644c725..6ee2215 100644
--- a/src/lib/qotaclient_p.h
+++ b/src/lib/qotaclient_p.h
@@ -49,7 +49,7 @@ class QOTAClientPrivate : public QObject
 public:
     enum class QueryTarget
     {
-        Client,
+        Booted,
         Server,
         Rollback
     };
@@ -60,7 +60,7 @@ public:
 
     void refreshState();
     void initializeFinished(const QString &defaultRev,
-                            const QString &clientRev, const QJsonDocument &clientInfo,
+                            const QString &bootedRev, const QJsonDocument &bootedInfo,
                             const QString &serverRev, const QJsonDocument &serverInfo);
     void fetchServerInfoFinished(const QString &serverRev, const QJsonDocument &serverInfo, bool success);
     void updateFinished(const QString &defaultRev, bool success);
@@ -90,10 +90,10 @@ public:
     QScopedPointer<QOTAClientAsync> m_otaAsync;
     QString m_defaultRev;
 
-    QString m_clientVersion;
-    QString m_clientDescription;
-    QString m_clientRev;
-    QByteArray m_clientInfo;
+    QString m_bootedVersion;
+    QString m_bootedDescription;
+    QString m_bootedRev;
+    QByteArray m_bootedInfo;
 
     QString m_serverVersion;
     QString m_serverDescription;
diff --git a/src/lib/qotaclientasync.cpp b/src/lib/qotaclientasync.cpp
index 5e222b8..2ada18d 100644
--- a/src/lib/qotaclientasync.cpp
+++ b/src/lib/qotaclientasync.cpp
@@ -116,7 +116,7 @@ QJsonDocument QOTAClientAsync::info(QOTAClientPrivate::QueryTarget target, bool
 {
     QString jsonData;
     switch (target) {
-    case QOTAClientPrivate::QueryTarget::Client: {
+    case QOTAClientPrivate::QueryTarget::Booted: {
         QFile metadata(QStringLiteral("/usr/etc/qt-ota.json"));
         if (metadata.open(QFile::ReadOnly))
             jsonData = QString::fromLatin1(metadata.readAll());
@@ -172,16 +172,16 @@ void QOTAClientAsync::_initialize()
     ostree_sysroot_load (m_sysroot, 0, 0);
 
     OstreeDeployment *bootedDeployment = (OstreeDeployment*)ostree_sysroot_get_booted_deployment (m_sysroot);
-    QString clientRev = QLatin1String(ostree_deployment_get_csum (bootedDeployment));
+    QString bootedRev = QLatin1String(ostree_deployment_get_csum (bootedDeployment));
     bool ok = true;
-    QJsonDocument clientInfo = info(QOTAClientPrivate::QueryTarget::Client, &ok);
+    QJsonDocument bootedInfo = info(QOTAClientPrivate::QueryTarget::Booted, &ok);
     QString defaultRev = defaultRevision();
     // prepopulate with what we think is on the server (head of the local repo)
     QString serverRev = ostree(QStringLiteral("ostree rev-parse linux/qt"), &ok);
     QJsonDocument serverInfo = info(QOTAClientPrivate::QueryTarget::Server, &ok, serverRev);
 
     refreshRollbackState();
-    emit initializeFinished(defaultRev, clientRev, clientInfo, serverRev, serverInfo);
+    emit initializeFinished(defaultRev, bootedRev, bootedInfo, serverRev, serverInfo);
     multiprocessUnlock();
 }
 
diff --git a/src/lib/qotaclientasync_p.h b/src/lib/qotaclientasync_p.h
index 4191e6f..3929316 100644
--- a/src/lib/qotaclientasync_p.h
+++ b/src/lib/qotaclientasync_p.h
@@ -50,7 +50,7 @@ public:
 signals:
     void initialize();
     void initializeFinished(const QString &defaultRev,
-                            const QString &clientRev, const QJsonDocument &clientInfo,
+                            const QString &bootedRev, const QJsonDocument &bootedInfo,
                             const QString &serverRev, const QJsonDocument &serverInfo);
     void fetchServerInfo();
     void fetchServerInfoFinished(const QString &serverRev, const QJsonDocument &serverInfo, bool success);