summaryrefslogtreecommitdiffstats
path: root/digikam/libs
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:08:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:08:22 -0600
commitc1bbc88281394639e2a92c2d1b43ca4f3e1813aa (patch)
tree240471d225925d788fc2450f4602f343c47517d0 /digikam/libs
parent3b6fffbdfed82ed3ab983a0370a64ee7267c825e (diff)
downloaddigikam-c1bbc88281394639e2a92c2d1b43ca4f3e1813aa.tar.gz
digikam-c1bbc88281394639e2a92c2d1b43ca4f3e1813aa.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'digikam/libs')
-rw-r--r--digikam/libs/dialogs/deletedialogbase.ui2
-rw-r--r--digikam/libs/dialogs/imagedialog.cpp6
-rw-r--r--digikam/libs/dialogs/imagedialog.h2
-rw-r--r--digikam/libs/dialogs/imagedlgbase.cpp2
-rw-r--r--digikam/libs/dialogs/imageguidedlg.cpp2
-rw-r--r--digikam/libs/dmetadata/dmetadata.cpp40
-rw-r--r--digikam/libs/greycstoration/CImg.h8
-rw-r--r--digikam/libs/imageproperties/cameraitempropertiestab.cpp6
-rw-r--r--digikam/libs/imageproperties/imagedescedittab.cpp26
-rw-r--r--digikam/libs/imageproperties/imagedescedittab.h2
-rw-r--r--digikam/libs/imageproperties/imagepropertiescolorstab.cpp38
-rw-r--r--digikam/libs/imageproperties/imagepropertiestab.cpp8
-rw-r--r--digikam/libs/imageproperties/navigatebartab.cpp2
-rw-r--r--digikam/libs/imageproperties/talbumlistview.cpp4
-rw-r--r--digikam/libs/imageproperties/talbumlistview.h2
-rw-r--r--digikam/libs/jpegutils/jpegutils.cpp8
-rw-r--r--digikam/libs/jpegutils/jpegutils.h2
-rw-r--r--digikam/libs/lprof/cmslnr.cpp6
-rw-r--r--digikam/libs/themeengine/themeengine.cpp164
-rw-r--r--digikam/libs/threadimageio/loadsavetask.cpp36
-rw-r--r--digikam/libs/threadimageio/loadsavetask.h30
-rw-r--r--digikam/libs/threadimageio/managedloadsavethread.cpp26
-rw-r--r--digikam/libs/threadimageio/previewtask.cpp10
-rw-r--r--digikam/libs/thumbbar/thumbbar.cpp14
-rw-r--r--digikam/libs/widgets/common/curveswidget.cpp2
-rw-r--r--digikam/libs/widgets/common/dcursortracker.cpp2
-rw-r--r--digikam/libs/widgets/common/dlogoaction.cpp2
-rw-r--r--digikam/libs/widgets/common/dpopupmenu.cpp8
-rw-r--r--digikam/libs/widgets/common/paniconwidget.cpp2
-rw-r--r--digikam/libs/widgets/common/searchtextbar.cpp2
-rw-r--r--digikam/libs/widgets/common/splashscreen.cpp2
-rw-r--r--digikam/libs/widgets/common/splashscreen.h2
-rw-r--r--digikam/libs/widgets/common/squeezedcombobox.cpp4
-rw-r--r--digikam/libs/widgets/common/squeezedcombobox.h4
-rw-r--r--digikam/libs/widgets/common/statusprogressbar.cpp6
-rw-r--r--digikam/libs/widgets/common/statusprogressbar.h2
-rw-r--r--digikam/libs/widgets/imageplugins/imageguidewidget.cpp6
-rw-r--r--digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp2
-rw-r--r--digikam/libs/widgets/imageplugins/imagepannelwidget.cpp2
-rw-r--r--digikam/libs/widgets/imageplugins/imageregionwidget.cpp2
-rw-r--r--digikam/libs/widgets/imageplugins/imagewidget.cpp2
-rw-r--r--digikam/libs/widgets/metadata/metadatawidget.cpp2
-rw-r--r--digikam/libs/widgets/metadata/worldmapwidget.cpp4
43 files changed, 252 insertions, 252 deletions
diff --git a/digikam/libs/dialogs/deletedialogbase.ui b/digikam/libs/dialogs/deletedialogbase.ui
index 72db02d..6eaa796 100644
--- a/digikam/libs/dialogs/deletedialogbase.ui
+++ b/digikam/libs/dialogs/deletedialogbase.ui
@@ -23,7 +23,7 @@
<height>374</height>
</rect>
</property>
- <property name="tqminimumSize" stdset="0">
+ <property name="minimumSize" stdset="0">
<size>
<width>420</width>
<height>320</height>
diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp
index 3754f7a..a3e4721 100644
--- a/digikam/libs/dialogs/imagedialog.cpp
+++ b/digikam/libs/dialogs/imagedialog.cpp
@@ -90,8 +90,8 @@ ImageDialogPreview::ImageDialogPreview(TQWidget *parent)
TQVBoxLayout *vlay = new TQVBoxLayout(this);
d->imageLabel = new TQLabel(this);
- d->imageLabel->tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
- d->imageLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ d->imageLabel->setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
+ d->imageLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
d->infoLabel = new TQLabel(this);
@@ -118,7 +118,7 @@ ImageDialogPreview::~ImageDialogPreview()
delete d;
}
-TQSize ImageDialogPreview::tqsizeHint() const
+TQSize ImageDialogPreview::sizeHint() const
{
return TQSize(256, 256);
}
diff --git a/digikam/libs/dialogs/imagedialog.h b/digikam/libs/dialogs/imagedialog.h
index 23d85d5..658caa4 100644
--- a/digikam/libs/dialogs/imagedialog.h
+++ b/digikam/libs/dialogs/imagedialog.h
@@ -49,7 +49,7 @@ public:
ImageDialogPreview(TQWidget *parent=0);
~ImageDialogPreview();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
public slots:
diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp
index 7f1ba5d..5a1463d 100644
--- a/digikam/libs/dialogs/imagedlgbase.cpp
+++ b/digikam/libs/dialogs/imagedlgbase.cpp
@@ -229,7 +229,7 @@ void ImageDlgBase::setPreviewAreaWidget(TQWidget *w)
TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred,
TQSizePolicy::Expanding,
2, 1);
- w->tqsetSizePolicy(rightSzPolicy);
+ w->setSizePolicy(rightSzPolicy);
}
void ImageDlgBase::setUserAreaWidget(TQWidget *w)
diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/digikam/libs/dialogs/imageguidedlg.cpp
index 5cd94b6..028ccae 100644
--- a/digikam/libs/dialogs/imageguidedlg.cpp
+++ b/digikam/libs/dialogs/imageguidedlg.cpp
@@ -192,7 +192,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name,
d->splitter->setOpaqueResize(false);
TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
- m_imagePreviewWidget->tqsetSizePolicy(rightSzPolicy);
+ m_imagePreviewWidget->setSizePolicy(rightSzPolicy);
TQString sbName(d->name + TQString(" Image Plugin Sidebar"));
d->settingsSideBar = new Sidebar(d->hbox, sbName.ascii(), Sidebar::Right);
diff --git a/digikam/libs/dmetadata/dmetadata.cpp b/digikam/libs/dmetadata/dmetadata.cpp
index 2398157..d342b37 100644
--- a/digikam/libs/dmetadata/dmetadata.cpp
+++ b/digikam/libs/dmetadata/dmetadata.cpp
@@ -453,7 +453,7 @@ bool DMetadata::getXMLImageProperties(TQString& comments, TQDateTime& date,
}
TQDomElement rootElem = xmlDoc.documentElement();
- if (rootElem.tagName() != TQString::tqfromLatin1("digikamproperties"))
+ if (rootElem.tagName() != TQString::fromLatin1("digikamproperties"))
return false;
for (TQDomNode node = rootElem.firstChild();
@@ -461,34 +461,34 @@ bool DMetadata::getXMLImageProperties(TQString& comments, TQDateTime& date,
{
TQDomElement e = node.toElement();
TQString name = e.tagName();
- TQString val = e.attribute(TQString::tqfromLatin1("value"));
+ TQString val = e.attribute(TQString::fromLatin1("value"));
- if (name == TQString::tqfromLatin1("comments"))
+ if (name == TQString::fromLatin1("comments"))
{
comments = val;
}
- else if (name == TQString::tqfromLatin1("date"))
+ else if (name == TQString::fromLatin1("date"))
{
if (val.isEmpty()) continue;
date = TQDateTime::fromString(val, Qt::ISODate);
}
- else if (name == TQString::tqfromLatin1("rating"))
+ else if (name == TQString::fromLatin1("rating"))
{
if (val.isEmpty()) continue;
bool ok=false;
rating = val.toInt(&ok);
if (!ok) rating = 0;
}
- else if (name == TQString::tqfromLatin1("tagslist"))
+ else if (name == TQString::fromLatin1("tagslist"))
{
for (TQDomNode node2 = e.firstChild();
!node2.isNull(); node2 = node2.nextSibling())
{
TQDomElement e2 = node2.toElement();
TQString name2 = e2.tagName();
- TQString val2 = e2.attribute(TQString::tqfromLatin1("path"));
+ TQString val2 = e2.attribute(TQString::fromLatin1("path"));
- if (name2 == TQString::tqfromLatin1("tag"))
+ if (name2 == TQString::fromLatin1("tag"))
{
if (val2.isEmpty()) continue;
tagsPath.append(val2);
@@ -505,32 +505,32 @@ bool DMetadata::setXMLImageProperties(const TQString& comments, const TQDateTime
{
TQDomDocument xmlDoc;
- xmlDoc.appendChild(xmlDoc.createProcessingInstruction( TQString::tqfromLatin1("xml"),
- TQString::tqfromLatin1("version=\"1.0\" encoding=\"UTF-8\"") ) );
+ xmlDoc.appendChild(xmlDoc.createProcessingInstruction( TQString::fromLatin1("xml"),
+ TQString::fromLatin1("version=\"1.0\" encoding=\"UTF-8\"") ) );
- TQDomElement propertiesElem = xmlDoc.createElement(TQString::tqfromLatin1("digikamproperties"));
+ TQDomElement propertiesElem = xmlDoc.createElement(TQString::fromLatin1("digikamproperties"));
xmlDoc.appendChild( propertiesElem );
- TQDomElement c = xmlDoc.createElement(TQString::tqfromLatin1("comments"));
- c.setAttribute(TQString::tqfromLatin1("value"), comments);
+ TQDomElement c = xmlDoc.createElement(TQString::fromLatin1("comments"));
+ c.setAttribute(TQString::fromLatin1("value"), comments);
propertiesElem.appendChild(c);
- TQDomElement d = xmlDoc.createElement(TQString::tqfromLatin1("date"));
- d.setAttribute(TQString::tqfromLatin1("value"), date.toString(Qt::ISODate));
+ TQDomElement d = xmlDoc.createElement(TQString::fromLatin1("date"));
+ d.setAttribute(TQString::fromLatin1("value"), date.toString(Qt::ISODate));
propertiesElem.appendChild(d);
- TQDomElement r = xmlDoc.createElement(TQString::tqfromLatin1("rating"));
- r.setAttribute(TQString::tqfromLatin1("value"), rating);
+ TQDomElement r = xmlDoc.createElement(TQString::fromLatin1("rating"));
+ r.setAttribute(TQString::fromLatin1("value"), rating);
propertiesElem.appendChild(r);
- TQDomElement tagsElem = xmlDoc.createElement(TQString::tqfromLatin1("tagslist"));
+ TQDomElement tagsElem = xmlDoc.createElement(TQString::fromLatin1("tagslist"));
propertiesElem.appendChild(tagsElem);
TQStringList path = tagsPath;
for ( TQStringList::Iterator it = path.begin(); it != path.end(); ++it )
{
- TQDomElement e = xmlDoc.createElement(TQString::tqfromLatin1("tag"));
- e.setAttribute(TQString::tqfromLatin1("path"), *it);
+ TQDomElement e = xmlDoc.createElement(TQString::fromLatin1("tag"));
+ e.setAttribute(TQString::fromLatin1("path"), *it);
tagsElem.appendChild(e);
}
diff --git a/digikam/libs/greycstoration/CImg.h b/digikam/libs/greycstoration/CImg.h
index 008f22a..3589f7a 100644
--- a/digikam/libs/greycstoration/CImg.h
+++ b/digikam/libs/greycstoration/CImg.h
@@ -9393,8 +9393,8 @@ namespace cimg_library {
return assign(width,height,title,normalization,!is_fullscreen,false);
}
- static OStqStatus CarbonEventHandler(EventHandlerCallRef myHandler, EventRef theEvent, void* userData) {
- OStqStatus result = eventNotHandledErr;
+ static OSStatus CarbonEventHandler(EventHandlerCallRef myHandler, EventRef theEvent, void* userData) {
+ OSStatus result = eventNotHandledErr;
CImgDisplay* disp = (CImgDisplay*) userData;
(void)myHandler; // Avoid "unused parameter"
cimg::CarbonInfo& c = cimg::CarbonAttr();
@@ -9605,7 +9605,7 @@ namespace cimg_library {
MPSignalSemaphore(c.sync_event); // Notify the caller that all goes fine
EventRef theEvent;
EventTargetRef theTarget;
- OStqStatus err;
+ OSStatus err;
CbSerializedQuery* query;
theTarget = GetEventDispatcherTarget();
@@ -9617,7 +9617,7 @@ namespace cimg_library {
SendEventToEventTarget (theEvent, theTarget);
ReleaseEvent(theEvent);
} else if (err == eventLoopTimedOutErr) { // There is no event to process, so check if there is new messages to process
- OStqStatus r =MPWaitOnQueue(c.com_queue,(void**)&query,0,0,10*kDurationMillisecond);
+ OSStatus r =MPWaitOnQueue(c.com_queue,(void**)&query,0,0,10*kDurationMillisecond);
if (r!=noErr) continue; //nothing in the queue or an error.., bye
// If we're here, we've something to do now.
if (query) {
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;
diff --git a/digikam/libs/jpegutils/jpegutils.cpp b/digikam/libs/jpegutils/jpegutils.cpp
index 5d2f78d..b83825f 100644
--- a/digikam/libs/jpegutils/jpegutils.cpp
+++ b/digikam/libs/jpegutils/jpegutils.cpp
@@ -105,7 +105,7 @@ static void jpegutils_jpeg_output_message(j_common_ptr cinfo)
#endif
}
-bool loadJPEGScaled(TQImage& image, const TQString& path, int tqmaximumSize)
+bool loadJPEGScaled(TQImage& image, const TQString& path, int maximumSize)
{
TQString format = TQImageIO::imageFormat(path);
if (format !="JPEG") return false;
@@ -138,7 +138,7 @@ bool loadJPEGScaled(TQImage& image, const TQString& path, int tqmaximumSize)
// libjpeg supports 1/1, 1/2, 1/4, 1/8
int scale=1;
- while(tqmaximumSize*scale*2<=imgSize)
+ while(maximumSize*scale*2<=imgSize)
{
scale*=2;
}
@@ -229,8 +229,8 @@ bool loadJPEGScaled(TQImage& image, const TQString& path, int tqmaximumSize)
}
int newMax = TQMAX(cinfo.output_width, cinfo.output_height);
- int newx = tqmaximumSize*cinfo.output_width / newMax;
- int newy = tqmaximumSize*cinfo.output_height / newMax;
+ int newx = maximumSize*cinfo.output_width / newMax;
+ int newy = maximumSize*cinfo.output_height / newMax;
jpeg_destroy_decompress(&cinfo);
fclose(inputFile);
diff --git a/digikam/libs/jpegutils/jpegutils.h b/digikam/libs/jpegutils/jpegutils.h
index db6b50b..ad38477 100644
--- a/digikam/libs/jpegutils/jpegutils.h
+++ b/digikam/libs/jpegutils/jpegutils.h
@@ -33,7 +33,7 @@
namespace Digikam
{
-bool loadJPEGScaled(TQImage& image, const TQString& path, int tqmaximumSize);
+bool loadJPEGScaled(TQImage& image, const TQString& path, int maximumSize);
bool exifRotate(const TQString& file, const TQString& documentName);
bool jpegConvert(const TQString& src, const TQString& dest, const TQString& documentName,
const TQString& format=TQString("PNG"));
diff --git a/digikam/libs/lprof/cmslnr.cpp b/digikam/libs/lprof/cmslnr.cpp
index 8e3b277..696d2c7 100644
--- a/digikam/libs/lprof/cmslnr.cpp
+++ b/digikam/libs/lprof/cmslnr.cpp
@@ -191,7 +191,7 @@ BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[])
LCMSHANDLE h;
double ChiSq, OldChiSq;
int i;
- BOOL tqStatus = true;
+ BOOL Status = true;
/* initial guesses */
@@ -213,7 +213,7 @@ BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[])
for(i = 0; i < LEVENBERG_MARTQUARDT_ITERATE_MAX; i++) {
if (!cmsxLevenbergMarquardtIterate(h)) {
- tqStatus = false;
+ Status = false;
break;
}
@@ -227,7 +227,7 @@ BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[])
cmsxLevenbergMarquardtFree(h);
- return tqStatus;
+ return Status;
}
/* Tries to fit gamma as per IEC 61966-2.1 using Levenberg-Marquardt method */
diff --git a/digikam/libs/themeengine/themeengine.cpp b/digikam/libs/themeengine/themeengine.cpp
index 8ea0adb..9797079 100644
--- a/digikam/libs/themeengine/themeengine.cpp
+++ b/digikam/libs/themeengine/themeengine.cpp
@@ -325,7 +325,7 @@ void ThemeEngine::changePalette()
plt.setDisabled(cg);
}
- kapp->tqsetPalette(plt, true);
+ kapp->setPalette(plt, true);
}
Theme* ThemeEngine::getCurrentTheme() const
@@ -414,7 +414,7 @@ bool ThemeEngine::loadTheme()
}
TQDomElement rootElem = xmlDoc.documentElement();
- if (rootElem.tagName() != TQString::tqfromLatin1("digikamtheme"))
+ if (rootElem.tagName() != TQString::fromLatin1("digikamtheme"))
return false;
TQString resource;
@@ -678,7 +678,7 @@ TQString ThemeEngine::resourceValue(const TQDomElement &rootElem, const TQString
{
TQDomElement e = node.toElement();
TQString name = e.tagName();
- TQString val = e.attribute(TQString::tqfromLatin1("value"));
+ TQString val = e.attribute(TQString::fromLatin1("value"));
if (key == name)
{
@@ -711,8 +711,8 @@ bool ThemeEngine::saveTheme()
// header ------------------------------------------------------------------
- xmlDoc.appendChild(xmlDoc.createProcessingInstruction(TQString::tqfromLatin1("xml"),
- TQString::tqfromLatin1("version=\"1.0\" encoding=\"UTF-8\"")));
+ xmlDoc.appendChild(xmlDoc.createProcessingInstruction(TQString::fromLatin1("xml"),
+ TQString::fromLatin1("version=\"1.0\" encoding=\"UTF-8\"")));
TQString banner = TQString("\n/* ============================================================"
"\n *"
@@ -736,52 +736,52 @@ bool ThemeEngine::saveTheme()
"\n * GNU General Public License for more details."
"\n *"
"\n * ============================================================ */\n")
- .tqarg(TQDate::tqcurrentDate().year())
- .tqarg(TQDate::tqcurrentDate().month())
- .tqarg(TQDate::tqcurrentDate().day())
+ .tqarg(TQDate::currentDate().year())
+ .tqarg(TQDate::currentDate().month())
+ .tqarg(TQDate::currentDate().day())
.tqarg(fi.fileName())
- .tqarg(TQDate::tqcurrentDate().year())
+ .tqarg(TQDate::currentDate().year())
.tqarg(user.fullName());
xmlDoc.appendChild(xmlDoc.createComment(banner));
- TQDomElement themeElem = xmlDoc.createElement(TQString::tqfromLatin1("digikamtheme"));
+ TQDomElement themeElem = xmlDoc.createElement(TQString::fromLatin1("digikamtheme"));
xmlDoc.appendChild(themeElem);
// base props --------------------------------------------------------------
- e = xmlDoc.createElement(TQString::tqfromLatin1("name"));
- e.setAttribute(TQString::tqfromLatin1("value"), fi.fileName());
+ e = xmlDoc.createElement(TQString::fromLatin1("name"));
+ e.setAttribute(TQString::fromLatin1("value"), fi.fileName());
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("BaseColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->baseColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("BaseColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->baseColor.name()).upper());
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("TextRegularColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textRegColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("TextRegularColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->textRegColor.name()).upper());
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("TextSelectedColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textSelColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("TextSelectedColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->textSelColor.name()).upper());
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("TextSpecialRegularColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textSpecialRegColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("TextSpecialRegularColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->textSpecialRegColor.name()).upper());
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("TextSpecialSelectedColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->textSpecialSelColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("TextSpecialSelectedColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->textSpecialSelColor.name()).upper());
themeElem.appendChild(e);
// banner props ------------------------------------------------------------
- e = xmlDoc.createElement(TQString::tqfromLatin1("BannerColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->bannerColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("BannerColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->bannerColor.name()).upper());
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("BannerColorTo"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->bannerColorTo.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("BannerColorTo"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->bannerColorTo.name()).upper());
themeElem.appendChild(e);
switch(t->bannerBevel)
@@ -803,8 +803,8 @@ bool ThemeEngine::saveTheme()
}
};
- e = xmlDoc.createElement(TQString::tqfromLatin1("BannerBevel"));
- e.setAttribute(TQString::tqfromLatin1("value"), val);
+ e = xmlDoc.createElement(TQString::fromLatin1("BannerBevel"));
+ e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
switch(t->bannerGrad)
@@ -831,26 +831,26 @@ bool ThemeEngine::saveTheme()
}
};
- e = xmlDoc.createElement(TQString::tqfromLatin1("BannerGradient"));
- e.setAttribute(TQString::tqfromLatin1("value"), val);
+ e = xmlDoc.createElement(TQString::fromLatin1("BannerGradient"));
+ e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("BannerBorder"));
- e.setAttribute(TQString::tqfromLatin1("value"), (t->bannerBorder ? "TRUE" : "FALSE"));
+ e = xmlDoc.createElement(TQString::fromLatin1("BannerBorder"));
+ e.setAttribute(TQString::fromLatin1("value"), (t->bannerBorder ? "TRUE" : "FALSE"));
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("BannerBorderColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->bannerBorderColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("BannerBorderColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->bannerBorderColor.name()).upper());
themeElem.appendChild(e);
// thumbnail.regular props -------------------------------------------------
- e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbRegColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbRegColor.name()).upper());
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularColorTo"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbRegColorTo.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularColorTo"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbRegColorTo.name()).upper());
themeElem.appendChild(e);
switch(t->thumbRegBevel)
@@ -872,8 +872,8 @@ bool ThemeEngine::saveTheme()
}
};
- e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularBevel"));
- e.setAttribute(TQString::tqfromLatin1("value"), val);
+ e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularBevel"));
+ e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
switch(t->thumbRegGrad)
@@ -900,26 +900,26 @@ bool ThemeEngine::saveTheme()
}
};
- e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularGradient"));
- e.setAttribute(TQString::tqfromLatin1("value"), val);
+ e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularGradient"));
+ e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularBorder"));
- e.setAttribute(TQString::tqfromLatin1("value"), (t->thumbRegBorder ? "TRUE" : "FALSE"));
+ e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularBorder"));
+ e.setAttribute(TQString::fromLatin1("value"), (t->thumbRegBorder ? "TRUE" : "FALSE"));
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailRegularBorderColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbRegBorderColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularBorderColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbRegBorderColor.name()).upper());
themeElem.appendChild(e);
// thumbnail.selected props -------------------------------------------------
- e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbSelColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbSelColor.name()).upper());
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedColorTo"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbSelColorTo.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedColorTo"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbSelColorTo.name()).upper());
themeElem.appendChild(e);
switch(t->thumbSelBevel)
@@ -941,8 +941,8 @@ bool ThemeEngine::saveTheme()
}
};
- e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedBevel"));
- e.setAttribute(TQString::tqfromLatin1("value"), val);
+ e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedBevel"));
+ e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
switch(t->thumbSelGrad)
@@ -969,26 +969,26 @@ bool ThemeEngine::saveTheme()
}
};
- e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedGradient"));
- e.setAttribute(TQString::tqfromLatin1("value"), val);
+ e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedGradient"));
+ e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedBorder"));
- e.setAttribute(TQString::tqfromLatin1("value"), (t->thumbSelBorder ? "TRUE" : "FALSE"));
+ e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedBorder"));
+ e.setAttribute(TQString::fromLatin1("value"), (t->thumbSelBorder ? "TRUE" : "FALSE"));
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("ThumbnailSelectedBorderColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->thumbSelBorderColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedBorderColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->thumbSelBorderColor.name()).upper());
themeElem.appendChild(e);
// listview.regular props -------------------------------------------------
- e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listRegColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->listRegColor.name()).upper());
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularColorTo"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listRegColorTo.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularColorTo"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->listRegColorTo.name()).upper());
themeElem.appendChild(e);
switch(t->listRegBevel)
@@ -1010,8 +1010,8 @@ bool ThemeEngine::saveTheme()
}
};
- e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularBevel"));
- e.setAttribute(TQString::tqfromLatin1("value"), val);
+ e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularBevel"));
+ e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
switch(t->listRegGrad)
@@ -1038,26 +1038,26 @@ bool ThemeEngine::saveTheme()
}
};
- e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularGradient"));
- e.setAttribute(TQString::tqfromLatin1("value"), val);
+ e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularGradient"));
+ e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularBorder"));
- e.setAttribute(TQString::tqfromLatin1("value"), (t->listRegBorder ? "TRUE" : "FALSE"));
+ e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularBorder"));
+ e.setAttribute(TQString::fromLatin1("value"), (t->listRegBorder ? "TRUE" : "FALSE"));
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewRegularBorderColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listRegBorderColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularBorderColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->listRegBorderColor.name()).upper());
themeElem.appendChild(e);
// listview.selected props -------------------------------------------------
- e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listSelColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->listSelColor.name()).upper());
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedColorTo"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listSelColorTo.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedColorTo"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->listSelColorTo.name()).upper());
themeElem.appendChild(e);
switch(t->listSelBevel)
@@ -1079,8 +1079,8 @@ bool ThemeEngine::saveTheme()
}
};
- e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedBevel"));
- e.setAttribute(TQString::tqfromLatin1("value"), val);
+ e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedBevel"));
+ e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
switch(t->listSelGrad)
@@ -1107,16 +1107,16 @@ bool ThemeEngine::saveTheme()
}
};
- e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedGradient"));
- e.setAttribute(TQString::tqfromLatin1("value"), val);
+ e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedGradient"));
+ e.setAttribute(TQString::fromLatin1("value"), val);
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedBorder"));
- e.setAttribute(TQString::tqfromLatin1("value"), (t->listSelBorder ? "TRUE" : "FALSE"));
+ e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedBorder"));
+ e.setAttribute(TQString::fromLatin1("value"), (t->listSelBorder ? "TRUE" : "FALSE"));
themeElem.appendChild(e);
- e = xmlDoc.createElement(TQString::tqfromLatin1("ListviewSelectedBorderColor"));
- e.setAttribute(TQString::tqfromLatin1("value"), TQString(t->listSelBorderColor.name()).upper());
+ e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedBorderColor"));
+ e.setAttribute(TQString::fromLatin1("value"), TQString(t->listSelBorderColor.name()).upper());
themeElem.appendChild(e);
// -------------------------------------------------------------------------
diff --git a/digikam/libs/threadimageio/loadsavetask.cpp b/digikam/libs/threadimageio/loadsavetask.cpp
index 698f75b..585c4d9 100644
--- a/digikam/libs/threadimageio/loadsavetask.cpp
+++ b/digikam/libs/threadimageio/loadsavetask.cpp
@@ -78,7 +78,7 @@ void SavedEvent::notify(LoadSaveThread *thread)
void LoadingTask::execute()
{
- if (m_loadingTasktqStatus == LoadingTaskStatusStopping)
+ if (m_loadingTaskStatus == LoadingTaskStatusStopping)
return;
DImg img(m_loadingDescription.filePath, this, m_loadingDescription.rawDecodingSettings);
m_thread->taskHasFinished();
@@ -92,7 +92,7 @@ LoadingTask::TaskType LoadingTask::type()
void LoadingTask::progressInfo(const DImg *, float progress)
{
- if (m_loadingTasktqStatus == LoadingTaskStatusLoading)
+ if (m_loadingTaskStatus == LoadingTaskStatusLoading)
{
if (m_thread->querySendNotifyEvent())
TQApplication::postEvent(m_thread, new LoadingProgressEvent(m_loadingDescription.filePath, progress));
@@ -101,12 +101,12 @@ void LoadingTask::progressInfo(const DImg *, float progress)
bool LoadingTask::continueQuery(const DImg *)
{
- return m_loadingTasktqStatus != LoadingTaskStatusStopping;
+ return m_loadingTaskStatus != LoadingTaskStatusStopping;
}
-void LoadingTask::settqStatus(LoadingTasktqStatus status)
+void LoadingTask::setStatus(LoadingTaskStatus status)
{
- m_loadingTasktqStatus = status;
+ m_loadingTaskStatus = status;
}
@@ -123,7 +123,7 @@ bool LoadingTask::isShuttingDown()
void SharedLoadingTask::execute()
{
- if (m_loadingTasktqStatus == LoadingTaskStatusStopping)
+ if (m_loadingTaskStatus == LoadingTaskStatusStopping)
return;
// send StartedLoadingEvent from each single Task, not via LoadingProcess list
TQApplication::postEvent(m_thread, new StartedLoadingEvent(m_loadingDescription.filePath));
@@ -168,13 +168,13 @@ void SharedLoadingTask::execute()
// has finished.
m_usedProcess->addListener(this);
// break loop when either the loading has completed, or this task is being stopped
- while ( !m_usedProcess->completed() && m_loadingTasktqStatus != LoadingTaskStatusStopping )
+ while ( !m_usedProcess->completed() && m_loadingTaskStatus != LoadingTaskStatusStopping )
lock.timedWait();
// remove listener from process
m_usedProcess->removeListener(this);
// wake up the process which is waiting until all listeners have removed themselves
lock.wakeAll();
- // set to 0, as checked in settqStatus
+ // set to 0, as checked in setStatus
m_usedProcess = 0;
//DDebug() << "SharedLoadingTask " << this << ": waited" << endl;
return;
@@ -186,7 +186,7 @@ void SharedLoadingTask::execute()
cache->addLoadingProcess(this);
// Add this to the list of listeners
addListener(this);
- // for use in settqStatus
+ // for use in setStatus
m_usedProcess = this;
// Notify other processes that we are now loading this image.
// They might be interested - see notifyNewLoadingProcess below
@@ -284,14 +284,14 @@ void SharedLoadingTask::execute()
// wait until all listeners have removed themselves
while (m_listeners.count() != 0)
lock.timedWait();
- // set to 0, as checked in settqStatus
+ // set to 0, as checked in setStatus
m_usedProcess = 0;
}
}
void SharedLoadingTask::progressInfo(const DImg *, float progress)
{
- if (m_loadingTasktqStatus == LoadingTaskStatusLoading)
+ if (m_loadingTaskStatus == LoadingTaskStatusLoading)
{
LoadingCache *cache = LoadingCache::cache();
LoadingCache::CacheLock lock(cache);
@@ -308,13 +308,13 @@ bool SharedLoadingTask::continueQuery(const DImg *)
{
// If this is called, the thread is currently loading an image.
// In shared loading, we cannot stop until all listeners have been removed as well
- return (m_loadingTasktqStatus != LoadingTaskStatusStopping) || (m_listeners.count() != 0);
+ return (m_loadingTaskStatus != LoadingTaskStatusStopping) || (m_listeners.count() != 0);
}
-void SharedLoadingTask::settqStatus(LoadingTasktqStatus status)
+void SharedLoadingTask::setStatus(LoadingTaskStatus status)
{
- m_loadingTasktqStatus = status;
- if (m_loadingTasktqStatus == LoadingTaskStatusStopping)
+ m_loadingTaskStatus = status;
+ if (m_loadingTaskStatus == LoadingTaskStatusStopping)
{
LoadingCache *cache = LoadingCache::cache();
LoadingCache::CacheLock lock(cache);
@@ -413,12 +413,12 @@ void SavingTask::progressInfo(const DImg *, float progress)
bool SavingTask::continueQuery(const DImg *)
{
- return m_savingTasktqStatus != SavingTaskStatusStopping;
+ return m_savingTaskStatus != SavingTaskStatusStopping;
}
-void SavingTask::settqStatus(SavingTasktqStatus status)
+void SavingTask::setStatus(SavingTaskStatus status)
{
- m_savingTasktqStatus = status;
+ m_savingTaskStatus = status;
}
} //namespace Digikam
diff --git a/digikam/libs/threadimageio/loadsavetask.h b/digikam/libs/threadimageio/loadsavetask.h
index 13b2df2..833f86f 100644
--- a/digikam/libs/threadimageio/loadsavetask.h
+++ b/digikam/libs/threadimageio/loadsavetask.h
@@ -208,7 +208,7 @@ class LoadingTask : public LoadSaveTask, public DImgLoaderObserver
{
public:
- enum LoadingTasktqStatus
+ enum LoadingTaskStatus
{
LoadingTaskStatusLoading,
LoadingTaskStatusPreloading,
@@ -216,8 +216,8 @@ public:
};
LoadingTask(LoadSaveThread* thread, LoadingDescription description,
- LoadingTasktqStatus loadingTasktqStatus = LoadingTaskStatusLoading)
- : LoadSaveTask(thread), m_loadingDescription(description), m_loadingTasktqStatus(loadingTasktqStatus)
+ LoadingTaskStatus loadingTaskStatus = LoadingTaskStatusLoading)
+ : LoadSaveTask(thread), m_loadingDescription(description), m_loadingTaskStatus(loadingTaskStatus)
{}
// LoadSaveTask
@@ -231,11 +231,11 @@ public:
virtual bool continueQuery(const DImg *);
virtual bool isShuttingDown();
- virtual void settqStatus(LoadingTasktqStatus status);
+ virtual void setStatus(LoadingTaskStatus status);
- LoadingTasktqStatus status() const
+ LoadingTaskStatus status() const
{
- return m_loadingTasktqStatus;
+ return m_loadingTaskStatus;
}
TQString filePath() const
@@ -251,7 +251,7 @@ public:
protected:
LoadingDescription m_loadingDescription;
- LoadingTasktqStatus m_loadingTasktqStatus;
+ LoadingTaskStatus m_loadingTaskStatus;
};
//---------------------------------------------------------------------------------------------------
@@ -262,15 +262,15 @@ public:
SharedLoadingTask(LoadSaveThread* thread, LoadingDescription description,
LoadSaveThread::AccessMode mode = LoadSaveThread::AccessModeReadWrite,
- LoadingTasktqStatus loadingTasktqStatus = LoadingTaskStatusLoading)
- : LoadingTask(thread, description, loadingTasktqStatus),
+ LoadingTaskStatus loadingTaskStatus = LoadingTaskStatusLoading)
+ : LoadingTask(thread, description, loadingTaskStatus),
m_accessMode(mode), m_completed(false), m_usedProcess(0)
{}
virtual void execute();
virtual void progressInfo(const DImg *, float progress);
virtual bool continueQuery(const DImg *);
- virtual void settqStatus(LoadingTasktqStatus status);
+ virtual void setStatus(LoadingTaskStatus status);
// LoadingProcess
@@ -319,7 +319,7 @@ class SavingTask : public LoadSaveTask, public DImgLoaderObserver
{
public:
- enum SavingTasktqStatus
+ enum SavingTaskStatus
{
SavingTaskStatusSaving,
SavingTaskStatusStopping
@@ -335,11 +335,11 @@ public:
virtual void progressInfo(const DImg *, float progress);
virtual bool continueQuery(const DImg *);
- virtual void settqStatus(SavingTasktqStatus status);
+ virtual void setStatus(SavingTaskStatus status);
- SavingTasktqStatus status() const
+ SavingTaskStatus status() const
{
- return m_savingTasktqStatus;
+ return m_savingTaskStatus;
}
TQString filePath() const
@@ -352,7 +352,7 @@ private:
DImg m_img;
TQString m_filePath;
TQString m_format;
- SavingTasktqStatus m_savingTasktqStatus;
+ SavingTaskStatus m_savingTaskStatus;
};
} // namespace Digikam
diff --git a/digikam/libs/threadimageio/managedloadsavethread.cpp b/digikam/libs/threadimageio/managedloadsavethread.cpp
index 0f6768b..51d9f1b 100644
--- a/digikam/libs/threadimageio/managedloadsavethread.cpp
+++ b/digikam/libs/threadimageio/managedloadsavethread.cpp
@@ -46,7 +46,7 @@ ManagedLoadSaveThread::~ManagedLoadSaveThread()
{
TQMutexLocker lock(&m_mutex);
if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterAll)) )
- loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
+ loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
removeLoadingTasks(LoadingDescription(TQString()), LoadingTaskFilterAll);
break;
}
@@ -54,7 +54,7 @@ ManagedLoadSaveThread::~ManagedLoadSaveThread()
{
TQMutexLocker lock(&m_mutex);
if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading)) )
- loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
+ loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
removeLoadingTasks(LoadingDescription(TQString()), LoadingTaskFilterPreloading);
break;
}
@@ -125,13 +125,13 @@ void ManagedLoadSaveThread::load(LoadingDescription description, LoadingMode loa
// reuse task if it exists
if (existingTask)
{
- existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading);
+ existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading);
}
// stop current task
if (m_currentTask && m_currentTask != existingTask)
{
if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterAll)) )
- loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
+ loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
}
//DDebug() << "LoadingPolicyFirstRemovePrevious, Existing task " << existingTask <<
//", m_currentTask " << m_currentTask << ", loadingTask " << loadingTask << endl;
@@ -153,14 +153,14 @@ void ManagedLoadSaveThread::load(LoadingDescription description, LoadingMode loa
case LoadingPolicyPrepend:
if (existingTask)
{
- existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading);
+ existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading);
}
// stop and postpone current task if it is a preloading task
if (m_currentTask)
{
if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading)) )
{
- loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
+ loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
load(loadingTask->filePath(), LoadingPolicyPreload);
}
}
@@ -173,14 +173,14 @@ void ManagedLoadSaveThread::load(LoadingDescription description, LoadingMode loa
case LoadingPolicyAppend:
if (existingTask)
{
- existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading);
+ existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading);
}
// stop and postpone current task if it is a preloading task
if (m_currentTask)
{
if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading)) )
{
- loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
+ loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
load(loadingTask->filePath(), LoadingPolicyPreload);
}
}
@@ -222,13 +222,13 @@ void ManagedLoadSaveThread::loadPreview(LoadingDescription description)
// reuse task if it exists
if (existingTask)
{
- existingTask->settqStatus(LoadingTask::LoadingTaskStatusLoading);
+ existingTask->setStatus(LoadingTask::LoadingTaskStatusLoading);
}
// stop current task
if (m_currentTask && m_currentTask != existingTask)
{
if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterAll)) )
- loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
+ loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
}
// remove all loading tasks
for (LoadSaveTask *task = m_todo.first(); task; task = m_todo.next())
@@ -289,7 +289,7 @@ void ManagedLoadSaveThread::stopSaving(const TQString& filePath)
SavingTask *savingTask = (SavingTask *)m_currentTask;
if (filePath.isNull() || savingTask->filePath() == filePath)
{
- savingTask->settqStatus(SavingTask::SavingTaskStatusStopping);
+ savingTask->setStatus(SavingTask::SavingTaskStatusStopping);
}
}
@@ -318,7 +318,7 @@ void ManagedLoadSaveThread::removeLoadingTasks(const LoadingDescription &descrip
{
if (description.filePath.isNull() || loadingTask->loadingDescription() == description)
{
- loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
+ loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
}
}
@@ -344,7 +344,7 @@ void ManagedLoadSaveThread::save(DImg &image, const TQString& filePath, const TQ
// stop and postpone current task if it is a preloading task
if (m_currentTask && (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterPreloading)))
{
- loadingTask->settqStatus(LoadingTask::LoadingTaskStatusStopping);
+ loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
load(loadingTask->filePath(), LoadingPolicyPreload);
}
// append new loading task, put it in front of preloading tasks
diff --git a/digikam/libs/threadimageio/previewtask.cpp b/digikam/libs/threadimageio/previewtask.cpp
index 5c1d394..b0cc3c5 100644
--- a/digikam/libs/threadimageio/previewtask.cpp
+++ b/digikam/libs/threadimageio/previewtask.cpp
@@ -50,7 +50,7 @@ namespace Digikam
void PreviewLoadingTask::execute()
{
- if (m_loadingTasktqStatus == LoadingTaskStatusStopping)
+ if (m_loadingTaskStatus == LoadingTaskStatusStopping)
return;
LoadingCache *cache = LoadingCache::cache();
@@ -106,13 +106,13 @@ void PreviewLoadingTask::execute()
// has finished.
m_usedProcess->addListener(this);
// break loop when either the loading has completed, or this task is being stopped
- while ( !m_usedProcess->completed() && m_loadingTasktqStatus != LoadingTaskStatusStopping )
+ while ( !m_usedProcess->completed() && m_loadingTaskStatus != LoadingTaskStatusStopping )
lock.timedWait();
// remove listener from process
m_usedProcess->removeListener(this);
// wake up the process which is waiting until all listeners have removed themselves
lock.wakeAll();
- // set to 0, as checked in settqStatus
+ // set to 0, as checked in setStatus
m_usedProcess = 0;
return;
}
@@ -123,7 +123,7 @@ void PreviewLoadingTask::execute()
cache->addLoadingProcess(this);
// Add this to the list of listeners
addListener(this);
- // for use in settqStatus
+ // for use in setStatus
m_usedProcess = this;
// Notify other processes that we are now loading this image.
// They might be interested - see notifyNewLoadingProcess below
@@ -228,7 +228,7 @@ void PreviewLoadingTask::execute()
// wait until all listeners have removed themselves
while (m_listeners.count() != 0)
lock.timedWait();
- // set to 0, as checked in settqStatus
+ // set to 0, as checked in setStatus
m_usedProcess = 0;
}
}
diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp
index 091c055..9559d0f 100644
--- a/digikam/libs/thumbbar/thumbbar.cpp
+++ b/digikam/libs/thumbbar/thumbbar.cpp
@@ -206,13 +206,13 @@ void ThumbBarView::resizeEvent(TQResizeEvent* e)
if (d->orientation ==Qt::Vertical)
{
- d->tileSize = width() - 2*d->margin - verticalScrollBar()->tqsizeHint().width();
+ d->tileSize = width() - 2*d->margin - verticalScrollBar()->sizeHint().width();
verticalScrollBar()->setLineStep(d->tileSize);
verticalScrollBar()->setPageStep(2*d->tileSize);
}
else
{
- d->tileSize = height() - 2*d->margin - horizontalScrollBar()->tqsizeHint().height();
+ d->tileSize = height() - 2*d->margin - horizontalScrollBar()->sizeHint().height();
horizontalScrollBar()->setLineStep(d->tileSize);
horizontalScrollBar()->setPageStep(2*d->tileSize);
}
@@ -480,7 +480,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e)
x2 = ((x1 + er.width())/ts +1)*ts;
}
- bgPix.fill(tqcolorGroup().background());
+ bgPix.fill(colorGroup().background());
for (ThumbBarItem *item = d->firstItem; item; item = item->d->next)
{
@@ -489,9 +489,9 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e)
if (y1 <= item->d->pos && item->d->pos <= y2)
{
if (item == d->currItem)
- tile.fill(tqcolorGroup().highlight());
+ tile.fill(colorGroup().highlight());
else
- tile.fill(tqcolorGroup().background());
+ tile.fill(colorGroup().background());
TQPainter p(&tile);
p.setPen(TQt::white);
@@ -516,9 +516,9 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e)
if (x1 <= item->d->pos && item->d->pos <= x2)
{
if (item == d->currItem)
- tile.fill(tqcolorGroup().highlight());
+ tile.fill(colorGroup().highlight());
else
- tile.fill(tqcolorGroup().background());
+ tile.fill(colorGroup().background());
TQPainter p(&tile);
p.setPen(TQt::white);
diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp
index d464116..ac70ee3 100644
--- a/digikam/libs/widgets/common/curveswidget.cpp
+++ b/digikam/libs/widgets/common/curveswidget.cpp
@@ -148,7 +148,7 @@ void CurvesWidget::setup(int w, int h, bool readOnly)
m_imageHistogram = 0;
setMouseTracking(true);
- setPaletteBackgroundColor(tqcolorGroup().background());
+ setPaletteBackgroundColor(colorGroup().background());
setMinimumSize(w, h);
d->blinkTimer = new TQTimer( this );
diff --git a/digikam/libs/widgets/common/dcursortracker.cpp b/digikam/libs/widgets/common/dcursortracker.cpp
index fc82060..2e3ae53 100644
--- a/digikam/libs/widgets/common/dcursortracker.cpp
+++ b/digikam/libs/widgets/common/dcursortracker.cpp
@@ -103,7 +103,7 @@ DTipTracker::DTipTracker(const TQString& txt, TQWidget *parent)
setPalette(TQToolTip::palette());
setFrameStyle(TQFrame::Plain | TQFrame::Box);
setLineWidth(1);
- tqsetAlignment(AlignAuto | AlignTop);
+ setAlignment(AlignAuto | AlignTop);
}
} // namespace Digikam
diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp
index de82a75..5d0e400 100644
--- a/digikam/libs/widgets/common/dlogoaction.cpp
+++ b/digikam/libs/widgets/common/dlogoaction.cpp
@@ -62,7 +62,7 @@ int DLogoAction::plug(TQWidget *widget, int index)
KURLLabel *pixmapLogo = new KURLLabel(Digikam::webProjectUrl(), TQString(), bar);
pixmapLogo->setMargin(0);
pixmapLogo->setScaledContents(false);
- pixmapLogo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+ pixmapLogo->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website"));
KGlobal::dirs()->addResourceType("banner-digikam", KGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = KGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png");
diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp
index 10bcef0..04b0a5a 100644
--- a/digikam/libs/widgets/common/dpopupmenu.cpp
+++ b/digikam/libs/widgets/common/dpopupmenu.cpp
@@ -84,7 +84,7 @@ int DPopupMenu::sidePixmapWidth() const
TQRect DPopupMenu::sideImageRect() const
{
- return TQStyle::tqvisualRect(TQRect(frameWidth(), frameWidth(),
+ return TQStyle::visualRect(TQRect(frameWidth(), frameWidth(),
s_dpopupmenu_sidePixmap.width(),
height() - 2*frameWidth()),
this);
@@ -153,7 +153,7 @@ void DPopupMenu::resizeEvent(TQResizeEvent * e)
{
KPopupMenu::resizeEvent(e);
- setFrameRect(TQStyle::tqvisualRect(TQRect(s_dpopupmenu_sidePixmap.width(), 0,
+ setFrameRect(TQStyle::visualRect(TQRect(s_dpopupmenu_sidePixmap.width(), 0,
width() - s_dpopupmenu_sidePixmap.width(), height()),
this ) );
}
@@ -161,7 +161,7 @@ void DPopupMenu::resizeEvent(TQResizeEvent * e)
//Workaround TQt3.3.x sizing bug, by ensuring we're always wide enough.
void DPopupMenu::resize(int width, int height)
{
- width = kMax(width, tqmaximumSize().width());
+ width = kMax(width, maximumSize().width());
KPopupMenu::resize(width, height);
}
@@ -190,7 +190,7 @@ void DPopupMenu::paintEvent(TQPaintEvent* e)
tqstyle().tqdrawPrimitive(TQStyle::PE_PanelPopup, &p,
TQRect(0, 0, width(), height()),
- tqcolorGroup(), TQStyle::Style_Default,
+ colorGroup(), TQStyle::Style_Default,
TQStyleOption( frameWidth(), 0));
}
diff --git a/digikam/libs/widgets/common/paniconwidget.cpp b/digikam/libs/widgets/common/paniconwidget.cpp
index 7f7fcc3..cd917f6 100644
--- a/digikam/libs/widgets/common/paniconwidget.cpp
+++ b/digikam/libs/widgets/common/paniconwidget.cpp
@@ -192,7 +192,7 @@ void PanIconWidget::regionSelectionMoved(bool targetDone)
void PanIconWidget::updatePixmap()
{
// Drawing background and image.
- m_pixmap->fill(tqcolorGroup().background());
+ m_pixmap->fill(colorGroup().background());
bitBlt(m_pixmap, m_rect.x(), m_rect.y(), &d->image, 0, 0);
TQPainter p(m_pixmap);
diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp
index e7f9e73..30c0c7b 100644
--- a/digikam/libs/widgets/common/searchtextbar.cpp
+++ b/digikam/libs/widgets/common/searchtextbar.cpp
@@ -172,7 +172,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString
kcom->setOrder(KCompletion::Sorted);
d->searchEdit->setCompletionObject(kcom, true);
d->searchEdit->setAutoDeleteCompletionObject(true);
- d->searchEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+ d->searchEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
hlay->setSpacing(0);
hlay->setMargin(0);
diff --git a/digikam/libs/widgets/common/splashscreen.cpp b/digikam/libs/widgets/common/splashscreen.cpp
index 8294d97..05ae620 100644
--- a/digikam/libs/widgets/common/splashscreen.cpp
+++ b/digikam/libs/widgets/common/splashscreen.cpp
@@ -93,7 +93,7 @@ void SplashScreen::setColor(const TQColor& color)
{
d->color = color;
}
-void SplashScreen::tqsetAlignment(int tqalignment)
+void SplashScreen::setAlignment(int tqalignment)
{
d->tqalignment = tqalignment;
}
diff --git a/digikam/libs/widgets/common/splashscreen.h b/digikam/libs/widgets/common/splashscreen.h
index 9845c81..294b360 100644
--- a/digikam/libs/widgets/common/splashscreen.h
+++ b/digikam/libs/widgets/common/splashscreen.h
@@ -52,7 +52,7 @@ public:
SplashScreen(const TQString& splash, WFlags f=0);
virtual ~SplashScreen();
- void tqsetAlignment(int tqalignment);
+ void setAlignment(int tqalignment);
void setColor(const TQColor& color);
protected:
diff --git a/digikam/libs/widgets/common/squeezedcombobox.cpp b/digikam/libs/widgets/common/squeezedcombobox.cpp
index 470f40f..ab8163d 100644
--- a/digikam/libs/widgets/common/squeezedcombobox.cpp
+++ b/digikam/libs/widgets/common/squeezedcombobox.cpp
@@ -89,7 +89,7 @@ SqueezedComboBox::~SqueezedComboBox()
delete d;
}
-TQSize SqueezedComboBox::tqsizeHint() const
+TQSize SqueezedComboBox::sizeHint() const
{
constPolish();
TQFontMetrics fm = fontMetrics();
@@ -188,7 +188,7 @@ void SqueezedComboBoxTip::maybeTip(const TQPoint &pos)
TQListBoxItem* selectedItem = listBox->itemAt( pos );
if (selectedItem)
{
- TQRect positionToolTip = listBox->tqitemRect(selectedItem);
+ TQRect positionToolTip = listBox->itemRect(selectedItem);
TQString toolTipText = m_originalWidget->itemHighlighted();
if (!toolTipText.isNull())
tip(positionToolTip, toolTipText);
diff --git a/digikam/libs/widgets/common/squeezedcombobox.h b/digikam/libs/widgets/common/squeezedcombobox.h
index d85b81d..87bd691 100644
--- a/digikam/libs/widgets/common/squeezedcombobox.h
+++ b/digikam/libs/widgets/common/squeezedcombobox.h
@@ -100,9 +100,9 @@ public:
TQString itemHighlighted();
/**
- * Sets the tqsizeHint() of this widget.
+ * Sets the sizeHint() of this widget.
*/
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
private slots:
diff --git a/digikam/libs/widgets/common/statusprogressbar.cpp b/digikam/libs/widgets/common/statusprogressbar.cpp
index 52d33b3..31bcbd5 100644
--- a/digikam/libs/widgets/common/statusprogressbar.cpp
+++ b/digikam/libs/widgets/common/statusprogressbar.cpp
@@ -86,7 +86,7 @@ StatusProgressBar::StatusProgressBar(TQWidget *parent)
setProgressTotalSteps(100);
d->cancelButton = new TQPushButton(d->progressWidget);
d->cancelButton->setFocusPolicy(TQ_NoFocus);
- d->cancelButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+ d->cancelButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
d->cancelButton->setPixmap(SmallIcon("cancel"));
// Parent widget will probably have the wait cursor set.
@@ -115,9 +115,9 @@ void StatusProgressBar::setText(const TQString& text)
d->textLabel->setText(text);
}
-void StatusProgressBar::tqsetAlignment(int a)
+void StatusProgressBar::setAlignment(int a)
{
- d->textLabel->tqsetAlignment(a);
+ d->textLabel->setAlignment(a);
}
int StatusProgressBar::progressValue()
diff --git a/digikam/libs/widgets/common/statusprogressbar.h b/digikam/libs/widgets/common/statusprogressbar.h
index f4292bb..0b0866b 100644
--- a/digikam/libs/widgets/common/statusprogressbar.h
+++ b/digikam/libs/widgets/common/statusprogressbar.h
@@ -58,7 +58,7 @@ public:
StatusProgressBar(TQWidget *parent=0);
~StatusProgressBar();
- void tqsetAlignment(int a);
+ void setAlignment(int a);
void progressBarMode(int mode, const TQString& text=TQString());
diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp
index 07f0541..0d84d4d 100644
--- a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp
@@ -235,7 +235,7 @@ void ImageGuideWidget::updatePixmap()
TQFontMetrics fontMt = p.fontMetrics();
p.setPen(TQPen(TQt::red, 1)) ;
- d->pixmap->fill(tqcolorGroup().background());
+ d->pixmap->fill(colorGroup().background());
if (d->renderingPreviewMode == PreviewOriginalImage ||
(d->renderingPreviewMode == PreviewToggleOnMouseOver && d->onMouseMovePreviewToggled == false ))
@@ -303,7 +303,7 @@ void ImageGuideWidget::updatePixmap()
}
// Drawing the information and others stuff.
- p.fillRect(d->rect.right(), 0, width(), height(), tqcolorGroup().background());
+ p.fillRect(d->rect.right(), 0, width(), height(), colorGroup().background());
p.setPen(TQPen(TQt::white, 2, TQt::SolidLine));
p.drawLine(d->rect.x()+d->rect.width()/2-1,
@@ -368,7 +368,7 @@ void ImageGuideWidget::updatePixmap()
0, 0, d->rect.width(), d->rect.height()/2);
}
- p.fillRect(0, d->rect.bottom(), width(), height(), tqcolorGroup().background());
+ p.fillRect(0, d->rect.bottom(), width(), height(), colorGroup().background());
p.setPen(TQPen(TQt::white, 2, TQt::SolidLine));
p.drawLine(d->rect.x(),
diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp
index 0d16724..2d11e70 100644
--- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp
@@ -103,7 +103,7 @@ void ImagePanIconWidget::setHighLightPoints(const TQPointArray& pointsList)
void ImagePanIconWidget::updatePixmap()
{
// Drawing background and image.
- m_pixmap->fill(tqcolorGroup().background());
+ m_pixmap->fill(colorGroup().background());
d->iface->paint(TQT_TQPAINTDEVICE(m_pixmap), m_rect.x(), m_rect.y(), m_rect.width(), m_rect.height());
TQPainter p(m_pixmap);
diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
index 5f3b3ba..59fcf00 100644
--- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
@@ -132,7 +132,7 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec
l1->addWidget(d->imageRegionWidget, 0);
TQSizePolicy rightSzPolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 2, 1);
- d->previewWidget->tqsetSizePolicy(rightSzPolicy);
+ d->previewWidget->setSizePolicy(rightSzPolicy);
// -------------------------------------------------------------
diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp
index 6975968..c00348a 100644
--- a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp
@@ -87,7 +87,7 @@ ImageRegionWidget::ImageRegionWidget(int wp, int hp, TQWidget *parent, bool scro
d->image = d->iface->getOriginalImg()->copy();
setMinimumSize(wp, hp);
- setBackgroundColor(tqcolorGroup().background());
+ setBackgroundColor(colorGroup().background());
if( !scrollBar )
{
diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp
index c6667d9..c5e1177 100644
--- a/digikam/libs/widgets/imageplugins/imagewidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp
@@ -87,7 +87,7 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent,
TQGridLayout* grid = new TQGridLayout(this, 2, 3);
d->spotInfoLabel = new KSqueezedTextLabel(this);
- d->spotInfoLabel->tqsetAlignment(TQt::AlignRight);
+ d->spotInfoLabel->setAlignment(TQt::AlignRight);
// -------------------------------------------------------------
diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp
index ee7764d..f9cd999 100644
--- a/digikam/libs/widgets/metadata/metadatawidget.cpp
+++ b/digikam/libs/widgets/metadata/metadatawidget.cpp
@@ -354,7 +354,7 @@ void MetadataWidget::slotPrintMetadata()
do
{
- richText.draw( &p, margin, margin, view, tqcolorGroup() );
+ richText.draw( &p, margin, margin, view, colorGroup() );
view.moveBy( 0, view.height() );
p.translate( 0 , -view.height() );
p.setFont( font );
diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/digikam/libs/widgets/metadata/worldmapwidget.cpp
index 6cf7771..d690a39 100644
--- a/digikam/libs/widgets/metadata/worldmapwidget.cpp
+++ b/digikam/libs/widgets/metadata/worldmapwidget.cpp
@@ -81,14 +81,14 @@ WorldMapWidget::WorldMapWidget(int w, int h, TQWidget *parent)
setVScrollBarMode(TQScrollView::AlwaysOff);
setHScrollBarMode(TQScrollView::AlwaysOff);
viewport()->setMouseTracking(true);
- viewport()->setPaletteBackgroundColor(tqcolorGroup().background());
+ viewport()->setPaletteBackgroundColor(colorGroup().background());
setMinimumWidth(w);
setMaximumHeight(h);
resizeContents(worldMapPixmap().width(), worldMapPixmap().height());
d->latLonPos = new TQLabel(viewport());
d->latLonPos->setMaximumHeight(fontMetrics().height());
- d->latLonPos->tqsetAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
+ d->latLonPos->setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
d->latLonPos->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
addChild(d->latLonPos);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 08:06:57 +0000