Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1

NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3


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

1 files changed, 10 insertions, 10 deletions

diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
index 271328525..80ad121a5 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
@@ -234,13 +234,13 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
   mMapList.append( outlookMap );
 
   TQFrame *page = plainPage();
-  TQGridLayout *layout = new TQGridLayout( page, 4, ( attributes.count() + 4 ) >> 1,
+  TQGridLayout *tqlayout = new TQGridLayout( page, 4, ( attributes.count() + 4 ) >> 1,
                                          0, spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Template:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
   mMapCombo = new KComboBox( page );
-  layout->addWidget( mMapCombo, 0, 1 );
+  tqlayout->addWidget( mMapCombo, 0, 1 );
 
   mMapCombo->insertItem( i18n( "User Defined" ) );
   mMapCombo->insertItem( i18n( "Kolab" ) );
@@ -250,9 +250,9 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
   connect( mMapCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( mapChanged( int ) ) );
 
   label = new TQLabel( i18n( "RDN prefix attribute:" ), page );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
   mRDNCombo = new KComboBox( page );
-  layout->addWidget( mRDNCombo, 1, 1 );
+  tqlayout->addWidget( mRDNCombo, 1, 1 );
   mRDNCombo->insertItem( i18n( "commonName" ) );
   mRDNCombo->insertItem( i18n( "UID" ) );
   mRDNCombo->setCurrentItem( rdnprefix );
@@ -274,14 +274,14 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
     mLineEditDict.insert( it.key(), lineedit );
     lineedit->setText( it.data() );
     label->setBuddy( lineedit );
-    layout->addWidget( label, i, j );
-    layout->addWidget( lineedit, i, j+1 );
+    tqlayout->addWidget( label, i, j );
+    tqlayout->addWidget( lineedit, i, j+1 );
   }
   
   for ( i = 1; i < mMapCombo->count(); i++ ) {
     TQDictIterator<KLineEdit> it2( mLineEditDict );
     for ( ; it2.current(); ++it2 ) {
-      if ( mMapList[ i ].contains( it2.currentKey() ) ) {
+      if ( mMapList[ i ].tqcontains( it2.currentKey() ) ) {
         if ( mMapList[ i ][ it2.currentKey() ] != it2.current()->text() ) break;
       } else {
         if ( mDefaultMap[ it2.currentKey() ] != it2.current()->text() ) break;
@@ -338,8 +338,8 @@ OfflineDialog::OfflineDialog( bool autoCache, int cachePolicy, const KURL &src,
                  Ok, parent, name, true, true )
 {
   TQFrame *page = plainPage();
-  TQVBoxLayout *layout = new TQVBoxLayout( page );
-  layout->setAutoAdd( true );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
+  tqlayout->setAutoAdd( true );
 
   mSrc = src; mDst = dst;
   mCacheGroup = new TQButtonGroup( 1, Qt::Horizontal,