TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace Qt with TQt

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/50/head
Michele Calgaro 1 year ago
parent 895081803a
commit ef06f14f24
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
358 changed files with 1519 additions and 1519 deletions
Show Stats Download Patch File Download Diff File

20
chalk/doc/controller.xmi
Unescape Escape View File

@ -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 &amp; drop widgets." isSpecification="f
<codecomment tag="" writeOutText="false" />
</header>
</codeblockwithcomments>
<codeblockwithcomments tag="imports" text="&amp;#010;import Qt.Qt::Orientation;&amp;#010;import bool;&amp;#010;import QPixmap;" >
<codeblockwithcomments tag="imports" text="&amp;#010;import TQt.TQt::Orientation;&amp;#010;import bool;&amp;#010;import QPixmap;" >
<header>
<codecomment tag="" writeOutText="false" />
</header>
@ -13122,7 +13122,7 @@ XXX: for post 1.4: make sure we can drag &amp; 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 &amp; drop widgets." isSpecification="f
</codeoperation>
<codeoperation parent_id="681" tag="operation_681" canDelete="false" indentLevel="1" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Qt.Qt::Orientation " />
<javacodedocumentation tag="" indentLevel="1" text="&amp;#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 &amp; 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 &amp; 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;&amp;#010;" >
<codeblockwithcomments tag="packages" text="package TQt;&amp;#010;" >
<header>
<codecomment tag="" writeOutText="false" />
</header>
@ -21856,7 +21856,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeblockwithcomments>
<javaclassdeclarationblock parent_id="678" tag="ClassDeclBlock" canDelete="false" >
<header>
<javacodedocumentation tag="" text="Class Qt::Orientation&amp;#010;" />
<javacodedocumentation tag="" text="Class TQt::Orientation&amp;#010;" />
</header>
<textblocks>
<hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" >
@ -21875,7 +21875,7 @@ XXX: for post 1.4: make sure we can drag &amp; 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 &amp; drop widgets." isSpecification="f
<codecomment tag="" writeOutText="false" />
</header>
</codeblockwithcomments>
<codeblockwithcomments tag="imports" text="&amp;#010;import KisGuideSP;&amp;#010;import Qt.Qt::Orientation;&amp;#010;import bool;&amp;#010;import TQ_INT32;&amp;#010;import QSize;&amp;#010;import QPixmap;&amp;#010;import KisGuideMgr.vKisGuideSP;" >
<codeblockwithcomments tag="imports" text="&amp;#010;import KisGuideSP;&amp;#010;import TQt.TQt::Orientation;&amp;#010;import bool;&amp;#010;import TQ_INT32;&amp;#010;import QSize;&amp;#010;import QPixmap;&amp;#010;import KisGuideMgr.vKisGuideSP;" >
<header>
<codecomment tag="" writeOutText="false" />
</header>

2
chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp
Unescape Escape View File

@ -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;

4
chalk/plugins/filters/levelfilter/kgradientslider.cpp
Unescape Escape View File

@ -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;

2
chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp
Unescape Escape View File

@ -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);

4
chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp
Unescape Escape View File

@ -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);

4
chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp
Unescape Escape View File

@ -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;

2
chalk/plugins/tools/defaulttools/kis_tool_fill.cpp
Unescape Escape View File

@ -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;

4
chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp
Unescape Escape View File

@ -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();

4
chalk/plugins/tools/defaulttools/kis_tool_line.cpp
Unescape Escape View File

@ -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();

6
chalk/plugins/tools/defaulttools/kis_tool_move.cpp
Unescape Escape View File

@ -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());
}
}

4
chalk/plugins/tools/defaulttools/kis_tool_pan.cpp
Unescape Escape View File

@ -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;
}

4
chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp
Unescape Escape View File

@ -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;

4
chalk/plugins/tools/defaulttools/kis_tool_text.cpp
Unescape Escape View File

@ -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();

4
chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
Unescape Escape View File

@ -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();

4
chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp
Unescape Escape View File

@ -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;

2
chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp
Unescape Escape View File

@ -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()))

4
chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp
Unescape Escape View File

@ -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();

4
chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp
Unescape Escape View File

@ -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();

8
chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp
Unescape Escape View File

