[Pkg-owncloud-commits] [owncloud-client] 118/498: multi-account: compile with Qt4

[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 e587c8e2dc897a9f092b47cb06cbb6597e4aee32
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Jun 2 19:57:41 2015 +0200

    multi-account: compile with Qt4
---
 src/gui/folderstatusmodel.cpp |  2 +-
 src/gui/folderstatusmodel.h   | 10 ++++++----
 src/gui/settingsdialog.cpp    |  6 +++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index ec1b74c..ad1226f 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -222,7 +222,7 @@ bool FolderStatusModel::setData(const QModelIndex& index, const QVariant& value,
         }
         _dirty = true;
         emit dirtyChanged();
-        dataChanged(index, index, QVector<int>() << role);
+        emit dataChanged(index, index, QVector<int>() << role);
         return true;
     }
     return QAbstractItemModel::setData(index, value, role);
diff --git a/src/gui/folderstatusmodel.h b/src/gui/folderstatusmodel.h
index 650a4aa..2d8f713 100644
--- a/src/gui/folderstatusmodel.h
+++ b/src/gui/folderstatusmodel.h
@@ -19,10 +19,6 @@
 #include <QStandardItemModel>
 #include <accountfwd.h>
 
-#ifndef Q_DECL_OVERRIDE
-#define Q_DECL_OVERRIDE
-#endif
-
 namespace OCC {
 
 class Folder;
@@ -96,6 +92,12 @@ private:
     AccountPtr _account;
     bool _dirty = false;  // If the selective sync checkboxes were changed
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    //the roles argument was added in Qt5
+    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>())
+    { emit QAbstractItemModel::dataChanged(topLeft,bottomRight); }
+#endif
+
 signals:
     void dirtyChanged();
 };
diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index a5bf908..768995e 100644
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -166,7 +166,11 @@ void SettingsDialog::accountAdded(AccountState *s)
     _ui->stack->insertWidget(0 , accountSettings);
     _actions.insert(accountAction, accountSettings);
 
-    auto group = findChild<QActionGroup*>(QString(), Qt::FindDirectChildrenOnly);
+    auto group = findChild<QActionGroup*>(
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+                    QString() , Qt::FindDirectChildrenOnly
+#endif
+        );
     Q_ASSERT(group);
     group->addAction(accountAction);
 

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