Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 19 insertions, 19 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index f0b45f5b..bb2408f7 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -25,11 +25,11 @@
 #include <unistd.h> // for usleep
 #include <tqeventloop.h>
 
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqptrlist.h>
 #include <tqwidgetstack.h>
 #include <tqregexp.h>
@@ -114,7 +114,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
     mAddressBook = new KABC::AddressBook;
     mAddressBook->addResource( new KABC::ResourceFile( file ) );
     if ( !mAddressBook->load() ) {
-      KMessageBox::error( parent, i18n("Unable to load '%1'.").arg( file ) );
+      KMessageBox::error( parent, i18n("Unable to load '%1'.").tqarg( file ) );
     }
   }
   mAddressBook->setErrorHandler( new KABC::GuiErrorHandler( mWidget ) );
@@ -430,10 +430,10 @@ void KABCore::setContactSelected( const TQString &uid )
   mActionMerge->setEnabled( ( list.size() == 2 ) && writable );
 
   if ( mReadWrite ) {
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
 #if defined(KABC_VCARD_ENCODING_FIX)
     const TQMimeSource *data = cb->data( TQClipboard::Clipboard );
-    list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) );
+    list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) );
 #else
     list = AddresseeUtil::clipboardToAddressees( cb->text() );
 #endif
@@ -552,11 +552,11 @@ void KABCore::copyContacts()
 
 #if defined(KABC_VCARD_ENCODING_FIX)
   TQByteArray clipText = AddresseeUtil::addresseesToClipboard( addrList );
-  TQClipboard *cb = TQApplication::clipboard();
+  TQClipboard *cb = TQApplication::tqclipboard();
   cb->setText( TQString::fromUtf8( clipText.data() ) );
 #else
   TQString clipText = AddresseeUtil::addresseesToClipboard( addrList );
-  TQClipboard *cb = TQApplication::clipboard();
+  TQClipboard *cb = TQApplication::tqclipboard();
   cb->setText( clipText );
 #endif
 }
@@ -575,10 +575,10 @@ void KABCore::cutContacts()
 
 void KABCore::pasteContacts()
 {
-  TQClipboard *cb = TQApplication::clipboard();
+  TQClipboard *cb = TQApplication::tqclipboard();
 #if defined(KABC_VCARD_ENCODING_FIX)
   const TQMimeSource *data = cb->data( TQClipboard::Clipboard );
-  KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) );
+  KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) );
 #else
   KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() );
 #endif
@@ -640,7 +640,7 @@ void KABCore::setWhoAmI()
   }
 
   TQString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) );
-  if ( KMessageBox::questionYesNo( mWidget, text.arg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes )
+  if ( KMessageBox::questionYesNo( mWidget, text.tqarg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes )
     static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self( true ) )->setWhoAmI( addrList[ 0 ] );
 }
 
@@ -661,7 +661,7 @@ void KABCore::incrementalJumpButtonSearch( const TQString& character )
     KABC::AddresseeList::ConstIterator it;
     const KABC::AddresseeList::ConstIterator endIt( list.end() );
     for ( it = list.begin(); it != endIt; ++it ) {
-      if ( field->value( *it ).startsWith( character, false ) ) {
+      if ( field->value( *it ).tqstartsWith( character, false ) ) {
         mViewManager->setSelected( (*it).uid(), true );
         return;
       }
@@ -720,7 +720,7 @@ void KABCore::newDistributionList()
     bool foundUnused = false;
     int i = 1;
     while ( !foundUnused ) {
-      name = i18n( "New Distribution List (%1)" ).arg( i++ );
+      name = i18n( "New Distribution List (%1)" ).tqarg( i++ );
       foundUnused = KPIM::DistributionList::findByName( addressBook(), name ).isEmpty();
     }
   }
@@ -897,7 +897,7 @@ void KABCore::save()
     if ( ticket ) {
       if ( !mAddressBook->save( ticket ) ) {
         KMessageBox::error( mWidget,
-                            i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).arg( it.current()->resourceName() ) );
+                            i18n( "<qt>Unable to save address book <b>%1</b>.</qt>" ).tqarg( it.current()->resourceName() ) );
         mAddressBook->releaseSaveTicket( ticket );
       } else {
         setModified( false );
@@ -905,7 +905,7 @@ void KABCore::save()
     } else {
       KMessageBox::error( mWidget,
                           i18n( "<qt>Unable to get access for saving the address book <b>%1</b>.</qt>" )
-                          .arg( it.current()->resourceName() ) );
+                          .tqarg( it.current()->resourceName() ) );
     }
 
     ++it;
@@ -1224,7 +1224,7 @@ void KABCore::initGUI()
   viewLayout->setSpacing( KDialog::spacingHint() );
 
   mViewHeaderLabel = new TQLabel( viewWidget );
-//  mViewHeaderLabel->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
+//  mViewHeaderLabel->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
   mViewHeaderLabel->setText( i18n( "Contacts" ) );
   viewLayout->addWidget( mViewHeaderLabel );
   mViewManager = new ViewManager( this, viewWidget );
@@ -1311,7 +1311,7 @@ void KABCore::createJumpButtonBar()
 
 void KABCore::initActions()
 {
-  connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
+  connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
            TQT_SLOT( clipboardDataChanged() ) );
 
   KAction *action;
@@ -1432,7 +1432,7 @@ void KABCore::initActions()
 void KABCore::clipboardDataChanged()
 {
   if ( mReadWrite )
-    mActionPaste->setEnabled( !TQApplication::clipboard()->text().isEmpty() );
+    mActionPaste->setEnabled( !TQApplication::tqclipboard()->text().isEmpty() );
 }
 
 void KABCore::updateIncSearchWidget()
@@ -1634,7 +1634,7 @@ void KABCore::removeSelectedContactsFromDistList()
                "<b>Note:</b>The contacts will be not be removed from your addressbook nor from "
                "any other distribution list."
                "</qt>",
-               uids.count() ).arg( mSelectedDistributionList ),
+               uids.count() ).tqarg( mSelectedDistributionList ),
          names, TQString(), KStdGuiItem::del() ) == KMessageBox::Cancel ) {
     return;
   }
@@ -1729,7 +1729,7 @@ void KABCore::setSelectedDistributionList( const TQString &name )
   mSearchManager->setSelectedDistributionList( name );
   mViewHeaderLabel->setText( name.isNull() ?
                              i18n( "Contacts" ) :
-                             i18n( "Distribution List: %1" ).arg( name ) );
+                             i18n( "Distribution List: %1" ).tqarg( name ) );
   mDistListButtonWidget->setShown( !mSelectedDistributionList.isNull() );
   if ( !name.isNull() ) {
     mDetailsStack->raiseWidget( mDistListEntryView );