From 7b46ec16017d5b467b2b04e9d7e27ce1cee8659e Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Tue, 28 Jun 2011 23:19:29 +0200
Subject: remove QT3_SUPPORT from corelib/tools

Change-Id: Ie224cf992be675c7d405d4be05e4acd4157e590e
Reviewed-on: http://codereview.qt.nokia.com/863
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
---
 src/corelib/tools/qstringlist.h | 51 -----------------------------------------
 1 file changed, 51 deletions(-)

(limited to 'src/corelib/tools/qstringlist.h')

diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h
index 2159512b20..efb7f46c9b 100644
--- a/src/corelib/tools/qstringlist.h
+++ b/src/corelib/tools/qstringlist.h
@@ -48,9 +48,6 @@
 #include <QtCore/qregexp.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstringmatcher.h>
-#ifdef QT_INCLUDE_COMPAT
-#include <Qt3Support/q3valuelist.h>
-#endif
 
 QT_BEGIN_HEADER
 
@@ -108,24 +105,6 @@ public:
     inline int lastIndexOf(const QString &str, int from = -1) const
     { return QList<QString>::lastIndexOf(str, from); }
 #endif
-#ifdef QT3_SUPPORT
-    static inline QT3_SUPPORT QStringList split(const QString &sep, const QString &str, bool allowEmptyEntries = false);
-    static inline QT3_SUPPORT QStringList split(const QChar &sep, const QString &str, bool allowEmptyEntries = false);
-    inline QT3_SUPPORT QStringList grep(const QString &str, bool cs = true) const
-        { return filter(str, cs ? Qt::CaseSensitive : Qt::CaseInsensitive); }
-
-#ifndef QT_NO_REGEXP
-    static inline QT3_SUPPORT QStringList split(const QRegExp &sep, const QString &str, bool allowEmptyEntries = false);
-    inline QT3_SUPPORT QStringList grep(const QRegExp &rx) const { return filter(rx); }
-    inline QT3_SUPPORT QStringList &gres(const QRegExp &rx, const QString &after)
-        { return replaceInStrings(rx, after); }
-#endif
-    inline QT3_SUPPORT QStringList &gres(const QString &before, const QString &after, bool cs = true)
-        { return replaceInStrings(before, after, cs ? Qt::CaseSensitive : Qt::CaseInsensitive); }
-
-    inline Iterator QT3_SUPPORT fromLast() { return (isEmpty() ? end() : --end()); }
-    inline ConstIterator QT3_SUPPORT fromLast() const { return (isEmpty() ? end() : --end()); }
-#endif
 };
 
 namespace QtPrivate {
@@ -214,36 +193,6 @@ inline int QStringList::lastIndexOf(QRegExp &rx, int from) const
 #endif
 
 
-#ifdef QT3_SUPPORT
-inline QStringList QStringList::split(const QChar &sep, const QString &str, bool allowEmptyEntries)
-{
-    if (str.isEmpty())
-        return QStringList();
-    return str.split(sep, allowEmptyEntries ? QString::KeepEmptyParts
-                                            : QString::SkipEmptyParts);
-}
-
-inline QStringList QStringList::split(const QString &sep, const QString &str, bool allowEmptyEntries)
-{
-    if (str.isEmpty())
-        return QStringList();
-    return str.split(sep, allowEmptyEntries ? QString::KeepEmptyParts
-                                            : QString::SkipEmptyParts);
-}
-
-#ifndef QT_NO_REGEXP
-inline QStringList QStringList::split(const QRegExp &sep, const QString &str, bool allowEmptyEntries)
-{
-    if (str.isEmpty())
-        return QStringList();
-    return str.split(sep, allowEmptyEntries ? QString::KeepEmptyParts
-                                            : QString::SkipEmptyParts);
-}
-#endif // QT_NO_REGEXP
-
-#endif // QT3_SUPPORT
-
-
 #ifndef QT_NO_DATASTREAM
 inline QDataStream &operator>>(QDataStream &in, QStringList &list)
 {
-- 
cgit v1.2.3