diff options
Diffstat (limited to 'karbon')
28 files changed, 59 insertions, 59 deletions
diff --git a/karbon/dialogs/vcolortab.cpp b/karbon/dialogs/vcolortab.cpp index 0b2c3bab..fc8f4eac 100644 --- a/karbon/dialogs/vcolortab.cpp +++ b/karbon/dialogs/vcolortab.cpp @@ -48,7 +48,7 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mainLayout->addMultiCellWidget(mColorSelector, 0, 2, 0, 0 ); //Selector - mSelector = new KGradientSelector( Qt::Vertical, mRGBWidget ); + mSelector = new KGradientSelector( TQt::Vertical, mRGBWidget ); mSelector->setColors( TQColor( "white" ), TQColor( "black" ) ); mSelector->setMinimumWidth( 20 ); //TODO: Make it autochange color if the solid-filled object is selected (also for TQSpinBoxes) @@ -56,7 +56,7 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mainLayout->addMultiCellWidget( mSelector, 0, 2, 1, 1 ); //Reference - TQGroupBox* groupbox = new TQGroupBox( 2,Qt::Vertical, i18n( "Reference" ), mRGBWidget ); + TQGroupBox* groupbox = new TQGroupBox( 2,TQt::Vertical, i18n( "Reference" ), mRGBWidget ); new TQLabel( i18n( "Old:" ), groupbox ); new TQLabel( i18n( "New:" ), groupbox ); mOldColor = new KColorPatch( groupbox ); @@ -68,7 +68,7 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mainLayout->addWidget( groupbox, 0, 2 ); //Components - TQGroupBox* cgroupbox = new TQGroupBox( 3,Qt::Vertical, i18n( "Components" ), mRGBWidget ); + TQGroupBox* cgroupbox = new TQGroupBox( 3,TQt::Vertical, i18n( "Components" ), mRGBWidget ); //--->RGB new TQLabel( i18n( "R:" ), cgroupbox ); @@ -94,7 +94,7 @@ VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name ) mainLayout->addWidget( cgroupbox, 1, 2 ); //--->Opacity - TQGroupBox* ogroupBox = new TQGroupBox( 1,Qt::Vertical, i18n( "Opacity" ), mRGBWidget ); + TQGroupBox* ogroupBox = new TQGroupBox( 1,TQt::Vertical, i18n( "Opacity" ), mRGBWidget ); mOpacity = new KIntNumInput( 100, ogroupBox ); mOpacity->setRange( 0, 100, 1, true ); mOpacity->setValue( int( c.opacity() * 100.0 ) ); diff --git a/karbon/dialogs/vconfiguredlg.cpp b/karbon/dialogs/vconfiguredlg.cpp index 49f874fc..3736f738 100644 --- a/karbon/dialogs/vconfiguredlg.cpp +++ b/karbon/dialogs/vconfiguredlg.cpp @@ -217,7 +217,7 @@ VConfigMiscPage::VConfigMiscPage( KarbonView* view, TQVBox* box, char* name ) KoUnit::Unit unit = view->part()->unit(); - TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), box, "GroupBox" ); + TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Misc" ), box, "GroupBox" ); tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); @@ -302,14 +302,14 @@ VConfigGridPage::VConfigGridPage( KarbonView* view, TQVBox* page, char* name ) TQLabel* gridColorLbl = new TQLabel( i18n( "Grid &color:" ), page); m_gridColorBtn = new KColorButton( gd.color, page ); gridColorLbl->setBuddy( m_gridColorBtn ); - TQGroupBox* spacingGrp = new TQGroupBox( 2, Qt::Horizontal, i18n( "Spacing" ), page ); + TQGroupBox* spacingGrp = new TQGroupBox( 2, TQt::Horizontal, i18n( "Spacing" ), page ); TQLabel* spaceHorizLbl = new TQLabel( i18n( "&Horizontal:" ), spacingGrp ); m_spaceHorizUSpin = new KoUnitDoubleSpinBox( spacingGrp, 0.0, pgw, 0.1, fw, unit ); spaceHorizLbl->setBuddy( m_spaceHorizUSpin ); TQLabel* spaceVertLbl = new TQLabel( i18n( "&Vertical:" ), spacingGrp ); m_spaceVertUSpin = new KoUnitDoubleSpinBox( spacingGrp, 0.0, pgh, 0.1, fh, unit ); spaceVertLbl->setBuddy( m_spaceVertUSpin ); - TQGroupBox* snapGrp = new TQGroupBox( 2, Qt::Horizontal, i18n( "Snap Distance" ), page ); + TQGroupBox* snapGrp = new TQGroupBox( 2, TQt::Horizontal, i18n( "Snap Distance" ), page ); TQLabel* snapHorizLbl = new TQLabel( i18n( "H&orizontal:" ), snapGrp ); m_snapHorizUSpin = new KoUnitDoubleSpinBox( snapGrp, 0.0, fw, 0.1, sw, unit ); snapHorizLbl->setBuddy( m_snapHorizUSpin ); diff --git a/karbon/karbon_view.cpp b/karbon/karbon_view.cpp index 3fc8eaf5..20e74fce 100644 --- a/karbon/karbon_view.cpp +++ b/karbon/karbon_view.cpp @@ -162,11 +162,11 @@ KarbonView::KarbonView( KarbonPart* p, TQWidget* parent, const char* name ) connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), TQT_TQOBJECT(this), TQT_SLOT( setUnit( KoUnit::Unit ) ) ); // widgets: - m_horizRuler = new VRuler( Qt::Horizontal, this ); + m_horizRuler = new VRuler( TQt::Horizontal, this ); m_horizRuler->setUnit(p->unit()); connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_horizRuler, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); - m_vertRuler = new VRuler( Qt::Vertical, this ); + m_vertRuler = new VRuler( TQt::Vertical, this ); m_vertRuler->setUnit(p->unit()); connect( p, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), m_vertRuler, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); @@ -1031,7 +1031,7 @@ KarbonView::initActions() TQT_SLOT( selectionAlignHorizontalLeft() ), actionCollection(), "object_align_horizontal_left" ); new TDEAction( - i18n( "Align Center Qt::Horizontal)" ), "aocenterh", 0, TQT_TQOBJECT(this), + i18n( "Align Center (Horizontal)" ), "aocenterh", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionAlignHorizontalCenter() ), actionCollection(), "object_align_horizontal_center" ); new TDEAction( @@ -1043,7 +1043,7 @@ KarbonView::initActions() TQT_SLOT( selectionAlignVerticalTop() ), actionCollection(), "object_align_vertical_top" ); new TDEAction( - i18n( "Align Middle Qt::Vertical)" ), "aocenterv", 0, TQT_TQOBJECT(this), + i18n( "Align Middle (Vertical)" ), "aocenterv", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionAlignVerticalCenter() ), actionCollection(), "object_align_vertical_center" ); new TDEAction( @@ -1052,11 +1052,11 @@ KarbonView::initActions() actionCollection(), "object_align_vertical_bottom" ); new TDEAction( - i18n( "Distribute Center Qt::Horizontal)" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Center (Horizontal)" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeHorizontalCenter() ), actionCollection(), "object_distribute_horizontal_center" ); new TDEAction( - i18n( "Distribute Gaps Qt::Horizontal)" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Gaps (Horizontal)" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeHorizontalGap() ), actionCollection(), "object_distribute_horizontal_gap" ); new TDEAction( @@ -1068,11 +1068,11 @@ KarbonView::initActions() TQT_SLOT( selectionDistributeHorizontalRight() ), actionCollection(), "object_distribute_horizontal_right" ); new TDEAction( - i18n( "Distribute Center Qt::Vertical)" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Center (Vertical)" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeVerticalCenter() ), actionCollection(), "object_distribute_vertical_center" ); new TDEAction( - i18n( "Distribute Gaps Qt::Vertical)" ), "", 0, TQT_TQOBJECT(this), + i18n( "Distribute Gaps (Vertical)" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( selectionDistributeVerticalGap() ), actionCollection(), "object_distribute_vertical_gap" ); new TDEAction( diff --git a/karbon/plugins/flattenpath/flattenpathplugin.cpp b/karbon/plugins/flattenpath/flattenpathplugin.cpp index 6c4a33d8..f1453f96 100644 --- a/karbon/plugins/flattenpath/flattenpathplugin.cpp +++ b/karbon/plugins/flattenpath/flattenpathplugin.cpp @@ -56,7 +56,7 @@ VFlattenDlg::VFlattenDlg( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Flatten Path" ), Ok | Cancel ) { // add input fields on the left: - TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox* group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Flatness:" ), group ); m_flatness = new KDoubleNumInput( group ); group->setMinimumWidth( 300 ); diff --git a/karbon/plugins/insertknots/insertknotsplugin.cpp b/karbon/plugins/insertknots/insertknotsplugin.cpp index 19a1e4d5..0cde892c 100644 --- a/karbon/plugins/insertknots/insertknotsplugin.cpp +++ b/karbon/plugins/insertknots/insertknotsplugin.cpp @@ -54,7 +54,7 @@ VInsertKnotsDlg::VInsertKnotsDlg( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Insert Knots" ), Ok | Cancel ) { // add input fields: - TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox* group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Knots:" ), group ); m_knots = new KIntSpinBox( group ); diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cpp b/karbon/plugins/roundcorners/roundcornersplugin.cpp index 1841c5eb..71545b9c 100644 --- a/karbon/plugins/roundcorners/roundcornersplugin.cpp +++ b/karbon/plugins/roundcorners/roundcornersplugin.cpp @@ -59,7 +59,7 @@ VRoundCornersDlg::VRoundCornersDlg( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Polygonize" ), Ok | Cancel ) { // add input: - TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox* group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Round corners:" ), group ); m_radius = new KDoubleNumInput( group ); diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cpp b/karbon/plugins/shadoweffect/shadoweffectplugin.cpp index 019b4024..dedd26f3 100644 --- a/karbon/plugins/shadoweffect/shadoweffectplugin.cpp +++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cpp @@ -61,7 +61,7 @@ VShadowEffectDlg::VShadowEffectDlg( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Create Shadow Effect" ), Ok | Cancel ) { // add input fields on the left: - TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox* group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Distance:" ), group ); m_distance = new KIntNumInput( group ); m_distance->setRange( -1000, 1000, 1, true ); diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.cpp b/karbon/plugins/whirlpinch/whirlpinchplugin.cpp index d2b91a18..46ebf530 100644 --- a/karbon/plugins/whirlpinch/whirlpinchplugin.cpp +++ b/karbon/plugins/whirlpinch/whirlpinchplugin.cpp @@ -62,7 +62,7 @@ VWhirlPinchDlg::VWhirlPinchDlg( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Whirl Pinch" ), Ok | Cancel ) { // add input fields: - TQGroupBox* group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox* group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Angle:" ), group ); m_angle = new KDoubleNumInput( group ); diff --git a/karbon/render/vkopainter.cpp b/karbon/render/vkopainter.cpp index 3f81f3c3..54803efe 100644 --- a/karbon/render/vkopainter.cpp +++ b/karbon/render/vkopainter.cpp @@ -383,7 +383,7 @@ VKoPainter::setPen( const TQColor &c ) } void -VKoPainter::setPen( Qt::PenStyle style ) +VKoPainter::setPen( TQt::PenStyle style ) { if( style == TQt::NoPen ) { diff --git a/karbon/render/vkopainter.h b/karbon/render/vkopainter.h index eac4c204..7f9263ca 100644 --- a/karbon/render/vkopainter.h +++ b/karbon/render/vkopainter.h @@ -75,7 +75,7 @@ public: // pen + brush virtual void setPen( const VStroke & ); virtual void setPen( const TQColor & ); - virtual void setPen( Qt::PenStyle style ); + virtual void setPen( TQt::PenStyle style ); virtual void setBrush( const VFill & ); virtual void setBrush( const TQColor & ); virtual void setBrush( TQt::BrushStyle style ); diff --git a/karbon/render/vpainter.h b/karbon/render/vpainter.h index b61d854a..dec4a394 100644 --- a/karbon/render/vpainter.h +++ b/karbon/render/vpainter.h @@ -81,7 +81,7 @@ public: virtual void setPen( const VStroke & ) = 0; // compatibility, use VPen/VBrush later ? virtual void setPen( const TQColor & ) = 0; - virtual void setPen( Qt::PenStyle style ) = 0; + virtual void setPen( TQt::PenStyle style ) = 0; virtual void setBrush( const VFill & ) = 0; virtual void setBrush( const TQColor & ) = 0; virtual void setBrush( TQt::BrushStyle style ) = 0; diff --git a/karbon/render/vqpainter.cpp b/karbon/render/vqpainter.cpp index 51819ae3..2519bf83 100644 --- a/karbon/render/vqpainter.cpp +++ b/karbon/render/vqpainter.cpp @@ -174,11 +174,11 @@ VTQPainter::setPen( const VStroke &stroke ) // caps if( stroke.lineCap() == VStroke::capButt ) - pen.setCapStyle( Qt::FlatCap ); + pen.setCapStyle( TQt::FlatCap ); else if( stroke.lineCap() == VStroke::capRound ) - pen.setCapStyle( Qt::RoundCap ); + pen.setCapStyle( TQt::RoundCap ); else if( stroke.lineCap() == VStroke::capSquare ) - pen.setCapStyle( Qt::SquareCap ); + pen.setCapStyle( TQt::SquareCap ); m_painter->setPen( pen ); } @@ -214,7 +214,7 @@ VTQPainter::setPen( const TQColor &c ) } void -VTQPainter::setPen( Qt::PenStyle style ) +VTQPainter::setPen( TQt::PenStyle style ) { m_painter->setPen( style ); } diff --git a/karbon/render/vqpainter.h b/karbon/render/vqpainter.h index 5cf3ecd1..2ea918f1 100644 --- a/karbon/render/vqpainter.h +++ b/karbon/render/vqpainter.h @@ -62,7 +62,7 @@ public: // pen + brush virtual void setPen( const VStroke & ); virtual void setPen( const TQColor & ); - virtual void setPen( Qt::PenStyle style ); + virtual void setPen( TQt::PenStyle style ); virtual void setBrush( const VFill & ); virtual void setBrush( const TQColor & ); virtual void setBrush( TQt::BrushStyle style ); diff --git a/karbon/tools/vellipsetool.cpp b/karbon/tools/vellipsetool.cpp index 170a51dd..a22e28b7 100644 --- a/karbon/tools/vellipsetool.cpp +++ b/karbon/tools/vellipsetool.cpp @@ -37,7 +37,7 @@ VEllipseOptionsWidget::VEllipseOptionsWidget( KarbonPart *part, TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Insert Ellipse" ), Ok | Cancel ), m_part( part ) { - TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox *group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Type:" ), group ); m_type = new KComboBox( false, group ); m_type->insertItem( i18n( "Full" ), VEllipse::full ); diff --git a/karbon/tools/vpenciltool.cpp b/karbon/tools/vpenciltool.cpp index 1239923e..ea9da2f3 100644 --- a/karbon/tools/vpenciltool.cpp +++ b/karbon/tools/vpenciltool.cpp @@ -64,14 +64,14 @@ VPencilOptionsWidget::VPencilOptionsWidget( KarbonView*view, TQWidget* parent, c m_widgetStack = new TQWidgetStack( vbox ); - TQGroupBox *group1 = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), m_widgetStack ); + TQGroupBox *group1 = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), m_widgetStack ); m_widgetStack->addWidget( group1, 1 ); m_optimizeRaw = new TQCheckBox( i18n( "Optimize" ), group1 ); group1->setInsideMargin( 4 ); group1->setInsideSpacing( 2 ); - TQGroupBox *group2 = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), m_widgetStack ); + TQGroupBox *group2 = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), m_widgetStack ); m_widgetStack->addWidget( group2, 2 ); TQVBox *vbox2 = new TQVBox( group2 ); @@ -83,7 +83,7 @@ VPencilOptionsWidget::VPencilOptionsWidget( KarbonView*view, TQWidget* parent, c group2->setInsideMargin( 4 ); group2->setInsideSpacing( 2 ); - TQGroupBox *group3 = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), m_widgetStack ); + TQGroupBox *group3 = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), m_widgetStack ); m_widgetStack->addWidget( group3, 3 ); m_combineAngle = new KDoubleNumInput( 0.0, 360.0, 0.10, 0.50, 3, group3 ); diff --git a/karbon/tools/vpolygontool.cpp b/karbon/tools/vpolygontool.cpp index de475691..20263c53 100644 --- a/karbon/tools/vpolygontool.cpp +++ b/karbon/tools/vpolygontool.cpp @@ -33,7 +33,7 @@ VPolygonTool::VPolygonOptionsWidget::VPolygonOptionsWidget( KarbonView *view, TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Insert Polygon" ), Ok | Cancel ), m_view(view) { - TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox *group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Radius:" ), group ); m_radius = new KoUnitDoubleSpinBox( group, 0.0, 1000.0, 0.5, 50.0, KoUnit::U_MM ); diff --git a/karbon/tools/vrectangletool.cpp b/karbon/tools/vrectangletool.cpp index 4572cc23..819883cf 100644 --- a/karbon/tools/vrectangletool.cpp +++ b/karbon/tools/vrectangletool.cpp @@ -33,7 +33,7 @@ VRectangleTool::VRectangleOptionsWidget::VRectangleOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Insert Rectangle" ), Ok | Cancel ), m_part( part ) { - TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox *group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); // add width/height-input: m_widthLabel = new TQLabel( i18n( "object width", "Width:" ), group ); m_width = new KoUnitDoubleSpinBox( group, 0.0, 1000.0, 0.5, 100.0, KoUnit::U_MM ); diff --git a/karbon/tools/vroundrecttool.cpp b/karbon/tools/vroundrecttool.cpp index 02f694c6..79d721f6 100644 --- a/karbon/tools/vroundrecttool.cpp +++ b/karbon/tools/vroundrecttool.cpp @@ -34,7 +34,7 @@ VRoundRectTool::VRoundRectOptionsWidget::VRoundRectOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Insert Round Rect" ), Ok | Cancel ), m_part( part ) { - TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox *group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "object width", "Width:" ), group ); KoUnit::Unit unit = KoUnit::U_CM; diff --git a/karbon/tools/vselecttool.cpp b/karbon/tools/vselecttool.cpp index b2c28d66..dae170b0 100644 --- a/karbon/tools/vselecttool.cpp +++ b/karbon/tools/vselecttool.cpp @@ -43,7 +43,7 @@ VSelectOptionsWidget::VSelectOptionsWidget( KarbonPart *part ) : KDialogBase( 0L, "", true, i18n( "Selection" ), Ok | Cancel ), m_part( part ) { - TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Selection Mode" ), this ); + TQButtonGroup *group = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Selection Mode" ), this ); new TQRadioButton( i18n( "Select in current layer" ), group ); new TQRadioButton( i18n( "Select in visible layers" ), group ); diff --git a/karbon/tools/vsinustool.cpp b/karbon/tools/vsinustool.cpp index 12dbe128..3bfdfedc 100644 --- a/karbon/tools/vsinustool.cpp +++ b/karbon/tools/vsinustool.cpp @@ -35,7 +35,7 @@ VSinusTool::VSinusOptionsWidget::VSinusOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Insert Sinus" ), Ok | Cancel ), m_part( part ) { - TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox *group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); // add width/height-input: m_widthLabel = new TQLabel( i18n( "object width", "Width:" ), group ); diff --git a/karbon/tools/vspiraltool.cpp b/karbon/tools/vspiraltool.cpp index c414be41..90b3b470 100644 --- a/karbon/tools/vspiraltool.cpp +++ b/karbon/tools/vspiraltool.cpp @@ -34,7 +34,7 @@ VSpiralTool::VSpiralOptionsWidget::VSpiralOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Insert Spiral" ), Ok | Cancel ), m_part( part ) { - TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox *group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Type:" ), group ); m_type = new KComboBox( false, group ); @@ -51,7 +51,7 @@ VSpiralTool::VSpiralOptionsWidget::VSpiralOptionsWidget( KarbonPart *part, TQWid m_fade = new KDoubleNumInput( group ); m_fade->setRange( 0.0, 1.0, 0.05 ); - new TQLabel( i18n( "Qt::Orientation:" ), group ); + new TQLabel( i18n( "Orientation:" ), group ); m_clockwise = new KComboBox( false, group ); m_clockwise->insertItem( i18n( "Clockwise" ), 0 ); m_clockwise->insertItem( i18n( "Counter Clockwise" ), 1 ); diff --git a/karbon/tools/vstartool.cpp b/karbon/tools/vstartool.cpp index 9a92cd37..7b503ff6 100644 --- a/karbon/tools/vstartool.cpp +++ b/karbon/tools/vstartool.cpp @@ -34,7 +34,7 @@ VStarOptionsWidget::VStarOptionsWidget( KarbonPart *part, TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Insert Star" ), Ok | Cancel ), m_part( part ) { - TQGroupBox *group = new TQGroupBox( 2, Qt::Horizontal, i18n( "Properties" ), this ); + TQGroupBox *group = new TQGroupBox( 2, TQt::Horizontal, i18n( "Properties" ), this ); new TQLabel( i18n( "Type:" ), group ); m_type = new KComboBox( false, group ); m_type->insertItem( i18n( "Star Outline" ), VStar::star_outline ); diff --git a/karbon/vtool.cpp b/karbon/vtool.cpp index 140d6513..a9b29ac8 100644 --- a/karbon/vtool.cpp +++ b/karbon/vtool.cpp @@ -96,7 +96,7 @@ VTool::mouseEvent( TQMouseEvent* mouseEvent, const KoPoint &canvasCoordinate ) m_firstPoint.setX( canvasCoordinate.x() ); m_firstPoint.setY( canvasCoordinate.y() ); - if( mouseEvent->button() == Qt::RightButton ) + if( mouseEvent->button() == TQt::RightButton ) rightMouseButtonPress(); else mouseButtonPress(); @@ -131,7 +131,7 @@ VTool::mouseEvent( TQMouseEvent* mouseEvent, const KoPoint &canvasCoordinate ) m_isDragging = false; } else if( m_mouseButtonIsDown ) // False if canceled. - if( mouseEvent->button() == Qt::RightButton ) + if( mouseEvent->button() == TQt::RightButton ) rightMouseButtonRelease(); else mouseButtonRelease(); diff --git a/karbon/widgets/vcolorslider.cpp b/karbon/widgets/vcolorslider.cpp index 15961cca..53f90786 100644 --- a/karbon/widgets/vcolorslider.cpp +++ b/karbon/widgets/vcolorslider.cpp @@ -56,7 +56,7 @@ void VColorSlider::init() TQHBoxLayout *layout = new TQHBoxLayout( this, 3 ); m_label = new TQLabel( this ); - m_gradientSelect = new KGradientSelector( Qt::Horizontal, this ); + m_gradientSelect = new KGradientSelector( TQt::Horizontal, this ); m_spinBox = new KIntSpinBox( this ); layout->addWidget( m_label ); diff --git a/karbon/widgets/vgradientwidget.cpp b/karbon/widgets/vgradientwidget.cpp index 64cbf373..f76f1fed 100644 --- a/karbon/widgets/vgradientwidget.cpp +++ b/karbon/widgets/vgradientwidget.cpp @@ -195,7 +195,7 @@ void VGradientWidget::mousePressEvent( TQMouseEvent* e ) { // found mid point at position currentPoint = 2 * i + 2; - if( e->button() == Qt::LeftButton ) + if( e->button() == TQt::LeftButton ) setCursor( VCursor::horzMove() ); return; } @@ -204,7 +204,7 @@ void VGradientWidget::mousePressEvent( TQMouseEvent* e ) { // found ramp point at position currentPoint = 2 * i + 1; - if( e->button() == Qt::LeftButton ) + if( e->button() == TQt::LeftButton ) setCursor( VCursor::horzMove() ); return; } @@ -215,7 +215,7 @@ void VGradientWidget::mousePressEvent( TQMouseEvent* e ) void VGradientWidget::mouseReleaseEvent( TQMouseEvent* e ) { - if( e->button() == Qt::RightButton && currentPoint ) + if( e->button() == TQt::RightButton && currentPoint ) { if( m_pntArea.contains( e->x(), e->y() ) && ( currentPoint % 2 == 1 ) ) { @@ -238,7 +238,7 @@ void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e ) if( ! m_pntArea.contains( e->x(), e->y() ) ) return; - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) return; if( currentPoint % 2 == 1 ) @@ -269,7 +269,7 @@ void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e ) void VGradientWidget::mouseMoveEvent( TQMouseEvent* e ) { - if( e->state() & Qt::RightButton ) + if( e->state() & TQt::RightButton ) return; TQPtrList<VColorStop>& colorStops = m_gradient->m_colorStops; diff --git a/karbon/widgets/vreference.cpp b/karbon/widgets/vreference.cpp index c4e96ddf..596c822e 100644 --- a/karbon/widgets/vreference.cpp +++ b/karbon/widgets/vreference.cpp @@ -29,7 +29,7 @@ VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent, name ) { TQVBoxLayout* layout = new TQVBoxLayout( this ); - mButtonGroup = new TQButtonGroup (3,Qt::Vertical, this ); + mButtonGroup = new TQButtonGroup (3,TQt::Vertical, this ); TQRadioButton* radio = new TQRadioButton ( mButtonGroup ); mButtonGroup->insert( radio, TopLeft ); radio = new TQRadioButton ( mButtonGroup ); diff --git a/karbon/widgets/vruler.cpp b/karbon/widgets/vruler.cpp index c0ff0a20..cd97b3da 100644 --- a/karbon/widgets/vruler.cpp +++ b/karbon/widgets/vruler.cpp @@ -40,7 +40,7 @@ const char *VRuler::m_nums[] = { "XX XXXXXX XXX XXX XXXXXX XXX XXXX XXXXX XXXXX XXXX XXX" }; -VRuler::VRuler(Qt::Orientation o, TQWidget *parent, const char *name) : super(parent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums) +VRuler::VRuler(TQt::Orientation o, TQWidget *parent, const char *name) : super(parent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums) { setBackgroundMode(NoBackground); setFrameStyle(Box | Sunken); @@ -53,7 +53,7 @@ VRuler::VRuler(Qt::Orientation o, TQWidget *parent, const char *name) : super(pa m_pixmapBuffer = 0; m_currentPosition = -1; - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { setFixedHeight(RULER_SIZE); initMarker(MARKER_WIDTH, MARKER_HEIGHT); } else { @@ -89,7 +89,7 @@ void VRuler::recalculateSize() m_pixmapBuffer = 0; } - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { w = width(); h = RULER_SIZE; } else { @@ -129,7 +129,7 @@ void VRuler::setZoom(double zoom) void VRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) { if (m_pixmapBuffer) { - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { if (m_currentPosition != -1) repaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT); @@ -151,7 +151,7 @@ void VRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) void VRuler::updateVisibleArea(TQ_INT32 xpos, TQ_INT32 ypos) { - if (m_orientation == Qt::Horizontal) + if (m_orientation == TQt::Horizontal) m_firstVisible = xpos; else m_firstVisible = ypos; @@ -221,7 +221,7 @@ void VRuler::drawRuler() bool s3 = KoUnit::fromUserValue(st3, m_unit) * m_zoom > 3.0; bool s4 = KoUnit::fromUserValue(st4, m_unit) * m_zoom > 3.0; - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { // XXX: This was 7 * 4 -- why? what was the idea about having 30 point intervals? float cx = KoUnit::fromUserValue(100, m_unit) / m_zoom; TQ_INT32 step = tqRound(cx);//((TQ_INT32)(cx / (float)stt) + 1) * stt; @@ -290,7 +290,7 @@ void VRuler::resizeEvent(TQResizeEvent *) void VRuler::show() { - if (m_orientation == Qt::Horizontal) { + if (m_orientation == TQt::Horizontal) { setFixedHeight(RULER_SIZE); initMarker(MARKER_WIDTH, MARKER_HEIGHT); } else { @@ -303,7 +303,7 @@ void VRuler::show() void VRuler::hide() { - if (m_orientation == Qt::Horizontal) + if (m_orientation == TQt::Horizontal) setFixedHeight(1); else setFixedWidth(1); diff --git a/karbon/widgets/vruler.h b/karbon/widgets/vruler.h index 2690a4b2..5fadc54a 100644 --- a/karbon/widgets/vruler.h +++ b/karbon/widgets/vruler.h @@ -36,7 +36,7 @@ class VRuler : public TQFrame { typedef TQFrame super; public: - VRuler(Qt::Orientation, TQWidget *parent = 0, const char *name = 0); + VRuler(TQt::Orientation, TQWidget *parent = 0, const char *name = 0); virtual ~VRuler(); public: @@ -62,7 +62,7 @@ protected: private: KoUnit::Unit m_unit; - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; TQ_INT32 m_firstVisible; TQ_INT32 m_currentPosition; TQPixmap *m_pixmapBuffer; |