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

This reverts commit 650c190e4a29a2a17fd46b32ce78b956b9816215.

20 files changed, 68 insertions, 68 deletions

diff --git a/kipi-plugins/metadataedit/commenteditdialog.cpp b/kipi-plugins/metadataedit/commenteditdialog.cpp
index 07dc266..9d4fc87 100644
--- a/kipi-plugins/metadataedit/commenteditdialog.cpp
+++ b/kipi-plugins/metadataedit/commenteditdialog.cpp
@@ -24,7 +24,7 @@
 
 #include <tqlabel.h>
 #include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.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.")
-                                    .arg(KApplication::kApplication()->aboutData()->appName()),
+                                    .tqarg(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 6e887c2..86f6fdd 100644
--- a/kipi-plugins/metadataedit/commentremovedialog.cpp
+++ b/kipi-plugins/metadataedit/commentremovedialog.cpp
@@ -24,7 +24,7 @@
 
 #include <tqlabel.h>
 #include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.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")
-                                    .arg(KApplication::kApplication()->aboutData()->appName()), 
+                                    .tqarg(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 1d7d39a..553b630 100644
--- a/kipi-plugins/metadataedit/exifadjust.cpp
+++ b/kipi-plugins/metadataedit/exifadjust.cpp
@@ -26,7 +26,7 @@
 
 // QT includes.
 
-#include <layout.h>
+#include <tqlayout.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 92c2e98..0bcd96e 100644
--- a/kipi-plugins/metadataedit/exifcaption.cpp
+++ b/kipi-plugins/metadataedit/exifcaption.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <layout.h>
+#include <tqlayout.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")
-                                            .arg(KApplication::kApplication()->aboutData()->appName()), 
+                                            .tqarg(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 5e2a5df..dac52c5 100644
--- a/kipi-plugins/metadataedit/exifdatetime.cpp
+++ b/kipi-plugins/metadataedit/exifdatetime.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <layout.h>
+#include <tqlayout.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::currentDateTime());
+    d->dateCreatedSel->setDateTime(TQDateTime::tqcurrentDateTime());
     d->syncHOSTDateCheck      = new TQCheckBox(i18n("Sync creation date entered through %1")
-                                              .arg(KApplication::kApplication()->aboutData()->appName()), 
+                                              .tqarg(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::currentDateTime());
+    d->dateOriginalSel->setDateTime(TQDateTime::tqcurrentDateTime());
     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::currentDateTime());
+    d->dateDigitalizedSel->setDateTime(TQDateTime::tqcurrentDateTime());
     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::currentDateTime());
+    d->dateCreatedSel->setDateTime(TQDateTime::tqcurrentDateTime());
     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::currentDateTime());
+    d->dateOriginalSel->setDateTime(TQDateTime::tqcurrentDateTime());
     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::currentDateTime());
+    d->dateDigitalizedSel->setDateTime(TQDateTime::tqcurrentDateTime());
     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 480d1fe..890a1e3 100644
--- a/kipi-plugins/metadataedit/exifdevice.cpp
+++ b/kipi-plugins/metadataedit/exifdevice.cpp
@@ -26,7 +26,7 @@
 
 // QT includes.
 
