[Pkg-owncloud-commits] [owncloud-client] 394/470: QTokenizer: fix Qt4 build

Sandro Knauß hefee-guest at moszumanska.debian.org
Thu May 12 16:25:31 UTC 2016


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 4e7c09de83e855ebbc0b8014175d1f0bd20632b6
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Apr 26 10:38:20 2016 +0200

    QTokenizer: fix Qt4 build
    
    QSharedPointer::reset is new in Qt5
---
 src/3rdparty/qtokenizer/qtokenizer.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/3rdparty/qtokenizer/qtokenizer.h b/src/3rdparty/qtokenizer/qtokenizer.h
index e192a41..2c4b082 100644
--- a/src/3rdparty/qtokenizer/qtokenizer.h
+++ b/src/3rdparty/qtokenizer/qtokenizer.h
@@ -141,9 +141,9 @@ public:
 
        \sa QStringTokenizer, QByteArrayTokenizer, StringTokenizer, WStringTokenizer
      */
-    QTokenizer(const T& string, const T& delimiters) {
-        d.reset(new QTokenizerPrivate<T, const_iterator>(string, delimiters));
-    }
+    QTokenizer(const T& string, const T& delimiters)
+        : d(new QTokenizerPrivate<T, const_iterator>(string, delimiters))
+    { }
 
     /*!
        Whether or not to return delimiters as tokens

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



More information about the Pkg-owncloud-commits mailing list