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

153 files changed, 1029 insertions, 1029 deletions

diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp
index fc2d113..f1ff1ac 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 <tqlayout.h>
+#include <layout.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 <tqtextedit.h>
+#include <textedit.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->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
-    m_preview->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+    m_preview->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_preview->setSizePolicy( 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->tqlayout()->setSpacing( 6 );
-    groupBox2->tqlayout()->setMargin( 11 );
+    groupBox2->layout()->setSpacing( 6 );
+    groupBox2->layout()->setMargin( 11 );
     TQWhatsThis::add( groupBox2, i18n("<p>The saving options of the target image.") );
 
-    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
-    groupBox2Layout->tqsetAlignment( TQt::AlignTop );
+    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() );
+    groupBox2Layout->setAlignment( 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->tqlayout()->setSpacing( 6 );
-    groupBox2->tqlayout()->setMargin( 11 );
+    groupBox2->layout()->setSpacing( 6 );
+    groupBox2->layout()->setMargin( 11 );
     TQWhatsThis::add( groupBox2, i18n("<p>The description of the current Album in the selection list.") );
 
-    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
-    groupBox2Layout->tqsetAlignment( TQt::AlignTop );
+    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() );
+    groupBox2Layout->setAlignment( TQt::AlignTop );
 
     m_AlbumComments = new KSqueezedTextLabel( groupBox2 );
-    m_AlbumComments->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    m_AlbumComments->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
     groupBox2Layout->addWidget( m_AlbumComments );
 
     m_AlbumCollection = new KSqueezedTextLabel( groupBox2 );
-    m_AlbumCollection->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    m_AlbumCollection->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
     groupBox2Layout->addWidget( m_AlbumCollection );
 
     m_AlbumDate = new KSqueezedTextLabel( groupBox2 );
-    m_AlbumDate->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    m_AlbumDate->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
     groupBox2Layout->addWidget( m_AlbumDate );
 
     m_AlbumItems = new KSqueezedTextLabel( groupBox2 );
-    m_AlbumItems->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    m_AlbumItems->setAlignment( 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").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 ) );
+    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 ) );
 }
 
 void AcquireImageDialog::slotOk()
@@ -432,7 +432,7 @@ void AcquireImageDialog::slotOk()
     {
         for (int idx = 1; idx < 100 ; ++idx) 
         {
-            url.setFileName(TQString("%1_%2%3").tqarg(fileName).tqarg(idx).tqarg(ext));
+            url.setFileName(TQString("%1_%2%3").arg(fileName).arg(idx).arg(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\".").tqarg(imagePath));
+       KMessageBox::error(this, i18n("Cannot write image file \"%1\".").arg(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\".").tqarg(url.prettyURL()));
+           KMessageBox::error(this, i18n("Could not upload image to \"%1\".").arg(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>" ).tqarg( err ) );
+                                  "The error was: %1</qt>" ).arg( err ) );
         return;
     }
 
diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp
index 4e47f1a..f553fb8 100644
--- a/kipi-plugins/acquireimages/screenshotdialog.cpp
+++ b/kipi-plugins/acquireimages/screenshotdialog.cpp
@@ -32,7 +32,7 @@ extern "C"
 
 // Include files for TQt
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqfileinfo.h>
 #include <tqapplication.h>
@@ -75,7 +75,7 @@ ScreenGrabDialog::ScreenGrabDialog( KIPI::Interface* interface, TQWidget *parent
     m_inSelect = false;
     TQWidget* box = new TQWidget( this );
     setMainWidget(box);
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(box);
+    TQVBoxLayout *layout = new TQVBoxLayout(box);
 
     //---------------------------------------------
    
@@ -83,31 +83,31 @@ ScreenGrabDialog::ScreenGrabDialog( KIPI::Interface* interface, TQWidget *parent
                                      "application window. If you grab a single window your mouse\n"
                                      "cursor will change into crosshairs; then, simply select the\n"
                                      "window with your mouse."), box);
-    tqlayout->addWidget(label1);
+    layout->addWidget(label1);
 
     //---------------------------------------------
 
     m_desktopCB = new TQCheckBox(i18n("Grab the entire desktop"), box);
     TQWhatsThis::add( m_desktopCB, i18n( "<p>If you enable this option, the entire desktop will be grabbed; "
                                         "otherwise, only the active windows." ) );
-    tqlayout->addWidget(m_desktopCB);
+    layout->addWidget(m_desktopCB);
 
     //---------------------------------------------
 
     m_hideCB = new TQCheckBox(i18n("Hide all host application windows"), box);
     TQWhatsThis::add( m_hideCB, i18n( "<p>If you enable this option, all host application windows will be hidden "
                                      "during the grab operation." ) );
-    tqlayout->addWidget(m_hideCB);
+    layout->addWidget(m_hideCB);
 
     //---------------------------------------------
 
     TQLabel *label2 = new TQLabel(i18n("Delay:"), box);
-    tqlayout->addWidget(label2);
+    layout->addWidget(label2);
     m_delay = new KIntNumInput(box);
     TQWhatsThis::add( m_delay, i18n( "<p>The delay in seconds before the grab operation is started.") );
     m_delay->setRange(0, 60);
-    tqlayout->addWidget(m_delay);
-    tqlayout->addStretch(1);
+    layout->addWidget(m_delay);
+    layout->addStretch(1);
 
     //---------------------------------------------
 
@@ -201,7 +201,7 @@ void ScreenGrabDialog::slotGrab()
     m_hiddenWindows.clear();
     if (m_hideCB->isChecked())
     {
-        TQWidgetList  *list = TQApplication::tqtopLevelWidgets();
+        TQWidgetList  *list = TQApplication::topLevelWidgets();
         TQWidgetListIt it( *list );
         TQWidget * w;
         while ( (w=it.current()) != 0 )
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
index a07ba79..3c092c0 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
@@ -30,7 +30,7 @@ extern "C"
 // Include files for TQt
 
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdir.h>
 #include <tqwidget.h>
 #include <tqlabel.h>
@@ -41,7 +41,7 @@ extern "C"
 #include <tqprocess.h>
 #include <tqcolor.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqimage.h>
 #include <tqevent.h>
 #include <tqdragobject.h>
@@ -108,8 +108,8 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In
     m_tmpFolder = dir.saveLocation("tmp", "kipi-batchprocessimagesplugin-" +
                                    TQString::number(getpid()) );
 
-    m_converttqStatus  = NO_PROCESS;
-    m_progresstqStatus = 0;
+    m_convertStatus  = NO_PROCESS;
+    m_progressStatus = 0;
     m_ProcessusProc  = 0;
     m_PreviewProc    = 0;
 
@@ -122,9 +122,9 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In
 
     TQHBoxLayout *hlay = new TQHBoxLayout( dvlay );
     groupBox1 = new TQGroupBox( 0, Qt::Vertical, box );
-    groupBox1->tqlayout()->setSpacing(KDialog::spacingHint());
-    groupBox1->tqlayout()->setMargin(KDialog::marginHint());
-    TQGridLayout* grid = new TQGridLayout( groupBox1->tqlayout(), 2, 3);
+    groupBox1->layout()->setSpacing(KDialog::spacingHint());
+    groupBox1->layout()->setMargin(KDialog::marginHint());
+    TQGridLayout* grid = new TQGridLayout( groupBox1->layout(), 2, 3);
     m_labelType = new TQLabel( groupBox1 );
     grid->addMultiCellWidget(m_labelType, 0, 0, 0, 0);
 
@@ -207,7 +207,7 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In
     m_listFiles       = new BatchProcessImagesList( box41 );
     lay2->addWidget( m_listFiles );
 
-    m_listFiles->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding);
+    m_listFiles->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding);
 
     TQVBoxLayout* lay3 = new TQVBoxLayout( lay2 );
     m_addImagesButton = new TQPushButton ( i18n( "&Add..." ), box41 );
@@ -220,8 +220,8 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In
 
     m_imageLabel = new TQLabel( box41 );
     m_imageLabel->setFixedHeight( 80 );
-    m_imageLabel->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
-    m_imageLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+    m_imageLabel->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
     lay3->addWidget( m_imageLabel );
     TQWhatsThis::add( m_imageLabel, i18n( "<p>The preview of the selected image on the list." ) );
     lay3->addStretch( 1 );
@@ -406,7 +406,7 @@ void BatchProcessImagesDialog::slotProcessStart( void )
            return;
     }
 
-    m_converttqStatus = UNDER_PROCESS;
+    m_convertStatus = UNDER_PROCESS;
     disconnect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotProcessStart()));
     showButtonCancel( false );
     setButtonText( User1, i18n("&Stop") );
@@ -432,7 +432,7 @@ void BatchProcessImagesDialog::slotProcessStart( void )
 
 bool BatchProcessImagesDialog::startProcess(void)
 {
-    if ( m_converttqStatus == STOP_PROCESS )
+    if ( m_convertStatus == STOP_PROCESS )
     {
        endProcess();
        return true;
@@ -456,8 +456,8 @@ bool BatchProcessImagesDialog::startProcess(void)
     if ( prepareStartProcess(item, targetAlbum) == false ) // If there is a problem during the
     {                                                   // preparation -> pass to the next item!
         ++*m_listFile2Process_iterator;
-        ++m_progresstqStatus;
-        m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem));
+        ++m_progressStatus;
+        m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem));
         item = static_cast<BatchProcessImagesItem*>( m_listFile2Process_iterator->current() );
         m_listFiles->setCurrentItem(item);
     
@@ -487,7 +487,7 @@ bool BatchProcessImagesDialog::startProcess(void)
           {
              int ValRet = KMessageBox::warningYesNoCancel(this,
                           i18n("The destination file \"%1\" already exists;\n"
-                          "do you want overwrite it?").tqarg(item->nameDest()),
+                          "do you want overwrite it?").arg(item->nameDest()),
                           i18n("Overwrite Destination Image File"), KStdGuiItem::cont());
 
              if ( ValRet == KMessageBox::No )
@@ -495,8 +495,8 @@ bool BatchProcessImagesDialog::startProcess(void)
                 item->changeResult(i18n("Skipped."));
                 item->changeError(i18n("destination image file already exists (skipped by user)."));
                 ++*m_listFile2Process_iterator;
-                ++m_progresstqStatus;
-                m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem));
+                ++m_progressStatus;
+                m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem));
 
                 if ( m_listFile2Process_iterator->current() )
                 {
@@ -532,8 +532,8 @@ bool BatchProcessImagesDialog::startProcess(void)
                 item->changeResult(i18n("Failed."));
                 item->changeError(i18n("destination image file already exists and cannot be renamed."));
                 ++*m_listFile2Process_iterator;
-                ++m_progresstqStatus;
-                m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem));
+                ++m_progressStatus;
+                m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem));
 
                 if ( m_listFile2Process_iterator->current() )
                 {
@@ -560,8 +560,8 @@ bool BatchProcessImagesDialog::startProcess(void)
              item->changeResult(i18n("Skipped."));
              item->changeError(i18n("destination image file already exists (skipped automatically)."));
              ++*m_listFile2Process_iterator;
-             ++m_progresstqStatus;
-             m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem));
+             ++m_progressStatus;
+             m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem));
 
              if ( m_listFile2Process_iterator->current() )
              {
@@ -623,7 +623,7 @@ void BatchProcessImagesDialog::slotReadStd(KProcess* /*proc*/, char *buffer, int
 
 void BatchProcessImagesDialog::slotProcessDone(KProcess* proc)
 {
-    if ( m_converttqStatus == PROCESS_DONE )
+    if ( m_convertStatus == PROCESS_DONE )
     {
         // processAborted() has already been called. No need to show the warning.
         return;
@@ -647,8 +647,8 @@ void BatchProcessImagesDialog::slotProcessDone(KProcess* proc)
             item->changeResult(i18n("Failed."));
             item->changeError(i18n("'convert' program from 'ImageMagick' package has been stopped abnormally."));
             ++*m_listFile2Process_iterator;
-            ++m_progresstqStatus;
-            m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem));
+            ++m_progressStatus;
+            m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem));
     
             if ( m_listFile2Process_iterator->current() )
                 startProcess();
@@ -690,7 +690,7 @@ void BatchProcessImagesDialog::slotProcessDone(KProcess* proc)
                 {
                     int code = KMessageBox::warningContinueCancel( this,
                                             i18n("<qt>Error adding image to application; error message was: "
-                                            "<b>%1</b></qt>").tqarg( errmsg ),
+                                            "<b>%1</b></qt>").arg( errmsg ),
                                             i18n("Error Adding Image to Application") );
     
                     if ( code == KMessageBox::Cancel )
@@ -742,8 +742,8 @@ void BatchProcessImagesDialog::slotProcessDone(KProcess* proc)
     }
 
     ++*m_listFile2Process_iterator;
-    ++m_progresstqStatus;
-    m_progress->setValue((int)((float)m_progresstqStatus *(float)100 / (float)m_nbItem));
+    ++m_progressStatus;
+    m_progress->setValue((int)((float)m_progressStatus *(float)100 / (float)m_nbItem));
 
     if ( m_listFile2Process_iterator->current() )
         startProcess();
@@ -755,13 +755,13 @@ void BatchProcessImagesDialog::slotListDoubleClicked(TQListViewItem *itemClicked
 {
     BatchProcessImagesItem *item = static_cast<BatchProcessImagesItem*>( itemClicked );
 
-    if (m_converttqStatus == PROCESS_DONE)
+    if (m_convertStatus == PROCESS_DONE)
     {
        OutputDialog *infoDialog = new OutputDialog(this,
                                                    i18n("Image processing error"),
                                                    item->outputMess(),
                                                    i18n("Image \"%1\": %2\n\nThe output messages are:\n")
-                                                        .tqarg(item->nameSrc()).tqarg(item->error())
+                                                        .arg(item->nameSrc()).arg(item->error())
                                                    );
        infoDialog->exec();
     }
@@ -880,7 +880,7 @@ void BatchProcessImagesDialog::slotPreviewProcessDone(KProcess* proc)
                                                    m_previewOutput,
                                                    i18n("Cannot process preview for image \"%1\"."
                                                         "\nThe output messages are:\n")
-                                                        .tqarg(item->nameSrc())
+                                                        .arg(item->nameSrc())
                                                    );
        infoDialog->exec();
     }
@@ -902,7 +902,7 @@ void BatchProcessImagesDialog::slotProcessStop( void )
     if ( m_ProcessusProc->isRunning() == true ) m_ProcessusProc->kill(SIGTERM);
 
     // If kill operation failed, Stop the process at the next image !
-    if ( m_converttqStatus == UNDER_PROCESS ) m_converttqStatus = STOP_PROCESS;
+    if ( m_convertStatus == UNDER_PROCESS ) m_convertStatus = STOP_PROCESS;
 
     processAborted(true);
 }
@@ -1042,7 +1042,7 @@ void BatchProcessImagesDialog::processAborted(bool removeFlag)
 
 void BatchProcessImagesDialog::endProcess(void)
 {
-    m_converttqStatus = PROCESS_DONE;
+    m_convertStatus = PROCESS_DONE;
     setButtonText( User1, i18n("&Close") );
 
     disconnect(this, TQT_SIGNAL(user1Clicked()),
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h
index a606d1b..631046e 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.h
@@ -81,7 +81,7 @@ Q_OBJECT
 
  public:
    // Don't forget to add the 'm_Type' and 'm_labelType' implementation in the constructor of
-   // tqchildren dialog class.
+   // children dialog class.
 
    BatchProcessImagesDialog( KURL::List urlList, KIPI::Interface* interface, TQString caption, TQWidget *parent=0 );
    ~BatchProcessImagesDialog();
@@ -157,8 +157,8 @@ private slots:
    
    KConfig                *m_config;
 
-   int                     m_converttqStatus;
-   int                     m_progresstqStatus;
+   int                     m_convertStatus;
+   int                     m_progressStatus;
    int                     m_nbItem;
 
    KProcess               *m_ProcessusProc;
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp
index 6d69155..af5f2b8 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp
@@ -62,24 +62,24 @@ void BatchProcessImagesItem::changeError(TQString text)      { _error = text; }
 void BatchProcessImagesItem::changeNameDest(TQString text)   { _nameDest = text; setText(2, _nameDest); }
 void BatchProcessImagesItem::changeOutputMess(TQString text) { _outputMess.append(text); }
 
-void BatchProcessImagesItem::paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+void BatchProcessImagesItem::paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
 {
     TQColorGroup _cg( cg );
 
     if (text(3) != i18n("OK") && !text(3).isEmpty() )
        {
        _cg.setColor( TQColorGroup::Text, TQt::red );
-       KListViewItem::paintCell( p, _cg, column, width, tqalignment );
+       KListViewItem::paintCell( p, _cg, column, width, alignment );
        return;
        }
     if (text(3) == i18n("OK") )
        {
        _cg.setColor( TQColorGroup::Text, TQt::darkGreen );
-       KListViewItem::paintCell( p, _cg, column, width, tqalignment );
+       KListViewItem::paintCell( p, _cg, column, width, alignment );
        return;
        }
 
-    KListViewItem::paintCell( p, cg, column, width, tqalignment );
+    KListViewItem::paintCell( p, cg, column, width, alignment );
 }
 
 bool BatchProcessImagesItem::overWrote()
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesitem.h b/kipi-plugins/batchprocessimages/batchprocessimagesitem.h
index 60b12c4..d17f9e7 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesitem.h
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesitem.h
@@ -61,7 +61,7 @@ public:
     void changeNameDest(TQString text);
     void changeOutputMess(TQString text);
 
-    void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
+    void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
 
     void setKey(const TQString& val, bool reverseSort);
     TQString key(int column, bool ascending) const;
diff --git a/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp b/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp
index f9d4f19..808598e 100644
--- a/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp
+++ b/kipi-plugins/batchprocessimages/borderoptionsdialog.cpp
@@ -23,7 +23,7 @@
 // Include files for TQt
 
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
diff --git a/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp b/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp
index 832b1b8..548476e 100644
--- a/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp
+++ b/kipi-plugins/batchprocessimages/coloroptionsdialog.cpp
@@ -23,7 +23,7 @@
 // Include files for TQt
 
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
diff --git a/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp b/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp
index 395bba2..ac995e7 100644
--- a/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp
+++ b/kipi-plugins/batchprocessimages/convertoptionsdialog.cpp
@@ -23,7 +23,7 @@
 // Include files for TQt
 
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
diff --git a/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp b/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp
index 745d3f8..c28d84b 100644
--- a/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp
+++ b/kipi-plugins/batchprocessimages/effectoptionsdialog.cpp
@@ -23,7 +23,7 @@
 // Include files for TQt
 
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
diff --git a/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp b/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp
index d22c43a..f7f0982 100644
--- a/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp
+++ b/kipi-plugins/batchprocessimages/filteroptionsdialog.cpp
@@ -23,7 +23,7 @@
 // Include files for TQt
 
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp
index d3248bd..badbed5 100644
--- a/kipi-plugins/batchprocessimages/imagepreview.cpp
+++ b/kipi-plugins/batchprocessimages/imagepreview.cpp
@@ -36,7 +36,7 @@ extern "C"
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqslider.h>
@@ -80,8 +80,8 @@ int INIT_ZOOM_FACTOR;
 ImagePreview::ImagePreview(const TQString &fileOrig, const TQString &fileDest, const TQString &tmpPath,
                            bool cropActionOrig, bool cropActionDest, const TQString &EffectName,
                            const TQString &FileName, TQWidget *parent)
-            : KDialogBase( parent, "PreviewDialog", true, i18n("Batch Process Preview (%1 - %2)").tqarg(EffectName)
-                           .tqarg(FileName), Help|Ok, Ok, true)
+            : KDialogBase( parent, "PreviewDialog", true, i18n("Batch Process Preview (%1 - %2)").arg(EffectName)
+                           .arg(FileName), Help|Ok, Ok, true)
 {
     // About data and help button.
 
diff --git a/kipi-plugins/batchprocessimages/outputdialog.cpp b/kipi-plugins/batchprocessimages/outputdialog.cpp
index 2f12cbe..aaa77e2 100644
--- a/kipi-plugins/batchprocessimages/outputdialog.cpp
+++ b/kipi-plugins/batchprocessimages/outputdialog.cpp
@@ -22,8 +22,8 @@
 
 // TQt includes
 
-#include <tqtextview.h>
-#include <tqlayout.h>
+#include <textview.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqframe.h>
diff --git a/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp b/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp
index 21975da..401a5b8 100644
--- a/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp
+++ b/kipi-plugins/batchprocessimages/recompressoptionsdialog.cpp
@@ -23,7 +23,7 @@
 // Include files for TQt
 
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
diff --git a/kipi-plugins/batchprocessimages/renameimagesbase.ui b/kipi-plugins/batchprocessimages/renameimagesbase.ui
index 168625f..671a697 100644
--- a/kipi-plugins/batchprocessimages/renameimagesbase.ui
+++ b/kipi-plugins/batchprocessimages/renameimagesbase.ui
@@ -77,7 +77,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="4" column="0">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -93,7 +93,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>12</width>
                                     <height>14</height>
@@ -112,7 +112,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="1">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -139,7 +139,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>261</width>
                                     <height>21</height>
@@ -157,7 +157,7 @@
             <property name="title">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignTop|AlignHCenter</set>
             </property>
             <grid>
@@ -251,7 +251,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>175</height>
@@ -276,7 +276,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>19</height>
@@ -319,7 +319,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>96</width>
                             <height>96</height>
@@ -339,7 +339,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>19</height>
diff --git a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
index 6fc88cf..213e7b0 100644
--- a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
@@ -23,7 +23,7 @@
 
 // TQt includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 
 // KDE includes.
diff --git a/kipi-plugins/batchprocessimages/renameimageswidget.cpp b/kipi-plugins/batchprocessimages/renameimageswidget.cpp
index 8c04f80..4606cde 100644
--- a/kipi-plugins/batchprocessimages/renameimageswidget.cpp
+++ b/kipi-plugins/batchprocessimages/renameimageswidget.cpp
@@ -358,7 +358,7 @@ TQString RenameImagesWidget::oldToNewName(BatchProcessImagesItem* item,
         char s[100];
         ::strftime(s, 100, TQFile::encodeName(format), time_tm);
 
-        newName += TQString::tqfromLatin1(s);
+        newName += TQString::fromLatin1(s);
         newName += "_";
     }
 
@@ -378,7 +378,7 @@ TQString RenameImagesWidget::oldToNewName(BatchProcessImagesItem* item,
     seq.sprintf(format.latin1(), itemPosition + m_seqSpin->value());
     newName += seq;
 
-    newName += TQString::tqfromLatin1(".") + fi.extension();
+    newName += TQString::fromLatin1(".") + fi.extension();
     
     return newName;
 }
diff --git a/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp b/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp
index bc063dc..bf68fc1 100644
--- a/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp
+++ b/kipi-plugins/batchprocessimages/resizeoptionsdialog.cpp
@@ -23,7 +23,7 @@
 // Include files for TQt
 
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
diff --git a/kipi-plugins/calendar/caleventsbase.ui b/kipi-plugins/calendar/caleventsbase.ui
index d9aa2cb..0524bc8 100644
--- a/kipi-plugins/calendar/caleventsbase.ui
+++ b/kipi-plugins/calendar/caleventsbase.ui
@@ -34,7 +34,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -44,7 +44,7 @@
                     <property name="name">
                         <cstring>ohFileEdit</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>300</width>
                             <height>0</height>
@@ -77,7 +77,7 @@
                 <string>You can download a calendar for your country from http://www.icalshare.com/ or other sites.
 This is fully optional. All the events from this calendar will be printed red.</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -110,7 +110,7 @@ This is fully optional. All the events from this calendar will be printed red.</
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -120,7 +120,7 @@ This is fully optional. All the events from this calendar will be printed red.</
                     <property name="name">
                         <cstring>fhFileEdit</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>300</width>
                             <height>0</height>
@@ -161,7 +161,7 @@ This is fully optional. All the events from this calendar will be printed red.</
                 <string>You can create such a calendar using KOrganizer or any other calendar program.
 This is fully optional. All the events from this calendar will be printed green.</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -175,7 +175,7 @@ This is fully optional. All the events from this calendar will be printed green.
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>140</height>
diff --git a/kipi-plugins/calendar/calselect.cpp b/kipi-plugins/calendar/calselect.cpp
index c29809a..b362d51 100644
--- a/kipi-plugins/calendar/calselect.cpp
+++ b/kipi-plugins/calendar/calselect.cpp
@@ -22,7 +22,7 @@
 // TQt includes.
 
 #include <tqhgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqspinbox.h>
 #include <tqdatetime.h>
 #include <tqlabel.h>
@@ -68,13 +68,13 @@ void CalSelect::setupView( KIPI::Interface* interface )
 
     setCaption(i18n("Create Calendar"));
     TQHGroupBox *yearBox = new TQHGroupBox(i18n("Select Year"), this);
-    yearBox->tqlayout()->addItem(new TQSpacerItem(5,5,
+    yearBox->layout()->addItem(new TQSpacerItem(5,5,
                                                TQSizePolicy::Expanding,
                                                TQSizePolicy::Minimum));
     yearSpin_ = new TQSpinBox(KGlobal::locale()->calendar()->minValidYear(),
                              KGlobal::locale()->calendar()->maxValidYear(),
                              1,yearBox);
-    yearSpin_->setValue(KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()));
+    yearSpin_->setValue(KGlobal::locale()->calendar()->year(TQDate::currentDate()));
     slotYearChanged(yearSpin_->value());
 
     connect(yearSpin_, TQT_SIGNAL(valueChanged(int)),
@@ -86,11 +86,11 @@ void CalSelect::setupView( KIPI::Interface* interface )
 
     TQGroupBox *monthBox = new TQGroupBox(i18n("Select Images"), this);
     monthBox->setColumnLayout(0, Qt::Vertical );
-    monthBox->tqlayout()->setSpacing( 6 );
-    monthBox->tqlayout()->setMargin( 11 );
+    monthBox->layout()->setSpacing( 6 );
+    monthBox->layout()->setMargin( 11 );
 
-    monthBoxLayout_ = new TQGridLayout(monthBox->tqlayout());
-    monthBoxLayout_->tqsetAlignment( TQt::AlignCenter );
+    monthBoxLayout_ = new TQGridLayout(monthBox->layout());
+    monthBoxLayout_->setAlignment( TQt::AlignCenter );
 
     KURL::List urlList;
     KIPI::ImageCollection images = interface->currentSelection();
diff --git a/kipi-plugins/calendar/caltemplate.cpp b/kipi-plugins/calendar/caltemplate.cpp
index 21ccf88..3014a13 100644
--- a/kipi-plugins/calendar/caltemplate.cpp
+++ b/kipi-plugins/calendar/caltemplate.cpp
@@ -31,7 +31,7 @@
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
 #include <tqslider.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqfontdatabase.h>
 #include <tqpaintdevicemetrics.h>
@@ -65,9 +65,9 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name)
 
     TQGroupBox *boxPreview_ = new TQGroupBox( i18n("Preview"), this );
     boxPreview_->setColumnLayout(0, Qt::Vertical);
-    boxPreview_->tqlayout()->setMargin( 5 );
+    boxPreview_->layout()->setMargin( 5 );
 
-    TQVBoxLayout *previewLayout = new TQVBoxLayout(boxPreview_->tqlayout());
+    TQVBoxLayout *previewLayout = new TQVBoxLayout(boxPreview_->layout());
     calWidget_ = new CalWidget(boxPreview_);
     previewLayout->addWidget(calWidget_, 0, TQt::AlignCenter);
 
@@ -77,18 +77,18 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name)
 
     TQGroupBox *gbox = new TQGroupBox( i18n("Settings"), this );
     gbox->setColumnLayout(0, Qt::Vertical );
-    gbox->tqlayout()->setSpacing( 11 );
-    gbox->tqlayout()->setMargin( 6 );
-    TQVBoxLayout* gboxLayout = new TQVBoxLayout( gbox->tqlayout() );
+    gbox->layout()->setSpacing( 11 );
+    gbox->layout()->setMargin( 6 );
+    TQVBoxLayout* gboxLayout = new TQVBoxLayout( gbox->layout() );
 
     // ---------------------------------------------------------------
 
-    TQHBoxLayout *htqlayout = new TQHBoxLayout( 0, 0, 5 );
-    htqlayout->addWidget( new TQLabel(i18n("Paper size:"), gbox) );
+    TQHBoxLayout *hlayout = new TQHBoxLayout( 0, 0, 5 );
+    hlayout->addWidget( new TQLabel(i18n("Paper size:"), gbox) );
 
     comboPaperSize_ = new TQComboBox(false, gbox);
-    htqlayout->addWidget(comboPaperSize_);
-    gboxLayout->addLayout( htqlayout );
+    hlayout->addWidget(comboPaperSize_);
+    gboxLayout->addLayout( hlayout );
 
     TQStringList paperSizes;
     paperSizes << "A4";
@@ -131,29 +131,29 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name)
 
     // ---------------------------------------------------------------
 
-    htqlayout = new TQHBoxLayout( 0, 0, 5 );
+    hlayout = new TQHBoxLayout( 0, 0, 5 );
 
-    htqlayout->addWidget(new TQLabel(i18n("Image to text ratio:"), gbox));
+    hlayout->addWidget(new TQLabel(i18n("Image to text ratio:"), gbox));
 
     sliderRatio_ = new TQSlider(50,300,5,100,Qt::Horizontal,gbox);
-    htqlayout->addWidget( sliderRatio_ );
+    hlayout->addWidget( sliderRatio_ );
 
-    gboxLayout->addLayout( htqlayout );
+    gboxLayout->addLayout( hlayout );
 
     connect(sliderRatio_, TQT_SIGNAL(valueChanged(int)),
             TQT_SLOT(slotParamsChanged()));
 
     // ---------------------------------------------------------------
 
-    htqlayout = new TQHBoxLayout( 0, 0, 5 );
+    hlayout = new TQHBoxLayout( 0, 0, 5 );
 
-    htqlayout->addWidget(new TQLabel(i18n("Font:"), gbox));
+    hlayout->addWidget(new TQLabel(i18n("Font:"), gbox));
 
     comboFont_ = new TQComboBox(false, gbox);
-    htqlayout->addWidget( comboFont_ );
+    hlayout->addWidget( comboFont_ );
 
     TQFontDatabase fontDB;
-    TQStringList families(fontDB.tqfamilies());
+    TQStringList families(fontDB.families());
     TQStringList smoothScalableFamilies;
     for (TQStringList::iterator it=families.begin(); it != families.end();
          ++it)
@@ -167,7 +167,7 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name)
     comboFont_->setCurrentText( f.family() );
 
 
-    gboxLayout->addLayout( htqlayout );
+    gboxLayout->addLayout( hlayout );
 
     connect(comboFont_, TQT_SIGNAL(activated(int)),
             TQT_SLOT(slotParamsChanged()));
diff --git a/kipi-plugins/calendar/calwidget.cpp b/kipi-plugins/calendar/calwidget.cpp
index 235fb0f..9f40e39 100644
--- a/kipi-plugins/calendar/calwidget.cpp
+++ b/kipi-plugins/calendar/calwidget.cpp
@@ -48,7 +48,7 @@ namespace KIPICalendarPlugin
 CalWidget::CalWidget(TQWidget *parent)
     : TQWidget(parent,0,TQt::WRepaintNoErase|TQt::WResizeNoErase)
 {
-    tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     calPainter_ = 0;
     pix_ = new TQPixmap();
 }
@@ -78,8 +78,8 @@ void CalWidget::recreate()
     if (!calPainter_)
         calPainter_ = new CalPainter(TQT_TQPAINTDEVICE(pix_));
 
-    calPainter_->setYearMonth(KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()),
-                              KGlobal::locale()->calendar()->month(TQDate::tqcurrentDate()));
+    calPainter_->setYearMonth(KGlobal::locale()->calendar()->year(TQDate::currentDate()),
+                              KGlobal::locale()->calendar()->month(TQDate::currentDate()));
     calPainter_->paint();
     update();
 }
diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp
index 0ffc1a9..f6ab1e9 100644
--- a/kipi-plugins/calendar/calwizard.cpp
+++ b/kipi-plugins/calendar/calwizard.cpp
@@ -29,7 +29,7 @@
 #include <tqtimer.h>
 #include <tqpainter.h>
 #include <tqprogressbar.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqframe.h>
 #include <tqpixmap.h>
@@ -113,17 +113,17 @@ CalWizard::CalWizard( KIPI::Interface* interface, TQWidget *parent )
     wFinishLabel_ = new TQLabel(wFinish_);
     wFinishLayout->addWidget(wFinishLabel_);
 
-    TQHBoxLayout *hboxtqlayout = new TQHBoxLayout(0, 5, 5);
-    hboxtqlayout->addWidget(new TQLabel(i18n("Current Page"), wFinish_));
+    TQHBoxLayout *hboxlayout = new TQHBoxLayout(0, 5, 5);
+    hboxlayout->addWidget(new TQLabel(i18n("Current Page"), wFinish_));
     wFinishProgressCurrent_ = new TQProgressBar(wFinish_);
-    hboxtqlayout->addWidget(wFinishProgressCurrent_);
-    wFinishLayout->addLayout(hboxtqlayout);
+    hboxlayout->addWidget(wFinishProgressCurrent_);
+    wFinishLayout->addLayout(hboxlayout);
 
-    hboxtqlayout = new TQHBoxLayout(0, 5, 5);
-    hboxtqlayout->addWidget(new TQLabel(i18n("Total Pages"), wFinish_));
+    hboxlayout = new TQHBoxLayout(0, 5, 5);
+    hboxlayout->addWidget(new TQLabel(i18n("Total Pages"), wFinish_));
     wFinishProgressTotal_ = new TQProgressBar(wFinish_);
-    hboxtqlayout->addWidget(wFinishProgressTotal_);
-    wFinishLayout->addLayout(hboxtqlayout);
+    hboxlayout->addWidget(wFinishProgressTotal_);
+    wFinishLayout->addLayout(hboxlayout);
 
     wFinishLayout->addStretch();
 
@@ -215,9 +215,9 @@ void CalWizard::slotPageSelected(const TQString&)
             TQString year = TQString::number(cSettings_->getYear());
 
             TQString extra;
-            if ((KGlobal::locale()->calendar()->month(TQDate::tqcurrentDate()) >= 6 &&
-                 KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()) == cSettings_->getYear()) ||
-                KGlobal::locale()->calendar()->year(TQDate::tqcurrentDate()) > cSettings_->getYear())
+            if ((KGlobal::locale()->calendar()->month(TQDate::currentDate()) >= 6 &&
+                 KGlobal::locale()->calendar()->year(TQDate::currentDate()) == cSettings_->getYear()) ||
+                KGlobal::locale()->calendar()->year(TQDate::currentDate()) > cSettings_->getYear())
                 extra = "<br><br><b>"+i18n("Please note that you are making a "
                         "calendar for<br>the current year or a year in the "
                         "past.")+"</b>";
@@ -229,7 +229,7 @@ void CalWizard::slotPageSelected(const TQString&)
                     "of that part of the generation of the calendar.");
 
             wPrintLabel_->setText(i18n("Click Next to start Printing<br><br>"
-                                       "Following months will be printed for year %1:").tqarg(year)
+                                       "Following months will be printed for year %1:").arg(year)
                                   + TQString("<br>")
                              + printList.join(" - ") + extra + extra2);
             wPrintLabel_->setTextFormat(TQt::RichText);
@@ -320,12 +320,12 @@ void CalWizard::slotPrintOnePage()
 
 #if KDE_IS_VERSION(3,2,0)
     wFinishLabel_->setText(i18n("Printing Calendar Page for %1 of %2")
-                    .tqarg(KGlobal::locale()->calendar()->monthName(month, cSettings_->getYear(), false))
-                    .tqarg(yearName));
+                    .arg(KGlobal::locale()->calendar()->monthName(month, cSettings_->getYear(), false))
+                    .arg(yearName));
 #else
     wFinishLabel_->setText(i18n("Printing Calendar Page for %1 of %2")
-                     .tqarg(KGlobal::locale()->monthName(month)).
-                     .tqarg(yearName));
+                     .arg(KGlobal::locale()->monthName(month)).
+                     .arg(yearName));
 #endif
 
     currPage_++;
diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp
index 6019187..0a17245 100644
--- a/kipi-plugins/cdarchiving/cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/cdarchiving.cpp
@@ -36,8 +36,8 @@ extern "C"
 #include <tqfont.h>
 #include <tqimage.h>
 #include <tqregexp.h>
-#include <tqtextcodec.h>
-#include <tqtextstream.h>
+#include <textcodec.h>
+#include <textstream.h>
 #include <tqtimer.h>
 
 // Include files for KDE
