From 52c253fa33162c1db2d0cb0916e0de188b9a0aae Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Thu, 23 Feb 2012 00:22:59 +0100
Subject: Remove QT_ASCII_CAST_WARN_CONSTRUCTOR

GCC version < 3 which it was created for is not supported anymore.

Change-Id: I0b4df4c99600cacbaafbf0bc4270cd4978600956
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/global/qglobal.h  | 7 -------
 src/corelib/kernel/qvariant.h | 2 +-
 src/corelib/tools/qchar.h     | 4 ++--
 src/corelib/tools/qstring.h   | 4 ++--
 4 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 485f08bfce..e7a6b59f2e 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -385,15 +385,8 @@ QT_END_INCLUDE_NAMESPACE
 
 #ifdef QT_ASCII_CAST_WARNINGS
 #  define QT_ASCII_CAST_WARN Q_DECL_DEPRECATED
-#  if defined(Q_CC_GNU) && __GNUC__ < 4
-     /* gcc < 4 doesn't like Q_DECL_DEPRECATED in front of constructors */
-#    define QT_ASCII_CAST_WARN_CONSTRUCTOR
-#  else
-#    define QT_ASCII_CAST_WARN_CONSTRUCTOR Q_DECL_CONSTRUCTOR_DEPRECATED
-#  endif
 #else
 #  define QT_ASCII_CAST_WARN
-#  define QT_ASCII_CAST_WARN_CONSTRUCTOR
 #endif
 
 #if defined(__i386__) || defined(_WIN32) || defined(_WIN32_WCE)
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 5fcfe3e696..20d3946ea1 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -210,7 +210,7 @@ class Q_CORE_EXPORT QVariant
     QVariant(double d);
     QVariant(float f) { d.is_null = false; d.type = QMetaType::Float; d.data.f = f; }
 #ifndef QT_NO_CAST_FROM_ASCII
-    QT_ASCII_CAST_WARN_CONSTRUCTOR QVariant(const char *str);
+    QT_ASCII_CAST_WARN QVariant(const char *str);
 #endif
 
     QVariant(const QByteArray &bytearray);
diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h
index d55fcdba89..3209ffb0f2 100644
--- a/src/corelib/tools/qchar.h
+++ b/src/corelib/tools/qchar.h
@@ -86,8 +86,8 @@ public:
     Q_DECL_CONSTEXPR QChar(QLatin1Char ch) : ucs(ch.unicode()) {} // implicit
 
 #ifndef QT_NO_CAST_FROM_ASCII
-    QT_ASCII_CAST_WARN_CONSTRUCTOR Q_DECL_CONSTEXPR explicit QChar(char c) : ucs(uchar(c)) { }
-    QT_ASCII_CAST_WARN_CONSTRUCTOR Q_DECL_CONSTEXPR explicit QChar(uchar c) : ucs(c) { }
+    QT_ASCII_CAST_WARN Q_DECL_CONSTEXPR explicit QChar(char c) : ucs(uchar(c)) { }
+    QT_ASCII_CAST_WARN Q_DECL_CONSTEXPR explicit QChar(uchar c) : ucs(c) { }
 #endif
     // Unicode information
 
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index f49d989e9d..b1ade85a30 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@ -498,10 +498,10 @@ public:
 
     // ASCII compatibility
 #ifndef QT_NO_CAST_FROM_ASCII
-    inline QT_ASCII_CAST_WARN_CONSTRUCTOR QString(const char *ch)
+    inline QT_ASCII_CAST_WARN QString(const char *ch)
         : d(fromAscii_helper(ch, ch ? int(strlen(ch)) : -1))
     {}
-    inline QT_ASCII_CAST_WARN_CONSTRUCTOR QString(const QByteArray &a)
+    inline QT_ASCII_CAST_WARN QString(const QByteArray &a)
         : d(fromAscii_helper(a.constData(), qstrnlen(a.constData(), a.size())))
     {}
     inline QT_ASCII_CAST_WARN QString &operator=(const char *ch)
-- 
cgit v1.2.3