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

3 files changed, 45 insertions, 45 deletions

diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp
index 2dd7ca2..4124fb4 100644
--- a/kipi-plugins/findimages/displaycompare.cpp
+++ b/kipi-plugins/findimages/displaycompare.cpp
@@ -32,7 +32,7 @@
 #include <tqlistview.h>
 #include <tqcheckbox.h>
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfileinfo.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
@@ -167,29 +167,29 @@ DisplayCompare::DisplayCompare(TQWidget* parent, KIPI::Interface* interface,
     //---------------------------------------------
 
     GroupBox1 = new TQGroupBox( 1, Qt::Horizontal, i18n("Original Files"), box );
-    GroupBox1->tqlayout()->setSpacing( 6 );
-    GroupBox1->tqlayout()->setMargin( 11 );
+    GroupBox1->layout()->setSpacing( 6 );
+    GroupBox1->layout()->setMargin( 11 );
 
     OriginalNameLabel = new KSqueezedTextLabel( GroupBox1, "OriginalNameLabel" );
     OriginalNameLabel->setFrameShape( TQLabel::Box );
-    OriginalNameLabel->tqsetAlignment( int( TQLabel::AlignCenter ) );
+    OriginalNameLabel->setAlignment( int( TQLabel::AlignCenter ) );
 
     preview1 = new TQLabel( GroupBox1, "preview1" );
     preview1->setFixedHeight( 120 );
-    preview1->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
-    preview1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+    preview1->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+    preview1->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
     TQWhatsThis::add( preview1, i18n( "<p>The preview of files with duplicates." ) );
 
     originalInfoLabel1 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel1" );
-    originalInfoLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) );
+    originalInfoLabel1->setAlignment( int( TQLabel::AlignCenter ) );
     originalInfoLabel2 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel2" );
-    originalInfoLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) );
+    originalInfoLabel2->setAlignment( int( TQLabel::AlignCenter ) );
     originalInfoLabel3 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel3" );
-    originalInfoLabel3->tqsetAlignment( int( TQLabel::AlignCenter ) );
+    originalInfoLabel3->setAlignment( int( TQLabel::AlignCenter ) );
     originalInfoLabel4 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel4" );
-    originalInfoLabel4->tqsetAlignment( int( TQLabel::AlignCenter ) );
+    originalInfoLabel4->setAlignment( int( TQLabel::AlignCenter ) );
     originalInfoLabel5 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel5" );
-    originalInfoLabel5->tqsetAlignment( int( TQLabel::AlignCenter ) );
+    originalInfoLabel5->setAlignment( int( TQLabel::AlignCenter ) );
 
     listName = new KListView( GroupBox1, "listName" );
     listName->header()->setLabel( 0, i18n( "Files" ) );
@@ -202,29 +202,29 @@ DisplayCompare::DisplayCompare(TQWidget* parent, KIPI::Interface* interface,
     //---------------------------------------------
 
     GroupBox2 = new TQGroupBox( 1, Qt::Horizontal, i18n("Similar Files"), box );
-    GroupBox2->tqlayout()->setSpacing( 6 );
-    GroupBox2->tqlayout()->setMargin( 11 );
+    GroupBox2->layout()->setSpacing( 6 );
+    GroupBox2->layout()->setMargin( 11 );
 
     similarNameLabel = new KSqueezedTextLabel( GroupBox2, "similarNameLabel" );
     similarNameLabel->setFrameShape( TQLabel::Box );
-    similarNameLabel->tqsetAlignment( int( TQLabel::AlignCenter ) );
+    similarNameLabel->setAlignment( int( TQLabel::AlignCenter ) );
 
     preview2 = new TQLabel( GroupBox2, "preview2" );
     preview2->setFixedHeight( 120 );
-    preview2->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
-    preview2->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+    preview2->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+    preview2->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
     TQWhatsThis::add( preview2, i18n( "<p>The preview of duplicate files." ) );
 
     similarInfoLabel1 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel1" );
-    similarInfoLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) );
+    similarInfoLabel1->setAlignment( int( TQLabel::AlignCenter ) );
     similarInfoLabel2 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel2" );
-    similarInfoLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) );
+    similarInfoLabel2->setAlignment( int( TQLabel::AlignCenter ) );
     similarInfoLabel3 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel3" );
-    similarInfoLabel3->tqsetAlignment( int( TQLabel::AlignCenter ) );
+    similarInfoLabel3->setAlignment( int( TQLabel::AlignCenter ) );
     similarInfoLabel4 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel4" );
