diff options
Diffstat (limited to 'krita/plugins/tools/tool_curves/kis_tool_curve.cc')
-rw-r--r-- | krita/plugins/tools/tool_curves/kis_tool_curve.cc | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/krita/plugins/tools/tool_curves/kis_tool_curve.cc b/krita/plugins/tools/tool_curves/kis_tool_curve.cc index 526311e33..3ca41af62 100644 --- a/krita/plugins/tools/tool_curves/kis_tool_curve.cc +++ b/krita/plugins/tools/tool_curves/kis_tool_curve.cc @@ -21,10 +21,10 @@ #include <math.h> #include <limits.h> -#include <qapplication.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qrect.h> +#include <tqapplication.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqrect.h> #include <kaction.h> #include <kdebug.h> @@ -53,17 +53,17 @@ #include "kis_curve_framework.h" #include "kis_tool_curve.h" -QRect KisToolCurve::pivotRect (const QPoint& pos) +TQRect KisToolCurve::pivotRect (const TQPoint& pos) { - return QRect (pos-QPoint(4,4),pos+QPoint(4,4)); + return TQRect (pos-TQPoint(4,4),pos+TQPoint(4,4)); } -QRect KisToolCurve::selectedPivotRect (const QPoint& pos) +TQRect KisToolCurve::selectedPivotRect (const TQPoint& pos) { - return QRect (pos-QPoint(5,5),pos+QPoint(5,5)); + return TQRect (pos-TQPoint(5,5),pos+TQPoint(5,5)); } -KisToolCurve::KisToolCurve(const QString& UIName) +KisToolCurve::KisToolCurve(const TQString& UIName) : super(UIName) { m_UIName = UIName; @@ -75,9 +75,9 @@ KisToolCurve::KisToolCurve(const QString& UIName) m_dragging = false; m_draggingCursor = false; m_drawPivots = true; - m_drawingPen = QPen(Qt::white, 0, Qt::SolidLine); - m_pivotPen = QPen(Qt::gray, 0, Qt::SolidLine); - m_selectedPivotPen = QPen(Qt::yellow, 0, Qt::SolidLine); + m_drawingPen = TQPen(TQt::white, 0, TQt::SolidLine); + m_pivotPen = TQPen(TQt::gray, 0, TQt::SolidLine); + m_selectedPivotPen = TQPen(TQt::yellow, 0, TQt::SolidLine); m_pivotRounding = m_selectedPivotRounding = 55; m_actionOptions = NOOPTIONS; @@ -118,13 +118,13 @@ void KisToolCurve::buttonPress(KisButtonPressEvent *event) if (event->button() == Qt::LeftButton) { m_dragging = true; m_currentPoint = event->pos(); - PointPair temp = pointUnderMouse (m_subject->canvasController()->windowToView(event->pos().toQPoint())); + PointPair temp = pointUnderMouse (m_subject->canvasController()->windowToView(event->pos().toTQPoint())); if (temp.first == m_curve->end() && !(m_actionOptions)) { draw(true, true); m_curve->selectAll(false); draw(true, true); draw(m_curve->end()); - m_previous = m_curve->find(m_curve->last()); + m_previous = m_curve->tqfind(m_curve->last()); m_current = m_curve->pushPivot(event->pos()); if (m_curve->pivots().count() > 1) m_curve->calculateCurve(m_previous,m_current,m_current); @@ -143,28 +143,28 @@ void KisToolCurve::buttonPress(KisButtonPressEvent *event) } } -void KisToolCurve::keyPress(QKeyEvent *event) +void KisToolCurve::keyPress(TQKeyEvent *event) { - if (event->key() == Qt::Key_Return) { + if (event->key() == TQt::Key_Return) { m_dragging = false; commitCurve(); } else - if (event->key() == Qt::Key_Escape) { + if (event->key() == TQt::Key_Escape) { m_dragging = false; draw(false); m_curve->clear(); } else - if (event->key() == Qt::Key_Delete) { + if (event->key() == TQt::Key_Delete) { draw(false); m_dragging = false; m_curve->deleteSelected(); - m_current = m_curve->find(m_curve->last()); + m_current = m_curve->tqfind(m_curve->last()); m_previous = m_curve->selectPivot(m_current); draw(false); } } -void KisToolCurve::keyRelease(QKeyEvent *) +void KisToolCurve::keyRelease(TQKeyEvent *) { } @@ -183,7 +183,7 @@ void KisToolCurve::doubleClick(KisDoubleClickEvent *) void KisToolCurve::move(KisMoveEvent *event) { updateOptions(event->state()); - PointPair temp = pointUnderMouse(m_subject->canvasController()->windowToView(event->pos().toQPoint())); + PointPair temp = pointUnderMouse(m_subject->canvasController()->windowToView(event->pos().toTQPoint())); if (temp.first == m_curve->end() && !m_dragging) { if (m_draggingCursor) { setCursor(KisCursor::load(m_cursor, 6, 6)); @@ -220,10 +220,10 @@ double pointToSegmentDistance(const KisPoint& p, const KisPoint& l0, const KisPo return distance; } -PointPair KisToolCurve::pointUnderMouse(const QPoint& pos) +PointPair KisToolCurve::pointUnderMouse(const TQPoint& pos) { KisCurve::iterator it, next; - QPoint pos1, pos2; + TQPoint pos1, pos2; it = handleUnderMouse(pos); if (it != m_curve->end()) return PointPair(it,true); @@ -234,8 +234,8 @@ PointPair KisToolCurve::pointUnderMouse(const QPoint& pos) return PointPair(m_curve->end(),false); if ((*it).hint() > LINEHINT || (*next).hint() > LINEHINT) continue; - pos1 = m_subject->canvasController()->windowToView((*it).point().toQPoint()); - pos2 = m_subject->canvasController()->windowToView((*next).point().toQPoint()); + pos1 = m_subject->canvasController()->windowToView((*it).point().toTQPoint()); + pos2 = m_subject->canvasController()->windowToView((*next).point().toTQPoint()); if (pos1 == pos2) continue; if (pointToSegmentDistance(pos,pos1,pos2) <= MAXDISTANCE) @@ -245,17 +245,17 @@ PointPair KisToolCurve::pointUnderMouse(const QPoint& pos) return PointPair(it,false); } -KisCurve::iterator KisToolCurve::handleUnderMouse(const QPoint& pos) +KisCurve::iterator KisToolCurve::handleUnderMouse(const TQPoint& pos) { KisCurve pivs = m_curve->pivots(), inHandle; KisCurve::iterator it; for (it = pivs.begin(); it != pivs.end(); it++) { - if (pivotRect(m_subject->canvasController()->windowToView((*it).point().toQPoint())).contains(pos)) + if (pivotRect(m_subject->canvasController()->windowToView((*it).point().toTQPoint())).tqcontains(pos)) inHandle.pushPoint((*it)); } if (inHandle.isEmpty()) return m_curve->end(); - return m_curve->find(inHandle.last()); + return m_curve->tqfind(inHandle.last()); } KisCurve::iterator KisToolCurve::selectByMouse(KisCurve::iterator it) @@ -278,13 +278,13 @@ int KisToolCurve::updateOptions(int key) { int options = 0x0000; - if (key & Qt::ControlButton) + if (key & TQt::ControlButton) options |= CONTROLOPTION; - if (key & Qt::ShiftButton) + if (key & TQt::ShiftButton) options |= SHIFTOPTION; - if (key & Qt::AltButton) + if (key & TQt::AltButton) options |= ALTOPTION; if (options != m_actionOptions) { @@ -317,7 +317,7 @@ void KisToolCurve::draw(KisCurve::iterator inf, bool pivotonly, bool minimal) return; gc->setPen(m_drawingPen); - gc->setRasterOp(Qt::XorROP); + gc->setRasterOp(TQt::XorROP); KisCurve::iterator it, finish; @@ -344,8 +344,8 @@ void KisToolCurve::draw(KisCurve::iterator inf, bool pivotonly, bool minimal) return; } for (KisCurve::iterator i = sel.begin(); i != sel.end(); i++) { - it = m_curve->find(*i).previousPivot(); - finish = m_curve->find(*i).nextPivot(); + it = m_curve->tqfind(*i).previousPivot(); + finish = m_curve->tqfind(*i).nextPivot(); if ((*finish).isSelected()) finish = finish.previousPivot(); while (it != finish) { @@ -374,8 +374,8 @@ KisCurve::iterator KisToolCurve::drawPoint(KisCanvasPainter& gc, KisCurve::itera { KisCanvasController *controller = m_subject->canvasController(); - QPoint pos1, pos2; - pos1 = controller->windowToView((*point).point().toQPoint()); + TQPoint pos1, pos2; + pos1 = controller->windowToView((*point).point().toTQPoint()); switch ((*point).hint()) { case POINTHINT: @@ -385,7 +385,7 @@ KisCurve::iterator KisToolCurve::drawPoint(KisCanvasPainter& gc, KisCurve::itera case LINEHINT: gc.drawPoint(pos1); if (++point != m_curve->end() && (*point).hint() <= LINEHINT) { - pos2 = controller->windowToView((*point).point().toQPoint()); + pos2 = controller->windowToView((*point).point().toTQPoint()); gc.drawLine(pos1,pos2); } break; @@ -401,7 +401,7 @@ void KisToolCurve::drawPivotHandle(KisCanvasPainter& gc, KisCurve::iterator poin KisCanvasController *controller = m_subject->canvasController(); if (m_drawPivots) { - QPoint pos = controller->windowToView((*point).point().toQPoint()); + TQPoint pos = controller->windowToView((*point).point().toTQPoint()); if ((*point).isSelected()) { gc.setPen(m_selectedPivotPen); gc.drawRoundRect(selectedPivotRect(pos),m_selectedPivotRounding,m_selectedPivotRounding); @@ -418,7 +418,7 @@ void KisToolCurve::paint(KisCanvasPainter&) draw(false); } -void KisToolCurve::paint(KisCanvasPainter&, const QRect&) +void KisToolCurve::paint(KisCanvasPainter&, const TQRect&) { draw(false); } @@ -487,9 +487,9 @@ KisCurve::iterator KisToolCurve::paintPoint (KisPainter& painter, KisCurve::iter return point; } -QValueVector<KisPoint> KisToolCurve::convertCurve() +TQValueVector<KisPoint> KisToolCurve::convertCurve() { - QValueVector<KisPoint> points; + TQValueVector<KisPoint> points; for (KisCurve::iterator i = m_curve->begin(); i != m_curve->end(); i++) if ((*i).hint() != NOHINTS) @@ -500,7 +500,7 @@ QValueVector<KisPoint> KisToolCurve::convertCurve() void KisToolCurve::selectCurve() { - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); KisPaintDeviceSP dev = m_currentImage->activeDevice(); bool hasSelection = dev->hasSelection(); KisSelectedTransaction *t = 0; @@ -513,7 +513,7 @@ void KisToolCurve::selectCurve() KisPainter painter(selection.data()); - painter.setPaintColor(KisColor(Qt::black, selection->colorSpace())); + painter.setPaintColor(KisColor(TQt::black, selection->colorSpace())); painter.setFillStyle(KisPainter::FillStyleForegroundColor); painter.setStrokeStyle(KisPainter::StrokeStyleNone); painter.setBrush(m_subject->currentBrush()); @@ -536,7 +536,7 @@ void KisToolCurve::selectCurve() if(hasSelection) { - QRect dirty(painter.dirtyRect()); + TQRect dirty(painter.dirtyRect()); dev->setDirty(dirty); dev->emitSelectionChanged(dirty); } else { @@ -547,17 +547,17 @@ void KisToolCurve::selectCurve() if (m_currentImage->undo()) m_currentImage->undoAdapter()->addCommand(t); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); draw(false); } -QWidget* KisToolCurve::createOptionWidget(QWidget* parent) +TQWidget* KisToolCurve::createOptionWidget(TQWidget* tqparent) { if (toolType() == TOOL_SHAPE || toolType() == TOOL_FREEHAND) - return super::createOptionWidget(parent); + return super::createOptionWidget(tqparent); else if (toolType() == TOOL_SELECT) - return createSelectionOptionWidget(parent); + return createSelectionOptionWidget(tqparent); else kdDebug(0) << "NO SUPPORT FOR THIS TOOL TYPE" << endl; return 0; @@ -568,21 +568,21 @@ void KisToolCurve::slotSetAction(int action) { m_selectAction =(enumSelectionMode)action; } -QWidget* KisToolCurve::createSelectionOptionWidget(QWidget* parent) +TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* tqparent) { - m_optWidget = new KisSelectionOptions(parent, m_subject); + m_optWidget = new KisSelectionOptions(tqparent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(m_UIName); - connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int))); + connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout()); - l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; } -QWidget* KisToolCurve::optionWidget() +TQWidget* KisToolCurve::optionWidget() { if (toolType() == TOOL_SELECT) return m_optWidget; |