diff options
Diffstat (limited to 'digikam/utilities/imageeditor/canvas')
9 files changed, 67 insertions, 67 deletions
diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp index 8154c09..89758c3 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.cpp +++ b/digikam/utilities/imageeditor/canvas/canvas.cpp @@ -174,35 +174,35 @@ Canvas::Canvas(TQWidget *parent) // ------------------------------------------------------------ - connect(this, TQT_SIGNAL(signalZoomChanged(double)), - this, TQT_SLOT(slotZoomChanged(double))); + connect(this, TQ_SIGNAL(signalZoomChanged(double)), + this, TQ_SLOT(slotZoomChanged(double))); - connect(d->cornerButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(slotCornerButtonPressed())); + connect(d->cornerButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(slotCornerButtonPressed())); - connect(d->im, TQT_SIGNAL(signalModified()), - this, TQT_SLOT(slotModified())); + connect(d->im, TQ_SIGNAL(signalModified()), + this, TQ_SLOT(slotModified())); - connect(d->im, TQT_SIGNAL(signalUndoStateChanged(bool, bool, bool)), - this, TQT_SIGNAL(signalUndoStateChanged(bool, bool, bool))); + connect(d->im, TQ_SIGNAL(signalUndoStateChanged(bool, bool, bool)), + this, TQ_SIGNAL(signalUndoStateChanged(bool, bool, bool))); - connect(d->im, TQT_SIGNAL(signalLoadingStarted(const TQString&)), - this, TQT_SIGNAL(signalLoadingStarted(const TQString&))); + connect(d->im, TQ_SIGNAL(signalLoadingStarted(const TQString&)), + this, TQ_SIGNAL(signalLoadingStarted(const TQString&))); - connect(d->im, TQT_SIGNAL(signalImageLoaded(const TQString&, bool)), - this, TQT_SLOT(slotImageLoaded(const TQString&, bool))); + connect(d->im, TQ_SIGNAL(signalImageLoaded(const TQString&, bool)), + this, TQ_SLOT(slotImageLoaded(const TQString&, bool))); - connect(d->im, TQT_SIGNAL(signalImageSaved(const TQString&, bool)), - this, TQT_SLOT(slotImageSaved(const TQString&, bool))); + connect(d->im, TQ_SIGNAL(signalImageSaved(const TQString&, bool)), + this, TQ_SLOT(slotImageSaved(const TQString&, bool))); - connect(d->im, TQT_SIGNAL(signalLoadingProgress(const TQString&, float)), - this, TQT_SIGNAL(signalLoadingProgress(const TQString&, float))); + connect(d->im, TQ_SIGNAL(signalLoadingProgress(const TQString&, float)), + this, TQ_SIGNAL(signalLoadingProgress(const TQString&, float))); - connect(d->im, TQT_SIGNAL(signalSavingProgress(const TQString&, float)), - this, TQT_SIGNAL(signalSavingProgress(const TQString&, float))); + connect(d->im, TQ_SIGNAL(signalSavingProgress(const TQString&, float)), + this, TQ_SIGNAL(signalSavingProgress(const TQString&, float))); - connect(this, TQT_SIGNAL(signalSelected(bool)), - this, TQT_SLOT(slotSelected())); + connect(this, TQ_SIGNAL(signalSelected(bool)), + this, TQ_SLOT(slotSelected())); } Canvas::~Canvas() @@ -568,7 +568,7 @@ void Canvas::paintViewport(const TQRect& er, bool antialias) TQRect rr(d->rubber->normalize()); TQRect r(i, j, d->tileSize, d->tileSize); - d->im->paintOnDevice(TQT_TQPAINTDEVICE(pix), sx, sy, sw, sh, + d->im->paintOnDevice(pix, sx, sy, sw, sh, 0, 0, d->tileSize, d->tileSize, rr.x() - i - d->pixmapRect.x(), rr.y() - j - d->pixmapRect.y(), @@ -591,7 +591,7 @@ void Canvas::paintViewport(const TQRect& er, bool antialias) } else { - d->im->paintOnDevice(TQT_TQPAINTDEVICE(pix), sx, sy, sw, sh, + d->im->paintOnDevice(pix, sx, sy, sw, sh, 0, 0, d->tileSize, d->tileSize, antialias); } @@ -637,7 +637,7 @@ void Canvas::drawRubber() TQPoint pnt(r.x(), r.y()); - style().tqdrawPrimitive(TQStyle::PE_FocusRect, &p, + style().drawPrimitive(TQStyle::PE_FocusRect, &p, TQRect(pnt.x(), pnt.y(), r.width(), r.height()), colorGroup(), TQStyle::Style_Default, TQStyleOption(colorGroup().base())); @@ -646,12 +646,12 @@ void Canvas::drawRubber() void Canvas::contentsMousePressEvent(TQMouseEvent *e) { - if (!e || e->button() == Qt::RightButton) + if (!e || e->button() == TQt::RightButton) return; d->midButtonPressed = false; - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { if (d->ltActive || d->rtActive || d->lbActive || d->rbActive) @@ -695,7 +695,7 @@ void Canvas::contentsMousePressEvent(TQMouseEvent *e) return; } } - else if (e->button() == Qt::MidButton) + else if (e->button() == TQt::MidButton) { if (visibleWidth() < d->im->width() || visibleHeight() < d->im->height()) @@ -733,7 +733,7 @@ void Canvas::contentsMouseMoveEvent(TQMouseEvent *e) if (!e) return; - if (e->state() & Qt::MidButton) + if (e->state() & TQt::MidButton) { if (d->midButtonPressed) { @@ -746,7 +746,7 @@ void Canvas::contentsMouseMoveEvent(TQMouseEvent *e) if (!d->rubber) return; - if (e->state() != Qt::LeftButton && + if (e->state() != TQt::LeftButton && !(d->ltActive || d->rtActive || d->lbActive || d->rbActive)) return; @@ -865,12 +865,12 @@ void Canvas::contentsMouseReleaseEvent(TQMouseEvent *e) emit signalSelected(false); } - if (e->button() != Qt::LeftButton) + if (e->button() != TQt::LeftButton) { viewport()->unsetCursor(); } - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { emit signalRightButtonClicked(); } @@ -1349,11 +1349,11 @@ void Canvas::slotCornerButtonPressed() pan->setRegionSelection(r); pan->setMouseFocus(); - connect(pan, TQT_SIGNAL(signalSelectionMoved(const TQRect&, bool)), - this, TQT_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); + connect(pan, TQ_SIGNAL(signalSelectionMoved(const TQRect&, bool)), + this, TQ_SLOT(slotPanIconSelectionMoved(const TQRect&, bool))); - connect(pan, TQT_SIGNAL(signalHiden()), - this, TQT_SLOT(slotPanIconHiden())); + connect(pan, TQ_SIGNAL(signalHiden()), + this, TQ_SLOT(slotPanIconHiden())); TQPoint g = mapToGlobal(viewport()->pos()); g.setX(g.x()+ viewport()->size().width()); diff --git a/digikam/utilities/imageeditor/canvas/canvas.h b/digikam/utilities/imageeditor/canvas/canvas.h index 101362e..c772098 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.h +++ b/digikam/utilities/imageeditor/canvas/canvas.h @@ -55,7 +55,7 @@ class IOFileSettingsContainer; class DIGIKAM_EXPORT Canvas : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp index f81a70d..1403773 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp @@ -84,7 +84,7 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview, TQLabel *embeddedProfileTitle = new TQLabel(i18n("Embedded color profile:"), page); TQLabel *embeddedProfileDesc = new TQLabel(TQString("<b>%1</b>").arg(m_iccTrans->getEmbeddedProfileDescriptor()), page); TQPushButton *embeddedProfInfo = new TQPushButton(i18n("Info..."), page); - KSeparator *line = new KSeparator(Qt::Horizontal, page); + KSeparator *line = new KSeparator(TQt::Horizontal, page); if (m_iccTrans->embeddedProfile().isEmpty()) { @@ -117,7 +117,7 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview, vlay->addWidget(logo); vlay->addWidget(message); - vlay->addWidget(new KSeparator(Qt::Horizontal, page)); + vlay->addWidget(new KSeparator(TQt::Horizontal, page)); vlay->addWidget(currentProfileTitle); vlay->addWidget(currentProfileDesc); @@ -144,14 +144,14 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview, // -------------------------------------------------------------------- - connect(currentProfInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCurrentProfInfo()) ); + connect(currentProfInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCurrentProfInfo()) ); - connect(embeddedProfInfo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEmbeddedProfInfo()) ); + connect(embeddedProfInfo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEmbeddedProfInfo()) ); - connect(this, TQT_SIGNAL(applyClicked()), - this, TQT_SLOT(slotApplyClicked())); + connect(this, TQ_SIGNAL(applyClicked()), + this, TQ_SLOT(slotApplyClicked())); } ColorCorrectionDlg::~ColorCorrectionDlg() diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h index 208bc4e..7cc4c19 100644 --- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h +++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.h @@ -45,7 +45,7 @@ class DImg; class DIGIKAM_EXPORT ColorCorrectionDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.cpp b/digikam/utilities/imageeditor/canvas/dimginterface.cpp index f8a156b..8ce1c11 100644 --- a/digikam/utilities/imageeditor/canvas/dimginterface.cpp +++ b/digikam/utilities/imageeditor/canvas/dimginterface.cpp @@ -162,17 +162,17 @@ DImgInterface::DImgInterface() d->undoMan = new UndoManager(this); d->thread = new SharedLoadSaveThread; - connect( d->thread, TQT_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg&)), - this, TQT_SLOT(slotImageLoaded(const LoadingDescription &, const DImg&)) ); + connect( d->thread, TQ_SIGNAL(signalImageLoaded(const LoadingDescription &, const DImg&)), + this, TQ_SLOT(slotImageLoaded(const LoadingDescription &, const DImg&)) ); - connect( d->thread, TQT_SIGNAL(signalImageSaved(const TQString&, bool)), - this, TQT_SLOT(slotImageSaved(const TQString&, bool)) ); + connect( d->thread, TQ_SIGNAL(signalImageSaved(const TQString&, bool)), + this, TQ_SLOT(slotImageSaved(const TQString&, bool)) ); - connect( d->thread, TQT_SIGNAL(signalLoadingProgress(const LoadingDescription &, float)), - this, TQT_SLOT(slotLoadingProgress(const LoadingDescription &, float)) ); + connect( d->thread, TQ_SIGNAL(signalLoadingProgress(const LoadingDescription &, float)), + this, TQ_SLOT(slotLoadingProgress(const LoadingDescription &, float)) ); - connect( d->thread, TQT_SIGNAL(signalSavingProgress(const TQString&, float)), - this, TQT_SLOT(slotSavingProgress(const TQString&, float)) ); + connect( d->thread, TQ_SIGNAL(signalSavingProgress(const TQString&, float)), + this, TQ_SLOT(slotSavingProgress(const TQString&, float)) ); } DImgInterface::~DImgInterface() @@ -201,11 +201,11 @@ void DImgInterface::load(const TQString& filename, IOFileSettingsContainer *iofi RawImport *rawImport = new RawImport(KURL(d->filename), this); EditorToolIface::editorToolIface()->loadTool(rawImport); - connect(rawImport, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(slotUseRawImportSettings())); + connect(rawImport, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(slotUseRawImportSettings())); - connect(rawImport, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(slotUseDefaultSettings())); + connect(rawImport, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(slotUseDefaultSettings())); } else { @@ -637,7 +637,7 @@ void DImgInterface::saveAs(const TQString& fileName, IOFileSettingsContainer *io } // Update Exif thumbnail. - TQImage thumb = preview.smoothScale(160, 120, TQ_ScaleMin); + TQImage thumb = preview.smoothScale(160, 120, TQImage::ScaleMin); meta.setExifThumbnail(thumb); // Update Exif Image dimensions. diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.h b/digikam/utilities/imageeditor/canvas/dimginterface.h index 8ca147c..9a41eb0 100644 --- a/digikam/utilities/imageeditor/canvas/dimginterface.h +++ b/digikam/utilities/imageeditor/canvas/dimginterface.h @@ -49,7 +49,7 @@ class DImgInterfacePrivate; class DIGIKAM_EXPORT DImgInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/canvas/imageplugin.cpp b/digikam/utilities/imageeditor/canvas/imageplugin.cpp index c7ae00c..b330cb5 100644 --- a/digikam/utilities/imageeditor/canvas/imageplugin.cpp +++ b/digikam/utilities/imageeditor/canvas/imageplugin.cpp @@ -53,11 +53,11 @@ void ImagePlugin::loadTool(EditorTool* tool) { EditorToolIface::editorToolIface()->loadTool(tool); - connect(tool, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(slotToolDone())); + connect(tool, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(slotToolDone())); - connect(tool, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(slotToolDone())); + connect(tool, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(slotToolDone())); } void ImagePlugin::slotToolDone() diff --git a/digikam/utilities/imageeditor/canvas/imageplugin.h b/digikam/utilities/imageeditor/canvas/imageplugin.h index a9559e5..ef50625 100644 --- a/digikam/utilities/imageeditor/canvas/imageplugin.h +++ b/digikam/utilities/imageeditor/canvas/imageplugin.h @@ -46,7 +46,7 @@ class EditorTool; class DIGIKAM_EXPORT ImagePlugin : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/digikam/utilities/imageeditor/canvas/undoaction.cpp b/digikam/utilities/imageeditor/canvas/undoaction.cpp index dea1a94..bb4ff75 100644 --- a/digikam/utilities/imageeditor/canvas/undoaction.cpp +++ b/digikam/utilities/imageeditor/canvas/undoaction.cpp @@ -108,9 +108,9 @@ UndoActionFlip::UndoActionFlip(DImgInterface* iface, UndoActionFlip::Direction dir) : UndoAction(iface), m_dir(dir) { - if(m_dir ==Qt::Horizontal) + if(m_dir ==TQt::Horizontal) m_title = i18n("Flip Horizontal"); - else if(m_dir ==Qt::Vertical) + else if(m_dir ==TQt::Vertical) m_title = i18n("Flip Vertical"); } @@ -122,10 +122,10 @@ void UndoActionFlip::rollBack() { switch(m_dir) { - case Qt::Horizontal: + case TQt::Horizontal: m_iface->flipHoriz(false); return; - case Qt::Vertical: + case TQt::Vertical: m_iface->flipVert(false); return; default: |