From c048ce6e8cc109b317293d380a5053e19a37dd31 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 20 Oct 2018 21:47:53 +0900 Subject: [PATCH] Removed obsolete Qt2's TQVector class and replaced with TQt3's TQPtrVector. Signed-off-by: Michele Calgaro --- doc/html/index | 1 - doc/html/ntqvector.html | 47 ------------------------ doc/html/porting.html | 5 +-- doc/html/qptrvector-h.html | 4 -- doc/html/qt.dcf | 3 -- doc/html/titleindex | 1 - doc/qcollection-compat.doc | 10 ----- include/ntqvector.h | 1 - src/compat/ntqvector.h | 27 -------------- src/sql/drivers/sqlite/qsql_sqlite.cpp | 17 ++------- src/sql/drivers/sqlite3/qsql_sqlite3.cpp | 14 ++----- src/tools/ntqptrvector.h | 4 -- 12 files changed, 9 insertions(+), 125 deletions(-) delete mode 100644 doc/html/ntqvector.html delete mode 120000 include/ntqvector.h delete mode 100644 src/compat/ntqvector.h diff --git a/doc/html/index b/doc/html/index index 0464d66e..e8cc9658 100644 --- a/doc/html/index +++ b/doc/html/index @@ -7467,7 +7467,6 @@ "QVariant::typeName" ntqvariant.html#typeName "QVariant::typeToName" ntqvariant.html#typeToName "QVariant::~QVariant" ntqvariant.html#~QVariant -"QVector Class Reference (obsolete)" ntqvector.html "QWMatrix" ntqwmatrix.html "QWMatrix::TransformationMode" ntqwmatrix.html#TransformationMode "QWMatrix::det" ntqwmatrix.html#det diff --git a/doc/html/ntqvector.html b/doc/html/ntqvector.html deleted file mode 100644 index e5eca324..00000000 --- a/doc/html/ntqvector.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - -TQVector Class Reference (obsolete) - - - - - - - -
- -Home - | -All Classes - | -Main Classes - | -Annotated - | -Grouped Classes - | -Functions -

TQVector Class Reference (obsolete)

- - -

-#include <ntqvector.h>
- -

The TQVector class has been renamed TQPtrVector in TQt 3.0. - - -

- -
Copyright © 2007 -TrolltechTrademarks -
TQt 3.3.8
-
- diff --git a/doc/html/porting.html b/doc/html/porting.html index 24c53efe..78db2bc6 100644 --- a/doc/html/porting.html +++ b/doc/html/porting.html @@ -398,8 +398,8 @@ use of the safe qstr* variants directly or ensure that no 0 pointer is passed to the standard C functions in your code base.

Collection Class Renaming

-

The classes TQArray, TQCollection, TQQueue, TQStack -and TQVector have been renamed. To ease porting, the old names and the +

The classes TQArray, TQCollection, TQQueue and TQStack +have been renamed. To ease porting, the old names and the old header-file names are still supported.

Old Name New Name New Header File @@ -407,7 +407,6 @@ old header-file names are still supported.
TQCollection TQPtrCollection <ntqptrcollection.h>
TQQueue TQPtrQueue <ntqptrqueue.h>
TQStack TQPtrStack <ntqptrstack.h> -
TQVector TQPtrVector <ntqptrvector.h>

TQButtonGroup

diff --git a/doc/html/qptrvector-h.html b/doc/html/qptrvector-h.html index a7382458..a9515d79 100644 --- a/doc/html/qptrvector-h.html +++ b/doc/html/qptrvector-h.html @@ -145,10 +145,6 @@ template<class type> inline void TQPtrVector<type>::deleteItem( TQPt if ( del_item ) delete (type *)d; } -#ifndef TQT_NO_COMPAT -#define TQVector TQPtrVector -#endif - #define Q_DEFINED_QPTRVECTOR #include "ntqwinexport.h" #endif // TQVECTOR_H diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf index f74a4312..cf77ec58 100644 --- a/doc/html/qt.dcf +++ b/doc/html/qt.dcf @@ -10272,9 +10272,6 @@
Qt/Mac Issues
-
- QVector Class Reference (obsolete) -
Range controls
diff --git a/doc/html/titleindex b/doc/html/titleindex index 90d8dbc6..58b9f1c0 100644 --- a/doc/html/titleindex +++ b/doc/html/titleindex @@ -947,7 +947,6 @@ QValueVector Class | ntqvaluevector.html QValueVector Member List | qvaluevector-members.html QVariant Class | ntqvariant.html QVariant Member List | qvariant-members.html -QVector Class Reference (obsolete) | ntqvector.html QWMatrix Class | ntqwmatrix.html QWMatrix Member List | qwmatrix-members.html QWSDecoration Class | qwsdecoration.html diff --git a/doc/qcollection-compat.doc b/doc/qcollection-compat.doc index c2a86eb7..b9209881 100644 --- a/doc/qcollection-compat.doc +++ b/doc/qcollection-compat.doc @@ -75,13 +75,3 @@ The QStack class has been renamed \l QPtrStack in TQt 3.0. */ - -/*! \page ntqvector.html - - \title QVector Class Reference (obsolete) - - \code -#include \endcode - - The QVector class has been renamed \l QPtrVector in TQt 3.0. -*/ diff --git a/include/ntqvector.h b/include/ntqvector.h deleted file mode 120000 index bd1c1ed7..00000000 --- a/include/ntqvector.h +++ /dev/null @@ -1 +0,0 @@ -../src/compat/ntqvector.h \ No newline at end of file diff --git a/src/compat/ntqvector.h b/src/compat/ntqvector.h deleted file mode 100644 index 54491f81..00000000 --- a/src/compat/ntqvector.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 TQVECTOR_H -#define TQVECTOR_H -#ifndef TQT_NO_COMPAT -#include "ntqptrvector.h" -#endif -#endif diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index 92a66c72..b7b7aa5e 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -17,20 +17,11 @@ #include #include #include - -#if (TQT_VERSION-0 < 0x030000) -# include -# if !defined Q_WS_WIN32 -# include -# endif -# include "../../../3rdparty/libraries/sqlite/sqlite.h" -#else -# include -# if !defined Q_WS_WIN32 -# include -# endif -# include +#include +#if !defined Q_WS_WIN32 +# include #endif +#include typedef struct sqlite_vm sqlite_vm; diff --git a/src/sql/drivers/sqlite3/qsql_sqlite3.cpp b/src/sql/drivers/sqlite3/qsql_sqlite3.cpp index 4d79cb4e..a0d9ac55 100644 --- a/src/sql/drivers/sqlite3/qsql_sqlite3.cpp +++ b/src/sql/drivers/sqlite3/qsql_sqlite3.cpp @@ -19,17 +19,9 @@ #include #include #include - -#if (TQT_VERSION-0 < 0x030200) -# include -# if !defined Q_WS_WIN32 -# include -# endif -#else -# include -# if !defined Q_WS_WIN32 -# include -# endif +#include +#if !defined Q_WS_WIN32 +# include #endif typedef struct sqlite3_stmt sqlite3_stmt; diff --git a/src/tools/ntqptrvector.h b/src/tools/ntqptrvector.h index e3034a6a..38101a21 100644 --- a/src/tools/ntqptrvector.h +++ b/src/tools/ntqptrvector.h @@ -109,10 +109,6 @@ template inline void TQPtrVector::deleteItem( TQPtrCollection: if ( del_item ) delete (type *)d; } -#ifndef TQT_NO_COMPAT -#define TQVector TQPtrVector -#endif - #define Q_DEFINED_QPTRVECTOR #include "ntqwinexport.h" #endif // TQVECTOR_H