@ -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) {
}
}

4
chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp
Unescape Escape View File

@ -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();

4
chalk/plugins/tools/tool_crop/kis_tool_crop.cpp
Unescape Escape View File

@ -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;

2
chalk/plugins/tools/tool_curves/kis_tool_curve.cpp
Unescape Escape View File

@ -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()));

4
chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp
Unescape Escape View File

@ -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()));

6
chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp
Unescape Escape View File

@ -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)

6
chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp
Unescape Escape View File

@ -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);

8
chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp
Unescape Escape View File

@ -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) {
}
}

8
chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp
Unescape Escape View File

@ -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) {
}
}

2
chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
Unescape Escape View File

@ -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()))

4
chalk/plugins/tools/tool_star/kis_tool_star.cpp
Unescape Escape View File

@ -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;

6
chalk/plugins/tools/tool_transform/kis_tool_transform.cpp
Unescape Escape View File

@ -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;

2
chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp
Unescape Escape View File

@ -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

2
chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
Unescape Escape View File

@ -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;

2
chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
Unescape Escape View File

@ -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() );

4
chalk/ui/imageviewer.cpp
Unescape Escape View File

@ -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;

4
chalk/ui/kcurve.cpp
Unescape Escape View File

@ -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() );

30
chalk/ui/kis_canvas.cpp
Unescape Escape View File

@ -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

16
chalk/ui/kis_canvas_painter.cpp
Unescape Escape View File

@ -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);

12
chalk/ui/kis_canvas_painter.h
Unescape Escape View File

@ -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;

2
chalk/ui/kis_dlg_adjustment_layer.cpp
Unescape Escape View File

@ -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"),

2
chalk/ui/kis_double_widget.cpp
Unescape Escape View File

@ -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()));

2
chalk/ui/kis_gradient_slider_widget.cpp
Unescape Escape View File

@ -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;

14
chalk/ui/kis_grid_drawer.cpp
Unescape Escape View File

@ -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);

2
chalk/ui/kis_grid_drawer.h
Unescape Escape View File

@ -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 {

2
chalk/ui/kis_histogram_view.cpp
Unescape Escape View File

@ -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);

4
chalk/ui/kis_int_spinbox.cpp
Unescape Escape View File

@ -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?

2
chalk/ui/kis_int_spinbox.h
Unescape Escape View File

@ -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);

10
chalk/ui/kis_opengl_canvas_painter.cpp
Unescape Escape View File

@ -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*/)
{
}

8
chalk/ui/kis_opengl_canvas_painter.h
Unescape Escape View File

@ -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;

6
chalk/ui/kis_qpaintdevice_canvas_painter.cpp
Unescape Escape View File

@ -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);
}

6
chalk/ui/kis_qpaintdevice_canvas_painter.h
Unescape Escape View File

@ -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;

16
chalk/ui/kis_ruler.cpp
Unescape Escape View File

@ -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);

4
chalk/ui/kis_ruler.h
Unescape Escape View File

@ -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;

4
chalk/ui/kis_tool_dummy.cpp
Unescape Escape View File

@ -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;
}
}

4
chalk/ui/kis_tool_freehand.cpp
Unescape Escape View File

@ -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";

2
chalk/ui/kis_tool_paint.cpp
Unescape Escape View File

@ -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();

24
chalk/ui/kis_view.cpp
Unescape Escape View File

@ -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);
}
}

4
chalk/ui/kobirdeyepanel.cpp
Unescape Escape View File

@ -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;
}

4
chalk/ui/layerlist.cpp
Unescape Escape View File

@ -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();

12
doc/chalk/developers-plugins.docbook
Unescape Escape View File

@ -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() &amp; Qt::AltButton) {
if (event->state() &amp; 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&amp; start, const KisPoint&amp; 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&lt;TDERadioAction *&gt;(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("&amp;Star"),
"tool_star",
shortcut,

2
filters/chalk/raw/dcraw.c
Unescape Escape View File

@ -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 */

2
filters/karbon/eps/epsexport.cpp
Unescape Escape View File

@ -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;

2
filters/karbon/eps/epsexportdlg.cpp
Unescape Escape View File

@ -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;

14
filters/karbon/wmf/wmfexport.cpp
Unescape Escape View File

@ -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 );
}
}