@@ -464,7 +464,7 @@ void CDArchiving::slotK3bDone(KProcess*)
         d->action = KIPICDArchivingPlugin::Error;
         d->starting = false;
         d->success = false;
-        d->message = i18n("Cannot remove temporary folder '%1'.").tqarg(m_tmpFolder);
+        d->message = i18n("Cannot remove temporary folder '%1'.").arg(m_tmpFolder);
         TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
         usleep(1000);
     }
@@ -494,7 +494,7 @@ bool CDArchiving::buildHTMLInterface (void)
             d->action = KIPICDArchivingPlugin::Error;
             d->starting = false;
             d->success = false;
-            d->message = i18n("Cannot remove folder '%1'.").tqarg(MainTPath);
+            d->message = i18n("Cannot remove folder '%1'.").arg(MainTPath);
             TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
             usleep(1000);
             return false;
@@ -507,7 +507,7 @@ bool CDArchiving::buildHTMLInterface (void)
         d->action = KIPICDArchivingPlugin::Error;
         d->starting = false;
         d->success = false;
-        d->message = i18n("Could not create folder '%1'.").tqarg(MainTPath);
+        d->message = i18n("Could not create folder '%1'.").arg(MainTPath);
         TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
         usleep(1000);
         return false;
@@ -528,7 +528,7 @@ bool CDArchiving::buildHTMLInterface (void)
     dir = KGlobal::dirs()->findResourceDir("kipi_data", "up.png");
     dir = dir + "up.png";
     srcURL = dir;
-    destURL = MainTPath + TQString::tqfromLatin1("/up.png");
+    destURL = MainTPath + TQString::fromLatin1("/up.png");
     KIO::file_copy(srcURL, destURL, -1, true, false, false);
 
     //clear the temporary list for unique names
@@ -556,7 +556,7 @@ bool CDArchiving::buildHTMLInterface (void)
             d->action = KIPICDArchivingPlugin::Error;
             d->starting = false;
             d->success = false;
-            d->message = i18n("Could not create folder '%1'.").tqarg(SubTPath);
+            d->message = i18n("Could not create folder '%1'.").arg(SubTPath);
             TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
             usleep(1000);
             return false;
@@ -586,7 +586,7 @@ bool CDArchiving::buildHTMLInterface (void)
                 d->action = KIPICDArchivingPlugin::Error;
                 d->starting = false;
                 d->success = false;
-                d->message = i18n("Cannot remove folder '%1'.").tqarg(MainTPath);
+                d->message = i18n("Cannot remove folder '%1'.").arg(MainTPath);
                 TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
                 usleep(1000);
                 return false;
@@ -623,7 +623,7 @@ bool CDArchiving::buildHTMLInterface (void)
         d->action = KIPICDArchivingPlugin::Error;
         d->starting = false;
         d->success = false;
-        d->message = i18n("Could not open file '%1'.").tqarg(MainUrl.path(+1));
+        d->message = i18n("Could not open file '%1'.").arg(MainUrl.path(+1));
         TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
         usleep(1000);
         return false;
@@ -649,7 +649,7 @@ bool CDArchiving::createDirectory(TQDir thumb_dir, TQString imgGalleryDir, TQStr
             d->starting = false;
             d->success = false;
             d->message = i18n("Could not create folder '%1' in '%2'.")
-                         .tqarg(dirName).tqarg(imgGalleryDir);
+                         .arg(dirName).arg(imgGalleryDir);
             TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
             usleep(1000);
             return false;
@@ -678,7 +678,7 @@ void CDArchiving::createHead(TQTextStream& stream)
     stream << "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">" << endl;
     stream << "<meta name=\"Generator\" content=\"Albums HTML interface for CD archiving generated by "
     << m_hostName << " [" << m_hostURL << "]\">"  << endl;
-    stream << "<meta name=\"date\" content=\"" + KGlobal::locale()->formatDate(TQDate::tqcurrentDate())
+    stream << "<meta name=\"date\" content=\"" + KGlobal::locale()->formatDate(TQDate::currentDate())
     + "\">" << endl;
     stream << "<title>" << m_mainTitle << "</title>" << endl;
     createCSSSection(stream);
@@ -736,7 +736,7 @@ void CDArchiving::createBody(TQTextStream& stream,
     int numOfImages   = images.count();
 
     const TQString imgGalleryDir = targetURL.directory();
-    const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()));
+    const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate()));
 
     stream << "<body>\n" << endl;
 
@@ -952,7 +952,7 @@ void CDArchiving::createBody(TQTextStream& stream,
     dir = dir + "valid-html401.png";
 
     KURL srcURL(dir);
-    KURL destURL(imgGalleryDir + TQString::tqfromLatin1("/thumbs/valid-html401.png"));
+    KURL destURL(imgGalleryDir + TQString::fromLatin1("/thumbs/valid-html401.png"));
     KIO::file_copy(srcURL, destURL, -1, true, false, false);
 
     stream << "<p>"  << endl;
@@ -961,7 +961,7 @@ void CDArchiving::createBody(TQTextStream& stream,
     << "\" height=\"31\" width=\"88\" title=\"" << Temp << "\" />" << endl;
 
     Temp = i18n("Album archive created with "
-                "<a href=\"%1\">%2</a> on %3").tqarg(m_hostURL).tqarg(m_hostName).tqarg(today);
+                "<a href=\"%1\">%2</a> on %3").arg(m_hostURL).arg(m_hostName).arg(today);
 
     stream << Temp << endl;
     stream << "</p>" << endl;
@@ -974,7 +974,7 @@ void CDArchiving::createBody(TQTextStream& stream,
 void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url)
 {
     TQString Temp;
-    const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()));
+    const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate()));
 
     Temp = m_mainTitle;
     stream << "<body>\n<h1>" << Temp << "</h1><p>\n" << endl;
@@ -992,7 +992,7 @@ void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url)
     dir = dir + "valid-html401.png";
 
     KURL srcURL(dir);
-    KURL destURL(url.directory() + TQString::tqfromLatin1("/valid-html401.png"));
+    KURL destURL(url.directory() + TQString::fromLatin1("/valid-html401.png"));
     KIO::file_copy(srcURL, destURL, -1, true, false, false);
 
     stream << "<p>"  << endl;
@@ -1001,7 +1001,7 @@ void CDArchiving::createBodyMainPage(TQTextStream& stream, KURL& url)
     << Temp <<  "\" />" << endl;
 
     Temp = i18n("Album archive created with "
-                "<a href=\"%1\">%2</a> on %3").tqarg(m_hostURL).tqarg(m_hostName).tqarg(today);
+                "<a href=\"%1\">%2</a> on %3").arg(m_hostURL).arg(m_hostName).arg(today);
     stream << Temp << endl;
     stream << "</p>" << endl;
     stream << "</body>\n</html>\n" << endl;
@@ -1023,12 +1023,12 @@ bool CDArchiving::createHtml( const KIPI::ImageCollection& album,
 
     // Create the "thumbs" subdirectory
 
-    TQDir thumb_dir( imgGalleryDir + TQString::tqfromLatin1("/thumbs/"));
+    TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/"));
 
     if (createDirectory(thumb_dir, imgGalleryDir, "thumbs") == false)
         return false;
 
-    TQDir pages_dir( imgGalleryDir + TQString::tqfromLatin1("/pages/"));
+    TQDir pages_dir( imgGalleryDir + TQString::fromLatin1("/pages/"));
 
     if (createDirectory(pages_dir, imgGalleryDir, "pages") == false)
         return false;
@@ -1053,7 +1053,7 @@ bool CDArchiving::createHtml( const KIPI::ImageCollection& album,
         d->action = KIPICDArchivingPlugin::Error;
         d->starting = false;
         d->success = false;
-        d->message = i18n("Could not open file '%1'.").tqarg(targetURL.path(+1));
+        d->message = i18n("Could not open file '%1'.").arg(targetURL.path(+1));
         TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
         usleep(1000);
         return false;
@@ -1073,8 +1073,8 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir,
                              const TQString& comment)
 {
 
-    const TQDir pagesDir(imgGalleryDir + TQString::tqfromLatin1("/pages/"));
-    const TQDir thumbsDir(imgGalleryDir + TQString::tqfromLatin1("/thumbs/"));
+    const TQDir pagesDir(imgGalleryDir + TQString::fromLatin1("/pages/"));
+    const TQDir thumbsDir(imgGalleryDir + TQString::fromLatin1("/thumbs/"));
     const TQFileInfo fi (imgURL.fileName());
     const TQString imgName = uniqueImgName + "." + fi.extension(FALSE);
     kdDebug( 51000 ) << "CreatePage: FileName: " << imgURL.fileName() << endl;
@@ -1086,21 +1086,21 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir,
     // Html pages filenames
 
     const TQString pageFilename = pagesDir.path() +
-                                 TQString::tqfromLatin1("/") +
+                                 TQString::fromLatin1("/") +
                                  webifyFileName(uniqueImgName)+
-                                 TQString::tqfromLatin1(".htm");
+                                 TQString::fromLatin1(".htm");
     const TQString nextPageFilename =  webifyFileName(nextUniqueImgName) +
-                                      TQString::tqfromLatin1(".htm");
+                                      TQString::fromLatin1(".htm");
     const TQString prevPageFilename =  webifyFileName(prevUniqueImgName) +
-                                      TQString::tqfromLatin1(".htm");
+                                      TQString::fromLatin1(".htm");
 
     // Thumbs filenames
 
-    const TQString prevThumb = TQString::tqfromLatin1("../thumbs/") +
+    const TQString prevThumb = TQString::fromLatin1("../thumbs/") +
                               webifyFileName(prevUniqueImgName) +
                               extension(m_imageFormat);
 
-    const TQString nextThumb = TQString::tqfromLatin1("../thumbs/") +
+    const TQString nextThumb = TQString::fromLatin1("../thumbs/") +
                               webifyFileName(nextUniqueImgName) +
                               extension(m_imageFormat);
 
@@ -1122,7 +1122,7 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir,
         << m_hostName << " [" << m_hostURL << "]\">"  << endl;
 
         stream << "<meta name=\"date\" content=\""
-        << KGlobal::locale()->formatDate(TQDate::tqcurrentDate())
+        << KGlobal::locale()->formatDate(TQDate::currentDate())
         << "\">" << endl;
         stream << "<title>" << m_mainTitle << " : "<< imgName/*imgURL.fileName()*/ <<"</title>" << endl;
 
@@ -1239,13 +1239,13 @@ bool CDArchiving::createPage(const TQString& imgGalleryDir,
         // Footer
 
         TQString valid = i18n("Valid HTML 4.01.");
-        const TQString today(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()));
+        const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate()));
 
         stream << "<div align=\"center\"><hr><img src=\"../thumbs/valid-html401.png\" alt=\""
         << valid << "\" height=\"31\" width=\"88\"  title=\"" << valid <<  "\" />" << endl;
 
         valid =  i18n("Image gallery created with "
-                      "<a href=\"%1\">%2</a> on %3").tqarg(m_hostURL).tqarg(m_hostName).tqarg(today);
+                      "<a href=\"%1\">%2</a> on %3").arg(m_hostURL).arg(m_hostName).arg(today);
 
         stream << valid << "</div>" << endl;
 
@@ -1270,7 +1270,7 @@ int CDArchiving::createThumb( const TQString& imgName, const TQString& sourceDir
     // Create the thumbnails for the HTML interface.
 
     const TQString ImageNameFormat = webifyFileName(uniqueFileName) + extension(imageFormat);
-    const TQString thumbDir = imgGalleryDir + TQString::tqfromLatin1("/thumbs/");
+    const TQString thumbDir = imgGalleryDir + TQString::fromLatin1("/thumbs/");
     int extent = m_thumbnailsSize;
 
     m_imgWidth = 120; // Setting the size of the images is
@@ -1580,7 +1580,7 @@ bool CDArchiving::BuildK3bXMLprojectfile (TQString HTMLinterfaceFolder, TQString
         d->action = KIPICDArchivingPlugin::Progress;
         d->starting = true;
         d->success = false;
-        d->message = i18n("Adding Album '%1' into project...").tqarg( (*it).name() );
+        d->message = i18n("Adding Album '%1' into project...").arg( (*it).name() );
         TQApplication::sendEvent(m_parent, new TQCustomEvent(TQEvent::User, d));
         usleep(1000);
         addCollectionToK3bXMLProjectFile( *it, &stream);
@@ -1847,7 +1847,7 @@ TQString CDArchiving::EscapeSgmlText(const TQTextCodec* codec,
     for (uint i = 0 ; i < strIn.length() ; ++i)
     {
         ch=strIn[i];
-        switch (ch.tqunicode())
+        switch (ch.unicode())
         {
         case 38: // &
         {
@@ -1889,7 +1889,7 @@ TQString CDArchiving::EscapeSgmlText(const TQTextCodec* codec,
             {
                 if (!codec->canEncode(ch))
                 {
-                    strReturn += TQString("&#%1;").tqarg(ch.tqunicode());
+                    strReturn += TQString("&#%1;").arg(ch.unicode());
                     break;
                 }
             }
diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
index 5121432..4e9f435 100644
--- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
+++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
@@ -33,7 +33,7 @@
 #include <tqgroupbox.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlistview.h>
 #include <tqprogressdialog.h>
@@ -140,21 +140,21 @@ void CDArchivingDialog::setupSelection(void)
     page_setupSelection = addPage(i18n("Selection"), i18n("Album 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);
 
     //---------------------------------------------
 
     TQGroupBox * groupBox3 = new TQGroupBox( 2, Qt::Horizontal,
                                            i18n("Target Media Information"),
                                            page_setupSelection );
-    groupBox3->tqlayout()->setSpacing( 6 );
-    groupBox3->tqlayout()->setMargin( 11 );
+    groupBox3->layout()->setSpacing( 6 );
+    groupBox3->layout()->setMargin( 11 );
     TQWhatsThis::add( groupBox3, i18n("<p>Information about the backup medium.") );
 
     m_mediaSize = new TQLabel( groupBox3 );
-    m_mediaSize->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    m_mediaSize->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
 
     m_mediaFormat = new TQComboBox(false, groupBox3);
     m_mediaFormat->insertItem(i18n("CD (650Mb)"));
@@ -165,7 +165,7 @@ void CDArchivingDialog::setupSelection(void)
     mediaFormatActived(m_mediaFormat->currentText());
     TQWhatsThis::add( m_mediaFormat, i18n("<p>Select here the backup media format."));
 
-    tqlayout->addWidget( groupBox3 );
+    layout->addWidget( groupBox3 );
 
     //---------------------------------------------
 
@@ -539,11 +539,11 @@ void CDArchivingDialog::setupBurning(void)
 
     TQGroupBox * groupBoxAdvancedOptions = new TQGroupBox( i18n("Advanced Burning Options"), page_burning );
     groupBoxAdvancedOptions->setColumnLayout(0, Qt::Vertical );
-    groupBoxAdvancedOptions->tqlayout()->setSpacing( 6 );
-    groupBoxAdvancedOptions->tqlayout()->setMargin( 11 );
+    groupBoxAdvancedOptions->layout()->setSpacing( 6 );
+    groupBoxAdvancedOptions->layout()->setMargin( 11 );
 
-    TQVBoxLayout * groupBoxAOLayout = new TQVBoxLayout( groupBoxAdvancedOptions->tqlayout() );
-    groupBoxAOLayout->tqsetAlignment( TQt::AlignTop );
+    TQVBoxLayout * groupBoxAOLayout = new TQVBoxLayout( groupBoxAdvancedOptions->layout() );
+    groupBoxAOLayout->setAlignment( TQt::AlignTop );
 
     m_burnOnTheFly = new TQCheckBox( i18n("Media burning On-The-Fly"), groupBoxAdvancedOptions);
     m_burnOnTheFly->setChecked( false );
@@ -621,8 +621,8 @@ void CDArchivingDialog::ShowMediaCapacity(void)
         Color = "<font color=\"red\">";
 
     m_mediaSize->setText( i18n("Total size: ") + Color +
-                          i18n("<b>%1</b></font> / <b>%2</b>").tqarg(KIO::convertSizeFromKB(TargetMediaSize))
-                          .tqarg(KIO::convertSizeFromKB (MaxMediaSize)) );
+                          i18n("<b>%1</b></font> / <b>%2</b>").arg(KIO::convertSizeFromKB(TargetMediaSize))
+                          .arg(KIO::convertSizeFromKB (MaxMediaSize)) );
 }
 
 void CDArchivingDialog::slotOk()
diff --git a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
index 0bab4a2..5d70cc9 100644
--- a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
@@ -157,7 +157,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
 
         case(KIPICDArchivingPlugin::BuildAlbumHTMLPage):
         {
-            text = i18n("Making HTML pages for Album '%1'...").tqarg(d->albumName);
+            text = i18n("Making HTML pages for Album '%1'...").arg(d->albumName);
             break;
         }
 
@@ -169,7 +169,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
 
         case(KIPICDArchivingPlugin::ResizeImages):
         {
-            text = i18n("Creating thumbnail for '%1'...").tqarg(d->fileName);
+            text = i18n("Creating thumbnail for '%1'...").arg(d->fileName);
             break;
         }
 
@@ -211,14 +211,14 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
             case(KIPICDArchivingPlugin::BuildAlbumHTMLPage):
             {
                 ++m_current;
-                text = i18n("HTML page creation for Album '%1' completed.").tqarg(d->albumName);
+                text = i18n("HTML page creation for Album '%1' completed.").arg(d->albumName);
                 break;
             }
 
             case(KIPICDArchivingPlugin::ResizeImages):
             {
                 ++m_current;
-                text = i18n("Creating thumbnail for '%1' done.").tqarg(d->fileName);
+                text = i18n("Creating thumbnail for '%1' done.").arg(d->fileName);
                 break;
             }
 
@@ -250,7 +250,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
             {
             case(KIPICDArchivingPlugin::ResizeImages):
             {
-                text = i18n("Failed to create thumbnail for '%1'").tqarg(d->fileName);
+                text = i18n("Failed to create thumbnail for '%1'").arg(d->fileName);
                 m_progressDlg->addedAction(text, KIPI::WarningMessage);
                 m_progressDlg->setProgress(m_current, m_total);
                 break;
@@ -260,7 +260,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
             {
                 ++m_current;
                 text = i18n("Failed to create HTML interface: %1")
-                       .tqarg(d->message);
+                       .arg(d->message);
                 m_progressDlg->addedAction(text, KIPI::ErrorMessage);
                 m_progressDlg->setProgress(m_current, m_total);
                 slotCancel();
@@ -271,7 +271,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
             case(KIPICDArchivingPlugin::BuildAlbumHTMLPage):
             {
                 text = i18n("Failed to create HTML pages for Album '%1'")
-                       .tqarg(d->albumName);
+                       .arg(d->albumName);
                 m_progressDlg->addedAction(text, KIPI::ErrorMessage);
                 m_progressDlg->setProgress(m_current, m_total);
                 slotCancel();
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;
                 }
 
diff --git a/kipi-plugins/flickrexport/flickralbumdialog.ui b/kipi-plugins/flickrexport/flickralbumdialog.ui
index 20d5749..6d17a1d 100644
--- a/kipi-plugins/flickrexport/flickralbumdialog.ui
+++ b/kipi-plugins/flickrexport/flickralbumdialog.ui
@@ -52,7 +52,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -137,7 +137,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kipi-plugins/flickrexport/flickrtalker.cpp b/kipi-plugins/flickrexport/flickrtalker.cpp
index 0a317ec..057855f 100644
--- a/kipi-plugins/flickrexport/flickrtalker.cpp
+++ b/kipi-plugins/flickrexport/flickrtalker.cpp
@@ -31,7 +31,7 @@
 // TQt includes.
 
 #include <tqcstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqimage.h>
 #include <tqstringlist.h>
@@ -542,7 +542,7 @@ void FlickrTalker::slotError(const TQString& error)
     };
 
     KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()),
-                 i18n("Error Occured: %1\n We can not proceed further").tqarg(transError));
+                 i18n("Error Occured: %1\n We can not proceed further").arg(transError));
 
 //  kdDebug() << "Not handling the error now will see it later" << endl;
 }
diff --git a/kipi-plugins/flickrexport/flickrwidget.cpp b/kipi-plugins/flickrexport/flickrwidget.cpp
index f7279c1..aa222bd 100644
--- a/kipi-plugins/flickrexport/flickrwidget.cpp
+++ b/kipi-plugins/flickrexport/flickrwidget.cpp
@@ -32,7 +32,7 @@
 #include <tqgroupbox.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
@@ -88,7 +88,7 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface)
     TQVBoxLayout* settingsBoxLayout = new TQVBoxLayout(settingsBox);
 
     //m_newAlbumBtn = new TQPushButton(settingsBox, "m_newAlbumBtn");
-    //m_newAlbumBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    //m_newAlbumBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     //m_newAlbumBtn->setText(i18n("&New Album"));
 
     TQGridLayout* tagsLayout  = new TQGridLayout(1, 1);
@@ -109,9 +109,9 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface)
 
     TQGroupBox* optionsBox         = new TQGroupBox(i18n("Override Default Options"), settingsBox);
     optionsBox->setColumnLayout(0, Qt::Vertical);
-    optionsBox->tqlayout()->setSpacing(KDialog::spacingHint());
-    optionsBox->tqlayout()->setMargin(KDialog::spacingHint());
-    TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->tqlayout(), 5, 3);
+    optionsBox->layout()->setSpacing(KDialog::spacingHint());
+    optionsBox->layout()->setMargin(KDialog::spacingHint());
+    TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->layout(), 5, 3);
 
     m_publicCheckBox = new TQCheckBox(optionsBox);
     m_publicCheckBox->setText(i18n("As in accessible for people", "Public (anyone can see them)"));
@@ -128,14 +128,14 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface)
 
     m_dimensionSpinBox = new TQSpinBox(0, 5000, 10, optionsBox);
     m_dimensionSpinBox->setValue(600);
-    m_dimensionSpinBox->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_dimensionSpinBox->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     m_dimensionSpinBox->setEnabled(false);
 
     TQLabel* resizeLabel = new TQLabel(i18n("Maximum dimension (pixels):"), optionsBox);
 
     m_imageQualitySpinBox = new TQSpinBox(0, 100, 1, optionsBox);
     m_imageQualitySpinBox->setValue(85);
-    m_imageQualitySpinBox->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_imageQualitySpinBox->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 
     // NOTE: The term Compression factor may be to technical to write in the label
     TQLabel* imageQualityLabel = new TQLabel(i18n("JPEG Image Quality (higher is better):"), optionsBox);
@@ -157,9 +157,9 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface)
 
     TQGroupBox* accountBox = new TQGroupBox(i18n("Account"), settingsBox);
     accountBox->setColumnLayout(0, Qt::Vertical);
-    accountBox->tqlayout()->setSpacing(KDialog::spacingHint());
-    accountBox->tqlayout()->setMargin(KDialog::spacingHint());
-    TQGridLayout* accountBoxLayout = new TQGridLayout(accountBox->tqlayout(), 1, 3);
+    accountBox->layout()->setSpacing(KDialog::spacingHint());
+    accountBox->layout()->setMargin(KDialog::spacingHint());
+    TQGridLayout* accountBoxLayout = new TQGridLayout(accountBox->layout(), 1, 3);
 
     TQLabel *userNameLabel  = new TQLabel(i18n("User Name: "), accountBox);
     m_userNameDisplayLabel = new TQLabel(accountBox);
diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp
index 8109c8a..7b8864d 100644
--- a/kipi-plugins/flickrexport/flickrwindow.cpp
+++ b/kipi-plugins/flickrexport/flickrwindow.cpp
@@ -292,7 +292,7 @@ void FlickrWindow::slotTokenObtained(const TQString& token)
     m_username = m_talker->getUserName();
     m_userId   = m_talker->getUserId();
     kdDebug() << "SlotTokenObtained invoked setting user Display name to " << m_username << endl;
-    m_userNameDisplayLabel->setText(TQString("<qt><b>%1</b></qt>").tqarg(m_username));
+    m_userNameDisplayLabel->setText(TQString("<qt><b>%1</b></qt>").arg(m_username));
     m_widget->setEnabled(true);
 }
 
@@ -531,7 +531,7 @@ void FlickrWindow::slotAddPhotoNext()
         return;
     }
 
-    m_progressDlg->setLabelText(i18n("Uploading file %1").tqarg(pathComments.first.filename()));
+    m_progressDlg->setLabelText(i18n("Uploading file %1").arg(pathComments.first.filename()));
 
     if (m_progressDlg->isHidden())
         m_progressDlg->show();
@@ -550,7 +550,7 @@ void FlickrWindow::slotAddPhotoSucceeded()
 void FlickrWindow::slotAddPhotoFailed(const TQString& msg)
 {
     if (KMessageBox::warningContinueCancel(this,
-                     i18n("Failed to upload photo into Flickr. %1\nDo you want to continue?").tqarg(msg))
+                     i18n("Failed to upload photo into Flickr. %1\nDo you want to continue?").arg(msg))
                      != KMessageBox::Continue)
     {
         m_uploadQueue.clear();
diff --git a/kipi-plugins/flickrexport/imageslist.cpp b/kipi-plugins/flickrexport/imageslist.cpp
index fee6062..dfb841f 100644
--- a/kipi-plugins/flickrexport/imageslist.cpp
+++ b/kipi-plugins/flickrexport/imageslist.cpp
@@ -27,7 +27,7 @@
 #include <tqpushbutton.h>
 #include <tqpainter.h>
 #include <tqfileinfo.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqdragobject.h>
 #include <tqimage.h>
@@ -98,7 +98,7 @@ ImagesListView::ImagesListView(TQWidget *parent)
     setResizeMode(TQListView::AllColumns);
     setAllColumnsShowFocus(true);
     setSorting(-1);
-    tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+    setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
     setSelectionMode(TQListView::Extended);
 }
 
diff --git a/kipi-plugins/flickrexport/login.cpp b/kipi-plugins/flickrexport/login.cpp
index 0686a09..0c42f1d 100644
--- a/kipi-plugins/flickrexport/login.cpp
+++ b/kipi-plugins/flickrexport/login.cpp
@@ -26,7 +26,7 @@
 #include <tqframe.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE includes.
 
@@ -48,7 +48,7 @@ FlickrLogin::FlickrLogin(TQWidget* parent, const TQString& header,
 
     TQVBoxLayout* vbox = new TQVBoxLayout(this, 5, 5, "vbox");
     m_headerLabel     = new TQLabel(this);
-    m_headerLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+    m_headerLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
     m_headerLabel->setText(header);
 
     TQFrame* hline = new TQFrame(this, "hline");
@@ -91,7 +91,7 @@ FlickrLogin::FlickrLogin(TQWidget* parent, const TQString& header,
     vbox->addLayout(centerLayout);
     vbox->addLayout(btnLayout);
 
-    resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(300, 150).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
 
     m_nameEdit->setText(_name);
diff --git a/kipi-plugins/flickrexport/mpform.cpp b/kipi-plugins/flickrexport/mpform.cpp
index 35138f0..25488c9 100644
--- a/kipi-plugins/flickrexport/mpform.cpp
+++ b/kipi-plugins/flickrexport/mpform.cpp
@@ -30,7 +30,7 @@
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // KDE includes.
 
diff --git a/kipi-plugins/galleryexport/TODO b/kipi-plugins/galleryexport/TODO
index 7a3d8b6..fcff8e0 100644
--- a/kipi-plugins/galleryexport/TODO
+++ b/kipi-plugins/galleryexport/TODO
@@ -10,4 +10,4 @@ Somewhat immediate implementation needed:
 For the lazy times:
 
 * Polish the html code used to render the thumbnails, better
-  fonts sizes and tqlayout
+  fonts sizes and layout
diff --git a/kipi-plugins/galleryexport/galleries.cpp b/kipi-plugins/galleryexport/galleries.cpp
index af186be..5accc6c 100644
--- a/kipi-plugins/galleryexport/galleries.cpp
+++ b/kipi-plugins/galleryexport/galleries.cpp
@@ -157,12 +157,12 @@ void Galleries::Load()
       mMaxGalleryId = gallery_id;
 
     // Load the gallery with this id.
-    name = config.readEntry(TQString("Name%1").tqarg(gallery_id));
-    url = config.readEntry(TQString("URL%1").tqarg(gallery_id));
-    username = config.readEntry(TQString("Username%1").tqarg(gallery_id));
-    version = config.readNumEntry(TQString("Version%1").tqarg(gallery_id));
+    name = config.readEntry(TQString("Name%1").arg(gallery_id));
+    url = config.readEntry(TQString("URL%1").arg(gallery_id));
+    username = config.readEntry(TQString("Username%1").arg(gallery_id));
+    version = config.readNumEntry(TQString("Version%1").arg(gallery_id));
     if (bln_use_wallet)
-      mpWallet->readPassword(TQString("Password%1").tqarg(gallery_id), password);
+      mpWallet->readPassword(TQString("Password%1").arg(gallery_id), password);
 
     Gallery* p_gallery = new Gallery(name, url, username, password, version, gallery_id);
     mGalleries.append(p_gallery);
@@ -217,12 +217,12 @@ void Galleries::Save()
     unsigned int gallery_id = p_gallery->galleryId();
     gallery_ids.append(gallery_id);
 
-    config.writeEntry(TQString("Name%1").tqarg(gallery_id), p_gallery->name());
-    config.writeEntry(TQString("URL%1").tqarg(gallery_id), p_gallery->url());
-    config.writeEntry(TQString("Username%1").tqarg(gallery_id), p_gallery->username());
-    config.writeEntry(TQString("Version%1").tqarg(gallery_id), p_gallery->version());
+    config.writeEntry(TQString("Name%1").arg(gallery_id), p_gallery->name());
+    config.writeEntry(TQString("URL%1").arg(gallery_id), p_gallery->url());
+    config.writeEntry(TQString("Username%1").arg(gallery_id), p_gallery->username());
+    config.writeEntry(TQString("Version%1").arg(gallery_id), p_gallery->version());
     if (bln_use_wallet)
-      mpWallet->writePassword(TQString("Password%1").tqarg(gallery_id), p_gallery->password());
+      mpWallet->writePassword(TQString("Password%1").arg(gallery_id), p_gallery->password());
   }
 
   config.setGroup("GallerySync Settings");
diff --git a/kipi-plugins/galleryexport/galleryalbumdialog.ui b/kipi-plugins/galleryexport/galleryalbumdialog.ui
index 26ee8d9..a04a137 100644
--- a/kipi-plugins/galleryexport/galleryalbumdialog.ui
+++ b/kipi-plugins/galleryexport/galleryalbumdialog.ui
@@ -52,7 +52,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -137,7 +137,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kipi-plugins/galleryexport/galleryconfig.cpp b/kipi-plugins/galleryexport/galleryconfig.cpp
index 9fc79f4..d08fe3a 100644
--- a/kipi-plugins/galleryexport/galleryconfig.cpp
+++ b/kipi-plugins/galleryexport/galleryconfig.cpp
@@ -28,7 +28,7 @@
 #include <tqprogressdialog.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // Include files for KDE
 
@@ -74,7 +74,7 @@ GalleryEdit::GalleryEdit(TQWidget* pParent,
   tll->addItem(vbox);
 
   mpHeaderLabel = new TQLabel(page);
-  mpHeaderLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
+  mpHeaderLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
                                             TQSizePolicy::Fixed));
   mpHeaderLabel->setText(title);
   vbox->addWidget(mpHeaderLabel);
@@ -124,7 +124,7 @@ GalleryEdit::GalleryEdit(TQWidget* pParent,
 
   vbox->addLayout( centerLayout );
 
-  resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) );
+  resize( TQSize(300, 150).expandedTo(minimumSizeHint()) );
   clearWState( WState_Polished );
 
   mpNameEdit->setText(pGallery->name());
diff --git a/kipi-plugins/galleryexport/gallerylist.cpp b/kipi-plugins/galleryexport/gallerylist.cpp
index 314ebd2..cd0eefd 100644
--- a/kipi-plugins/galleryexport/gallerylist.cpp
+++ b/kipi-plugins/galleryexport/gallerylist.cpp
@@ -28,7 +28,7 @@
 #include <tqprogressdialog.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // Include files for KDE
 
@@ -79,7 +79,7 @@ GalleryList::GalleryList(TQWidget *pParent, Galleries* pGalleries, bool blnShowO
   hb->addWidget(label);
   label->setPixmap(UserIcon("gallery"));
   label->setFrameStyle (TQFrame::Panel | TQFrame::Sunken);
-  label->tqsetAlignment(TQt::AlignTop);
+  label->setAlignment(TQt::AlignTop);
   TQVBoxLayout *vb = new TQVBoxLayout();
   vb->setSpacing (KDialog::spacingHint());
   tll->addItem(vb);
diff --git a/kipi-plugins/galleryexport/gallerympform.cpp b/kipi-plugins/galleryexport/gallerympform.cpp
index 5161bc2..964f876 100644
--- a/kipi-plugins/galleryexport/gallerympform.cpp
+++ b/kipi-plugins/galleryexport/gallerympform.cpp
@@ -26,7 +26,7 @@
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <cstring>
 #include <cstdio>
@@ -76,7 +76,7 @@ void GalleryMPForm::finish()
 bool GalleryMPForm::addPair(const TQString& name, const TQString& value)
 {
     if (GalleryTalker::isGallery2())
-      return addPairRaw(TQString("g2_form[%1]").tqarg(name), value);
+      return addPairRaw(TQString("g2_form[%1]").arg(name), value);
 
     return addPairRaw(name, value);
 }
diff --git a/kipi-plugins/galleryexport/gallerytalker.cpp b/kipi-plugins/galleryexport/gallerytalker.cpp
index 3d7a03c..5b4b276 100644
--- a/kipi-plugins/galleryexport/gallerytalker.cpp
+++ b/kipi-plugins/galleryexport/gallerytalker.cpp
@@ -20,7 +20,7 @@
  * ============================================================ */
 
 #include <tqcstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqimage.h>
 #include <tqregexp.h>
diff --git a/kipi-plugins/galleryexport/gallerywidget.cpp b/kipi-plugins/galleryexport/gallerywidget.cpp
index 769c4e5..a7c0e54 100644
--- a/kipi-plugins/galleryexport/gallerywidget.cpp
+++ b/kipi-plugins/galleryexport/gallerywidget.cpp
@@ -32,7 +32,7 @@
 #include <tqgroupbox.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqsplitter.h>
 #include <tqwhatsthis.h>
@@ -87,11 +87,11 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl )
     rightButtonGroupLayout->setMargin( 5 );
 
     m_newAlbumBtn = new TQPushButton( rightButtonGroup, "m_newAlbumBtn" );
-    m_newAlbumBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_newAlbumBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     rightButtonGroupLayout->addWidget( m_newAlbumBtn, 0, TQt::AlignHCenter );
 
     m_addPhotoBtn = new TQPushButton( rightButtonGroup, "m_addPhotoBtn" );
-    m_addPhotoBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_addPhotoBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     rightButtonGroupLayout->addWidget( m_addPhotoBtn, 0, TQt::AlignHCenter );
 
     // ------------------------------------------------------------------------
@@ -99,9 +99,9 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl )
     TQGroupBox* optionsBox = new TQGroupBox(i18n("Override Default Options"),
                                           rightButtonGroup);
     optionsBox->setColumnLayout(0, Qt::Vertical);
-    optionsBox->tqlayout()->setSpacing(5);
-    optionsBox->tqlayout()->setMargin(5);
-    TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->tqlayout());
+    optionsBox->layout()->setSpacing(5);
+    optionsBox->layout()->setMargin(5);
+    TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->layout());
 
     // ------------------------------------------------------------------------
     m_captTitleCheckBox = new TQCheckBox(optionsBox);
@@ -118,7 +118,7 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl )
 
     m_dimensionSpinBox  = new TQSpinBox(0, 5000, 10, optionsBox);
     m_dimensionSpinBox->setValue(600);
-    m_dimensionSpinBox->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_dimensionSpinBox->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     optionsBoxLayout->addWidget(m_dimensionSpinBox, 3, 1);
 
     TQLabel* resizeLabel = new TQLabel(i18n("Maximum dimension:"), optionsBox);
@@ -149,7 +149,7 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl )
 
     // ------------------------------------------------------------------------
 
-    resize( TQSize(600, 400).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(600, 400).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
 }
 
diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp
index ac37a31..d9ac417 100644
--- a/kipi-plugins/galleryexport/gallerywindow.cpp
+++ b/kipi-plugins/galleryexport/gallerywindow.cpp
@@ -346,18 +346,18 @@ void GalleryWindow::slotPhotos( const TQValueList<GPhoto>& photoList)
     TQString styleSheet =
         TQString( "body { margin: 8px; font-size: %1px; "
                  " color: %2; background-color: %3;}" )
