[Pkg-owncloud-commits] [owncloud-client] 400/498: Account Capabilities: style fixup

[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 07ddf18b3b1e15ddc754c90fad2d0239e021a9d3
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Jul 29 12:05:00 2015 +0200

    Account Capabilities: style fixup
    
     - Remove the copy constructor. The default constructor is fine. Having
       a user defined copy constructor inhibit the move constructor.
     - Pass QVariantMap arguments via const references
     - Do not return a pointer to Capabilities from the account. It is a
       value type and should not be used by pointer.
---
 src/gui/sharedialog.cpp      | 8 ++++----
 src/libsync/account.cpp      | 4 ++--
 src/libsync/account.h        | 2 +-
 src/libsync/capabilities.cpp | 6 +-----
 src/libsync/capabilities.h   | 3 +--
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/gui/sharedialog.cpp b/src/gui/sharedialog.cpp
index a7642dc..16ea2df 100644
--- a/src/gui/sharedialog.cpp
+++ b/src/gui/sharedialog.cpp
@@ -147,15 +147,15 @@ ShareDialog::ShareDialog(AccountPtr account, const QString &sharePath, const QSt
     // Parse capabilities
 
     // If password is enforced make don't allow users to disable it
-    if (_account->capabilities()->publicLinkEnforcePassword()) {
+    if (_account->capabilities().publicLinkEnforcePassword()) {
         _ui->checkBox_password->setEnabled(false);
     }
 
     // If expiredate is enforced do not allow disable and set max days
-    if (_account->capabilities()->publicLinkEnforceExpireDate()) {
+    if (_account->capabilities().publicLinkEnforceExpireDate()) {
         _ui->checkBox_expire->setEnabled(false);
         _ui->calendar->setMaximumDate(QDate::currentDate().addDays(
-            _account->capabilities()->publicLinkExpireDateDays()
+            _account->capabilities().publicLinkExpireDateDays()
             ));
     }
 }
@@ -466,7 +466,7 @@ void ShareDialog::slotCheckBoxShareLinkClicked()
          * Check the capabilities if the server requires a password for a share
          * Ask for it directly
          */
-        if (_account->capabilities()->publicLinkEnforcePassword()) {
+        if (_account->capabilities().publicLinkEnforcePassword()) {
             _ui->checkBox_password->setChecked(true);
             _ui->checkBox_password->setEnabled(false);
             _ui->checkBox_password->setText(tr("Public sh&aring requires a password"));
diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index de94b0a..d0d59a8 100644
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -440,9 +440,9 @@ void Account::setMigrated(bool mig)
     _wasMigrated = mig;
 }
 
-const Capabilities * Account::capabilities() const
+const Capabilities &Account::capabilities() const
 {
-    return &_capabilities;
+    return _capabilities;
 }
 
 void Account::setCapabilities(const QVariantMap &caps)
diff --git a/src/libsync/account.h b/src/libsync/account.h
index a7201ce..60e096d 100644
--- a/src/libsync/account.h
+++ b/src/libsync/account.h
@@ -139,7 +139,7 @@ public:
     void setCertificate(const QByteArray certficate = QByteArray(), const QString privateKey = QString());
 
     void setCapabilities(const QVariantMap &caps);
-    const Capabilities * capabilities() const;
+    const Capabilities &capabilities() const;
     void setServerVersion(const QString &version);
     QString serverVersion();
 
diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp
index b1137b9..ed53505 100644
--- a/src/libsync/capabilities.cpp
+++ b/src/libsync/capabilities.cpp
@@ -18,11 +18,7 @@
 namespace OCC {
 
 
-Capabilities::Capabilities(const Capabilities &capabilities) {
-    _capabilities = capabilities._capabilities;
-}
-
-Capabilities::Capabilities(const QVariantMap capabilities)
+Capabilities::Capabilities(const QVariantMap &capabilities)
     : _capabilities(capabilities)
 {
 }
diff --git a/src/libsync/capabilities.h b/src/libsync/capabilities.h
index 548895d..fdf1acb 100644
--- a/src/libsync/capabilities.h
+++ b/src/libsync/capabilities.h
@@ -29,8 +29,7 @@ namespace OCC {
 class Capabilities {
 
 public:
-    Capabilities(const Capabilities& capabilities);
-    Capabilities(const QVariantMap capabilities);
+    Capabilities(const QVariantMap &capabilities);
 
     bool publicLinkEnforcePassword() const;
     bool publicLinkEnforceExpireDate() const;

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