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

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.

1 files changed, 18 insertions, 18 deletions

diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index 075a8235..756ace69 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -38,12 +38,12 @@
 #include <tqfileinfo.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 // KDE include files
 #include <kconfig.h>
 #include <kdebug.h>
@@ -66,7 +66,7 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
 
   TQString temp;
 
-  TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
+  TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
 
   // Set the label's text depending on the SVN command.
   switch ( cmd ) {
@@ -89,11 +89,11 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
       temp = i18n( "Get information for the following files:" );
       break;
   }
-  layout->addWidget( new TQLabel( temp, this ) );
+  tqlayout->addWidget( new TQLabel( temp, this ) );
 
   // Widget for showing the list of files.
   filebox = new TQListBox( this );
-  layout->addWidget( filebox );
+  tqlayout->addWidget( filebox );
 
   // Add special widgets for 'svn commit'.
   if ( cmd == SVN::Commit ) {
@@ -104,15 +104,15 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
     oldMessages = new TQComboBox( this );
     oldMessages->setDuplicatesEnabled( false );
     label->setBuddy( oldMessages );
-    layout->addWidget( label );
-    layout->addWidget( oldMessages );
+    tqlayout->addWidget( label );
+    tqlayout->addWidget( oldMessages );
 
     // Textfield for entering a log message.
     label = new TQLabel( i18n( "&Log message:" ), this );
     logedit = new TQTextEdit( this );
     label->setBuddy( logedit );
-    layout->addWidget( label );
-    layout->addWidget( logedit );
+    tqlayout->addWidget( label );
+    tqlayout->addWidget( logedit );
 
     connect( oldMessages, TQT_SIGNAL( activated( int ) ),
       this, TQT_SLOT( slotComboActivated( int ) ) );
@@ -151,19 +151,19 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
 
   cancelBtn = new TQPushButton( i18n( "C&ancel" ), this );
   buttons->addWidget( cancelBtn );
-  layout->addLayout( buttons );
+  tqlayout->addLayout( buttons );
 
   TQFrame * line = new TQFrame( this );
   line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
-  layout->addWidget( line );
+  tqlayout->addWidget( line );
 
-  layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
+  tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
 
   output = new TQTextEdit( this );
   output->setReadOnly( true );
-  layout->addWidget( output );
+  tqlayout->addWidget( output );
 
-  resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
+  resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) );
 
   if ( cmd == SVN::Commit )
     logedit->setFocus( );
@@ -327,7 +327,7 @@ void SVNDialog::slotProcessStderr( KProcess*, char * buffer, int len )
 void SVNDialog::slotProcessExited( KProcess * p )
 {
   if ( p->exitStatus( ) )
-    output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) );
+    output->append( i18n( "[ Exited with status %1 ]" ).tqarg( p->exitStatus( ) ) );
   else
     output->append( i18n( "[ Finished ]" ) );
 
@@ -362,9 +362,9 @@ void SVNDialog::readSettings( )
     m_logMessages.clear();
     m_squeezedLogMessages.clear();
     for ( int cnt = 0; cnt < 10; cnt++ )
-      if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) )
+      if ( config->hasKey( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ) )
       {
-        const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) );
+        const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ) );
         if ( !logMessage.isEmpty() )
         {
           // If the message is too long, cut it to 80 characters (or the combo box becomes too wide)
@@ -390,7 +390,7 @@ void SVNDialog::saveSettings( )
     int cnt = 0;
     TQStringList::const_iterator it;
     for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt )
-      config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it );
+      config->writeEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ), *it );
   }
   m_config->sync();
 }