TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 103 insertions, 103 deletions

diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp
index 3a8316b8..d8cdb32c 100644
--- a/kommander/editor/metadatabase.cpp
+++ b/kommander/editor/metadatabase.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
- This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
+ This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
 
  This file may be distributed and/or modified under the terms of the
  GNU General Public License version 2 as published by the Free Software
@@ -34,7 +34,7 @@
 #include <tqwidgetlist.h>
 #include <tqmainwindow.h>
 #include <tqregexp.h>
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #include <tqdatetime.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
@@ -110,7 +110,7 @@ void MetaDataBase::addEntry( TQObject *o )
     if ( !o )
         return;
     setupDataBase();
-    if ( db->find( o ) )
+    if ( db->tqfind( o ) )
         return;
     MetaDataBaseRecord *r = new MetaDataBaseRecord;
     r->object = o;
@@ -129,7 +129,7 @@ void MetaDataBase::removeEntry( TQObject *o )
 void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bool changed )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -137,24 +137,24 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo
     }
 
     if ( changed ) {
-        if ( r->changedProperties.findIndex( property ) == -1 )
+        if ( r->changedProperties.tqfindIndex( property ) == -1 )
             r->changedProperties.append( property );
     } else {
-        if ( r->changedProperties.findIndex( property ) != -1 )
+        if ( r->changedProperties.tqfindIndex( property ) != -1 )
             r->changedProperties.remove( property );
     }
 
     if ( doUpdate &&
          ( property == "hAlign" || property == "vAlign" || property == "wordwrap" ) ) {
         doUpdate = false;
-        setPropertyChanged( o, "alignment", changed ||
+        setPropertyChanged( o, "tqalignment", changed ||
                             isPropertyChanged( o, "hAlign" ) ||
                             isPropertyChanged( o, "vAlign" ) ||
                             isPropertyChanged( o, "wordwrap" ) );
         doUpdate = true;
     }
 
-    if ( doUpdate && property == "alignment" ) {
+    if ( doUpdate && property == "tqalignment" ) {
         doUpdate = false;
         setPropertyChanged( o, "hAlign", changed );
         setPropertyChanged( o, "vAlign", changed );
@@ -166,20 +166,20 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo
 bool MetaDataBase::isPropertyChanged( TQObject *o, const TQString &property )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
         return false;
     }
 
-    return r->changedProperties.findIndex( property ) != -1;
+    return r->changedProperties.tqfindIndex( property ) != -1;
 }
 
 TQStringList MetaDataBase::changedProperties( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -193,7 +193,7 @@ TQStringList MetaDataBase::changedProperties( TQObject *o )
 void MetaDataBase::setPropertyComment( TQObject *o, const TQString &property, const TQString &comment )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -206,20 +206,20 @@ void MetaDataBase::setPropertyComment( TQObject *o, const TQString &property, co
 TQString MetaDataBase::propertyComment( TQObject *o, const TQString &property )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
-        return TQString::null;
+        return TQString();
     }
 
-    return *r->propertyComments.find( property );
+    return *r->propertyComments.tqfind( property );
 }
 
 void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const TQVariant& value )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -231,13 +231,13 @@ void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const
 TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property)
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
         return TQVariant();
     }
-    TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.find( property );
+    TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.tqfind( property );
     if ( it != r->fakeProperties.end() )
         return r->fakeProperties[property];
     return WidgetFactory::defaultValue( o, property );
@@ -247,7 +247,7 @@ TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property)
 TQMap<TQString,TQVariant>* MetaDataBase::fakeProperties( TQObject* o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -261,7 +261,7 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
     if ( !o )
         return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -269,10 +269,10 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
     }
 
     r->spacing = spacing;
-    TQLayout * layout = 0;
-    WidgetFactory::layoutType( (TQWidget*)o, layout );
-    if ( layout )
-        layout->setSpacing( spacing );
+    TQLayout * tqlayout = 0;
+    WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout );
+    if ( tqlayout )
+        tqlayout->setSpacing( spacing );
 }
 
 int MetaDataBase::spacing( TQObject *o )
@@ -281,8 +281,8 @@ int MetaDataBase::spacing( TQObject *o )
         return -1;
     setupDataBase();
     if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
-        o = ( (TQMainWindow*)o )->centralWidget();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+        o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget());
+    MetaDataBaseRecord *r = db->tqfind( TQT_TQOBJECT(o) );
     if ( !r || !o->isWidgetType() ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -297,7 +297,7 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
     if ( !o )
         return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -305,12 +305,12 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
     }
 
     r->margin = margin;
