summaryrefslogtreecommitdiffstats
path: root/digikam/libs/widgets/common
diff options
context:
space:
mode:
Diffstat (limited to 'digikam/libs/widgets/common')
-rw-r--r--digikam/libs/widgets/common/colorgradientwidget.cpp4
-rw-r--r--digikam/libs/widgets/common/curveswidget.cpp64
-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.cpp14
-rw-r--r--digikam/libs/widgets/common/filesaveoptionsbox.cpp2
-rw-r--r--digikam/libs/widgets/common/histogramwidget.cpp128
-rw-r--r--digikam/libs/widgets/common/paniconwidget.cpp14
-rw-r--r--digikam/libs/widgets/common/previewwidget.cpp8
-rw-r--r--digikam/libs/widgets/common/searchtextbar.cpp14
-rw-r--r--digikam/libs/widgets/common/sidebar.cpp4
-rw-r--r--digikam/libs/widgets/common/splashscreen.cpp14
-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/statusnavigatebar.cpp2
-rw-r--r--digikam/libs/widgets/common/statusprogressbar.cpp8
-rw-r--r--digikam/libs/widgets/common/statusprogressbar.h2
18 files changed, 146 insertions, 146 deletions
diff --git a/digikam/libs/widgets/common/colorgradientwidget.cpp b/digikam/libs/widgets/common/colorgradientwidget.cpp
index 9270fd58..04426dcf 100644
--- a/digikam/libs/widgets/common/colorgradientwidget.cpp
+++ b/digikam/libs/widgets/common/colorgradientwidget.cpp
@@ -92,8 +92,8 @@ void ColorGradientWidget::drawContents(TQPainter *p)
// Widget is disable : drawing grayed frame.
if ( !isEnabled() )
{
- color1 = palette().disabled().foreground();
- color2 = palette().disabled().background();
+ color1 = tqpalette().disabled().foreground();
+ color2 = tqpalette().disabled().background();
}
else
{
diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp
index 7f168ea4..d4641164 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(colorGroup().background());
+ setPaletteBackgroundColor(tqcolorGroup().background());
setMinimumSize(w, h);
d->blinkTimer = new TQTimer( this );
@@ -184,7 +184,7 @@ void CurvesWidget::reset()
d->grabPoint = -1;
d->guideVisible = false;
- repaint(false);
+ tqrepaint(false);
}
ImageCurves* CurvesWidget::curves() const
@@ -208,7 +208,7 @@ void CurvesWidget::setLoadingFailed()
d->clearFlag = CurvesWidgetPriv::HistogramFailed;
d->pos = 0;
d->blinkTimer->stop();
- repaint(false);
+ tqrepaint(false);
setCursor(KCursor::arrowCursor());
}
@@ -216,7 +216,7 @@ void CurvesWidget::setCurveGuide(const DColor& color)
{
d->guideVisible = true;
d->colorGuide = color;
- repaint(false);
+ tqrepaint(false);
}
void CurvesWidget::curveTypeChanged()
@@ -245,7 +245,7 @@ void CurvesWidget::curveTypeChanged()
break;
}
- repaint(false);
+ tqrepaint(false);
emit signalCurvesChanged();
}
@@ -262,7 +262,7 @@ void CurvesWidget::customEvent(TQCustomEvent *event)
setCursor(KCursor::waitCursor());
d->clearFlag = CurvesWidgetPriv::HistogramStarted;
d->blinkTimer->start(200);
- repaint(false);
+ tqrepaint(false);
}
else
{
@@ -271,14 +271,14 @@ void CurvesWidget::customEvent(TQCustomEvent *event)
// Repaint histogram
d->clearFlag = CurvesWidgetPriv::HistogramCompleted;
d->blinkTimer->stop();
- repaint(false);
+ tqrepaint(false);
setCursor(KCursor::arrowCursor());
}
else
{
d->clearFlag = CurvesWidgetPriv::HistogramFailed;
d->blinkTimer->stop();
- repaint(false);
+ tqrepaint(false);
setCursor(KCursor::arrowCursor());
emit signalHistogramComputationFailed();
}
@@ -298,7 +298,7 @@ void CurvesWidget::stopHistogramComputation()
void CurvesWidget::slotBlinkTimerDone()
{
- repaint(false);
+ tqrepaint(false);
d->blinkTimer->start(200);
}
@@ -312,12 +312,12 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
int asize = 24;
TQPixmap anim(asize, asize);
TQPainter p2;
- p2.begin(TQT_TQPAINTDEVICE(&anim), this);
- p2.fillRect(0, 0, asize, asize, palette().active().background());
+ p2.tqbegin(TQT_TQPAINTDEVICE(&anim), this);
+ p2.fillRect(0, 0, asize, asize, tqpalette().active().background());
p2.translate(asize/2, asize/2);
d->pos = (d->pos + 10) % 360;
- p2.setPen(TQPen(palette().active().text()));
+ p2.setPen(TQPen(tqpalette().active().text()));
p2.rotate(d->pos);
for ( int i=0 ; i<12 ; i++ )
{
@@ -330,12 +330,12 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
- p1.begin(TQT_TQPAINTDEVICE(&pm), this);
- p1.fillRect(0, 0, width(), height(), palette().active().background());
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
+ p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.drawPixmap(width()/2 - asize /2, asize, anim);
- p1.setPen(TQPen(palette().active().text()));
+ p1.setPen(TQPen(tqpalette().active().text()));
if (d->clearFlag == CurvesWidgetPriv::HistogramDataLoading)
p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
@@ -353,11 +353,11 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
{
TQPixmap pm(size());
TQPainter p1;
- p1.begin(TQT_TQPAINTDEVICE(&pm), this);
- p1.fillRect(0, 0, width(), height(), palette().active().background());
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
+ p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
- p1.setPen(TQPen(palette().active().text()));
+ p1.setPen(TQPen(tqpalette().active().text()));
p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
i18n("Histogram\ncalculation\nfailed."));
p1.end();
@@ -418,7 +418,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
- p1.begin(TQT_TQPAINTDEVICE(&pm), this);
+ p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
int curvePrevVal = 0;
@@ -483,14 +483,14 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
// Drawing histogram
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - y);
- p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - y, x, 0);
// Drawing curves.
- p1.setPen(TQPen(palette().active().link(), 2, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().link(), 2, TQt::SolidLine));
p1.drawLine(x - 1, wHeight - ((curvePrevVal * wHeight) / histogram->getHistogramSegment()),
x, wHeight - ((curveVal * wHeight) / histogram->getHistogramSegment()));
@@ -518,7 +518,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
// Drawing black/middle/highlight tone grid separators.
- p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.drawLine(wWidth/4, 0, wWidth/4, wHeight);
p1.drawLine(wWidth/2, 0, wWidth/2, wHeight);
p1.drawLine(3*wWidth/4, 0, 3*wWidth/4, wHeight);
@@ -532,7 +532,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
if (d->xMouseOver != -1 && d->yMouseOver != -1)
{
- TQString string = i18n("x:%1\ny:%2").arg(d->xMouseOver).arg(d->yMouseOver);
+ TQString string = i18n("x:%1\ny:%2").tqarg(d->xMouseOver).tqarg(d->yMouseOver);
TQFontMetrics fontMt(string);
TQRect rect = fontMt.boundingRect(0, 0, wWidth, wHeight, 0, string);
rect.moveRight(wWidth);
@@ -574,7 +574,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
int xGuide = (guidePos * wWidth) / histogram->getHistogramSegment();
p1.drawLine(xGuide, 0, xGuide, wHeight);
- TQString string = i18n("x:%1").arg(guidePos);
+ TQString string = i18n("x:%1").tqarg(guidePos);
TQFontMetrics fontMt( string );
TQRect rect = fontMt.boundingRect(0, 0, wWidth, wHeight, 0, string);
p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine));
@@ -601,7 +601,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
// Drawing frame.
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.end();
@@ -694,7 +694,7 @@ void CurvesWidget::mousePressEvent(TQMouseEvent *e)
}
d->curves->curvesCalculateCurve(m_channelType);
- repaint(false);
+ tqrepaint(false);
}
void CurvesWidget::mouseReleaseEvent(TQMouseEvent *e)
@@ -707,7 +707,7 @@ void CurvesWidget::mouseReleaseEvent(TQMouseEvent *e)
setCursor(KCursor::arrowCursor());
d->grabPoint = -1;
d->curves->curvesCalculateCurve(m_channelType);
- repaint(false);
+ tqrepaint(false);
emit signalCurvesChanged();
}
@@ -824,7 +824,7 @@ void CurvesWidget::mouseMoveEvent(TQMouseEvent *e)
d->xMouseOver = x;
d->yMouseOver = m_imageHistogram->getHistogramSegment()-1 - y;
emit signalMouseMoved(d->xMouseOver, d->yMouseOver);
- repaint(false);
+ tqrepaint(false);
}
void CurvesWidget::leaveEvent(TQEvent*)
@@ -832,7 +832,7 @@ void CurvesWidget::leaveEvent(TQEvent*)
d->xMouseOver = -1;
d->yMouseOver = -1;
emit signalMouseMoved(d->xMouseOver, d->yMouseOver);
- repaint(false);
+ tqrepaint(false);
}
} // NameSpace Digikam
diff --git a/digikam/libs/widgets/common/dcursortracker.cpp b/digikam/libs/widgets/common/dcursortracker.cpp
index 2e3ae53a..fc820603 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);
- setAlignment(AlignAuto | AlignTop);
+ tqsetAlignment(AlignAuto | AlignTop);
}
} // namespace Digikam
diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp
index 5d0e4008..de82a75f 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->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
+ pixmapLogo->tqsetSizePolicy(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 17a24e3e..10bcef09 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::visualRect(TQRect(frameWidth(), frameWidth(),
+ return TQStyle::tqvisualRect(TQRect(frameWidth(), frameWidth(),
s_dpopupmenu_sidePixmap.width(),
height() - 2*frameWidth()),
this);
@@ -93,14 +93,14 @@ TQRect DPopupMenu::sideImageRect() const
TQColor DPopupMenu::calcPixmapColor()
{
TQColor color;
- TQColor activeTitle = TQApplication::palette().active().background();
- TQColor inactiveTitle = TQApplication::palette().inactive().background();
+ TQColor activeTitle = TQApplication::tqpalette().active().background();
+ TQColor inactiveTitle = TQApplication::tqpalette().inactive().background();
// figure out which color is most suitable for recoloring to
int h1, s1, v1, h2, s2, v2, h3, s3, v3;
activeTitle.hsv(&h1, &s1, &v1);
inactiveTitle.hsv(&h2, &s2, &v2);
- TQApplication::palette().active().background().hsv(&h3, &s3, &v3);
+ TQApplication::tqpalette().active().background().hsv(&h3, &s3, &v3);
if ( (kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < kAbs(h2-h3)+kAbs(s2-s3)+kAbs(v2-v3)) &&
((kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < 32) || (s1 < 32)) && (s2 > s1))
@@ -153,7 +153,7 @@ void DPopupMenu::resizeEvent(TQResizeEvent * e)
{
KPopupMenu::resizeEvent(e);
- setFrameRect(TQStyle::visualRect(TQRect(s_dpopupmenu_sidePixmap.width(), 0,
+ setFrameRect(TQStyle::tqvisualRect(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, maximumSize().width());
+ width = kMax(width, tqmaximumSize().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()),
- colorGroup(), TQStyle::Style_Default,
+ tqcolorGroup(), TQStyle::Style_Default,
TQStyleOption( frameWidth(), 0));
}
diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.cpp b/digikam/libs/widgets/common/filesaveoptionsbox.cpp
index 415d58d2..8059bbd9 100644
--- a/digikam/libs/widgets/common/filesaveoptionsbox.cpp
+++ b/digikam/libs/widgets/common/filesaveoptionsbox.cpp
@@ -24,7 +24,7 @@
// TQt includes.
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqwidget.h>
#include <tqlabel.h>
diff --git a/digikam/libs/widgets/common/histogramwidget.cpp b/digikam/libs/widgets/common/histogramwidget.cpp
index 2d3675b8..b88ddb9d 100644
--- a/digikam/libs/widgets/common/histogramwidget.cpp
+++ b/digikam/libs/widgets/common/histogramwidget.cpp
@@ -36,7 +36,7 @@
#include <tqevent.h>
#include <tqtimer.h>
#include <tqcolor.h>
-#include <brush.h>
+#include <tqbrush.h>
#include <tqrect.h>
#include <tqfont.h>
#include <tqfontmetrics.h>
@@ -192,13 +192,13 @@ void HistogramWidget::setHistogramGuideByColor(const DColor& color)
{
d->guideVisible = true;
d->colorGuide = color;
- repaint(false);
+ tqrepaint(false);
}
void HistogramWidget::reset()
{
d->guideVisible = false;
- repaint(false);
+ tqrepaint(false);
}
void HistogramWidget::customEvent(TQCustomEvent *event)
@@ -220,15 +220,15 @@ void HistogramWidget::customEvent(TQCustomEvent *event)
{
if (d->clearFlag != HistogramWidgetPriv::HistogramDataLoading)
{
- // enter initial repaint wait, repaint only after waiting
+ // enter initial tqrepaint wait, tqrepaint only after waiting
// a short time so that very fast computation does not create flicker
d->inInitialRepaintWait = true;
d->blinkTimer->start( 100 );
}
else
{
- // after the initial repaint, we can repaint immediately
- repaint(false);
+ // after the initial tqrepaint, we can tqrepaint immediately
+ tqrepaint(false);
d->blinkTimer->start( 200 );
}
}
@@ -245,21 +245,21 @@ void HistogramWidget::customEvent(TQCustomEvent *event)
// Send signals to refresh information if necessary.
// The signals may trigger multiple repaints, avoid this,
- // we repaint once afterwards.
+ // we tqrepaint once afterwards.
setUpdatesEnabled(false);
notifyValuesChanged();
emit signalHistogramComputationDone(d->sixteenBits);
setUpdatesEnabled(true);
- repaint(false);
+ tqrepaint(false);
}
else
{
d->clearFlag = HistogramWidgetPriv::HistogramFailed;
d->blinkTimer->stop();
d->inInitialRepaintWait = false;
- repaint(false);
+ tqrepaint(false);
setCursor( KCursor::arrowCursor() );
// Remove old histogram data from memory.
if (m_imageHistogram)
@@ -285,7 +285,7 @@ void HistogramWidget::setDataLoading()
{
setCursor( KCursor::waitCursor() );
d->clearFlag = HistogramWidgetPriv::HistogramDataLoading;
- // enter initial repaint wait, repaint only after waiting
+ // enter initial tqrepaint wait, tqrepaint only after waiting
// a short time so that very fast computation does not create flicker
d->inInitialRepaintWait = true;
d->pos = 0;
@@ -299,7 +299,7 @@ void HistogramWidget::setLoadingFailed()
d->pos = 0;
d->blinkTimer->stop();
d->inInitialRepaintWait = false;
- repaint(false);
+ tqrepaint(false);
setCursor( KCursor::arrowCursor() );
}
@@ -366,7 +366,7 @@ void HistogramWidget::updateSelectionData(uchar *s_data, uint s_w, uint s_h,
void HistogramWidget::slotBlinkTimerDone()
{
d->inInitialRepaintWait = false;
- repaint(false);
+ tqrepaint(false);
d->blinkTimer->start( 200 );
}
@@ -383,11 +383,11 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
{
TQPixmap pm(size());
TQPainter p1;
- p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
- p1.fillRect(0, 0, size().width(), size().height(), palette().disabled().background());
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.tqbegin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
+ p1.fillRect(0, 0, size().width(), size().height(), tqpalette().disabled().background());
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
- p1.setPen(TQPen(palette().disabled().foreground(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().disabled().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.end();
bitBlt(this, 0, 0, &pm);
@@ -405,12 +405,12 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
int asize = 24;
TQPixmap anim(asize, asize);
TQPainter p2;
- p2.begin(TQT_TQPAINTDEVICE(&anim), TQT_TQOBJECT(this));
- p2.fillRect(0, 0, asize, asize, palette().active().background());
+ p2.tqbegin(TQT_TQPAINTDEVICE(&anim), TQT_TQOBJECT(this));
+ p2.fillRect(0, 0, asize, asize, tqpalette().active().background());
p2.translate(asize/2, asize/2);
d->pos = (d->pos + 10) % 360;
- p2.setPen(TQPen(palette().active().text()));
+ p2.setPen(TQPen(tqpalette().active().text()));
p2.rotate(d->pos);
for ( int i=0 ; i<12 ; i++ )
{
@@ -423,12 +423,12 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
- p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
- p1.fillRect(0, 0, width(), height(), palette().active().background());
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.tqbegin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
+ p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.drawPixmap(width()/2 - asize /2, asize, anim);
- p1.setPen(TQPen(palette().active().text()));
+ p1.setPen(TQPen(tqpalette().active().text()));
if (d->clearFlag == HistogramWidgetPriv::HistogramDataLoading)
p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
@@ -447,11 +447,11 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
{
TQPixmap pm(size());
TQPainter p1;
- p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
- p1.fillRect(0, 0, width(), height(), palette().active().background());
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.tqbegin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
+ p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
- p1.setPen(TQPen(palette().active().text()));
+ p1.setPen(TQPen(tqpalette().active().text()));
p1.drawText(0, 0, width(), height(), TQt::AlignCenter,
i18n("Histogram\ncalculation\nfailed."));
p1.end();
@@ -524,8 +524,8 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
- p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
- p1.fillRect(0, 0, width(), height(), palette().active().background());
+ p1.tqbegin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
+ p1.fillRect(0, 0, width(), height(), tqpalette().active().background());
// Drawing selection or all histogram values.
@@ -645,35 +645,35 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
{
if ( x >= (int)(d->xmin * wWidth) && x <= (int)(d->xmax * wWidth) )
{
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
- p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - y);
}
else
{
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - y);
- p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - y, x, 0);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
- p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
}
}
else
{
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - y);
- p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - y, x, 0);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
- p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
}
@@ -684,9 +684,9 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
{
if ( x >= (int)(d->xmin * wWidth) && x <= (int)(d->xmax * wWidth) )
{
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
- p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
// Witch color must be used on the foreground with all colors channel mode?
switch (m_colorType)
@@ -717,16 +717,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yr);
- p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
- p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@@ -740,16 +740,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::green, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yg);
- p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
- p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@@ -763,16 +763,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::blue, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yb);
- p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
- p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@@ -793,16 +793,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yr);
- p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
- p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@@ -816,16 +816,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::green, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yg);
- p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
- p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@@ -839,16 +839,16 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
p1.setPen(TQPen(TQt::blue, 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, wHeight - yb);
- p1.setPen(TQPen(palette().active().background(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().background(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - TQMAX(TQMAX(yr, yg), yb), x, 0);
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight - yr -1, x, wHeight - yr);
p1.drawLine(x, wHeight - yg -1, x, wHeight - yg);
p1.drawLine(x, wHeight - yb -1, x, wHeight - yb);
if ( x == wWidth/4 || x == wWidth/2 || x == 3*wWidth/4 )
{
- p1.setPen(TQPen(palette().active().base(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().base(), 1, TQt::SolidLine));
p1.drawLine(x, wHeight, x, 0);
}
@@ -911,7 +911,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
int xGuide = (guidePos * wWidth) / histogram->getHistogramSegment();
p1.drawLine(xGuide, 0, xGuide, wHeight);
- TQString string = i18n("x:%1").arg(guidePos);
+ TQString string = i18n("x:%1").tqarg(guidePos);
TQFontMetrics fontMt( string );
TQRect rect = fontMt.boundingRect(0, 0, wWidth, wHeight, 0, string);
p1.setPen(TQPen(TQt::red, 1, TQt::SolidLine));
@@ -973,7 +973,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQToolTip::add( this, tipText);
}
- p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
+ p1.setPen(TQPen(tqpalette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
p1.end();
bitBlt(this, 0, 0, &pm);
@@ -986,7 +986,7 @@ void HistogramWidget::mousePressEvent(TQMouseEvent* e)
if (!d->inSelected)
{
d->inSelected = true;
- repaint(false);
+ tqrepaint(false);
}
d->xmin = ((double)e->pos().x()) / ((double)width());
@@ -1009,7 +1009,7 @@ void HistogramWidget::mouseReleaseEvent(TQMouseEvent*)
//emit signalMinValueChanged( 0 );
//emit signalMaxValueChanged( d->range );
notifyValuesChanged();
- repaint(false);
+ tqrepaint(false);
}
}
}
@@ -1040,7 +1040,7 @@ void HistogramWidget::mouseMoveEvent(TQMouseEvent *e)
notifyValuesChanged();
//emit signalMaxValueChanged( d->xmax == 0.0 ? d->range : (int)(d->xmax * d->range) );
- repaint(false);
+ tqrepaint(false);
}
}
}
@@ -1064,7 +1064,7 @@ void HistogramWidget::slotMinValueChanged( int min )
{
d->xmin = ((double)min)/d->range;
}
- repaint(false);
+ tqrepaint(false);
}
}
@@ -1082,7 +1082,7 @@ void HistogramWidget::slotMaxValueChanged(int max)
{
d->xmax = ((double)max)/d->range;
}
- repaint(false);
+ tqrepaint(false);
}
}
diff --git a/digikam/libs/widgets/common/paniconwidget.cpp b/digikam/libs/widgets/common/paniconwidget.cpp
index a64ba02a..7f7fcc3d 100644
--- a/digikam/libs/widgets/common/paniconwidget.cpp
+++ b/digikam/libs/widgets/common/paniconwidget.cpp
@@ -91,7 +91,7 @@ PanIconWidget::~PanIconWidget()
void PanIconWidget::setImage(int previewWidth, int previewHeight, const TQImage& image)
{
TQSize sz(image.width(), image.height());
- sz.scale(previewWidth, previewHeight, TQSize::ScaleMin);
+ sz.tqscale(previewWidth, previewHeight, TQSize::ScaleMin);
m_pixmap = new TQPixmap(previewWidth, previewHeight);
m_width = sz.width();
m_height = sz.height();
@@ -120,7 +120,7 @@ void PanIconWidget::slotZoomFactorChanged(double factor)
m_zoomedOrgWidth = (int)(m_orgWidth * factor);
m_zoomedOrgHeight = (int)(m_orgHeight * factor);
updatePixmap();
- repaint(false);
+ tqrepaint(false);
}
void PanIconWidget::setRegionSelection(const TQRect& regionSelection)
@@ -139,7 +139,7 @@ void PanIconWidget::setRegionSelection(const TQRect& regionSelection)
((float)m_height / (float)m_zoomedOrgHeight)) );
updatePixmap();
- repaint(false);
+ tqrepaint(false);
}
TQRect PanIconWidget::getRegionSelection()
@@ -166,7 +166,7 @@ void PanIconWidget::regionSelectionMoved(bool targetDone)
if (targetDone)
{
updatePixmap();
- repaint(false);
+ tqrepaint(false);
}
int x = (int)lround( ((float)m_localRegionSelection.x() - (float)m_rect.x() ) *
@@ -192,7 +192,7 @@ void PanIconWidget::regionSelectionMoved(bool targetDone)
void PanIconWidget::updatePixmap()
{
// Drawing background and image.
- m_pixmap->fill(colorGroup().background());
+ m_pixmap->fill(tqcolorGroup().background());
bitBlt(m_pixmap, m_rect.x(), m_rect.y(), &d->image, 0, 0);
TQPainter p(m_pixmap);
@@ -286,7 +286,7 @@ void PanIconWidget::mouseMoveEvent ( TQMouseEvent * e )
m_localRegionSelection.moveBottom(m_rect.bottom());
updatePixmap();
- repaint(false);
+ tqrepaint(false);
regionSelectionMoved(false);
return;
}
@@ -315,7 +315,7 @@ void PanIconWidget::timerEvent(TQTimerEvent * e)
{
m_flicker = !m_flicker;
updatePixmap();
- repaint(false);
+ tqrepaint(false);
}
else
TQWidget::timerEvent(e);
diff --git a/digikam/libs/widgets/common/previewwidget.cpp b/digikam/libs/widgets/common/previewwidget.cpp
index a7a15f20..f6795d0c 100644
--- a/digikam/libs/widgets/common/previewwidget.cpp
+++ b/digikam/libs/widgets/common/previewwidget.cpp
@@ -453,7 +453,7 @@ void PreviewWidget::resizeEvent(TQResizeEvent* e)
updateContentsSize();
- // No need to repaint. its called
+ // No need to tqrepaint. its called
// automatically after resize
// To be sure than corner widget used to pan image will be hide/show
@@ -497,7 +497,7 @@ void PreviewWidget::viewportPaintEvent(TQPaintEvent *e)
{
for (int i = x1 ; i < x2 ; i += d->tileSize)
{
- TQString key = TQString("%1,%2").arg(i).arg(j);
+ TQString key = TQString("%1,%2").tqarg(i).tqarg(j);
TQPixmap *pix = d->tileCache.find(key);
if (!pix)
@@ -562,7 +562,7 @@ void PreviewWidget::contentsMousePressEvent(TQMouseEvent *e)
m_movingInProgress = true;
d->midButtonX = e->x();
d->midButtonY = e->y();
- viewport()->repaint(false);
+ viewport()->tqrepaint(false);
viewport()->setCursor(TQt::SizeAllCursor);
}
return;
@@ -596,7 +596,7 @@ void PreviewWidget::contentsMouseReleaseEvent(TQMouseEvent *e)
{
emit signalContentsMovedEvent(true);
viewport()->unsetCursor();
- viewport()->repaint(false);
+ viewport()->tqrepaint(false);
}
if (e->button() == Qt::RightButton)
diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp
index e9b67f0c..e7f9e733 100644
--- a/digikam/libs/widgets/common/searchtextbar.cpp
+++ b/digikam/libs/widgets/common/searchtextbar.cpp
@@ -24,10 +24,10 @@
// TQt includes.
#include <tqcolor.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqpainter.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtoolbutton.h>
// KDE includes.
@@ -79,13 +79,13 @@ TQString DLineEdit::message() const
void DLineEdit::setMessage(const TQString &msg)
{
d->message = msg;
- repaint();
+ tqrepaint();
}
void DLineEdit::setText(const TQString &txt)
{
d->drawMsg = txt.isEmpty();
- repaint();
+ tqrepaint();
KLineEdit::setText(txt);
}
@@ -117,7 +117,7 @@ void DLineEdit::focusInEvent(TQFocusEvent *e)
if (d->drawMsg)
{
d->drawMsg = false;
- repaint();
+ tqrepaint();
}
TQLineEdit::focusInEvent(e);
}
@@ -127,7 +127,7 @@ void DLineEdit::focusOutEvent(TQFocusEvent *e)
if (text().isEmpty())
{
d->drawMsg = true;
- repaint();
+ tqrepaint();
}
TQLineEdit::focusOutEvent(e);
}
@@ -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->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+ d->searchEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
hlay->setSpacing(0);
hlay->setMargin(0);
diff --git a/digikam/libs/widgets/common/sidebar.cpp b/digikam/libs/widgets/common/sidebar.cpp
index e76c1f73..d2e03b13 100644
--- a/digikam/libs/widgets/common/sidebar.cpp
+++ b/digikam/libs/widgets/common/sidebar.cpp
@@ -141,7 +141,7 @@ TQSplitter* Sidebar::splitter() const
void Sidebar::loadViewState()
{
KConfig *config = kapp->config();
- config->setGroup(TQString("%1").arg(name()));
+ config->setGroup(TQString("%1").tqarg(name()));
int tab = config->readNumEntry("ActiveTab", 0);
bool minimized = config->readBoolEntry("Minimized", d->minimizedDefault);
@@ -168,7 +168,7 @@ void Sidebar::loadViewState()
void Sidebar::saveViewState()
{
KConfig *config = kapp->config();
- config->setGroup(TQString("%1").arg(name()));
+ config->setGroup(TQString("%1").tqarg(name()));
config->writeEntry("ActiveTab", d->activeTab);
config->writeEntry("Minimized", d->minimized);
config->sync();
diff --git a/digikam/libs/widgets/common/splashscreen.cpp b/digikam/libs/widgets/common/splashscreen.cpp
index 422f80f1..8294d974 100644
--- a/digikam/libs/widgets/common/splashscreen.cpp
+++ b/digikam/libs/widgets/common/splashscreen.cpp
@@ -53,12 +53,12 @@ public:
progressBarSize = 3;
state = 0;
color = TQt::black;
- alignment = TQt::AlignLeft;
+ tqalignment = TQt::AlignLeft;
}
int state;
int progressBarSize;
- int alignment;
+ int tqalignment;
TQString string;
@@ -86,22 +86,22 @@ SplashScreen::~SplashScreen()
void SplashScreen::animate()
{
d->state = ((d->state + 1) % (2*d->progressBarSize-1));
- repaint();
+ tqrepaint();
}
void SplashScreen::setColor(const TQColor& color)
{
d->color = color;
}
-void SplashScreen::setAlignment(int alignment)
+void SplashScreen::tqsetAlignment(int tqalignment)
{
- d->alignment = alignment;
+ d->tqalignment = tqalignment;
}
void SplashScreen::message(const TQString& message)
{
d->string = message;
- TQSplashScreen::message(d->string, d->alignment, d->color);
+ TQSplashScreen::message(d->string, d->tqalignment, d->color);
animate();
}
@@ -154,7 +154,7 @@ void SplashScreen::drawContents(TQPainter* painter)
// Draw message at given position, limited to 43 chars
// If message is too long, string is truncated
if (d->string.length() > 40) {d->string.truncate(39); d->string += "...";}
- painter->drawText(r, d->alignment, d->string);
+ painter->drawText(r, d->tqalignment, d->string);
}
} // namespace Digikam
diff --git a/digikam/libs/widgets/common/splashscreen.h b/digikam/libs/widgets/common/splashscreen.h
index c1be1272..9845c818 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 setAlignment(int alignment);
+ void tqsetAlignment(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 ab8163d2..470f40f3 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::sizeHint() const
+TQSize SqueezedComboBox::tqsizeHint() 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->itemRect(selectedItem);
+ TQRect positionToolTip = listBox->tqitemRect(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 87bd6910..d85b81dc 100644
--- a/digikam/libs/widgets/common/squeezedcombobox.h
+++ b/digikam/libs/widgets/common/squeezedcombobox.h
@@ -100,9 +100,9 @@ public:
TQString itemHighlighted();
/**
- * Sets the sizeHint() of this widget.
+ * Sets the tqsizeHint() of this widget.
*/
- virtual TQSize sizeHint() const;
+ virtual TQSize tqsizeHint() const;
private slots:
diff --git a/digikam/libs/widgets/common/statusnavigatebar.cpp b/digikam/libs/widgets/common/statusnavigatebar.cpp
index 894e46cd..dab8e0fa 100644
--- a/digikam/libs/widgets/common/statusnavigatebar.cpp
+++ b/digikam/libs/widgets/common/statusnavigatebar.cpp
@@ -24,7 +24,7 @@
// TQt includes.
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
diff --git a/digikam/libs/widgets/common/statusprogressbar.cpp b/digikam/libs/widgets/common/statusprogressbar.cpp
index 40545877..52d33b33 100644
--- a/digikam/libs/widgets/common/statusprogressbar.cpp
+++ b/digikam/libs/widgets/common/statusprogressbar.cpp
@@ -24,7 +24,7 @@
// TQt includes.
-#include <layout.h>
+#include <tqlayout.h>
#include <tqwidget.h>
#include <tqpushbutton.h>
@@ -86,7 +86,7 @@ StatusProgressBar::StatusProgressBar(TQWidget *parent)
setProgressTotalSteps(100);
d->cancelButton = new TQPushButton(d->progressWidget);
d->cancelButton->setFocusPolicy(TQ_NoFocus);
- d->cancelButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+ d->cancelButton->tqsetSizePolicy( 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::setAlignment(int a)
+void StatusProgressBar::tqsetAlignment(int a)
{
- d->textLabel->setAlignment(a);
+ d->textLabel->tqsetAlignment(a);
}
int StatusProgressBar::progressValue()
diff --git a/digikam/libs/widgets/common/statusprogressbar.h b/digikam/libs/widgets/common/statusprogressbar.h
index 0b0866bc..f4292bbf 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 setAlignment(int a);
+ void tqsetAlignment(int a);
void progressBarMode(int mode, const TQString& text=TQString());