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

This reverts commit 650c190e4a29a2a17fd46b32ce78b956b9816215.

1 files changed, 24 insertions, 24 deletions

diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp
index f1ff1ac..fc2d113 100644
--- a/kipi-plugins/acquireimages/acquireimagedialog.cpp
+++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp
@@ -38,7 +38,7 @@ extern "C"
 
 #undef Unsorted // x headers suck - make qdir.h work with --enable-final
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdir.h>
 #include <tqwidget.h>
 #include <tqlabel.h>
@@ -46,7 +46,7 @@ extern "C"
 #include <tqgroupbox.h>
 #include <tqstring.h>
 #include <tqwhatsthis.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
 #include <tqcombobox.h>
@@ -211,8 +211,8 @@ void AcquireImageDialog::setupImageOptions(void)
 
     m_preview = new TQLabel( groupBox1, "preview" );
     m_preview->setFixedHeight( 120 );
-    m_preview->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
-    m_preview->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+    m_preview->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_preview->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
     TQWhatsThis::add( m_preview, i18n( "<p>The preview of the target image." ) );
     m_preview->setScaledContents( false );
     TQImage scanned = m_qimageScanned.smoothScale((m_qimageScanned.width() * 100) / m_qimageScanned.height(), 100);
@@ -227,12 +227,12 @@ void AcquireImageDialog::setupImageOptions(void)
 
     TQGroupBox * groupBox2 = new TQGroupBox( i18n("Saving Options"), page_setupImageOptions );
     groupBox2->setColumnLayout(0, Qt::Vertical );
-    groupBox2->layout()->setSpacing( 6 );
-    groupBox2->layout()->setMargin( 11 );
+    groupBox2->tqlayout()->setSpacing( 6 );
+    groupBox2->tqlayout()->setMargin( 11 );
     TQWhatsThis::add( groupBox2, i18n("<p>The saving options of the target image.") );
 
-    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() );
-    groupBox2Layout->setAlignment( TQt::AlignTop );
+    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
+    groupBox2Layout->tqsetAlignment( TQt::AlignTop );
 
     m_imageCompression = new KIntNumInput(75, groupBox2);
     m_imageCompression->setRange(1, 100, 1, true );
@@ -327,27 +327,27 @@ void AcquireImageDialog::setupAlbumsList(void)
 
     TQGroupBox * groupBox2 = new TQGroupBox( i18n("Album Description"), page_setupAlbumsList );
     groupBox2->setColumnLayout(0, Qt::Vertical );
-    groupBox2->layout()->setSpacing( 6 );
-    groupBox2->layout()->setMargin( 11 );
+    groupBox2->tqlayout()->setSpacing( 6 );
+    groupBox2->tqlayout()->setMargin( 11 );
     TQWhatsThis::add( groupBox2, i18n("<p>The description of the current Album in the selection list.") );
 
-    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() );
-    groupBox2Layout->setAlignment( TQt::AlignTop );
+    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
+    groupBox2Layout->tqsetAlignment( TQt::AlignTop );
 
     m_AlbumComments = new KSqueezedTextLabel( groupBox2 );
-    m_AlbumComments->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    m_AlbumComments->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
     groupBox2Layout->addWidget( m_AlbumComments );
 
     m_AlbumCollection = new KSqueezedTextLabel( groupBox2 );
-    m_AlbumCollection->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    m_AlbumCollection->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
     groupBox2Layout->addWidget( m_AlbumCollection );
 
     m_AlbumDate = new KSqueezedTextLabel( groupBox2 );
-    m_AlbumDate->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    m_AlbumDate->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
     groupBox2Layout->addWidget( m_AlbumDate );
 
     m_AlbumItems = new KSqueezedTextLabel( groupBox2 );
-    m_AlbumItems->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    m_AlbumItems->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
     groupBox2Layout->addWidget( m_AlbumItems );
 
     vlay->addWidget( groupBox2 );
@@ -390,10 +390,10 @@ void AcquireImageDialog::slotAlbumSelected( const KURL &url )
        items.setNum((*albumIt).images().count());
     }
         
-    m_AlbumComments->setText( i18n("Caption: %1").arg(comments) );
-    m_AlbumCollection->setText( i18n("Collection: %1").arg(category) );
-    m_AlbumDate->setText( i18n("Date: %1").arg(date) );
-    m_AlbumItems->setText( i18n("Items: %1").arg( items ) );
+    m_AlbumComments->setText( i18n("Caption: %1").tqarg(comments) );
+    m_AlbumCollection->setText( i18n("Collection: %1").tqarg(category) );
+    m_AlbumDate->setText( i18n("Date: %1").tqarg(date) );
+    m_AlbumItems->setText( i18n("Items: %1").tqarg( items ) );
 }
 
 void AcquireImageDialog::slotOk()
@@ -432,7 +432,7 @@ void AcquireImageDialog::slotOk()
     {
         for (int idx = 1; idx < 100 ; ++idx) 
         {
-            url.setFileName(TQString("%1_%2%3").arg(fileName).arg(idx).arg(ext));
+            url.setFileName(TQString("%1_%2%3").tqarg(fileName).tqarg(idx).tqarg(ext));
             kdDebug(51001) << "File already exist. Try to fixed target Url to: " << url.prettyURL() << endl;
             
             if (!KIO::NetAccess::exists(url, false NETACCESS_WIDGET)) 
@@ -471,7 +471,7 @@ void AcquireImageDialog::slotOk()
 
     if ( !ok )
     {
-       KMessageBox::error(this, i18n("Cannot write image file \"%1\".").arg(imagePath));
+       KMessageBox::error(this, i18n("Cannot write image file \"%1\".").tqarg(imagePath));
        return;
     }
 
@@ -480,7 +480,7 @@ void AcquireImageDialog::slotOk()
     {
         if (!KIO::NetAccess::upload(imagePath, url NETACCESS_WIDGET)) 
         {
-           KMessageBox::error(this, i18n("Could not upload image to \"%1\".").arg(url.prettyURL()));
+           KMessageBox::error(this, i18n("Could not upload image to \"%1\".").tqarg(url.prettyURL()));
            return;
         }
     }
@@ -491,7 +491,7 @@ void AcquireImageDialog::slotOk()
     if ( !ok ) 
     {
         KMessageBox::error(this, i18n("<qt>Error when informing the application about the new image. "
-                                  "The error was: %1</qt>" ).arg( err ) );
+                                  "The error was: %1</qt>" ).tqarg( err ) );
         return;
     }