From a9aa206b7b8ac4e69f8c46233b4080e00e845ff5 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 27 May 2019 19:13:54 +0200 Subject: Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer --- src/corelib/tools/qstring_compat.cpp | 112 ----------------------------------- 1 file changed, 112 deletions(-) delete mode 100644 src/corelib/tools/qstring_compat.cpp (limited to 'src/corelib/tools/qstring_compat.cpp') diff --git a/src/corelib/tools/qstring_compat.cpp b/src/corelib/tools/qstring_compat.cpp deleted file mode 100644 index 45bb816e4b..0000000000 --- a/src/corelib/tools/qstring_compat.cpp +++ /dev/null @@ -1,112 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Intel Corporation. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#if defined(QSTRING_H) || defined(QBYTEARRAY_H) -# error "This file cannot be compiled with pre-compiled headers" -#endif -#define QT_COMPILING_QSTRING_COMPAT_CPP - -#include "qbytearray.h" -#include "qstring.h" - -QT_BEGIN_NAMESPACE - -// all these implementations must be the same as the inline versions in qstring.h -QString QString::trimmed() const -{ - return trimmed_helper(*this); -} - -QString QString::simplified() const -{ - return simplified_helper(*this); -} - -QString QString::toLower() const -{ - return toLower_helper(*this); -} - -QString QString::toCaseFolded() const -{ - return toCaseFolded_helper(*this); -} - -QString QString::toUpper() const -{ - return toUpper_helper(*this); -} - -QByteArray QString::toLatin1() const -{ - return toLatin1_helper(*this); -} - -QByteArray QString::toLocal8Bit() const -{ - return toLocal8Bit_helper(isNull() ? nullptr : constData(), size()); -} - -QByteArray QString::toUtf8() const -{ - return toUtf8_helper(*this); -} - -// ditto, for qbytearray.h (because we're lazy) -QByteArray QByteArray::toLower() const -{ - return toLower_helper(*this); -} - -QByteArray QByteArray::toUpper() const -{ - return toUpper_helper(*this); -} - -QByteArray QByteArray::trimmed() const -{ - return trimmed_helper(*this); -} - -QByteArray QByteArray::simplified() const -{ - return simplified_helper(*this); -} - -QT_END_NAMESPACE -- cgit v1.2.3