summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-09-02 15:47:37 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-09-02 15:47:37 +0900
commit8f6e6791ffb61316ca86e08dd79fa68a33768bf3 (patch)
tree19df064d3dce550d29dc6161bbac985d5c46c822
parentd3ac9f6e7fffd7c6f5b459ad0c7f7e3d39c8b840 (diff)
downloaddigikam-8f6e6791ffb61316ca86e08dd79fa68a33768bf3.tar.gz
digikam-8f6e6791ffb61316ca86e08dd79fa68a33768bf3.zip
Replace TQ_*Focus* and TQ_Scale* defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--digikam/digikam/iconview.cpp2
-rw-r--r--digikam/digikam/syncjob.cpp2
-rw-r--r--digikam/digikam/timelineview.cpp2
-rw-r--r--digikam/digikam/welcomepageview.cpp2
-rw-r--r--digikam/imageplugins/hotpixels/blackframelistview.cpp2
-rw-r--r--digikam/libs/dialogs/dprogressdlg.cpp4
-rw-r--r--digikam/libs/dialogs/imagedialog.cpp2
-rw-r--r--digikam/libs/jpegutils/jpegutils.cpp4
-rw-r--r--digikam/libs/thumbbar/thumbbar.cpp4
-rw-r--r--digikam/libs/widgets/common/dlogoaction.cpp2
-rw-r--r--digikam/libs/widgets/common/searchtextbar.cpp2
-rw-r--r--digikam/libs/widgets/common/statusled.cpp2
-rw-r--r--digikam/libs/widgets/common/statusnavigatebar.cpp10
-rw-r--r--digikam/libs/widgets/common/statusprogressbar.cpp4
-rw-r--r--digikam/libs/widgets/common/statuszoombar.cpp8
-rw-r--r--digikam/tdeioslave/digikamthumbnail.cpp4
-rw-r--r--digikam/utilities/cameragui/cameracontroller.cpp2
-rw-r--r--digikam/utilities/cameragui/cameraiconitem.cpp2
-rw-r--r--digikam/utilities/cameragui/cameraui.cpp2
-rw-r--r--digikam/utilities/imageeditor/canvas/dimginterface.cpp2
-rw-r--r--digikam/utilities/imageeditor/editor/editorwindow.cpp4
-rw-r--r--digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp2
-rw-r--r--digikam/utilities/lighttable/lighttablebar.cpp4
23 files changed, 37 insertions, 37 deletions
diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp
index e71e103..b76761c 100644
--- a/digikam/digikam/iconview.cpp
+++ b/digikam/digikam/iconview.cpp
@@ -138,7 +138,7 @@ IconView::IconView(TQWidget* parent, const char* name)
{
viewport()->setBackgroundMode(TQt::NoBackground);
viewport()->setFocusProxy(this);
- viewport()->setFocusPolicy(TQ_WheelFocus);
+ viewport()->setFocusPolicy(TQWidget::WheelFocus);
viewport()->setMouseTracking(true);
d = new IconViewPriv;
diff --git a/digikam/digikam/syncjob.cpp b/digikam/digikam/syncjob.cpp
index 44b6829..ea04642 100644
--- a/digikam/digikam/syncjob.cpp
+++ b/digikam/digikam/syncjob.cpp
@@ -146,7 +146,7 @@ bool SyncJob::fileMovePriv(const KURL &src, const KURL &dest)
void SyncJob::enter_loop()
{
TQWidget dummy(0,0,WType_Dialog | WShowModal);
- dummy.setFocusPolicy( TQ_NoFocus );
+ dummy.setFocusPolicy( TQWidget::NoFocus );
tqt_enter_modal(&dummy);
tqApp->enter_loop();
tqt_leave_modal(&dummy);
diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp
index 1951d43..4e63523 100644
--- a/digikam/digikam/timelineview.cpp
+++ b/digikam/digikam/timelineview.cpp
@@ -138,7 +138,7 @@ TimeLineView::TimeLineView(TQWidget *parent)
d->timeUnitCB->insertItem(i18n("Month"), TimeLineWidget::Month);
d->timeUnitCB->insertItem(i18n("Year"), TimeLineWidget::Year);
d->timeUnitCB->setCurrentItem((int)TimeLineWidget::Month);
- d->timeUnitCB->setFocusPolicy(TQ_NoFocus);
+ d->timeUnitCB->setFocusPolicy(TQWidget::NoFocus);
TQWhatsThis::add(d->timeUnitCB, i18n("<p>Select the histogram time unit here.<p>"
"You can change the graph decade to zoom in or zoom out over time."));
diff --git a/digikam/digikam/welcomepageview.cpp b/digikam/digikam/welcomepageview.cpp
index eef7e74..1b6c831 100644
--- a/digikam/digikam/welcomepageview.cpp
+++ b/digikam/digikam/welcomepageview.cpp
@@ -50,7 +50,7 @@ namespace Digikam
WelcomePageView::WelcomePageView(TQWidget* parent)
: TDEHTMLPart(parent)
{
- widget()->setFocusPolicy(TQ_WheelFocus);
+ widget()->setFocusPolicy(TQWidget::WheelFocus);
// Let's better be paranoid and disable plugins (it defaults to enabled):
setPluginsEnabled(false);
setJScriptEnabled(false); // just make this explicit.
diff --git a/digikam/imageplugins/hotpixels/blackframelistview.cpp b/digikam/imageplugins/hotpixels/blackframelistview.cpp
index 35fa8f7..20f8cbd 100644
--- a/digikam/imageplugins/hotpixels/blackframelistview.cpp
+++ b/digikam/imageplugins/hotpixels/blackframelistview.cpp
@@ -132,7 +132,7 @@ TQPixmap BlackFrameListViewItem::thumb(const TQSize& size)
TQPixmap thumb;
//First scale it down to the size
- thumb = m_image.smoothScale(size, TQ_ScaleMin);
+ thumb = m_image.smoothScale(size, TQImage::ScaleMin);
//And draw the hot pixel positions on the thumb
TQPainter p(&thumb);
diff --git a/digikam/libs/dialogs/dprogressdlg.cpp b/digikam/libs/dialogs/dprogressdlg.cpp
index 754047d..d4b0dc2 100644
--- a/digikam/libs/dialogs/dprogressdlg.cpp
+++ b/digikam/libs/dialogs/dprogressdlg.cpp
@@ -144,11 +144,11 @@ void DProgressDlg::addedAction(const TQPixmap& pix, const TQString &text)
"image-broken.png");
dir = dir + "/image-broken.png";
TQPixmap pixbi(dir);
- img = pixbi.convertToImage().scale(32, 32, TQ_ScaleMin);
+ img = pixbi.convertToImage().scale(32, 32, TQImage::ScaleMin);
}
else
{
- img = pix.convertToImage().scale(32, 32, TQ_ScaleMin);
+ img = pix.convertToImage().scale(32, 32, TQImage::ScaleMin);
}
TQPixmap pixmap(img);
diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp
index 4473024..5304126 100644
--- a/digikam/libs/dialogs/imagedialog.cpp
+++ b/digikam/libs/dialogs/imagedialog.cpp
@@ -219,7 +219,7 @@ void ImageDialogPreview::slotGotThumbnail(const KURL& url, const TQPixmap& pix)
TQSize s = d->imageLabel->contentsRect().size();
if (s.width() < pix.width() || s.height() < pix.height())
- pixmap = pix.convertToImage().smoothScale(s, TQ_ScaleMin);
+ pixmap = pix.convertToImage().smoothScale(s, TQImage::ScaleMin);
else
pixmap = pix;
diff --git a/digikam/libs/jpegutils/jpegutils.cpp b/digikam/libs/jpegutils/jpegutils.cpp
index 2db3402..2f2aabb 100644
--- a/digikam/libs/jpegutils/jpegutils.cpp
+++ b/digikam/libs/jpegutils/jpegutils.cpp
@@ -423,7 +423,7 @@ bool exifRotate(const TQString& file, const TQString& documentName)
metaData.setImageDimensions(img.size());
// Update the image thumbnail.
- TQImage thumb = img.scale(160, 120, TQ_ScaleMin);
+ TQImage thumb = img.scale(160, 120, TQImage::ScaleMin);
metaData.setExifThumbnail(thumb);
// Update Exif Document Name tag (the orinal file name from camera for example).
@@ -495,7 +495,7 @@ bool jpegConvert(const TQString& src, const TQString& dest, const TQString& docu
meta.setImagePreview(preview);
// Update Exif thumbnail.
- TQImage thumb = preview.smoothScale(160, 120, TQ_ScaleMin);
+ TQImage thumb = preview.smoothScale(160, 120, TQImage::ScaleMin);
meta.setExifThumbnail(thumb);
// Update Exif Document Name tag (the orinal file name from camera for example).
diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp
index 53fa9b0..2735b7d 100644
--- a/digikam/libs/thumbbar/thumbbar.cpp
+++ b/digikam/libs/thumbbar/thumbbar.cpp
@@ -502,7 +502,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e)
{
TQPixmap pix;
pix.convertFromImage(TQImage(item->d->pixmap->convertToImage()).
- smoothScale(d->tileSize, d->tileSize, TQ_ScaleMin));
+ smoothScale(d->tileSize, d->tileSize, TQImage::ScaleMin));
int x = (tile.width() - pix.width())/2;
int y = (tile.height() - pix.height())/2;
bitBlt(&tile, x, y, &pix);
@@ -529,7 +529,7 @@ void ThumbBarView::viewportPaintEvent(TQPaintEvent* e)
{
TQPixmap pix;
pix.convertFromImage(TQImage(item->d->pixmap->convertToImage()).
- smoothScale(d->tileSize, d->tileSize, TQ_ScaleMin));
+ smoothScale(d->tileSize, d->tileSize, TQImage::ScaleMin));
int x = (tile.width() - pix.width())/2;
int y = (tile.height()- pix.height())/2;
bitBlt(&tile, x, y, &pix);
diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp
index eea2bc4..26e37fc 100644
--- a/digikam/libs/widgets/common/dlogoaction.cpp
+++ b/digikam/libs/widgets/common/dlogoaction.cpp
@@ -67,7 +67,7 @@ int DLogoAction::plug(TQWidget *widget, int index)
TDEGlobal::dirs()->addResourceType("banner-digikam", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = TDEGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png");
pixmapLogo->setPixmap(TQPixmap( directory + "banner-digikam.png" ));
- pixmapLogo->setFocusPolicy(TQ_NoFocus);
+ pixmapLogo->setFocusPolicy(TQWidget::NoFocus);
bar->insertWidget(id, pixmapLogo->width(), pixmapLogo);
bar->alignItemRight(id);
diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp
index a6379c4..1eb4c27 100644
--- a/digikam/libs/widgets/common/searchtextbar.cpp
+++ b/digikam/libs/widgets/common/searchtextbar.cpp
@@ -156,7 +156,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new SearchTextBarPriv;
- setFocusPolicy(TQ_NoFocus);
+ setFocusPolicy(TQWidget::NoFocus);
setName(name);
TQHBoxLayout *hlay = new TQHBoxLayout(this);
diff --git a/digikam/libs/widgets/common/statusled.cpp b/digikam/libs/widgets/common/statusled.cpp
index 7d71c7f..e047505 100644
--- a/digikam/libs/widgets/common/statusled.cpp
+++ b/digikam/libs/widgets/common/statusled.cpp
@@ -43,7 +43,7 @@ StatusLed::StatusLed(TQWidget *parent)
: TQLabel(parent)
{
setLedColor(Gray);
- setFocusPolicy(TQ_NoFocus);
+ setFocusPolicy(TQWidget::NoFocus);
}
StatusLed::~StatusLed()
diff --git a/digikam/libs/widgets/common/statusnavigatebar.cpp b/digikam/libs/widgets/common/statusnavigatebar.cpp
index c2a3d40..2eb43c5 100644
--- a/digikam/libs/widgets/common/statusnavigatebar.cpp
+++ b/digikam/libs/widgets/common/statusnavigatebar.cpp
@@ -66,30 +66,30 @@ StatusNavigateBar::StatusNavigateBar(TQWidget *parent)
: TQWidget(parent, 0, TQt::WDestructiveClose)
{
d = new StatusNavigateBarPriv;
- setFocusPolicy(TQ_NoFocus);
+ setFocusPolicy(TQWidget::NoFocus);
TQHBoxLayout *lay = new TQHBoxLayout(this);
d->firstButton = new TQToolButton(this);
- d->firstButton->setFocusPolicy(TQ_NoFocus);
+ d->firstButton->setFocusPolicy(TQWidget::NoFocus);
d->firstButton->setAutoRaise(true);
d->firstButton->setIconSet(SmallIconSet("go-first"));
TQToolTip::add(d->firstButton, i18n("Go to the first item"));
d->prevButton = new TQToolButton(this);
- d->prevButton->setFocusPolicy(TQ_NoFocus);
+ d->prevButton->setFocusPolicy(TQWidget::NoFocus);
d->prevButton->setAutoRaise(true);
d->prevButton->setIconSet(SmallIconSet("back"));
TQToolTip::add(d->prevButton, i18n("Go to the previous item"));
d->nextButton = new TQToolButton(this);
- d->nextButton->setFocusPolicy(TQ_NoFocus);
+ d->nextButton->setFocusPolicy(TQWidget::NoFocus);
d->nextButton->setAutoRaise(true);
d->nextButton->setIconSet(SmallIconSet("forward"));
TQToolTip::add(d->nextButton, i18n("Go to the next item"));
d->lastButton = new TQToolButton(this);
- d->lastButton->setFocusPolicy(TQ_NoFocus);
+ d->lastButton->setFocusPolicy(TQWidget::NoFocus);
d->lastButton->setAutoRaise(true);
d->lastButton->setIconSet(SmallIconSet("go-last"));
TQToolTip::add(d->lastButton, i18n("Go to the last item"));
diff --git a/digikam/libs/widgets/common/statusprogressbar.cpp b/digikam/libs/widgets/common/statusprogressbar.cpp
index 54c7f3b..c4991d3 100644
--- a/digikam/libs/widgets/common/statusprogressbar.cpp
+++ b/digikam/libs/widgets/common/statusprogressbar.cpp
@@ -77,7 +77,7 @@ StatusProgressBar::StatusProgressBar(TQWidget *parent)
: TQWidgetStack(parent, 0, TQt::WDestructiveClose)
{
d = new StatusProgressBarPriv;
- setFocusPolicy(TQ_NoFocus);
+ setFocusPolicy(TQWidget::NoFocus);
d->textLabel = new KSqueezedTextLabel(this);
d->progressWidget = new TQWidget(this);
@@ -85,7 +85,7 @@ StatusProgressBar::StatusProgressBar(TQWidget *parent)
d->progressBar = new KProgress(d->progressWidget);
setProgressTotalSteps(100);
d->cancelButton = new TQPushButton(d->progressWidget);
- d->cancelButton->setFocusPolicy(TQ_NoFocus);
+ d->cancelButton->setFocusPolicy(TQWidget::NoFocus);
d->cancelButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
d->cancelButton->setPixmap(SmallIcon("cancel"));
diff --git a/digikam/libs/widgets/common/statuszoombar.cpp b/digikam/libs/widgets/common/statuszoombar.cpp
index 3fe5658..047e0a1 100644
--- a/digikam/libs/widgets/common/statuszoombar.cpp
+++ b/digikam/libs/widgets/common/statuszoombar.cpp
@@ -104,11 +104,11 @@ StatusZoomBar::StatusZoomBar(TQWidget *parent)
: TQHBox(parent, 0, TQt::WDestructiveClose)
{
d = new StatusZoomBarPriv;
- setFocusPolicy(TQ_NoFocus);
+ setFocusPolicy(TQWidget::NoFocus);
d->zoomMinusButton = new TQToolButton(this);
d->zoomMinusButton->setAutoRaise(true);
- d->zoomMinusButton->setFocusPolicy(TQ_NoFocus);
+ d->zoomMinusButton->setFocusPolicy(TQWidget::NoFocus);
d->zoomMinusButton->setIconSet(SmallIconSet("zoom-out"));
TQToolTip::add(d->zoomMinusButton, i18n("Zoom Out"));
@@ -121,12 +121,12 @@ StatusZoomBar::StatusZoomBar(TQWidget *parent)
d->zoomSlider->setLineStep(ThumbnailSize::Step);
d->zoomSlider->setMaximumHeight(fontMetrics().height()+2);
d->zoomSlider->setFixedWidth(120);
- d->zoomSlider->setFocusPolicy(TQ_NoFocus);
+ d->zoomSlider->setFocusPolicy(TQWidget::NoFocus);
d->zoomPlusButton = new TQToolButton(this);
d->zoomPlusButton->setAutoRaise(true);
d->zoomPlusButton->setIconSet(SmallIconSet("zoom-in"));
- d->zoomPlusButton->setFocusPolicy(TQ_NoFocus);
+ d->zoomPlusButton->setFocusPolicy(TQWidget::NoFocus);
TQToolTip::add(d->zoomPlusButton, i18n("Zoom In"));
d->zoomTracker = new DTipTracker("", d->zoomSlider);
diff --git a/digikam/tdeioslave/digikamthumbnail.cpp b/digikam/tdeioslave/digikamthumbnail.cpp
index f5d9dc8..3dd4df2 100644
--- a/digikam/tdeioslave/digikamthumbnail.cpp
+++ b/digikam/tdeioslave/digikamthumbnail.cpp
@@ -185,7 +185,7 @@ void tdeio_digikamthumbnailProtocol::get(const KURL& url)
}
if (TQMAX(img.width(),img.height()) != cachedSize_)
- img = img.smoothScale(cachedSize_, cachedSize_, TQ_ScaleMin);
+ img = img.smoothScale(cachedSize_, cachedSize_, TQImage::ScaleMin);
if (img.depth() != 32)
img = img.convertDepth(32);
@@ -206,7 +206,7 @@ void tdeio_digikamthumbnailProtocol::get(const KURL& url)
}
}
- img = img.smoothScale(size, size, TQ_ScaleMin);
+ img = img.smoothScale(size, size, TQImage::ScaleMin);
if (img.isNull())
{
diff --git a/digikam/utilities/cameragui/cameracontroller.cpp b/digikam/utilities/cameragui/cameracontroller.cpp
index 947df78..78fcbc6 100644
--- a/digikam/utilities/cameragui/cameracontroller.cpp
+++ b/digikam/utilities/cameragui/cameracontroller.cpp
@@ -308,7 +308,7 @@ void CameraThread::run()
if (!thumbnail.isNull())
{
- thumbnail = thumbnail.smoothScale(ThumbnailSize::Huge, ThumbnailSize::Huge, TQ_ScaleMin);
+ thumbnail = thumbnail.smoothScale(ThumbnailSize::Huge, ThumbnailSize::Huge, TQImage::ScaleMin);
CameraEvent* event = new CameraEvent(CameraEvent::gp_thumbnailed);
event->map.insert("folder", TQVariant(folder));
diff --git a/digikam/utilities/cameragui/cameraiconitem.cpp b/digikam/utilities/cameragui/cameraiconitem.cpp
index ec23e2c..c68f785 100644
--- a/digikam/utilities/cameragui/cameraiconitem.cpp
+++ b/digikam/utilities/cameragui/cameraiconitem.cpp
@@ -225,7 +225,7 @@ void CameraIconViewItem::calcRect(const TQString& itemName, const TQString& down
{
CameraIconView* view = (CameraIconView*)iconView();
int thumbSize = view->thumbnailSize().size();
- d->pixmap = TQPixmap(d->thumbnail.convertToImage().smoothScale(thumbSize, thumbSize, TQ_ScaleMin));
+ d->pixmap = TQPixmap(d->thumbnail.convertToImage().smoothScale(thumbSize, thumbSize, TQImage::ScaleMin));
d->pixRect = TQRect(0,0,0,0);
d->textRect = TQRect(0,0,0,0);
d->extraRect = TQRect(0,0,0,0);
diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp
index 7920d13..302f3ea 100644
--- a/digikam/utilities/cameragui/cameraui.cpp
+++ b/digikam/utilities/cameragui/cameraui.cpp
@@ -375,7 +375,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
TDEGlobal::dirs()->addResourceType("logo-digikam", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
TQString directory = TDEGlobal::dirs()->findResourceDir("logo-digikam", "logo-digikam.png");
pixmapLogo->setPixmap( TQPixmap( directory + "logo-digikam.png" ) );
- pixmapLogo->setFocusPolicy(TQ_NoFocus);
+ pixmapLogo->setFocusPolicy(TQWidget::NoFocus);
d->anim = new AnimWidget(frame, pixmapLogo->height()-2);
diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.cpp b/digikam/utilities/imageeditor/canvas/dimginterface.cpp
index f8a156b..b7062bf 100644
--- a/digikam/utilities/imageeditor/canvas/dimginterface.cpp
+++ b/digikam/utilities/imageeditor/canvas/dimginterface.cpp
@@ -637,7 +637,7 @@ void DImgInterface::saveAs(const TQString& fileName, IOFileSettingsContainer *io
}
// Update Exif thumbnail.
- TQImage thumb = preview.smoothScale(160, 120, TQ_ScaleMin);
+ TQImage thumb = preview.smoothScale(160, 120, TQImage::ScaleMin);
meta.setExifThumbnail(thumb);
// Update Exif Image dimensions.
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp
index 654b28e..b82f5ed 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
+++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp
@@ -376,7 +376,7 @@ void EditorWindow::setupStandardActions()
d->zoomCombo = new KComboBox(true);
d->zoomCombo->setDuplicatesEnabled(false);
- d->zoomCombo->setFocusPolicy(TQ_ClickFocus);
+ d->zoomCombo->setFocusPolicy(TQWidget::ClickFocus);
d->zoomCombo->setInsertionPolicy(TQComboBox::NoInsertion);
d->zoomComboAction = new KWidgetAction(d->zoomCombo, i18n("Zoom"), 0, 0, 0,
actionCollection(), "editorwindow_zoomto");
@@ -1254,7 +1254,7 @@ bool EditorWindow::waitForSavingToComplete()
void EditorWindow::enter_loop()
{
TQWidget dummy(0, 0, WType_Dialog | WShowModal);
- dummy.setFocusPolicy( TQ_NoFocus );
+ dummy.setFocusPolicy( TQWidget::NoFocus );
tqt_enter_modal(&dummy);
tqApp->enter_loop();
tqt_leave_modal(&dummy);
diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
index 2618162..b02a98e 100644
--- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
+++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
@@ -342,7 +342,7 @@ RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent)
d->resetCurveBtn = new TQToolButton(d->curveBox);
d->resetCurveBtn->setFixedSize(11, 11);
d->resetCurveBtn->setIconSet(SmallIconSet("reload_page", 8));
- d->resetCurveBtn->setFocusPolicy(TQ_NoFocus);
+ d->resetCurveBtn->setFocusPolicy(TQWidget::NoFocus);
d->resetCurveBtn->setAutoRaise(true);
TQToolTip::add(d->resetCurveBtn, i18n("Reset curve to linear"));
diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp
index d5e2166..849706c 100644
--- a/digikam/utilities/lighttable/lighttablebar.cpp
+++ b/digikam/utilities/lighttable/lighttablebar.cpp
@@ -515,7 +515,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e)
{
TQPixmap pix;
pix.convertFromImage(TQImage(item->pixmap()->convertToImage()).
- smoothScale(getTileSize(), getTileSize(), TQ_ScaleMin));
+ smoothScale(getTileSize(), getTileSize(), TQImage::ScaleMin));
int x = (tile.width() - pix.width())/2;
int y = (tile.height() - pix.height())/2;
bitBlt(&tile, x, y, &pix);
@@ -571,7 +571,7 @@ void LightTableBar::viewportPaintEvent(TQPaintEvent* e)
{
TQPixmap pix;
pix.convertFromImage(TQImage(item->pixmap()->convertToImage()).
- smoothScale(getTileSize(), getTileSize(), TQ_ScaleMin));
+ smoothScale(getTileSize(), getTileSize(), TQImage::ScaleMin));
int x = (tile.width() - pix.width())/2;
int y = (tile.height()- pix.height())/2;
bitBlt(&tile, x, y, &pix);