[Pkg-owncloud-commits] [owncloud-client] 164/498: Fix coverity build which does not support nsdmi

[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 0cfc518c338a69698000b3e0620f8785aa9f9902
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Jun 16 09:30:29 2015 +0200

    Fix coverity build which does not support nsdmi
---
 src/gui/folderman.cpp         |  2 +-
 src/gui/folderstatusmodel.cpp |  2 +-
 src/gui/folderstatusmodel.h   | 22 +++++++++++++---------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 69efeac..a793c04 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -53,7 +53,7 @@ static qint64 msBetweenRequestAndSync = 2000;
 
 FolderMan::FolderMan(QObject *parent) :
     QObject(parent),
-    _currentSyncFolder(0)
+    _currentSyncFolder(0),
     _syncEnabled( true )
 {
     Q_ASSERT(!_instance);
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index e62d2da..7604749 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -29,7 +29,7 @@ namespace OCC {
 static const char propertyParentIndexC[] = "oc_parentIndex";
 
 FolderStatusModel::FolderStatusModel(QObject *parent)
-    :QAbstractItemModel(parent)
+    :QAbstractItemModel(parent), _dirty(false)
 {
 }
 
diff --git a/src/gui/folderstatusmodel.h b/src/gui/folderstatusmodel.h
index 0f3be4c..60db329 100644
--- a/src/gui/folderstatusmodel.h
+++ b/src/gui/folderstatusmodel.h
@@ -45,24 +45,28 @@ public:
 
 
     struct SubFolderInfo {
-        Folder *_folder = nullptr;
+        SubFolderInfo()
+            : _folder(0), _size(0), _fetched(false), _fetching(false), _isUndecided(false),
+            _checked(Qt::Checked) {}
+        Folder *_folder;
         QString _name;
         QString _path;
         QVector<int> _pathIdx;
         QVector<SubFolderInfo> _subs;
-        int _size = 0;
-        bool _fetched = false; // If we did the LSCOL for this folder already
-        bool _fetching = false;
-        bool _isUndecided = false; // undecided folder are the big folder that the user has not accepted yet
-        Qt::CheckState _checked = Qt::Checked;
+        int _size;
+        bool _fetched; // If we did the LSCOL for this folder already
+        bool _fetching;
+        bool _isUndecided; // undecided folder are the big folder that the user has not accepted yet
+        Qt::CheckState _checked;
 
         struct Progress {
+            Progress() : _warningCount(0), _overallPercent(0) {}
             bool isNull() const
             { return _progressString.isEmpty() && _warningCount == 0 && _overallSyncString.isEmpty(); }
             QString _progressString;
             QString _overallSyncString;
-            int _warningCount = 0;
-            int _overallPercent = 0;
+            int _warningCount;
+            int _overallPercent;
         };
         Progress _progress;
     };
@@ -92,7 +96,7 @@ private:
     QStringList createBlackList(OCC::FolderStatusModel::SubFolderInfo* root,
                                 const QStringList& oldBlackList) const;
     AccountPtr _account;
-    bool _dirty = false;  // If the selective sync checkboxes were changed
+    bool _dirty;  // If the selective sync checkboxes were changed
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     //the roles argument was added in Qt5

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