-    TQLayout * layout = 0;
-    WidgetFactory::layoutType( (TQWidget*)o, layout );
+    TQLayout * tqlayout = 0;
+    WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout );
     if ( margin < 1 )
         margin = 1;
-    if ( layout )
-        layout->setMargin( margin );
+    if ( tqlayout )
+        tqlayout->setMargin( margin );
 }
 
 int MetaDataBase::margin( TQObject *o )
@@ -319,8 +319,8 @@ int MetaDataBase::margin( TQObject *o )
         return -1;
     setupDataBase();
     if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
-        o = ( (TQMainWindow*)o )->centralWidget();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+        o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget());
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -334,7 +334,7 @@ void MetaDataBase::addConnection( TQObject *o, TQObject *sender, const TQCString
                                   TQObject *receiver, const TQCString &slot )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -352,7 +352,7 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr
                                      TQObject *receiver, const TQCString &slot )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -374,7 +374,7 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr
 TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -387,7 +387,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ
                                                                 TQObject *receiver )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -409,7 +409,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ
 TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQObject *object )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -430,7 +430,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ
 void MetaDataBase::doConnections( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -465,16 +465,16 @@ void MetaDataBase::doConnections( TQObject *o )
             delete l;
         }
         TQString s = "2""%1";
-        s = s.arg( conn.signal );
+        s = s.tqarg( conn.signal.data() );
         TQString s2 = "1""%1";
-        s2 = s2.arg( conn.slot );
+        s2 = s2.tqarg( conn.slot.data() );
 
-        TQStrList signalList = sender->metaObject()->signalNames( true );
-        TQStrList slotList = receiver->metaObject()->slotNames( true );
+        TQStrList signalList = sender->tqmetaObject()->signalNames( true );
+        TQStrList slotList = receiver->tqmetaObject()->slotNames( true );
 
         // avoid warnings
-        if ( signalList.find( conn.signal ) == -1 ||
-             slotList.find( conn.slot ) == -1 )
+        if ( signalList.tqfind( conn.signal ) == -1 ||
+             slotList.tqfind( conn.slot ) == -1 )
             continue;
 
         TQObject::connect( sender, s, receiver, s2 );
@@ -485,7 +485,7 @@ void MetaDataBase::addSlot( TQObject *o, const TQCString &slot, const TQString&
                             const TQString &access, const TQString &language, const TQString &returnType )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -498,7 +498,7 @@ void MetaDataBase::addSlot( TQObject *o, const TQCString &slot, const TQString&
     s.access = access;
     s.language = language;
     s.returnType = returnType;
-    TQValueList<MetaDataBase::Slot>::Iterator it = r->slotList.find( s );
+    TQValueList<MetaDataBase::Slot>::Iterator it = r->slotList.tqfind( s );
     if ( it != r->slotList.end() )
         r->slotList.remove( it );
     r->slotList.append( s );
@@ -510,7 +510,7 @@ void MetaDataBase::addSlot( TQObject *o, const TQCString &slot, const TQString&
 void MetaDataBase::setSlotList( TQObject *o, const TQValueList<Slot> &slotList )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -523,7 +523,7 @@ void MetaDataBase::removeSlot( TQObject *o, const TQCString &slot, const TQStrin
                                const TQString &access, const TQString &language, const TQString &returnType )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -546,7 +546,7 @@ void MetaDataBase::removeSlot( TQObject *o, const TQCString &slot, const TQStrin
 void MetaDataBase::removeSlot( TQObject *o, const TQString &slot )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -565,7 +565,7 @@ void MetaDataBase::removeSlot( TQObject *o, const TQString &slot )
 TQValueList<MetaDataBase::Slot> MetaDataBase::slotList( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -578,7 +578,7 @@ TQValueList<MetaDataBase::Slot> MetaDataBase::slotList( TQObject *o )
 bool MetaDataBase::isSlotUsed( TQObject *o, const TQCString &slot )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -596,7 +596,7 @@ bool MetaDataBase::isSlotUsed( TQObject *o, const TQCString &slot )
 void MetaDataBase::changeSlot( TQObject *o, const TQCString &slot, const TQCString &newName )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -617,7 +617,7 @@ void MetaDataBase::changeSlotAttributes( TQObject *o, const TQCString &slot,
                                          const TQString &language, const TQString &returnType )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -639,7 +639,7 @@ void MetaDataBase::changeSlotAttributes( TQObject *o, const TQCString &slot,
 bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -647,14 +647,14 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom
     }
 
     if ( !onlyCustom ) {
-        TQStrList slotList = o->metaObject()->slotNames( true );
-        if ( slotList.find( slot ) != -1 )
+        TQStrList slotList = o->tqmetaObject()->slotNames( true );
+        if ( slotList.tqfind( slot ) != -1 )
             return true;
 
         if ( o->inherits( "FormWindow" ) ) {
-            o = ( (FormWindow*)o )->mainContainer();
-            slotList = o->metaObject()->slotNames( true );
-            if ( slotList.find( slot ) != -1 )
+            o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
+            slotList = o->tqmetaObject()->slotNames( true );
+            if ( slotList.tqfind( slot ) != -1 )
                 return true;
         }
 
@@ -682,11 +682,11 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom
 TQString MetaDataBase::languageOfSlot( TQObject *o, const TQCString &slot )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
-        return TQString::null;
+        return TQString();
     }
 
     TQString sl = slot;
@@ -698,7 +698,7 @@ TQString MetaDataBase::languageOfSlot( TQObject *o, const TQCString &slot )
         if ( sl == sl2 )
             return s.language;
     }
-    return TQString::null;
+    return TQString();
 }
 
 bool MetaDataBase::addCustomWidget( CustomWidget *wid )
@@ -779,7 +779,7 @@ bool MetaDataBase::hasCustomWidget( const TQString &className )
 void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*) w );
