[Pkg-owncloud-commits] [owncloud-client] 403/498: Fix compilation with old GCC

[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 795922e2a051a9437bca1923650f00946e2c628c
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Jul 30 10:44:07 2015 +0200

    Fix compilation with old GCC
    
    that does not understand nullptr
    
    Note that we can't just replace nullptr by 0 in createIndex otherwise
    it would be ambiguious.
    So leave it commented to show that your intention is to create it with
    a null pointer  (which is the default because of the default parameter)
---
 src/gui/folderstatusmodel.cpp | 4 ++--
 src/gui/sslbutton.cpp         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index a8c23f2..cf76aee 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -307,7 +307,7 @@ FolderStatusModel::SubFolderInfo* FolderStatusModel::infoForIndex(const QModelIn
 QModelIndex FolderStatusModel::index(int row, int column, const QModelIndex& parent) const
 {
     if (!parent.isValid()) {
-        return createIndex(row, column, nullptr);
+        return createIndex(row, column/*, nullptr*/);
     }
     switch(classify(parent)) {
         case AddButton: return QModelIndex();
@@ -342,7 +342,7 @@ QModelIndex FolderStatusModel::parent(const QModelIndex& child) const
     int i = 1;
     Q_ASSERT(pathIdx.at(0) < _folders.count());
     if (pathIdx.count() == 2) {
-        return createIndex(pathIdx.at(0), 0, nullptr);
+        return createIndex(pathIdx.at(0), 0/*, nullptr*/);
     }
 
     const SubFolderInfo *info = &_folders[pathIdx.at(0)];
diff --git a/src/gui/sslbutton.cpp b/src/gui/sslbutton.cpp
index 133c902..0ead755 100644
--- a/src/gui/sslbutton.cpp
+++ b/src/gui/sslbutton.cpp
@@ -194,7 +194,7 @@ void SslButton::updateAccountState(AccountState *accountState)
     } else {
         setIcon(QIcon(QPixmap(Theme::hidpiFileName(":/client/resources/lock-http.png"))));
         setToolTip(tr("This connection is NOT secure as it is not encrypted.\n"));
-        setMenu(nullptr);
+        setMenu(0);
     }
 }
 

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