diff options
author | Michele Calgaro <[email protected]> | 2023-11-05 11:54:26 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2023-11-16 23:37:57 +0900 |
commit | ef06f14f2475bd08d3ea2ceec54a7b2238f3554e (patch) | |
tree | 03df826633e4ba084d133ca977c4fc37c74f21ac /chalk | |
parent | 895081803a715ee89f4a90cfbf63d558ef2b2ebc (diff) | |
download | koffice-ef06f14f2475bd08d3ea2ceec54a7b2238f3554e.tar.gz koffice-ef06f14f2475bd08d3ea2ceec54a7b2238f3554e.zip |
Replace Qt with TQt
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'chalk')
58 files changed, 169 insertions, 169 deletions
diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi index f0a23c0d..6f21c7ee 100644 --- a/chalk/doc/controller.xmi +++ b/chalk/doc/controller.xmi @@ -2210,7 +2210,7 @@ and the clipboard." isSpecification="false" isLeaf="false" visibility="public" x </UML:Namespace.ownedElement> </UML:Class> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="662" isRoot="false" isAbstract="false" name="TQByteArray" /> - <UML:Package isSpecification="false" isLeaf="false" visibility="public" xmi.id="677" isRoot="false" isAbstract="false" name="Qt" > + <UML:Package isSpecification="false" isLeaf="false" visibility="public" xmi.id="677" isRoot="false" isAbstract="false" name="TQt" > <UML:Namespace.ownedElement> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="678" isRoot="false" isAbstract="false" name="Orientation" /> </UML:Namespace.ownedElement> @@ -13087,7 +13087,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <codecomment tag="" writeOutText="false" /> </header> </codeblockwithcomments> - <codeblockwithcomments tag="imports" text="&#010;import Qt.Qt::Orientation;&#010;import bool;&#010;import QPixmap;" > + <codeblockwithcomments tag="imports" text="&#010;import TQt.TQt::Orientation;&#010;import bool;&#010;import QPixmap;" > <header> <codecomment tag="" writeOutText="false" /> </header> @@ -13122,7 +13122,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <codecomment tag="" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="689" tag="tblock_11" canDelete="false" indentLevel="1" text="public Qt.Qt::Orientation orient;" > + <ccfdeclarationcodeblock parent_id="689" tag="tblock_11" canDelete="false" indentLevel="1" text="public TQt.TQt::Orientation orient;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -13233,7 +13233,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeoperation> <codeoperation parent_id="681" tag="operation_681" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@return Qt.Qt::Orientation " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@return TQt.TQt::Orientation " /> </header> </codeoperation> <codeoperation parent_id="682" tag="operation_682" canDelete="false" indentLevel="1" > @@ -13376,7 +13376,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="689" tag="tblock_11" canDelete="false" indentLevel="1" text="public Qt.Qt::Orientation orient;" > + <ccfdeclarationcodeblock parent_id="689" tag="tblock_11" canDelete="false" indentLevel="1" text="public TQt.TQt::Orientation orient;" > <header> <codecomment tag="" indentLevel="1" /> </header> @@ -21842,9 +21842,9 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </header> <classfields/> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="Qt" id="678" parent_class="678" fileExt=".java" fileName="Orientation" > + <classifiercodedocument writeOutCode="true" package="TQt" id="678" parent_class="678" fileExt=".java" fileName="Orientation" > <textblocks> - <codeblockwithcomments tag="packages" text="package Qt;&#010;" > + <codeblockwithcomments tag="packages" text="package TQt;&#010;" > <header> <codecomment tag="" writeOutText="false" /> </header> @@ -21856,7 +21856,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeblockwithcomments> <javaclassdeclarationblock parent_id="678" tag="ClassDeclBlock" canDelete="false" > <header> - <javacodedocumentation tag="" text="Class Qt::Orientation&#010;" /> + <javacodedocumentation tag="" text="Class TQt::Orientation&#010;" /> </header> <textblocks> <hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" > @@ -21875,7 +21875,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <codecomment tag="" indentLevel="1" text="Constructors" /> </header> <textblocks> - <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public Qt::Orientation ( ) { }" > + <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public TQt::Orientation ( ) { }" > <header> <codecomment tag="" indentLevel="1" text="Empty Constructor" /> </header> @@ -21999,7 +21999,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <codecomment tag="" writeOutText="false" /> </header> </codeblockwithcomments> - <codeblockwithcomments tag="imports" text="&#010;import KisGuideSP;&#010;import Qt.Qt::Orientation;&#010;import bool;&#010;import TQ_INT32;&#010;import QSize;&#010;import QPixmap;&#010;import KisGuideMgr.vKisGuideSP;" > + <codeblockwithcomments tag="imports" text="&#010;import KisGuideSP;&#010;import TQt.TQt::Orientation;&#010;import bool;&#010;import TQ_INT32;&#010;import QSize;&#010;import QPixmap;&#010;import KisGuideMgr.vKisGuideSP;" > <header> <codecomment tag="" writeOutText="false" /> </header> diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp index 8f108565..89a20500 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 ca5725bd..de5dd76d 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 f15077b3..3a2a2284 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 40a09a91..6130aa21 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 0488dcb0..0dc53a5b 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 ceb78f06..3c9b6038 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 b8f72a3b..c0543c6a 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 87cb9390..e9e303a6 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 be506578..1bcd5135 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 c95b1000..d96c820f 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 69e306ec..0106b769 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 d1727f39..6fb07940 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 fe449ee4..77cdd336 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 a1f0902f..c89702f9 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 1a4932b7..bf24775d 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 f85da332..0d632c42 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 7f526736..2507cb56 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 8d89eea2..464e4b0a 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 5a6772ba..b52ec563 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 58454b4f..8826de3d 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 ea1f9a77..b4369d15 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 ebf82634..1412f5fa 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 7d5df0f2..e676ba56 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 e73f5da3..19451d94 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 601fc690..3457d278 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 ab89cf3f..594f1cf9 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 65b05957..3a5182b4 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 3a260545..601bb775 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 88a67566..19841067 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 e0bec7ec..255b8b8d 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 783e2a1d..24b239b3 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 0fdf4a66..268a24d8 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() ); diff --git a/chalk/ui/imageviewer.cpp b/chalk/ui/imageviewer.cpp index 5e74c8fe..fe632dcc 100644 --- a/chalk/ui/imageviewer.cpp +++ b/chalk/ui/imageviewer.cpp @@ -50,7 +50,7 @@ void ImageViewer::setImage(TQImage & image) void ImageViewer::contentsMousePressEvent(TQMouseEvent *event) { - if(Qt::LeftButton == event->button()) { + if(TQt::LeftButton == event->button()) { setCursor(KisCursor::closedHandCursor()); m_currentPos = event->globalPos(); m_isDragging = true; @@ -59,7 +59,7 @@ void ImageViewer::contentsMousePressEvent(TQMouseEvent *event) void ImageViewer::contentsMouseReleaseEvent(TQMouseEvent *event) { - if(Qt::LeftButton == event->button()) { + if(TQt::LeftButton == event->button()) { setCursor(KisCursor::handCursor()); m_currentPos = event->globalPos(); m_isDragging = false; diff --git a/chalk/ui/kcurve.cpp b/chalk/ui/kcurve.cpp index 086bcb55..a69b7846 100644 --- a/chalk/ui/kcurve.cpp +++ b/chalk/ui/kcurve.cpp @@ -211,7 +211,7 @@ void KCurve::mousePressEvent ( TQMouseEvent * e ) TQPair<double,double> *closest_point=NULL; double distance; - if (e->button() != Qt::LeftButton) + if (e->button() != TQt::LeftButton) return; double x = e->pos().x() / (float)width(); @@ -288,7 +288,7 @@ void KCurve::mouseReleaseEvent ( TQMouseEvent * e ) { if (m_readOnlyMode) return; - if (e->button() != Qt::LeftButton) + if (e->button() != TQt::LeftButton) return; setCursor( KCursor::arrowCursor() ); diff --git a/chalk/ui/kis_canvas.cpp b/chalk/ui/kis_canvas.cpp index f001c5bd..1128d9f2 100644 --- a/chalk/ui/kis_canvas.cpp +++ b/chalk/ui/kis_canvas.cpp @@ -169,16 +169,16 @@ void KisCanvasWidget::widgetGotTabletEvent(TQTabletEvent *e) double pressure = e->pressure() / 255.0; if (e->type() == TQEvent::TabletPress) { - KisButtonPressEvent ke(device, KisPoint(e->pos()), KisPoint(e->globalPos()), pressure, e->xTilt(), e->yTilt(), Qt::LeftButton, Qt::NoButton); + KisButtonPressEvent ke(device, KisPoint(e->pos()), KisPoint(e->globalPos()), pressure, e->xTilt(), e->yTilt(), TQt::LeftButton, TQt::NoButton); translateTabletEvent(&ke); } else if (e->type() == TQEvent::TabletRelease) { - KisButtonReleaseEvent ke(device, KisPoint(e->pos()), KisPoint(e->globalPos()), pressure, e->xTilt(), e->yTilt(), Qt::LeftButton, Qt::NoButton); + KisButtonReleaseEvent ke(device, KisPoint(e->pos()), KisPoint(e->globalPos()), pressure, e->xTilt(), e->yTilt(), TQt::LeftButton, TQt::NoButton); translateTabletEvent(&ke); } else { - KisMoveEvent ke(device, KisPoint(e->pos()), KisPoint(e->globalPos()), pressure, e->xTilt(), e->yTilt(), Qt::NoButton); + KisMoveEvent ke(device, KisPoint(e->pos()), KisPoint(e->globalPos()), pressure, e->xTilt(), e->yTilt(), TQt::NoButton); translateTabletEvent(&ke); #ifdef Q_WS_X11 // Fix the problem that when you change from using a tablet device to the mouse, @@ -263,7 +263,7 @@ void KisCanvasWidget::translateTabletEvent(KisEvent *e) if (e->type() == KisEvent::ButtonPressEvent || e->type() == KisEvent::ButtonReleaseEvent) { KisButtonEvent *b = static_cast<KisButtonEvent *>(e); - if (b->button() == Qt::MidButton || b->button() == Qt::RightButton) { + if (b->button() == TQt::MidButton || b->button() == TQt::RightButton) { if (e->type() == KisEvent::ButtonPressEvent) { buttonPressEvent(static_cast<KisButtonPressEvent *>(e)); @@ -277,10 +277,10 @@ void KisCanvasWidget::translateTabletEvent(KisEvent *e) // Use pressure threshold to detect 'left button' press/release if (e->pressure() >= PRESSURE_THRESHOLD && m_lastPressure < PRESSURE_THRESHOLD) { - KisButtonPressEvent ke(e->device(), e->pos(), e->globalPos(), e->pressure(), e->xTilt(), e->yTilt(), Qt::LeftButton, e->state()); + KisButtonPressEvent ke(e->device(), e->pos(), e->globalPos(), e->pressure(), e->xTilt(), e->yTilt(), TQt::LeftButton, e->state()); buttonPressEvent(&ke); } else if (e->pressure() < PRESSURE_THRESHOLD && m_lastPressure >= PRESSURE_THRESHOLD) { - KisButtonReleaseEvent ke(e->device(), e->pos(), e->globalPos(), e->pressure(), e->xTilt(), e->yTilt(), Qt::LeftButton, e->state()); + KisButtonReleaseEvent ke(e->device(), e->pos(), e->globalPos(), e->pressure(), e->xTilt(), e->yTilt(), TQt::LeftButton, e->state()); buttonReleaseEvent(&ke); } else { if (!checkThresholdOnly) { @@ -417,11 +417,11 @@ TQt::ButtonState KisCanvasWidget::translateX11ButtonState(int state) int buttonState = 0; if (state & Button1Mask) - buttonState |= Qt::LeftButton; + buttonState |= TQt::LeftButton; if (state & Button2Mask) - buttonState |= Qt::MidButton; + buttonState |= TQt::MidButton; if (state & Button3Mask) - buttonState |= Qt::RightButton; + buttonState |= TQt::RightButton; if (state & ShiftMask) buttonState |= TQt::ShiftButton; if (state & ControlMask) @@ -440,16 +440,16 @@ TQt::ButtonState KisCanvasWidget::translateX11Button(unsigned int X11Button) switch (X11Button) { case Button1: - qtButton = Qt::LeftButton; + qtButton = TQt::LeftButton; break; case Button2: - qtButton = Qt::MidButton; + qtButton = TQt::MidButton; break; case Button3: - qtButton = Qt::RightButton; + qtButton = TQt::RightButton; break; default: - qtButton = Qt::NoButton; + qtButton = TQt::NoButton; } return qtButton; @@ -853,7 +853,7 @@ bool KisCanvasWidget::x11Event(XEvent *event, Display *x11Display, WId winId, TQ int state = translateX11ButtonState(motion.state); TQPoint pos(motion.x, motion.y); - TQMouseEvent e(TQEvent::MouseMove, pos, globalPos, Qt::NoButton, state); + TQMouseEvent e(TQEvent::MouseMove, pos, globalPos, TQt::NoButton, state); widgetGotMouseMoveEvent(&e); } @@ -911,7 +911,7 @@ bool KisCanvasWidget::x11Event(XEvent *event, Display *x11Display, WId winId, TQ deviceId = motion->deviceid; axisData = motion->axis_data; - button = Qt::NoButton; + button = TQt::NoButton; buttonState = translateX11ButtonState(motion->state); } else diff --git a/chalk/ui/kis_canvas_painter.cpp b/chalk/ui/kis_canvas_painter.cpp index 9b3666e8..438f990a 100644 --- a/chalk/ui/kis_canvas_painter.cpp +++ b/chalk/ui/kis_canvas_painter.cpp @@ -69,7 +69,7 @@ void KisCanvasWidgetPainter::setPen(const TQPen& /*pen*/) { } -void KisCanvasWidgetPainter::setPen(Qt::PenStyle /*penStyle*/) +void KisCanvasWidgetPainter::setPen(TQt::PenStyle /*penStyle*/) { } @@ -108,12 +108,12 @@ void KisCanvasWidgetPainter::setBackgroundColor(const TQColor& /*color*/) { } -Qt::BGMode KisCanvasWidgetPainter::backgroundMode() const +TQt::BGMode KisCanvasWidgetPainter::backgroundMode() const { - return Qt::TransparentMode; + return TQt::TransparentMode; } -void KisCanvasWidgetPainter::setBackgroundMode(Qt::BGMode /*bgMode*/) +void KisCanvasWidgetPainter::setBackgroundMode(TQt::BGMode /*bgMode*/) { } @@ -641,7 +641,7 @@ void KisCanvasPainter::setPen(const TQPen& pen) } } -void KisCanvasPainter::setPen(Qt::PenStyle penStyle) +void KisCanvasPainter::setPen(TQt::PenStyle penStyle) { if (m_canvasWidgetPainter != 0) { m_canvasWidgetPainter->setPen(penStyle); @@ -707,15 +707,15 @@ void KisCanvasPainter::setBackgroundColor(const TQColor& color) } } -Qt::BGMode KisCanvasPainter::backgroundMode() const +TQt::BGMode KisCanvasPainter::backgroundMode() const { if (m_canvasWidgetPainter != 0) { return m_canvasWidgetPainter->backgroundMode(); } - return Qt::TransparentMode; + return TQt::TransparentMode; } -void KisCanvasPainter::setBackgroundMode(Qt::BGMode bgMode) +void KisCanvasPainter::setBackgroundMode(TQt::BGMode bgMode) { if (m_canvasWidgetPainter != 0) { m_canvasWidgetPainter->setBackgroundMode(bgMode); diff --git a/chalk/ui/kis_canvas_painter.h b/chalk/ui/kis_canvas_painter.h index a5ad2d84..00a197fd 100644 --- a/chalk/ui/kis_canvas_painter.h +++ b/chalk/ui/kis_canvas_painter.h @@ -48,7 +48,7 @@ public: virtual void setFont(const TQFont&); virtual const TQPen& pen() const; virtual void setPen(const TQPen&); - virtual void setPen(Qt::PenStyle); + virtual void setPen(TQt::PenStyle); virtual void setPen(const TQColor&); virtual const TQBrush&brush() const; virtual void setBrush(const TQBrush&); @@ -58,8 +58,8 @@ public: virtual const TQColor&backgroundColor() const; virtual void setBackgroundColor(const TQColor&); - virtual Qt::BGMode backgroundMode() const; - virtual void setBackgroundMode(Qt::BGMode); + virtual TQt::BGMode backgroundMode() const; + virtual void setBackgroundMode(TQt::BGMode); virtual TQt::RasterOp rasterOp() const; virtual void setRasterOp(TQt::RasterOp); virtual const TQPoint&brushOrigin() const; @@ -211,7 +211,7 @@ public: void setFont(const TQFont&); const TQPen& pen() const; void setPen(const TQPen&); - void setPen(Qt::PenStyle); + void setPen(TQt::PenStyle); void setPen(const TQColor&); const TQBrush&brush() const; void setBrush(const TQBrush&); @@ -221,8 +221,8 @@ public: const TQColor&backgroundColor() const; void setBackgroundColor(const TQColor&); - Qt::BGMode backgroundMode() const; - void setBackgroundMode(Qt::BGMode); + TQt::BGMode backgroundMode() const; + void setBackgroundMode(TQt::BGMode); TQt::RasterOp rasterOp() const; void setRasterOp(TQt::RasterOp); const TQPoint&brushOrigin() const; diff --git a/chalk/ui/kis_dlg_adjustment_layer.cpp b/chalk/ui/kis_dlg_adjustment_layer.cpp index 997887f0..34374356 100644 --- a/chalk/ui/kis_dlg_adjustment_layer.cpp +++ b/chalk/ui/kis_dlg_adjustment_layer.cpp @@ -97,7 +97,7 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img, grid->addWidget(m_preview, 1, 1); m_configWidgetHolder = new TQGroupBox(i18n("Configuration"), page, "currentConfigWidget"); - m_configWidgetHolder->setColumnLayout(0, Qt::Horizontal); + m_configWidgetHolder->setColumnLayout(0, TQt::Horizontal); grid->addWidget(m_configWidgetHolder, 2, 1); m_labelNoConfigWidget = new TQLabel(i18n("No configuration options are available for this filter"), diff --git a/chalk/ui/kis_double_widget.cpp b/chalk/ui/kis_double_widget.cpp index 3325f07b..37f2b862 100644 --- a/chalk/ui/kis_double_widget.cpp +++ b/chalk/ui/kis_double_widget.cpp @@ -48,7 +48,7 @@ void KisDoubleWidget::init(double min, double max) m_spinBox = new KDoubleSpinBox(min, max, 0.05, 0, 2, this, "spinbox"); connect(m_spinBox, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(setSliderValue(double))); - m_slider = new TQSlider(static_cast<int>(min * 100 + 0.5), static_cast<int>(max * 100 + 0.5), 1, 0, Qt::Horizontal, this, "sld"); + m_slider = new TQSlider(static_cast<int>(min * 100 + 0.5), static_cast<int>(max * 100 + 0.5), 1, 0, TQt::Horizontal, this, "sld"); connect(m_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged(int))); connect(m_slider, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed())); connect(m_slider, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased())); diff --git a/chalk/ui/kis_gradient_slider_widget.cpp b/chalk/ui/kis_gradient_slider_widget.cpp index 255d3847..939c654e 100644 --- a/chalk/ui/kis_gradient_slider_widget.cpp +++ b/chalk/ui/kis_gradient_slider_widget.cpp @@ -109,7 +109,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe ) void KisGradientSliderWidget::mousePressEvent( TQMouseEvent * e ) { TQWidget::mousePressEvent( e ); - if( ( e->y() < MARGIN || e->y() > height() - MARGIN ) || ( e->x() < MARGIN || e->x() > width() - MARGIN ) || e-> button() != Qt::LeftButton ) + if( ( e->y() < MARGIN || e->y() > height() - MARGIN ) || ( e->x() < MARGIN || e->x() > width() - MARGIN ) || e-> button() != TQt::LeftButton ) return; double t = (double)(e->x() - MARGIN) / (double)(width() - 2 * MARGIN); KisGradientSegment* segment = 0; diff --git a/chalk/ui/kis_grid_drawer.cpp b/chalk/ui/kis_grid_drawer.cpp index f0d0e5f8..a03ad22f 100644 --- a/chalk/ui/kis_grid_drawer.cpp +++ b/chalk/ui/kis_grid_drawer.cpp @@ -33,20 +33,20 @@ #include "kis_perspective_grid.h" #include "kis_perspective_grid_manager.h" -Qt::PenStyle GridDrawer::gs2style(TQ_UINT32 s) +TQt::PenStyle GridDrawer::gs2style(TQ_UINT32 s) { switch(s) { case 1: - return Qt::DashLine; + return TQt::DashLine; case 2: - return Qt::DotLine; + return TQt::DotLine; case 3: - return Qt::DashDotLine; + return TQt::DashDotLine; case 4: - return Qt::DashDotDotLine; + return TQt::DashDotDotLine; default: - return Qt::SolidLine; + return TQt::SolidLine; } } @@ -166,7 +166,7 @@ OpenGLGridDrawer::~OpenGLGridDrawer() void OpenGLGridDrawer::setPen(const TQPen& pen) { #ifdef HAVE_GL - Qt::PenStyle penStyle = pen.style(); + TQt::PenStyle penStyle = pen.style(); if (penStyle == TQt::SolidLine) { glDisable(GL_LINE_STIPPLE); diff --git a/chalk/ui/kis_grid_drawer.h b/chalk/ui/kis_grid_drawer.h index a37fd69e..5a659a97 100644 --- a/chalk/ui/kis_grid_drawer.h +++ b/chalk/ui/kis_grid_drawer.h @@ -45,7 +45,7 @@ class GridDrawer { inline void drawLine(const TQPoint& p1, const TQPoint& p2) { drawLine(p1.x(), p1.y(), p2.x(), p2.y() ); } inline void drawLine(const KisPoint* p1, const KisPoint* p2) { drawLine( p1->roundTQPoint(), p2->roundTQPoint()); } private: - Qt::PenStyle gs2style(TQ_UINT32 s); + TQt::PenStyle gs2style(TQ_UINT32 s); }; class TQPainterGridDrawer : public GridDrawer { diff --git a/chalk/ui/kis_histogram_view.cpp b/chalk/ui/kis_histogram_view.cpp index 3b94db61..2f14fa52 100644 --- a/chalk/ui/kis_histogram_view.cpp +++ b/chalk/ui/kis_histogram_view.cpp @@ -344,7 +344,7 @@ void KisHistogramView::updateHistogram() } void KisHistogramView::mousePressEvent(TQMouseEvent * e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) emit rightClicked(e->globalPos()); else TQLabel::mousePressEvent(e); diff --git a/chalk/ui/kis_int_spinbox.cpp b/chalk/ui/kis_int_spinbox.cpp index cb1b6938..9e561287 100644 --- a/chalk/ui/kis_int_spinbox.cpp +++ b/chalk/ui/kis_int_spinbox.cpp @@ -85,10 +85,10 @@ void KisIntSpinbox::init(int val) d->m_numinput->setSuffix("%"); l->addWidget( d->m_numinput ); - d->m_slider = new KisPopupSlider(0, 100, 10, val, Qt::Horizontal, this); + d->m_slider = new KisPopupSlider(0, 100, 10, val, TQt::Horizontal, this); d->m_slider->setFrameStyle(TQFrame::Panel|TQFrame::Raised); - d->m_arrow = new KArrowButton(this, Qt::DownArrow); + d->m_arrow = new KArrowButton(this, TQt::DownArrow); d->m_arrow->setPopup(d->m_slider); d->m_arrow->setMaximumHeight( fontMetrics().height() + 4); d->m_arrow->setEnabled(true); // Why is the arrow still gray? diff --git a/chalk/ui/kis_int_spinbox.h b/chalk/ui/kis_int_spinbox.h index 12aa5abb..939312fa 100644 --- a/chalk/ui/kis_int_spinbox.h +++ b/chalk/ui/kis_int_spinbox.h @@ -38,7 +38,7 @@ class KisPopupSlider : public TQPopupMenu { public: - KisPopupSlider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, TQWidget * parent, const char * name = 0) + KisPopupSlider(int minValue, int maxValue, int pageStep, int value, TQt::Orientation orientation, TQWidget * parent, const char * name = 0) : TQPopupMenu(parent, name) { m_slider = new TQSlider(minValue, maxValue, pageStep, value, orientation, this, name); diff --git a/chalk/ui/kis_opengl_canvas_painter.cpp b/chalk/ui/kis_opengl_canvas_painter.cpp index e6551f81..91c4c870 100644 --- a/chalk/ui/kis_opengl_canvas_painter.cpp +++ b/chalk/ui/kis_opengl_canvas_painter.cpp @@ -136,7 +136,7 @@ void KisOpenGLCanvasPainter::restore() glPopMatrix(); } -void KisOpenGLCanvasPainter::setPenStyle(Qt::PenStyle penStyle) +void KisOpenGLCanvasPainter::setPenStyle(TQt::PenStyle penStyle) { if (penStyle == TQt::SolidLine) { glDisable(GL_LINE_STIPPLE); @@ -196,7 +196,7 @@ void KisOpenGLCanvasPainter::setPen(const TQPen& pen) setPenStyle(pen.style()); } -void KisOpenGLCanvasPainter::setPen(Qt::PenStyle penStyle) +void KisOpenGLCanvasPainter::setPen(TQt::PenStyle penStyle) { setPenStyle(penStyle); } @@ -236,12 +236,12 @@ void KisOpenGLCanvasPainter::setBackgroundColor(const TQColor& /*color*/) { } -Qt::BGMode KisOpenGLCanvasPainter::backgroundMode() const +TQt::BGMode KisOpenGLCanvasPainter::backgroundMode() const { - return Qt::TransparentMode; + return TQt::TransparentMode; } -void KisOpenGLCanvasPainter::setBackgroundMode(Qt::BGMode /*bgMode*/) +void KisOpenGLCanvasPainter::setBackgroundMode(TQt::BGMode /*bgMode*/) { } diff --git a/chalk/ui/kis_opengl_canvas_painter.h b/chalk/ui/kis_opengl_canvas_painter.h index 24f2e2e2..ff7c841c 100644 --- a/chalk/ui/kis_opengl_canvas_painter.h +++ b/chalk/ui/kis_opengl_canvas_painter.h @@ -55,7 +55,7 @@ public: virtual void setFont(const TQFont&); virtual const TQPen& pen() const; virtual void setPen(const TQPen&); - virtual void setPen(Qt::PenStyle); + virtual void setPen(TQt::PenStyle); virtual void setPen(const TQColor&); virtual const TQBrush&brush() const; virtual void setBrush(const TQBrush&); @@ -65,8 +65,8 @@ public: virtual const TQColor& backgroundColor() const; virtual void setBackgroundColor(const TQColor&); - virtual Qt::BGMode backgroundMode() const; - virtual void setBackgroundMode(Qt::BGMode); + virtual TQt::BGMode backgroundMode() const; + virtual void setBackgroundMode(TQt::BGMode); virtual TQt::RasterOp rasterOp() const; virtual void setRasterOp(TQt::RasterOp); virtual const TQPoint& brushOrigin() const; @@ -189,7 +189,7 @@ public: protected: void prepareForDrawing(); void updateViewTransformation(); - void setPenStyle(Qt::PenStyle penStyle); + void setPenStyle(TQt::PenStyle penStyle); protected: TQFont m_defaultFont; diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.cpp b/chalk/ui/kis_qpaintdevice_canvas_painter.cpp index e0836bf6..cc598ef2 100644 --- a/chalk/ui/kis_qpaintdevice_canvas_painter.cpp +++ b/chalk/ui/kis_qpaintdevice_canvas_painter.cpp @@ -94,7 +94,7 @@ void KisTQPaintDeviceCanvasPainter::setPen(const TQPen& pen) m_painter.setPen(pen); } -void KisTQPaintDeviceCanvasPainter::setPen(Qt::PenStyle penStyle) +void KisTQPaintDeviceCanvasPainter::setPen(TQt::PenStyle penStyle) { m_painter.setPen(penStyle); } @@ -139,12 +139,12 @@ void KisTQPaintDeviceCanvasPainter::setBackgroundColor(const TQColor& color) m_painter.setBackgroundColor(color); } -Qt::BGMode KisTQPaintDeviceCanvasPainter::backgroundMode() const +TQt::BGMode KisTQPaintDeviceCanvasPainter::backgroundMode() const { return m_painter.backgroundMode(); } -void KisTQPaintDeviceCanvasPainter::setBackgroundMode(Qt::BGMode bgMode) +void KisTQPaintDeviceCanvasPainter::setBackgroundMode(TQt::BGMode bgMode) { m_painter.setBackgroundMode(bgMode); } diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.h b/chalk/ui/kis_qpaintdevice_canvas_painter.h index cef260b4..704cbfff 100644 --- a/chalk/ui/kis_qpaintdevice_canvas_painter.h +++ b/chalk/ui/kis_qpaintdevice_canvas_painter.h @@ -50,7 +50,7 @@ public: virtual void setFont(const TQFont&); virtual const TQPen& pen() const; virtual void setPen(const TQPen&); - virtual void setPen(Qt::PenStyle); + virtual void setPen(TQt::PenStyle); virtual void setPen(const TQColor&); virtual const TQBrush&brush() const; virtual void setBrush(const TQBrush&); @@ -60,8 +60,8 @@ public: virtual const TQColor&backgroundColor() const; virtual void setBackgroundColor(const TQColor&); - virtual Qt::BGMode backgroundMode() const; - virtual void setBackgroundMode(Qt::BGMode); + virtual TQt::BGMode backgroundMode() const; + virtual void setBackgroundMode(TQt::BGMode); virtual TQt::RasterOp rasterOp() const; virtual void setRasterOp(TQt::RasterOp); virtual const TQPoint&brushOrigin() const; diff --git a/chalk/ui/kis_ruler.cpp b/chalk/ui/kis_ruler.cpp index 23426922..dde306d6 100644 --- a/chalk/ui/kis_ruler.cpp +++ b/chalk/ui/kis_ruler.cpp @@ -40,7 +40,7 @@ const char *KisRuler::m_nums[] = { "XX XXXXXX XXX XXX XXXXXX XXX XXXX XXXXX XXXXX XXXX XXX" }; -KisRuler::KisRuler(Qt::Orientation o, TQWidget *parent, const char *name) : super(parent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums) +KisRuler::KisRuler(TQt::Orientation o, TQWidget *parent, const char *name) : super(parent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums) { setBackgroundMode(NoBackground); setFrameStyle(Box | Sunken); @@ -53,7 +53,7 @@ KisRuler::KisRuler(Qt::Orientation o, TQWidget *parent, const char *name) : supe m_pixmapBuffer = 0; m_currentPosition = -1; - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { setFixedHeight(RULER_THICKNESS); initMarker(MARKER_WIDTH, MARKER_HEIGHT); } else { @@ -89,7 +89,7 @@ void KisRuler::recalculateSize() m_pixmapBuffer = 0; } - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { w = width(); h = RULER_THICKNESS; } else { @@ -129,7 +129,7 @@ void KisRuler::setZoom(double zoom) void KisRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) { if (m_pixmapBuffer) { - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { if (m_currentPosition != -1) repaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT); @@ -151,7 +151,7 @@ void KisRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) void KisRuler::updateVisibleArea(TQ_INT32 xpos, TQ_INT32 ypos) { - if (m_orientation == Qt::Horizontal) + if (m_orientation == TQt::Horizontal) m_firstVisible = xpos; else m_firstVisible = ypos; @@ -251,7 +251,7 @@ void KisRuler::drawRuler() TQ_INT32 start = (TQ_INT32)(KoUnit::fromUserValue(m_firstVisible, m_unit) / m_zoom); TQ_INT32 pos = 0; - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { do { pos = (TQ_INT32)(KoUnit::fromUserValue(start, m_unit) * m_zoom - m_firstVisible); @@ -322,7 +322,7 @@ void KisRuler::paletteChange(const TQPalette& oldPalette) void KisRuler::show() { - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { setFixedHeight(RULER_THICKNESS); initMarker(MARKER_WIDTH, MARKER_HEIGHT); } else { @@ -336,7 +336,7 @@ void KisRuler::show() void KisRuler::hide() { /* - if (m_orientation == Qt::Horizontal) + if (m_orientation == TQt::Horizontal) setFixedHeight(1); else setFixedWidth(1); diff --git a/chalk/ui/kis_ruler.h b/chalk/ui/kis_ruler.h index d0ee1451..90d61690 100644 --- a/chalk/ui/kis_ruler.h +++ b/chalk/ui/kis_ruler.h @@ -38,7 +38,7 @@ class KisRuler : public TQFrame { typedef TQFrame super; public: - KisRuler(Qt::Orientation, TQWidget *parent = 0, const char *name = 0); + KisRuler(TQt::Orientation, TQWidget *parent = 0, const char *name = 0); virtual ~KisRuler(); public: @@ -65,7 +65,7 @@ protected: private: KoUnit::Unit m_unit; - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; TQ_INT32 m_firstVisible; TQ_INT32 m_currentPosition; TQPixmap *m_pixmapBuffer; diff --git a/chalk/ui/kis_tool_dummy.cpp b/chalk/ui/kis_tool_dummy.cpp index 759136f4..de4ac080 100644 --- a/chalk/ui/kis_tool_dummy.cpp +++ b/chalk/ui/kis_tool_dummy.cpp @@ -54,7 +54,7 @@ void KisToolDummy::update(KisCanvasSubject *subject) void KisToolDummy::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(); @@ -77,7 +77,7 @@ void KisToolDummy::move(KisMoveEvent *e) void KisToolDummy::buttonRelease(KisButtonReleaseEvent *e) { - if (m_subject && m_dragging && e->button() == Qt::LeftButton) { + if (m_subject && m_dragging && e->button() == TQt::LeftButton) { m_dragging = false; } } diff --git a/chalk/ui/kis_tool_freehand.cpp b/chalk/ui/kis_tool_freehand.cpp index 74eec406..56821849 100644 --- a/chalk/ui/kis_tool_freehand.cpp +++ b/chalk/ui/kis_tool_freehand.cpp @@ -79,7 +79,7 @@ void KisToolFreehand::buttonPress(KisButtonPressEvent *e) if (!m_currentImage || !m_currentImage->activeDevice()) return; - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { m_currentImage->activeDevice()->lock( true ); kdDebug() << ">>>>>>>>>>>>>>>>>>>Locking paint device\n"; @@ -116,7 +116,7 @@ void KisToolFreehand::buttonPress(KisButtonPressEvent *e) void KisToolFreehand::buttonRelease(KisButtonReleaseEvent* e) { - if (e->button() == Qt::LeftButton && m_mode == PAINT) { + if (e->button() == TQt::LeftButton && m_mode == PAINT) { endPaint(); m_currentImage->activeDevice()->lock( false ); kdDebug() << ">>>>>>>>>>>>>>>>>>>UNLocking paint device\n"; diff --git a/chalk/ui/kis_tool_paint.cpp b/chalk/ui/kis_tool_paint.cpp index 143bd675..34fc7730 100644 --- a/chalk/ui/kis_tool_paint.cpp +++ b/chalk/ui/kis_tool_paint.cpp @@ -94,7 +94,7 @@ void KisToolPaint::move(KisMoveEvent *) void KisToolPaint::buttonRelease(KisButtonReleaseEvent * e) { kdDebug() << "buttonRelease" << endl; - if(e->button() == Qt::MidButton) + if(e->button() == TQt::MidButton) { kdDebug() << "switch" << endl; KisColor bg = m_subject->bgColor(); diff --git a/chalk/ui/kis_view.cpp b/chalk/ui/kis_view.cpp index 439423c7..2e123f5d 100644 --- a/chalk/ui/kis_view.cpp +++ b/chalk/ui/kis_view.cpp @@ -458,10 +458,10 @@ void KisView::setupScrollBars() { m_scrollX = 0; m_scrollY = 0; - m_vScroll = new TQScrollBar(Qt::Vertical, this); + m_vScroll = new TQScrollBar(TQt::Vertical, this); TQ_CHECK_PTR(m_vScroll); - m_hScroll = new TQScrollBar(Qt::Horizontal, this); + m_hScroll = new TQScrollBar(TQt::Horizontal, this); TQ_CHECK_PTR(m_hScroll); m_vScroll->setGeometry(width() - 16, 20, 16, height() - 36); @@ -474,10 +474,10 @@ void KisView::setupScrollBars() void KisView::setupRulers() { - m_hRuler = new KisRuler(Qt::Horizontal, this); + m_hRuler = new KisRuler(TQt::Horizontal, this); TQ_CHECK_PTR(m_hRuler); - m_vRuler = new KisRuler(Qt::Vertical, this); + m_vRuler = new KisRuler(TQt::Vertical, this); TQ_CHECK_PTR(m_vRuler); m_hRuler->setGeometry(20, 0, width() - 20, 20); @@ -2280,13 +2280,13 @@ void KisView::canvasGotButtonPressEvent(KisButtonPressEvent *e) // m_lastGuidePoint = mapToScreen(e->pos().floorTQPoint()); // m_currentGuide = 0; // -// if ((e->state() & ~TQt::ShiftButton) == Qt::NoButton) { +// if ((e->state() & ~TQt::ShiftButton) == TQt::NoButton) { // KisGuideSP gd = mgr->find(static_cast<TQ_INT32>(pt.x() / zoom()), static_cast<TQ_INT32>(pt.y() / zoom()), TQMAX(2.0, 2.0 / zoom())); // // if (gd) { // m_currentGuide = gd; // -// if ((e->button() == Qt::RightButton) || ((e->button() & TQt::ShiftButton) == TQt::ShiftButton)) { +// if ((e->button() == TQt::RightButton) || ((e->button() & TQt::ShiftButton) == TQt::ShiftButton)) { // if (gd->isSelected()) // mgr->unselect(gd); // else @@ -2303,7 +2303,7 @@ void KisView::canvasGotButtonPressEvent(KisButtonPressEvent *e) // } // } // } - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { TQPopupMenu * m_popup = 0; if (factory()) { Q_ASSERT(factory()); @@ -2360,7 +2360,7 @@ void KisView::canvasGotMoveEvent(KisMoveEvent *e) TQPoint p = mapToScreen(e->pos().floorTQPoint()); KisGuideMgr *mgr = img->guides(); - if (((e->state() & Qt::LeftButton) == Qt::LeftButton) && mgr->hasSelected()) { + if (((e->state() & TQt::LeftButton) == TQt::LeftButton) && mgr->hasSelected()) { eraseGuides(); p -= m_lastGuidePoint; @@ -3543,7 +3543,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e) mgr = img->guides(); - if (e->type() == TQEvent::MouseMove && (me->state() & Qt::LeftButton)) { + if (e->type() == TQEvent::MouseMove && (me->state() & TQt::LeftButton)) { bool flag = geometry().contains(pt); KisGuideSP gd; @@ -3555,9 +3555,9 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e) mgr->unselectAll(); if (o == m_vRuler) - gd = mgr->add((pt.x() - m_vRuler->width() + horzValue()) / zoom(), Qt::Vertical); + gd = mgr->add((pt.x() - m_vRuler->width() + horzValue()) / zoom(), TQt::Vertical); else - gd = mgr->add((pt.y() - m_hRuler->height() + vertValue()) / zoom(), Qt::Horizontal); + gd = mgr->add((pt.y() - m_hRuler->height() + vertValue()) / zoom(), TQt::Horizontal); m_currentGuide = gd; mgr->select(gd); @@ -3582,7 +3582,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e) paintGuides(); m_currentGuide = 0; enterEvent(0); - KisMoveEvent kme(currentInputDevice(), pt, me->globalPos(), PRESSURE_DEFAULT, 0, 0, Qt::NoButton); + KisMoveEvent kme(currentInputDevice(), pt, me->globalPos(), PRESSURE_DEFAULT, 0, 0, TQt::NoButton); canvasGotMoveEvent(&kme); } } diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index ee784efa..5cc9799e 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -334,7 +334,7 @@ bool KoBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev) TQMouseEvent* me = (TQMouseEvent*)ev; TQPoint thumbnailPos = viewToThumbnail(me->pos()); - if (me->button() == Qt::LeftButton) { + if (me->button() == TQt::LeftButton) { handleMousePress(thumbnailPos); } @@ -345,7 +345,7 @@ bool KoBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev) TQMouseEvent* me = (TQMouseEvent*)ev; - if (me->button() == Qt::LeftButton) { + if (me->button() == TQt::LeftButton) { m_dragging = false; } diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index c15c6d5e..9bcf12ce 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -671,7 +671,7 @@ void LayerList::contentsMousePressEvent( TQMouseEvent *e ) else { super::contentsMousePressEvent( e ); - if( e->button() == Qt::RightButton ) + if( e->button() == TQt::RightButton ) showContextMenu(); } } @@ -1170,7 +1170,7 @@ TQFontMetrics LayerItem::fontMetrics() const bool LayerItem::mousePressEvent( TQMouseEvent *e ) { - if( e->button() == Qt::RightButton ) + if( e->button() == TQt::RightButton ) { if ( !(e->state() & TQt::ControlButton) && !(e->state() & TQt::ShiftButton) ) setActive(); |