From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:50 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
---
 kitchensync/src/configguildap.cpp | 48 +++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'kitchensync/src/configguildap.cpp')

diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp
index 18c9aebc..fd9dad4b 100644
--- a/kitchensync/src/configguildap.cpp
+++ b/kitchensync/src/configguildap.cpp
@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 #include <tqdom.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 
 #include <kcombobox.h>
@@ -93,26 +93,26 @@ TQString ConfigGuiLdap::save() const
 {
   TQString config = "<config>\n";
 
-  config += TQString( "<servername>%1</servername>\n" ).arg( mLdapWidget->host() );
-  config += TQString( "<serverport>%1</serverport>\n" ).arg( mLdapWidget->port() );
-  config += TQString( "<binddn>%1</binddn>\n" ).arg( mLdapWidget->bindDN() );
-  config += TQString( "<password>%1</password>\n" ).arg( mLdapWidget->password() );
-  config += TQString( "<anonymous>%1</anonymous>\n" ).arg( mLdapWidget->isAuthAnon() ? "1" : "0" );
-  config += TQString( "<searchbase>%1</searchbase>\n" ).arg( mLdapWidget->dn() );
-  config += TQString( "<searchfilter>%1</searchfilter>\n" ).arg( mLdapWidget->filter() );
-  config += TQString( "<storebase>%1</storebase>\n" ).arg( mLdapWidget->dn() );
-  config += TQString( "<keyattr>%1</keyattr>\n" ).arg( mKeyAttribute->text() );
+  config += TQString( "<servername>%1</servername>\n" ).tqarg( mLdapWidget->host() );
+  config += TQString( "<serverport>%1</serverport>\n" ).tqarg( mLdapWidget->port() );
+  config += TQString( "<binddn>%1</binddn>\n" ).tqarg( mLdapWidget->bindDN() );
+  config += TQString( "<password>%1</password>\n" ).tqarg( mLdapWidget->password() );
+  config += TQString( "<anonymous>%1</anonymous>\n" ).tqarg( mLdapWidget->isAuthAnon() ? "1" : "0" );
+  config += TQString( "<searchbase>%1</searchbase>\n" ).tqarg( mLdapWidget->dn() );
+  config += TQString( "<searchfilter>%1</searchfilter>\n" ).tqarg( mLdapWidget->filter() );
+  config += TQString( "<storebase>%1</storebase>\n" ).tqarg( mLdapWidget->dn() );
+  config += TQString( "<keyattr>%1</keyattr>\n" ).tqarg( mKeyAttribute->text() );
 
   TQStringList scopes;
   scopes << "base" << "one" << "sub";
 
-  config += TQString( "<scope>%1</scope>\n" ).arg( scopes[ mSearchScope->currentItem() ] );
+  config += TQString( "<scope>%1</scope>\n" ).tqarg( scopes[ mSearchScope->currentItem() ] );
 
   config += TQString( "<authmech>SIMPLE</authmech>\n" );
-  config += TQString( "<encryption>%1</encryption>\n" ).arg( mEncryption->isChecked() ? "1" : "0" );
+  config += TQString( "<encryption>%1</encryption>\n" ).tqarg( mEncryption->isChecked() ? "1" : "0" );
 
-  config += TQString( "<ldap_read>%1</ldap_read>\n" ).arg( mReadLdap->isChecked() ? "1" : "0" );
-  config += TQString( "<ldap_write>%1</ldap_write>\n" ).arg( mWriteLdap->isChecked() ? "1" : "0" );
+  config += TQString( "<ldap_read>%1</ldap_read>\n" ).tqarg( mReadLdap->isChecked() ? "1" : "0" );
+  config += TQString( "<ldap_write>%1</ldap_write>\n" ).tqarg( mWriteLdap->isChecked() ? "1" : "0" );
 
   config += "</config>";
 
@@ -121,8 +121,8 @@ TQString ConfigGuiLdap::save() const
 
 void ConfigGuiLdap::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
-  layout->setMargin( KDialog::marginHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
+  tqlayout->setMargin( KDialog::marginHint() );
 
   mLdapWidget = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_HOST |
                                             KABC::LdapConfigWidget::W_PORT |
@@ -139,14 +139,14 @@ void ConfigGuiLdap::initGUI()
   mReadLdap = new TQCheckBox( i18n( "Load data from LDAP" ), this );
   mWriteLdap = new TQCheckBox( i18n( "Save data to LDAP" ), this );
 
-  layout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 );
-  layout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 );
-  layout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 );
-  layout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 );
-  layout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 );
-  layout->addWidget( mEncryption, 12, 0 );
-  layout->addWidget( mReadLdap, 13, 0 );
-  layout->addWidget( mWriteLdap, 13, 3 );
+  tqlayout->addMultiCellWidget( mLdapWidget, 0, 9, 0, 3 );
+  tqlayout->addWidget( new TQLabel( i18n( "Key Attribute:" ), this ), 10, 0 );
+  tqlayout->addMultiCellWidget( mKeyAttribute, 10, 10, 1, 2 );
+  tqlayout->addWidget( new TQLabel( i18n( "Search Scope:" ), this ), 11, 0 );
+  tqlayout->addMultiCellWidget( mSearchScope, 11, 11, 1, 2 );
+  tqlayout->addWidget( mEncryption, 12, 0 );
+  tqlayout->addWidget( mReadLdap, 13, 0 );
+  tqlayout->addWidget( mWriteLdap, 13, 3 );
 
 }
 
-- 
cgit v1.2.3