diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 13:55:40 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 14:08:02 +0200 |
commit | 314fdbce8ce473eb3610be3658c61fab2fac0efb (patch) | |
tree | 98a24a6f53ea8d6a7f3fc6ad60ab84dd66ae2863 /src/corelib/tools/qstringlist.h | |
parent | 8d7647e286e07690de15a6ff9189307ee1a3517c (diff) | |
parent | 83736a8d06a6ca2a1f165d6119ddaca90646e1f8 (diff) |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
config.tests/unix/opengldesktop/opengldesktop.cpp
examples/itemviews/interview/interview.pro
examples/mainwindows/mainwindow/mainwindow.pro
examples/openvg/README
examples/richtext/textedit/textedit.pro
examples/tools/undo/undo.pro
src/corelib/global/qglobal.h
src/corelib/kernel/qcoreapplication.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qmetatype.h
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/gui/text/qfontdatabase.cpp
src/opengl/qgl.h
src/openvg/qpaintengine_vg.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
tests/auto/qmainwindow/qmainwindow.pro
Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
Diffstat (limited to 'src/corelib/tools/qstringlist.h')
-rw-r--r-- | src/corelib/tools/qstringlist.h | 51 |
1 files changed, 0 insertions, 51 deletions
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) { |