-        .tqarg( pxSize )
-        .tqarg( tqcolorGroup().text().name() )
-        .tqarg( tqcolorGroup().base().name() );
+        .arg( pxSize )
+        .arg( colorGroup().text().name() )
+        .arg( colorGroup().base().name() );
 
     styleSheet += TQString( "a { font-size: %1px; color: %2; "
                            "text-decoration: none;}" )
-                  .tqarg( pxSize )
-                  .tqarg( tqcolorGroup().text().name() );
+                  .arg( pxSize )
+                  .arg( colorGroup().text().name() );
     styleSheet += TQString( "i { font-size: %1px; color: %2; "
                            "text-decoration: none;}" )
-                  .tqarg( pxSize-2 )
-                  .tqarg( TQColor("steelblue").name() );
+                  .arg( pxSize-2 )
+                  .arg( TQColor("steelblue").name() );
 
     m_photoView->begin();
     m_photoView->setUserStyleSheet( styleSheet );
@@ -378,13 +378,13 @@ void GalleryWindow::slotPhotos( const TQValueList<GPhoto>& photoList)
 
         m_photoView->write( "<tr><td class='photo'>"
                             + TQString("<a href='%1'>")
-                            .tqarg(imageurl.url())
+                            .arg(imageurl.url())
                             + TQString("<img border=1 src=\"%1\"><br>")
-                            .tqarg(thumburl.url())
+                            .arg(thumburl.url())
                             + photo.name
                             + ( photo.caption.isEmpty() ? TQString() :
                                 TQString("<br><i>%1</i>")
-                                .tqarg(photo.caption) )
+                                .arg(photo.caption) )
                             + "</a></td></tr>" );
     }
 
@@ -529,7 +529,7 @@ void GalleryWindow::slotNewAlbum()
     if (!clean)
     {
         KMessageBox::error( this, i18n("Sorry, these characters are not allowed in album name: %1")
-                            .tqarg("\\ / * ? \" \' & < > | . + # ( ) or spaces") );
+                            .arg("\\ / * ? \" \' & < > | . + # ( ) or spaces") );
         return;
     }
 
@@ -601,7 +601,7 @@ void GalleryWindow::slotAddPhotoNext()
     }
 
     m_progressDlg->setLabelText( i18n("Uploading file %1 ")
-                                 .tqarg( KURL(pathComments.first).filename() ) );
+                                 .arg( KURL(pathComments.first).filename() ) );
 
     if (m_progressDlg->isHidden())
         m_progressDlg->show();
diff --git a/kipi-plugins/gpssync/gpsdataparser.cpp b/kipi-plugins/gpssync/gpsdataparser.cpp
index 66d7bd0..c7c5e41 100644
--- a/kipi-plugins/gpssync/gpsdataparser.cpp
+++ b/kipi-plugins/gpssync/gpsdataparser.cpp
@@ -32,7 +32,7 @@
 #include <tqstringlist.h>
 #include <tqfile.h>
 #include <tqdom.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // KDE includes.
 
diff --git a/kipi-plugins/gpssync/gpseditdialog.cpp b/kipi-plugins/gpssync/gpseditdialog.cpp
index 96663f7..4c5d958 100644
--- a/kipi-plugins/gpssync/gpseditdialog.cpp
+++ b/kipi-plugins/gpssync/gpseditdialog.cpp
@@ -24,7 +24,7 @@
 
 #include <tqtimer.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqvalidator.h>
 
@@ -85,7 +85,7 @@ public:
 
 GPSEditDialog::GPSEditDialog(TQWidget* parent, const GPSDataContainer& gpsData,
                              const TQString& fileName, bool hasGPSInfo)
-             : KDialogBase(Plain, i18n("%1 - Edit Geographical Coordinates").tqarg(fileName),
+             : KDialogBase(Plain, i18n("%1 - Edit Geographical Coordinates").arg(fileName),
                            Help|Ok|Cancel, Ok,
                            parent, 0, true, false)
 {
diff --git a/kipi-plugins/gpssync/gpslistviewitem.cpp b/kipi-plugins/gpssync/gpslistviewitem.cpp
index 0378291..0b186d0 100644
--- a/kipi-plugins/gpssync/gpslistviewitem.cpp
+++ b/kipi-plugins/gpssync/gpslistviewitem.cpp
@@ -117,7 +117,7 @@ void GPSListViewItem::setGPSInfo(const GPSDataContainer& gpsData, bool dirty, bo
         setText(6, status);
     }
 
-    tqrepaint();
+    repaint();
 }
 
 GPSDataContainer GPSListViewItem::GPSInfo() const
@@ -130,7 +130,7 @@ void GPSListViewItem::eraseGPSInfo()
     d->erase = true;
     d->dirty = true;
     setText(6, i18n("Deleted!"));
-    tqrepaint();
+    repaint();
 }
 
 void GPSListViewItem::setDateTime(const TQDateTime& date)
@@ -197,7 +197,7 @@ void GPSListViewItem::writeGPSInfoToFile()
 void GPSListViewItem::setEnabled(bool e)
 {
     d->enabled = e;
-    tqrepaint();
+    repaint();
 }
 
 bool GPSListViewItem::isEnabled()
@@ -210,7 +210,7 @@ bool GPSListViewItem::isDirty()
     return d->dirty;
 }
 
-void GPSListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+void GPSListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
 {
     if (isEnabled())
     {
@@ -219,7 +219,7 @@ void GPSListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column
             TQColorGroup _cg( cg );
             TQColor c = _cg.text();
             _cg.setColor( TQColorGroup::Text, TQt::red );
-            KListViewItem::paintCell( p, _cg, column, width, tqalignment );
+            KListViewItem::paintCell( p, _cg, column, width, alignment );
             _cg.setColor( TQColorGroup::Text, c );
         }
         else if ( isDirty() && d->erase && column == 6)
@@ -227,18 +227,18 @@ void GPSListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column
             TQColorGroup _cg( cg );
             TQColor c = _cg.text();
             _cg.setColor( TQColorGroup::Text, TQt::red );
-            KListViewItem::paintCell( p, _cg, column, width, tqalignment );
+            KListViewItem::paintCell( p, _cg, column, width, alignment );
             _cg.setColor( TQColorGroup::Text, c );
         }
         else
-            KListViewItem::paintCell(p, cg, column, width, tqalignment);
+            KListViewItem::paintCell(p, cg, column, width, alignment);
     }
     else
     {
         TQColorGroup _cg( cg );
         TQColor c = _cg.text();
         _cg.setColor( TQColorGroup::Text, TQt::gray );
-        KListViewItem::paintCell( p, _cg, column, width, tqalignment );
+        KListViewItem::paintCell( p, _cg, column, width, alignment );
         _cg.setColor( TQColorGroup::Text, c );
     }
 }
diff --git a/kipi-plugins/gpssync/gpslistviewitem.h b/kipi-plugins/gpssync/gpslistviewitem.h
index a9c0526..738b610 100644
--- a/kipi-plugins/gpssync/gpslistviewitem.h
+++ b/kipi-plugins/gpssync/gpslistviewitem.h
@@ -71,7 +71,7 @@ public:
 
 protected:
 
-    void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
+    void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
 
 private: 
 
diff --git a/kipi-plugins/gpssync/gpsmapwidget.cpp b/kipi-plugins/gpssync/gpsmapwidget.cpp
index 82132ac..a5874b6 100644
--- a/kipi-plugins/gpssync/gpsmapwidget.cpp
+++ b/kipi-plugins/gpssync/gpsmapwidget.cpp
@@ -126,7 +126,7 @@ void GPSMapWidget::khtmlMouseMoveEvent(khtml::MouseMoveEvent *e)
 {
     TQString status = jsStatusBarText();
 
-    // If a new point to the map have been moved, the tqStatus
+    // If a new point to the map have been moved, the Status
     // string is like : "(lat:25.5894748, lon:47.6897455478, alt:211)"
     if (status.startsWith(TQString("(lat:")))
         extractGPSPositionfromStatusbar(status);
@@ -138,12 +138,12 @@ void GPSMapWidget::khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *e)
 {
     TQString status = jsStatusBarText();
 
-    // If a new point to the map have been moved, the tqStatus
+    // If a new point to the map have been moved, the Status
     // string is like : "(lat:25.5894748, lon:47.6897455478, alt:211)"
     if (status.startsWith(TQString("(lat:")))
         extractGPSPositionfromStatusbar(status);
 
-    // If a new map zoom level have been selected, the tqStatus
+    // If a new map zoom level have been selected, the Status
     // string is like : "newZoomLevel:5"
     if (status.startsWith(TQString("newZoomLevel:")))
     {
@@ -151,7 +151,7 @@ void GPSMapWidget::khtmlMouseReleaseEvent(khtml::MouseReleaseEvent *e)
         d->zoomLevel = status;
     }
 
-    // If a new map type have been selected, the tqStatus
+    // If a new map type have been selected, the Status
     // string is like : "newMapType:G_SATELLITE_TYPE"
     if (status.startsWith(TQString("newMapType:")))
     {
diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp
index 597bb10..c847668 100644
--- a/kipi-plugins/gpssync/gpssyncdialog.cpp
+++ b/kipi-plugins/gpssync/gpssyncdialog.cpp
@@ -24,7 +24,7 @@
 // TQt includes.
 
 #include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqvgroupbox.h>
 #include <tqgrid.h>
@@ -138,14 +138,14 @@ GPSSyncDialog::GPSSyncDialog( KIPI::Interface* interface, TQWidget* parent)
     d->listView->setResizeMode(TQListView::AllColumns);
     d->listView->setAllColumnsShowFocus(true);
     d->listView->setSorting(-1);
-    d->listView->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+    d->listView->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
     d->listView->setSelectionMode(TQListView::Extended);
     d->listView->setMinimumWidth(450);
 
     // ---------------------------------------------------------------
 
     TQGroupBox *settingsBox         = new TQGroupBox(0, Qt::Vertical, i18n("Settings"), plainPage());
-    TQGridLayout *settingsBoxLayout = new TQGridLayout(settingsBox->tqlayout(), 8, 1,
+    TQGridLayout *settingsBoxLayout = new TQGridLayout(settingsBox->layout(), 8, 1,
                                                      KDialog::spacingHint());
 
     TQPushButton *loadGPXButton = new TQPushButton(i18n("Load GPX File..."), settingsBox);
@@ -299,7 +299,7 @@ void GPSSyncDialog::setImages( const KURL::List& images )
 void GPSSyncDialog::slotLoadGPXFile()
 {
     KURL loadGPXFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(),
-                                               i18n("%1|GPS Exchange Format").tqarg("*.gpx"), this,
+                                               i18n("%1|GPS Exchange Format").arg("*.gpx"), this,
                                                i18n("Select GPX File to Load") );
     if( loadGPXFile.isEmpty() )
        return;
@@ -310,7 +310,7 @@ void GPSSyncDialog::slotLoadGPXFile()
     if (!ret)
     {
         KMessageBox::error(this, i18n("Cannot parse %1 GPX file!")
-                           .tqarg(loadGPXFile.fileName()), i18n("GPS Sync"));
+                           .arg(loadGPXFile.fileName()), i18n("GPS Sync"));
         enableButton(User1, false);
         return;
     }
@@ -318,13 +318,13 @@ void GPSSyncDialog::slotLoadGPXFile()
     if (d->gpxParser.numPoints() <= 0)
     {
         KMessageBox::sorry(this, i18n("The %1 GPX file do not have a date-time track to use!")
-                           .tqarg(loadGPXFile.fileName()), i18n("GPS Sync"));
+                           .arg(loadGPXFile.fileName()), i18n("GPS Sync"));
         enableButton(User1, false);
         return;
     }
 
     d->gpxFileName->setText(loadGPXFile.fileName());
-    d->gpxPointsLabel->setText(i18n("Points parsed: %1").tqarg(d->gpxParser.numPoints()));
+    d->gpxPointsLabel->setText(i18n("Points parsed: %1").arg(d->gpxParser.numPoints()));
     enableButton(User1, true);
     slotUser1();
 }
@@ -373,7 +373,7 @@ bool GPSSyncDialog::promptUserClose()
         if (KMessageBox::No == KMessageBox::warningYesNo(this,
                      i18n("<p>%1\n"
                           "Do you really want to close this window without applying changes?</p>")
-                          .tqarg(msg)))
+                          .arg(msg)))
             return false;
     }
 
diff --git a/kipi-plugins/gpssync/kmlexport.cpp b/kipi-plugins/gpssync/kmlexport.cpp
index c95b54a..c3a1337 100644
--- a/kipi-plugins/gpssync/kmlexport.cpp
+++ b/kipi-plugins/gpssync/kmlexport.cpp
@@ -80,7 +80,7 @@ bool kmlExport::createDir(TQDir dir)
     bool ok = createDir(parent);
     if (!ok) 
     {
-        logError(i18n("Could not create '%1").tqarg(parent.path()));
+        logError(i18n("Could not create '%1").arg(parent.path()));
         return false;
     }
     return parent.mkdir(dir.dirName());
@@ -164,14 +164,14 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
     TQFile imageFile(path);
     if (!imageFile.open(IO_ReadOnly)) 
     {
-        logWarning(i18n("Could not read image '%1'").tqarg(path));
+        logWarning(i18n("Could not read image '%1'").arg(path));
         return;
     }
 
     TQString imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&imageFile));
     if (imageFormat.isEmpty()) 
     {
-        logWarning(i18n("Format of image '%1' is unknown").tqarg(path));
+        logWarning(i18n("Format of image '%1' is unknown").arg(path));
         return;
     }
     imageFile.close();
@@ -181,7 +181,7 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
     TQImage image;
     if (!image.loadFromData(imageData) ) 
     {
-        logWarning(i18n("Error loading image '%1'").tqarg(path));
+        logWarning(i18n("Error loading image '%1'").arg(path));
         return;
     }
 
@@ -221,11 +221,11 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
     if (!image.save(destPath, imageFormat.ascii(), 85)) 
     {
         // if not able to save the image, it's pointless to create a placemark
-        logWarning(i18n("Could not save image '%1' to '%2'").tqarg(path).tqarg(destPath));
+        logWarning(i18n("Could not save image '%1' to '%2'").arg(path).arg(destPath));
     }
     else 
     {
-        //logInfo(i18n("Creation of picture '%1'").tqarg(fullFileName));
+        //logInfo(i18n("Creation of picture '%1'").arg(fullFileName));
         KExiv2Iface::KExiv2 exiv2Iface;
         exiv2Iface.load(imageURL.path());
         double alt, lat, lng;
@@ -237,11 +237,11 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
 
         if (alt) 
         {
-            addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2,%3").tqarg(lng).tqarg(lat).tqarg(alt));
+            addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2,%3").arg(lng).arg(lat).arg(alt));
         } 
         else 
         {
-            addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2").tqarg(lng).tqarg(lat));
+            addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2").arg(lng).arg(lat));
         }
 
         if (m_altitudeMode == 2 ) 
@@ -301,18 +301,18 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
             my_description += "<br/>" + info.description() ;
         }
         addKmlTextElement(kmlPlacemark, "description", my_description);
-        logInfo(i18n("Creation of placemark '%1'").tqarg(fullFileName));
+        logInfo(i18n("Creation of placemark '%1'").arg(fullFileName));
 
         // Save icon
         TQString iconFileName = "thumb_" + baseFileName + '.' + imageFormat.lower();
         TQString destPath     = m_tempDestDir + m_imageDir + iconFileName;
         if (!icon.save(destPath, imageFormat.ascii(), 85)) 
         {
-            logWarning(i18n("Could not save icon for image '%1' to '%2'").tqarg(path).tqarg(destPath));
+            logWarning(i18n("Could not save icon for image '%1' to '%2'").arg(path).arg(destPath));
         } 
         else 
         {
-            //logInfo(i18n("Creation of icon '%1'").tqarg(iconFileName));
+            //logInfo(i18n("Creation of icon '%1'").arg(iconFileName));
             // style et icon
             TQDomElement kmlStyle     = addKmlElement(kmlPlacemark, "Style");
             TQDomElement kmlIconStyle = addKmlElement(kmlStyle, "IconStyle");
@@ -347,14 +347,14 @@ void kmlExport::addTrack(TQDomElement &kmlAlbum)
 
     if (!ret)
     {
-        logError(i18n("Cannot parse %1 GPX file!").tqarg(m_GPXFile));
+        logError(i18n("Cannot parse %1 GPX file!").arg(m_GPXFile));
         return;
     }
 
     if (m_gpxParser.numPoints() <= 0)
     {
         logError(i18n("The %1 GPX file do not have a date-time track to use!")
-                 .tqarg(m_GPXFile));
+                 .arg(m_GPXFile));
         return;
     }
 
@@ -381,12 +381,12 @@ void kmlExport::addTrack(TQDomElement &kmlAlbum)
     TQDomElement kmlLineStyle = addKmlElement(kmlLineTrackStyle, "LineStyle");
     // the KML color is not #RRGGBB but AABBGGRR
     TQString KMLColorValue = TQString("%1%2%3%4")
-        .tqarg((int)m_GPXOpacity*256/100, 2, 16)
-        .tqarg((&m_GPXColor)->blue(), 2, 16)
-        .tqarg((&m_GPXColor)->green(), 2, 16)
-        .tqarg((&m_GPXColor)->red(), 2, 16);
+        .arg((int)m_GPXOpacity*256/100, 2, 16)
+        .arg((&m_GPXColor)->blue(), 2, 16)
+        .arg((&m_GPXColor)->green(), 2, 16)
+        .arg((&m_GPXColor)->red(), 2, 16);
     addKmlTextElement(kmlLineStyle, "color", KMLColorValue);
-    addKmlTextElement(kmlLineStyle, "width", TQString("%1").tqarg(m_LineWidth) );
+    addKmlTextElement(kmlLineStyle, "width", TQString("%1").arg(m_LineWidth) );
 
     m_gpxParser.CreateTrackLine(kmlAlbum, *kmlDocument, m_GPXAltitudeMode);
 }
@@ -440,7 +440,7 @@ void kmlExport::generate()
         }
         else 
         {
-            logWarning(i18n("No position data for '%1'").tqarg(info.title()));
+            logWarning(i18n("No position data for '%1'").arg(info.title()));
             defectImage++;
         }
         m_progressDialog->setProgress(pos, count);
diff --git a/kipi-plugins/gpssync/kmlexportconfig.cpp b/kipi-plugins/gpssync/kmlexportconfig.cpp
index 10602d8..00a4a84 100644
--- a/kipi-plugins/gpssync/kmlexportconfig.cpp
+++ b/kipi-plugins/gpssync/kmlexportconfig.cpp
@@ -27,7 +27,7 @@
 #include <tqcombobox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -68,20 +68,20 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name)
                              parent, 0, true, false)
 {
     if ( !name ) setName( "KMLExportConfig" );
-    tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0,
+    setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0,
                                 (TQSizePolicy::SizeType)0, 0, 0, sizePolicy().hasHeightForWidth() ) );
     KMLExportConfigLayout = new TQGridLayout ( plainPage(), 1, 3, 0, spacingHint()); 
 
     // --------------------------------------------------------------
     // Target preferences
     TargetPreferenceGroupBox       = new TQGroupBox(0, Qt::Vertical, i18n( "Target Preferences" ), plainPage());
-    TargetPreferenceGroupBoxLayout = new TQGridLayout( TargetPreferenceGroupBox->tqlayout(), 6, 5, KDialog::spacingHint());
-    TargetPreferenceGroupBoxLayout->tqsetAlignment( TQt::AlignTop );
+    TargetPreferenceGroupBoxLayout = new TQGridLayout( TargetPreferenceGroupBox->layout(), 6, 5, KDialog::spacingHint());
+    TargetPreferenceGroupBoxLayout->setAlignment( TQt::AlignTop );
 
     // target type
     buttonGroupTargetType = new TQButtonGroup(0, Qt::Vertical, i18n( "Target Type" ), TargetPreferenceGroupBox, "buttonGroupTargetType" );
-    buttonGroupTargetTypeLayout = new TQGridLayout( buttonGroupTargetType->tqlayout(), 2, 1, KDialog::spacingHint() );
-    buttonGroupTargetTypeLayout->tqsetAlignment( TQt::AlignTop );
+    buttonGroupTargetTypeLayout = new TQGridLayout( buttonGroupTargetType->layout(), 2, 1, KDialog::spacingHint() );
+    buttonGroupTargetTypeLayout->setAlignment( TQt::AlignTop );
 
     LocalTargetRadioButton_ = new TQRadioButton( i18n( "&Local or web target used by GoogleEarth" ),
                                                 buttonGroupTargetType, "LocalTargetRadioButton_" );
@@ -146,8 +146,8 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name)
     // Sizes
     TQGroupBox *SizeGroupBox = new TQGroupBox(0, Qt::Vertical, i18n( "Sizes" ), plainPage() );
     SizeGroupBox->setColumnLayout(0, Qt::Vertical );
-    SizeGroupBoxLayout = new TQGridLayout( SizeGroupBox->tqlayout(), 2, 3, KDialog::spacingHint() );
-    SizeGroupBoxLayout->tqsetAlignment( TQt::AlignTop );
+    SizeGroupBoxLayout = new TQGridLayout( SizeGroupBox->layout(), 2, 3, KDialog::spacingHint() );
+    SizeGroupBoxLayout->setAlignment( TQt::AlignTop );
 
     IconSizeLabel = new TQLabel( i18n( "Icon size" ),
                                 SizeGroupBox, "IconSizeLabel" );
@@ -176,9 +176,9 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name)
     // --------------------------------------------------------------
     // GPX Tracks
     TQGroupBox *GPXTracksGroupBox         = new TQGroupBox(0, Qt::Vertical, i18n( "GPX Tracks" ), plainPage());
-    TQGridLayout *GPXTracksGroupBoxLayout = new TQGridLayout(GPXTracksGroupBox->tqlayout(), 5, 4,
+    TQGridLayout *GPXTracksGroupBoxLayout = new TQGridLayout(GPXTracksGroupBox->layout(), 5, 4,
                                                            KDialog::spacingHint());
-    GPXTracksGroupBoxLayout->tqsetAlignment( TQt::AlignTop );
+    GPXTracksGroupBoxLayout->setAlignment( TQt::AlignTop );
 
     // add a gpx track checkbox
     GPXTracksCheckBox_ = new TQCheckBox( i18n( "Draw GPX track" ), GPXTracksGroupBox, "GPXTracksCheckBox");
@@ -190,7 +190,7 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name)
     GPXTracksGroupBoxLayout->addMultiCellWidget( GPXFileLabel_, 1, 1, 0, 0);
 
     GPXFileKURLRequester_ = new KURLRequester( GPXTracksGroupBox, "GPXFileKURLRequester" );
-    GPXFileKURLRequester_->setFilter(i18n("%1|GPS Exchange Format").tqarg("*.gpx"));
+    GPXFileKURLRequester_->setFilter(i18n("%1|GPS Exchange Format").arg("*.gpx"));
     GPXFileKURLRequester_->setCaption(i18n("Select GPX File to Load"));
     GPXTracksGroupBoxLayout->addMultiCellWidget( GPXFileKURLRequester_, 1, 1, 1, 3);
 
diff --git a/kipi-plugins/gpssync/kmlgpsdataparser.cpp b/kipi-plugins/gpssync/kmlgpsdataparser.cpp
index 1d9226d..522da15 100644
--- a/kipi-plugins/gpssync/kmlgpsdataparser.cpp
+++ b/kipi-plugins/gpssync/kmlgpsdataparser.cpp
@@ -49,7 +49,7 @@ TQString KMLGPSDataParser::lineString()
     for (GPSDataMap::ConstIterator it = m_GPSDataMap.constBegin();
          it != end; ++it )
     {
-        line += TQString("%1,%2,%3 ").tqarg(it.data().longitude()).tqarg(it.data().latitude()).tqarg(it.data().altitude());
+        line += TQString("%1,%2,%3 ").arg(it.data().longitude()).arg(it.data().latitude()).arg(it.data().altitude());
     }
     return line;
 }
@@ -102,7 +102,7 @@ void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackPoints(TQDomElement &parent
          it != end; ++it, i++)
     {
         TQDomElement kmlPointPlacemark = addKmlElement(kmlPointsFolder, "Placemark");
-        addKmlTextElement(kmlPointPlacemark, "name", TQString("%1 %2 ").tqarg(i18n("Point")).tqarg(i));
+        addKmlTextElement(kmlPointPlacemark, "name", TQString("%1 %2 ").arg(i18n("Point")).arg(i));
         addKmlTextElement(kmlPointPlacemark, "styleUrl", "#track");
         TQDomElement kmlTimeStamp = addKmlElement(kmlPointPlacemark, "TimeStamp");
         // GPS device are sync in time by satellite using GMT time.
@@ -117,11 +117,11 @@ void KIPIGPSSyncPlugin::KMLGPSDataParser::CreateTrackPoints(TQDomElement &parent
         if (it.data().latitude()) 
         {
             addKmlTextElement(kmlGeometry, "coordinates",
-                              TQString("%1,%2,%3").tqarg(it.data().longitude()).tqarg(it.data().latitude()).tqarg(it.data().altitude()));
+                              TQString("%1,%2,%3").arg(it.data().longitude()).arg(it.data().latitude()).arg(it.data().altitude()));
         } 
         else 
         {
-            addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2").tqarg(it.data().longitude()).tqarg(it.data().latitude()));
+            addKmlTextElement(kmlGeometry, "coordinates", TQString("%1,%2").arg(it.data().longitude()).arg(it.data().latitude()));
         }
         if (altitudeMode == 2 ) 
         {
diff --git a/kipi-plugins/gpssync/plugin_gpssync.cpp b/kipi-plugins/gpssync/plugin_gpssync.cpp
index 2c9695a..0adba49 100644
--- a/kipi-plugins/gpssync/plugin_gpssync.cpp
+++ b/kipi-plugins/gpssync/plugin_gpssync.cpp
@@ -141,8 +141,8 @@ bool Plugin_GPSSync::checkBinaries(TQString &gpsBabelVersion)
                           "Please install gpsbabel as a package from your distributor "
                           "or <a href=\"%1\">download the source</a>.</p>"
                           "<p>Note: at least, gpsbabel version %2 is required by this plugin.</p></qt>")
-                          .tqarg("http://www.gpsbabel.org")
-                          .tqarg(gpsBabelBinary.minimalVersion()),
+                          .arg("http://www.gpsbabel.org")
+                          .arg(gpsBabelBinary.minimalVersion()),
                      TQString(),
                      TQString(),
                      KMessageBox::Notify | KMessageBox::AllowLink);
@@ -160,9 +160,9 @@ bool Plugin_GPSSync::checkBinaries(TQString &gpsBabelVersion)
                           "or <a href=\"%2\">download the source</a>.</p>"
                           "<p>Note: at least, gpsbabel version %3 is required by this "
                           "plugin</p></qt>")
-                          .tqarg(gpsBabelVersion)
-                          .tqarg("http://www.gpsbabel.org")
-                          .tqarg(gpsBabelBinary.minimalVersion()),
+                          .arg(gpsBabelVersion)
+                          .arg("http://www.gpsbabel.org")
+                          .arg(gpsBabelBinary.minimalVersion()),
                      TQString(),
                      TQString(),
                      KMessageBox::Notify | KMessageBox::AllowLink);