4
filters/karbon/wmf/wmfimportparser.cpp
Unescape Escape View File

@ -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;
}

4
filters/karbon/wmf/wmfimportparser.h
Unescape Escape View File

@ -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;

4
filters/kpresenter/ooimpress/ooimpressimport.cpp
Unescape Escape View File

@ -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");

4
filters/kpresenter/powerpoint/libppt/powerpoint.h
Unescape Escape View File

@ -2095,8 +2095,8 @@ public:
NotesBody,
CenteredTitle,
Subtitle,
Qt::VerticalTextTitle,
Qt::VerticalTextBody,
TQt::VerticalTextTitle,
TQt::VerticalTextBody,
NotesSlideImage,
Object,
Graph,

2
filters/kspread/csv/csvexportdialog.cpp
Unescape Escape View File

@ -68,7 +68,7 @@ CSVExportDialog::CSVExportDialog( TQWidget * parent )
m_dialog->comboBoxEncoding->insertStringList(encodings);
setButtonBoxOrientation (Qt::Vertical );
setButtonBoxOrientation (TQt::Vertical );
setMainWidget(m_dialog);

4
filters/kspread/excel/sidewinder/excel.cpp
Unescape Escape View File

@ -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;

68
filters/kspread/gnumeric/gnumericimport.cpp
Unescape Escape View File

@ -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);
}
}

10
filters/kspread/gnumeric/status.html
Unescape Escape View File

@ -39,7 +39,7 @@ KOffice filters status:&nbsp;&nbsp; GNUmeric (GNOME spreadsheet)</h1></center>
<tr BGCOLOR="#CCCCFF">
<td VALIGN=TOP><b><font size="+1">Features</font></b></td>
<td>Vertical &amp;Qt::Horizontal Alignment, text wrapping, indention
<td>Vertical &amp; Horizontal Alignment, text wrapping, indention
<br>Background, Patter &amp; Foreground color
<br>Fonts:
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -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 &amp;Qt::Vertical&nbsp;
<br>Cell Size: horizontal &amp; vertical&nbsp;
<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 &amp;Qt::Vertical (Export) (kspread&nbsp; doesn't
<td>Cell Size: horizontal &amp; vertical (Export) (kspread&nbsp; doesn't
support retriving the first "rowFormat" and colFormat".)
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -194,7 +194,7 @@ Faure</a>&nbsp;&nbsp; <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 &amp;Qt::Horizontal Alignment
<td>Vertical &amp; Horizontal Alignment
<br>Background &amp; Foreground color
<br>Fonts:
<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -208,7 +208,7 @@ Bold
<br>Multiple Sheets (Tables)
<br>Formulas!!! (ExprID)
<br>Selections
<br>Cell Size:Qt::Horizontal &amp;Qt::Vertical
<br>Cell Size: horizontal &amp; vertical
<br>Hidden columns/rows&nbsp;
<br>Selected Tab
<br>Paper layout

2
filters/kspread/opencalc/opencalcexport.cpp
Unescape Escape View File

@ -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 );
}

12
filters/kspread/opencalc/opencalcimport.cpp
Unescape Escape View File

@ -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;

2
filters/kword/abiword/abiwordexport.cpp
Unescape Escape View File

@ -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";

2
filters/kword/abiword/abiwordimport.cpp
Unescape Escape View File

@ -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);

6
filters/kword/kword1.3/import/kword13document.cpp
Unescape Escape View File

@ -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;
}

8
filters/kword/kword1.3/import/kword13oasisgenerator.cpp
Unescape Escape View File

@ -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;

12
filters/kword/libexport/KWEFKWordLeader.cpp
Unescape Escape View File

@ -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);
}

10
filters/kword/oowriter/ExportFilter.cpp
Unescape Escape View File

@ -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())

8
filters/kword/oowriter/oowriterimport.cpp
Unescape Escape View File

@ -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");

2
filters/kword/wordperfect/import/parser.h
Unescape Escape View File

@ -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
{

8
karbon/dialogs/vcolortab.cpp
Unescape Escape View File

@ -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 ) );

6
karbon/dialogs/vconfiguredlg.cpp
Unescape Escape View File

@ -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 );

16
karbon/karbon_view.cpp
Unescape Escape View File