-#include <layout.h>
+#include <tqlayout.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->setAlignment (TQt::AlignRight|TQt::AlignVCenter);
+    exposureLabel->tqsetAlignment (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 073eabe..c8989a2 100644
--- a/kipi-plugins/metadataedit/exifeditdialog.cpp
+++ b/kipi-plugins/metadataedit/exifeditdialog.cpp
@@ -24,7 +24,7 @@
 
 #include <tqtimer.h>
 #include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 // KDE includes.
@@ -277,10 +277,10 @@ void EXIFEditDialog::slotItemChanged()
     enableButton(Apply, !d->isReadOnly);
     
     setCaption(TQString("%1 (%2/%3) - %4")
-               .arg((*d->currItem).filename())
-               .arg(d->urls.findIndex(*(d->currItem))+1)
-               .arg(d->urls.count())
-               .arg(i18n("Edit EXIF Metadata")) + 
+               .tqarg((*d->currItem).filename())
+               .tqarg(d->urls.findIndex(*(d->currItem))+1)
+               .tqarg(d->urls.count())
+               .tqarg(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 108f52d..a672b87 100644
--- a/kipi-plugins/metadataedit/exiflens.cpp
+++ b/kipi-plugins/metadataedit/exiflens.cpp
@@ -26,7 +26,7 @@
 
 // QT includes.
 
-#include <layout.h>
+#include <tqlayout.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 5eab28a..703ad9d 100644
--- a/kipi-plugins/metadataedit/exiflight.cpp
+++ b/kipi-plugins/metadataedit/exiflight.cpp
@@ -26,7 +26,7 @@
 
 // QT includes.
 
-#include <layout.h>
+#include <tqlayout.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 04cc7cb..d5e2823 100644
--- a/kipi-plugins/metadataedit/iptccaption.cpp
+++ b/kipi-plugins/metadataedit/iptccaption.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <layout.h>
+#include <tqlayout.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")
-                                            .arg(KApplication::kApplication()->aboutData()->appName()), 
+                                            .tqarg(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 69ed4be..7cd3193 100644
--- a/kipi-plugins/metadataedit/iptccategories.cpp
+++ b/kipi-plugins/metadataedit/iptccategories.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <layout.h>
+#include <tqlayout.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->setAlignment( TQt::AlignTop );
+    grid->tqsetAlignment( 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 dc799b1..3c88916 100644
--- a/kipi-plugins/metadataedit/iptccredits.cpp
+++ b/kipi-plugins/metadataedit/iptccredits.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <layout.h>
+#include <tqlayout.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 0e1bb9f..df101d1 100644
--- a/kipi-plugins/metadataedit/iptcdatetime.cpp
+++ b/kipi-plugins/metadataedit/iptcdatetime.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <layout.h>
+#include <tqlayout.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")
-                                              .arg(KApplication::kApplication()->aboutData()->appName()), 
+                                              .tqarg(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::currentDate());
+    d->dateCreatedSel->setDate(TQDate::tqcurrentDate());
     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::currentDate());
+    d->dateReleasedSel->setDate(TQDate::tqcurrentDate());
     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::currentDate());
+    d->dateExpiredSel->setDate(TQDate::tqcurrentDate());
     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::currentDate());
+    d->dateDigitalizedSel->setDate(TQDate::tqcurrentDate());
     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::currentDate());
+    d->dateCreatedSel->setDate(TQDate::tqcurrentDate());
     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::currentDate());
+    d->dateReleasedSel->setDate(TQDate::tqcurrentDate());
     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::currentDate());
+    d->dateExpiredSel->setDate(TQDate::tqcurrentDate());
     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::currentDate());