diff --git a/kipi-plugins/htmlexport/generator.cpp b/kipi-plugins/htmlexport/generator.cpp
index 2e52161..d1bbe1c 100644
--- a/kipi-plugins/htmlexport/generator.cpp
+++ b/kipi-plugins/htmlexport/generator.cpp
@@ -172,7 +172,7 @@ struct Generator::Private {
 	bool init() {
 		mTheme=Theme::findByInternalName(mInfo->theme());
 		if (!mTheme) {
-			logError( i18n("Could not find theme in '%1'").tqarg(mInfo->theme()) );
+			logError( i18n("Could not find theme in '%1'").arg(mInfo->theme()) );
 			return false;
 		}
 		return true;
@@ -200,11 +200,11 @@ struct Generator::Private {
 	bool writeDataToFile(const TQByteArray& data, const TQString& destPath) {
 		TQFile destFile(destPath);
 		if (!destFile.open(IO_WriteOnly)) {
-			logWarning(i18n("Could not open file '%1' for writing").tqarg(destPath));
+			logWarning(i18n("Could not open file '%1' for writing").arg(destPath));
 			return false;
 		}
 		if (destFile.writeBlock(data) != (TQ_LONG)data.size()) {
-			logWarning(i18n("Could not save image to file '%1'").tqarg(destPath));
+			logWarning(i18n("Could not save image to file '%1'").arg(destPath));
 			return false;
 		}
 		return true;
@@ -233,13 +233,13 @@ struct Generator::Private {
 		TQString path=imageURL.path();
 		TQFile imageFile(path);
 		if (!imageFile.open(IO_ReadOnly)) {
-			logWarning(i18n("Could not read image '%1'").tqarg(path));
+			logWarning(i18n("Could not read image '%1'").arg(path));
 			return;
 		}
 		
 		TQString imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&imageFile));
 		if (imageFormat.isEmpty()) {
-			logWarning(i18n("Format of image '%1' is unknown").tqarg(path));
+			logWarning(i18n("Format of image '%1' is unknown").arg(path));
 			return;
 		}
 		imageFile.close();
@@ -248,7 +248,7 @@ struct Generator::Private {
 		TQByteArray imageData = imageFile.readAll();
 		TQImage originalImage;
 		if (!originalImage.loadFromData(imageData) ) {
-			logWarning(i18n("Error loading image '%1'").tqarg(path));
+			logWarning(i18n("Error loading image '%1'").arg(path));
 			return;
 		}
 
@@ -284,7 +284,7 @@ struct Generator::Private {
 			fullFileName = baseFileName + "." + mInfo->fullFormatString().lower();
 			TQString destPath = destDir + "/" + fullFileName;
 			if (!fullImage.save(destPath, mInfo->fullFormatString().ascii(), mInfo->fullQuality())) {
-				logWarning(i18n("Could not save image '%1' to '%2'").tqarg(path).tqarg(destPath));
+				logWarning(i18n("Could not save image '%1' to '%2'").arg(path).arg(destPath));
 				return;
 			}
 		}
@@ -302,7 +302,7 @@ struct Generator::Private {
 		TQString thumbnailFileName = "thumb_" + baseFileName + "." + mInfo->thumbnailFormatString().lower();
 		TQString destPath = destDir + "/" + thumbnailFileName;
 		if (!thumbnail.save(destPath, mInfo->thumbnailFormatString().ascii(), mInfo->thumbnailQuality())) {
-			logWarning(i18n("Could not save thumbnail for image '%1' to '%2'").tqarg(path).tqarg(destPath));
+			logWarning(i18n("Could not save thumbnail for image '%1' to '%2'").arg(path).arg(destPath));
 			return;
 		}
 		
@@ -337,7 +337,7 @@ struct Generator::Private {
 		TQValueList<KIPI::ImageCollection>::Iterator collectionEnd=mInfo->mCollectionList.end();
 		for (; collectionIt!=collectionEnd; ++collectionIt) {
 			KIPI::ImageCollection collection=*collectionIt;
-			logInfo( i18n("Generating files for \"%1\"").tqarg(collection.name()) );
+			logInfo( i18n("Generating files for \"%1\"").arg(collection.name()) );
 
 			TQString collectionFileName = webifyFileName(collection.name());
 			TQString destDir = baseDestDir + "/" + collectionFileName;
@@ -406,13 +406,13 @@ struct Generator::Private {
 		CWrapper<xsltStylesheetPtr, xsltFreeStylesheet> xslt= xsltParseStylesheetFile( (const xmlChar*) xsltFileName.local8Bit().data() );
 
 		if (!xslt) {
-			logError(i18n("Could not load XSL file '%1'").tqarg(xsltFileName));
+			logError(i18n("Could not load XSL file '%1'").arg(xsltFileName));
 			return false;
 		}
 		
 		CWrapper<xmlDocPtr, xmlFreeDoc> xmlGallery=xmlParseFile( mXMLFileName.local8Bit().data() );
 		if (!xmlGallery) {
-			logError(i18n("Could not load XML file '%1'").tqarg(mXMLFileName));
+			logError(i18n("Could not load XML file '%1'").arg(mXMLFileName));
 			return false;
 		}
 		
@@ -451,7 +451,7 @@ struct Generator::Private {
 		TQString destFileName=mInfo->destKURL().path() + "/index.html";
 		FILE* file=fopen(destFileName.local8Bit().data(), "w");
 		if (!file) {
-			logError(i18n("Could not open '%1' for writing").tqarg(destFileName));
+			logError(i18n("Could not open '%1' for writing").arg(destFileName));
 			return false;
 		}
 		xsltSaveResultToFile(file, xmlOutput, xslt);
@@ -469,7 +469,7 @@ struct Generator::Private {
 			TQString part = *it;
 			if (!dir.exists(part)) {
 				if (!dir.mkdir(part)) {
-					logError(i18n("Could not create folder '%1' in '%2'").tqarg(part).tqarg(dir.absPath()));
+					logError(i18n("Could not create folder '%1' in '%2'").arg(part).arg(dir.absPath()));
 					return false;
 				}
 			}
diff --git a/kipi-plugins/htmlexport/imagesettingspage.ui b/kipi-plugins/htmlexport/imagesettingspage.ui
index d200786..596076e 100644
--- a/kipi-plugins/htmlexport/imagesettingspage.ui
+++ b/kipi-plugins/htmlexport/imagesettingspage.ui
@@ -45,7 +45,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>58</width>
                     <height>20</height>
@@ -62,7 +62,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -79,7 +79,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>104</height>
@@ -109,7 +109,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -126,7 +126,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -244,7 +244,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -288,7 +288,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -305,7 +305,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>19</height>
@@ -332,7 +332,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -341,7 +341,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="4" column="1" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -401,7 +401,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kipi-plugins/htmlexport/listthemeparameter.cpp b/kipi-plugins/htmlexport/listthemeparameter.cpp
index 8bae470..e2bb23e 100644
--- a/kipi-plugins/htmlexport/listthemeparameter.cpp
+++ b/kipi-plugins/htmlexport/listthemeparameter.cpp
@@ -49,8 +49,8 @@ void ListThemeParameter::init(const TQCString& internalName, const KConfigBase*
 	AbstractThemeParameter::init(internalName, configFile);
 
 	for (int pos=0;; ++pos) {
-		TQString valueKey = TQString("%1%2").tqarg(ITEM_VALUE_KEY).tqarg(pos);
-		TQString captionKey = TQString("%1%2").tqarg(ITEM_CAPTION_KEY).tqarg(pos);
+		TQString valueKey = TQString("%1%2").arg(ITEM_VALUE_KEY).arg(pos);
+		TQString captionKey = TQString("%1%2").arg(ITEM_CAPTION_KEY).arg(pos);
 		if (!configFile->hasKey(valueKey) || !configFile->hasKey(captionKey)) {
 			break;
 		}
diff --git a/kipi-plugins/htmlexport/outputpage.ui b/kipi-plugins/htmlexport/outputpage.ui
index 6ece24d..aa7e3f4 100644
--- a/kipi-plugins/htmlexport/outputpage.ui
+++ b/kipi-plugins/htmlexport/outputpage.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -63,7 +63,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>51</height>
diff --git a/kipi-plugins/htmlexport/theme.cpp b/kipi-plugins/htmlexport/theme.cpp
index 02531a8..74aafae 100644
--- a/kipi-plugins/htmlexport/theme.cpp
+++ b/kipi-plugins/htmlexport/theme.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // TQt
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // KDE
 #include <kdebug.h>
diff --git a/kipi-plugins/htmlexport/themeparameterspage.ui b/kipi-plugins/htmlexport/themeparameterspage.ui
index 2d05fda..4fd5a21 100644
--- a/kipi-plugins/htmlexport/themeparameterspage.ui
+++ b/kipi-plugins/htmlexport/themeparameterspage.ui
@@ -37,7 +37,7 @@
             <property name="text">
                 <string>In this page, you can change some theme parameters. Depending on the theme, different parameters are available.</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -51,7 +51,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -79,7 +79,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp
index acc7f6e..c64fb0a 100644
--- a/kipi-plugins/htmlexport/wizard.cpp
+++ b/kipi-plugins/htmlexport/wizard.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 #include <tqpainter.h>
 #include <tqspinbox.h>
@@ -102,7 +102,7 @@ struct Wizard::Private {
 	void fillThemeParametersPage(Theme::Ptr theme) {
 		// Delete any previous widgets
 		TQFrame* content = mThemeParametersPage->content;
-		if (content->tqlayout()) {
+		if (content->layout()) {
 			// Setting recursiveSearch to false is very important, if we don't
 			// we will end up deleting subwidgets of our child widgets
 			TQObjectList* list = content->queryList(TQWIDGET_OBJECT_NAME_STRING, 0 /*objName*/, 
@@ -112,14 +112,14 @@ struct Wizard::Private {
 				delete it.current();
 			}
 
-			delete content->tqlayout();
+			delete content->layout();
 		}
 		mThemeParameterWidgetFromName.clear();
 
-		// Create tqlayout. We need to recreate it everytime, to get rid of
+		// Create layout. We need to recreate it everytime, to get rid of
 		// spacers
-		TQGridLayout* tqlayout = new TQGridLayout(content, 0, 3);
-		tqlayout->setSpacing(KDialog::spacingHint());
+		TQGridLayout* layout = new TQGridLayout(content, 0, 3);
+		layout->setSpacing(KDialog::spacingHint());
 
 		// Create widgets
 		Theme::ParameterList parameterList = theme->parameterList();
@@ -136,23 +136,23 @@ struct Wizard::Private {
 				themeParameter->defaultValue());
 
 			TQString name = themeParameter->name();
-			name = i18n("'%1' is a label for a theme parameter", "%1:").tqarg(name);
+			name = i18n("'%1' is a label for a theme parameter", "%1:").arg(name);
 
 			TQLabel* label = new TQLabel(name, content);
 			TQWidget* widget = themeParameter->createWidget(content, value);
 			label->setBuddy(widget);
 
-			int row = tqlayout->numRows();
-			tqlayout->addWidget(label, row, 0);
+			int row = layout->numRows();
+			layout->addWidget(label, row, 0);
 
-			if (widget->tqsizePolicy().expanding() & TQSizePolicy::Horizontally) {
+			if (widget->sizePolicy().expanding() & TQSizePolicy::Horizontally) {
 				// Widget wants full width
-				tqlayout->addMultiCellWidget(widget, row, row, 1, 2);
+				layout->addMultiCellWidget(widget, row, row, 1, 2);
 			} else {
 				// Widget doesn't like to be stretched, add a spacer next to it
-				tqlayout->addWidget(widget, row, 1);
+				layout->addWidget(widget, row, 1);
 				TQSpacerItem* spacer = new TQSpacerItem(1, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum);
-				tqlayout->addItem(spacer, row, 2);
+				layout->addItem(spacer, row, 2);
 			}
 
 			mThemeParameterWidgetFromName[internalName] = widget;
@@ -161,7 +161,7 @@ struct Wizard::Private {
 		// Add spacer at the end, so that widgets aren't spread on the whole
 		// parent height
 		TQSpacerItem* spacer = new TQSpacerItem(1, 1, TQSizePolicy::Minimum, TQSizePolicy::Expanding);
-		tqlayout->addItem(spacer, tqlayout->numRows(), 0);
+		layout->addItem(spacer, layout->numRows(), 0);
 	}
 };
 
@@ -242,12 +242,12 @@ void Wizard::slotThemeSelectionChanged() {
 		TQString url=theme->authorUrl();
 		TQString author=theme->authorName();
 		if (!url.isEmpty()) {
-			author=TQString("<a href='%1'>%2</a>").tqarg(url).tqarg(author);
+			author=TQString("<a href='%1'>%2</a>").arg(url).arg(author);
 		}
 		
 		TQString txt=
-			TQString("<b>%1</b><br><br>%2<br><br>").tqarg(theme->name(), theme->comment())
-			+ i18n("Author: %1").tqarg(author);
+			TQString("<b>%1</b><br><br>%2<br><br>").arg(theme->name(), theme->comment())
+			+ i18n("Author: %1").arg(author);
 		browser->setText(txt);
 		setNextEnabled(d->mThemePage, true);
 
diff --git a/kipi-plugins/ipodexport/imagelist.cpp b/kipi-plugins/ipodexport/imagelist.cpp
index 940b920..f0bcfdc 100644
--- a/kipi-plugins/ipodexport/imagelist.cpp
+++ b/kipi-plugins/ipodexport/imagelist.cpp
@@ -91,9 +91,9 @@ ImageList::viewportPaintEvent( TQPaintEvent *e )
         const uint x = (viewport()->width() - w - 30) / 2 ;
         const uint y = (viewport()->height() - h - 30) / 2 ;
 
-        p.setBrush( tqcolorGroup().background() );
+        p.setBrush( colorGroup().background() );
         p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h );
-        t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() );
+        t.draw( &p, x+15, y+15, TQRect(), colorGroup() );
     }
 }
 
diff --git a/kipi-plugins/ipodexport/ipodexportdialog.cpp b/kipi-plugins/ipodexport/ipodexportdialog.cpp
index 387f77d..0f6668a 100644
--- a/kipi-plugins/ipodexport/ipodexportdialog.cpp
+++ b/kipi-plugins/ipodexport/ipodexportdialog.cpp
@@ -24,7 +24,7 @@
 #include <tqhgroupbox.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 #include <tqvgroupbox.h>
@@ -107,8 +107,8 @@ UploadDialog::UploadDialog(
 
     m_ipodPreview = new TQLabel( buttons );
     m_ipodPreview->setFixedHeight( 80 );
-    m_ipodPreview->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
-    m_ipodPreview->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+    m_ipodPreview->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_ipodPreview->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
 
     buttonLayout->addWidget( m_createAlbumButton );
     buttonLayout->addWidget( m_removeAlbumButton );
@@ -126,7 +126,7 @@ UploadDialog::UploadDialog(
     m_uploadList->setMinimumHeight( 80 );
     urlLayout->addWidget( m_uploadList );
 
-    m_uploadList->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding );
+    m_uploadList->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding );
 
     TQVBoxLayout* uploadPaneLayout = new TQVBoxLayout( urlLayout );
     m_addImagesButton = new TQPushButton ( i18n( "&Add..." ), urlBox );
@@ -143,8 +143,8 @@ UploadDialog::UploadDialog(
 
     m_imagePreview = new TQLabel( urlBox );
     m_imagePreview->setFixedHeight( 80 );
-    m_imagePreview->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
-    m_imagePreview->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+    m_imagePreview->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_imagePreview->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
     TQWhatsThis::add( m_imagePreview, i18n( "The preview of the selected image in the list." ) );
 
     TQLabel *hdd_icon = new TQLabel( urlBox );
@@ -700,7 +700,7 @@ UploadDialog::openDevice()
         debug() << "could not find iTunesDB on device mounted at " << m_mountPoint << endl;
 
         TQString msg = i18n( "An iPod photo database could not be found on device mounted at %1. "
-                "Should I try to initialize your iPod photo database?" ).tqarg( m_mountPoint );
+                "Should I try to initialize your iPod photo database?" ).arg( m_mountPoint );
 
         if( KMessageBox::warningContinueCancel( this, msg, i18n( "Initialize iPod Photo Database?" ),
                     KGuiItem(i18n("&Initialize"), "new") ) == KMessageBox::Continue )
diff --git a/kipi-plugins/ipodexport/ipodheader.cpp b/kipi-plugins/ipodexport/ipodheader.cpp
index 9fbf092..1924f86 100644
--- a/kipi-plugins/ipodexport/ipodheader.cpp
+++ b/kipi-plugins/ipodexport/ipodheader.cpp
@@ -18,19 +18,19 @@
 #include "kpushbutton.h"
 
 #include "tqlabel.h"
-#include "tqlayout.h"
+#include "layout.h"
 
 using namespace IpodExport;
 
 IpodHeader::IpodHeader( TQWidget *parent, const char *name, WFlags f )
     : TQFrame( parent, name, f )
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 10/*margin*/, 5/*spacing*/ );
+    TQVBoxLayout *layout = new TQVBoxLayout( this, 10/*margin*/, 5/*spacing*/ );
 
-    tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+    setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
 
     m_messageLabel = new TQLabel( TQString(), this );
-    m_messageLabel->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+    m_messageLabel->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
 
     TQHBoxLayout *buttonLayout = new TQHBoxLayout;
     m_button = new KPushButton( this );
@@ -40,8 +40,8 @@ IpodHeader::IpodHeader( TQWidget *parent, const char *name, WFlags f )
     buttonLayout->addWidget( m_button );
     buttonLayout->addStretch( 1 );
 
-    tqlayout->addWidget( m_messageLabel );
-    tqlayout->addLayout( buttonLayout );
+    layout->addWidget( m_messageLabel );
+    layout->addLayout( buttonLayout );
 }
 
 void IpodHeader::setViewType( ViewType view )
@@ -86,7 +86,7 @@ void IpodHeader::setIncompatibleIpod()
 {
     const TQString modelType = UploadDialog::instance()->ipodModel();
 
-    m_messageLabel->setText( i18n("<p align=\"center\"><b>Your iPod (%1) does not seem to support artwork.</b></p>" ).tqarg( modelType ) );
+    m_messageLabel->setText( i18n("<p align=\"center\"><b>Your iPod (%1) does not seem to support artwork.</b></p>" ).arg( modelType ) );
 
     setPaletteBackgroundColor( TQColor(225,150,0) );
     m_messageLabel->setPaletteBackgroundColor( TQColor(225,150,0)  );
@@ -109,12 +109,12 @@ void IpodHeader::setValidIpod()
     if( !mountPoint.isEmpty() )
     {
         m_messageLabel->setText( i18n("<p align=\"center\"><b>iPod %1 detected at: %2</b></p>" )
-                                 .tqarg( modelType, mountPoint ) );
+                                 .arg( modelType, mountPoint ) );
     }
     else
     {
         m_messageLabel->setText( i18n("<p align=\"center\"><b>iPod %1 detected</b></p>" )
-                                .tqarg( modelType ) );
+                                .arg( modelType ) );
     }
     setPaletteBackgroundColor( TQColor(0,98,0) );
     m_messageLabel->setPaletteBackgroundColor( TQColor(0,98,0) );
diff --git a/kipi-plugins/jpeglossless/convert2grayscale.cpp b/kipi-plugins/jpeglossless/convert2grayscale.cpp
index 95aff08..7c154f7 100644
--- a/kipi-plugins/jpeglossless/convert2grayscale.cpp
+++ b/kipi-plugins/jpeglossless/convert2grayscale.cpp
@@ -258,7 +258,7 @@ bool ImageGrayScale::image2GrayScaleImageMagick(const TQString& src, const TQStr
     }
 
     // Processing error !
-    err = i18n("Cannot convert to gray scale: %1").tqarg(m_stdErr.replace('\n', ' '));
+    err = i18n("Cannot convert to gray scale: %1").arg(m_stdErr.replace('\n', ' '));
     return false;
 }
 
diff --git a/kipi-plugins/jpeglossless/imageflip.cpp b/kipi-plugins/jpeglossless/imageflip.cpp
index 5cadb2f..55e3c97 100644
--- a/kipi-plugins/jpeglossless/imageflip.cpp
+++ b/kipi-plugins/jpeglossless/imageflip.cpp
@@ -213,7 +213,7 @@ bool ImageFlip::flipImageMagick(const TQString& src, const TQString& dest, FlipA
     }
 
     // Processing error !
-    err = i18n("Cannot flip: %1").tqarg(m_stdErr.replace('\n', ' '));
+    err = i18n("Cannot flip: %1").arg(m_stdErr.replace('\n', ' '));
     return false;
 }
 
diff --git a/kipi-plugins/jpeglossless/imagerotate.cpp b/kipi-plugins/jpeglossless/imagerotate.cpp
index 31360ba..6b030f6 100644
--- a/kipi-plugins/jpeglossless/imagerotate.cpp
+++ b/kipi-plugins/jpeglossless/imagerotate.cpp
@@ -237,7 +237,7 @@ bool ImageRotate::rotateImageMagick(const TQString& src, const TQString& dest,
     }
 
     // Processing error !
-    err = i18n("Cannot rotate: %1").tqarg(m_stdErr.replace('\n', ' '));
+    err = i18n("Cannot rotate: %1").arg(m_stdErr.replace('\n', ' '));
     return false;
 }
 
diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
index 3b35e6a..6b50023 100644
--- a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
+++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
@@ -213,7 +213,7 @@ void Plugin_JPEGLossless::slotFlip()
     }
 
     m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()), 
-                        i18n("Flip images %1").tqarg(title));
+                        i18n("Flip images %1").arg(title));
 
     connect(m_progressDlg, TQT_SIGNAL(cancelClicked()),
             this, TQT_SLOT(slotCancel()));
@@ -269,7 +269,7 @@ void Plugin_JPEGLossless::slotRotate()
     }
 
     m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()), 
-                        i18n("Rotate images %1").tqarg(title));
+                        i18n("Rotate images %1").arg(title));
 
     connect(m_progressDlg, TQT_SIGNAL(cancelClicked()),
             this, TQT_SLOT(slotCancel()));
@@ -344,17 +344,17 @@ void Plugin_JPEGLossless::customEvent(TQCustomEvent *event)
         {
             case(KIPIJPEGLossLessPlugin::Rotate): 
             {
-                text = i18n("Rotating Image \"%1\"").tqarg(d->fileName.section('/', -1));
+                text = i18n("Rotating Image \"%1\"").arg(d->fileName.section('/', -1));
                 break;
             }
             case(KIPIJPEGLossLessPlugin::Flip): 
             {
-                text = i18n("Flipping Image \"%1\"").tqarg(d->fileName.section('/', -1));
+                text = i18n("Flipping Image \"%1\"").arg(d->fileName.section('/', -1));
                 break;
             }
             case(KIPIJPEGLossLessPlugin::GrayScale): 
             {
-                text = i18n("Converting to Black & White \"%1\"").tqarg(d->fileName.section('/', -1));
+                text = i18n("Converting to Black & White \"%1\"").arg(d->fileName.section('/', -1));
                 break;
             }
             default:
diff --git a/kipi-plugins/jpeglossless/utils.cpp b/kipi-plugins/jpeglossless/utils.cpp
index d96b57e..4347c8c 100644
--- a/kipi-plugins/jpeglossless/utils.cpp
+++ b/kipi-plugins/jpeglossless/utils.cpp
@@ -175,7 +175,7 @@ bool Utils::updateMetadataImageMagick(const TQString& src, TQString& err)
     }
 
     // Processing error !
-    err = i18n("Cannot update metadata: %1").tqarg(m_stdErr.replace('\n', ' '));
+    err = i18n("Cannot update metadata: %1").arg(m_stdErr.replace('\n', ' '));
     return false;
 }
 
diff --git a/kipi-plugins/kameraklient/cameraiconitem.cpp b/kipi-plugins/kameraklient/cameraiconitem.cpp
index b41085f..441aa60 100644
--- a/kipi-plugins/kameraklient/cameraiconitem.cpp
+++ b/kipi-plugins/kameraklient/cameraiconitem.cpp
@@ -24,7 +24,7 @@
 #include <tqpixmap.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 // Local
 #include "gpfileiteminfo.h"
 #include "cameraiconview.h"
@@ -90,10 +90,10 @@ void CameraIconItem::setPixmap(const TQImage& thumb) {
     pixHeight_ = thumb.height();
     TQPainter painter;
     painter.begin(pixmap());
-    painter.fillRect(0, 0, size, size, TQBrush(iconView()->tqcolorGroup().base()));
+    painter.fillRect(0, 0, size, size, TQBrush(iconView()->colorGroup().base()));
     painter.drawImage((size-thumb.width())/2, (size-thumb.height())/2, thumb);
     painter.end();
-    tqrepaint();
+    repaint();
 }
 
 }  // NameSpace KIPIKameraKlientPlugin
diff --git a/kipi-plugins/kameraklient/cameraiconview.cpp b/kipi-plugins/kameraklient/cameraiconview.cpp
index 0ff21f9..3aa33e4 100644
--- a/kipi-plugins/kameraklient/cameraiconview.cpp
+++ b/kipi-plugins/kameraklient/cameraiconview.cpp
@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqrect.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpoint.h>
 #include <tqpopupmenu.h>
 #include <tqvaluevector.h>
@@ -73,9 +73,9 @@ void CameraIconView::setThumbnailSize() {
     double scale = double(w-10) / double(image.width());
     image = image.smoothScale(w-10, h-10, TQ_ScaleMin);
     TQPixmap pix(w, h);
-    pix.fill(tqcolorGroup().base());
+    pix.fill(colorGroup().base());
     TQPainter p(&pix);
-    p.fillRect(0, 0, w, h, TQBrush(tqcolorGroup().base()));
+    p.fillRect(0, 0, w, h, TQBrush(colorGroup().base()));
     if(!image.isNull()) {
         p.drawImage((w-image.width())/2, (h-image.height())/2, image);
     }
@@ -136,7 +136,7 @@ void CameraIconView::markDownloaded(CameraIconItem* iconItem) {
     }
     GPFileItemInfo *fileInfo = const_cast<GPFileItemInfo*>(iconItem->fileInfo());
     fileInfo->downloaded = 1;
-    iconItem->tqrepaint();
+    iconItem->repaint();
 }
 
 }  // NameSpace KIPIKameraKlientPlugin
diff --git a/kipi-plugins/kameraklient/cameralist.cpp b/kipi-plugins/kameraklient/cameralist.cpp
index 455ba26..a9e751e 100644
--- a/kipi-plugins/kameraklient/cameralist.cpp
+++ b/kipi-plugins/kameraklient/cameralist.cpp
@@ -23,7 +23,7 @@
 #include <tqdom.h>
 #include <tqfile.h>
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 // Local
 #include "cameralist.h"
 #include "cameratype.h"
diff --git a/kipi-plugins/kameraklient/cameraselection.cpp b/kipi-plugins/kameraklient/cameraselection.cpp
index 79439fe..40aca3a 100644
--- a/kipi-plugins/kameraklient/cameraselection.cpp
+++ b/kipi-plugins/kameraklient/cameraselection.cpp
@@ -21,7 +21,7 @@
 #include <tqlistview.h>
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqlineedit.h>
@@ -86,21 +86,21 @@ CameraSelection::CameraSelection(TQWidget* parent)
     TQGroupBox* mainBox = new TQGroupBox(page);
     mainBox->setTitle(i18n("Camera Configuration"));
     mainBox->setColumnLayout(0, Qt::Vertical );
-    mainBox->tqlayout()->setSpacing( 5 );
-    mainBox->tqlayout()->setMargin( 5 );
-    TQGridLayout* mainBoxLayout = new TQGridLayout(mainBox->tqlayout());
-    mainBoxLayout->tqsetAlignment(TQt::AlignTop);
+    mainBox->layout()->setSpacing( 5 );
+    mainBox->layout()->setMargin( 5 );
+    TQGridLayout* mainBoxLayout = new TQGridLayout(mainBox->layout());
+    mainBoxLayout->setAlignment(TQt::AlignTop);
 
     listView_ = new TQListView( mainBox );
     listView_->addColumn( i18n("Cameras") );
-    listView_->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+    listView_->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
     mainBoxLayout->addMultiCellWidget(listView_, 0, 4, 0, 0);
 
     portButtonGroup_ = new TQVButtonGroup(mainBox);
     portButtonGroup_->setTitle(i18n("Camera Port Type"));
     portButtonGroup_->setRadioButtonExclusive(true);
-    portButtonGroup_->tqlayout()->setSpacing(5);
-    portButtonGroup_->tqlayout()->setMargin(5);
+    portButtonGroup_->layout()->setSpacing(5);
+    portButtonGroup_->layout()->setMargin(5);
 
     usbButton_ = new TQRadioButton(portButtonGroup_);
     usbButton_->setText( i18n("USB"));
@@ -113,10 +113,10 @@ CameraSelection::CameraSelection(TQWidget* parent)
     TQGroupBox* portPathBox = new TQGroupBox(mainBox);
     portPathBox->setTitle( i18n("Camera Port Path"));
     portPathBox->setColumnLayout(0, Qt::Vertical );
-    portPathBox->tqlayout()->setSpacing( 5 );
-    portPathBox->tqlayout()->setMargin( 5 );
-    TQVBoxLayout* portPathBoxLayout = new TQVBoxLayout( portPathBox->tqlayout() );
-    portPathBoxLayout->tqsetAlignment( TQt::AlignTop );
+    portPathBox->layout()->setSpacing( 5 );
+    portPathBox->layout()->setMargin( 5 );
+    TQVBoxLayout* portPathBoxLayout = new TQVBoxLayout( portPathBox->layout() );
+    portPathBoxLayout->setAlignment( TQt::AlignTop );
 
     TQLabel* portPathLabel_ = new TQLabel( portPathBox);
     portPathLabel_->setText( i18n("only for serial port\n" "cameras"));
diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp
index c936800..bcecbe7 100644
--- a/kipi-plugins/kameraklient/cameraui.cpp
+++ b/kipi-plugins/kameraklient/cameraui.cpp
@@ -37,7 +37,7 @@
 #include <tqfileinfo.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsplitter.h>
 #include <tqstringlist.h>
 #include <tqtooltip.h>
@@ -170,7 +170,7 @@ CameraUI::CameraUI() : TQWidget()
     mCameraBoxLayout->addWidget(mCameraConnectBtn);
     mCameraComboBox = new TQComboBox(this, "camera");
     mCameraComboBox->setInsertionPolicy(TQComboBox::AtBottom);
-    mCameraComboBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+    mCameraComboBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
     mCameraBoxLayout->addWidget(mCameraComboBox);
 
     // create Download Directory Camera Box ---------------------------------------------------
@@ -180,14 +180,14 @@ CameraUI::CameraUI() : TQWidget()
     TQLabel* mDownloadDirectoryLabel = new TQLabel(i18n("Download to: "), this);
     mDownloadDirectoryBoxLayout->addWidget(mDownloadDirectoryLabel);
     mDownloadDirectoryEdit = new TQLineEdit(this);
-    mDownloadDirectoryEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+    mDownloadDirectoryEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
     mDownloadDirectoryEdit->setReadOnly(true);
     mDownloadDirectoryBoxLayout->addWidget(mDownloadDirectoryEdit);
     mChangeDownloadDirectoryBtn = new TQPushButton(i18n("&Change"), this);
     mDownloadDirectoryBoxLayout->addWidget(mChangeDownloadDirectoryBtn); // -------------------------
     mSplitter = new TQSplitter(this);
     mLeftBoxLayout->addWidget(mSplitter);
-    mSplitter->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+    mSplitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
     mFolderView   = new CameraFolderView(mSplitter);
     mIconView   = new CameraIconView(mSplitter);
     mSplitter->setOpaqueResize(true);
@@ -199,7 +199,7 @@ CameraUI::CameraUI() : TQWidget()
     controller_->start();
     cameraConnected_ = false;
 
-    // create tqStatus Bar -----------------------------------------------------------------------------
+    // create Status Bar -----------------------------------------------------------------------------
 
     mStatusBar =  new KStatusBar(this);
     mLeftBoxLayout->addWidget(mStatusBar);
