summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-10-20 21:47:53 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-10-20 21:47:53 +0900
commitc048ce6e8cc109b317293d380a5053e19a37dd31 (patch)
tree48aec6b3314b880d050fb9d243b3b50b4c6fc658
parent789e7c7f92e09fb31549a5126281331b86834008 (diff)
downloadtqt3-c048ce6e8cc109b317293d380a5053e19a37dd31.tar.gz
tqt3-c048ce6e8cc109b317293d380a5053e19a37dd31.zip
Removed obsolete Qt2's TQVector class and replaced
with TQt3's TQPtrVector. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--doc/html/index1
-rw-r--r--doc/html/ntqvector.html47
-rw-r--r--doc/html/porting.html5
-rw-r--r--doc/html/qptrvector-h.html4
-rw-r--r--doc/html/qt.dcf3
-rw-r--r--doc/html/titleindex1
-rw-r--r--doc/qcollection-compat.doc10
l---------include/ntqvector.h1
-rw-r--r--src/compat/ntqvector.h27
-rw-r--r--src/sql/drivers/sqlite/qsql_sqlite.cpp17
-rw-r--r--src/sql/drivers/sqlite3/qsql_sqlite3.cpp14
-rw-r--r--src/tools/ntqptrvector.h4
12 files changed, 9 insertions, 125 deletions
diff --git a/doc/html/index b/doc/html/index
index 0464d66ec..e8cc96581 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 e5eca324e..000000000
--- a/doc/html/ntqvector.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/doc/qcollection-compat.doc:97 -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>TQVector Class Reference (obsolete)</title>
-<style type="text/css"><!--
-fn { margin-left: 1cm; text-indent: -1cm; }
-a:link { color: #004faf; text-decoration: none }
-a:visited { color: #672967; text-decoration: none }
-body { background: #ffffff; color: black; }
---></style>
-</head>
-<body>
-
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr bgcolor="#E5E5E5">
-<td valign=center>
- <a href="index.html">
-<font color="#004faf">Home</font></a>
- | <a href="classes.html">
-<font color="#004faf">All&nbsp;Classes</font></a>
- | <a href="mainclasses.html">
-<font color="#004faf">Main&nbsp;Classes</font></a>
- | <a href="annotated.html">
-<font color="#004faf">Annotated</font></a>
- | <a href="groups.html">
-<font color="#004faf">Grouped&nbsp;Classes</font></a>
- | <a href="functions.html">
-<font color="#004faf">Functions</font></a>
-</td>
-<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>TQVector Class Reference (obsolete)</h1>
-
-
-<p> <pre>
-#include &lt;ntqvector.h&gt;</pre>
-
-<p> The TQVector class has been renamed <b> <a href="ntqptrvector.html">TQPtrVector</a> </b> in TQt 3.0.
-
-<!-- eof -->
-<p><address><hr><div align=center>
-<table width=100% cellspacing=0 border=0><tr>
-<td>Copyright &copy; 2007
-<a href="troll.html">Trolltech</a><td align=center><a href="trademarks.html">Trademarks</a>
-<td align=right><div align=right>TQt 3.3.8</div>
-</table></div></address></body>
-</html>
diff --git a/doc/html/porting.html b/doc/html/porting.html
index 24c53efe3..78db2bc61 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.
<p> <h2> Collection Class Renaming
</h2>
-<a name="6"></a><p> The classes TQArray, TQCollection, TQQueue, TQStack
-and TQVector have been renamed. To ease porting, the old names and the
+<a name="6"></a><p> 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.
<p> <center><table cellpadding="4" cellspacing="2" border="0">
<tr bgcolor="#a2c511"> <th valign="top">Old Name <th valign="top">New Name <th valign="top">New Header File
@@ -407,7 +407,6 @@ old header-file names are still supported.
<tr bgcolor="#d0d0d0"> <td valign="top">TQCollection <td valign="top"><a href="ntqptrcollection.html">TQPtrCollection</a> <td valign="top"><tt>&lt;ntqptrcollection.h&gt;</tt>
<tr bgcolor="#f0f0f0"> <td valign="top">TQQueue <td valign="top"><a href="ntqptrqueue.html">TQPtrQueue</a> <td valign="top"><tt>&lt;ntqptrqueue.h&gt;</tt>
<tr bgcolor="#d0d0d0"> <td valign="top">TQStack <td valign="top"><a href="ntqptrstack.html">TQPtrStack</a> <td valign="top"><tt>&lt;ntqptrstack.h&gt;</tt>
-<tr bgcolor="#f0f0f0"> <td valign="top">TQVector <td valign="top"><a href="ntqptrvector.html">TQPtrVector</a> <td valign="top"><tt>&lt;ntqptrvector.h&gt;</tt>
</table></center>
<p> <h2> <a href="ntqbuttongroup.html">TQButtonGroup</a>
</h2>
diff --git a/doc/html/qptrvector-h.html b/doc/html/qptrvector-h.html
index a73824584..a9515d796 100644
--- a/doc/html/qptrvector-h.html
+++ b/doc/html/qptrvector-h.html
@@ -145,10 +145,6 @@ template&lt;class type&gt; inline void TQPtrVector&lt;type&gt;::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 f74a43122..cf77ec581 100644
--- a/doc/html/qt.dcf
+++ b/doc/html/qt.dcf
@@ -10272,9 +10272,6 @@
<section ref="mac-differences.html" title="Qt/Mac Issues">
<keyword ref="mac-differences.html">Qt/Mac Issues</keyword>
</section>
-<section ref="ntqvector.html" title="QVector Class Reference (obsolete)">
- <keyword ref="ntqvector.html">QVector Class Reference (obsolete)</keyword>
-</section>
<section ref="rangecontrols-example.html" title="Range controls">
<keyword ref="rangecontrols-example.html">Range controls</keyword>
</section>
diff --git a/doc/html/titleindex b/doc/html/titleindex
index 90d8dbc6a..58b9f1c0d 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 c2a86eb72..b9209881e 100644
--- a/doc/qcollection-compat.doc
+++ b/doc/qcollection-compat.doc
@@ -75,13 +75,3 @@
The QStack class has been renamed <b> \l QPtrStack </b> in TQt 3.0.
*/
-
-/*! \page ntqvector.html
-
- \title QVector Class Reference (obsolete)
-
- \code
-#include <ntqvector.h>\endcode
-
- The QVector class has been renamed <b> \l QPtrVector </b> in TQt 3.0.
-*/
diff --git a/include/ntqvector.h b/include/ntqvector.h
deleted file mode 120000
index bd1c1ed7b..000000000
--- 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 54491f813..000000000
--- 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 92a66c72e..b7b7aa5e3 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp
@@ -17,20 +17,11 @@
#include <ntqdatetime.h>
#include <ntqregexp.h>
#include <ntqfile.h>
-
-#if (TQT_VERSION-0 < 0x030000)
-# include <ntqvector.h>
-# if !defined Q_WS_WIN32
-# include <unistd.h>
-# endif
-# include "../../../3rdparty/libraries/sqlite/sqlite.h"
-#else
-# include <ntqptrvector.h>
-# if !defined Q_WS_WIN32
-# include <unistd.h>
-# endif
-# include <sqlite.h>
+#include <ntqptrvector.h>
+#if !defined Q_WS_WIN32
+# include <unistd.h>
#endif
+#include <sqlite.h>
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 4d79cb4ea..a0d9ac558 100644
--- a/src/sql/drivers/sqlite3/qsql_sqlite3.cpp
+++ b/src/sql/drivers/sqlite3/qsql_sqlite3.cpp
@@ -19,17 +19,9 @@
#include <ntqregexp.h>
#include <ntqfile.h>
#include <sqlite3.h>
-
-#if (TQT_VERSION-0 < 0x030200)
-# include <ntqvector.h>
-# if !defined Q_WS_WIN32
-# include <unistd.h>
-# endif
-#else
-# include <ntqptrvector.h>
-# if !defined Q_WS_WIN32
-# include <unistd.h>
-# endif
+#include <ntqptrvector.h>
+#if !defined Q_WS_WIN32
+# include <unistd.h>
#endif
typedef struct sqlite3_stmt sqlite3_stmt;
diff --git a/src/tools/ntqptrvector.h b/src/tools/ntqptrvector.h
index e3034a6a3..38101a21c 100644
--- a/src/tools/ntqptrvector.h
+++ b/src/tools/ntqptrvector.h
@@ -109,10 +109,6 @@ template<class type> inline void TQPtrVector<type>::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