-    similarInfoLabel4->tqsetAlignment( int( TQLabel::AlignCenter ) );
+    similarInfoLabel4->setAlignment( int( TQLabel::AlignCenter ) );
     similarInfoLabel5 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel5" );
-    similarInfoLabel5->tqsetAlignment( int( TQLabel::AlignCenter ) );
+    similarInfoLabel5->setAlignment( int( TQLabel::AlignCenter ) );
 
     listEq = new KListView( GroupBox2, "listEq" );
     listEq->header()->setLabel( 0, i18n( "Files" ) );
@@ -308,7 +308,7 @@ void DisplayCompare::slotDelete( void )
            KURL deleteImage(item->fullpath());
 
            if ( KIO::NetAccess::del(deleteImage) == false )
-              KMessageBox::error(this, i18n("Cannot remove duplicate file:\n%1").tqarg(item->fullpath()));
+              KMessageBox::error(this, i18n("Cannot remove duplicate file:\n%1").arg(item->fullpath()));
            else
               m_interface->delImage( deleteImage );
 
@@ -329,7 +329,7 @@ void DisplayCompare::slotDelete( void )
            KURL deleteImage(item->fullpath());
 
            if ( KIO::NetAccess::del(deleteImage) == false )
-              KMessageBox::error(this, i18n("Cannot remove original file:\n%1").tqarg(item->fullpath()));
+              KMessageBox::error(this, i18n("Cannot remove original file:\n%1").arg(item->fullpath()));
 
            item->setOn( false );
            }
@@ -350,14 +350,14 @@ void DisplayCompare::slotDisplayLeft(TQListViewItem * item)
     if ( !im.isNull() )
        {
        OriginalNameLabel->setText(pitem->name());
-       originalInfoLabel1->setText(i18n("Image size: %1x%2 pixels").tqarg(im.width()).tqarg(im.height()));
+       originalInfoLabel1->setText(i18n("Image size: %1x%2 pixels").arg(im.width()).arg(im.height()));
        originalInfoLabel2->setText(i18n("File size: 1 byte",
                                         "File size: %n bytes",TQFileInfo(pitem->fullpath()).size()));
-       originalInfoLabel3->setText(i18n("Modified: %1").tqarg(KLocale(NULL)
+       originalInfoLabel3->setText(i18n("Modified: %1").arg(KLocale(NULL)
                                    .formatDateTime(TQFileInfo(pitem->fullpath())
                                    .lastModified())));
-       originalInfoLabel4->setText(i18n("Album: %1").tqarg(pitem->album()));
-       originalInfoLabel5->setText(i18n("Comments: %1").tqarg(pitem->comments()));
+       originalInfoLabel4->setText(i18n("Album: %1").arg(pitem->album()));
+       originalInfoLabel5->setText(i18n("Comments: %1").arg(pitem->comments()));
        }
 
     preview1->clear();
@@ -427,14 +427,14 @@ void DisplayCompare::slotDisplayRight(TQListViewItem * item)
     if ( !im.isNull() )
        {
        similarNameLabel->setText(pitem->name());
-       similarInfoLabel1->setText(i18n("Image size: %1x%2 pixels").tqarg(im.width()).tqarg(im.height()));
+       similarInfoLabel1->setText(i18n("Image size: %1x%2 pixels").arg(im.width()).arg(im.height()));
        similarInfoLabel2->setText(i18n("File size: 1 byte",
                                        "File size: %n bytes", TQFileInfo(pitem->fullpath()).size()));
-       similarInfoLabel3->setText(i18n("Modified: %1").tqarg(KLocale(NULL)
+       similarInfoLabel3->setText(i18n("Modified: %1").arg(KLocale(NULL)
                                                       .formatDateTime(TQFileInfo(pitem->fullpath())
                                                       .lastModified())));
-       similarInfoLabel4->setText(i18n("Album: %1").tqarg(pitem->album()));
-       similarInfoLabel5->setText(i18n("Caption: %1").tqarg(pitem->comments()));
+       similarInfoLabel4->setText(i18n("Album: %1").arg(pitem->album()));
+       similarInfoLabel5->setText(i18n("Caption: %1").arg(pitem->comments()));
        }
 
     preview2->clear();
diff --git a/kipi-plugins/findimages/finddupplicatedialog.cpp b/kipi-plugins/findimages/finddupplicatedialog.cpp
index 32e7d4b..e8326c3 100644
--- a/kipi-plugins/findimages/finddupplicatedialog.cpp
+++ b/kipi-plugins/findimages/finddupplicatedialog.cpp
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <tqvbox.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
@@ -126,9 +126,9 @@ void FindDuplicateDialog::setupSelection(void)
                                   i18n("Album's Selection"),
                                   BarIcon("folder_image", KIcon::SizeMedium));
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() );
+    TQVBoxLayout *layout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() );
     m_imageCollectionSelector = new KIPI::ImageCollectionSelector(page_setupSelection, m_interface);
-    tqlayout->addWidget(m_imageCollectionSelector);
+    layout->addWidget(m_imageCollectionSelector);
 }
 
 
