diff options
Diffstat (limited to 'kpresenter')
26 files changed, 83 insertions, 83 deletions
diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp index 6b213d7f8..a92d59908 100644 --- a/kpresenter/KPrBackDia.cpp +++ b/kpresenter/KPrBackDia.cpp @@ -153,14 +153,14 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, labXFactor =new TQLabel( i18n( "X-factor:" ), colorTab ); - xfactor = new TQSlider( -200, 200, 1, 100, Qt::Horizontal, colorTab ); + xfactor = new TQSlider( -200, 200, 1, 100, TQt::Horizontal, colorTab ); connect( xfactor, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( updateConfiguration() ) ); xfactor->setValue( _xfactor ); labYFactor=new TQLabel( i18n( "Y-factor:" ), colorTab ); - yfactor = new TQSlider( -200, 200, 1, 100, Qt::Horizontal, colorTab ); + yfactor = new TQSlider( -200, 200, 1, 100, TQt::Horizontal, colorTab ); connect( yfactor, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( updateConfiguration() ) ); yfactor->setValue( _yfactor ); diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp index fa5a4d4d2..f446ed703 100644 --- a/kpresenter/KPrBackground.cpp +++ b/kpresenter/KPrBackground.cpp @@ -281,7 +281,7 @@ void KPrBackGround::loadOasis(KoOasisContext & context ) strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href); - const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); + const KoPictureKey key(filename, TQDateTime::currentDateTime(TQt::UTC)); backPicture.setKey(key); KoStore* store = context.store(); diff --git a/kpresenter/KPrBrush.cpp b/kpresenter/KPrBrush.cpp index 4ef45d0d8..3a6035ea0 100644 --- a/kpresenter/KPrBrush.cpp +++ b/kpresenter/KPrBrush.cpp @@ -226,7 +226,7 @@ void KPrBrush::loadOasisFillStyle( KoOasisContext &context, const char * propert // otherwise the properties dialog for the object won't // display the preview for the gradient. TQBrush tmpBrush; - tmpBrush.setStyle( static_cast<Qt::BrushStyle>( 1 ) ); + tmpBrush.setStyle( static_cast<TQt::BrushStyle>( 1 ) ); setBrush( tmpBrush ); setFillType( FT_GRADIENT ); } diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp index 7b7312d09..d69479e03 100644 --- a/kpresenter/KPrBrushProperty.cpp +++ b/kpresenter/KPrBrushProperty.cpp @@ -139,50 +139,50 @@ TQBrush KPrBrushProperty::getTQBrush() const switch ( m_brushUI->styleCombo->currentItem() ) { case 0: - brush.setStyle( Qt::SolidPattern ); + brush.setStyle( TQt::SolidPattern ); break; case 1: - brush.setStyle( Qt::Dense1Pattern ); + brush.setStyle( TQt::Dense1Pattern ); break; case 2: - brush.setStyle( Qt::Dense2Pattern ); + brush.setStyle( TQt::Dense2Pattern ); break; case 3: - brush.setStyle( Qt::Dense3Pattern ); + brush.setStyle( TQt::Dense3Pattern ); break; case 4: - brush.setStyle( Qt::Dense4Pattern ); + brush.setStyle( TQt::Dense4Pattern ); break; case 5: - brush.setStyle( Qt::Dense5Pattern ); + brush.setStyle( TQt::Dense5Pattern ); break; case 6: - brush.setStyle( Qt::Dense6Pattern ); + brush.setStyle( TQt::Dense6Pattern ); break; case 7: - brush.setStyle( Qt::Dense7Pattern ); + brush.setStyle( TQt::Dense7Pattern ); break; case 8: - brush.setStyle( Qt::HorPattern ); + brush.setStyle( TQt::HorPattern ); break; case 9: - brush.setStyle( Qt::VerPattern ); + brush.setStyle( TQt::VerPattern ); break; case 10: - brush.setStyle( Qt::CrossPattern ); + brush.setStyle( TQt::CrossPattern ); break; case 11: - brush.setStyle( Qt::BDiagPattern ); + brush.setStyle( TQt::BDiagPattern ); break; case 12: - brush.setStyle( Qt::FDiagPattern ); + brush.setStyle( TQt::FDiagPattern ); break; case 13: - brush.setStyle( Qt::DiagCrossPattern ); + brush.setStyle( TQt::DiagCrossPattern ); break; } if( m_typeCombo->currentItem() == 2) - brush.setStyle( Qt::NoBrush ); + brush.setStyle( TQt::NoBrush ); brush.setColor( m_brushUI->colorChooser->color() ); diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 7903e2b76..04a81ae32 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -698,13 +698,13 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) m_currentTextObjectView->mousePressEvent(e, m_view->zoomHandler()->ptToLayoutUnitPix( pos ) ); // in LU pixels mousePressed = true; m_view->enableAutoScroll(); - if(e->button() == Qt::RightButton) + if(e->button() == TQt::RightButton) { m_currentTextObjectView->showPopup( m_view, TQCursor::pos(), m_view->actionList() ); m_view->disableAutoScroll(); mousePressed=false; } - else if( e->button() == Qt::MidButton ) + else if( e->button() == TQt::MidButton ) { TQApplication::clipboard()->setSelectionMode( true ); m_currentTextObjectView->paste(); @@ -722,7 +722,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) exitEditMode(); if ( editMode ) { - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { mousePressed = true; m_view->enableAutoScroll(); @@ -978,7 +978,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) } } - if ( e->button() == Qt::RightButton && ( toolEditMode == INS_POLYLINE || toolEditMode == INS_CLOSED_POLYLINE ) + if ( e->button() == TQt::RightButton && ( toolEditMode == INS_POLYLINE || toolEditMode == INS_CLOSED_POLYLINE ) && !m_pointArray.isNull() && m_drawPolyline ) { if( m_indexPointArray > 1) { @@ -1026,7 +1026,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) return; } - if ( e->button() == Qt::RightButton && ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_QUADRICBEZIERCURVE + if ( e->button() == TQt::RightButton && ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_QUADRICBEZIERCURVE || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || toolEditMode == INS_CLOSED_QUADRICBEZIERCURVE ) && !m_pointArray.isNull() && m_drawCubicBezierCurve ) { if ( m_drawLineWithCubicBezierCurve ) { @@ -1047,7 +1047,7 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) return; } - if ( e->button() == Qt::RightButton && toolEditMode == TEM_MOUSE ) { + if ( e->button() == TQt::RightButton && toolEditMode == TEM_MOUSE ) { KPrObject * obj = getObjectAt( docPoint ); if ( obj ) { @@ -1070,18 +1070,18 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) modType = MT_NONE; } - else if( e->button() == Qt::RightButton && toolEditMode == TEM_ZOOM ) { + else if( e->button() == TQt::RightButton && toolEditMode == TEM_ZOOM ) { TQPoint pnt = TQCursor::pos(); mousePressed = false; m_view->disableAutoScroll(); m_view->openPopupMenuZoom( pnt ); } - else if( e->button() == Qt::RightButton && toolEditMode != TEM_MOUSE ) { + else if( e->button() == TQt::RightButton && toolEditMode != TEM_MOUSE ) { //deactivate tools when you click on right button setToolEditMode( TEM_MOUSE ); } } else { - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { if ( m_drawMode ) { setCursor( KPrUtils::penCursor() ); m_drawLineInDrawMode = true; @@ -1091,9 +1091,9 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) } else m_view->screenNext(); - } else if ( e->button() == Qt::MidButton ) + } else if ( e->button() == TQt::MidButton ) m_view->screenPrev(); - else if ( e->button() == Qt::RightButton ) { + else if ( e->button() == TQt::RightButton ) { if ( !m_drawMode && !spManualSwitch() ) { finishObjectEffects(); @@ -1151,7 +1151,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e ) return; } - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; if ( m_drawMode ) { @@ -2113,7 +2113,7 @@ void KPrCanvas::keyPressEvent( TQKeyEvent *e ) m_gl.repaintAfterSnapping(); } // undo snapping for move by mouse - if ( e->state() & Qt::LeftButton && m_isMoving ) + if ( e->state() & TQt::LeftButton && m_isMoving ) { moveObjectsByMouse( m_origMousePos, e->state() & AltButton || e->state() & ControlButton ); } diff --git a/kpresenter/KPrClosedLineObject.cpp b/kpresenter/KPrClosedLineObject.cpp index 58d76275a..e2664f1c3 100644 --- a/kpresenter/KPrClosedLineObject.cpp +++ b/kpresenter/KPrClosedLineObject.cpp @@ -54,7 +54,7 @@ KPrClosedLineObject::KPrClosedLineObject( const KoPointArray &_points, const KoS } KPrClosedLineObject::KPrClosedLineObject( const KPrPointObject &object ) -: KPr2DObject( object.getPen(), Qt::NoBrush, FT_BRUSH, TQColor(), TQColor(), BCT_PLAIN, false, 0, 0 ) +: KPr2DObject( object.getPen(), TQt::NoBrush, FT_BRUSH, TQColor(), TQColor(), BCT_PLAIN, false, 0, 0 ) { ext = object.getSize(); orig = object.getOrig(); diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index ba1ae4497..b3dbf4952 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -418,7 +418,7 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, ch m_pView=_view; config = KPrFactory::global()->config(); - TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Misc"), this, "GroupBox" ); + TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, TQt::Vertical, i18n("Misc"), this, "GroupBox" ); tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); TQGridLayout *grid = new TQGridLayout( tmpTQGroupBox->layout(), 8, 1 ); @@ -468,7 +468,7 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, ch box->addWidget(tmpTQGroupBox); - tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Grid"), this, "GroupBox" ); + tmpTQGroupBox = new TQGroupBox( 0, TQt::Vertical, i18n("Grid"), this, "GroupBox" ); tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); grid = new TQGridLayout( tmpTQGroupBox->layout(), 8, 1 ); @@ -904,7 +904,7 @@ void KPrConfigureToolsPage::apply() void KPrConfigureToolsPage::slotDefault() { - KoPenCmd::Pen pen( KoPen(black, 1.0, Qt::SolidLine), L_NORMAL, L_NORMAL ); + KoPenCmd::Pen pen( KoPen(black, 1.0, TQt::SolidLine), L_NORMAL, L_NORMAL ); m_confPenDia->setPen( pen ); m_pView->getActionPenColor()->setCurrentColor( pen.pen.color() ); diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index bcab0f2e2..913cff97d 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -4520,9 +4520,9 @@ void KPrDocument::verticalGuideLines( const TQValueList<double> &lines ) } -void KPrDocument::addGuideLine( Qt::Orientation o, double pos ) +void KPrDocument::addGuideLine( TQt::Orientation o, double pos ) { - if ( o == Qt::Horizontal ) + if ( o == TQt::Horizontal ) { m_hGuideLines.append( pos ); } diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h index cfba6e6fc..68a17fe15 100644 --- a/kpresenter/KPrDocument.h +++ b/kpresenter/KPrDocument.h @@ -435,7 +435,7 @@ class KPrDocument : public KoDocument * @param p the orientation of the guide line * @param p the position of the guide line */ - void addGuideLine( Qt::Orientation o, double pos ); + void addGuideLine( TQt::Orientation o, double pos ); void updateGuideLineButton(); diff --git a/kpresenter/KPrDocumentIface.cpp b/kpresenter/KPrDocumentIface.cpp index 20f924032..c2c34b5d0 100644 --- a/kpresenter/KPrDocumentIface.cpp +++ b/kpresenter/KPrDocumentIface.cpp @@ -436,7 +436,7 @@ void KPrDocumentIface::setShowGuideLines( bool b ) void KPrDocumentIface::addGuideLine( bool horizontal, double pos ) { - doc->addGuideLine( horizontal ? Qt::Horizontal: Qt::Vertical, pos ); + doc->addGuideLine( horizontal ? TQt::Horizontal: TQt::Vertical, pos ); doc->repaint( false ); } diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp index ddba51980..ec1579ddc 100644 --- a/kpresenter/KPrEffectDia.cpp +++ b/kpresenter/KPrEffectDia.cpp @@ -60,7 +60,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< setMainWidget(page); topLayout = new TQVBoxLayout( page, 0, spacingHint() ); - TQGroupBox *grp1 = new TQGroupBox(0, Qt::Vertical, i18n( "Appear" ), page ); + TQGroupBox *grp1 = new TQGroupBox(0, TQt::Vertical, i18n( "Appear" ), page ); grp1->layout()->setSpacing(KDialog::spacingHint()); grp1->layout()->setMargin(KDialog::marginHint()); topLayout->addWidget(grp1); @@ -195,7 +195,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< disappear->setChecked( obj->getDisappear() ); topLayout->addWidget(disappear); - TQGroupBox *grp2 = new TQGroupBox(0, Qt::Vertical, i18n( "Disappear" ), page); + TQGroupBox *grp2 = new TQGroupBox(0, TQt::Vertical, i18n( "Disappear" ), page); grp2->layout()->setSpacing(KDialog::spacingHint()); grp2->layout()->setMargin(KDialog::marginHint()); topLayout->addWidget(grp2); diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp index 557b87c48..40343fb18 100644 --- a/kpresenter/KPrMSPresentationSetup.cpp +++ b/kpresenter/KPrMSPresentationSetup.cpp @@ -340,7 +340,7 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie topLayout->addLayout( titleLayout ); topLayout->addWidget( moreBox ); - colourGroup = new TQGroupBox( 2, Qt::Vertical, + colourGroup = new TQGroupBox( 2, TQt::Vertical, i18n("Preliminary Slides"), this , "colourBox" ); TQWhatsThis::add( colourGroup, diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp index e545ede5b..0a0dd2c6e 100644 --- a/kpresenter/KPrMoveHelpLineDia.cpp +++ b/kpresenter/KPrMoveHelpLineDia.cpp @@ -71,7 +71,7 @@ KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *parent, const KoRect & _pa m_doc=_doc; setCaption( i18n("Add New Help Line") ); TQVBox *page = makeVBoxMainWidget(); - TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal,i18n("Orientation"), page ); + TQButtonGroup *group = new TQButtonGroup( 1, TQt::Horizontal,i18n("Orientation"), page ); group->setRadioButtonExclusive( TRUE ); group->layout(); m_rbHoriz = new TQRadioButton( i18n("Horizontal"), group ); diff --git a/kpresenter/KPrObject.cpp b/kpresenter/KPrObject.cpp index bb7ef63fb..f310552dc 100644 --- a/kpresenter/KPrObject.cpp +++ b/kpresenter/KPrObject.cpp @@ -1522,7 +1522,7 @@ KoPen KPrObject::toPen(const TQDomElement &element) const { KoPen pen; pen.setColor(retrieveColor(element)); if(element.hasAttribute(attrStyle)) - pen.setStyle(static_cast<Qt::PenStyle>(element.attribute(attrStyle).toInt())); + pen.setStyle(static_cast<TQt::PenStyle>(element.attribute(attrStyle).toInt())); if(element.hasAttribute(attrWidth)) pen.setPointWidth(element.attribute(attrWidth).toDouble()); return pen; @@ -1541,7 +1541,7 @@ TQBrush KPrObject::toBrush(const TQDomElement &element) const { TQBrush brush; brush.setColor(retrieveColor(element)); if(element.hasAttribute(attrStyle)) - brush.setStyle(static_cast<Qt::BrushStyle>(element.attribute(attrStyle).toInt())); + brush.setStyle(static_cast<TQt::BrushStyle>(element.attribute(attrStyle).toInt())); return brush; } @@ -1845,9 +1845,9 @@ void KPrShadowObject::loadOasis(const TQDomElement &element, KoOasisContext & co if ( styleStack.hasAttributeNS( KoXmlNS::draw, "stroke" )) { if ( styleStack.attributeNS( KoXmlNS::draw, "stroke" ) == "none" ) - pen.setStyle(Qt::NoPen ); + pen.setStyle(TQt::NoPen ); else if ( styleStack.attributeNS( KoXmlNS::draw, "stroke" ) == "solid" ) - pen.setStyle(Qt::SolidLine ); + pen.setStyle(TQt::SolidLine ); else if ( styleStack.attributeNS( KoXmlNS::draw, "stroke" ) == "dash" ) { TQString style = styleStack.attributeNS( KoXmlNS::draw, "stroke-dash" ); @@ -1867,25 +1867,25 @@ void KPrShadowObject::loadOasis(const TQDomElement &element, KoOasisContext & co draw->attributeNS( KoXmlNS::draw, "dots1-length", TQString() )=="0.508cm" && draw->attributeNS( KoXmlNS::draw, "dots2-length", TQString() )=="0.508cm" && draw->attributeNS( KoXmlNS::draw, "distance", TQString() )=="0.508cm" ) - pen.setStyle(Qt::DashLine ); + pen.setStyle(TQt::DashLine ); else if ( draw->attributeNS( KoXmlNS::draw, "dots1", TQString() )=="1" && draw->attributeNS( KoXmlNS::draw, "distance", TQString() )=="0.257cm" ) - pen.setStyle(Qt::DotLine ); + pen.setStyle(TQt::DotLine ); else if ( draw->attributeNS( KoXmlNS::draw, "dots1", TQString() )=="1" && draw->attributeNS( KoXmlNS::draw, "dots2", TQString() )=="1" && draw->attributeNS( KoXmlNS::draw, "dots1-length", TQString() )=="0.051cm" && draw->attributeNS( KoXmlNS::draw, "dots2-length", TQString() )=="0.254cm" && draw->attributeNS( KoXmlNS::draw, "distance", TQString() )=="0.127cm" ) - pen.setStyle(Qt::DashDotLine ); + pen.setStyle(TQt::DashDotLine ); else if ( draw->attributeNS( KoXmlNS::draw, "dots1", TQString() )=="2" && draw->attributeNS( KoXmlNS::draw, "dots2", TQString() )=="1" && draw->attributeNS( KoXmlNS::draw, "dots2-length", TQString() )=="0.203cm" && draw->attributeNS( KoXmlNS::draw, "distance", TQString() )=="0.203cm" ) - pen.setStyle(Qt::DashDotDotLine ); + pen.setStyle(TQt::DashDotDotLine ); else { kdDebug()<<" stroke style undefined \n"; - pen.setStyle(Qt::SolidLine ); + pen.setStyle(TQt::SolidLine ); } } diff --git a/kpresenter/KPrObjectProperties.cpp b/kpresenter/KPrObjectProperties.cpp index b27e24c6e..40a02e329 100644 --- a/kpresenter/KPrObjectProperties.cpp +++ b/kpresenter/KPrObjectProperties.cpp @@ -33,7 +33,7 @@ KPrObjectProperties::KPrObjectProperties( const TQPtrList<KPrObject> &objects ) : m_objects( objects ) , m_flags( 0 ) -, m_pen( KoPen( TQt::black, 1.0, Qt::SolidLine ), L_NORMAL, L_NORMAL ) +, m_pen( KoPen( TQt::black, 1.0, TQt::SolidLine ), L_NORMAL, L_NORMAL ) , m_protectContent( STATE_UNDEF ) { getProperties( m_objects ); diff --git a/kpresenter/KPrPBPreview.cpp b/kpresenter/KPrPBPreview.cpp index cec920e03..dfef8da94 100644 --- a/kpresenter/KPrPBPreview.cpp +++ b/kpresenter/KPrPBPreview.cpp @@ -30,7 +30,7 @@ KPrPBPreview::KPrPBPreview( TQWidget* parent, const char* name, PaintType _paint //FIXME zoom _zoomHandler=new KoTextZoomHandler(); paintType = _paintType; - pen = KoPen( black, 1, Qt::SolidLine ); + pen = KoPen( black, 1, TQt::SolidLine ); brush = TQBrush( white, SolidPattern ); gradient = new KPrGradient( TQt::red, TQt::green, BCT_GHORZ, false, 100, 100 ); savedGradient = gradient; diff --git a/kpresenter/KPrPartObject.cpp b/kpresenter/KPrPartObject.cpp index da2ae14db..3311ff12a 100644 --- a/kpresenter/KPrPartObject.cpp +++ b/kpresenter/KPrPartObject.cpp @@ -35,7 +35,7 @@ KPrPartObject::KPrPartObject( KPrChild *_child ) : KPr2DObject() { child = _child; - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); _enableDrawing = true; } diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp index a8a2f6539..032c6734d 100644 --- a/kpresenter/KPrPenStyleWidget.cpp +++ b/kpresenter/KPrPenStyleWidget.cpp @@ -152,22 +152,22 @@ KoPen KPrPenStyleWidget::getKPPen() const switch ( m_ui->styleCombo->currentItem() ) { case 0: - pen.setStyle( Qt::NoPen ); + pen.setStyle( TQt::NoPen ); break; case 1: - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); break; case 2: - pen.setStyle( Qt::DashLine ); + pen.setStyle( TQt::DashLine ); break; case 3: - pen.setStyle( Qt::DotLine ); + pen.setStyle( TQt::DotLine ); break; case 4: - pen.setStyle( Qt::DashDotLine ); + pen.setStyle( TQt::DashDotLine ); break; case 5: - pen.setStyle( Qt::DashDotDotLine ); + pen.setStyle( TQt::DashDotDotLine ); break; } diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp index 1a7b3079d..314ab03ff 100644 --- a/kpresenter/KPrPgConfDia.cpp +++ b/kpresenter/KPrPgConfDia.cpp @@ -126,7 +126,7 @@ void KPrPgConfDia::setupPageGeneral() // presentation pen (color and width) - TQGroupBox* penGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("Presentation Pen") , generalPage ); + TQGroupBox* penGroup = new TQGroupBox( 2, TQt::Horizontal, i18n("Presentation Pen") , generalPage ); generalLayout->addWidget( penGroup ); TQWhatsThis::add( penGroup, i18n("<p>This part of the dialog allows you to configure the " "<em>drawing mode</em>, which allows you to add additional " diff --git a/kpresenter/KPrPixmapObject.cpp b/kpresenter/KPrPixmapObject.cpp index f4578755d..09dcb7895 100644 --- a/kpresenter/KPrPixmapObject.cpp +++ b/kpresenter/KPrPixmapObject.cpp @@ -52,7 +52,7 @@ KPrPixmapObject::KPrPixmapObject( KoPictureCollection *_imageCollection ) : KPr2DObject() { imageCollection = _imageCollection; - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; @@ -73,7 +73,7 @@ KPrPixmapObject::KPrPixmapObject( KoPictureCollection *_imageCollection, const K imageCollection = _imageCollection; ext = KoSize(); // invalid size means unset - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; @@ -364,7 +364,7 @@ void KPrPixmapObject::loadOasis(const TQDomElement &element, KoOasisContext & co strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href/*.mid(1)*/); - const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); + const KoPictureKey key(filename, TQDateTime::currentDateTime(TQt::UTC)); image.setKey(key); KoStore* store = context.store(); diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp index 13340d318..8e845dc7d 100644 --- a/kpresenter/KPrRotationDialogImpl.cpp +++ b/kpresenter/KPrRotationDialogImpl.cpp @@ -130,7 +130,7 @@ KPrCircleToggle::KPrCircleToggle( TQWidget *parent, const TQString &image, int i } void KPrCircleToggle::mousePressEvent ( TQMouseEvent * e ) { - if(e->button() != Qt:: LeftButton) + if(e->button() != TQt:: LeftButton) return; setChecked(!m_selected); } diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 461015faf..874e781bc 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -476,7 +476,7 @@ void KPrTextObject::drawText( TQPainter* _painter, KoTextZoomHandler *zoomHandle _painter->save(); _painter->translate( m_doc->zoomHandler()->zoomItX( bLeft()), m_doc->zoomHandler()->zoomItY( bTop()+alignVertical)); if ( !editingTextObj || (_painter->device() && _painter->device()->devType() == TQInternal::Printer)) - cg.setBrush( TQColorGroup::Base, Qt::NoBrush ); + cg.setBrush( TQColorGroup::Base, TQt::NoBrush ); else cg.setColor( TQColorGroup::Base, m_doc->txtBackCol() ); @@ -2570,7 +2570,7 @@ void KPrTextObject::saveParagraph( TQDomDocument& doc,KoTextParag * parag,TQDomE KoPen KPrTextObject::defaultPen() const { - return KoPen( TQt::black, 1.0, Qt::NoPen ); + return KoPen( TQt::black, 1.0, TQt::NoPen ); } TQPoint KPrTextObject::viewToInternal( const TQPoint & pos, KPrCanvas* canvas ) const diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 59da1ddde..dc7464323 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -292,7 +292,7 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) presDurationDia = 0; v_ruler = 0; h_ruler = 0; - pen = KoPen( black, 1.0, Qt::SolidLine ); + pen = KoPen( black, 1.0, TQt::SolidLine ); brush = TQBrush( white, SolidPattern ); lineBegin = L_NORMAL; lineEnd = L_NORMAL; @@ -1439,7 +1439,7 @@ void KPrView::extraUnGroup() void KPrView::extraPenStyle( int newStyle ) { m_canvas->setToolEditMode( TEM_MOUSE ); - setExtraPenStyle(static_cast<Qt::PenStyle>(newStyle)); + setExtraPenStyle(static_cast<TQt::PenStyle>(newStyle)); } void KPrView::extraPenWidth( double newWidth ) @@ -2106,7 +2106,7 @@ void KPrView::setExtraLineEnd(LineEnd le) lineEnd = le; } -void KPrView::setExtraPenStyle( Qt::PenStyle style ) +void KPrView::setExtraPenStyle( TQt::PenStyle style ) { KoPen tmpPen; tmpPen.setStyle( style ); @@ -2171,7 +2171,7 @@ void KPrView::createGUI() splitter->setResizeMode( sidebar, TQSplitter::KeepSize ); } - TQSplitter *splitterVertical = new TQSplitter( Qt::Vertical, splitter ); + TQSplitter *splitterVertical = new TQSplitter( TQt::Vertical, splitter ); // setup page pageBase = new PageBase( splitterVertical, this ); @@ -3744,8 +3744,8 @@ void KPrView::setupPopupMenus() void KPrView::setupScrollbars() { - vert = new TQScrollBar( Qt::Vertical, pageBase ); - horz = new TQScrollBar( Qt::Horizontal, pageBase ); + vert = new TQScrollBar( TQt::Vertical, pageBase ); + horz = new TQScrollBar( TQt::Horizontal, pageBase ); vert->show(); horz->show(); TQObject::connect( vert, TQT_SIGNAL( valueChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( scrollV( int ) ) ); @@ -3770,12 +3770,12 @@ void KPrView::setupRulers() { tabChooser = new KoTabChooser( pageBase, KoTabChooser::TAB_ALL ); tabChooser->setReadWrite(kPresenterDoc()->isReadWrite()); - h_ruler = new KoRuler( pageBase, m_canvas, Qt::Horizontal, kPresenterDoc()->pageLayout(), + h_ruler = new KoRuler( pageBase, m_canvas, TQt::Horizontal, kPresenterDoc()->pageLayout(), KoRuler::F_INDENTS | KoRuler::F_TABS, kPresenterDoc()->unit(), tabChooser ); h_ruler->changeFlags(0); h_ruler->setReadWrite(kPresenterDoc()->isReadWrite()); - v_ruler = new KoRuler( pageBase, m_canvas, Qt::Vertical, kPresenterDoc()->pageLayout(), 0, kPresenterDoc()->unit() ); + v_ruler = new KoRuler( pageBase, m_canvas, TQt::Vertical, kPresenterDoc()->pageLayout(), 0, kPresenterDoc()->unit() ); v_ruler->setReadWrite(kPresenterDoc()->isReadWrite()); int hSpace = v_ruler->minimumSizeHint().width(); diff --git a/kpresenter/KPrView.h b/kpresenter/KPrView.h index 456e2f13b..d17bf9bae 100644 --- a/kpresenter/KPrView.h +++ b/kpresenter/KPrView.h @@ -713,7 +713,7 @@ protected slots: void extraLineEndDoubleLineArrow(); void setExtraLineEnd(LineEnd le); - void setExtraPenStyle( Qt::PenStyle style ); + void setExtraPenStyle( TQt::PenStyle style ); void setExtraPenWidth( double width ); /** diff --git a/kpresenter/dtd/kpresenter.dtd b/kpresenter/dtd/kpresenter.dtd index c5403c3fe..158f79333 100644 --- a/kpresenter/dtd/kpresenter.dtd +++ b/kpresenter/dtd/kpresenter.dtd @@ -417,9 +417,9 @@ TODO: finish documentation for export filters. align Counter alignment. Possible values include: - int(Qt::AlignAuto), //left for LTR text and right for RTL text - int(Qt::AlignLeft), - int(Qt::AlignRight). + int(TQt::AlignAuto), //left for LTR text and right for RTL text + int(TQt::AlignLeft), + int(TQt::AlignRight). --> <!ELEMENT COUNTER EMPTY> diff --git a/kpresenter/kprconverter.pl b/kpresenter/kprconverter.pl index 524b3d8df..b5de1cfbc 100644 --- a/kpresenter/kprconverter.pl +++ b/kpresenter/kprconverter.pl @@ -41,8 +41,8 @@ while (<INPUT>) $insideParag=1; s/<PARAGRAPH /<P /; # In the old format we had horzAlign="[0|1|2]" 0=left, 1=center, 2=right - # In the new one it's align="..." and uses the Qt::AlignmentFlags enums. - # Qt::AlignLeft=1, AlignRight=2, AlignHCenter=4 + # In the new one it's align="..." and uses the TQt::AlignmentFlags enums. + # TQt::AlignLeft=1, AlignRight=2, AlignHCenter=4 $alignment=$1 if(/horzAlign=(\"[0-2]+\")/); $alignment =~ tr/01/14/; s/horzAlign=\"[0-2]+\"/align=$alignment/; |