diff options
Diffstat (limited to 'digikam/libs/widgets')
58 files changed, 207 insertions, 207 deletions
diff --git a/digikam/libs/widgets/common/colorgradientwidget.cpp b/digikam/libs/widgets/common/colorgradientwidget.cpp index 9270fd5..df4c96c 100644 --- a/digikam/libs/widgets/common/colorgradientwidget.cpp +++ b/digikam/libs/widgets/common/colorgradientwidget.cpp @@ -61,7 +61,7 @@ ColorGradientWidget::ColorGradientWidget(int o, int size, TQWidget *parent) setFrameStyle(TQFrame::Box|TQFrame::Plain); setLineWidth(1); - if ( d->orientation ==Qt::Horizontal ) + if ( d->orientation ==TQt::Horizontal ) setFixedHeight( size ); else setFixedWidth( size ); @@ -105,7 +105,7 @@ void ColorGradientWidget::drawContents(TQPainter *p) int greenDiff = color2.green() - color1.green(); int blueDiff = color2.blue() - color1.blue(); - if ( d->orientation ==Qt::Vertical ) + if ( d->orientation ==TQt::Vertical ) { for ( int y = 0; y < image.height(); y++ ) { diff --git a/digikam/libs/widgets/common/colorgradientwidget.h b/digikam/libs/widgets/common/colorgradientwidget.h index 2b63dc9..aafc3df 100644 --- a/digikam/libs/widgets/common/colorgradientwidget.h +++ b/digikam/libs/widgets/common/colorgradientwidget.h @@ -40,7 +40,7 @@ class ColorGradientWidgetPriv; class DIGIKAM_EXPORT ColorGradientWidget : public TQFrame { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp index 6409a0b..281aecc 100644 --- a/digikam/libs/widgets/common/curveswidget.cpp +++ b/digikam/libs/widgets/common/curveswidget.cpp @@ -153,8 +153,8 @@ void CurvesWidget::setup(int w, int h, bool readOnly) d->blinkTimer = new TQTimer( this ); - connect(d->blinkTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotBlinkTimerDone())); + connect(d->blinkTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotBlinkTimerDone())); } void CurvesWidget::updateData(uchar *i_data, uint i_w, uint i_h, bool i_sixteenBits) @@ -168,7 +168,7 @@ void CurvesWidget::updateData(uchar *i_data, uint i_w, uint i_h, bool i_sixteenB delete m_imageHistogram; // Calc new histogram data - m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this)); + m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this); if (d->curves) delete d->curves; @@ -312,7 +312,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) int asize = 24; TQPixmap anim(asize, asize); TQPainter p2; - p2.begin(TQT_TQPAINTDEVICE(&anim), this); + p2.begin(&anim, this); p2.fillRect(0, 0, asize, asize, palette().active().background()); p2.translate(asize/2, asize/2); @@ -330,7 +330,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(&pm, this); p1.fillRect(0, 0, width(), height(), palette().active().background()); p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -353,7 +353,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) { TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(&pm, this); p1.fillRect(0, 0, width(), height(), palette().active().background()); p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -418,7 +418,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), this); + p1.begin(&pm, this); int curvePrevVal = 0; @@ -616,7 +616,7 @@ void CurvesWidget::mousePressEvent(TQMouseEvent *e) int closest_point; int distance; - if (e->button() != Qt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted) + if (e->button() != TQt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted) return; int x = CLAMP((int)(e->pos().x() * @@ -701,7 +701,7 @@ void CurvesWidget::mouseReleaseEvent(TQMouseEvent *e) { if (d->readOnlyMode || !m_imageHistogram) return; - if (e->button() != Qt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted) + if (e->button() != TQt::LeftButton || d->clearFlag == CurvesWidgetPriv::HistogramStarted) return; setCursor(KCursor::arrowCursor()); diff --git a/digikam/libs/widgets/common/curveswidget.h b/digikam/libs/widgets/common/curveswidget.h index c85cfff..c9cfed4 100644 --- a/digikam/libs/widgets/common/curveswidget.h +++ b/digikam/libs/widgets/common/curveswidget.h @@ -44,7 +44,7 @@ class CurvesWidgetPriv; class DIGIKAM_EXPORT CurvesWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/dcursortracker.cpp b/digikam/libs/widgets/common/dcursortracker.cpp index 2e3ae53..bb9490c 100644 --- a/digikam/libs/widgets/common/dcursortracker.cpp +++ b/digikam/libs/widgets/common/dcursortracker.cpp @@ -58,15 +58,15 @@ void DCursorTracker::setEnable(bool b) bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e) { - TQWidget *widget = TQT_TQWIDGET(object); + TQWidget *widget = static_cast<TQWidget*>(object); switch (e->type()) { case TQEvent::MouseMove: { - TQMouseEvent *event = TQT_TQMOUSEEVENT(e); - if (m_enable && (TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) || - (event->stateAfter() & Qt::LeftButton))) + TQMouseEvent *event = static_cast<TQMouseEvent*>(e); + if (m_enable && (widget->rect().contains(event->pos()) || + (event->stateAfter() & TQt::LeftButton))) { show(); TQPoint p = widget->mapToGlobal(TQPoint(widget->width()/2, 0)); @@ -81,8 +81,8 @@ bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e) case TQEvent::MouseButtonRelease: { - TQMouseEvent* event = TQT_TQMOUSEEVENT(e); - if ( !TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) ) + TQMouseEvent* event = static_cast<TQMouseEvent*>(e); + if ( !widget->rect().contains(event->pos()) ) { hide(); } diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp index eea2bc4..60cfd77 100644 --- a/digikam/libs/widgets/common/dlogoaction.cpp +++ b/digikam/libs/widgets/common/dlogoaction.cpp @@ -67,18 +67,18 @@ 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); addContainer(bar, id); - connect(bar, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(slotDestroyed())); + connect(bar, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(slotDestroyed())); - connect(pixmapLogo, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(slotProcessURL(const TQString&))); + connect(pixmapLogo, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(slotProcessURL(const TQString&))); return containerCount() - 1; } diff --git a/digikam/libs/widgets/common/dlogoaction.h b/digikam/libs/widgets/common/dlogoaction.h index c731ab1..11a0052 100644 --- a/digikam/libs/widgets/common/dlogoaction.h +++ b/digikam/libs/widgets/common/dlogoaction.h @@ -37,7 +37,7 @@ namespace Digikam class DIGIKAM_EXPORT DLogoAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp index 55139df..f41404c 100644 --- a/digikam/libs/widgets/common/dpopupmenu.cpp +++ b/digikam/libs/widgets/common/dpopupmenu.cpp @@ -188,7 +188,7 @@ void DPopupMenu::paintEvent(TQPaintEvent* e) drawContents(&p); - style().tqdrawPrimitive(TQStyle::PE_PanelPopup, &p, + style().drawPrimitive(TQStyle::PE_PanelPopup, &p, TQRect(0, 0, width(), height()), colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0)); diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.h b/digikam/libs/widgets/common/filesaveoptionsbox.h index 64ba44f..9d9f84f 100644 --- a/digikam/libs/widgets/common/filesaveoptionsbox.h +++ b/digikam/libs/widgets/common/filesaveoptionsbox.h @@ -42,7 +42,7 @@ class FileSaveOptionsBoxPriv; class DIGIKAM_EXPORT FileSaveOptionsBox : public TQWidgetStack { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/histogramwidget.cpp b/digikam/libs/widgets/common/histogramwidget.cpp index 44b52c7..b301720 100644 --- a/digikam/libs/widgets/common/histogramwidget.cpp +++ b/digikam/libs/widgets/common/histogramwidget.cpp @@ -134,7 +134,7 @@ HistogramWidget::HistogramWidget(int w, int h, d->sixteenBits = i_sixteenBits; setup(w, h, selectMode, showProgress, statisticsVisible); - m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this)); + m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this); m_selectionHistogram = 0L; } @@ -152,8 +152,8 @@ HistogramWidget::HistogramWidget(int w, int h, d->sixteenBits = i_sixteenBits; setup(w, h, selectMode, showProgress, statisticsVisible); - m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this)); - m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, TQT_TQOBJECT(this)); + m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this); + m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, this); } HistogramWidget::~HistogramWidget() @@ -184,8 +184,8 @@ void HistogramWidget::setup(int w, int h, bool selectMode, bool showProgress, bo d->blinkTimer = new TQTimer( this ); - connect( d->blinkTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotBlinkTimerDone()) ); + connect( d->blinkTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotBlinkTimerDone()) ); } void HistogramWidget::setHistogramGuideByColor(const DColor& color) @@ -340,10 +340,10 @@ void HistogramWidget::updateData(uchar *i_data, uint i_w, uint i_h, delete m_selectionHistogram; // Calc new histogram data - m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, TQT_TQOBJECT(this)); + m_imageHistogram = new ImageHistogram(i_data, i_w, i_h, i_sixteenBits, this); if (s_data && s_w && s_h) - m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, TQT_TQOBJECT(this)); + m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, this); else m_selectionHistogram = 0L; } @@ -360,7 +360,7 @@ void HistogramWidget::updateSelectionData(uchar *s_data, uint s_w, uint s_h, delete m_selectionHistogram; // Calc new histogram data - m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, TQT_TQOBJECT(this)); + m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, this); } void HistogramWidget::slotBlinkTimerDone() @@ -383,7 +383,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) { TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); + p1.begin(&pm, this); p1.fillRect(0, 0, size().width(), size().height(), palette().disabled().background()); p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -405,7 +405,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) int asize = 24; TQPixmap anim(asize, asize); TQPainter p2; - p2.begin(TQT_TQPAINTDEVICE(&anim), TQT_TQOBJECT(this)); + p2.begin(&anim, this); p2.fillRect(0, 0, asize, asize, palette().active().background()); p2.translate(asize/2, asize/2); @@ -423,7 +423,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); + p1.begin(&pm, this); p1.fillRect(0, 0, width(), height(), palette().active().background()); p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -447,7 +447,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) { TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); + p1.begin(&pm, this); p1.fillRect(0, 0, width(), height(), palette().active().background()); p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); @@ -524,7 +524,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; - p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); + p1.begin(&pm, this); p1.fillRect(0, 0, width(), height(), palette().active().background()); // Drawing selection or all histogram values. diff --git a/digikam/libs/widgets/common/histogramwidget.h b/digikam/libs/widgets/common/histogramwidget.h index 6c7a4d6..2615717 100644 --- a/digikam/libs/widgets/common/histogramwidget.h +++ b/digikam/libs/widgets/common/histogramwidget.h @@ -43,7 +43,7 @@ class HistogramWidgetPriv; class DIGIKAM_EXPORT HistogramWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/paniconwidget.cpp b/digikam/libs/widgets/common/paniconwidget.cpp index a64ba02..d554969 100644 --- a/digikam/libs/widgets/common/paniconwidget.cpp +++ b/digikam/libs/widgets/common/paniconwidget.cpp @@ -247,7 +247,7 @@ void PanIconWidget::hideEvent(TQHideEvent *e) void PanIconWidget::mousePressEvent ( TQMouseEvent * e ) { - if ( (e->button() == Qt::LeftButton || e->button() == Qt::MidButton) && + if ( (e->button() == TQt::LeftButton || e->button() == TQt::MidButton) && m_localRegionSelection.contains( e->x(), e->y() ) ) { d->xpos = e->x(); @@ -261,7 +261,7 @@ void PanIconWidget::mousePressEvent ( TQMouseEvent * e ) void PanIconWidget::mouseMoveEvent ( TQMouseEvent * e ) { if ( d->moveSelection && - (e->state() == Qt::LeftButton || e->state() == Qt::MidButton) ) + (e->state() == TQt::LeftButton || e->state() == TQt::MidButton) ) { int newxpos = e->x(); int newypos = e->y(); diff --git a/digikam/libs/widgets/common/paniconwidget.h b/digikam/libs/widgets/common/paniconwidget.h index 62dbaf3..40b0758 100644 --- a/digikam/libs/widgets/common/paniconwidget.h +++ b/digikam/libs/widgets/common/paniconwidget.h @@ -43,7 +43,7 @@ class PanIconWidgetPriv; class PanIconWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/previewwidget.cpp b/digikam/libs/widgets/common/previewwidget.cpp index 9e34d00..0fe5cb2 100644 --- a/digikam/libs/widgets/common/previewwidget.cpp +++ b/digikam/libs/widgets/common/previewwidget.cpp @@ -545,16 +545,16 @@ void PreviewWidget::viewportPaintEvent(TQPaintEvent *e) void PreviewWidget::contentsMousePressEvent(TQMouseEvent *e) { - if (!e || e->button() == Qt::RightButton) + if (!e || e->button() == TQt::RightButton) return; m_movingInProgress = false; - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { emit signalLeftButtonClicked(); } - else if (e->button() == Qt::MidButton) + else if (e->button() == TQt::MidButton) { if (visibleWidth() < d->zoomWidth || visibleHeight() < d->zoomHeight) @@ -575,7 +575,7 @@ void PreviewWidget::contentsMouseMoveEvent(TQMouseEvent *e) { if (!e) return; - if (e->state() & Qt::MidButton) + if (e->state() & TQt::MidButton) { if (m_movingInProgress) { @@ -592,14 +592,14 @@ void PreviewWidget::contentsMouseReleaseEvent(TQMouseEvent *e) m_movingInProgress = false; - if (e->button() == Qt::MidButton) + if (e->button() == TQt::MidButton) { emit signalContentsMovedEvent(true); viewport()->unsetCursor(); viewport()->repaint(false); } - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { emit signalRightButtonClicked(); } diff --git a/digikam/libs/widgets/common/previewwidget.h b/digikam/libs/widgets/common/previewwidget.h index 6d284dc..03369a4 100644 --- a/digikam/libs/widgets/common/previewwidget.h +++ b/digikam/libs/widgets/common/previewwidget.h @@ -43,7 +43,7 @@ class PreviewWidgetPriv; class DIGIKAM_EXPORT PreviewWidget : public TQScrollView { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp index a6379c4..1a81c03 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); @@ -179,11 +179,11 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString hlay->addWidget(d->searchEdit); hlay->addWidget(d->clearButton); - connect(d->clearButton, TQT_SIGNAL(clicked()), - d->searchEdit, TQT_SLOT(clear())); + connect(d->clearButton, TQ_SIGNAL(clicked()), + d->searchEdit, TQ_SLOT(clear())); - connect(d->searchEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotTextChanged(const TQString&))); + connect(d->searchEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotTextChanged(const TQString&))); TDEConfig *config = kapp->config(); config->setGroup(name + TQString(" Search Text Tool")); diff --git a/digikam/libs/widgets/common/searchtextbar.h b/digikam/libs/widgets/common/searchtextbar.h index 9e59976..04ef994 100644 --- a/digikam/libs/widgets/common/searchtextbar.h +++ b/digikam/libs/widgets/common/searchtextbar.h @@ -46,7 +46,7 @@ class SearchTextBarPriv; class DIGIKAM_EXPORT DLineEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: @@ -73,7 +73,7 @@ private : class DIGIKAM_EXPORT SearchTextBar : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/sidebar.cpp b/digikam/libs/widgets/common/sidebar.cpp index 57dd502..a1bcd75 100644 --- a/digikam/libs/widgets/common/sidebar.cpp +++ b/digikam/libs/widgets/common/sidebar.cpp @@ -94,8 +94,8 @@ Sidebar::Sidebar(TQWidget *parent, const char *name, Side side, bool minimizedDe d->side = side; d->dragSwitchTimer = new TQTimer(this); - connect(d->dragSwitchTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotDragSwitchTimer())); + connect(d->dragSwitchTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotDragSwitchTimer())); } Sidebar::~Sidebar() @@ -201,8 +201,8 @@ void Sidebar::appendTab(TQWidget *w, const TQPixmap &pic, const TQString &title) tab(d->tabs)->setAcceptDrops(true); tab(d->tabs)->installEventFilter(this); - connect(tab(d->tabs), TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(clicked(int))); + connect(tab(d->tabs), TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(clicked(int))); d->tabs++; } @@ -312,7 +312,7 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev) for (TQPtrListIterator<KMultiTabBarTab> it(*pTabs); it.current(); ++it) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(*it) ) + if ( obj == *it ) { if ( ev->type() == TQEvent::DragEnter) { diff --git a/digikam/libs/widgets/common/sidebar.h b/digikam/libs/widgets/common/sidebar.h index ef7f544..8d2dc51 100644 --- a/digikam/libs/widgets/common/sidebar.h +++ b/digikam/libs/widgets/common/sidebar.h @@ -51,7 +51,7 @@ class SidebarPriv; */ class DIGIKAM_EXPORT Sidebar : public KMultiTabBar { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/splashscreen.cpp b/digikam/libs/widgets/common/splashscreen.cpp index 20abac7..7a8cbba 100644 --- a/digikam/libs/widgets/common/splashscreen.cpp +++ b/digikam/libs/widgets/common/splashscreen.cpp @@ -72,8 +72,8 @@ SplashScreen::SplashScreen(const TQString& splash, WFlags f) TQTimer *timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(animate())); + connect(timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(animate())); timer->start(150); } diff --git a/digikam/libs/widgets/common/splashscreen.h b/digikam/libs/widgets/common/splashscreen.h index ef82cce..d2d4cf4 100644 --- a/digikam/libs/widgets/common/splashscreen.h +++ b/digikam/libs/widgets/common/splashscreen.h @@ -44,7 +44,7 @@ class SplashScreenPriv; class DIGIKAM_EXPORT SplashScreen : public KSplashScreen { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/squeezedcombobox.cpp b/digikam/libs/widgets/common/squeezedcombobox.cpp index 996b9cf..b70da09 100644 --- a/digikam/libs/widgets/common/squeezedcombobox.cpp +++ b/digikam/libs/widgets/common/squeezedcombobox.cpp @@ -75,11 +75,11 @@ SqueezedComboBox::SqueezedComboBox(TQWidget *parent, const char *name) d->tooltip = new SqueezedComboBoxTip(listBox()->viewport(), this); setMinimumWidth(100); - connect(d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeOut())); + connect(d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeOut())); - connect(this, TQT_SIGNAL(activated( int )), - this, TQT_SLOT(slotUpdateToolTip( int ))); + connect(this, TQ_SIGNAL(activated( int )), + this, TQ_SLOT(slotUpdateToolTip( int ))); } SqueezedComboBox::~SqueezedComboBox() @@ -97,7 +97,7 @@ TQSize SqueezedComboBox::sizeHint() const int maxW = count() ? 18 : 7 * fm.width(TQChar('x')) + 18; int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2; - return style().tqsizeFromContents(TQStyle::CT_ComboBox, this, + return style().sizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut()); } diff --git a/digikam/libs/widgets/common/squeezedcombobox.h b/digikam/libs/widgets/common/squeezedcombobox.h index f6b0a4f..7baaeca 100644 --- a/digikam/libs/widgets/common/squeezedcombobox.h +++ b/digikam/libs/widgets/common/squeezedcombobox.h @@ -55,7 +55,7 @@ class SqueezedComboBoxPriv; */ class DIGIKAM_EXPORT SqueezedComboBox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: 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/statusled.h b/digikam/libs/widgets/common/statusled.h index 9b55eda..2fd94cb 100644 --- a/digikam/libs/widgets/common/statusled.h +++ b/digikam/libs/widgets/common/statusled.h @@ -39,7 +39,7 @@ class StatusNavigateBarPriv; class DIGIKAM_EXPORT StatusLed : public TQLabel { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/statusnavigatebar.cpp b/digikam/libs/widgets/common/statusnavigatebar.cpp index c2a3d40..0ebcaf8 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")); @@ -99,17 +99,17 @@ StatusNavigateBar::StatusNavigateBar(TQWidget *parent) lay->addWidget(d->nextButton); lay->addWidget(d->lastButton); - connect(d->firstButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalFirstItem())); + connect(d->firstButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalFirstItem())); - connect(d->prevButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalPrevItem())); + connect(d->prevButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalPrevItem())); - connect(d->nextButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalNextItem())); + connect(d->nextButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalNextItem())); - connect(d->lastButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalLastItem())); + connect(d->lastButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalLastItem())); } StatusNavigateBar::~StatusNavigateBar() diff --git a/digikam/libs/widgets/common/statusnavigatebar.h b/digikam/libs/widgets/common/statusnavigatebar.h index 1918687..7972f74 100644 --- a/digikam/libs/widgets/common/statusnavigatebar.h +++ b/digikam/libs/widgets/common/statusnavigatebar.h @@ -41,7 +41,7 @@ class StatusNavigateBarPriv; class DIGIKAM_EXPORT StatusNavigateBar : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/statusprogressbar.cpp b/digikam/libs/widgets/common/statusprogressbar.cpp index 54c7f3b..215f81f 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")); @@ -99,8 +99,8 @@ StatusProgressBar::StatusProgressBar(TQWidget *parent) addWidget(d->textLabel, StatusProgressBarPriv::TextLabel); addWidget(d->progressWidget, StatusProgressBarPriv::ProgressBar); - connect( d->cancelButton, TQT_SIGNAL( clicked() ), - this, TQT_SIGNAL( signalCancelButtonPressed() ) ); + connect( d->cancelButton, TQ_SIGNAL( clicked() ), + this, TQ_SIGNAL( signalCancelButtonPressed() ) ); progressBarMode(TextMode); } diff --git a/digikam/libs/widgets/common/statusprogressbar.h b/digikam/libs/widgets/common/statusprogressbar.h index 512f029..e227a6d 100644 --- a/digikam/libs/widgets/common/statusprogressbar.h +++ b/digikam/libs/widgets/common/statusprogressbar.h @@ -41,7 +41,7 @@ class StatusProgressBarPriv; class DIGIKAM_EXPORT StatusProgressBar : public TQWidgetStack { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/common/statuszoombar.cpp b/digikam/libs/widgets/common/statuszoombar.cpp index 2bc4e06..4430248 100644 --- a/digikam/libs/widgets/common/statuszoombar.cpp +++ b/digikam/libs/widgets/common/statuszoombar.cpp @@ -56,7 +56,7 @@ TQSliderReverseWheel::~TQSliderReverseWheel() void TQSliderReverseWheel::wheelEvent(TQWheelEvent * e) { - if ( e->orientation() != orientation() && !TQT_TQRECT_OBJECT(rect()).contains(e->pos()) ) + if ( e->orientation() != orientation() && !rect().contains(e->pos()) ) return; static float offset = 0; @@ -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")); @@ -117,36 +117,36 @@ StatusZoomBar::StatusZoomBar(TQWidget *parent) d->zoomSlider->setMaxValue(ThumbnailSize::Huge); d->zoomSlider->setPageStep(ThumbnailSize::Step); d->zoomSlider->setValue(ThumbnailSize::Medium); - d->zoomSlider->setOrientation(Qt::Horizontal); + d->zoomSlider->setOrientation(TQt::Horizontal); 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); // ------------------------------------------------------------- - connect(d->zoomMinusButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalZoomMinusClicked())); + connect(d->zoomMinusButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalZoomMinusClicked())); - connect(d->zoomPlusButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalZoomPlusClicked())); + connect(d->zoomPlusButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalZoomPlusClicked())); - connect(d->zoomSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SIGNAL(signalZoomSliderChanged(int))); + connect(d->zoomSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SIGNAL(signalZoomSliderChanged(int))); - connect(d->zoomSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotZoomSliderChanged(int))); + connect(d->zoomSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotZoomSliderChanged(int))); - connect(d->zoomSlider, TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(slotZoomSliderReleased())); + connect(d->zoomSlider, TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(slotZoomSliderReleased())); } StatusZoomBar::~StatusZoomBar() @@ -167,8 +167,8 @@ void StatusZoomBar::slotZoomSliderChanged(int) } d->zoomTimer = new TQTimer( this ); - connect(d->zoomTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotDelayedZoomSliderChanged()) ); + connect(d->zoomTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotDelayedZoomSliderChanged()) ); d->zoomTimer->start(300, true); } diff --git a/digikam/libs/widgets/common/statuszoombar.h b/digikam/libs/widgets/common/statuszoombar.h index fc86a81..adf6941 100644 --- a/digikam/libs/widgets/common/statuszoombar.h +++ b/digikam/libs/widgets/common/statuszoombar.h @@ -62,7 +62,7 @@ private: class DIGIKAM_EXPORT StatusZoomBar : public TQHBox { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp index cd2efd5..2ec738b 100644 --- a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp +++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp @@ -213,8 +213,8 @@ CIETongueWidget::CIETongueWidget(int w, int h, TQWidget *parent, cmsHPROFILE hMo d->hMonitorProfile, TYPE_RGB_8, INTENT_PERCEPTUAL, 0); - connect(d->blinkTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotBlinkTimerDone())); + connect(d->blinkTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotBlinkTimerDone())); } CIETongueWidget::~CIETongueWidget() @@ -724,7 +724,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*) int asize = 24; TQPixmap anim(asize, asize); TQPainter p2; - p2.begin(&anim, TQT_TQOBJECT(this)); + p2.begin(&anim, this); p2.fillRect(0, 0, asize, asize, palette().active().background()); p2.translate(asize/2, asize/2); diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.h b/digikam/libs/widgets/iccprofiles/cietonguewidget.h index c91c0c6..9fc8503 100644 --- a/digikam/libs/widgets/iccprofiles/cietonguewidget.h +++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.h @@ -57,7 +57,7 @@ class CIETongueWidgetPriv; class DIGIKAM_EXPORT CIETongueWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h index f93f592..89b1f4b 100644 --- a/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h +++ b/digikam/libs/widgets/iccprofiles/iccpreviewwidget.h @@ -43,7 +43,7 @@ class ICCProfileWidget; class DIGIKAM_EXPORT ICCPreviewWidget : public KPreviewWidgetBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/iccprofiles/iccprofilewidget.h b/digikam/libs/widgets/iccprofiles/iccprofilewidget.h index 4296246..d753f30 100644 --- a/digikam/libs/widgets/iccprofiles/iccprofilewidget.h +++ b/digikam/libs/widgets/iccprofiles/iccprofilewidget.h @@ -41,7 +41,7 @@ class ICCProfileWidgetPriv; class DIGIKAM_EXPORT ICCProfileWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp index c8d3045..4ed7f25 100644 --- a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp @@ -253,7 +253,7 @@ void ImageGuideWidget::updatePixmap() else if (d->renderingPreviewMode == PreviewTargetImage || d->renderingPreviewMode == NoPreviewMode || (d->renderingPreviewMode == PreviewToggleOnMouseOver && d->onMouseMovePreviewToggled == true )) { - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), d->rect.x(), d->rect.y(), + d->iface->paint(d->pixmap, d->rect.x(), d->rect.y(), d->rect.width(), d->rect.height(), d->underExposureIndicator, d->overExposureIndicator); @@ -278,7 +278,7 @@ void ImageGuideWidget::updatePixmap() p.drawPixmap(d->rect, d->iface->convertToPixmap(d->preview)); // Drawing the target image under the original. - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), + d->iface->paint(d->pixmap, d->rect.x()+d->rect.width()/2, d->rect.y(), d->rect.width()/2, @@ -289,7 +289,7 @@ void ImageGuideWidget::updatePixmap() else { // Drawing the target image. - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), + d->iface->paint(d->pixmap, d->rect.x(), d->rect.y(), d->rect.width(), @@ -344,7 +344,7 @@ void ImageGuideWidget::updatePixmap() p.drawPixmap(d->rect, d->iface->convertToPixmap(d->preview)); // Drawing the target image under the original. - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), + d->iface->paint(d->pixmap, d->rect.x(), d->rect.y()+d->rect.height()/2, d->rect.width(), @@ -355,7 +355,7 @@ void ImageGuideWidget::updatePixmap() else { // Drawing the target image. - d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), + d->iface->paint(d->pixmap, d->rect.x(), d->rect.y(), d->rect.width(), @@ -496,7 +496,7 @@ void ImageGuideWidget::resizeEvent(TQResizeEvent* e) void ImageGuideWidget::mousePressEvent(TQMouseEvent* e) { - if ( !d->focus && e->button() == Qt::LeftButton && + if ( !d->focus && e->button() == TQt::LeftButton && d->rect.contains( e->x(), e->y() ) && d->spotVisible ) { d->focus = true; diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.h b/digikam/libs/widgets/imageplugins/imageguidewidget.h index 5cf7a11..48d6d24 100644 --- a/digikam/libs/widgets/imageplugins/imageguidewidget.h +++ b/digikam/libs/widgets/imageplugins/imageguidewidget.h @@ -46,7 +46,7 @@ class ImageGuideWidgetPriv; class DIGIKAM_EXPORT ImageGuideWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp index 4b6ab95..4551e09 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp @@ -179,24 +179,24 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSecti // ------------------------------------------------------------- - TQTimer::singleShot(0, this, TQT_SLOT(slotInitGui())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInitGui())); // ------------------------------------------------------------- - connect(d->imageRegionWidget, TQT_SIGNAL(signalContentsMovedEvent(bool)), - this, TQT_SLOT(slotOriginalImageRegionChanged(bool))); + connect(d->imageRegionWidget, TQ_SIGNAL(signalContentsMovedEvent(bool)), + this, TQ_SLOT(slotOriginalImageRegionChanged(bool))); - connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotSetImageRegionPosition(const TQRect&, bool))); + connect(d->imagePanIconWidget, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotSetImageRegionPosition(const TQRect&, bool))); - connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionTakeFocus()), - this, TQT_SLOT(slotPanIconTakeFocus())); + connect(d->imagePanIconWidget, TQ_SIGNAL(signalSelectionTakeFocus()), + this, TQ_SLOT(slotPanIconTakeFocus())); - connect(d->separateView, TQT_SIGNAL(released(int)), - d->imagePanIconWidget, TQT_SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQ_SIGNAL(released(int)), + d->imagePanIconWidget, TQ_SLOT(slotSeparateViewToggled(int))); - connect(d->separateView, TQT_SIGNAL(released(int)), - d->imageRegionWidget, TQT_SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQ_SIGNAL(released(int)), + d->imageRegionWidget, TQ_SLOT(slotSeparateViewToggled(int))); } ImagePanelWidget::~ImagePanelWidget() diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.h b/digikam/libs/widgets/imageplugins/imagepanelwidget.h index 292ba74..32179da 100644 --- a/digikam/libs/widgets/imageplugins/imagepanelwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.h @@ -47,7 +47,7 @@ class ImagePanIconWidget; class DIGIKAM_EXPORT ImagePanelWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp index 8fbeb17..3856422 100644 --- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp @@ -104,7 +104,7 @@ void ImagePanIconWidget::updatePixmap() { // Drawing background and image. m_pixmap->fill(colorGroup().background()); - d->iface->paint(TQT_TQPAINTDEVICE(m_pixmap), m_rect.x(), m_rect.y(), m_rect.width(), m_rect.height()); + d->iface->paint(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/imagepaniconwidget.h b/digikam/libs/widgets/imageplugins/imagepaniconwidget.h index dbb3480..e7d6ffb 100644 --- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepaniconwidget.h @@ -40,7 +40,7 @@ class ImagePanIconWidgetPriv; class ImagePanIconWidget : public PanIconWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp index 27444a0..cebf0f3 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp @@ -253,33 +253,33 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec // ------------------------------------------------------------- setProgressVisible(false); - TQTimer::singleShot(0, this, TQT_SLOT(slotInitGui())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInitGui())); // ------------------------------------------------------------- - connect(d->imageRegionWidget, TQT_SIGNAL(signalContentsMovedEvent(bool)), - this, TQT_SLOT(slotOriginalImageRegionChanged(bool))); + connect(d->imageRegionWidget, TQ_SIGNAL(signalContentsMovedEvent(bool)), + this, TQ_SLOT(slotOriginalImageRegionChanged(bool))); - connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotSetImageRegionPosition(const TQRect&, bool))); + connect(d->imagePanIconWidget, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotSetImageRegionPosition(const TQRect&, bool))); - connect(d->imagePanIconWidget, TQT_SIGNAL(signalSelectionTakeFocus()), - this, TQT_SLOT(slotPanIconTakeFocus())); + connect(d->imagePanIconWidget, TQ_SIGNAL(signalSelectionTakeFocus()), + this, TQ_SLOT(slotPanIconTakeFocus())); - connect(d->separateView, TQT_SIGNAL(released(int)), - d->imageRegionWidget, TQT_SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQ_SIGNAL(released(int)), + d->imageRegionWidget, TQ_SLOT(slotSeparateViewToggled(int))); - connect(d->separateView, TQT_SIGNAL(released(int)), - d->imagePanIconWidget, TQT_SLOT(slotSeparateViewToggled(int))); + connect(d->separateView, TQ_SIGNAL(released(int)), + d->imagePanIconWidget, TQ_SLOT(slotSeparateViewToggled(int))); - connect(d->zoomBar, TQT_SIGNAL(signalZoomMinusClicked()), - d->imageRegionWidget, TQT_SLOT(slotDecreaseZoom())); + connect(d->zoomBar, TQ_SIGNAL(signalZoomMinusClicked()), + d->imageRegionWidget, TQ_SLOT(slotDecreaseZoom())); - connect(d->zoomBar, TQT_SIGNAL(signalZoomPlusClicked()), - d->imageRegionWidget, TQT_SLOT(slotIncreaseZoom())); + connect(d->zoomBar, TQ_SIGNAL(signalZoomPlusClicked()), + d->imageRegionWidget, TQ_SLOT(slotIncreaseZoom())); - connect(d->zoomBar, TQT_SIGNAL(signalZoomSliderReleased(int)), - this, TQT_SLOT(slotZoomSliderChanged(int))); + connect(d->zoomBar, TQ_SIGNAL(signalZoomSliderReleased(int)), + this, TQ_SLOT(slotZoomSliderChanged(int))); } ImagePannelWidget::~ImagePannelWidget() diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.h b/digikam/libs/widgets/imageplugins/imagepannelwidget.h index a839372..a342988 100644 --- a/digikam/libs/widgets/imageplugins/imagepannelwidget.h +++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.h @@ -46,7 +46,7 @@ class ImageRegionWidget; class DIGIKAM_EXPORT ImagePannelWidget : public TQHBox { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp index db80604..c1392cc 100644 --- a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp @@ -95,8 +95,8 @@ ImageRegionWidget::ImageRegionWidget(int wp, int hp, TQWidget *parent, bool scro setHScrollBarMode( TQScrollView::AlwaysOff ); } - connect(this, TQT_SIGNAL(signalZoomFactorChanged(double)), - this, TQT_SLOT(slotZoomFactorChanged())); + connect(this, TQ_SIGNAL(signalZoomFactorChanged(double)), + this, TQ_SLOT(slotZoomFactorChanged())); } ImageRegionWidget::~ImageRegionWidget() diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.h b/digikam/libs/widgets/imageplugins/imageregionwidget.h index fbd70ba..8555703 100644 --- a/digikam/libs/widgets/imageplugins/imageregionwidget.h +++ b/digikam/libs/widgets/imageplugins/imageregionwidget.h @@ -41,7 +41,7 @@ class ImageRegionWidgetPriv; class DIGIKAM_EXPORT ImageRegionWidget : public PreviewWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp index 909dba9..ab73bbf 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp @@ -217,29 +217,29 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent, // ------------------------------------------------------------- - connect(d->previewWidget, TQT_SIGNAL(signalResized()), - this, TQT_SIGNAL(signalResized())); + connect(d->previewWidget, TQ_SIGNAL(signalResized()), + this, TQ_SIGNAL(signalResized())); - connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), - this, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & ))); + connect(d->previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQ_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const TQPoint & ))); + connect(d->previewWidget, TQ_SIGNAL(spotPositionChangedFromOriginal( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & ))); + connect(d->previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewWidget, TQT_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), - this, TQT_SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const TQPoint & ))); + connect(d->previewWidget, TQ_SIGNAL(spotPositionChangedFromTarget( const Digikam::DColor &, const TQPoint & )), + this, TQ_SLOT(slotUpdateSpotInfo( const Digikam::DColor &, const TQPoint & ))); - connect(d->previewButtons, TQT_SIGNAL(released(int)), - d->previewWidget, TQT_SLOT(slotChangeRenderingPreviewMode(int))); + connect(d->previewButtons, TQ_SIGNAL(released(int)), + d->previewWidget, TQ_SLOT(slotChangeRenderingPreviewMode(int))); - connect(d->underExposureButton, TQT_SIGNAL(toggled(bool)), - d->previewWidget, TQT_SLOT(slotToggleUnderExposure(bool))); + connect(d->underExposureButton, TQ_SIGNAL(toggled(bool)), + d->previewWidget, TQ_SLOT(slotToggleUnderExposure(bool))); - connect(d->overExposureButton, TQT_SIGNAL(toggled(bool)), - d->previewWidget, TQT_SLOT(slotToggleOverExposure(bool))); + connect(d->overExposureButton, TQ_SIGNAL(toggled(bool)), + d->previewWidget, TQ_SLOT(slotToggleOverExposure(bool))); // ------------------------------------------------------------- diff --git a/digikam/libs/widgets/imageplugins/imagewidget.h b/digikam/libs/widgets/imageplugins/imagewidget.h index 0192bdf..ebdf92e 100644 --- a/digikam/libs/widgets/imageplugins/imagewidget.h +++ b/digikam/libs/widgets/imageplugins/imagewidget.h @@ -46,7 +46,7 @@ class ImageWidgetPriv; class DIGIKAM_EXPORT ImageWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/exifwidget.h b/digikam/libs/widgets/metadata/exifwidget.h index ead60bc..ba66d08 100644 --- a/digikam/libs/widgets/metadata/exifwidget.h +++ b/digikam/libs/widgets/metadata/exifwidget.h @@ -38,7 +38,7 @@ namespace Digikam class DIGIKAM_EXPORT ExifWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/gpswidget.cpp b/digikam/libs/widgets/metadata/gpswidget.cpp index fcb1646..033423e 100644 --- a/digikam/libs/widgets/metadata/gpswidget.cpp +++ b/digikam/libs/widgets/metadata/gpswidget.cpp @@ -110,7 +110,7 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name) // -------------------------------------------------------- - TQGroupBox* box2 = new TQGroupBox( 0, Qt::Vertical, gpsInfo ); + TQGroupBox* box2 = new TQGroupBox( 0, TQt::Vertical, gpsInfo ); box2->setInsideMargin(0); box2->setInsideSpacing(0); box2->setFrameStyle( TQFrame::NoFrame ); @@ -138,8 +138,8 @@ GPSWidget::GPSWidget(TQWidget* parent, const char* name) // -------------------------------------------------------- - connect(d->detailsButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotGPSDetails())); + connect(d->detailsButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotGPSDetails())); setUserAreaWidget(gpsInfo); decodeMetadata(); diff --git a/digikam/libs/widgets/metadata/gpswidget.h b/digikam/libs/widgets/metadata/gpswidget.h index 2d1d92e..fd787d6 100644 --- a/digikam/libs/widgets/metadata/gpswidget.h +++ b/digikam/libs/widgets/metadata/gpswidget.h @@ -42,7 +42,7 @@ class WorldMapWidget; class DIGIKAM_EXPORT GPSWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/iptcwidget.h b/digikam/libs/widgets/metadata/iptcwidget.h index df4fb36..58f1449 100644 --- a/digikam/libs/widgets/metadata/iptcwidget.h +++ b/digikam/libs/widgets/metadata/iptcwidget.h @@ -34,7 +34,7 @@ namespace Digikam class DIGIKAM_EXPORT IptcWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/makernotewidget.h b/digikam/libs/widgets/metadata/makernotewidget.h index ae10381..f654959 100644 --- a/digikam/libs/widgets/metadata/makernotewidget.h +++ b/digikam/libs/widgets/metadata/makernotewidget.h @@ -35,7 +35,7 @@ namespace Digikam class DIGIKAM_EXPORT MakerNoteWidget : public MetadataWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/metadatalistview.cpp b/digikam/libs/widgets/metadata/metadatalistview.cpp index f2cd414..612eed1 100644 --- a/digikam/libs/widgets/metadata/metadatalistview.cpp +++ b/digikam/libs/widgets/metadata/metadatalistview.cpp @@ -59,8 +59,8 @@ MetadataListView::MetadataListView(TQWidget* parent) m_parent = dynamic_cast<MetadataWidget *>(parent); - connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*))); } MetadataListView::~MetadataListView() @@ -185,7 +185,7 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt delete parentifDItem; setCurrentItemByKey(m_selectedItemKey); - TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( triggerUpdate() ) ); } void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQStringList& keysFilter, @@ -244,13 +244,13 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt } setCurrentItemByKey(m_selectedItemKey); - TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( triggerUpdate() ) ); } void MetadataListView::viewportResizeEvent(TQResizeEvent* e) { TQListView::viewportResizeEvent(e); - TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( triggerUpdate() ) ); } void MetadataListView::slotSearchTextChanged(const TQString& filter) diff --git a/digikam/libs/widgets/metadata/metadatalistview.h b/digikam/libs/widgets/metadata/metadatalistview.h index 92d6fb7..aefe649 100644 --- a/digikam/libs/widgets/metadata/metadatalistview.h +++ b/digikam/libs/widgets/metadata/metadatalistview.h @@ -42,7 +42,7 @@ namespace Digikam class DIGIKAM_EXPORT MetadataListView : public TQListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp index 525effd..d0bd5b1 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.cpp +++ b/digikam/libs/widgets/metadata/metadatawidget.cpp @@ -158,23 +158,23 @@ MetadataWidget::MetadataWidget(TQWidget* parent, const char* name) // ----------------------------------------------------------------- - connect(d->levelButtons, TQT_SIGNAL(released(int)), - this, TQT_SLOT(slotModeChanged(int))); + connect(d->levelButtons, TQ_SIGNAL(released(int)), + this, TQ_SLOT(slotModeChanged(int))); - connect(copy2ClipBoard, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopy2Clipboard())); + connect(copy2ClipBoard, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopy2Clipboard())); - connect(printMetadata, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotPrintMetadata())); + connect(printMetadata, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotPrintMetadata())); - connect(saveMetadata, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSaveMetadataToFile())); + connect(saveMetadata, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSaveMetadataToFile())); - connect(d->searchBar, TQT_SIGNAL(signalTextChanged(const TQString&)), - d->view, TQT_SLOT(slotSearchTextChanged(const TQString&))); + connect(d->searchBar, TQ_SIGNAL(signalTextChanged(const TQString&)), + d->view, TQ_SLOT(slotSearchTextChanged(const TQString&))); - connect(d->view, TQT_SIGNAL(signalTextFilterMatch(bool)), - d->searchBar, TQT_SLOT(slotSearchResult(bool))); + connect(d->view, TQ_SIGNAL(signalTextFilterMatch(bool)), + d->searchBar, TQ_SLOT(slotSearchResult(bool))); } MetadataWidget::~MetadataWidget() diff --git a/digikam/libs/widgets/metadata/metadatawidget.h b/digikam/libs/widgets/metadata/metadatawidget.h index c109338..5d2feb6 100644 --- a/digikam/libs/widgets/metadata/metadatawidget.h +++ b/digikam/libs/widgets/metadata/metadatawidget.h @@ -46,7 +46,7 @@ class MetadataWidgetPriv; class DIGIKAM_EXPORT MetadataWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/digikam/libs/widgets/metadata/worldmapwidget.cpp index 17d07cc..811e914 100644 --- a/digikam/libs/widgets/metadata/worldmapwidget.cpp +++ b/digikam/libs/widgets/metadata/worldmapwidget.cpp @@ -176,7 +176,7 @@ void WorldMapWidget::drawContents(TQPainter *p, int x, int y, int w, int h) void WorldMapWidget::contentsMousePressEvent ( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { d->xMousePos = e->x(); d->yMousePos = e->y(); @@ -191,7 +191,7 @@ void WorldMapWidget::contentsMouseReleaseEvent ( TQMouseEvent * ) void WorldMapWidget::contentsMouseMoveEvent( TQMouseEvent * e ) { - if ( e->state() == Qt::LeftButton ) + if ( e->state() == TQt::LeftButton ) { uint newxpos = e->x(); uint newypos = e->y(); diff --git a/digikam/libs/widgets/metadata/worldmapwidget.h b/digikam/libs/widgets/metadata/worldmapwidget.h index 2bfa10f..bfb8ad8 100644 --- a/digikam/libs/widgets/metadata/worldmapwidget.h +++ b/digikam/libs/widgets/metadata/worldmapwidget.h @@ -39,7 +39,7 @@ class WorldMapWidgetPriv; class DIGIKAM_EXPORT WorldMapWidget : public TQScrollView { -Q_OBJECT +TQ_OBJECT public: |