Rename old tq methods that no longer need a unique name

8 files changed, 44 insertions, 44 deletions

diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp
index dd71c64..52891cd 100644
--- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp
+++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp
@@ -170,7 +170,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar)
 
     d->settingsArea = new TQFrame(sv->viewport());
     d->settingsArea->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
-    d->settingsArea->setLineWidth( tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
+    d->settingsArea->setLineWidth( tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
 
     sv->addChild(d->settingsArea);
     m_navigateBarLayout->addWidget(sv);
@@ -227,7 +227,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar)
     d->labelPhotoWhiteBalance = new KSqueezedTextLabel(0, d->settingsArea);
 
     int hgt = fontMetrics().height()-2;
-    d->title->tqsetAlignment(TQt::AlignCenter);
+    d->title->setAlignment(TQt::AlignCenter);
     d->file->setMaximumHeight(hgt);
     d->folder->setMaximumHeight(hgt);
     d->date->setMaximumHeight(hgt);
@@ -249,7 +249,7 @@ CameraItemPropertiesTab::CameraItemPropertiesTab(TQWidget* parent, bool navBar)
     d->labelNewFileName->setMaximumHeight(hgt);
     d->labelAlreadyDownloaded->setMaximumHeight(hgt);
 
-    d->title2->tqsetAlignment(TQt::AlignCenter);
+    d->title2->setAlignment(TQt::AlignCenter);
     d->make->setMaximumHeight(hgt);
     d->model->setMaximumHeight(hgt);
     d->photoDate->setMaximumHeight(hgt);
diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp
index ff1f594..32c24e8 100644
--- a/digikam/libs/imageproperties/imagedescedittab.cpp
+++ b/digikam/libs/imageproperties/imagedescedittab.cpp
@@ -688,7 +688,7 @@ void ImageDescEditTab::slotItemStateChanged(TAlbumCheckListItem *item)
     d->hub.setTag(item->album(), item->isOn());
 
     d->tagsView->blockSignals(true);
-    item->settqStatus(d->hub.tagtqStatus(item->album()));
+    item->setStatus(d->hub.tagStatus(item->album()));
     d->tagsView->blockSignals(false);
 
     slotModified();
@@ -703,14 +703,14 @@ void ImageDescEditTab::slotCommentChanged()
         return;
 
     d->hub.setComment(d->commentsEdit->text());
-    setMetadataWidgettqStatus(d->hub.commenttqStatus(), d->commentsEdit);
+    setMetadataWidgetStatus(d->hub.commentStatus(), d->commentsEdit);
     slotModified();
 }
 
 void ImageDescEditTab::slotDateTimeChanged(const TQDateTime& dateTime)
 {
     d->hub.setDateTime(dateTime);
-    setMetadataWidgettqStatus(d->hub.dateTimetqStatus(), d->dateTimeEdit);
+    setMetadataWidgetStatus(d->hub.dateTimeStatus(), d->dateTimeEdit);
     slotModified();
 }
 
@@ -743,7 +743,7 @@ void ImageDescEditTab::updateTagsView()
     {
         TAlbumCheckListItem* tItem = dynamic_cast<TAlbumCheckListItem*>(it.current());
         if (tItem)
-            tItem->settqStatus(d->hub.tagtqStatus(tItem->album()));
+            tItem->setStatus(d->hub.tagStatus(tItem->album()));
         ++it;
     }
 