@@ -435,7 +435,7 @@ void CameraUI::slotCameraDownloadSelected() {
     TQString dir = mDownloadDirectoryEdit->text();
     TQDir qdir(dir);
     if(!qdir.exists()) {
-        KMessageBox::error(this, i18n("'%1' directory does not exist.").tqarg(dir));
+        KMessageBox::error(this, i18n("'%1' directory does not exist.").arg(dir));
         return;
     }
     int count = 0;
@@ -510,7 +510,7 @@ void CameraUI::slotCameraUpload() {
 	}
         TQString uploadName = info.fileName();
         while (container_->findItem(folderItem->folderPath(), uploadName)) {
-            TQString msg(i18n("Camera Folder '%1' contains item '%2'\n Please, enter New Name").tqarg(folderItem->folderName()).tqarg(uploadName));
+            TQString msg(i18n("Camera Folder '%1' contains item '%2'\n Please, enter New Name").arg(folderItem->folderName()).arg(uploadName));
             uploadName = KLineEditDlg::getText(msg,uploadName,&ok,this);
             if(!ok){
 		return;
diff --git a/kipi-plugins/kameraklient/dmessagebox.cpp b/kipi-plugins/kameraklient/dmessagebox.cpp
index f29bc85..f7ac617 100644
--- a/kipi-plugins/kameraklient/dmessagebox.cpp
+++ b/kipi-plugins/kameraklient/dmessagebox.cpp
@@ -27,10 +27,10 @@
 #include <tqapplication.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 // KDE
 #include <klocale.h>
 #include <kapplication.h>
@@ -58,9 +58,9 @@ DMessageBox::DMessageBox() : TQWidget(0, 0, WShowModal | WStyle_DialogBorder| WD
 								       0, true);
     TQLabel *pixLabel = new TQLabel(hbox);
     pixLabel->setPixmap(pix);
-    pixLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+    pixLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
     msgBox_ = new TQLabel(hbox);
-    msgBox_->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+    msgBox_->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
     grid->addMultiCellWidget(hbox, 0, 0, 0, 2);
     // ---------------------------------------------------
     extraMsgBox_ = new TQTextEdit(this);
diff --git a/kipi-plugins/kameraklient/gpcamera.cpp b/kipi-plugins/kameraklient/gpcamera.cpp
index 6858e0e..6c5aabb 100644
--- a/kipi-plugins/kameraklient/gpcamera.cpp
+++ b/kipi-plugins/kameraklient/gpcamera.cpp
@@ -95,7 +95,7 @@ int GPCamera::setup() {
         status = 0;
     }
 
-    status = new GPtqStatus();
+    status = new GPStatus();
 
     gp_abilities_list_new(&abilList);
     gp_abilities_list_load(abilList, status->context);
@@ -160,7 +160,7 @@ int GPCamera::initialize() {
         delete status;
         status = 0;
     }
-    status = new GPtqStatus();
+    status = new GPStatus();
     // Try and initialize the camera to see if its connected
     if (gp_camera_init(d->camera, status->context) != GP_OK) {
         gp_camera_unref(d->camera);
@@ -209,7 +209,7 @@ int GPCamera::getSubFolders(const TQString& folder, TQValueList<TQString>& subFo
         delete status;
         status = 0;
     }
-    status = new GPtqStatus();
+    status = new GPStatus();
     if (gp_camera_folder_list_folders(d->camera, folder.latin1(), clist, status->context) != GP_OK) {
         gp_list_unref(clist);
         delete status;
@@ -257,7 +257,7 @@ int GPCamera::getItemsInfo(const TQString& folder, GPFileItemInfoList& infoList)
         delete status;
         status = 0;
     }
-    status = new GPtqStatus;
+    status = new GPStatus;
     gp_list_new(&clist);
     if (gp_camera_folder_list_files(d->camera, folder.latin1(), clist, status->context) != GP_OK) {
         gp_list_unref(clist);
@@ -337,7 +337,7 @@ int GPCamera::getThumbnail(const TQString& folder, const TQString& imageName, TQ
         delete status;
         status = 0;
     }
-    status = new GPtqStatus;
+    status = new GPStatus;
     if (gp_camera_file_get(d->camera, folder.latin1(), imageName.latin1(), GP_FILE_TYPE_PREVIEW, cfile, status->context) != GP_OK) {
         gp_file_unref(cfile);
         delete status;
@@ -359,7 +359,7 @@ int GPCamera::downloadItem(const TQString& folder, const TQString& itemName, con
         delete status;
         status = 0;
     }
-    status = new GPtqStatus;
+    status = new GPStatus;
     if (gp_camera_file_get(d->camera, folder.latin1(), itemName.latin1(), GP_FILE_TYPE_NORMAL, cfile, status->context) != GP_OK) {
         gp_file_unref(cfile);
         delete status;
@@ -381,7 +381,7 @@ int GPCamera::deleteItem(const TQString& folder, const TQString& itemName) {
         delete status;
         status = 0;
     }
-    status = new GPtqStatus;
+    status = new GPStatus;
     if(gp_camera_file_delete(d->camera, folder.latin1(), itemName.latin1(), status->context) != GP_OK) {
         delete status;
         status = 0;
@@ -412,7 +412,7 @@ int GPCamera::deleteAllItems(const TQString& folder) {
         delete status;
         status = 0;
     }
-    status = new GPtqStatus;
+    status = new GPStatus;
     if (gp_camera_folder_delete_all(d->camera, folder.latin1(), status->context) != GP_OK) {
         delete status;
         status = 0;
@@ -435,7 +435,7 @@ int GPCamera::uploadItem(const TQString& folder, const TQString& itemName, const
         delete status;
         status = 0;
     }
-    status = new GPtqStatus;
+    status = new GPStatus;
     if (gp_camera_folder_put_file(d->camera, folder.latin1(), cfile, status->context) != GP_OK) {
         gp_file_unref(cfile);
         delete status;
@@ -454,7 +454,7 @@ void GPCamera::cameraSummary(TQString& summary) {
         delete status;
         status = 0;
     }
-    status = new GPtqStatus;
+    status = new GPStatus;
     gp_camera_get_summary(d->camera, &sum, status->context);
     summary = TQString(sum.text);
     delete status;
@@ -467,7 +467,7 @@ void GPCamera::cameraManual(TQString& manual) {
         delete status;
         status = 0;
     }
-    status = new GPtqStatus;
+    status = new GPStatus;
     gp_camera_get_manual(d->camera, &man, status->context);
     manual = TQString(man.text);
     delete status;
@@ -480,7 +480,7 @@ void GPCamera::cameraAbout(TQString& about) {
         delete status;
         status = 0;
     }
-    status = new GPtqStatus;
+    status = new GPStatus;
     gp_camera_get_about(d->camera, &abt, status->context);
     about = TQString(abt.text);
     delete status;
diff --git a/kipi-plugins/kameraklient/gpcamera.h b/kipi-plugins/kameraklient/gpcamera.h
index 864f87a..613af65 100644
--- a/kipi-plugins/kameraklient/gpcamera.h
+++ b/kipi-plugins/kameraklient/gpcamera.h
@@ -34,7 +34,7 @@ namespace KIPIKameraKlientPlugin
 {
 
 class GPCameraPrivate;
-class GPtqStatus;
+class GPStatus;
 
 class GPCamera {
 
@@ -84,7 +84,7 @@ public:
 private:
     int  setup();
     GPCameraPrivate *d;
-    GPtqStatus        *status;
+    GPStatus        *status;
 };
 
 }  // NameSpace KIPIKameraKlientPlugin
diff --git a/kipi-plugins/kameraklient/gpcontroller.cpp b/kipi-plugins/kameraklient/gpcontroller.cpp
index 7f59c08..c66c5d2 100644
--- a/kipi-plugins/kameraklient/gpcontroller.cpp
+++ b/kipi-plugins/kameraklient/gpcontroller.cpp
@@ -254,7 +254,7 @@ void GPController::getSubFolders(const TQString& folder) {
         }
         return;
     } else {
-        TQString msg(i18n("Failed to get subfolder names from '%1'\n").tqarg(folder));
+        TQString msg(i18n("Failed to get subfolder names from '%1'\n").arg(folder));
         error(msg);
         return;
     }
@@ -275,7 +275,7 @@ void GPController::getItemsInfo(const TQString& folder) {
     if (result == GPCamera::GPSuccess) {
 	TQApplication::postEvent(parent_, new GPEventGetItemsInfo(folder, infoList));
     } else {
-        TQString msg(i18n("Failed to get images information from '%1'\n").tqarg(folder));
+        TQString msg(i18n("Failed to get images information from '%1'\n").arg(folder));
         error(msg);
     }
 }
@@ -298,7 +298,7 @@ void GPController::getThumbnail(const TQString& folder, const TQString& imageNam
         scaleHighlightThumbnail(thumbnail);
 	TQApplication::postEvent(parent_, new GPEventGetThumbnail(folder, imageName, thumbnail));
     } else {
-        kdWarning() << i18n("Failed to get preview for '%1/%2'").tqarg(folder).tqarg(imageName) << endl;
+        kdWarning() << i18n("Failed to get preview for '%1/%2'").arg(folder).arg(imageName) << endl;
     }
 }
 
@@ -307,7 +307,7 @@ void GPController::downloadItem(const TQString& folder, const TQString& itemName
     int result = camera_->downloadItem(folder, itemName, saveFile);
     mutex_.unlock();
     if (result != GPCamera::GPSuccess) {
-        TQString msg(i18n("Failed to download '%1' from '%2'").tqarg(itemName).tqarg(folder));
+        TQString msg(i18n("Failed to download '%1' from '%2'").arg(itemName).arg(folder));
         error(msg);
     } else {
 	TQApplication::postEvent(parent_, new GPEventDownloadItem(folder, itemName));
@@ -319,7 +319,7 @@ void GPController::openItem(const TQString& folder, const TQString& itemName, co
     int result = camera_->downloadItem(folder, itemName, saveFile);
     mutex_.unlock();
     if (result != GPCamera::GPSuccess) {
-        TQString msg(i18n("Failed to open '%1'").tqarg(itemName));
+        TQString msg(i18n("Failed to open '%1'").arg(itemName));
         error(msg);
     } else {
 	TQApplication::postEvent(parent_, new GPEventOpenItem(saveFile));
@@ -331,7 +331,7 @@ void GPController::openItemWithService(const TQString& folder, const TQString& i
     int result = camera_->downloadItem(folder, itemName, saveFile);
     mutex_.unlock();
     if (result != GPCamera::GPSuccess) {
-        TQString msg(i18n("Failed to open '%1'").tqarg(itemName));
+        TQString msg(i18n("Failed to open '%1'").arg(itemName));
         error(msg);
     } else {
 	TQApplication::postEvent(parent_, new GPEventOpenItemWithService(saveFile, serviceName));
@@ -343,7 +343,7 @@ void GPController::deleteItem(const TQString& folder, const TQString& itemName)
    int result = camera_->deleteItem(folder, itemName);
    mutex_.unlock();
    if (result != GPCamera::GPSuccess) {
-       TQString msg(i18n("Failed to delete '%1'").tqarg(itemName));
+       TQString msg(i18n("Failed to delete '%1'").arg(itemName));
        error(msg);
    } else {
        TQApplication::postEvent(parent_, new GPEventDeleteItem(folder, itemName));
@@ -355,7 +355,7 @@ void GPController::uploadItem(const TQString& folder, const TQString& uploadName
     int result = camera_->uploadItem(folder, uploadName, localFile);
     mutex_.unlock();
     if (result != GPCamera::GPSuccess) {
-        TQString msg(i18n("Failed to upload '%1'").tqarg(localFile));
+        TQString msg(i18n("Failed to upload '%1'").arg(localFile));
         error(msg);
     } else {
         GPFileItemInfoList infoList;
diff --git a/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp b/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp
index 145e825..5cda3f4 100644
--- a/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp
+++ b/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp
@@ -24,7 +24,7 @@
 
 #include <tqpixmap.h>
 #include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 #include <kiconloader.h>
@@ -53,7 +53,7 @@ GPFileItemInfoDlg::GPFileItemInfoDlg(const GPFileItemInfo& info,
     TQLabel *thumbLabel = new TQLabel( page );
     thumbLabel->setFrameShape(TQFrame::Box);
     thumbLabel->setMargin(2);
-    thumbLabel->setPaletteBackgroundColor(tqcolorGroup().base());
+    thumbLabel->setPaletteBackgroundColor(colorGroup().base());
     if (!pixmap) {
         if (info.mime.contains("image"))
             thumbLabel->setPixmap(DesktopIcon("image"));
diff --git a/kipi-plugins/kameraklient/gpmessages.h b/kipi-plugins/kameraklient/gpmessages.h
index b255df1..ad9e9f6 100644
--- a/kipi-plugins/kameraklient/gpmessages.h
+++ b/kipi-plugins/kameraklient/gpmessages.h
@@ -28,7 +28,7 @@ class GPMessages : public TQObject {
     Q_OBJECT
   TQ_OBJECT
 
-    friend class GPtqStatus;
+    friend class GPStatus;
 
 public:
 
diff --git a/kipi-plugins/kameraklient/gpstatus.cpp b/kipi-plugins/kameraklient/gpstatus.cpp
index a54ca82..61b22a6 100644
--- a/kipi-plugins/kameraklient/gpstatus.cpp
+++ b/kipi-plugins/kameraklient/gpstatus.cpp
@@ -26,10 +26,10 @@
 namespace KIPIKameraKlientPlugin
 {
 
-float GPtqStatus::target = 0.0;
-bool  GPtqStatus::cancel = false;
+float GPStatus::target = 0.0;
+bool  GPStatus::cancel = false;
 
-GPtqStatus::GPtqStatus() : TQObject() {
+GPStatus::GPStatus() : TQObject() {
     context = gp_context_new();
     cancel = false;
     gp_context_set_cancel_func(context, cancel_func, 0);
@@ -38,21 +38,21 @@ GPtqStatus::GPtqStatus() : TQObject() {
     gp_context_set_progress_funcs(context, progress_start_func, progress_update_func, progress_stop_func, 0);
 }
 
-GPtqStatus::~GPtqStatus() {
+GPStatus::~GPStatus() {
     if(context) {
 	gp_context_unref(context);
     }
 }
 
-void GPtqStatus::cancelOperation() {
+void GPStatus::cancelOperation() {
     cancel = true;    
 }
 
-GPContextFeedback GPtqStatus::cancel_func(GPContext *, void *) {
+GPContextFeedback GPStatus::cancel_func(GPContext *, void *) {
     return (cancel ? GP_CONTEXT_FEEDBACK_CANCEL : GP_CONTEXT_FEEDBACK_OK);
 }
 
-void GPtqStatus::error_func(GPContext *, const char *format, va_list args, void *) {
+void GPStatus::error_func(GPContext *, const char *format, va_list args, void *) {
     char buf[4096] = "";
     int nSize = vsnprintf( buf, 4096, format, args );
     if(nSize > 4094) {
@@ -64,7 +64,7 @@ void GPtqStatus::error_func(GPContext *, const char *format, va_list args, void
     GPMessages::gpMessagesWrapper()->emit errorMessage(error);
 }
 
-void GPtqStatus::status_func (GPContext *, const char *format, va_list args, void *) {
+void GPStatus::status_func (GPContext *, const char *format, va_list args, void *) {
     char buf[4096] = "";
     int nSize = vsnprintf( buf, 4096, format, args );
     if(nSize > 4094) {
@@ -76,7 +76,7 @@ void GPtqStatus::status_func (GPContext *, const char *format, va_list args, voi
     GPMessages::gpMessagesWrapper()->emit statusChanged(status);
 }
 
-unsigned int GPtqStatus::progress_start_func(GPContext *, float _target, const char *format, va_list args, void *) {
+unsigned int GPStatus::progress_start_func(GPContext *, float _target, const char *format, va_list args, void *) {
     char buf[4096] = "";
     int nSize = vsnprintf( buf, 4096, format, args );
     if(nSize > 4094) {
@@ -89,12 +89,12 @@ unsigned int GPtqStatus::progress_start_func(GPContext *, float _target, const c
     return GP_OK;
 }
 
-void GPtqStatus::progress_update_func(GPContext *, unsigned int, float current, void *) {
+void GPStatus::progress_update_func(GPContext *, unsigned int, float current, void *) {
     int percentage = int(100.0 * current/target);
     GPMessages::gpMessagesWrapper()->emit progressChanged(percentage);
 }
 
-void  GPtqStatus::progress_stop_func(GPContext *, unsigned int, void *) {
+void  GPStatus::progress_stop_func(GPContext *, unsigned int, void *) {
   GPMessages::gpMessagesWrapper()->emit progressChanged(0);
 }
 
diff --git a/kipi-plugins/kameraklient/gpstatus.h b/kipi-plugins/kameraklient/gpstatus.h
index 1dccb13..132acc8 100644
--- a/kipi-plugins/kameraklient/gpstatus.h
+++ b/kipi-plugins/kameraklient/gpstatus.h
@@ -33,14 +33,14 @@ extern "C" {
 namespace KIPIKameraKlientPlugin
 {
 
-class GPtqStatus : public TQObject {
+class GPStatus : public TQObject {
     Q_OBJECT
   TQ_OBJECT
     friend class GPCamera;
     
     public:
-	GPtqStatus();
-	~GPtqStatus();
+	GPStatus();
+	~GPStatus();
 	void cancelOperation();
 	
     private:
diff --git a/kipi-plugins/kameraklient/kameraklient.h b/kipi-plugins/kameraklient/kameraklient.h
index 9e4ca1a..eeee784 100644
--- a/kipi-plugins/kameraklient/kameraklient.h
+++ b/kipi-plugins/kameraklient/kameraklient.h
@@ -40,7 +40,7 @@ public:
 	virtual void setup(TQWidget* widget);
     virtual KIPI::Category category(KAction*) const;
     TQString id() const {
-		return TQString::tqfromLatin1("kameraklient");
+		return TQString::fromLatin1("kameraklient");
     }
 	KAction* mKameraKlientAction;
 
diff --git a/kipi-plugins/kameraklient/savefiledialog.cpp b/kipi-plugins/kameraklient/savefiledialog.cpp
index a050f01..2f0b0a7 100644
--- a/kipi-plugins/kameraklient/savefiledialog.cpp
+++ b/kipi-plugins/kameraklient/savefiledialog.cpp
@@ -20,7 +20,7 @@
 #include <tqpushbutton.h>
 #include <tqfileinfo.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 // KDE
 #include <klocale.h>
 #include <kbuttonbox.h>
@@ -34,7 +34,7 @@ namespace KIPIKameraKlientPlugin
 SavefileDialog::SavefileDialog(const TQString& file, TQWidget *parent, const char* name, bool modal) : TQDialog(parent, name, modal) {
     TQFileInfo fileInfo(file);
     setCaption(i18n("File Already Exists"));
-    TQLabel *descLbl = new TQLabel(i18n("The file '%1' already exists!").tqarg(fileInfo.absFilePath()), this);
+    TQLabel *descLbl = new TQLabel(i18n("The file '%1' already exists!").arg(fileInfo.absFilePath()), this);
     renameEdit = new TQLineEdit(this);
     renameEdit->setText(fileInfo.fileName());
     connect(renameEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slot_renameEnabled()));
@@ -47,11 +47,11 @@ SavefileDialog::SavefileDialog(const TQString& file, TQWidget *parent, const cha
     bbox->addButton(i18n("Overwrite All"), TQT_TQOBJECT(this), TQT_SLOT(slot_overwriteAll()), true);
     TQPushButton *cancelBtn = bbox->addButton(i18n("&Cancel"), TQT_TQOBJECT(this), TQT_SLOT(reject()), true);
     cancelBtn->setDefault(true);
-    bbox->tqlayout();
-    TQGridLayout *tqlayout = new TQGridLayout(this, 0, 0, 15);
-    tqlayout->addMultiCellWidget(descLbl, 0, 0, 0, 3);
-    tqlayout->addMultiCellWidget(renameEdit, 3, 3, 0, 3);
-    tqlayout->addMultiCellWidget(bbox, 4, 4, 0, 3);
+    bbox->layout();
+    TQGridLayout *layout = new TQGridLayout(this, 0, 0, 15);
+    layout->addMultiCellWidget(descLbl, 0, 0, 0, 3);
+    layout->addMultiCellWidget(renameEdit, 3, 3, 0, 3);
+    layout->addMultiCellWidget(bbox, 4, 4, 0, 3);
 }
 
 SavefileDialog::~SavefileDialog() {
diff --git a/kipi-plugins/kameraklient/setupcamera.cpp b/kipi-plugins/kameraklient/setupcamera.cpp
index 1ebad16..95cadeb 100644
--- a/kipi-plugins/kameraklient/setupcamera.cpp
+++ b/kipi-plugins/kameraklient/setupcamera.cpp
@@ -23,7 +23,7 @@
 
 #include <tqapplication.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlistview.h>
 #include <tqpushbutton.h>
@@ -90,11 +90,11 @@ SetupCamera::SetupCamera(TQWidget* parent, const char* name)
         
     TQGroupBox* groupBox = new TQGroupBox(page, "groupBox");
     groupBox->setColumnLayout(0, Qt::Vertical);
-    groupBox->tqlayout()->setSpacing(5);
-    groupBox->tqlayout()->setMargin(5);
+    groupBox->layout()->setSpacing(5);
+    groupBox->layout()->setMargin(5);
     
-    TQGridLayout* groupBoxLayout = new TQGridLayout(groupBox->tqlayout());
-    groupBoxLayout->tqsetAlignment( TQt::AlignTop );
+    TQGridLayout* groupBoxLayout = new TQGridLayout(groupBox->layout());
+    groupBoxLayout->setAlignment( TQt::AlignTop );
     listView_ = new TQListView( groupBox );
     listView_->addColumn(i18n("Model"));
     listView_->addColumn(i18n("Port"));
diff --git a/kipi-plugins/kameraklient/thumbitem.cpp b/kipi-plugins/kameraklient/thumbitem.cpp
index 72dbd54..45dd458 100644
--- a/kipi-plugins/kameraklient/thumbitem.cpp
+++ b/kipi-plugins/kameraklient/thumbitem.cpp
@@ -17,10 +17,10 @@
 #include <tqpixmap.h>
 #include <tqfont.h>
 #include <tqfontmetrics.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpainter.h>
 #include <tqevent.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 // Local
 #include "thumbview.h"
 #include "thumbitem.h"
@@ -52,7 +52,7 @@ ThumbItemLineEdit::ThumbItemLineEdit(const TQString& text, TQWidget* parent, Thu
     setWrapColumnOrWidth(item->pixmapRect().width());
     resize(200, 200);
     setText(text);
-    tqsetAlignment(TQt::AlignCenter);
+    setAlignment(TQt::AlignCenter);
     resize(wrapColumnOrWidth() + 2, heightForWidth(wrapColumnOrWidth()) + 2);
 }
 
@@ -182,9 +182,9 @@ void ThumbItem::paintItem(TQPainter *, const TQColorGroup& cg) {
     bitBlt(view->viewport(), r.x(), r.y(), &pix, 0, 0, r.width(), r.height());
 }
 
-void ThumbItem::tqrepaint() {
+void ThumbItem::repaint() {
     TQRect r(view->contentsRectToViewport(d->rect));
-    view->viewport()->tqrepaint(r);
+    view->viewport()->repaint(r);
 }
 
 TQRect ThumbItem::rect() {
@@ -293,7 +293,7 @@ void ThumbItem::setPixmap(const TQPixmap& pixmap) {
     view->updateItemContainer(this);
 
     if(oR.intersects(TQRect(view->contentsX(), view->contentsY(), view->visibleWidth(), view->visibleHeight()))) {
-        view->viewport()->tqrepaint(oR);
+        view->viewport()->repaint(oR);
 	}
 }
 
@@ -310,7 +310,7 @@ void ThumbItem::setText(const TQString& text) {
     view->updateItemContainer(this);
     
     if(oR.intersects(TQRect(view->contentsX(), view->contentsY(), view->visibleWidth(), view->visibleHeight()))) {
-        view->viewport()->tqrepaint(oR);
+        view->viewport()->repaint(oR);
 	}
 }
 
@@ -360,7 +360,7 @@ void ThumbItem::renameItem() {
 }
 
 void ThumbItem::cancelRenameItem() {
-    tqrepaint();
+    repaint();
 
     bool resetFocus = view->viewport()->focusProxy() == renameBox;
     delete renameBox;
diff --git a/kipi-plugins/kameraklient/thumbitem.h b/kipi-plugins/kameraklient/thumbitem.h
index 3587476..984ab65 100644
--- a/kipi-plugins/kameraklient/thumbitem.h
+++ b/kipi-plugins/kameraklient/thumbitem.h
@@ -64,7 +64,7 @@ public:
 
     virtual void setPixmap(const TQPixmap& pixmap);
     virtual void setText(const TQString& text);
-    void tqrepaint();
+    void repaint();
     
     ThumbView* iconView();
 
diff --git a/kipi-plugins/kameraklient/thumbview.cpp b/kipi-plugins/kameraklient/thumbview.cpp
index cca8ee6..2f7dae9 100644
--- a/kipi-plugins/kameraklient/thumbview.cpp
+++ b/kipi-plugins/kameraklient/thumbview.cpp
@@ -237,7 +237,7 @@ void ThumbView::takeItem(ThumbItem *item) {
     }
     if (!d->clearing) {
         TQRect r(contentsRectToViewport(item->rect())); 
-        viewport()->tqrepaint(r);
+        viewport()->repaint(r);
     }
 }
 
@@ -290,14 +290,14 @@ void ThumbView::viewportPaintEvent(TQPaintEvent *pe) {
             for ( ; item; item = c->items.next()) {
                 TQRect ir(contentsRectToViewport(item->rect()));
                 if (r.intersects(ir)) {
-                    item->paintItem(&painter, tqcolorGroup());
+                    item->paintItem(&painter, colorGroup());
                     paintRegion -= TQRegion(ir);
                 }
             }
         }
     }
     painter.setClipRegion(paintRegion);
-    painter.fillRect(r, tqcolorGroup().base());
+    painter.fillRect(r, colorGroup().base());
     painter.end();
 }
 
@@ -393,7 +393,7 @@ void ThumbView::drawRubber(TQPainter *p) {
     TQRect r(d->rubber->normalize());
     r = contentsRectToViewport(r);
     TQPoint pnt(r.x(), r.y());
-    tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, TQRect( pnt.x(), pnt.y(), r.width(), r.height()), tqcolorGroup(), TQStyle::Style_Default, TQStyleOption(tqcolorGroup().base()));
+    tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, TQRect( pnt.x(), pnt.y(), r.width(), r.height()), colorGroup(), TQStyle::Style_Default, TQStyleOption(colorGroup().base()));
 }
 
 void ThumbView::contentsMousePressEvent(TQMouseEvent *e) {
@@ -546,7 +546,7 @@ void ThumbView::contentsMouseMoveEvent(TQMouseEvent *e) {
     if (changed) {
         emit signalSelectionChanged();
         paintRegion.translate(-contentsX(), -contentsY());
-        viewport()->tqrepaint(paintRegion);
+        viewport()->repaint(paintRegion);
     }
     ensureVisible(e->pos().x(), e->pos().y());
     *d->rubber = r;
@@ -945,7 +945,7 @@ void ThumbView::keyPressEvent(TQKeyEvent *e) {
 	    return;
     }
     if (handled) {
-        viewport()->tqrepaint();
+        viewport()->repaint();
         emit signalSelectionChanged();
     }
 }
diff --git a/kipi-plugins/metadataedit/commenteditdialog.cpp b/kipi-plugins/metadataedit/commenteditdialog.cpp
index 9d4fc87..07dc266 100644
--- a/kipi-plugins/metadataedit/commenteditdialog.cpp
+++ b/kipi-plugins/metadataedit/commenteditdialog.cpp
@@ -24,7 +24,7 @@
 
 #include <tqlabel.h>
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
@@ -105,7 +105,7 @@ CommentEditDialog::CommentEditDialog(TQWidget* parent)
     TQLabel *title = new TQLabel(i18n("<p>Enter the image caption hosted by <b>%1</b>. "
                                     "This field is not limited (excepted with IPTC). UTF-8 encoding "
                                     "will be used to save text.")
-                                    .tqarg(KApplication::kApplication()->aboutData()->appName()),
+                                    .arg(KApplication::kApplication()->aboutData()->appName()),
                                plainPage());
 
     d->userCommentEdit  = new KTextEdit(plainPage());
diff --git a/kipi-plugins/metadataedit/commentremovedialog.cpp b/kipi-plugins/metadataedit/commentremovedialog.cpp
index 86f6fdd..6e887c2 100644
--- a/kipi-plugins/metadataedit/commentremovedialog.cpp
+++ b/kipi-plugins/metadataedit/commentremovedialog.cpp
@@ -24,7 +24,7 @@
 
 #include <tqlabel.h>
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
@@ -101,7 +101,7 @@ CommentRemoveDialog::CommentRemoveDialog(TQWidget* parent)
     TQVBoxLayout *vlay = new TQVBoxLayout(plainPage(), 0, KDialog::spacingHint());
 
     d->removeHOSTCommentCheck = new TQCheckBox(i18n("Remove caption created by %1")
-                                    .tqarg(KApplication::kApplication()->aboutData()->appName()), 
+                                    .arg(KApplication::kApplication()->aboutData()->appName()), 
                                     plainPage());
     d->removeJFIFCommentCheck = new TQCheckBox(i18n("Remove JFIF Comment section"), plainPage());
     d->removeEXIFCommentCheck = new TQCheckBox(i18n("Remove EXIF Comment"), plainPage());
diff --git a/kipi-plugins/metadataedit/exifadjust.cpp b/kipi-plugins/metadataedit/exifadjust.cpp
index 553b630..1d7d39a 100644
--- a/kipi-plugins/metadataedit/exifadjust.cpp
+++ b/kipi-plugins/metadataedit/exifadjust.cpp
@@ -26,7 +26,7 @@
 
 // QT includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
diff --git a/kipi-plugins/metadataedit/exifcaption.cpp b/kipi-plugins/metadataedit/exifcaption.cpp
index 0bcd96e..92c2e98 100644
--- a/kipi-plugins/metadataedit/exifcaption.cpp
+++ b/kipi-plugins/metadataedit/exifcaption.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhgroupbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
@@ -151,7 +151,7 @@ EXIFCaption::EXIFCaption(TQWidget* parent)
                                              "will be used to save the text."));
 
     d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync captions entered through %1")
-                                            .tqarg(KApplication::kApplication()->aboutData()->appName()), 
+                                            .arg(KApplication::kApplication()->aboutData()->appName()), 
                                             parent);
     d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent);
     d->syncIPTCCaptionCheck = new TQCheckBox(i18n("Sync IPTC caption (warning: limited to 2000 printable "
diff --git a/kipi-plugins/metadataedit/exifdatetime.cpp b/kipi-plugins/metadataedit/exifdatetime.cpp
index dac52c5..5e2a5df 100644
--- a/kipi-plugins/metadataedit/exifdatetime.cpp
+++ b/kipi-plugins/metadataedit/exifdatetime.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqvalidator.h>
@@ -104,9 +104,9 @@ EXIFDateTime::EXIFDateTime(TQWidget* parent)
     d->dateCreatedSubSecCheck = new TQCheckBox(i18n("Creation sub-second"), parent);
     d->dateCreatedSel         = new KDateTimeWidget(parent);
     d->dateCreatedSubSecEdit  = new KIntSpinBox(0, 999, 1, 0, 10, parent);
-    d->dateCreatedSel->setDateTime(TQDateTime::tqcurrentDateTime());
+    d->dateCreatedSel->setDateTime(TQDateTime::currentDateTime());
     d->syncHOSTDateCheck      = new TQCheckBox(i18n("Sync creation date entered through %1")
-                                              .tqarg(KApplication::kApplication()->aboutData()->appName()), 
+                                              .arg(KApplication::kApplication()->aboutData()->appName()), 
                                               parent);
     d->syncIPTCDateCheck      = new TQCheckBox(i18n("Sync IPTC creation date"), parent);
     KSeparator *line          = new KSeparator(Qt::Horizontal, parent);
@@ -130,7 +130,7 @@ EXIFDateTime::EXIFDateTime(TQWidget* parent)
     d->dateOriginalSubSecCheck = new TQCheckBox(i18n("Original sub-second"), parent);
     d->dateOriginalSel         = new KDateTimeWidget(parent);
     d->dateOriginalSubSecEdit  = new KIntSpinBox(0, 999, 1, 0, 10, parent);
-    d->dateOriginalSel->setDateTime(TQDateTime::tqcurrentDateTime());
+    d->dateOriginalSel->setDateTime(TQDateTime::currentDateTime());
     grid->addMultiCellWidget(d->dateOriginalCheck, 5, 5, 0, 0);
     grid->addMultiCellWidget(d->dateOriginalSubSecCheck, 5, 5, 1, 2);
     grid->addMultiCellWidget(d->dateOriginalSel, 6, 6, 0, 0);
@@ -147,7 +147,7 @@ EXIFDateTime::EXIFDateTime(TQWidget* parent)
     d->dateDigitalizedSubSecCheck = new TQCheckBox(i18n("Digitization sub-second"), parent);
     d->dateDigitalizedSel         = new KDateTimeWidget(parent);
     d->dateDigitalizedSubSecEdit  = new KIntSpinBox(0, 999, 1, 0, 10, parent);
-    d->dateDigitalizedSel->setDateTime(TQDateTime::tqcurrentDateTime());
+    d->dateDigitalizedSel->setDateTime(TQDateTime::currentDateTime());
     grid->addMultiCellWidget(d->dateDigitalizedCheck, 7, 7, 0, 0);
     grid->addMultiCellWidget(d->dateDigitalizedSubSecCheck, 7, 7, 1, 2);
     grid->addMultiCellWidget(d->dateDigitalizedSel, 8, 8, 0, 0);
@@ -269,7 +269,7 @@ void EXIFDateTime::readMetadata(TQByteArray& exifData)
     TQDateTime datetime;
     TQString datetimeStr, data;
 
-    d->dateCreatedSel->setDateTime(TQDateTime::tqcurrentDateTime());
+    d->dateCreatedSel->setDateTime(TQDateTime::currentDateTime());
     d->dateCreatedCheck->setChecked(false);
     datetimeStr = exiv2Iface.getExifTagString("Exif.Image.DateTime", false);
     if (!datetimeStr.isEmpty()) 
@@ -300,7 +300,7 @@ void EXIFDateTime::readMetadata(TQByteArray& exifData)
     }
     d->dateCreatedSubSecEdit->setEnabled(d->dateCreatedSubSecCheck->isChecked());
 
-    d->dateOriginalSel->setDateTime(TQDateTime::tqcurrentDateTime());
+    d->dateOriginalSel->setDateTime(TQDateTime::currentDateTime());
     d->dateOriginalCheck->setChecked(false);
     datetimeStr = exiv2Iface.getExifTagString("Exif.Photo.DateTimeOriginal", false);
     if (!datetimeStr.isEmpty()) 
@@ -329,7 +329,7 @@ void EXIFDateTime::readMetadata(TQByteArray& exifData)
     }
     d->dateOriginalSubSecEdit->setEnabled(d->dateOriginalSubSecCheck->isChecked());
 
-    d->dateDigitalizedSel->setDateTime(TQDateTime::tqcurrentDateTime());
+    d->dateDigitalizedSel->setDateTime(TQDateTime::currentDateTime());
     d->dateDigitalizedCheck->setChecked(false);
     datetimeStr = exiv2Iface.getExifTagString("Exif.Photo.DateTimeDigitized", false);
     if (!datetimeStr.isEmpty()) 
diff --git a/kipi-plugins/metadataedit/exifdevice.cpp b/kipi-plugins/metadataedit/exifdevice.cpp
index 890a1e3..480d1fe 100644
--- a/kipi-plugins/metadataedit/exifdevice.cpp
+++ b/kipi-plugins/metadataedit/exifdevice.cpp
@@ -26,7 +26,7 @@
 
 // QT includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
@@ -176,7 +176,7 @@ EXIFDevice::EXIFDevice(TQWidget* parent)
     d->exposureTimeNumEdit = new KIntSpinBox(1, 100000, 1, 1, 10, parent);
     d->exposureTimeDenEdit = new KIntSpinBox(1, 100000, 1, 1, 10, parent);
     TQLabel *exposureLabel  = new TQLabel("/", parent);
-    exposureLabel->tqsetAlignment (TQt::AlignRight|TQt::AlignVCenter);
+    exposureLabel->setAlignment (TQt::AlignRight|TQt::AlignVCenter);
     grid->addMultiCellWidget(d->exposureTimeCheck, 5, 5, 0, 0);
     grid->addMultiCellWidget(d->exposureTimeNumEdit, 5, 5, 2, 2);
     grid->addMultiCellWidget(exposureLabel, 5, 5, 3, 3);
diff --git a/kipi-plugins/metadataedit/exifeditdialog.cpp b/kipi-plugins/metadataedit/exifeditdialog.cpp
index c8989a2..073eabe 100644
--- a/kipi-plugins/metadataedit/exifeditdialog.cpp
+++ b/kipi-plugins/metadataedit/exifeditdialog.cpp
@@ -24,7 +24,7 @@
 
 #include <tqtimer.h>
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 
 // KDE includes.
@@ -277,10 +277,10 @@ void EXIFEditDialog::slotItemChanged()
     enableButton(Apply, !d->isReadOnly);
     
     setCaption(TQString("%1 (%2/%3) - %4")
-               .tqarg((*d->currItem).filename())
-               .tqarg(d->urls.findIndex(*(d->currItem))+1)
-               .tqarg(d->urls.count())
-               .tqarg(i18n("Edit EXIF Metadata")) + 
+               .arg((*d->currItem).filename())
+               .arg(d->urls.findIndex(*(d->currItem))+1)
+               .arg(d->urls.count())
+               .arg(i18n("Edit EXIF Metadata")) + 
                (d->isReadOnly ? TQString(" - ") + i18n("(read only)") : TQString()));
     enableButton(User1, *(d->currItem) != d->urls.last());
     enableButton(User2, *(d->currItem) != d->urls.first());
diff --git a/kipi-plugins/metadataedit/exiflens.cpp b/kipi-plugins/metadataedit/exiflens.cpp
index a672b87..108f52d 100644
--- a/kipi-plugins/metadataedit/exiflens.cpp
+++ b/kipi-plugins/metadataedit/exiflens.cpp
@@ -26,7 +26,7 @@
 
 // QT includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
diff --git a/kipi-plugins/metadataedit/exiflight.cpp b/kipi-plugins/metadataedit/exiflight.cpp
index 703ad9d..5eab28a 100644
--- a/kipi-plugins/metadataedit/exiflight.cpp
+++ b/kipi-plugins/metadataedit/exiflight.cpp
@@ -26,7 +26,7 @@
 
 // QT includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
diff --git a/kipi-plugins/metadataedit/iptccaption.cpp b/kipi-plugins/metadataedit/iptccaption.cpp
index d5e2823..04cc7cb 100644
--- a/kipi-plugins/metadataedit/iptccaption.cpp
+++ b/kipi-plugins/metadataedit/iptccaption.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhgroupbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
@@ -103,7 +103,7 @@ IPTCCaption::IPTCCaption(TQWidget* parent)
     d->captionEdit          = new KTextEdit(parent);
     d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent);
     d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync caption entered through %1")
-                                            .tqarg(KApplication::kApplication()->aboutData()->appName()), 
+                                            .arg(KApplication::kApplication()->aboutData()->appName()), 
                                             parent);
     d->syncEXIFCommentCheck = new TQCheckBox(i18n("Sync EXIF Comment"), parent);
     KSeparator *line        = new KSeparator(Qt::Horizontal, parent);
diff --git a/kipi-plugins/metadataedit/iptccategories.cpp b/kipi-plugins/metadataedit/iptccategories.cpp
index 7cd3193..69ed4be 100644
--- a/kipi-plugins/metadataedit/iptccategories.cpp
+++ b/kipi-plugins/metadataedit/iptccategories.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqvalidator.h>
@@ -84,7 +84,7 @@ IPTCCategories::IPTCCategories(TQWidget* parent)
 {
     d = new IPTCCategoriesPriv;
     TQGridLayout *grid = new TQGridLayout(parent, 6, 1, 0, KDialog::spacingHint());
-    grid->tqsetAlignment( TQt::AlignTop );
+    grid->setAlignment( TQt::AlignTop );
 
     // IPTC only accept printable Ascii char.
     TQRegExp asciiRx("[\x20-\x7F]+$");
diff --git a/kipi-plugins/metadataedit/iptccredits.cpp b/kipi-plugins/metadataedit/iptccredits.cpp
index 3c88916..dc799b1 100644
--- a/kipi-plugins/metadataedit/iptccredits.cpp
+++ b/kipi-plugins/metadataedit/iptccredits.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhgroupbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
diff --git a/kipi-plugins/metadataedit/iptcdatetime.cpp b/kipi-plugins/metadataedit/iptcdatetime.cpp
index df101d1..0e1bb9f 100644
--- a/kipi-plugins/metadataedit/iptcdatetime.cpp
+++ b/kipi-plugins/metadataedit/iptcdatetime.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqdatetime.h>
 #include <tqwhatsthis.h>
@@ -114,11 +114,11 @@ IPTCDateTime::IPTCDateTime(TQWidget* parent)
     d->dateCreatedSel    = new KDateWidget(parent);
     d->timeCreatedSel    = new KTimeWidget(parent);
     d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1")
-                                              .tqarg(KApplication::kApplication()->aboutData()->appName()), 
+                                              .arg(KApplication::kApplication()->aboutData()->appName()), 
                                               parent);
     d->syncEXIFDateCheck = new TQCheckBox(i18n("Sync EXIF creation date"), parent);
     KSeparator *line     = new KSeparator(Qt::Horizontal, parent);
-    d->dateCreatedSel->setDate(TQDate::tqcurrentDate());
+    d->dateCreatedSel->setDate(TQDate::currentDate());
     d->timeCreatedSel->setTime(TQTime::currentTime());
     grid->addMultiCellWidget(d->dateCreatedCheck, 0, 0, 0, 0);
     grid->addMultiCellWidget(d->timeCreatedCheck, 0, 0, 1, 2);
@@ -138,7 +138,7 @@ IPTCDateTime::IPTCDateTime(TQWidget* parent)
     d->timeReleasedCheck = new TQCheckBox(i18n("Release time"), parent);
     d->dateReleasedSel   = new KDateWidget(parent);
     d->timeReleasedSel   = new KTimeWidget(parent);
-    d->dateReleasedSel->setDate(TQDate::tqcurrentDate());
+    d->dateReleasedSel->setDate(TQDate::currentDate());
     d->timeReleasedSel->setTime(TQTime::currentTime());
     grid->addMultiCellWidget(d->dateReleasedCheck, 5, 5, 0, 0);
     grid->addMultiCellWidget(d->timeReleasedCheck, 5, 5, 1, 2);
@@ -155,7 +155,7 @@ IPTCDateTime::IPTCDateTime(TQWidget* parent)
     d->timeExpiredCheck = new TQCheckBox(i18n("Expiration time"), parent);
     d->dateExpiredSel   = new KDateWidget(parent);
     d->timeExpiredSel   = new KTimeWidget(parent);
-    d->dateExpiredSel->setDate(TQDate::tqcurrentDate());
+    d->dateExpiredSel->setDate(TQDate::currentDate());
     d->timeExpiredSel->setTime(TQTime::currentTime());
     grid->addMultiCellWidget(d->dateExpiredCheck, 7, 7, 0, 0);
     grid->addMultiCellWidget(d->timeExpiredCheck, 7, 7, 1, 2);
@@ -172,7 +172,7 @@ IPTCDateTime::IPTCDateTime(TQWidget* parent)
     d->timeDigitalizedCheck = new TQCheckBox(i18n("Digitization time"), parent);
     d->dateDigitalizedSel   = new KDateWidget(parent);
     d->timeDigitalizedSel   = new KTimeWidget(parent);
-    d->dateDigitalizedSel->setDate(TQDate::tqcurrentDate());
+    d->dateDigitalizedSel->setDate(TQDate::currentDate());
     d->timeDigitalizedSel->setTime(TQTime::currentTime());
     grid->addMultiCellWidget(d->dateDigitalizedCheck, 9, 9, 0, 0);
     grid->addMultiCellWidget(d->timeDigitalizedCheck, 9, 9, 1, 2);
@@ -314,7 +314,7 @@ void IPTCDateTime::readMetadata(TQByteArray& iptcData)
     dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.DateCreated", false);
     timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.TimeCreated", false);
 
-    d->dateCreatedSel->setDate(TQDate::tqcurrentDate());
+    d->dateCreatedSel->setDate(TQDate::currentDate());
     d->dateCreatedCheck->setChecked(false);
     if (!dateStr.isEmpty()) 
     {
@@ -345,7 +345,7 @@ void IPTCDateTime::readMetadata(TQByteArray& iptcData)
     dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.ReleaseDate", false);
     timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.ReleaseTime", false);
 
-    d->dateReleasedSel->setDate(TQDate::tqcurrentDate());
+    d->dateReleasedSel->setDate(TQDate::currentDate());
     d->dateReleasedCheck->setChecked(false);
     if (!dateStr.isEmpty()) 
     {
@@ -374,7 +374,7 @@ void IPTCDateTime::readMetadata(TQByteArray& iptcData)
     dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.ExpirationDate", false);
     timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.ExpirationTime", false);
 
-    d->dateExpiredSel->setDate(TQDate::tqcurrentDate());
+    d->dateExpiredSel->setDate(TQDate::currentDate());
     d->dateExpiredCheck->setChecked(false);
     if (!dateStr.isEmpty()) 
     {
@@ -403,7 +403,7 @@ void IPTCDateTime::readMetadata(TQByteArray& iptcData)
     dateStr = exiv2Iface.getIptcTagString("Iptc.Application2.DigitizationDate", false);
     timeStr = exiv2Iface.getIptcTagString("Iptc.Application2.DigitizationTime", false);
 
-    d->dateDigitalizedSel->setDate(TQDate::tqcurrentDate());
+    d->dateDigitalizedSel->setDate(TQDate::currentDate());
     d->dateDigitalizedCheck->setChecked(false);
     if (!dateStr.isEmpty()) 
     {
diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp
index 6be4f97..8560be3 100644
--- a/kipi-plugins/metadataedit/iptceditdialog.cpp
+++ b/kipi-plugins/metadataedit/iptceditdialog.cpp
@@ -24,7 +24,7 @@
 
 #include <tqtimer.h>
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 
 // KDE includes.
@@ -120,7 +120,7 @@ public:
     IPTCKeywords             *keywordsPage;
     IPTCCategories           *categoriesPage;
     IPTCCredits              *creditsPage;
-    IPTCtqStatus               *statusPage;
+    IPTCStatus               *statusPage;
     IPTCOrigin               *originPage;
 
     KIPI::Interface          *interface;
@@ -169,7 +169,7 @@ IPTCEditDialog::IPTCEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interfac
   
     d->page_status     = addPage(i18n("Status"), i18n("Status Information"),
                                  BarIcon("messagebox_info", KIcon::SizeMedium));
-    d->statusPage      = new IPTCtqStatus(d->page_status);
+    d->statusPage      = new IPTCStatus(d->page_status);
 
     d->page_origin     = addPage(i18n("Origin"), i18n("Origin Information"),
                                  BarIcon("www", KIcon::SizeMedium));
@@ -303,10 +303,10 @@ void IPTCEditDialog::slotItemChanged()
     enableButton(Apply, !d->isReadOnly);
     
     setCaption(TQString("%1 (%2/%3) - %4")
-               .tqarg((*d->currItem).filename())
-               .tqarg(d->urls.findIndex(*(d->currItem))+1)
-               .tqarg(d->urls.count())
-               .tqarg(i18n("Edit IPTC Metadata")) + 
+               .arg((*d->currItem).filename())
+               .arg(d->urls.findIndex(*(d->currItem))+1)
+               .arg(d->urls.count())
+               .arg(i18n("Edit IPTC Metadata")) + 
                (d->isReadOnly ? TQString(" - ") + i18n("(read only)") : TQString()));
     enableButton(User1, *(d->currItem) != d->urls.last());
     enableButton(User2, *(d->currItem) != d->urls.first());
diff --git a/kipi-plugins/metadataedit/iptckeywords.cpp b/kipi-plugins/metadataedit/iptckeywords.cpp
index ee85553..08bfd84 100644
--- a/kipi-plugins/metadataedit/iptckeywords.cpp
+++ b/kipi-plugins/metadataedit/iptckeywords.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqvalidator.h>
@@ -80,7 +80,7 @@ IPTCKeywords::IPTCKeywords(TQWidget* parent)
 {
     d = new IPTCKeywordsPriv;
     TQGridLayout *grid = new TQGridLayout(parent, 5, 2, 0, KDialog::spacingHint());
-    grid->tqsetAlignment( TQt::AlignTop );
+    grid->setAlignment( TQt::AlignTop );
 
     // IPTC only accept printable Ascii char.
     TQRegExp asciiRx("[\x20-\x7F]+$");
diff --git a/kipi-plugins/metadataedit/iptcorigin.cpp b/kipi-plugins/metadataedit/iptcorigin.cpp
index 6cf021a..d81155b 100644
--- a/kipi-plugins/metadataedit/iptcorigin.cpp
+++ b/kipi-plugins/metadataedit/iptcorigin.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqvalidator.h>
@@ -417,7 +417,7 @@ IPTCOrigin::IPTCOrigin(TQWidget* parent)
 
     for (IPTCOriginPriv::CountryCodeMap::Iterator it = d->countryCodeMap.begin();
          it != d->countryCodeMap.end(); ++it )
-        d->countryCB->insertItem(TQString("%1 - %2").tqarg(it.key()).tqarg(it.data()));
+        d->countryCB->insertItem(TQString("%1 - %2").arg(it.key()).arg(it.data()));
 
     d->countryCB->listBox()->sort();
 
diff --git a/kipi-plugins/metadataedit/iptcstatus.cpp b/kipi-plugins/metadataedit/iptcstatus.cpp
index e36bf74..e701511 100644
--- a/kipi-plugins/metadataedit/iptcstatus.cpp
+++ b/kipi-plugins/metadataedit/iptcstatus.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
@@ -88,7 +88,7 @@ public:
     MetadataCheckBox *objectAttributeCheck;
 };
 
-IPTCtqStatus::IPTCtqStatus(TQWidget* parent)
+IPTCStatus::IPTCStatus(TQWidget* parent)
           : TQWidget(parent)
 {
     d = new IPTCStatusPriv;
@@ -294,12 +294,12 @@ IPTCtqStatus::IPTCtqStatus(TQWidget* parent)
             this, TQT_SIGNAL(signalModified()));
 }
 
-IPTCtqStatus::~IPTCtqStatus()
+IPTCStatus::~IPTCStatus()
 {
     delete d;
 }
 
-void IPTCtqStatus::readMetadata(TQByteArray& iptcData)
+void IPTCStatus::readMetadata(TQByteArray& iptcData)
 {
     blockSignals(true);
     KExiv2Iface::KExiv2 exiv2Iface;
@@ -417,7 +417,7 @@ void IPTCtqStatus::readMetadata(TQByteArray& iptcData)
     blockSignals(false);
 }
 
-void IPTCtqStatus::applyMetadata(TQByteArray& iptcData)
+void IPTCStatus::applyMetadata(TQByteArray& iptcData)
 {
     KExiv2Iface::KExiv2 exiv2Iface;
     exiv2Iface.setIptc(iptcData);
@@ -456,7 +456,7 @@ void IPTCtqStatus::applyMetadata(TQByteArray& iptcData)
     {
         TQString objectType;
         objectType.sprintf("%2d", d->objectTypeCB->currentItem()+1);
-        objectType.append(TQString(":%1").tqarg(d->objectTypeDescEdit->text()));
+        objectType.append(TQString(":%1").arg(d->objectTypeDescEdit->text()));
         exiv2Iface.setIptcTagString("Iptc.Application2.ObjectType", objectType);
     }
     else if (d->objectTypeCheck->isValid())
@@ -466,7 +466,7 @@ void IPTCtqStatus::applyMetadata(TQByteArray& iptcData)
     {
         TQString objectAttribute;
         objectAttribute.sprintf("%3d", d->objectAttributeCB->currentItem()+1);
-        objectAttribute.append(TQString(":%1").tqarg(d->objectAttributeDescEdit->text()));
+        objectAttribute.append(TQString(":%1").arg(d->objectAttributeDescEdit->text()));
         exiv2Iface.setIptcTagString("Iptc.Application2.ObjectAttribute", objectAttribute);
     }
     else if (d->objectAttributeCheck->isValid())
diff --git a/kipi-plugins/metadataedit/iptcstatus.h b/kipi-plugins/metadataedit/iptcstatus.h
index a28744c..79b77a4 100644
--- a/kipi-plugins/metadataedit/iptcstatus.h
+++ b/kipi-plugins/metadataedit/iptcstatus.h
@@ -33,15 +33,15 @@ namespace KIPIMetadataEditPlugin
 
 class IPTCStatusPriv;
 
-class IPTCtqStatus : public TQWidget
+class IPTCStatus : public TQWidget
 {
     Q_OBJECT
   TQ_OBJECT
     
 public:
 
-    IPTCtqStatus(TQWidget* parent);
-    ~IPTCtqStatus();
+    IPTCStatus(TQWidget* parent);
+    ~IPTCStatus();
 
     void applyMetadata(TQByteArray& iptcData);
     void readMetadata(TQByteArray& iptcData);
diff --git a/kipi-plugins/metadataedit/iptcsubjects.cpp b/kipi-plugins/metadataedit/iptcsubjects.cpp
index d21a96e..a28e933 100644
--- a/kipi-plugins/metadataedit/iptcsubjects.cpp
+++ b/kipi-plugins/metadataedit/iptcsubjects.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqvalidator.h>
@@ -80,7 +80,7 @@ IPTCSubjects::IPTCSubjects(TQWidget* parent)
 {
     d = new IPTCSubjectsPriv;
     TQGridLayout *grid = new TQGridLayout(parent, 5, 2, 0, KDialog::spacingHint());
-    grid->tqsetAlignment( TQt::AlignTop );
+    grid->setAlignment( TQt::AlignTop );
 
     // IPTC only accept printable Ascii char.
     TQRegExp asciiRx("[\x20-\x7F]+$");
diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.cpp b/kipi-plugins/metadataedit/plugin_metadataedit.cpp
index d43de5a..b6c9a58 100644
--- a/kipi-plugins/metadataedit/plugin_metadataedit.cpp
+++ b/kipi-plugins/metadataedit/plugin_metadataedit.cpp
@@ -238,7 +238,7 @@ void Plugin_MetadataEdit::slotImportExif()
     if (!exiv2Iface.load(importEXIFFile.path()))
     {
         KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), 
-                           i18n("Cannot load metadata from \"%1\"").tqarg(importEXIFFile.fileName()), 
+                           i18n("Cannot load metadata from \"%1\"").arg(importEXIFFile.fileName()), 
                            i18n("Import EXIF Metadata"));    
         return;
     }
@@ -247,7 +247,7 @@ void Plugin_MetadataEdit::slotImportExif()
     if (exifData.isEmpty())
     {
         KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), 
-                           i18n("\"%1\" do not have EXIF metadata").tqarg(importEXIFFile.fileName()), 
+                           i18n("\"%1\" do not have EXIF metadata").arg(importEXIFFile.fileName()), 
                            i18n("Import EXIF Metadata"));    
         return;
     }        
@@ -256,7 +256,7 @@ void Plugin_MetadataEdit::slotImportExif()
                      TQT_TQWIDGET(kapp->activeWindow()),
                      i18n("EXIF metadata from current selected pictures will be permanently "
                           "replaced by the EXIF content of \"%1\".\n"
-                          "Do you want to continue ?").tqarg(importEXIFFile.fileName()),
+                          "Do you want to continue ?").arg(importEXIFFile.fileName()),
                      i18n("Import EXIF Metadata")) != KMessageBox::Yes)
         return;
 
@@ -384,7 +384,7 @@ void Plugin_MetadataEdit::slotImportIptc()
     if (!exiv2Iface.load(importIPTCFile.path()))
     {
         KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), 
-                           i18n("Cannot load metadata from \"%1\"").tqarg(importIPTCFile.fileName()), 
+                           i18n("Cannot load metadata from \"%1\"").arg(importIPTCFile.fileName()), 
                            i18n("Import IPTC Metadata"));    
         return;
     }
@@ -393,7 +393,7 @@ void Plugin_MetadataEdit::slotImportIptc()
     if (iptcData.isEmpty())
     {
         KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), 
-                           i18n("\"%1\" do not have IPTC metadata").tqarg(importIPTCFile.fileName()), 
+                           i18n("\"%1\" do not have IPTC metadata").arg(importIPTCFile.fileName()), 
                            i18n("Import IPTC Metadata"));    
         return;
     }        
@@ -402,7 +402,7 @@ void Plugin_MetadataEdit::slotImportIptc()
                      TQT_TQWIDGET(kapp->activeWindow()),
                      i18n("IPTC metadata from current selected pictures will be permanently "
                           "replaced by the IPTC content of \"%1\".\n"
-                          "Do you want to continue ?").tqarg(importIPTCFile.fileName()),
+                          "Do you want to continue ?").arg(importIPTCFile.fileName()),
                      i18n("Import IPTC Metadata")) != KMessageBox::Yes)
         return;
 
diff --git a/kipi-plugins/mpegencoder/images2mpg b/kipi-plugins/mpegencoder/images2mpg
index 9b15b7b..ddf265d 100755
--- a/kipi-plugins/mpegencoder/images2mpg
+++ b/kipi-plugins/mpegencoder/images2mpg
@@ -858,7 +858,7 @@ while test $CPT -lt $NBFRAMETOTAL;\
 	    if [ $CPT = `echo $((($CPF*$NBFRAMEIMAGE)-$NBFRAMEIMAGE+1))` ]; then
 
 		# Conversion and resizing the curent image file with ImageMagick.
-    		$MONTAGE_BIN -type TrueColor -quality 100 -tqgeometry 768x576 -texture "$MASK" "${INPUT_IMAGE_FILES[`echo $(($CPF-1))`]}" "$TMPFILENAME.tmp.jpg"
+    		$MONTAGE_BIN -type TrueColor -quality 100 -geometry 768x576 -texture "$MASK" "${INPUT_IMAGE_FILES[`echo $(($CPF-1))`]}" "$TMPFILENAME.tmp.jpg"
 		$CONVERT_BIN -type TrueColor -quality 100 "$TMPFILENAME.tmp.jpg" "$TMPFILENAME.tmp.pnm"
 
 		# Next input image...
@@ -870,7 +870,7 @@ while test $CPT -lt $NBFRAMETOTAL;\
 		if [ $[$CPT <= `echo $((($CPF*($NBFRAMEIMAGE+$NBFRAMETRANSITION)-$NBFRAMEIMAGE)))`] = 1 ]; then
 
 		    if [ $DISSOLVEVALUE = 99 ]; then
-    			$MONTAGE_BIN -type TrueColor -quality 100 -tqgeometry 768x576 -texture "$MASK" "${INPUT_IMAGE_FILES[`echo $(($CPF-1))`]}" "$TMPFILENAME.tmp.jpg"
+    			$MONTAGE_BIN -type TrueColor -quality 100 -geometry 768x576 -texture "$MASK" "${INPUT_IMAGE_FILES[`echo $(($CPF-1))`]}" "$TMPFILENAME.tmp.jpg"
     			$CONVERT_BIN -type TrueColor -quality 100 "$TMPFILENAME.tmp.jpg" "$TMPFILENAME.next_trans.tmp.pnm"
 		    fi
 
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp
index be78b6d..502b0a6 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.cpp
+++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp
@@ -58,7 +58,7 @@ extern "C"
 #include <tqwhatsthis.h>
 #include <tqprocess.h>
 #include <tqdatetime.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdragobject.h>
 #include <tqmessagebox.h>
 
@@ -265,8 +265,8 @@ KImg2mpgData::KImg2mpgData(KIPI::Interface* interface, TQWidget *parent, const c
 
   readSettings();
 
-  int maxW = TQMAX( m_VideoFormatComboBox->tqsizeHint().width(),
-                   m_ChromaComboBox->tqsizeHint().width() );
+  int maxW = TQMAX( m_VideoFormatComboBox->sizeHint().width(),
+                   m_ChromaComboBox->sizeHint().width() );
 
   m_ChromaComboBox->setMinimumWidth( maxW ); 
   m_VideoFormatComboBox->setMinimumWidth( maxW );
@@ -433,7 +433,7 @@ void KImg2mpgData::slotImagesFilesSelected( TQListBoxItem *item )
            TQT_SLOT(slotFailedPreview(const KFileItem*)));
 
   int index = m_ImagesFilesListBox->index ( item );
-  m_label7->setText(i18n("Image no. %1").tqarg(index + 1));
+  m_label7->setText(i18n("Image no. %1").arg(index + 1));
 }
 
 
@@ -578,7 +578,7 @@ void KImg2mpgData::slotEncode( void )
   if (TQFile::exists(OutputFileName))
     {
     int Ret=KMessageBox::questionYesNo(this, i18n("The output MPEG file '%1' already exists.\n"
-                                                  "Do you want overwrite this file?").tqarg(OutputFileName));
+                                                  "Do you want overwrite this file?").arg(OutputFileName));
     if (Ret == KMessageBox::No)
       return;
     }
@@ -688,7 +688,7 @@ void KImg2mpgData::slotEncode( void )
     if (!TQFile::exists(FileName))
     {
       KMessageBox::error(this,
-                         i18n("Cannot access to file %1, please check the path is right.").tqarg(FileName));
+                         i18n("Cannot access to file %1, please check the path is right.").arg(FileName));
       m_Abort = true;
       reset();
       return;
@@ -801,9 +801,9 @@ void KImg2mpgData::ShowNumberImages( int Number )
   TotalDuration = TotalDuration.addMSecs((Number+1)*TransitionDuration);
 
   if ( Number < 2)
-    m_label6->setText(i18n("%1 image [%2]").tqarg(Number).tqarg(TotalDuration.toString()));
+    m_label6->setText(i18n("%1 image [%2]").arg(Number).arg(TotalDuration.toString()));
   else
-    m_label6->setText(i18n("%1 images [%2]").tqarg(Number).tqarg(TotalDuration.toString()));
+    m_label6->setText(i18n("%1 images [%2]").arg(Number).arg(TotalDuration.toString()));
 }
 
 
@@ -840,7 +840,7 @@ void KImg2mpgData::readStderr(KProcess *, char *buffer, int buflen)
         ImgNum = 1;
 
       m_frame->setText(i18n("Encoding image file [%1/%2]...")
-                       .tqarg(ImgNum).tqarg(m_ImagesFilesListBox->count()));
+                       .arg(ImgNum).arg(m_ImagesFilesListBox->count()));
 
       if (ImgNum > 1)
         m_ImagesFilesListBox->setSelected(ImgNum-2, false);
@@ -912,7 +912,7 @@ void KImg2mpgData::EncodeDone(KProcess*)
     m_frame->setText(i18n("Encoding terminated..."));
     int Ret=KMessageBox::warningYesNo(this,
                          i18n("The encoding process has terminated...\n\n"
-                         "Encoding duration: %1").tqarg(Encoding),
+                         "Encoding duration: %1").arg(Encoding),
                          i18n("'images2mpg' Script Execution Terminated"),
                          i18n("&OK"),
                          i18n("Show Process Messages"));
@@ -930,7 +930,7 @@ void KImg2mpgData::EncodeDone(KProcess*)
     m_frame->setText(i18n("Encoding aborted..."));
     int Ret=KMessageBox::warningYesNo(this,
                          i18n("The encoding process has been aborted...\n\n"
-                         "Encoding duration: %1").tqarg(Encoding),
+                         "Encoding duration: %1").arg(Encoding),
                          i18n("'images2mpg' Script Execution Aborted"),
                          i18n("&OK"),
                          i18n("Show Process Messages"));
@@ -1130,7 +1130,7 @@ void KImg2mpgData::RemoveTmpFiles(void)
 
     if (m_TmpFolderConfig.isEmpty() != true && tmpFolder.exists() == true)
        if (DeleteDir(m_TmpFolderConfig) == false)
-          KMessageBox::error(this, i18n("Cannot remove temporary folder %1!").tqarg(m_TmpFolderConfig));
+          KMessageBox::error(this, i18n("Cannot remove temporary folder %1!").arg(m_TmpFolderConfig));
 }
 
 
diff --git a/kipi-plugins/mpegencoder/kimg2mpgbase.ui b/kipi-plugins/mpegencoder/kimg2mpgbase.ui
index bcfee60..d5093ca 100644
--- a/kipi-plugins/mpegencoder/kimg2mpgbase.ui
+++ b/kipi-plugins/mpegencoder/kimg2mpgbase.ui
@@ -23,13 +23,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -53,7 +53,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout26</cstring>
+                <cstring>layout26</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -88,7 +88,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>5</height>
@@ -97,7 +97,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout16</cstring>
+                                <cstring>layout16</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -105,7 +105,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout29</cstring>
+                                        <cstring>layout29</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -118,7 +118,7 @@
                                             <property name="text">
                                                 <string>Video Format</string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>AlignCenter</set>
                                             </property>
                                         </widget>
@@ -164,7 +164,7 @@ DVD is an experimental option.</string>
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout30</cstring>
+                                        <cstring>layout30</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -185,7 +185,7 @@ DVD is an experimental option.</string>
                                             <property name="text">
                                                 <string>Video Type</string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>AlignCenter</set>
                                             </property>
                                         </widget>
@@ -225,7 +225,7 @@ NTSC is an American TV standard; PAL/SECAM is European.</string>
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout31</cstring>
+                                        <cstring>layout31</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -246,7 +246,7 @@ NTSC is an American TV standard; PAL/SECAM is European.</string>
                                             <property name="text">
                                                 <string>Chroma Mode</string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>AlignCenter</set>
                                             </property>
                                         </widget>
@@ -301,7 +301,7 @@ Change it if you have problems with the default value.</string>
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>5</height>
@@ -339,7 +339,7 @@ Change it if you have problems with the default value.</string>
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>5</height>
@@ -348,7 +348,7 @@ Change it if you have problems with the default value.</string>
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout25</cstring>
+                                <cstring>layout25</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -356,7 +356,7 @@ Change it if you have problems with the default value.</string>
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout33</cstring>
+                                        <cstring>layout33</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -369,13 +369,13 @@ Change it if you have problems with the default value.</string>
                                             <property name="text">
                                                 <string>Image duration</string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>AlignVCenter</set>
                                             </property>
                                         </widget>
                                         <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>tqlayout32</cstring>
+                                                <cstring>layout32</cstring>
                                             </property>
                                             <hbox>
                                                 <property name="name">
@@ -414,7 +414,7 @@ Change it if you have problems with the default value.</string>
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout44</cstring>
+                                        <cstring>layout44</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -427,7 +427,7 @@ Change it if you have problems with the default value.</string>
                                             <property name="text">
                                                 <string>Transition speed</string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>AlignVCenter</set>
                                             </property>
                                         </widget>
@@ -488,7 +488,7 @@ Change it if you have problems with the default value.</string>
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout45</cstring>
+                                        <cstring>layout45</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -501,7 +501,7 @@ Change it if you have problems with the default value.</string>
                                             <property name="text">
                                                 <string>Background color</string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>AlignVCenter</set>
                                             </property>
                                         </widget>
@@ -540,7 +540,7 @@ Black is a good value for this.</string>
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>5</height>
@@ -567,7 +567,7 @@ Black is a good value for this.</string>
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout15</cstring>
+                        <cstring>layout15</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -622,7 +622,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -649,7 +649,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -674,7 +674,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -699,7 +699,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -724,7 +724,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -749,7 +749,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -758,7 +758,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout14</cstring>
+                        <cstring>layout14</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -776,7 +776,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>128</width>
                                     <height>128</height>
@@ -788,7 +788,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                             <property name="scaledContents">
                                 <bool>false</bool>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignCenter</set>
                             </property>
                             <property name="whatsThis" stdset="0">
@@ -820,7 +820,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout28</cstring>
+                <cstring>layout28</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -828,7 +828,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout27</cstring>
+                        <cstring>layout27</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -846,13 +846,13 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>32767</height>
@@ -893,7 +893,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -912,7 +912,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>22</width>
                                             <height>22</height>
@@ -932,7 +932,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -953,13 +953,13 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>32767</height>
@@ -1001,7 +1001,7 @@ This audio file name will be multiplexed with the portfolio video.
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -1020,7 +1020,7 @@ This audio file name will be multiplexed with the portfolio video.
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>22</width>
                                             <height>22</height>
@@ -1040,7 +1040,7 @@ This audio file name will be multiplexed with the portfolio video.
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -1061,13 +1061,13 @@ This audio file name will be multiplexed with the portfolio video.
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>50</width>
                                     <height>25</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>30</height>
@@ -1098,13 +1098,13 @@ This audio file name will be multiplexed with the portfolio video.
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>27</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>30</height>
@@ -1126,7 +1126,7 @@ This audio file name will be multiplexed with the portfolio video.
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
@@ -1135,7 +1135,7 @@ This audio file name will be multiplexed with the portfolio video.
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout21</cstring>
+                        <cstring>layout21</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -1171,7 +1171,7 @@ The program uses the 'images2mpg' bash script.</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>51</height>
@@ -1190,7 +1190,7 @@ The program uses the 'images2mpg' bash script.</string>
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>62</width>
                                     <height>0</height>
@@ -1210,7 +1210,7 @@ The program uses the 'images2mpg' bash script.</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>51</height>
diff --git a/kipi-plugins/mpegencoder/kshowdebuggingoutput.h b/kipi-plugins/mpegencoder/kshowdebuggingoutput.h
index 6a36569..9592352 100644
--- a/kipi-plugins/mpegencoder/kshowdebuggingoutput.h
+++ b/kipi-plugins/mpegencoder/kshowdebuggingoutput.h
@@ -27,8 +27,8 @@
 // TQt includes
 
 #include <tqpushbutton.h>
-#include <tqtextview.h>
-#include <tqlayout.h>
+#include <textview.h>
+#include <layout.h>
 
 // KDElib includes
 
diff --git a/kipi-plugins/mpegencoder/optionsdialog.cpp b/kipi-plugins/mpegencoder/optionsdialog.cpp
index d657a86..e951fe3 100644
--- a/kipi-plugins/mpegencoder/optionsdialog.cpp
+++ b/kipi-plugins/mpegencoder/optionsdialog.cpp
@@ -23,7 +23,7 @@
 // Include files for TQt
 
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
diff --git a/kipi-plugins/picasawebexport/mpform.cpp b/kipi-plugins/picasawebexport/mpform.cpp
index 3fdeac6..2a5884c 100644
--- a/kipi-plugins/picasawebexport/mpform.cpp
+++ b/kipi-plugins/picasawebexport/mpform.cpp
@@ -30,7 +30,7 @@
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // KDE includes.
 
@@ -76,7 +76,7 @@ void MPForm::finish()
 bool MPForm::addPair(const TQString& name, const TQString& value, const TQString& contentType)
 {
     TQCString str;
-    TQString  content_length = TQString("%1").tqarg(value.length());
+    TQString  content_length = TQString("%1").arg(value.length());
     str += "--";
     str += m_boundary;
     str += "\r\n";
@@ -131,7 +131,7 @@ bool MPForm::addFile(const TQString& name,const TQString& path)
     TQByteArray imageData = imageFile.readAll();
 
     TQCString str;
-    TQString file_size = TQString("%1").tqarg(imageFile.size());
+    TQString file_size = TQString("%1").arg(imageFile.size());
 
     str += "--";
     str += m_boundary;
diff --git a/kipi-plugins/picasawebexport/picasaweblogin.cpp b/kipi-plugins/picasawebexport/picasaweblogin.cpp
index 413a824..6a3cc0b 100644
--- a/kipi-plugins/picasawebexport/picasaweblogin.cpp
+++ b/kipi-plugins/picasawebexport/picasaweblogin.cpp
@@ -26,7 +26,7 @@
 #include <tqframe.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE includes.
 
@@ -50,7 +50,7 @@ PicasawebLogin::PicasawebLogin(TQWidget* parent, const TQString& header,
     TQVBoxLayout* vbox = new TQVBoxLayout( this, 5, 5, "vbox");
 
     m_headerLabel = new TQLabel(this);
-    m_headerLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
+    m_headerLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
                                              TQSizePolicy::Fixed));
     m_headerLabel->setText(header);
     vbox->addWidget( m_headerLabel );
@@ -96,7 +96,7 @@ PicasawebLogin::PicasawebLogin(TQWidget* parent, const TQString& header,
 
     vbox->addLayout( btnLayout );
 
-    resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(300, 150).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
 
     m_nameEdit->setText(_name);
diff --git a/kipi-plugins/picasawebexport/picasawebtalker.cpp b/kipi-plugins/picasawebexport/picasawebtalker.cpp
index 319373c..db78104 100644
--- a/kipi-plugins/picasawebexport/picasawebtalker.cpp
+++ b/kipi-plugins/picasawebexport/picasawebtalker.cpp
@@ -31,7 +31,7 @@
 // TQt includes.
 
 #include <tqcstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqimage.h>
@@ -320,8 +320,8 @@ void PicasawebTalker::addPhotoTag(const TQString& photoURI, const TQString& tag)
                                 "<title>%1</title> "
                                 "<category scheme='http://schemas.google.com/g/2005#kind' "
                                 "term='http://schemas.google.com/photos/2007#tag'/> "
-                                "</entry>").tqarg(tag);
-    TQString postUrl = TQString("%1").tqarg(photoURI);
+                                "</entry>").arg(tag);
+    TQString postUrl = TQString("%1").arg(photoURI);
     TQByteArray buffer;
     TQTextStream ts(buffer, IO_Append|IO_WriteOnly);
     ts.setEncoding(TQTextStream::UnicodeUTF8);
@@ -330,7 +330,7 @@ void PicasawebTalker::addPhotoTag(const TQString& photoURI, const TQString& tag)
     TQString auth_string = "GoogleLogin auth=" + m_token;
     KIO::TransferJob* job = KIO::http_post(postUrl, buffer, false);
     job->addMetaData("content-type", "Content-Type: application/atom+xml");
-    job->addMetaData("content-length", TQString("Content-Length: %1").tqarg(addTagXML.length()));
+    job->addMetaData("content-length", TQString("Content-Length: %1").arg(addTagXML.length()));
     job->addMetaData("customHTTPHeader", "Authorization: " + auth_string );
 
     //connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
@@ -374,13 +374,13 @@ void PicasawebTalker::createAlbum(const TQString& albumTitle, const TQString& al
                 "</media:group> "
                 "<category scheme='http://schemas.google.com/g/2005#kind' "
                         "term='http://schemas.google.com/photos/2007#album'></category> "
-                        "</entry> ").tqarg(albumTitle)
-                                    .tqarg(albumDesc)
-                                    .tqarg(location)
-                                    .tqarg(access)
-                                    .tqarg(isCommentsEnabled==true?"true":"false")
-                                    .tqarg(timestamp)
-                                    .tqarg(media_keywords);
+                        "</entry> ").arg(albumTitle)
+                                    .arg(albumDesc)
+                                    .arg(location)
+                                    .arg(access)
+                                    .arg(isCommentsEnabled==true?"true":"false")
+                                    .arg(timestamp)
+                                    .arg(media_keywords);
 
     TQByteArray buffer;
     TQTextStream ts(buffer, IO_Append|IO_WriteOnly);
@@ -392,7 +392,7 @@ void PicasawebTalker::createAlbum(const TQString& albumTitle, const TQString& al
     TQString auth_string = "GoogleLogin auth=" + m_token;
     KIO::TransferJob* job = KIO::http_post(postUrl, buffer, false);
     job->addMetaData("content-type", "Content-Type: application/atom+xml");
-    job->addMetaData("content-length", TQString("Content-Length: %1").tqarg(newAlbumXML.length()));
+    job->addMetaData("content-length", TQString("Content-Length: %1").arg(newAlbumXML.length()));
     job->addMetaData("customHTTPHeader", "Authorization: " + auth_string );
 
     connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
@@ -593,7 +593,7 @@ void PicasawebTalker::slotError(const TQString & error)
             transError=i18n("Unknown error");
     };
 
-    KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Error Occured: %1\n We can not proceed further").tqarg(transError));
+    KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Error Occured: %1\n We can not proceed further").arg(transError));
     //kdDebug()<<"Not handling the error now will see it later"<<endl;
 }
 
@@ -904,7 +904,7 @@ void PicasawebTalker::parseResponseAddPhoto(const TQByteArray &data)
         for ( TQStringList::Iterator it = tags.begin(); it != tags.end(); ++it ) 
         {
             TQString photoURI= TQString("http://picasaweb.google.com/data/feed/api/user/"
-                    "%1/albumid/%2/photoid/%3").tqarg(m_username).tqarg(album_id).tqarg(photo_id);
+                    "%1/albumid/%2/photoid/%3").arg(m_username).arg(album_id).arg(photo_id);
             addPhotoTag( photoURI, *it);
         }
     }
diff --git a/kipi-plugins/picasawebexport/picasawebwidget.cpp b/kipi-plugins/picasawebexport/picasawebwidget.cpp
index b6c6be9..d3bf95c 100644
--- a/kipi-plugins/picasawebexport/picasawebwidget.cpp
+++ b/kipi-plugins/picasawebexport/picasawebwidget.cpp
@@ -32,7 +32,7 @@
 #include <tqgroupbox.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqsplitter.h>
 #include <tqwhatsthis.h>
@@ -58,7 +58,7 @@ PicasawebWidget::PicasawebWidget(TQWidget* parent, const char* name, WFlags fl)
     if ( !name )
         setName("PicasawebWidget");
 
-    //resize( TQSize(600, 400).expandedTo(tqminimumSizeHint()) );
+    //resize( TQSize(600, 400).expandedTo(minimumSizeHint()) );
     //clearWState( WState_Polished );
 }
 
diff --git a/kipi-plugins/picasawebexport/picasawebwindow.cpp b/kipi-plugins/picasawebexport/picasawebwindow.cpp
index 762c03f..370e9b0 100644
--- a/kipi-plugins/picasawebexport/picasawebwindow.cpp
+++ b/kipi-plugins/picasawebexport/picasawebwindow.cpp
@@ -37,7 +37,7 @@
 #include <tqradiobutton.h>
 #include <tqdatetimeedit.h>
 #include <tqdatetime.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 // KDE includes.
 
@@ -374,7 +374,7 @@ void PicasawebWindow::slotAuthCancel()
 void PicasawebWindow::slotCreateNewAlbum()
 {
     NewAlbumDialog *dlg = new NewAlbumDialog(TQT_TQWIDGET(kapp->activeWindow()));
-    dlg->m_dateAndTimeEdit->setDateTime(TQDateTime::tqcurrentDateTime());
+    dlg->m_dateAndTimeEdit->setDateTime(TQDateTime::currentDateTime());
     TQString test;
     int t = dlg->exec();
 
@@ -541,7 +541,7 @@ void PicasawebWindow::slotAddPhotoNext()
         return;
     }
 
-    m_progressDlg->setLabelText(i18n("Uploading file %1 ").tqarg( KURL(pathComments.first).filename()));
+    m_progressDlg->setLabelText(i18n("Uploading file %1 ").arg( KURL(pathComments.first).filename()));
 
     if (m_progressDlg->isHidden())
         m_progressDlg->show();
@@ -558,7 +558,7 @@ void PicasawebWindow::slotAddPhotoFailed(const TQString& msg)
 {
     if ( KMessageBox::warningContinueCancel(this,
            i18n("Failed to upload photo into Picasaweb. %1\nDo you want to continue?")
-                .tqarg( msg )) != KMessageBox::Continue)
+                .arg( msg )) != KMessageBox::Continue)
     {
         m_uploadQueue.clear();
         m_progressDlg->reset();
diff --git a/kipi-plugins/picasawebexport/uploadwidget.ui b/kipi-plugins/picasawebexport/uploadwidget.ui
index 35f30ae..2180ca2 100644
--- a/kipi-plugins/picasawebexport/uploadwidget.ui
+++ b/kipi-plugins/picasawebexport/uploadwidget.ui
@@ -168,7 +168,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -193,7 +193,7 @@
         <property name="text">
             <string>PicasaWeb Uploader</string>
         </property>
-        <property name="tqalignment">
+        <property name="alignment">
             <set>AlignCenter</set>
         </property>
     </widget>
diff --git a/kipi-plugins/printwizard/cropframe.cpp b/kipi-plugins/printwizard/cropframe.cpp
index 4f9cf2e..b92c392 100644
--- a/kipi-plugins/printwizard/cropframe.cpp
+++ b/kipi-plugins/printwizard/cropframe.cpp
@@ -118,7 +118,7 @@ void CropFrame::init(TPhoto *photo, int width, int height, bool autoRotate, bool
     m_cropRegion = _photoToScreenRect(m_photo->cropRegion);
 
   if (paint)  
-    tqrepaint(false);
+    repaint(false);
 }
 
 TQRect CropFrame::_screenToPhotoRect(TQRect r)
@@ -263,7 +263,7 @@ void CropFrame::mouseMoveEvent(TQMouseEvent *e)
 
     m_cropRegion.setRect(newX, newY, newW, newH);
     m_photo->cropRegion = _screenToPhotoRect(m_cropRegion);
-    tqrepaint(false);
+    repaint(false);
   }
 }
 
@@ -295,14 +295,14 @@ void CropFrame::keyPressEvent(TQKeyEvent *e)
 
   m_cropRegion.setRect(newX, newY, w, h);
   m_photo->cropRegion = _screenToPhotoRect(m_cropRegion);
-  tqrepaint(false);
+  repaint(false);
 
 }
 
 void CropFrame::setColor(TQColor c)
 {
   m_color = c;
-  tqrepaint(false);
+  repaint(false);
 }
 
 TQColor CropFrame::color()
diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp
index 2962791..b61e8fc 100644
--- a/kipi-plugins/printwizard/frmprintwizard.cpp
+++ b/kipi-plugins/printwizard/frmprintwizard.cpp
@@ -282,7 +282,7 @@ void FrmPrintWizard::updateCropFrame(TPhoto *photo, int photoIndex)
 {
   TPhotoSize *s = m_photoSizes.at(ListPhotoSizes->currentItem());
   cropFrame->init(photo, getLayout(photoIndex)->width(), getLayout(photoIndex)->height(), s->autoRotate);
-  LblCropPhoto->setText(i18n("Photo %1 of %2").tqarg( TQString::number(m_photos.at() + 1) ).tqarg( TQString::number(m_photos.count()) ));
+  LblCropPhoto->setText(i18n("Photo %1 of %2").arg( TQString::number(m_photos.at() + 1) ).arg( TQString::number(m_photos.count()) ));
 }
 
 void FrmPrintWizard::BtnCropPrev_clicked()
@@ -399,7 +399,7 @@ double getMaxDPI(TQPtrList<TPhoto> photos, TQPtrList<TQRect> layouts, unsigned i
 {
     Q_ASSERT(layouts.count() > 1);
 
-  TQRect *tqlayout = layouts.at(1);
+  TQRect *layout = layouts.at(1);
 
   double maxDPI = 0.0;
 
@@ -407,12 +407,12 @@ double getMaxDPI(TQPtrList<TPhoto> photos, TQPtrList<TQRect> layouts, unsigned i
   {
     TPhoto *photo = photos.at(current);
     double dpi = ((double)photo->cropRegion.width() + (double)photo->cropRegion.height()) /
-      (((double)tqlayout->width() / 1000.0) + ((double)tqlayout->height() / 1000.0));
+      (((double)layout->width() / 1000.0) + ((double)layout->height() / 1000.0));
     if (dpi > maxDPI)
       maxDPI = dpi;
     // iterate to the next position
-    tqlayout = layouts.next();
-    if (tqlayout == 0)
+    layout = layouts.next();
+    if (layout == 0)
     {
       break;
     }
@@ -426,7 +426,7 @@ TQRect * FrmPrintWizard::getLayout(int photoIndex)
 
   // how many photos would actually be printed, including copies?
   int photoCount  = (photoIndex + 1);
-  // how many pages?  Recall that the first tqlayout item is the paper size
+  // how many pages?  Recall that the first layout item is the paper size
   int photosPerPage = s->layouts.count() - 1;
   int remainder = photoCount % photosPerPage;
 
@@ -438,11 +438,11 @@ TQRect * FrmPrintWizard::getLayout(int photoIndex)
 
 int FrmPrintWizard::getPageCount()
 {
-  // get the selected tqlayout
+  // get the selected layout
   TPhotoSize *s = m_photoSizes.at(ListPhotoSizes->currentItem());
 
   int photoCount  =  m_photos.count();
-  // how many pages?  Recall that the first tqlayout item is the paper size
+  // how many pages?  Recall that the first layout item is the paper size
   int photosPerPage = s->layouts.count() - 1;
   int remainder = photoCount % photosPerPage;
   int emptySlots = 0;
@@ -541,7 +541,7 @@ TQString FrmPrintWizard::captionFormatter(TPhoto *photo, const TQString& format)
   TQString resolution;
   TQSize imageSize =  photo->exiv2Iface()->getImageDimensions();
   if (imageSize.isValid()) {
-    resolution = TQString( "%1x%2" ).tqarg( imageSize.width()).tqarg( imageSize.height());
+    resolution = TQString( "%1x%2" ).arg( imageSize.width()).arg( imageSize.height());
   }
   str.replace("\\n", "\n");
 
@@ -574,7 +574,7 @@ bool FrmPrintWizard::paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrL
   if (photos.count() == 0) return true; // no photos => last photo
 
   TQRect *srcPage = layouts.at(0);
-  TQRect *tqlayout = layouts.at(1);
+  TQRect *layout = layouts.at(1);
 
   // scale the page size to best fit the painter
   // size the rectangle based on the minimum image dimension
@@ -654,10 +654,10 @@ bool FrmPrintWizard::paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrL
     else
       img = img.copy(photo->cropRegion);
 
-    int x1 = NINT((double)tqlayout->left() * xRatio);
-    int y1 = NINT((double)tqlayout->top()  * yRatio);
-    int w  = NINT((double)tqlayout->width() * xRatio);
-    int h  = NINT((double)tqlayout->height() * yRatio);
+    int x1 = NINT((double)layout->left() * xRatio);
+    int y1 = NINT((double)layout->top()  * yRatio);
+    int w  = NINT((double)layout->width() * xRatio);
+    int h  = NINT((double)layout->height() * yRatio);
 
     p.drawImage( TQRect(x1 + left, y1 + top, w, h), img );
 
@@ -742,8 +742,8 @@ bool FrmPrintWizard::paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrL
     } // caption
 
     // iterate to the next position
-    tqlayout = layouts.next();
-    if (tqlayout == 0)
+    layout = layouts.next();
+    if (layout == 0)
     {
       current++;
       break;
@@ -766,7 +766,7 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis
   Q_ASSERT(layouts.count() > 1);
 
   TQRect *srcPage = layouts.at(0);
-  TQRect *tqlayout = layouts.at(1);
+  TQRect *layout = layouts.at(1);
 
   // scale the page size to best fit the painter
   // size the rectangle based on the minimum image dimension
@@ -821,10 +821,10 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis
 
     img = img.copy(photo->cropRegion);
 
-    int x1 = NINT((double)tqlayout->left() * xRatio);
-    int y1 = NINT((double)tqlayout->top()  * yRatio);
-    int w  = NINT((double)tqlayout->width() * xRatio);
-    int h  = NINT((double)tqlayout->height() * yRatio);
+    int x1 = NINT((double)layout->left() * xRatio);
+    int y1 = NINT((double)layout->top()  * yRatio);
+    int w  = NINT((double)layout->width() * xRatio);
+    int h  = NINT((double)layout->height() * yRatio);
 
     // We can use scaleFree because the crop frame should have the proper dimensions.
     img = img.smoothScale(w, h, TQ_ScaleFree);
@@ -929,8 +929,8 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis
     } // caption
 
     // iterate to the next position
-    tqlayout = layouts.next();
-    if (tqlayout == 0)
+    layout = layouts.next();
+    if (layout == 0)
     {
       current++;
       break;
@@ -944,11 +944,11 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis
 // update the pages to be printed and preview first/last pages
 void FrmPrintWizard::previewPhotos()
 {
-  // get the selected tqlayout
+  // get the selected layout
   TPhotoSize *s = m_photoSizes.at(ListPhotoSizes->currentItem());
 
   int photoCount  =  m_photos.count();
-  // how many pages?  Recall that the first tqlayout item is the paper size
+  // how many pages?  Recall that the first layout item is the paper size
   int photosPerPage = s->layouts.count() - 1;
   int remainder = photoCount % photosPerPage;
   int emptySlots = 0;
@@ -997,7 +997,7 @@ void FrmPrintWizard::previewPhotos()
   p.end();
   BmpFirstPagePreview->setPixmap(img);
   LblPreview->setText(i18n("Page ") + TQString::number(m_currentPreviewPage + 1) + i18n(" of ") + TQString::number(getPageCount()));
-  LblPreview->setText(i18n("Page %1 of %2").tqarg(m_currentPreviewPage + 1).tqarg(getPageCount()));
+  LblPreview->setText(i18n("Page %1 of %2").arg(m_currentPreviewPage + 1).arg(getPageCount()));
 
   manageBtnPreviewPage();
   manageBtnPrintOrder();
diff --git a/kipi-plugins/printwizard/frmprintwizardbase.ui b/kipi-plugins/printwizard/frmprintwizardbase.ui
index 55ebac8..93a1f13 100644
--- a/kipi-plugins/printwizard/frmprintwizardbase.ui
+++ b/kipi-plugins/printwizard/frmprintwizardbase.ui
@@ -37,7 +37,7 @@
         </attribute>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout53</cstring>
+                <cstring>layout53</cstring>
             </property>
             <property name="geometry">
                 <rect>
@@ -53,7 +53,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout24</cstring>
+                        <cstring>layout24</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -91,7 +91,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>300</height>
@@ -116,7 +116,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout52</cstring>
+                        <cstring>layout52</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -132,7 +132,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>31</height>
@@ -156,7 +156,7 @@
 
 Click the 'Next' button to begin.</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignVCenter</set>
                             </property>
                         </widget>
@@ -170,7 +170,7 @@ Click the 'Next' button to begin.</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>381</height>
@@ -195,7 +195,7 @@ Click the 'Next' button to begin.</string>
             </property>
             <widget class="TQLayoutWidget" row="0" column="0">
                 <property name="name">
-                    <cstring>tqlayout88</cstring>
+                    <cstring>layout88</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -233,7 +233,7 @@ Click the 'Next' button to begin.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>16</width>
                                 <height>471</height>
@@ -244,7 +244,7 @@ Click the 'Next' button to begin.</string>
             </widget>
             <widget class="TQLayoutWidget" row="0" column="1">
                 <property name="name">
-                    <cstring>tqlayout87</cstring>
+                    <cstring>layout87</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -271,7 +271,7 @@ Click the 'Next' button to begin.</string>
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout37</cstring>
+                                    <cstring>layout37</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -279,7 +279,7 @@ Click the 'Next' button to begin.</string>
                                     </property>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout36</cstring>
+                                            <cstring>layout36</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -343,7 +343,7 @@ Click the 'Next' button to begin.</string>
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout36</cstring>
+                                            <cstring>layout36</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -359,7 +359,7 @@ Click the 'Next' button to begin.</string>
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>210</width>
                                                         <height>20</height>
@@ -394,7 +394,7 @@ Click the 'Next' button to begin.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout86</cstring>
+                                    <cstring>layout86</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -483,7 +483,7 @@ Click the 'Next' button to begin.</string>
                                                         <verstretch>0</verstretch>
                                                     </sizepolicy>
                                                 </property>
-                                                <property name="tqminimumSize">
+                                                <property name="minimumSize">
                                                     <size>
                                                         <width>200</width>
                                                         <height>110</height>
@@ -496,7 +496,7 @@ Click the 'Next' button to begin.</string>
 %a aperture    %l focal length
 \n newline</string>
                                                 </property>
-                                                <property name="tqalignment">
+                                                <property name="alignment">
                                                     <set>WordBreak|AlignVCenter</set>
                                                 </property>
                                             </widget>
@@ -564,7 +564,7 @@ Click the 'Next' button to begin.</string>
                                             </widget>
                                             <widget class="TQLayoutWidget">
                                                 <property name="name">
-                                                    <cstring>tqlayout37</cstring>
+                                                    <cstring>layout37</cstring>
                                                 </property>
                                                 <hbox>
                                                     <property name="name">
@@ -665,7 +665,7 @@ Click the 'Next' button to begin.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout24</cstring>
+                                    <cstring>layout24</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -725,7 +725,7 @@ Click the 'Next' button to begin.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>40</width>
                                                 <height>20</height>
@@ -752,7 +752,7 @@ Click the 'Next' button to begin.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout23</cstring>
+                                    <cstring>layout23</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -768,7 +768,7 @@ Click the 'Next' button to begin.</string>
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>19</width>
                                                 <height>26</height>
@@ -793,7 +793,7 @@ Click the 'Next' button to begin.</string>
                                         <property name="text">
                                             <string>This wizard will output each page to this folder with the filename kipi_printwizard_1, kipi_printwizard_2, etc.</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>WordBreak|AlignVCenter</set>
                                         </property>
                                     </widget>
@@ -801,7 +801,7 @@ Click the 'Next' button to begin.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout23</cstring>
+                                    <cstring>layout23</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -817,7 +817,7 @@ Click the 'Next' button to begin.</string>
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>19</width>
                                                 <height>26</height>
@@ -916,7 +916,7 @@ Click the 'Next' button to begin.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>20</height>
@@ -941,7 +941,7 @@ Click the 'Next' button to begin.</string>
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout113</cstring>
+                    <cstring>layout113</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -949,7 +949,7 @@ Click the 'Next' button to begin.</string>
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout88</cstring>
+                            <cstring>layout88</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -957,7 +957,7 @@ Click the 'Next' button to begin.</string>
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout86</cstring>
+                                    <cstring>layout86</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -988,7 +988,7 @@ Click the 'Next' button to begin.</string>
                                         <property name="name">
                                             <cstring>ListPhotoSizes</cstring>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>150</width>
                                                 <height>200</height>
@@ -999,7 +999,7 @@ Click the 'Next' button to begin.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout87</cstring>
+                                    <cstring>layout87</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1026,7 +1026,7 @@ Click the 'Next' button to begin.</string>
                                             </property>
                                             <widget class="TQLayoutWidget">
                                                 <property name="name">
-                                                    <cstring>tqlayout90</cstring>
+                                                    <cstring>layout90</cstring>
                                                 </property>
                                                 <hbox>
                                                     <property name="name">
@@ -1047,7 +1047,7 @@ Click the 'Next' button to begin.</string>
                                                         <property name="text">
                                                             <string>Photos:</string>
                                                         </property>
-                                                        <property name="tqalignment">
+                                                        <property name="alignment">
                                                             <set>AlignVCenter|AlignRight</set>
                                                         </property>
                                                     </widget>
@@ -1063,7 +1063,7 @@ Click the 'Next' button to begin.</string>
                                                                 <verstretch>0</verstretch>
                                                             </sizepolicy>
                                                         </property>
-                                                        <property name="tqminimumSize">
+                                                        <property name="minimumSize">
                                                             <size>
                                                                 <width>30</width>
                                                                 <height>0</height>
@@ -1072,7 +1072,7 @@ Click the 'Next' button to begin.</string>
                                                         <property name="text">
                                                             <string>&lt;p align="right"&gt;0&lt;/p&gt;</string>
                                                         </property>
-                                                        <property name="tqalignment">
+                                                        <property name="alignment">
                                                             <set>WordBreak|AlignVCenter|AlignLeft</set>
                                                         </property>
                                                     </widget>
@@ -1080,7 +1080,7 @@ Click the 'Next' button to begin.</string>
                                             </widget>
                                             <widget class="TQLayoutWidget">
                                                 <property name="name">
-                                                    <cstring>tqlayout91</cstring>
+                                                    <cstring>layout91</cstring>
                                                 </property>
                                                 <hbox>
                                                     <property name="name">
@@ -1101,7 +1101,7 @@ Click the 'Next' button to begin.</string>
                                                         <property name="text">
                                                             <string>Sheets:</string>
                                                         </property>
-                                                        <property name="tqalignment">
+                                                        <property name="alignment">
                                                             <set>AlignVCenter|AlignRight</set>
                                                         </property>
                                                     </widget>
@@ -1117,7 +1117,7 @@ Click the 'Next' button to begin.</string>
                                                                 <verstretch>0</verstretch>
                                                             </sizepolicy>
                                                         </property>
-                                                        <property name="tqminimumSize">
+                                                        <property name="minimumSize">
                                                             <size>
                                                                 <width>30</width>
                                                                 <height>0</height>
@@ -1126,7 +1126,7 @@ Click the 'Next' button to begin.</string>
                                                         <property name="text">
                                                             <string>&lt;p align="right"&gt;0&lt;/p&gt;</string>
                                                         </property>
-                                                        <property name="tqalignment">
+                                                        <property name="alignment">
                                                             <set>WordBreak|AlignVCenter|AlignLeft</set>
                                                         </property>
                                                     </widget>
@@ -1134,7 +1134,7 @@ Click the 'Next' button to begin.</string>
                                             </widget>
                                             <widget class="TQLayoutWidget">
                                                 <property name="name">
-                                                    <cstring>tqlayout92</cstring>
+                                                    <cstring>layout92</cstring>
                                                 </property>
                                                 <hbox>
                                                     <property name="name">
@@ -1155,7 +1155,7 @@ Click the 'Next' button to begin.</string>
                                                         <property name="text">
                                                             <string>Empty Q_SLOTS:</string>
                                                         </property>
-                                                        <property name="tqalignment">
+                                                        <property name="alignment">
                                                             <set>WordBreak|AlignVCenter|AlignRight</set>
                                                         </property>
                                                     </widget>
@@ -1171,7 +1171,7 @@ Click the 'Next' button to begin.</string>
                                                                 <verstretch>0</verstretch>
                                                             </sizepolicy>
                                                         </property>
-                                                        <property name="tqminimumSize">
+                                                        <property name="minimumSize">
                                                             <size>
                                                                 <width>30</width>
                                                                 <height>0</height>
@@ -1180,7 +1180,7 @@ Click the 'Next' button to begin.</string>
                                                         <property name="text">
                                                             <string>&lt;p align="right"&gt;0&lt;/p&gt;</string>
                                                         </property>
-                                                        <property name="tqalignment">
+                                                        <property name="alignment">
                                                             <set>WordBreak|AlignVCenter|AlignLeft</set>
                                                         </property>
                                                     </widget>
@@ -1198,7 +1198,7 @@ Click the 'Next' button to begin.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>105</height>
@@ -1240,7 +1240,7 @@ Click the 'Next' button to begin.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout112</cstring>
+                                    <cstring>layout112</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1283,7 +1283,7 @@ Click the 'Next' button to begin.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>80</height>
@@ -1322,7 +1322,7 @@ Click the 'Next' button to begin.</string>
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout75</cstring>
+                            <cstring>layout75</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1343,7 +1343,7 @@ Click the 'Next' button to begin.</string>
                                 <property name="text">
                                     <string>Number of times to print selected photo:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
@@ -1370,7 +1370,7 @@ Click the 'Next' button to begin.</string>
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout40</cstring>
+                    <cstring>layout40</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -1405,7 +1405,7 @@ Click the 'Next' button to begin.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout37</cstring>
+                                    <cstring>layout37</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1421,7 +1421,7 @@ Click the 'Next' button to begin.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -1440,13 +1440,13 @@ Click the 'Next' button to begin.</string>
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>260</width>
                                                 <height>367</height>
                                             </size>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>260</width>
                                                 <height>367</height>
@@ -1461,7 +1461,7 @@ Click the 'Next' button to begin.</string>
                                         <property name="scaledContents">
                                             <bool>true</bool>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignVCenter</set>
                                         </property>
                                     </widget>
@@ -1475,7 +1475,7 @@ Click the 'Next' button to begin.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -1486,7 +1486,7 @@ Click the 'Next' button to begin.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout35</cstring>
+                                    <cstring>layout35</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1504,7 +1504,7 @@ Click the 'Next' button to begin.</string>
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>32767</height>
@@ -1530,7 +1530,7 @@ Click the 'Next' button to begin.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>161</width>
                                                 <height>21</height>
@@ -1549,7 +1549,7 @@ Click the 'Next' button to begin.</string>
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>32767</height>
@@ -1579,7 +1579,7 @@ Click the 'Next' button to begin.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -1603,7 +1603,7 @@ Click the 'Next' button to begin.</string>
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout110</cstring>
+                    <cstring>layout110</cstring>
                 </property>
                 <hbox>
                     <property name="name">
@@ -1649,7 +1649,7 @@ Click the 'Next' button to begin.</string>
                         <property name="scaledContents">
                             <bool>false</bool>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignTop|AlignLeft</set>
                         </property>
                     </widget>
@@ -1673,7 +1673,7 @@ Click the 'Next' button to begin.</string>
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout121</cstring>
+                    <cstring>layout121</cstring>
                 </property>
                 <hbox>
                     <property name="name">
@@ -1689,7 +1689,7 @@ Click the 'Next' button to begin.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>41</width>
                                 <height>21</height>
@@ -1698,7 +1698,7 @@ Click the 'Next' button to begin.</string>
                     </spacer>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout119</cstring>
+                            <cstring>layout119</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -1708,7 +1708,7 @@ Click the 'Next' button to begin.</string>
                                 <property name="name">
                                     <cstring>cropFrame</cstring>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>200</width>
                                         <height>200</height>
@@ -1717,7 +1717,7 @@ Click the 'Next' button to begin.</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout118</cstring>
+                                    <cstring>layout118</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1750,7 +1750,7 @@ Click the 'Next' button to begin.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>127</width>
                                                 <height>16</height>
@@ -1801,7 +1801,7 @@ Click the 'Next' button to begin.</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>127</width>
                                                 <height>16</height>
@@ -1838,7 +1838,7 @@ Click the 'Next' button to begin.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>41</width>
                                 <height>21</height>
@@ -1858,7 +1858,7 @@ Click the 'Next' button to begin.</string>
         </attribute>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout62</cstring>
+                <cstring>layout62</cstring>
             </property>
             <property name="geometry">
                 <rect>
@@ -1874,7 +1874,7 @@ Click the 'Next' button to begin.</string>
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout61</cstring>
+                        <cstring>layout61</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -1912,7 +1912,7 @@ Click the 'Next' button to begin.</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>438</height>
@@ -1937,7 +1937,7 @@ Click the 'Next' button to begin.</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout60</cstring>
+                        <cstring>layout60</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -1953,7 +1953,7 @@ Click the 'Next' button to begin.</string>
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>70</height>
@@ -1975,7 +1975,7 @@ Click the 'Next' button to begin.</string>
                             <property name="text">
                                 <string>Click the Next button to print.</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignTop|AlignHCenter</set>
                             </property>
                         </widget>
@@ -1989,7 +1989,7 @@ Click the 'Next' button to begin.</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>361</height>
@@ -1998,7 +1998,7 @@ Click the 'Next' button to begin.</string>
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout35</cstring>
+                                <cstring>layout35</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -2014,7 +2014,7 @@ Click the 'Next' button to begin.</string>
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>360</width>
                                             <height>20</height>
@@ -2060,7 +2060,7 @@ Click the 'Next' button to begin.</string>
             </property>
             <widget class="TQLayoutWidget" row="0" column="0">
                 <property name="name">
-                    <cstring>tqlayout55</cstring>
+                    <cstring>layout55</cstring>
                 </property>
                 <hbox>
                     <property name="name">
@@ -2112,7 +2112,7 @@ Click the 'Next' button to begin.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>0</width>
                                         <height>289</height>
@@ -2137,7 +2137,7 @@ Click the 'Next' button to begin.</string>
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout54</cstring>
+                            <cstring>layout54</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -2153,7 +2153,7 @@ Click the 'Next' button to begin.</string>
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>70</height>
@@ -2180,7 +2180,7 @@ Click the 'Next' button to begin.</string>
                                 <property name="text">
                                     <string>Complete.  Click Finish to exit the Print Wizard.</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop|AlignHCenter</set>
                                 </property>
                             </widget>
@@ -2194,7 +2194,7 @@ Click the 'Next' button to begin.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>41</width>
                                         <height>371</height>
diff --git a/kipi-plugins/rawconverter/actionthread.cpp b/kipi-plugins/rawconverter/actionthread.cpp
index 1d6934b..ed48d51 100644
--- a/kipi-plugins/rawconverter/actionthread.cpp
+++ b/kipi-plugins/rawconverter/actionthread.cpp
@@ -172,33 +172,33 @@ void ActionThread::run()
                         identify = info.make + TQString("-") + info.model;
                     else
                     {
-                        identify = i18n("Make: %1\n").tqarg(info.make); 
-                        identify.append(i18n("Model: %1\n").tqarg(info.model));
+                        identify = i18n("Make: %1\n").arg(info.make); 
+                        identify.append(i18n("Model: %1\n").arg(info.model));
 
                         if (info.dateTime.isValid())
                         {
                             identify.append(i18n("Created: %1\n")
-                                    .tqarg(KGlobal::locale()->formatDateTime(info.dateTime, true, true)));
+                                    .arg(KGlobal::locale()->formatDateTime(info.dateTime, true, true)));
                         }
 
                         if (info.aperture != -1.0)
                         {
-                            identify.append(i18n("Aperture: f/%1\n").tqarg(TQString::number(info.aperture)));
+                            identify.append(i18n("Aperture: f/%1\n").arg(TQString::number(info.aperture)));
                         }
 
                         if (info.focalLength != -1.0)
                         {
-                            identify.append(i18n("Focal: %1 mm\n").tqarg(info.focalLength));
+                            identify.append(i18n("Focal: %1 mm\n").arg(info.focalLength));
                         }                        
 
                         if (info.exposureTime != -1.0)
                         {
-                            identify.append(i18n("Exposure: 1/%1 s\n").tqarg(info.exposureTime));
+                            identify.append(i18n("Exposure: 1/%1 s\n").arg(info.exposureTime));
                         }
    
                         if (info.sensitivity != -1)
                         {
-                            identify.append(i18n("Sensitivity: %1 ISO").tqarg(info.sensitivity));
+                            identify.append(i18n("Sensitivity: %1 ISO").arg(info.sensitivity));
                         }
                     }
                 }
diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp
index b5cc905..29c2fad 100644
--- a/kipi-plugins/rawconverter/batchdialog.cpp
+++ b/kipi-plugins/rawconverter/batchdialog.cpp
@@ -38,7 +38,7 @@ extern "C"
 
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqtimer.h>
 #include <tqfileinfo.h>
@@ -104,7 +104,7 @@ BatchDialog::BatchDialog(TQWidget* /*parent*/)
     m_listView->setResizeMode(TQListView::AllColumns);
     m_listView->setAllColumnsShowFocus(true);
     m_listView->setSorting(-1);
-    m_listView->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+    m_listView->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
     m_listView->setSelectionMode(TQListView::Single);
     m_listView->setMinimumWidth(450);
 
@@ -520,7 +520,7 @@ void BatchDialog::processed(const TQString& file, const TQString& tmpFile)
         if (::stat(TQFile::encodeName(destFile), &statBuf) == 0) 
         {
             KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as")
-                                     .tqarg(m_currentConvertItem->src),
+                                     .arg(m_currentConvertItem->src),
                                tmpFile, destFile,
                                KIO::RenameDlg_Mode(KIO::M_SINGLE | KIO::M_OVERWRITE | KIO::M_SKIP));
 
@@ -548,7 +548,7 @@ void BatchDialog::processed(const TQString& file, const TQString& tmpFile)
     {
         if (::rename(TQFile::encodeName(tmpFile), TQFile::encodeName(destFile)) != 0)
         {
-            KMessageBox::error(this, i18n("Failed to save image %1").tqarg( destFile ));
+            KMessageBox::error(this, i18n("Failed to save image %1").arg( destFile ));
             m_currentConvertItem->viewItem->setPixmap(1, SmallIcon("cancel"));
         }
         else 
diff --git a/kipi-plugins/rawconverter/clistviewitem.h b/kipi-plugins/rawconverter/clistviewitem.h
index a964594..3473a1d 100644
--- a/kipi-plugins/rawconverter/clistviewitem.h
+++ b/kipi-plugins/rawconverter/clistviewitem.h
@@ -80,7 +80,7 @@ public:
     void setEnabled(bool d)    
     {
         m_enabled = d;
-        tqrepaint();
+        repaint();
     }
 
     bool isEnabled(void)    
@@ -90,18 +90,18 @@ public:
     
 protected:
 
-    void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+    void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
     {
         if (m_enabled)
         {
-            KListViewItem::paintCell(p, cg, column, width, tqalignment);
+            KListViewItem::paintCell(p, cg, column, width, alignment);
         }
         else
         {
             TQColorGroup _cg( cg );
             TQColor c = _cg.text();
             _cg.setColor( TQColorGroup::Text, TQt::gray );
-            KListViewItem::paintCell( p, _cg, column, width, tqalignment );
+            KListViewItem::paintCell( p, _cg, column, width, alignment );
             _cg.setColor( TQColorGroup::Text, c );
         }
     }
diff --git a/kipi-plugins/rawconverter/plugin_rawconverter.cpp b/kipi-plugins/rawconverter/plugin_rawconverter.cpp
index 483a063..ee70d5d 100644
--- a/kipi-plugins/rawconverter/plugin_rawconverter.cpp
+++ b/kipi-plugins/rawconverter/plugin_rawconverter.cpp
@@ -167,7 +167,7 @@ void Plugin_RawConverter::slotActivateSingle()
     if (!isRAWFile(images.images()[0].path()))
     {
         KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), 
-                           i18n("\"%1\" is not a Raw file.").tqarg(images.images()[0].fileName()));
+                           i18n("\"%1\" is not a Raw file.").arg(images.images()[0].fileName()));
         return;
     }
 
diff --git a/kipi-plugins/rawconverter/previewwidget.cpp b/kipi-plugins/rawconverter/previewwidget.cpp
index ed9ee83..1906fdb 100644
--- a/kipi-plugins/rawconverter/previewwidget.cpp
+++ b/kipi-plugins/rawconverter/previewwidget.cpp
@@ -71,7 +71,7 @@ PreviewWidget::PreviewWidget(TQWidget *parent)
     setLineWidth(1); 
 
     setMinimumSize(TQSize(400, 300));
-    tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+    setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 
     d->pix = new TQPixmap(400, 300);
     d->pix->fill(TQt::black);
diff --git a/kipi-plugins/rawconverter/rawdecodingiface.cpp b/kipi-plugins/rawconverter/rawdecodingiface.cpp
index 2da4272..d9d8e5f 100644
--- a/kipi-plugins/rawconverter/rawdecodingiface.cpp
+++ b/kipi-plugins/rawconverter/rawdecodingiface.cpp
@@ -184,7 +184,7 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath,
     // -- Write image data into destination file -------------------------------
 
     TQByteArray ICCColorProfile = getICCProfilFromFile(m_rawDecodingSettings.outputColorSpace);
-    TQString soft = TQString("Kipi-plugins v.%1").tqarg(kipiplugins_version);
+    TQString soft = TQString("Kipi-plugins v.%1").arg(kipiplugins_version);
     TQFileInfo fi(filePath);
     destPath = fi.dirPath(true) + TQString("/") + ".kipi-rawconverter-tmp-" 
                                 + TQString::number(::time(0));
@@ -304,7 +304,7 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath,
 
             TQString libpngver(PNG_HEADER_VERSION_STRING);
             libpngver.replace('\n', ' ');
-            soft.append(TQString(" (%1)").tqarg(libpngver));
+            soft.append(TQString(" (%1)").arg(libpngver));
             png_text text;
             text.key  = "Software";
             text.text = (char *)soft.ascii();
@@ -384,7 +384,7 @@ bool RawDecodingIface::loadedFromDcraw(const TQString& filePath,
 
             TQString libtiffver(TIFFLIB_VERSION_STR);
             libtiffver.replace('\n', ' ');
-            soft.append(TQString(" ( %1 )").tqarg(libtiffver));
+            soft.append(TQString(" ( %1 )").arg(libtiffver));
             TIFFSetField(tif, TIFFTAG_SOFTWARE,        (const char*)soft.ascii());
 
             // Write ICC profil.
diff --git a/kipi-plugins/rawconverter/savesettingswidget.cpp b/kipi-plugins/rawconverter/savesettingswidget.cpp
index f511b5a..5a24f44 100644
--- a/kipi-plugins/rawconverter/savesettingswidget.cpp
+++ b/kipi-plugins/rawconverter/savesettingswidget.cpp
@@ -26,7 +26,7 @@
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqstring.h>
 
diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp
index a9fff66..9b82393 100644
--- a/kipi-plugins/rawconverter/singledialog.cpp
+++ b/kipi-plugins/rawconverter/singledialog.cpp
@@ -39,7 +39,7 @@ extern "C"
 #include <tqtimer.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqfileinfo.h>
 #include <tqevent.h>
@@ -433,7 +433,7 @@ void SingleDialog::processed(const TQString&, const TQString& tmpFile)
         struct stat statBuf;
         if (::stat(TQFile::encodeName(destFile), &statBuf) == 0) 
         {
-            KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as").tqarg(fi.fileName()),
+            KIO::RenameDlg dlg(this, i18n("Save Raw Image converted from '%1' as").arg(fi.fileName()),
                                tmpFile, destFile,
                                KIO::RenameDlg_Mode(KIO::M_SINGLE | KIO::M_OVERWRITE | KIO::M_SKIP));
 
@@ -460,7 +460,7 @@ void SingleDialog::processed(const TQString&, const TQString& tmpFile)
     {
         if (::rename(TQFile::encodeName(tmpFile), TQFile::encodeName(destFile)) != 0)
         {
-            KMessageBox::error(this, i18n("Failed to save image %1").tqarg( destFile ));
+            KMessageBox::error(this, i18n("Failed to save image %1").arg( destFile ));
         }
     }
 }
diff --git a/kipi-plugins/sendimages/listimageserrordialog.cpp b/kipi-plugins/sendimages/listimageserrordialog.cpp
index 47db9af..6d13e08 100644
--- a/kipi-plugins/sendimages/listimageserrordialog.cpp
+++ b/kipi-plugins/sendimages/listimageserrordialog.cpp
@@ -23,7 +23,7 @@
 // TQt includes
 
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstringlist.h>
 #include <tqstring.h>
 #include <tqlabel.h>
diff --git a/kipi-plugins/sendimages/plugin_sendimages.cpp b/kipi-plugins/sendimages/plugin_sendimages.cpp
index 598317f..1407887 100644
--- a/kipi-plugins/sendimages/plugin_sendimages.cpp
+++ b/kipi-plugins/sendimages/plugin_sendimages.cpp
@@ -174,14 +174,14 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event)
             case(KIPISendimagesPlugin::ResizeImages):
             {
                 text = i18n("Resizing '%1' from Album '%2'...")
-                            .tqarg(d->fileName).tqarg(d->albumName);
+                            .arg(d->fileName).arg(d->albumName);
                 break;
             }
 
             case(KIPISendimagesPlugin::Progress):
             {
                 text = i18n("Using '%1' from Album '%2' without resizing...")
-                            .tqarg(d->fileName).tqarg(d->albumName);
+                            .arg(d->fileName).arg(d->albumName);
                 break;
             }
 
@@ -204,7 +204,7 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event)
                 case(KIPISendimagesPlugin::ResizeImages):
                 {
                     text = i18n("Failed to resize '%1' from Album '%2'")
-                                .tqarg(d->fileName).tqarg(d->albumName);
+                                .arg(d->fileName).arg(d->albumName);
                     break;
                 }
 
@@ -223,7 +223,7 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event)
                 case(KIPISendimagesPlugin::ResizeImages):
                 {
                     text = i18n("Resizing '%1' from Album '%2' completed.")
-                                .tqarg(d->fileName).tqarg(d->albumName);
+                                .arg(d->fileName).arg(d->albumName);
                     break;
                 }
 
diff --git a/kipi-plugins/sendimages/sendimages.cpp b/kipi-plugins/sendimages/sendimages.cpp
index 0b2a4bc..ce22104 100644
--- a/kipi-plugins/sendimages/sendimages.cpp
+++ b/kipi-plugins/sendimages/sendimages.cpp
@@ -337,7 +337,7 @@ void SendImages::makeCommentsFile(void)
                 anyCommentsPresent = true;
 
             ImageCommentsText += i18n("Caption for image \"%1\": %2\n")
-                                      .tqarg(targetFile).tqarg(commentItem);
+                                      .arg(targetFile).arg(commentItem);
             
             //Tags from the database
             if (m_interface->hasFeature(KIPI::HostSupportsTags))
@@ -345,7 +345,7 @@ void SendImages::makeCommentsFile(void)
                 TQMap <TQString, TQVariant> attribs=info.attributes();
                 if (attribs["tags"].asStringList().count() > 0)
                 {
-                    ImageCommentsText += i18n("Tags: %2\n").tqarg(attribs["tags"].asStringList().join(","));
+                    ImageCommentsText += i18n("Tags: %2\n").arg(attribs["tags"].asStringList().join(","));
                     anyCommentsPresent = true;
                 }
             }
@@ -487,7 +487,7 @@ bool SendImages::invokeMailAgent(void)
             KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), 
                                i18n("Cannot start '%1' program;\nplease "
                                     "check your installation.")
-                                    .tqarg(m_sendImagesDialog->m_mailAgentName->currentText()));
+                                    .arg(m_sendImagesDialog->m_mailAgentName->currentText()));
         else
             agentInvoked = true;
         }
@@ -516,7 +516,7 @@ bool SendImages::invokeMailAgent(void)
                 KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), 
                                    i18n("Cannot start '%1' program;\nplease "
                                         "check your installation.")
-                                        .tqarg(m_sendImagesDialog->m_mailAgentName->currentText()));
+                                        .arg(m_sendImagesDialog->m_mailAgentName->currentText()));
             else
                 agentInvoked = true;
         }
@@ -538,7 +538,7 @@ bool SendImages::invokeMailAgent(void)
                 KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), 
                                    i18n("Cannot start '%1' program;\nplease "
                                         "check your installation.")
