summaryrefslogtreecommitdiffstats
path: root/experimental/tqtinterface/qt4/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'experimental/tqtinterface/qt4/plugins')
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblemenu.cpp18
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp48
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/inputmethods/imsw-multi/tqmultiinputcontext.cpp2
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp6
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/sqldrivers/ibase/ibase.pro2
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/sqldrivers/mysql/mysql.pro2
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/sqldrivers/odbc/odbc.pro4
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/sqldrivers/psql/psql.pro2
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/sqldrivers/sqldrivers.pro16
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/sqldrivers/sqlite/sqlite.pro2
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/styles/cde/cde.pro2
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/styles/compact/compact.pro2
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/styles/motifplus/motifplus.pro2
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/styles/platinum/platinum.pro2
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/styles/sgi/sgi.pro2
-rw-r--r--experimental/tqtinterface/qt4/plugins/src/styles/styles.pro20
16 files changed, 66 insertions, 66 deletions
diff --git a/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblemenu.cpp b/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblemenu.cpp
index 21a99b1d6..4a120d9b9 100644
--- a/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblemenu.cpp
+++ b/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblemenu.cpp
@@ -81,7 +81,7 @@ TQString TQAccessiblePopup::text( Text t, int control ) const
TQMenuItem *item = 0;
if ( control ) {
id = popupMenu()->idAt( control - 1 );
- item = popupMenu()->tqfindItem( id );
+ item = popupMenu()->findItem( id );
}
switch ( t ) {
@@ -110,7 +110,7 @@ TQAccessible::Role TQAccessiblePopup::role( int control ) const
if ( !control )
return PopupMenu;
- TQMenuItem *item = popupMenu()->tqfindItem( popupMenu()->idAt( control -1 ) );
+ TQMenuItem *item = popupMenu()->findItem( popupMenu()->idAt( control -1 ) );
if ( item && item->isSeparator() )
return Separator;
return MenuItem;
@@ -123,7 +123,7 @@ TQAccessible::State TQAccessiblePopup::state( int control ) const
return (State)s;
int id = popupMenu()->idAt( control -1 );
- TQMenuItem *item = popupMenu()->tqfindItem( id );
+ TQMenuItem *item = popupMenu()->findItem( id );
if ( !item )
return (State)s;
@@ -145,7 +145,7 @@ bool TQAccessiblePopup::doDefaultAction( int control )
return FALSE;
int id = popupMenu()->idAt( control -1 );
- TQMenuItem *item = popupMenu()->tqfindItem( id );
+ TQMenuItem *item = popupMenu()->findItem( id );
if ( !item || !item->isEnabled() )
return FALSE;
@@ -159,7 +159,7 @@ bool TQAccessiblePopup::setFocus( int control )
return FALSE;
int id = popupMenu()->idAt( control -1 );
- TQMenuItem *item = popupMenu()->tqfindItem( id );
+ TQMenuItem *item = popupMenu()->findItem( id );
if ( !item || !item->isEnabled() )
return FALSE;
@@ -268,7 +268,7 @@ TQAccessible::Role TQAccessibleMenuBar::role( int control ) const
if ( !control )
return MenuBar;
- TQMenuItem *item = menuBar()->tqfindItem( menuBar()->idAt( control -1 ) );
+ TQMenuItem *item = menuBar()->findItem( menuBar()->idAt( control -1 ) );
if ( item && item->isSeparator() )
return Separator;
return MenuItem;
@@ -281,7 +281,7 @@ TQAccessible::State TQAccessibleMenuBar::state( int control ) const
return (State)s;
int id = menuBar()->idAt( control -1 );
- TQMenuItem *item = menuBar()->tqfindItem( id );
+ TQMenuItem *item = menuBar()->findItem( id );
if ( !item )
return (State)s;
@@ -301,7 +301,7 @@ bool TQAccessibleMenuBar::doDefaultAction( int control )
return FALSE;
int id = menuBar()->idAt( control -1 );
- TQMenuItem *item = menuBar()->tqfindItem( id );
+ TQMenuItem *item = menuBar()->findItem( id );
if ( !item || !item->isEnabled() )
return FALSE;
@@ -315,7 +315,7 @@ bool TQAccessibleMenuBar::setFocus( int control )
return FALSE;
int id = menuBar()->idAt( control -1 );
- TQMenuItem *item = menuBar()->tqfindItem( id );
+ TQMenuItem *item = menuBar()->findItem( id );
if ( !item || !item->isEnabled() )
return FALSE;
diff --git a/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp b/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp
index 6741bf085..224ee097f 100644
--- a/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp
+++ b/experimental/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp
@@ -81,7 +81,7 @@ TQString hotKey( const TQString &text )
TQString n = text;
int fa = 0;
bool ac = FALSE;
- while ( ( fa = n.tqfind( "&", fa ) ) != -1 ) {
+ while ( ( fa = n.find( "&", fa ) ) != -1 ) {
if ( n.at(fa+1) != '&' ) {
ac = TRUE;
break;
@@ -134,7 +134,7 @@ int TQAccessibleWidget::controlAt( int x, int y ) const
{
TQWidget *w = widget();
TQPoint gp = w->mapToGlobal( TQPoint( 0, 0 ) );
- if ( !TQRect( gp.x(), gp.y(), w->width(), w->height() ).tqcontains( x, y ) )
+ if ( !TQRect( gp.x(), gp.y(), w->width(), w->height() ).contains( x, y ) )
return -1;
TQPoint rp = w->mapFromGlobal( TQPoint( x, y ) );
@@ -148,7 +148,7 @@ int TQAccessibleWidget::controlAt( int x, int y ) const
TQWidget *child = 0;
int index = 1;
while ( ( child = (TQWidget*)it.current() ) ) {
- if ( !child->isTopLevel() && !child->isHidden() && child->tqgeometry().tqcontains( rp ) ) {
+ if ( !child->isTopLevel() && !child->isHidden() && child->tqgeometry().contains( rp ) ) {
delete list;
return index;
}
@@ -244,7 +244,7 @@ int TQAccessibleWidget::navigate( NavDirection dir, int startControl ) const
return -1;
TQObjectList *list = w->queryList( "TQWidget", 0, FALSE, FALSE );
- int index = list->tqfindRef( w2 );
+ int index = list->findRef( w2 );
delete list;
return ( index != -1 ) ? index+1 : -1;
}
@@ -654,9 +654,9 @@ TQAccessibleSpinWidget::TQAccessibleSpinWidget( TQObject *o )
int TQAccessibleSpinWidget::controlAt( int x, int y ) const
{
TQPoint tl = widget()->mapFromGlobal( TQPoint( x, y ) );
- if ( ((TQSpinWidget*)widget())->upRect().tqcontains( tl ) )
+ if ( ((TQSpinWidget*)widget())->upRect().contains( tl ) )
return 1;
- else if ( ((TQSpinWidget*)widget())->downRect().tqcontains( tl ) )
+ else if ( ((TQSpinWidget*)widget())->downRect().contains( tl ) )
return 2;
return -1;
@@ -832,7 +832,7 @@ TQScrollBar *TQAccessibleScrollBar::scrollBar() const
int TQAccessibleScrollBar::controlAt( int x, int y ) const
{
for ( int i = 1; i <= childCount(); i++ ) {
- if ( rect(i).tqcontains( x,y ) )
+ if ( rect(i).contains( x,y ) )
return i;
}
return 0;
@@ -1029,7 +1029,7 @@ TQSlider *TQAccessibleSlider::slider() const
int TQAccessibleSlider::controlAt( int x, int y ) const
{
for ( int i = 1; i <= childCount(); i++ ) {
- if ( rect(i).tqcontains( x,y ) )
+ if ( rect(i).contains( x,y ) )
return i;
}
return 0;
@@ -1331,7 +1331,7 @@ int TQAccessibleHeader::controlAt( int x, int y ) const
{
TQPoint point = header()->mapFromGlobal( TQPoint( x, y ) );
for ( int i = 0; i < header()->count(); i++ ) {
- if ( header()->sectionRect( i ).tqcontains( point ) )
+ if ( header()->sectionRect( i ).contains( point ) )
return i+1;
}
return -1;
@@ -1675,7 +1675,7 @@ TQComboBox *TQAccessibleComboBox::comboBox() const
int TQAccessibleComboBox::controlAt( int x, int y ) const
{
for ( int i = childCount(); i >= 0; --i ) {
- if ( rect( i ).tqcontains( x, y ) )
+ if ( rect( i ).contains( x, y ) )
return i;
}
return -1;
@@ -1976,7 +1976,7 @@ TQString TQAccessibleTitleBar::text( Text t, int control ) const
case 5:
return TQTitleBar::tr("Closes the window");
default:
- return TQTitleBar::tr("Displays the name of the window and tqcontains controls to manipulate it");
+ return TQTitleBar::tr("Displays the name of the window and contains controls to manipulate it");
}
default:
break;
@@ -2353,7 +2353,7 @@ TQMemArray<int> TQAccessibleListBox::selection() const
\brief The TQAccessibleListView class implements the TQAccessibleInterface for list views.
*/
-static TQListViewItem *tqfindLVItem( TQListView* listView, int control )
+static TQListViewItem *findLVItem( TQListView* listView, int control )
{
int id = 1;
TQListViewItemIterator it( listView );
@@ -2402,7 +2402,7 @@ int TQAccessibleListView::itemAt( int x, int y ) const
/*! \reimp */
TQRect TQAccessibleListView::tqitemRect( int control ) const
{
- TQListViewItem *item = tqfindLVItem( listView(), control );
+ TQListViewItem *item = findLVItem( listView(), control );
if ( !item )
return TQRect();
return listView()->tqitemRect( item );
@@ -2427,7 +2427,7 @@ TQString TQAccessibleListView::text( Text t, int control ) const
if ( !control || t != Name )
return TQAccessibleScrollView::text( t, control );
- TQListViewItem *item = tqfindLVItem( listView(), control );
+ TQListViewItem *item = findLVItem( listView(), control );
if ( !item )
return TQString::null;
return item->text( 0 );
@@ -2446,7 +2446,7 @@ TQAccessible::State TQAccessibleListView::state( int control ) const
{
int state = TQAccessibleScrollView::state( control );
TQListViewItem *item;
- if ( !control || !( item = tqfindLVItem( listView(), control ) ) )
+ if ( !control || !( item = findLVItem( listView(), control ) ) )
return (State)state;
if ( item->isSelectable() ) {
@@ -2507,7 +2507,7 @@ bool TQAccessibleListView::setFocus( int control )
if ( !control || !res )
return res;
- TQListViewItem *item = tqfindLVItem( listView(), control );
+ TQListViewItem *item = findLVItem( listView(), control );
if ( !item )
return FALSE;
listView()->setCurrentItem( item );
@@ -2522,7 +2522,7 @@ bool TQAccessibleListView::setSelected( int control, bool on, bool extend )
listView()->selectionMode() != TQListView::Multi ) )
return FALSE;
- TQListViewItem *item = tqfindLVItem( listView(), control );
+ TQListViewItem *item = findLVItem( listView(), control );
if ( !item )
return FALSE;
if ( !extend ) {
@@ -2578,7 +2578,7 @@ TQMemArray<int> TQAccessibleListView::selection() const
\brief The TQAccessibleIconView class implements the TQAccessibleInterface for icon views.
*/
-static TQIconViewItem *tqfindIVItem( TQIconView *iconView, int control )
+static TQIconViewItem *findIVItem( TQIconView *iconView, int control )
{
int id = 1;
TQIconViewItem *item = iconView->firstItem();
@@ -2608,14 +2608,14 @@ TQIconView *TQAccessibleIconView::iconView() const
/*! \reimp */
int TQAccessibleIconView::itemAt( int x, int y ) const
{
- TQIconViewItem *item = iconView()->tqfindItem( TQPoint( x, y ) );
+ TQIconViewItem *item = iconView()->findItem( TQPoint( x, y ) );
return iconView()->index( item ) + 1;
}
/*! \reimp */
TQRect TQAccessibleIconView::tqitemRect( int control ) const
{
- TQIconViewItem *item = tqfindIVItem( iconView(), control );
+ TQIconViewItem *item = findIVItem( iconView(), control );
if ( !item )
return TQRect();
@@ -2634,7 +2634,7 @@ TQString TQAccessibleIconView::text( Text t, int control ) const
if ( !control || t != Name )
return TQAccessibleScrollView::text( t, control );
- TQIconViewItem *item = tqfindIVItem( iconView(), control );
+ TQIconViewItem *item = findIVItem( iconView(), control );
if ( !item )
return TQString::null;
return item->text();
@@ -2653,7 +2653,7 @@ TQAccessible::State TQAccessibleIconView::state( int control ) const
{
int state = TQAccessibleScrollView::state( control );
TQIconViewItem *item;
- if ( !control || !( item = tqfindIVItem( iconView(), control ) ) )
+ if ( !control || !( item = findIVItem( iconView(), control ) ) )
return (State)state;
if ( item->isSelectable() ) {
@@ -2695,7 +2695,7 @@ bool TQAccessibleIconView::setFocus( int control )
if ( !control || !res )
return res;
- TQIconViewItem *item = tqfindIVItem( iconView(), control );
+ TQIconViewItem *item = findIVItem( iconView(), control );
if ( !item )
return FALSE;
iconView()->setCurrentItem( item );
@@ -2710,7 +2710,7 @@ bool TQAccessibleIconView::setSelected( int control, bool on, bool extend )
iconView()->selectionMode() != TQIconView::Multi ) )
return FALSE;
- TQIconViewItem *item = tqfindIVItem( iconView(), control );
+ TQIconViewItem *item = findIVItem( iconView(), control );
if ( !item )
return FALSE;
if ( !extend ) {
diff --git a/experimental/tqtinterface/qt4/plugins/src/inputmethods/imsw-multi/tqmultiinputcontext.cpp b/experimental/tqtinterface/qt4/plugins/src/inputmethods/imsw-multi/tqmultiinputcontext.cpp
index a3caede80..721bd6ddb 100644
--- a/experimental/tqtinterface/qt4/plugins/src/inputmethods/imsw-multi/tqmultiinputcontext.cpp
+++ b/experimental/tqtinterface/qt4/plugins/src/inputmethods/imsw-multi/tqmultiinputcontext.cpp
@@ -372,7 +372,7 @@ TQPopupMenu *TQMultiInputContext::createImSelPopup()
void TQMultiInputContext::changeInputMethodWithMenuId( int menuid )
{
- TQString *key = keyDict.tqfind( (long)menuid );
+ TQString *key = keyDict.find( (long)menuid );
changeInputMethod( (*key) );
}
diff --git a/experimental/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp b/experimental/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp
index 412ece8c4..f0d746c67 100644
--- a/experimental/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp
+++ b/experimental/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp
@@ -254,9 +254,9 @@ extern "C" {
delete [] str;
if (drawstruct->chg_length < 0)
- qic->composingText.tqreplace(drawstruct->chg_first, UINT_MAX, s);
+ qic->composingText.replace(drawstruct->chg_first, UINT_MAX, s);
else
- qic->composingText.tqreplace(drawstruct->chg_first, drawstruct->chg_length, s);
+ qic->composingText.replace(drawstruct->chg_first, drawstruct->chg_length, s);
if ( qic->selectedChars.size() < qic->composingText.length() ) {
// expand the selectedChars array if the compose string is longer
@@ -619,7 +619,7 @@ bool TQXIMInputContext::x11FilterEvent( TQWidget *keywidget, XEvent *event )
* event into a filtered KeyPress event, in which case our
* keywidget is still zero.
*/
- TQETWidget *widget = (TQETWidget*)TQWidget::tqfind( (WId)event->xany.window );
+ TQETWidget *widget = (TQETWidget*)TQWidget::find( (WId)event->xany.window );
if ( ! keywidget ) {
keywidget = (TQETWidget*)TQWidget::keyboardGrabber();
if ( keywidget ) {
diff --git a/experimental/tqtinterface/qt4/plugins/src/sqldrivers/ibase/ibase.pro b/experimental/tqtinterface/qt4/plugins/src/sqldrivers/ibase/ibase.pro
index ed1cd584d..ec176dfba 100644
--- a/experimental/tqtinterface/qt4/plugins/src/sqldrivers/ibase/ibase.pro
+++ b/experimental/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/experimental/tqtinterface/qt4/plugins/src/sqldrivers/mysql/mysql.pro b/experimental/tqtinterface/qt4/plugins/src/sqldrivers/mysql/mysql.pro
index 0d2cc7ce5..1469a93ea 100644
--- a/experimental/tqtinterface/qt4/plugins/src/sqldrivers/mysql/mysql.pro
+++ b/experimental/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/experimental/tqtinterface/qt4/plugins/src/sqldrivers/odbc/odbc.pro b/experimental/tqtinterface/qt4/plugins/src/sqldrivers/odbc/odbc.pro
index ba9058e06..735c85be6 100644
--- a/experimental/tqtinterface/qt4/plugins/src/sqldrivers/odbc/odbc.pro
+++ b/experimental/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/experimental/tqtinterface/qt4/plugins/src/sqldrivers/psql/psql.pro b/experimental/tqtinterface/qt4/plugins/src/sqldrivers/psql/psql.pro
index 1ab680802..57f47b66e 100644
--- a/experimental/tqtinterface/qt4/plugins/src/sqldrivers/psql/psql.pro
+++ b/experimental/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/experimental/tqtinterface/qt4/plugins/src/sqldrivers/sqldrivers.pro b/experimental/tqtinterface/qt4/plugins/src/sqldrivers/sqldrivers.pro
index a7e165251..616b23fc6 100644
--- a/experimental/tqtinterface/qt4/plugins/src/sqldrivers/sqldrivers.pro
+++ b/experimental/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/experimental/tqtinterface/qt4/plugins/src/sqldrivers/sqlite/sqlite.pro b/experimental/tqtinterface/qt4/plugins/src/sqldrivers/sqlite/sqlite.pro
index 51d696e1d..51a6ff096 100644
--- a/experimental/tqtinterface/qt4/plugins/src/sqldrivers/sqlite/sqlite.pro
+++ b/experimental/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 \
diff --git a/experimental/tqtinterface/qt4/plugins/src/styles/cde/cde.pro b/experimental/tqtinterface/qt4/plugins/src/styles/cde/cde.pro
index 6aa8abce6..38ca906e3 100644
--- a/experimental/tqtinterface/qt4/plugins/src/styles/cde/cde.pro
+++ b/experimental/tqtinterface/qt4/plugins/src/styles/cde/cde.pro
@@ -8,7 +8,7 @@ HEADERS = ../../../../include/tqcdestyle.h
SOURCES = main.cpp \
../../../../src/styles/tqcdestyle.cpp
-!tqcontains(styles, motif) {
+!contains(styles, motif) {
HEADERS += ../../../../include/tqmotifstyle.h
SOURCES += ../../../../src/styles/tqmotifstyle.cpp
}
diff --git a/experimental/tqtinterface/qt4/plugins/src/styles/compact/compact.pro b/experimental/tqtinterface/qt4/plugins/src/styles/compact/compact.pro
index ce5af7a7c..72d0328bb 100644
--- a/experimental/tqtinterface/qt4/plugins/src/styles/compact/compact.pro
+++ b/experimental/tqtinterface/qt4/plugins/src/styles/compact/compact.pro
@@ -9,7 +9,7 @@ HEADERS = ../../../../include/tqcompactstyle.h
SOURCES = main.cpp \
../../../../src/styles/tqcompactstyle.cpp
-!tqcontains(styles, windows) {
+!contains(styles, windows) {
HEADERS += ../../../../include/tqwindowsstyle.h
SOURCES += ../../../../src/styles/tqwindowsstyle.cpp
}
diff --git a/experimental/tqtinterface/qt4/plugins/src/styles/motifplus/motifplus.pro b/experimental/tqtinterface/qt4/plugins/src/styles/motifplus/motifplus.pro
index f97bdcc1f..be1862dfe 100644
--- a/experimental/tqtinterface/qt4/plugins/src/styles/motifplus/motifplus.pro
+++ b/experimental/tqtinterface/qt4/plugins/src/styles/motifplus/motifplus.pro
@@ -8,7 +8,7 @@ HEADERS = ../../../../include/tqmotifplusstyle.h
SOURCES = main.cpp \
../../../../src/styles/tqmotifplusstyle.cpp
-!tqcontains(styles, motif) {
+!contains(styles, motif) {
HEADERS += ../../../../include/tqmotifstyle.h
SOURCES += ../../../../src/styles/tqmotifstyle.cpp
}
diff --git a/experimental/tqtinterface/qt4/plugins/src/styles/platinum/platinum.pro b/experimental/tqtinterface/qt4/plugins/src/styles/platinum/platinum.pro
index 486faeb56..f8aa607c3 100644
--- a/experimental/tqtinterface/qt4/plugins/src/styles/platinum/platinum.pro
+++ b/experimental/tqtinterface/qt4/plugins/src/styles/platinum/platinum.pro
@@ -8,7 +8,7 @@ HEADERS = ../../../../include/tqplatinumstyle.h
SOURCES = main.cpp \
../../../../src/styles/tqplatinumstyle.cpp
-!tqcontains(styles, windows) {
+!contains(styles, windows) {
HEADERS += ../../../../include/tqwindowsstyle.h
SOURCES += ../../../../src/styles/tqwindowsstyle.cpp
}
diff --git a/experimental/tqtinterface/qt4/plugins/src/styles/sgi/sgi.pro b/experimental/tqtinterface/qt4/plugins/src/styles/sgi/sgi.pro
index 11f32db9a..ec23e294c 100644
--- a/experimental/tqtinterface/qt4/plugins/src/styles/sgi/sgi.pro
+++ b/experimental/tqtinterface/qt4/plugins/src/styles/sgi/sgi.pro
@@ -8,7 +8,7 @@ HEADERS = ../../../../include/tqsgistyle.h
SOURCES = main.cpp \
../../../../src/styles/tqsgistyle.cpp
-!tqcontains(styles, motif) {
+!contains(styles, motif) {
HEADERS += ../../../../include/tqmotifstyle.h
SOURCES += ../../../../src/styles/tqmotifstyle.cpp
}
diff --git a/experimental/tqtinterface/qt4/plugins/src/styles/styles.pro b/experimental/tqtinterface/qt4/plugins/src/styles/styles.pro
index 8268056a6..9fa6a2217 100644
--- a/experimental/tqtinterface/qt4/plugins/src/styles/styles.pro
+++ b/experimental/tqtinterface/qt4/plugins/src/styles/styles.pro
@@ -1,11 +1,11 @@
TEMPLATE = subdirs
-tqcontains(style-plugins, windows) :SUBDIRS += windows
-tqcontains(style-plugins, motif) :SUBDIRS += motif
-tqcontains(style-plugins, platinum) :SUBDIRS += platinum
-tqcontains(style-plugins, motifplus) :SUBDIRS += motifplus
-tqcontains(style-plugins, cde) :SUBDIRS += cde
-tqcontains(style-plugins, sgi) :SUBDIRS += sgi
-tqcontains(style-plugins, compact) :SUBDIRS += compact
-tqcontains(style-plugins, aqua) :SUBDIRS += aqua
-tqcontains(style-plugins, mac) :SUBDIRS += mac
-tqcontains(style-plugins, windowsxp) :SUBDIRS += windowsxp
+contains(style-plugins, windows) :SUBDIRS += windows
+contains(style-plugins, motif) :SUBDIRS += motif
+contains(style-plugins, platinum) :SUBDIRS += platinum
+contains(style-plugins, motifplus) :SUBDIRS += motifplus
+contains(style-plugins, cde) :SUBDIRS += cde
+contains(style-plugins, sgi) :SUBDIRS += sgi
+contains(style-plugins, compact) :SUBDIRS += compact
+contains(style-plugins, aqua) :SUBDIRS += aqua
+contains(style-plugins, mac) :SUBDIRS += mac
+contains(style-plugins, windowsxp) :SUBDIRS += windowsxp