+    d->dateDigitalizedSel->setDate(TQDate::tqcurrentDate());
     d->dateDigitalizedCheck->setChecked(false);
     if (!dateStr.isEmpty()) 
     {
diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp
index 8560be3..6be4f97 100644
--- a/kipi-plugins/metadataedit/iptceditdialog.cpp
+++ b/kipi-plugins/metadataedit/iptceditdialog.cpp
@@ -24,7 +24,7 @@
 
 #include <tqtimer.h>
 #include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 // KDE includes.
@@ -120,7 +120,7 @@ public:
     IPTCKeywords             *keywordsPage;
     IPTCCategories           *categoriesPage;
     IPTCCredits              *creditsPage;
-    IPTCStatus               *statusPage;
+    IPTCtqStatus               *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 IPTCStatus(d->page_status);
+    d->statusPage      = new IPTCtqStatus(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")
-               .arg((*d->currItem).filename())
-               .arg(d->urls.findIndex(*(d->currItem))+1)
-               .arg(d->urls.count())
-               .arg(i18n("Edit IPTC Metadata")) + 
+               .tqarg((*d->currItem).filename())
+               .tqarg(d->urls.findIndex(*(d->currItem))+1)
+               .tqarg(d->urls.count())
+               .tqarg(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 08bfd84..ee85553 100644
--- a/kipi-plugins/metadataedit/iptckeywords.cpp
+++ b/kipi-plugins/metadataedit/iptckeywords.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <layout.h>
+#include <tqlayout.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->setAlignment( TQt::AlignTop );
+    grid->tqsetAlignment( 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 d81155b..6cf021a 100644
--- a/kipi-plugins/metadataedit/iptcorigin.cpp
+++ b/kipi-plugins/metadataedit/iptcorigin.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <layout.h>
+#include <tqlayout.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").arg(it.key()).arg(it.data()));
+        d->countryCB->insertItem(TQString("%1 - %2").tqarg(it.key()).tqarg(it.data()));
 
     d->countryCB->listBox()->sort();
 
diff --git a/kipi-plugins/metadataedit/iptcstatus.cpp b/kipi-plugins/metadataedit/iptcstatus.cpp
index e701511..e36bf74 100644
--- a/kipi-plugins/metadataedit/iptcstatus.cpp
+++ b/kipi-plugins/metadataedit/iptcstatus.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
@@ -88,7 +88,7 @@ public:
     MetadataCheckBox *objectAttributeCheck;
 };
 
-IPTCStatus::IPTCStatus(TQWidget* parent)
+IPTCtqStatus::IPTCtqStatus(TQWidget* parent)
           : TQWidget(parent)
 {
     d = new IPTCStatusPriv;
@@ -294,12 +294,12 @@ IPTCStatus::IPTCStatus(TQWidget* parent)
             this, TQT_SIGNAL(signalModified()));
 }
 
-IPTCStatus::~IPTCStatus()
+IPTCtqStatus::~IPTCtqStatus()
 {
     delete d;
 }
 
-void IPTCStatus::readMetadata(TQByteArray& iptcData)
+void IPTCtqStatus::readMetadata(TQByteArray& iptcData)
 {
     blockSignals(true);
     KExiv2Iface::KExiv2 exiv2Iface;
@@ -417,7 +417,7 @@ void IPTCStatus::readMetadata(TQByteArray& iptcData)
     blockSignals(false);
 }
 
-void IPTCStatus::applyMetadata(TQByteArray& iptcData)
+void IPTCtqStatus::applyMetadata(TQByteArray& iptcData)
 {
     KExiv2Iface::KExiv2 exiv2Iface;
     exiv2Iface.setIptc(iptcData);
@@ -456,7 +456,7 @@ void IPTCStatus::applyMetadata(TQByteArray& iptcData)
     {
         TQString objectType;
         objectType.sprintf("%2d", d->objectTypeCB->currentItem()+1);
-        objectType.append(TQString(":%1").arg(d->objectTypeDescEdit->text()));
+        objectType.append(TQString(":%1").tqarg(d->objectTypeDescEdit->text()));
         exiv2Iface.setIptcTagString("Iptc.Application2.ObjectType", objectType);
     }
     else if (d->objectTypeCheck->isValid())
@@ -466,7 +466,7 @@ void IPTCStatus::applyMetadata(TQByteArray& iptcData)
     {
         TQString objectAttribute;
         objectAttribute.sprintf("%3d", d->objectAttributeCB->currentItem()+1);
-        objectAttribute.append(TQString(":%1").arg(d->objectAttributeDescEdit->text()));
+        objectAttribute.append(TQString(":%1").tqarg(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 79b77a4..a28744c 100644
--- a/kipi-plugins/metadataedit/iptcstatus.h
+++ b/kipi-plugins/metadataedit/iptcstatus.h
@@ -33,15 +33,15 @@ namespace KIPIMetadataEditPlugin
 
 class IPTCStatusPriv;
 
-class IPTCStatus : public TQWidget
+class IPTCtqStatus : public TQWidget
 {
     Q_OBJECT
   TQ_OBJECT
     
 public:
 
-    IPTCStatus(TQWidget* parent);
-    ~IPTCStatus();
+    IPTCtqStatus(TQWidget* parent);
+    ~IPTCtqStatus();
 
     void applyMetadata(TQByteArray& iptcData);
     void readMetadata(TQByteArray& iptcData);
diff --git a/kipi-plugins/metadataedit/iptcsubjects.cpp b/kipi-plugins/metadataedit/iptcsubjects.cpp
index a28e933..d21a96e 100644
--- a/kipi-plugins/metadataedit/iptcsubjects.cpp
+++ b/kipi-plugins/metadataedit/iptcsubjects.cpp
@@ -22,7 +22,7 @@
 
 // QT includes.
 
-#include <layout.h>
+#include <tqlayout.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->setAlignment( TQt::AlignTop );
+    grid->tqsetAlignment( 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 b6c9a58..d43de5a 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\"").arg(importEXIFFile.fileName()), 
+                           i18n("Cannot load metadata from \"%1\"").tqarg(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").arg(importEXIFFile.fileName()), 
+                           i18n("\"%1\" do not have EXIF metadata").tqarg(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 ?").arg(importEXIFFile.fileName()),
+                          "Do you want to continue ?").tqarg(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\"").arg(importIPTCFile.fileName()), 
+                           i18n("Cannot load metadata from \"%1\"").tqarg(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").arg(importIPTCFile.fileName()), 
+                           i18n("\"%1\" do not have IPTC metadata").tqarg(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 ?").arg(importIPTCFile.fileName()),
+                          "Do you want to continue ?").tqarg(importIPTCFile.fileName()),
                      i18n("Import IPTC Metadata")) != KMessageBox::Yes)
         return;