-                                        .tqarg(m_sendImagesDialog->m_mailAgentName->currentText()));
+                                        .arg(m_sendImagesDialog->m_mailAgentName->currentText()));
             else
                 agentInvoked = true;
         }
@@ -564,7 +564,7 @@ bool SendImages::invokeMailAgent(void)
                 KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), 
                                    i18n("Cannot start '%1' program;\nplease "
                                         "check your installation.")
-                                        .tqarg(m_sendImagesDialog->m_mailAgentName->currentText()));
+                                        .arg(m_sendImagesDialog->m_mailAgentName->currentText()));
             else
                 agentInvoked = true;
         }
@@ -627,7 +627,7 @@ bool SendImages::invokeMailAgent(void)
                 KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), 
                                    i18n("Cannot start '%1' program;\nplease "
                                         "check your installation.")
-                                        .tqarg(m_sendImagesDialog->m_mailAgentName->currentText()));
+                                        .arg(m_sendImagesDialog->m_mailAgentName->currentText()));
             else
             {   agentInvoked = true;
                 m_invokedBefore=true;
@@ -642,7 +642,7 @@ bool SendImages::invokeMailAgent(void)
 void SendImages::removeTmpFiles(void)
 {
     if (DeleteDir(m_tmp) == false)
-       KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot remove temporary folder %1.").tqarg(m_tmp));
+       KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Cannot remove temporary folder %1.").arg(m_tmp));
 }
 
 ///Checks if directory is empty and invokes its deletion
@@ -884,7 +884,7 @@ void SendImages::slotMozillaExited(KProcess*)
             KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), 
                                i18n("Cannot start '%1' program;\nplease "
                                     "check your installation.")