@ -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(

2
karbon/plugins/flattenpath/flattenpathplugin.cpp
Unescape Escape View File

@ -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 );

2
karbon/plugins/insertknots/insertknotsplugin.cpp
Unescape Escape View File

@ -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 );

2
karbon/plugins/roundcorners/roundcornersplugin.cpp
Unescape Escape View File

@ -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 );

2
karbon/plugins/shadoweffect/shadoweffectplugin.cpp
Unescape Escape View File

@ -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 );

2
karbon/plugins/whirlpinch/whirlpinchplugin.cpp
Unescape Escape View File

@ -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 );

2
karbon/render/vkopainter.cpp
Unescape Escape View File

@ -383,7 +383,7 @@ VKoPainter::setPen( const TQColor &c )
}
void
VKoPainter::setPen( Qt::PenStyle style )
VKoPainter::setPen( TQt::PenStyle style )
{
if( style == TQt::NoPen )
{

2
karbon/render/vkopainter.h
Unescape Escape View File

@ -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 );

2
karbon/render/vpainter.h
Unescape Escape View File

@ -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;

8
karbon/render/vqpainter.cpp
Unescape Escape View File

@ -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 );
}

2
karbon/render/vqpainter.h
Unescape Escape View File

@ -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 );

2
karbon/tools/vellipsetool.cpp
Unescape Escape View File

@ -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 );

6
karbon/tools/vpenciltool.cpp
Unescape Escape View File

@ -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 );

2
karbon/tools/vpolygontool.cpp
Unescape Escape View File

@ -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 );

2
karbon/tools/vrectangletool.cpp
Unescape Escape View File

@ -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 );

2
karbon/tools/vroundrecttool.cpp
Unescape Escape View File

@ -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;

2
karbon/tools/vselecttool.cpp
Unescape Escape View File

@ -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 );

2
karbon/tools/vsinustool.cpp
Unescape Escape View File

@ -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 );

4
karbon/tools/vspiraltool.cpp
Unescape Escape View File

@ -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 );

2
karbon/tools/vstartool.cpp
Unescape Escape View File

@ -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 );

4
karbon/vtool.cpp
Unescape Escape View File

@ -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();

2
karbon/widgets/vcolorslider.cpp
Unescape Escape View File

@ -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 );

10
karbon/widgets/vgradientwidget.cpp
Unescape Escape View File

@ -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;

2
karbon/widgets/vreference.cpp
Unescape Escape View File

@ -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 );

16
karbon/widgets/vruler.cpp
Unescape Escape View File

@ -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);

4
karbon/widgets/vruler.h
Unescape Escape View File

@ -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;

2
kchart/kchartColorConfigPage.cpp
Unescape Escape View File

@ -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);

16
kchart/kchartLegendConfigPage.cpp
Unescape Escape View File

@ -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());

2
kchart/kchartPageLayout.cpp
Unescape Escape View File

@ -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);

2
kchart/kchartParameter3dConfigPage.cpp
Unescape Escape View File

@ -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());

4
kchart/kchartParameterConfigPage.cpp
Unescape Escape View File

@ -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());

2
kchart/kchartWizardSelectChartSubTypePage.cpp
Unescape Escape View File

@ -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();

4
kchart/kchart_params.cpp
Unescape Escape View File

@ -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 );

2
kchart/kchart_view.cpp
Unescape Escape View File

@ -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());
}

12
kchart/kdchart/KDChartAxesPainter.cpp
Unescape Escape View File

@ -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;

16
kchart/kdchart/KDChartAxisParams.cpp
Unescape Escape View File

@ -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

12
kchart/kdchart/KDChartAxisParams.h
Unescape Escape View File

@ -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;

2
kchart/kdchart/KDChartLinesPainter.cpp
Unescape Escape View File

@ -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

4
kchart/kdchart/KDChartObjectFactory.cpp
Unescape Escape View File

@ -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;

4
kchart/kdchart/KDChartPainter.cpp
Unescape Escape View File

@ -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 );

38
kchart/kdchart/KDChartParams.cpp
Unescape Escape View File

@ -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,

28
kchart/kdchart/KDChartParams.h
Unescape Escape View File

@ -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;

10
kchart/kdchart/KDChartParams_io.cpp
Unescape Escape View File