+    MetaDataBaseRecord *r = db->tqfind( (void*) w );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   w, w->name(), w->className() );
@@ -792,7 +792,7 @@ void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order )
 TQWidgetList MetaDataBase::tabOrder( TQWidget *w )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*) w );
+    MetaDataBaseRecord *r = db->tqfind( (void*) w );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   w, w->name(), w->className() );
@@ -805,7 +805,7 @@ TQWidgetList MetaDataBase::tabOrder( TQWidget *w )
 void MetaDataBase::setIncludes( TQObject *o, const TQValueList<Include> &incs )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -818,7 +818,7 @@ void MetaDataBase::setIncludes( TQObject *o, const TQValueList<Include> &incs )
 TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -831,7 +831,7 @@ TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQObject *o )
 void MetaDataBase::setForwards( TQObject *o, const TQStringList &fwds )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -844,7 +844,7 @@ void MetaDataBase::setForwards( TQObject *o, const TQStringList &fwds )
 TQStringList MetaDataBase::forwards( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -857,7 +857,7 @@ TQStringList MetaDataBase::forwards( TQObject *o )
 void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -871,10 +871,10 @@ void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs )
         bool hasSemicolon = s.endsWith( ";" );
         if ( hasSemicolon )
             s = s.left( s.length() - 1 );
-        int p = s.find( '(' );
+        int p = s.tqfind( '(' );
         if ( p < 0 )
             p = s.length();
-        int sp = s.find( ' ' );
+        int sp = s.tqfind( ' ' );
         if ( sp >= 0 && sp < p ) {
             s = s.mid( sp+1 );
             p -= sp + 1;
@@ -890,7 +890,7 @@ void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs )
 TQStringList MetaDataBase::signalList( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -903,7 +903,7 @@ TQStringList MetaDataBase::signalList( TQObject *o )
 void MetaDataBase::setMetaInfo( TQObject *o, MetaInfo mi )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -916,7 +916,7 @@ void MetaDataBase::setMetaInfo( TQObject *o, MetaInfo mi )
 MetaDataBase::MetaInfo MetaDataBase::metaInfo( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -934,7 +934,7 @@ MetaDataBase::CustomWidget::CustomWidget()
     className = "MyCustomWidget";
     includeFile = "mywidget.h";
     includePolicy = Local;
-    sizeHint = TQSize( -1, -1 );
+    tqsizeHint = TQSize( -1, -1 );
     pixmap = new TQPixmap( PixmapChooser::loadPixmap( "customwidget.xpm" ) );
     id = -1;
     sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred );
@@ -946,7 +946,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w )
     className = w.className;
     includeFile = w.includeFile;
     includePolicy = w.includePolicy;
-    sizeHint = w.sizeHint;
+    tqsizeHint = w.tqsizeHint;
     if ( w.pixmap )
         pixmap = new TQPixmap( *w.pixmap );
     else
@@ -958,7 +958,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w )
 void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)w );