@@ -759,14 +759,14 @@ void ImageDescEditTab::updateComments()
 {
     d->commentsEdit->blockSignals(true);
     d->commentsEdit->setText(d->hub.comment());
-    setMetadataWidgettqStatus(d->hub.commenttqStatus(), d->commentsEdit);
+    setMetadataWidgetStatus(d->hub.commentStatus(), d->commentsEdit);
     d->commentsEdit->blockSignals(false);
 }
 
 void ImageDescEditTab::updateRating()
 {
     d->ratingWidget->blockSignals(true);
-    if (d->hub.ratingtqStatus() == MetadataHub::MetadataDisjoint)
+    if (d->hub.ratingStatus() == MetadataHub::MetadataDisjoint)
         d->ratingWidget->setRating(0);
     else
         d->ratingWidget->setRating(d->hub.rating());
@@ -777,11 +777,11 @@ void ImageDescEditTab::updateDate()
 {
     d->dateTimeEdit->blockSignals(true);
     d->dateTimeEdit->setDateTime(d->hub.dateTime());
-    setMetadataWidgettqStatus(d->hub.dateTimetqStatus(), d->dateTimeEdit);
+    setMetadataWidgetStatus(d->hub.dateTimeStatus(), d->dateTimeEdit);
     d->dateTimeEdit->blockSignals(false);
 }
 
-void ImageDescEditTab::setMetadataWidgettqStatus(int status, TQWidget *widget)
+void ImageDescEditTab::setMetadataWidgetStatus(int status, TQWidget *widget)
 {
     if (status == MetadataHub::MetadataDisjoint)
     {
@@ -1646,7 +1646,7 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t)
             {
                 if (t)
                 {
-                    MetadataHub::TagtqStatus status = d->hub.tagtqStatus(item->album());
+                    MetadataHub::TagStatus status = d->hub.tagStatus(item->album());
                     bool tagAssigned = (status == MetadataHub::MetadataAvailable && status.hasTag)
                                         || status == MetadataHub::MetadataDisjoint;
                     item->setVisible(tagAssigned);
@@ -1686,7 +1686,7 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t)
                 if (!tag->isRoot())
                 {
                     // only if the current item is not marked as tagged, check all tqchildren
-                    MetadataHub::TagtqStatus status = d->hub.tagtqStatus(item->album());
+                    MetadataHub::TagStatus status = d->hub.tagStatus(item->album());
                     bool tagAssigned = (status == MetadataHub::MetadataAvailable && status.hasTag)
                                         || status == MetadataHub::MetadataDisjoint;
                     if (!tagAssigned)
@@ -1698,9 +1698,9 @@ void ImageDescEditTab::slotAssignedTagsToggled(bool t)
                         while (*tmpIt != nextSibling )
                         {
                             TAlbumCheckListItem* tmpItem = dynamic_cast<TAlbumCheckListItem*>(tmpIt.current());
-                            MetadataHub::TagtqStatus tmptqStatus = d->hub.tagtqStatus(tmpItem->album());
-                            bool tmpTagAssigned = (tmptqStatus == MetadataHub::MetadataAvailable && tmptqStatus.hasTag)
-                                                || tmptqStatus == MetadataHub::MetadataDisjoint;
+                            MetadataHub::TagStatus tmpStatus = d->hub.tagStatus(tmpItem->album());
+                            bool tmpTagAssigned = (tmpStatus == MetadataHub::MetadataAvailable && tmpStatus.hasTag)
+                                                || tmpStatus == MetadataHub::MetadataDisjoint;
                             if(tmpTagAssigned)
                             {
                                 somethingIsSet = true;
diff --git a/digikam/libs/imageproperties/imagedescedittab.h b/digikam/libs/imageproperties/imagedescedittab.h
index 30f8722..5db5132 100644
--- a/digikam/libs/imageproperties/imagedescedittab.h
+++ b/digikam/libs/imageproperties/imagedescedittab.h
@@ -93,7 +93,7 @@ private:
     void setTagThumbnail(TAlbum *album);
 
     bool singleSelection() const;
-    void setMetadataWidgettqStatus(int status, TQWidget *widget);
+    void setMetadataWidgetStatus(int status, TQWidget *widget);
     void reloadForMetadataChange(TQ_LLONG imageId);
 
 private slots:
diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp
index 4fe50c3..7454681 100644
--- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp
+++ b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp
@@ -165,7 +165,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar
     sv->addChild(histogramPage);
 
     TQLabel *label1 = new TQLabel(i18n("Channel:"), histogramPage);
-    label1->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label1->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     d->channelCB = new TQComboBox( false, histogramPage );
     d->channelCB->insertItem( i18n("Luminosity") );
     d->channelCB->insertItem( i18n("Red") );
@@ -210,7 +210,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar
     logHistoButton->setToggleButton(true);
 
     TQLabel *label10 = new TQLabel(i18n("Colors:"), histogramPage);
-    label10->tqsetAlignment ( TQt::AlignRight | TQt::AlignVCenter );
+    label10->setAlignment ( TQt::AlignRight | TQt::AlignVCenter );
     d->colorsCB = new TQComboBox( false, histogramPage );
     d->colorsCB->insertItem( i18n("Red") );
     d->colorsCB->insertItem( i18n("Green") );
@@ -262,7 +262,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar
 
     TQHBoxLayout *hlay2 = new TQHBoxLayout(KDialog::spacingHint());
     TQLabel *label3     = new TQLabel(i18n("Range:"), histogramPage);
-    label3->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
+    label3->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
     d->minInterv = new TQSpinBox(0, 255, 1, histogramPage);
     d->minInterv->setValue(0);
     TQWhatsThis::add(d->minInterv, i18n("<p>Select the minimal intensity "
@@ -283,44 +283,44 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar
                                 "channels."));
 
     TQLabel *label5 = new TQLabel(i18n("Pixels:"), gbox);
-    label5->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
+    label5->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
     d->labelPixelsValue = new TQLabel(gbox);
-    d->labelPixelsValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    d->labelPixelsValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
 
     TQLabel *label7 = new TQLabel(i18n("Count:"), gbox);
-    label7->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
+    label7->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
     d->labelCountValue = new TQLabel(gbox);
-    d->labelCountValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    d->labelCountValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
 
     TQLabel *label4 = new TQLabel(i18n("Mean:"), gbox);
-    label4->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
+    label4->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
     d->labelMeanValue = new TQLabel(gbox);
-    d->labelMeanValue->tqsetAlignment (TQt::AlignRight | TQt::AlignVCenter);
+    d->labelMeanValue->setAlignment (TQt::AlignRight | TQt::AlignVCenter);
 
     TQLabel *label6 = new TQLabel(i18n("Std. deviation:"), gbox);
-    label6->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
+    label6->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
     d->labelStdDevValue = new TQLabel(gbox);
-    d->labelStdDevValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    d->labelStdDevValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
 
     TQLabel *label8 = new TQLabel(i18n("Median:"), gbox);
-    label8->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
+    label8->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
     d->labelMedianValue = new TQLabel(gbox);
-    d->labelMedianValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    d->labelMedianValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
 
     TQLabel *label9 = new TQLabel(i18n("Percentile:"), gbox);
-    label9->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
+    label9->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
     d->labelPercentileValue = new TQLabel(gbox);
-    d->labelPercentileValue->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    d->labelPercentileValue->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
 
     TQLabel *label11 = new TQLabel(i18n("Color depth:"), gbox);
-    label11->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
+    label11->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
     d->labelColorDepth = new TQLabel(gbox);
-    d->labelColorDepth->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    d->labelColorDepth->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
 
     TQLabel *label12 = new TQLabel(i18n("Alpha Channel:"), gbox);
-    label12->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
+    label12->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
     d->labelAlphaChannel = new TQLabel(gbox);
-    d->labelAlphaChannel->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+    d->labelAlphaChannel->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
 
     topLayout->addMultiCellWidget(label1,       1, 1, 0, 0);
     topLayout->addMultiCellWidget(d->channelCB, 1, 1, 1, 1);
diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp
index 0d4b3ac..f2f6350 100644
--- a/digikam/libs/imageproperties/imagepropertiestab.cpp
+++ b/digikam/libs/imageproperties/imagepropertiestab.cpp
@@ -183,7 +183,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
 
     d->settingsArea = new TQFrame(sv->viewport());
     d->settingsArea->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
-    d->settingsArea->setLineWidth( tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
+    d->settingsArea->setLineWidth( tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) );
 
     sv->addChild(d->settingsArea);
     m_navigateBarLayout->addWidget(sv);
@@ -248,7 +248,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
     d->labelPhotoWhiteBalance   = new KSqueezedTextLabel(0, d->settingsArea);
 
     int hgt = fontMetrics().height()-2;
-    d->title->tqsetAlignment(TQt::AlignCenter);
+    d->title->setAlignment(TQt::AlignCenter);
     d->file->setMaximumHeight(hgt);
     d->folder->setMaximumHeight(hgt);
     d->modifiedDate->setMaximumHeight(hgt);
@@ -262,7 +262,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
     d->labelFileOwner->setMaximumHeight(hgt);
     d->labelFilePermissions->setMaximumHeight(hgt);
 
-    d->title2->tqsetAlignment(TQt::AlignCenter);
+    d->title2->setAlignment(TQt::AlignCenter);
     d->mime->setMaximumHeight(hgt);
     d->dimensions->setMaximumHeight(hgt);
     d->compression->setMaximumHeight(hgt);
@@ -274,7 +274,7 @@ ImagePropertiesTab::ImagePropertiesTab(TQWidget* parent, bool navBar)
     d->labelImageBitDepth->setMaximumHeight(hgt);
     d->labelImageColorMode->setMaximumHeight(hgt);
 
-    d->title3->tqsetAlignment(TQt::AlignCenter);
+    d->title3->setAlignment(TQt::AlignCenter);
     d->make->setMaximumHeight(hgt);
     d->model->setMaximumHeight(hgt);
     d->photoDate->setMaximumHeight(hgt);
diff --git a/digikam/libs/imageproperties/navigatebartab.cpp b/digikam/libs/imageproperties/navigatebartab.cpp
index 92e975b..87540cd 100644
--- a/digikam/libs/imageproperties/navigatebartab.cpp
+++ b/digikam/libs/imageproperties/navigatebartab.cpp
@@ -93,7 +93,7 @@ void NavigateBarTab::setupNavigateBar(bool withBar)
                 this, TQT_SIGNAL(signalLastItem()));
 
         d->label = new TQLabel(d->stack);
-        d->label->tqsetAlignment(TQt::AlignCenter);
+        d->label->setAlignment(TQt::AlignCenter);
         d->stack->addWidget(d->label);
     }
 }
diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp
index 6798b19..fef2644 100644
--- a/digikam/libs/imageproperties/talbumlistview.cpp
+++ b/digikam/libs/imageproperties/talbumlistview.cpp
@@ -151,7 +151,7 @@ int TAlbumCheckListItem::count()
     return m_count;
 }
 
-void TAlbumCheckListItem::settqStatus(MetadataHub::TagtqStatus status)
+void TAlbumCheckListItem::setStatus(MetadataHub::TagStatus status)
 {
     if (status == MetadataHub::MetadataDisjoint)
     {
@@ -253,7 +253,7 @@ void TAlbumListView::contentsDropEvent(TQDropEvent *e)
 
     if(TagDrag::canDecode(e))
     {
-        TQByteArray ba = e->tqencodedData("digikam/tag-id");
+        TQByteArray ba = e->encodedData("digikam/tag-id");
         TQDataStream ds(ba, IO_ReadOnly);
         int tagID;
         ds >> tagID;
diff --git a/digikam/libs/imageproperties/talbumlistview.h b/digikam/libs/imageproperties/talbumlistview.h
index 94b1186..aeba1d0 100644
--- a/digikam/libs/imageproperties/talbumlistview.h
+++ b/digikam/libs/imageproperties/talbumlistview.h
@@ -47,7 +47,7 @@ public:
 
     TAlbumCheckListItem(TQCheckListItem* parent, TAlbum* album);
 
-    void    settqStatus(MetadataHub::TagtqStatus status);
+    void    setStatus(MetadataHub::TagStatus status);
     void    refresh();
     void    setOpen(bool o);
     TAlbum* album() const;