4 files changed, 0 insertions, 52 deletions
diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h
index c7b83a98cc..a49ae2fd9d 100644
--- a/src/corelib/tools/qbytearraymatcher.h
+++ b/src/corelib/tools/qbytearraymatcher.h
@@ -66,11 +66,6 @@ public:
 private:
     QByteArrayMatcherPrivate *d;
     QByteArray q_pattern;
-#ifdef Q_CC_RVCT
-// explicitly allow anonymous unions for RVCT to prevent compiler warnings
-#  pragma push
-#  pragma anon_unions
-#endif
     struct Data {
         uchar q_skiptable[256];
         const uchar *p;
@@ -80,9 +75,6 @@ private:
         uint dummy[256];
         Data p;
     };
-#ifdef Q_CC_RVCT
-#  pragma pop
-#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h
index 771e81c8f4..325799d165 100644
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
@@ -977,29 +977,11 @@ public:
     inline QMultiHash operator+(const QMultiHash &other) const
     { QMultiHash result = *this; result += other; return result; }
 
-#if !defined(Q_CC_RVCT)
-    // RVCT compiler doesn't handle using-keyword right when used functions are overloaded in child class
     using QHash<Key, T>::contains;
     using QHash<Key, T>::remove;
     using QHash<Key, T>::count;
     using QHash<Key, T>::find;
     using QHash<Key, T>::constFind;
-#else
-    inline bool contains(const Key &key) const
-    { return QHash<Key, T>::contains(key); }
-    inline int remove(const Key &key)
-    { return QHash<Key, T>::remove(key); }
-    inline int count(const Key &key) const
-    { return QHash<Key, T>::count(key); }
-    inline int count() const
-    { return QHash<Key, T>::count(); }
-    inline typename QHash<Key, T>::iterator find(const Key &key)
-    { return QHash<Key, T>::find(key); }
-    inline typename QHash<Key, T>::const_iterator find(const Key &key) const
-    { return QHash<Key, T>::find(key); }
-    inline typename QHash<Key, T>::const_iterator constFind(const Key &key) const
-    { return QHash<Key, T>::constFind(key); }
-#endif
 
     bool contains(const Key &key, const T &value) const;
 
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h
index ce550c540b..4b1fc65b22 100644
--- a/src/corelib/tools/qmap.h
+++ b/src/corelib/tools/qmap.h
@@ -1157,29 +1157,11 @@ public:
     inline QMultiMap operator+(const QMultiMap &other) const
     { QMultiMap result = *this; result += other; return result; }
 
-#if !defined(Q_CC_RVCT)
-    // RVCT compiler doesn't handle using-keyword right when used functions are overloaded in child class
     using QMap<Key, T>::contains;
     using QMap<Key, T>::remove;
     using QMap<Key, T>::count;
     using QMap<Key, T>::find;
     using QMap<Key, T>::constFind;
-#else
-    inline bool contains(const Key &key) const
-    { return QMap<Key, T>::contains(key); }
-    inline int remove(const Key &key)
-    { return QMap<Key, T>::remove(key); }
-    inline int count(const Key &key) const
-    { return QMap<Key, T>::count(key); }
-    inline int count() const
-    { return QMap<Key, T>::count(); }
-    inline typename QMap<Key, T>::iterator find(const Key &key)
-    { return QMap<Key, T>::find(key); }
-    inline typename QMap<Key, T>::const_iterator find(const Key &key) const
-    { return QMap<Key, T>::find(key); }
-    inline typename QMap<Key, T>::const_iterator constFind(const Key &key) const
-    { return QMap<Key, T>::constFind(key); }
-#endif
 
     bool contains(const Key &key, const T &value) const;
 
diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/tools/qstringmatcher.h
index 00e5fc1587..d416831434 100644
--- a/src/corelib/tools/qstringmatcher.h
+++ b/src/corelib/tools/qstringmatcher.h
@@ -66,11 +66,6 @@ private:
     QStringMatcherPrivate *d_ptr;
     QString q_pattern;
     Qt::CaseSensitivity q_cs;
-#ifdef Q_CC_RVCT
-// explicitly allow anonymous unions for RVCT to prevent compiler warnings
-#  pragma push
-#  pragma anon_unions
-#endif
     struct Data {
         uchar q_skiptable[256];
         const QChar *uc;
@@ -80,9 +75,6 @@ private:
         uint q_data[256];
         Data p;
     };
-#ifdef Q_CC_RVCT
-#  pragma pop
-#endif
 };
 
 QT_END_NAMESPACE