From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Wed, 12 Aug 2020 15:56:22 +0000 (+0200)
Subject: Make QTokenizer use simpler by having optional second parameter
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~235^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=97af14a4f025c7476fb539680b13e007471a3d88;p=nextcloud-desktop.git

Make QTokenizer use simpler by having optional second parameter

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
---

diff --git a/src/3rdparty/qtokenizer/qtokenizer.h b/src/3rdparty/qtokenizer/qtokenizer.h
index b8de15a7d..d8ca3d53f 100644
--- a/src/3rdparty/qtokenizer/qtokenizer.h
+++ b/src/3rdparty/qtokenizer/qtokenizer.h
@@ -110,7 +110,7 @@ struct QTokenizerPrivate {
     bool returnQuotes;
 };
 
-template <class T, class const_iterator>
+template <class T, class const_iterator = typename T::const_iterator>
 class QTokenizer {
 public:
     using char_type = typename T::value_type;
@@ -234,7 +234,7 @@ private:
     QSharedPointer<QTokenizerPrivate<T, const_iterator> > d;
 };
 
-class QStringTokenizer : public QTokenizer<QString, QString::const_iterator> {
+class QStringTokenizer : public QTokenizer<QString> {
 public:
     QStringTokenizer(const QString &string, const QString &delim) :
         QTokenizer<QString, QString::const_iterator>(string, delim) {}
@@ -253,9 +253,9 @@ public:
     }
 };
 
-using QByteArrayTokenizer = QTokenizer<QByteArray, QByteArray::const_iterator>;
-using StringTokenizer = QTokenizer<std::string, std::string::const_iterator>;
-using WStringTokenizer = QTokenizer<std::wstring, std::wstring::const_iterator>;
+using QByteArrayTokenizer = QTokenizer<QByteArray>;
+using StringTokenizer = QTokenizer<std::string>;
+using WStringTokenizer = QTokenizer<std::wstring>;
 
 QT_END_NAMESPACE