Merge remote-tracking branch 'origin/master' into new-ui

.travis.yml

@@ -0,0 +1,31 @@
+language: cpp
+branches:
+  only:
+  - coverity_scan 
+
+before_install:
+- sudo sh -c "echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- sudo sh -c "echo 'deb-src http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.04/ /' >> /etc/apt/sources.list.d/owncloud-client.list"
+- wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/xUbuntu_12.04/Release.key
+- sudo apt-key add - < Release.key
+- sudo apt-get update
+- sudo apt-get build-dep owncloud-client
+- checkout=$(git show-ref --head --hash head)
+- cd ../
+- wget https://scan.coverity.com/download/linux-64 --post-data "token=$token&project=owncloud%2Fmirall" -O coverity_tool.tgz
+- mkdir coverity
+- tar -xvf coverity_tool.tgz -C coverity --strip-components=1
+- export PATH=$PATH:$PWD/coverity/bin/
+- cd $TRAVIS_BUILD_DIR
+
+install:
+- cd ../
+- mkdir client-build
+- cd client-build
+- cmake -DCMAKE_BUILD_TYPE="Debug" $TRAVIS_BUILD_DIR
+- cov-build --dir cov-int make
+- tar czvf client.tgz cov-int 
+- curl --form token=$token --form email=lukas@statuscode.ch --form file=@$PWD/client.tgz --form version="$checkout" --form description="$checkout" https://scan.coverity.com/builds?project=owncloud%2Fmirall
+
+# Hack to stop processing
+script: true

src/gui/socketapi.cpp

@@ -491,7 +491,7 @@ SqlQuery* SocketApi::getSqlQuery( Folder *folder )
         if( db && db->openReadOnly(dbFileName) ) {
             _openDbs.insert(folder, db);
 
-            auto query = QSharedPointer<SqlQuery>::create(*db);
+            QSharedPointer<SqlQuery> query(new SqlQuery(*db));
             rc = query->prepare(sql);
 
             if( rc != SQLITE_OK ) {

src/libsync/discoveryphase.h

@@ -105,9 +105,9 @@ class DiscoveryMainThread : public QObject {
     qint64 *_currentGetSizeResult;
 
 public:
-    DiscoveryMainThread(AccountPtr account) : QObject(), _account(account), _currentDiscoveryDirectoryResult(0) {
-
-    }
+    DiscoveryMainThread(AccountPtr account) : QObject(), _account(account),
+        _currentDiscoveryDirectoryResult(0), _currentGetSizeResult(0)
+    { }
     void abort();
 
 
@@ -168,7 +168,7 @@ class DiscoveryJob : public QObject {
 
 public:
     explicit DiscoveryJob(CSYNC *ctx, QObject* parent = 0)
-            : QObject(parent), _csync_ctx(ctx) {
+            : QObject(parent), _csync_ctx(ctx), _newSharedFolderSizeLimit(-1) {
         // We need to forward the log property as csync uses thread local
         // and updates run in another thread
         _log_callback = csync_get_log_callback();
@@ -178,7 +178,7 @@ public:
 
     QStringList _selectiveSyncBlackList;
     QStringList _selectiveSyncWhiteList;
-    qint64 _newSharedFolderSizeLimit = 0;
+    qint64 _newSharedFolderSizeLimit;
     Q_INVOKABLE void start();
 signals:
     void finished(int result);

src/libsync/syncengine.cpp

@@ -70,6 +70,7 @@ SyncEngine::SyncEngine(AccountPtr account, CSYNC *ctx, const QString& localPath,
   , _hasRemoveFile(false)
   , _uploadLimit(0)
   , _downloadLimit(0)
+  , _newSharedFolderSizeLimit(-1)
   , _anotherSyncNeeded(false)
 {
     qRegisterMetaType<SyncFileItem>("SyncFileItem");

src/libsync/syncengine.h

@@ -203,7 +203,7 @@ private:
     int _uploadLimit;
     int _downloadLimit;
     /* maximum size a shared folder can have without asking for confirmation: -1 means infinite */
-    qint64 _newSharedFolderSizeLimit = -1;
+    qint64 _newSharedFolderSizeLimit;
 
     // hash containing the permissions on the remote directory
     QHash<QString, QByteArray> _remotePerms;