@@ -145,8 +145,8 @@ void FindDuplicateDialog::setupPageMethod(void)
     //---------------------------------------------
 
     TQGroupBox * groupBox1 = new TQGroupBox( 2, Qt::Horizontal, i18n("Method"), page_setupMethod );
-    groupBox1->tqlayout()->setSpacing( 6 );
-    groupBox1->tqlayout()->setMargin( 11 );
+    groupBox1->layout()->setSpacing( 6 );
+    groupBox1->layout()->setMargin( 11 );
 
     TQLabel *m_labelsearchMethod = new TQLabel( i18n("Search method:"), groupBox1 );
     m_findMethod = new TQComboBox(false, groupBox1);
diff --git a/kipi-plugins/findimages/plugin_findimages.cpp b/kipi-plugins/findimages/plugin_findimages.cpp
index b169a4c..91a650a 100644
--- a/kipi-plugins/findimages/plugin_findimages.cpp
+++ b/kipi-plugins/findimages/plugin_findimages.cpp
@@ -143,26 +143,26 @@ void Plugin_FindImages::customEvent(TQCustomEvent *event)
         {
         case(KIPIFindDupplicateImagesPlugin::Similar):
             {
-                text = i18n("Similar comparison for '%1'").tqarg(TQFileInfo(d->fileName).fileName() );
+                text = i18n("Similar comparison for '%1'").arg(TQFileInfo(d->fileName).fileName() );
                 break;
             }
 
         case(KIPIFindDupplicateImagesPlugin::Exact):
             {
                 m_total = d->total;      // Needed because the total can change in this mode !
-                text = i18n("Exact comparison for '%1'").tqarg(TQFileInfo(d->fileName).fileName());
+                text = i18n("Exact comparison for '%1'").arg(TQFileInfo(d->fileName).fileName());
                 break;
             }
 
         case(KIPIFindDupplicateImagesPlugin::Matrix):
             {
-                text = i18n("Creating fingerprint for '%1'").tqarg(TQFileInfo(d->fileName).fileName());
+                text = i18n("Creating fingerprint for '%1'").arg(TQFileInfo(d->fileName).fileName());
                 break;
             }
 
         case(KIPIFindDupplicateImagesPlugin::FastParsing):
             {
-                text = i18n("Fast parsing for '%1'").tqarg(TQFileInfo(d->fileName).fileName());
+                text = i18n("Fast parsing for '%1'").arg(TQFileInfo(d->fileName).fileName());
                 break;
             }
 
@@ -192,7 +192,7 @@ void Plugin_FindImages::customEvent(TQCustomEvent *event)
             case(KIPIFindDupplicateImagesPlugin::Matrix):
                 {
                     text = i18n("Failed to create fingerprint for '%1'")
-                           .tqarg(TQFileInfo(d->fileName).fileName());
+                           .arg(TQFileInfo(d->fileName).fileName());
                     break;
                 }
 
@@ -232,28 +232,28 @@ void Plugin_FindImages::customEvent(TQCustomEvent *event)
             case(KIPIFindDupplicateImagesPlugin::Matrix):
                 {
                     text = i18n("Fingerprint created for '%1'")
-                           .tqarg(TQFileInfo(d->fileName).fileName());
+                           .arg(TQFileInfo(d->fileName).fileName());
                     break;
                 }
 
             case(KIPIFindDupplicateImagesPlugin::FastParsing):
                 {
                     text = i18n("Fast parsing completed for '%1'")
-                           .tqarg(TQFileInfo(d->fileName).fileName());
+                           .arg(TQFileInfo(d->fileName).fileName());
                     break;
                 }
 
             case(KIPIFindDupplicateImagesPlugin::Similar):
                 {
                     text = i18n("Finding similar images for '%1' completed.")
-                           .tqarg(TQFileInfo(d->fileName).fileName());
+                           .arg(TQFileInfo(d->fileName).fileName());
                     break;
                 }
 
             case(KIPIFindDupplicateImagesPlugin::Exact):
                 {
                     text = i18n("Finding exact images for '%1' completed.")
-                           .tqarg(TQFileInfo(d->fileName).fileName());
+                           .arg(TQFileInfo(d->fileName).fileName());
                     break;
                 }