1 files changed, 15 insertions, 15 deletions

diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp
index a56057a5..ed1aa293 100644
--- a/libtdepim/ldapsearchdialog.cpp
+++ b/libtdepim/ldapsearchdialog.cpp
@@ -27,7 +27,7 @@
 #include <tqgroupbox.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistview.h>
 #include <tqpushbutton.h>
 
@@ -137,7 +137,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name )
   groupBox->setFrameShape( TQGroupBox::Box );
   groupBox->setFrameShadow( TQGroupBox::Sunken );
   groupBox->setColumnLayout( 0, Qt::Vertical );
-  TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2,
+  TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2,
                                             5, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
 
@@ -160,10 +160,10 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name )
 
   TQSize buttonSize;
   mSearchButton = new TQPushButton( i18n( "Stop" ), groupBox );
-  buttonSize = mSearchButton->sizeHint();
+  buttonSize = mSearchButton->tqsizeHint();
   mSearchButton->setText( i18n( "Search" ) );
-  if ( buttonSize.width() < mSearchButton->sizeHint().width() )
-    buttonSize = mSearchButton->sizeHint();
+  if ( buttonSize.width() < mSearchButton->tqsizeHint().width() )
+    buttonSize = mSearchButton->tqsizeHint();
   mSearchButton->setFixedWidth( buttonSize.width() );
 
   mSearchButton->setDefault( true );
@@ -186,7 +186,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name )
   mResultListView->setShowSortIndicator( true );
   topLayout->addWidget( mResultListView );
 
-  resize( TQSize( 600, 400).expandedTo( minimumSizeHint() ) );
+  resize( TQSize( 600, 400).expandedTo( tqminimumSizeHint() ) );
 
   setButtonText( User1, i18n( "Unselect All" ) );
   setButtonText( User2, i18n( "Select All" ) );
@@ -238,23 +238,23 @@ void LDAPSearchDialog::restoreSettings()
     for ( int j = 0; j < mNumHosts; ++j ) {
         KPIM::LdapServer ldapServer;
 
-      TQString host = config->readEntry( TQString( "SelectedHost%1" ).arg( j ), "" );
+      TQString host = config->readEntry( TQString( "SelectedHost%1" ).tqarg( j ), "" );
       if ( !host.isEmpty() )
           ldapServer.setHost( host );
 
-      int port = config->readUnsignedNumEntry( TQString( "SelectedPort%1" ).arg( j ) );
+      int port = config->readUnsignedNumEntry( TQString( "SelectedPort%1" ).tqarg( j ) );
       if ( port )
         ldapServer.setPort( port );
 
-      TQString base = config->readEntry( TQString( "SelectedBase%1" ).arg( j ), "" );
+      TQString base = config->readEntry( TQString( "SelectedBase%1" ).tqarg( j ), "" );
       if ( !base.isEmpty() )
         ldapServer.setBaseDN( base );
 
-      TQString bindDN = config->readEntry( TQString( "SelectedBind%1" ).arg( j ), "" );
+      TQString bindDN = config->readEntry( TQString( "SelectedBind%1" ).tqarg( j ), "" );
       if ( !bindDN.isEmpty() )
         ldapServer.setBindDN( bindDN );
 
-      TQString pwdBindDN = config->readEntry( TQString( "SelectedPwdBind%1" ).arg( j ), "" );
+      TQString pwdBindDN = config->readEntry( TQString( "SelectedPwdBind%1" ).tqarg( j ), "" );
       if ( !pwdBindDN.isEmpty() )
         ldapServer.setPwdBindDN( pwdBindDN );
 
@@ -352,15 +352,15 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at
 
   if ( attr == i18n( "Name" ) ) {
     result += startsWith ? "|(cn=%1*)(sn=%2*)" : "|(cn=*%1*)(sn=*%2*)";
-    result = result.arg( query ).arg( query );
+    result = result.tqarg( query ).tqarg( query );
   } else {
     result += (startsWith ? "%1=%2*" : "%1=*%2*");
     if ( attr == i18n( "Email" ) ) {
-      result = result.arg( "mail" ).arg( query );
+      result = result.tqarg( "mail" ).tqarg( query );
     } else if ( attr == i18n( "Home Number" ) ) {
-      result = result.arg( "homePhone" ).arg( query );
+      result = result.tqarg( "homePhone" ).tqarg( query );
     } else if ( attr == i18n( "Work Number" ) ) {
-      result = result.arg( "telephoneNumber" ).arg( query );
+      result = result.tqarg( "telephoneNumber" ).tqarg( query );
     } else {
       // Error?
       result = TQString();