@ -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" );
}

4
kchart/kdchart/KDChartPropertySet.cpp
Unescape Escape View File

@ -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;

12
kchart/kdchart/KDChartPropertySet.h
Unescape Escape View File

@ -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;

8
kchart/kdchart/KDChartWidget.cpp
Unescape Escape View File

@ -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 ){

98
kchart/kdchart/KDXMLTools.cpp
Unescape Escape View File

@ -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;
}
}

12
kchart/kdchart/KDXMLTools.h
Unescape Escape View File

@ -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 );

56
kdgantt/KDGanttMinimizeSplitter.cpp
Unescape Escape View File

@ -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.
*/

8
kdgantt/KDGanttMinimizeSplitter.h
Unescape Escape View File

@ -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;

24
kdgantt/KDGanttSemiSizingControl.cpp
Unescape Escape View File

@ -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());
}
}

10
kdgantt/KDGanttSemiSizingControl.h
Unescape Escape View File

@ -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;

6
kdgantt/KDGanttView.cpp
Unescape Escape View File

@ -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;

12
kdgantt/KDGanttViewItem.cpp
Unescape Escape View File

@ -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);

52
kdgantt/KDGanttViewSubwidgets.cpp
Unescape Escape View File

@ -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() )

4
kdgantt/KDGanttViewTaskLink.cpp
Unescape Escape View File

@ -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);

100
kdgantt/KDGanttXMLTools.cpp
Unescape Escape View File

@ -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;
}
}

8
kdgantt/KDGanttXMLTools.h
Unescape Escape View File

@ -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 );

2
kexi/3rdparty/kolibs/KoPageLayoutSize.cpp vendored
Unescape Escape View File

@ -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 );

4
kexi/3rdparty/kolibs/koPageLayoutDia.cpp vendored
Unescape Escape View File

@ -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 );

2
kexi/doc/dev/TODO-Kexi-js
Unescape Escape View File

@ -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)

4
kexi/formeditor/commands.cpp
Unescape Escape View File

@ -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

48
kexi/formeditor/container.cpp
Unescape Escape View File

@ -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;

2
kexi/formeditor/factories/containerfactory.cpp
Unescape Escape View File

@ -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;
}

20
kexi/formeditor/factories/stdwidgetfactory.cpp
Unescape Escape View File

@ -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)

4
kexi/formeditor/formIO.cpp
Unescape Escape View File

@ -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

2
kexi/formeditor/resizehandle.cpp
Unescape Escape View File

@ -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;

10
kexi/formeditor/spring.cpp
Unescape Escape View File

@ -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;

4
kexi/kexidb/driver.cpp
Unescape Escape View File

@ -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: {

4
kexi/kexidb/driver.h
Unescape Escape View File

@ -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.

6
kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp
Unescape Escape View File

@ -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?

8
kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
Unescape Escape View File

@ -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:

6
kexi/kexidb/drivers/sqlite/sqlitepreparedstatement.cpp
Unescape Escape View File

@ -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?

8
kexi/kexidb/expression.cpp
Unescape Escape View File

@ -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();
}

6
kexi/kexidb/field.cpp
Unescape Escape View File

@ -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

4
kexi/kexiutils/utils.h
Unescape Escape View File

@ -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).

12
kexi/main/ksplitter.h
Unescape Escape View File

@ -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%

4
kexi/main/startup/KexiStartupDialog.cpp
Unescape Escape View File

@ -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*)));

2
kexi/main/startup/KexiStartupFileDialog.cpp
Unescape Escape View File

@ -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;

10
kexi/plugins/forms/widgets/kexidbcombobox.cpp
Unescape Escape View File

@ -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;
}

12
kexi/plugins/forms/widgets/kexidbform.cpp
Unescape Escape View File

@ -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;

2
kexi/plugins/forms/widgets/kexidbimagebox.cpp
Unescape Escape View File

@ -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;

6
kexi/plugins/importexport/csv/kexicsvexport.cpp
Unescape Escape View File

@ -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)

2
kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
Unescape Escape View File

@ -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);

2
kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
Unescape Escape View File

@ -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

10
kexi/plugins/queries/kexiquerydesignerguieditor.cpp
Unescape Escape View File

@ -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