From eaa7ee2e0bbca40ba3173c4304f81957e8964291 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 9 Aug 2011 22:25:47 -0500 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains --- tqtinterface/qt4/plugins/src/sqldrivers/ibase/ibase.pro | 2 +- tqtinterface/qt4/plugins/src/sqldrivers/mysql/mysql.pro | 2 +- tqtinterface/qt4/plugins/src/sqldrivers/odbc/odbc.pro | 4 ++-- tqtinterface/qt4/plugins/src/sqldrivers/psql/psql.pro | 2 +- tqtinterface/qt4/plugins/src/sqldrivers/sqldrivers.pro | 16 ++++++++-------- .../qt4/plugins/src/sqldrivers/sqlite/sqlite.pro | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tqtinterface/qt4/plugins/src/sqldrivers') diff --git a/tqtinterface/qt4/plugins/src/sqldrivers/ibase/ibase.pro b/tqtinterface/qt4/plugins/src/sqldrivers/ibase/ibase.pro index ed1cd58..ec176df 100644 --- a/tqtinterface/qt4/plugins/src/sqldrivers/ibase/ibase.pro +++ b/tqtinterface/qt4/plugins/src/sqldrivers/ibase/ibase.pro @@ -11,7 +11,7 @@ SOURCES = main.cpp \ unix { OBJECTS_DIR = .obj - !tqcontains( LIBS, .*gds.* ):!tqcontains( LIBS, .*libfb.* ) { + !contains( LIBS, .*gds.* ):!contains( LIBS, .*libfb.* ) { LIBS *= -lfbclient } } diff --git a/tqtinterface/qt4/plugins/src/sqldrivers/mysql/mysql.pro b/tqtinterface/qt4/plugins/src/sqldrivers/mysql/mysql.pro index 0d2cc7c..1469a93 100644 --- a/tqtinterface/qt4/plugins/src/sqldrivers/mysql/mysql.pro +++ b/tqtinterface/qt4/plugins/src/sqldrivers/mysql/mysql.pro @@ -11,7 +11,7 @@ SOURCES = main.cpp \ unix { OBJECTS_DIR = .obj - !tqcontains( LIBS, .*mysql.* ) { + !contains( LIBS, .*mysql.* ) { LIBS *= -lmysqlclient } } diff --git a/tqtinterface/qt4/plugins/src/sqldrivers/odbc/odbc.pro b/tqtinterface/qt4/plugins/src/sqldrivers/odbc/odbc.pro index ba9058e..735c85b 100644 --- a/tqtinterface/qt4/plugins/src/sqldrivers/odbc/odbc.pro +++ b/tqtinterface/qt4/plugins/src/sqldrivers/odbc/odbc.pro @@ -9,14 +9,14 @@ SOURCES = main.cpp \ ../../../../src/sql/drivers/odbc/tqsql_odbc.cpp mac { - !tqcontains( LIBS, .*odbc.* ) { + !contains( LIBS, .*odbc.* ) { LIBS *= -liodbc } } unix { OBJECTS_DIR = .obj - !tqcontains( LIBS, .*odbc.* ) { + !contains( LIBS, .*odbc.* ) { LIBS *= -lodbc } } diff --git a/tqtinterface/qt4/plugins/src/sqldrivers/psql/psql.pro b/tqtinterface/qt4/plugins/src/sqldrivers/psql/psql.pro index 1ab6808..57f47b6 100644 --- a/tqtinterface/qt4/plugins/src/sqldrivers/psql/psql.pro +++ b/tqtinterface/qt4/plugins/src/sqldrivers/psql/psql.pro @@ -9,7 +9,7 @@ SOURCES = main.cpp \ ../../../../src/sql/drivers/psql/tqsql_psql.cpp unix { OBJECTS_DIR = .obj - !tqcontains( LIBS, .*pq.* ) { + !contains( LIBS, .*pq.* ) { LIBS *= -lpq } } diff --git a/tqtinterface/qt4/plugins/src/sqldrivers/sqldrivers.pro b/tqtinterface/qt4/plugins/src/sqldrivers/sqldrivers.pro index a7e1652..616b23f 100644 --- a/tqtinterface/qt4/plugins/src/sqldrivers/sqldrivers.pro +++ b/tqtinterface/qt4/plugins/src/sqldrivers/sqldrivers.pro @@ -1,10 +1,10 @@ TEMPLATE = subdirs -tqcontains(sql-plugins, psql) : SUBDIRS += psql -tqcontains(sql-plugins, mysql) : SUBDIRS += mysql -tqcontains(sql-plugins, odbc) : SUBDIRS += odbc -tqcontains(sql-plugins, tds) : SUBDIRS += tds -tqcontains(sql-plugins, oci) : SUBDIRS += oci -tqcontains(sql-plugins, db2) : SUBDIRS += db2 -tqcontains(sql-plugins, sqlite) : SUBDIRS += sqlite -tqcontains(sql-plugins, ibase) : SUBDIRS += ibase +contains(sql-plugins, psql) : SUBDIRS += psql +contains(sql-plugins, mysql) : SUBDIRS += mysql +contains(sql-plugins, odbc) : SUBDIRS += odbc +contains(sql-plugins, tds) : SUBDIRS += tds +contains(sql-plugins, oci) : SUBDIRS += oci +contains(sql-plugins, db2) : SUBDIRS += db2 +contains(sql-plugins, sqlite) : SUBDIRS += sqlite +contains(sql-plugins, ibase) : SUBDIRS += ibase diff --git a/tqtinterface/qt4/plugins/src/sqldrivers/sqlite/sqlite.pro b/tqtinterface/qt4/plugins/src/sqldrivers/sqlite/sqlite.pro index 51d696e..51a6ff0 100644 --- a/tqtinterface/qt4/plugins/src/sqldrivers/sqlite/sqlite.pro +++ b/tqtinterface/qt4/plugins/src/sqldrivers/sqlite/sqlite.pro @@ -23,7 +23,7 @@ win32 { # } } -!tqcontains( LIBS, .*sqlite.* ) { +!contains( LIBS, .*sqlite.* ) { INCLUDEPATH += ../../../../src/3rdparty/sqlite HEADERS += ../../../../src/3rdparty/sqlite/btree.h \ -- cgit v1.2.3