[Pkg-owncloud-commits] [owncloud-client] 80/484: OCSJob -> OcsJob and more docs

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit db1f4d4016dbd979ed7b7fdca069628c58dcd44f
Author: Roeland Jago Douma <rullzer at owncloud.com>
Date:   Thu Oct 15 20:54:52 2015 +0200

    OCSJob -> OcsJob and more docs
---
 src/gui/ocsjob.cpp      | 20 ++++++++++----------
 src/gui/ocsjob.h        |  9 +++++++--
 src/gui/ocssharejob.cpp |  4 ++--
 src/gui/ocssharejob.h   |  5 ++++-
 src/gui/sharedialog.cpp |  2 +-
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/gui/ocsjob.cpp b/src/gui/ocsjob.cpp
index 19bf1e4..f9e86b6 100644
--- a/src/gui/ocsjob.cpp
+++ b/src/gui/ocsjob.cpp
@@ -20,42 +20,42 @@
 
 namespace OCC {
 
-OCSJob::OCSJob(AccountPtr account, QObject* parent)
+OcsJob::OcsJob(AccountPtr account, QObject* parent)
 : AbstractNetworkJob(account, "", parent)
 {
     _passStatusCodes.append(100);
     setIgnoreCredentialFailure(true);
 }
 
-void OCSJob::setVerb(const QByteArray &verb)
+void OcsJob::setVerb(const QByteArray &verb)
 {
     _verb = verb;
 }
 
-void OCSJob::setUrl(const QUrl &url)
+void OcsJob::setUrl(const QUrl &url)
 {
     _url = url;
 }
 
-void OCSJob::setGetParams(const QList<QPair<QString, QString> >& getParams)
+void OcsJob::setGetParams(const QList<QPair<QString, QString> >& getParams)
 {
     _url.setQueryItems(getParams);
 }
 
-void OCSJob::setPostParams(const QList<QPair<QString, QString> >& postParams)
+void OcsJob::setPostParams(const QList<QPair<QString, QString> >& postParams)
 {
     _postParams = postParams;
 }
 
-void OCSJob::addPassStatusCode(int code)
+void OcsJob::addPassStatusCode(int code)
 {
     _passStatusCodes.append(code);
 }
 
-void OCSJob::start()
+void OcsJob::start()
 {
     QNetworkRequest req;
-    req.setRawHeader("OCS-APIREQUEST", "true");
+    req.setRawHeader("Ocs-APIREQUEST", "true");
     req.setRawHeader("Content-Type", "application/x-www-form-urlencoded");
 
     // Url encode the _postParams and put them in a buffer.
@@ -81,7 +81,7 @@ void OCSJob::start()
     AbstractNetworkJob::start();
 }
 
-bool OCSJob::finished()
+bool OcsJob::finished()
 {
     const QString replyData = reply()->readAll();
 
@@ -103,7 +103,7 @@ bool OCSJob::finished()
     return true;
 }
 
-int OCSJob::getJsonReturnCode(const QVariantMap &json, QString &message)
+int OcsJob::getJsonReturnCode(const QVariantMap &json, QString &message)
 {
     //TODO proper checking
     int code = json.value("ocs").toMap().value("meta").toMap().value("statuscode").toInt();
diff --git a/src/gui/ocsjob.h b/src/gui/ocsjob.h
index fe7752c..dc6c95d 100644
--- a/src/gui/ocsjob.h
+++ b/src/gui/ocsjob.h
@@ -27,13 +27,18 @@ namespace OCC {
 /**
  * @brief The OcsShareJob class
  * @ingroup gui
+ *
+ * Base class for jobs that talk to the OCS endpoints on the server.
+ * All the comminication logic is handled in this class.
+ *
+ * All OCS jobs (e.g. sharing) should extend this class.
  */
-class OCSJob : public AbstractNetworkJob {
+class OcsJob : public AbstractNetworkJob {
     Q_OBJECT
 
 protected:
 
-    explicit OCSJob(AccountPtr account, QObject* parent = 0);
+    explicit OcsJob(AccountPtr account, QObject* parent = 0);
 
     /**
      * Set the verb for the job
diff --git a/src/gui/ocssharejob.cpp b/src/gui/ocssharejob.cpp
index 5df074b..b809f07 100644
--- a/src/gui/ocssharejob.cpp
+++ b/src/gui/ocssharejob.cpp
@@ -21,13 +21,13 @@
 namespace OCC {
 
 OcsShareJob::OcsShareJob(AccountPtr account, QObject* parent)
-: OCSJob(account, parent)
+: OcsJob(account, parent)
 {
     setUrl(Account::concatUrlPath(account->url(), QString("ocs/v1.php/apps/files_sharing/api/v1/shares")));
 }
 
 OcsShareJob::OcsShareJob(int shareId, AccountPtr account, QObject* parent)
-: OCSJob(account, parent)
+: OcsJob(account, parent)
 {
     setUrl(Account::concatUrlPath(account->url(), QString("ocs/v1.php/apps/files_sharing/api/v1/shares/%1").arg(shareId)));
 }
diff --git a/src/gui/ocssharejob.h b/src/gui/ocssharejob.h
index ed216cc..135481b 100644
--- a/src/gui/ocssharejob.h
+++ b/src/gui/ocssharejob.h
@@ -24,8 +24,11 @@ namespace OCC {
 /**
  * @brief The OcsShareJob class
  * @ingroup gui
+ *
+ * Handle talking to the OCS Share API. 
+ * For creation, deletion and modification of shares.
  */
-class OcsShareJob : public OCSJob {
+class OcsShareJob : public OcsJob {
     Q_OBJECT
 public:
 
diff --git a/src/gui/sharedialog.cpp b/src/gui/sharedialog.cpp
index 76af797..f58149a 100644
--- a/src/gui/sharedialog.cpp
+++ b/src/gui/sharedialog.cpp
@@ -201,7 +201,7 @@ void ShareDialog::setExpireDate(const QDate &date)
 void ShareDialog::slotExpireSet(const QVariantMap &reply)
 {
     QString message;
-    int code = OCSJob::getJsonReturnCode(reply, message);
+    int code = OcsShareJob::getJsonReturnCode(reply, message);
     if (code != 100) {
         displayError(code);
     } 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git