diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-05 11:54:26 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-16 23:40:13 +0900 |
| commit | c8c5e11f05f023849896d09cf06917e9a2c016ca (patch) | |
| tree | a62f00b0249b967528e115e2123b56d40633c17a | |
| parent | c9973bfbf1091ef91f30b5ab456015676123aa47 (diff) | |
| download | koffice-c8c5e11f.tar.gz koffice-c8c5e11f.zip | |
Replace Qt with TQt
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit ef06f14f2475bd08d3ea2ceec54a7b2238f3554e)
358 files changed, 1519 insertions, 1519 deletions
diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi index f0a23c0d9..6f21c7ee4 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 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() ); diff --git a/chalk/ui/imageviewer.cpp b/chalk/ui/imageviewer.cpp index 5e74c8fe8..fe632dccf 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 086bcb55b..a69b78466 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 f001c5bdb..1128d9f2a 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 9b3666e89..438f990a5 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 a5ad2d843..00a197fd9 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 997887f00..34374356e 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 3325f07bb..37f2b862b 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 255d3847a..939c654e6 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 f0d0e5f89..a03ad22f3 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 a37fd69e3..5a659a97e 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 3b94db619..2f14fa523 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 cb1b69384..9e561287e 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 12aa5abb1..939312fab 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 e6551f816..91c4c8705 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 24f2e2e26..ff7c841c5 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 e0836bf60..cc598ef29 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 cef260b40..704cbfff9 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 234269227..dde306d68 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 d0ee14512..90d61690c 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 759136f44..de4ac0808 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 74eec4066..568218490 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 143bd6754..34fc77302 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 439423c71..2e123f5d4 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 ee784efa4..5cc9799e9 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 c15c6d5e1..9bcf12cec 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(); diff --git a/doc/chalk/developers-plugins.docbook b/doc/chalk/developers-plugins.docbook index 319d92578..e041576ef 100644 --- a/doc/chalk/developers-plugins.docbook +++ b/doc/chalk/developers-plugins.docbook @@ -951,7 +951,7 @@ void KisToolStar::move(KisMoveEvent *event) // erase old lines on canvas draw(m_dragStart, m_dragEnd); // move (alt) or resize star - if (event->state() & Qt::AltButton) { + if (event->state() & TQt::AltButton) { KisPoint trans = event->pos() - m_dragEnd; m_dragStart += trans; m_dragEnd += trans; @@ -1016,7 +1016,7 @@ The <methodname>draw()</methodname> method is an internal method of <classname>KisToolStar</classname> and draws the outline of the star. We call this from the <methodname>move()</methodname> method to give the user feedback of the size and shape of their star. Note that we use the -<varname>Qt::NotROP</varname> raster operation, which means that calling +<varname>TQt::NotROP</varname> raster operation, which means that calling <methodname>draw()</methodname> a second time with the same start and end point the previously drawn star will be deleted. </para> @@ -1030,14 +1030,14 @@ void KisToolStar::draw(const KisPoint& start, const KisPoint& end ) KisCanvasController *controller = m_subject->canvasController(); KisCanvas *canvas = controller->kiscanvas(); KisCanvasPainter p (canvas); - QPen pen(Qt::SolidLine); + QPen pen(TQt::SolidLine); KisPoint startPos; KisPoint endPos; startPos = controller->windowToView(start); endPos = controller->windowToView(end); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); vKisPoint points = starCoordinates(m_vertices, startPos.x(), startPos.y(), endPos.x(), endPos.y()); @@ -1066,8 +1066,8 @@ void KisToolStar::setup(TDEActionCollection *collection) m_action = static_cast<TDERadioAction *>(collection->action(name())); if (m_action == 0) { - TDEShortcut shortcut(Qt::Key_Plus); - shortcut.append(TDEShortcut(Qt::Key_F9)); + TDEShortcut shortcut(TQt::Key_Plus); + shortcut.append(TDEShortcut(TQt::Key_F9)); m_action = new TDERadioAction(i18n("&Star"), "tool_star", shortcut, diff --git a/filters/chalk/raw/dcraw.c b/filters/chalk/raw/dcraw.c index b937e1dae..ac9fe9116 100644 --- a/filters/chalk/raw/dcraw.c +++ b/filters/chalk/raw/dcraw.c @@ -3514,7 +3514,7 @@ int CLASS parse_tiff_ifd (int base, int level) case 0x111: /* StripOffset */ data_offset = get4(); break; - case 0x112: /* Qt::Orientation */ + case 0x112: /* Orientation */ flip = flip_map[(get2()-1) & 7]; break; case 0x115: /* SamplesPerPixel */ diff --git a/filters/karbon/eps/epsexport.cpp b/filters/karbon/eps/epsexport.cpp index 023074daa..6d0621042 100644 --- a/filters/karbon/eps/epsexport.cpp +++ b/filters/karbon/eps/epsexport.cpp @@ -197,7 +197,7 @@ EpsExport::visitVDocument( VDocument& document ) TQDateTime now( TQDateTime::currentDateTime() ); *m_stream << - "%%CreationDate: (" << now.toString( Qt::LocalDate ) << ")\n" + "%%CreationDate: (" << now.toString( TQt::LocalDate ) << ")\n" "%%For: (" << authorPage->fullName() << ") (" << authorPage->company() << ")\n" "%%Title: (" << docInfo.title() << ")" << endl; diff --git a/filters/karbon/eps/epsexportdlg.cpp b/filters/karbon/eps/epsexportdlg.cpp index 4bf4aec7e..6ceb99e0c 100644 --- a/filters/karbon/eps/epsexportdlg.cpp +++ b/filters/karbon/eps/epsexportdlg.cpp @@ -34,7 +34,7 @@ EpsExportDlg::EpsExportDlg( TQWidget* parent, const char* name ) { TQVBox* page = makeVBoxMainWidget(); - m_psLevelButtons = new TQButtonGroup( 1, Qt::Horizontal, + m_psLevelButtons = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Options" ), page ); TQRadioButton* radio; diff --git a/filters/karbon/wmf/wmfexport.cpp b/filters/karbon/wmf/wmfexport.cpp index de929ca88..6236aa577 100644 --- a/filters/karbon/wmf/wmfexport.cpp +++ b/filters/karbon/wmf/wmfexport.cpp @@ -225,15 +225,15 @@ void WmfExport::getBrush( TQBrush& brush, const VFill *fill ) { if( (fill->type() == VFill::solid) || (fill->type() == VFill::grad) || (fill->type() == VFill::patt) ) { if ( fill->color().opacity() < 0.1 ) { - brush.setStyle( Qt::NoBrush ); + brush.setStyle( TQt::NoBrush ); } else { - brush.setStyle( Qt::SolidPattern ); + brush.setStyle( TQt::SolidPattern ); brush.setColor( fill->color() ); } } else { - brush.setStyle( Qt::NoBrush ); + brush.setStyle( TQt::NoBrush ); } } @@ -244,17 +244,17 @@ void WmfExport::getPen( TQPen& pen, const VStroke *stroke ) { // TODO : Dash pattern. if ( stroke->lineCap() == VStroke::capRound ) { - pen.setCapStyle( Qt::RoundCap ); + pen.setCapStyle( TQt::RoundCap ); } else { - pen.setCapStyle( Qt::SquareCap ); + pen.setCapStyle( TQt::SquareCap ); } - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); pen.setColor( stroke->color() ); pen.setWidth( coordX( stroke->lineWidth() ) ); } else { - pen.setStyle( Qt::NoPen ); + pen.setStyle( TQt::NoPen ); } } diff --git a/filters/karbon/wmf/wmfimportparser.cpp b/filters/karbon/wmf/wmfimportparser.cpp index 275490fef..58be2e08e 100644 --- a/filters/karbon/wmf/wmfimportparser.cpp +++ b/filters/karbon/wmf/wmfimportparser.cpp @@ -49,7 +49,7 @@ bool WMFImportParser::play( VDocument& doc ) bool WMFImportParser::begin() { TQRect bounding = boundingRect(); - mBackgroundMode = Qt::TransparentMode; + mBackgroundMode = TQt::TransparentMode; mCurrentOrg.setX( bounding.left() ); mCurrentOrg.setY( bounding.top() ); @@ -111,7 +111,7 @@ void WMFImportParser::setBackgroundColor( const TQColor &c ) { } -void WMFImportParser::setBackgroundMode( Qt::BGMode mode ) { +void WMFImportParser::setBackgroundMode( TQt::BGMode mode ) { mBackgroundMode = mode; } diff --git a/filters/karbon/wmf/wmfimportparser.h b/filters/karbon/wmf/wmfimportparser.h index 4e904d7fc..a297c9967 100644 --- a/filters/karbon/wmf/wmfimportparser.h +++ b/filters/karbon/wmf/wmfimportparser.h @@ -60,7 +60,7 @@ private: // Drawing attributes/modes void setBackgroundColor( const TQColor &c ); - void setBackgroundMode( Qt::BGMode mode ); + void setBackgroundMode( TQt::BGMode mode ); void setRasterOp( TQt::RasterOp op ); /** @@ -128,7 +128,7 @@ private: TQRegion mClippingRegion; TQPen mPen; TQBrush mBrush; - Qt::BGMode mBackgroundMode; + TQt::BGMode mBackgroundMode; TQColor mBackgroundColor; // current origin of WMF logical coordinate TQPoint mCurrentOrg; diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cpp b/filters/kpresenter/ooimpress/ooimpressimport.cpp index 5d6c9da4a..8223e284e 100644 --- a/filters/kpresenter/ooimpress/ooimpressimport.cpp +++ b/filters/kpresenter/ooimpress/ooimpressimport.cpp @@ -2155,7 +2155,7 @@ void OoImpressImport::appendField(TQDomDocument& doc, TQDomElement& e, const TQD if (isTextNS && tag == "date") { - TQDateTime dt(TQDate::fromString(object.attributeNS( ooNS::text, "date-value", TQString()), Qt::ISODate)); + TQDateTime dt(TQDate::fromString(object.attributeNS( ooNS::text, "date-value", TQString()), TQt::ISODate)); bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); @@ -2190,7 +2190,7 @@ void OoImpressImport::appendField(TQDomDocument& doc, TQDomElement& e, const TQD else if (isTextNS && tag == "time") { // Use TQDateTime to work around a possible problem of TQTime::FromString in TQt 3.2.2 - TQDateTime dt(TQDateTime::fromString(object.attributeNS( ooNS::text, "time-value", TQString()), Qt::ISODate)); + TQDateTime dt(TQDateTime::fromString(object.attributeNS( ooNS::text, "time-value", TQString()), TQt::ISODate)); bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.h b/filters/kpresenter/powerpoint/libppt/powerpoint.h index b2a0f6490..2f3b5ee98 100644 --- a/filters/kpresenter/powerpoint/libppt/powerpoint.h +++ b/filters/kpresenter/powerpoint/libppt/powerpoint.h @@ -2095,8 +2095,8 @@ public: NotesBody, CenteredTitle, Subtitle, - Qt::VerticalTextTitle, - Qt::VerticalTextBody, + TQt::VerticalTextTitle, + TQt::VerticalTextBody, NotesSlideImage, Object, Graph, diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp index ebf1523ee..fe1a7c80b 100644 --- a/filters/kspread/csv/csvexportdialog.cpp +++ b/filters/kspread/csv/csvexportdialog.cpp @@ -68,7 +68,7 @@ CSVExportDialog::CSVExportDialog( TQWidget * parent ) m_dialog->comboBoxEncoding->insertStringList(encodings); - setButtonBoxOrientation (Qt::Vertical ); + setButtonBoxOrientation (TQt::Vertical ); setMainWidget(m_dialog); diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp index b956384ec..3f7240f34 100644 --- a/filters/kspread/excel/sidewinder/excel.cpp +++ b/filters/kspread/excel/sidewinder/excel.cpp @@ -4662,8 +4662,8 @@ void XFRecord::dump( std::ostream& out ) const out << " Format Index : " << formatIndex() << std::endl; out << " Locked : " << (locked()?"Yes":"No") << std::endl; out << " Formula Visibility : " << (formulaHidden()?"Hidden":"Visible") << std::endl; - out << " Qt::Horizontal Align : " << horizontalAlignmentAsString() << std::endl; - out << " Qt::Vertical Align : " << verticalAlignmentAsString() << std::endl; + out << " Horizontal Align : " << horizontalAlignmentAsString() << std::endl; + out << " Vertical Align : " << verticalAlignmentAsString() << std::endl; out << " Text Wrap : " << ( textWrap() ? "yes" : "no" ) << std::endl; out << " Rotation : " << rotationAngle() << std::endl; out << " Stacked Letters : " << ( stackedLetters() ? "yes" : "no" ) << std::endl; diff --git a/filters/kspread/gnumeric/gnumericimport.cpp b/filters/kspread/gnumeric/gnumericimport.cpp index f437aad00..4b037ad15 100644 --- a/filters/kspread/gnumeric/gnumericimport.cpp +++ b/filters/kspread/gnumeric/gnumericimport.cpp @@ -488,63 +488,63 @@ void convertToPen( TQPen & pen, int style ) case 0: break; case 1: - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); pen.setWidth( 1 ); break; case 2: - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); pen.setWidth( 2 ); break; case 3: - pen.setStyle( Qt::DashLine ); + pen.setStyle( TQt::DashLine ); pen.setWidth( 1 ); break; case 4: // width should be 1 but otherwise it would be the same as 7 - pen.setStyle( Qt::DotLine ); + pen.setStyle( TQt::DotLine ); pen.setWidth( 2 ); break; case 5: - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); pen.setWidth( 3 ); break; case 6: // TODO should be double - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); pen.setWidth( 1 ); break; case 7: // very thin dots => no match in KSpread - pen.setStyle( Qt::DotLine ); + pen.setStyle( TQt::DotLine ); pen.setWidth( 1 ); break; case 8: - pen.setStyle( Qt::DashLine ); + pen.setStyle( TQt::DashLine ); pen.setWidth( 2 ); break; case 9: - pen.setStyle( Qt::DashDotLine ); + pen.setStyle( TQt::DashDotLine ); pen.setWidth( 1 ); break; case 10: - pen.setStyle( Qt::DashDotLine ); + pen.setStyle( TQt::DashDotLine ); pen.setWidth( 2 ); break; case 11: - pen.setStyle( Qt::DashDotDotLine ); + pen.setStyle( TQt::DashDotDotLine ); pen.setWidth( 1 ); break; case 12: - pen.setStyle( Qt::DashDotDotLine ); + pen.setStyle( TQt::DashDotDotLine ); pen.setWidth( 2 ); break; case 13: // TODO: long dash, short dash, long dash,... - pen.setStyle( Qt::DashDotLine ); + pen.setStyle( TQt::DashDotLine ); pen.setWidth( 3 ); break; default: - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); pen.setWidth( 1 ); } } @@ -1178,7 +1178,7 @@ void GNUMERICFilter::setStyleInfo(TQDomNode * sheet, Sheet * table) else if (shade == "1") { /* 1 Solid */ - //kspread_cell->format()->setBackGroundBrushStyle(Qt::SolidPattern); + //kspread_cell->format()->setBackGroundBrushStyle(TQt::SolidPattern); //This is as empty /* What should this be? */ @@ -1186,86 +1186,86 @@ void GNUMERICFilter::setStyleInfo(TQDomNode * sheet, Sheet * table) else if (shade == "2") { /* 2 75% */ - kspread_cell->format()->setBackGroundBrushStyle(Qt::Dense2Pattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::Dense2Pattern); } else if (shade == "3") { /* 3 50% */ - kspread_cell->format()->setBackGroundBrushStyle(Qt::Dense4Pattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::Dense4Pattern); } else if (shade == "4") { - kspread_cell->format()->setBackGroundBrushStyle(Qt::Dense5Pattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::Dense5Pattern); /* This should be 25%... All qt has is 37% */ /* 4 25% */ } else if (shade == "5") { - kspread_cell->format()->setBackGroundBrushStyle(Qt::Dense6Pattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::Dense6Pattern); /* 5 12.5% */ } else if (shade == "6") { - kspread_cell->format()->setBackGroundBrushStyle(Qt::Dense7Pattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::Dense7Pattern); /* 6 6.25% */ } else if (shade == "7") { - kspread_cell->format()->setBackGroundBrushStyle(Qt::HorPattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::HorPattern); /* 7 Horizontal Stripe */ } else if (shade == "8") { - kspread_cell->format()->setBackGroundBrushStyle(Qt::VerPattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::VerPattern); /* 8 Vertical Stripe */ } else if (shade == "9") { - kspread_cell->format()->setBackGroundBrushStyle(Qt::BDiagPattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::BDiagPattern); /* 9 Reverse Diagonal Stripe */ } else if (shade == "10") { /* 10 Diagonal Stripe */ - kspread_cell->format()->setBackGroundBrushStyle(Qt::FDiagPattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::FDiagPattern); } else if (shade == "11") { /* 11 Diagonal Crosshatch */ - kspread_cell->format()->setBackGroundBrushStyle(Qt::DiagCrossPattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::DiagCrossPattern); } else if (shade == "12") { /* 12 Thick Diagonal Crosshatch TODO!*/ - kspread_cell->format()->setBackGroundBrushStyle(Qt::DiagCrossPattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::DiagCrossPattern); } else if (shade == "13") { /* 13 Thin Horizontal Stripe TODO: wrong: this is thick!*/ - kspread_cell->format()->setBackGroundBrushStyle(Qt::HorPattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::HorPattern); } else if (shade == "14") { - kspread_cell->format()->setBackGroundBrushStyle(Qt::VerPattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::VerPattern); } else if (shade == "15") { - kspread_cell->format()->setBackGroundBrushStyle(Qt::FDiagPattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::FDiagPattern); } else if (shade == "16") { /* 16 Thick Reverse Stripe TODO:*/ - kspread_cell->format()->setBackGroundBrushStyle(Qt::BDiagPattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::BDiagPattern); } else if (shade == "17") { - kspread_cell->format()->setBackGroundBrushStyle(Qt::DiagCrossPattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::DiagCrossPattern); } else if (shade == "18") { - kspread_cell->format()->setBackGroundBrushStyle(Qt::DiagCrossPattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::DiagCrossPattern); } else if (shade == "19") { @@ -1290,12 +1290,12 @@ void GNUMERICFilter::setStyleInfo(TQDomNode * sheet, Sheet * table) else if (shade == "24") { /* 24 100% */ - kspread_cell->format()->setBackGroundBrushStyle(Qt::SolidPattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::SolidPattern); } else if (shade == "25") { /* 25 87.5% */ - kspread_cell->format()->setBackGroundBrushStyle(Qt::Dense2Pattern); + kspread_cell->format()->setBackGroundBrushStyle(TQt::Dense2Pattern); } } diff --git a/filters/kspread/gnumeric/status.html b/filters/kspread/gnumeric/status.html index a25cdf4b6..c6c9ef89a 100644 --- a/filters/kspread/gnumeric/status.html +++ b/filters/kspread/gnumeric/status.html @@ -39,7 +39,7 @@ KOffice filters status: GNUmeric (GNOME spreadsheet)</h1></center> <tr BGCOLOR="#CCCCFF"> <td VALIGN=TOP><b><font size="+1">Features</font></b></td> -<td>Vertical &Qt::Horizontal Alignment, text wrapping, indention +<td>Vertical & Horizontal Alignment, text wrapping, indention <br>Background, Patter & Foreground color <br>Fonts: <br> @@ -61,7 +61,7 @@ Family <br>Page: size, orientation, borders, header and footer <br>Border: color, style, width for all 6 types <br>Background pattern: style, color -<br>Cell Size:Qt::Horizontal &Qt::Vertical +<br>Cell Size: horizontal & vertical <br>Hidden Columns <br>Default row heights and column widths <br>Area name @@ -81,7 +81,7 @@ Family <tr BGCOLOR="#EEEEFF"> <td VALIGN=TOP><b><font size="+1">Todo</font></b></td> -<td>Cell Size:Qt::Horizontal &Qt::Vertical (Export) (kspread doesn't +<td>Cell Size: horizontal & vertical (Export) (kspread doesn't support retriving the first "rowFormat" and colFormat".) <br> <br> @@ -194,7 +194,7 @@ Faure</a> <a href="mailto:trobin@kde.org">Werner Trobin</a></td> <tr BGCOLOR="#CCCCFF"> <td VALIGN=TOP><b><font size="+1">Features</font></b></td> -<td>Vertical &Qt::Horizontal Alignment +<td>Vertical & Horizontal Alignment <br>Background & Foreground color <br>Fonts: <br> @@ -208,7 +208,7 @@ Bold <br>Multiple Sheets (Tables) <br>Formulas!!! (ExprID) <br>Selections -<br>Cell Size:Qt::Horizontal &Qt::Vertical +<br>Cell Size: horizontal & vertical <br>Hidden columns/rows <br>Selected Tab <br>Paper layout diff --git a/filters/kspread/opencalc/opencalcexport.cpp b/filters/kspread/opencalc/opencalcexport.cpp index 2db60420f..8f8018c53 100644 --- a/filters/kspread/opencalc/opencalcexport.cpp +++ b/filters/kspread/opencalc/opencalcexport.cpp @@ -231,7 +231,7 @@ bool OpenCalcExport::exportDocInfo( KoStore * store, const Doc* ksdoc ) if ( dt.isValid() ) { data = meta.createElement( "dc:date" ); - data.appendChild( meta.createTextNode( dt.toString( Qt::ISODate ) ) ); + data.appendChild( meta.createTextNode( dt.toString( TQt::ISODate ) ) ); officeMeta.appendChild( data ); } diff --git a/filters/kspread/opencalc/opencalcimport.cpp b/filters/kspread/opencalc/opencalcimport.cpp index 6dc3216ed..2ccf31739 100644 --- a/filters/kspread/opencalc/opencalcimport.cpp +++ b/filters/kspread/opencalc/opencalcimport.cpp @@ -2017,17 +2017,17 @@ void OpenCalcImport::loadBorder( Format * layout, TQString const & borderDef, bP kdDebug(30518) << "Borderstyle: " << s << endl; if ( s == "solid" || s == "double" ) - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); else { #if 0 // TODO: not supported by oocalc - pen.setStyle( Qt::DashLine ); - pen.setStyle( Qt::DotLine ); - pen.setStyle( Qt::DashDotLine ); - pen.setStyle( Qt::DashDotDotLine ); + pen.setStyle( TQt::DashLine ); + pen.setStyle( TQt::DotLine ); + pen.setStyle( TQt::DashDotLine ); + pen.setStyle( TQt::DashDotDotLine ); #endif - pen.setStyle( Qt::SolidLine ); //default. + pen.setStyle( TQt::SolidLine ); //default. } ++p2; diff --git a/filters/kword/abiword/abiwordexport.cpp b/filters/kword/abiword/abiwordexport.cpp index d1b5a98a2..ffc040167 100644 --- a/filters/kword/abiword/abiwordexport.cpp +++ b/filters/kword/abiword/abiwordexport.cpp @@ -1208,7 +1208,7 @@ bool AbiWordWorker::doFullDocumentInfo(const KWEFDocumentInfo& docInfo) *m_streamOut << "</m>\n"; - TQDateTime now (TQDateTime::currentDateTime(Qt::UTC)); // current time in UTC + TQDateTime now (TQDateTime::currentDateTime(TQt::UTC)); // current time in UTC *m_streamOut << "<m key=\"abiword.date_last_changed\">" << escapeAbiWordText(transformToTextDate(now)) << "</m>\n"; diff --git a/filters/kword/abiword/abiwordimport.cpp b/filters/kword/abiword/abiwordimport.cpp index bd6ea1e38..e443ada11 100644 --- a/filters/kword/abiword/abiwordimport.cpp +++ b/filters/kword/abiword/abiwordimport.cpp @@ -72,7 +72,7 @@ class StructureParser : public TQXmlDefaultHandler public: StructureParser(KoFilterChain* chain) : m_chain(chain), m_pictureNumber(0), m_pictureFrameNumber(0), m_tableGroupNumber(0), - m_timepoint(TQDateTime::currentDateTime(Qt::UTC)), m_fatalerror(false) + m_timepoint(TQDateTime::currentDateTime(TQt::UTC)), m_fatalerror(false) { createDocument(); structureStack.setAutoDelete(true); diff --git a/filters/kword/kword1.3/import/kword13document.cpp b/filters/kword/kword1.3/import/kword13document.cpp index 747d88a4c..af9899d46 100644 --- a/filters/kword/kword1.3/import/kword13document.cpp +++ b/filters/kword/kword1.3/import/kword13document.cpp @@ -201,7 +201,7 @@ TQDateTime KWord13Document::lastPrintingDate( void ) const } else { - dt = TQDateTime::fromString( strDate, Qt::ISODate ); + dt = TQDateTime::fromString( strDate, TQt::ISODate ); } return dt; } @@ -230,7 +230,7 @@ TQDateTime KWord13Document::creationDate( void ) const } else { - dt = TQDateTime::fromString( strDate, Qt::ISODate ); + dt = TQDateTime::fromString( strDate, TQt::ISODate ); } return dt; } @@ -258,7 +258,7 @@ TQDateTime KWord13Document::modificationDate( void ) const } else { - dt = TQDateTime::fromString( strDate, Qt::ISODate ); + dt = TQDateTime::fromString( strDate, TQt::ISODate ); } return dt; } diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp index cc28136ae..bf2ca8a54 100644 --- a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp +++ b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp @@ -760,7 +760,7 @@ void KWord13OasisGenerator::writeMetaXml(void) if ( dt.isValid() ) { writer->startElement( "meta:creation-date"); - writer->addTextNode( dt.toString( Qt::ISODate) ); + writer->addTextNode( dt.toString( TQt::ISODate) ); writer->endElement(); } @@ -768,7 +768,7 @@ void KWord13OasisGenerator::writeMetaXml(void) if ( dt.isValid() ) { writer->startElement( "dc:date"); - writer->addTextNode( dt.toString( Qt::ISODate) ); + writer->addTextNode( dt.toString( TQt::ISODate) ); writer->endElement(); } @@ -776,7 +776,7 @@ void KWord13OasisGenerator::writeMetaXml(void) if ( dt.isValid() ) { writer->startElement( "meta:print-date"); - writer->addTextNode( dt.toString( Qt::ISODate) ); + writer->addTextNode( dt.toString( TQt::ISODate) ); writer->endElement(); } @@ -839,7 +839,7 @@ void KWord13OasisGenerator::writePreviewFile(void) } // We have a 256x256x8 preview and we need a 128x128x32 preview with alpha channel - TQImage preview( image.convertDepth( 32, Qt::ColorOnly ).smoothScale( 128, 128 ) ); + TQImage preview( image.convertDepth( 32, TQt::ColorOnly ).smoothScale( 128, 128 ) ); if ( preview.isNull() ) { kdWarning(30520) << "Could not create preview!" << endl; diff --git a/filters/kword/libexport/KWEFKWordLeader.cpp b/filters/kword/libexport/KWEFKWordLeader.cpp index 05e4024a5..17e1d5179 100644 --- a/filters/kword/libexport/KWEFKWordLeader.cpp +++ b/filters/kword/libexport/KWEFKWordLeader.cpp @@ -767,8 +767,8 @@ static void ProcessVariableSettingsTag (TQDomNode myNode, void *, KWEFKWordLeade } } else - vs.creationTime=TQDateTime::fromString(creation, Qt::ISODate); - //kdDebug(30508) << "Creation time: " << vs.creationTime.toString( Qt::ISODate ) << endl; + vs.creationTime=TQDateTime::fromString(creation, TQt::ISODate); + //kdDebug(30508) << "Creation time: " << vs.creationTime.toString( TQt::ISODate ) << endl; if ( modification.isEmpty() ) { @@ -778,12 +778,12 @@ static void ProcessVariableSettingsTag (TQDomNode myNode, void *, KWEFKWordLeade } } else - vs.modificationTime=TQDateTime::fromString(modification, Qt::ISODate); - //kdDebug(30508) << "Modification time: " << vs.modificationTime.toString( Qt::ISODate ) << endl; + vs.modificationTime=TQDateTime::fromString(modification, TQt::ISODate); + //kdDebug(30508) << "Modification time: " << vs.modificationTime.toString( TQt::ISODate ) << endl; if (!print.isEmpty()) - vs.printTime=TQDateTime::fromString(print, Qt::ISODate); - //kdDebug(30508) << "Print time: " << vs.printTime.toString( Qt::ISODate ) << endl; + vs.printTime=TQDateTime::fromString(print, TQt::ISODate); + //kdDebug(30508) << "Print time: " << vs.printTime.toString( TQt::ISODate ) << endl; leader->doVariableSettings (vs); } diff --git a/filters/kword/oowriter/ExportFilter.cpp b/filters/kword/oowriter/ExportFilter.cpp index 0894d0443..d96b451a1 100644 --- a/filters/kword/oowriter/ExportFilter.cpp +++ b/filters/kword/oowriter/ExportFilter.cpp @@ -519,21 +519,21 @@ void OOWriterWorker::writeMetaXml(void) if (m_varSet.creationTime.isValid()) { zipWriteData(" <meta:creation-date>"); - zipWriteData(escapeOOText(m_varSet.creationTime.toString(Qt::ISODate))); + zipWriteData(escapeOOText(m_varSet.creationTime.toString(TQt::ISODate))); zipWriteData("</meta:creation-date>\n"); } if (m_varSet.modificationTime.isValid()) { zipWriteData(" <dc:date>"); - zipWriteData(escapeOOText(m_varSet.modificationTime.toString(Qt::ISODate))); + zipWriteData(escapeOOText(m_varSet.modificationTime.toString(TQt::ISODate))); zipWriteData("</dc:date>\n"); } if (m_varSet.printTime.isValid()) { zipWriteData(" <meta:print-date>"); - zipWriteData(escapeOOText(m_varSet.printTime.toString(Qt::ISODate))); + zipWriteData(escapeOOText(m_varSet.printTime.toString(TQt::ISODate))); zipWriteData("</meta:print-date>\n"); } @@ -1577,7 +1577,7 @@ void OOWriterWorker::processNote( const VariableData& variable ) // We use the document creation date as creation date for the annotation // (OOWriter uses only the date part, there is no time part) if ( m_varSet.creationTime.isValid() ) - *m_streamOut << escapeOOText( m_varSet.creationTime.date().toString( Qt::ISODate ) ); + *m_streamOut << escapeOOText( m_varSet.creationTime.date().toString( TQt::ISODate ) ); else *m_streamOut << "1970-01-01"; @@ -2217,7 +2217,7 @@ TQString OOWriterWorker::makeAutomaticStyleName(const TQString& prefix, ulong& c return str2; // If it is still not unique, try a time stamp. - const TQDateTime dt(TQDateTime::currentDateTime(Qt::UTC)); + const TQDateTime dt(TQDateTime::currentDateTime(TQt::UTC)); str2 = str + "_" + TQString::number(dt.toTime_t(),16); if (m_styleMap.find(str2)==m_styleMap.end()) diff --git a/filters/kword/oowriter/oowriterimport.cpp b/filters/kword/oowriter/oowriterimport.cpp index 5e54ce06f..19449823c 100644 --- a/filters/kword/oowriter/oowriterimport.cpp +++ b/filters/kword/oowriter/oowriterimport.cpp @@ -175,7 +175,7 @@ KoFilter::ConversionStatus OoWriterImport::convert( TQCString const & from, TQCS { // ### TODO: thumbnail.setAlphaBuffer( false ); // legacy KOffice previews have no alpha channel // Legacy KOffice previews are 256x256x8 instead of 128x128x32 - TQImage preview( thumbnail.smoothScale( 256, 256 ).convertDepth(8, Qt::AvoidDither | Qt::DiffuseDither) ); + TQImage preview( thumbnail.smoothScale( 256, 256 ).convertDepth(8, TQt::AvoidDither | TQt::DiffuseDither) ); // Not to be able to generate a preview is not an error if ( !preview.isNull() ) { @@ -1817,7 +1817,7 @@ TQString OoWriterImport::appendPicture(TQDomDocument& doc, const TQDomElement& o strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href.mid(1)); - KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); + KoPictureKey key(filename, TQDateTime::currentDateTime(TQt::UTC)); picture.setKey(key); if (!m_zip) @@ -1961,7 +1961,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats { subtype = 1; // current (or fixed) date // Standard form of the date is in date-value. Example: 2004-01-21T10:57:05 - TQDateTime dt(TQDate::fromString(object.attributeNS( ooNS::text, "date-value", TQString()), Qt::ISODate)); + TQDateTime dt(TQDate::fromString(object.attributeNS( ooNS::text, "date-value", TQString()), TQt::ISODate)); bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) @@ -1990,7 +1990,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats else if (localName == "time") { // Use TQDateTime to work around a possible problem of TQTime::FromString in TQt 3.2.2 - TQDateTime dt(TQDateTime::fromString(object.attributeNS( ooNS::text, "time-value", TQString()), Qt::ISODate)); + TQDateTime dt(TQDateTime::fromString(object.attributeNS( ooNS::text, "time-value", TQString()), TQt::ISODate)); bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true"); diff --git a/filters/kword/wordperfect/import/parser.h b/filters/kword/wordperfect/import/parser.h index 2a69ad27a..9fa880527 100644 --- a/filters/kword/wordperfect/import/parser.h +++ b/filters/kword/wordperfect/import/parser.h @@ -64,7 +64,7 @@ namespace WP { Left, Right, Center, Full, All }; enum TabType - { LeftTab, CenterTab, RightTab, DecimalTab,Qt::VerticalTab }; + { LeftTab, CenterTab, RightTab, DecimalTab,TQt::VerticalTab }; class Tab { diff --git a/karbon/dialogs/vcolortab.cpp b/karbon/dialogs/vcolortab.cpp index 0b2c3bab9..fc8f4eac5 100644 --- a/karbon/dialogs/vcolortab.cpp +++ b/karbon/dialogs/vcolortab.cpp @@ -48,7 +48,7 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mainLayout->addMultiCellWidget(mColorSelector, 0, 2, 0, 0 ); //Selector - mSelector = new KGradientSelector( Qt::Vertical, mRGBWidget ); + mSelector = new KGradientSelector( TQt::Vertical, mRGBWidget ); mSelector->setColors( TQColor( "white" ), TQColor( "black" ) ); mSelector->setMinimumWidth( 20 ); //TODO: Make it autochange color if the solid-filled object is selected (also for TQSpinBoxes) @@ -56,7 +56,7 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mainLayout->addMultiCellWidget( mSelector, 0, 2, 1, 1 ); //Reference - TQGroupBox* groupbox = new TQGroupBox( 2,Qt::Vertical, i18n( "Reference" ), mRGBWidget ); + TQGroupBox* groupbox = new TQGroupBox( 2,TQt::Vertical, i18n( "Reference" ), mRGBWidget ); new TQLabel( i18n( "Old:" ), groupbox ); new TQLabel( i18n( "New:" ), groupbox ); mOldColor = new KColorPatch( groupbox ); @@ -68,7 +68,7 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mainLayout->addWidget( groupbox, 0, 2 ); //Components - TQGroupBox* cgroupbox = new TQGroupBox( 3,Qt::Vertical, i18n( "Components" ), mRGBWidget ); + TQGroupBox* cgroupbox = new TQGroupBox( 3,TQt::Vertical, i18n( "Components" ), mRGBWidget ); //--->RGB new TQLabel( i18n( "R:" ), cgroupbox ); @@ -94,7 +94,7 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mainLayout->addWidget( cgroupbox, 1, 2 ); //--->Opacity - TQGroupBox* ogroupBox = new TQGroupBox( 1,Qt::Vertical, i18n( "Opacity" ), mRGBWidget ); + TQGroupBox* ogroupBox = new TQGroupBox( 1,TQt::Vertical, i18n( "Opacity" ), mRGBWidget ); mOpacity = new KIntNumInput( 100, ogroupBox ); mOpacity->setRange( 0, 100, 1, true ); mOpacity->setValue( int( c.opacity() * 100.0 ) ); diff --git a/karbon/dialogs/vconfiguredlg.cpp b/karbon/dialogs/vconfiguredlg.cpp index 49f874fc4..3736f738a 100644 --- a/karbon/dialogs/vconfiguredlg.cpp +++ b/karbon/dialogs/vconfiguredlg.cpp @@ -217,7 +217,7 @@ VConfigMiscPage::VConfigMiscPage( KarbonView* view, TQVBox* box, char* name ) KoUnit::Unit unit = view->part()->unit(); - TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), box, "GroupBox" ); + TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Misc" ), box, "GroupBox" ); tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); @@ -302,14 +302,14 @@ VConfigGridPage::VConfigGridPage( KarbonView* view, TQVBox* page, char* name ) TQLabel* gridColorLbl = new TQLabel( i18n( "Grid &color:" ), page); m_gridColorBtn = new KColorButton( gd.color, page ); gridColorLbl->setBuddy( m_gridColorBtn ); - TQGroupBox* spacingGrp = new TQGroupBox( 2, Qt::Horizontal, i18n( "Spacing" ), page ); + TQGroupBox* spacingGrp = new TQGroupBox( 2, TQt::Horizontal, i18n( "Spacing" ), page ); TQLabel* spaceHorizLbl = new TQLabel( i18n( "&Horizontal:" ), spacingGrp ); m_spaceHorizUSpin = new KoUnitDoubleSpinBox( spacingGrp, 0.0, pgw, 0.1, fw, unit ); spaceHorizLbl->setBuddy( m_spaceHorizUSpin ); TQLabel* spaceVertLbl = new TQLabel( i18n( "&Vertical:" ), spacingGrp ); m_spaceVertUSpin = new KoUnitDoubleSpinBox( spacingGrp, 0.0, pgh, 0.1, fh, unit ); spaceVertLbl->setBuddy( m_spaceVertUSpin ); - TQGroupBox* snapGrp = new TQGroupBox( 2, Qt::Horizontal, i18n( "Snap Distance" ), page ); + TQGroupBox* snapGrp = new TQGroupBox( 2, TQt::Horizontal, i18n( "Snap Distance" ), page ); TQLabel* snapHorizLbl = new TQLabel( i18n( "H&orizontal:" ), snapGrp ); m_snapHorizUSpin = new KoUnitDoubleSpinBox( snapGrp, 0.0, fw, 0.1, sw, unit ); snapHorizLbl->setBuddy( m_snapHorizUSpin ); diff --git a/karbon/karbon_view.cpp b/karbon/karbon_view.cpp index 3fc8eaf5b..20e74fce2 100644 --- a/karbon/karbon_view.cpp +++ b/karbon/karbon_view.cpp @@ -162,11 +162,11 @@ KarbonView::KarbonView( KarbonPart* p, TQWidget* parent, const char* name ) connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), TQT_TQOBJECT(this), TQT_SLOT( setUnit( KoUnit::Unit ) ) ); // widgets: - m_horizRuler = new VRuler( Qt::Horizontal, this ); + m_horizRuler = new VRuler( TQt::Horizontal, this ); m_horizRuler->setUnit(p->unit()); connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_horizRuler, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); - m_vertRuler = new VRuler( Qt::Vertical, this ); + m_vertRuler = new VRuler( TQt::Vertical, this ); m_vertRuler->setUnit(p->unit()); connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_vertRuler, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); @@ -1031,7 +1031,7 @@ KarbonView::initActions() TQT_SLOT( selectionAlignHorizontalLeft() ), actionCollection(), "object_align_horizontal_left" ); new TDEAction( - i18n( "Align Center Qt::Horizontal)" ), "aocenterh", 0, TQT_TQOBJECT(this), + i18n( "Align Center (Horizontal)" ), "aocenterh", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionAlignHorizontalCenter() ), actionCollection(), "object_align_horizontal_center" ); new TDEAction( @@ -1043,7 +1043,7 @@ KarbonView::initActions() TQT_SLOT( selectionAlignVerticalTop() ), actionCollection(), "object_align_vertical_top" ); new TDEAction( - i18n( "Align Middle Qt::Vertical)" ), "aocenterv", 0, TQT_TQOBJECT(this), + i18n( "Align Middle (Vertical)" ), "aocenterv", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionAlignVerticalCenter() ), actionCollection(), "object_align_vertical_center" ); new TDEAction( @@ -1052,11 +1052,11 @@ KarbonView::initActions() actionCollection(), "object_align_vertical_bottom" ); new TDEAction( - i18n( "Distribute Center Qt::Horizontal)" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Center (Horizontal)" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeHorizontalCenter() ), actionCollection(), "object_distribute_horizontal_center" ); new TDEAction( - i18n( "Distribute Gaps Qt::Horizontal)" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Gaps (Horizontal)" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeHorizontalGap() ), actionCollection(), "object_distribute_horizontal_gap" ); new TDEAction( @@ -1068,11 +1068,11 @@ KarbonView::initActions() TQT_SLOT( selectionDistributeHorizontalRight() ), actionCollection(), "object_distribute_horizontal_right" ); new TDEAction( - i18n( "Distribute Center Qt::Vertical)" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Center (Vertical)" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeVerticalCenter() ), actionCollection(), "object_distribute_vertical_center" ); new TDEAction( - i18n( "Distribute Gaps Qt::Vertical)" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Gaps (Vertical)" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeVerticalGap() ), actionCollection(), "object_distribute_vertical_gap" ); new TDEAction( diff --git a/karbon/plugins/flattenpath/flattenpathplugin.cpp b/karbon/plugins/flattenpath/flattenpathplugin.cpp index 6c4a33d8d..f1453f96a 100644 --- a/karbon/plugins/flattenpath/flattenpathplugin.cpp +++ b/karbon/plugins/flattenpath/flattenpathplugin.cpp @@ -56,7 +56,7 @@ VFlattenDlg::VFlattenDlg( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Flatten Path" ), Ok | Cancel ) { // add input fields on the left: - TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox* group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Flatness:" ), group ); m_flatness = new KDoubleNumInput( group ); group->setMinimumWidth( 300 ); diff --git a/karbon/plugins/insertknots/insertknotsplugin.cpp b/karbon/plugins/insertknots/insertknotsplugin.cpp index 19a1e4d56..0cde892c6 100644 --- a/karbon/plugins/insertknots/insertknotsplugin.cpp +++ b/karbon/plugins/insertknots/insertknotsplugin.cpp @@ -54,7 +54,7 @@ VInsertKnotsDlg::VInsertKnotsDlg( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Insert Knots" ), Ok | Cancel ) { // add input fields: - TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox* group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Knots:" ), group ); m_knots = new KIntSpinBox( group ); diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cpp b/karbon/plugins/roundcorners/roundcornersplugin.cpp index 1841c5eb1..71545b9c2 100644 --- a/karbon/plugins/roundcorners/roundcornersplugin.cpp +++ b/karbon/plugins/roundcorners/roundcornersplugin.cpp @@ -59,7 +59,7 @@ VRoundCornersDlg::VRoundCornersDlg( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Polygonize" ), Ok | Cancel ) { // add input: - TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox* group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Round corners:" ), group ); m_radius = new KDoubleNumInput( group ); diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cpp b/karbon/plugins/shadoweffect/shadoweffectplugin.cpp index 019b4024a..dedd26f35 100644 --- a/karbon/plugins/shadoweffect/shadoweffectplugin.cpp +++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cpp @@ -61,7 +61,7 @@ VShadowEffectDlg::VShadowEffectDlg( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Create Shadow Effect" ), Ok | Cancel ) { // add input fields on the left: - TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox* group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Distance:" ), group ); m_distance = new KIntNumInput( group ); m_distance->setRange( -1000, 1000, 1, true ); diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.cpp b/karbon/plugins/whirlpinch/whirlpinchplugin.cpp index d2b91a185..46ebf530c 100644 --- a/karbon/plugins/whirlpinch/whirlpinchplugin.cpp +++ b/karbon/plugins/whirlpinch/whirlpinchplugin.cpp @@ -62,7 +62,7 @@ VWhirlPinchDlg::VWhirlPinchDlg( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Whirl Pinch" ), Ok | Cancel ) { // add input fields: - TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox* group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Angle:" ), group ); m_angle = new KDoubleNumInput( group ); diff --git a/karbon/render/vkopainter.cpp b/karbon/render/vkopainter.cpp index 3f81f3c32..54803efe0 100644 --- a/karbon/render/vkopainter.cpp +++ b/karbon/render/vkopainter.cpp @@ -383,7 +383,7 @@ VKoPainter::setPen( const TQColor &c ) } void -VKoPainter::setPen( Qt::PenStyle style ) +VKoPainter::setPen( TQt::PenStyle style ) { if( style == TQt::NoPen ) { diff --git a/karbon/render/vkopainter.h b/karbon/render/vkopainter.h index eac4c2049..7f9263cad 100644 --- a/karbon/render/vkopainter.h +++ b/karbon/render/vkopainter.h @@ -75,7 +75,7 @@ public: // pen + brush virtual void setPen( const VStroke & ); virtual void setPen( const TQColor & ); - virtual void setPen( Qt::PenStyle style ); + virtual void setPen( TQt::PenStyle style ); virtual void setBrush( const VFill & ); virtual void setBrush( const TQColor & ); virtual void setBrush( TQt::BrushStyle style ); diff --git a/karbon/render/vpainter.h b/karbon/render/vpainter.h index b61d854a7..dec4a3941 100644 --- a/karbon/render/vpainter.h +++ b/karbon/render/vpainter.h @@ -81,7 +81,7 @@ public: virtual void setPen( const VStroke & ) = 0; // compatibility, use VPen/VBrush later ? virtual void setPen( const TQColor & ) = 0; - virtual void setPen( Qt::PenStyle style ) = 0; + virtual void setPen( TQt::PenStyle style ) = 0; virtual void setBrush( const VFill & ) = 0; virtual void setBrush( const TQColor & ) = 0; virtual void setBrush( TQt::BrushStyle style ) = 0; diff --git a/karbon/render/vqpainter.cpp b/karbon/render/vqpainter.cpp index 51819ae30..2519bf838 100644 --- a/karbon/render/vqpainter.cpp +++ b/karbon/render/vqpainter.cpp @@ -174,11 +174,11 @@ VTQPainter::setPen( const VStroke &stroke ) // caps if( stroke.lineCap() == VStroke::capButt ) - pen.setCapStyle( Qt::FlatCap ); + pen.setCapStyle( TQt::FlatCap ); else if( stroke.lineCap() == VStroke::capRound ) - pen.setCapStyle( Qt::RoundCap ); + pen.setCapStyle( TQt::RoundCap ); else if( stroke.lineCap() == VStroke::capSquare ) - pen.setCapStyle( Qt::SquareCap ); + pen.setCapStyle( TQt::SquareCap ); m_painter->setPen( pen ); } @@ -214,7 +214,7 @@ VTQPainter::setPen( const TQColor &c ) } void -VTQPainter::setPen( Qt::PenStyle style ) +VTQPainter::setPen( TQt::PenStyle style ) { m_painter->setPen( style ); } diff --git a/karbon/render/vqpainter.h b/karbon/render/vqpainter.h index 5cf3ecd12..2ea918f12 100644 --- a/karbon/render/vqpainter.h +++ b/karbon/render/vqpainter.h @@ -62,7 +62,7 @@ public: // pen + brush virtual void setPen( const VStroke & ); virtual void setPen( const TQColor & ); - virtual void setPen( Qt::PenStyle style ); + virtual void setPen( TQt::PenStyle style ); virtual void setBrush( const VFill & ); virtual void setBrush( const TQColor & ); virtual void setBrush( TQt::BrushStyle style ); diff --git a/karbon/tools/vellipsetool.cpp b/karbon/tools/vellipsetool.cpp index 170a51dde..a22e28b7d 100644 --- a/karbon/tools/vellipsetool.cpp +++ b/karbon/tools/vellipsetool.cpp @@ -37,7 +37,7 @@ VEllipseOptionsWidget::VEllipseOptionsWidget( KarbonPart *part, TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Insert Ellipse" ), Ok | Cancel ), m_part( part ) { - TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox *group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Type:" ), group ); m_type = new KComboBox( false, group ); m_type->insertItem( i18n( "Full" ), VEllipse::full ); diff --git a/karbon/tools/vpenciltool.cpp b/karbon/tools/vpenciltool.cpp index 1239923ea..ea9da2f33 100644 --- a/karbon/tools/vpenciltool.cpp +++ b/karbon/tools/vpenciltool.cpp @@ -64,14 +64,14 @@ VPencilOptionsWidget::VPencilOptionsWidget( KarbonView*view, TQWidget* parent, c m_widgetStack = new TQWidgetStack( vbox ); - TQGroupBox *group1 = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), m_widgetStack ); + TQGroupBox *group1 = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), m_widgetStack ); m_widgetStack->addWidget( group1, 1 ); m_optimizeRaw = new TQCheckBox( i18n( "Optimize" ), group1 ); group1->setInsideMargin( 4 ); group1->setInsideSpacing( 2 ); - TQGroupBox *group2 = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), m_widgetStack ); + TQGroupBox *group2 = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), m_widgetStack ); m_widgetStack->addWidget( group2, 2 ); TQVBox *vbox2 = new TQVBox( group2 ); @@ -83,7 +83,7 @@ VPencilOptionsWidget::VPencilOptionsWidget( KarbonView*view, TQWidget* parent, c group2->setInsideMargin( 4 ); group2->setInsideSpacing( 2 ); - TQGroupBox *group3 = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), m_widgetStack ); + TQGroupBox *group3 = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), m_widgetStack ); m_widgetStack->addWidget( group3, 3 ); m_combineAngle = new KDoubleNumInput( 0.0, 360.0, 0.10, 0.50, 3, group3 ); diff --git a/karbon/tools/vpolygontool.cpp b/karbon/tools/vpolygontool.cpp index de4756919..20263c532 100644 --- a/karbon/tools/vpolygontool.cpp +++ b/karbon/tools/vpolygontool.cpp @@ -33,7 +33,7 @@ VPolygonTool::VPolygonOptionsWidget::VPolygonOptionsWidget( KarbonView *view, TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Insert Polygon" ), Ok | Cancel ), m_view(view) { - TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox *group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Radius:" ), group ); m_radius = new KoUnitDoubleSpinBox( group, 0.0, 1000.0, 0.5, 50.0, KoUnit::U_MM ); diff --git a/karbon/tools/vrectangletool.cpp b/karbon/tools/vrectangletool.cpp index 4572cc237..819883cf6 100644 --- a/karbon/tools/vrectangletool.cpp +++ b/karbon/tools/vrectangletool.cpp @@ -33,7 +33,7 @@ VRectangleTool::VRectangleOptionsWidget::VRectangleOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Insert Rectangle" ), Ok | Cancel ), m_part( part ) { - TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox *group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); // add width/height-input: m_widthLabel = new TQLabel( i18n( "object width", "Width:" ), group ); m_width = new KoUnitDoubleSpinBox( group, 0.0, 1000.0, 0.5, 100.0, KoUnit::U_MM ); diff --git a/karbon/tools/vroundrecttool.cpp b/karbon/tools/vroundrecttool.cpp index 02f694c69..79d721f6c 100644 --- a/karbon/tools/vroundrecttool.cpp +++ b/karbon/tools/vroundrecttool.cpp @@ -34,7 +34,7 @@ VRoundRectTool::VRoundRectOptionsWidget::VRoundRectOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Insert Round Rect" ), Ok | Cancel ), m_part( part ) { - TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox *group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "object width", "Width:" ), group ); KoUnit::Unit unit = KoUnit::U_CM; diff --git a/karbon/tools/vselecttool.cpp b/karbon/tools/vselecttool.cpp index b2c28d661..dae170b06 100644 --- a/karbon/tools/vselecttool.cpp +++ b/karbon/tools/vselecttool.cpp @@ -43,7 +43,7 @@ VSelectOptionsWidget::VSelectOptionsWidget( KarbonPart *part ) : KDialogBase( 0L, "", true, i18n( "Selection" ), Ok | Cancel ), m_part( part ) { - TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Selection Mode" ), this ); + TQButtonGroup *group = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Selection Mode" ), this ); new TQRadioButton( i18n( "Select in current layer" ), group ); new TQRadioButton( i18n( "Select in visible layers" ), group ); diff --git a/karbon/tools/vsinustool.cpp b/karbon/tools/vsinustool.cpp index 12dbe1282..3bfdfedc3 100644 --- a/karbon/tools/vsinustool.cpp +++ b/karbon/tools/vsinustool.cpp @@ -35,7 +35,7 @@ VSinusTool::VSinusOptionsWidget::VSinusOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Insert Sinus" ), Ok | Cancel ), m_part( part ) { - TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox *group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); // add width/height-input: m_widthLabel = new TQLabel( i18n( "object width", "Width:" ), group ); diff --git a/karbon/tools/vspiraltool.cpp b/karbon/tools/vspiraltool.cpp index c414be41f..90b3b470c 100644 --- a/karbon/tools/vspiraltool.cpp +++ b/karbon/tools/vspiraltool.cpp @@ -34,7 +34,7 @@ VSpiralTool::VSpiralOptionsWidget::VSpiralOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Insert Spiral" ), Ok | Cancel ), m_part( part ) { - TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox *group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Type:" ), group ); m_type = new KComboBox( false, group ); @@ -51,7 +51,7 @@ VSpiralTool::VSpiralOptionsWidget::VSpiralOptionsWidget( KarbonPart *part, TQWid m_fade = new KDoubleNumInput( group ); m_fade->setRange( 0.0, 1.0, 0.05 ); - new TQLabel( i18n( "Qt::Orientation:" ), group ); + new TQLabel( i18n( "Orientation:" ), group ); m_clockwise = new KComboBox( false, group ); m_clockwise->insertItem( i18n( "Clockwise" ), 0 ); m_clockwise->insertItem( i18n( "Counter Clockwise" ), 1 ); diff --git a/karbon/tools/vstartool.cpp b/karbon/tools/vstartool.cpp index 9a92cd376..7b503ff69 100644 --- a/karbon/tools/vstartool.cpp +++ b/karbon/tools/vstartool.cpp @@ -34,7 +34,7 @@ VStarOptionsWidget::VStarOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Insert Star" ), Ok | Cancel ), m_part( part ) { - TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox *group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Type:" ), group ); m_type = new KComboBox( false, group ); m_type->insertItem( i18n( "Star Outline" ), VStar::star_outline ); diff --git a/karbon/vtool.cpp b/karbon/vtool.cpp index 140d65131..a9b29ac8e 100644 --- a/karbon/vtool.cpp +++ b/karbon/vtool.cpp @@ -96,7 +96,7 @@ VTool::mouseEvent( TQMouseEvent* mouseEvent, const KoPoint &canvasCoordinate ) m_firstPoint.setX( canvasCoordinate.x() ); m_firstPoint.setY( canvasCoordinate.y() ); - if( mouseEvent->button() == Qt::RightButton ) + if( mouseEvent->button() == TQt::RightButton ) rightMouseButtonPress(); else mouseButtonPress(); @@ -131,7 +131,7 @@ VTool::mouseEvent( TQMouseEvent* mouseEvent, const KoPoint &canvasCoordinate ) m_isDragging = false; } else if( m_mouseButtonIsDown ) // False if canceled. - if( mouseEvent->button() == Qt::RightButton ) + if( mouseEvent->button() == TQt::RightButton ) rightMouseButtonRelease(); else mouseButtonRelease(); diff --git a/karbon/widgets/vcolorslider.cpp b/karbon/widgets/vcolorslider.cpp index 15961ccaa..53f907866 100644 --- a/karbon/widgets/vcolorslider.cpp +++ b/karbon/widgets/vcolorslider.cpp @@ -56,7 +56,7 @@ void VColorSlider::init() TQHBoxLayout *layout = new TQHBoxLayout( this, 3 ); m_label = new TQLabel( this ); - m_gradientSelect = new KGradientSelector( Qt::Horizontal, this ); + m_gradientSelect = new KGradientSelector( TQt::Horizontal, this ); m_spinBox = new KIntSpinBox( this ); layout->addWidget( m_label ); diff --git a/karbon/widgets/vgradientwidget.cpp b/karbon/widgets/vgradientwidget.cpp index 64cbf3731..f76f1feda 100644 --- a/karbon/widgets/vgradientwidget.cpp +++ b/karbon/widgets/vgradientwidget.cpp @@ -195,7 +195,7 @@ void VGradientWidget::mousePressEvent( TQMouseEvent* e ) { // found mid point at position currentPoint = 2 * i + 2; - if( e->button() == Qt::LeftButton ) + if( e->button() == TQt::LeftButton ) setCursor( VCursor::horzMove() ); return; } @@ -204,7 +204,7 @@ void VGradientWidget::mousePressEvent( TQMouseEvent* e ) { // found ramp point at position currentPoint = 2 * i + 1; - if( e->button() == Qt::LeftButton ) + if( e->button() == TQt::LeftButton ) setCursor( VCursor::horzMove() ); return; } @@ -215,7 +215,7 @@ void VGradientWidget::mousePressEvent( TQMouseEvent* e ) void VGradientWidget::mouseReleaseEvent( TQMouseEvent* e ) { - if( e->button() == Qt::RightButton && currentPoint ) + if( e->button() == TQt::RightButton && currentPoint ) { if( m_pntArea.contains( e->x(), e->y() ) && ( currentPoint % 2 == 1 ) ) { @@ -238,7 +238,7 @@ void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e ) if( ! m_pntArea.contains( e->x(), e->y() ) ) return; - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) return; if( currentPoint % 2 == 1 ) @@ -269,7 +269,7 @@ void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e ) void VGradientWidget::mouseMoveEvent( TQMouseEvent* e ) { - if( e->state() & Qt::RightButton ) + if( e->state() & TQt::RightButton ) return; TQPtrList<VColorStop>& colorStops = m_gradient->m_colorStops; diff --git a/karbon/widgets/vreference.cpp b/karbon/widgets/vreference.cpp index c4e96ddff..596c822eb 100644 --- a/karbon/widgets/vreference.cpp +++ b/karbon/widgets/vreference.cpp @@ -29,7 +29,7 @@ VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent, name ) { TQVBoxLayout* layout = new TQVBoxLayout( this ); - mButtonGroup = new TQButtonGroup (3,Qt::Vertical, this ); + mButtonGroup = new TQButtonGroup (3,TQt::Vertical, this ); TQRadioButton* radio = new TQRadioButton ( mButtonGroup ); mButtonGroup->insert( radio, TopLeft ); radio = new TQRadioButton ( mButtonGroup ); diff --git a/karbon/widgets/vruler.cpp b/karbon/widgets/vruler.cpp index c0ff0a201..cd97b3da1 100644 --- a/karbon/widgets/vruler.cpp +++ b/karbon/widgets/vruler.cpp @@ -40,7 +40,7 @@ const char *VRuler::m_nums[] = { "XX XXXXXX XXX XXX XXXXXX XXX XXXX XXXXX XXXXX XXXX XXX" }; -VRuler::VRuler(Qt::Orientation o, TQWidget *parent, const char *name) : super(parent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums) +VRuler::VRuler(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 @@ VRuler::VRuler(Qt::Orientation o, TQWidget *parent, const char *name) : super(pa m_pixmapBuffer = 0; m_currentPosition = -1; - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { setFixedHeight(RULER_SIZE); initMarker(MARKER_WIDTH, MARKER_HEIGHT); } else { @@ -89,7 +89,7 @@ void VRuler::recalculateSize() m_pixmapBuffer = 0; } - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { w = width(); h = RULER_SIZE; } else { @@ -129,7 +129,7 @@ void VRuler::setZoom(double zoom) void VRuler::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 VRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) void VRuler::updateVisibleArea(TQ_INT32 xpos, TQ_INT32 ypos) { - if (m_orientation == Qt::Horizontal) + if (m_orientation == TQt::Horizontal) m_firstVisible = xpos; else m_firstVisible = ypos; @@ -221,7 +221,7 @@ void VRuler::drawRuler() bool s3 = KoUnit::fromUserValue(st3, m_unit) * m_zoom > 3.0; bool s4 = KoUnit::fromUserValue(st4, m_unit) * m_zoom > 3.0; - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { // XXX: This was 7 * 4 -- why? what was the idea about having 30 point intervals? float cx = KoUnit::fromUserValue(100, m_unit) / m_zoom; TQ_INT32 step = tqRound(cx);//((TQ_INT32)(cx / (float)stt) + 1) * stt; @@ -290,7 +290,7 @@ void VRuler::resizeEvent(TQResizeEvent *) void VRuler::show() { - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { setFixedHeight(RULER_SIZE); initMarker(MARKER_WIDTH, MARKER_HEIGHT); } else { @@ -303,7 +303,7 @@ void VRuler::show() void VRuler::hide() { - if (m_orientation == Qt::Horizontal) + if (m_orientation == TQt::Horizontal) setFixedHeight(1); else setFixedWidth(1); diff --git a/karbon/widgets/vruler.h b/karbon/widgets/vruler.h index 2690a4b2c..5fadc54ac 100644 --- a/karbon/widgets/vruler.h +++ b/karbon/widgets/vruler.h @@ -36,7 +36,7 @@ class VRuler : public TQFrame { typedef TQFrame super; public: - VRuler(Qt::Orientation, TQWidget *parent = 0, const char *name = 0); + VRuler(TQt::Orientation, TQWidget *parent = 0, const char *name = 0); virtual ~VRuler(); public: @@ -62,7 +62,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/kchart/kchartColorConfigPage.cpp b/kchart/kchartColorConfigPage.cpp index 921b42c47..c1691b286 100644 --- a/kchart/kchartColorConfigPage.cpp +++ b/kchart/kchartColorConfigPage.cpp @@ -50,7 +50,7 @@ KChartColorConfigPage::KChartColorConfigPage( KChartParams* params, "different color." ) ); TQVBoxLayout* toplevel = new TQVBoxLayout( this, 14 ); - TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Colors"), this ); + TQButtonGroup* gb = new TQButtonGroup( 0, TQt::Vertical, i18n("Colors"), this ); gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setMargin(KDialog::marginHint()); toplevel->addWidget( gb); diff --git a/kchart/kchartLegendConfigPage.cpp b/kchart/kchartLegendConfigPage.cpp index dc18d7176..1187cafbc 100644 --- a/kchart/kchartLegendConfigPage.cpp +++ b/kchart/kchartLegendConfigPage.cpp @@ -52,7 +52,7 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, TQGridLayout* layout = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); //1. Block: General settings - TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, i18n("General"), this ); + TQButtonGroup* gb = new TQButtonGroup( 0, TQt::Vertical, i18n("General"), this ); gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setMargin(KDialog::marginHint()); layout->addWidget( gb, 0, 0 ); @@ -67,7 +67,7 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, grid2->addWidget( title, 0, 1 ); // 2. Block: Legend position - gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Legend Position"), this ); + gb = new TQButtonGroup( 0, TQt::Vertical, i18n("Legend Position"), this ); TQWhatsThis::add(gb, i18n("<qt>Choose the location of the legend on the chart by " "clicking a location button.\nUse the central button to <b>hide</b> the legend.</qt>")); gb->layout()->setSpacing(KDialog::spacingHint()); @@ -102,7 +102,7 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, layout->addMultiCellWidget( gb, 1,2, 0,0 ); // 3. Block: Font - gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Font"), this ); + gb = new TQButtonGroup( 0, TQt::Vertical, i18n("Font"), this ); TQWhatsThis::add(gb, i18n("This Font box can be used to set different fonts for the legend title and the individual entries.")); gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setMargin(KDialog::marginHint()); @@ -130,7 +130,7 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, connect( textLegendFontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeTextLegendFont())); - // 4. Block: Qt::Orientation + // 4. Block: Orientation orientationGroup = new TQVButtonGroup( i18n("Orientation"), this ); TQWhatsThis::add(orientationGroup, i18n("Select, if the legend's items should be drawn next to each other, or below each other.")); orientationGroup->setRadioButtonExclusive(true); @@ -143,7 +143,7 @@ KChartLegendConfigPage::KChartLegendConfigPage( KChartParams* params, Q_UNUSED(orientation); // 5. Block: Text Colors - gb = new TQButtonGroup( 0, Qt::Vertical, i18n("Color"), this ); + gb = new TQButtonGroup( 0, TQt::Vertical, i18n("Color"), this ); TQWhatsThis::add(gb, i18n("This Color box can be used to set different colors for the legend title and text.")); gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setMargin(KDialog::marginHint()); @@ -259,7 +259,7 @@ void KChartLegendConfigPage::init() } legendFrameColor->setColor(frameColor); - if( _params->legendOrientation() == Qt::Vertical ) + if( _params->legendOrientation() == TQt::Vertical ) orientationGroup->setButton(0); else orientationGroup->setButton(1); @@ -335,9 +335,9 @@ void KChartLegendConfigPage::apply() _params->setLegendPosition( KDChartParams::LegendRight ); if( orientationGroup->selectedId() == 0 ) - _params->setLegendOrientation( Qt::Vertical ); + _params->setLegendOrientation( TQt::Vertical ); else - _params->setLegendOrientation( Qt::Horizontal ); + _params->setLegendOrientation( TQt::Horizontal ); _params->setLegendTitleText(title->text()); _params->setLegendTitleTextColor(legendTitleColor->color()); diff --git a/kchart/kchartPageLayout.cpp b/kchart/kchartPageLayout.cpp index e2587b9ff..434a5d2fd 100644 --- a/kchart/kchartPageLayout.cpp +++ b/kchart/kchartPageLayout.cpp @@ -37,7 +37,7 @@ KChartPageLayout::KChartPageLayout( KChartParams* _params, TQWidget* parent, con #if 0 TQWidget *page = new TQWidget( this ); #else - TQGroupBox* page = new TQGroupBox( 2, Qt::Horizontal, i18n("Margins"), + TQGroupBox* page = new TQGroupBox( 2, TQt::Horizontal, i18n("Margins"), this ); #endif setMainWidget(page); diff --git a/kchart/kchartParameter3dConfigPage.cpp b/kchart/kchartParameter3dConfigPage.cpp index 1b37b8cca..753f07a92 100644 --- a/kchart/kchartParameter3dConfigPage.cpp +++ b/kchart/kchartParameter3dConfigPage.cpp @@ -41,7 +41,7 @@ KChartParameter3dConfigPage::KChartParameter3dConfigPage( KChartParams* params, TQGridLayout* layout = new TQGridLayout(this, 2, 2,KDialog::marginHint(),KDialog::spacingHint()); - TQButtonGroup* gb = new TQButtonGroup( 0, Qt::Vertical, + TQButtonGroup* gb = new TQButtonGroup( 0, TQt::Vertical, i18n("3D Parameters"), this ); gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setMargin(KDialog::marginHint()); diff --git a/kchart/kchartParameterConfigPage.cpp b/kchart/kchartParameterConfigPage.cpp index da6c8017f..770b1c23a 100644 --- a/kchart/kchartParameterConfigPage.cpp +++ b/kchart/kchartParameterConfigPage.cpp @@ -51,7 +51,7 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params, toplevel->addLayout( layout ); // The "Parameters" button group - TQButtonGroup* gb1 = new TQButtonGroup( 0, Qt::Vertical, i18n("Parameters"), this ); + TQButtonGroup* gb1 = new TQButtonGroup( 0, TQt::Vertical, i18n("Parameters"), this ); gb1->layout()->setSpacing(KDialog::spacingHint()); gb1->layout()->setMargin(KDialog::marginHint()); TQGridLayout *grid1 = new TQGridLayout(gb1->layout(),9,1); @@ -91,7 +91,7 @@ KChartParameterConfigPage::KChartParameterConfigPage( KChartParams* params, #endif // The "Settings" button group - TQButtonGroup* gb2 = new TQButtonGroup( 0, Qt::Vertical, + TQButtonGroup* gb2 = new TQButtonGroup( 0, TQt::Vertical, i18n("Settings"), this ); gb2->layout()->setSpacing(KDialog::spacingHint()); gb2->layout()->setMargin(KDialog::marginHint()); diff --git a/kchart/kchartWizardSelectChartSubTypePage.cpp b/kchart/kchartWizardSelectChartSubTypePage.cpp index 2c86549a8..60abcbfa2 100644 --- a/kchart/kchartWizardSelectChartSubTypePage.cpp +++ b/kchart/kchartWizardSelectChartSubTypePage.cpp @@ -41,7 +41,7 @@ KChartWizardSelectChartSubTypePage::KChartWizardSelectChartSubTypePage( TQWidget lay1->setMargin( KDialog::marginHint() ); lay1->setSpacing( KDialog::spacingHint() ); - TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, + TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Chart Sub Type" ), this ); grp->setRadioButtonExclusive( true ); grp->layout(); diff --git a/kchart/kchart_params.cpp b/kchart/kchart_params.cpp index 2cd8da51d..8e20e809d 100644 --- a/kchart/kchart_params.cpp +++ b/kchart/kchart_params.cpp @@ -488,10 +488,10 @@ bool KChartParams::loadOasisPlotarea( const TQDomElement &plotareaElem, case Bar: // Find out subtype tmp = styleStack.attributeNS( KoXmlNS::chart, "vertical" ); - // FIXME:Qt::Vertical is ignored. At least store it so we can + // FIXME: vertical is ignored. At least store it so we can // save it again even if we don't support it. - //kdDebug(35001) << " ======> Qt::Vertical: " << tmp << " <======" << endl; + //kdDebug(35001) << " ======> vertical: " << tmp << " <======" << endl; // Set the bar chart subtype. if ( styleStack.attributeNS( KoXmlNS::chart, "stacked" ) == "true" ) setBarChartSubType( BarStacked ); diff --git a/kchart/kchart_view.cpp b/kchart/kchart_view.cpp index ba2d1321e..282c48196 100644 --- a/kchart/kchart_view.cpp +++ b/kchart/kchart_view.cpp @@ -545,7 +545,7 @@ void KChartView::mousePressEvent ( TQMouseEvent *e ) { if (!koDocument()->isReadWrite() || !factory()) return; - if ( e->button() == Qt::RightButton ) + if ( e->button() == TQt::RightButton ) ((TQPopupMenu*)factory()->container("action_popup",this))->popup(TQCursor::pos()); } diff --git a/kchart/kdchart/KDChartAxesPainter.cpp b/kchart/kdchart/KDChartAxesPainter.cpp index 43b3bd521..b07195bf5 100644 --- a/kchart/kdchart/KDChartAxesPainter.cpp +++ b/kchart/kdchart/KDChartAxesPainter.cpp @@ -644,7 +644,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, TQString text; if( cv.isDateTime ){ TQDateTime dt( TQDateTime::fromString( *it, - Qt::ISODate ) ); + TQt::ISODate ) ); text = dt.toString( formatDT ); }else{ text = *it; @@ -1081,7 +1081,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, if( nLeaveOut ) { leaveOutGridPen = gridPen; leaveOutGridPen.setWidth( gridLineWidth / 2 ); - leaveOutGridPen.setStyle( Qt::DotLine ); + leaveOutGridPen.setStyle( TQt::DotLine ); } // ========================================================= // || The labels and delimiters and grid printing loops || @@ -1640,7 +1640,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter, TQDateTime dt; if( cv.isDateTime ){ dt = TQDateTime::fromString( *labelIter, - Qt::ISODate ); + TQt::ISODate ); label = dt.toString( formatDT ); }else{ label = *labelIter; @@ -3193,9 +3193,9 @@ void KDChartAxesPainter::calculateLabelTexts( nLabels = 0; /* tqDebug("dtLow: "); - tqDebug(dtLow.toString( Qt::ISODate )); + tqDebug(dtLow.toString( TQt::ISODate )); tqDebug("dtHigh: "); - tqDebug(dtHigh.toString( Qt::ISODate )); + tqDebug(dtHigh.toString( TQt::ISODate )); */ bool bDone=false; while( !bDone ) { @@ -3226,7 +3226,7 @@ void KDChartAxesPainter::calculateLabelTexts( if( autoDtLabels ) labelTexts.append( "x" ); else - labelTexts.append( dt.toString( Qt::ISODate ) ); + labelTexts.append( dt.toString( TQt::ISODate ) ); bDone = (goDown ? (dt < dtLow ) : (dt > dtHigh)); /*if( bDone ){ dtHigh = dt; diff --git a/kchart/kdchart/KDChartAxisParams.cpp b/kchart/kdchart/KDChartAxisParams.cpp index 70f448fd1..559037c6c 100644 --- a/kchart/kdchart/KDChartAxisParams.cpp +++ b/kchart/kdchart/KDChartAxisParams.cpp @@ -158,12 +158,12 @@ KDChartAxisParams::KDChartAxisParams() _axisShowGrid = false; _axisGridColor = KDCHART_DEFAULT_AXIS_GRID_COLOR; _axisGridLineWidth = KDCHART_AXIS_GRID_AUTO_LINEWIDTH; - _axisGridStyle = Qt::SolidLine; + _axisGridStyle = TQt::SolidLine; _axisShowSubDelimiters = true; _axisGridSubColor = KDCHART_DEFAULT_AXIS_GRID_COLOR; _axisGridSubLineWidth = KDCHART_AXIS_GRID_AUTO_LINEWIDTH; - _axisGridSubStyle = Qt::DotLine; + _axisGridSubStyle = TQt::DotLine; _axisZeroLineColor = TQColor( 0x00, 0x00, 0x80 ); @@ -1151,14 +1151,14 @@ void KDChartAxisParams::setAxisGridSubLineWidth( int axisGridSubLineWidth ) \param axisGridStyle the axis grid line pattern. \sa axisGridStyle, setAxisShowGrid */ -void KDChartAxisParams::setAxisGridStyle( Qt::PenStyle axisGridStyle ) +void KDChartAxisParams::setAxisGridStyle( TQt::PenStyle axisGridStyle ) { _axisGridStyle = axisGridStyle; emit changed(); } /** - \fn Qt::PenStyle KDChartAxisParams::axisGridStyle() const + \fn TQt::PenStyle KDChartAxisParams::axisGridStyle() const Returns the axis grid line pattern. \return the axis grid line pattern. @@ -1175,14 +1175,14 @@ void KDChartAxisParams::setAxisGridStyle( Qt::PenStyle axisGridStyle ) \sa axisGridSubStyle, setAxisGridStyle, axisGridStyle \sa setAxisShowGrid */ -void KDChartAxisParams::setAxisGridSubStyle( Qt::PenStyle axisGridSubStyle ) +void KDChartAxisParams::setAxisGridSubStyle( TQt::PenStyle axisGridSubStyle ) { _axisGridSubStyle = axisGridSubStyle; emit changed(); } /** - \fn Qt::PenStyle KDChartAxisParams::axisGridSubStyle() const + \fn TQt::PenStyle KDChartAxisParams::axisGridSubStyle() const Returns the axis grid line pattern for the thin lines showing the sub-delimiter values. @@ -3087,14 +3087,14 @@ KDChartAxisParams::AxisType KDChartAxisParams::stringToAxisType( const TQString& */ /** - \var Qt::PenStyle _axisGridStyle + \var TQt::PenStyle _axisGridStyle Specifies the axis grid line pattern for main grid lines. \sa setAxisGridStyle, setAxisShowGrid */ /** - \var Qt::PenStyle _axisGridSubStyle + \var TQt::PenStyle _axisGridSubStyle Specifies the axis grid line pattern for sub-delimiter grid lines. \sa setAxisGridSubStyle, setAxisGridStyle, setAxisShowGrid diff --git a/kchart/kdchart/KDChartAxisParams.h b/kchart/kdchart/KDChartAxisParams.h index 2ccd8ea1b..2e5e4baa0 100644 --- a/kchart/kdchart/KDChartAxisParams.h +++ b/kchart/kdchart/KDChartAxisParams.h @@ -246,8 +246,8 @@ public slots: bool axisShowFractionalValuesDelimiters() const { return _axisShowFractionalValuesDelimiters; } void setAxisShowGrid( bool axisShowGrid ); bool axisShowGrid() const { return _axisShowGrid; } - void setAxisGridStyle( Qt::PenStyle axisGridStyle ); - Qt::PenStyle axisGridStyle() const { return _axisGridStyle; } + void setAxisGridStyle( TQt::PenStyle axisGridStyle ); + TQt::PenStyle axisGridStyle() const { return _axisGridStyle; } void setAxisGridColor( TQColor axisGridColor ); TQColor axisGridColor() const { return _axisGridColor; } void setAxisGridLineWidth( int axisGridLineWidth ); @@ -255,8 +255,8 @@ public slots: // sub grid: void setAxisShowSubDelimiters( bool axisShowSubDelimiters ); bool axisShowSubDelimiters() const { return _axisShowSubDelimiters; } - void setAxisGridSubStyle( Qt::PenStyle axisGridSubStyle ); - Qt::PenStyle axisGridSubStyle() const { return _axisGridSubStyle; } + void setAxisGridSubStyle( TQt::PenStyle axisGridSubStyle ); + TQt::PenStyle axisGridSubStyle() const { return _axisGridSubStyle; } void setAxisGridSubColor( TQColor axisGridSubColor ); TQColor axisGridSubColor() const { return _axisGridSubColor; } void setAxisGridSubLineWidth( int axisGridSubLineWidth ); @@ -451,12 +451,12 @@ private: bool _axisShowGrid; TQColor _axisGridColor; int _axisGridLineWidth; - Qt::PenStyle _axisGridStyle; + TQt::PenStyle _axisGridStyle; bool _axisShowSubDelimiters; TQColor _axisGridSubColor; int _axisGridSubLineWidth; - Qt::PenStyle _axisGridSubStyle; + TQt::PenStyle _axisGridSubStyle; TQColor _axisZeroLineColor; bool _axisLabelsVisible; diff --git a/kchart/kdchart/KDChartLinesPainter.cpp b/kchart/kdchart/KDChartLinesPainter.cpp index 705abb986..e0f247af6 100644 --- a/kchart/kdchart/KDChartLinesPainter.cpp +++ b/kchart/kdchart/KDChartLinesPainter.cpp @@ -795,7 +795,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter, // preset with default values int theLineWidth = default2DPen.width(); TQColor theLineColor = default2DPen.color(); - Qt::PenStyle theLineStyle = default2DPen.style(); + TQt::PenStyle theLineStyle = default2DPen.style(); if( curPropSetId != KDChartPropertySet::UndefinedID ){ // we can safely call the following functions and ignore their // return values since they will touch the parameters' values diff --git a/kchart/kdchart/KDChartObjectFactory.cpp b/kchart/kdchart/KDChartObjectFactory.cpp index a53f84c0e..fb5c7f7b0 100644 --- a/kchart/kdchart/KDChartObjectFactory.cpp +++ b/kchart/kdchart/KDChartObjectFactory.cpp @@ -327,7 +327,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList& if ( !getNumber( args, 7,&i, "KDChartPropertySet" ) ) return 0; - Qt::PenStyle lineStyle = (Qt::PenStyle) i; + TQt::PenStyle lineStyle = (TQt::PenStyle) i; int idShowMarker; if ( !getNumber( args, 8,&idShowMarker, "KDChartPropertySet" ) ) return 0; @@ -369,7 +369,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList& if ( !getNumber( args, 20,&idExtraLinesStyle, "KDChartPropertySet" ) ) return 0; if ( !getNumber( args, 21,&i, "KDChartPropertySet" ) ) return 0; - Qt::PenStyle extraLinesStyle = (Qt::PenStyle) i; + TQt::PenStyle extraLinesStyle = (TQt::PenStyle) i; int idExtraMarkersAlign; if ( !getNumber( args, 22,&idExtraMarkersAlign, "KDChartPropertySet" ) ) return 0; diff --git a/kchart/kdchart/KDChartPainter.cpp b/kchart/kdchart/KDChartPainter.cpp index ca939538a..a6f43ad11 100644 --- a/kchart/kdchart/KDChartPainter.cpp +++ b/kchart/kdchart/KDChartPainter.cpp @@ -1336,7 +1336,7 @@ void KDChartPainter::calculateHorizontalLegendSize( TQPainter* painter, bool KDChartPainter::mustDrawVerticalLegend() const { return - params()->legendOrientation() == Qt::Vertical || + params()->legendOrientation() == TQt::Vertical || params()->legendPosition() == KDChartParams::LegendLeft || params()->legendPosition() == KDChartParams::LegendRight || params()->legendPosition() == KDChartParams::LegendTopLeft || @@ -2865,7 +2865,7 @@ void KDChartPainter::drawExtraLinesAndMarkers( int extraLinesLength = -20; int extraLinesWidth = defaultPen.width(); TQColor extraLinesColor = defaultPen.color(); - Qt::PenStyle extraLinesStyle = defaultPen.style(); + TQt::PenStyle extraLinesStyle = defaultPen.style(); uint extraMarkersAlign = 0; propSet.hasOwnExtraLinesLength( iDummy, extraLinesLength ); propSet.hasOwnExtraLinesWidth( iDummy, extraLinesWidth ); diff --git a/kchart/kdchart/KDChartParams.cpp b/kchart/kdchart/KDChartParams.cpp index fd9f0e2e7..c2647ccc2 100644 --- a/kchart/kdchart/KDChartParams.cpp +++ b/kchart/kdchart/KDChartParams.cpp @@ -139,7 +139,7 @@ KDChartParams::KDChartParams() setShadowBrightnessFactor( 1.0 ); // The default shadow fill style. - setShadowPattern( Qt::SolidPattern ); + setShadowPattern( TQt::SolidPattern ); // Some default colors for the data. setDataDefaultColors(); @@ -151,7 +151,7 @@ KDChartParams::KDChartParams() setOutlineDataLineWidth( 1 ); // Default line style for data display outlines. - setOutlineDataLineStyle( Qt::SolidLine ); + setOutlineDataLineStyle( TQt::SolidLine ); // END GENERAL @@ -210,7 +210,7 @@ KDChartParams::KDChartParams() setLineWidth( 1 ); // Lines are solid by default - setLineStyle( Qt::SolidLine ); + setLineStyle( TQt::SolidLine ); // Lines have the same color as their // respective data points by default @@ -333,8 +333,8 @@ KDChartParams::KDChartParams() setLegendSpacing( 20 ); // Position of the legend setLegendPosition( LegendRight ); - // Qt::Orientation of the legend - setLegendOrientation( Qt::Vertical ); + // Orientation of the legend + setLegendOrientation( TQt::Vertical ); // Whether the legend shall show lines or just // show the markers (or squares, resp.) setLegendShowLines( false ); @@ -427,7 +427,7 @@ KDChartParams::KDChartParams() setProperties(KDCHART_PROPSET_NORMAL_DATA, *tempPropSetA); // don't show the line, don't show the marker tempPropSetA->setName("transparent data"); - tempPropSetA->setLineStyle( KDChartPropertySet::OwnID, Qt::NoPen ); + tempPropSetA->setLineStyle( KDChartPropertySet::OwnID, TQt::NoPen ); tempPropSetA->setShowMarker( KDChartPropertySet::OwnID, false ); setProperties(KDCHART_PROPSET_TRANSPARENT_DATA, *tempPropSetA); // don't show line nor marker, but do show the horizontal line @@ -630,7 +630,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet ) if( bOk ){ int lineWidth; TQColor lineColor; - Qt::PenStyle lineStyle; + TQt::PenStyle lineStyle; bool showMarker; uint markerAlign; TQSize markerSize; @@ -641,7 +641,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet ) int extraLinesLength; int extraLinesWidth; TQColor extraLinesColor; - Qt::PenStyle extraLinesStyle; + TQt::PenStyle extraLinesStyle; uint extraMarkersAlign; TQSize extraMarkersSize; TQColor extraMarkersColor; @@ -1296,7 +1296,7 @@ void KDChartParams::setPrintDataValues( bool active, else settings->_dataValuesColor = *color; } - settings->_dataValuesBrush = TQBrush(Qt::NoBrush); + settings->_dataValuesBrush = TQBrush(TQt::NoBrush); // for values below zero: settings->_dataValuesAnchorNegativePosition = negativePosition; settings->_dataValuesAnchorNegativeAlign = negativeAlign; @@ -3087,7 +3087,7 @@ void KDChartParams::setAdditionalChartType( ChartType chartType ) /** - \fn void KDChartParams::setShadowPattern( Qt::BrushStyle style ) + \fn void KDChartParams::setShadowPattern( TQt::BrushStyle style ) Specifies a filling style for filling the shadow areas in 3-dimensional drawings like 3D bar charts. The default is to @@ -3101,7 +3101,7 @@ void KDChartParams::setAdditionalChartType( ChartType chartType ) /** - \fn Qt::BrushStyle KDChartParams::shadowPattern() const + \fn TQt::BrushStyle KDChartParams::shadowPattern() const Returns the filling style used for filling the shadow areas in 3-dimensional drawings like 3D bar charts. The default is to @@ -4857,7 +4857,7 @@ void KDChartParams::setLineMarkerStyles( LineMarkerStyleMap map ) { \sa lineStyle, setLineWidth, setLineColor \sa setLineMarker, setLineMarkerSize, setLineMarkerStyle */ -void KDChartParams::setLineStyle( Qt::PenStyle style, uint dataset ) +void KDChartParams::setLineStyle( TQt::PenStyle style, uint dataset ) { if( KDCHART_GLOBAL_LINE_STYLE == dataset ) _lineStyle = style; @@ -4880,7 +4880,7 @@ void KDChartParams::setLineStyle( Qt::PenStyle style, uint dataset ) \return the line style for the specified data set \sa setLineStyle, setLineMarkerStyle */ -Qt::PenStyle KDChartParams::lineStyle( uint dataset ) const +TQt::PenStyle KDChartParams::lineStyle( uint dataset ) const { if( KDCHART_GLOBAL_LINE_STYLE == dataset ) // global line style @@ -6663,10 +6663,10 @@ void KDChartParams::setBWChartPrintStatistics( BWStatVal statValue, /** - \fn void KDChartParams::setLegendOrientation( Qt::Orientation orientation ) + \fn void KDChartParams::setLegendOrientation( TQt::Orientation orientation ) - Specifies how the legend should be printed. Qt::Vertical (the default) - prints the legend entries below each other, Qt::Horizontal prints them + Specifies how the legend should be printed. vertical (the default) + prints the legend entries below each other, horizontal prints them aside each other. \note Horizontal orientation is only possible if the chart is NOT making @@ -6681,7 +6681,7 @@ void KDChartParams::setBWChartPrintStatistics( BWStatVal statValue, /** - \fn Qt::Orientation KDChartParams::legendOrientation() const + \fn TQt::Orientation KDChartParams::legendOrientation() const Returns how the legend will be printed. @@ -8423,7 +8423,7 @@ int KDChartParams::headerFooterFontRelSize( uint pos ) const /** - \var Qt::BrushStyle KDChartParams::_shadowPattern; + \var TQt::BrushStyle KDChartParams::_shadowPattern; Stores a fill style to be used for filling shadow area in 3-dimensional drawings like e.g. 3D bar charts. @@ -9233,7 +9233,7 @@ void KDChartParams::insertDefaultAxisTitleBox( uint n, 0, 0, 0, 0, setColor ? axisTitleColor : TQt::darkBlue, - Qt::NoBrush, + TQt::NoBrush, KDChartEnums::AreaAxisBASE + n, bVert ? KDChartEnums::PosCenterLeft : KDChartEnums::PosBottomCenter, bVert ? (TQt::AlignTop + TQt::AlignHCenter) : (TQt::AlignBottom + TQt::AlignHCenter), 0,0,0, diff --git a/kchart/kdchart/KDChartParams.h b/kchart/kdchart/KDChartParams.h index 4d3f78e86..a87fba68c 100644 --- a/kchart/kdchart/KDChartParams.h +++ b/kchart/kdchart/KDChartParams.h @@ -634,12 +634,12 @@ public slots: } - void setShadowPattern( Qt::BrushStyle style ) { + void setShadowPattern( TQt::BrushStyle style ) { _shadowPattern = style; emit changed(); } - Qt::BrushStyle shadowPattern() const { + TQt::BrushStyle shadowPattern() const { return _shadowPattern; } @@ -669,13 +669,13 @@ public slots: } - void setOutlineDataLineStyle( Qt::PenStyle style ) + void setOutlineDataLineStyle( TQt::PenStyle style ) { _outlineDataLineStyle = style; emit changed(); } - Qt::PenStyle outlineDataLineStyle() const + TQt::PenStyle outlineDataLineStyle() const { return _outlineDataLineStyle; } @@ -750,7 +750,7 @@ public slots: uint chart = KDCHART_ALL_CHARTS ); void setDataValuesColors( const TQColor* color = KDCHART_DATA_VALUE_AUTO_COLOR, - const TQBrush& background = TQBrush(Qt::NoBrush), + const TQBrush& background = TQBrush(TQt::NoBrush), uint chart = KDCHART_ALL_CHARTS ); // Note if you change the parameters here, then you must also change them in wrappers/KDChartParametersWrapper.h @@ -1151,9 +1151,9 @@ public slots: return _lineColor; } - void setLineStyle( Qt::PenStyle style, uint dataset=KDCHART_GLOBAL_LINE_STYLE ); + void setLineStyle( TQt::PenStyle style, uint dataset=KDCHART_GLOBAL_LINE_STYLE ); - Qt::PenStyle lineStyle( uint dataset=KDCHART_GLOBAL_LINE_STYLE ) const; + TQt::PenStyle lineStyle( uint dataset=KDCHART_GLOBAL_LINE_STYLE ) const; void setThreeDLines( bool threeD ) { @@ -1867,13 +1867,13 @@ public slots: return _legendPosition; } - void setLegendOrientation( Qt::Orientation orientation ) + void setLegendOrientation( TQt::Orientation orientation ) { _legendOrientation = orientation; emit changed(); } - Qt::Orientation legendOrientation() const + TQt::Orientation legendOrientation() const { return _legendOrientation; } @@ -2544,14 +2544,14 @@ private: uint _maxDatasetSourceMode; KDChartPropertySetList _propertySetList; double _shadowBrightnessFactor; - Qt::BrushStyle _shadowPattern; + TQt::BrushStyle _shadowPattern; bool _threeDShadowColors; uint _maxDatasetColor; TQMap < uint, TQColor > _dataColorsShadow1; TQMap < uint, TQColor > _dataColorsShadow2; TQColor _outlineDataColor; uint _outlineDataLineWidth; - Qt::PenStyle _outlineDataLineStyle; + TQt::PenStyle _outlineDataLineStyle; struct PrintDataValuesSettings { @@ -2613,8 +2613,8 @@ private: TQSize _lineMarkerSize; TQColor _lineColor; int _lineWidth; - Qt::PenStyle _lineStyle; - typedef TQMap<uint, Qt::PenStyle> LineStyleMap; + TQt::PenStyle _lineStyle; + typedef TQMap<uint, TQt::PenStyle> LineStyleMap; LineStyleMap _datasetLineStyles; AreaChartSubType _areaChartSubType; AreaLocation _areaLocation; @@ -2701,7 +2701,7 @@ private: // LEGENDS LegendPosition _legendPosition; - Qt::Orientation _legendOrientation; + TQt::Orientation _legendOrientation; bool _legendShowLines; LegendSource _legendSource; TQMap < int, TQString > _legendText; diff --git a/kchart/kdchart/KDChartParams_io.cpp b/kchart/kdchart/KDChartParams_io.cpp index e7f9928db..58bd6770d 100644 --- a/kchart/kdchart/KDChartParams_io.cpp +++ b/kchart/kdchart/KDChartParams_io.cpp @@ -540,7 +540,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const KDXML::penStyleToString( _lineStyle ) ); // the DatasetLineStyles elements - {for( TQMap<uint, Qt::PenStyle>::ConstIterator it = _datasetLineStyles.begin(); + {for( TQMap<uint, TQt::PenStyle>::ConstIterator it = _datasetLineStyles.begin(); it != _datasetLineStyles.end(); ++it ) { TQDomElement lineStyleElement = doc.createElement( "DatasetLineStyle" ); lineSettingsElement.appendChild( lineStyleElement ); @@ -784,7 +784,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const KDXML::createStringNode( doc, legendSettingsElement, "Position", KDChartParams::legendPositionToString( _legendPosition ) ); - // the Qt::Orientation element + // the Orientation element KDXML::createOrientationNode( doc, legendSettingsElement, "Orientation", _legendOrientation ); @@ -1572,7 +1572,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) } else if( tagName == "DatasetLineStyle" ) { bool ok = true; uint dataset; - Qt::PenStyle style = Qt::SolidLine; + TQt::PenStyle style = TQt::SolidLine; if( element.hasAttribute( "Dataset" ) && element.hasAttribute( "Style" ) ) { dataset = element.attribute( "Dataset" ).toUInt( &ok ); @@ -1880,7 +1880,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc ) if( KDXML::readStringNode( element, string ) ) _legendPosition = KDChartParams::stringToLegendPosition( string ); } else if( tagName == "Orientation" ) { - Qt::Orientation value=Qt::Vertical; + TQt::Orientation value=TQt::Vertical; if( KDXML::readOrientationNode( element, value ) ) _legendOrientation = value; } else if( tagName == "ShowLines" ) { @@ -2311,7 +2311,7 @@ void dataCoordToElementAttr(const TQVariant& val, TQDomElement& element, const T element.setAttribute( "StringValue"+postfix, val.toString() ); else if( TQVariant::DateTime == val.type() ) element.setAttribute( "DateTimeValue"+postfix, - val.toDateTime().toString( Qt::ISODate ) ); + val.toDateTime().toString( TQt::ISODate ) ); else element.setAttribute( "NoValue"+postfix, "true" ); } diff --git a/kchart/kdchart/KDChartPropertySet.cpp b/kchart/kdchart/KDChartPropertySet.cpp index cae1c3c4f..4dc589f7f 100644 --- a/kchart/kdchart/KDChartPropertySet.cpp +++ b/kchart/kdchart/KDChartPropertySet.cpp @@ -118,7 +118,7 @@ void KDChartPropertySet::fillValueMembersWithDummyValues() // fill with dummy values to avoid problems when saving us into a stream mLineWidth = 1; mLineColor = TQt::black; - mLineStyle = Qt::SolidLine; + mLineStyle = TQt::SolidLine; mShowMarker = true; mMarkerAlign = TQt::AlignCenter; mMarkerSize = TQSize(6,6); @@ -129,7 +129,7 @@ void KDChartPropertySet::fillValueMembersWithDummyValues() mExtraLinesLength = -20; mExtraLinesWidth = 1; mExtraLinesColor = TQt::black; - mExtraLinesStyle = Qt::SolidLine; + mExtraLinesStyle = TQt::SolidLine; mExtraMarkersAlign = TQt::AlignLeft|TQt::AlignTop; mExtraMarkersSize = TQSize(6,6); mExtraMarkersColor = TQt::black; diff --git a/kchart/kdchart/KDChartPropertySet.h b/kchart/kdchart/KDChartPropertySet.h index 28a21c2fd..63c9d7f09 100644 --- a/kchart/kdchart/KDChartPropertySet.h +++ b/kchart/kdchart/KDChartPropertySet.h @@ -521,7 +521,7 @@ public slots: \sa setLineWidth, setLineColor, setShowMarker \sa hasOwnLineWidth, hasOwnLineColor, hasOwnLineStyle, hasOwnShowMarker */ - void setLineStyle( int idLineStyle, const Qt::PenStyle& lineStyle ) + void setLineStyle( int idLineStyle, const TQt::PenStyle& lineStyle ) { mIdLineStyle = idLineStyle; mLineStyle = lineStyle; @@ -559,7 +559,7 @@ public slots: \sa setLineWidth, setLineColor, setLineStyle, setShowMarker \sa hasOwnLineWidth, hasOwnLineColor, hasOwnShowMarker */ - bool hasOwnLineStyle( int& idLineStyle, Qt::PenStyle& lineStyle ) + bool hasOwnLineStyle( int& idLineStyle, TQt::PenStyle& lineStyle ) { idLineStyle = mIdLineStyle; if( OwnID == mIdLineStyle ){ @@ -877,12 +877,12 @@ public slots: } return false; } - void setExtraLinesStyle( int idExtraLinesStyle, const Qt::PenStyle extraLinesStyle ) + void setExtraLinesStyle( int idExtraLinesStyle, const TQt::PenStyle extraLinesStyle ) { mIdExtraLinesStyle = idExtraLinesStyle; mExtraLinesStyle = extraLinesStyle; } - bool hasOwnExtraLinesStyle( int& idExtraLinesStyle, Qt::PenStyle& extraLinesStyle ) + bool hasOwnExtraLinesStyle( int& idExtraLinesStyle, TQt::PenStyle& extraLinesStyle ) { idExtraLinesStyle = mIdExtraLinesStyle; if( OwnID == idExtraLinesStyle ){ @@ -961,7 +961,7 @@ private: // IDs: values used if ID == OwnID: int mIdLineWidth; int mLineWidth; int mIdLineColor; TQColor mLineColor; - int mIdLineStyle; Qt::PenStyle mLineStyle; + int mIdLineStyle; TQt::PenStyle mLineStyle; int mIdShowMarker; bool mShowMarker; int mIdMarkerSize; TQSize mMarkerSize; int mIdMarkerColor; TQColor mMarkerColor; @@ -972,7 +972,7 @@ private: int mIdExtraLinesLength; int mExtraLinesLength; int mIdExtraLinesWidth; int mExtraLinesWidth; int mIdExtraLinesColor; TQColor mExtraLinesColor; - int mIdExtraLinesStyle; Qt::PenStyle mExtraLinesStyle; + int mIdExtraLinesStyle; TQt::PenStyle mExtraLinesStyle; int mIdExtraMarkersAlign; uint mExtraMarkersAlign; int mIdExtraMarkersSize; TQSize mExtraMarkersSize; int mIdExtraMarkersColor; TQColor mExtraMarkersColor; diff --git a/kchart/kdchart/KDChartWidget.cpp b/kchart/kdchart/KDChartWidget.cpp index 46ced0f63..5f37f41df 100644 --- a/kchart/kdchart/KDChartWidget.cpp +++ b/kchart/kdchart/KDChartWidget.cpp @@ -170,10 +170,10 @@ void KDChartWidget::mousePressEvent( TQMouseEvent* event ) //while ( ( current = it.current() ) ) { if ( current->contains( event->pos() ) ) { _mousePressedOnRegion = current; - if ( event->button() == Qt::LeftButton ){ + if ( event->button() == TQt::LeftButton ){ emit dataLeftPressed( current->row, current->col ); emit dataLeftPressed( event->pos() ); - }else if ( event->button() == Qt::MidButton ){ + }else if ( event->button() == TQt::MidButton ){ emit dataMiddlePressed( current->row, current->col ); emit dataMiddlePressed( event->pos() ); }else{ @@ -199,14 +199,14 @@ void KDChartWidget::mouseReleaseEvent( TQMouseEvent* event ) while ( ( current = it.current() ) ) { ++it; if ( current->contains( event->pos() ) ) { - if ( event->button() == Qt::LeftButton ) { + if ( event->button() == TQt::LeftButton ) { emit dataLeftReleased( current->row, current->col ); emit dataLeftReleased( event->pos() ); if ( _mousePressedOnRegion == current ){ emit dataLeftClicked( current->row, current->col ); emit dataLeftClicked( event->pos() ); } - } else if ( event->button() == Qt::MidButton ) { + } else if ( event->button() == TQt::MidButton ) { emit dataMiddleReleased( current->row, current->col ); emit dataMiddleReleased( event->pos() ); if ( _mousePressedOnRegion == current ){ diff --git a/kchart/kdchart/KDXMLTools.cpp b/kchart/kdchart/KDXMLTools.cpp index 0d3e199f4..496b717e7 100644 --- a/kchart/kdchart/KDXMLTools.cpp +++ b/kchart/kdchart/KDXMLTools.cpp @@ -46,13 +46,13 @@ namespace KDXML { void createOrientationNode( TQDomDocument& doc, TQDomNode& parent, - const TQString& elementName, Qt::Orientation value ) + const TQString& elementName, TQt::Orientation value ) { TQDomElement newElement = doc.createElement( elementName ); parent.appendChild( newElement ); TQDomText elementContent = - doc.createTextNode( (Qt::Vertical == value) ? "vertical" : "horizontal" ); + doc.createTextNode( (TQt::Vertical == value) ? "vertical" : "horizontal" ); newElement.appendChild( elementContent ); } @@ -274,7 +274,7 @@ namespace KDXML { } - TQString penStyleToString( Qt::PenStyle style ) + TQString penStyleToString( TQt::PenStyle style ) { switch( style ) { case TQt::NoPen: @@ -296,39 +296,39 @@ namespace KDXML { - TQString brushStyleToString( Qt::BrushStyle style ) + TQString brushStyleToString( TQt::BrushStyle style ) { // PENDING(kalle) Support custom patterns switch( style ) { - case Qt::NoBrush: + case TQt::NoBrush: return "NoBrush"; - case Qt::SolidPattern: + case TQt::SolidPattern: return "SolidPattern"; - case Qt::Dense1Pattern: + case TQt::Dense1Pattern: return "Dense1Pattern"; - case Qt::Dense2Pattern: + case TQt::Dense2Pattern: return "Dense2Pattern"; - case Qt::Dense3Pattern: + case TQt::Dense3Pattern: return "Dense3Pattern"; - case Qt::Dense4Pattern: + case TQt::Dense4Pattern: return "Dense4Pattern"; - case Qt::Dense5Pattern: + case TQt::Dense5Pattern: return "Dense5Pattern"; - case Qt::Dense6Pattern: + case TQt::Dense6Pattern: return "Dense6Pattern"; - case Qt::Dense7Pattern: + case TQt::Dense7Pattern: return "Dense7Pattern"; - case Qt::HorPattern: + case TQt::HorPattern: return "HorPattern"; - case Qt::VerPattern: + case TQt::VerPattern: return "VerPattern"; - case Qt::CrossPattern: + case TQt::CrossPattern: return "CrossPattern"; - case Qt::BDiagPattern: + case TQt::BDiagPattern: return "BDiagPattern"; - case Qt::FDiagPattern: + case TQt::FDiagPattern: return "FDiagPattern"; - case Qt::DiagCrossPattern: + case TQt::DiagCrossPattern: return "DiagCrossPattern"; default: // should not happen (but can for a custom pattern) return "SolidPattern"; @@ -376,13 +376,13 @@ namespace KDXML { } - bool readOrientationNode( const TQDomElement& element, Qt::Orientation& value ) + bool readOrientationNode( const TQDomElement& element, TQt::Orientation& value ) { if( element.text() == "vertical" ) { - value = Qt::Vertical; + value = TQt::Vertical; return true; } else if( element.text() == "horizontal" ) { - value = Qt::Horizontal; + value = TQt::Horizontal; return true; } else return false; @@ -438,7 +438,7 @@ namespace KDXML { { bool ok = true; TQColor tempColor; - Qt::BrushStyle tempStyle=Qt::SolidPattern; + TQt::BrushStyle tempStyle=TQt::SolidPattern; TQPixmap tempPixmap; TQDomNode node = element.firstChild(); while( !node.isNull() ) { @@ -546,7 +546,7 @@ namespace KDXML { bool ok = true; int tempWidth; TQColor tempColor; - Qt::PenStyle tempStyle=Qt::SolidLine; + TQt::PenStyle tempStyle=TQt::SolidLine; TQDomNode node = element.firstChild(); while( !node.isNull() ) { TQDomElement element = node.toElement(); @@ -742,60 +742,60 @@ namespace KDXML { - Qt::PenStyle stringToPenStyle( const TQString& style ) + TQt::PenStyle stringToPenStyle( const TQString& style ) { if( style == "NoPen" ) - return Qt::NoPen; + return TQt::NoPen; else if( style == "SolidLine" ) - return Qt::SolidLine; + return TQt::SolidLine; else if( style == "DashLine" ) - return Qt::DashLine; + return TQt::DashLine; else if( style == "DotLine" ) - return Qt::DotLine; + return TQt::DotLine; else if( style == "DashDotLine" ) - return Qt::DashDotLine; + return TQt::DashDotLine; else if( style == "DashDotDotLine" ) - return Qt::DashDotDotLine; + return TQt::DashDotDotLine; else // should not happen - return Qt::SolidLine; + return TQt::SolidLine; } - Qt::BrushStyle stringToBrushStyle( const TQString& style ) + TQt::BrushStyle stringToBrushStyle( const TQString& style ) { // PENDING(kalle) Support custom patterns if( style == "NoBrush" ) - return Qt::NoBrush; + return TQt::NoBrush; else if( style == "SolidPattern" ) - return Qt::SolidPattern; + return TQt::SolidPattern; else if( style == "Dense1Pattern" ) - return Qt::Dense1Pattern; + return TQt::Dense1Pattern; else if( style == "Dense2Pattern" ) - return Qt::Dense2Pattern; + return TQt::Dense2Pattern; else if( style == "Dense3Pattern" ) - return Qt::Dense3Pattern; + return TQt::Dense3Pattern; else if( style == "Dense4Pattern" ) - return Qt::Dense4Pattern; + return TQt::Dense4Pattern; else if( style == "Dense5Pattern" ) - return Qt::Dense5Pattern; + return TQt::Dense5Pattern; else if( style == "Dense6Pattern" ) - return Qt::Dense6Pattern; + return TQt::Dense6Pattern; else if( style == "Dense7Pattern" ) - return Qt::Dense7Pattern; + return TQt::Dense7Pattern; else if( style == "HorPattern" ) - return Qt::HorPattern; + return TQt::HorPattern; else if( style == "VerPattern" ) - return Qt::VerPattern; + return TQt::VerPattern; else if( style == "CrossPattern" ) - return Qt::CrossPattern; + return TQt::CrossPattern; else if( style == "BDiagPattern" ) - return Qt::BDiagPattern; + return TQt::BDiagPattern; else if( style == "FDiagPattern" ) - return Qt::FDiagPattern; + return TQt::FDiagPattern; else if( style == "DiagCrossPattern" ) - return Qt::DiagCrossPattern; + return TQt::DiagCrossPattern; else // should not happen (but can with custom patterns) - return Qt::SolidPattern; + return TQt::SolidPattern; } } diff --git a/kchart/kdchart/KDXMLTools.h b/kchart/kdchart/KDXMLTools.h index 022005b48..098e93894 100644 --- a/kchart/kdchart/KDXMLTools.h +++ b/kchart/kdchart/KDXMLTools.h @@ -44,15 +44,15 @@ #include <tqdatetime.h> namespace KDXML { - TQString penStyleToString( Qt::PenStyle style ); - Qt::PenStyle stringToPenStyle( const TQString& style ); - TQString brushStyleToString( Qt::BrushStyle style ); - Qt::BrushStyle stringToBrushStyle( const TQString& style ); + TQString penStyleToString( TQt::PenStyle style ); + TQt::PenStyle stringToPenStyle( const TQString& style ); + TQString brushStyleToString( TQt::BrushStyle style ); + TQt::BrushStyle stringToBrushStyle( const TQString& style ); void createBoolNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, bool value ); void createOrientationNode( TQDomDocument& doc, TQDomNode& parent, - const TQString& elementName, Qt::Orientation value ); + const TQString& elementName, TQt::Orientation value ); void createSizeNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, const TQSize& value ); void createIntNode( TQDomDocument& doc, TQDomNode& parent, @@ -89,7 +89,7 @@ namespace KDXML { bool readStringNode( const TQDomElement& element, TQString& value ); bool readDoubleNode( const TQDomElement& element, double& value ); bool readBoolNode( const TQDomElement& element, bool& value ); - bool readOrientationNode( const TQDomElement& element, Qt::Orientation& value ); + bool readOrientationNode( const TQDomElement& element, TQt::Orientation& value ); bool readSizeNode( const TQDomElement& element, TQSize& value ); bool readColorNode( const TQDomElement& element, TQColor& value ); bool readBrushNode( const TQDomElement& element, TQBrush& brush ); diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index bf70e678c..1f772e69f 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -57,7 +57,7 @@ static int mouseOffset; static int opaqueOldPos = -1; //### there's only one mouse, but this is a bit risky -KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o, +KDGanttSplitterHandle::KDGanttSplitterHandle( TQt::Orientation o, KDGanttMinimizeSplitter *parent, const char * name ) : TQWidget( parent, name ), _activeButton( 0 ), _collapsed( false ) { @@ -71,11 +71,11 @@ TQSize KDGanttSplitterHandle::sizeHint() const return TQSize(8,8); } -void KDGanttSplitterHandle::setOrientation( Qt::Orientation o ) +void KDGanttSplitterHandle::setOrientation( TQt::Orientation o ) { orient = o; #ifndef TQT_NO_CURSOR - if ( o == Qt::Horizontal ) + if ( o == TQt::Horizontal ) setCursor( splitHCursor ); else setCursor( splitVCursor ); @@ -86,7 +86,7 @@ void KDGanttSplitterHandle::setOrientation( Qt::Orientation o ) void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e ) { updateCursor( e->pos() ); - if ( !(e->state()&Qt::LeftButton) ) + if ( !(e->state()&TQt::LeftButton) ) return; if ( _activeButton != 0) @@ -106,7 +106,7 @@ void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e ) void KDGanttSplitterHandle::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { _activeButton = onButton( e->pos() ); mouseOffset = s->pick(e->pos()); if ( _activeButton != 0) @@ -121,7 +121,7 @@ void KDGanttSplitterHandle::updateCursor( const TQPoint& p) setCursor( arrowCursor ); } else { - if ( orient == Qt::Horizontal ) + if ( orient == TQt::Horizontal ) setCursor( splitHCursor ); else setCursor( splitVCursor ); @@ -160,7 +160,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e ) updateCursor( e->pos() ); } else { - if ( !opaque() && e->button() == Qt::LeftButton ) { + if ( !opaque() && e->button() == TQt::LeftButton ) { TQCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos())) - mouseOffset; s->setRubberband( -1 ); @@ -386,7 +386,7 @@ static TQSize minSizeHint( const TQWidget* w ) KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *parent, const char *name ) :TQFrame(parent,name,WPaintUnclipped) { - orient =Qt::Horizontal; + orient =TQt::Horizontal; init(); } @@ -394,7 +394,7 @@ KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *parent, const char * Constructs a splitter with orientation \a o with the \a parent and \a name arguments being passed on to the TQFrame constructor. */ -KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *parent, const char *name ) +KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQt::Orientation o, TQWidget *parent, const char *name ) :TQFrame(parent,name,WPaintUnclipped) { orient = o; @@ -414,7 +414,7 @@ KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter() void KDGanttMinimizeSplitter::init() { data = new TQSplitterData; - if ( orient ==Qt::Horizontal ) + if ( orient ==TQt::Horizontal ) setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) ); else setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) ); @@ -426,15 +426,15 @@ void KDGanttMinimizeSplitter::init() \brief the orientation of the splitter By default the orientation is horizontal (the widgets are side by side). - The possible orientations are Qt::Vertical and Qt::Horizontal (the default). + The possible orientations are TQt::Vertical and TQt::Horizontal (the default). */ -void KDGanttMinimizeSplitter::setOrientation( Qt::Orientation o ) +void KDGanttMinimizeSplitter::setOrientation( TQt::Orientation o ) { if ( orient == o ) return; orient = o; - if ( orient ==Qt::Horizontal ) + if ( orient ==TQt::Horizontal ) setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); else setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); @@ -564,7 +564,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p ) TQRect r = contentsRect(); const int rBord = 3; //Themable???? int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this); - if ( orient ==Qt::Horizontal ) { + if ( orient ==TQt::Horizontal ) { if ( opaqueOldPos >= 0 ) paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(), 2*rBord, r.height() ); @@ -604,7 +604,7 @@ void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p, TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h ) { style().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(), - (orientation() == Qt::Horizontal ? + (orientation() == TQt::Horizontal ? TQStyle::Style_Horizontal : 0)); } @@ -646,9 +646,9 @@ void KDGanttMinimizeSplitter::moveSplitter( TQCOORD p, int id ) p = adjustPos( p, id ); KDGanttSplitterLayoutStruct *s = data->list.at(id); - int oldP = orient ==Qt::Horizontal ? s->wid->x() : s->wid->y(); + int oldP = orient ==TQt::Horizontal ? s->wid->x() : s->wid->y(); bool upLeft; - if ( TQApplication::reverseLayout() && orient ==Qt::Horizontal ) { + if ( TQApplication::reverseLayout() && orient ==TQt::Horizontal ) { p += s->wid->width(); upLeft = p > oldP; } else @@ -663,8 +663,8 @@ void KDGanttMinimizeSplitter::moveSplitter( TQCOORD p, int id ) void KDGanttMinimizeSplitter::setG( TQWidget *w, int p, int s, bool isSplitter ) { - if ( orient ==Qt::Horizontal ) { - if ( TQApplication::reverseLayout() && orient ==Qt::Horizontal && !isSplitter ) + if ( orient ==TQt::Horizontal ) { + if ( TQApplication::reverseLayout() && orient ==TQt::Horizontal && !isSplitter ) p = contentsRect().width() - p - s; w->setGeometry( p, contentsRect().y(), s, contentsRect().height() ); } else @@ -690,7 +690,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) } else if ( s->isSplitter ) { int pos1, pos2; int dd = s->sizer; - if( TQApplication::reverseLayout() && orient ==Qt::Horizontal ) { + if( TQApplication::reverseLayout() && orient ==TQt::Horizontal ) { pos1 = pos; pos2 = pos + dd; } else { @@ -706,7 +706,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) } } else { int dd, newLeft, nextPos; - if( TQApplication::reverseLayout() && orient ==Qt::Horizontal ) { + if( TQApplication::reverseLayout() && orient ==TQt::Horizontal ) { dd = w->geometry().right() - pos; dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); newLeft = pos+1; @@ -743,7 +743,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) } else if ( s->isSplitter ) { int dd = s->sizer; int pos1, pos2; - if( TQApplication::reverseLayout() && orient ==Qt::Horizontal ) { + if( TQApplication::reverseLayout() && orient ==TQt::Horizontal ) { pos2 = pos - dd; pos1 = pos2 + 1; } else { @@ -760,7 +760,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) } else { int left = pick( w->pos() ); int right, dd,/* newRight,*/ newLeft, nextPos; - if ( TQApplication::reverseLayout() && orient ==Qt::Horizontal ) { + if ( TQApplication::reverseLayout() && orient ==TQt::Horizontal ) { dd = pos - left + 1; dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); newLeft = pos-dd+1; @@ -838,7 +838,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max ) } } TQRect r = contentsRect(); - if ( orient ==Qt::Horizontal && TQApplication::reverseLayout() ) { + if ( orient ==TQt::Horizontal && TQApplication::reverseLayout() ) { int splitterWidth = style().pixelMetric(TQStyle::PM_SplitterWidth, this); if ( min ) *min = pick(r.topRight()) - TQMIN( maxB, pick(r.size())-minA ) - splitterWidth; @@ -977,7 +977,7 @@ void KDGanttMinimizeSplitter::recalc( bool update ) if ( maxt < mint ) maxt = mint; - if ( orient ==Qt::Horizontal ) { + if ( orient ==TQt::Horizontal ) { setMaximumSize( maxl, maxt ); setMinimumSize( minl, mint ); } else { @@ -1129,7 +1129,7 @@ TQSize KDGanttMinimizeSplitter::sizeHint() const } } } - return orientation() ==Qt::Horizontal ? TQSize( l, t ) : TQSize( t, l ); + return orientation() ==TQt::Horizontal ? TQSize( l, t ) : TQSize( t, l ); } @@ -1159,7 +1159,7 @@ TQSize KDGanttMinimizeSplitter::minimumSizeHint() const } } } - return orientation() ==Qt::Horizontal ? TQSize( l, t ) : TQSize( t, l ); + return orientation() ==TQt::Horizontal ? TQSize( l, t ) : TQSize( t, l ); } @@ -1533,7 +1533,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i */ /*! - \fn Qt::Orientation KDGanttMinimizeSplitter::orientation() const + \fn TQt::Orientation KDGanttMinimizeSplitter::orientation() const Returns the orientation of the splitter. */ diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h index 7afa75471..b70c51818 100644 --- a/kdgantt/KDGanttMinimizeSplitter.h +++ b/kdgantt/KDGanttMinimizeSplitter.h @@ -108,14 +108,14 @@ private: void setG( TQWidget *w, int p, int s, bool isSplitter = FALSE ); TQCOORD pick( const TQPoint &p ) const - { return orient ==Qt::Horizontal ? p.x() : p.y(); } + { return orient ==TQt::Horizontal ? p.x() : p.y(); } TQCOORD pick( const TQSize &s ) const - { return orient ==Qt::Horizontal ? s.width() : s.height(); } + { return orient ==TQt::Horizontal ? s.width() : s.height(); } TQCOORD trans( const TQPoint &p ) const - { return orient ==Qt::Vertical ? p.x() : p.y(); } + { return orient ==TQt::Vertical ? p.x() : p.y(); } TQCOORD trans( const TQSize &s ) const - { return orient ==Qt::Vertical ? s.width() : s.height(); } + { return orient ==TQt::Vertical ? s.width() : s.height(); } TQSplitterData *data; diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp index 16fa3b7b0..6de8d0a49 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -65,7 +65,7 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* parent, const char* name ) : - KDGanttSizingControl( parent, name ), _orient(Qt::Horizontal ), + KDGanttSizingControl( parent, name ), _orient(TQt::Horizontal ), _arrowPos( Before ), _minimizedWidget(0), _maximizedWidget(0) { init(); @@ -84,7 +84,7 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* parent, the base class. */ -KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation, +KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQt::Orientation orientation, TQWidget* parent, const char* name ) : KDGanttSizingControl( parent, name ), _orient( orientation ), @@ -108,7 +108,7 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation, */ KDGanttSemiSizingControl::KDGanttSemiSizingControl( ArrowPosition arrowPosition, - Qt::Orientation orientation, + TQt::Orientation orientation, TQWidget* parent, const char* name ) : KDGanttSizingControl( parent, name ), _orient( orientation ), @@ -186,7 +186,7 @@ TQWidget* KDGanttSemiSizingControl::maximizedWidget() const \sa orientation() */ -void KDGanttSemiSizingControl::setOrientation( Qt::Orientation orientation ) +void KDGanttSemiSizingControl::setOrientation( TQt::Orientation orientation ) { if ( _orient != orientation ) { _orient = orientation; @@ -201,7 +201,7 @@ void KDGanttSemiSizingControl::setOrientation( Qt::Orientation orientation ) \sa setOrientation() */ -Qt::Orientation KDGanttSemiSizingControl::orientation() const +TQt::Orientation KDGanttSemiSizingControl::orientation() const { return _orient; } @@ -262,12 +262,12 @@ void KDGanttSemiSizingControl::setup() delete _layout; TQBoxLayout* butLayout; // _layout will delete me - if ( _orient ==Qt::Horizontal || isMinimized() ) + if ( _orient ==TQt::Horizontal || isMinimized() ) _layout = new TQHBoxLayout( this ); else _layout = new TQVBoxLayout( this ); - if ( _orient ==Qt::Vertical && !isMinimized() ) + if ( _orient ==TQt::Vertical && !isMinimized() ) butLayout = new TQHBoxLayout( _layout ); else butLayout = new TQVBoxLayout( _layout ); @@ -288,7 +288,7 @@ void KDGanttSemiSizingControl::setup() } //------------------------------ Setup the button at the correct possition - if ( _arrowPos == After && _orient ==Qt::Vertical && !isMinimized() ) { + if ( _arrowPos == After && _orient ==TQt::Vertical && !isMinimized() ) { butLayout->addStretch( 1 ); butLayout->addWidget( _but, 0, TQt::AlignLeft ); } @@ -305,7 +305,7 @@ void KDGanttSemiSizingControl::setup() else widget = _maximizedWidget; if( widget ) { - if ( _arrowPos == Before || _orient ==Qt::Vertical && !isMinimized() ) + if ( _arrowPos == Before || _orient ==TQt::Vertical && !isMinimized() ) _layout->addWidget( widget, 1 ); else _layout->insertWidget( 0, widget, 1 ); @@ -318,20 +318,20 @@ void KDGanttSemiSizingControl::setup() if ( isMinimized() ) { widget = _minimizedWidget; if( widget ) { - if ( _arrowPos == Before || _orient ==Qt::Vertical && !isMinimized() ) + if ( _arrowPos == Before || _orient ==TQt::Vertical && !isMinimized() ) _layout->addWidget( widget, 1 ); else _layout->insertWidget( 0, widget, 1 ); } } else { - if ( _arrowPos == Before || _orient ==Qt::Vertical && !isMinimized() ) + if ( _arrowPos == Before || _orient ==TQt::Vertical && !isMinimized() ) _layout->addStretch( 1 ); else _layout->insertStretch( 0, 1 ); widget = _maximizedWidget; // the following is only the special case - // arrowPos == Before and _orient ==Qt::Vertical + // arrowPos == Before and _orient ==TQt::Vertical //widget->move( 0+x(), _but->height()+y()); } } diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h index d5a09b46e..a6d29e54c 100644 --- a/kdgantt/KDGanttSemiSizingControl.h +++ b/kdgantt/KDGanttSemiSizingControl.h @@ -51,10 +51,10 @@ public: enum ArrowPosition { Before, After }; KDGanttSemiSizingControl( TQWidget* parent = 0, const char* name = 0 ); - KDGanttSemiSizingControl( Qt::Orientation orientation, TQWidget* parent = 0, + KDGanttSemiSizingControl( TQt::Orientation orientation, TQWidget* parent = 0, const char* name = 0 ); KDGanttSemiSizingControl( ArrowPosition arrowPosition, - Qt::Orientation orientation, TQWidget* parent = 0, + TQt::Orientation orientation, TQWidget* parent = 0, const char* name = 0 ); void setMinimizedWidget( TQWidget* widget ); @@ -62,8 +62,8 @@ public: TQWidget* minimizedWidget() const; TQWidget* maximizedWidget() const; - void setOrientation( Qt::Orientation orientation ); - Qt::Orientation orientation() const; + void setOrientation( TQt::Orientation orientation ); + TQt::Orientation orientation() const; void setArrowPosition( ArrowPosition arrowPosition ); ArrowPosition arrowPosition() const; @@ -79,7 +79,7 @@ protected: TQPixmap pixmap( Direction ); private: - Qt::Orientation _orient; + TQt::Orientation _orient; ArrowPosition _arrowPos; TQWidget* _minimizedWidget; TQWidget* _maximizedWidget; diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index 4269e5331..1d1a3e4dc 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -81,7 +81,7 @@ */ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) - : KDGanttMinimizeSplitter( Qt::Vertical, parent, name ), + : KDGanttMinimizeSplitter( TQt::Vertical, parent, name ), myCanvasView(0), myTimeHeaderScroll(0) { @@ -458,11 +458,11 @@ void KDGanttView::slotmouseButtonClicked ( int button, TQListViewItem * item, //emit mouseButtonClicked ( button , gItem, pos, c ); { switch ( button ) { - case Qt::LeftButton: + case TQt::LeftButton: emit lvItemLeftClicked( gItem ); emit itemLeftClicked( gItem ); break; - case Qt::MidButton: + case TQt::MidButton: emit lvItemMidClicked( gItem ); emit itemMidClicked( gItem ); break; diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp index 5c3825a3f..e7a550de9 100644 --- a/kdgantt/KDGanttViewItem.cpp +++ b/kdgantt/KDGanttViewItem.cpp @@ -916,10 +916,10 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape, // items which don't have any shapes return; } - item->setBrush(Qt::SolidPattern); + item->setBrush(TQt::SolidPattern); item->setZ(5); itemShape = (KDCanvasPolygonItem*) item; - itemBack->setBrush(Qt::SolidPattern); + itemBack->setBrush(TQt::SolidPattern); itemBack->setZ(3); itemShapeBack = (KDCanvasPolygonItem*) itemBack; @@ -1306,11 +1306,11 @@ void KDGanttViewItem::updateCanvasItems() if (blockUpdating) return; TQPen p,pBack; TQBrush b; - b.setStyle(Qt::SolidPattern); + b.setStyle(TQt::SolidPattern); if ( enabled() ) { textCanvas->setColor(myTextColor); if (isHighlighted) { - b.setStyle(Qt::SolidPattern); + b.setStyle(TQt::SolidPattern); b.setColor(myStartColorHL); startShape->setBrush(b); b.setColor(myMiddleColorHL); @@ -1323,7 +1323,7 @@ void KDGanttViewItem::updateCanvasItems() p.setColor(myEndColorHL); endLine->setPen(p); } else { - b.setStyle(Qt::SolidPattern); + b.setStyle(TQt::SolidPattern); b.setColor(myStartColor); // tqDebug("update color %s %s", listViewText().latin1(),myStartColor.name().latin1() ); startShape->setBrush(b); @@ -1341,7 +1341,7 @@ void KDGanttViewItem::updateCanvasItems() //TQColor discol = TQt::lightGray; TQColor discol = TQColor(232,232,232); textCanvas->setColor( TQColor(150,150,150) ); - b.setStyle(Qt::SolidPattern); + b.setStyle(TQt::SolidPattern); b.setColor(discol); startShape->setBrush(b); midShape->setBrush(b); diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 027e1b81c..443eeb74f 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -65,7 +65,7 @@ KDTimeTableWidget:: KDTimeTableWidget( TQWidget* parent,KDGanttView* myGantt) taskLinksVisible = true; flag_blockUpdating = false; int_blockUpdating = 0; - gridPen.setStyle(Qt::DotLine); + gridPen.setStyle(TQt::DotLine); gridPen.setColor(TQColor(100,100,100)); maximumComputedGridHeight = 0; denseLineCount = 0; @@ -229,7 +229,7 @@ void KDTimeTableWidget::computeVerticalGrid() itcol.current()->setPoints(i+(cw/2),0,i+(cw/2),h); */ - itcol.current()->setPen( Qt::NoPen ); + itcol.current()->setPen( TQt::NoPen ); itcol.current()->setBrush( TQBrush( colcol, SolidPattern) ); itcol.current()->setSize(cw ,h ); itcol.current()->move( i, 0 ); @@ -243,7 +243,7 @@ void KDTimeTableWidget::computeVerticalGrid() templine->setPoints(i+(cw/2),0,i+(cw/2),h); */ temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem); - temprect->setPen( Qt::NoPen ); + temprect->setPen( TQt::NoPen ); temprect->setBrush( TQBrush( colcol, SolidPattern) ); temprect->setSize(cw ,h ); temprect->move( i, 0 ); @@ -275,7 +275,7 @@ void KDTimeTableWidget::computeVerticalGrid() itcol.current()->setPen(colPen); itcol.current()->setPoints(i+(cw/2),0,i+(cw/2),h); */ - itcol.current()->setPen( Qt::NoPen ); + itcol.current()->setPen( TQt::NoPen ); itcol.current()->setBrush( TQBrush( colcol, SolidPattern) ); itcol.current()->setSize(cw ,h ); itcol.current()->move( i, 0 ); @@ -283,7 +283,7 @@ void KDTimeTableWidget::computeVerticalGrid() ++itcol; } else { temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem); - temprect->setPen( Qt::NoPen ); + temprect->setPen( TQt::NoPen ); temprect->setBrush( TQBrush( colcol, SolidPattern) ); temprect->setSize(cw ,h ); temprect->move( i, 0 ); @@ -331,7 +331,7 @@ void KDTimeTableWidget::computeVerticalGrid() itcol.current()->setPen(colPen); itcol.current()->setPoints(i+mid,0,mid,h); */ - itcol.current()->setPen( Qt::NoPen ); + itcol.current()->setPen( TQt::NoPen ); itcol.current()->setBrush( TQBrush( colcol, SolidPattern) ); itcol.current()->setSize(mid ,h ); itcol.current()->move( left, 0 ); @@ -339,7 +339,7 @@ void KDTimeTableWidget::computeVerticalGrid() ++itcol; } else { temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem); - temprect->setPen( Qt::NoPen ); + temprect->setPen( TQt::NoPen ); temprect->setBrush( TQBrush( colcol, SolidPattern) ); temprect->setSize(mid,h ); temprect->move( left, 0 ); @@ -385,7 +385,7 @@ void KDTimeTableWidget::computeVerticalGrid() itcol.current()->setPen(colPen); itcol.current()->setPoints(i+mid,0,mid,h); */ - itcol.current()->setPen( Qt::NoPen ); + itcol.current()->setPen( TQt::NoPen ); itcol.current()->setBrush( TQBrush( colcol, SolidPattern) ); itcol.current()->setSize(mid ,h ); itcol.current()->move( left, 0 ); @@ -393,7 +393,7 @@ void KDTimeTableWidget::computeVerticalGrid() ++itcol; } else { temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem); - temprect->setPen( Qt::NoPen ); + temprect->setPen( TQt::NoPen ); temprect->setBrush( TQBrush( colcol, SolidPattern) ); temprect->setSize(mid ,h ); temprect->move( left, 0 ); @@ -1494,7 +1494,7 @@ void KDTimeHeaderWidget::computeIntervals( int height ) right = getCoordX((*it).end); if ( right == left ) ++right; - (*it).canvasRect->setPen( Qt::NoPen ); + (*it).canvasRect->setPen( TQt::NoPen ); (*it).canvasRect->setBrush( TQBrush( (*it).color, SolidPattern) ); (*it).canvasRect->setSize( right - left ,height ); (*it).canvasRect->move( left,0 ); @@ -2459,16 +2459,16 @@ void KDTimeHeaderWidget::mousePressEvent ( TQMouseEvent * e ) { mouseDown = false; switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: mouseDown = true; beginMouseDown = e->pos().x(); endMouseDown = e->pos().x(); break; - case Qt::RightButton: + case TQt::RightButton: if (flagShowPopupMenu) myPopupMenu->popup(e->globalPos()); break; - case Qt::MidButton: + case TQt::MidButton: break; default: break; @@ -2551,7 +2551,7 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e ) ***************************************************************** */ KDLegendWidget:: KDLegendWidget( TQWidget* parent, KDGanttMinimizeSplitter* legendParent ) : - KDGanttSemiSizingControl ( KDGanttSemiSizingControl::Before,Qt::Vertical, + KDGanttSemiSizingControl ( KDGanttSemiSizingControl::Before,TQt::Vertical, parent) { myLegendParent = legendParent; @@ -2657,9 +2657,9 @@ void KDLegendWidget::clearLegend ( ) { if ( myLegend ) delete myLegend; if ( dock ) - myLegend = new TQGroupBox( 1, Qt::Horizontal, scroll->viewport() ); + myLegend = new TQGroupBox( 1, TQt::Horizontal, scroll->viewport() ); else - myLegend = new TQGroupBox( 1, Qt::Horizontal, i18n( "Legend" ), scroll->viewport() ); + myLegend = new TQGroupBox( 1, TQt::Horizontal, i18n( "Legend" ), scroll->viewport() ); myLegend->setBackgroundColor( TQt::white ); myLegend->setFont( font() ); scroll->addChild( myLegend ); @@ -3510,7 +3510,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e ) setFocus(); currentLink = 0; currentItem = 0; - if (e->button() == Qt::RightButton && mySignalSender->editable()) { + if (e->button() == TQt::RightButton && mySignalSender->editable()) { lastClickedItem = (KDGanttViewItem*) mySignalSender->myListView->itemAt( TQPoint(2,e->pos().y())); if ( lastClickedItem ) { if ( lastClickedItem->displaySubitemsAsGroup() && ! lastClickedItem->isOpen() ) { @@ -3531,7 +3531,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e ) TQCanvasItemList::Iterator it; for ( it = il.begin(); it != il.end(); ++it ) { switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: switch (getType(*it)) { case Type_is_KDGanttViewItem: currentItem = getItem(*it); @@ -3554,7 +3554,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e ) break; } break; - case Qt::RightButton: + case TQt::RightButton: switch (getType(*it)) { case Type_is_KDGanttViewItem: currentItem = getItem(*it); @@ -3566,7 +3566,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e ) break; } break; - case Qt::MidButton: + case TQt::MidButton: switch (getType(*it)) { case Type_is_KDGanttViewItem: currentItem = getItem(*it); @@ -3582,10 +3582,10 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e ) break; } } - if (e->button() == Qt::RightButton ) { + if (e->button() == TQt::RightButton ) { mySignalSender->gvContextMenuRequested( currentItem, e->globalPos() ); } - if (autoScrollEnabled && e->button() == Qt::LeftButton) { + if (autoScrollEnabled && e->button() == TQt::LeftButton) { myScrollTimer->start(50); } } @@ -3606,7 +3606,7 @@ void KDGanttCanvasView::contentsMouseReleaseEvent ( TQMouseEvent * e ) // if ( currentLink || currentItem ) { switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: myScrollTimer->stop(); { mySignalSender->itemLeftClicked( currentItem ); @@ -3634,7 +3634,7 @@ void KDGanttCanvasView::contentsMouseReleaseEvent ( TQMouseEvent * e ) } fromItem = 0; break; - case Qt::RightButton: + case TQt::RightButton: { mySignalSender->itemRightClicked( currentItem ); mySignalSender->gvItemRightClicked( currentItem ); @@ -3643,7 +3643,7 @@ void KDGanttCanvasView::contentsMouseReleaseEvent ( TQMouseEvent * e ) if ( currentLink ) mySignalSender->taskLinkRightClicked( currentLink ); break; - case Qt::MidButton: + case TQt::MidButton: { mySignalSender->itemMidClicked( currentItem ); mySignalSender->gvItemMidClicked( currentItem ); @@ -3674,7 +3674,7 @@ void KDGanttCanvasView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) TQCanvasItemList::Iterator it; for ( it = il.begin(); it != il.end(); ++it ) { switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: switch (getType(*it)) { case Type_is_KDGanttViewItem: if ( getItem(*it)->enabled() ) diff --git a/kdgantt/KDGanttViewTaskLink.cpp b/kdgantt/KDGanttViewTaskLink.cpp index fdf4e7ece..6409370a1 100644 --- a/kdgantt/KDGanttViewTaskLink.cpp +++ b/kdgantt/KDGanttViewTaskLink.cpp @@ -268,7 +268,7 @@ void KDGanttViewTaskLink::showMe( bool visible ) TQPen p; TQBrush b; p.setWidth(wid); - b.setStyle(Qt::SolidPattern); + b.setStyle(TQt::SolidPattern); if (ishighlighted) { b.setColor(myColorHL); p.setColor(myColorHL); @@ -333,7 +333,7 @@ void KDGanttViewTaskLink::showMeType( bool visible ) TQPen p; TQBrush b; p.setWidth(wid); - b.setStyle(Qt::SolidPattern); + b.setStyle(TQt::SolidPattern); if (ishighlighted) { b.setColor(myColorHL); p.setColor(myColorHL); diff --git a/kdgantt/KDGanttXMLTools.cpp b/kdgantt/KDGanttXMLTools.cpp index f2868ed95..78b25ea39 100644 --- a/kdgantt/KDGanttXMLTools.cpp +++ b/kdgantt/KDGanttXMLTools.cpp @@ -266,20 +266,20 @@ void createTimeNode( TQDomDocument& doc, TQDomNode& parent, } -TQString penStyleToString( Qt::PenStyle style ) +TQString penStyleToString( TQt::PenStyle style ) { switch( style ) { - case Qt::NoPen: + case TQt::NoPen: return "NoPen"; - case Qt::SolidLine: + case TQt::SolidLine: return "SolidLine"; - case Qt::DashLine: + case TQt::DashLine: return "DashLine"; - case Qt::DotLine: + case TQt::DotLine: return "DotLine"; - case Qt::DashDotLine: + case TQt::DashDotLine: return "DashDotLine"; - case Qt::DashDotDotLine: + case TQt::DashDotDotLine: return "DashDotDotLine"; default: // should not happen return "SolidLine"; @@ -288,39 +288,39 @@ TQString penStyleToString( Qt::PenStyle style ) -TQString brushStyleToString( Qt::BrushStyle style ) +TQString brushStyleToString( TQt::BrushStyle style ) { // PENDING(kalle) Support custom patterns switch( style ) { - case Qt::NoBrush: + case TQt::NoBrush: return "NoBrush"; - case Qt::SolidPattern: + case TQt::SolidPattern: return "SolidPattern"; - case Qt::Dense1Pattern: + case TQt::Dense1Pattern: return "Dense1Pattern"; - case Qt::Dense2Pattern: + case TQt::Dense2Pattern: return "Dense2Pattern"; - case Qt::Dense3Pattern: + case TQt::Dense3Pattern: return "Dense3Pattern"; - case Qt::Dense4Pattern: + case TQt::Dense4Pattern: return "Dense4Pattern"; - case Qt::Dense5Pattern: + case TQt::Dense5Pattern: return "Dense5Pattern"; - case Qt::Dense6Pattern: + case TQt::Dense6Pattern: return "Dense6Pattern"; - case Qt::Dense7Pattern: + case TQt::Dense7Pattern: return "Dense7Pattern"; - case Qt::HorPattern: + case TQt::HorPattern: return "HorPattern"; - case Qt::VerPattern: + case TQt::VerPattern: return "VerPattern"; - case Qt::CrossPattern: + case TQt::CrossPattern: return "CrossPattern"; - case Qt::BDiagPattern: + case TQt::BDiagPattern: return "BDiagPattern"; - case Qt::FDiagPattern: + case TQt::FDiagPattern: return "FDiagPattern"; - case Qt::DiagCrossPattern: + case TQt::DiagCrossPattern: return "DiagCrossPattern"; default: // should not happen (but can for a custom pattern) return "SolidPattern"; @@ -399,7 +399,7 @@ bool readBrushNode( const TQDomElement& element, TQBrush& brush ) { bool ok = true; TQColor tempColor; - Qt::BrushStyle tempStyle; + TQt::BrushStyle tempStyle; TQPixmap tempPixmap; TQDomNode node = element.firstChild(); while( !node.isNull() ) { @@ -506,7 +506,7 @@ bool readPenNode( const TQDomElement& element, TQPen& pen ) bool ok = true; int tempWidth; TQColor tempColor; - Qt::PenStyle tempStyle; + TQt::PenStyle tempStyle; TQDomNode node = element.firstChild(); while( !node.isNull() ) { TQDomElement element = node.toElement(); @@ -705,60 +705,60 @@ bool readTimeNode( const TQDomElement& element, TQTime& value ) -Qt::PenStyle stringToPenStyle( const TQString& style ) +TQt::PenStyle stringToPenStyle( const TQString& style ) { if( style == "NoPen" ) - return Qt::NoPen; + return TQt::NoPen; else if( style == "SolidLine" ) - return Qt::SolidLine; + return TQt::SolidLine; else if( style == "DashLine" ) - return Qt::DashLine; + return TQt::DashLine; else if( style == "DotLine" ) - return Qt::DotLine; + return TQt::DotLine; else if( style == "DashDotLine" ) - return Qt::DashDotLine; + return TQt::DashDotLine; else if( style == "DashDotDotLine" ) - return Qt::DashDotDotLine; + return TQt::DashDotDotLine; else // should not happen - return Qt::SolidLine; + return TQt::SolidLine; } -Qt::BrushStyle stringToBrushStyle( const TQString& style ) +TQt::BrushStyle stringToBrushStyle( const TQString& style ) { // PENDING(kalle) Support custom patterns if( style == "NoBrush" ) - return Qt::NoBrush; + return TQt::NoBrush; else if( style == "SolidPattern" ) - return Qt::SolidPattern; + return TQt::SolidPattern; else if( style == "Dense1Pattern" ) - return Qt::Dense1Pattern; + return TQt::Dense1Pattern; else if( style == "Dense2Pattern" ) - return Qt::Dense2Pattern; + return TQt::Dense2Pattern; else if( style == "Dense3Pattern" ) - return Qt::Dense3Pattern; + return TQt::Dense3Pattern; else if( style == "Dense4Pattern" ) - return Qt::Dense4Pattern; + return TQt::Dense4Pattern; else if( style == "Dense5Pattern" ) - return Qt::Dense5Pattern; + return TQt::Dense5Pattern; else if( style == "Dense6Pattern" ) - return Qt::Dense6Pattern; + return TQt::Dense6Pattern; else if( style == "Dense7Pattern" ) - return Qt::Dense7Pattern; + return TQt::Dense7Pattern; else if( style == "HorPattern" ) - return Qt::HorPattern; + return TQt::HorPattern; else if( style == "VerPattern" ) - return Qt::VerPattern; + return TQt::VerPattern; else if( style == "CrossPattern" ) - return Qt::CrossPattern; + return TQt::CrossPattern; else if( style == "BDiagPattern" ) - return Qt::BDiagPattern; + return TQt::BDiagPattern; else if( style == "FDiagPattern" ) - return Qt::FDiagPattern; + return TQt::FDiagPattern; else if( style == "DiagCrossPattern" ) - return Qt::DiagCrossPattern; + return TQt::DiagCrossPattern; else // should not happen (but can with custom patterns) - return Qt::SolidPattern; + return TQt::SolidPattern; } } diff --git a/kdgantt/KDGanttXMLTools.h b/kdgantt/KDGanttXMLTools.h index 992daba39..f33045595 100644 --- a/kdgantt/KDGanttXMLTools.h +++ b/kdgantt/KDGanttXMLTools.h @@ -45,10 +45,10 @@ #include <tqdatetime.h> namespace KDGanttXML { - TQString penStyleToString( Qt::PenStyle style ); - Qt::PenStyle stringToPenStyle( const TQString& style ); - TQString brushStyleToString( Qt::BrushStyle style ); - Qt::BrushStyle stringToBrushStyle( const TQString& style ); + TQString penStyleToString( TQt::PenStyle style ); + TQt::PenStyle stringToPenStyle( const TQString& style ); + TQString brushStyleToString( TQt::BrushStyle style ); + TQt::BrushStyle stringToBrushStyle( const TQString& style ); void createBoolNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, bool value ); diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp index 90adff174..b465c4d15 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp +++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp @@ -125,7 +125,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, // --------------- page margins --------------- TQVGroupBox *marginsFrame = new TQVGroupBox( i18n( "Margins" ), this ); - marginsFrame->setColumnLayout( 0, Qt::Vertical ); + marginsFrame->setColumnLayout( 0, TQt::Vertical ); marginsFrame->setMargin( KDialog::marginHint() ); grid1->addWidget( marginsFrame, 3, 0 ); diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cpp b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp index a0f05ab6a..8d618793d 100644 --- a/kexi/3rdparty/kolibs/koPageLayoutDia.cpp +++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp @@ -281,7 +281,7 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) TQGridLayout *grid2 = new TQGridLayout( tab2, 7, 2, 0, KDialog::spacingHint() ); // ------------- header --------------- - TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 ); + TQGroupBox *gHead = new TQGroupBox( 0, TQt::Vertical, i18n( "Head Line" ), tab2 ); gHead->layout()->setSpacing(KDialog::spacingHint()); gHead->layout()->setMargin(KDialog::marginHint()); TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 ); @@ -310,7 +310,7 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) grid2->addMultiCellWidget( gHead, 0, 1, 0, 1 ); // ------------- footer --------------- - TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 ); + TQGroupBox *gFoot = new TQGroupBox( 0, TQt::Vertical, i18n( "Foot Line" ), tab2 ); gFoot->layout()->setSpacing(KDialog::spacingHint()); gFoot->layout()->setMargin(KDialog::marginHint()); TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 ); diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js index 378e6b360..8baabd7be 100644 --- a/kexi/doc/dev/TODO-Kexi-js +++ b/kexi/doc/dev/TODO-Kexi-js @@ -257,7 +257,7 @@ I am using update_kexi_po to recreate kexi.po file. THis will run cd koffice/ && - signal when null/empty value forcell isn't permitted - signal when repeated value isn't permitted - add support for cut, copy & paste of cell's contents (get shortcuts from TDEStdAccel) -HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem +HINT: removing WStaticContents from KexiTableView ctor fixed repaint problem the problem was with repainting when hscrollbar disapperars.... - KexiTableView loads all data from the table: very slow and consumes a lot of memory: (e.g. for each record with 3 fields: 1 integer, 1 text and 1 float consumed ~350B) diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index 10bd7eb31..85f407073 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -933,9 +933,9 @@ CreateLayoutCommand::execute() } if(m_type == Container::HSplitter) - ((TQSplitter*)w)->setOrientation(Qt::Horizontal); + ((TQSplitter*)w)->setOrientation(TQt::Horizontal); else if(m_type == Container::VSplitter) - ((TQSplitter*)w)->setOrientation(Qt::Vertical); + ((TQSplitter*)w)->setOrientation(TQt::Vertical); else if(tree->container()) { tree->container()->setLayout((Container::LayoutType)m_type); w->resize(tree->container()->layout()->sizeHint()); // the layout doesn't have its own size diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index 89269b146..17f1ced84 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -64,7 +64,7 @@ EventEater::eventFilter(TQObject *, TQEvent *ev) if(ev->type() == TQEvent::MouseButtonRelease && m_widget->inherits("TQTabWidget")) { TQMouseEvent *mev = TQT_TQMOUSEEVENT(ev); - if(mev->button() == Qt::LeftButton) + if(mev->button() == TQt::LeftButton) { TQMouseEvent *myev = new TQMouseEvent(TQEvent::MouseButtonPress, mev->pos(), mev->button(), mev->state()); m_container->eventFilter(m_widget, myev); @@ -171,7 +171,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) return true; } - if(((mev->state() == ControlButton) || (mev->state() == ShiftButton)) + if(((mev->state() == TQt::ControlButton) || (mev->state() == TQt::ShiftButton)) && (!FormManager::self()->isInserting())) // multiple selection mode { if(m_form->selectedWidgets()->findRef(m_moving) != -1) // widget is already selected @@ -187,22 +187,22 @@ Container::eventFilter(TQObject *s, TQEvent *e) } } else // the widget is not yet selected, we add it - setSelectedWidget(m_moving, true, (mev->button() == Qt::RightButton)); + setSelectedWidget(m_moving, true, (mev->button() == TQt::RightButton)); } else if((m_form->selectedWidgets()->count() > 1))//&& (!m_form->manager()->isInserting())) // more than one widget selected { if(m_form->selectedWidgets()->findRef(m_moving) == -1) // widget is not selected, it becomes the only selected widget - setSelectedWidget(m_moving, false, (mev->button() == Qt::RightButton)); + setSelectedWidget(m_moving, false, (mev->button() == TQt::RightButton)); // If the widget is already selected, we do nothing (to ease widget moving, etc.) } else// if(!m_form->manager()->isInserting()) - setSelectedWidget(m_moving, false, (mev->button() == Qt::RightButton)); + setSelectedWidget(m_moving, false, (mev->button() == TQt::RightButton)); // we are inserting a widget or drawing a selection rect in the form if((/*s == m_container &&*/ FormManager::self()->isInserting()) || ((s == m_container) && !m_toplevel)) { int tmpx,tmpy; - if(!FormManager::self()->snapWidgetsToGrid() || (mev->state() == (Qt::LeftButton|ControlButton|AltButton))) + if(!FormManager::self()->snapWidgetsToGrid() || (mev->state() == (TQt::LeftButton|TQt::ControlButton|TQt::AltButton))) { tmpx = mev->x(); tmpy = mev->y(); @@ -253,8 +253,8 @@ Container::eventFilter(TQObject *s, TQEvent *e) case TQEvent::MouseMove: { TQMouseEvent *mev = TQT_TQMOUSEEVENT(e); - if(m_insertBegin!=TQPoint(-1,-1) && FormManager::self()->isInserting() && ((mev->state() == Qt::LeftButton) || (mev->state() == (Qt::LeftButton|ControlButton)) || - (mev->state() == (Qt::LeftButton|ControlButton|AltButton)) || (mev->state() == (Qt::LeftButton|ShiftButton)) ) ) + if(m_insertBegin!=TQPoint(-1,-1) && FormManager::self()->isInserting() && ((mev->state() == TQt::LeftButton) || (mev->state() == (TQt::LeftButton|TQt::ControlButton)) || + (mev->state() == (TQt::LeftButton|TQt::ControlButton|TQt::AltButton)) || (mev->state() == (TQt::LeftButton|TQt::ShiftButton)) ) ) // draw the insert rect { drawInsertRect(mev, s); @@ -270,9 +270,9 @@ Container::eventFilter(TQObject *s, TQEvent *e) if(m_form->formWidget() && (tree->widget() != s)) m_form->formWidget()->highlightWidgets(tree->widget(), TQT_TQWIDGET(s)); } - else if(m_insertBegin!=TQPoint(-1,-1) && s == m_container && !m_toplevel && (mev->state() != ControlButton) && !FormManager::self()->isCreatingConnection()) // draw the selection rect + else if(m_insertBegin!=TQPoint(-1,-1) && s == m_container && !m_toplevel && (mev->state() != TQt::ControlButton) && !FormManager::self()->isCreatingConnection()) // draw the selection rect { - if((mev->state() != Qt::LeftButton) || /*m_inlineEditing*/ m_state == InlineEditing) + if((mev->state() != TQt::LeftButton) || /*m_inlineEditing*/ m_state == InlineEditing) return true; int topx = (m_insertBegin.x() < mev->x()) ? m_insertBegin.x() : mev->x(); int topy = (m_insertBegin.y() < mev->y()) ? m_insertBegin.y() : mev->y(); @@ -287,14 +287,14 @@ Container::eventFilter(TQObject *s, TQEvent *e) m_state = DoingNothing; return true; } - else if(mev->state() == (Qt::LeftButton|ControlButton)) // draw the insert rect for the copied widget + else if(mev->state() == (TQt::LeftButton|TQt::ControlButton)) // draw the insert rect for the copied widget { if(s == m_container)// || (m_form->selectedWidgets()->count() > 1)) return true; drawCopiedWidgetRect(mev); return true; } - else if( ( (mev->state() == Qt::LeftButton) || (mev->state() == (Qt::LeftButton|ControlButton|AltButton)) ) + else if( ( (mev->state() == TQt::LeftButton) || (mev->state() == (TQt::LeftButton|TQt::ControlButton|TQt::AltButton)) ) && !FormManager::self()->isInserting() && (m_state != CopyingWidget)) // we are dragging the widget(s) to move it { if(!m_toplevel && m_moving == m_container) // no effect for form @@ -372,8 +372,8 @@ Container::eventFilter(TQObject *s, TQEvent *e) if(!m_moving) return true; // we simulate a mouse move event to update screen - TQMouseEvent *mev = new TQMouseEvent(TQEvent::MouseMove, m_moving->mapFromGlobal(TQCursor::pos()), Qt::NoButton, - Qt::LeftButton|ControlButton ); + TQMouseEvent *mev = new TQMouseEvent(TQEvent::MouseMove, m_moving->mapFromGlobal(TQCursor::pos()), TQt::NoButton, + TQt::LeftButton|TQt::ControlButton ); eventFilter(TQT_TQOBJECT(m_moving), TQT_TQEVENT(mev)); delete mev; } @@ -487,16 +487,16 @@ Container::handleMouseReleaseEvent(TQObject *s, TQMouseEvent *mev) m_insertRect = TQRect(); return true; } - else if(s == m_container && !m_toplevel && (mev->button() != Qt::RightButton) && m_insertRect.isValid()) // we are drawing a rect to select widgets + else if(s == m_container && !m_toplevel && (mev->button() != TQt::RightButton) && m_insertRect.isValid()) // we are drawing a rect to select widgets { drawSelectionRect(mev); return true; } - if(mev->button() == Qt::RightButton) // Right-click -> context menu + if(mev->button() == TQt::RightButton) // Right-click -> context menu { FormManager::self()->createContextMenu(TQT_TQWIDGET(s), this); } - else if(mev->state() == (Qt::LeftButton|TQt::ControlButton))// && (m_copyRect.isValid())) + else if(mev->state() == (TQt::LeftButton|TQt::ControlButton))// && (m_copyRect.isValid())) { // copying a widget by Ctrl+dragging @@ -620,7 +620,7 @@ Container::setLayout(LayoutType type) case HFlow: { KexiFlowLayout *flow = new KexiFlowLayout(m_container,m_margin, m_spacing); - flow->setOrientation(Qt::Horizontal); + flow->setOrientation(TQt::Horizontal); m_layout = (TQLayout*)flow; createFlowLayout(); break; @@ -628,7 +628,7 @@ Container::setLayout(LayoutType type) case VFlow: { KexiFlowLayout *flow = new KexiFlowLayout(m_container,m_margin, m_spacing); - flow->setOrientation(Qt::Vertical); + flow->setOrientation(TQt::Vertical); m_layout = (TQLayout*)flow; createFlowLayout(); break; @@ -674,7 +674,7 @@ Container::createFlowLayout() const int offset = 15; WidgetList *list=0, *list2=0; - if(flow->orientation() ==Qt::Horizontal) { + if(flow->orientation() ==TQt::Horizontal) { list = new VerWidgetList(m_form->toplevelContainer()->widget()); list2 = new HorWidgetList(m_form->toplevelContainer()->widget()); } @@ -688,7 +688,7 @@ Container::createFlowLayout() list->append( tree->widget()); list->sort(); - if(flow->orientation() ==Qt::Horizontal) { + if(flow->orientation() ==TQt::Horizontal) { int y = list->first()->y(); for(TQWidget *w = list->first(); w; w = list->next()) { if( (w->y() > y +offset)) { @@ -943,7 +943,7 @@ Container::stringToLayoutType(const TQString &name) void Container::drawConnection(TQMouseEvent *mev) { - if(mev->button() != Qt::LeftButton) + if(mev->button() != TQt::LeftButton) { FormManager::self()->resetCreatedConnection(); return; @@ -1023,7 +1023,7 @@ Container::drawInsertRect(TQMouseEvent *mev, TQObject *s) TQPoint pos = TQT_TQWIDGET(s)->mapTo(m_container, mev->pos()); int gridX = m_form->gridSize(); int gridY = m_form->gridSize(); - if(!FormManager::self()->snapWidgetsToGrid() || (mev->state() == (Qt::LeftButton|ControlButton|AltButton)) ) + if(!FormManager::self()->snapWidgetsToGrid() || (mev->state() == (TQt::LeftButton|TQt::ControlButton|TQt::AltButton)) ) { tmpx = pos.x(); tmpy = pos.y(); @@ -1144,7 +1144,7 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev) } int tmpx, tmpy; - if(!FormManager::self()->snapWidgetsToGrid() || (mev && mev->state() == (Qt::LeftButton|ControlButton|AltButton)) ) + if(!FormManager::self()->snapWidgetsToGrid() || (mev && mev->state() == (TQt::LeftButton|TQt::ControlButton|TQt::AltButton)) ) { tmpx = w->x() + dx; tmpy = w->y() + dy; diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index 543729919..164dea27b 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -610,7 +610,7 @@ ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, TQSplitter *split = new TQSplitter(p, n); if (0 == (options & WidgetFactory::AnyOrientation)) split->setOrientation( - (options & WidgetFactory::VerticalOrientation) ? Qt::Vertical : Qt::Horizontal); + (options & WidgetFactory::VerticalOrientation) ? TQt::Vertical : TQt::Horizontal); new KFormDesigner::Container(container, split, container); return split; } diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index a74097a03..101073337 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -72,32 +72,32 @@ KexiPictureLabel::setProperty(const char *name, const TQVariant &value) return TQLabel::setProperty(name, value); } -Line::Line(Qt::Orientation orient, TQWidget *parent, const char *name) +Line::Line(TQt::Orientation orient, TQWidget *parent, const char *name) : TQFrame(parent, name) { setFrameShadow(Sunken); - if(orient ==Qt::Horizontal) + if(orient ==TQt::Horizontal) setFrameShape(HLine); else setFrameShape(VLine); } void -Line::setOrientation(Qt::Orientation orient) +Line::setOrientation(TQt::Orientation orient) { - if(orient ==Qt::Horizontal) + if(orient ==TQt::Horizontal) setFrameShape(HLine); else setFrameShape(VLine); } -Qt::Orientation +TQt::Orientation Line::orientation() const { if(frameShape() == HLine) - return Qt::Horizontal; + return TQt::Horizontal; else - return Qt::Vertical; + return TQt::Vertical; } // The factory itself @@ -425,7 +425,7 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, ((TDEListView*)w)->setRootIsDecorated(true); } else if(c == "TQSlider") - w = new TQSlider(Qt::Horizontal, p, n); + w = new TQSlider(TQt::Horizontal, p, n); else if(c == "KProgress") w = new KProgress(p, n); @@ -440,13 +440,13 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, w = new KDateTimeWidget(TQDateTime::currentDateTime(), p, n); else if(c == "Line") - w = new Line(options & WidgetFactory::VerticalOrientation ? Qt::Vertical : Qt::Horizontal, p, n); + w = new Line(options & WidgetFactory::VerticalOrientation ? TQt::Vertical : TQt::Horizontal, p, n); else if(c == "Spring") { w = new Spring(p, n); if (0 == (options & WidgetFactory::AnyOrientation)) static_cast<Spring*>(w)->setOrientation( - (options & WidgetFactory::VerticalOrientation) ? Qt::Vertical : Qt::Horizontal); + (options & WidgetFactory::VerticalOrientation) ? TQt::Vertical : TQt::Horizontal); } if(w) diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 298c07f8f..62402bfab 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -1431,13 +1431,13 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl if(layoutName == "HFlow") { item->container()->m_layType = Container::HFlow; KexiFlowLayout *layout = new KexiFlowLayout(item->widget()); - layout->setOrientation(Qt::Horizontal); + layout->setOrientation(TQt::Horizontal); item->container()->m_layout = (TQLayout*)layout; } else if(layoutName == "VFlow") { item->container()->m_layType = Container::VFlow; KexiFlowLayout *layout = new KexiFlowLayout(item->widget()); - layout->setOrientation(Qt::Vertical); + layout->setOrientation(TQt::Vertical); item->container()->m_layout = (TQLayout*)layout; } else { // grid layout diff --git a/kexi/formeditor/resizehandle.cpp b/kexi/formeditor/resizehandle.cpp index 1c3ad69d6..ab46ecd71 100644 --- a/kexi/formeditor/resizehandle.cpp +++ b/kexi/formeditor/resizehandle.cpp @@ -161,7 +161,7 @@ void ResizeHandle::mouseMoveEvent(TQMouseEvent *ev) int dummyx = ev->x() - m_x; int dummyy = ev->y() - m_y; - if(FormManager::self()->snapWidgetsToGrid() && (ev->state() != (Qt::LeftButton|ControlButton|AltButton))) + if(FormManager::self()->snapWidgetsToGrid() && (ev->state() != (TQt::LeftButton|TQt::ControlButton|TQt::AltButton))) { dummyy = (int) ( ((float)dummyy) / ((float)gridY) + 0.5 ); dummyy *= gridY; diff --git a/kexi/formeditor/spring.cpp b/kexi/formeditor/spring.cpp index 3e0651b19..0eb604002 100644 --- a/kexi/formeditor/spring.cpp +++ b/kexi/formeditor/spring.cpp @@ -37,12 +37,12 @@ Spring::Spring(TQWidget *parent, const char *name) : TQWidget(parent, name) { m_edit = true; - m_orient =Qt::Horizontal; + m_orient =TQt::Horizontal; setSizeType((SizeType)TQSizePolicy::Expanding); } void -Spring::setOrientation(Qt::Orientation orient) +Spring::setOrientation(TQt::Orientation orient) { SizeType type = sizeType(); m_orient = orient; @@ -53,7 +53,7 @@ Spring::setOrientation(Qt::Orientation orient) Spring::SizeType Spring::sizeType() const { - if(m_orient ==Qt::Vertical) + if(m_orient ==TQt::Vertical) return (SizeType)sizePolicy().verData(); else return (SizeType)sizePolicy().horData(); @@ -62,7 +62,7 @@ Spring::sizeType() const void Spring::setSizeType(SizeType size) { - if(m_orient ==Qt::Vertical) + if(m_orient ==TQt::Vertical) setSizePolicy(TQSizePolicy::Minimum, (TQSizePolicy::SizeType)size); else setSizePolicy( (TQSizePolicy::SizeType)size, TQSizePolicy::Minimum); @@ -80,7 +80,7 @@ Spring::paintEvent(TQPaintEvent *ev) p.setPen(TQPen(TQt::white, 1)); p.setRasterOp(TQt::XorROP); TQPointArray pa(4); - if(m_orient ==Qt::Vertical) { + if(m_orient ==TQt::Vertical) { uint part = (height()+16) / 16; if (part<3) part=3; diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp index 953243e4f..73b4f29cb 100644 --- a/kexi/kexidb/driver.cpp +++ b/kexi/kexidb/driver.cpp @@ -275,9 +275,9 @@ TQString Driver::valueToSQL( uint ftype, const TQVariant& v ) const case Field::Boolean: return TQString::number(v.toInt()?1:0); //0 or 1 case Field::Time: - return TQString("\'")+v.toTime().toString(Qt::ISODate)+"\'"; + return TQString("\'")+v.toTime().toString(TQt::ISODate)+"\'"; case Field::Date: - return TQString("\'")+v.toDate().toString(Qt::ISODate)+"\'"; + return TQString("\'")+v.toDate().toString(TQt::ISODate)+"\'"; case Field::DateTime: return dateTimeToSQL( v.toDateTime() ); case Field::BLOB: { diff --git a/kexi/kexidb/driver.h b/kexi/kexidb/driver.h index 3fc1acbf3..4abe86996 100644 --- a/kexi/kexidb/driver.h +++ b/kexi/kexidb/driver.h @@ -243,8 +243,8 @@ class KEXI_DB_EXPORT Driver : public TQObject, public KexiDB::Object @todo add support for time zones? */ //old const TQDateTime dt( v.toDateTime() ); -//old return TQString("\'")+dt.date().toString(Qt::ISODate)+" "+dt.time().toString(Qt::ISODate)+"\'"; - return TQString("\'")+v.toString(Qt::ISODate)+"\'"; +//old return TQString("\'")+dt.date().toString(TQt::ISODate)+" "+dt.time().toString(TQt::ISODate)+"\'"; + return TQString("\'")+v.toString(TQt::ISODate)+"\'"; } /*! Driver-specific SQL string escaping. diff --git a/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp b/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp index 74479fe77..6f9195859 100644 --- a/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp @@ -229,7 +229,7 @@ m_stringBuffer[ 1024 ]; ??? break; case KexiDB::Field::Time: res = sqlite3_bind_text(prepared_st_handle, arg, - (*it).toTime().toString(Qt::ISODate).latin1(), + (*it).toTime().toString(TQt::ISODate).latin1(), sizeof("HH:MM:SS"), SQLITE_TRANSIENT /*??*/); if (SQLITE_OK != res) { //! @todo msg? @@ -238,7 +238,7 @@ m_stringBuffer[ 1024 ]; ??? break; case KexiDB::Field::Date: res = sqlite3_bind_text(prepared_st_handle, arg, - (*it).toDate().toString(Qt::ISODate).latin1(), + (*it).toDate().toString(TQt::ISODate).latin1(), sizeof("YYYY-MM-DD"), SQLITE_TRANSIENT /*??*/); if (SQLITE_OK != res) { //! @todo msg? @@ -247,7 +247,7 @@ m_stringBuffer[ 1024 ]; ??? break; case KexiDB::Field::DateTime: res = sqlite3_bind_text(prepared_st_handle, arg, - (*it).toDateTime().toString(Qt::ISODate).latin1(), + (*it).toDateTime().toString(TQt::ISODate).latin1(), sizeof("YYYY-MM-DDTHH:MM:SS"), SQLITE_TRANSIENT /*??*/); if (SQLITE_OK != res) { //! @todo msg? diff --git a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp index 6a80f76de..902e729a5 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp @@ -141,14 +141,14 @@ class KexiDB::SQLiteCursorData : public SQLiteConnectionInternal else { switch (f->type()) { case Field::Date: - return TQDate::fromString( GET_sqlite3_column_text, Qt::ISODate ); + return TQDate::fromString( GET_sqlite3_column_text, TQt::ISODate ); case Field::Time: //TQDateTime - a hack needed because TQVariant(TQTime) has broken isNull() return KexiUtils::stringToHackedTQTime(GET_sqlite3_column_text); case Field::DateTime: { TQString tmp( GET_sqlite3_column_text ); tmp[10] = 'T'; //for ISODate compatibility - return TQDateTime::fromString( tmp, Qt::ISODate ); + return TQDateTime::fromString( tmp, TQt::ISODate ); } case Field::Boolean: return TQVariant(sqliteStringToBool(GET_sqlite3_column_text)); @@ -483,7 +483,7 @@ void SQLiteCursor::storeCurrentRow(RowData &data) const data[i] = TQVariant( sqliteStringToBool(TQString::fromLatin1(*col)) ); break; case Field::Date: - data[i] = TQDate::fromString( TQString::fromLatin1(*col), Qt::ISODate ); + data[i] = TQDate::fromString( TQString::fromLatin1(*col), TQt::ISODate ); break; case Field::Time: //TQDateTime - a hack needed because TQVariant(TQTime) has broken isNull() @@ -492,7 +492,7 @@ void SQLiteCursor::storeCurrentRow(RowData &data) const case Field::DateTime: { TQString tmp( TQString::fromLatin1(*col) ); tmp[10] = 'T'; - data[i] = TQDateTime::fromString( tmp, Qt::ISODate ); + data[i] = TQDateTime::fromString( tmp, TQt::ISODate ); break; } default: diff --git a/kexi/kexidb/drivers/sqlite/sqlitepreparedstatement.cpp b/kexi/kexidb/drivers/sqlite/sqlitepreparedstatement.cpp index bccfd11b5..7a811d559 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitepreparedstatement.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitepreparedstatement.cpp @@ -178,7 +178,7 @@ bool SQLitePreparedStatement::execute() break; case KexiDB::Field::Time: res = sqlite3_bind_text(prepared_st_handle, arg, - TQString((*it).toTime().toString(Qt::ISODate)).latin1(), + TQString((*it).toTime().toString(TQt::ISODate)).latin1(), sizeof("HH:MM:SS"), SQLITE_TRANSIENT /*??*/); if (SQLITE_OK != res) { //! @todo msg? @@ -187,7 +187,7 @@ bool SQLitePreparedStatement::execute() break; case KexiDB::Field::Date: res = sqlite3_bind_text(prepared_st_handle, arg, - TQString((*it).toDate().toString(Qt::ISODate)).latin1(), + TQString((*it).toDate().toString(TQt::ISODate)).latin1(), sizeof("YYYY-MM-DD"), SQLITE_TRANSIENT /*??*/); if (SQLITE_OK != res) { //! @todo msg? @@ -196,7 +196,7 @@ bool SQLitePreparedStatement::execute() break; case KexiDB::Field::DateTime: res = sqlite3_bind_text(prepared_st_handle, arg, - (*it).toDateTime().toString(Qt::ISODate).latin1(), + (*it).toDateTime().toString(TQt::ISODate).latin1(), sizeof("YYYY-MM-DDTHH:MM:SS"), SQLITE_TRANSIENT /*??*/); if (SQLITE_OK != res) { //! @todo msg? diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp index f4e5ccfe8..25af20ee9 100644 --- a/kexi/kexidb/expression.cpp +++ b/kexi/kexidb/expression.cpp @@ -539,12 +539,12 @@ TQString ConstExpr::toString(QuerySchemaParameterValueListIterator* params) else if (m_token==REAL_CONST) return TQString::number(value.toPoint().x())+"."+TQString::number(value.toPoint().y()); else if (m_token==DATE_CONST) - return "'" + value.toDate().toString(Qt::ISODate) + "'"; + return "'" + value.toDate().toString(TQt::ISODate) + "'"; else if (m_token==DATETIME_CONST) - return "'" + value.toDateTime().date().toString(Qt::ISODate) - + " " + value.toDateTime().time().toString(Qt::ISODate) + "'"; + return "'" + value.toDateTime().date().toString(TQt::ISODate) + + " " + value.toDateTime().time().toString(TQt::ISODate) + "'"; else if (m_token==TIME_CONST) - return "'" + value.toTime().toString(Qt::ISODate) + "'"; + return "'" + value.toTime().toString(TQt::ISODate) + "'"; return value.toString(); } diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp index 41cce80be..e2dd698e8 100644 --- a/kexi/kexidb/field.cpp +++ b/kexi/kexidb/field.cpp @@ -452,21 +452,21 @@ Field::setDefaultValue(const TQCString& def) m_defaultValue = TQVariant((bool)v); break; }case Date: {//YYYY-MM-DD - TQDate date = TQDate::fromString( def, Qt::ISODate ); + TQDate date = TQDate::fromString( def, TQt::ISODate ); if (!date.isValid()) m_defaultValue = TQVariant(); else m_defaultValue = TQVariant(date); break; }case DateTime: {//YYYY-MM-DDTHH:MM:SS - TQDateTime dt = TQDateTime::fromString( def, Qt::ISODate ); + TQDateTime dt = TQDateTime::fromString( def, TQt::ISODate ); if (!dt.isValid()) m_defaultValue = TQVariant(); else m_defaultValue = TQVariant(dt); break; }case Time: {//HH:MM:SS - TQTime time = TQTime::fromString( def, Qt::ISODate ); + TQTime time = TQTime::fromString( def, TQt::ISODate ); if (!time.isValid()) m_defaultValue = TQVariant(); else diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h index 7ad113241..89af157ce 100644 --- a/kexi/kexiutils/utils.h +++ b/kexi/kexiutils/utils.h @@ -82,8 +82,8 @@ namespace KexiUtils { if (s.isEmpty()) return TQDateTime(); - // kdDebug() << TQDateTime( TQDate(0,1,2), TQTime::fromString( s, Qt::ISODate ) ).toString(Qt::ISODate) << endl;; - return TQDateTime( TQDate(0,1,2), TQTime::fromString( s, Qt::ISODate ) ); + // kdDebug() << TQDateTime( TQDate(0,1,2), TQTime::fromString( s, TQt::ISODate ) ).toString(TQt::ISODate) << endl;; + return TQDateTime( TQDate(0,1,2), TQTime::fromString( s, TQt::ISODate ) ); } /*! Sets "wait" cursor with 1 second delay (or 0 seconds if noDelay is true). diff --git a/kexi/main/ksplitter.h b/kexi/main/ksplitter.h index 47e9307ce..05f2d5682 100644 --- a/kexi/main/ksplitter.h +++ b/kexi/main/ksplitter.h @@ -53,10 +53,10 @@ public: * Constructor. * @param parent parent widget * @param name name - * @param orient orientation. Either @p Qt::Vertical or @p Qt::Horizontal + * @param orient orientation. Either @p TQt::Vertical or @p TQt::Horizontal * @param pos procentual position of the splitter. Must be int [0...100]. */ - KDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50); + KDockSplitter(TQWidget *parent= 0, const char *name= 0, TQt::Orientation orient=TQt::Vertical, int pos= 50); virtual ~KDockSplitter(){}; /** @@ -169,9 +169,9 @@ public: void restoreFromForcedFixedSize(KDockWidget *dw); /** - * The orientation is either @p Qt::Horizontal or @p Qt::Vertical. + * The orientation is either @p TQt::Horizontal or @p TQt::Vertical. */ - Qt::Orientation orientation(){return m_orientation;} + TQt::Orientation orientation(){return m_orientation;} protected: friend class KDockContainer; @@ -223,7 +223,7 @@ private: * child[01]->getWidget() may be KDockContainer. */ TQWidget *child0, *child1; - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; /** * If initialised is true, the divider!=0L. If false, the divider==0L! */ @@ -235,7 +235,7 @@ private: TQFrame* divider; /** * @p xpos and @p savedXPos represent the current divider position. - * If the orientation is Qt::Horizontal @p xpos actually is "ypos". So + * If the orientation is horizontal @p xpos actually is "ypos". So * do not get confused only because of the 'x'. * * xpos and savedXPos are internally high resolution. So *not* 0..100% diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index 49a55a35c..9f3e5de74 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -358,7 +358,7 @@ void KexiStartupDialog::setupPageTemplates() templPageFrame = d->templatesWidget->addPage ( i18n("Personal Databases"), i18n("New Personal Database Project Templates"), DesktopIcon("folder_home") ); tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); - d->viewPersonalTempl = new TemplatesPage(Qt::Vertical, templPageFrame, "personal_page" ); + d->viewPersonalTempl = new TemplatesPage(TQt::Vertical, templPageFrame, "personal_page" ); tmplyr->addWidget( d->viewPersonalTempl ); connect(d->viewPersonalTempl->templates,TQT_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); connect(d->viewPersonalTempl->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); @@ -372,7 +372,7 @@ void KexiStartupDialog::setupPageTemplates() i18n("Business Databases"), i18n("New Business Database Project Templates"), DesktopIcon( "business_user" )); tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); - d->viewBusinessTempl = new TemplatesPage(Qt::Vertical, templPageFrame, "business_page" ); + d->viewBusinessTempl = new TemplatesPage(TQt::Vertical, templPageFrame, "business_page" ); tmplyr->addWidget( d->viewBusinessTempl ); connect(d->viewBusinessTempl->templates,TQT_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); connect(d->viewBusinessTempl->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index 8f4457371..7b0aa5c84 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -410,7 +410,7 @@ bool KexiStartupFileDialog::eventFilter ( TQObject * watched, TQEvent * e ) { //filter-out ESC key if (e->type()==TQEvent::KeyPress && TQT_TQKEYEVENT(e)->key()==TQt::Key_Escape - && TQT_TQKEYEVENT(e)->state()==Qt::NoButton) { + && TQT_TQKEYEVENT(e)->state()==TQt::NoButton) { TQT_TQKEYEVENT(e)->accept(); emit rejected(); return true; diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index afe2e3aa2..d9e33b9bc 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -239,7 +239,7 @@ TQRect KexiDBComboBox::buttonGeometry() const bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e) { - if ( e->button() != Qt::LeftButton || d->designMode ) + if ( e->button() != TQt::LeftButton || d->designMode ) return true; /*todo if ( m_discardNextMousePress ) { d->discardNextMousePress = FALSE; @@ -270,9 +270,9 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e) bool KexiDBComboBox::handleKeyPressEvent(TQKeyEvent *ke) { const int k = ke->key(); - const bool dropDown = (ke->state() == Qt::NoButton && ((k==TQt::Key_F2 && !d->isEditable) || k==TQt::Key_F4)) + const bool dropDown = (ke->state() == TQt::NoButton && ((k==TQt::Key_F2 && !d->isEditable) || k==TQt::Key_F4)) || (ke->state() == TQt::AltButton && k==TQt::Key_Down); - const bool escPressed = ke->state() == Qt::NoButton && k==TQt::Key_Escape; + const bool escPressed = ke->state() == TQt::NoButton && k==TQt::Key_Escape; const bool popupVisible = popup() && popup()->isVisible(); if ((dropDown || escPressed) && popupVisible) { popup()->hide(); @@ -302,12 +302,12 @@ bool KexiDBComboBox::keyPressed(TQKeyEvent *ke) const int k = ke->key(); const bool popupVisible = popup() && popup()->isVisible(); - const bool escPressed = ke->state() == Qt::NoButton && k==TQt::Key_Escape; + const bool escPressed = ke->state() == TQt::NoButton && k==TQt::Key_Escape; if (escPressed && popupVisible) { popup()->hide(); return true; } - if (ke->state() == Qt::NoButton && (k==TQt::Key_PageDown || k==TQt::Key_PageUp) && popupVisible) + if (ke->state() == TQt::NoButton && (k==TQt::Key_PageDown || k==TQt::Key_PageUp) && popupVisible) return true; return false; } diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp index a6603867e..0fb4519e2 100644 --- a/kexi/plugins/forms/widgets/kexidbform.cpp +++ b/kexi/plugins/forms/widgets/kexidbform.cpp @@ -396,8 +396,8 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) if (preview()) { TQKeyEvent *ke = TQT_TQKEYEVENT(e); const int key = ke->key(); - bool tab = ke->state() == Qt::NoButton && key == TQt::Key_Tab; - bool backtab = ((ke->state() == Qt::NoButton || ke->state() == TQt::ShiftButton) && key == TQt::Key_Backtab) + bool tab = ke->state() == TQt::NoButton && key == TQt::Key_Tab; + bool backtab = ((ke->state() == TQt::NoButton || ke->state() == TQt::ShiftButton) && key == TQt::Key_Backtab) || (ke->state() == TQt::ShiftButton && key == TQt::Key_Tab); TQObject *o = watched; //focusWidget(); TQWidget* realWidget = dynamic_cast<TQWidget*>(o); //will beused below (for tab/backtab handling) @@ -405,9 +405,9 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) if (!tab && !backtab) { //for buttons, left/up and right/down keys act like tab/backtab (see qbutton.cpp) if (realWidget->inherits("TQButton")) { - if (ke->state() == Qt::NoButton && (key == TQt::Key_Right || key == TQt::Key_Down)) + if (ke->state() == TQt::NoButton && (key == TQt::Key_Right || key == TQt::Key_Down)) tab = true; - else if (ke->state() == Qt::NoButton && (key == TQt::Key_Left || key == TQt::Key_Up)) + else if (ke->state() == TQt::NoButton && (key == TQt::Key_Left || key == TQt::Key_Up)) backtab = true; } } @@ -437,7 +437,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) int curCol = d->dataAwareObject->currentColumn(); bool moveToFirstField; //if true, we'll move focus to the first field (in tab order) bool moveToLastField; //if true, we'll move focus to the first field (in tab order) - if (! (ke->state() == Qt::NoButton && (key == TQt::Key_Home + if (! (ke->state() == TQt::NoButton && (key == TQt::Key_Home || key == TQt::Key_End || key == TQt::Key_Down || key == TQt::Key_Up)) /* ^^ home/end/down/up are already handled by widgets */ && d->dataAwareObject->handleKeyPress( @@ -474,7 +474,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) } } // handle Esc key - if (ke->state() == Qt::NoButton && key == TQt::Key_Escape) { + if (ke->state() == TQt::NoButton && key == TQt::Key_Escape) { //cancel field editing/row editing if possible if (d->dataAwareObject->cancelEditor()) return true; diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index 1d81cc1cf..f205de05f 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -773,7 +773,7 @@ void KexiDBImageBox::setColumnInfo(KexiDB::QueryColumnInfo* cinfo) bool KexiDBImageBox::keyPressed(TQKeyEvent *ke) { // Esc key should close the popup - if (ke->state() == Qt::NoButton && ke->key() == TQt::Key_Escape) { + if (ke->state() == TQt::NoButton && ke->key() == TQt::Key_Escape) { if (m_popupMenu->isVisible()) { m_setFocusOnButtonAfterClosingPopup = true; return true; diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp index 7b369c60e..ee606300a 100644 --- a/kexi/plugins/importexport/csv/kexicsvexport.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp @@ -223,11 +223,11 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery, APPEND( cursor->value(real_i).toString() ); } else if (isDateTime[real_i]) { //avoid "T" in ISO DateTime - APPEND( cursor->value(real_i).toDateTime().date().toString(Qt::ISODate)+" " - + cursor->value(real_i).toDateTime().time().toString(Qt::ISODate) ); + APPEND( cursor->value(real_i).toDateTime().date().toString(TQt::ISODate)+" " + + cursor->value(real_i).toDateTime().time().toString(TQt::ISODate) ); } else if (isTime[real_i]) { //time is temporarily stored as null date + time... - APPEND( cursor->value(real_i).toTime().toString(Qt::ISODate) ); + APPEND( cursor->value(real_i).toTime().toString(TQt::ISODate) ); } else if (isBLOB[real_i]) { //BLOB is escaped in a special way if (hasTextQuote) diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index b2d3940c4..19e30f248 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -140,7 +140,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, m_showOptionsButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); // -<options section> - m_exportOptionsSection = new TQGroupBox(1,Qt::Vertical, i18n("Options"), m_exportOptionsPage, + m_exportOptionsSection = new TQGroupBox(1,TQt::Vertical, i18n("Options"), m_exportOptionsPage, "m_exportOptionsSection"); m_exportOptionsSection->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); exportOptionsLyr->addMultiCellWidget(m_exportOptionsSection, 3, 3, 0, 1); diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index cccc5f8bc..daf536c59 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -1078,7 +1078,7 @@ bool KexiCSVImportDialog::parseDate(const TQString& text, TQDate& date) bool KexiCSVImportDialog::parseTime(const TQString& text, TQTime& time) { - time = TQTime::fromString(text, Qt::ISODate); //same as m_timeRegExp1 + time = TQTime::fromString(text, TQt::ISODate); //same as m_timeRegExp1 if (time.isValid()) return true; if (m_timeRegExp2.exactMatch(text)) { //hh:mm:ss diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index 582d79e62..6d5d557c9 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -145,7 +145,7 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor( { d->conn = mainWin->project()->dbConnection(); - d->spl = new TQSplitter(Qt::Vertical, this); + d->spl = new TQSplitter(TQt::Vertical, this); d->spl->setChildrenCollapsible(false); d->relations = new KexiRelationWidget(mainWin, d->spl, "relations"); connect(d->relations, TQT_SIGNAL(tableAdded(KexiDB::TableSchema&)), @@ -155,7 +155,7 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor( connect(d->relations, TQT_SIGNAL(tableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&)), this, TQT_SLOT(slotTableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&))); - d->head = new KexiSectionHeader(i18n("Query Columns"),Qt::Vertical, d->spl); + d->head = new KexiSectionHeader(i18n("Query Columns"),TQt::Vertical, d->spl); d->dataTable = new KexiDataTable(mainWin, d->head, "guieditor_dataTable", false); d->dataTable->dataAwareObject()->setSpreadSheetMode(); @@ -1349,7 +1349,7 @@ KexiQueryDesignerGuiEditor::parseExpressionString(const TQString& fullString, in { valueExpr = new KexiDB::ConstExpr(DATE_CONST, TQDate::fromString( re.cap(1).rightJustify(4, '0')+"-"+re.cap(2).rightJustify(2, '0') - +"-"+re.cap(3).rightJustify(2, '0'), Qt::ISODate)); + +"-"+re.cap(3).rightJustify(2, '0'), TQt::ISODate)); } else if ((re = TQRegExp("(\\d{1,2}):(\\d{1,2})")).exactMatch( str ) || (re = TQRegExp("(\\d{1,2}):(\\d{1,2}):(\\d{1,2})")).exactMatch( str )) @@ -1357,7 +1357,7 @@ KexiQueryDesignerGuiEditor::parseExpressionString(const TQString& fullString, in TQString res = re.cap(1).rightJustify(2, '0')+":"+re.cap(2).rightJustify(2, '0') +":"+re.cap(3).rightJustify(2, '0'); // kexipluginsdbg << res << endl; - valueExpr = new KexiDB::ConstExpr(TIME_CONST, TQTime::fromString(res, Qt::ISODate)); + valueExpr = new KexiDB::ConstExpr(TIME_CONST, TQTime::fromString(res, TQt::ISODate)); } else if ((re = TQRegExp("(\\d{1,4})-(\\d{1,2})-(\\d{1,2})\\s+(\\d{1,2}):(\\d{1,2})")).exactMatch( str ) || (re = TQRegExp("(\\d{1,4})-(\\d{1,2})-(\\d{1,2})\\s+(\\d{1,2}):(\\d{1,2}):(\\d{1,2})")).exactMatch( str )) @@ -1368,7 +1368,7 @@ KexiQueryDesignerGuiEditor::parseExpressionString(const TQString& fullString, in +":"+re.cap(6).rightJustify(2, '0'); // kexipluginsdbg << res << endl; valueExpr = new KexiDB::ConstExpr(DATETIME_CONST, - TQDateTime::fromString(res, Qt::ISODate)); + TQDateTime::fromString(res, TQt::ISODate)); } else if (str[0]>='0' && str[0]<='9' || str[0]=='-' || str[0]=='+') { //number diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index 5e076cb45..be57a7662 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -104,8 +104,8 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi , d( new Private() ) { d->splitter = new TQSplitter(this); - d->splitter->setOrientation(Qt::Vertical); - d->head = new KexiSectionHeader(i18n("SQL Query Text"),Qt::Vertical, d->splitter); + d->splitter->setOrientation(TQt::Vertical); + d->head = new KexiSectionHeader(i18n("SQL Query Text"),TQt::Vertical, d->splitter); d->editor = new KexiQueryDesignerSQLEditor(mainWin, d->head, "sqle"); // d->editor->installEventFilter(this);//for keys connect(d->editor, TQT_SIGNAL(textChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotTextChanged())); @@ -140,7 +140,7 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi plugSharedAction("querypart_view_toggle_history", TQT_TQOBJECT(this), TQT_SLOT(slotUpdateMode())); d->action_toggle_history = static_cast<TDEToggleAction*>( sharedAction( "querypart_view_toggle_history" ) ); - d->historyHead = new KexiSectionHeader(i18n("SQL Query History"),Qt::Vertical, d->history_section); + d->historyHead = new KexiSectionHeader(i18n("SQL Query History"),TQt::Vertical, d->history_section); d->historyHead->installEventFilter(this); d->history = new KexiQueryDesignerSQLHistory(d->historyHead, "sql_history"); diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index fba543db3..883bf3cad 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -100,7 +100,7 @@ KexiQueryDesignerSQLHistory::contentsMousePressEvent(TQMouseEvent * e) m_selected = popupHistory; m_selected->setSelected(true, colorGroup()); updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics())); - if(e->button() == Qt::RightButton) { + if(e->button() == TQt::RightButton) { m_popup->exec(e->globalPos()); } } diff --git a/kexi/plugins/reports/reportwidgets.cpp b/kexi/plugins/reports/reportwidgets.cpp index 7cea50a35..08b41a372 100644 --- a/kexi/plugins/reports/reportwidgets.cpp +++ b/kexi/plugins/reports/reportwidgets.cpp @@ -104,7 +104,7 @@ ReportLine::paintEvent (TQPaintEvent *ev) TQPainter p(this); if(!ev->erased()) p.eraseRect(0, 0, width(), height()); - TQPen pen(m_color, m_lineWidth, (Qt::PenStyle)m_lineStyle); + TQPen pen(m_color, m_lineWidth, (TQt::PenStyle)m_lineStyle); pen.setCapStyle((TQt::PenCapStyle)m_capStyle); p.setPen(pen); p.drawLine(0, 0, width() -1, height() - 1); diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp index e991d61dc..6de68b7da 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp @@ -72,7 +72,7 @@ KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *pa d->updatesProperties = false; TQSplitter* splitter = new TQSplitter(this); - splitter->setOrientation(Qt::Vertical); + splitter->setOrientation(TQt::Vertical); TQHBoxLayout* layout = new TQHBoxLayout(this); layout->addWidget(splitter); diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 99deccf63..1d59dae04 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -582,13 +582,13 @@ bool KexiBrowser::eventFilter ( TQObject *o, TQEvent * e ) else if (e->type()==TQEvent::AccelOverride) { TQKeyEvent *ke = TQT_TQKEYEVENT(e); //override delete action - if (ke->key()==TQt::Key_Delete && ke->state()==Qt::NoButton) { + if (ke->key()==TQt::Key_Delete && ke->state()==TQt::NoButton) { slotRemove(); ke->accept(); return true; } //override rename action - if (ke->key()==TQt::Key_F2 && ke->state()==Qt::NoButton) { + if (ke->key()==TQt::Key_F2 && ke->state()==TQt::NoButton) { slotRename(); ke->accept(); return true; diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp index 7a414d2b7..1176b793b 100644 --- a/kexi/widget/kexisectionheader.cpp +++ b/kexi/widget/kexisectionheader.cpp @@ -48,7 +48,7 @@ class KexiSectionHeaderPrivate { } - Qt::Orientation orientation; + TQt::Orientation orientation; TQLabel *lbl; KexiSectionHeader::BoxLayout *lyr; TQHBox *lbl_b; @@ -56,12 +56,12 @@ class KexiSectionHeaderPrivate //========================== -KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o, TQWidget* parent ) +KexiSectionHeader::KexiSectionHeader(const TQString &caption, TQt::Orientation o, TQWidget* parent ) : TQWidget(parent, "KexiSectionHeader") , d( new KexiSectionHeaderPrivate() ) { d->orientation = o; - d->lyr = new BoxLayout( this, d->orientation==Qt::Vertical ? TQBoxLayout::TopToBottom : TQBoxLayout::LeftToRight ); + d->lyr = new BoxLayout( this, d->orientation==TQt::Vertical ? TQBoxLayout::TopToBottom : TQBoxLayout::LeftToRight ); d->lyr->setAutoAdd(true); d->lbl_b = new TQHBox(this); d->lbl = new TQLabel(TQString(" ")+caption, d->lbl_b); diff --git a/kexi/widget/kexisectionheader.h b/kexi/widget/kexisectionheader.h index 1b1054c38..083fac1a8 100644 --- a/kexi/widget/kexisectionheader.h +++ b/kexi/widget/kexisectionheader.h @@ -31,7 +31,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSectionHeader : public TQWidget public: class BoxLayout; - KexiSectionHeader(const TQString &caption, Qt::Orientation o, + KexiSectionHeader(const TQString &caption, TQt::Orientation o, TQWidget* parent = 0 ); virtual ~KexiSectionHeader(); diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index 47e9c8595..81ce13823 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -383,7 +383,7 @@ KexiRelationView::contentsMousePressEvent(TQMouseEvent *ev) emit connectionViewGotFocus(); // invalidateActions(); - if(ev->button() == Qt::RightButton) {//show popup + if(ev->button() == TQt::RightButton) {//show popup kdDebug() << "KexiRelationView::contentsMousePressEvent(): context" << endl; // TQPopupMenu m; // m_removeSelectedTableQueryAction->plug( &m ); @@ -396,7 +396,7 @@ KexiRelationView::contentsMousePressEvent(TQMouseEvent *ev) //connection not found clearSelection(); // invalidateActions(); - if(ev->button() == Qt::RightButton) {//show popup on view background area + if(ev->button() == TQt::RightButton) {//show popup on view background area // TQPopupMenu m; // m_removeSelectedConnectionAction->plug( &m ); emit emptyAreaContextMenuRequest( ev->globalPos() ); diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 4bab34e40..2e18e00a2 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -208,7 +208,7 @@ bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev) { if (ev->type()==TQEvent::MouseMove) { - if (m_dragging && TQT_TQMOUSEEVENT(ev)->state()==Qt::LeftButton) { + if (m_dragging && TQT_TQMOUSEEVENT(ev)->state()==TQt::LeftButton) { int diffX,diffY; diffX=TQT_TQMOUSEEVENT(ev)->globalPos().x()-m_grabX; diffY=TQT_TQMOUSEEVENT(ev)->globalPos().y()-m_grabY; @@ -260,7 +260,7 @@ void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) { kdDebug()<<"KexiRelationViewTableContainerHeader::Mouse Press Event"<<endl; parentWidget()->setFocus(); ev->accept(); - if (ev->button()==Qt::LeftButton) { + if (ev->button()==TQt::LeftButton) { m_dragging=true; m_grabX=ev->globalPos().x(); m_grabY=ev->globalPos().y(); @@ -269,7 +269,7 @@ void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) { setCursor(TQt::SizeAllCursor); return; } - if (ev->button()==Qt::RightButton) { + if (ev->button()==TQt::RightButton) { emit static_cast<KexiRelationViewTableContainer*>(parentWidget()) ->contextMenuRequest(ev->globalPos()); } @@ -278,7 +278,7 @@ void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) { void KexiRelationViewTableContainerHeader::mouseReleaseEvent(TQMouseEvent *ev) { kdDebug()<<"KexiRelationViewTableContainerHeader::Mouse Release Event"<<endl; - if (m_dragging && ev->button() & Qt::LeftButton) { + if (m_dragging && ev->button() & TQt::LeftButton) { setCursor(TQt::ArrowCursor); m_dragging=false; emit endDrag(); @@ -413,7 +413,7 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev) parentWidget()->setFocus(); setFocus(); TDEListView::contentsMousePressEvent(ev); -// if (ev->button()==Qt::RightButton) +// if (ev->button()==TQt::RightButton) // static_cast<KexiRelationView*>(parentWidget())->executePopup(ev->pos()); } diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index 0c153c75f..75f516111 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -413,13 +413,13 @@ bool KexiBlobTableEdit::handleKeyPress( TQKeyEvent* ke, bool editorActive ) const int k = ke->key(); KKey kkey(ke); if (!d->readOnly) { - if ((ke->state()==Qt::NoButton && k==TQt::Key_F4) + if ((ke->state()==TQt::NoButton && k==TQt::Key_F4) || (ke->state()==TQt::AltButton && k==TQt::Key_Down)) { d->button->animateClick(); - TQMouseEvent me( TQEvent::MouseButtonPress, TQPoint(2,2), Qt::LeftButton, Qt::NoButton ); + TQMouseEvent me( TQEvent::MouseButtonPress, TQPoint(2,2), TQt::LeftButton, TQt::NoButton ); TQApplication::sendEvent( d->button, &me ); } - else if ((ke->state()==Qt::NoButton && (k==TQt::Key_F2 || k==TQt::Key_Space || k==TQt::Key_Enter || k==TQt::Key_Return))) { + else if ((ke->state()==TQt::NoButton && (k==TQt::Key_F2 || k==TQt::Key_Space || k==TQt::Key_Enter || k==TQt::Key_Return))) { d->popup->insertFromFile(); } else @@ -459,7 +459,7 @@ bool KexiBlobTableEdit::eventFilter( TQObject *o, TQEvent *e ) TQKeyEvent* ke = TQT_TQKEYEVENT(e); const int state = ke->state(); const int k = ke->key(); - if ( (state==Qt::NoButton && (k==TQt::Key_Tab || k==TQt::Key_Left || k==TQt::Key_Right)) + if ( (state==TQt::NoButton && (k==TQt::Key_Tab || k==TQt::Key_Left || k==TQt::Key_Right)) || (state==TQt::ShiftButton && k==TQt::Key_Backtab) ) { diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp index 8a0e678a3..dfd6edb45 100644 --- a/kexi/widget/tableview/kexicomboboxpopup.cpp +++ b/kexi/widget/tableview/kexicomboboxpopup.cpp @@ -353,7 +353,7 @@ bool KexiComboBoxPopup::eventFilter( TQObject *o, TQEvent *e ) if (e->type()==TQEvent::KeyPress) { TQKeyEvent *ke = TQT_TQKEYEVENT(e); const int k = ke->key(); - if ((ke->state()==Qt::NoButton && (k==Key_Escape || k==Key_F4)) + if ((ke->state()==TQt::NoButton && (k==Key_Escape || k==Key_F4)) || (ke->state()==AltButton && k==Key_Up)) { hide(); diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp index 9eecc4986..a818e40b9 100644 --- a/kexi/widget/tableview/kexicomboboxtableedit.cpp +++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp @@ -298,7 +298,7 @@ void KexiComboBoxTableEdit::show() bool KexiComboBoxTableEdit::handleKeyPress( TQKeyEvent *ke, bool editorActive ) { const int k = ke->key(); - if ((ke->state()==Qt::NoButton && k==TQt::Key_F4) + if ((ke->state()==TQt::NoButton && k==TQt::Key_F4) || (ke->state()==AltButton && k==TQt::Key_Down)) { //show popup diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp index 4ff506737..2ba852944 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.cpp +++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp @@ -1668,7 +1668,7 @@ bool KexiDataAwareObjectInterface::handleKeyPress(TQKeyEvent *e, int &curRow, in if (moveToLastField) *moveToLastField = false; - const bool nobtn = e->state()==Qt::NoButton; + const bool nobtn = e->state()==TQt::NoButton; const int k = e->key(); //kdDebug() << "-----------" << e->state() << " " << k << endl; diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp index 36a44566f..da553388e 100644 --- a/kexi/widget/tableview/kexidatetableedit.cpp +++ b/kexi/widget/tableview/kexidatetableedit.cpp @@ -99,7 +99,7 @@ void KexiDateTableEdit::setupContents( TQPainter *p, bool focused, const TQVaria #endif if (val.toDate().isValid()) txt = m_formatter.dateToString(val.toDate()); -// txt = val.toDate().toString(Qt::LocalDate); +// txt = val.toDate().toString(TQt::LocalDate); align |= AlignLeft; } diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index 39e397ea5..284cbd1da 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -241,7 +241,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch // Create headers m_horizontalHeader = new KexiTableViewHeader(this, "topHeader"); m_horizontalHeader->setSelectionBackgroundColor( palette().active().highlight() ); - m_horizontalHeader->setOrientation(Qt::Horizontal); + m_horizontalHeader->setOrientation(TQt::Horizontal); m_horizontalHeader->setTracking(false); m_horizontalHeader->setMovingEnabled(false); connect(m_horizontalHeader, TQT_SIGNAL(sizeChange(int,int,int)), this, TQT_SLOT(slotTopHeaderSizeChange(int,int,int))); @@ -1023,11 +1023,11 @@ void KexiTableView::contentsMousePressEvent( TQMouseEvent* e ) } // kdDebug(44021)<<"void KexiTableView::contentsMousePressEvent( TQMouseEvent* e ) by now the current items should be set, if not -> error + crash"<<endl; - if(e->button() == Qt::RightButton) + if(e->button() == TQt::RightButton) { showContextMenu(e->globalPos()); } - else if(e->button() == Qt::LeftButton) + else if(e->button() == TQt::LeftButton) { if(columnType(m_curCol) == KexiDB::Field::Boolean && columnEditable(m_curCol)) { @@ -1115,7 +1115,7 @@ bool KexiTableView::handleContentsMousePressOrRelease(TQMouseEvent* e, bool rele } newcol = columnAt(e->pos().x()); - if(e->button() != Qt::NoButton) { + if(e->button() != TQt::NoButton) { setCursorPosition(newrow,newcol); } return true; @@ -1244,9 +1244,9 @@ bool KexiTableView::shortCutPressed( TQKeyEvent *e, const TQCString &action_name if (action_name=="edit_delete_row") return k == TQt::Key_Delete && e->state()==TQt::ControlButton; if (action_name=="edit_delete") - return k == TQt::Key_Delete && e->state()==Qt::NoButton; + return k == TQt::Key_Delete && e->state()==TQt::NoButton; if (action_name=="edit_edititem") - return k == TQt::Key_F2 && e->state()==Qt::NoButton; + return k == TQt::Key_F2 && e->state()==TQt::NoButton; if (action_name=="edit_insert_empty_row") return k == TQt::Key_Insert && e->state()==(TQt::ShiftButton | TQt::ControlButton); @@ -1317,7 +1317,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e) int curRow = m_curRow; int curCol = m_curCol; - const bool nobtn = e->state()==Qt::NoButton; + const bool nobtn = e->state()==TQt::NoButton; bool printable = false; //check shared shortcuts @@ -2423,7 +2423,7 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e ) return true; } else if (m_editor && (o==dynamic_cast<TQObject*>(m_editor) || o==m_editor->widget())) { - if ( (k==TQt::Key_Tab && (s==Qt::NoButton || s==TQt::ShiftButton)) + if ( (k==TQt::Key_Tab && (s==TQt::NoButton || s==TQt::ShiftButton)) || (overrideEditorShortcutNeeded(ke)) || (k==TQt::Key_Enter || k==TQt::Key_Return || k==TQt::Key_Up || k==TQt::Key_Down) || (k==TQt::Key_Left && m_editor->cursorAtStart()) diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp index 6279aa049..f22248e67 100644 --- a/kexi/widget/utils/kexiarrowtip.cpp +++ b/kexi/widget/utils/kexiarrowtip.cpp @@ -124,7 +124,7 @@ void KexiArrowTip::drawContents(TQPainter& p) void KexiArrowTip::drawFrame(TQPainter& p) { - TQPen pen(palette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin); + TQPen pen(palette().active().foreground(), 1, TQt::SolidLine, TQt::SquareCap, TQt::MiterJoin); p.setPen( pen ); /* /\ diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp index cf204d135..68ba7deb6 100644 --- a/kexi/widget/utils/kexidropdownbutton.cpp +++ b/kexi/widget/utils/kexidropdownbutton.cpp @@ -67,12 +67,12 @@ TQSize KexiDropDownButton::sizeHint () const void KexiDropDownButton::keyPressEvent( TQKeyEvent * e ) { const int k = e->key(); - const bool dropDown = (e->state() == Qt::NoButton && (k==TQt::Key_Space || k==TQt::Key_Enter || k==TQt::Key_Return || k==TQt::Key_F2 || k==TQt::Key_F4)) + const bool dropDown = (e->state() == TQt::NoButton && (k==TQt::Key_Space || k==TQt::Key_Enter || k==TQt::Key_Return || k==TQt::Key_F2 || k==TQt::Key_F4)) || (e->state() == TQt::AltButton && k==TQt::Key_Down); if (dropDown) { e->accept(); animateClick(); - TQMouseEvent me( TQEvent::MouseButtonPress, TQPoint(2,2), Qt::LeftButton, Qt::NoButton ); + TQMouseEvent me( TQEvent::MouseButtonPress, TQPoint(2,2), TQt::LeftButton, TQt::NoButton ); TQApplication::sendEvent( this, &me ); return; } diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp index 14e5e9595..cedb7b745 100644 --- a/kexi/widget/utils/kexiflowlayout.cpp +++ b/kexi/widget/utils/kexiflowlayout.cpp @@ -69,7 +69,7 @@ KexiFlowLayoutIterator::takeCurrent() KexiFlowLayout::KexiFlowLayout(TQWidget *parent, int border, int space, const char *name) : TQLayout(parent, border, space, name) { - m_orientation =Qt::Horizontal; + m_orientation =TQt::Horizontal; m_justify = false; m_cached_width = 0; } @@ -77,7 +77,7 @@ KexiFlowLayout::KexiFlowLayout(TQWidget *parent, int border, int space, const ch KexiFlowLayout::KexiFlowLayout(TQLayout* parent, int space, const char *name) : TQLayout( parent, space, name ) { - m_orientation =Qt::Horizontal; + m_orientation =TQt::Horizontal; m_justify = false; m_cached_width = 0; } @@ -85,7 +85,7 @@ KexiFlowLayout::KexiFlowLayout(TQLayout* parent, int space, const char *name) KexiFlowLayout::KexiFlowLayout(int space, const char *name) : TQLayout(space, name) { - m_orientation =Qt::Horizontal; + m_orientation =TQt::Horizontal; m_justify = false; m_cached_width = 0; } @@ -104,7 +104,7 @@ KexiFlowLayout::addItem(TQLayoutItem *item) void KexiFlowLayout::addSpacing(int size) { - if (m_orientation ==Qt::Horizontal) + if (m_orientation ==TQt::Horizontal) addItem( TQT_TQLAYOUTITEM(new TQSpacerItem( size, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum )) ); else addItem( TQT_TQLAYOUTITEM(new TQSpacerItem( 0, size, TQSizePolicy::Minimum, TQSizePolicy::Fixed )) ); @@ -145,7 +145,7 @@ KexiFlowLayout::isEmpty() bool KexiFlowLayout::hasHeightForWidth() const { - return (m_orientation ==Qt::Horizontal); + return (m_orientation ==TQt::Horizontal); } int @@ -192,7 +192,7 @@ KexiFlowLayout::minimumSize() const TQSizePolicy::ExpandData KexiFlowLayout::expanding() const { - if(m_orientation == Qt::Vertical) + if(m_orientation == TQt::Vertical) return TQSizePolicy::Vertically; else return TQSizePolicy::Horizontally; @@ -202,7 +202,7 @@ void KexiFlowLayout::setGeometry(const TQRect &r) { TQLayout::setGeometry(r); - if(m_orientation ==Qt::Horizontal) + if(m_orientation ==TQt::Horizontal) doHorizontalLayout(r); else doVerticalLayout(r); @@ -211,7 +211,7 @@ KexiFlowLayout::setGeometry(const TQRect &r) int KexiFlowLayout::simulateLayout(const TQRect &r) { - if(m_orientation ==Qt::Horizontal) + if(m_orientation ==TQt::Horizontal) return doHorizontalLayout(r, true); else return doVerticalLayout(r, true); diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h index fa48df6f5..4ac7450c2 100644 --- a/kexi/widget/utils/kexiflowlayout.h +++ b/kexi/widget/utils/kexiflowlayout.h @@ -37,11 +37,11 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout ie as it is stored in m_list. You must delete the list after using it. */ TQPtrList<TQWidget>* widgetList() const; - /*! Sets layout's orientation to \a orientation. Default orientation is Qt::Vertical. */ - void setOrientation(Qt::Orientation orientation) { m_orientation = orientation; } + /*! Sets layout's orientation to \a orientation. Default orientation is TQt::Vertical. */ + void setOrientation(TQt::Orientation orientation) { m_orientation = orientation; } /*! \return layout's orientation. */ - Qt::Orientation orientation() const { return m_orientation; } + TQt::Orientation orientation() const { return m_orientation; } void setJustified(bool justify) { m_justify = justify; } bool isJustified() const { return m_justify; } @@ -70,7 +70,7 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout int m_cached_width; int m_cached_hfw; bool m_justify; - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; TQSize m_cached_sizeHint; TQSize m_cached_minSize; }; diff --git a/kivio/kiviopart/addstenciltool.cpp b/kivio/kiviopart/addstenciltool.cpp index 7e7a0becb..ddbe38c55 100644 --- a/kivio/kiviopart/addstenciltool.cpp +++ b/kivio/kiviopart/addstenciltool.cpp @@ -53,7 +53,7 @@ bool AddStencilTool::processEvent(TQEvent* e) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if(me->button() == Qt::LeftButton) { + if(me->button() == TQt::LeftButton) { m_leftMouseButtonPressed = true; createStencil(me->pos()); return true; @@ -65,7 +65,7 @@ bool AddStencilTool::processEvent(TQEvent* e) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if(m_leftMouseButtonPressed && (me->button() == Qt::LeftButton)) { + if(m_leftMouseButtonPressed && (me->button() == TQt::LeftButton)) { m_leftMouseButtonPressed = false; endOperation(me->pos()); return true; diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp index 6bf6a3aab..cd09d54cc 100644 --- a/kivio/kiviopart/kivio_page.cpp +++ b/kivio/kiviopart/kivio_page.cpp @@ -1639,7 +1639,7 @@ void KivioPage::saveGuideLines(TQDomElement& element) TQDomElement e = element.ownerDocument().createElement("Guideline"); element.appendChild(e); XmlWriteDouble(e, "pos", *it); - XmlWriteInt(e, "orient", (int)Qt::Horizontal); + XmlWriteInt(e, "orient", (int)TQt::Horizontal); } itEnd = m_vGuideLines.end(); @@ -1648,7 +1648,7 @@ void KivioPage::saveGuideLines(TQDomElement& element) TQDomElement e = element.ownerDocument().createElement("Guideline"); element.appendChild(e); XmlWriteDouble(e, "pos", *it); - XmlWriteInt(e, "orient", (int)Qt::Vertical); + XmlWriteInt(e, "orient", (int)TQt::Vertical); } } @@ -1662,14 +1662,14 @@ void KivioPage::loadGuideLines(const TQDomElement& element) for( ; !e.isNull(); e = e.nextSibling().toElement() ) { double pos = XmlReadDouble(e, "pos", 0.0); - Qt::Orientation orient = (Qt::Orientation)XmlReadInt(e, "orient", 0); + TQt::Orientation orient = (TQt::Orientation)XmlReadInt(e, "orient", 0); addGuideLine(orient, pos); } } -void KivioPage::addGuideLine(Qt::Orientation orientation, double position) +void KivioPage::addGuideLine(TQt::Orientation orientation, double position) { - if(orientation == Qt::Horizontal) { + if(orientation == TQt::Horizontal) { m_hGuideLines.append(position); } else { m_vGuideLines.append(position); diff --git a/kivio/kiviopart/kivio_page.h b/kivio/kiviopart/kivio_page.h index d6bdb02ce..b9c1c314d 100644 --- a/kivio/kiviopart/kivio_page.h +++ b/kivio/kiviopart/kivio_page.h @@ -179,7 +179,7 @@ class KIVIO_EXPORT KivioPage : public TQObject void setPaintSelected(bool paint = true); void setGuideLines(const TQValueList<double> hGuideLines, const TQValueList<double> vGuideLines); - void addGuideLine(Qt::Orientation orientation, double position); + void addGuideLine(TQt::Orientation orientation, double position); signals: void sig_updateView( KivioPage *_page ); diff --git a/kivio/kiviopart/kivio_stackbar.cpp b/kivio/kiviopart/kivio_stackbar.cpp index 1c6954bc4..32d56ce74 100644 --- a/kivio/kiviopart/kivio_stackbar.cpp +++ b/kivio/kiviopart/kivio_stackbar.cpp @@ -61,7 +61,7 @@ void KivioStackBar::insertPage( TQWidget* w, const TQString& title ) connect( b, TQT_SIGNAL(beginDrag()), TQT_SLOT(buttonBeginDrag()) ); connect( b, TQT_SIGNAL(finishDrag()), TQT_SLOT(buttonFinishDrag()) ); connect( b, TQT_SIGNAL(closeRequired(DragBarButton*)), TQT_SLOT(slotDeleteButton(DragBarButton*)) ); - connect(this, TQT_SIGNAL(orientationChanged(Qt::Orientation)), b, TQT_SLOT(setOrientation(Qt::Orientation))); + connect(this, TQT_SIGNAL(orientationChanged(TQt::Orientation)), b, TQT_SLOT(setOrientation(TQt::Orientation))); boxLayout()->addWidget(b); boxLayout()->addWidget(w, 1); @@ -206,8 +206,8 @@ void KivioStackBar::closeEvent(TQCloseEvent* ev) void KivioStackBar::newPlace(TQDockWindow::Place place) { - if((place == OutsideDock) && (orientation() == Qt::Horizontal)) { - setOrientation(Qt::Vertical); + if((place == OutsideDock) && (orientation() == TQt::Horizontal)) { + setOrientation(TQt::Vertical); } } diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index 0b20e35c6..d06bc5f05 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -201,8 +201,8 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) m_pTabBar->setReverseLayout( TQApplication::reverseLayout() ); // Scroll Bar - m_vertScrollBar = new TQScrollBar(Qt::Vertical,pRightSide); - m_horzScrollBar = new TQScrollBar(Qt::Horizontal,tabSplit); + m_vertScrollBar = new TQScrollBar(TQt::Vertical,pRightSide); + m_horzScrollBar = new TQScrollBar(TQt::Horizontal,tabSplit); TQValueList<int> sizes; sizes << tabSplit->width() / 2 << tabSplit->width() / 2; @@ -218,11 +218,11 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc ) m_pCanvas->setFocusPolicy(TQWidget::StrongFocus); // Rulers - vRuler = new KoRuler(pRightSide, m_pCanvas, Qt::Vertical, Kivio::Config::defaultPageLayout(), + vRuler = new KoRuler(pRightSide, m_pCanvas, TQt::Vertical, Kivio::Config::defaultPageLayout(), KoRuler::F_HELPLINES, m_pDoc->unit()); vRuler->showMousePos(true); vRuler->setZoom(zoomHandler()->zoomedResolutionY()); - hRuler = new KoRuler(pRightSide, m_pCanvas, Qt::Horizontal, Kivio::Config::defaultPageLayout(), + hRuler = new KoRuler(pRightSide, m_pCanvas, TQt::Horizontal, Kivio::Config::defaultPageLayout(), KoRuler::F_HELPLINES, m_pDoc->unit()); hRuler->showMousePos(true); hRuler->setZoom(zoomHandler()->zoomedResolutionX()); diff --git a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp index a57af7c85..8479eb869 100644 --- a/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_1d_stencil.cpp @@ -148,7 +148,7 @@ int Kivio1DStencil::linePattern() void Kivio1DStencil::setFillPattern(int p) { - m_pFillStyle->setBrushStyle(static_cast<Qt::BrushStyle>(p)); + m_pFillStyle->setBrushStyle(static_cast<TQt::BrushStyle>(p)); } int Kivio1DStencil::fillPattern() diff --git a/kivio/kiviopart/kiviosdk/kivio_fill_style.cpp b/kivio/kiviopart/kiviosdk/kivio_fill_style.cpp index 29f0f1f51..4d4a68b10 100644 --- a/kivio/kiviopart/kiviosdk/kivio_fill_style.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_fill_style.cpp @@ -32,7 +32,7 @@ KivioFillStyle::KivioFillStyle() m_colorStyle = kcsSolid; m_color = TQColor(255,255,255); m_color2 = TQColor(255,255,255); - m_brushStyle = Qt::SolidPattern; + m_brushStyle = TQt::SolidPattern; m_gradientType = KImageEffect::VerticalGradient; } @@ -130,7 +130,7 @@ TQBrush KivioFillStyle::brush() break; case kcsNone: - b.setStyle(Qt::NoBrush); + b.setStyle(TQt::NoBrush); break; case kcsGradient: diff --git a/kivio/kiviopart/kiviosdk/kivio_fill_style.h b/kivio/kiviopart/kiviosdk/kivio_fill_style.h index 4be7303b8..9a3620772 100644 --- a/kivio/kiviopart/kiviosdk/kivio_fill_style.h +++ b/kivio/kiviopart/kiviosdk/kivio_fill_style.h @@ -45,7 +45,7 @@ protected: KivioColorStyle m_colorStyle; // The color style to use when filling TQColor m_color; // The color to use when solid filling TQColor m_color2; // The second color to use when using a gradient - Qt::BrushStyle m_brushStyle; // The brush pattern to use when solid filling (maybe gradient too?) + TQt::BrushStyle m_brushStyle; // The brush pattern to use when solid filling (maybe gradient too?) KImageEffect::GradientType m_gradientType; //Which type of gradient to use public: @@ -68,8 +68,8 @@ public: inline TQColor color2() const { return m_color2; } inline void setColor2( const TQColor& c ) { m_color2 = c; } - inline Qt::BrushStyle brushStyle() const { return m_brushStyle; } - inline void setBrushStyle( Qt::BrushStyle b ) { m_brushStyle = b; } + inline TQt::BrushStyle brushStyle() const { return m_brushStyle; } + inline void setBrushStyle( TQt::BrushStyle b ) { m_brushStyle = b; } inline KImageEffect::GradientType gradientType() const { return m_gradientType; } inline void setGradientType(KImageEffect::GradientType t) { m_gradientType = t; } diff --git a/kivio/kiviopart/kiviosdk/kivio_line_style.cpp b/kivio/kiviopart/kiviosdk/kivio_line_style.cpp index 7622a2891..cd644669e 100644 --- a/kivio/kiviopart/kiviosdk/kivio_line_style.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_line_style.cpp @@ -79,9 +79,9 @@ TQPen KivioLineStyle::pen( float scale ) const p.setColor( m_color ); p.setWidth( (int)s ); - p.setJoinStyle( (Qt::PenJoinStyle)m_joinStyle ); - p.setCapStyle( (Qt::PenCapStyle)m_capStyle ); - p.setStyle( (Qt::PenStyle)m_style ); + p.setJoinStyle( (TQt::PenJoinStyle)m_joinStyle ); + p.setCapStyle( (TQt::PenCapStyle)m_capStyle ); + p.setStyle( (TQt::PenStyle)m_style ); return p; } diff --git a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp index 02c850e40..4424cc710 100644 --- a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp @@ -472,7 +472,7 @@ void KivioScreenPainter::drawLineArray( TQPtrList<KivioPoint> *pList ) int i; TQBrush b; - b.setStyle( Qt::NoBrush ); + b.setStyle( TQt::NoBrush ); i=0; pPoint = pList->first(); @@ -878,7 +878,7 @@ void KivioScreenPainter::drawHandle( float x, float y, int flags ) penColor.setRgb(0, 0, 0); b.setColor(fillColor); - b.setStyle(Qt::SolidPattern); + b.setStyle(TQt::SolidPattern); p.setColor(penColor); m_pPainter->setPen(p); m_pPainter->setBrush(b); @@ -910,7 +910,7 @@ void KivioScreenPainter::drawSelectionBox( const TQRect& r ) PAINTER_CHECK(); TQPen p; p.setColor(TQColor(0,200,0)); - p.setStyle(Qt::DashLine); + p.setStyle(TQt::DashLine); m_pPainter->setBrush(TQt::NoBrush); m_pPainter->setPen(p); m_pPainter->drawRect(r); diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp index dc6f2722d..cc6a1a5a7 100644 --- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp @@ -1388,7 +1388,7 @@ void KivioSMLStencil::setFillPattern(int p) pShape = m_pShapeList->first(); while( pShape ) { - pShape->shapeData()->fillStyle()->setBrushStyle( static_cast<Qt::BrushStyle>(p) ); + pShape->shapeData()->fillStyle()->setBrushStyle( static_cast<TQt::BrushStyle>(p) ); pShape = m_pShapeList->next(); } diff --git a/kivio/kiviopart/stencilbarbutton.cpp b/kivio/kiviopart/stencilbarbutton.cpp index bb9b5627d..0c41bbc90 100644 --- a/kivio/kiviopart/stencilbarbutton.cpp +++ b/kivio/kiviopart/stencilbarbutton.cpp @@ -38,7 +38,7 @@ DragBarButton::DragBarButton( const TQString& text, TQWidget* parent, const char m_bDragged = false; m_bMouseOn = false; m_bClose = false; - m_orientation = Qt::Vertical; + m_orientation = TQt::Vertical; const char* stencil_xpm[] = { "12 12 17 1", @@ -111,7 +111,7 @@ void DragBarButton::drawButton( TQPainter* paint ) { TQSize pixSize; - if(m_orientation == Qt::Vertical) { + if(m_orientation == TQt::Vertical) { pixSize = TQSize(width(), height()); } else { pixSize = TQSize(height(), width()); @@ -165,7 +165,7 @@ void DragBarButton::drawButton( TQPainter* paint ) pixPainter.drawPixmap(pixSize.width() - 20 + z, (pixSize.height() - m_pClosePix->height()) / 2 + z, *m_pClosePix); } - if(m_orientation == Qt::Vertical) { + if(m_orientation == TQt::Vertical) { paint->drawPixmap(0, 0, pix); } else { paint->rotate(-90); @@ -209,7 +209,7 @@ TQSize DragBarButton::sizeHint() const TQSize size; - if(m_orientation == Qt::Vertical) { + if(m_orientation == TQt::Vertical) { size = TQSize(w, h).expandedTo(TQApplication::globalStrut()); } else { size = TQSize(h, w).expandedTo(TQApplication::globalStrut()); @@ -223,7 +223,7 @@ void DragBarButton::mousePressEvent( TQMouseEvent* ev ) m_bClose = false; TQRect closeRect; - if(m_orientation == Qt::Vertical) { + if(m_orientation == TQt::Vertical) { closeRect.setRect(width() - 20, 0, m_pClosePix->width(), height()); } else { closeRect.setRect(0, 20 - m_pClosePix->width(), width(), m_pClosePix->width()); @@ -246,7 +246,7 @@ void DragBarButton::mouseReleaseEvent( TQMouseEvent* ev ) repaint(); TQRect closeRect; - if(m_orientation == Qt::Vertical) { + if(m_orientation == TQt::Vertical) { closeRect.setRect(width() - 20, 0, m_pClosePix->width(), height()); } else { closeRect.setRect(0, 20 - m_pClosePix->width(), width(), m_pClosePix->width()); @@ -295,11 +295,11 @@ void DragBarButton::leaveEvent( TQEvent* ev ) repaint(); } -void DragBarButton::setOrientation(Qt::Orientation orientation) +void DragBarButton::setOrientation(TQt::Orientation orientation) { m_orientation = orientation; - if(m_orientation == Qt::Vertical) { + if(m_orientation == TQt::Vertical) { setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); } else { setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); diff --git a/kivio/kiviopart/stencilbarbutton.h b/kivio/kiviopart/stencilbarbutton.h index be4d36b17..16d04df9b 100644 --- a/kivio/kiviopart/stencilbarbutton.h +++ b/kivio/kiviopart/stencilbarbutton.h @@ -37,7 +37,7 @@ class DragBarButton : public TQPushButton TQSize sizeHint() const; - Qt::Orientation orientation() const { return m_orientation; } + TQt::Orientation orientation() const { return m_orientation; } signals: void beginDrag(); @@ -45,7 +45,7 @@ class DragBarButton : public TQPushButton void closeRequired(DragBarButton *); public slots: - void setOrientation(Qt::Orientation orientation); + void setOrientation(TQt::Orientation orientation); protected: void drawButton( TQPainter* ); @@ -64,7 +64,7 @@ class DragBarButton : public TQPushButton bool m_bMouseOn; bool m_bClose; TQPoint m_ppoint; - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; }; } diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index ba1e9cd53..8cb189768 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -100,7 +100,7 @@ bool KivioBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev) if (o == canvas && ev->type() == TQEvent::MouseMove) { TQMouseEvent* me = TQT_TQMOUSEEVENT(ev); - if (me->state() == Qt::LeftButton) + if (me->state() == TQt::LeftButton) handleMouseMoveAction(me->pos()); else handleMouseMove(me->pos()); @@ -111,7 +111,7 @@ bool KivioBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev) if (o == canvas && ev->type() == TQEvent::MouseButtonPress) { TQMouseEvent* me = TQT_TQMOUSEEVENT(ev); - if (me->button() == Qt::LeftButton) + if (me->button() == TQt::LeftButton) handleMousePress(me->pos()); return true; diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp index f2784d7ab..e1623d9c1 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp +++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp @@ -51,7 +51,7 @@ // GuidesListViewItem::GuidesListViewItem(TQListView* parent, KivioGuideLineData *gd, KoUnit::Unit u) // : TDEListViewItem(parent), m_data(gd) // { -// setPixmap(0, BarIcon(m_data->orientation() == Qt::Vertical ? +// setPixmap(0, BarIcon(m_data->orientation() == TQt::Vertical ? // "guides_vertical":"guides_horizontal")); // TQString s = TDEGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2); // s += " " + KoUnit::unitName(u); @@ -78,10 +78,10 @@ // setText(1, s); // } // -// void GuidesListViewItem::setOrientation(Qt::Orientation o) +// void GuidesListViewItem::setOrientation(TQt::Orientation o) // { // m_data->setOrientation(o); -// setPixmap(0, BarIcon(m_data->orientation() == Qt::Vertical ? +// setPixmap(0, BarIcon(m_data->orientation() == TQt::Vertical ? // "guides_vertical":"guides_horizontal")); // } @@ -174,7 +174,7 @@ void KivioOptionsDialog::initGrid() TQLabel* gridColorLbl = new TQLabel(i18n("Grid &color:"), page); m_gridColorBtn = new KColorButton(Kivio::Config::gridColor(), page); gridColorLbl->setBuddy(m_gridColorBtn); - TQGroupBox* spacingGrp = new TQGroupBox(2, Qt::Horizontal, i18n("Spacing"), page); + TQGroupBox* spacingGrp = new TQGroupBox(2, TQt::Horizontal, i18n("Spacing"), page); TQLabel* spaceHorizLbl = new TQLabel(i18n("&Horizontal:"), spacingGrp); m_spaceHorizUSpin = new KoUnitDoubleSpinBox(spacingGrp, 0.0, pgw, 0.1, fw, unit); @@ -183,7 +183,7 @@ void KivioOptionsDialog::initGrid() m_spaceVertUSpin = new KoUnitDoubleSpinBox(spacingGrp, 0.0, pgh, 0.1, fh, unit); spaceVertLbl->setBuddy(m_spaceVertUSpin); - TQGroupBox* snapGrp = new TQGroupBox(2, Qt::Horizontal, i18n("Snap Distance"), page); + TQGroupBox* snapGrp = new TQGroupBox(2, TQt::Horizontal, i18n("Snap Distance"), page); TQLabel* snapHorizLbl = new TQLabel(i18n("H&orizontal:"), snapGrp); m_snapHorizUSpin = new KoUnitDoubleSpinBox(snapGrp, 0.0, fw, 0.1, sw, unit); diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.h b/kivio/kiviopart/ui/kiviooptionsdialog.h index bdd2138a3..a70bbb049 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.h +++ b/kivio/kiviopart/ui/kiviooptionsdialog.h @@ -45,7 +45,7 @@ class TQFont; // // void setUnit(KoUnit::Unit u); // void setPosition(double p, KoUnit::Unit u); -// void setOrientation(Qt::Orientation o); +// void setOrientation(TQt::Orientation o); // KivioGuideLineData* guideData() { return m_data; } // // private: diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp index 26a62671d..d16f6e898 100644 --- a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp @@ -92,7 +92,7 @@ void KivioStencilFormatDlg::initLinePatterns() for (int i = NoPen; i <= DashDotDotLine ; i++ ) { pix.fill(white); - pen.setStyle(static_cast<Qt::PenStyle>(i)); + pen.setStyle(static_cast<TQt::PenStyle>(i)); p.setPen(pen); p.drawLine(0, 8, pix.width(), 8); @@ -114,7 +114,7 @@ void KivioStencilFormatDlg::initFillPatterns() for (int i = NoBrush; i <= DiagCrossPattern; i++ ) { pix.fill(white); - brush.setStyle(static_cast<Qt::BrushStyle>(i)); + brush.setStyle(static_cast<TQt::BrushStyle>(i)); p.setBrush(brush); p.fillRect(0, 0, pix.width(), pix.height(), brush); @@ -132,13 +132,13 @@ void KivioStencilFormatDlg::initLineEndStyles() TQPen pen; pen.setColor(TQColor(0, 0, 0)); pen.setWidth(4); - pen.setStyle(Qt::SolidLine); - pen.setJoinStyle(Qt::RoundJoin); + pen.setStyle(TQt::SolidLine); + pen.setJoinStyle(TQt::RoundJoin); p.setBrush(white); for (int i = 0; i < 3; i++) { pix.fill(white); - pen.setCapStyle(static_cast<Qt::PenCapStyle>(i * 0x10)); + pen.setCapStyle(static_cast<TQt::PenCapStyle>(i * 0x10)); p.setPen(pen); p.drawLine(6, 8, pix.width() - 12, 8); diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp index 3bf67805a..536ab660c 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp @@ -56,12 +56,12 @@ void KivioTextFormatDlg::initFontTab() void KivioTextFormatDlg::initPositionTab() { TQFrame* tab = addPage(i18n("Position")); - m_valignBGrp = new TQButtonGroup(1, Qt::Horizontal, i18n("Vertical"), tab); + m_valignBGrp = new TQButtonGroup(1, TQt::Horizontal, i18n("Vertical"), tab); (void) new TQRadioButton(i18n("&Top"), m_valignBGrp); (void) new TQRadioButton(i18n("&Center"), m_valignBGrp); (void) new TQRadioButton(i18n("&Bottom"), m_valignBGrp); m_valignBGrp->setButton(1); - m_halignBGrp = new TQButtonGroup(1, Qt::Vertical, i18n("Horizontal"), tab); + m_halignBGrp = new TQButtonGroup(1, TQt::Vertical, i18n("Horizontal"), tab); (void) new TQRadioButton(i18n("&Left"), m_halignBGrp); (void) new TQRadioButton(i18n("C&enter"), m_halignBGrp); (void) new TQRadioButton(i18n("&Right"), m_halignBGrp); diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp index f8b5d0151..5e45cc369 100644 --- a/kivio/plugins/kivioconnectortool/tool_connector.cpp +++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp @@ -171,7 +171,7 @@ void ConnectorTool::connector(TQRect) void ConnectorTool::mousePress( TQMouseEvent *e ) { - if(e->button() == Qt::LeftButton) { + if(e->button() == TQt::LeftButton) { bool ok = true; if(!m_pStencil || (m_type == StraightConnector)) { ok = startRubberBanding(e); @@ -200,7 +200,7 @@ void ConnectorTool::mousePress( TQMouseEvent *e ) } else { m_mode = stmNone; } - } else if(e->button() == Qt::RightButton) { + } else if(e->button() == TQt::RightButton) { if(m_type == PolyLineConnector) { if(m_mode == stmDrawRubber) { endRubberBanding(e); diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp index 34e53196b..86a05245f 100644 --- a/kivio/plugins/kivioselecttool/tool_select.cpp +++ b/kivio/plugins/kivioselecttool/tool_select.cpp @@ -94,7 +94,7 @@ bool SelectTool::processEvent(TQEvent* e) case TQEvent::MouseButtonDblClick: m = (TQMouseEvent *)e; - if( m->button() == Qt::LeftButton ) { + if( m->button() == TQt::LeftButton ) { leftDoubleClick(m->pos()); } @@ -105,9 +105,9 @@ bool SelectTool::processEvent(TQEvent* e) case TQEvent::MouseButtonPress: m = (TQMouseEvent *)e; - if( m->button() == Qt::RightButton ) { + if( m->button() == TQt::RightButton ) { showPopupMenu(m->globalPos()); - } else if( m->button() == Qt::LeftButton ) { + } else if( m->button() == TQt::LeftButton ) { if(m->state() & ControlButton) { m_controlKey = true; } else { diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp index e8ebc0fa7..8803b19dd 100644 --- a/kivio/plugins/kiviotexttool/tool_text.cpp +++ b/kivio/plugins/kiviotexttool/tool_text.cpp @@ -164,7 +164,7 @@ void TextTool::text(TQRect r) void TextTool::mousePress( TQMouseEvent *e ) { - if(e->button() == Qt::LeftButton) { + if(e->button() == TQt::LeftButton) { KoPoint pagePoint = view()->canvasWidget()->mapFromScreen(e->pos()); int colType; KivioPage *page = view()->activePage(); diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.cpp b/kivio/plugins/kiviozoomtool/tool_zoom.cpp index e20b57e8b..d2a10db87 100644 --- a/kivio/plugins/kiviozoomtool/tool_zoom.cpp +++ b/kivio/plugins/kiviozoomtool/tool_zoom.cpp @@ -127,7 +127,7 @@ bool ZoomTool::processEvent(TQEvent* e) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if(me->button() == Qt::LeftButton) { + if(me->button() == TQt::LeftButton) { if(m_pCurrent == m_pMinus) { m_pCurrent->activate(); } else { diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp index 211a04e3f..c92fa97a1 100644 --- a/koshell/iconsidepane.cpp +++ b/koshell/iconsidepane.cpp @@ -247,7 +247,7 @@ bool Navigator::showIcons() void Navigator::mouseReleaseEvent(TQMouseEvent *e) { TDEListBox::mouseReleaseEvent(e); - if ( e->button() != Qt::LeftButton || !mLeftMouseButtonPressed ) + if ( e->button() != TQt::LeftButton || !mLeftMouseButtonPressed ) return; if ( itemAt( e->pos() ) && executedItem == selectedItem() ) emit itemSelected( currentItem() ); @@ -257,10 +257,10 @@ void Navigator::mouseReleaseEvent(TQMouseEvent *e) void Navigator::mousePressEvent(TQMouseEvent *e) { - if ( e->button() != Qt::LeftButton || itemAt( e->pos() ) == 0 ) + if ( e->button() != TQt::LeftButton || itemAt( e->pos() ) == 0 ) { mLeftMouseButtonPressed = false; - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) slotShowRMBMenu( 0,mapToGlobal( e->pos() ) ); return; } @@ -405,7 +405,7 @@ void Navigator::slotShowRMBMenu( TQListBoxItem *, const TQPoint &pos ) IconSidePane::IconSidePane(TQWidget *parent, const char *name ) : TQVBox( parent, name ) { - m_buttongroup = new TQButtonGroup(1, Qt::Horizontal, this); + m_buttongroup = new TQButtonGroup(1, TQt::Horizontal, this); m_buttongroup->setExclusive(true); m_buttongroup->hide(); mWidgetstack = new TQWidgetStack(this); diff --git a/kplato/kptappointment.cpp b/kplato/kptappointment.cpp index f09b4bcc6..6d239ccd6 100644 --- a/kplato/kptappointment.cpp +++ b/kplato/kptappointment.cpp @@ -95,8 +95,8 @@ void AppointmentInterval::saveXML(TQDomElement &element) const { TQDomElement me = element.ownerDocument().createElement("interval"); element.appendChild(me); - me.setAttribute("start", m_start.toString(Qt::ISODate)); - me.setAttribute("end", m_end.toString(Qt::ISODate)); + me.setAttribute("start", m_start.toString(TQt::ISODate)); + me.setAttribute("end", m_end.toString(TQt::ISODate)); me.setAttribute("load", m_load); } @@ -251,7 +251,7 @@ bool Appointment::UsedEffort::load(TQDomElement &element) { TQDate date; s = e.attribute("date"); if (s != "") - date = TQDate::fromString(s, Qt::ISODate); + date = TQDate::fromString(s, TQt::ISODate); Duration eff = Duration::fromString(e.attribute("effort")); bool ot = e.attribute("overtime", "0").toInt(); if (date.isValid()) { @@ -271,7 +271,7 @@ void Appointment::UsedEffort::save(TQDomElement &element) const { for (; it.current(); ++it) { TQDomElement me = element.ownerDocument().createElement("actual-effort"); element.appendChild(me); - me.setAttribute("date",it.current()->date().toString(Qt::ISODate)); + me.setAttribute("date",it.current()->date().toString(TQt::ISODate)); me.setAttribute("effort",it.current()->effort().toString()); me.setAttribute("overtime",it.current()->isOvertime()); } diff --git a/kplato/kptcalendar.cpp b/kplato/kptcalendar.cpp index 461950410..b60b33920 100644 --- a/kplato/kptcalendar.cpp +++ b/kplato/kptcalendar.cpp @@ -92,7 +92,7 @@ bool CalendarDay::load(TQDomElement &element) { //kdDebug()<<k_funcinfo<<" state="<<m_state<<endl; TQString s = element.attribute("date"); if (s != "") { - m_date = TQDate::fromString(s, Qt::ISODate); + m_date = TQDate::fromString(s, TQt::ISODate); if (!m_date.isValid()) m_date = TQDate::fromString(s); } @@ -121,7 +121,7 @@ void CalendarDay::save(TQDomElement &element) const { if (m_state == Map::None) return; if (m_date.isValid()) { - element.setAttribute("date", m_date.toString(Qt::ISODate)); + element.setAttribute("date", m_date.toString(TQt::ISODate)); } element.setAttribute("state", m_state); if (m_workingIntervals.count() == 0) @@ -237,7 +237,7 @@ Duration CalendarDay::effort(const TQTime &start, const TQTime &end) { //kdDebug()<<k_funcinfo<<dtStart.time().toString()<<" - "<<dtEnd.time().toString()<<"="<<eff.toString(Duration::Format_Day)<<endl; } } - //kdDebug()<<k_funcinfo<<(m_date.isValid()?m_date.toString(Qt::ISODate):"Weekday")<<": "<<start.toString()<<" - "<<end.toString()<<": total="<<eff.toString(Duration::Format_Day)<<endl; + //kdDebug()<<k_funcinfo<<(m_date.isValid()?m_date.toString(TQt::ISODate):"Weekday")<<": "<<start.toString()<<" - "<<end.toString()<<": total="<<eff.toString(Duration::Format_Day)<<endl; return eff; } @@ -264,14 +264,14 @@ bool CalendarDay::hasInterval() const { } bool CalendarDay::hasInterval(const TQTime &start, const TQTime &end) const { - //kdDebug()<<k_funcinfo<<(m_date.isValid()?m_date.toString(Qt::ISODate):"Weekday")<<" "<<start.toString()<<" - "<<end.toString()<<endl; + //kdDebug()<<k_funcinfo<<(m_date.isValid()?m_date.toString(TQt::ISODate):"Weekday")<<" "<<start.toString()<<" - "<<end.toString()<<endl; if (m_state != Map::Working) { return false; } TQPtrListIterator<TQPair<TQTime, TQTime> > it = m_workingIntervals; for (; it.current(); ++it) { if (start < it.current()->second && end > it.current()->first) { - //kdDebug()<<k_funcinfo<<"true:"<<(m_date.isValid()?m_date.toString(Qt::ISODate):"Weekday")<<" "<<it.current()->first.toString()<<" - "<<it.current()->second.toString()<<endl; + //kdDebug()<<k_funcinfo<<"true:"<<(m_date.isValid()?m_date.toString(TQt::ISODate):"Weekday")<<" "<<it.current()->first.toString()<<" - "<<it.current()->second.toString()<<endl; return true; } } @@ -689,7 +689,7 @@ bool Calendar::hasParent(Calendar *cal) { } Duration Calendar::effort(const TQDate &date, const TQTime &start, const TQTime &end) const { - //kdDebug()<<k_funcinfo<<m_name<<": "<<date.toString(Qt::ISODate)<<" "<<start.toString()<<" - "<<end.toString()<<endl; + //kdDebug()<<k_funcinfo<<m_name<<": "<<date.toString(TQt::ISODate)<<" "<<start.toString()<<" - "<<end.toString()<<endl; if (start == end) { return Duration::zeroDuration; } diff --git a/kplato/kptcalendaredit.cpp b/kplato/kptcalendaredit.cpp index a29eb8c09..427645d7b 100644 --- a/kplato/kptcalendaredit.cpp +++ b/kplato/kptcalendaredit.cpp @@ -112,7 +112,7 @@ void CalendarEdit::slotApplyClicked() { //kdDebug()<<k_funcinfo<<"("<<m_calendar<<")"<<endl; DateMap dates = calendarPanel->selectedDates(); for(DateMap::iterator it = dates.begin(); it != dates.end(); ++it) { - TQDate date = TQDate::fromString(it.key(), Qt::ISODate); + TQDate date = TQDate::fromString(it.key(), TQt::ISODate); //kdDebug()<<k_funcinfo<<"Date: "<<date<<endl; CalendarDay *calDay = m_calendar->findDay(date); if (!calDay) { diff --git a/kplato/kptcalendareditbase.cpp b/kplato/kptcalendareditbase.cpp index 6349c273e..c30d11dc1 100644 --- a/kplato/kptcalendareditbase.cpp +++ b/kplato/kptcalendareditbase.cpp @@ -50,7 +50,7 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f CalendarEditBaseLayout = new TQHBoxLayout( this, 0, 0, "CalendarEditBaseLayout"); groupBox2 = new TQGroupBox( this, "groupBox2" ); - groupBox2->setColumnLayout(0, Qt::Vertical ); + groupBox2->setColumnLayout(0, TQt::Vertical ); groupBox2->layout()->setSpacing( 6 ); groupBox2->layout()->setMargin( 6 ); groupBox2Layout = new TQGridLayout( groupBox2->layout() ); @@ -61,7 +61,7 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f groupBox2Layout->addWidget( calendarPanel, 1, 0 ); day = new TQButtonGroup( groupBox2, "day" ); - day->setColumnLayout(0, Qt::Vertical ); + day->setColumnLayout(0, TQt::Vertical ); day->layout()->setSpacing( 6 ); day->layout()->setMargin( 6 ); dayLayout = new TQVBoxLayout( day->layout() ); @@ -77,7 +77,7 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f dayLayout->addLayout( layout8 ); groupBox4 = new TQGroupBox( day, "groupBox4" ); - groupBox4->setColumnLayout(0, Qt::Vertical ); + groupBox4->setColumnLayout(0, TQt::Vertical ); groupBox4->layout()->setSpacing( 6 ); groupBox4->layout()->setMargin( 6 ); groupBox4Layout = new TQVBoxLayout( groupBox4->layout() ); diff --git a/kplato/kptcanvasitem.cpp b/kplato/kptcanvasitem.cpp index 152fd837f..a792443d3 100644 --- a/kplato/kptcanvasitem.cpp +++ b/kplato/kptcanvasitem.cpp @@ -587,7 +587,7 @@ void PertRelationItem::drawShape(TQPainter &p) { //kdDebug()<<k_funcinfo<<" "<<m_rel->parent()->name()<<" to "<<m_rel->child()->name()<<endl; // cannot use polygon's drawShape() as it doesn't use the pen - setBrush(Qt::NoBrush); + setBrush(TQt::NoBrush); TQPointArray a = poly; int size = a.size()-1; for(int i = 0; i < size; ++i) @@ -611,7 +611,7 @@ TQPointArray PertRelationItem::areaPoints () const TQPointArray pa(4); int pw = (pen().width()+1)/2; if ( pw < 1 ) pw = 1; - if ( pen() == Qt::NoPen ) pw = 0; + if ( pen() == TQt::NoPen ) pw = 0; pa[0] = TQPoint(left-pw,top-pw); pa[1] = pa[0] + TQPoint(right-left+pw*2,0); pa[2] = pa[1] + TQPoint(0,bottom-top+pw*2); diff --git a/kplato/kptcontext.cpp b/kplato/kptcontext.cpp index 830c6c957..58a2d205d 100644 --- a/kplato/kptcontext.cpp +++ b/kplato/kptcontext.cpp @@ -79,7 +79,7 @@ bool Context::load(TQDomElement &element) { } else if (e.tagName() == "accounts-view") { accountsview.accountsviewsize = e.attribute("accountsview-size").toInt(); accountsview.periodviewsize = e.attribute("periodview-size").toInt(); - accountsview.date = TQDate::fromString(e.attribute("date"), Qt::ISODate); + accountsview.date = TQDate::fromString(e.attribute("date"), TQt::ISODate); accountsview.period = e.attribute("period").toInt(); accountsview.cumulative = e.attribute("cumulative").toInt(); @@ -146,7 +146,7 @@ void Context::save(TQDomElement &element) const { me.appendChild(a); a.setAttribute("accountsview-size", accountsview.accountsviewsize); a.setAttribute("periodview-size", accountsview.periodviewsize); - a.setAttribute("date", accountsview.date.toString(Qt::ISODate)); + a.setAttribute("date", accountsview.date.toString(TQt::ISODate)); a.setAttribute("period", accountsview.period); a.setAttribute("cumulative", accountsview.cumulative); if (!accountsview.closedItems.isEmpty()) { diff --git a/kplato/kptdatetable.cpp b/kplato/kptdatetable.cpp index 7184350ec..0f07b7486 100644 --- a/kplato/kptdatetable.cpp +++ b/kplato/kptdatetable.cpp @@ -447,7 +447,7 @@ void DateTable::contentsMousePressEvent(TQMouseEvent *e) { DateMap::ConstIterator it; for (it = m_selectedDates.constBegin(); it != m_selectedDates.constEnd(); ++it) { //kdDebug()<<k_funcinfo<<it.key()<<endl; - TQDate d = TQDate::fromString(it.key(), Qt::ISODate); + TQDate d = TQDate::fromString(it.key(), TQt::ISODate); if (!d.isValid()) continue; if (!first.isValid() || first > d) @@ -461,7 +461,7 @@ void DateTable::contentsMousePressEvent(TQMouseEvent *e) { TQDate anchor = first < date ? first : last; int i = anchor > date ? -1 : 1; while (anchor != date) { - //kdDebug()<<k_funcinfo<<anchor.toString(Qt::ISODate)<<endl; + //kdDebug()<<k_funcinfo<<anchor.toString(TQt::ISODate)<<endl; m_selectedDates.toggle(anchor); anchor = anchor.addDays(i); } @@ -835,7 +835,7 @@ DateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col) void DateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) { - if(!isEnabled() || e->button() != Qt::LeftButton) + if(!isEnabled() || e->button() != TQt::LeftButton) { KNotifyClient::beep(); return; @@ -862,7 +862,7 @@ DateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) void DateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) { - if (e->state() & Qt::LeftButton) + if (e->state() & TQt::LeftButton) { int row, col; TQPoint mouseCoord; diff --git a/kplato/kptdatetime.h b/kplato/kptdatetime.h index beef48587..2a06e21b6 100644 --- a/kplato/kptdatetime.h +++ b/kplato/kptdatetime.h @@ -58,7 +58,7 @@ public: TQDateTime dt; if (dts.isEmpty()) return DateTime(); - dt = TQDateTime::fromString(dts, Qt::ISODate); + dt = TQDateTime::fromString(dts, TQt::ISODate); if (dt.isValid()) return DateTime(dt); return DateTime(TQDateTime::fromString(dts)); diff --git a/kplato/kptdoublelistviewbase.cpp b/kplato/kptdoublelistviewbase.cpp index d6bc73d4f..e2c54df55 100644 --- a/kplato/kptdoublelistviewbase.cpp +++ b/kplato/kptdoublelistviewbase.cpp @@ -51,7 +51,7 @@ void ListView::paintToPrinter(TQPainter * p, int cx, int cy, int cw, int ch) { p->setClipRegion(r.intersect(TQRegion(cx, 0, cw, ch)), TQPainter::CoordPainter); TQColor bgc(193, 223, 255); TQBrush bg(bgc); - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); p->setBackgroundColor(bgc); TQHeader *h = header(); int hei = 0; @@ -348,7 +348,7 @@ DoubleListViewBase::DoubleListViewBase(TQWidget *parent, bool description) m_fmt('f'), m_prec(0) { - setOrientation(Qt::Horizontal); + setOrientation(TQt::Horizontal); setHandleWidth(TQMIN(2, handleWidth())); m_masterList = new ListView(this); diff --git a/kplato/kptganttview.cpp b/kplato/kptganttview.cpp index b84bbbc49..63a1383da 100644 --- a/kplato/kptganttview.cpp +++ b/kplato/kptganttview.cpp @@ -87,7 +87,7 @@ GanttView::GanttView(TQWidget *parent, bool readWrite, const char* name) m_project(0) { kdDebug() << " ---------------- KPlato: Creating GanttView ----------------" << endl; - setOrientation(Qt::Vertical); + setOrientation(TQt::Vertical); m_gantt = new MyKDGanttView(this, "Gantt view"); diff --git a/kplato/kptmap.h b/kplato/kptmap.h index 134eeac7c..18e83a0c4 100644 --- a/kplato/kptmap.h +++ b/kplato/kptmap.h @@ -43,7 +43,7 @@ public: DateMap() {} virtual ~DateMap() {} - virtual bool contains(TQDate date) const { return DateMapType::contains(date.toString(Qt::ISODate)); } + virtual bool contains(TQDate date) const { return DateMapType::contains(date.toString(TQt::ISODate)); } void insert(TQString date, int state=Map::NonWorking) { //kdDebug()<<k_funcinfo<<date<<"="<<state<<endl; @@ -52,11 +52,11 @@ public: else DateMapType::insert(date, state); } - void insert(TQDate date, int state=Map::NonWorking) { insert(date.toString(Qt::ISODate), state); } + void insert(TQDate date, int state=Map::NonWorking) { insert(date.toString(TQt::ISODate), state); } void remove(TQDate date) { - //kdDebug()<<k_funcinfo<<date.toString(Qt::ISODate)<<endl; - DateMapType::remove(date.toString(Qt::ISODate)); + //kdDebug()<<k_funcinfo<<date.toString(TQt::ISODate)<<endl; + DateMapType::remove(date.toString(TQt::ISODate)); } int state(TQString date) { @@ -64,7 +64,7 @@ public: if (it == end()) return 0; else return it.data(); } - int state(TQDate date) { return state(date.toString(Qt::ISODate)); } + int state(TQDate date) { return state(date.toString(TQt::ISODate)); } bool operator==(const DateMap &m) const { return keys() == m.keys() && values() == m.values(); @@ -81,14 +81,14 @@ public: else DateMapType::insert(date, state); } - void toggle(TQDate date, int state=Map::NonWorking) { return toggle(date.toString(Qt::ISODate)); } + void toggle(TQDate date, int state=Map::NonWorking) { return toggle(date.toString(TQt::ISODate)); } void toggleClear(TQString date, int state=Map::NonWorking) { //kdDebug()<<k_funcinfo<<date<<"="<<state<<endl; bool s = DateMapType::contains(date); clear(); if (!s) insert(date, state); } - void toggleClear(TQDate date, int state=Map::NonWorking) { toggleClear(date.toString(Qt::ISODate)); } + void toggleClear(TQDate date, int state=Map::NonWorking) { toggleClear(date.toString(TQt::ISODate)); } }; typedef TQMap<int, int> IntMapType; diff --git a/kplato/kptpertcanvas.cpp b/kplato/kptpertcanvas.cpp index 9d12945cf..55e8c36ee 100644 --- a/kplato/kptpertcanvas.cpp +++ b/kplato/kptpertcanvas.cpp @@ -301,11 +301,11 @@ void PertCanvas::contentsMousePressEvent ( TQMouseEvent * e ) //kdDebug()<<k_funcinfo<<" gl.X,gl.Y="<<e->globalX()<<","<<e->globalY()<<" x,y="<<e->x()<<","<<e->y()<<endl; switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: { break; } - case Qt::RightButton: + case TQt::RightButton: { PertNodeItem *item = selectedItem(); if (item) @@ -335,7 +335,7 @@ void PertCanvas::contentsMousePressEvent ( TQMouseEvent * e ) } break; } - case Qt::MidButton: + case TQt::MidButton: break; default: break; @@ -347,7 +347,7 @@ void PertCanvas::contentsMouseReleaseEvent ( TQMouseEvent * e ) //kdDebug()<<k_funcinfo<<" gl.X,gl.Y="<<e->globalX()<<","<<e->globalY()<<" x,y="<<e->x()<<","<<e->y()<<endl; switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: { bool hit = false; TQCanvasItemList l = canvas()->collisions(e->pos()); @@ -393,11 +393,11 @@ void PertCanvas::contentsMouseReleaseEvent ( TQMouseEvent * e ) canvas()->update(); break; } - case Qt::RightButton: + case TQt::RightButton: { break; } - case Qt::MidButton: + case TQt::MidButton: break; default: break; diff --git a/kplato/kptproject.cpp b/kplato/kptproject.cpp index 97eb82028..fc7cf3d7e 100644 --- a/kplato/kptproject.cpp +++ b/kplato/kptproject.cpp @@ -471,8 +471,8 @@ void Project::save(TQDomElement &element) const { //me.setAttribute("baselined",(int)m_baselined); FIXME: Removed for this release me.setAttribute("scheduling",constraintToString()); - me.setAttribute("start-time", m_constraintStartTime.toString(Qt::ISODate)); - me.setAttribute("end-time", m_constraintEndTime.toString(Qt::ISODate)); + me.setAttribute("start-time", m_constraintStartTime.toString(TQt::ISODate)); + me.setAttribute("end-time", m_constraintEndTime.toString(TQt::ISODate)); m_accounts.save(me); diff --git a/kplato/kptresource.cpp b/kplato/kptresource.cpp index 763c0c86c..3b3be7a28 100644 --- a/kplato/kptresource.cpp +++ b/kplato/kptresource.cpp @@ -378,8 +378,8 @@ void Resource::save(TQDomElement &element) const { me.setAttribute("email", m_email); me.setAttribute("type", typeToString()); me.setAttribute("units", m_units); - me.setAttribute("available-from", m_availableFrom.toString(Qt::ISODate)); - me.setAttribute("available-until", m_availableUntil.toString(Qt::ISODate)); + me.setAttribute("available-from", m_availableFrom.toString(TQt::ISODate)); + me.setAttribute("available-until", m_availableUntil.toString(TQt::ISODate)); me.setAttribute("normal-rate", TDEGlobal::locale()->formatMoney(cost.normalRate)); me.setAttribute("overtime-rate", TDEGlobal::locale()->formatMoney(cost.overtimeRate)); } diff --git a/kplato/kptresourceview.cpp b/kplato/kptresourceview.cpp index c20b9fd26..fd07757e3 100644 --- a/kplato/kptresourceview.cpp +++ b/kplato/kptresourceview.cpp @@ -59,7 +59,7 @@ public: p->save(); TQColor bgc(193, 223, 255); TQBrush bg(bgc); - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); p->setBackgroundColor(bgc); TQHeader *head = header(); int offset = 0; @@ -372,7 +372,7 @@ ResourceView::ResourceView(View *view, TQWidget *parent) m_selectedItem(0), m_currentNode(0) { - setOrientation(Qt::Vertical); + setOrientation(TQt::Vertical); resList = new ResListView(this, "Resource list"); resList->setItemMargin(2); diff --git a/kplato/kptschedule.cpp b/kplato/kptschedule.cpp index 7581312e0..c57861840 100644 --- a/kplato/kptschedule.cpp +++ b/kplato/kptschedule.cpp @@ -431,17 +431,17 @@ void NodeSchedule::saveXML(TQDomElement &element) const { saveCommonXML(sch); if (earliestStart.isValid()) - sch.setAttribute("earlieststart",earliestStart.toString(Qt::ISODate)); + sch.setAttribute("earlieststart",earliestStart.toString(TQt::ISODate)); if (latestFinish.isValid()) - sch.setAttribute("latestfinish",latestFinish.toString(Qt::ISODate)); + sch.setAttribute("latestfinish",latestFinish.toString(TQt::ISODate)); if (startTime.isValid()) - sch.setAttribute("start",startTime.toString(Qt::ISODate)); + sch.setAttribute("start",startTime.toString(TQt::ISODate)); if (endTime.isValid()) - sch.setAttribute("end",endTime.toString(Qt::ISODate)); + sch.setAttribute("end",endTime.toString(TQt::ISODate)); if (workStartTime.isValid()) - sch.setAttribute("start-work", workStartTime.toString(Qt::ISODate)); + sch.setAttribute("start-work", workStartTime.toString(TQt::ISODate)); if (workEndTime.isValid()) - sch.setAttribute("end-work", workEndTime.toString(Qt::ISODate)); + sch.setAttribute("end-work", workEndTime.toString(TQt::ISODate)); sch.setAttribute("duration",duration.toString()); @@ -603,8 +603,8 @@ bool MainSchedule::loadXML(const TQDomElement &sch, Project &project) { void MainSchedule::saveXML(TQDomElement &element) const { saveCommonXML(element); - element.setAttribute("start",startTime.toString(Qt::ISODate)); - element.setAttribute("end",endTime.toString(Qt::ISODate)); + element.setAttribute("start",startTime.toString(TQt::ISODate)); + element.setAttribute("end",endTime.toString(TQt::ISODate)); } #ifndef NDEBUG diff --git a/kplato/kpttask.cpp b/kplato/kpttask.cpp index 4e41e6bc8..7392ceb74 100644 --- a/kplato/kpttask.cpp +++ b/kplato/kpttask.cpp @@ -289,8 +289,8 @@ void Task::save(TQDomElement &element) const { me.setAttribute("description", m_description); me.setAttribute("scheduling",constraintToString()); - me.setAttribute("constraint-starttime",m_constraintStartTime.toString(Qt::ISODate)); - me.setAttribute("constraint-endtime",m_constraintEndTime.toString(Qt::ISODate)); + me.setAttribute("constraint-starttime",m_constraintStartTime.toString(TQt::ISODate)); + me.setAttribute("constraint-endtime",m_constraintEndTime.toString(TQt::ISODate)); me.setAttribute("startup-cost", m_startupCost); me.setAttribute("shutdown-cost", m_shutdownCost); @@ -303,8 +303,8 @@ void Task::save(TQDomElement &element) const { me.appendChild(el); el.setAttribute("started", m_progress.started); el.setAttribute("finished", m_progress.finished); - el.setAttribute("startTime", m_progress.startTime.toString(Qt::ISODate)); - el.setAttribute("finishTime", m_progress.finishTime.toString(Qt::ISODate)); + el.setAttribute("startTime", m_progress.startTime.toString(TQt::ISODate)); + el.setAttribute("finishTime", m_progress.finishTime.toString(TQt::ISODate)); el.setAttribute("percent-finished", m_progress.percentFinished); el.setAttribute("remaining-effort", m_progress.remainingEffort.toString()); el.setAttribute("performed-effort", m_progress.totalPerformed.toString()); diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp index 6b213d7f8..a92d59908 100644 --- a/kpresenter/KPrBackDia.cpp +++ b/kpresenter/KPrBackDia.cpp @@ -153,14 +153,14 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, labXFactor =new TQLabel( i18n( "X-factor:" ), colorTab ); - xfactor = new TQSlider( -200, 200, 1, 100, Qt::Horizontal, colorTab ); + xfactor = new TQSlider( -200, 200, 1, 100, TQt::Horizontal, colorTab ); connect( xfactor, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( updateConfiguration() ) ); xfactor->setValue( _xfactor ); labYFactor=new TQLabel( i18n( "Y-factor:" ), colorTab ); - yfactor = new TQSlider( -200, 200, 1, 100, Qt::Horizontal, colorTab ); + yfactor = new TQSlider( -200, 200, 1, 100, TQt::Horizontal, colorTab ); connect( yfactor, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( updateConfiguration() ) ); yfactor->setValue( _yfactor ); diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp index fa5a4d4d2..f446ed703 100644 --- a/kpresenter/KPrBackground.cpp +++ b/kpresenter/KPrBackground.cpp @@ -281,7 +281,7 @@ void KPrBackGround::loadOasis(KoOasisContext & context ) strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href); - const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); + const KoPictureKey key(filename, TQDateTime::currentDateTime(TQt::UTC)); backPicture.setKey(key); KoStore* store = context.store(); diff --git a/kpresenter/KPrBrush.cpp b/kpresenter/KPrBrush.cpp index 4ef45d0d8..3a6035ea0 100644 --- a/kpresenter/KPrBrush.cpp +++ b/kpresenter/KPrBrush.cpp @@ -226,7 +226,7 @@ void KPrBrush::loadOasisFillStyle( KoOasisContext &context, const char * propert // otherwise the properties dialog for the object won't // display the preview for the gradient. TQBrush tmpBrush; - tmpBrush.setStyle( static_cast<Qt::BrushStyle>( 1 ) ); + tmpBrush.setStyle( static_cast<TQt::BrushStyle>( 1 ) ); setBrush( tmpBrush ); setFillType( FT_GRADIENT ); } diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp index 7b7312d09..d69479e03 100644 --- a/kpresenter/KPrBrushProperty.cpp +++ b/kpresenter/KPrBrushProperty.cpp @@ -139,50 +139,50 @@ TQBrush KPrBrushProperty::getTQBrush() const switch ( m_brushUI->styleCombo->currentItem() ) { case 0: - brush.setStyle( Qt::SolidPattern ); + brush.setStyle( TQt::SolidPattern ); break; case 1: - brush.setStyle( Qt::Dense1Pattern ); + brush.setStyle( TQt::Dense1Pattern ); break; case 2: - brush.setStyle( Qt::Dense2Pattern ); + brush.setStyle( TQt::Dense2Pattern ); break; case 3: - brush.setStyle( Qt::Dense3Pattern ); + brush.setStyle( TQt::Dense3Pattern ); break; case 4: - brush.setStyle( Qt::Dense4Pattern ); + brush.setStyle( TQt::Dense4Pattern ); break; case 5: - brush.setStyle( Qt::Dense5Pattern ); + brush.setStyle( TQt::Dense5Pattern ); break; case 6: - brush.setStyle( Qt::Dense6Pattern ); + brush.setStyle( TQt::Dense6Pattern ); break; case 7: - brush.setStyle( Qt::Dense7Pattern ); + brush.setStyle( TQt::Dense7Pattern ); break; case 8: - brush.setStyle( Qt::HorPattern ); + brush.setStyle( TQt::HorPattern ); break; case 9: - brush.setStyle( Qt::VerPattern ); + brush.setStyle( TQt::VerPattern ); break; case 10: - brush.setStyle( Qt::CrossPattern ); + brush.setStyle( TQt::CrossPattern ); break; case 11: - brush.setStyle( Qt::BDiagPattern ); + brush.setStyle( TQt::BDiagPattern ); break; case 12: - brush.setStyle( Qt::FDiagPattern ); + brush.setStyle( TQt::FDiagPattern ); break; case 13: - brush.setStyle( Qt::DiagCrossPattern ); + brush.setStyle( TQt::DiagCrossPattern ); break; } if( m_typeCombo->currentItem() == 2) - brush.setStyle( Qt::NoBrush ); + brush.setStyle( TQt::NoBrush ); brush.setColor( m_brushUI->colorChooser->color() ); diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 7903e2b76..04a81ae32 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -698,13 +698,13 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) m_currentTextObjectView->mousePressEvent(e, m_view->zoomHandler()->ptToLayoutUnitPix( pos ) ); // in LU pixels mousePressed = true; m_view->enableAutoScroll(); - if(e->button() == Qt::RightButton) + if(e->button() == TQt::RightButton) { m_currentTextObjectView->showPopup( m_view, TQCursor::pos(), m_view->actionList() ); m_view->disableAutoScroll(); mousePressed=false; } - else if( e->button() == Qt::MidButton ) + else if( e->button() == TQt::MidButton ) { TQApplication::clipboard()->setSelectionMode( true ); m_currentTextObjectView->paste(); @@ -722,7 +722,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) exitEditMode(); if ( editMode ) { - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { mousePressed = true; m_view->enableAutoScroll(); @@ -978,7 +978,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) } } - if ( e->button() == Qt::RightButton && ( toolEditMode == INS_POLYLINE || toolEditMode == INS_CLOSED_POLYLINE ) + if ( e->button() == TQt::RightButton && ( toolEditMode == INS_POLYLINE || toolEditMode == INS_CLOSED_POLYLINE ) && !m_pointArray.isNull() && m_drawPolyline ) { if( m_indexPointArray > 1) { @@ -1026,7 +1026,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) return; } - if ( e->button() == Qt::RightButton && ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_QUADRICBEZIERCURVE + if ( e->button() == TQt::RightButton && ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_QUADRICBEZIERCURVE || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || toolEditMode == INS_CLOSED_QUADRICBEZIERCURVE ) && !m_pointArray.isNull() && m_drawCubicBezierCurve ) { if ( m_drawLineWithCubicBezierCurve ) { @@ -1047,7 +1047,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) return; } - if ( e->button() == Qt::RightButton && toolEditMode == TEM_MOUSE ) { + if ( e->button() == TQt::RightButton && toolEditMode == TEM_MOUSE ) { KPrObject * obj = getObjectAt( docPoint ); if ( obj ) { @@ -1070,18 +1070,18 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) modType = MT_NONE; } - else if( e->button() == Qt::RightButton && toolEditMode == TEM_ZOOM ) { + else if( e->button() == TQt::RightButton && toolEditMode == TEM_ZOOM ) { TQPoint pnt = TQCursor::pos(); mousePressed = false; m_view->disableAutoScroll(); m_view->openPopupMenuZoom( pnt ); } - else if( e->button() == Qt::RightButton && toolEditMode != TEM_MOUSE ) { + else if( e->button() == TQt::RightButton && toolEditMode != TEM_MOUSE ) { //deactivate tools when you click on right button setToolEditMode( TEM_MOUSE ); } } else { - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { if ( m_drawMode ) { setCursor( KPrUtils::penCursor() ); m_drawLineInDrawMode = true; @@ -1091,9 +1091,9 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) } else m_view->screenNext(); - } else if ( e->button() == Qt::MidButton ) + } else if ( e->button() == TQt::MidButton ) m_view->screenPrev(); - else if ( e->button() == Qt::RightButton ) { + else if ( e->button() == TQt::RightButton ) { if ( !m_drawMode && !spManualSwitch() ) { finishObjectEffects(); @@ -1151,7 +1151,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e ) return; } - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; if ( m_drawMode ) { @@ -2113,7 +2113,7 @@ void KPrCanvas::keyPressEvent( TQKeyEvent *e ) m_gl.repaintAfterSnapping(); } // undo snapping for move by mouse - if ( e->state() & Qt::LeftButton && m_isMoving ) + if ( e->state() & TQt::LeftButton && m_isMoving ) { moveObjectsByMouse( m_origMousePos, e->state() & AltButton || e->state() & ControlButton ); } diff --git a/kpresenter/KPrClosedLineObject.cpp b/kpresenter/KPrClosedLineObject.cpp index 58d76275a..e2664f1c3 100644 --- a/kpresenter/KPrClosedLineObject.cpp +++ b/kpresenter/KPrClosedLineObject.cpp @@ -54,7 +54,7 @@ KPrClosedLineObject::KPrClosedLineObject( const KoPointArray &_points, const KoS } KPrClosedLineObject::KPrClosedLineObject( const KPrPointObject &object ) -: KPr2DObject( object.getPen(), Qt::NoBrush, FT_BRUSH, TQColor(), TQColor(), BCT_PLAIN, false, 0, 0 ) +: KPr2DObject( object.getPen(), TQt::NoBrush, FT_BRUSH, TQColor(), TQColor(), BCT_PLAIN, false, 0, 0 ) { ext = object.getSize(); orig = object.getOrig(); diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index ba1ae4497..b3dbf4952 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -418,7 +418,7 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, ch m_pView=_view; config = KPrFactory::global()->config(); - TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Misc"), this, "GroupBox" ); + TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, TQt::Vertical, i18n("Misc"), this, "GroupBox" ); tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); TQGridLayout *grid = new TQGridLayout( tmpTQGroupBox->layout(), 8, 1 ); @@ -468,7 +468,7 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, ch box->addWidget(tmpTQGroupBox); - tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Grid"), this, "GroupBox" ); + tmpTQGroupBox = new TQGroupBox( 0, TQt::Vertical, i18n("Grid"), this, "GroupBox" ); tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); grid = new TQGridLayout( tmpTQGroupBox->layout(), 8, 1 ); @@ -904,7 +904,7 @@ void KPrConfigureToolsPage::apply() void KPrConfigureToolsPage::slotDefault() { - KoPenCmd::Pen pen( KoPen(black, 1.0, Qt::SolidLine), L_NORMAL, L_NORMAL ); + KoPenCmd::Pen pen( KoPen(black, 1.0, TQt::SolidLine), L_NORMAL, L_NORMAL ); m_confPenDia->setPen( pen ); m_pView->getActionPenColor()->setCurrentColor( pen.pen.color() ); diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index bcab0f2e2..913cff97d 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -4520,9 +4520,9 @@ void KPrDocument::verticalGuideLines( const TQValueList<double> &lines ) } -void KPrDocument::addGuideLine( Qt::Orientation o, double pos ) +void KPrDocument::addGuideLine( TQt::Orientation o, double pos ) { - if ( o == Qt::Horizontal ) + if ( o == TQt::Horizontal ) { m_hGuideLines.append( pos ); } diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h index cfba6e6fc..68a17fe15 100644 --- a/kpresenter/KPrDocument.h +++ b/kpresenter/KPrDocument.h @@ -435,7 +435,7 @@ class KPrDocument : public KoDocument * @param p the orientation of the guide line * @param p the position of the guide line */ - void addGuideLine( Qt::Orientation o, double pos ); + void addGuideLine( TQt::Orientation o, double pos ); void updateGuideLineButton(); diff --git a/kpresenter/KPrDocumentIface.cpp b/kpresenter/KPrDocumentIface.cpp index 20f924032..c2c34b5d0 100644 --- a/kpresenter/KPrDocumentIface.cpp +++ b/kpresenter/KPrDocumentIface.cpp @@ -436,7 +436,7 @@ void KPrDocumentIface::setShowGuideLines( bool b ) void KPrDocumentIface::addGuideLine( bool horizontal, double pos ) { - doc->addGuideLine( horizontal ? Qt::Horizontal: Qt::Vertical, pos ); + doc->addGuideLine( horizontal ? TQt::Horizontal: TQt::Vertical, pos ); doc->repaint( false ); } diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp index ddba51980..ec1579ddc 100644 --- a/kpresenter/KPrEffectDia.cpp +++ b/kpresenter/KPrEffectDia.cpp @@ -60,7 +60,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< setMainWidget(page); topLayout = new TQVBoxLayout( page, 0, spacingHint() ); - TQGroupBox *grp1 = new TQGroupBox(0, Qt::Vertical, i18n( "Appear" ), page ); + TQGroupBox *grp1 = new TQGroupBox(0, TQt::Vertical, i18n( "Appear" ), page ); grp1->layout()->setSpacing(KDialog::spacingHint()); grp1->layout()->setMargin(KDialog::marginHint()); topLayout->addWidget(grp1); @@ -195,7 +195,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< disappear->setChecked( obj->getDisappear() ); topLayout->addWidget(disappear); - TQGroupBox *grp2 = new TQGroupBox(0, Qt::Vertical, i18n( "Disappear" ), page); + TQGroupBox *grp2 = new TQGroupBox(0, TQt::Vertical, i18n( "Disappear" ), page); grp2->layout()->setSpacing(KDialog::spacingHint()); grp2->layout()->setMargin(KDialog::marginHint()); topLayout->addWidget(grp2); diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp index 557b87c48..40343fb18 100644 --- a/kpresenter/KPrMSPresentationSetup.cpp +++ b/kpresenter/KPrMSPresentationSetup.cpp @@ -340,7 +340,7 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie topLayout->addLayout( titleLayout ); topLayout->addWidget( moreBox ); - colourGroup = new TQGroupBox( 2, Qt::Vertical, + colourGroup = new TQGroupBox( 2, TQt::Vertical, i18n("Preliminary Slides"), this , "colourBox" ); TQWhatsThis::add( colourGroup, diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp index e545ede5b..0a0dd2c6e 100644 --- a/kpresenter/KPrMoveHelpLineDia.cpp +++ b/kpresenter/KPrMoveHelpLineDia.cpp @@ -71,7 +71,7 @@ KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *parent, const KoRect & _pa m_doc=_doc; setCaption( i18n("Add New Help Line") ); TQVBox *page = makeVBoxMainWidget(); - TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal,i18n("Orientation"), page ); + TQButtonGroup *group = new TQButtonGroup( 1, TQt::Horizontal,i18n("Orientation"), page ); group->setRadioButtonExclusive( TRUE ); group->layout(); m_rbHoriz = new TQRadioButton( i18n("Horizontal"), group ); diff --git a/kpresenter/KPrObject.cpp b/kpresenter/KPrObject.cpp index bb7ef63fb..f310552dc 100644 --- a/kpresenter/KPrObject.cpp +++ b/kpresenter/KPrObject.cpp @@ -1522,7 +1522,7 @@ KoPen KPrObject::toPen(const TQDomElement &element) const { KoPen pen; pen.setColor(retrieveColor(element)); if(element.hasAttribute(attrStyle)) - pen.setStyle(static_cast<Qt::PenStyle>(element.attribute(attrStyle).toInt())); + pen.setStyle(static_cast<TQt::PenStyle>(element.attribute(attrStyle).toInt())); if(element.hasAttribute(attrWidth)) pen.setPointWidth(element.attribute(attrWidth).toDouble()); return pen; @@ -1541,7 +1541,7 @@ TQBrush KPrObject::toBrush(const TQDomElement &element) const { TQBrush brush; brush.setColor(retrieveColor(element)); if(element.hasAttribute(attrStyle)) - brush.setStyle(static_cast<Qt::BrushStyle>(element.attribute(attrStyle).toInt())); + brush.setStyle(static_cast<TQt::BrushStyle>(element.attribute(attrStyle).toInt())); return brush; } @@ -1845,9 +1845,9 @@ void KPrShadowObject::loadOasis(const TQDomElement &element, KoOasisContext & co if ( styleStack.hasAttributeNS( KoXmlNS::draw, "stroke" )) { if ( styleStack.attributeNS( KoXmlNS::draw, "stroke" ) == "none" ) - pen.setStyle(Qt::NoPen ); + pen.setStyle(TQt::NoPen ); else if ( styleStack.attributeNS( KoXmlNS::draw, "stroke" ) == "solid" ) - pen.setStyle(Qt::SolidLine ); + pen.setStyle(TQt::SolidLine ); else if ( styleStack.attributeNS( KoXmlNS::draw, "stroke" ) == "dash" ) { TQString style = styleStack.attributeNS( KoXmlNS::draw, "stroke-dash" ); @@ -1867,25 +1867,25 @@ void KPrShadowObject::loadOasis(const TQDomElement &element, KoOasisContext & co draw->attributeNS( KoXmlNS::draw, "dots1-length", TQString() )=="0.508cm" && draw->attributeNS( KoXmlNS::draw, "dots2-length", TQString() )=="0.508cm" && draw->attributeNS( KoXmlNS::draw, "distance", TQString() )=="0.508cm" ) - pen.setStyle(Qt::DashLine ); + pen.setStyle(TQt::DashLine ); else if ( draw->attributeNS( KoXmlNS::draw, "dots1", TQString() )=="1" && draw->attributeNS( KoXmlNS::draw, "distance", TQString() )=="0.257cm" ) - pen.setStyle(Qt::DotLine ); + pen.setStyle(TQt::DotLine ); else if ( draw->attributeNS( KoXmlNS::draw, "dots1", TQString() )=="1" && draw->attributeNS( KoXmlNS::draw, "dots2", TQString() )=="1" && draw->attributeNS( KoXmlNS::draw, "dots1-length", TQString() )=="0.051cm" && draw->attributeNS( KoXmlNS::draw, "dots2-length", TQString() )=="0.254cm" && draw->attributeNS( KoXmlNS::draw, "distance", TQString() )=="0.127cm" ) - pen.setStyle(Qt::DashDotLine ); + pen.setStyle(TQt::DashDotLine ); else if ( draw->attributeNS( KoXmlNS::draw, "dots1", TQString() )=="2" && draw->attributeNS( KoXmlNS::draw, "dots2", TQString() )=="1" && draw->attributeNS( KoXmlNS::draw, "dots2-length", TQString() )=="0.203cm" && draw->attributeNS( KoXmlNS::draw, "distance", TQString() )=="0.203cm" ) - pen.setStyle(Qt::DashDotDotLine ); + pen.setStyle(TQt::DashDotDotLine ); else { kdDebug()<<" stroke style undefined \n"; - pen.setStyle(Qt::SolidLine ); + pen.setStyle(TQt::SolidLine ); } } diff --git a/kpresenter/KPrObjectProperties.cpp b/kpresenter/KPrObjectProperties.cpp index b27e24c6e..40a02e329 100644 --- a/kpresenter/KPrObjectProperties.cpp +++ b/kpresenter/KPrObjectProperties.cpp @@ -33,7 +33,7 @@ KPrObjectProperties::KPrObjectProperties( const TQPtrList<KPrObject> &objects ) : m_objects( objects ) , m_flags( 0 ) -, m_pen( KoPen( TQt::black, 1.0, Qt::SolidLine ), L_NORMAL, L_NORMAL ) +, m_pen( KoPen( TQt::black, 1.0, TQt::SolidLine ), L_NORMAL, L_NORMAL ) , m_protectContent( STATE_UNDEF ) { getProperties( m_objects ); diff --git a/kpresenter/KPrPBPreview.cpp b/kpresenter/KPrPBPreview.cpp index cec920e03..dfef8da94 100644 --- a/kpresenter/KPrPBPreview.cpp +++ b/kpresenter/KPrPBPreview.cpp @@ -30,7 +30,7 @@ KPrPBPreview::KPrPBPreview( TQWidget* parent, const char* name, PaintType _paint //FIXME zoom _zoomHandler=new KoTextZoomHandler(); paintType = _paintType; - pen = KoPen( black, 1, Qt::SolidLine ); + pen = KoPen( black, 1, TQt::SolidLine ); brush = TQBrush( white, SolidPattern ); gradient = new KPrGradient( TQt::red, TQt::green, BCT_GHORZ, false, 100, 100 ); savedGradient = gradient; diff --git a/kpresenter/KPrPartObject.cpp b/kpresenter/KPrPartObject.cpp index da2ae14db..3311ff12a 100644 --- a/kpresenter/KPrPartObject.cpp +++ b/kpresenter/KPrPartObject.cpp @@ -35,7 +35,7 @@ KPrPartObject::KPrPartObject( KPrChild *_child ) : KPr2DObject() { child = _child; - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); _enableDrawing = true; } diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp index a8a2f6539..032c6734d 100644 --- a/kpresenter/KPrPenStyleWidget.cpp +++ b/kpresenter/KPrPenStyleWidget.cpp @@ -152,22 +152,22 @@ KoPen KPrPenStyleWidget::getKPPen() const switch ( m_ui->styleCombo->currentItem() ) { case 0: - pen.setStyle( Qt::NoPen ); + pen.setStyle( TQt::NoPen ); break; case 1: - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); break; case 2: - pen.setStyle( Qt::DashLine ); + pen.setStyle( TQt::DashLine ); break; case 3: - pen.setStyle( Qt::DotLine ); + pen.setStyle( TQt::DotLine ); break; case 4: - pen.setStyle( Qt::DashDotLine ); + pen.setStyle( TQt::DashDotLine ); break; case 5: - pen.setStyle( Qt::DashDotDotLine ); + pen.setStyle( TQt::DashDotDotLine ); break; } diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp index 1a7b3079d..314ab03ff 100644 --- a/kpresenter/KPrPgConfDia.cpp +++ b/kpresenter/KPrPgConfDia.cpp @@ -126,7 +126,7 @@ void KPrPgConfDia::setupPageGeneral() // presentation pen (color and width) - TQGroupBox* penGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("Presentation Pen") , generalPage ); + TQGroupBox* penGroup = new TQGroupBox( 2, TQt::Horizontal, i18n("Presentation Pen") , generalPage ); generalLayout->addWidget( penGroup ); TQWhatsThis::add( penGroup, i18n("<p>This part of the dialog allows you to configure the " "<em>drawing mode</em>, which allows you to add additional " diff --git a/kpresenter/KPrPixmapObject.cpp b/kpresenter/KPrPixmapObject.cpp index f4578755d..09dcb7895 100644 --- a/kpresenter/KPrPixmapObject.cpp +++ b/kpresenter/KPrPixmapObject.cpp @@ -52,7 +52,7 @@ KPrPixmapObject::KPrPixmapObject( KoPictureCollection *_imageCollection ) : KPr2DObject() { imageCollection = _imageCollection; - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; @@ -73,7 +73,7 @@ KPrPixmapObject::KPrPixmapObject( KoPictureCollection *_imageCollection, const K imageCollection = _imageCollection; ext = KoSize(); // invalid size means unset - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; @@ -364,7 +364,7 @@ void KPrPixmapObject::loadOasis(const TQDomElement &element, KoOasisContext & co strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href/*.mid(1)*/); - const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); + const KoPictureKey key(filename, TQDateTime::currentDateTime(TQt::UTC)); image.setKey(key); KoStore* store = context.store(); diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp index 13340d318..8e845dc7d 100644 --- a/kpresenter/KPrRotationDialogImpl.cpp +++ b/kpresenter/KPrRotationDialogImpl.cpp @@ -130,7 +130,7 @@ KPrCircleToggle::KPrCircleToggle( TQWidget *parent, const TQString &image, int i } void KPrCircleToggle::mousePressEvent ( TQMouseEvent * e ) { - if(e->button() != Qt:: LeftButton) + if(e->button() != TQt:: LeftButton) return; setChecked(!m_selected); } diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 461015faf..874e781bc 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -476,7 +476,7 @@ void KPrTextObject::drawText( TQPainter* _painter, KoTextZoomHandler *zoomHandle _painter->save(); _painter->translate( m_doc->zoomHandler()->zoomItX( bLeft()), m_doc->zoomHandler()->zoomItY( bTop()+alignVertical)); if ( !editingTextObj || (_painter->device() && _painter->device()->devType() == TQInternal::Printer)) - cg.setBrush( TQColorGroup::Base, Qt::NoBrush ); + cg.setBrush( TQColorGroup::Base, TQt::NoBrush ); else cg.setColor( TQColorGroup::Base, m_doc->txtBackCol() ); @@ -2570,7 +2570,7 @@ void KPrTextObject::saveParagraph( TQDomDocument& doc,KoTextParag * parag,TQDomE KoPen KPrTextObject::defaultPen() const { - return KoPen( TQt::black, 1.0, Qt::NoPen ); + return KoPen( TQt::black, 1.0, TQt::NoPen ); } TQPoint KPrTextObject::viewToInternal( const TQPoint & pos, KPrCanvas* canvas ) const diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 59da1ddde..dc7464323 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -292,7 +292,7 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) presDurationDia = 0; v_ruler = 0; h_ruler = 0; - pen = KoPen( black, 1.0, Qt::SolidLine ); + pen = KoPen( black, 1.0, TQt::SolidLine ); brush = TQBrush( white, SolidPattern ); lineBegin = L_NORMAL; lineEnd = L_NORMAL; @@ -1439,7 +1439,7 @@ void KPrView::extraUnGroup() void KPrView::extraPenStyle( int newStyle ) { m_canvas->setToolEditMode( TEM_MOUSE ); - setExtraPenStyle(static_cast<Qt::PenStyle>(newStyle)); + setExtraPenStyle(static_cast<TQt::PenStyle>(newStyle)); } void KPrView::extraPenWidth( double newWidth ) @@ -2106,7 +2106,7 @@ void KPrView::setExtraLineEnd(LineEnd le) lineEnd = le; } -void KPrView::setExtraPenStyle( Qt::PenStyle style ) +void KPrView::setExtraPenStyle( TQt::PenStyle style ) { KoPen tmpPen; tmpPen.setStyle( style ); @@ -2171,7 +2171,7 @@ void KPrView::createGUI() splitter->setResizeMode( sidebar, TQSplitter::KeepSize ); } - TQSplitter *splitterVertical = new TQSplitter( Qt::Vertical, splitter ); + TQSplitter *splitterVertical = new TQSplitter( TQt::Vertical, splitter ); // setup page pageBase = new PageBase( splitterVertical, this ); @@ -3744,8 +3744,8 @@ void KPrView::setupPopupMenus() void KPrView::setupScrollbars() { - vert = new TQScrollBar( Qt::Vertical, pageBase ); - horz = new TQScrollBar( Qt::Horizontal, pageBase ); + vert = new TQScrollBar( TQt::Vertical, pageBase ); + horz = new TQScrollBar( TQt::Horizontal, pageBase ); vert->show(); horz->show(); TQObject::connect( vert, TQT_SIGNAL( valueChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( scrollV( int ) ) ); @@ -3770,12 +3770,12 @@ void KPrView::setupRulers() { tabChooser = new KoTabChooser( pageBase, KoTabChooser::TAB_ALL ); tabChooser->setReadWrite(kPresenterDoc()->isReadWrite()); - h_ruler = new KoRuler( pageBase, m_canvas, Qt::Horizontal, kPresenterDoc()->pageLayout(), + h_ruler = new KoRuler( pageBase, m_canvas, TQt::Horizontal, kPresenterDoc()->pageLayout(), KoRuler::F_INDENTS | KoRuler::F_TABS, kPresenterDoc()->unit(), tabChooser ); h_ruler->changeFlags(0); h_ruler->setReadWrite(kPresenterDoc()->isReadWrite()); - v_ruler = new KoRuler( pageBase, m_canvas, Qt::Vertical, kPresenterDoc()->pageLayout(), 0, kPresenterDoc()->unit() ); + v_ruler = new KoRuler( pageBase, m_canvas, TQt::Vertical, kPresenterDoc()->pageLayout(), 0, kPresenterDoc()->unit() ); v_ruler->setReadWrite(kPresenterDoc()->isReadWrite()); int hSpace = v_ruler->minimumSizeHint().width(); diff --git a/kpresenter/KPrView.h b/kpresenter/KPrView.h index 456e2f13b..d17bf9bae 100644 --- a/kpresenter/KPrView.h +++ b/kpresenter/KPrView.h @@ -713,7 +713,7 @@ protected slots: void extraLineEndDoubleLineArrow(); void setExtraLineEnd(LineEnd le); - void setExtraPenStyle( Qt::PenStyle style ); + void setExtraPenStyle( TQt::PenStyle style ); void setExtraPenWidth( double width ); /** diff --git a/kpresenter/dtd/kpresenter.dtd b/kpresenter/dtd/kpresenter.dtd index c5403c3fe..158f79333 100644 --- a/kpresenter/dtd/kpresenter.dtd +++ b/kpresenter/dtd/kpresenter.dtd @@ -417,9 +417,9 @@ TODO: finish documentation for export filters. align Counter alignment. Possible values include: - int(Qt::AlignAuto), //left for LTR text and right for RTL text - int(Qt::AlignLeft), - int(Qt::AlignRight). + int(TQt::AlignAuto), //left for LTR text and right for RTL text + int(TQt::AlignLeft), + int(TQt::AlignRight). --> <!ELEMENT COUNTER EMPTY> diff --git a/kpresenter/kprconverter.pl b/kpresenter/kprconverter.pl index 524b3d8df..b5de1cfbc 100644 --- a/kpresenter/kprconverter.pl +++ b/kpresenter/kprconverter.pl @@ -41,8 +41,8 @@ while (<INPUT>) $insideParag=1; s/<PARAGRAPH /<P /; # In the old format we had horzAlign="[0|1|2]" 0=left, 1=center, 2=right - # In the new one it's align="..." and uses the Qt::AlignmentFlags enums. - # Qt::AlignLeft=1, AlignRight=2, AlignHCenter=4 + # In the new one it's align="..." and uses the TQt::AlignmentFlags enums. + # TQt::AlignLeft=1, AlignRight=2, AlignHCenter=4 $alignment=$1 if(/horzAlign=(\"[0-2]+\")/); $alignment =~ tr/01/14/; s/horzAlign=\"[0-2]+\"/align=$alignment/; diff --git a/kspread/KSpreadCellIface.cpp b/kspread/KSpreadCellIface.cpp index 4188a1e4e..7d413b849 100644 --- a/kspread/KSpreadCellIface.cpp +++ b/kspread/KSpreadCellIface.cpp @@ -600,17 +600,17 @@ void CellIface::setLeftBorderStyle( const TQString& _style ) if( !m_sheet ) return; Cell* cell = m_sheet->nonDefaultCell( m_point.x(), m_point.y() ); if(_style=="DotLine") - cell->format()->setLeftBorderStyle(Qt::DotLine); + cell->format()->setLeftBorderStyle(TQt::DotLine); else if(_style=="DashLine") - cell->format()->setLeftBorderStyle(Qt::DashLine); + cell->format()->setLeftBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - cell->format()->setLeftBorderStyle(Qt::DashDotLine); + cell->format()->setLeftBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - cell->format()->setLeftBorderStyle(Qt::DashDotDotLine); + cell->format()->setLeftBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - cell->format()->setLeftBorderStyle(Qt::SolidLine); + cell->format()->setLeftBorderStyle(TQt::SolidLine); else - cell->format()->setLeftBorderStyle(Qt::SolidLine); + cell->format()->setLeftBorderStyle(TQt::SolidLine); m_sheet->setRegionPaintDirty(cell->cellRect()); } @@ -661,7 +661,7 @@ TQString CellIface::leftBorderStyle() const { if( !m_sheet ) return TQString(); Cell* cell = m_sheet->cellAt( m_point ); - Qt::PenStyle penStyle=cell->format()->leftBorderStyle( m_point.x(), m_point.y() ); + TQt::PenStyle penStyle=cell->format()->leftBorderStyle( m_point.x(), m_point.y() ); TQString tmp; if( penStyle==TQt::DotLine) tmp="DotLine"; @@ -684,17 +684,17 @@ void CellIface::setRightBorderStyle( const TQString& _style ) if( !m_sheet ) return; Cell* cell = m_sheet->nonDefaultCell( m_point.x(), m_point.y() ); if(_style=="DotLine") - cell->format()->setRightBorderStyle(Qt::DotLine); + cell->format()->setRightBorderStyle(TQt::DotLine); else if(_style=="DashLine") - cell->format()->setRightBorderStyle(Qt::DashLine); + cell->format()->setRightBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - cell->format()->setRightBorderStyle(Qt::DashDotLine); + cell->format()->setRightBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - cell->format()->setRightBorderStyle(Qt::DashDotDotLine); + cell->format()->setRightBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - cell->format()->setRightBorderStyle(Qt::SolidLine); + cell->format()->setRightBorderStyle(TQt::SolidLine); else - cell->format()->setRightBorderStyle(Qt::SolidLine); + cell->format()->setRightBorderStyle(TQt::SolidLine); m_sheet->setRegionPaintDirty(cell->cellRect()); } @@ -744,7 +744,7 @@ TQString CellIface::rightBorderStyle() const { if( !m_sheet ) return TQString(); Cell* cell = m_sheet->cellAt( m_point ); - Qt::PenStyle penStyle=cell->format()->rightBorderStyle( m_point.x(), m_point.y() ); + TQt::PenStyle penStyle=cell->format()->rightBorderStyle( m_point.x(), m_point.y() ); TQString tmp; if( penStyle==TQt::DotLine) tmp="DotLine"; @@ -767,17 +767,17 @@ void CellIface::setTopBorderStyle( const TQString& _style ) if( !m_sheet ) return; Cell* cell = m_sheet->nonDefaultCell( m_point.x(), m_point.y() ); if(_style=="DotLine") - cell->format()->setTopBorderStyle(Qt::DotLine); + cell->format()->setTopBorderStyle(TQt::DotLine); else if(_style=="DashLine") - cell->format()->setTopBorderStyle(Qt::DashLine); + cell->format()->setTopBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - cell->format()->setTopBorderStyle(Qt::DashDotLine); + cell->format()->setTopBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - cell->format()->setTopBorderStyle(Qt::DashDotDotLine); + cell->format()->setTopBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - cell->format()->setTopBorderStyle(Qt::SolidLine); + cell->format()->setTopBorderStyle(TQt::SolidLine); else - cell->format()->setTopBorderStyle(Qt::SolidLine); + cell->format()->setTopBorderStyle(TQt::SolidLine); m_sheet->setRegionPaintDirty(cell->cellRect()); } @@ -826,7 +826,7 @@ TQString CellIface::topBorderStyle() const { if( !m_sheet ) return TQString(); Cell* cell = m_sheet->cellAt( m_point ); - Qt::PenStyle penStyle=cell->format()->topBorderStyle( m_point.x(), m_point.y() ); + TQt::PenStyle penStyle=cell->format()->topBorderStyle( m_point.x(), m_point.y() ); TQString tmp; if( penStyle==TQt::DotLine) tmp="DotLine"; @@ -849,17 +849,17 @@ void CellIface::setBottomBorderStyle( const TQString& _style ) if( !m_sheet ) return; Cell* cell = m_sheet->nonDefaultCell( m_point.x(), m_point.y() ); if(_style=="DotLine") - cell->format()->setBottomBorderStyle(Qt::DotLine); + cell->format()->setBottomBorderStyle(TQt::DotLine); else if(_style=="DashLine") - cell->format()->setBottomBorderStyle(Qt::DashLine); + cell->format()->setBottomBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - cell->format()->setBottomBorderStyle(Qt::DashDotLine); + cell->format()->setBottomBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - cell->format()->setBottomBorderStyle(Qt::DashDotDotLine); + cell->format()->setBottomBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - cell->format()->setBottomBorderStyle(Qt::SolidLine); + cell->format()->setBottomBorderStyle(TQt::SolidLine); else - cell->format()->setBottomBorderStyle(Qt::SolidLine); + cell->format()->setBottomBorderStyle(TQt::SolidLine); m_sheet->setRegionPaintDirty(cell->cellRect()); } @@ -908,7 +908,7 @@ TQString CellIface::bottomBorderStyle() const { if( !m_sheet ) return TQString(); Cell* cell = m_sheet->cellAt( m_point ); - Qt::PenStyle penStyle=cell->format()->bottomBorderStyle( m_point.x(), m_point.y() ); + TQt::PenStyle penStyle=cell->format()->bottomBorderStyle( m_point.x(), m_point.y() ); TQString tmp; if( penStyle==TQt::DotLine) tmp="DotLine"; @@ -931,17 +931,17 @@ void CellIface::setFallDiagonalStyle( const TQString& _style ) if( !m_sheet ) return; Cell* cell = m_sheet->nonDefaultCell( m_point.x(), m_point.y() ); if(_style=="DotLine") - cell->format()->setFallDiagonalStyle(Qt::DotLine); + cell->format()->setFallDiagonalStyle(TQt::DotLine); else if(_style=="DashLine") - cell->format()->setFallDiagonalStyle(Qt::DashLine); + cell->format()->setFallDiagonalStyle(TQt::DashLine); else if(_style=="DashDotLine") - cell->format()->setFallDiagonalStyle(Qt::DashDotLine); + cell->format()->setFallDiagonalStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - cell->format()->setFallDiagonalStyle(Qt::DashDotDotLine); + cell->format()->setFallDiagonalStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - cell->format()->setFallDiagonalStyle(Qt::SolidLine); + cell->format()->setFallDiagonalStyle(TQt::SolidLine); else - cell->format()->setFallDiagonalStyle(Qt::SolidLine); + cell->format()->setFallDiagonalStyle(TQt::SolidLine); m_sheet->setRegionPaintDirty(cell->cellRect()); } @@ -990,7 +990,7 @@ TQString CellIface::fallDiagonalStyle() const { if( !m_sheet ) return TQString(); Cell* cell = m_sheet->cellAt( m_point ); - Qt::PenStyle penStyle=cell->format()->fallDiagonalStyle( m_point.x(), m_point.y() ); + TQt::PenStyle penStyle=cell->format()->fallDiagonalStyle( m_point.x(), m_point.y() ); TQString tmp; if( penStyle==TQt::DotLine) tmp="DotLine"; @@ -1014,17 +1014,17 @@ void CellIface::setGoUpDiagonalStyle( const TQString& _style ) if( !m_sheet ) return; Cell* cell = m_sheet->nonDefaultCell( m_point.x(), m_point.y() ); if(_style=="DotLine") - cell->format()->setGoUpDiagonalStyle(Qt::DotLine); + cell->format()->setGoUpDiagonalStyle(TQt::DotLine); else if(_style=="DashLine") - cell->format()->setGoUpDiagonalStyle(Qt::DashLine); + cell->format()->setGoUpDiagonalStyle(TQt::DashLine); else if(_style=="DashDotLine") - cell->format()->setGoUpDiagonalStyle(Qt::DashDotLine); + cell->format()->setGoUpDiagonalStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - cell->format()->setGoUpDiagonalStyle(Qt::DashDotDotLine); + cell->format()->setGoUpDiagonalStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - cell->format()->setGoUpDiagonalStyle(Qt::SolidLine); + cell->format()->setGoUpDiagonalStyle(TQt::SolidLine); else - cell->format()->setGoUpDiagonalStyle(Qt::SolidLine); + cell->format()->setGoUpDiagonalStyle(TQt::SolidLine); m_sheet->setRegionPaintDirty(cell->cellRect()); } @@ -1073,7 +1073,7 @@ TQString CellIface::goUpDiagonalStyle() const { if( !m_sheet ) return TQString(); Cell* cell = m_sheet->cellAt( m_point ); - Qt::PenStyle penStyle=cell->format()->goUpDiagonalStyle( m_point.x(), m_point.y() ); + TQt::PenStyle penStyle=cell->format()->goUpDiagonalStyle( m_point.x(), m_point.y() ); TQString tmp; if( penStyle==TQt::DotLine) tmp="DotLine"; diff --git a/kspread/KSpreadLayoutIface.cpp b/kspread/KSpreadLayoutIface.cpp index d3c5e1b75..efc28fca7 100644 --- a/kspread/KSpreadLayoutIface.cpp +++ b/kspread/KSpreadLayoutIface.cpp @@ -195,17 +195,17 @@ void LayoutIface::setTextFontFamily( const TQString& _font ) void LayoutIface::setLeftBorderStyle( const TQString& _style ) { if(_style=="DotLine") - layout->setLeftBorderStyle(Qt::DotLine); + layout->setLeftBorderStyle(TQt::DotLine); else if(_style=="DashLine") - layout->setLeftBorderStyle(Qt::DashLine); + layout->setLeftBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - layout->setLeftBorderStyle(Qt::DashDotLine); + layout->setLeftBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - layout->setLeftBorderStyle(Qt::DashDotDotLine); + layout->setLeftBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - layout->setLeftBorderStyle(Qt::SolidLine); + layout->setLeftBorderStyle(TQt::SolidLine); else - layout->setLeftBorderStyle(Qt::SolidLine); + layout->setLeftBorderStyle(TQt::SolidLine); } void LayoutIface::setLeftBorderColor(const TQString& _c) @@ -230,17 +230,17 @@ void LayoutIface::setLeftBorderWidth( int _size ) void LayoutIface::setRightBorderStyle( const TQString& _style ) { if(_style=="DotLine") - layout->setRightBorderStyle(Qt::DotLine); + layout->setRightBorderStyle(TQt::DotLine); else if(_style=="DashLine") - layout->setRightBorderStyle(Qt::DashLine); + layout->setRightBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - layout->setRightBorderStyle(Qt::DashDotLine); + layout->setRightBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - layout->setRightBorderStyle(Qt::DashDotDotLine); + layout->setRightBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - layout->setRightBorderStyle(Qt::SolidLine); + layout->setRightBorderStyle(TQt::SolidLine); else - layout->setRightBorderStyle(Qt::SolidLine); + layout->setRightBorderStyle(TQt::SolidLine); } void LayoutIface::setRightBorderColor(const TQString& _c) @@ -265,17 +265,17 @@ void LayoutIface::setRightBorderWidth( int _size ) void LayoutIface::setTopBorderStyle( const TQString& _style ) { if(_style=="DotLine") - layout->setTopBorderStyle(Qt::DotLine); + layout->setTopBorderStyle(TQt::DotLine); else if(_style=="DashLine") - layout->setTopBorderStyle(Qt::DashLine); + layout->setTopBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - layout->setTopBorderStyle(Qt::DashDotLine); + layout->setTopBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - layout->setTopBorderStyle(Qt::DashDotDotLine); + layout->setTopBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - layout->setTopBorderStyle(Qt::SolidLine); + layout->setTopBorderStyle(TQt::SolidLine); else - layout->setTopBorderStyle(Qt::SolidLine); + layout->setTopBorderStyle(TQt::SolidLine); } void LayoutIface::setTopBorderColor(const TQString& _c) @@ -300,17 +300,17 @@ void LayoutIface::setTopBorderWidth( int _size ) void LayoutIface::setBottomBorderStyle( const TQString& _style ) { if(_style=="DotLine") - layout->setBottomBorderStyle(Qt::DotLine); + layout->setBottomBorderStyle(TQt::DotLine); else if(_style=="DashLine") - layout->setBottomBorderStyle(Qt::DashLine); + layout->setBottomBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - layout->setBottomBorderStyle(Qt::DashDotLine); + layout->setBottomBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - layout->setBottomBorderStyle(Qt::DashDotDotLine); + layout->setBottomBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - layout->setBottomBorderStyle(Qt::SolidLine); + layout->setBottomBorderStyle(TQt::SolidLine); else - layout->setBottomBorderStyle(Qt::SolidLine); + layout->setBottomBorderStyle(TQt::SolidLine); } void LayoutIface::setBottomBorderColor(const TQString& _c) @@ -334,17 +334,17 @@ void LayoutIface::setBottomBorderWidth( int _size ) void LayoutIface::setFallDiagonalStyle( const TQString& _style ) { if(_style=="DotLine") - layout->setFallDiagonalStyle(Qt::DotLine); + layout->setFallDiagonalStyle(TQt::DotLine); else if(_style=="DashLine") - layout->setFallDiagonalStyle(Qt::DashLine); + layout->setFallDiagonalStyle(TQt::DashLine); else if(_style=="DashDotLine") - layout->setFallDiagonalStyle(Qt::DashDotLine); + layout->setFallDiagonalStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - layout->setFallDiagonalStyle(Qt::DashDotDotLine); + layout->setFallDiagonalStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - layout->setFallDiagonalStyle(Qt::SolidLine); + layout->setFallDiagonalStyle(TQt::SolidLine); else - layout->setFallDiagonalStyle(Qt::SolidLine); + layout->setFallDiagonalStyle(TQt::SolidLine); } void LayoutIface::setFallDiagonalColor(const TQString& _c) @@ -369,17 +369,17 @@ void LayoutIface::setFallDiagonalWidth( int _size ) void LayoutIface::setGoUpDiagonalStyle( const TQString& _style ) { if(_style=="DotLine") - layout->setGoUpDiagonalStyle(Qt::DotLine); + layout->setGoUpDiagonalStyle(TQt::DotLine); else if(_style=="DashLine") - layout->setGoUpDiagonalStyle(Qt::DashLine); + layout->setGoUpDiagonalStyle(TQt::DashLine); else if(_style=="DashDotLine") - layout->setGoUpDiagonalStyle(Qt::DashDotLine); + layout->setGoUpDiagonalStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - layout->setGoUpDiagonalStyle(Qt::DashDotDotLine); + layout->setGoUpDiagonalStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - layout->setGoUpDiagonalStyle(Qt::SolidLine); + layout->setGoUpDiagonalStyle(TQt::SolidLine); else - layout->setGoUpDiagonalStyle(Qt::SolidLine); + layout->setGoUpDiagonalStyle(TQt::SolidLine); } void LayoutIface::setGoUpDiagonalColor(const TQString& _c) diff --git a/kspread/dialogs/kspread_dlg_conditional.cpp b/kspread/dialogs/kspread_dlg_conditional.cpp index a75bd5bd0..42e60b6a6 100644 --- a/kspread/dialogs/kspread_dlg_conditional.cpp +++ b/kspread/dialogs/kspread_dlg_conditional.cpp @@ -53,7 +53,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags TQGridLayout * Form1Layout = new TQGridLayout( this, 1, 1, 11, 6, "Form1Layout"); TQGroupBox * groupBox1_3 = new TQGroupBox( this, "groupBox1_3" ); - groupBox1_3->setColumnLayout(0, Qt::Vertical ); + groupBox1_3->setColumnLayout(0, TQt::Vertical ); groupBox1_3->layout()->setSpacing( KDialog::spacingHint() ); groupBox1_3->layout()->setMargin( KDialog::marginHint() ); TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->layout() ); @@ -88,7 +88,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags Form1Layout->addWidget( groupBox1_3, 2, 0 ); TQGroupBox * groupBox1_2 = new TQGroupBox( this, "groupBox1_2" ); - groupBox1_2->setColumnLayout(0, Qt::Vertical ); + groupBox1_2->setColumnLayout(0, TQt::Vertical ); groupBox1_2->layout()->setSpacing( KDialog::spacingHint() ); groupBox1_2->layout()->setMargin( KDialog::marginHint() ); @@ -124,7 +124,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags Form1Layout->addWidget( groupBox1_2, 1, 0 ); TQGroupBox * groupBox1_1 = new TQGroupBox( this, "groupBox1_1" ); - groupBox1_1->setColumnLayout(0, Qt::Vertical ); + groupBox1_1->setColumnLayout(0, TQt::Vertical ); groupBox1_1->layout()->setSpacing( KDialog::spacingHint() ); groupBox1_1->layout()->setMargin( KDialog::marginHint() ); @@ -291,7 +291,7 @@ ConditionalDialog::ConditionalDialog( View * parent, const char * name, m_dlg->m_style_3->insertStringList( list ); setCaption( i18n( "Conditional Cell Attributes" ) ); - setButtonBoxOrientation(Qt::Vertical ); + setButtonBoxOrientation(TQt::Vertical ); setMainWidget( m_dlg ); init(); diff --git a/kspread/dialogs/kspread_dlg_csv.cpp b/kspread/dialogs/kspread_dlg_csv.cpp index c068810b0..c40074b90 100644 --- a/kspread/dialogs/kspread_dlg_csv.cpp +++ b/kspread/dialogs/kspread_dlg_csv.cpp @@ -88,7 +88,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_delimiterBox = new TQButtonGroup( page, "m_delimiterBox" ); m_delimiterBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) ); m_delimiterBox->setTitle( i18n( "Delimiter" ) ); - m_delimiterBox->setColumnLayout(0, Qt::Vertical ); + m_delimiterBox->setColumnLayout(0, TQt::Vertical ); m_delimiterBox->layout()->setSpacing( KDialog::spacingHint() ); m_delimiterBox->layout()->setMargin( KDialog::marginHint() ); m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->layout() ); @@ -131,7 +131,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_formatBox = new TQButtonGroup( page, "m_formatBox" ); m_formatBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) ); m_formatBox->setTitle( i18n( "Format" ) ); - m_formatBox->setColumnLayout(0, Qt::Vertical ); + m_formatBox->setColumnLayout(0, TQt::Vertical ); m_formatBox->layout()->setSpacing( KDialog::spacingHint() ); m_formatBox->layout()->setMargin( KDialog::marginHint() ); m_formatBoxLayout = new TQGridLayout( m_formatBox->layout() ); diff --git a/kspread/dialogs/kspread_dlg_insert.cpp b/kspread/dialogs/kspread_dlg_insert.cpp index 454a43ba4..23f7f841b 100644 --- a/kspread/dialogs/kspread_dlg_insert.cpp +++ b/kspread/dialogs/kspread_dlg_insert.cpp @@ -53,7 +53,7 @@ InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,M setMainWidget(page); TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); - TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page); + TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n("Insert"),page); grp->setRadioButtonExclusive( TRUE ); grp->layout(); lay1->addWidget(grp); diff --git a/kspread/dialogs/kspread_dlg_layout.cpp b/kspread/dialogs/kspread_dlg_layout.cpp index ad876b3b4..ff4719c62 100644 --- a/kspread/dialogs/kspread_dlg_layout.cpp +++ b/kspread/dialogs/kspread_dlg_layout.cpp @@ -76,14 +76,14 @@ using namespace KSpread; PatternSelect::PatternSelect( TQWidget *parent, const char * ) : TQFrame( parent ) { - penStyle = Qt::NoPen; + penStyle = TQt::NoPen; penWidth = 1; penColor = colorGroup().text(); selected = false; undefined = false; } -void PatternSelect::setPattern( const TQColor &_color, int _width, Qt::PenStyle _style ) +void PatternSelect::setPattern( const TQColor &_color, int _width, TQt::PenStyle _style ) { penStyle = _style; penColor = _color; @@ -154,7 +154,7 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) TQGridLayout * layout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "layout"); TQGroupBox * groupBox = new TQGroupBox( this, "groupBox1" ); - groupBox->setColumnLayout(0, Qt::Vertical ); + groupBox->setColumnLayout(0, TQt::Vertical ); groupBox->setTitle( i18n( "Style" ) ); groupBox->layout()->setSpacing( KDialog::spacingHint() ); groupBox->layout()->setMargin( KDialog::marginHint() ); @@ -2531,7 +2531,7 @@ double CellFormatPagePosition::getSizeWidth() const BorderButton::BorderButton( TQWidget *parent, const char *_name ) : TQPushButton(parent,_name) { - penStyle = Qt::NoPen; + penStyle = TQt::NoPen; penWidth = 1; penColor = colorGroup().text(); setToggleButton( true ); @@ -2547,7 +2547,7 @@ void BorderButton::mousePressEvent( TQMouseEvent * ) void BorderButton::setUndefined() { - setPenStyle(Qt::SolidLine ); + setPenStyle(TQt::SolidLine ); setPenWidth(1); setColor(colorGroup().midlight()); } @@ -2557,7 +2557,7 @@ void BorderButton::unselect() { setOn(false); setPenWidth(1); - setPenStyle(Qt::NoPen); + setPenStyle(TQt::NoPen); setColor( colorGroup().text() ); setChanged(true); } @@ -2646,7 +2646,7 @@ CellFormatPageBorder::CellFormatPageBorder( TQWidget* parent, CellFormatDialog * style->setEnabled(false); size->setEnabled(false); - preview->setPattern( black , 1, Qt::SolidLine ); + preview->setPattern( black , 1, TQt::SolidLine ); this->resize( 400, 400 ); } @@ -2859,16 +2859,16 @@ void CellFormatPageBorder::InitializeBorderButtons() void CellFormatPageBorder::InitializePatterns() { - pattern[0]->setPattern( black, 1, Qt::DotLine ); - pattern[1]->setPattern( black, 1, Qt::DashLine ); - pattern[2]->setPattern( black, 1, Qt::SolidLine ); - pattern[3]->setPattern( black, 1, Qt::DashDotLine ); - pattern[4]->setPattern( black, 1, Qt::DashDotDotLine ); - pattern[5]->setPattern( black, 2, Qt::SolidLine ); - pattern[6]->setPattern( black, 3, Qt::SolidLine ); - pattern[7]->setPattern( black, 4, Qt::SolidLine ); - pattern[8]->setPattern( black, 5, Qt::SolidLine ); - pattern[9]->setPattern( black, 1, Qt::NoPen ); + pattern[0]->setPattern( black, 1, TQt::DotLine ); + pattern[1]->setPattern( black, 1, TQt::DashLine ); + pattern[2]->setPattern( black, 1, TQt::SolidLine ); + pattern[3]->setPattern( black, 1, TQt::DashDotLine ); + pattern[4]->setPattern( black, 1, TQt::DashDotDotLine ); + pattern[5]->setPattern( black, 2, TQt::SolidLine ); + pattern[6]->setPattern( black, 3, TQt::SolidLine ); + pattern[7]->setPattern( black, 4, TQt::SolidLine ); + pattern[8]->setPattern( black, 5, TQt::SolidLine ); + pattern[9]->setPattern( black, 1, TQt::NoPen ); slotSetColorButton( black ); } @@ -2919,7 +2919,7 @@ void CellFormatPageBorder::cutomize_chosen_slot() style->setEnabled( false ); size->setEnabled( false ); pattern[2]->slotSelect(); - preview->setPattern( black , 1, Qt::SolidLine ); + preview->setPattern( black , 1, TQt::SolidLine ); } } @@ -2936,26 +2936,26 @@ void CellFormatPageBorder::slotChangeStyle(int) int penSize = size->currentText().toInt(); if ( !penSize) { - preview->setPattern( preview->getColor(), penSize, Qt::NoPen ); + preview->setPattern( preview->getColor(), penSize, TQt::NoPen ); } else { switch(index) { case 0: - preview->setPattern( preview->getColor(), penSize, Qt::DotLine ); + preview->setPattern( preview->getColor(), penSize, TQt::DotLine ); break; case 1: - preview->setPattern( preview->getColor(), penSize, Qt::DashLine ); + preview->setPattern( preview->getColor(), penSize, TQt::DashLine ); break; case 2: - preview->setPattern( preview->getColor(), penSize, Qt::DashDotLine ); + preview->setPattern( preview->getColor(), penSize, TQt::DashDotLine ); break; case 3: - preview->setPattern( preview->getColor(), penSize, Qt::DashDotDotLine ); + preview->setPattern( preview->getColor(), penSize, TQt::DashDotDotLine ); break; case 4: - preview->setPattern( preview->getColor(), penSize, Qt::SolidLine ); + preview->setPattern( preview->getColor(), penSize, TQt::SolidLine ); break; default: kdDebug(36001)<<"Error in combobox\n"; @@ -3239,7 +3239,7 @@ void CellFormatPageBorder::changeState( BorderButton *_p) else { _p->setPenWidth(1); - _p->setPenStyle(Qt::NoPen); + _p->setPenStyle(TQt::NoPen); _p->setColor( colorGroup().text() ); } @@ -3496,12 +3496,12 @@ if (rect.contains(TQPoint(_ev->x(),_ev->y()))) BrushSelect::BrushSelect( TQWidget *parent, const char * ) : TQFrame( parent ) { - brushStyle = Qt::NoBrush; + brushStyle = TQt::NoBrush; brushColor = TQt::red; selected = false; } -void BrushSelect::setPattern( const TQColor &_color,Qt::BrushStyle _style ) +void BrushSelect::setPattern( const TQColor &_color,TQt::BrushStyle _style ) { brushStyle = _style; brushColor = _color; @@ -3720,21 +3720,21 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog connect( brush15, TQT_SIGNAL( clicked( BrushSelect* ) ), this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - brush1->setPattern( TQt::red,Qt::VerPattern ); - brush2->setPattern( TQt::red,Qt::HorPattern ); - brush3->setPattern( TQt::red,Qt::Dense1Pattern ); - brush4->setPattern( TQt::red,Qt::Dense2Pattern ); - brush5->setPattern( TQt::red,Qt::Dense3Pattern ); - brush6->setPattern( TQt::red,Qt::Dense4Pattern ); - brush7->setPattern( TQt::red,Qt::Dense5Pattern ); - brush8->setPattern( TQt::red,Qt::Dense6Pattern ); - brush9->setPattern( TQt::red,Qt::Dense7Pattern ); - brush10->setPattern( TQt::red,Qt::CrossPattern ); - brush11->setPattern( TQt::red,Qt::BDiagPattern ); - brush12->setPattern( TQt::red,Qt::FDiagPattern ); - brush13->setPattern( TQt::red,Qt::VerPattern ); - brush14->setPattern( TQt::red,Qt::DiagCrossPattern ); - brush15->setPattern( TQt::red,Qt::NoBrush ); + brush1->setPattern( TQt::red,TQt::VerPattern ); + brush2->setPattern( TQt::red,TQt::HorPattern ); + brush3->setPattern( TQt::red,TQt::Dense1Pattern ); + brush4->setPattern( TQt::red,TQt::Dense2Pattern ); + brush5->setPattern( TQt::red,TQt::Dense3Pattern ); + brush6->setPattern( TQt::red,TQt::Dense4Pattern ); + brush7->setPattern( TQt::red,TQt::Dense5Pattern ); + brush8->setPattern( TQt::red,TQt::Dense6Pattern ); + brush9->setPattern( TQt::red,TQt::Dense7Pattern ); + brush10->setPattern( TQt::red,TQt::CrossPattern ); + brush11->setPattern( TQt::red,TQt::BDiagPattern ); + brush12->setPattern( TQt::red,TQt::FDiagPattern ); + brush13->setPattern( TQt::red,TQt::VerPattern ); + brush14->setPattern( TQt::red,TQt::DiagCrossPattern ); + brush15->setPattern( TQt::red,TQt::NoBrush ); current->setPattern(dlg->brushColor,dlg->brushStyle); current->slotSelect(); diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h index 84b6d241a..1360f1c88 100644 --- a/kspread/dialogs/kspread_dlg_layout.h +++ b/kspread/dialogs/kspread_dlg_layout.h @@ -101,14 +101,14 @@ class PatternSelect : public TQFrame public: PatternSelect( TQWidget *parent, const char *_name ); - void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; repaint(); } - Qt::PenStyle getPenStyle() { return penStyle; } + void setPenStyle( TQt::PenStyle _pat ) { penStyle = _pat; repaint(); } + TQt::PenStyle getPenStyle() { return penStyle; } void setColor( const TQColor &_col ) { penColor = _col; repaint(); } const TQColor& getColor() { return penColor; } void setPenWidth( int _w ) { penWidth = _w; repaint(); } int getPenWidth() { return penWidth; } - void setPattern( const TQColor &_color, int _width, Qt::PenStyle _style ); + void setPattern( const TQColor &_color, int _width, TQt::PenStyle _style ); void setUndefined(); void setDefined() { undefined = FALSE; repaint(); } @@ -125,7 +125,7 @@ protected: virtual void paintEvent( TQPaintEvent *_ev ); virtual void mousePressEvent( TQMouseEvent *_ev ); - Qt::PenStyle penStyle; + TQt::PenStyle penStyle; TQColor penColor; int penWidth; @@ -303,8 +303,8 @@ class BorderButton : public TQPushButton public: BorderButton( TQWidget *parent, const char *_name ); - void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat;} - Qt::PenStyle getPenStyle() { return penStyle; } + void setPenStyle( TQt::PenStyle _pat ) { penStyle = _pat;} + TQt::PenStyle getPenStyle() { return penStyle; } void setColor( const TQColor &_col ) { penColor = _col; } const TQColor& getColor() { return penColor; } void setPenWidth( int _w ) { penWidth = _w; } @@ -317,7 +317,7 @@ public: void clicked(BorderButton *); protected: virtual void mousePressEvent( TQMouseEvent *_ev ); - Qt::PenStyle penStyle; + TQt::PenStyle penStyle; TQColor penColor; int penWidth; bool changed; @@ -389,11 +389,11 @@ class BrushSelect : public TQFrame public: BrushSelect( TQWidget *parent, const char *_name ); - void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; repaint(); } - Qt::BrushStyle getBrushStyle() const { return brushStyle; } + void setBrushStyle( TQt::BrushStyle _pat ) { brushStyle = _pat; repaint(); } + TQt::BrushStyle getBrushStyle() const { return brushStyle; } TQColor getBrushColor() const { return brushColor; } void setBrushColor(const TQColor &_c) { brushColor=_c;} - void setPattern( const TQColor &_color, Qt::BrushStyle _style ); + void setPattern( const TQColor &_color, TQt::BrushStyle _style ); signals: void clicked( BrushSelect *_this ); @@ -406,7 +406,7 @@ protected: virtual void paintEvent( TQPaintEvent *_ev ); virtual void mousePressEvent( TQMouseEvent *_ev ); - Qt::BrushStyle brushStyle; + TQt::BrushStyle brushStyle; TQColor brushColor; bool selected; }; @@ -527,13 +527,13 @@ public: bool bStyle; TQColor color; bool bColor; - Qt::PenStyle style; + TQt::PenStyle style; }; // The format of the selected area CellBorderFormat borders[BorderType_END]; - Qt::BrushStyle brushStyle; + TQt::BrushStyle brushStyle; TQColor brushColor; bool oneCol; diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cpp b/kspread/dialogs/kspread_dlg_paperlayout.cpp index bdd65a268..8f18de6de 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.cpp +++ b/kspread/dialogs/kspread_dlg_paperlayout.cpp @@ -126,7 +126,7 @@ void PaperLayout::initRanges( TQWidget * tab, TQVBoxLayout * vbox ) SheetPrint* print = m_pSheet->print(); TQGroupBox *rangeGroup = new TQGroupBox( i18n("Ranges"), tab ); - rangeGroup->setColumnLayout( 0, Qt::Vertical ); + rangeGroup->setColumnLayout( 0, TQt::Vertical ); rangeGroup->setMargin( KDialog::marginHint() ); vbox->addWidget( rangeGroup ); @@ -178,7 +178,7 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox ) SheetPrint* print = m_pSheet->print(); TQButtonGroup *zoomGroup = new TQButtonGroup( i18n("Scale Printout"), tab ); - zoomGroup->setColumnLayout( 0, Qt::Vertical ); + zoomGroup->setColumnLayout( 0, TQt::Vertical ); zoomGroup->setMargin( KDialog::marginHint() ); vbox->addWidget( zoomGroup ); diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cpp b/kspread/dialogs/kspread_dlg_pasteinsert.cpp index 93d67b06a..2ffffc202 100644 --- a/kspread/dialogs/kspread_dlg_pasteinsert.cpp +++ b/kspread/dialogs/kspread_dlg_pasteinsert.cpp @@ -47,7 +47,7 @@ PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRec setMainWidget(page); TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); - TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page); + TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n("Insert"),page); grp->setRadioButtonExclusive( TRUE ); grp->layout(); lay1->addWidget(grp); diff --git a/kspread/dialogs/kspread_dlg_preference.cpp b/kspread/dialogs/kspread_dlg_preference.cpp index d82af591b..9202bb3a6 100644 --- a/kspread/dialogs/kspread_dlg_preference.cpp +++ b/kspread/dialogs/kspread_dlg_preference.cpp @@ -789,7 +789,7 @@ configureLayoutPage::configureLayoutPage( View* _view,TQVBox *box , char *name ) { m_pView = _view; - TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Default Parameters"), box, "GroupBox" ); + TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, TQt::Vertical, i18n("Default Parameters"), box, "GroupBox" ); tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); diff --git a/kspread/dialogs/kspread_dlg_series.cpp b/kspread/dialogs/kspread_dlg_series.cpp index ee241617d..6bc31ca17 100644 --- a/kspread/dialogs/kspread_dlg_series.cpp +++ b/kspread/dialogs/kspread_dlg_series.cpp @@ -58,7 +58,7 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker) TQBoxLayout *grid1 = new TQHBoxLayout(page); grid1->setSpacing( spacingHint() ); - TQButtonGroup* gb1 = new TQButtonGroup( 2, Qt::Vertical, + TQButtonGroup* gb1 = new TQButtonGroup( 2, TQt::Vertical, i18n("Insert Values"), page ); column = new TQRadioButton( i18n("Vertical"), gb1 ); TQWhatsThis::add(column, i18n("Insert the series vertically, one below the other") ); @@ -67,7 +67,7 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker) column->setChecked(true); - TQButtonGroup* gb2 = new TQButtonGroup( 2, Qt::Vertical, + TQButtonGroup* gb2 = new TQButtonGroup( 2, TQt::Vertical, i18n("Type"), page ); linear = new TQRadioButton( i18n("Linear (2,4,6,...)"), gb2 ); TQWhatsThis::add(linear, i18n("Generate a series from 'start' to 'end' and for each step add " @@ -81,7 +81,7 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker) linear->setChecked(true); - TQGroupBox* gb = new TQGroupBox( 1, Qt::Vertical, i18n("Parameters"), page ); + TQGroupBox* gb = new TQGroupBox( 1, TQt::Vertical, i18n("Parameters"), page ); TQWidget *params = new TQWidget( gb ); TQGridLayout *params_layout = new TQGridLayout( params, 3, 2 ); params_layout->setSpacing( spacingHint() ); @@ -110,8 +110,8 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker) void SeriesDlg::slotOk() { - Series mode=Column; //same as Qt::Vertical - Series type=Linear; // same as Qt::Horizontal + Series mode=Column; //same as Vertical + Series type=Linear; // same as Horizontal TQString tmp; double dstep, dend, dstart; Sheet * m_pSheet; diff --git a/kspread/dialogs/kspread_dlg_sort.cpp b/kspread/dialogs/kspread_dlg_sort.cpp index 52cda9b64..5e5167f8a 100644 --- a/kspread/dialogs/kspread_dlg_sort.cpp +++ b/kspread/dialogs/kspread_dlg_sort.cpp @@ -79,7 +79,7 @@ SortDialog::SortDialog( View * parent, const char * name, //---------------- Sort Layout & Header Row/Column Toggle //Sort orientation selector (for selecting Left-To-Right or Top-To-Bottom sorting of the selection) - TQGroupBox* layoutGroup = new TQGroupBox(2 , Qt::Vertical, m_page1, "layoutGroup"); + TQGroupBox* layoutGroup = new TQGroupBox(2 , TQt::Vertical, m_page1, "layoutGroup"); layoutGroup->setTitle( i18n("Layout") ); TQHButtonGroup * orientationGroup = new TQHButtonGroup( layoutGroup, "orientationGroup" ); @@ -107,7 +107,7 @@ SortDialog::SortDialog( View * parent, const char * name, TQGroupBox * sort1Box = new TQGroupBox( m_page1, "sort1Box" ); sort1Box->setTitle( i18n( "Sort By" ) ); sort1Box->setFlat(true); - sort1Box->setColumnLayout(0, Qt::Vertical ); + sort1Box->setColumnLayout(0, TQt::Vertical ); sort1Box->layout()->setSpacing( KDialog::spacingHint() ); sort1Box->layout()->setMargin( KDialog::marginHint() ); TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->layout() ); @@ -126,7 +126,7 @@ SortDialog::SortDialog( View * parent, const char * name, TQGroupBox * sort2Box = new TQGroupBox( m_page1, "sort2Box" ); sort2Box->setTitle( i18n( "Then By" ) ); sort2Box->setFlat(true); - sort2Box->setColumnLayout(0, Qt::Vertical ); + sort2Box->setColumnLayout(0, TQt::Vertical ); sort2Box->layout()->setSpacing( KDialog::spacingHint() ); sort2Box->layout()->setMargin( KDialog::marginHint() ); TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->layout() ); @@ -146,7 +146,7 @@ SortDialog::SortDialog( View * parent, const char * name, TQGroupBox * sort3Box = new TQGroupBox( m_page1, "sort3Box" ); sort3Box->setTitle( i18n( "Then By" ) ); sort3Box->setFlat(true); - sort3Box->setColumnLayout(0, Qt::Vertical ); + sort3Box->setColumnLayout(0, TQt::Vertical ); sort3Box->layout()->setSpacing( KDialog::spacingHint() ); sort3Box->layout()->setMargin( KDialog::marginHint() ); TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->layout() ); @@ -175,7 +175,7 @@ SortDialog::SortDialog( View * parent, const char * name, TQGroupBox * firstKeyBox = new TQGroupBox( m_page2, "firstKeyBox" ); firstKeyBox->setTitle( i18n( "First Key" ) ); - firstKeyBox->setColumnLayout(0, Qt::Vertical ); + firstKeyBox->setColumnLayout(0, TQt::Vertical ); firstKeyBox->layout()->setSpacing( KDialog::spacingHint() ); firstKeyBox->layout()->setMargin( KDialog::marginHint() ); TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->layout() ); @@ -200,7 +200,7 @@ SortDialog::SortDialog( View * parent, const char * name, TQGroupBox * resultToBox = new TQGroupBox( m_page2, "resultToBox" ); resultToBox->setTitle( i18n( "Location to Store Sort Results" ) ); - resultToBox->setColumnLayout(0, Qt::Vertical ); + resultToBox->setColumnLayout(0, TQt::Vertical ); resultToBox->layout()->setSpacing( KDialog::spacingHint() ); resultToBox->layout()->setMargin( KDialog::marginHint() ); diff --git a/kspread/dialogs/kspread_dlg_special.cpp b/kspread/dialogs/kspread_dlg_special.cpp index 2fbeb7ebe..5e835c1fb 100644 --- a/kspread/dialogs/kspread_dlg_special.cpp +++ b/kspread/dialogs/kspread_dlg_special.cpp @@ -44,7 +44,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) setMainWidget(page); TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); - TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Paste What" ),page ); + TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Paste What" ),page ); grp->setRadioButtonExclusive( TRUE ); grp->layout(); lay1->addWidget(grp); @@ -57,7 +57,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) rb4 = new TQRadioButton( i18n("Everything without border"), grp ); rb1->setChecked(true); - grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Operation"),page); + grp = new TQButtonGroup( 1, TQt::Horizontal, i18n("Operation"),page); grp->setRadioButtonExclusive( TRUE ); grp->layout(); lay1->addWidget(grp); diff --git a/kspread/dialogs/kspread_dlg_styles.cpp b/kspread/dialogs/kspread_dlg_styles.cpp index bf8f4de26..461b28cc0 100644 --- a/kspread/dialogs/kspread_dlg_styles.cpp +++ b/kspread/dialogs/kspread_dlg_styles.cpp @@ -78,7 +78,7 @@ StyleDlg::StyleDlg( View * parent, StyleManager * manager, m_dlg( new StyleWidget( this ) ) { setCaption( i18n( "Style Manager" ) ); - setButtonBoxOrientation(Qt::Vertical ); + setButtonBoxOrientation(TQt::Vertical ); setMainWidget( m_dlg ); slotDisplayMode( 0 ); diff --git a/kspread/dialogs/kspread_dlg_subtotal.cpp b/kspread/dialogs/kspread_dlg_subtotal.cpp index 054cc1f76..37799645e 100644 --- a/kspread/dialogs/kspread_dlg_subtotal.cpp +++ b/kspread/dialogs/kspread_dlg_subtotal.cpp @@ -45,7 +45,7 @@ SubtotalDialog::SubtotalDialog( View * parent, TQRect const & selection, const c m_selection( selection ), m_dialog( new Subtotal( this ) ) { - setButtonBoxOrientation( Qt::Vertical ); + setButtonBoxOrientation( TQt::Vertical ); setMainWidget( m_dialog ); fillColumnBoxes(); diff --git a/kspread/dialogs/kspread_dlg_validity.cpp b/kspread/dialogs/kspread_dlg_validity.cpp index ea4625272..b7aca93e5 100644 --- a/kspread/dialogs/kspread_dlg_validity.cpp +++ b/kspread/dialogs/kspread_dlg_validity.cpp @@ -53,7 +53,7 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker ) TQVBoxLayout *lay1 = new TQVBoxLayout( page1, KDialogBase::marginHint(), KDialogBase::spacingHint() ); TQGroupBox* tmpTQButtonGroup; - tmpTQButtonGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Validity Criteria"), page1, "ButtonGroup_1" ); + tmpTQButtonGroup = new TQGroupBox( 0, TQt::Vertical, i18n("Validity Criteria"), page1, "ButtonGroup_1" ); tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint()); TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->layout(),4,2); @@ -147,7 +147,7 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker ) lay1 = new TQVBoxLayout( page2, KDialogBase::marginHint(), KDialogBase::spacingHint() ); - tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page2, "ButtonGroup_2" ); + tmpTQButtonGroup = new TQButtonGroup( 0, TQt::Vertical, i18n("Contents"), page2, "ButtonGroup_2" ); tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint()); TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2); @@ -187,7 +187,7 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker ) TQFrame *page3 = addPage(i18n("Input Help")); lay1 = new TQVBoxLayout( page3, KDialogBase::marginHint(), KDialogBase::spacingHint() ); - tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page3, "ButtonGroup_2" ); + tmpTQButtonGroup = new TQButtonGroup( 0, TQt::Vertical, i18n("Contents"), page3, "ButtonGroup_2" ); tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint()); diff --git a/kspread/kspread_canvas.cpp b/kspread/kspread_canvas.cpp index 511e5e0c8..1154f650b 100644 --- a/kspread/kspread_canvas.cpp +++ b/kspread/kspread_canvas.cpp @@ -221,7 +221,7 @@ Canvas::Canvas (View *_view) d->defaultGridPen.setColor( lightGray ); d->defaultGridPen.setWidth( 1 ); - d->defaultGridPen.setStyle( Qt::SolidLine ); + d->defaultGridPen.setStyle( TQt::SolidLine ); d->xOffset = 0.0; d->yOffset = 0.0; @@ -1228,14 +1228,14 @@ void Canvas::mouseReleaseEvent( TQMouseEvent* /*_ev*/) void Canvas::processClickSelectionHandle( TQMouseEvent *event ) { // Auto fill ? That is done using the left mouse button. - if ( event->button() == Qt::LeftButton ) + if ( event->button() == TQt::LeftButton ) { d->mouseAction = AutoFill; d->autoFillSource = selectionInfo()->lastRange(); } // Resize a cell (done with the right mouse button) ? // But for that to work there must not be a selection. - else if ( event->button() == Qt::MidButton && selectionInfo()->isSingular()) + else if ( event->button() == TQt::MidButton && selectionInfo()->isSingular()) { d->mouseAction = ResizeCell; } @@ -1307,13 +1307,13 @@ bool Canvas::highlightRangeSizeGripAt(double x, double y) void Canvas::mousePressEvent( TQMouseEvent * _ev ) { - if ( _ev->button() == Qt::LeftButton ) + if ( _ev->button() == TQt::LeftButton ) { d->mousePressed = true; d->view->enableAutoScroll(); } - if ( activeSheet() && _ev->button() == Qt::LeftButton) + if ( activeSheet() && _ev->button() == TQt::LeftButton) { d->m_moveStartPosMouse = objectRect( false ).topLeft(); EmbeddedObject *obj = getObject( _ev->pos(), activeSheet() ); @@ -1495,7 +1495,7 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev ) switch (_ev->button()) { - case Qt::LeftButton: + case TQt::LeftButton: if (!d->anchor.isEmpty()) { // Hyperlink pressed @@ -1532,7 +1532,7 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev ) (d->chooseCell ? choice() : selectionInfo())->initialize(TQPoint(col,row), activeSheet()); } break; - case Qt::MidButton: + case TQt::MidButton: // Paste operation with the middle button? if ( d->view->koDocument()->isReadWrite() && !sheet->isProtected() ) { @@ -1542,7 +1542,7 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev ) sheet->setRegionPaintDirty(*selectionInfo()); } break; - case Qt::RightButton: + case TQt::RightButton: if (!selectionInfo()->contains( TQPoint( col, row ) )) { // No selection or the mouse press was outside of an existing selection? @@ -1561,7 +1561,7 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev ) updatePosWidget(); // Context menu? - if ( _ev->button() == Qt::RightButton ) + if ( _ev->button() == TQt::RightButton ) { // TODO: Handle anchor // TODO Stefan: ??? TQPoint p = mapToGlobal( _ev->pos() ); @@ -1625,7 +1625,7 @@ void Canvas::mouseDoubleClickEvent( TQMouseEvent* _ev) void Canvas::wheelEvent( TQWheelEvent* _ev ) { - if ( _ev->orientation() == Qt::Vertical ) + if ( _ev->orientation() == TQt::Vertical ) { if ( vertScrollBar() ) TQApplication::sendEvent( vertScrollBar(), _ev ); @@ -4667,7 +4667,7 @@ void VBorder::mousePressEvent( TQMouseEvent * _ev ) if ( !m_pView->koDocument()->isReadWrite() ) return; - if ( _ev->button() == Qt::LeftButton ) + if ( _ev->button() == TQt::LeftButton ) m_bMousePressed = true; const Sheet *sheet = m_pCanvas->activeSheet(); @@ -4733,7 +4733,7 @@ void VBorder::mousePressEvent( TQMouseEvent * _ev ) m_iSelectionAnchor = hit_row; if ( !m_pView->selectionInfo()->contains( TQPoint(1, hit_row) ) || - !( _ev->button() == Qt::RightButton ) || + !( _ev->button() == TQt::RightButton ) || !m_pView->selectionInfo()->isRowSelected() ) { TQPoint newMarker( 1, hit_row ); @@ -4755,7 +4755,7 @@ void VBorder::mousePressEvent( TQMouseEvent * _ev ) } } - if ( _ev->button() == Qt::RightButton ) + if ( _ev->button() == TQt::RightButton ) { TQPoint p = mapToGlobal( _ev->pos() ); m_pView->popupRowMenu( p ); @@ -5222,7 +5222,7 @@ void HBorder::mousePressEvent( TQMouseEvent * _ev ) if (!m_pView->koDocument()->isReadWrite()) return; - if ( _ev->button() == Qt::LeftButton ) + if ( _ev->button() == TQt::LeftButton ) m_bMousePressed = true; const Sheet *sheet = m_pCanvas->activeSheet(); @@ -5349,7 +5349,7 @@ void HBorder::mousePressEvent( TQMouseEvent * _ev ) m_iSelectionAnchor = hit_col; if ( !m_pView->selectionInfo()->contains( TQPoint( hit_col, 1 ) ) || - !( _ev->button() == Qt::RightButton ) || + !( _ev->button() == TQt::RightButton ) || !m_pView->selectionInfo()->isColumnSelected() ) { TQPoint newMarker( hit_col, 1 ); @@ -5371,7 +5371,7 @@ void HBorder::mousePressEvent( TQMouseEvent * _ev ) } } - if ( _ev->button() == Qt::RightButton ) + if ( _ev->button() == TQt::RightButton ) { TQPoint p = mapToGlobal( _ev->pos() ); m_pView->popupColumnMenu( p ); diff --git a/kspread/kspread_cell.cpp b/kspread/kspread_cell.cpp index fca76bbe0..1c99dea39 100644 --- a/kspread/kspread_cell.cpp +++ b/kspread/kspread_cell.cpp @@ -5554,7 +5554,7 @@ void Cell::saveOasisValue (KoXmlWriter &xmlWriter) { xmlWriter.addAttribute( "office:value-type", "date" ); xmlWriter.addAttribute( "office:date-value", - value().asDate().toString( Qt::ISODate ) ); + value().asDate().toString( TQt::ISODate ) ); break; } case Value::fmt_Time: diff --git a/kspread/kspread_format.cpp b/kspread/kspread_format.cpp index 430e23869..c354f8497 100644 --- a/kspread/kspread_format.cpp +++ b/kspread/kspread_format.cpp @@ -636,7 +636,7 @@ bool Format::loadFormat( const TQDomElement & f, Paste::Mode pm, bool paste ) if ( f.hasAttribute( "brushstyle" ) ) { - setBackGroundBrushStyle( (Qt::BrushStyle) f.attribute( "brushstyle" ).toInt( &ok ) ); + setBackGroundBrushStyle( (TQt::BrushStyle) f.attribute( "brushstyle" ).toInt( &ok ) ); if ( !ok ) return false; } @@ -1221,7 +1221,7 @@ void Format::setLeftBorderPen( const TQPen & _p ) formatChanged(); } -void Format::setLeftBorderStyle( Qt::PenStyle s ) +void Format::setLeftBorderStyle( TQt::PenStyle s ) { TQPen p( m_pStyle->leftBorderPen() ); p.setStyle( s ); @@ -1259,7 +1259,7 @@ void Format::setTopBorderPen( const TQPen & _p ) formatChanged(); } -void Format::setTopBorderStyle( Qt::PenStyle s ) +void Format::setTopBorderStyle( TQt::PenStyle s ) { TQPen p( m_pStyle->topBorderPen() ); p.setStyle( s ); @@ -1297,7 +1297,7 @@ void Format::setRightBorderPen( const TQPen& p ) formatChanged(); } -void Format::setRightBorderStyle( Qt::PenStyle _s ) +void Format::setRightBorderStyle( TQt::PenStyle _s ) { TQPen p( m_pStyle->rightBorderPen() ); p.setStyle( _s ); @@ -1335,7 +1335,7 @@ void Format::setBottomBorderPen( const TQPen& p ) formatChanged(); } -void Format::setBottomBorderStyle( Qt::PenStyle _s ) +void Format::setBottomBorderStyle( TQt::PenStyle _s ) { TQPen p( m_pStyle->bottomBorderPen() ); p.setStyle( _s ); @@ -1373,7 +1373,7 @@ void Format::setFallDiagonalPen( const TQPen & _p ) formatChanged(); } -void Format::setFallDiagonalStyle( Qt::PenStyle s ) +void Format::setFallDiagonalStyle( TQt::PenStyle s ) { TQPen p( m_pStyle->fallDiagonalPen() ); p.setStyle( s ); @@ -1411,7 +1411,7 @@ void Format::setGoUpDiagonalPen( const TQPen & _p ) formatChanged(); } -void Format::setGoUpDiagonalStyle( Qt::PenStyle s ) +void Format::setGoUpDiagonalStyle( TQt::PenStyle s ) { TQPen p( m_pStyle->goUpDiagonalPen() ); p.setStyle( s ); @@ -1449,7 +1449,7 @@ void Format::setBackGroundBrush( const TQBrush & _p) formatChanged(); } -void Format::setBackGroundBrushStyle( Qt::BrushStyle s ) +void Format::setBackGroundBrushStyle( TQt::BrushStyle s ) { TQBrush b( m_pStyle->backGroundBrush() ); b.setStyle( s ); @@ -1841,7 +1841,7 @@ int Format::fallDiagonalWidth( int col, int row ) const return fallDiagonalPen( col, row ).width(); } -Qt::PenStyle Format::fallDiagonalStyle( int col, int row ) const +TQt::PenStyle Format::fallDiagonalStyle( int col, int row ) const { return fallDiagonalPen( col, row ).style(); } @@ -1867,7 +1867,7 @@ int Format::goUpDiagonalWidth( int col, int row ) const return goUpDiagonalPen( col, row ).width(); } -Qt::PenStyle Format::goUpDiagonalStyle( int col, int row ) const +TQt::PenStyle Format::goUpDiagonalStyle( int col, int row ) const { return goUpDiagonalPen( col, row ).style(); } @@ -1946,7 +1946,7 @@ const TQPen& Format::leftBorderPen( int col, int row ) const return m_pStyle->leftBorderPen(); } -Qt::PenStyle Format::leftBorderStyle( int col, int row ) const +TQt::PenStyle Format::leftBorderStyle( int col, int row ) const { return leftBorderPen( col, row ).style(); } @@ -1979,7 +1979,7 @@ const TQColor& Format::topBorderColor( int col, int row ) const return topBorderPen( col, row ).color(); } -Qt::PenStyle Format::topBorderStyle( int col, int row ) const +TQt::PenStyle Format::topBorderStyle( int col, int row ) const { return topBorderPen( col, row ).style(); } @@ -2007,7 +2007,7 @@ int Format::rightBorderWidth( int col, int row ) const return rightBorderPen( col, row ).width(); } -Qt::PenStyle Format::rightBorderStyle( int col, int row ) const +TQt::PenStyle Format::rightBorderStyle( int col, int row ) const { return rightBorderPen( col, row ).style(); } @@ -2035,7 +2035,7 @@ int Format::bottomBorderWidth( int col, int row ) const return bottomBorderPen( col, row ).width(); } -Qt::PenStyle Format::bottomBorderStyle( int col, int row ) const +TQt::PenStyle Format::bottomBorderStyle( int col, int row ) const { return bottomBorderPen( col, row ).style(); } @@ -2056,7 +2056,7 @@ const TQBrush& Format::backGroundBrush( int col, int row ) const return m_pStyle->backGroundBrush(); } -Qt::BrushStyle Format::backGroundBrushStyle( int col, int row ) const +TQt::BrushStyle Format::backGroundBrushStyle( int col, int row ) const { return backGroundBrush( col, row ).style(); } diff --git a/kspread/kspread_format.h b/kspread/kspread_format.h index 5af772b80..fc01a82cd 100644 --- a/kspread/kspread_format.h +++ b/kspread/kspread_format.h @@ -196,37 +196,37 @@ public: void setPrecision( int _p ); virtual void setLeftBorderPen( const TQPen& _p ); - void setLeftBorderStyle( Qt::PenStyle s ); + void setLeftBorderStyle( TQt::PenStyle s ); void setLeftBorderColor( const TQColor & _c ); void setLeftBorderWidth( int _w ); virtual void setTopBorderPen( const TQPen& _p ); - void setTopBorderStyle( Qt::PenStyle s ); + void setTopBorderStyle( TQt::PenStyle s ); void setTopBorderColor( const TQColor & _c ); void setTopBorderWidth( int _w ); virtual void setRightBorderPen( const TQPen& p ); - void setRightBorderStyle( Qt::PenStyle _s ); + void setRightBorderStyle( TQt::PenStyle _s ); void setRightBorderColor( const TQColor & _c ); void setRightBorderWidth( int _w ); virtual void setBottomBorderPen( const TQPen& p ); - void setBottomBorderStyle( Qt::PenStyle _s ); + void setBottomBorderStyle( TQt::PenStyle _s ); void setBottomBorderColor( const TQColor & _c ); void setBottomBorderWidth( int _w ); void setFallDiagonalPen( const TQPen& _p ); - void setFallDiagonalStyle( Qt::PenStyle s ); + void setFallDiagonalStyle( TQt::PenStyle s ); void setFallDiagonalColor( const TQColor & _c ); void setFallDiagonalWidth( int _w ); void setGoUpDiagonalPen( const TQPen& _p ); - void setGoUpDiagonalStyle( Qt::PenStyle s ); + void setGoUpDiagonalStyle( TQt::PenStyle s ); void setGoUpDiagonalColor( const TQColor & _c ); void setGoUpDiagonalWidth( int _w ); void setBackGroundBrush( const TQBrush& _p); - void setBackGroundBrushStyle( Qt::BrushStyle s); + void setBackGroundBrushStyle( TQt::BrushStyle s); void setBackGroundBrushColor( const TQColor & _c); void setTextFont( const TQFont& _f ); @@ -275,36 +275,36 @@ public: virtual const TQPen& leftBorderPen( int col, int row ) const; int leftBorderWidth( int col, int row ) const; - Qt::PenStyle leftBorderStyle( int col, int row ) const; + TQt::PenStyle leftBorderStyle( int col, int row ) const; const TQColor& leftBorderColor( int col, int row ) const; virtual const TQPen& topBorderPen( int col, int row ) const; int topBorderWidth( int col, int row ) const; - Qt::PenStyle topBorderStyle( int col, int row ) const; + TQt::PenStyle topBorderStyle( int col, int row ) const; const TQColor& topBorderColor( int col, int row ) const; virtual const TQPen& rightBorderPen( int col, int row ) const; int rightBorderWidth( int col, int row ) const; - Qt::PenStyle rightBorderStyle( int col, int row ) const; + TQt::PenStyle rightBorderStyle( int col, int row ) const; const TQColor& rightBorderColor( int col, int row ) const; virtual const TQPen& bottomBorderPen( int col, int row ) const; int bottomBorderWidth( int col, int row ) const; - Qt::PenStyle bottomBorderStyle( int col, int row ) const; + TQt::PenStyle bottomBorderStyle( int col, int row ) const; const TQColor& bottomBorderColor( int col, int row ) const; const TQPen& fallDiagonalPen( int col, int row ) const; int fallDiagonalWidth( int col, int row ) const; - Qt::PenStyle fallDiagonalStyle( int col, int row ) const; + TQt::PenStyle fallDiagonalStyle( int col, int row ) const; const TQColor& fallDiagonalColor( int col, int row ) const; const TQPen& goUpDiagonalPen( int col, int row ) const; int goUpDiagonalWidth( int col, int row ) const; - Qt::PenStyle goUpDiagonalStyle( int col, int row ) const; + TQt::PenStyle goUpDiagonalStyle( int col, int row ) const; const TQColor& goUpDiagonalColor( int col, int row ) const; const TQBrush& backGroundBrush( int col, int row ) const; - Qt::BrushStyle backGroundBrushStyle( int col, int row ) const; + TQt::BrushStyle backGroundBrushStyle( int col, int row ) const; const TQColor& backGroundBrushColor(int col, int row ) const; uint bottomBorderValue( int col, int row ) const; diff --git a/kspread/kspread_handler.cpp b/kspread/kspread_handler.cpp index 262774ffe..3e9fe0e52 100644 --- a/kspread/kspread_handler.cpp +++ b/kspread/kspread_handler.cpp @@ -53,7 +53,7 @@ bool InsertHandler::eventFilter( TQObject*, TQEvent* ev ) painter.setRasterOp( NotROP ); TQPen pen; - pen.setStyle( Qt::DashLine ); + pen.setStyle( TQt::DashLine ); painter.setPen( pen ); if ( m_started ) @@ -128,7 +128,7 @@ bool InsertHandler::eventFilter( TQObject*, TQEvent* ev ) painter.begin( (TQWidget*)target() ); TQPen pen; - pen.setStyle( Qt::DashLine ); + pen.setStyle( TQt::DashLine ); painter.setPen( pen ); painter.setRasterOp( NotROP ); diff --git a/kspread/kspread_object.cpp b/kspread/kspread_object.cpp index 2fce26968..6f397b527 100644 --- a/kspread/kspread_object.cpp +++ b/kspread/kspread_object.cpp @@ -56,7 +56,7 @@ class View; * **********************************************************/ EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _geometry ) - : m_geometry( _geometry), m_sheet(_sheet), m_objectName(""), m_selected(false), m_protect(false), m_keepRatio(false), pen( TQt::black, 1, Qt::SolidLine ) + : m_geometry( _geometry), m_sheet(_sheet), m_objectName(""), m_selected(false), m_protect(false), m_keepRatio(false), pen( TQt::black, 1, TQt::SolidLine ) { angle = 0.0; inObjList = true; @@ -691,7 +691,7 @@ EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geom : EmbeddedObject( _sheet, _geometry ) { imageCollection = _imageCollection; - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; @@ -712,7 +712,7 @@ EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geom imageCollection = _imageCollection; //ext = KoSize(); // invalid size means unset - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; @@ -734,7 +734,7 @@ EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, KoPictureCollection imageCollection = _imageCollection; //ext = KoSize(); // invalid size means unset - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; @@ -1015,7 +1015,7 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href/*.mid(1)*/); - const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); + const KoPictureKey key(filename, TQDateTime::currentDateTime(TQt::UTC)); image.setKey(key); KoStore* store = context.store(); @@ -1206,7 +1206,7 @@ TQPixmap EmbeddedPictureObject::toPixmap( double xZoom , double yZoom ) TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler) { - const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1 : pen.width() ) / 2.0 ); + const double penw = _zoomHandler->zoomItX( ( ( pen.style() == TQt::NoPen ) ? 1 : pen.width() ) / 2.0 ); TQSize size( _zoomHandler->zoomSize( m_geometry.size() /*ext*/ ) ); //kdDebug(33001) << "EmbeddedPictureObject::generatePixmap size= " << size << endl; @@ -1217,7 +1217,7 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler) pixmap.fill( TQt::white ); // Draw background - paint.setPen( Qt::NoPen ); + paint.setPen( TQt::NoPen ); paint.setBrush( getBrush() ); TQRect rect( (int)( penw ), (int)( penw ), @@ -1264,7 +1264,7 @@ void EmbeddedPictureObject::draw( TQPainter *_painter/*, KoZoomHandler*_zoomHand const double oy = /*orig*/m_geometry.y(); const double ow = /*ext*/m_geometry.width(); const double oh = /*ext*/m_geometry.height(); - //const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1.0 : pen.width() ) / 2.0 ); + //const double penw = _zoomHandler->zoomItX( ( ( pen.style() == TQt::NoPen ) ? 1.0 : pen.width() ) / 2.0 ); _painter->save(); @@ -1355,7 +1355,7 @@ void EmbeddedPictureObject::draw( TQPainter *_painter/*, KoZoomHandler*_zoomHand // } // else { // pen2 = pen; -// pen2.setWidth( _zoomHandler->zoomItX( ( pen.style() == Qt::NoPen ) ? 1.0 : (double)pen.width() ) ); +// pen2.setWidth( _zoomHandler->zoomItX( ( pen.style() == TQt::NoPen ) ? 1.0 : (double)pen.width() ) ); // } // _painter->setPen( pen2 ); // _painter->setBrush( TQt::NoBrush ); diff --git a/kspread/kspread_pen.cpp b/kspread/kspread_pen.cpp index 52a0ada6b..4aac2761c 100644 --- a/kspread/kspread_pen.cpp +++ b/kspread/kspread_pen.cpp @@ -27,7 +27,7 @@ KSpreadPen::KSpreadPen() m_pointWidth = 1.0; } -KSpreadPen::KSpreadPen(const TQColor& _color, double _pointWidth, Qt::PenStyle _style) +KSpreadPen::KSpreadPen(const TQColor& _color, double _pointWidth, TQt::PenStyle _style) : TQPen() { setColor(_color); diff --git a/kspread/kspread_pen.h b/kspread/kspread_pen.h index 23de5877d..ec87dd29e 100644 --- a/kspread/kspread_pen.h +++ b/kspread/kspread_pen.h @@ -31,7 +31,7 @@ class KSpreadPen : public TQPen { public: KSpreadPen(); - KSpreadPen(const TQColor& _color, double _pointWidth, Qt::PenStyle _style); + KSpreadPen(const TQColor& _color, double _pointWidth, TQt::PenStyle _style); KSpreadPen(const TQColor& _color); ~KSpreadPen(); diff --git a/kspread/kspread_sheet.cpp b/kspread/kspread_sheet.cpp index a8965b9e7..85e8f15f7 100644 --- a/kspread/kspread_sheet.cpp +++ b/kspread/kspread_sheet.cpp @@ -368,7 +368,7 @@ Sheet::Sheet (Map* map, d->layoutDirection = LeftToRight; d->defaultFormat = new Format (this, d->workbook->doc()->styleManager()->defaultStyle()); - d->emptyPen.setStyle( Qt::NoPen ); + d->emptyPen.setStyle( TQt::NoPen ); d->dcop = 0; d->name = sheetName; @@ -8482,10 +8482,10 @@ void Sheet::convertObscuringBorders() rightPen = c->rightBorderPen(c->column(), c->row()); bottomPen = c->bottomBorderPen(c->column(), c->row()); - c->format()->setTopBorderStyle(Qt::NoPen); - c->format()->setLeftBorderStyle(Qt::NoPen); - c->format()->setRightBorderStyle(Qt::NoPen); - c->format()->setBottomBorderStyle(Qt::NoPen); + c->format()->setTopBorderStyle(TQt::NoPen); + c->format()->setLeftBorderStyle(TQt::NoPen); + c->format()->setRightBorderStyle(TQt::NoPen); + c->format()->setBottomBorderStyle(TQt::NoPen); for (int x = c->column(); x < c->column() + c->extraXCells(); x++) { diff --git a/kspread/kspread_sheetprint.cpp b/kspread/kspread_sheetprint.cpp index 974e89945..b8a3a919d 100644 --- a/kspread/kspread_sheetprint.cpp +++ b/kspread/kspread_sheetprint.cpp @@ -227,7 +227,7 @@ bool SheetPrint::print( TQPainter &painter, KPrinter *_printer ) { gridPen = TQPen( m_pDoc->gridColor(), 1, TQt::SolidLine ); TQPen nopen; - nopen.setStyle( Qt::NoPen ); + nopen.setStyle( TQt::NoPen ); m_pDoc->setGridColor( TQt::white ); } diff --git a/kspread/kspread_style.cpp b/kspread/kspread_style.cpp index bd58ac885..4abcdb4b8 100644 --- a/kspread/kspread_style.cpp +++ b/kspread/kspread_style.cpp @@ -1701,7 +1701,7 @@ bool Style::loadXML( TQDomElement & format ) if ( format.hasAttribute( "brushstyle" ) ) { - m_backGroundBrush.setStyle( (Qt::BrushStyle) format.attribute( "brushstyle" ).toInt( &ok ) ); + m_backGroundBrush.setStyle( (TQt::BrushStyle) format.attribute( "brushstyle" ).toInt( &ok ) ); if ( !ok ) return false; diff --git a/kspread/kspread_util.cpp b/kspread/kspread_util.cpp index c7b28af12..1db4b0498 100644 --- a/kspread/kspread_util.cpp +++ b/kspread/kspread_util.cpp @@ -171,7 +171,7 @@ TQPen KSpread::util_toPen( TQDomElement & element ) bool ok; TQPen p; - p.setStyle( (Qt::PenStyle)element.attribute("style").toInt( &ok ) ); + p.setStyle( (TQt::PenStyle)element.attribute("style").toInt( &ok ) ); if ( !ok ) return TQPen(); @@ -970,7 +970,7 @@ TQPen KSpread::convertOasisStringToPen( const TQString &border ) //string like "0.088cm solid #800000" if (border.isEmpty() || border=="none" || border=="hidden") // in fact no border { - pen.setStyle( Qt::NoPen ); + pen.setStyle( TQt::NoPen ); return pen; } //code from koborder, for the moment kspread doesn't use koborder @@ -982,17 +982,17 @@ TQPen KSpread::convertOasisStringToPen( const TQString &border ) pen.setWidth( ( int )( KoUnit::parseValue( _width, 1.0 ) ) ); if ( _style =="none" ) - pen.setStyle( Qt::NoPen ); + pen.setStyle( TQt::NoPen ); else if ( _style =="solid" ) - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); else if ( _style =="dashed" ) - pen.setStyle( Qt::DashLine ); + pen.setStyle( TQt::DashLine ); else if ( _style =="dotted" ) - pen.setStyle( Qt::DotLine ); + pen.setStyle( TQt::DotLine ); else if ( _style =="dot-dash" ) - pen.setStyle( Qt::DashDotLine ); + pen.setStyle( TQt::DashDotLine ); else if ( _style =="dot-dot-dash" ) - pen.setStyle( Qt::DashDotDotLine ); + pen.setStyle( TQt::DashDotDotLine ); else kdDebug()<<" style undefined : "<<_style<<endl; diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp index 21420e12c..81518a4c9 100644 --- a/kspread/kspread_view.cpp +++ b/kspread/kspread_view.cpp @@ -1927,7 +1927,7 @@ void View::initView() d->calcLabel = 0; d->vertScrollBar = new TQScrollBar( this, "ScrollBar_2" ); d->vertScrollBar->setRange( 0, 4096 ); - d->vertScrollBar->setOrientation( Qt::Vertical ); + d->vertScrollBar->setOrientation( TQt::Vertical ); d->vertScrollBar->setLineStep(60); //just random guess based on what feels okay d->vertScrollBar->setPageStep(60); //This should be controlled dynamically, depending on how many rows are shown @@ -1984,7 +1984,7 @@ void View::initView() d->horzScrollBar = new TQScrollBar( bottomPart, "ScrollBar_1" ); d->horzScrollBar->setRange( 0, 4096 ); - d->horzScrollBar->setOrientation( Qt::Horizontal ); + d->horzScrollBar->setOrientation( TQt::Horizontal ); d->horzScrollBar->setLineStep(60); //just random guess based on what feels okay d->horzScrollBar->setPageStep(60); diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp index 56af25b4d..202da13e1 100644 --- a/kspread/plugins/calculator/configdlg.cpp +++ b/kspread/plugins/calculator/configdlg.cpp @@ -47,7 +47,7 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct) lay1->setMargin( KDialog::marginHint() ); lay1->setSpacing( KDialog::spacingHint() ); - box = new TQGroupBox(0, Qt::Vertical, i18n("Defaults"), this, "box"); + box = new TQGroupBox(0, TQt::Vertical, i18n("Defaults"), this, "box"); box->layout()->setSpacing(KDialog::spacingHint()); box->layout()->setMargin(KDialog::marginHint()); diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index e0eb620af..55c16bf6b 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -106,7 +106,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char TQAccel *accel = new TQAccel( this ); - TQButtonGroup *angle_group = new TQButtonGroup( 3,Qt::Horizontal,this, "AngleButtons" ); + TQButtonGroup *angle_group = new TQButtonGroup( 3,TQt::Horizontal,this, "AngleButtons" ); angle_group->setTitle(i18n( "Angle") ); anglebutton[0] = new TQRadioButton( angle_group ); @@ -135,7 +135,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char - TQButtonGroup *base_group = new TQButtonGroup( 4,Qt::Horizontal,this, "BaseButtons" ); + TQButtonGroup *base_group = new TQButtonGroup( 4,TQt::Horizontal,this, "BaseButtons" ); base_group->setTitle( i18n("Base") ); basebutton[0] = new TQRadioButton( base_group ); @@ -1464,7 +1464,7 @@ void TQtCalculator::configclicked(){ lay1->setMargin( KDialog::marginHint() ); lay1->setSpacing( KDialog::spacingHint() ); - TQGroupBox *box = new TQGroupBox(0,Qt::Vertical,about,"box"); + TQGroupBox *box = new TQGroupBox(0,TQt::Vertical,about,"box"); box->layout()->setSpacing(KDialog::spacingHint()); box->layout()->setMargin(KDialog::marginHint()); TQGridLayout *grid1 = new TQGridLayout(box->layout(),2,2); diff --git a/kspread/valueparser.cpp b/kspread/valueparser.cpp index 08ebe628a..b098ec90d 100644 --- a/kspread/valueparser.cpp +++ b/kspread/valueparser.cpp @@ -402,7 +402,7 @@ Value ValueParser::tryParseDate (const TQString& str, bool *ok) if (!valid) { //try to use the standard TQt date parsing, using ISO 8601 format - tmpDate = TQDate::fromString(str,Qt::ISODate); + tmpDate = TQDate::fromString(str,TQt::ISODate); if (tmpDate.isValid()) { valid = true; diff --git a/kugar/kudesigner_lib/view.cpp b/kugar/kudesigner_lib/view.cpp index d021dc23f..dc4af2627 100644 --- a/kugar/kudesigner_lib/view.cpp +++ b/kugar/kudesigner_lib/view.cpp @@ -328,7 +328,7 @@ void View::contentsMousePressEvent( TQMouseEvent* e ) */ switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: if ( itemToInsert ) { // tqWarning("placing item"); @@ -362,7 +362,7 @@ void View::contentsMouseReleaseEvent( TQMouseEvent* e ) switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: if ( selectionStarted ) finishSelection(); break; @@ -626,7 +626,7 @@ void View::contentsMouseMoveEvent( TQMouseEvent* e ) void View::contentsMouseDoubleClickEvent( TQMouseEvent *e ) { ReportItem * item = 0L; - if ( e->button() == Qt::LeftButton && m_canvas->selected.count() == 1 ) + if ( e->button() == TQt::LeftButton && m_canvas->selected.count() == 1 ) item = dynamic_cast<ReportItem*>( m_canvas->selected.first() ); if ( item ) { diff --git a/kugar/lib/mfieldobject.cpp b/kugar/lib/mfieldobject.cpp index 3444d5b7f..546c6722e 100644 --- a/kugar/lib/mfieldobject.cpp +++ b/kugar/lib/mfieldobject.cpp @@ -115,7 +115,7 @@ void MFieldObject::setText( const TQString txt ) day = txt.mid( 3, 2 ); d.setYMD( year.toInt(), month.toInt(), day.toInt() ); - // d = TQDate::fromString(txt, Qt::LocalDate); + // d = TQDate::fromString(txt, TQt::LocalDate); text = MUtil::formatDate( d, format ); } else diff --git a/kugar/lib/mlabelobject.h b/kugar/lib/mlabelobject.h index 3526552e3..05397b99a 100644 --- a/kugar/lib/mlabelobject.h +++ b/kugar/lib/mlabelobject.h @@ -27,9 +27,9 @@ class MLabelObject : public MReportObject public: /** Font weight constants */ enum FontWeight { Light = 25, Normal = 50, DemiBold = 63, Bold = 75, Black = 87 }; - /**Qt::Horizontal alignment constants */ + /** Horizontal alignment constants */ enum HAlignment { Left = 0, Center, Right }; - /** Vertial alignment constants */ + /** Vertical alignment constants */ enum VAlignment { Top = 0, Middle, Bottom }; /** Constructor */ diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 6dc6bbb33..fb0889f69 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -413,13 +413,13 @@ void KWCanvas::contentsMousePressEvent( TQMouseEvent *e ) KoPoint docPoint = m_doc->unzoomPoint( normalPoint ); - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { m_mousePressed = true; } // Only edit-mode (and only LMB) allowed on read-only documents (to select text) - if ( !m_doc->isReadWrite() && ( m_mouseMode != MM_EDIT || e->button() != Qt::LeftButton ) ) + if ( !m_doc->isReadWrite() && ( m_mouseMode != MM_EDIT || e->button() != TQt::LeftButton ) ) return; if ( m_printing ) return; @@ -450,7 +450,7 @@ void KWCanvas::contentsMousePressEvent( TQMouseEvent *e ) // RMB inside a frame unselects too, except when // right-clicking on a selected frame KWFrameView *view = m_frameViewManager->view( docPoint, KWFrameViewManager::frameOnTop ); - if ( ! ( e->button() == Qt::RightButton && view && view->selected() ) ) + if ( ! ( e->button() == TQt::RightButton && view && view->selected() ) ) selectAllFrames( false ); KWFrame * frame = view ? view->frame() : 0L; @@ -529,18 +529,18 @@ void KWCanvas::contentsMousePressEvent( TQMouseEvent *e ) break; case MM_CREATE_TEXT: case MM_CREATE_PART: case MM_CREATE_TABLE: case MM_CREATE_FORMULA: - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) mpCreate( normalPoint, e->state() & TQt::ShiftButton); break; case MM_CREATE_PIX: - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) mpCreatePixmap( normalPoint, e->state() & TQt::ShiftButton ); break; default: break; } m_scrollTimer->start( 50 ); - if ( e->button() == Qt::MidButton ) { + if ( e->button() == TQt::MidButton ) { if ( m_doc->isReadWrite() && m_currentFrameSetEdit && m_mouseMode == MM_EDIT ) { TQApplication::clipboard()->setSelectionMode( true ); @@ -548,7 +548,7 @@ void KWCanvas::contentsMousePressEvent( TQMouseEvent *e ) TQApplication::clipboard()->setSelectionMode( false ); } } - else if ( e->button() == Qt::RightButton ) { + else if ( e->button() == TQt::RightButton ) { if(!m_doc->isReadWrite()) // The popups are not available in readonly mode, since the GUI isn't built... return; if ( m_deleteMovingRect ) @@ -1816,10 +1816,10 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) TQPoint vP = m_viewMode->normalToView(normalPoint); TQPoint gP = mapToGlobal(vP); TQMouseEvent mevPress(TQEvent::MouseButtonPress, vP, - gP, Qt::LeftButton, 0); + gP, TQt::LeftButton, 0); contentsMousePressEvent(&mevPress); TQMouseEvent mevRelease(TQEvent::MouseButtonRelease, vP, - gP, Qt::LeftButton, 0); + gP, TQt::LeftButton, 0); contentsMouseReleaseEvent(&mevRelease); } else if ( keyev->key() == TQt::Key_Escape ) { @@ -2062,13 +2062,13 @@ InteractionPolicy::InteractionPolicy(KWCanvas *parent, bool doInit, bool include } InteractionPolicy* InteractionPolicy::createPolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState) { - if(buttonState & Qt::LeftButton || buttonState & Qt::RightButton) { + if(buttonState & TQt::LeftButton || buttonState & TQt::RightButton) { // little inner class to make sure we don't duplicate code class Selector { public: Selector(KWCanvas *canvas, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState) : m_canvas(canvas), m_point(point), m_state(keyState) { - m_leftClick = buttonState & Qt::LeftButton; + m_leftClick = buttonState & TQt::LeftButton; KWFrameView *view = canvas->frameViewManager()->view(point, KWFrameViewManager::frameOnTop); m_doSomething = (view && !view->selected()); @@ -2445,7 +2445,7 @@ void FrameMovePolicy::finishInteraction() { FrameSelectPolicy::FrameSelectPolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState) : InteractionPolicy(parent, false) { - bool leftButton = buttonState & Qt::LeftButton; + bool leftButton = buttonState & TQt::LeftButton; // this is a special case; if a frame that is curently being edited is 'selected' on the border // we redirect that click to the text part of the frame. // this means we give the user a lot more space to click on the left side of the frame to diff --git a/kword/KWCanvas.h b/kword/KWCanvas.h index cab23b9c7..3538fac12 100644 --- a/kword/KWCanvas.h +++ b/kword/KWCanvas.h @@ -408,7 +408,7 @@ class InteractionPolicy { * @param parent the parent canvas for things like redraw commands. * @param meaning the mouseMeaning of as it is at 'point' * @param point the place where the mouseDown is registred. - * @param buttonState which button is used to click, like Qt::LeftButton + * @param buttonState which button is used to click, like TQt::LeftButton * @param keyState which keys are held down at the click, like TQt::ControlButton */ static InteractionPolicy* createPolicy(KWCanvas *parent, MouseMeaning meaning, KoPoint &point, TQt::ButtonState buttonState, TQt::ButtonState keyState); diff --git a/kword/KWConfigFootNoteDia.cpp b/kword/KWConfigFootNoteDia.cpp index 236c73579..0efe2000c 100644 --- a/kword/KWConfigFootNoteDia.cpp +++ b/kword/KWConfigFootNoteDia.cpp @@ -80,7 +80,7 @@ void KWConfigFootNoteDia::setupTab3() comment= i18n ("The separator can be positioned horizontally by picking one " "of the three alignments."); TQWhatsThis::add(positionGroupBox, comment); - positionGroupBox->setColumnLayout(0, Qt::Vertical ); + positionGroupBox->setColumnLayout(0, TQt::Vertical ); TQVBoxLayout *positionLayout = new TQVBoxLayout( positionGroupBox->layout() ); positionLayout->setAlignment( TQt::AlignTop ); diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp index dd612b753..eaa7982ef 100644 --- a/kword/KWEditPersonnalExpression.cpp +++ b/kword/KWEditPersonnalExpression.cpp @@ -53,7 +53,7 @@ KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const ch TQGroupBox *expressionGroupBox = new TQGroupBox( page, "expressionGroupBox" ); expressionGroupBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 0, expressionGroupBox->sizePolicy().hasHeightForWidth() ) ); expressionGroupBox->setTitle( i18n( "Expressions" ) ); - expressionGroupBox->setColumnLayout(0, Qt::Vertical ); + expressionGroupBox->setColumnLayout(0, TQt::Vertical ); expressionGroupBox->layout()->setSpacing( KDialog::spacingHint() ); expressionGroupBox->layout()->setMargin( KDialog::marginHint() ); TQVBoxLayout *expressionGroupBoxLayout = new TQVBoxLayout( expressionGroupBox->layout() ); diff --git a/kword/KWFootNoteDia.cpp b/kword/KWFootNoteDia.cpp index 4d9ec80b2..9214038ac 100644 --- a/kword/KWFootNoteDia.cpp +++ b/kword/KWFootNoteDia.cpp @@ -65,7 +65,7 @@ KWFootNoteDia::KWFootNoteDia( NoteType _noteType, KWFootNoteVariable::Numbering grid->addWidget( m_footLine, 2, 1); - grp = new TQButtonGroup( 4, Qt::Vertical, page ); + grp = new TQButtonGroup( 4, TQt::Vertical, page ); m_rbFootNote = new TQRadioButton( i18n("&Footnote"), grp ); m_rbEndNote = new TQRadioButton( i18n("&Endnote"), grp ); diff --git a/kword/KWFrame.cpp b/kword/KWFrame.cpp index e1cdb9d8d..e591bd9bc 100644 --- a/kword/KWFrame.cpp +++ b/kword/KWFrame.cpp @@ -422,7 +422,7 @@ void KWFrame::load( TQDomElement &frameElem, KWFrameSet* frameSet, int syntaxVer if( frameElem.hasAttribute("bkStyle")) - m_backgroundColor.setStyle (static_cast<Qt::BrushStyle>(KWDocument::getAttribute( frameElem, "bkStyle", TQt::SolidPattern ))); + m_backgroundColor.setStyle (static_cast<TQt::BrushStyle>(KWDocument::getAttribute( frameElem, "bkStyle", TQt::SolidPattern ))); m_paddingLeft = frameElem.attribute( "bleftpt" ).toDouble(); m_paddingRight = frameElem.attribute( "brightpt" ).toDouble(); @@ -456,7 +456,7 @@ void KWFrame::loadBorderProperties( KoStyleStack& styleStack ) if ( styleStack.hasAttributeNS( KoXmlNS::fo, "background-transparency" ) ) { TQString transp = styleStack.attributeNS( KoXmlNS::fo, "background-transparency" ); if ( transp == "100%" ) - m_backgroundColor.setStyle( Qt::NoBrush ); + m_backgroundColor.setStyle( TQt::NoBrush ); } // borders (3.11.27) diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index 66ef91b20..a74fc3e35 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -613,7 +613,7 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround // First groupbox m_runGroup = new TQButtonGroup( i18n( "Layout of Text in Other Frames" ), m_tab2); - m_runGroup->setColumnLayout( 0, Qt::Vertical ); + m_runGroup->setColumnLayout( 0, TQt::Vertical ); m_runGroup->layout()->setSpacing( KDialog::spacingHint() ); TQGridLayout *groupBox1Layout = new TQGridLayout( m_runGroup->layout() ); groupBox1Layout->setAlignment( TQt::AlignTop ); @@ -649,7 +649,7 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround // Second groupbox m_runSideGroup = new TQButtonGroup( i18n( "Run Around Side" ), m_tab2); - m_runSideGroup->setColumnLayout( 0, Qt::Vertical ); + m_runSideGroup->setColumnLayout( 0, TQt::Vertical ); m_runSideGroup->layout()->setSpacing( KDialog::spacingHint() ); m_runSideGroup->layout()->setMargin( KDialog::marginHint() ); TQGridLayout *runSideLayout = new TQGridLayout( m_runSideGroup->layout() ); @@ -1288,7 +1288,7 @@ void KWFrameDia::setupTab6() // Border style initBorderSettings(); - TQGroupBox *grp=new TQGroupBox( 0, Qt::Vertical, i18n( "Preview" ), m_tab6, "previewgrp" ); + TQGroupBox *grp=new TQGroupBox( 0, TQt::Vertical, i18n( "Preview" ), m_tab6, "previewgrp" ); grid->addMultiCellWidget( grp , 0, 7, 1, 1 ); grp->layout()->setSpacing(KDialog::spacingHint()); grp->layout()->setMargin(KDialog::marginHint()); @@ -1561,7 +1561,7 @@ TQBrush KWFrameDia::frameBrushStyle() const { TQBrush brush; - brush.setStyle( m_transparentCB->isChecked() ? Qt::NoBrush : Qt::SolidPattern ); + brush.setStyle( m_transparentCB->isChecked() ? TQt::NoBrush : TQt::SolidPattern ); #if 0 switch ( brushStyle->currentItem() ) diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp index 1195815a4..d612be05f 100644 --- a/kword/KWFrameSet.cpp +++ b/kword/KWFrameSet.cpp @@ -260,7 +260,7 @@ void KWFrameSet::drawFrameBorder( TQPainter *painter, KWFrame *frame, KWFrame *s // ...except when printing, or embedded doc, or disabled. if ( !viewMode || !viewMode->drawFrameBorders() ) { - viewSetting = TQPen(Qt::NoPen); + viewSetting = TQPen(TQt::NoPen); minBorder = 0; } diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp index f3c811356..dddfbac93 100644 --- a/kword/KWFrameStyleManager.cpp +++ b/kword/KWFrameStyleManager.cpp @@ -234,7 +234,7 @@ void KWFrameStyleManager::addGeneralTab() tabLayout->setSpacing( KDialog::spacingHint() ); tabLayout->setMargin( KDialog::marginHint() ); - previewBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Preview" ), tab ); + previewBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Preview" ), tab ); previewBox->layout()->setSpacing(KDialog::spacingHint()); previewBox->layout()->setMargin(KDialog::marginHint()); TQGridLayout *previewLayout = new TQGridLayout( previewBox->layout() ); @@ -568,7 +568,7 @@ KWFrameStyleBackgroundTab::KWFrameStyleBackgroundTab( TQWidget * parent ) : KWFrameStyleManagerTab( parent ) { bgwidget = this; - m_backgroundColor.setStyle( Qt::SolidPattern ); + m_backgroundColor.setStyle( TQt::SolidPattern ); grid = new TQGridLayout( bgwidget, 7, 2, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kword/KWInsertPageDia.cpp b/kword/KWInsertPageDia.cpp index 1a818cb36..97fb081d4 100644 --- a/kword/KWInsertPageDia.cpp +++ b/kword/KWInsertPageDia.cpp @@ -32,7 +32,7 @@ KWInsertPageDia::KWInsertPageDia( TQWidget *parent, const char* name ) { TQVBox *page = makeVBoxMainWidget(); - TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Insert Page" ),page ); + TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Insert Page" ),page ); grp->setRadioButtonExclusive( TRUE ); grp->layout(); m_after = new TQRadioButton( i18n("After"), grp ); diff --git a/kword/KWPictureFrameSet.cpp b/kword/KWPictureFrameSet.cpp index 62f8ce2cc..c79c1f5cf 100644 --- a/kword/KWPictureFrameSet.cpp +++ b/kword/KWPictureFrameSet.cpp @@ -184,7 +184,7 @@ void KWPictureFrameSet::loadOasis( const TQDomElement& frame, const TQDomElement { TQCString data = binaryData.toElement().text().latin1(); m_picture.loadFromBase64( data ); - key = KoPictureKey("nofile", TQDateTime::currentDateTime(Qt::UTC)); + key = KoPictureKey("nofile", TQDateTime::currentDateTime(TQt::UTC)); m_picture.setKey(key); } else @@ -199,7 +199,7 @@ void KWPictureFrameSet::loadOasis( const TQDomElement& frame, const TQDomElement strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href/*.mid(1)*/); - key = KoPictureKey(filename, TQDateTime::currentDateTime(Qt::UTC)); + key = KoPictureKey(filename, TQDateTime::currentDateTime(TQt::UTC)); m_picture.setKey(key); KoStore* store = context.store(); diff --git a/kword/KWSortDia.cpp b/kword/KWSortDia.cpp index 9fab03f98..9a8c5ecf5 100644 --- a/kword/KWSortDia.cpp +++ b/kword/KWSortDia.cpp @@ -32,7 +32,7 @@ KWSortDia::KWSortDia( TQWidget *parent, const char* name ) { TQVBox *page = makeVBoxMainWidget(); - TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Sort" ),page ); + TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Sort" ),page ); grp->setRadioButtonExclusive( TRUE ); grp->layout(); m_increase = new TQRadioButton( i18n("Increase"), grp ); diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp index 915042b80..64e9ba135 100644 --- a/kword/KWTableStyleManager.cpp +++ b/kword/KWTableStyleManager.cpp @@ -292,7 +292,7 @@ void KWTableStyleManager::setupMain() mainLayout->addWidget( nameLabel, 0, 0 ); - TQGroupBox *adjustBox = new TQGroupBox( 0, Qt::Vertical, i18n("Adjust"), main); + TQGroupBox *adjustBox = new TQGroupBox( 0, TQt::Vertical, i18n("Adjust"), main); adjustBox->layout()->setSpacing(KDialog::spacingHint()); adjustBox->layout()->setMargin(KDialog::marginHint()); TQGridLayout *adjustLayout = new TQGridLayout( adjustBox->layout() ); diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp index 476fb9b95..cff93a813 100644 --- a/kword/KWTableTemplateSelector.cpp +++ b/kword/KWTableTemplateSelector.cpp @@ -572,7 +572,7 @@ KWTableTemplateSelector::KWTableTemplateSelector( KWDocument *_doc, TQWidget *_p preview = new KWTableTemplatePreview( i18n( "Preview" ), m_doc->tableStyleCollection()->findStyle("Plain"), this ); grid->addWidget( preview, 0, 1 ); - bgCustomize = new TQButtonGroup( 3,Qt::Horizontal, i18n( "Apply To" ), this ); + bgCustomize = new TQButtonGroup( 3,TQt::Horizontal, i18n( "Apply To" ), this ); cbFirstRow = new TQCheckBox( i18n( "First row" ), bgCustomize ); cbLastRow = new TQCheckBox( i18n( "Last row" ), bgCustomize ); diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index c2e668be1..195ecd5d7 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -531,19 +531,19 @@ void KWTextFrameSet::drawContents( TQPainter *p, const TQRect & crect, const TQC switch( m_doc->footNoteSeparatorLineType()) { case SLT_SOLID: - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); break; case SLT_DASH: - pen.setStyle( Qt::DashLine ); + pen.setStyle( TQt::DashLine ); break; case SLT_DOT: - pen.setStyle( Qt::DotLine ); + pen.setStyle( TQt::DotLine ); break; case SLT_DASH_DOT: - pen.setStyle( Qt::DashDotLine ); + pen.setStyle( TQt::DashDotLine ); break; case SLT_DASH_DOT_DOT: - pen.setStyle( Qt::DashDotDotLine ); + pen.setStyle( TQt::DashDotDotLine ); break; } p->setPen( pen ); @@ -3408,7 +3408,7 @@ void KWTextFrameSetEdit::keyPressEvent( TQKeyEvent* e ) // Handle moving into inline frames (e.g. formula frames). if ( !( e->state() & ControlButton ) && !( e->state() & ShiftButton ) ) { - if (e->state() != Qt::NoButton) + if (e->state() != TQt::NoButton) removeToolTipCompletion(); switch ( e->key() ) { case Key_Left: { @@ -3508,7 +3508,7 @@ void KWTextFrameSetEdit::mousePressEvent( TQMouseEvent *e, const TQPoint &, cons } // else mightStartDrag = FALSE; necessary? - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; KoVariable* var = variable(); if ( var ) diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 7100a5626..633e0f3d4 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -7599,7 +7599,7 @@ KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView ) m_vertRuler = 0; // The splitter - m_panner = new TQSplitter( Qt::Horizontal, this ); + m_panner = new TQSplitter( TQt::Horizontal, this ); // The left side m_docStruct = new KWDocStruct( m_panner, doc, this ); @@ -7622,13 +7622,13 @@ KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView ) m_tabChooser->setReadWrite(doc->isReadWrite()); gridLayout->addWidget( m_tabChooser, 0, 0 ); - m_horRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Horizontal, layout, + m_horRuler = new KoRuler( m_right, m_canvas->viewport(), TQt::Horizontal, layout, KoRuler::F_INDENTS | KoRuler::F_TABS, doc->unit(), m_tabChooser ); m_horRuler->setReadWrite(doc->isReadWrite()); gridLayout->addWidget( m_horRuler, 0, 1 ); - m_vertRuler = new KoRuler( m_right, m_canvas->viewport(), Qt::Vertical, layout, + m_vertRuler = new KoRuler( m_right, m_canvas->viewport(), TQt::Vertical, layout, 0, doc->unit() ); m_vertRuler->setReadWrite(doc->isReadWrite()); gridLayout->addWidget( m_vertRuler, 1, 0 ); diff --git a/kword/dtd/kword.dtd b/kword/dtd/kword.dtd index 1011ef63a..b0ccef2df 100644 --- a/kword/dtd/kword.dtd +++ b/kword/dtd/kword.dtd @@ -911,9 +911,9 @@ don't put a </?xml...> at the end of the file!). display-levels Number of levels to display (e.g. 3 means "1.2.1") align Counter alignment. Possible values include: - int(Qt::AlignAuto), //left for LTR text and right for RTL text - int(Qt::AlignLeft), - int(Qt::AlignRight). + int(TQt::AlignAuto), //left for LTR text and right for RTL text + int(TQt::AlignLeft), + int(TQt::AlignRight). --> <!ELEMENT COUNTER EMPTY> diff --git a/lib/kformula/kformulaconfigpage.cpp b/lib/kformula/kformulaconfigpage.cpp index ce95c40c8..380bfcd2f 100644 --- a/lib/kformula/kformulaconfigpage.cpp +++ b/lib/kformula/kformulaconfigpage.cpp @@ -61,7 +61,7 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, TDEConfig* con // fonts TQGroupBox *gbox = new TQGroupBox( i18n( "Fonts" ), box ); - gbox->setColumnLayout( 0, Qt::Horizontal ); + gbox->setColumnLayout( 0, TQt::Horizontal ); TQGridLayout* grid = new TQGridLayout( gbox->layout(), 5, 3 ); grid->setSpacing( KDialog::spacingHint() ); @@ -106,7 +106,7 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, TDEConfig* con syntaxHighlighting->setChecked( contextStyle.syntaxHighlighting() ); // hlBox = new TQGroupBox( i18n( "Highlight Colors" ), box ); -// hlBox->setColumnLayout( 0, Qt::Horizontal ); +// hlBox->setColumnLayout( 0, TQt::Horizontal ); // grid = new TQGridLayout( hlBox->layout(), 5, 2 ); // grid->setSpacing( KDialog::spacingHint() ); diff --git a/lib/kofficecore/KoContainerHandler.cpp b/lib/kofficecore/KoContainerHandler.cpp index ae4dbeabe..ff81b632a 100644 --- a/lib/kofficecore/KoContainerHandler.cpp +++ b/lib/kofficecore/KoContainerHandler.cpp @@ -305,17 +305,17 @@ bool KoContainerHandler::eventFilter( TQObject*, TQEvent* ev ) TQMouseEvent *e=TQT_TQMOUSEEVENT(ev); KoChild *ch=child(gadget, pos, e); - if ( e->button() == Qt::RightButton && gadget != KoChild::NoGadget ) + if ( e->button() == TQt::RightButton && gadget != KoChild::NoGadget ) { emit popupMenu( ch, e->globalPos() ); return true; } - else if ( e->button() == Qt::LeftButton && gadget == KoChild::Move ) + else if ( e->button() == TQt::LeftButton && gadget == KoChild::Move ) { (void)new KoPartMoveHandler( TQT_TQWIDGET(target()), m_view->matrix(), m_view, ch, pos ); return true; } - else if ( e->button() == Qt::LeftButton && gadget != KoChild::NoGadget ) + else if ( e->button() == TQt::LeftButton && gadget != KoChild::NoGadget ) { (void)new KoPartResizeHandler( TQT_TQWIDGET(target()), m_view->matrix(), m_view, ch, gadget, pos ); return true; diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 3f32927e3..4c3854fe2 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -1185,7 +1185,7 @@ bool KoDocument::saveToStore( KoStore* _store, const TQString & _path ) bool KoDocument::saveOasisPreview( KoStore* store, KoXmlWriter* manifestWriter ) { const TQPixmap pix = generatePreview( TQSize( 128, 128 ) ); - TQImage preview ( pix.convertToImage().convertDepth( 32, Qt::ColorOnly ) ); + TQImage preview ( pix.convertToImage().convertDepth( 32, TQt::ColorOnly ) ); if ( !preview.hasAlphaBuffer() ) { preview.setAlphaBuffer( true ); @@ -1206,7 +1206,7 @@ bool KoDocument::savePreview( KoStore* store ) { TQPixmap pix = generatePreview(TQSize(256, 256)); // Reducing to 8bpp reduces file sizes quite a lot. - const TQImage preview ( pix.convertToImage().convertDepth( 8, Qt::AvoidDither | Qt::DiffuseDither) ); + const TQImage preview ( pix.convertToImage().convertDepth( 8, TQt::AvoidDither | TQt::DiffuseDither) ); KoStoreDevice io ( store ); if ( !io.open( IO_WriteOnly ) ) return false; @@ -1298,7 +1298,7 @@ bool KoDocument::checkAutoSaveFile() if ( TQFile::exists( asf ) ) { TQDateTime date = TQFileInfo(asf).lastModified(); - TQString dateStr = date.toString(Qt::LocalDate); + TQString dateStr = date.toString(TQt::LocalDate); int res = KMessageBox::warningYesNoCancel( 0, i18n( "An autosaved file for an unnamed document exists in %1.\nThis file is dated %2\nDo you want to open it?" ) .arg(asf, dateStr) ); diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp index d50c256d6..ae50ba28b 100644 --- a/lib/kofficecore/KoDocumentInfo.cpp +++ b/lib/kofficecore/KoDocumentInfo.cpp @@ -682,14 +682,14 @@ bool KoDocumentInfoAbout::saveOasis( KoXmlWriter &xmlWriter ) if ( m_creationDate.isValid() ) { xmlWriter.startElement( "meta:creation-date" ); - xmlWriter.addTextNode( m_creationDate.toString( Qt::ISODate ) ); + xmlWriter.addTextNode( m_creationDate.toString( TQt::ISODate ) ); xmlWriter.endElement(); } if ( m_modificationDate.isValid() ) { xmlWriter.startElement( "dc:date" ); - xmlWriter.addTextNode( m_modificationDate.toString( Qt::ISODate ) ); + xmlWriter.addTextNode( m_modificationDate.toString( TQt::ISODate ) ); xmlWriter.endElement(); } return true; @@ -729,13 +729,13 @@ bool KoDocumentInfoAbout::loadOasis( const TQDomNode& metaDoc ) e = KoDom::namedItemNS( metaDoc, KoXmlNS::meta, "creation-date" ); if ( !e.isNull() && !e.text().isEmpty() ) - m_creationDate = TQDateTime::fromString( e.text(), Qt::ISODate ); + m_creationDate = TQDateTime::fromString( e.text(), TQt::ISODate ); else m_creationDate = TQDateTime(); e = KoDom::namedItemNS( metaDoc, KoXmlNS::dc, "date" ); if ( !e.isNull() && !e.text().isEmpty() ) - m_modificationDate = TQDateTime::fromString( e.text(), Qt::ISODate ); + m_modificationDate = TQDateTime::fromString( e.text(), TQt::ISODate ); return true; } @@ -760,9 +760,9 @@ bool KoDocumentInfoAbout::load( const TQDomElement& e ) else if ( e.tagName() == "editing-cycles" ) m_editingCycles = e.text().toInt(); else if ( e.tagName() == "creation-date" ) - m_creationDate = TQDateTime::fromString( e.text(), Qt::ISODate ); + m_creationDate = TQDateTime::fromString( e.text(), TQt::ISODate ); else if ( e.tagName() == "date" ) - m_modificationDate = TQDateTime::fromString( e.text(), Qt::ISODate ); + m_modificationDate = TQDateTime::fromString( e.text(), TQt::ISODate ); } return true; @@ -800,11 +800,11 @@ TQDomElement KoDocumentInfoAbout::save( TQDomDocument& doc ) t = doc.createElement( "creation-date" ); e.appendChild( t ); - t.appendChild( doc.createTextNode( m_creationDate.toString( Qt::ISODate ) ) ); + t.appendChild( doc.createTextNode( m_creationDate.toString( TQt::ISODate ) ) ); t = doc.createElement( "date" ); e.appendChild( t ); - t.appendChild( doc.createTextNode( m_modificationDate.toString( Qt::ISODate ) ) ); + t.appendChild( doc.createTextNode( m_modificationDate.toString( TQt::ISODate ) ) ); return e; } diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 36d5fbdc8..3641f58c5 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -72,7 +72,7 @@ public: // Allow right-click on embedded objects (without activating them) // But beware: this means right-click on parent, from embedded object, // doesn't make the parent active first... - setActivationButtonMask( Qt::LeftButton | Qt::MidButton ); + setActivationButtonMask( TQt::LeftButton | TQt::MidButton ); } virtual bool eventFilter( TQObject *obj, TQEvent *ev ) { @@ -253,7 +253,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) d->m_sendfile->setEnabled( false); d->m_paCloseFile->setEnabled( false); - d->m_splitter=new TQSplitter(Qt::Vertical, this, "mw-splitter"); + d->m_splitter=new TQSplitter(TQt::Vertical, this, "mw-splitter"); setCentralWidget( d->m_splitter ); // Keyboard accessibility enhancements. new KKbdAccessExtensions(this, "mw-panelSizer"); @@ -1424,7 +1424,7 @@ void KoMainWindow::slotRemoveView() { } void KoMainWindow::slotSetOrientation() { - d->m_splitter->setOrientation(static_cast<Qt::Orientation> + d->m_splitter->setOrientation(static_cast<TQt::Orientation> (d->m_orientation->currentItem())); } diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp index 9560a559e..a5d34c0bf 100644 --- a/lib/kofficecore/KoOasisStyles.cpp +++ b/lib/kofficecore/KoOasisStyles.cpp @@ -1431,7 +1431,7 @@ TQBrush KoOasisStyles::loadOasisFillStyle( const KoStyleStack &styleStack, const TQBrush tmpBrush; if ( fill == "solid" ) { - tmpBrush.setStyle(static_cast<Qt::BrushStyle>( 1 ) ); + tmpBrush.setStyle(static_cast<TQt::BrushStyle>( 1 ) ); if ( styleStack.hasAttributeNS( KoXmlNS::draw, "fill-color" ) ) tmpBrush.setColor(styleStack.attributeNS( KoXmlNS::draw, "fill-color" ) ); if ( styleStack.hasAttributeNS( KoXmlNS::draw, "transparency" ) ) @@ -1439,35 +1439,35 @@ TQBrush KoOasisStyles::loadOasisFillStyle( const KoStyleStack &styleStack, const TQString transparency = styleStack.attributeNS( KoXmlNS::draw, "transparency" ); if ( transparency == "94%" ) { - tmpBrush.setStyle(Qt::Dense1Pattern); + tmpBrush.setStyle(TQt::Dense1Pattern); } else if ( transparency == "88%" ) { - tmpBrush.setStyle(Qt::Dense2Pattern); + tmpBrush.setStyle(TQt::Dense2Pattern); } else if ( transparency == "63%" ) { - tmpBrush.setStyle(Qt::Dense3Pattern); + tmpBrush.setStyle(TQt::Dense3Pattern); } else if ( transparency == "50%" ) { - tmpBrush.setStyle(Qt::Dense4Pattern); + tmpBrush.setStyle(TQt::Dense4Pattern); } else if ( transparency == "37%" ) { - tmpBrush.setStyle(Qt::Dense5Pattern); + tmpBrush.setStyle(TQt::Dense5Pattern); } else if ( transparency == "12%" ) { - tmpBrush.setStyle(Qt::Dense6Pattern); + tmpBrush.setStyle(TQt::Dense6Pattern); } else if ( transparency == "6%" ) { - tmpBrush.setStyle(Qt::Dense7Pattern); + tmpBrush.setStyle(TQt::Dense7Pattern); } else @@ -1514,19 +1514,19 @@ TQBrush KoOasisStyles::loadOasisFillStyle( const KoStyleStack &styleStack, const { case 0: case 180: - tmpBrush.setStyle(Qt::HorPattern ); + tmpBrush.setStyle(TQt::HorPattern ); break; case 45: case 225: - tmpBrush.setStyle(Qt::BDiagPattern ); + tmpBrush.setStyle(TQt::BDiagPattern ); break; case 90: case 270: - tmpBrush.setStyle(Qt::VerPattern ); + tmpBrush.setStyle(TQt::VerPattern ); break; case 135: case 315: - tmpBrush.setStyle(Qt::FDiagPattern ); + tmpBrush.setStyle(TQt::FDiagPattern ); break; default: //todo fixme when we will have a kopaint @@ -1542,13 +1542,13 @@ TQBrush KoOasisStyles::loadOasisFillStyle( const KoStyleStack &styleStack, const case 180: case 90: case 270: - tmpBrush.setStyle(Qt::CrossPattern ); + tmpBrush.setStyle(TQt::CrossPattern ); break; case 45: case 135: case 225: case 315: - tmpBrush.setStyle(Qt::DiagCrossPattern ); + tmpBrush.setStyle(TQt::DiagCrossPattern ); break; default: //todo fixme when we will have a kopaint diff --git a/lib/kofficecore/KoPictureImage.h b/lib/kofficecore/KoPictureImage.h index 4647ba42d..4e8a011d8 100644 --- a/lib/kofficecore/KoPictureImage.h +++ b/lib/kofficecore/KoPictureImage.h @@ -98,7 +98,7 @@ public: { m_originalImage.setAlphaBuffer(enable); } virtual TQImage createAlphaMask(int conversion_flags = 0) const - { return m_originalImage.createAlphaMask((Qt::ImageConversionFlags)conversion_flags); } + { return m_originalImage.createAlphaMask((TQt::ImageConversionFlags)conversion_flags); } virtual void clearCache(void); diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index cfdfc46d6..646606d05 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -80,7 +80,7 @@ class KPanelKbdSizerIcon : public TQCursor if (shayp != shape()) { // Must restore and override to get the icon to refresh. if (isActive) kapp->restoreOverrideCursor(); - TQCursor::setShape((Qt::CursorShape)shayp); + TQCursor::setShape((TQt::CursorShape)shayp); if (isActive) kapp->setOverrideCursor(*this); } } @@ -396,7 +396,7 @@ void KKbdAccessExtensions::showIcon() int handleNdx = d->handleNdx - 1; TQValueList<int> sizes = splitter->sizes(); // kdDebug() << "KKbdAccessExtensions::showIcon: sizes = " << sizes << endl; - if (splitter->orientation() == Qt::Horizontal) { + if (splitter->orientation() == TQt::Horizontal) { d->icon->setShape(TQt::SizeHorCursor); p.setX(sizes[handleNdx] + (splitter->handleWidth() / 2)); p.setY(splitter->height() / 2); @@ -418,7 +418,7 @@ void KKbdAccessExtensions::showIcon() // TODO: How to get the handle width? if (d->handleNdx == 1) { d->icon->setShape(TQt::SizeHorCursor); - if (dockWindow->area()->orientation() == Qt::Vertical) { + if (dockWindow->area()->orientation() == TQt::Vertical) { if (dockWindow->area()->handlePosition() == TQDockArea::Normal) // Handle is to the right of the dock window. p.setX(p.x() + dockWindow->width()); @@ -430,7 +430,7 @@ void KKbdAccessExtensions::showIcon() } else { d->icon->setShape(TQt::SizeVerCursor); p.setX(p.x() + (dockWindow->width() / 2)); - if (dockWindow->area()->orientation() == Qt::Vertical) + if (dockWindow->area()->orientation() == TQt::Vertical) // Handle is below the dock window. p.setY(p.y() + dockWindow->height()); else { @@ -479,7 +479,7 @@ void KKbdAccessExtensions::resizePanel(int dx, int dy, int state) if (d->handleNdx == 1) { // When vertically oriented and dock area is on right side of screen, pressing // left arrow increases size. - if (dockWindow->area()->orientation() == Qt::Vertical && + if (dockWindow->area()->orientation() == TQt::Vertical && dockWindow->area()->handlePosition() == TQDockArea::Reverse) adj = -adj; int w = fe.width(); if (w < 0) w = dockWindow->width(); @@ -488,7 +488,7 @@ void KKbdAccessExtensions::resizePanel(int dx, int dy, int state) } else { // When horizontally oriented and dock area is at bottom of screen, // pressing up arrow increases size. - if (dockWindow->area()->orientation() == Qt::Horizontal && + if (dockWindow->area()->orientation() == TQt::Horizontal && dockWindow->area()->handlePosition() == TQDockArea::Reverse) adj = -adj; int h = fe.height(); if (h < 0) h = dockWindow->height(); diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp index 9f49d062d..740a71912 100644 --- a/lib/kofficeui/KoGuideLineDia.cpp +++ b/lib/kofficeui/KoGuideLineDia.cpp @@ -57,7 +57,7 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect, setCaption( i18n("Add Guide Line") ); TQVBox * vbox = makeVBoxMainWidget(); - TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Orientation" ), vbox ); + TQButtonGroup *group = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Orientation" ), vbox ); group->setRadioButtonExclusive( true ); //group->layout(); m_hButton = new TQRadioButton( i18n( "Horizontal" ), group ); @@ -83,12 +83,12 @@ double KoGuideLineDia::pos() const } -Qt::Orientation KoGuideLineDia::orientation() const +TQt::Orientation KoGuideLineDia::orientation() const { - Qt::Orientation o = Qt::Horizontal; + TQt::Orientation o = TQt::Horizontal; if ( m_vButton && m_vButton->isChecked() ) { - o = Qt::Vertical; + o = TQt::Vertical; } return o; } diff --git a/lib/kofficeui/KoGuideLineDia.h b/lib/kofficeui/KoGuideLineDia.h index cac53f764..797df1933 100644 --- a/lib/kofficeui/KoGuideLineDia.h +++ b/lib/kofficeui/KoGuideLineDia.h @@ -78,7 +78,7 @@ public: * * @return the orientation of the added guide line */ - Qt::Orientation orientation() const; + TQt::Orientation orientation() const; protected slots: void slotOrientationChanged(); diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp index 95fcddbfd..cb25ace91 100644 --- a/lib/kofficeui/KoGuides.cpp +++ b/lib/kofficeui/KoGuides.cpp @@ -110,7 +110,7 @@ void KoGuides::paintGuides( TQPainter &painter ) painter.setPen( TQPen( blue, 0, DotLine ) ); painter.save(); - if ( ( *it )->orientation == Qt::Vertical ) + if ( ( *it )->orientation == TQt::Vertical ) { painter.translate( m_zoomHandler->zoomItX( ( *it )->position ), 0 ); painter.drawLine( 0, 0, 0, height ); @@ -137,9 +137,9 @@ bool KoGuides::mousePressEvent( TQMouseEvent *e ) if ( guideLine ) { m_lastPoint = e->pos(); - if ( e->button() == Qt::LeftButton || e->button() == Qt::RightButton ) + if ( e->button() == TQt::LeftButton || e->button() == TQt::RightButton ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { m_mouseSelected = true; } @@ -188,7 +188,7 @@ bool KoGuides::mousePressEvent( TQMouseEvent *e ) emit moveGuides( false ); } - if ( e->button() == Qt::RightButton && hasSelected() ) + if ( e->button() == TQt::RightButton && hasSelected() ) { m_popup->update( m_guideLines[GL_SELECTED].count() ); m_popup->exec( TQCursor::pos() ); @@ -212,13 +212,13 @@ bool KoGuides::mouseMoveEvent( TQMouseEvent *e ) emit guideLinesChanged( m_view ); eventProcessed = true; } - else if ( e->state() == Qt::NoButton ) + else if ( e->state() == TQt::NoButton ) { KoPoint p( mapFromScreen( e->pos() ) ); KoGuideLine * guideLine = find( p, m_zoomHandler->unzoomItY( 2 ) ); if ( guideLine ) { - m_view->canvas()->setCursor( guideLine->orientation == Qt::Vertical ? TQt::sizeHorCursor : TQt::sizeVerCursor ); + m_view->canvas()->setCursor( guideLine->orientation == TQt::Vertical ? TQt::sizeHorCursor : TQt::sizeVerCursor ); eventProcessed = true; } } @@ -237,7 +237,7 @@ bool KoGuides::mouseReleaseEvent( TQMouseEvent *e ) int x1, y1, x2, y2; m_view->canvas()->rect().coords( &x1, &y1, &x2, &y2 ); TQPoint gp( m_view->canvas()->mapFromGlobal( e->globalPos() ) ); - if ( m_guideLines[GL_SELECTED].first()->orientation == Qt::Vertical ) + if ( m_guideLines[GL_SELECTED].first()->orientation == TQt::Vertical ) { if ( gp.x() < x1 || gp.x() > x2 ) removeSelected(); @@ -251,7 +251,7 @@ bool KoGuides::mouseReleaseEvent( TQMouseEvent *e ) KoGuideLine * guideLine = find( p, m_zoomHandler->unzoomItY( 2 ) ); if ( guideLine ) { - m_view->canvas()->setCursor( guideLine->orientation == Qt::Vertical ? TQt::sizeHorCursor : TQt::sizeVerCursor ); + m_view->canvas()->setCursor( guideLine->orientation == TQt::Vertical ? TQt::sizeHorCursor : TQt::sizeVerCursor ); } m_mouseSelected = false; eventProcessed = true; @@ -296,13 +296,13 @@ void KoGuides::setGuideLines( const TQValueList<double> &horizontalPos, const TQ TQValueList<double>::ConstIterator posIt = horizontalPos.begin(); for ( ; posIt != horizontalPos.end(); ++posIt ) { - KoGuideLine *guideLine = new KoGuideLine( Qt::Horizontal, *posIt, false ); + KoGuideLine *guideLine = new KoGuideLine( TQt::Horizontal, *posIt, false ); m_guideLines[GL].append( guideLine ); } posIt = verticalPos.begin(); for ( ; posIt != verticalPos.end(); ++posIt ) { - KoGuideLine *guideLine = new KoGuideLine( Qt::Vertical, *posIt, false ); + KoGuideLine *guideLine = new KoGuideLine( TQt::Vertical, *posIt, false ); m_guideLines[GL].append( guideLine ); } paint(); @@ -320,13 +320,13 @@ void KoGuides::setAutoGuideLines( const TQValueList<double> &horizontalPos, cons TQValueList<double>::ConstIterator posIt = horizontalPos.begin(); for ( ; posIt != horizontalPos.end(); ++posIt ) { - KoGuideLine *guideLine = new KoGuideLine( Qt::Horizontal, *posIt, true ); + KoGuideLine *guideLine = new KoGuideLine( TQt::Horizontal, *posIt, true ); m_guideLines[GL_AUTOMATIC].append( guideLine ); } posIt = verticalPos.begin(); for ( ; posIt != verticalPos.end(); ++posIt ) { - KoGuideLine *guideLine = new KoGuideLine( Qt::Vertical, *posIt, true ); + KoGuideLine *guideLine = new KoGuideLine( TQt::Vertical, *posIt, true ); m_guideLines[GL_AUTOMATIC].append( guideLine ); } } @@ -340,7 +340,7 @@ void KoGuides::getGuideLines( TQValueList<double> &horizontalPos, TQValueList<do TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[GL].begin(); for ( ; it != m_guideLines[GL].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal ) + if ( ( *it )->orientation == TQt::Horizontal ) { horizontalPos.append( ( *it )->position ); } @@ -352,7 +352,7 @@ void KoGuides::getGuideLines( TQValueList<double> &horizontalPos, TQValueList<do it = m_guideLines[GL_SELECTED].begin(); for ( ; it != m_guideLines[GL_SELECTED].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal ) + if ( ( *it )->orientation == TQt::Horizontal ) { horizontalPos.append( ( *it )->position ); } @@ -376,7 +376,7 @@ void KoGuides::snapToGuideLines( KoRect &rect, int snap, SnapStatus &snapStatus, TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin(); for ( ; it != m_guideLines[i].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal ) + if ( ( *it )->orientation == TQt::Horizontal ) { double tmp = (*it)->position - rect.top(); if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) @@ -440,7 +440,7 @@ void KoGuides::snapToGuideLines( KoPoint &pos, int snap, SnapStatus &snapStatus, TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin(); for ( ; it != m_guideLines[i].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal ) + if ( ( *it )->orientation == TQt::Horizontal ) { double tmp = (*it)->position - pos.y(); if ( snapStatus & SNAP_HORIZ || TQABS( tmp ) < m_zoomHandler->unzoomItY( snap ) ) @@ -483,7 +483,7 @@ void KoGuides::repaintSnapping( const KoRect &snappedRect ) TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin(); for ( ; it != m_guideLines[i].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal ) + if ( ( *it )->orientation == TQt::Horizontal ) { if ( virtuallyEqual( snappedRect.top(), (*it)->position ) || virtuallyEqual( snappedRect.bottom(), ( *it )->position ) ) @@ -537,7 +537,7 @@ void KoGuides::repaintSnapping( const KoPoint &snappedPoint, SnapStatus snapStat TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin(); for ( ; it != m_guideLines[i].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal && ( snapStatus & SNAP_HORIZ ) ) + if ( ( *it )->orientation == TQt::Horizontal && ( snapStatus & SNAP_HORIZ ) ) { if( virtuallyEqual( snappedPoint.y(), (*it)->position ) ) { @@ -617,7 +617,7 @@ void KoGuides::diffNextGuide( KoRect &rect, KoPoint &diff ) TQValueList<KoGuideLine *>::const_iterator it = m_guideLines[i].begin(); for ( ; it != m_guideLines[i].end(); ++it ) { - if ( ( *it )->orientation == Qt::Horizontal ) + if ( ( *it )->orientation == TQt::Horizontal ) { double moveyl = ( *it )->position - rect.top(); double moveyr = ( *it )->position - rect.bottom(); @@ -686,22 +686,22 @@ void KoGuides::moveGuide( const TQPoint &pos, bool horizontal, int rulerWidth ) if ( ! horizontal && x > 0 ) { m_insertGuide = true; - add( Qt::Vertical, p ); + add( TQt::Vertical, p ); } else if ( horizontal && y > 0 ) { m_insertGuide = true; - add( Qt::Horizontal, p ); + add( TQt::Horizontal, p ); } if ( m_insertGuide ) { - TQMouseEvent e( TQEvent::MouseButtonPress, p, Qt::LeftButton, Qt::LeftButton ); + TQMouseEvent e( TQEvent::MouseButtonPress, p, TQt::LeftButton, TQt::LeftButton ); mousePressEvent( &e ); } } else { - TQMouseEvent e( TQEvent::MouseMove, p, Qt::NoButton, Qt::LeftButton ); + TQMouseEvent e( TQEvent::MouseMove, p, TQt::NoButton, TQt::LeftButton ); mouseMoveEvent( &e ); } } @@ -713,7 +713,7 @@ void KoGuides::addGuide( const TQPoint &pos, bool /* horizontal */, int rulerWid int y = pos.y() - rulerWidth; TQPoint p( x, y ); m_insertGuide = false; - TQMouseEvent e( TQEvent::MouseButtonRelease, p, Qt::LeftButton, Qt::LeftButton ); + TQMouseEvent e( TQEvent::MouseButtonRelease, p, TQt::LeftButton, TQt::LeftButton ); mouseReleaseEvent( &e ); } @@ -725,7 +725,7 @@ void KoGuides::slotChangePosition() const KoPageLayout& pl = m_view->koDocument()->pageLayout(); double max = 0.0; - if ( guideLine->orientation == Qt::Vertical ) + if ( guideLine->orientation == TQt::Vertical ) { max = TQMAX( pl.ptWidth, m_zoomHandler->unzoomItX( m_view->canvas()->size().width() + m_view->canvasXOffset() - 1 ) ); } @@ -757,10 +757,10 @@ void KoGuides::paint() } -void KoGuides::add( Qt::Orientation o, TQPoint &pos ) +void KoGuides::add( TQt::Orientation o, TQPoint &pos ) { KoPoint p( mapFromScreen( pos ) ); - KoGuideLine *guideLine = new KoGuideLine( o, o == Qt::Vertical ? p.x(): p.y() ); + KoGuideLine *guideLine = new KoGuideLine( o, o == TQt::Vertical ? p.x(): p.y() ); m_guideLines[GL].append( guideLine ); } @@ -823,11 +823,11 @@ KoGuides::KoGuideLine * KoGuides::find( KoPoint &p, double diff ) TQValueList<KoGuideLine *>::iterator it = m_guideLines[GL_SELECTED].begin(); for ( ; it != m_guideLines[GL_SELECTED].end(); ++it ) { - if ( ( *it )->orientation == Qt::Vertical && TQABS( ( *it )->position - p.x() ) < diff ) + if ( ( *it )->orientation == TQt::Vertical && TQABS( ( *it )->position - p.x() ) < diff ) { return *it; } - if ( ( *it )->orientation == Qt::Horizontal && TQABS( ( *it )->position - p.y() ) < diff ) + if ( ( *it )->orientation == TQt::Horizontal && TQABS( ( *it )->position - p.y() ) < diff ) { return *it; } @@ -836,11 +836,11 @@ KoGuides::KoGuideLine * KoGuides::find( KoPoint &p, double diff ) it = m_guideLines[GL].begin(); for ( ; it != m_guideLines[GL].end(); ++it ) { - if ( ( *it )->orientation == Qt::Vertical && TQABS( ( *it )->position - p.x() ) < diff ) + if ( ( *it )->orientation == TQt::Vertical && TQABS( ( *it )->position - p.x() ) < diff ) { return *it; } - if ( ( *it )->orientation == Qt::Horizontal && TQABS( ( *it )->position - p.y() ) < diff ) + if ( ( *it )->orientation == TQt::Horizontal && TQABS( ( *it )->position - p.y() ) < diff ) { return *it; } @@ -861,7 +861,7 @@ void KoGuides::moveSelectedBy( TQPoint &p ) TQValueList<KoGuideLine *>::iterator it = m_guideLines[GL_SELECTED].begin(); for ( ; it != m_guideLines[GL_SELECTED].end(); ++it ) { - if ( ( *it )->orientation == Qt::Vertical ) + if ( ( *it )->orientation == TQt::Vertical ) { double tmp = ( *it )->position + point.x(); if ( tmp < 0 ) @@ -892,11 +892,11 @@ void KoGuides::moveSelectedBy( TQPoint &p ) { ( *it )->snapping = false; - if ( ( *it )->orientation == Qt::Vertical && p.x() != 0 ) + if ( ( *it )->orientation == TQt::Vertical && p.x() != 0 ) { ( *it )->position = ( *it )->position + point.x(); } - else if ( ( *it )->orientation == Qt::Horizontal && p.y() != 0 ) + else if ( ( *it )->orientation == TQt::Horizontal && p.y() != 0 ) { ( *it )->position = ( *it )->position + point.y(); } diff --git a/lib/kofficeui/KoGuides.h b/lib/kofficeui/KoGuides.h index 7feb7164d..e1ba50fff 100644 --- a/lib/kofficeui/KoGuides.h +++ b/lib/kofficeui/KoGuides.h @@ -275,14 +275,14 @@ private: /// Strukt holding the data of a guide line struct KoGuideLine { - KoGuideLine( Qt::Orientation o, double pos, bool a = false ) + KoGuideLine( TQt::Orientation o, double pos, bool a = false ) : orientation( o ) , position( pos ) , selected( false ) , snapping( false ) , automatic( a ) {} - Qt::Orientation orientation; + TQt::Orientation orientation; double position; bool selected; // if this guide is selected bool snapping; // if this guide is being snapped to @@ -300,7 +300,7 @@ private: * @param pos where to insert the guide * @param o orientation of the guide line */ - void add( Qt::Orientation o, TQPoint &pos ); + void add( TQt::Orientation o, TQPoint &pos ); /** * @brief Select a guide diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp index fc32a2a72..3c0678cc9 100644 --- a/lib/kofficeui/KoPageLayoutDia.cpp +++ b/lib/kofficeui/KoPageLayoutDia.cpp @@ -281,7 +281,7 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) TQGridLayout *grid2 = new TQGridLayout( tab2, 7, 2, 0, KDialog::spacingHint() ); // ------------- header --------------- - TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 ); + TQGroupBox *gHead = new TQGroupBox( 0, TQt::Vertical, i18n( "Head Line" ), tab2 ); gHead->layout()->setSpacing(KDialog::spacingHint()); gHead->layout()->setMargin(KDialog::marginHint()); TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 ); @@ -310,7 +310,7 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) grid2->addMultiCellWidget( gHead, 0, 1, 0, 1 ); // ------------- footer --------------- - TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 ); + TQGroupBox *gFoot = new TQGroupBox( 0, TQt::Vertical, i18n( "Foot Line" ), tab2 ); gFoot->layout()->setSpacing(KDialog::spacingHint()); gFoot->layout()->setMargin(KDialog::marginHint()); TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 ); diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp index c4e19fa87..7cc70ca5c 100644 --- a/lib/kofficeui/KoPageLayoutSize.cpp +++ b/lib/kofficeui/KoPageLayoutSize.cpp @@ -126,7 +126,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, // --------------- page margins --------------- TQVGroupBox *marginsFrame = new TQVGroupBox( i18n( "Margins" ), this ); - marginsFrame->setColumnLayout( 0, Qt::Vertical ); + marginsFrame->setColumnLayout( 0, TQt::Vertical ); marginsFrame->setMargin( KDialog::marginHint() ); grid1->addWidget( marginsFrame, 3, 0 ); diff --git a/lib/kofficeui/KoPen.cpp b/lib/kofficeui/KoPen.cpp index c1aad91e8..caf77a498 100644 --- a/lib/kofficeui/KoPen.cpp +++ b/lib/kofficeui/KoPen.cpp @@ -27,7 +27,7 @@ KoPen::KoPen() m_pointWidth = 1.0; } -KoPen::KoPen(const TQColor& _color, double _pointWidth, Qt::PenStyle _style) +KoPen::KoPen(const TQColor& _color, double _pointWidth, TQt::PenStyle _style) : TQPen() { setColor(_color); diff --git a/lib/kofficeui/KoPen.h b/lib/kofficeui/KoPen.h index 84a7ea668..df8029072 100644 --- a/lib/kofficeui/KoPen.h +++ b/lib/kofficeui/KoPen.h @@ -31,7 +31,7 @@ class KoPen : public TQPen { public: KoPen(); - KoPen(const TQColor& _color, double _pointWidth, Qt::PenStyle _style); + KoPen(const TQColor& _color, double _pointWidth, TQt::PenStyle _style); KoPen(const TQColor& _color); ~KoPen(); diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp index fade3f714..b5ab6ec97 100644 --- a/lib/kofficeui/KoRuler.cpp +++ b/lib/kofficeui/KoRuler.cpp @@ -79,7 +79,7 @@ const int KoRuler::F_HELPLINES = 4; const int KoRuler::F_NORESIZE = 8; /*================================================================*/ -KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orientation, +KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, TQt::Orientation _orientation, const KoPageLayout& _layout, int _flags, KoUnit::Unit _unit, KoTabChooser *_tabChooser ) : TQFrame( _parent ), buffer( width(), height() ), m_zoom(1.0), m_1_zoom(1.0), m_unit( _unit ) @@ -124,7 +124,7 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orienta d->currTab.type = T_INVALID; d->removeTab.type = T_INVALID; - if ( orientation == Qt::Horizontal ) { + if ( orientation == TQt::Horizontal ) { frameStart = tqRound( zoomIt(d->layout.ptLeft) ); d->frameEnd = tqRound( zoomIt(d->layout.ptWidth - d->layout.ptRight) ); } else { @@ -159,7 +159,7 @@ void KoRuler::setMousePos( int mx, int my ) TQPainter p( this ); p.setRasterOp( TQt::NotROP ); - if ( orientation == Qt::Horizontal ) { + if ( orientation == TQt::Horizontal ) { if ( hasToDelete ) p.drawLine( mposX, 1, mposX, height() - 1 ); p.drawLine( mx, 1, mx, height() - 1 ); @@ -486,7 +486,7 @@ void KoRuler::mousePressEvent( TQMouseEvent *e ) d->removeTab.type = T_INVALID; switch ( e->button() ) { - case Qt::RightButton: + case TQt::RightButton: if(d->currTab.type == T_INVALID || !(d->flags & F_TABS)) d->rb_menu->setItemEnabled(d->mRemoveTab, false); else @@ -495,11 +495,11 @@ void KoRuler::mousePressEvent( TQMouseEvent *e ) d->action = A_NONE; d->mousePressed = false; return; - case Qt::MidButton: + case TQt::MidButton: // MMB shall do like double-click (it opens a dialog). handleDoubleClick(); return; - case Qt::LeftButton: + case TQt::LeftButton: if ( d->action == A_BR_RIGHT || d->action == A_BR_LEFT ) { if ( d->action == A_BR_RIGHT ) d->whileMovingBorderRight = true; @@ -571,7 +571,7 @@ void KoRuler::mousePressEvent( TQMouseEvent *e ) } else if ( d->flags & F_HELPLINES ) { - setCursor( orientation == Qt::Horizontal ? + setCursor( orientation == TQt::Horizontal ? TQt::sizeVerCursor : TQt::sizeHorCursor ); d->action = A_HELPLINES; } @@ -655,8 +655,8 @@ void KoRuler::mouseReleaseEvent( TQMouseEvent *e ) } else if( d->action == A_HELPLINES ) { - emit addGuide( e->pos(), orientation == Qt::Horizontal, orientation == Qt::Horizontal ? size().height() : size().width() ); - emit addHelpline( e->pos(), orientation == Qt::Horizontal); + emit addGuide( e->pos(), orientation == TQt::Horizontal, orientation == TQt::Horizontal ? size().height() : size().width() ); + emit addHelpline( e->pos(), orientation == TQt::Horizontal); setCursor( ArrowCursor ); } d->currTab.type = T_INVALID; // added (DF) @@ -686,7 +686,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) TQToolTip::remove( this); switch ( orientation ) { - case Qt::Horizontal: { + case TQt::Horizontal: { if ( !d->mousePressed ) { setCursor( ArrowCursor ); d->action = A_NONE; @@ -871,7 +871,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e ) return; } break; - case Qt::Vertical: { + case TQt::Vertical: { if ( !d->mousePressed ) { setCursor( ArrowCursor ); d->action = A_NONE; diff --git a/lib/kofficeui/KoRuler.h b/lib/kofficeui/KoRuler.h index 9bf6c8c6f..4c8031ecf 100644 --- a/lib/kofficeui/KoRuler.h +++ b/lib/kofficeui/KoRuler.h @@ -113,7 +113,7 @@ public: * Create a ruler * TODO document params */ - KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orientation, + KoRuler( TQWidget *_parent, TQWidget *_canvas, TQt::Orientation _orientation, const KoPageLayout& _layout, int _flags, KoUnit::Unit _unit, KoTabChooser *_tabChooser = 0L ); ~KoRuler(); @@ -279,7 +279,7 @@ protected: A_HELPLINES }; void drawContents( TQPainter *_painter ) - { orientation == Qt::Horizontal ? drawHorizontal( _painter ) : drawVertical( _painter ); } + { orientation == TQt::Horizontal ? drawHorizontal( _painter ) : drawVertical( _painter ); } void drawHorizontal( TQPainter *_painter ); void drawVertical( TQPainter *_painter ); @@ -312,7 +312,7 @@ private: KoRulerPrivate *d; - Qt::Orientation orientation; + TQt::Orientation orientation; int diffx, diffy; double i_left, i_first; TQPixmap buffer; diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp index c751e4e81..319f2baf1 100644 --- a/lib/kofficeui/KoTabBar.cpp +++ b/lib/kofficeui/KoTabBar.cpp @@ -768,7 +768,7 @@ void KoTabBar::mousePressEvent( TQMouseEvent* ev ) scrollForward(); } - if( ev->button() == Qt::RightButton ) + if( ev->button() == TQt::RightButton ) if( !d->readOnly ) emit contextMenu( ev->globalPos() ); } @@ -779,7 +779,7 @@ void KoTabBar::mouseReleaseEvent( TQMouseEvent* ev ) d->autoScroll = false; - if ( ev->button() == Qt::LeftButton && d->targetTab != 0 ) + if ( ev->button() == TQt::LeftButton && d->targetTab != 0 ) { emit tabMoved( d->activeTab-1, d->targetTab-1 ); d->targetTab = 0; diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp index 325b9c00c..8fc563c77 100644 --- a/lib/kofficeui/KoTabChooser.cpp +++ b/lib/kofficeui/KoTabChooser.cpp @@ -71,7 +71,7 @@ void KoTabChooser::mousePressEvent( TQMouseEvent *e ) return; switch ( e->button() ) { - case Qt::LeftButton: case Qt::MidButton: { + case TQt::LeftButton: case TQt::MidButton: { switch ( currType ) { case TAB_LEFT: { if ( flags & TAB_CENTER ) currType = TAB_CENTER; @@ -96,7 +96,7 @@ void KoTabChooser::mousePressEvent( TQMouseEvent *e ) } repaint( true ); } break; - case Qt::RightButton: { + case TQt::RightButton: { TQPoint pnt( TQCursor::pos() ); rb_menu->setItemChecked( mLeft, false ); diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index 222b206d1..86d2ad88d 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -139,10 +139,10 @@ void KoToolBox::setupTools() } -void KoToolBox::setOrientation ( Qt::Orientation o ) +void KoToolBox::setOrientation ( TQt::Orientation o ) { if ( barPos() == Floating ) { // when floating, make it a standing toolbox. - o = o == Qt::Vertical ? Qt::Horizontal : Qt::Vertical; + o = o == TQt::Vertical ? TQt::Horizontal : TQt::Vertical; } TQDockWindow::setOrientation( o ); @@ -239,15 +239,15 @@ TQWidget* ToolArea::getNextParent() } -void ToolArea::setOrientation ( Qt::Orientation o ) +void ToolArea::setOrientation ( TQt::Orientation o ) { - TQBoxLayout::Direction dir = (o != Qt::Horizontal + TQBoxLayout::Direction dir = (o != TQt::Horizontal ? TQBoxLayout::TopToBottom : TQBoxLayout::LeftToRight); m_leftLayout->setDirection(dir); m_rightLayout->setDirection(dir); - m_layout->setDirection(o == Qt::Horizontal + m_layout->setDirection(o == TQt::Horizontal ? TQBoxLayout::TopToBottom : TQBoxLayout::LeftToRight); } diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h index 0d5b2b18e..5b0e75d60 100644 --- a/lib/kofficeui/KoToolBox.h +++ b/lib/kofficeui/KoToolBox.h @@ -63,7 +63,7 @@ public: public slots: - virtual void setOrientation ( Qt::Orientation o ); + virtual void setOrientation ( TQt::Orientation o ); void slotButtonPressed( int id ); void slotPressButton( int id ); @@ -98,7 +98,7 @@ public: ToolArea(TQWidget *parent); ~ToolArea(); - void setOrientation ( Qt::Orientation o ); + void setOrientation ( TQt::Orientation o ); void add(TQWidget *button); TQWidget* getNextParent(); diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index 3adcaca86..f2c64a32c 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -303,7 +303,7 @@ void KoColorPanel::insertDefaultColors() void KoColorPanel::mousePressEvent( TQMouseEvent* e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) m_pressedPos = e->pos(); } @@ -316,7 +316,7 @@ void KoColorPanel::mouseReleaseEvent( TQMouseEvent* ) void KoColorPanel::mouseMoveEvent( TQMouseEvent* e ) { - if ( e->state() & Qt::LeftButton ) { + if ( e->state() & TQt::LeftButton ) { TQPoint p = m_pressedPos - e->pos(); if ( p.manhattanLength() > TQApplication::startDragDistance() ) { TQColor color( mapToColor( m_pressedPos ) ); diff --git a/lib/kofficeui/Kolinestyleaction.cpp b/lib/kofficeui/Kolinestyleaction.cpp index 08176d1b3..82ec3adeb 100644 --- a/lib/kofficeui/Kolinestyleaction.cpp +++ b/lib/kofficeui/Kolinestyleaction.cpp @@ -76,7 +76,7 @@ void KoLineStyleAction::createMenu() for(int i = 1; i < 6; i++) { pix.fill(white); - pen.setStyle(static_cast<Qt::PenStyle>(i)); + pen.setStyle(static_cast<TQt::PenStyle>(i)); p.setPen(pen); p.drawLine(0, 10, pix.width(), 10); mask = pix; diff --git a/lib/kopainter/koColorSlider.cpp b/lib/kopainter/koColorSlider.cpp index 6e7c0239e..720357ca3 100644 --- a/lib/kopainter/koColorSlider.cpp +++ b/lib/kopainter/koColorSlider.cpp @@ -87,7 +87,7 @@ void KoColorFrame::drawContents(TQPainter *p) void KoColorFrame::mousePressEvent(TQMouseEvent *e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) { emit clicked(e->pos()); @@ -113,7 +113,7 @@ void KoColorFrame::mousePressEvent(TQMouseEvent *e) void KoColorFrame::mouseReleaseEvent(TQMouseEvent *e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) mDragging = false; else TQFrame::mouseReleaseEvent(e); @@ -190,7 +190,7 @@ void KoSliderWidget::paintEvent(TQPaintEvent *) void KoSliderWidget::mousePressEvent(TQMouseEvent *e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) { mPos = e->pos(); mDragging = true; @@ -201,7 +201,7 @@ void KoSliderWidget::mousePressEvent(TQMouseEvent *e) void KoSliderWidget::mouseReleaseEvent(TQMouseEvent *e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) mDragging = false; else TQWidget::mouseReleaseEvent(e); @@ -346,7 +346,7 @@ void KoColorSlider::slotFrameClicked(const TQPoint &p) void KoColorSlider::mousePressEvent(TQMouseEvent *e) { - if(e->button() & Qt::LeftButton) + if(e->button() & TQt::LeftButton) { TQPoint pos = TQPoint(e->pos().x() - mSlider->width() / 2, height() - mSlider->height()); diff --git a/lib/kopainter/koIconChooser.cpp b/lib/kopainter/koIconChooser.cpp index e8647ffb3..bae95a21a 100644 --- a/lib/kopainter/koIconChooser.cpp +++ b/lib/kopainter/koIconChooser.cpp @@ -205,7 +205,7 @@ KoIconChooser::startDrag() void KoIconChooser::mouseReleaseEvent(TQMouseEvent * e) { mMouseButtonDown = true; - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) { TQPoint p = e->pos(); mDragStartPos = p; diff --git a/lib/kopainter/ko_hsv_widget.cpp b/lib/kopainter/ko_hsv_widget.cpp index 148d51bed..83919d302 100644 --- a/lib/kopainter/ko_hsv_widget.cpp +++ b/lib/kopainter/ko_hsv_widget.cpp @@ -42,7 +42,7 @@ KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, nam TQGridLayout *mGrid = new TQGridLayout(this, 5, 7, 5, 2); m_colorwheel = new KoColorWheel(this); m_colorwheel->setFixedSize( 120, 120); - m_VSelector = new KValueSelector(Qt::Vertical, this); + m_VSelector = new KValueSelector(TQt::Vertical, this); m_VSelector-> setFixedSize( 30, 120); /* setup slider labels */ diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index c6ebe14f1..2a72fdbe6 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -931,7 +931,7 @@ Editor::handleKeyPress(TQKeyEvent* ev) //selection moving TQListViewItem *item = 0; - if ( ((s == Qt::NoButton) && (k == Key_Up)) || (k==Key_BackTab) ) { + if ( ((s == TQt::NoButton) && (k == Key_Up)) || (k==Key_BackTab) ) { //find prev visible item = selectedItem() ? selectedItem()->itemAbove() : 0; while (item && (!item->isSelectable() || !item->isVisible())) @@ -939,7 +939,7 @@ Editor::handleKeyPress(TQKeyEvent* ev) if (!item) return true; } - else if( (s == Qt::NoButton) && ((k == Key_Down) || (k == Key_Tab)) ) { + else if( (s == TQt::NoButton) && ((k == Key_Down) || (k == Key_Tab)) ) { //find next visible item = selectedItem() ? selectedItem()->itemBelow() : 0; while (item && (!item->isSelectable() || !item->isVisible())) @@ -947,7 +947,7 @@ Editor::handleKeyPress(TQKeyEvent* ev) if (!item) return true; } - else if( (s==Qt::NoButton) && (k==Key_Home) ) { + else if( (s==TQt::NoButton) && (k==Key_Home) ) { if (d->currentWidget && d->currentWidget->hasFocus()) return false; //find 1st visible @@ -955,7 +955,7 @@ Editor::handleKeyPress(TQKeyEvent* ev) while (item && (!item->isSelectable() || !item->isVisible())) item = item->itemBelow(); } - else if( (s==Qt::NoButton) && (k==Key_End) ) { + else if( (s==TQt::NoButton) && (k==Key_End) ) { if (d->currentWidget && d->currentWidget->hasFocus()) return false; //find last visible diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index d71bcac2f..7c0d7c24f 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -158,7 +158,7 @@ class GroupWidgetBase : public TQWidget virtual bool event( TQEvent * e ) { if (e->type()==TQEvent::MouseButtonPress || e->type()==TQEvent::MouseButtonRelease) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if (me->button() == Qt::LeftButton) { + if (me->button() == TQt::LeftButton) { m_mouseDown = e->type()==TQEvent::MouseButtonPress; update(); } @@ -239,7 +239,7 @@ void GroupContainer::setContents( TQWidget* contents ) bool GroupContainer::event( TQEvent * e ) { if (e->type()==TQEvent::MouseButtonPress) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if (me->button() == Qt::LeftButton && d->contents && d->groupWidget->rect().contains(me->pos())) { + if (me->button() == TQt::LeftButton && d->contents && d->groupWidget->rect().contains(me->pos())) { d->groupWidget->setOpen(!d->groupWidget->isOpen()); if (d->groupWidget->isOpen()) d->contents->show(); diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index 6fdc5f625..b6454a96c 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -206,7 +206,7 @@ bool PixmapEdit::eventFilter(TQObject *o, TQEvent *ev) { if(o == m_edit) { - if(ev->type() == TQEvent::MouseButtonPress && TQT_TQMOUSEEVENT(ev)->button()==Qt::LeftButton) { + if(ev->type() == TQEvent::MouseButtonPress && TQT_TQMOUSEEVENT(ev)->button()==TQt::LeftButton) { if(m_previewPixmap.height() <= m_edit->height() && m_previewPixmap.width() <= m_edit->width()) return false; diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index 6b48af1fc..5b5487564 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -44,8 +44,8 @@ KoAutoFormatLineEdit::KoAutoFormatLineEdit ( TQWidget * parent, const char * nam void KoAutoFormatLineEdit::keyPressEvent ( TQKeyEvent *ke ) { - if( ke->key() == Qt::Key_Return || - ke->key() == Qt::Key_Enter ) + if( ke->key() == TQt::Key_Return || + ke->key() == TQt::Key_Enter ) { emit keyReturnPressed(); return; diff --git a/lib/kotext/KoBorder.cpp b/lib/kotext/KoBorder.cpp index 5c7461e6f..b1d04f1bc 100644 --- a/lib/kotext/KoBorder.cpp +++ b/lib/kotext/KoBorder.cpp @@ -27,16 +27,16 @@ #include <float.h> static const struct BorderStyle { - Qt::PenStyle penStyle; + TQt::PenStyle penStyle; TQCString oasisName; TQCString uiStringStyle; } s_borderStyles[] = { - { Qt::SolidLine, "solid", "_________" }, // SOLID - { Qt::DashLine, "dashed", "___ ___ __" }, // DASH - { Qt::DotLine, "dotted", "_ _ _ _ _ _" }, // DOT - { Qt::DashDotLine, "dot-dash", "___ _ ___ _" }, // DASH_DOT - { Qt::DashDotDotLine, "dot-dot-dash", "___ _ _ ___" }, // DASH_DOT_DOT - { Qt::SolidLine, "double", "===========" } // DOUBLE_LINE + { TQt::SolidLine, "solid", "_________" }, // SOLID + { TQt::DashLine, "dashed", "___ ___ __" }, // DASH + { TQt::DotLine, "dotted", "_ _ _ _ _ _" }, // DOT + { TQt::DashDotLine, "dot-dash", "___ _ ___ _" }, // DASH_DOT + { TQt::DashDotDotLine, "dot-dot-dash", "___ _ _ ___" }, // DASH_DOT_DOT + { TQt::SolidLine, "double", "===========" } // DOUBLE_LINE }; KoBorder::KoBorder() diff --git a/lib/kotext/KoChangeCaseDia.cpp b/lib/kotext/KoChangeCaseDia.cpp index a7cff7c22..6bffac9b7 100644 --- a/lib/kotext/KoChangeCaseDia.cpp +++ b/lib/kotext/KoChangeCaseDia.cpp @@ -34,7 +34,7 @@ KoChangeCaseDia::KoChangeCaseDia( TQWidget *parent, const char *name ) setCaption( i18n("Change Case") ); TQVBox *page = makeVBoxMainWidget(); - TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Case" ),page ); + TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Case" ),page ); grp->setRadioButtonExclusive( TRUE ); grp->layout(); m_upperCase=new TQRadioButton( i18n("&Uppercase"), grp ); diff --git a/lib/kotext/KoFontDiaPreview.cpp b/lib/kotext/KoFontDiaPreview.cpp index adf7594dc..b8ae8846c 100644 --- a/lib/kotext/KoFontDiaPreview.cpp +++ b/lib/kotext/KoFontDiaPreview.cpp @@ -392,7 +392,7 @@ void KoFontDiaPreview::drawUnderlineWave( int x, int y, int width, int thickness p->save(); int offset = 2 * thickness; TQPen pen(color, thickness, TQt::SolidLine); - pen.setCapStyle(Qt::RoundCap); + pen.setCapStyle(TQt::RoundCap); p->setPen(pen); double anc=acos(1.0-2*(static_cast<double>(offset-(x)%offset)/static_cast<double>(offset)))/3.1415*180; int pos=1; diff --git a/lib/kotext/KoHighlightingTab.cpp b/lib/kotext/KoHighlightingTab.cpp index ab7b05775..405887bf8 100644 --- a/lib/kotext/KoHighlightingTab.cpp +++ b/lib/kotext/KoHighlightingTab.cpp @@ -39,7 +39,7 @@ KoHighlightingTab::KoHighlightingTab( TQWidget* parent, const char* name, WFlags strikethroughStyleKComboBox->insertStringList( KoTextFormat::strikeOutTypeList() ); strikethroughLineStyleKComboBox->insertStringList( KoTextFormat::strikeOutStyleList() ); - capitalisationButtonGroup->setColumnLayout( 3, Qt::Horizontal ); + capitalisationButtonGroup->setColumnLayout( 3, TQt::Horizontal ); TQStringList attributes = KoTextFormat::fontAttributeList(); for ( TQStringList::Iterator it = attributes.begin(); it != attributes.end(); ++it ) { capitalisationButtonGroup->insert( new TQRadioButton( *it, capitalisationButtonGroup ) ); diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 5e038a98f..826c44a5f 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -747,22 +747,22 @@ TQPen KoBorderPreview::setBorderPen( KoBorder _brd ) switch ( _brd.getStyle() ) { case KoBorder::SOLID: - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); break; case KoBorder::DASH: - pen.setStyle( Qt::DashLine ); + pen.setStyle( TQt::DashLine ); break; case KoBorder::DOT: - pen.setStyle( Qt::DotLine ); + pen.setStyle( TQt::DotLine ); break; case KoBorder::DASH_DOT: - pen.setStyle( Qt::DashDotLine ); + pen.setStyle( TQt::DashDotLine ); break; case KoBorder::DASH_DOT_DOT: - pen.setStyle( Qt::DashDotDotLine ); + pen.setStyle( TQt::DashDotDotLine ); break; case KoBorder::DOUBLE_LINE: - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); break; } @@ -1600,7 +1600,7 @@ KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * parent, gNumbering = new TQButtonGroup( this, "numberingGroup" ); gNumbering->setTitle( i18n( "Numbering" ) ); - gNumbering->setColumnLayout(0, Qt::Vertical ); + gNumbering->setColumnLayout(0, TQt::Vertical ); gNumbering->layout()->setSpacing( 0 ); gNumbering->layout()->setMargin( 0 ); TQHBoxLayout *numberingGroupLayout = new TQHBoxLayout( gNumbering->layout() ); @@ -1724,8 +1724,8 @@ KoTabulatorsLineEdit::KoTabulatorsLineEdit( TQWidget *parent, double lower, doub void KoTabulatorsLineEdit::keyPressEvent ( TQKeyEvent *ke ) { - if( ke->key() == Qt::Key_Return || - ke->key() == Qt::Key_Enter ) + if( ke->key() == TQt::Key_Return || + ke->key() == TQt::Key_Enter ) { emit keyReturnPressed(); return; @@ -1765,7 +1765,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram gPosition = new TQGroupBox( this, "gPosition" ); gPosition->setTitle( i18n( "Po&sition" ) ); - gPosition->setColumnLayout(0, Qt::Vertical ); + gPosition->setColumnLayout(0, TQt::Vertical ); gPosition->layout()->setSpacing( 0 ); gPosition->layout()->setMargin( 0 ); TQVBoxLayout* GroupBox2Layout = new TQVBoxLayout( gPosition->layout() ); @@ -1793,7 +1793,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram bgAlign = new TQButtonGroup( this ); bgAlign->setTitle( i18n( "Alignment" ) ); - bgAlign->setColumnLayout(0, Qt::Vertical ); + bgAlign->setColumnLayout(0, TQt::Vertical ); bgAlign->layout()->setSpacing( 0 ); bgAlign->layout()->setMargin( 0 ); TQVBoxLayout* ButtonGroup1Layout = new TQVBoxLayout( bgAlign->layout() ); diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index 55a4c56b0..4e81463d5 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -603,25 +603,25 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC - TQButtonGroup *grpBold = new TQButtonGroup( 1, Qt::Vertical, page ); + TQButtonGroup *grpBold = new TQButtonGroup( 1, TQt::Vertical, page ); grpBold->setRadioButtonExclusive( TRUE ); grpBold->layout(); m_boldYes=new TQRadioButton( i18n("Yes"), grpBold ); m_boldNo=new TQRadioButton( i18n("No"), grpBold ); - TQButtonGroup *grpItalic = new TQButtonGroup( 1, Qt::Vertical, page ); + TQButtonGroup *grpItalic = new TQButtonGroup( 1, TQt::Vertical, page ); grpItalic->setRadioButtonExclusive( TRUE ); grpItalic->layout(); m_italicYes=new TQRadioButton( i18n("Yes"), grpItalic ); m_italicNo=new TQRadioButton( i18n("No"), grpItalic ); - TQButtonGroup *grpShadow = new TQButtonGroup( 1, Qt::Vertical, page ); + TQButtonGroup *grpShadow = new TQButtonGroup( 1, TQt::Vertical, page ); grpShadow->setRadioButtonExclusive( TRUE ); grpShadow->layout(); m_shadowYes=new TQRadioButton( i18n("Yes"), grpShadow ); m_shadowNo=new TQRadioButton( i18n("No"), grpShadow ); - TQButtonGroup *grpWordByWord = new TQButtonGroup( 1, Qt::Vertical, page ); + TQButtonGroup *grpWordByWord = new TQButtonGroup( 1, TQt::Vertical, page ); grpWordByWord->setRadioButtonExclusive( TRUE ); grpWordByWord->layout(); m_wordByWordYes=new TQRadioButton( i18n("Yes"), grpWordByWord ); diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp index c4042779f..b3e92c9eb 100644 --- a/lib/kotext/KoTextParag.cpp +++ b/lib/kotext/KoTextParag.cpp @@ -2565,7 +2565,7 @@ void KoTextParag::drawFontEffects( TQPainter * p, KoTextFormat *format, KoTextZo p->save(); int offset = 2 * dim; TQPen pen(col, dim, TQt::SolidLine); - pen.setCapStyle(Qt::RoundCap); + pen.setCapStyle(TQt::RoundCap); p->setPen(pen); Q_ASSERT(offset); double anc=acos(1.0-2*(static_cast<double>(offset-(startX)%offset)/static_cast<double>(offset)))/3.1415*180; diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index b7608827d..d70f9f722 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -702,7 +702,7 @@ bool KoTextView::handleMousePressEvent( TQMouseEvent *e, const TQPoint &iPoint, addParag = placeCursor( iPoint, insertDirectCursor&& isReadWrite() ); ensureCursorVisible(); - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) { showCursor(); return addParag; @@ -847,7 +847,7 @@ void KoTextView::tripleClickTimeout() void KoTextView::handleMouseTripleClickEvent( TQMouseEvent*ev, const TQPoint& /* Currently unused */ ) { - if ( ev->button() != Qt::LeftButton) + if ( ev->button() != TQt::LeftButton) { showCursor(); return; diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index fb1b6c1c0..0c55f52e4 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -125,13 +125,13 @@ void KoVariableSettings::saveOasis( KoXmlWriter &settingsWriter ) const // style:page-number in the first parag of a page (see KoTextParag), or // style:first-page-number in style:page-layout, for spreadsheets etc. if ( d->m_lastPrintingDate.isValid()) - settingsWriter.addConfigItem("lastPrintingDate", d->m_lastPrintingDate.toString(Qt::ISODate)); + settingsWriter.addConfigItem("lastPrintingDate", d->m_lastPrintingDate.toString(TQt::ISODate)); if ( d->m_creationDate.isValid()) - settingsWriter.addConfigItem("creationDate", d->m_creationDate.toString(Qt::ISODate)); + settingsWriter.addConfigItem("creationDate", d->m_creationDate.toString(TQt::ISODate)); if ( d->m_modificationDate.isValid()) - settingsWriter.addConfigItem("modificationDate", d->m_modificationDate.toString(Qt::ISODate)); + settingsWriter.addConfigItem("modificationDate", d->m_modificationDate.toString(TQt::ISODate)); settingsWriter.endElement(); // config:config-item-set } @@ -148,18 +148,18 @@ void KoVariableSettings::loadOasis(const KoOasisSettings&settingsDoc) TQString str = configurationSettings.parseConfigItemString( "lastPrintingDate" ); if ( !str.isEmpty() ) - d->m_lastPrintingDate = TQDateTime::fromString( str, Qt::ISODate ); + d->m_lastPrintingDate = TQDateTime::fromString( str, TQt::ISODate ); else d->m_lastPrintingDate.setTime_t(0); // 1970-01-01 00:00:00.000 locale time str = configurationSettings.parseConfigItemString( "creationDate" ); if ( !str.isEmpty() ) { - d->m_creationDate = TQDateTime::fromString( str, Qt::ISODate ); + d->m_creationDate = TQDateTime::fromString( str, TQt::ISODate ); } str = configurationSettings.parseConfigItemString( "modificationDate" ); if ( !str.isEmpty() ) - d->m_modificationDate = TQDateTime::fromString( str, Qt::ISODate ); + d->m_modificationDate = TQDateTime::fromString( str, TQt::ISODate ); // m_startingPageNumber isn't loaded from OASIS here. KWTextParag::loadOasis does it. } @@ -179,13 +179,13 @@ void KoVariableSettings::save( TQDomElement &parentElem ) elem.setAttribute("displayfieldcode", (int)m_displayFieldCode); if ( d->m_lastPrintingDate.isValid()) - elem.setAttribute("lastPrintingDate", d->m_lastPrintingDate.toString(Qt::ISODate)); + elem.setAttribute("lastPrintingDate", d->m_lastPrintingDate.toString(TQt::ISODate)); if ( d->m_creationDate.isValid()) - elem.setAttribute("creationDate", d->m_creationDate.toString(Qt::ISODate)); + elem.setAttribute("creationDate", d->m_creationDate.toString(TQt::ISODate)); if ( d->m_modificationDate.isValid()) - elem.setAttribute("modificationDate", d->m_modificationDate.toString(Qt::ISODate)); + elem.setAttribute("modificationDate", d->m_modificationDate.toString(TQt::ISODate)); } void KoVariableSettings::load( TQDomElement &elem ) @@ -205,16 +205,16 @@ void KoVariableSettings::load( TQDomElement &elem ) m_displayFieldCode=(bool)e.attribute("displayfieldcode").toInt(); if (e.hasAttribute("lastPrintingDate")) - d->m_lastPrintingDate = TQDateTime::fromString( e.attribute( "lastPrintingDate" ), Qt::ISODate ); + d->m_lastPrintingDate = TQDateTime::fromString( e.attribute( "lastPrintingDate" ), TQt::ISODate ); else d->m_lastPrintingDate.setTime_t(0); // 1970-01-01 00:00:00.000 locale time if (e.hasAttribute("creationDate")) { - d->m_creationDate = TQDateTime::fromString( e.attribute( "creationDate" ), Qt::ISODate ); + d->m_creationDate = TQDateTime::fromString( e.attribute( "creationDate" ), TQt::ISODate ); } if (e.hasAttribute("modificationDate")) - d->m_modificationDate = TQDateTime::fromString( e.attribute( "modificationDate" ), Qt::ISODate ); + d->m_modificationDate = TQDateTime::fromString( e.attribute( "modificationDate" ), TQt::ISODate ); } } @@ -1292,7 +1292,7 @@ void KoDateVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& context ) writer.startElement( "text:date" ); if ( m_subtype == VST_DATE_FIX ) { - writer.addAttribute( "text:date-value", m_varValue.toDate().toString( Qt::ISODate) ); + writer.addAttribute( "text:date-value", m_varValue.toDate().toString( TQt::ISODate) ); writer.addAttribute( "text:fixed", "true" ); } break; @@ -1340,7 +1340,7 @@ void KoDateVariable::loadOasis( const TQDomElement &elem, KoOasisContext& /*cont const TQString dateValue = elem.attributeNS( KoXmlNS::text, "date-value", TQString()); TQDateTime dt; if ( !dateValue.isEmpty() ) // avoid TQDate warning - dt = TQDate::fromString(dateValue, Qt::ISODate); + dt = TQDate::fromString(dateValue, TQt::ISODate); bool fixed = (elem.hasAttributeNS( KoXmlNS::text, "fixed") && elem.attributeNS( KoXmlNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) @@ -1540,7 +1540,7 @@ void KoTimeVariable::loadOasis( const TQDomElement &elem, KoOasisContext& /*cont if ( localName == "time" ) // current (or fixed) time { // Use TQDateTime to work around a possible problem of TQTime::fromString in TQt 3.2.2 - TQDateTime dt(TQDateTime::fromString(elem.attributeNS( KoXmlNS::text, "time-value", TQString()), Qt::ISODate)); + TQDateTime dt(TQDateTime::fromString(elem.attributeNS( KoXmlNS::text, "time-value", TQString()), TQt::ISODate)); bool fixed = (elem.hasAttributeNS( KoXmlNS::text, "fixed") && elem.attributeNS( KoXmlNS::text, "fixed", TQString())=="true"); if (!dt.isValid()) @@ -1563,7 +1563,7 @@ void KoTimeVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& context ) if (m_subtype == VST_TIME_FIX ) { writer.addAttribute( "text:fixed", "true" ); - writer.addAttribute( "text:time-value", m_varValue.toTime().toString( Qt::ISODate ) ); + writer.addAttribute( "text:time-value", m_varValue.toTime().toString( TQt::ISODate ) ); } TQString value( m_varFormat->formatProperties() ); @@ -2527,7 +2527,7 @@ void KoNoteVariable::loadOasis( const TQDomElement &elem, KoOasisContext& /*cont if ( localName == "annotation" && elem.namespaceURI() == KoXmlNS::office ) { TQDomElement date = KoDom::namedItemNS( elem, KoXmlNS::dc, "date" ); - m_createdNoteDate = TQDate::fromString( date.text(), Qt::ISODate ); + m_createdNoteDate = TQDate::fromString( date.text(), TQt::ISODate ); TQDomNode text = KoDom::namedItemNS( elem, KoXmlNS::text, "p" ); for ( ; !text.isNull(); text = text.nextSibling() ) { @@ -2546,7 +2546,7 @@ void KoNoteVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& /*context* // <office:annotation><dc:date>2004-11-10</dc:date><text:p/><text:p>---- 10/11/2004, 16:18 ----</text:p><text:p>dfgsdfsdfg</text:p><text:p>---- 10/11/2004, 16:18 ----</text:p><text:p/><text:p>---- 10/11/2004, 16:18 ----</text:p><text:p>gs</text:p><text:p>---- 10/11/2004, 16:18 ----</text:p><text:p>fg</text:p></office:annotation> writer.startElement( "office:annotation" ); writer.startElement( "dc:date" ); - writer.addTextNode( m_createdNoteDate.toString(Qt::ISODate) ); + writer.addTextNode( m_createdNoteDate.toString(TQt::ISODate) ); writer.endElement(); TQStringList text = TQStringList::split( "\n", m_varValue.toString() ); for ( TQStringList::Iterator it = text.begin(); it != text.end(); ++it ) { diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp index b19513e6f..93f2293b9 100644 --- a/lib/kotext/tests/kobordertest.cpp +++ b/lib/kotext/tests/kobordertest.cpp @@ -53,7 +53,7 @@ int main (int argc, char ** argv) KoZoomHandler* zh = new KoZoomHandler(); - TQGrid* grid = new TQGrid(2, Qt::Horizontal, 0L); // 2 columns + TQGrid* grid = new TQGrid(2, TQt::Horizontal, 0L); // 2 columns { // First square MyWidget* w = new MyWidget(zh, grid); diff --git a/lib/kwmf/kowmfpaint.cpp b/lib/kwmf/kowmfpaint.cpp index 430672731..e13170e95 100644 --- a/lib/kwmf/kowmfpaint.cpp +++ b/lib/kwmf/kowmfpaint.cpp @@ -124,7 +124,7 @@ void KoWmfPaint::setBackgroundColor( const TQColor &c ) { } -void KoWmfPaint::setBackgroundMode( Qt::BGMode mode ) { +void KoWmfPaint::setBackgroundMode( TQt::BGMode mode ) { mPainter.setBackgroundMode( mode ); } @@ -267,7 +267,7 @@ void KoWmfPaint::drawPolyPolygon( TQPtrList<TQPointArray>& listPa, bool winding mPainter.setClipRegion( region, TQPainter::CoordPainter ); // fill polygons - if ( brush != Qt::NoBrush ) { + if ( brush != TQt::NoBrush ) { mPainter.fillRect( region.boundingRect(), brush ); } diff --git a/lib/kwmf/kowmfpaint.h b/lib/kwmf/kowmfpaint.h index 7fb9356de..58b27b186 100644 --- a/lib/kwmf/kowmfpaint.h +++ b/lib/kwmf/kowmfpaint.h @@ -71,7 +71,7 @@ private: // Drawing attributes/modes void setBackgroundColor( const TQColor& c ); - void setBackgroundMode( Qt::BGMode mode ); + void setBackgroundMode( TQt::BGMode mode ); void setRasterOp( TQt::RasterOp op ); /** diff --git a/lib/kwmf/kowmfread.h b/lib/kwmf/kowmfread.h index ff8fa9be2..ca1183b11 100644 --- a/lib/kwmf/kowmfread.h +++ b/lib/kwmf/kowmfread.h @@ -106,7 +106,7 @@ public: // Drawing attributes/modes virtual void setBackgroundColor( const TQColor & ) = 0; - virtual void setBackgroundMode( Qt::BGMode ) = 0; + virtual void setBackgroundMode( TQt::BGMode ) = 0; virtual void setRasterOp( TQt::RasterOp ) = 0; // Change logical Coordinate diff --git a/lib/kwmf/kowmfreadprivate.cpp b/lib/kwmf/kowmfreadprivate.cpp index f812b7660..01ba4df43 100644 --- a/lib/kwmf/kowmfreadprivate.cpp +++ b/lib/kwmf/kowmfreadprivate.cpp @@ -574,9 +574,9 @@ void KoWmfReadPrivate::setBkMode( TQ_UINT32, TQDataStream& stream ) stream >> bkMode; if ( bkMode == 1 ) - mReadWmf->setBackgroundMode( Qt::TransparentMode ); + mReadWmf->setBackgroundMode( TQt::TransparentMode ); else - mReadWmf->setBackgroundMode( Qt::OpaqueMode ); + mReadWmf->setBackgroundMode( TQt::OpaqueMode ); } @@ -867,7 +867,7 @@ void KoWmfReadPrivate::createEmptyObject() void KoWmfReadPrivate::createBrushIndirect( TQ_UINT32, TQDataStream& stream ) { - Qt::BrushStyle style; + TQt::BrushStyle style; TQ_UINT16 sty, arg2; TQ_UINT32 color; KoWmfBrushHandle* handle = new KoWmfBrushHandle; @@ -881,7 +881,7 @@ void KoWmfReadPrivate::createBrushIndirect( TQ_UINT32, TQDataStream& stream ) else { kdDebug() << "KoWmfReadPrivate::createBrushIndirect: invalid hatched brush " << arg2 << endl; - style = Qt::SolidPattern; + style = TQt::SolidPattern; } } else { @@ -889,7 +889,7 @@ void KoWmfReadPrivate::createBrushIndirect( TQ_UINT32, TQDataStream& stream ) style = koWmfStyleBrush[ sty ]; else { kdDebug() << "KoWmfReadPrivate::createBrushIndirect: invalid brush " << sty << endl; - style = Qt::SolidPattern; + style = TQt::SolidPattern; } } handle->brush.setStyle( style ); @@ -901,7 +901,7 @@ void KoWmfReadPrivate::createBrushIndirect( TQ_UINT32, TQDataStream& stream ) void KoWmfReadPrivate::createPenIndirect( TQ_UINT32, TQDataStream& stream ) { // TODO: userStyle and alternateStyle - Qt::PenStyle penStyle; + TQt::PenStyle penStyle; TQ_UINT32 color; TQ_UINT16 style, width, arg; @@ -914,12 +914,12 @@ void KoWmfReadPrivate::createPenIndirect( TQ_UINT32, TQDataStream& stream ) penStyle=koWmfStylePen[ style ]; else { kdDebug() << "KoWmfReadPrivate::createPenIndirect: invalid pen " << style << endl; - penStyle = Qt::SolidLine; + penStyle = TQt::SolidLine; } handle->pen.setStyle( penStyle ); handle->pen.setColor( qtColor( color ) ); - handle->pen.setCapStyle( Qt::RoundCap ); + handle->pen.setCapStyle( TQt::RoundCap ); handle->pen.setWidth( width ); } } diff --git a/lib/kwmf/kowmfstruct.h b/lib/kwmf/kowmfstruct.h index 84281f4e4..5bd50b323 100644 --- a/lib/kwmf/kowmfstruct.h +++ b/lib/kwmf/kowmfstruct.h @@ -117,31 +117,31 @@ struct WmfEnhMetaRecord TQt::CopyROP, TQt::OrNotROP, TQt::OrROP, TQt::SetROP }; - static const Qt::BrushStyle koWmfHatchedStyleBrush[] = + static const TQt::BrushStyle koWmfHatchedStyleBrush[] = { - Qt::HorPattern, - Qt::VerPattern, - Qt::FDiagPattern, - Qt::BDiagPattern, - Qt::CrossPattern, - Qt::DiagCrossPattern + TQt::HorPattern, + TQt::VerPattern, + TQt::FDiagPattern, + TQt::BDiagPattern, + TQt::CrossPattern, + TQt::DiagCrossPattern }; - static const Qt::BrushStyle koWmfStyleBrush[] = - { Qt::SolidPattern, - Qt::NoBrush, - Qt::FDiagPattern, /* hatched */ - Qt::Dense4Pattern, /* should be custom bitmap pattern */ - Qt::HorPattern, /* should be BS_INDEXED (?) */ - Qt::VerPattern, /* should be device-independent bitmap */ - Qt::Dense6Pattern, /* should be device-independent packed-bitmap */ - Qt::Dense2Pattern, /* should be BS_PATTERN8x8 */ - Qt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */ + static const TQt::BrushStyle koWmfStyleBrush[] = + { TQt::SolidPattern, + TQt::NoBrush, + TQt::FDiagPattern, /* hatched */ + TQt::Dense4Pattern, /* should be custom bitmap pattern */ + TQt::HorPattern, /* should be BS_INDEXED (?) */ + TQt::VerPattern, /* should be device-independent bitmap */ + TQt::Dense6Pattern, /* should be device-independent packed-bitmap */ + TQt::Dense2Pattern, /* should be BS_PATTERN8x8 */ + TQt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */ }; - static const Qt::PenStyle koWmfStylePen[] = - { Qt::SolidLine, Qt::DashLine, Qt::DotLine, Qt::DashDotLine, Qt::DashDotDotLine, - Qt::NoPen, Qt::SolidLine }; + static const TQt::PenStyle koWmfStylePen[] = + { TQt::SolidLine, TQt::DashLine, TQt::DotLine, TQt::DashDotLine, TQt::DashDotDotLine, + TQt::NoPen, TQt::SolidLine }; #endif diff --git a/lib/kwmf/kowmfwrite.cpp b/lib/kwmf/kowmfwrite.cpp index 22a0d131e..23bb7024a 100644 --- a/lib/kwmf/kowmfwrite.cpp +++ b/lib/kwmf/kowmfwrite.cpp @@ -193,9 +193,9 @@ void KoWmfWrite::setBackgroundColor( const TQColor &c ) { } -void KoWmfWrite::setBackgroundMode( Qt::BGMode mode ) { +void KoWmfWrite::setBackgroundMode( TQt::BGMode mode ) { d->mSt << (TQ_UINT32)4 << (TQ_UINT16)0x0102; - if ( mode == Qt::TransparentMode ) + if ( mode == TQt::TransparentMode ) d->mSt << (TQ_UINT16)1; else d->mSt << (TQ_UINT16)0; diff --git a/lib/kwmf/kowmfwrite.h b/lib/kwmf/kowmfwrite.h index bc3e1411f..fda0540f3 100644 --- a/lib/kwmf/kowmfwrite.h +++ b/lib/kwmf/kowmfwrite.h @@ -82,7 +82,7 @@ public: // Drawing attributes/modes void setBackgroundColor( const TQColor& r ); - void setBackgroundMode( Qt::BGMode ); + void setBackgroundMode( TQt::BGMode ); void setRasterOp( TQt::RasterOp ); // Change logical Coordinate diff --git a/lib/kwmf/kwmf.cpp b/lib/kwmf/kwmf.cpp index 06092a825..d79596ced 100644 --- a/lib/kwmf/kwmf.cpp +++ b/lib/kwmf/kwmf.cpp @@ -706,17 +706,17 @@ void KWmf::opPenCreateIndirect( U32 /*words*/, TQDataStream &operands) { - static Qt::PenStyle styleTab[] = - { - Qt::SolidLine, - Qt::DashLine, - Qt::DotLine, - Qt::DashDotLine, - Qt::DashDotDotLine, - Qt::NoPen, - Qt::SolidLine, // PS_INSIDEFRAME - Qt::SolidLine, // PS_USERSTYLE - Qt::SolidLine // PS_ALTERNATE + static TQt::PenStyle styleTab[] = + { + TQt::SolidLine, + TQt::DashLine, + TQt::DotLine, + TQt::DashDotLine, + TQt::DashDotDotLine, + TQt::NoPen, + TQt::SolidLine, // PS_INSIDEFRAME + TQt::SolidLine, // PS_USERSTYLE + TQt::SolidLine // PS_ALTERNATE }; WinObjPenHandle *handle = handleCreatePen(); S16 arg; diff --git a/lib/kwmf/qwmf.cpp b/lib/kwmf/qwmf.cpp index 8b6572aee..415c63dd2 100644 --- a/lib/kwmf/qwmf.cpp +++ b/lib/kwmf/qwmf.cpp @@ -622,8 +622,8 @@ void QWinMetaFile::setBkColor( long, short* parm ) //----------------------------------------------------------------------------- void QWinMetaFile::setBkMode( long, short* parm ) { - if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( Qt::TransparentMode ); - else mPainter.setBackgroundMode( Qt::OpaqueMode ); + if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( TQt::TransparentMode ); + else mPainter.setBackgroundMode( TQt::OpaqueMode ); } @@ -927,26 +927,26 @@ void QWinMetaFile::createEmptyObject( long, short* ) //----------------------------------------------------------------------------- void QWinMetaFile::createBrushIndirect( long, short* parm ) { - static Qt::BrushStyle hatchedStyleTab[] = + static TQt::BrushStyle hatchedStyleTab[] = { - Qt::HorPattern, - Qt::FDiagPattern, - Qt::BDiagPattern, - Qt::CrossPattern, - Qt::DiagCrossPattern + TQt::HorPattern, + TQt::FDiagPattern, + TQt::BDiagPattern, + TQt::CrossPattern, + TQt::DiagCrossPattern }; - static Qt::BrushStyle styleTab[] = - { Qt::SolidPattern, - Qt::NoBrush, - Qt::FDiagPattern, /* hatched */ - Qt::Dense4Pattern, /* should be custom bitmap pattern */ - Qt::HorPattern, /* should be BS_INDEXED (?) */ - Qt::VerPattern, /* should be device-independent bitmap */ - Qt::Dense6Pattern, /* should be device-independent packed-bitmap */ - Qt::Dense2Pattern, /* should be BS_PATTERN8x8 */ - Qt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */ + static TQt::BrushStyle styleTab[] = + { TQt::SolidPattern, + TQt::NoBrush, + TQt::FDiagPattern, /* hatched */ + TQt::Dense4Pattern, /* should be custom bitmap pattern */ + TQt::HorPattern, /* should be BS_INDEXED (?) */ + TQt::VerPattern, /* should be device-independent bitmap */ + TQt::Dense6Pattern, /* should be device-independent packed-bitmap */ + TQt::Dense2Pattern, /* should be BS_PATTERN8x8 */ + TQt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */ }; - Qt::BrushStyle style; + TQt::BrushStyle style; short arg; WinObjBrushHandle* handle = new WinObjBrushHandle; addHandle( handle ); @@ -959,7 +959,7 @@ void QWinMetaFile::createBrushIndirect( long, short* parm ) else { kdDebug() << "QWinMetaFile::createBrushIndirect: invalid hatched brush " << arg << endl; - style = Qt::SolidPattern; + style = TQt::SolidPattern; } } else if ( arg>=0 && arg<9 ) @@ -967,7 +967,7 @@ void QWinMetaFile::createBrushIndirect( long, short* parm ) else { kdDebug() << "QWinMetaFile::createBrushIndirect: invalid brush " << arg << endl; - style = Qt::SolidPattern; + style = TQt::SolidPattern; } handle->brush.setStyle( style ); handle->brush.setColor( color( parm+1 ) ); @@ -977,10 +977,10 @@ void QWinMetaFile::createBrushIndirect( long, short* parm ) //----------------------------------------------------------------------------- void QWinMetaFile::createPenIndirect( long, short* parm ) { - static Qt::PenStyle styleTab[] = - { Qt::SolidLine, Qt::DashLine, Qt::DotLine, Qt::DashDotLine, Qt::DashDotDotLine, - Qt::NoPen, Qt::SolidLine }; - Qt::PenStyle style; + static TQt::PenStyle styleTab[] = + { TQt::SolidLine, TQt::DashLine, TQt::DotLine, TQt::DashDotLine, TQt::DashDotDotLine, + TQt::NoPen, TQt::SolidLine }; + TQt::PenStyle style; WinObjPenHandle* handle = new WinObjPenHandle; addHandle( handle ); @@ -988,12 +988,12 @@ void QWinMetaFile::createPenIndirect( long, short* parm ) else { kdDebug() << "QWinMetaFile::createPenIndirect: invalid pen " << parm[ 0 ] << endl; - style = Qt::SolidLine; + style = TQt::SolidLine; } handle->pen.setStyle( style ); handle->pen.setColor( color( parm+3 ) ); - handle->pen.setCapStyle( Qt::RoundCap ); + handle->pen.setCapStyle( TQt::RoundCap ); //int width = 0; // TODO : width of pen proportional to device context width diff --git a/tools/tdefile-plugins/ooo/tdefile_ooo.cpp b/tools/tdefile-plugins/ooo/tdefile_ooo.cpp index f73aa6d65..522ef6739 100644 --- a/tools/tdefile-plugins/ooo/tdefile_ooo.cpp +++ b/tools/tdefile-plugins/ooo/tdefile_ooo.cpp @@ -265,7 +265,7 @@ void KOfficePlugin::getEditingTime(KFileMetaInfoGroup group1, void KOfficePlugin::getDateTime(KFileMetaInfoGroup group1, const char * labelid, TQString & txt) { - TQDateTime dt = TQDateTime::fromString( txt, Qt::ISODate); + TQDateTime dt = TQDateTime::fromString( txt, TQt::ISODate); appendItem( group1, labelid, dt); } diff --git a/tools/thesaurus/main.cpp b/tools/thesaurus/main.cpp index 47554d3e2..2cad33205 100644 --- a/tools/thesaurus/main.cpp +++ b/tools/thesaurus/main.cpp @@ -126,13 +126,13 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &) TQHBox *hbox = new TQHBox(vbox); hbox->setSpacing(KDialog::spacingHint()); - grpbox_syn = new TQGroupBox( 1, Qt::Horizontal, i18n("Synonyms"), hbox); + grpbox_syn = new TQGroupBox( 1, TQt::Horizontal, i18n("Synonyms"), hbox); m_thes_syn = new TQListBox(grpbox_syn); - grpbox_hyper = new TQGroupBox( 1, Qt::Horizontal, i18n("More General Words"), hbox); + grpbox_hyper = new TQGroupBox( 1, TQt::Horizontal, i18n("More General Words"), hbox); m_thes_hyper = new TQListBox(grpbox_hyper); - grpbox_hypo = new TQGroupBox( 1, Qt::Horizontal, i18n("More Specific Words"), hbox); + grpbox_hypo = new TQGroupBox( 1, TQt::Horizontal, i18n("More Specific Words"), hbox); m_thes_hypo = new TQListBox(grpbox_hypo); // single click -- keep display unambiguous by removing other selections: |