7 files changed, 2 insertions, 95 deletions
diff --git a/src/compat/ntqarray.h b/src/compat/ntqarray.h
deleted file mode 100644
index 4f266e542..000000000
--- a/src/compat/ntqarray.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/****************************************************************************
-**
-** Compatibility file - should only be included by legacy code.
-** It #includes the file which obsoletes this one.
-**
-** Copyright (C) 1998-2008 Trolltech ASA.  All rights reserved.
-**  This file is part of the TQt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech ASA of Norway and appearing in the file
-** LICENSE.TQPL included in the packaging of this file.
-**
-** Licensees holding valid TQt Professional Edition licenses may use this
-** file in accordance with the TQt Professional Edition License Agreement
-** provided with the TQt Professional Edition.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about the Professional Edition licensing, or see
-** http://www.trolltech.com/qpl/ for TQPL licensing information.
-**
-*****************************************************************************/
-#ifndef TQARRAY_H
-#define TQARRAY_H
-#ifndef TQT_NO_COMPAT
-#include "ntqmemarray.h"
-#endif
-#endif
diff --git a/src/compat/ntqcollection.h b/src/compat/ntqcollection.h
deleted file mode 100644
index d285b6d40..000000000
--- a/src/compat/ntqcollection.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/****************************************************************************
-**
-** Compatibility file - should only be included by legacy code.
-** It #includes the file which obsoletes this one.
-**
-** Copyright (C) 1998-2008 Trolltech ASA.  All rights reserved.
-**  This file is part of the TQt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech ASA of Norway and appearing in the file
-** LICENSE.TQPL included in the packaging of this file.
-**
-** Licensees holding valid TQt Professional Edition licenses may use this
-** file in accordance with the TQt Professional Edition License Agreement
-** provided with the TQt Professional Edition.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about the Professional Edition licensing, or see
-** http://www.trolltech.com/qpl/ for TQPL licensing information.
-**
-*****************************************************************************/
-#ifndef TQCOLLECTION_H
-#define TQCOLLECTION_H
-#ifndef TQT_NO_COMPAT
-#include "ntqptrcollection.h"
-#endif
-#endif
diff --git a/src/compat/ntqqueue.h b/src/compat/ntqqueue.h
deleted file mode 100644
index 7165a2ed7..000000000
--- a/src/compat/ntqqueue.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/****************************************************************************
-**
-** Compatibility file - should only be included by legacy code.
-** It #includes the file which obsoletes this one.
-**
-** Copyright (C) 1998-2008 Trolltech ASA.  All rights reserved.
-**  This file is part of the TQt GUI Toolkit.
-**
-** This file may be distributed under the terms of the Q Public License
-** as defined by Trolltech ASA of Norway and appearing in the file
-** LICENSE.TQPL included in the packaging of this file.
-**
-** Licensees holding valid TQt Professional Edition licenses may use this
-** file in accordance with the TQt Professional Edition License Agreement
-** provided with the TQt Professional Edition.
-**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-** information about the Professional Edition licensing, or see
-** http://www.trolltech.com/qpl/ for TQPL licensing information.
-**
-*****************************************************************************/
-#ifndef TQQUEUE_H
-#define TQQUEUE_H
-#ifndef TQT_NO_COMPAT
-#include "ntqptrqueue.h"
-#endif
-#endif
diff --git a/src/kernel/qinputcontext_p.h b/src/kernel/qinputcontext_p.h
index 0a7d193d3..0ab3a0884 100644
--- a/src/kernel/qinputcontext_p.h
+++ b/src/kernel/qinputcontext_p.h
@@ -61,7 +61,7 @@ class TQString;
 
 
 #ifdef Q_WS_X11
-#include "ntqarray.h"
+#include "ntqmemarray.h"
 #include "ntqwindowdefs.h"
 #include "qt_x11_p.h"
 #endif
diff --git a/src/tools/ntqmemarray.h b/src/tools/ntqmemarray.h
index 2febfb23b..8a07bf9a9 100644
--- a/src/tools/ntqmemarray.h
+++ b/src/tools/ntqmemarray.h
@@ -112,10 +112,6 @@ public:
     ConstIterator end() const { return data() + size(); }
 };
 
-#ifndef TQT_NO_COMPAT
-#define TQArray TQMemArray
-#endif
-
 #define Q_DEFINED_QMEMARRAY
 #include "ntqwinexport.h"
-#endif // TQARRAY_H
+#endif
diff --git a/src/tools/ntqptrcollection.h b/src/tools/ntqptrcollection.h
index 37ff0df30..2b69899f8 100644
--- a/src/tools/ntqptrcollection.h
+++ b/src/tools/ntqptrcollection.h
@@ -73,8 +73,4 @@ protected:
 };
 
 
-#ifndef TQT_NO_COMPAT
-#define TQCollection TQPtrCollection
-#endif
-
 #endif // TQPTRCOLLECTION_H
diff --git a/src/tools/ntqptrqueue.h b/src/tools/ntqptrqueue.h
index 90f743d02..c905b4fd6 100644
--- a/src/tools/ntqptrqueue.h
+++ b/src/tools/ntqptrqueue.h
@@ -87,8 +87,4 @@ template<class type> inline void TQPtrQueue<type>::deleteItem( TQPtrCollection::
     if ( del_item ) delete (type *)d;
 }
 
-#ifndef TQT_NO_COMPAT
-#define TQQueue TQPtrQueue
-#endif
-
 #endif // TQPTRQUEUE_H