+    MetaDataBaseRecord *r = db->tqfind( (void*)w );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   w, w->name(), w->className() );
@@ -971,7 +971,7 @@ void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c )
 TQCursor MetaDataBase::cursor( TQWidget *w )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)w );
+    MetaDataBaseRecord *r = db->tqfind( (void*)w );
     if ( !r ) {
         w->unsetCursor();
         return w->cursor();
@@ -991,7 +991,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
     className = w.className;
     includeFile = w.includeFile;
     includePolicy = w.includePolicy;
-    sizeHint = w.sizeHint;
+    tqsizeHint = w.tqsizeHint;
     if ( w.pixmap )
         pixmap = new TQPixmap( *w.pixmap );
     else
@@ -1006,8 +1006,8 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
 
 bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
 {
-    TQStrList sigList = TQWidget::staticMetaObject()->signalNames( true );
-    if ( sigList.find( signal ) != -1 )
+    TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( true );
+    if ( sigList.tqfind( signal ) != -1 )
         return true;
     for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) {
         if ( normalizeSlot( *it ) == normalizeSlot( signal ) )
@@ -1018,8 +1018,8 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
 
 bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
 {
-    TQStrList slotList = TQWidget::staticMetaObject()->slotNames( true );
-    if ( slotList.find( normalizeSlot( slot ) ) != -1 )
+    TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( true );
+    if ( slotList.tqfind( normalizeSlot( slot ) ) != -1 )
         return true;
 
     for ( TQValueList<MetaDataBase::Slot>::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) {
@@ -1031,8 +1031,8 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
 
 bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const
 {
-    TQStrList propList = TQWidget::staticMetaObject()->propertyNames( true );
-    if ( propList.find( prop ) != -1 )
+    TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( true );
+    if ( propList.tqfind( prop ) != -1 )
         return true;
 
     for ( TQValueList<MetaDataBase::Property>::ConstIterator it = lstProperties.begin(); it != lstProperties.end(); ++it ) {
@@ -1047,7 +1047,7 @@ void MetaDataBase::setPixmapArgument( TQObject *o, int pixmap, const TQString &a
     if ( !o )
         return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -1061,16 +1061,16 @@ void MetaDataBase::setPixmapArgument( TQObject *o, int pixmap, const TQString &a
 TQString MetaDataBase::pixmapArgument( TQObject *o, int pixmap )
 {
     if ( !o )
-        return TQString::null;
+        return TQString();
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
-        return TQString::null;
+        return TQString();
     }
 
-    return *r->pixmapArguments.find( pixmap );
+    return *r->pixmapArguments.tqfind( pixmap );
 }
 
 void MetaDataBase::clearPixmapArguments( TQObject *o )
@@ -1078,7 +1078,7 @@ void MetaDataBase::clearPixmapArguments( TQObject *o )
     if ( !o )
         return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -1094,7 +1094,7 @@ void MetaDataBase::setPixmapKey( TQObject *o, int pixmap, const TQString &arg )
     if ( !o )
         return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -1108,16 +1108,16 @@ void MetaDataBase::setPixmapKey( TQObject *o, int pixmap, const TQString &arg )
 TQString MetaDataBase::pixmapKey( TQObject *o, int pixmap )
 {
     if ( !o )
-        return TQString::null;
+        return TQString();
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
-        return TQString::null;
+        return TQString();
     }
 
-    return *r->pixmapKeys.find( pixmap );
+    return *r->pixmapKeys.tqfind( pixmap );
 }
 
 void MetaDataBase::clearPixmapKeys( TQObject *o )
@@ -1125,7 +1125,7 @@ void MetaDataBase::clearPixmapKeys( TQObject *o )
     if ( !o )
         return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -1142,7 +1142,7 @@ void MetaDataBase::setColumnFields( TQObject *o, const TQMap<TQString, TQString>
     if ( !o )
         return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -1157,7 +1157,7 @@ TQMap<TQString, TQString> MetaDataBase::columnFields( TQObject *o )
     if ( !o )
         return TQMap<TQString, TQString>();
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -1187,7 +1187,7 @@ void MetaDataBase::setExportMacro( TQObject *o, const TQString &macro )
     if ( !o )
         return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -1202,7 +1202,7 @@ TQString MetaDataBase::exportMacro( TQObject *o )
     if ( !o )
         return "";
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -1214,6 +1214,6 @@ TQString MetaDataBase::exportMacro( TQObject *o )
 
 bool MetaDataBase::hasObject( TQObject *o )
 {
-    return !!db->find( o );
+    return !!db->tqfind( o );
 }