diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/compat/ntqvector.h | 27 | ||||
-rw-r--r-- | src/sql/drivers/sqlite/qsql_sqlite.cpp | 17 | ||||
-rw-r--r-- | src/sql/drivers/sqlite3/qsql_sqlite3.cpp | 14 | ||||
-rw-r--r-- | src/tools/ntqptrvector.h | 4 |
4 files changed, 7 insertions, 55 deletions
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 |