Removed obsolete Qt2's TQList/TQListIterator classes and replaced

with TQt3's TQPtrList/TQPtrListIterator ones.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

4 files changed, 2 insertions, 39 deletions

diff --git a/src/compat/ntqlist.h b/src/compat/ntqlist.h
deleted file mode 100644
index 4d75178cc..000000000
--- a/src/compat/ntqlist.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 TQLIST_H
-#define TQLIST_H
-#ifndef TQT_NO_COMPAT
-#include "ntqptrlist.h"
-#endif
-#endif
diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h
index 2cb7785e0..bb8a4f9fd 100644
--- a/src/kernel/ntqinputcontext.h
+++ b/src/kernel/ntqinputcontext.h
@@ -43,13 +43,8 @@
 #include "ntqglobal.h"
 #include "ntqevent.h"
 #include "ntqstring.h"
-#if (TQT_VERSION-0 >= 0x040000)
-#include "ntqlist.h"
-#include "ntqaction.h"
-#else
 #include "ntqptrlist.h"
 #endif
-#endif
 
 class TQWidget;
 class TQFont;
@@ -95,7 +90,7 @@ public:
     virtual bool isPreeditRelocationEnabled();
 
 #if (TQT_VERSION-0 >= 0x040000)
-    virtual TQList<TQAction *> actions();
+    virtual TQPtrList<TQAction *> actions();
     void addActionsTo( TQMenu *menu, TQInputContextMenu::Action action = TQInputContextMenu::InsertSeparator );
 #else
     virtual TQPtrList<TQInputContextMenu> *menus();
diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp
index 9533d3eb2..6523fe756 100644
--- a/src/kernel/qinputcontext.cpp
+++ b/src/kernel/qinputcontext.cpp
@@ -806,7 +806,7 @@ TQString TQInputContext::language()
 /*!
     This is a preliminary interface for TQt4
  */
-TQList<TQAction *> TQInputContext::actions()
+TQPtrList<TQAction *> TQInputContext::actions()
 {
 }
 #else
diff --git a/src/tools/ntqptrlist.h b/src/tools/ntqptrlist.h
index 305be554e..579c1b226 100644
--- a/src/tools/ntqptrlist.h
+++ b/src/tools/ntqptrlist.h
@@ -185,11 +185,6 @@ public:
 			      { TQGListIterator::operator=(it); return *this; }
 };
 
-#ifndef TQT_NO_COMPAT
-#define TQList TQPtrList
-#define TQListIterator TQPtrListIterator
-#endif
-
 #define Q_DEFINED_QPTRLIST
 #include "ntqwinexport.h"