-                                    .tqarg(m_sendImagesDialog->m_mailAgentName->currentText()));
+                                    .arg(m_sendImagesDialog->m_mailAgentName->currentText()));
         }
         else
         {
diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp
index cd99279..eba56ad 100644
--- a/kipi-plugins/sendimages/sendimagesdialog.cpp
+++ b/kipi-plugins/sendimages/sendimagesdialog.cpp
@@ -25,11 +25,11 @@
 // TQt includes.
 
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdir.h>
 #include <tqwidget.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 #include <tqwhatsthis.h>
@@ -271,13 +271,13 @@ void SendImagesDialog::setupImagesList(void)
     TQWhatsThis::add( m_addImagesButton, i18n("<p>Add images to the list.") );
     TQPushButton* m_remImagesButton  = imagesListButtonBox->addButton ( i18n( "&Remove" ));
     TQWhatsThis::add( m_remImagesButton, i18n("<p>Remove selected images from the list.") );
-    imagesListButtonBox->tqlayout();
+    imagesListButtonBox->layout();
     grid->addMultiCellWidget(imagesListButtonBox, 0, 1, 2, 2);
 
     m_imageLabel = new TQLabel( m_groupBoxImageList );
     m_imageLabel->setFixedHeight( 120 );
-    m_imageLabel->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
-    m_imageLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+    m_imageLabel->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+    m_imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
     TQWhatsThis::add( m_imageLabel, i18n( "<p>Preview of the currently selected image on the list." ) );
     grid->addMultiCellWidget(m_imageLabel, 2, 2, 2, 2);
 
@@ -287,19 +287,19 @@ void SendImagesDialog::setupImagesList(void)
 
     TQGroupBox * groupBox2 = new TQGroupBox( i18n("Image Description"), page_setupImagesList );
     groupBox2->setColumnLayout(0, Qt::Vertical );
-    groupBox2->tqlayout()->setSpacing( 6 );
-    groupBox2->tqlayout()->setMargin( 11 );
+    groupBox2->layout()->setSpacing( 6 );
+    groupBox2->layout()->setMargin( 11 );
     TQWhatsThis::add( groupBox2, i18n("<p>The description of the currently selected image on the list.") );
 
-    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
-    groupBox2Layout->tqsetAlignment( TQt::AlignTop );
+    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() );
+    groupBox2Layout->setAlignment( TQt::AlignTop );
 
     m_ImageComments = new KSqueezedTextLabel( groupBox2 );
-    m_ImageComments->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    m_ImageComments->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
     groupBox2Layout->addWidget( m_ImageComments );
 
     m_ImageAlbum = new KSqueezedTextLabel( groupBox2 );
-    m_ImageAlbum->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    m_ImageAlbum->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
     groupBox2Layout->addWidget( m_ImageAlbum );
 
     vlay->addWidget( groupBox2 );
@@ -434,12 +434,12 @@ void SendImagesDialog::setupEmailOptions(void)
 
     TQGroupBox * groupBox2 = new TQGroupBox( i18n("Image Properties"), page_setupEmailOptions );
     groupBox2->setColumnLayout(0, Qt::Vertical );
-    groupBox2->tqlayout()->setSpacing( 6 );
-    groupBox2->tqlayout()->setMargin( 11 );
+    groupBox2->layout()->setSpacing( 6 );
+    groupBox2->layout()->setMargin( 11 );
     TQWhatsThis::add( groupBox2, i18n("<p>The properties of images to send.") );
 
