diff options
Diffstat (limited to 'chalk/plugins')
32 files changed, 65 insertions, 65 deletions
diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp index 8f1085654..89a20500a 100644 --- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp +++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp @@ -121,7 +121,7 @@ KisEmbossInAllDirectionsFilter::KisEmbossInAllDirectionsFilter()  }  KisEmbossHorizontalVerticalFilter::KisEmbossHorizontalVerticalFilter() -    : KisConvolutionConstFilter(id(), "emboss", i18n("Emboss Horizontal &&Qt::Vertical")) +    : KisConvolutionConstFilter(id(), "emboss", i18n("Emboss Horizontal && Vertical"))  {      m_matrix = createKernel( 0, -1, 0 , -1, 4, -1 , 0, -1, 0, 1, 127);      m_channelFlags = KisChannelInfo::FLAG_COLOR; diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cpp b/chalk/plugins/filters/levelfilter/kgradientslider.cpp index ca5725bd5..de5dd76d3 100644 --- a/chalk/plugins/filters/levelfilter/kgradientslider.cpp +++ b/chalk/plugins/filters/levelfilter/kgradientslider.cpp @@ -131,7 +131,7 @@ void KGradientSlider::mousePressEvent ( TQMouseEvent * e )      eCursor closest_cursor;      int distance; -    if (e->button() != Qt::LeftButton) +    if (e->button() != TQt::LeftButton)          return;      unsigned int x = e->pos().x(); @@ -208,7 +208,7 @@ void KGradientSlider::mousePressEvent ( TQMouseEvent * e )  void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e )  { -    if (e->button() != Qt::LeftButton) +    if (e->button() != TQt::LeftButton)          return;      m_dragging = false; diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp index f15077b37..3a2a22842 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp +++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp @@ -63,7 +63,7 @@ KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *parent, bool isTablet)      TQHBoxLayout * l = new TQHBoxLayout(m_optionsWidget);      l->setAutoAdd(true);      m_rateLabel = new TQLabel(i18n("Rate: "), m_optionsWidget); -    m_rateSlider = new TQSlider(0,100,1, 50, Qt::Horizontal, m_optionsWidget); +    m_rateSlider = new TQSlider(0,100,1, 50, TQt::Horizontal, m_optionsWidget);      if(isTablet)      {          m_pressureVariation = new TQLabel(i18n("Pressure variation: "), m_optionsWidget); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp index 40a09a91f..6130aa217 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp @@ -77,7 +77,7 @@ void KisToolColorPicker::update(KisCanvasSubject *subject)  void KisToolColorPicker::buttonPress(KisButtonPressEvent *e)  {      if (m_subject) { -        if (e->button() != Qt::LeftButton && e->button() != Qt::RightButton) +        if (e->button() != TQt::LeftButton && e->button() != TQt::RightButton)              return;          KisImageSP img; @@ -164,7 +164,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e)          displayPickedColor();          if (m_updateColor) { -            if (e->button() == Qt::LeftButton) +            if (e->button() == TQt::LeftButton)                  m_subject->setFGColor(m_pickedColor);              else                  m_subject->setBGColor(m_pickedColor); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp index 0488dcb05..0dc53a5b6 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp @@ -62,7 +62,7 @@ void KisToolEllipse::update (KisCanvasSubject *subject)  void KisToolEllipse::buttonPress(KisButtonPressEvent *event)  { -    if (m_currentImage && event->button() == Qt::LeftButton) { +    if (m_currentImage && event->button() == TQt::LeftButton) {          m_dragging = true;          m_dragStart = m_dragCenter = m_dragEnd = event->pos();          draw(m_dragStart, m_dragEnd); @@ -110,7 +110,7 @@ void KisToolEllipse::buttonRelease(KisButtonReleaseEvent *event)      if (!m_subject || !m_currentImage)          return; -    if (m_dragging && event->button() == Qt::LeftButton) { +    if (m_dragging && event->button() == TQt::LeftButton) {          // erase old lines on canvas          draw(m_dragStart, m_dragEnd);          m_dragging = false; diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp b/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp index ceb78f06b..3c9b60386 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp @@ -145,7 +145,7 @@ void KisToolFill::buttonRelease(KisButtonReleaseEvent *e)  {      if (!m_subject) return;      if (!m_currentImage || !m_currentImage->activeDevice()) return; -    if (e->button() != Qt::LeftButton) return; +    if (e->button() != TQt::LeftButton) return;      if(!m_wasPressed) return;      m_wasPressed = false;      int x, y; diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp index b8f72a3bb..c0543c6a8 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp @@ -91,7 +91,7 @@ void KisToolGradient::buttonPress(KisButtonPressEvent *e)          return;      } -    if (e->button() == Qt::LeftButton) { +    if (e->button() == TQt::LeftButton) {          m_dragging = true;          m_startPos = e->pos();          m_endPos = e->pos(); @@ -118,7 +118,7 @@ void KisToolGradient::move(KisMoveEvent *e)  void KisToolGradient::buttonRelease(KisButtonReleaseEvent *e)  { -    if (m_dragging && e->button() == Qt::LeftButton) { +    if (m_dragging && e->button() == TQt::LeftButton) {          KisCanvasController *controller = m_subject->canvasController();          KisImageSP img = m_subject->currentImg(); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cpp b/chalk/plugins/tools/defaulttools/kis_tool_line.cpp index 87cb93907..e9e303a64 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_line.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cpp @@ -87,7 +87,7 @@ void KisToolLine::buttonPress(KisButtonPressEvent *e)      if (!m_subject->currentBrush()) return; -    if (e->button() == Qt::LeftButton) { +    if (e->button() == TQt::LeftButton) {          m_dragging = true;          //KisCanvasController *controller = m_subject->canvasController();          m_startPos = e->pos(); //controller->windowToView(e->pos()); @@ -116,7 +116,7 @@ void KisToolLine::move(KisMoveEvent *e)  void KisToolLine::buttonRelease(KisButtonReleaseEvent *e)  { -    if (m_dragging && e->button() == Qt::LeftButton) { +    if (m_dragging && e->button() == TQt::LeftButton) {          m_dragging = false;          KisCanvasController *controller = m_subject->canvasController();          KisImageSP img = m_subject->currentImg(); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_move.cpp b/chalk/plugins/tools/defaulttools/kis_tool_move.cpp index be5065784..1bcd51350 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_move.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_move.cpp @@ -62,7 +62,7 @@ void KisToolMove::update(KisCanvasSubject *subject)  void KisToolMove::buttonPress(KisButtonPressEvent *e)  { -    if (m_subject && e->button() == Qt::LeftButton) { +    if (m_subject && e->button() == TQt::LeftButton) {          TQPoint pos = e->pos().floorTQPoint();          KisImageSP img = m_subject->currentImg();          KisLayerSP dev; @@ -76,7 +76,7 @@ void KisToolMove::buttonPress(KisButtonPressEvent *e)  void KisToolMove::move(KisMoveEvent *e)  { -    if (m_subject  && e->state() == Qt::LeftButton) { +    if (m_subject  && e->state() == TQt::LeftButton) {          TQPoint pos = e->pos().floorTQPoint();          if((e->state() & TQt::AltButton) || (e->state() & TQt::ControlButton)) {              if(fabs(pos.x() - m_dragStart.x()) > fabs(pos.y() - m_dragStart.y())) @@ -90,7 +90,7 @@ void KisToolMove::move(KisMoveEvent *e)  void KisToolMove::buttonRelease(KisButtonReleaseEvent *e)  { -    if (m_subject && e->button() == Qt::LeftButton) { +    if (m_subject && e->button() == TQt::LeftButton) {          m_strategy.endDrag(e->pos().floorTQPoint());      }  } diff --git a/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp b/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp index c95b10000..d96c820f5 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp @@ -50,7 +50,7 @@ void KisToolPan::update(KisCanvasSubject *subject)  void KisToolPan::buttonPress(KisButtonPressEvent *e)  { -    if (m_subject && !m_dragging && e->button() == Qt::LeftButton) { +    if (m_subject && !m_dragging && e->button() == TQt::LeftButton) {          KisCanvasController *controller = m_subject->canvasController();          m_origScrollX = controller->horzValue(); @@ -74,7 +74,7 @@ void KisToolPan::move(KisMoveEvent *e)  void KisToolPan::buttonRelease(KisButtonReleaseEvent *e)  { -    if (m_subject && m_dragging && e->button() == Qt::LeftButton) { +    if (m_subject && m_dragging && e->button() == TQt::LeftButton) {          setCursor(m_openHandCursor);          m_dragging = false;      } diff --git a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp index 69e306ecf..0106b769d 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp @@ -63,7 +63,7 @@ void KisToolRectangle::update (KisCanvasSubject *subject)  void KisToolRectangle::buttonPress(KisButtonPressEvent *event)  { -    if (m_currentImage && event->button() == Qt::LeftButton) { +    if (m_currentImage && event->button() == TQt::LeftButton) {          m_dragging = true;          m_dragStart = m_dragCenter = m_dragEnd = event->pos();          draw(m_dragStart, m_dragEnd); @@ -117,7 +117,7 @@ void KisToolRectangle::buttonRelease(KisButtonReleaseEvent *event)      KisPaintDeviceSP device = m_currentImage->activeDevice ();      if (!device) return; -    if (m_dragging && event->button() == Qt::LeftButton) { +    if (m_dragging && event->button() == TQt::LeftButton) {          // erase old lines on canvas          draw(m_dragStart, m_dragEnd);          m_dragging = false; diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cpp b/chalk/plugins/tools/defaulttools/kis_tool_text.cpp index d1727f394..6fb079406 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cpp @@ -72,7 +72,7 @@ void KisToolText::update(KisCanvasSubject *subject)  void KisToolText::buttonPress(KisButtonPressEvent *e)  { -    if (m_subject && e->button() == Qt::LeftButton) { +    if (m_subject && e->button() == TQt::LeftButton) {          m_wasPressed = true;      }  } @@ -81,7 +81,7 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e)  {      if ( m_windowIsBeingShown ) return; -    if (m_subject && e->button() == Qt::LeftButton) { +    if (m_subject && e->button() == TQt::LeftButton) {          if(!m_wasPressed) return;          m_wasPressed = false;          KisImageSP img = m_subject->currentImg(); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp index fe449ee4f..77cdd336d 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp +++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp @@ -74,7 +74,7 @@ void KisToolZoom::paint(KisCanvasPainter& gc, const TQRect& rc)  void KisToolZoom::buttonPress(KisButtonPressEvent *e)  {      if (m_subject && m_subject->currentImg() && !m_dragging) { -        if (e->button() == Qt::LeftButton) { +        if (e->button() == TQt::LeftButton) {              m_startPos = e->pos().floorTQPoint();              m_endPos = e->pos().floorTQPoint();              m_dragging = true; @@ -95,7 +95,7 @@ void KisToolZoom::move(KisMoveEvent *e)  void KisToolZoom::buttonRelease(KisButtonReleaseEvent *e)  { -    if (m_subject && m_dragging && e->button() == Qt::LeftButton) { +    if (m_subject && m_dragging && e->button() == TQt::LeftButton) {          KisCanvasController *controller = m_subject->canvasController();          m_endPos = e->pos().floorTQPoint(); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp index a1f0902f4..c89702f9d 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp +++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp @@ -118,7 +118,7 @@ void KisToolMoveSelection::update(KisCanvasSubject *subject)  void KisToolMoveSelection::buttonPress(KisButtonPressEvent *e)  {      m_dragging = false; -    if (m_subject && e->button() == Qt::LeftButton) { +    if (m_subject && e->button() == TQt::LeftButton) {          TQPoint pos = e->pos().floorTQPoint();          KisImageSP img = m_subject->currentImg();          KisPaintLayerSP lay; @@ -176,7 +176,7 @@ void KisToolMoveSelection::move(KisMoveEvent *e)  void KisToolMoveSelection::buttonRelease(KisButtonReleaseEvent *e)  { -    if (m_subject && e->button() == Qt::LeftButton && m_dragging) { +    if (m_subject && e->button() == TQt::LeftButton && m_dragging) {          m_dragging = false;          KisImageSP img = m_subject->currentImg();          if(!img) return; diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp index 1a4932b75..bf24775d8 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp @@ -86,7 +86,7 @@ void KisToolSelectContiguous::buttonPress(KisButtonPressEvent * e)          KisPaintDeviceSP dev;          TQPoint pos; -        if (e->button() != Qt::LeftButton && e->button() != Qt::RightButton) +        if (e->button() != TQt::LeftButton && e->button() != TQt::RightButton)              return;          if (!(img = m_subject->currentImg())) diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp index f85da3327..0d632c423 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp @@ -117,7 +117,7 @@ void KisToolSelectElliptical::buttonPress(KisButtonPressEvent *e)      if (m_subject) {          KisImageSP img = m_subject->currentImg(); -        if (img && img->activeDevice() && e->button() == Qt::LeftButton) { +        if (img && img->activeDevice() && e->button() == TQt::LeftButton) {              clearSelection();              m_startPos = m_endPos = m_centerPos = e->pos();              m_selecting = true; @@ -162,7 +162,7 @@ void KisToolSelectElliptical::move(KisMoveEvent *e)  void KisToolSelectElliptical::buttonRelease(KisButtonReleaseEvent *e)  { -     if (m_subject && m_selecting && e->button() == Qt::LeftButton) { +     if (m_subject && m_selecting && e->button() == TQt::LeftButton) {          paintOutline(); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp index 7f5267366..2507cb569 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp @@ -82,7 +82,7 @@ void KisToolSelectOutline::update (KisCanvasSubject *subject)  void KisToolSelectOutline::buttonPress(KisButtonPressEvent *event)  { -    if (event->button() == Qt::LeftButton) { +    if (event->button() == TQt::LeftButton) {          m_dragging = true;          m_dragStart = event->pos(); @@ -108,7 +108,7 @@ void KisToolSelectOutline::buttonRelease(KisButtonReleaseEvent *event)      if (!m_subject)          return; -    if (m_dragging && event->button() == Qt::LeftButton) { +    if (m_dragging && event->button() == TQt::LeftButton) {          m_dragging = false;          deactivate(); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp index 8d89eea2f..464e4b0af 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp @@ -91,7 +91,7 @@ void KisToolSelectPolygonal::update (KisCanvasSubject *subject)  void KisToolSelectPolygonal::buttonPress(KisButtonPressEvent *event)  { -    if (event->button() == Qt::LeftButton) { +    if (event->button() == TQt::LeftButton) {          m_dragging = true;          if (m_points.isEmpty()) @@ -104,7 +104,7 @@ void KisToolSelectPolygonal::buttonPress(KisButtonPressEvent *event)              m_dragEnd = event->pos();              draw();          } -    } else if (event->button() == Qt::LeftButton && event->state() == ShiftButton) { +    } else if (event->button() == TQt::LeftButton && event->state() == ShiftButton) {          finish();      }  } @@ -195,12 +195,12 @@ void KisToolSelectPolygonal::buttonRelease(KisButtonReleaseEvent *event)      if (!m_subject)          return; -    if (m_dragging && event->button() == Qt::LeftButton)  { +    if (m_dragging && event->button() == TQt::LeftButton)  {          m_dragging = false;          m_points.append (m_dragEnd);      } -    if (m_dragging && event->button() == Qt::RightButton) { +    if (m_dragging && event->button() == TQt::RightButton) {          }  } diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp index 5a6772bac..b52ec5635 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp @@ -114,7 +114,7 @@ void KisToolSelectRectangular::buttonPress(KisButtonPressEvent *e)      if (m_subject) {          KisImageSP img = m_subject->currentImg(); -        if (img && img->activeDevice() && e->button() == Qt::LeftButton) { +        if (img && img->activeDevice() && e->button() == TQt::LeftButton) {              clearSelection();              m_startPos = m_endPos = m_centerPos = e->pos();              m_selecting = true; @@ -158,7 +158,7 @@ void KisToolSelectRectangular::move(KisMoveEvent *e)  void KisToolSelectRectangular::buttonRelease(KisButtonReleaseEvent *e)  { -    if (m_subject && m_selecting && e->button() == Qt::LeftButton) { +    if (m_subject && m_selecting && e->button() == TQt::LeftButton) {          paintOutline(); diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp b/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp index 58454b4f5..8826de3dd 100644 --- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp +++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp @@ -145,7 +145,7 @@ void KisToolCrop::buttonPress(KisButtonPressEvent *e)      if (m_subject) {          KisImageSP img = m_subject->currentImg(); -        if (img && img->activeDevice() && e->button() == Qt::LeftButton) { +        if (img && img->activeDevice() && e->button() == TQt::LeftButton) {              TQPoint pos = e->pos().floorTQPoint();              TQRect b = img->bounds(); @@ -392,7 +392,7 @@ void KisToolCrop::updateWidgetValues(bool updateratio)  void KisToolCrop::buttonRelease(KisButtonReleaseEvent *e)  { -    if (m_subject && m_subject->currentImg() && m_selecting && e->button() == Qt::LeftButton) { +    if (m_subject && m_subject->currentImg() && m_selecting && e->button() == TQt::LeftButton) {          m_selecting = false;          m_haveCropSelection = true; diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp b/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp index ea1f9a773..b4369d153 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp +++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp @@ -115,7 +115,7 @@ void KisToolCurve::buttonPress(KisButtonPressEvent *event)      updateOptions(event->state());      if (!m_currentImage)          return; -    if (event->button() == Qt::LeftButton) { +    if (event->button() == TQt::LeftButton) {          m_dragging = true;          m_currentPoint = event->pos();          PointPair temp = pointUnderMouse (m_subject->canvasController()->windowToView(event->pos().toTQPoint())); diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp index ebf82634f..1412f5fad 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp @@ -643,7 +643,7 @@ void KisToolMagnetic::buttonPress(KisButtonPressEvent *event)      updateOptions(event->state());      if (!m_currentImage)          return; -    if (event->button() == Qt::LeftButton) { +    if (event->button() == TQt::LeftButton) {          m_dragging = true;          m_currentPoint = event->pos();          PointPair temp(m_curve->end(),false); @@ -771,7 +771,7 @@ TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent)      m_mode = new TQLabel(i18n("Automatic mode"), m_optWidget);      m_lbDistance = new TQLabel(i18n("Distance: "), m_optWidget);      TQPushButton *finish = new TQPushButton(i18n("To Selection"), m_optWidget); -    m_slDistance = new TQSlider(MINDIST, MAXDIST, PAGESTEP, m_distance, Qt::Horizontal, m_optWidget); +    m_slDistance = new TQSlider(MINDIST, MAXDIST, PAGESTEP, m_distance, TQt::Horizontal, m_optWidget);      connect(m_slDistance, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetDistance(int)));      connect(finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCommitCurve())); diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp index 7d5df0f2b..e676ba56f 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp +++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp @@ -108,7 +108,7 @@ void KisToolPerspectiveGrid::buttonPress(KisButtonPressEvent *event)          m_mode = MODE_CREATION;          m_points.clear();      } -    if( m_mode == MODE_CREATION && event->button() == Qt::LeftButton) +    if( m_mode == MODE_CREATION && event->button() == TQt::LeftButton)      {          m_dragging = true; @@ -122,7 +122,7 @@ void KisToolPerspectiveGrid::buttonPress(KisButtonPressEvent *event)              m_dragEnd = event->pos();              drawGridCreation();          } -    } else if(m_mode == MODE_EDITING && event->button() == Qt::LeftButton){ +    } else if(m_mode == MODE_EDITING && event->button() == TQt::LeftButton){          // Look for the handle which was pressed          if (!m_subject)              return; @@ -265,7 +265,7 @@ void KisToolPerspectiveGrid::buttonRelease(KisButtonReleaseEvent *event)      if( m_mode == MODE_CREATION  )      { -        if (m_dragging && event->button() == Qt::LeftButton)  { +        if (m_dragging && event->button() == TQt::LeftButton)  {              m_dragging = false;              m_points.append (m_dragEnd);              if( m_points.size() == 4) diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp index e73f5da3c..19451d945 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp +++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp @@ -268,7 +268,7 @@ void KisToolPerspectiveTransform::buttonPress(KisButtonPressEvent *event)              {                  KisImageSP img = m_subject->currentImg(); -                if (img && img->activeDevice() && event->button() == Qt::LeftButton) { +                if (img && img->activeDevice() && event->button() == TQt::LeftButton) {                      m_actualyMoveWhileSelected = false;                      m_dragEnd = event->pos();                      KisCanvasController *controller = m_subject->canvasController(); @@ -425,13 +425,13 @@ void KisToolPerspectiveTransform::buttonRelease(KisButtonReleaseEvent * event)      if (!img)          return; -    if( event->button() == Qt::LeftButton) +    if( event->button() == TQt::LeftButton)      {          switch(m_interractionMode)          {              case DRAWRECTINTERRACTION:              { -                 if (m_dragging && event->button() == Qt::LeftButton)  { +                 if (m_dragging && event->button() == TQt::LeftButton)  {                      paintOutline();                      m_dragging = false;                      m_points.append (m_dragEnd); diff --git a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp index 601fc6907..3457d2782 100644 --- a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp +++ b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp @@ -68,7 +68,7 @@ void KisToolPolygon::update (KisCanvasSubject *subject)  void KisToolPolygon::buttonPress(KisButtonPressEvent *event)  {      if (m_currentImage) { -        if (event->button() == Qt::LeftButton && event->state() != ShiftButton) { +        if (event->button() == TQt::LeftButton && event->state() != ShiftButton) {              m_dragging = true; @@ -82,7 +82,7 @@ void KisToolPolygon::buttonPress(KisButtonPressEvent *event)                  m_dragEnd = event->pos();                  draw();              } -        } else if (event->button() == Qt::LeftButton && event->state() == ShiftButton) { +        } else if (event->button() == TQt::LeftButton && event->state() == ShiftButton) {              finish();          }      } @@ -144,12 +144,12 @@ void KisToolPolygon::buttonRelease(KisButtonReleaseEvent *event)          if (!m_subject || !m_currentImage)              return; -        if (m_dragging && event->button() == Qt::LeftButton)  { +        if (m_dragging && event->button() == TQt::LeftButton)  {                  m_dragging = false;                  m_points.append (m_dragEnd);      } -    if (m_dragging && event->button() == Qt::RightButton) { +    if (m_dragging && event->button() == TQt::RightButton) {          }  } diff --git a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp index ab89cf3f4..594f1cf96 100644 --- a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp +++ b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp @@ -68,7 +68,7 @@ void KisToolPolyline::update (KisCanvasSubject *subject)  void KisToolPolyline::buttonPress(KisButtonPressEvent *event)  {      if (m_currentImage) { -        if (event->button() == Qt::LeftButton && event->state() != TQt::ShiftButton ) { +        if (event->button() == TQt::LeftButton && event->state() != TQt::ShiftButton ) {              m_dragging = true; @@ -82,7 +82,7 @@ void KisToolPolyline::buttonPress(KisButtonPressEvent *event)                  m_dragEnd = event->pos();                  draw();              } -        } else if (event->button() == Qt::LeftButton && event->state() == TQt::ShiftButton ) { +        } else if (event->button() == TQt::LeftButton && event->state() == TQt::ShiftButton ) {              finish();          }      } @@ -154,12 +154,12 @@ void KisToolPolyline::buttonRelease(KisButtonReleaseEvent *event)          if (!m_subject || !m_currentImage)              return; -        if (m_dragging && event->button() == Qt::LeftButton)  { +        if (m_dragging && event->button() == TQt::LeftButton)  {                  m_dragging = false;                  m_points.append (m_dragEnd);      } -    if (m_dragging && event->button() == Qt::RightButton) { +    if (m_dragging && event->button() == TQt::RightButton) {          }  } diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp index 65b05957a..3a5182b42 100644 --- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp +++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp @@ -130,7 +130,7 @@ void KisToolSelectSimilar::buttonPress(KisButtonPressEvent *e)          TQPoint pos;          TQ_UINT8 opacity = OPACITY_OPAQUE; -        if (e->button() != Qt::LeftButton && e->button() != Qt::RightButton) +        if (e->button() != TQt::LeftButton && e->button() != TQt::RightButton)              return;          if (!(img = m_subject->currentImg())) diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cpp b/chalk/plugins/tools/tool_star/kis_tool_star.cpp index 3a260545b..601bb775f 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.cpp +++ b/chalk/plugins/tools/tool_star/kis_tool_star.cpp @@ -73,7 +73,7 @@ void KisToolStar::update (KisCanvasSubject *subject)  void KisToolStar::buttonPress(KisButtonPressEvent *event)  { -    if (m_currentImage && event->button() == Qt::LeftButton) { +    if (m_currentImage && event->button() == TQt::LeftButton) {          m_dragging = true;          m_dragStart = event->pos();          m_dragEnd = event->pos(); @@ -105,7 +105,7 @@ void KisToolStar::buttonRelease(KisButtonReleaseEvent *event)      if (!m_subject || !m_currentImage)          return; -    if (m_dragging && event->button() == Qt::LeftButton) { +    if (m_dragging && event->button() == TQt::LeftButton) {          // erase old lines on canvas          draw(m_dragStart, m_dragEnd);          m_dragging = false; diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp b/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp index 88a675663..198410673 100644 --- a/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp +++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp @@ -275,14 +275,14 @@ void KisToolTransform::paint(KisCanvasPainter& gc, const TQRect& rc)  void KisToolTransform::buttonPress(KisButtonPressEvent *e)  { -    if (m_subject && e->button() == Qt::LeftButton) { +    if (m_subject && e->button() == TQt::LeftButton) {          m_wasPressed = true;      }      if (m_subject) {          KisImageSP img = m_subject->currentImg(); -        if (img && img->activeDevice() && e->button() == Qt::LeftButton) { +        if (img && img->activeDevice() && e->button() == TQt::LeftButton) {              switch(m_function)              {                  case ROTATE: @@ -646,7 +646,7 @@ void KisToolTransform::move(KisMoveEvent *e)  void KisToolTransform::buttonRelease(KisButtonReleaseEvent *e)  { -    if (m_subject && e->button() == Qt::LeftButton) { +    if (m_subject && e->button() == TQt::LeftButton) {          if(!m_wasPressed) return;          m_wasPressed = false; diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp index e0bec7ec6..255b8b8d0 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp +++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp @@ -55,7 +55,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const      // Initialize filters list      connect(m_widget->filtersList , TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(selectionHasChanged(TQIconViewItem* )));      // Initialize configWidgetHolder -    m_widget->configWidgetHolder->setColumnLayout ( 0, Qt::Horizontal ); +    m_widget->configWidgetHolder->setColumnLayout ( 0, TQt::Horizontal );      //m_widget->configWidgetHolder->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum);      // Initialize preview widget diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index 783e2a1d7..24b239b34 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -274,7 +274,7 @@ bool KSnapshot::eventFilter( TQObject* o, TQEvent* e)          TQMouseEvent* me = (TQMouseEvent*) e;          if ( TQWidget::mouseGrabber() != grabber )              return false; -        if ( me->button() == Qt::LeftButton ) +        if ( me->button() == TQt::LeftButton )              performGrab();      }      return false; diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp index 0fdf4a663..268a24d81 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -97,7 +97,7 @@ void RegionGrabber::initGrabber()  void RegionGrabber::mousePressEvent( TQMouseEvent *e )  { -  if ( e->button() == Qt::LeftButton ) +  if ( e->button() == TQt::LeftButton )    {      mouseDown = true;      grabRect = TQRect( e->pos(), e->pos() );  | 
