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.
---
 kaddressbook/keywidget.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'kaddressbook/keywidget.cpp')

diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 775401c74..739672fc7 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -23,7 +23,7 @@
 
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 #include <kapplication.h>
@@ -41,25 +41,25 @@
 KeyWidget::KeyWidget( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 4, 2, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Keys:" ), this );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mKeyCombo = new KComboBox( this );
-  layout->addWidget( mKeyCombo, 0, 1 );
+  tqlayout->addWidget( mKeyCombo, 0, 1 );
 
   mAddButton = new TQPushButton( i18n( "Add..." ), this );
-  layout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 );
+  tqlayout->addMultiCellWidget( mAddButton, 1, 1, 0, 1 );
 
   mRemoveButton = new TQPushButton( i18n( "Remove" ), this );
   mRemoveButton->setEnabled( false );
-  layout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( mRemoveButton, 2, 2, 0, 1 );
 
   mExportButton = new TQPushButton( i18n( "Export..." ), this );
   mExportButton->setEnabled( false );
-  layout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 );
+  tqlayout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 );
 
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addKey() ) );
   connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeKey() ) );
@@ -122,7 +122,7 @@ void KeyWidget::addKey()
     TQFile file( tmpFile );
     if ( !file.open( IO_ReadOnly ) ) {
       TQString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) );
-      KMessageBox::error( this, text.arg( url.url() ) );
+      KMessageBox::error( this, text.tqarg( url.url() ) );
       return;
     }
 
@@ -154,7 +154,7 @@ void KeyWidget::removeKey()
 
   TQString type = mKeyCombo->currentText();
   TQString text = i18n( "<qt>Do you really want to remove the key <b>%1</b>?</qt>" );
-  if ( KMessageBox::warningContinueCancel( this, text.arg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel )
+  if ( KMessageBox::warningContinueCancel( this, text.tqarg( type ), "", KGuiItem( i18n("&Delete"), "editdelete") ) == KMessageBox::Cancel )
     return;
 
   mKeyList.remove( mKeyList.at( pos ) );
-- 
cgit v1.2.1