-    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
-    groupBox2Layout->tqsetAlignment( TQt::AlignTop );
+    TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() );
+    groupBox2Layout->setAlignment( TQt::AlignTop );
 
     m_changeImagesProp = new TQCheckBox(i18n("Adjust image properties"), groupBox2);
     TQWhatsThis::add( m_changeImagesProp, i18n("<p>If you enable this option, "
@@ -469,12 +469,12 @@ void SendImagesDialog::setupEmailOptions(void)
                      "and if the target mailbox size is not limited.<p>"
                      "<b>%5</b>: use this if you have no size or speed restrictions.<p>"
                      "<b>%6</b>: use this only for printing purpose.<p>")
-                     .tqarg(i18n("very small (320 pixels)"))
-                     .tqarg(i18n("small (640 pixels)"))
-                     .tqarg(i18n("medium (800 pixels)"))
-                     .tqarg(i18n("big (1024 pixels)"))
-                     .tqarg(i18n("very big (1280 pixels)"))
-		     .tqarg(i18n("huge - for printing (1600 pixels)"));
+                     .arg(i18n("very small (320 pixels)"))
+                     .arg(i18n("small (640 pixels)"))
+                     .arg(i18n("medium (800 pixels)"))
+                     .arg(i18n("big (1024 pixels)"))
+                     .arg(i18n("very big (1280 pixels)"))
+		     .arg(i18n("huge - for printing (1600 pixels)"));
     TQWhatsThis::add( m_imagesResize, whatsThis );
 
     m_labelImageSize = new TQLabel( i18n("Sent image size:"), groupBox2);
@@ -620,8 +620,8 @@ void SendImagesDialog::slotImageSelected( TQListBoxItem * item )
 
     if ( !pitem ) return;
 
-    m_ImageComments->setText( i18n("Caption: %1").tqarg(pitem->comments()) );
-    m_ImageAlbum->setText( i18n("Album: %1").tqarg(pitem->album()) );
+    m_ImageComments->setText( i18n("Caption: %1").arg(pitem->comments()) );
+    m_ImageAlbum->setText( i18n("Album: %1").arg(pitem->album()) );
     m_imageLabel->clear();
 
     if ( m_thumbJob ) 
diff --git a/kipi-plugins/simpleviewerexport/firstrundlg.cpp b/kipi-plugins/simpleviewerexport/firstrundlg.cpp
index dbf09f7..f81af64 100644
--- a/kipi-plugins/simpleviewerexport/firstrundlg.cpp
+++ b/kipi-plugins/simpleviewerexport/firstrundlg.cpp
@@ -24,7 +24,7 @@
 // QT include files
 
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
index 9c9fe3d..87f5f2a 100644
--- a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
+++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
@@ -149,7 +149,7 @@ bool SimpleViewerExport::configure()
             int ret = KMessageBox::warningYesNoCancel(TQT_TQWIDGET(kapp->activeWindow()),
                                                       i18n("Target folder %1 already exists.\n"
                                                            "Do you want to overwrite it (all data in this folder will be lost)")
-                                                           .tqarg(m_configDlg->exportURL()));
+                                                           .arg(m_configDlg->exportURL()));
 
             switch(ret)
             {
@@ -157,7 +157,7 @@ bool SimpleViewerExport::configure()
                     if(!KIO::NetAccess::del(m_configDlg->exportURL(), TQT_TQWIDGET(kapp->activeWindow())))
                     {
                         KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), i18n("Could not delete %1\n"
-                                "Please choose another export folder").tqarg(m_configDlg->exportURL()));
+                                "Please choose another export folder").arg(m_configDlg->exportURL()));
                         configured = false;
                     }
                     break;
@@ -267,7 +267,7 @@ void SimpleViewerExport::slotProcess()
         int ret = KMessageBox::warningYesNo(TQT_TQWIDGET(kapp->activeWindow()),
                                             i18n("Export was canceled.\n"
                                             "Do you want to delete the yet created files in %1 ?")
-                                            .tqarg(m_configDlg->exportURL()));
+                                            .arg(m_configDlg->exportURL()));
         if(ret == KMessageBox::Yes)
         {
             KIO::NetAccess::del(m_configDlg->exportURL(), TQT_TQWIDGET(kapp->activeWindow()));
@@ -288,7 +288,7 @@ bool SimpleViewerExport::createExportDirectories()
     KURL root = m_configDlg->exportURL();
     if(!KIO::NetAccess::mkdir(root, TQT_TQWIDGET(kapp->activeWindow())))
     {
-        m_progressDlg->addedAction(i18n("Could not create folder '%1'").tqarg(root.url()),
+        m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(root.url()),
                                    KIPI::ErrorMessage);
         return(false);
     }
@@ -297,7 +297,7 @@ bool SimpleViewerExport::createExportDirectories()
     thumbsDir.addPath("/thumbs");
     if(!KIO::NetAccess::mkdir(thumbsDir, TQT_TQWIDGET(kapp->activeWindow())))
     {
-        m_progressDlg->addedAction(i18n("Could not create folder '%1'").tqarg(thumbsDir.url()),
+        m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(thumbsDir.url()),
                                    KIPI::ErrorMessage);
         return(false);
     }
@@ -306,7 +306,7 @@ bool SimpleViewerExport::createExportDirectories()
     imagesDir.addPath("/images");
     if(!KIO::NetAccess::mkdir(imagesDir, TQT_TQWIDGET(kapp->activeWindow())))
     {
-        m_progressDlg->addedAction(i18n("Could not create folder '%1'").tqarg(imagesDir.url()),
+        m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(imagesDir.url()),
                                    KIPI::ErrorMessage);
         return(false);
     }
@@ -336,24 +336,24 @@ bool SimpleViewerExport::exportImages()
     file.open(IO_WriteOnly);
 
     TQDomDocument xmlDoc;
-    xmlDoc.appendChild(xmlDoc.createProcessingInstruction( TQString::tqfromLatin1("xml"),
-                       TQString::tqfromLatin1("version=\"1.0\" encoding=\"UTF-8\"") ) );
-    TQDomElement galleryElem = xmlDoc.createElement(TQString::tqfromLatin1("simpleviewerGallery")); 
+    xmlDoc.appendChild(xmlDoc.createProcessingInstruction( TQString::fromLatin1("xml"),
+                       TQString::fromLatin1("version=\"1.0\" encoding=\"UTF-8\"") ) );
+    TQDomElement galleryElem = xmlDoc.createElement(TQString::fromLatin1("simpleviewerGallery")); 
     xmlDoc.appendChild( galleryElem );
-    galleryElem.setAttribute(TQString::tqfromLatin1("maxImageWidth"),    m_configDlg->maxImageDimension());
-    galleryElem.setAttribute(TQString::tqfromLatin1("maxImageHeight"),   m_configDlg->maxImageDimension());
-    galleryElem.setAttribute(TQString::tqfromLatin1("textColor"),        TQString(m_configDlg->textColor().name()).replace("#", "0x"));
-    galleryElem.setAttribute(TQString::tqfromLatin1("frameColor"),       TQString(m_configDlg->frameColor().name()).replace("#", "0x"));
-    galleryElem.setAttribute(TQString::tqfromLatin1("bgColor"),          TQString(m_configDlg->backgroundColor().name()).replace("#", "0x"));
-    galleryElem.setAttribute(TQString::tqfromLatin1("frameWidth"),       m_configDlg->frameWidth());
-    galleryElem.setAttribute(TQString::tqfromLatin1("stagePadding"),     m_configDlg->stagePadding());
-    galleryElem.setAttribute(TQString::tqfromLatin1("thumbnailColumns"), m_configDlg->thumbnailColumns());
-    galleryElem.setAttribute(TQString::tqfromLatin1("thumbnailRows"),    m_configDlg->thumbnailRows());
-    galleryElem.setAttribute(TQString::tqfromLatin1("navPosition"),      m_configDlg->navPosition());
-    galleryElem.setAttribute(TQString::tqfromLatin1("navDirection"),     m_configDlg->navDirection());
-    galleryElem.setAttribute(TQString::tqfromLatin1("title"),            m_configDlg->title());
-    galleryElem.setAttribute(TQString::tqfromLatin1("imagePath"),        TQString());
-    galleryElem.setAttribute(TQString::tqfromLatin1("thumbPath"),        TQString());
+    galleryElem.setAttribute(TQString::fromLatin1("maxImageWidth"),    m_configDlg->maxImageDimension());
+    galleryElem.setAttribute(TQString::fromLatin1("maxImageHeight"),   m_configDlg->maxImageDimension());
+    galleryElem.setAttribute(TQString::fromLatin1("textColor"),        TQString(m_configDlg->textColor().name()).replace("#", "0x"));
+    galleryElem.setAttribute(TQString::fromLatin1("frameColor"),       TQString(m_configDlg->frameColor().name()).replace("#", "0x"));
+    galleryElem.setAttribute(TQString::fromLatin1("bgColor"),          TQString(m_configDlg->backgroundColor().name()).replace("#", "0x"));
+    galleryElem.setAttribute(TQString::fromLatin1("frameWidth"),       m_configDlg->frameWidth());
+    galleryElem.setAttribute(TQString::fromLatin1("stagePadding"),     m_configDlg->stagePadding());
+    galleryElem.setAttribute(TQString::fromLatin1("thumbnailColumns"), m_configDlg->thumbnailColumns());
+    galleryElem.setAttribute(TQString::fromLatin1("thumbnailRows"),    m_configDlg->thumbnailRows());
+    galleryElem.setAttribute(TQString::fromLatin1("navPosition"),      m_configDlg->navPosition());
+    galleryElem.setAttribute(TQString::fromLatin1("navDirection"),     m_configDlg->navDirection());
+    galleryElem.setAttribute(TQString::fromLatin1("title"),            m_configDlg->title());
+    galleryElem.setAttribute(TQString::fromLatin1("imagePath"),        TQString());
+    galleryElem.setAttribute(TQString::fromLatin1("thumbPath"),        TQString());
 
     KExiv2Iface::KExiv2 meta;
     TQImage              image;
@@ -377,7 +377,7 @@ bool SimpleViewerExport::exportImages()
             KURL url = *it;
             TQFileInfo fileInfo(url.path());
 
-            m_progressDlg->addedAction(i18n("Processing %1").tqarg(url.filename()), KIPI::StartingMessage);
+            m_progressDlg->addedAction(i18n("Processing %1").arg(url.filename()), KIPI::StartingMessage);
 
             // Check if RAW file.
 #if KDCRAW_VERSION < 0x000106
@@ -392,27 +392,27 @@ bool SimpleViewerExport::exportImages()
 
             if(image.isNull())
             {
-                m_progressDlg->addedAction(i18n("Could not open image '%1'").tqarg(url.filename()),
+                m_progressDlg->addedAction(i18n("Could not open image '%1'").arg(url.filename()),
                                            KIPI::WarningMessage);
                 continue;
             }
 
             if(!createThumbnail(image, thumbnail))
             {
-                m_progressDlg->addedAction(i18n("Could not create thumbnail from '%1'").tqarg(url.filename()),
+                m_progressDlg->addedAction(i18n("Could not create thumbnail from '%1'").arg(url.filename()),
                                            KIPI::WarningMessage);
                 continue;
             }
 
             if(resizeImages && !resizeImage(image, maxSize, image))
             {
-                m_progressDlg->addedAction(i18n("Could not resize image '%1'").tqarg(url.filename()),
+                m_progressDlg->addedAction(i18n("Could not resize image '%1'").arg(url.filename()),
                                            KIPI::WarningMessage);
                 continue;
             }
 
             meta.load(url.path());
-            newName = TQString("%1.%2").tqarg(tmp.sprintf("%03i", index)).tqarg(TQString("jpg"));
+            newName = TQString("%1.%2").arg(tmp.sprintf("%03i", index)).arg(TQString("jpg"));
 
             KURL thumbnailPath(thumbsDir);
             thumbnailPath.addPath(newName);
@@ -510,15 +510,15 @@ void SimpleViewerExport::cfgAddImage(TQDomDocument &xmlDoc, TQDomElement &galler
         comment = TQString();
     }
 
-    TQDomElement img = xmlDoc.createElement(TQString::tqfromLatin1("image")); 
+    TQDomElement img = xmlDoc.createElement(TQString::fromLatin1("image")); 
     galleryElem.appendChild(img);
 
-    TQDomElement name = xmlDoc.createElement(TQString::tqfromLatin1("name")); 
+    TQDomElement name = xmlDoc.createElement(TQString::fromLatin1("name")); 
     img.appendChild(name);
     TQDomText nametxt = xmlDoc.createTextNode(newName);
     name.appendChild(nametxt);
 
-    TQDomElement caption = xmlDoc.createElement(TQString::tqfromLatin1("caption")); 
+    TQDomElement caption = xmlDoc.createElement(TQString::fromLatin1("caption")); 
     img.appendChild(caption);
     TQDomText captiontxt = xmlDoc.createTextNode(comment);
     caption.appendChild(captiontxt);
diff --git a/kipi-plugins/simpleviewerexport/svedialog.cpp b/kipi-plugins/simpleviewerexport/svedialog.cpp
index 7c68d3c..f6549a6 100644
--- a/kipi-plugins/simpleviewerexport/svedialog.cpp
+++ b/kipi-plugins/simpleviewerexport/svedialog.cpp
@@ -25,9 +25,9 @@
 
 #include <tqframe.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
 #include <tqhgroupbox.h>
@@ -171,9 +171,9 @@ void SVEDialog::selectionPage()
     m_selectionPage = addPage(i18n("Selection"), i18n("Album Selection"),
                               BarIcon("folder_image", KIcon::SizeMedium));
 
-    TQVBoxLayout *tqlayout       = new TQVBoxLayout( m_selectionPage, 0, spacingHint() );
+    TQVBoxLayout *layout       = new TQVBoxLayout( m_selectionPage, 0, spacingHint() );
     m_imageCollectionSelector = new KIPI::ImageCollectionSelector( m_selectionPage, m_interface );
-    tqlayout->addWidget(m_imageCollectionSelector);
+    layout->addWidget(m_imageCollectionSelector);
 }
 
 void SVEDialog::lookPage()
diff --git a/kipi-plugins/slideshow/slideshow.cpp b/kipi-plugins/slideshow/slideshow.cpp
index 1cadf22..911ac6e 100644
--- a/kipi-plugins/slideshow/slideshow.cpp
+++ b/kipi-plugins/slideshow/slideshow.cpp
@@ -40,7 +40,7 @@
 #include <tqcursor.h>
 #include <tqfont.h>
 #include <tqwmatrix.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 // KDE includes.
 
diff --git a/kipi-plugins/slideshow/slideshowconfig.cpp b/kipi-plugins/slideshow/slideshowconfig.cpp
index d372f95..978b0d5 100644
--- a/kipi-plugins/slideshow/slideshowconfig.cpp
+++ b/kipi-plugins/slideshow/slideshowconfig.cpp
@@ -29,7 +29,7 @@
 #include <tqlabel.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmap.h>
 #include <tqframe.h>
 #include <tqpushbutton.h>
@@ -615,7 +615,7 @@ void SlideShowConfig::slotImagesFilesSelected( TQListBoxItem *item )
             TQT_SLOT(slotFailedPreview(const KFileItem*)));
 
     int index = m_ImagesFilesListBox->index ( item );
-    m_label7->setText(i18n("Image no. %1").tqarg(index + 1));
+    m_label7->setText(i18n("Image no. %1").arg(index + 1));
 }
 
 void SlideShowConfig::slotAddDropItems(KURL::List filesUrl)
@@ -735,9 +735,9 @@ void SlideShowConfig::ShowNumberImages( int Number )
     TotalDuration = TotalDuration.addMSecs((Number-1)*TransitionDuration);
 
     if ( Number < 2)
-        m_label6->setText(i18n("%1 image [%2]").tqarg(Number).tqarg(TotalDuration.toString()));
+        m_label6->setText(i18n("%1 image [%2]").arg(Number).arg(TotalDuration.toString()));
     else
-        m_label6->setText(i18n("%1 images [%2]").tqarg(Number).tqarg(TotalDuration.toString()));
+        m_label6->setText(i18n("%1 images [%2]").arg(Number).arg(TotalDuration.toString()));
 }
 
 void SlideShowConfig::slotGotPreview(const KFileItem*, const TQPixmap &pixmap)
@@ -766,7 +766,7 @@ void SlideShowConfig::slotStartClicked()
         if (!TQFile::exists(pitem->path()))
         {
             KMessageBox::error(this,
-                               i18n("Cannot access to file %1, please check the path is right.").tqarg(pitem->path()));
+                               i18n("Cannot access to file %1, please check the path is right.").arg(pitem->path()));
             return;
         }
         m_urlList->append(pitem->path());                              // Input images files.
diff --git a/kipi-plugins/slideshow/slideshowconfigbase.ui b/kipi-plugins/slideshow/slideshowconfigbase.ui
index 7231a60..51f63b1 100644
--- a/kipi-plugins/slideshow/slideshowconfigbase.ui
+++ b/kipi-plugins/slideshow/slideshowconfigbase.ui
@@ -23,13 +23,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -163,7 +163,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout15</cstring>
+                                    <cstring>layout15</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -210,7 +210,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout14</cstring>
+                                    <cstring>layout14</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -226,7 +226,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>31</width>
                                                 <height>5</height>
@@ -245,7 +245,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>0</width>
                                                 <height>0</height>
@@ -273,7 +273,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>0</width>
                                                 <height>0</height>
@@ -301,7 +301,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>0</width>
                                                 <height>0</height>
@@ -329,7 +329,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>0</width>
                                                 <height>0</height>
@@ -355,7 +355,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>31</width>
                                                 <height>5</height>
@@ -366,7 +366,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout14</cstring>
+                                    <cstring>layout14</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -384,7 +384,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>128</width>
                                                 <height>128</height>
@@ -396,7 +396,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                         <property name="scaledContents">
                                             <bool>false</bool>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignCenter</set>
                                         </property>
                                         <property name="whatsThis" stdset="0">
@@ -428,7 +428,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout50</cstring>
+                            <cstring>layout50</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -436,7 +436,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout47</cstring>
+                                    <cstring>layout47</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -473,7 +473,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                         <verstretch>0</verstretch>
                                                     </sizepolicy>
                                                 </property>
-                                                <property name="tqminimumSize">
+                                                <property name="minimumSize">
                                                     <size>
                                                         <width>238</width>
                                                         <height>33</height>
@@ -499,7 +499,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>21</width>
                                                         <height>2</height>
@@ -535,7 +535,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                             </property>
                                             <widget class="TQLayoutWidget">
                                                 <property name="name">
-                                                    <cstring>tqlayout14</cstring>
+                                                    <cstring>layout14</cstring>
                                                 </property>
                                                 <hbox>
                                                     <property name="name">
@@ -619,7 +619,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>21</width>
                                                         <height>16</height>
@@ -664,7 +664,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32767</width>
                                                 <height>32767</height>
@@ -689,7 +689,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>32767</width>
                                                 <height>32767</height>
@@ -704,7 +704,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout48</cstring>
+                                            <cstring>layout48</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -722,7 +722,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                         <verstretch>0</verstretch>
                                                     </sizepolicy>
                                                 </property>
-                                                <property name="tqmaximumSize">
+                                                <property name="maximumSize">
                                                     <size>
                                                         <width>32767</width>
                                                         <height>30</height>
@@ -744,7 +744,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                         <verstretch>0</verstretch>
                                                     </sizepolicy>
                                                 </property>
-                                                <property name="tqmaximumSize">
+                                                <property name="maximumSize">
                                                     <size>
                                                         <width>32767</width>
                                                         <height>32767</height>
@@ -767,7 +767,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout49</cstring>
+                                            <cstring>layout49</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -785,7 +785,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                         <verstretch>0</verstretch>
                                                     </sizepolicy>
                                                 </property>
-                                                <property name="tqmaximumSize">
+                                                <property name="maximumSize">
                                                     <size>
                                                         <width>32767</width>
                                                         <height>30</height>
@@ -807,13 +807,13 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                         <verstretch>0</verstretch>
                                                     </sizepolicy>
                                                 </property>
-                                                <property name="tqminimumSize">
+                                                <property name="minimumSize">
                                                     <size>
                                                         <width>0</width>
                                                         <height>0</height>
                                                     </size>
                                                 </property>
-                                                <property name="tqmaximumSize">
+                                                <property name="maximumSize">
                                                     <size>
                                                         <width>32767</width>
                                                         <height>32767</height>
@@ -841,7 +841,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>31</width>
                                                 <height>2</height>
@@ -862,7 +862,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>5</height>
@@ -897,7 +897,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout57</cstring>
+                            <cstring>layout57</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -916,7 +916,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                     </property>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout52</cstring>
+                                            <cstring>layout52</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -940,7 +940,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                 <property name="sizeType">
                                                     <enum>Minimum</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>15</width>
                                                         <height>21</height>
@@ -966,7 +966,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout51</cstring>
+                                            <cstring>layout51</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -990,7 +990,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                                 <property name="sizeType">
                                                     <enum>Minimum</enum>
                                                 </property>
-                                                <property name="tqsizeHint">
+                                                <property name="sizeHint">
                                                     <size>
                                                         <width>15</width>
                                                         <height>21</height>
@@ -1025,7 +1025,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>81</width>
                                         <height>31</height>
@@ -1034,7 +1034,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                             </spacer>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout55</cstring>
+                                    <cstring>layout55</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1058,7 +1058,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                         <property name="sizeType">
                                             <enum>Minimum</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>15</width>
                                                 <height>21</height>
@@ -1096,7 +1096,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>5</height>
@@ -1238,7 +1238,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout15</cstring>
+                                    <cstring>layout15</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1262,7 +1262,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>31</width>
                                                 <height>21</height>
@@ -1314,7 +1314,7 @@ Ken Burns effect doesn't use this cache mechanism.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>41</width>
                                 <height>90</height>
@@ -1326,7 +1326,7 @@ Ken Burns effect doesn't use this cache mechanism.</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
@@ -1350,7 +1350,7 @@ Ken Burns effect doesn't use this cache mechanism.</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>50</width>
                             <height>20</height>
diff --git a/kipi-plugins/slideshow/toolbar.cpp b/kipi-plugins/slideshow/toolbar.cpp
index b8136aa..3b7a5b5 100644
--- a/kipi-plugins/slideshow/toolbar.cpp
+++ b/kipi-plugins/slideshow/toolbar.cpp
@@ -24,7 +24,7 @@
 // TQt includes.
 
 #include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 
 // KDE includes.
@@ -63,7 +63,7 @@ ToolBar::ToolBar(TQWidget* parent)
     lay->addWidget(m_stopBtn);
 
     adjustSize();
-    tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 
     m_canHide = true;
     
diff --git a/kipi-plugins/sync/TODO b/kipi-plugins/sync/TODO
index 7a3d8b6..fcff8e0 100644
--- a/kipi-plugins/sync/TODO
+++ b/kipi-plugins/sync/TODO
@@ -10,4 +10,4 @@ Somewhat immediate implementation needed:
 For the lazy times:
 
 * Polish the html code used to render the thumbnails, better
-  fonts sizes and tqlayout
+  fonts sizes and layout
diff --git a/kipi-plugins/sync/galleryalbumdialog.ui b/kipi-plugins/sync/galleryalbumdialog.ui
index 26ee8d9..a04a137 100644
--- a/kipi-plugins/sync/galleryalbumdialog.ui
+++ b/kipi-plugins/sync/galleryalbumdialog.ui
@@ -52,7 +52,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -137,7 +137,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kipi-plugins/sync/galleryconfig.cpp b/kipi-plugins/sync/galleryconfig.cpp
index 9fc79f4..d08fe3a 100644
--- a/kipi-plugins/sync/galleryconfig.cpp
+++ b/kipi-plugins/sync/galleryconfig.cpp
@@ -28,7 +28,7 @@
 #include <tqprogressdialog.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // Include files for KDE
 
@@ -74,7 +74,7 @@ GalleryEdit::GalleryEdit(TQWidget* pParent,
   tll->addItem(vbox);
 
   mpHeaderLabel = new TQLabel(page);
-  mpHeaderLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
+  mpHeaderLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
                                             TQSizePolicy::Fixed));
   mpHeaderLabel->setText(title);
   vbox->addWidget(mpHeaderLabel);
@@ -124,7 +124,7 @@ GalleryEdit::GalleryEdit(TQWidget* pParent,
 
   vbox->addLayout( centerLayout );
 
-  resize( TQSize(300, 150).expandedTo(tqminimumSizeHint()) );
+  resize( TQSize(300, 150).expandedTo(minimumSizeHint()) );
   clearWState( WState_Polished );
 
   mpNameEdit->setText(pGallery->name());
diff --git a/kipi-plugins/sync/gallerywidget.cpp b/kipi-plugins/sync/gallerywidget.cpp
index d9472da..e88aef5 100644
--- a/kipi-plugins/sync/gallerywidget.cpp
+++ b/kipi-plugins/sync/gallerywidget.cpp
@@ -32,7 +32,7 @@
 #include <tqgroupbox.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqsplitter.h>
 #include <tqwhatsthis.h>
@@ -87,11 +87,11 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl )
     rightButtonGroupLayout->setMargin( 5 );
 
     m_newAlbumBtn = new TQPushButton( rightButtonGroup, "m_newAlbumBtn" );
-    m_newAlbumBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_newAlbumBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     rightButtonGroupLayout->addWidget( m_newAlbumBtn, 0, TQt::AlignHCenter );
 
     m_addPhotoBtn = new TQPushButton( rightButtonGroup, "m_addPhotoBtn" );
-    m_addPhotoBtn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_addPhotoBtn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     rightButtonGroupLayout->addWidget( m_addPhotoBtn, 0, TQt::AlignHCenter );
 
     // ------------------------------------------------------------------------
@@ -99,9 +99,9 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl )
     TQGroupBox* optionsBox = new TQGroupBox(i18n("Override Default Options"),
                                           rightButtonGroup);
     optionsBox->setColumnLayout(0, Qt::Vertical);
-    optionsBox->tqlayout()->setSpacing(5);
-    optionsBox->tqlayout()->setMargin(5);
-    TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->tqlayout());
+    optionsBox->layout()->setSpacing(5);
+    optionsBox->layout()->setMargin(5);
+    TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->layout());
 
     // ------------------------------------------------------------------------
 
@@ -111,7 +111,7 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl )
 
     m_dimensionSpinBox  = new TQSpinBox(0, 5000, 10, optionsBox);
     m_dimensionSpinBox->setValue(600);
-    m_dimensionSpinBox->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_dimensionSpinBox->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     optionsBoxLayout->addWidget(m_dimensionSpinBox, 1, 1);
 
     TQLabel* resizeLabel = new TQLabel(i18n("Maximum dimension:"), optionsBox);
@@ -139,7 +139,7 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl )
 
     // ------------------------------------------------------------------------
 
-    resize( TQSize(600, 400).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(600, 400).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
 }
 
diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp
index 336e6d4..eaaee83 100644
--- a/kipi-plugins/sync/gallerywindow.cpp
+++ b/kipi-plugins/sync/gallerywindow.cpp
@@ -331,18 +331,18 @@ void GalleryWindow::slotPhotos( const TQValueList<GPhoto>& photoList)
     TQString styleSheet =
         TQString( "body { margin: 8px; font-size: %1px; "
                  " color: %2; background-color: %3;}" )
-        .tqarg( pxSize )
-        .tqarg( tqcolorGroup().text().name() )
-        .tqarg( tqcolorGroup().base().name() );
+        .arg( pxSize )
+        .arg( colorGroup().text().name() )
+        .arg( colorGroup().base().name() );
 
     styleSheet += TQString( "a { font-size: %1px; color: %2; "
                            "text-decoration: none;}" )
-                  .tqarg( pxSize )
-                  .tqarg( tqcolorGroup().text().name() );
+                  .arg( pxSize )
+                  .arg( colorGroup().text().name() );
     styleSheet += TQString( "i { font-size: %1px; color: %2; "
                            "text-decoration: none;}" )
-                  .tqarg( pxSize-2 )
-                  .tqarg( TQColor("steelblue").name() );
+                  .arg( pxSize-2 )
+                  .arg( TQColor("steelblue").name() );
 
     m_photoView->begin();
     m_photoView->setUserStyleSheet( styleSheet );
@@ -363,13 +363,13 @@ void GalleryWindow::slotPhotos( const TQValueList<GPhoto>& photoList)
 
         m_photoView->write( "<tr><td class='photo'>"
                             + TQString("<a href='%1'>")
-                            .tqarg(imageurl.url())
+                            .arg(imageurl.url())
                             + TQString("<img border=1 src=\"%1\"><br>")
-                            .tqarg(thumburl.url())
+                            .arg(thumburl.url())
                             + photo.name
                             + ( photo.caption.isEmpty() ? TQString() :
                                 TQString("<br><i>%1</i>")
-                                .tqarg(photo.caption) )
+                                .arg(photo.caption) )
                             + "</a></td></tr>" );
     }
 
@@ -514,7 +514,7 @@ void GalleryWindow::slotNewAlbum()
     if (!clean)
     {
         KMessageBox::error( this, i18n("Sorry, these characters are not allowed in album name: %1")
-                            .tqarg("\\ / * ? \" \' & < > | . + # ( ) or spaces") );
+                            .arg("\\ / * ? \" \' & < > | . + # ( ) or spaces") );
         return;
     }
 
@@ -584,7 +584,7 @@ void GalleryWindow::slotAddPhotoNext()
     }
 
     m_progressDlg->setLabelText( i18n("Uploading file %1 ")
-                                 .tqarg( KURL(pathComments.first).filename() ) );
+                                 .arg( KURL(pathComments.first).filename() ) );
 
     if (m_progressDlg->isHidden())
         m_progressDlg->show();
diff --git a/kipi-plugins/sync/sinks.cpp b/kipi-plugins/sync/sinks.cpp
index 55f370b..7acd734 100644
--- a/kipi-plugins/sync/sinks.cpp
+++ b/kipi-plugins/sync/sinks.cpp
@@ -96,8 +96,8 @@ Sinks::Sinks()
     if (sink_id > mMaxSinkId)
       mMaxSinkId = sink_id;
 
-    type = config.readEntry(TQString("Type%1").tqarg(sink_id));
-    name = config.readEntry(TQString("Name%1").tqarg(sink_id));
+    type = config.readEntry(TQString("Type%1").arg(sink_id));
+    name = config.readEntry(TQString("Name%1").arg(sink_id));
     Sink* p_sink = SinkFactory::Create(type, sink_id, name, &config, p_wallet);
     if (p_sink)
       mSinks.append(p_sink);
diff --git a/kipi-plugins/sync/sinks/gallery/galleryform.cpp b/kipi-plugins/sync/sinks/gallery/galleryform.cpp
index 9c90dfa..e669ec5 100644
--- a/kipi-plugins/sync/sinks/gallery/galleryform.cpp
+++ b/kipi-plugins/sync/sinks/gallery/galleryform.cpp
@@ -25,7 +25,7 @@
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 //#include <cstring>
 //#include <cstdio>
@@ -58,7 +58,7 @@ GalleryForm::~GalleryForm()
 void GalleryForm::addPair(const TQString& name, const TQString& value)
 {
   if (Gallery2 == mVersion)
-    return addPairRaw(TQString("g2_form[%1]").tqarg(name), value);
+    return addPairRaw(TQString("g2_form[%1]").arg(name), value);
 
   return addPairRaw(name, value);
 }
diff --git a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
index 3035e27..1453c32 100644
--- a/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
+++ b/kipi-plugins/sync/sinks/gallery/gallerysink.cpp
@@ -19,7 +19,7 @@
  * ============================================================ */
 
 #include <tqcstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqimage.h>
 #include <tqregexp.h>
@@ -51,11 +51,11 @@ GallerySink::GallerySink(unsigned int sinkId, TQString name, KConfig* pConfig, K
     mpJob(0),
     m_loggedIn(false)
 {
-  TQString tmp = pConfig->readEntry(TQString("URL%1").tqarg(sinkId));
+  TQString tmp = pConfig->readEntry(TQString("URL%1").arg(sinkId));
   mURL = KURL(tmp);
-  mUsername = pConfig->readEntry(TQString("Username%1").tqarg(sinkId));
+  mUsername = pConfig->readEntry(TQString("Username%1").arg(sinkId));
   if (pWallet)
-    pWallet->readPassword(TQString("Password%1").tqarg(sinkId), mPassword);
+    pWallet->readPassword(TQString("Password%1").arg(sinkId), mPassword);
 }
 
 GallerySink::~GallerySink()
@@ -72,12 +72,12 @@ const KIPI2::CollectionList* GallerySink::getCollections()
   
 void GallerySink::Save(KConfig* pConfig, KWallet::Wallet* pWallet)
 {
-  pConfig->writeEntry(TQString("Name%1").tqarg(mSinkId), mName);
-  pConfig->writeEntry(TQString("Type%1").tqarg(mSinkId), Type());
-  pConfig->writeEntry(TQString("URL%1").tqarg(mSinkId), TQString(mURL.url()));
-  pConfig->writeEntry(TQString("Username%1").tqarg(mSinkId), mUsername);
+  pConfig->writeEntry(TQString("Name%1").arg(mSinkId), mName);
+  pConfig->writeEntry(TQString("Type%1").arg(mSinkId), Type());
+  pConfig->writeEntry(TQString("URL%1").arg(mSinkId), TQString(mURL.url()));
+  pConfig->writeEntry(TQString("Username%1").arg(mSinkId), mUsername);
   if (pWallet)
-    pWallet->writePassword(TQString("Password%1").tqarg(mSinkId), mPassword);
+    pWallet->writePassword(TQString("Password%1").arg(mSinkId), mPassword);
 }
 
 
diff --git a/kipi-plugins/timeadjust/timeadjustdialog.cpp b/kipi-plugins/timeadjust/timeadjustdialog.cpp
index b693ee6..e628a6c 100644
--- a/kipi-plugins/timeadjust/timeadjustdialog.cpp
+++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp
@@ -32,7 +32,7 @@ extern "C"
 // TQt includes.
 
 #include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqvbuttongroup.h>
 #include <tqvgroupbox.h>
@@ -252,7 +252,7 @@ TimeAdjustDialog::TimeAdjustDialog(KIPI::Interface* interface, TQWidget* parent)
 
     d->infoLabel  = new TQLabel(d->exampleBox);
     d->exampleAdj = new TQLabel(d->exampleBox);
-    d->exampleAdj->tqsetAlignment(TQt::AlignCenter);
+    d->exampleAdj->setAlignment(TQt::AlignCenter);
 
     vlay->addStretch();
 
@@ -301,7 +301,7 @@ void TimeAdjustDialog::slotHelp()
 
 void TimeAdjustDialog::slotResetDateToCurrent()
 {
-    d->dateCreatedSel->setDateTime(TQDateTime::tqcurrentDateTime());
+    d->dateCreatedSel->setDateTime(TQDateTime::currentDateTime());
 }
 
 void TimeAdjustDialog::closeEvent(TQCloseEvent *e)
@@ -328,7 +328,7 @@ void TimeAdjustDialog::readSettings()
     if (adjType == 2) d->exif->setChecked(true);
     if (adjType == 3) d->custom->setChecked(true);
 
-    TQDateTime current = TQDateTime::tqcurrentDateTime();
+    TQDateTime current = TQDateTime::currentDateTime();
     d->dateCreatedSel->setDateTime(config.readDateTimeEntry("Custom Date", &current));
 
     d->syncEXIFDateCheck->setChecked(config.readBoolEntry("Sync EXIF Date", true));
@@ -403,7 +403,7 @@ void TimeAdjustDialog::slotUpdateExample()
     TQString newDate = date.toString(Qt::LocalDate);
     d->exampleAdj->setText(i18n("<b>%1</b><br>would, for example, "
                                "change into<br><b>%2</b>")
-                           .tqarg(oldDate).tqarg(newDate));
+                           .arg(oldDate).arg(newDate));
 }
 
 void TimeAdjustDialog::slotAdjustmentTypeChanged()
diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.cpp b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
index 576ac48..d99868d 100644
--- a/kipi-plugins/wallpaper/plugin_wallpaper.cpp
+++ b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
@@ -212,9 +212,9 @@ void Plugin_WallPaper::slotSetScaleAndCrop()
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void Plugin_WallPaper::setWallpaper(int tqlayout)
+void Plugin_WallPaper::setWallpaper(int layout)
 {
-   if (tqlayout>SCALE_AND_CROP || tqlayout < CENTER)
+   if (layout>SCALE_AND_CROP || layout < CENTER)
       return;
 
    KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() );
@@ -254,7 +254,7 @@ void Plugin_WallPaper::setWallpaper(int tqlayout)
       }
 
    TQString cmd = TQString("dcop kdesktop KBackgroundIface setWallpaper '%1' %2")
-                         .tqarg(path).tqarg(tqlayout);
+                         .arg(path).arg(layout);
 
    KRun::runCommand(cmd);
 }
diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.h b/kipi-plugins/wallpaper/plugin_wallpaper.h
index 03db2fc..6dc7909 100644
--- a/kipi-plugins/wallpaper/plugin_wallpaper.h
+++ b/kipi-plugins/wallpaper/plugin_wallpaper.h
@@ -76,7 +76,7 @@
         };
 
    KActionMenu    *m_action_Background;
-   void setWallpaper( int tqlayout );
+   void setWallpaper( int layout );
   };
 
   #endif // PLUGIN_IMAGES2DESKTOP_H