diff options
Diffstat (limited to 'kpresenter')
199 files changed, 8088 insertions, 8022 deletions
diff --git a/kpresenter/KPrAutoFormObjectIface.cpp b/kpresenter/KPrAutoFormObjectIface.cpp index ee9500b0..111a88e4 100644 --- a/kpresenter/KPrAutoFormObjectIface.cpp +++ b/kpresenter/KPrAutoFormObjectIface.cpp @@ -33,22 +33,22 @@ KPrAutoFormObjectIface::KPrAutoFormObjectIface( KPrAutoformObject *_obj ) obj = _obj; } -QString KPrAutoFormObjectIface::fileName() const +TQString KPrAutoFormObjectIface::fileName() const { return obj->getFileName(); } -void KPrAutoFormObjectIface::setFileName( const QString &_filename ) +void KPrAutoFormObjectIface::setFileName( const TQString &_filename ) { obj->setFileName(_filename); } -void KPrAutoFormObjectIface::setLineBegin( const QString & type) +void KPrAutoFormObjectIface::setLineBegin( const TQString & type) { obj->setLineBegin(lineEndBeginFromString( type )); } -void KPrAutoFormObjectIface::setLineEnd( const QString & type) +void KPrAutoFormObjectIface::setLineEnd( const TQString & type) { obj->setLineEnd(lineEndBeginFromString( type )); } diff --git a/kpresenter/KPrAutoFormObjectIface.h b/kpresenter/KPrAutoFormObjectIface.h index 685b0c5f..d16125ce 100644 --- a/kpresenter/KPrAutoFormObjectIface.h +++ b/kpresenter/KPrAutoFormObjectIface.h @@ -24,7 +24,7 @@ #include <dcopobject.h> #include <dcopref.h> #include "KPrObject2DIface.h" -#include <qstring.h> +#include <tqstring.h> class KPrAutoformObject; @@ -35,11 +35,11 @@ public: KPrAutoFormObjectIface( KPrAutoformObject *obj_ ); k_dcop: - QString fileName() const; - void setFileName( const QString &_filename ); + TQString fileName() const; + void setFileName( const TQString &_filename ); - virtual void setLineBegin( const QString & ); - virtual void setLineEnd( const QString & ); + virtual void setLineBegin( const TQString & ); + virtual void setLineEnd( const TQString & ); private: KPrAutoformObject *obj; diff --git a/kpresenter/KPrAutoformObject.cpp b/kpresenter/KPrAutoformObject.cpp index c5d7028d..774f9f3e 100644 --- a/kpresenter/KPrAutoformObject.cpp +++ b/kpresenter/KPrAutoformObject.cpp @@ -24,13 +24,13 @@ #include "KPrUtils.h" #include "KPrGradient.h" -#include <qbitmap.h> -#include <qpointarray.h> -#include <qptrlist.h> -#include <qregion.h> -#include <qdom.h> -#include <qpainter.h> -#include <qwmatrix.h> +#include <tqbitmap.h> +#include <tqpointarray.h> +#include <tqptrlist.h> +#include <tqregion.h> +#include <tqdom.h> +#include <tqpainter.h> +#include <tqwmatrix.h> #include <kstandarddirs.h> #include <kdebug.h> #include <KoTextZoomHandler.h> @@ -44,10 +44,10 @@ KPrAutoformObject::KPrAutoformObject() { } -KPrAutoformObject::KPrAutoformObject( const KoPen & _pen, const QBrush &_brush, const QString & _filename, +KPrAutoformObject::KPrAutoformObject( const KoPen & _pen, const TQBrush &_brush, const TQString & _filename, LineEnd _lineBegin, LineEnd _lineEnd, - FillType _fillType, const QColor &_gColor1, - const QColor &_gColor2, BCType _gType, + FillType _fillType, const TQColor &_gColor1, + const TQColor &_gColor2, BCType _gType, bool _unbalanced, int _xfactor, int _yfactor) : KPr2DObject( _pen, _brush, _fillType, _gColor1, _gColor2, _gType, _unbalanced, _xfactor, _yfactor ) , KPrStartEndLine( _lineBegin, _lineEnd ) @@ -68,7 +68,7 @@ DCOPObject* KPrAutoformObject::dcopObject() return dcop; } -void KPrAutoformObject::setFileName( const QString & _filename ) +void KPrAutoformObject::setFileName( const TQString & _filename ) { filename = _filename; atfInterp.load( filename ); @@ -78,12 +78,12 @@ void KPrAutoformObject::setFileName( const QString & _filename ) bool KPrAutoformObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const { kdDebug(33001) << "bool KPrAutoformObject::saveOasisObjectAttributes()" << endl; - QSize size( int( ext.width() * 100 ), int( ext.height() * 100 ) ); + TQSize size( int( ext.width() * 100 ), int( ext.height() * 100 ) ); - sc.xmlWriter.addAttribute( "svg:viewBox", QString( "0 0 %1 %2" ).arg( size.width() ) - .arg( size.height() ) ); + sc.xmlWriter.addAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( size.width() ) + .tqarg( size.height() ) ); - QPointArray points = const_cast<ATFInterpreter &>( atfInterp ).getPointArray( size.width(), size.height() ); + TQPointArray points = const_cast<ATFInterpreter &>( atfInterp ).getPointArray( size.width(), size.height() ); unsigned int pointCount = points.size(); unsigned int pos = 0; @@ -92,15 +92,15 @@ bool KPrAutoformObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) cons if ( closed ) --pointCount; - QString d; - d += QString( "M%1 %2" ).arg( points.at(pos).x() ) - .arg( points.at(pos).y() ); + TQString d; + d += TQString( "M%1 %2" ).tqarg( points.at(pos).x() ) + .tqarg( points.at(pos).y() ); ++pos; while ( pos < pointCount ) { - d += QString( "L%1 %2" ).arg( points.at( pos ).x() ) - .arg( points.at( pos ).y() ); + d += TQString( "L%1 %2" ).tqarg( points.at( pos ).x() ) + .tqarg( points.at( pos ).y() ); ++pos; } @@ -117,7 +117,7 @@ void KPrAutoformObject::fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mai kdDebug(33001) << "KPr2DObject::fillStyle" << endl; KPrShadowObject::fillStyle( styleObjectAuto, mainStyles ); - QPointArray points = const_cast<ATFInterpreter &>( atfInterp ).getPointArray( int( ext.width() * 100 ), + TQPointArray points = const_cast<ATFInterpreter &>( atfInterp ).getPointArray( int( ext.width() * 100 ), int( ext.height() * 100 ) ); // if it is a closed object save the background @@ -136,34 +136,34 @@ const char * KPrAutoformObject::getOasisElementName() const return "draw:path"; } -QDomDocumentFragment KPrAutoformObject::save( QDomDocument& doc, double offset ) +TQDomDocumentFragment KPrAutoformObject::save( TQDomDocument& doc, double offset ) { - QDomDocumentFragment fragment=KPr2DObject::save(doc, offset); + TQDomDocumentFragment fragment=KPr2DObject::save(doc, offset); KPrStartEndLine::save( fragment, doc ); // The filename contains the absolute path to the autoform. This is // bad, so we simply remove everything but the last dir and the name. // e.g. /my/local/path/to/kpresenter/Arrow/.source/Arrow1.atf -> Arrow/.source/Arrow1.atf - QStringList afDirs = KPrFactory::global()->dirs()->resourceDirs("autoforms"); - QValueList<QString>::ConstIterator it=afDirs.begin(); - QString str; + TQStringList afDirs = KPrFactory::global()->dirs()->resourceDirs("autoforms"); + TQValueList<TQString>::ConstIterator it=afDirs.begin(); + TQString str; for( ; it!=afDirs.end(); ++it) { if(filename.startsWith(*it)) { str=filename.mid((*it).length()); break; } } - QDomElement elem=doc.createElement("FILENAME"); + TQDomElement elem=doc.createElement("FILENAME"); elem.setAttribute("value", str); fragment.appendChild(elem); return fragment; } -double KPrAutoformObject::load(const QDomElement &element) +double KPrAutoformObject::load(const TQDomElement &element) { double offset=KPr2DObject::load(element); KPrStartEndLine::load( element ); - QDomElement e=element.namedItem("FILENAME").toElement(); + TQDomElement e=element.namedItem("FILENAME").toElement(); if(!e.isNull()) { if(e.hasAttribute("value")) filename=e.attribute("value"); @@ -174,15 +174,15 @@ double KPrAutoformObject::load(const QDomElement &element) if(filename[0]=='/') { kdDebug(33001) << "rubbish ahead! cleaning up..." << endl; // remove the leading absolute path (i.e. to create Arrow/Arrow1.atf) - filename=filename.mid(filename.findRev('/', filename.findRev('/')-1)+1); + filename=filename.mid(filename.tqfindRev('/', filename.tqfindRev('/')-1)+1); } // okay... we changed the file format again and now the autoforms // are stored in .../kpresenter/autoforms/.source/foo.atf (note: we didn't have .source // before. Therefore we have to add this dir if it's not already there to make it // work with old files - if(filename.find(".source")==-1) { + if(filename.tqfind(".source")==-1) { // okay, old file -- add the .source dir - filename=filename.insert(filename.find('/'), "/.source"); + filename=filename.insert(filename.tqfind('/'), "/.source"); } filename = locate("autoforms", filename, KPrFactory::global()); atfInterp.load( filename ); @@ -190,28 +190,28 @@ double KPrAutoformObject::load(const QDomElement &element) return offset; } -void KPrAutoformObject::paint( QPainter* _painter, KoTextZoomHandler *_zoomHandler, +void KPrAutoformObject::paint( TQPainter* _painter, KoTextZoomHandler *_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour ) { unsigned int pw = 0, pwOrig = 0, px, py; - QPen pen2; - QSize size( _zoomHandler->zoomSize( ext ) ); + TQPen pen2; + TQSize size( _zoomHandler->zoomSize( ext ) ); if ( drawContour ) - pen2 = QPen( Qt::black, 1, Qt::DotLine ); + pen2 = TQPen( TQt::black, 1, TQt::DotLine ); else { pen2 = pen.zoomedPen( _zoomHandler ); } _painter->setPen( pen2 ); - pwOrig = ( pen2.style() == Qt::NoPen ) ? 1 : pen2.width(); + pwOrig = ( pen2.style() == TQt::NoPen ) ? 1 : pen2.width(); if ( !drawContour ) _painter->setBrush( getBrush() ); - QPointArray pntArray = atfInterp.getPointArray( _zoomHandler->zoomItX( ext.width()), + TQPointArray pntArray = atfInterp.getPointArray( _zoomHandler->zoomItX( ext.width()), _zoomHandler->zoomItY( ext.height() ) ); - QPtrList<ATFInterpreter::AttribList> atrLs = atfInterp.getAttribList(); - QPointArray pntArray2( pntArray.size() ); + TQPtrList<ATFInterpreter::AttribList> atrLs = atfInterp.getAttribList(); + TQPointArray pntArray2( pntArray.size() ); int ex = _zoomHandler->zoomItX(ext.width()); int ey = _zoomHandler->zoomItY(ext.height()); for ( unsigned int i = 0; i < pntArray.size(); i++ ) @@ -237,19 +237,19 @@ void KPrAutoformObject::paint( QPainter* _painter, KoTextZoomHandler *_zoomHandl { if ( angle == 0 || angle==360 ) { - //int ox = _painter->viewport().x() + static_cast<int>( _painter->worldMatrix().dx() ); - //int oy = _painter->viewport().y() + static_cast<int>( _painter->worldMatrix().dy() ); + //int ox = _painter->viewport().x() + static_cast<int>( _painter->tqworldMatrix().dx() ); + //int oy = _painter->viewport().y() + static_cast<int>( _painter->tqworldMatrix().dy() ); - QPointArray pntArray3 = pntArray2.copy(); + TQPointArray pntArray3 = pntArray2.copy(); _painter->save(); - QRegion clipregion( pntArray3 ); + TQRegion clipregion( pntArray3 ); // Intersect with current clipregion (whereas setupClipRegion unites) if ( _painter->hasClipping() ) - clipregion = _painter->clipRegion(QPainter::CoordPainter).intersect( clipregion ); + clipregion = _painter->clipRegion(TQPainter::CoordPainter).intersect( clipregion ); - _painter->setClipRegion( clipregion, QPainter::CoordPainter ); + _painter->setClipRegion( clipregion, TQPainter::CoordPainter ); gradient->setSize( size ); _painter->drawPixmap( 0, 0, gradient->pixmap() ); @@ -263,14 +263,14 @@ void KPrAutoformObject::paint( QPainter* _painter, KoTextZoomHandler *_zoomHandl kdDebug(33001) << "KPrAutoformObject::draw redrawPix" << endl; gradient->setSize( size ); m_redrawGradientPix = false; - QRegion clipregion( pntArray2 ); + TQRegion clipregion( pntArray2 ); m_gradientPix.resize ( _zoomHandler->zoomItX(ext.width()),_zoomHandler->zoomItY(ext.height()) ); - m_gradientPix.fill( Qt::white ); + m_gradientPix.fill( TQt::white ); - QPainter p; + TQPainter p; p.begin( &m_gradientPix ); - p.setClipRegion( clipregion , QPainter::CoordPainter); + p.setClipRegion( clipregion , TQPainter::CoordPainter); p.drawPixmap( 0, 0, gradient->pixmap() ); p.end(); @@ -281,7 +281,7 @@ void KPrAutoformObject::paint( QPainter* _painter, KoTextZoomHandler *_zoomHandl } _painter->setPen( pen2 ); - _painter->setBrush( Qt::NoBrush ); + _painter->setBrush( TQt::NoBrush ); _painter->drawPolygon( pntArray2 ); } } @@ -300,8 +300,8 @@ void KPrAutoformObject::paint( QPainter* _painter, KoTextZoomHandler *_zoomHandl { if ( lineBegin != L_NORMAL && !drawContour ) { - QPoint pnt1( pntArray2.at( 0 ) ), pnt2( pntArray2.at( 1 ) ); - QPoint pnt3, pnt4( pntArray.at( 0 ) ); + TQPoint pnt1( pntArray2.at( 0 ) ), pnt2( pntArray2.at( 1 ) ); + TQPoint pnt3, pnt4( pntArray.at( 0 ) ); float _angle = KoPoint::getAngle( KoPoint( pnt1 ), KoPoint( pnt2 ) ); switch ( static_cast<int>( _angle ) ) @@ -336,8 +336,8 @@ void KPrAutoformObject::paint( QPainter* _painter, KoTextZoomHandler *_zoomHandl if ( lineEnd != L_NORMAL && !drawContour ) { - QPoint pnt1( pntArray2.at( pntArray2.size() - 1 ) ), pnt2( pntArray2.at( pntArray2.size() - 2 ) ); - QPoint pnt3, pnt4( pntArray.at( pntArray.size() - 1 ) ); + TQPoint pnt1( pntArray2.at( pntArray2.size() - 1 ) ), pnt2( pntArray2.at( pntArray2.size() - 2 ) ); + TQPoint pnt3, pnt4( pntArray.at( pntArray.size() - 1 ) ); float _angle = KoPoint::getAngle( KoPoint( pnt1 ), KoPoint( pnt2 ) ); switch ( ( int )_angle ) diff --git a/kpresenter/KPrAutoformObject.h b/kpresenter/KPrAutoformObject.h index 9963769d..f7de60cb 100644 --- a/kpresenter/KPrAutoformObject.h +++ b/kpresenter/KPrAutoformObject.h @@ -22,7 +22,7 @@ #ifndef kpautoformobject_h #define kpautoformobject_h -#include <qpixmap.h> +#include <tqpixmap.h> #include <KoBrush.h> #include "KPrObject.h" @@ -36,8 +36,8 @@ class KPrAutoformObject : public KPr2DObject, public KPrStartEndLine { public: KPrAutoformObject(); - KPrAutoformObject( const KoPen & _pen, const QBrush &_brush, const QString &_filename, LineEnd _lineBegin, LineEnd _lineEnd, - FillType _fillType, const QColor &_gColor1, const QColor &_gColor2, BCType _gType, + KPrAutoformObject( const KoPen & _pen, const TQBrush &_brush, const TQString &_filename, LineEnd _lineBegin, LineEnd _lineEnd, + FillType _fillType, const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType, bool _unbalanced, int _xfactor, int _yfactor); virtual ~KPrAutoformObject() {} @@ -45,7 +45,7 @@ public: virtual DCOPObject* dcopObject(); - virtual void setFileName( const QString &_filename ); + virtual void setFileName( const TQString &_filename ); virtual void setLineBegin( LineEnd _lineBegin ) { lineBegin = _lineBegin; } virtual void setLineEnd( LineEnd _lineEnd ) @@ -53,28 +53,28 @@ public: virtual ObjType getType() const { return OT_AUTOFORM; } - virtual QString getTypeString() const + virtual TQString getTypeString() const { return i18n("Autoform"); } - QString getFileName() const + TQString getFileName() const { return filename; } virtual LineEnd getLineBegin() const { return lineBegin; } virtual LineEnd getLineEnd() const { return lineEnd; } - virtual QDomDocumentFragment save( QDomDocument& doc,double offset ); + virtual TQDomDocumentFragment save( TQDomDocument& doc,double offset ); - virtual double load(const QDomElement &element); + virtual double load(const TQDomElement &element); protected: virtual const char * getOasisElementName() const; virtual bool saveOasisObjectAttributes( KPOasisSaveContext &sc ) const; virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const; - virtual void paint( QPainter *_painter, KoTextZoomHandler *_zoomHandler, + virtual void paint( TQPainter *_painter, KoTextZoomHandler *_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour = FALSE ); - QString filename; + TQString filename; ATFInterpreter atfInterp; }; diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp index ebee4263..41f940a6 100644 --- a/kpresenter/KPrBackDia.cpp +++ b/kpresenter/KPrBackDia.cpp @@ -24,15 +24,15 @@ #include "KPrDocument.h" #include "KPrPage.h" -#include <qlabel.h> -#include <qpainter.h> -#include <qcombobox.h> -#include <qslider.h> -#include <qlayout.h> -#include <qtabwidget.h> -#include <qvbox.h> -#include <qcheckbox.h> -#include <qdatetime.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqcombobox.h> +#include <tqslider.h> +#include <tqlayout.h> +#include <tqtabwidget.h> +#include <tqvbox.h> +#include <tqcheckbox.h> +#include <tqdatetime.h> #include <kcolorbutton.h> #include <klocale.h> @@ -43,8 +43,8 @@ #include <KoPicture.h> -KPrBackPreview::KPrBackPreview( QWidget *parent, KPrPage *page ) - : QFrame( parent ) +KPrBackPreview::KPrBackPreview( TQWidget *tqparent, KPrPage *page ) + : TQFrame( tqparent ) { setFrameStyle( WinPanel | Sunken ); back = new KPrBackGround( page ); @@ -56,22 +56,22 @@ KPrBackPreview::~KPrBackPreview() delete back; } -void KPrBackPreview::drawContents( QPainter *p ) +void KPrBackPreview::drawContents( TQPainter *p ) { - QFrame::drawContents( p ); + TQFrame::drawContents( p ); p->save(); p->translate( contentsRect().x(), contentsRect().y() ); back->drawBackground( p, contentsRect().size(), contentsRect(), false ); p->restore(); } -KPrBackDialog::KPrBackDialog( QWidget* parent, const char* name, - BackType backType, const QColor &backColor1, - const QColor &backColor2, BCType _bcType, +KPrBackDialog::KPrBackDialog( TQWidget* tqparent, const char* name, + BackType backType, const TQColor &backColor1, + const TQColor &backColor2, BCType _bcType, const KoPicture &backPic, BackView backPicView, bool _unbalanced, int _xfactor, int _yfactor, KPrPage *_page ) - : KDialogBase( parent, name, true, "",KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel| + : KDialogBase( tqparent, name, true, "",KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel| KDialogBase::User1|KDialogBase::User2 ), m_useMasterBackground( 0 ), m_picture(backPic),m_oldpicture(backPic), m_page( _page ) { @@ -87,45 +87,45 @@ KPrBackDialog::KPrBackDialog( QWidget* parent, const char* name, oldXFactor=_xfactor; oldYFactor=_yfactor; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *layout = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() ); - QHBoxLayout *hbox = new QHBoxLayout( layout ); + TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout ); hbox->setSpacing( KDialog::spacingHint() ); - QVBoxLayout *vbox = new QVBoxLayout( hbox ); + TQVBoxLayout *vbox = new TQVBoxLayout( hbox ); vbox->setSpacing( KDialog::spacingHint() ); if ( !m_page->isMasterPage() ) { - m_useMasterBackground = new QCheckBox( i18n( "Use slide master background" ), page ); - connect( m_useMasterBackground, SIGNAL( clicked() ), - this, SLOT( updateConfiguration() ) ); + m_useMasterBackground = new TQCheckBox( i18n( "Use slide master background" ), page ); + connect( m_useMasterBackground, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( updateConfiguration() ) ); m_useMasterBackground->setChecked( m_page->useMasterBackground() ); vbox->addWidget( m_useMasterBackground ); } - vbox->addWidget( new QLabel( i18n( "Background type:" ), page ) ); + vbox->addWidget( new TQLabel( i18n( "Background type:" ), page ) ); - backCombo = new QComboBox( false, page ); + backCombo = new TQComboBox( false, page ); backCombo->insertItem( i18n( "Color/Gradient" ) ); backCombo->insertItem( i18n( "Picture" ) ); backCombo->setCurrentItem( (int)backType ); - connect( backCombo, SIGNAL( activated( int ) ), - this, SLOT( changeComboText(int) ) ); + connect( backCombo, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( changeComboText(int) ) ); vbox->addWidget( backCombo ); - tabWidget = new QTabWidget( page ); + tabWidget = new TQTabWidget( page ); vbox->addWidget( tabWidget ); // color/gradient tab --------------- - QVBox *colorTab = new QVBox( tabWidget ); + TQVBox *colorTab = new TQVBox( tabWidget ); colorTab->setSpacing( KDialog::spacingHint() ); colorTab->setMargin( 5 ); - cType = new QComboBox( false, colorTab ); + cType = new TQComboBox( false, colorTab ); cType->insertItem( i18n( "Plain" ) ); cType->insertItem( i18n( "Vertical Gradient" ) ); cType->insertItem( i18n( "Horizontal Gradient" ) ); @@ -136,69 +136,69 @@ KPrBackDialog::KPrBackDialog( QWidget* parent, const char* name, cType->insertItem( i18n( "PipeCross Gradient" ) ); cType->insertItem( i18n( "Pyramid Gradient" ) ); cType->setCurrentItem( _bcType ); - connect( cType, SIGNAL( activated( int ) ), - this, SLOT( updateConfiguration() ) ); + connect( cType, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( updateConfiguration() ) ); color1Choose = new KColorButton( backColor1, colorTab ); - connect( color1Choose, SIGNAL( changed( const QColor& ) ), - this, SLOT( updateConfiguration() ) ); + connect( color1Choose, TQT_SIGNAL( changed( const TQColor& ) ), + this, TQT_SLOT( updateConfiguration() ) ); color2Choose = new KColorButton( backColor2, colorTab ); - connect( color2Choose, SIGNAL( changed( const QColor& ) ), - this, SLOT( updateConfiguration() ) ); + connect( color2Choose, TQT_SIGNAL( changed( const TQColor& ) ), + this, TQT_SLOT( updateConfiguration() ) ); - unbalanced = new QCheckBox( i18n( "Unbalanced" ), colorTab ); - connect( unbalanced, SIGNAL( clicked() ), - this, SLOT( updateConfiguration() ) ); + unbalanced = new TQCheckBox( i18n( "Unbalanced" ), colorTab ); + connect( unbalanced, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( updateConfiguration() ) ); unbalanced->setChecked( _unbalanced ); - labXFactor =new QLabel( i18n( "X-factor:" ), colorTab ); + labXFactor =new TQLabel( i18n( "X-factor:" ), colorTab ); - xfactor = new QSlider( -200, 200, 1, 100, QSlider::Horizontal, colorTab ); - connect( xfactor, SIGNAL( valueChanged( int ) ), - this, SLOT( updateConfiguration() ) ); + xfactor = new TQSlider( -200, 200, 1, 100, Qt::Horizontal, colorTab ); + connect( xfactor, TQT_SIGNAL( valueChanged( int ) ), + this, TQT_SLOT( updateConfiguration() ) ); xfactor->setValue( _xfactor ); - labYFactor=new QLabel( i18n( "Y-factor:" ), colorTab ); + labYFactor=new TQLabel( i18n( "Y-factor:" ), colorTab ); - yfactor = new QSlider( -200, 200, 1, 100, QSlider::Horizontal, colorTab ); - connect( yfactor, SIGNAL( valueChanged( int ) ), - this, SLOT( updateConfiguration() ) ); + yfactor = new TQSlider( -200, 200, 1, 100, Qt::Horizontal, colorTab ); + connect( yfactor, TQT_SIGNAL( valueChanged( int ) ), + this, TQT_SLOT( updateConfiguration() ) ); yfactor->setValue( _yfactor ); tabWidget->addTab( colorTab, i18n( "Color/Gradient" ) ); // picture tab --------------------- - QVBox *picTab = new QVBox( tabWidget ); + TQVBox *picTab = new TQVBox( tabWidget ); picTab->setSpacing( KDialog::spacingHint() ); picTab->setMargin( 5 ); - QLabel *l = new QLabel( i18n( "View mode:" ), picTab ); - l->setFixedHeight( l->sizeHint().height() ); + TQLabel *l = new TQLabel( i18n( "View mode:" ), picTab ); + l->setFixedHeight( l->tqsizeHint().height() ); - picView = new QComboBox( false, picTab ); + picView = new TQComboBox( false, picTab ); picView->insertItem( i18n( "Scaled" ) ); picView->insertItem( i18n( "Centered" ) ); picView->insertItem( i18n( "Tiled" ) ); picView->setCurrentItem( (int)backPicView ); - connect( picView, SIGNAL( activated( int ) ), - this, SLOT( updateConfiguration() ) ); + connect( picView, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( updateConfiguration() ) ); - picChooseLabel = new QLabel( i18n("&Location:"), picTab ); - picChooseLabel->setFixedHeight( picChooseLabel->sizeHint().height() ); + picChooseLabel = new TQLabel( i18n("&Location:"), picTab ); + picChooseLabel->setFixedHeight( picChooseLabel->tqsizeHint().height() ); picChoose = new KURLRequester( picTab, "picChoose" ); - picChoose->setFixedHeight( picChoose->sizeHint().height() ); + picChoose->setFixedHeight( picChoose->tqsizeHint().height() ); picChoose->setMode( KFile::ExistingOnly ); - connect( picChoose, SIGNAL( openFileDialog( KURLRequester * ) ), - SLOT( aboutToSelectPic() ) ); - connect( picChoose, SIGNAL( urlSelected( const QString & ) ), - SLOT( afterSelectPic( const QString & ) ) ); + connect( picChoose, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), + TQT_SLOT( aboutToSelectPic() ) ); + connect( picChoose, TQT_SIGNAL( urlSelected( const TQString & ) ), + TQT_SLOT( afterSelectPic( const TQString & ) ) ); picChooseLabel->setBuddy( picChoose ); - (void)new QWidget( picTab ); + (void)new TQWidget( picTab ); tabWidget->addTab( picTab, i18n( "Picture" ) ); @@ -209,18 +209,18 @@ KPrBackDialog::KPrBackDialog( QWidget* parent, const char* name, // ------------------------ buttons - connect( this, SIGNAL( okClicked() ), - this, SLOT( Ok() ) ); - connect( this, SIGNAL( applyClicked() ), - this, SLOT( Apply() ) ); - connect( this, SIGNAL( user1Clicked() ), - this, SLOT( ApplyGlobal() ) ); + connect( this, TQT_SIGNAL( okClicked() ), + this, TQT_SLOT( Ok() ) ); + connect( this, TQT_SIGNAL( applyClicked() ), + this, TQT_SLOT( Apply() ) ); + connect( this, TQT_SIGNAL( user1Clicked() ), + this, TQT_SLOT( ApplyGlobal() ) ); - connect( this, SIGNAL( user2Clicked() ), - this, SLOT( slotReset() ) ); + connect( this, TQT_SIGNAL( user2Clicked() ), + this, TQT_SLOT( slotReset() ) ); - connect( this, SIGNAL( okClicked() ), - this, SLOT( accept() ) ); + connect( this, TQT_SIGNAL( okClicked() ), + this, TQT_SLOT( accept() ) ); setButtonText(KDialogBase::User1,i18n( "Apply &Global" )); setButtonText(KDialogBase::User2,i18n( "&Reset" )); picChanged = true; @@ -242,7 +242,7 @@ void KPrBackDialog::slotReset() if ( !m_picture.isNull() ) picChoose->setURL( m_picture.getKey().filename() ); else - picChoose->setURL( QString::null ); + picChoose->setURL( TQString() ); picView->setCurrentItem( (int)oldBackPicView ); unbalanced->setChecked( oldUnbalanced ); @@ -258,9 +258,9 @@ void KPrBackDialog::changeComboText(int _p) updateConfiguration(); } -void KPrBackDialog::showEvent( QShowEvent *e ) +void KPrBackDialog::showEvent( TQShowEvent *e ) { - QDialog::showEvent( e ); + TQDialog::showEvent( e ); lockUpdate = false; updateConfiguration(); } @@ -313,7 +313,7 @@ void KPrBackDialog::updateConfiguration() { kdDebug(33001) << "set backgound to master" << endl; preview->backGround()->setBackGround( m_page->masterPage()->background()->getBackGround() ); - preview->repaint( true ); + preview->tqrepaint( true ); } else { @@ -331,7 +331,7 @@ void KPrBackDialog::updateConfiguration() preview->backGround()->setBackType( getBackType() ); if ( preview->isVisible() && isVisible() ) { preview->backGround()->reload(); // ### TODO: instead of reloading, load or remove the picture correctly. - preview->repaint( true ); + preview->tqrepaint( true ); } picChanged = false; @@ -348,12 +348,12 @@ BackView KPrBackDialog::getBackView() const return (BackView)picView->currentItem(); } -QColor KPrBackDialog::getBackColor1() const +TQColor KPrBackDialog::getBackColor1() const { return color1Choose->color(); } -QColor KPrBackDialog::getBackColor2() const +TQColor KPrBackDialog::getBackColor2() const { return color2Choose->color(); } @@ -394,7 +394,7 @@ bool KPrBackDialog::useMasterBackground() const void KPrBackDialog::aboutToSelectPic() { - QStringList mimetypes; + TQStringList mimetypes; mimetypes += KImageIO::mimeTypes( KImageIO::Reading ); mimetypes += KoPictureFilePreview::clipartMimeTypes(); @@ -402,7 +402,7 @@ void KPrBackDialog::aboutToSelectPic() picChoose->fileDialog()->setPreviewWidget( new KoPictureFilePreview( picChoose->fileDialog() ) ); } -void KPrBackDialog::afterSelectPic( const QString &url ) +void KPrBackDialog::afterSelectPic( const TQString &url ) { KoPicture picture; picture.setKeyAndDownloadPicture(url, tabWidget); diff --git a/kpresenter/KPrBackDia.h b/kpresenter/KPrBackDia.h index 433edb5e..36ae92f5 100644 --- a/kpresenter/KPrBackDia.h +++ b/kpresenter/KPrBackDia.h @@ -22,8 +22,8 @@ #define BACKDIA_H #include <kdialogbase.h> -#include <qframe.h> -#include <qdatetime.h> +#include <tqframe.h> +#include <tqdatetime.h> #include "global.h" #include "KPrBackground.h" @@ -31,23 +31,24 @@ #include <KoBrush.h> #include <KoPicture.h> -class QLabel; -class QComboBox; +class TQLabel; +class TQComboBox; class KColorButton; -class QSlider; +class TQSlider; class KPrBackGround; -class QCheckBox; -class QTabWidget; +class TQCheckBox; +class TQTabWidget; class KPrPage; class KURLRequester; -class KPrBackPreview : public QFrame +class KPrBackPreview : public TQFrame { Q_OBJECT + TQ_OBJECT public: - KPrBackPreview( QWidget *parent, KPrPage *page ); + KPrBackPreview( TQWidget *tqparent, KPrPage *page ); virtual ~KPrBackPreview(); KPrBackGround *backGround() const { @@ -55,7 +56,7 @@ public: } protected: - virtual void drawContents( QPainter *p ); + virtual void drawContents( TQPainter *p ); private: KPrBackGround *back; @@ -65,11 +66,12 @@ private: class KPrBackDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KPrBackDialog( QWidget* parent, const char* name, - BackType backType, const QColor &backColor1, - const QColor &backColor2, BCType _bcType, + KPrBackDialog( TQWidget* tqparent, const char* name, + BackType backType, const TQColor &backColor1, + const TQColor &backColor2, BCType _bcType, const KoPicture &backPic, BackView backPicView, bool _unbalanced, int _xfactor, int _yfactor, KPrPage *_page ); @@ -78,9 +80,9 @@ public: bool useMasterBackground() const; protected: - void showEvent( QShowEvent *e ); - QColor getBackColor1() const; - QColor getBackColor2() const; + void showEvent( TQShowEvent *e ); + TQColor getBackColor1() const; + TQColor getBackColor2() const; BCType getBackColorType() const; BackType getBackType() const; KoPicture getBackPicture() const { return m_picture; } @@ -89,23 +91,23 @@ protected: int getBackXFactor() const; int getBackYFactor() const; private: - QLabel *picPreview; - QCheckBox *unbalanced; - QComboBox *cType, *backCombo, *picView; - QLabel *picChooseLabel; + TQLabel *picPreview; + TQCheckBox *unbalanced; + TQComboBox *cType, *backCombo, *picView; + TQLabel *picChooseLabel; KURLRequester *picChoose; KColorButton *color1Choose, *color2Choose; - QSlider *xfactor, *yfactor; + TQSlider *xfactor, *yfactor; KPrBackPreview *preview; bool picChanged, lockUpdate; - QLabel *labXFactor, *labYFactor; - QTabWidget *tabWidget; - QCheckBox *m_useMasterBackground; + TQLabel *labXFactor, *labYFactor; + TQTabWidget *tabWidget; + TQCheckBox *m_useMasterBackground; bool oldUseMasterBackground; BackType oldBackType; - QColor oldBackColor1; - QColor oldBackColor2; + TQColor oldBackColor1; + TQColor oldBackColor2; BCType oldBcType; BackView oldBackPicView; bool oldUnbalanced; @@ -117,7 +119,7 @@ private: private slots: void aboutToSelectPic(); - void afterSelectPic( const QString & ); + void afterSelectPic( const TQString & ); void updateConfiguration(); void Ok() { emit backOk( this, false ); } diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp index e8e7586d..e2d08fa2 100644 --- a/kpresenter/KPrBackground.cpp +++ b/kpresenter/KPrBackground.cpp @@ -28,9 +28,9 @@ #include "KPrUtils.h" #include "KPrBrush.h" -#include <qpainter.h> -#include <qpicture.h> -#include <qfileinfo.h> +#include <tqpainter.h> +#include <tqpicture.h> +#include <tqfileinfo.h> #include <KoRichText.h> #include <KoTextObject.h> @@ -49,8 +49,8 @@ KPrBackGround::KPrBackGround( KPrPage *_page ) { backType = BT_COLOR; backView = BV_CENTER; - backColor1 = Qt::white; - backColor2 = Qt::white; + backColor1 = TQt::white; + backColor2 = TQt::white; bcType = BCT_PLAIN; unbalanced = false; xfactor = 100; @@ -74,18 +74,18 @@ void KPrBackGround::setBackPicture ( const KoPictureKey& key ) backPicture = pictureCollection()->findOrLoad(key.filename(), key.lastModified() ); } -void KPrBackGround::drawBackground( QPainter *_painter, const KoTextZoomHandler* zoomHandler, - const QRect& _crect, bool _drawBorders ) +void KPrBackGround::drawBackground( TQPainter *_painter, const KoTextZoomHandler* zoomHandler, + const TQRect& _crect, bool _drawBorders ) { - QRect pageRect = zoomHandler->zoomRect( m_page->getPageRect() ); - QRect crect = pageRect.intersect( _crect ); + TQRect pageRect = zoomHandler->zoomRect( m_page->getPageRect() ); + TQRect crect = pageRect.intersect( _crect ); if ( crect.isEmpty() ) return; - QSize ext = pageRect.size(); + TQSize ext = pageRect.size(); drawBackground( _painter, ext, crect, _drawBorders ); } -void KPrBackGround::drawBackground( QPainter *_painter, const QSize& ext, const QRect& crect, bool _drawBorders ) +void KPrBackGround::drawBackground( TQPainter *_painter, const TQSize& ext, const TQRect& crect, bool _drawBorders ) { if ( m_page->displayBackground() ) { @@ -123,11 +123,11 @@ void KPrBackGround::reload() } -QDomElement KPrBackGround::save( QDomDocument &doc ) +TQDomElement KPrBackGround::save( TQDomDocument &doc ) { - QString tag = m_page->masterPage() == 0 ? "MASTERPAGE" : "PAGE"; - QDomElement page=doc.createElement( tag ); - QDomElement element; + TQString tag = m_page->masterPage() == 0 ? "MASTERPAGE" : "PAGE"; + TQDomElement page=doc.createElement( tag ); + TQDomElement element; element=doc.createElement("BACKMASTER"); element.setAttribute( "useMasterBackground", static_cast<int>(m_page->useMasterBackground() ) ); @@ -149,13 +149,13 @@ QDomElement KPrBackGround::save( QDomDocument &doc ) page.appendChild(element); } - if (backColor1!=Qt::white) { + if (backColor1!=TQt::white) { element=doc.createElement("BACKCOLOR1"); element.setAttribute("color", backColor1.name()); page.appendChild(element); } - if (backColor2!=Qt::white) { + if (backColor2!=TQt::white) { element=doc.createElement("BACKCOLOR2"); element.setAttribute("color", backColor2.name()); page.appendChild(element); @@ -194,7 +194,7 @@ void KPrBackGround::saveOasisBackgroundPageStyle( KoGenStyle& stylepageauto, KoG { case BT_COLOR: { - QBrush qbrush( backColor1 ); + TQBrush qbrush( backColor1 ); KPrBrush brush( qbrush, backColor1, backColor2, bcType, bcType == BCT_PLAIN ? FT_BRUSH : FT_GRADIENT, unbalanced, xfactor, yfactor ); @@ -206,7 +206,7 @@ void KPrBackGround::saveOasisBackgroundPageStyle( KoGenStyle& stylepageauto, KoG { stylepageauto.addProperty("draw:fill", "bitmap" ); stylepageauto.addProperty("draw:fill-image-name", saveOasisPictureStyle( mainStyles ) ); - QString repeat = "repeat"; + TQString repeat = "repeat"; switch ( backView ) { case BV_ZOOM: @@ -225,7 +225,7 @@ void KPrBackGround::saveOasisBackgroundPageStyle( KoGenStyle& stylepageauto, KoG } -QString KPrBackGround::saveOasisPictureStyle( KoGenStyles& mainStyles ) +TQString KPrBackGround::saveOasisPictureStyle( KoGenStyles& mainStyles ) { //<draw:fill-image draw:name="Pattern" xlink:href="Pictures/100000000000005E0000005E43C87AF2.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> KoGenStyle pictureStyle( KPrDocument::STYLE_PICTURE /*no family name*/ ); @@ -244,7 +244,7 @@ void KPrBackGround::loadOasis(KoOasisContext & context ) styleStack.setTypeProperties( "drawing-page" ); if ( styleStack.hasAttributeNS( KoXmlNS::draw, "fill" ) ) { - const QString fill = styleStack.attributeNS( KoXmlNS::draw, "fill" ); + const TQString fill = styleStack.attributeNS( KoXmlNS::draw, "fill" ); kdDebug(33001) <<"fill page type :" << fill << endl; if ( fill == "solid" || fill == "gradient" ) { @@ -268,21 +268,21 @@ void KPrBackGround::loadOasis(KoOasisContext & context ) } else if ( fill == "bitmap" ) { - QString style = styleStack.attributeNS( KoXmlNS::draw, "fill-image-name" ); - QDomElement* draw =context.oasisStyles().drawStyles()[style]; + TQString style = styleStack.attributeNS( KoXmlNS::draw, "fill-image-name" ); + TQDomElement* draw =context.oasisStyles().drawStyles()[style]; - const QString href( draw->attributeNS( KoXmlNS::xlink, "href", QString::null) ); + const TQString href( draw->attributeNS( KoXmlNS::xlink, "href", TQString()) ); kdDebug()<<" href: "<<href<<endl; if ( !href.isEmpty() ) { - QString strExtension; - const int result=href.findRev("."); + TQString strExtension; + const int result=href.tqfindRev("."); if (result>=0) { strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } - QString filename(href); - const KoPictureKey key(filename, QDateTime::currentDateTime(Qt::UTC)); + TQString filename(href); + const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC)); backPicture.setKey(key); KoStore* store = context.store(); @@ -298,7 +298,7 @@ void KPrBackGround::loadOasis(KoOasisContext & context ) if ( styleStack.hasAttributeNS( KoXmlNS::style, "repeat" ) ) { - QString repeat = styleStack.attributeNS( KoXmlNS::style, "repeat" ); + TQString repeat = styleStack.attributeNS( KoXmlNS::style, "repeat" ); if ( repeat == "stretch" ) setBackView( BV_ZOOM ); else if ( repeat == "no-repeat" ) @@ -314,10 +314,10 @@ void KPrBackGround::loadOasis(KoOasisContext & context ) } } -void KPrBackGround::load( const QDomElement &element ) +void KPrBackGround::load( const TQDomElement &element ) { //compatible with old file format kpresenter-1.4 - QDomElement e=element.namedItem("BACKMASTER").toElement(); + TQDomElement e=element.namedItem("BACKMASTER").toElement(); if ( !e.isNull() ) { if ( e.hasAttribute( "useMasterBackground" ) ) @@ -363,9 +363,9 @@ void KPrBackGround::load( const QDomElement &element ) if(e.hasAttribute("blue")) blue=e.attribute("blue").toInt(); if(e.hasAttribute("color")) - setBackColor1(QColor(e.attribute("color"))); + setBackColor1(TQColor(e.attribute("color"))); else - setBackColor1(QColor(red, green, blue)); + setBackColor1(TQColor(red, green, blue)); } e=element.namedItem("BACKCOLOR2").toElement(); if(!e.isNull()) { @@ -377,9 +377,9 @@ void KPrBackGround::load( const QDomElement &element ) if(e.hasAttribute("blue")) blue=e.attribute("blue").toInt(); if(e.hasAttribute("color")) - setBackColor2(QColor(e.attribute("color"))); + setBackColor2(TQColor(e.attribute("color"))); else - setBackColor2(QColor(red, green, blue)); + setBackColor2(TQColor(red, green, blue)); } e=element.namedItem("BGRADIENT").toElement(); if(!e.isNull()) { @@ -423,8 +423,8 @@ void KPrBackGround::load( const QDomElement &element ) e=element.namedItem("BACKPIX").toElement(); if(!e.isNull()) { bool openPic = true; - QString _data; - QString _fileName; + TQString _data; + TQString _fileName; if(e.hasAttribute("data")) _data=e.attribute("data"); if ( _data.isEmpty() ) @@ -435,11 +435,11 @@ void KPrBackGround::load( const QDomElement &element ) _fileName=e.attribute("filename"); if ( !_fileName.isEmpty() ) { - if ( int _envVarB = _fileName.find( '$' ) >= 0 ) + if ( int _envVarB = _fileName.tqfind( '$' ) >= 0 ) { - int _envVarE = _fileName.find( '/', _envVarB ); - QString path = getenv( QFile::encodeName(_fileName.mid( _envVarB, _envVarE-_envVarB )) ); - _fileName.replace( _envVarB-1, _envVarE-_envVarB+1, path ); + int _envVarE = _fileName.tqfind( '/', _envVarB ); + TQString path = getenv( TQFile::encodeName(_fileName.mid( _envVarB, _envVarE-_envVarB )) ); + _fileName.tqreplace( _envVarB-1, _envVarE-_envVarB+1, path ); } } if ( openPic ) @@ -450,14 +450,14 @@ void KPrBackGround::load( const QDomElement &element ) KoPictureKey key( _fileName ); backPicture.clear(); backPicture.setKey(key); - QByteArray rawData=_data.utf8(); // XPM is normally ASCII, therefore UTF-8 + TQByteArray rawData=_data.utf8(); // XPM is normally ASCII, therefore UTF-8 rawData[rawData.size()-1]=char(10); // Replace the NULL character by a LINE FEED - QBuffer buffer(rawData); - backPicture.loadXpm(&buffer); + TQBuffer buffer(rawData); + backPicture.loadXpm(TQT_TQIODEVICE(&buffer)); } #if 0 - if ( ext == orig_size.toQSize() ) + if ( ext == orig_size.toTQSize() ) ext = backPicture.size(); backPicture = backPicture.scale( ext ); @@ -476,31 +476,31 @@ void KPrBackGround::load( const QDomElement &element ) // try to find a BACKCLIP tag if the BACKCLIPKEY is not available... e=element.namedItem("BACKCLIP").toElement(); if(!e.isNull()) { - QString _fileName; + TQString _fileName; if(e.hasAttribute("filename")) _fileName=e.attribute("filename"); if ( !_fileName.isEmpty() ) { - if ( int _envVarB = _fileName.find( '$' ) >= 0 ) + if ( int _envVarB = _fileName.tqfind( '$' ) >= 0 ) { - int _envVarE = _fileName.find( '/', _envVarB ); - QString path = getenv( QFile::encodeName(_fileName.mid( _envVarB, _envVarE-_envVarB )) ); - _fileName.replace( _envVarB-1, _envVarE-_envVarB+1, path ); + int _envVarE = _fileName.tqfind( '/', _envVarB ); + TQString path = getenv( TQFile::encodeName(_fileName.mid( _envVarB, _envVarE-_envVarB )) ); + _fileName.tqreplace( _envVarB-1, _envVarE-_envVarB+1, path ); } } - //KPClipartKey clipKey( _fileName, QDateTime( pictureCollection()->tmpDate(), + //KPClipartKey clipKey( _fileName, TQDateTime( pictureCollection()->tmpDate(), // pictureCollection()->tmpTime() ) ); backPicture = pictureCollection()->loadPicture( _fileName ); // load from disk ! } } } -void KPrBackGround::drawBackColor( QPainter *_painter, const QSize& ext, const QRect& crect ) +void KPrBackGround::drawBackColor( TQPainter *_painter, const TQSize& ext, const TQRect& crect ) { if ( (backType == BT_COLOR && bcType == BCT_PLAIN) || backColor1 == backColor2 ) //plain color { //kdDebug(33001) << "KPrBackGround::drawBackColor (filling " << DEBUGRECT(crect) << ")" << endl; - _painter->fillRect( crect, QBrush( getBackColor1() ) ); + _painter->fillRect( crect, TQBrush( getBackColor1() ) ); } else if (backType == BT_COLOR && bcType != BCT_PLAIN) { //gradient if ( !gradientPixmap || gradientPixmap->size() != ext ) @@ -508,11 +508,11 @@ void KPrBackGround::drawBackColor( QPainter *_painter, const QSize& ext, const Q _painter->drawPixmap( crect.topLeft(), *gradientPixmap, crect ); } else /*if ( backType == BT_CLIPART || backType == BT_PICTURE )*/ //no gradient or bg color - _painter->fillRect( crect, QBrush( Qt::white ) ); + _painter->fillRect( crect, TQBrush( TQt::white ) ); return; } -void KPrBackGround::drawBackPix( QPainter *_painter, const QSize& ext, const QRect& /*crect*/ ) +void KPrBackGround::drawBackPix( TQPainter *_painter, const TQSize& ext, const TQRect& /*crect*/ ) { /*kdDebug(33001) << "KPrBackGround::drawBackPix ext=" << ext.width() << "," << ext.height() << endl; kdDebug(33001) << "mode=" << (backView==BV_ZOOM?"ZOOM":backView==BV_TILED?"TILED":backView==BV_CENTER?"CENTER":"OTHER") @@ -520,27 +520,27 @@ void KPrBackGround::drawBackPix( QPainter *_painter, const QSize& ext, const QRe if ( !backPicture.isNull() ) { // depend on page size and desktop size - const QSize _origSize = backPicture.getOriginalSize(); + const TQSize _origSize = backPicture.getOriginalSize(); // NOTE: make all multiplications before any division double w = _origSize.width(); w *= ext.width(); #if KDE_IS_VERSION(3,1,90) - QRect desk = KGlobalSettings::desktopGeometry(kapp->activeWindow()); + TQRect desk = KGlobalSettings::desktopGeometry(TQT_TQWIDGET(kapp->activeWindow())); #else - QRect desk = QApplication::desktop()->screenGeometry(); + TQRect desk = TQApplication::desktop()->screenGeometry(); #endif w /= desk.width(); double h = _origSize.height(); h *= ext.height(); h /= desk.height(); - const QSize _pixSize = QSize( (int)w, (int)h ); - QPixmap backPix; + const TQSize _pixSize = TQSize( (int)w, (int)h ); + TQPixmap backPix; switch ( backView ) { case BV_ZOOM: backPix=backPicture.generatePixmap( ext, true ); - _painter->drawPixmap( QRect( 0, 0, ext.width(), ext.height() ), backPix ); + _painter->drawPixmap( TQRect( 0, 0, ext.width(), ext.height() ), backPix ); break; case BV_TILED: backPix=backPicture.generatePixmap( _pixSize, true ); @@ -550,7 +550,7 @@ void KPrBackGround::drawBackPix( QPainter *_painter, const QSize& ext, const QRe { backPix=backPicture.generatePixmap( _pixSize, true ); - QPixmap *pix = new QPixmap( ext.width(), ext.height() ); + TQPixmap *pix = new TQPixmap( ext.width(), ext.height() ); bool delPix = true; int _x = 0, _y = 0; @@ -587,17 +587,17 @@ void KPrBackGround::drawBackPix( QPainter *_painter, const QSize& ext, const QRe } } -void KPrBackGround::drawBorders( QPainter *_painter, const QSize& /*ext*/, const QRect& /*crect*/ ) +void KPrBackGround::drawBorders( TQPainter *_painter, const TQSize& /*ext*/, const TQRect& /*crect*/ ) { - _painter->setPen( QApplication::palette().active().color( QColorGroup::Dark ) ); - _painter->setBrush( Qt::NoBrush ); + _painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) ); + _painter->setBrush( TQt::NoBrush ); - QRect rect = m_page->getZoomPageRect(); + TQRect rect = m_page->getZoomPageRect(); _painter->drawRect( rect.x()-1,rect.y()-1,rect.width()+1,rect.height()+1 ); } -void KPrBackGround::generateGradient( const QSize& size ) +void KPrBackGround::generateGradient( const TQSize& size ) { if ( backType == BT_COLOR || backType == BT_CLIPART || backType == BT_PICTURE && backView == BV_CENTER ) { diff --git a/kpresenter/KPrBackground.h b/kpresenter/KPrBackground.h index b0326634..b0a93f39 100644 --- a/kpresenter/KPrBackground.h +++ b/kpresenter/KPrBackground.h @@ -22,8 +22,8 @@ #ifndef kpbackground_h #define kpbackground_h -#include <qsize.h> -#include <qdatetime.h> +#include <tqsize.h> +#include <tqdatetime.h> #include <KoBrush.h> #include <KoStyleStack.h> #include <KoOasisStyles.h> @@ -34,11 +34,11 @@ #include "global.h" class KPrDocument; -class QPainter; -class QPixmap; +class TQPainter; +class TQPixmap; class KPrGradientCollection; -class QDomDocument; -class QDomElement; +class TQDomDocument; +class TQDomElement; class KoTextZoomHandler; class KPrPage; class KoXmlWriter; @@ -51,7 +51,7 @@ class KPrBackGround public: struct Settings { - Settings( const BackType backType, const QColor backColor1, const QColor backColor2, + Settings( const BackType backType, const TQColor backColor1, const TQColor backColor2, const BCType bcType, const bool unbalanced, const int xfactor, const int yfactor, const KoPictureKey &key, const BackView backView ) : m_backType( backType ) @@ -66,8 +66,8 @@ public: {} BackType m_backType; - QColor m_backColor1; - QColor m_backColor2; + TQColor m_backColor1; + TQColor m_backColor2; // Gradient setting BCType m_bcType; bool m_unbalanced; @@ -89,9 +89,9 @@ public: } void setBackView( BackView _backView ) { backView = _backView; } - void setBackColor1( const QColor &_color ) + void setBackColor1( const TQColor &_color ) { removeGradient(); backColor1 = _color; } - void setBackColor2( const QColor &_color ) + void setBackColor2( const TQColor &_color ) { removeGradient(); backColor2 = _color; } void setBackColorType( BCType _bcType ) { removeGradient(); bcType = _bcType; } @@ -113,9 +113,9 @@ public: { return backType; } BackView getBackView() const { return backView; } - QColor getBackColor1() const + TQColor getBackColor1() const { return backColor1; } - QColor getBackColor2() const + TQColor getBackColor2() const { return backColor2; } BCType getBackColorType() const { return bcType; } @@ -133,45 +133,45 @@ public: // Draw the background. // Uses the @p zoomHandler to determine the size of the background - void drawBackground( QPainter *_painter, const KoTextZoomHandler* zoomHandler, - const QRect& crect, bool _drawBorders ); + void drawBackground( TQPainter *_painter, const KoTextZoomHandler* zoomHandler, + const TQRect& crect, bool _drawBorders ); // Draw the background. The size of the background is passed explicitly - void drawBackground( QPainter *_painter, const QSize& ext, - const QRect& crect, bool _drawBorders ); + void drawBackground( TQPainter *_painter, const TQSize& ext, + const TQRect& crect, bool _drawBorders ); void reload(); - QDomElement save( QDomDocument &doc ); - void load( const QDomElement &element ); + TQDomElement save( TQDomDocument &doc ); + void load( const TQDomElement &element ); void loadOasis( KoOasisContext & context ); void saveOasisBackgroundPageStyle( KoGenStyle &stylepageauto, KoGenStyles &mainStyles ); protected: - void drawBackColor( QPainter *_painter, const QSize& ext, const QRect& crect ); - void drawBackPix( QPainter *_painter, const QSize& ext, const QRect& crect ); - void drawBorders( QPainter *_painter, const QSize& ext, const QRect& crect ); + void drawBackColor( TQPainter *_painter, const TQSize& ext, const TQRect& crect ); + void drawBackPix( TQPainter *_painter, const TQSize& ext, const TQRect& crect ); + void drawBorders( TQPainter *_painter, const TQSize& ext, const TQRect& crect ); // The current gradient isn't valid anymore (e.g. size or settings changed) -> discard it void removeGradient(); // Generate a new gradient pixmap, for the given size - void generateGradient( const QSize& size ); + void generateGradient( const TQSize& size ); KoPictureCollection *pictureCollection() const; KPrGradientCollection *gradientCollection() const; - QString saveOasisPictureStyle( KoGenStyles& mainStyles ); + TQString saveOasisPictureStyle( KoGenStyles& mainStyles ); private: BackType backType; BackView backView; - QColor backColor1; - QColor backColor2; + TQColor backColor1; + TQColor backColor2; BCType bcType; // Background picture KoPicture backPicture; // Pixmap used to cache the drawing of the gradient, at the current size - const QPixmap *gradientPixmap; + const TQPixmap *gradientPixmap; // The page for which this background exists KPrPage *m_page; diff --git a/kpresenter/KPrBezierCurveObject.cpp b/kpresenter/KPrBezierCurveObject.cpp index 152d466d..0b12115e 100644 --- a/kpresenter/KPrBezierCurveObject.cpp +++ b/kpresenter/KPrBezierCurveObject.cpp @@ -24,9 +24,9 @@ #include "KPrQuadricBezierCurveObjectIface.h" #include "KPrUtils.h" #include <KoTextZoomHandler.h> -#include <qpainter.h> -#include <qwmatrix.h> -#include <qdom.h> +#include <tqpainter.h> +#include <tqwmatrix.h> +#include <tqdom.h> #include "KoPointArray.h" #include <kdebug.h> @@ -60,31 +60,31 @@ KPrBezierCurveObject &KPrBezierCurveObject::operator=( const KPrBezierCurveObjec bool KPrBezierCurveObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const { KoRect rect( getRect() ); - sc.xmlWriter.addAttribute("svg:viewBox", QString( "0 0 %1 %2" ).arg( int( rect.width() * 100 ) ) - .arg( int( rect.height() * 100 ) ) ); + sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( int( rect.width() * 100 ) ) + .tqarg( int( rect.height() * 100 ) ) ); unsigned int pointCount = points.count(); unsigned int pos = 0; - QString d; - d += QString( "M%1 %2" ).arg( int( points.at(pos).x() * 100 ) ) - .arg( int( points.at(pos).y() * 100 ) ); + TQString d; + d += TQString( "M%1 %2" ).tqarg( int( points.at(pos).x() * 100 ) ) + .tqarg( int( points.at(pos).y() * 100 ) ); while ( pos + 4 <= pointCount ) { - d += QString( "C%1 %2 %3 %4 %5 %6" ).arg( int( points.at( pos + 2 ).x() * 100 ) ) - .arg( int( points.at( pos + 2 ).y() * 100 ) ) - .arg( int( points.at( pos + 3 ).x() * 100 ) ) - .arg( int( points.at( pos + 3 ).y() * 100 ) ) - .arg( int( points.at( pos + 1 ).x() * 100 ) ) - .arg( int( points.at( pos + 1 ).y() * 100 ) ); + d += TQString( "C%1 %2 %3 %4 %5 %6" ).tqarg( int( points.at( pos + 2 ).x() * 100 ) ) + .tqarg( int( points.at( pos + 2 ).y() * 100 ) ) + .tqarg( int( points.at( pos + 3 ).x() * 100 ) ) + .tqarg( int( points.at( pos + 3 ).y() * 100 ) ) + .tqarg( int( points.at( pos + 1 ).x() * 100 ) ) + .tqarg( int( points.at( pos + 1 ).y() * 100 ) ); pos += 4; } if ( pos < pointCount ) { - d += QString( "L%1 %2" ).arg( int( points.at( pos + 1 ).x() * 100 ) ) - .arg( int( points.at( pos + 1 ).y() * 100 ) ); + d += TQString( "L%1 %2" ).tqarg( int( points.at( pos + 1 ).x() * 100 ) ) + .tqarg( int( points.at( pos + 1 ).y() * 100 ) ); } sc.xmlWriter.addAttribute( "svg:d", d ); @@ -99,7 +99,7 @@ const char * KPrBezierCurveObject::getOasisElementName() const } -void KPrBezierCurveObject::loadOasis( const QDomElement &element, KoOasisContext & context, KPrLoadingInfo* info ) +void KPrBezierCurveObject::loadOasis( const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo* info ) { kdDebug(33001) << "KPrBezierCurveObject::loadOasis" << endl; KPrPointObject::loadOasis( element, context, info ); @@ -110,12 +110,12 @@ void KPrBezierCurveObject::loadOasis( const QDomElement &element, KoOasisContext loadOasisMarker( context ); } -QDomDocumentFragment KPrBezierCurveObject::save( QDomDocument& doc, double offset ) +TQDomDocumentFragment KPrBezierCurveObject::save( TQDomDocument& doc, double offset ) { return KPrPointObject::save( doc,offset ); } -double KPrBezierCurveObject::load(const QDomElement &element) +double KPrBezierCurveObject::load(const TQDomElement &element) { double offset = KPrPointObject::load( element ); diff --git a/kpresenter/KPrBezierCurveObject.h b/kpresenter/KPrBezierCurveObject.h index db12f8d8..c2b8558b 100644 --- a/kpresenter/KPrBezierCurveObject.h +++ b/kpresenter/KPrBezierCurveObject.h @@ -24,7 +24,7 @@ #include "KPrPointObject.h" -class QPainter; +class TQPainter; class DCOPObject; class KPrBezierCurveObject : public KPrPointObject @@ -35,10 +35,10 @@ public: const KoPen &_pen, LineEnd _lineBegin, LineEnd _lineEnd ); virtual ~KPrBezierCurveObject() {} - virtual QDomDocumentFragment save( QDomDocument& doc,double offset ); + virtual TQDomDocumentFragment save( TQDomDocument& doc,double offset ); - virtual double load( const QDomElement &element ); - virtual void loadOasis( const QDomElement &element, KoOasisContext & context, KPrLoadingInfo* info ); + virtual double load( const TQDomElement &element ); + virtual void loadOasis( const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo* info ); virtual void flip(bool horizontal ); @@ -70,7 +70,7 @@ public: virtual DCOPObject* dcopObject(); virtual ObjType getType() const { return OT_CUBICBEZIERCURVE; } - virtual QString getTypeString() const { return i18n( "Cubic Bezier Curve" ); } + virtual TQString getTypeString() const { return i18n( "Cubic Bezier Curve" ); } }; class KPrQuadricBezierCurveObject : public KPrBezierCurveObject @@ -84,7 +84,7 @@ public: virtual DCOPObject* dcopObject(); virtual ObjType getType() const { return OT_CUBICBEZIERCURVE; } - virtual QString getTypeString() const { return i18n( "Quadric Bezier Curve" ); } + virtual TQString getTypeString() const { return i18n( "Quadric Bezier Curve" ); } }; #endif diff --git a/kpresenter/KPrBgSpellCheck.cpp b/kpresenter/KPrBgSpellCheck.cpp index efd84234..add16a4b 100644 --- a/kpresenter/KPrBgSpellCheck.cpp +++ b/kpresenter/KPrBgSpellCheck.cpp @@ -48,7 +48,7 @@ KPrBgSpellCheck::~KPrBgSpellCheck() KoTextIterator *KPrBgSpellCheck::createWholeDocIterator() const { - QValueList<KoTextObject *> objects = m_doc->visibleTextObjects( ); + TQValueList<KoTextObject *> objects = m_doc->visibleTextObjects( ); kdDebug()<<"Number of visible text objects = "<< objects.count() << endl; diff --git a/kpresenter/KPrBrush.cpp b/kpresenter/KPrBrush.cpp index 6d4d1699..06954f7c 100644 --- a/kpresenter/KPrBrush.cpp +++ b/kpresenter/KPrBrush.cpp @@ -31,7 +31,7 @@ KPrBrush::KPrBrush() { } -KPrBrush::KPrBrush( const QBrush &brush, const QColor &gColor1, const QColor &gColor2, +KPrBrush::KPrBrush( const TQBrush &brush, const TQColor &gColor1, const TQColor &gColor2, BCType gType, FillType fillType, bool unbalanced, int xfactor, int yfactor ) : KoBrush( brush, gColor1,gColor2, gType, fillType, unbalanced, xfactor, yfactor ) @@ -44,7 +44,7 @@ void KPrBrush::saveOasisFillStyle( KoGenStyle &styleObjectAuto, KoGenStyles& mai { case FT_BRUSH: { - if( getBrush().style() != Qt::NoBrush ) + if( getBrush().style() != TQt::NoBrush ) { KoOasisStyles::saveOasisFillStyle( styleObjectAuto, mainStyles, getBrush() ); } @@ -62,19 +62,19 @@ void KPrBrush::saveOasisFillStyle( KoGenStyle &styleObjectAuto, KoGenStyles& mai } -QString KPrBrush::saveOasisGradientStyle( KoGenStyles& mainStyles ) const +TQString KPrBrush::saveOasisGradientStyle( KoGenStyles& mainStyles ) const { KoGenStyle gradientStyle( KPrDocument::STYLE_GRADIENT /*no family name*/); gradientStyle.addAttribute( "draw:start-color", getGColor1().name() ); gradientStyle.addAttribute( "draw:end-color", getGColor2().name() ); - QString unbalancedx( "50%" ); - QString unbalancedy( "50%" ); + TQString unbalancedx( "50%" ); + TQString unbalancedy( "50%" ); if ( getGUnbalanced() ) { - unbalancedx = QString( "%1%" ).arg( getGXFactor() / 4 + 50 ); - unbalancedy = QString( "%1%" ).arg( getGYFactor() / 4 + 50 ); + unbalancedx = TQString( "%1%" ).tqarg( getGXFactor() / 4 + 50 ); + unbalancedy = TQString( "%1%" ).tqarg( getGYFactor() / 4 + 50 ); } gradientStyle.addAttribute( "draw:cx", unbalancedx ); gradientStyle.addAttribute( "draw:cy", unbalancedy ); @@ -130,7 +130,7 @@ void KPrBrush::loadOasisFillStyle( KoOasisContext &context, const char * propert if ( styleStack.hasAttributeNS( KoXmlNS::draw, "fill" ) ) { - const QString fill = styleStack.attributeNS( KoXmlNS::draw, "fill" ); + const TQString fill = styleStack.attributeNS( KoXmlNS::draw, "fill" ); kdDebug(33001) << " load object gradient fill type :" << fill << endl; if ( fill == "solid" || fill == "hatch" ) @@ -139,19 +139,19 @@ void KPrBrush::loadOasisFillStyle( KoOasisContext &context, const char * propert } else if ( fill == "gradient" ) { - QString style = styleStack.attributeNS( KoXmlNS::draw, "fill-gradient-name" ); - QDomElement* draw = context.oasisStyles().drawStyles()[style]; + TQString style = styleStack.attributeNS( KoXmlNS::draw, "fill-gradient-name" ); + TQDomElement* draw = context.oasisStyles().drawStyles()[style]; if ( draw ) { - setGColor1( draw->attributeNS( KoXmlNS::draw, "start-color", QString::null ) ); - setGColor2( draw->attributeNS( KoXmlNS::draw, "end-color", QString::null ) ); + setGColor1( draw->attributeNS( KoXmlNS::draw, "start-color", TQString() ) ); + setGColor2( draw->attributeNS( KoXmlNS::draw, "end-color", TQString() ) ); - QString type = draw->attributeNS( KoXmlNS::draw, "style", QString::null ); + TQString type = draw->attributeNS( KoXmlNS::draw, "style", TQString() ); kdDebug()<<" type :"<<type<<endl; if ( type == "linear" ) { - int angle = draw->attributeNS( KoXmlNS::draw, "angle", QString::null ).toInt() / 10; + int angle = draw->attributeNS( KoXmlNS::draw, "angle", TQString() ).toInt() / 10; // make sure the angle is between 0 and 359 angle = abs( angle ); @@ -182,8 +182,8 @@ void KPrBrush::loadOasisFillStyle( KoOasisContext &context, const char * propert if ( nearAngle == 180 || nearAngle == 270 || nearAngle == 225 || nearAngle == 315 ) { - setGColor1( draw->attributeNS( KoXmlNS::draw, "end-color", QString::null ) ); - setGColor2( draw->attributeNS( KoXmlNS::draw, "start-color", QString::null ) ); + setGColor1( draw->attributeNS( KoXmlNS::draw, "end-color", TQString() ) ); + setGColor2( draw->attributeNS( KoXmlNS::draw, "start-color", TQString() ) ); } } else if ( type == "radial" || type == "ellipsoid" ) @@ -199,12 +199,12 @@ void KPrBrush::loadOasisFillStyle( KoOasisContext &context, const char * propert // and (un-)balanced settings of kpresenter. Let's try it. int x, y; if ( draw->hasAttributeNS( KoXmlNS::draw, "cx" ) ) - x = draw->attributeNS( KoXmlNS::draw, "cx", QString::null ).remove( '%' ).toInt(); + x = draw->attributeNS( KoXmlNS::draw, "cx", TQString() ).remove( '%' ).toInt(); else x = 50; if ( draw->hasAttributeNS( KoXmlNS::draw, "cy" ) ) - y = draw->attributeNS( KoXmlNS::draw, "cy", QString::null ).remove( '%' ).toInt(); + y = draw->attributeNS( KoXmlNS::draw, "cy", TQString() ).remove( '%' ).toInt(); else y = 50; @@ -226,7 +226,7 @@ void KPrBrush::loadOasisFillStyle( KoOasisContext &context, const char * propert // We have to set a brush with brushstyle != no background fill // otherwise the properties dialog for the object won't // display the preview for the gradient. - QBrush tmpBrush; + TQBrush tmpBrush; tmpBrush.setStyle( static_cast<Qt::BrushStyle>( 1 ) ); setBrush( tmpBrush ); setFillType( FT_GRADIENT ); @@ -240,7 +240,7 @@ void KPrBrush::loadOasisFillStyle( KoOasisContext &context, const char * propert //todo //not implementer in kpresenter... //the drawing object is filled with the bitmap specified by the draw:fill-image-name attribute. - //QBrush implement setPixmap + //TQBrush implement setPixmap //easy just add pixmap and store it. } } diff --git a/kpresenter/KPrBrush.h b/kpresenter/KPrBrush.h index f96f6627..e59f838a 100644 --- a/kpresenter/KPrBrush.h +++ b/kpresenter/KPrBrush.h @@ -21,7 +21,7 @@ #ifndef KPRBRUSH_H #define KPRBRUSH_H -#include <qbrush.h> +#include <tqbrush.h> #include <KoBrush.h> #include "global.h" @@ -29,13 +29,13 @@ class KoGenStyle; class KoGenStyles; class KoOasisContext; -class QDomElement; +class TQDomElement; class KPrBrush : public KoBrush { public: KPrBrush(); - KPrBrush( const QBrush &brush, const QColor &gColor1, const QColor &gColor2, + KPrBrush( const TQBrush &brush, const TQColor &gColor1, const TQColor &gColor2, BCType gType, FillType fillType, bool unbalanced, int xfactor, int yfactor ); @@ -43,7 +43,7 @@ public: void loadOasisFillStyle( KoOasisContext &context, const char * propertyType ); private: - QString saveOasisGradientStyle( KoGenStyles& mainStyles ) const; + TQString saveOasisGradientStyle( KoGenStyles& mainStyles ) const; }; #endif /* KPRBRUSH_H */ diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp index 6e27e118..7e4b4371 100644 --- a/kpresenter/KPrBrushProperty.cpp +++ b/kpresenter/KPrBrushProperty.cpp @@ -22,49 +22,49 @@ #include "gradientpropertyui.h" #include "KPrPBPreview.h" -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qslider.h> -#include <qwhatsthis.h> -#include <qwidgetstack.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqslider.h> +#include <tqwhatsthis.h> +#include <tqwidgetstack.h> #include <klocale.h> #include <kcolorbutton.h> #include <kcombobox.h> -KPrBrushProperty::KPrBrushProperty( QWidget *parent, const char *name, const KPrBrushCmd::Brush &brush ) - : QWidget( parent, name ) +KPrBrushProperty::KPrBrushProperty( TQWidget *tqparent, const char *name, const KPrBrushCmd::Brush &brush ) + : TQWidget( tqparent, name ) , m_brush( brush ) { - QGridLayout *layout = new QGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); m_typeCombo = new KComboBox( this ); - layout->addWidget( m_typeCombo, 0, 1 ); + tqlayout->addWidget( m_typeCombo, 0, 1 ); m_typeCombo->insertItem( i18n( "Single Color" ) ); m_typeCombo->insertItem( i18n( "Gradient" ) ); m_typeCombo->insertItem( i18n( "Transparent" ) ); - QWhatsThis::add(m_typeCombo, i18n( "You can choose between Single Color, Gradient or Transparent as the type." ) ); + TQWhatsThis::add(m_typeCombo, i18n( "You can choose between Single Color, Gradient or Transparent as the type." ) ); - QLabel *typeLabel = new QLabel( i18n( "&Type:" ), this ); - layout->addWidget( typeLabel, 0, 0 ); + TQLabel *typeLabel = new TQLabel( i18n( "&Type:" ), this ); + tqlayout->addWidget( typeLabel, 0, 0 ); typeLabel->setBuddy( m_typeCombo ); - m_stack = new QWidgetStack( this ); - layout->addMultiCellWidget( m_stack, 1, 1, 0, 1 ); - connect( m_typeCombo, SIGNAL( activated( int ) ), - this, SLOT( slotTypeChanged( int ) ) ); + m_stack = new TQWidgetStack( this ); + tqlayout->addMultiCellWidget( m_stack, 1, 1, 0, 1 ); + connect( m_typeCombo, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( slotTypeChanged( int ) ) ); m_brushUI = new BrushPropertyUI( m_stack ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 100 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 94 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 88 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 63 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 50 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 37 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 12 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 6 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 100 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 94 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 88 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 63 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 50 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 37 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 12 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 6 ) ); m_brushUI->styleCombo->insertItem( i18n( "Horizontal Lines" ) ); m_brushUI->styleCombo->insertItem( i18n( "Vertical Lines" ) ); m_brushUI->styleCombo->insertItem( i18n( "Crossing Lines" ) ); @@ -73,14 +73,14 @@ KPrBrushProperty::KPrBrushProperty( QWidget *parent, const char *name, const KPr m_brushUI->styleCombo->insertItem( i18n( "Diagonal Crossing Lines" ) ); m_preview_color = new KPrPBPreview( m_brushUI->previewPanel, 0, KPrPBPreview::Brush ); - QHBoxLayout *hbox = new QHBoxLayout( m_brushUI->previewPanel ); - QWhatsThis::add(m_preview_color, i18n( "This displays a preview of your choices." ) ); + TQHBoxLayout *hbox = new TQHBoxLayout( m_brushUI->previewPanel ); + TQWhatsThis::add(m_preview_color, i18n( "This displays a preview of your choices." ) ); hbox->addWidget(m_preview_color); - connect( m_brushUI->styleCombo, SIGNAL( activated( int ) ), - this, SLOT( slotBrushChanged() ) ); - connect( m_brushUI->colorChooser, SIGNAL( changed( const QColor& ) ), - this, SLOT( slotBrushChanged() ) ); + connect( m_brushUI->styleCombo, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( slotBrushChanged() ) ); + connect( m_brushUI->colorChooser, TQT_SIGNAL( changed( const TQColor& ) ), + this, TQT_SLOT( slotBrushChanged() ) ); m_stack->addWidget( m_brushUI, 0 ); @@ -95,24 +95,24 @@ KPrBrushProperty::KPrBrushProperty( QWidget *parent, const char *name, const KPr m_gradientUI->styleCombo->insertItem( i18n( "Pyramid" ) ); m_preview_gradient = new KPrPBPreview( m_gradientUI->previewPanel, 0, KPrPBPreview::Gradient ); - hbox = new QHBoxLayout( m_gradientUI->previewPanel ); + hbox = new TQHBoxLayout( m_gradientUI->previewPanel ); hbox->addWidget(m_preview_gradient); - connect( m_gradientUI->styleCombo, SIGNAL( activated( int ) ), - this, SLOT( slotBackColorTypeChanged() ) ); - connect( m_gradientUI->color1Chooser, SIGNAL( changed( const QColor& ) ), - this, SLOT( slotColor1Changed() ) ); - connect( m_gradientUI->color2Chooser, SIGNAL( changed( const QColor& ) ), - this, SLOT( slotColor2Changed() ) ); - connect( m_gradientUI->unbalancedCheckBox, SIGNAL( clicked() ), - this, SLOT( slotUnbalancedChanged() ) ); - connect( m_gradientUI->xSlider, SIGNAL( valueChanged( int ) ), - this, SLOT( slotXFactorChanged() ) ); - connect( m_gradientUI->ySlider, SIGNAL( valueChanged( int ) ), - this, SLOT( slotYFactorChanged() ) ); + connect( m_gradientUI->styleCombo, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( slotBackColorTypeChanged() ) ); + connect( m_gradientUI->color1Chooser, TQT_SIGNAL( changed( const TQColor& ) ), + this, TQT_SLOT( slotColor1Changed() ) ); + connect( m_gradientUI->color2Chooser, TQT_SIGNAL( changed( const TQColor& ) ), + this, TQT_SLOT( slotColor2Changed() ) ); + connect( m_gradientUI->unbalancedCheckBox, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotUnbalancedChanged() ) ); + connect( m_gradientUI->xSlider, TQT_SIGNAL( valueChanged( int ) ), + this, TQT_SLOT( slotXFactorChanged() ) ); + connect( m_gradientUI->ySlider, TQT_SIGNAL( valueChanged( int ) ), + this, TQT_SLOT( slotYFactorChanged() ) ); m_stack->addWidget( m_gradientUI, 1 ); - m_stack->addWidget( new QFrame(), 2 ); // the transparent case + m_stack->addWidget( new TQFrame(), 2 ); // the transparent case slotReset(); } @@ -132,57 +132,57 @@ FillType KPrBrushProperty::getFillType() const } -QBrush KPrBrushProperty::getQBrush() const +TQBrush KPrBrushProperty::getTQBrush() const { - QBrush brush; + TQBrush brush; switch ( m_brushUI->styleCombo->currentItem() ) { case 0: - brush.setStyle( SolidPattern ); + brush.setStyle( Qt::SolidPattern ); break; case 1: - brush.setStyle( Dense1Pattern ); + brush.setStyle( Qt::Dense1Pattern ); break; case 2: - brush.setStyle( Dense2Pattern ); + brush.setStyle( Qt::Dense2Pattern ); break; case 3: - brush.setStyle( Dense3Pattern ); + brush.setStyle( Qt::Dense3Pattern ); break; case 4: - brush.setStyle( Dense4Pattern ); + brush.setStyle( Qt::Dense4Pattern ); break; case 5: - brush.setStyle( Dense5Pattern ); + brush.setStyle( Qt::Dense5Pattern ); break; case 6: - brush.setStyle( Dense6Pattern ); + brush.setStyle( Qt::Dense6Pattern ); break; case 7: - brush.setStyle( Dense7Pattern ); + brush.setStyle( Qt::Dense7Pattern ); break; case 8: - brush.setStyle( HorPattern ); + brush.setStyle( Qt::HorPattern ); break; case 9: - brush.setStyle( VerPattern ); + brush.setStyle( Qt::VerPattern ); break; case 10: - brush.setStyle( CrossPattern ); + brush.setStyle( Qt::CrossPattern ); break; case 11: - brush.setStyle( BDiagPattern ); + brush.setStyle( Qt::BDiagPattern ); break; case 12: - brush.setStyle( FDiagPattern ); + brush.setStyle( Qt::FDiagPattern ); break; case 13: - brush.setStyle( DiagCrossPattern ); + brush.setStyle( Qt::DiagCrossPattern ); break; } if( m_typeCombo->currentItem() == 2) - brush.setStyle( QBrush::NoBrush ); + brush.setStyle( Qt::NoBrush ); brush.setColor( m_brushUI->colorChooser->color() ); @@ -190,13 +190,13 @@ QBrush KPrBrushProperty::getQBrush() const } -QColor KPrBrushProperty::getGColor1()const +TQColor KPrBrushProperty::getGColor1()const { return m_gradientUI->color1Chooser->color(); } -QColor KPrBrushProperty::getGColor2()const +TQColor KPrBrushProperty::getGColor2()const { return m_gradientUI->color2Chooser->color(); } @@ -233,7 +233,7 @@ int KPrBrushProperty::getBrushPropertyChange() const if ( getFillType() == FT_BRUSH ) { - QBrush brush = getQBrush(); + TQBrush brush = getTQBrush(); if ( fillTypeChanged || brush.color() != m_brush.brush.color() ) { flags |= KPrBrushCmd::BrushColor; @@ -284,7 +284,7 @@ int KPrBrushProperty::getBrushPropertyChange() const KPrBrushCmd::Brush KPrBrushProperty::getBrush() const { - KPrBrushCmd::Brush brush( getQBrush(), + KPrBrushCmd::Brush brush( getTQBrush(), getGColor1(), getGColor2(), getGType(), @@ -311,10 +311,10 @@ void KPrBrushProperty::apply() m_brush.fillType = getFillType(); if ( flags & KPrBrushCmd::BrushColor ) - m_brush.brush.setColor( getQBrush().color() ); + m_brush.brush.setColor( getTQBrush().color() ); if ( flags & KPrBrushCmd::BrushStyle ) - m_brush.brush.setStyle( getQBrush().style() ); + m_brush.brush.setStyle( getTQBrush().style() ); if ( flags & KPrBrushCmd::GradientColor1 ) m_brush.gColor1 = getGColor1(); @@ -336,7 +336,7 @@ void KPrBrushProperty::apply() } -void KPrBrushProperty::setQBrush( const QBrush &brush ) +void KPrBrushProperty::setTQBrush( const TQBrush &brush ) { switch ( brush.style() ) { @@ -394,7 +394,7 @@ void KPrBrushProperty::setQBrush( const QBrush &brush ) } -void KPrBrushProperty::setGradient( const QColor &_c1, const QColor &_c2, BCType _t, +void KPrBrushProperty::setGradient( const TQColor &_c1, const TQColor &_c2, BCType _t, bool _unbalanced, int _xfactor, int _yfactor ) { m_gradientUI->styleCombo->setCurrentItem( (int) _t - 1 ); @@ -421,7 +421,7 @@ void KPrBrushProperty::slotReset() { if ( m_brush.gType == BCT_PLAIN ) m_brush.gType = BCT_GHORZ; - setQBrush( m_brush.brush ); + setTQBrush( m_brush.brush ); setGradient( m_brush.gColor1, m_brush.gColor2, m_brush.gType, @@ -430,7 +430,7 @@ void KPrBrushProperty::slotReset() m_brush.yfactor ); int panelIndex; - if( m_brush.fillType == FT_BRUSH && m_brush.brush.style() == QBrush::NoBrush ) + if( m_brush.fillType == FT_BRUSH && m_brush.brush.style() == TQBrush::NoBrush ) panelIndex = 2; else panelIndex = (int)m_brush.fillType; @@ -449,7 +449,7 @@ void KPrBrushProperty::slotTypeChanged( int pos ) void KPrBrushProperty::slotBrushChanged() { - m_preview_color->setBrush( getQBrush() ); + m_preview_color->setBrush( getTQBrush() ); } diff --git a/kpresenter/KPrBrushProperty.h b/kpresenter/KPrBrushProperty.h index 1a49c685..58f415d8 100644 --- a/kpresenter/KPrBrushProperty.h +++ b/kpresenter/KPrBrushProperty.h @@ -19,8 +19,8 @@ #ifndef BRUSHSTYLEWIDGET_H #define BRUSHSTYLEWIDGET_H -#include <qbrush.h> -#include <qwidget.h> +#include <tqbrush.h> +#include <tqwidget.h> #include "KPrCommand.h" @@ -28,16 +28,17 @@ class BrushPropertyUI; class GradientPropertyUI; class KPrPBPreview; -class QWidgetStack; +class TQWidgetStack; class KComboBox; -class KPrBrushProperty : public QWidget +class KPrBrushProperty : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrBrushProperty( QWidget *parent, const char *name, const KPrBrushCmd::Brush &brush ); + KPrBrushProperty( TQWidget *tqparent, const char *name, const KPrBrushCmd::Brush &brush ); ~KPrBrushProperty(); int getBrushPropertyChange() const; @@ -49,22 +50,22 @@ public: protected: FillType getFillType() const; - QBrush getQBrush() const; + TQBrush getTQBrush() const; - QColor getGColor1() const; - QColor getGColor2() const; + TQColor getGColor1() const; + TQColor getGColor2() const; BCType getGType() const; bool getGUnbalanced() const; int getGXFactor() const; int getGYFactor() const; - void setQBrush( const QBrush &brush ); - void setGradient( const QColor &_c1, const QColor &_c2, BCType _t, + void setTQBrush( const TQBrush &brush ); + void setGradient( const TQColor &_c1, const TQColor &_c2, BCType _t, bool _unbalanced, int _xfactor, int _yfactor ); void setUnbalancedEnabled( bool state ); KComboBox *m_typeCombo; - QWidgetStack *m_stack; + TQWidgetStack *m_stack; BrushPropertyUI *m_brushUI; GradientPropertyUI *m_gradientUI; KPrPBPreview *m_preview_color; diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 965a3fd4..134e0851 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -22,21 +22,21 @@ #include <stdlib.h> #include <math.h> -#include <qprogressdialog.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> -#include <qwmatrix.h> -#include <qapplication.h> +#include <tqprogressdialog.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> +#include <tqwmatrix.h> +#include <tqapplication.h> #include <kpopupmenu.h> -#include <qimage.h> -#include <qdatetime.h> -#include <qdropsite.h> -#include <qrect.h> -#include <qsize.h> -#include <qpoint.h> -#include <qclipboard.h> +#include <tqimage.h> +#include <tqdatetime.h> +#include <tqdropsite.h> +#include <tqrect.h> +#include <tqsize.h> +#include <tqpoint.h> +#include <tqclipboard.h> #include <kapplication.h> #include <kmimemagic.h> @@ -92,8 +92,8 @@ const int KPrCanvas::MOUSE_SNAP_DISTANCE = 4; const int KPrCanvas::KEY_SNAP_DISTANCE = 2; -KPrCanvas::KPrCanvas( QWidget *parent, const char *name, KPrView *_view ) -: QWidget( parent, name, WStaticContents|WResizeNoErase|WRepaintNoErase ) +KPrCanvas::KPrCanvas( TQWidget *tqparent, const char *name, KPrView *_view ) +: TQWidget( tqparent, name, WStaticContents|WResizeNoErase|WRepaintNoErase ) , buffer( size() ) , m_gl( _view, _view->zoomHandler() ) , m_paintGuides( false ) @@ -108,7 +108,7 @@ KPrCanvas::KPrCanvas( QWidget *parent, const char *name, KPrView *_view ) m_keyPressEvent = false; m_drawSymetricObject = false; - if ( parent ) { + if ( tqparent ) { showingLastSlide = false; mousePressed = false; drawContour = false; @@ -116,7 +116,7 @@ KPrCanvas::KPrCanvas( QWidget *parent, const char *name, KPrView *_view ) m_resizeObject = 0; m_editObject = 0; m_rotateObject = 0; - setBackgroundMode( Qt::NoBackground ); + setBackgroundMode( TQt::NoBackground ); m_view = _view; setupMenus(); setMouseTracking( true ); @@ -152,7 +152,7 @@ KPrCanvas::KPrCanvas( QWidget *parent, const char *name, KPrView *_view ) hide(); } - setFocusPolicy( QWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setFocus(); setKeyCompression( true ); setInputMethodEnabled( true ); // ensure using the InputMethod @@ -163,14 +163,14 @@ KPrCanvas::KPrCanvas( QWidget *parent, const char *name, KPrView *_view ) if( m_view) { m_activePage=m_view->kPresenterDoc()->pageList().getFirst(); - connect( m_view->kPresenterDoc(), SIGNAL( sig_terminateEditing( KPrTextObject * ) ), - this, SLOT( terminateEditing( KPrTextObject * ) ) ); - connect( m_view, SIGNAL( autoScroll( const QPoint & )), this, SLOT( slotAutoScroll( const QPoint &))); + connect( m_view->kPresenterDoc(), TQT_SIGNAL( sig_terminateEditing( KPrTextObject * ) ), + this, TQT_SLOT( terminateEditing( KPrTextObject * ) ) ); + connect( m_view, TQT_SIGNAL( autoScroll( const TQPoint & )), this, TQT_SLOT( slotAutoScroll( const TQPoint &))); } if ( kospeaker ) - connect( kospeaker, SIGNAL( customSpeakWidget(QWidget*, const QPoint&, uint) ), - this, SLOT( speakTextUnderMouse(QWidget*, const QPoint&, uint) ) ); + connect( kospeaker, TQT_SIGNAL( customSpeakWidget(TQWidget*, const TQPoint&, uint) ), + this, TQT_SLOT( speakTextUnderMouse(TQWidget*, const TQPoint&, uint) ) ); } KPrCanvas::~KPrCanvas() @@ -208,7 +208,7 @@ void KPrCanvas::scrollY( int y ) scroll( 0, dy ); } -bool KPrCanvas::eventFilter( QObject *o, QEvent *e ) +bool KPrCanvas::eventFilter( TQObject *o, TQEvent *e ) { if ( !o || !e ) return TRUE; @@ -216,49 +216,49 @@ bool KPrCanvas::eventFilter( QObject *o, QEvent *e ) KCursor::autoHideEventFilter( o, e ); switch ( e->type() ) { - case QEvent::FocusIn: + case TQEvent::FocusIn: if ( m_currentTextObjectView ) m_currentTextObjectView->focusInEvent(); return TRUE; - case QEvent::FocusOut: + case TQEvent::FocusOut: if ( m_currentTextObjectView ) m_currentTextObjectView->focusOutEvent(); return TRUE; - case QEvent::KeyPress: + case TQEvent::KeyPress: { - QKeyEvent * keyev = static_cast<QKeyEvent *>(e); + TQKeyEvent * keyev = TQT_TQKEYEVENT(e); if ( keyev->key() == KGlobalSettings::contextMenuKey() ) { popupContextMenu(); return true; } if ( m_currentTextObjectView && - (keyev->key()==Qt::Key_Home ||keyev->key()==Key_End - || keyev->key()==Qt::Key_Tab || keyev->key()==Key_Prior - || keyev->key()==Qt::Key_Next || keyev->key() == Key_Backtab) ) + (keyev->key()==TQt::Key_Home ||keyev->key()==Key_End + || keyev->key()==TQt::Key_Tab || keyev->key()==Key_Prior + || keyev->key()==TQt::Key_Next || keyev->key() == Key_Backtab) ) { m_currentTextObjectView->keyPressEvent( keyev ); return true; } - else if ( !m_currentTextObjectView && keyev->key()==Qt::Key_Tab ) + else if ( !m_currentTextObjectView && keyev->key()==TQt::Key_Tab ) { keyPressEvent(keyev); return true; } break; } - case QEvent::AccelOverride: + case TQEvent::AccelOverride: { #ifndef NDEBUG - QKeyEvent * keyev = static_cast<QKeyEvent *>(e); + TQKeyEvent * keyev = TQT_TQKEYEVENT(e); // Debug keys if ( ( keyev->state() & ControlButton ) && ( keyev->state() & ShiftButton ) ) { switch ( keyev->key() ) { - case Qt::Key_P: // 'P' -> paragraph debug + case TQt::Key_P: // 'P' -> paragraph debug printRTDebug( 0 ); keyev->accept(); break; - case Qt::Key_V: // 'V' -> verbose parag debug + case TQt::Key_V: // 'V' -> verbose parag debug printRTDebug( 1 ); keyev->accept(); break; @@ -272,7 +272,7 @@ bool KPrCanvas::eventFilter( QObject *o, QEvent *e ) default: break; } - return QWidget::eventFilter(o,e); + return TQWidget::eventFilter(o,e); } bool KPrCanvas::focusNextPrevChild( bool ) @@ -280,7 +280,7 @@ bool KPrCanvas::focusNextPrevChild( bool ) return TRUE; // Don't allow to go out of the canvas widget by pressing "Tab" } -void KPrCanvas::paintEvent( QPaintEvent* paintEvent ) +void KPrCanvas::paintEvent( TQPaintEvent* paintEvent ) { if ( isUpdatesEnabled() ) { @@ -290,12 +290,12 @@ void KPrCanvas::paintEvent( QPaintEvent* paintEvent ) if ( ! m_paintGuides ) { //kdDebug(33001) << "KPrCanvas::paintEvent" << endl; - QPainter bufPainter; - bufPainter.begin( &buffer, this ); // double-buffering - (the buffer is as big as the widget) + TQPainter bufPainter; + bufPainter.tqbegin( TQT_TQPAINTDEVICE(&buffer), this ); // double-buffering - (the buffer is as big as the widget) bufPainter.translate( -diffx(), -diffy() ); bufPainter.setBrushOrigin( -diffx(), -diffy() ); - QRect crect( paintEvent->rect() ); // the rectangle that needs to be repainted, in widget coordinates + TQRect crect( paintEvent->rect() ); // the rectangle that needs to be tqrepainted, in widget coordinates bufPainter.setClipRect( crect ); //kdDebug(33001) << "KPrCanvas::paintEvent " << DEBUGRECT( crect ) << ", " << size() << endl; @@ -333,8 +333,8 @@ void KPrCanvas::paintEvent( QPaintEvent* paintEvent ) #if 0 // this works but isn't enough - e.g. object effects need the same offsets // so we should store them, but they don't work like diffx/diffy... // (e.g. the painter mustn't be translated when painting the background) - QRect desk = KGlobalSettings::desktopGeometry(this); - QRect pgRect = m_view->kPresenterDoc()->pageList().at(0)->getZoomPageRect(); + TQRect desk = KGlobalSettings::desktopGeometry(this); + TQRect pgRect = m_view->kPresenterDoc()->pageList().at(0)->getZoomPageRect(); int offx = 0, offy = 0; if ( desk.width() > pgRect.width() ) offx = ( desk.width() - pgRect.width() ) / 2; @@ -361,8 +361,8 @@ void KPrCanvas::paintEvent( QPaintEvent* paintEvent ) } - QPixmap topBuffer( buffer ); - QPainter topPainter( &topBuffer, &buffer ); + TQPixmap topBuffer( buffer ); + TQPainter topPainter( &topBuffer, &buffer ); topPainter.translate( -diffx(), -diffy() ); topPainter.setBrushOrigin( -diffx(), -diffy() ); @@ -371,14 +371,14 @@ void KPrCanvas::paintEvent( QPaintEvent* paintEvent ) m_gl.paintGuides( topPainter ); } - topPainter.setPen( QPen( Qt::black, 1, Qt::SolidLine ) ); + topPainter.setPen( TQPen( TQt::black, 1, TQt::SolidLine ) ); topPainter.setRasterOp( NotROP ); switch ( toolEditMode ) { case MT_NONE: if ( drawRubber ) { - topPainter.setPen( QPen( black, 0, DotLine ) ); + topPainter.setPen( TQPen( black, 0, DotLine ) ); topPainter.drawRect( m_view->zoomHandler()->zoomRect( m_rubber ) ); } break; @@ -423,14 +423,14 @@ void KPrCanvas::paintEvent( QPaintEvent* paintEvent ) case INS_POLYLINE: case INS_CLOSED_POLYLINE: { - QPointArray pointArray = m_pointArray.zoomPointArray( m_view->zoomHandler() ); + TQPointArray pointArray = m_pointArray.zoomPointArray( m_view->zoomHandler() ); topPainter.drawPolyline( pointArray ); topPainter.drawLine( m_view->zoomHandler()->zoomPoint( m_startPoint ), m_view->zoomHandler()->zoomPoint( m_endPoint ) ); } break; - case INS_QUADRICBEZIERCURVE: + case INS_TQUADRICBEZIERCURVE: case INS_CUBICBEZIERCURVE: - case INS_CLOSED_QUADRICBEZIERCURVE: + case INS_CLOSED_TQUADRICBEZIERCURVE: case INS_CLOSED_CUBICBEZIERCURVE: if ( m_drawCubicBezierCurve ) { @@ -454,11 +454,11 @@ void KPrCanvas::paintEvent( QPaintEvent* paintEvent ) } -void KPrCanvas::drawBackground( QPainter *painter, const QRect& rect, KPrPage * page, bool edit ) const +void KPrCanvas::drawBackground( TQPainter *painter, const TQRect& rect, KPrPage * page, bool edit ) const { if ( edit ) { - QRect pageRect = page->getZoomPageRect(); + TQRect pageRect = page->getZoomPageRect(); if ( rect.intersects( pageRect ) ) { @@ -476,20 +476,20 @@ void KPrCanvas::drawBackground( QPainter *painter, const QRect& rect, KPrPage * pageRect.rRight() += 1; pageRect.rBottom() += 1; - QRegion grayRegion( rect ); + TQRegion grayRegion( rect ); grayRegion -= pageRect; // In edit mode we also want to draw the gray area out of the pages if ( !grayRegion.isEmpty() ) - eraseEmptySpace( painter, grayRegion, QApplication::palette().active().brush( QColorGroup::Mid ) ); + eraseEmptySpace( painter, grayRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) ); } else { // Old code, left a black area if zoomX != zoomY //page->background()->draw( painter, m_view->zoomHandler(), rect, false ); - QRect desk = KGlobalSettings::desktopGeometry(getView()); - QRect crect = desk.intersect( rect ); + TQRect desk = KGlobalSettings::desktopGeometry(getView()); + TQRect crect = desk.intersect( rect ); if ( crect.isEmpty() || !page->displayBackground()) return; @@ -502,11 +502,11 @@ void KPrCanvas::drawBackground( QPainter *painter, const QRect& rect, KPrPage * // 100% stolen from KWord -void KPrCanvas::eraseEmptySpace( QPainter * painter, const QRegion & emptySpaceRegion, const QBrush & brush ) const +void KPrCanvas::eraseEmptySpace( TQPainter * painter, const TQRegion & emptySpaceRegion, const TQBrush & brush ) const { painter->save(); - painter->setClipRegion( emptySpaceRegion, QPainter::CoordPainter ); - painter->setPen( Qt::NoPen ); + painter->setClipRegion( emptySpaceRegion, TQPainter::CoordPainter ); + painter->setPen( TQt::NoPen ); //kdDebug(33001) << "KWDocument::eraseEmptySpace emptySpaceRegion: " << DEBUGRECT( emptySpaceRegion.boundingRect() ) << endl; painter->fillRect( emptySpaceRegion.boundingRect(), brush ); @@ -514,10 +514,10 @@ void KPrCanvas::eraseEmptySpace( QPainter * painter, const QRegion & emptySpaceR } -void KPrCanvas::drawObjects( QPainter *painter, const QPtrList<KPrObject> &objects, SelectionMode selectionMode, +void KPrCanvas::drawObjects( TQPainter *painter, const TQPtrList<KPrObject> &objects, SelectionMode selectionMode, bool contour, KPrTextView * textView, int pageNum ) const { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { SelectionMode selMode = selectionMode; @@ -541,11 +541,11 @@ void KPrCanvas::drawObjects( QPainter *painter, const QPtrList<KPrObject> &objec } -void KPrCanvas::drawObjectsPres( QPainter *painter, const QPtrList<KPrObject> &_objects, PresStep step ) const +void KPrCanvas::drawObjectsPres( TQPainter *painter, const TQPtrList<KPrObject> &_objects, PresStep step ) const { - QPtrList<KPrObject> objects; + TQPtrList<KPrObject> objects; - QPtrListIterator<KPrObject> it( _objects ); + TQPtrListIterator<KPrObject> it( _objects ); for ( ; it.current(); ++it ) { if ( objectIsAHeaderFooterHidden(it.current()) ) @@ -571,13 +571,13 @@ void KPrCanvas::drawObjectsPres( QPainter *painter, const QPtrList<KPrObject> &_ } -void KPrCanvas::drawObjectsEdit( QPainter *painter, const KoRect &rect, const QPtrList<KPrObject> &_objects, +void KPrCanvas::drawObjectsEdit( TQPainter *painter, const KoRect &rect, const TQPtrList<KPrObject> &_objects, SelectionMode selectionMode, int pageNum ) const { - QPtrList<KPrObject> objects; + TQPtrList<KPrObject> objects; KPrTextView * textView = NULL; - QPtrListIterator<KPrObject> it( _objects ); + TQPtrListIterator<KPrObject> it( _objects ); for ( ; it.current(); ++it ) { if ( objectIsAHeaderFooterHidden(it.current()) ) @@ -597,12 +597,12 @@ void KPrCanvas::drawObjectsEdit( QPainter *painter, const KoRect &rect, const QP } -void KPrCanvas::drawEditPage( QPainter *painter, const QRect &_rect, +void KPrCanvas::drawEditPage( TQPainter *painter, const TQRect &_rect, KPrPage *page, SelectionMode selectionMode ) const { KoRect rect = m_view->zoomHandler()->unzoomRect(_rect); - int pageNum = m_view->kPresenterDoc()->pageList().findRef( page ); + int pageNum = m_view->kPresenterDoc()->pageList().tqfindRef( page ); //objects on master page if ( page->masterPage() && page->displayObjectFromMasterPage() ) drawObjectsEdit( painter, rect, page->masterPage()->objectList(), selectionMode, pageNum ); @@ -611,7 +611,7 @@ void KPrCanvas::drawEditPage( QPainter *painter, const QRect &_rect, } -void KPrCanvas::drawPresPage( QPainter *painter, const QRect &_rect, PresStep step ) const +void KPrCanvas::drawPresPage( TQPainter *painter, const TQRect &_rect, PresStep step ) const { KoRect rect = m_view->zoomHandler()->unzoomRect(_rect); @@ -624,16 +624,16 @@ void KPrCanvas::drawPresPage( QPainter *painter, const QRect &_rect, PresStep st } -void KPrCanvas::drawGrid(QPainter *painter, const QRect &rect2) const +void KPrCanvas::drawGrid(TQPainter *painter, const TQRect &rect2) const { KPrDocument *doc=m_view->kPresenterDoc(); if(!doc->isReadWrite()) return; - QPen _pen = QPen( doc->gridColor(), 6, Qt::DotLine ); + TQPen _pen = TQPen( doc->gridColor(), 6, TQt::DotLine ); painter->save(); painter->setPen( _pen ); - QRect pageRect = m_activePage->getZoomPageRect(); + TQRect pageRect = m_activePage->getZoomPageRect(); int zoomedX, zoomedY; double offsetX = doc->getGridX(); @@ -641,7 +641,7 @@ void KPrCanvas::drawGrid(QPainter *painter, const QRect &rect2) const for ( double i = offsetX; ( zoomedX = m_view->zoomHandler()->zoomItX( i )+pageRect.left() ) < pageRect.right(); i += offsetX ) for ( double j = offsetY; ( zoomedY = m_view->zoomHandler()->zoomItY( j )+pageRect.top() ) < pageRect.bottom(); j += offsetY ) - if( rect2.contains( zoomedX, zoomedY ) ) + if( rect2.tqcontains( zoomedX, zoomedY ) ) painter->drawPoint( zoomedX, zoomedY ); painter->restore(); @@ -650,9 +650,9 @@ void KPrCanvas::drawGrid(QPainter *painter, const QRect &rect2) const // This one is used to generate the pixmaps for the HTML presentation, // for the pres-structure-dialog, for the sidebar previews, for template icons. -void KPrCanvas::drawAllObjectsInPage( QPainter *painter, const QPtrList<KPrObject> & obj, int pageNum ) const +void KPrCanvas::drawAllObjectsInPage( TQPainter *painter, const TQPtrList<KPrObject> & obj, int pageNum ) const { - QPtrListIterator<KPrObject> it( obj ); + TQPtrListIterator<KPrObject> it( obj ); for ( ; it.current(); ++it ) { if ( objectIsAHeaderFooterHidden( it.current() ) ) continue; @@ -662,9 +662,9 @@ void KPrCanvas::drawAllObjectsInPage( QPainter *painter, const QPtrList<KPrObjec void KPrCanvas::recalcAutoGuides( ) { - QValueList<double> horizontalPos; - QValueList<double> verticalPos; - QPtrListIterator<KPrObject> it( m_activePage->objectList() ); + TQValueList<double> horizontalPos; + TQValueList<double> verticalPos; + TQPtrListIterator<KPrObject> it( m_activePage->objectList() ); for ( ; it.current(); ++it ) { if( ! it.current()->isSelected() ) @@ -674,9 +674,9 @@ void KPrCanvas::recalcAutoGuides( ) m_gl.setAutoGuideLines( horizontalPos, verticalPos ); } -void KPrCanvas::mousePressEvent( QMouseEvent *e ) +void KPrCanvas::mousePressEvent( TQMouseEvent *e ) { - QPoint contentsPoint( e->pos().x()+diffx(), e->pos().y()+diffy() ); + TQPoint contentsPoint( e->pos().x()+diffx(), e->pos().y()+diffy() ); KoPoint docPoint = m_view->zoomHandler()->unzoomPoint( contentsPoint ); m_insertRect = KoRect(); @@ -691,24 +691,24 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) { KPrTextObject *txtObj=m_currentTextObjectView->kpTextObject(); Q_ASSERT(txtObj); - if(txtObj->contains( docPoint )) + if(txtObj->tqcontains( docPoint )) { KoPoint pos = docPoint - txtObj->innerRect().topLeft(); // in pt, but now translated into the object's coordinate system // This is common to all mouse buttons, so that RMB and MMB place the cursor too m_currentTextObjectView->mousePressEvent(e, m_view->zoomHandler()->ptToLayoutUnitPix( pos ) ); // in LU pixels mousePressed = true; m_view->enableAutoScroll(); - if(e->button() == RightButton) + if(e->button() == Qt::RightButton) { - m_currentTextObjectView->showPopup( m_view, QCursor::pos(), m_view->actionList() ); + m_currentTextObjectView->showPopup( m_view, TQCursor::pos(), m_view->actionList() ); m_view->disableAutoScroll(); mousePressed=false; } - else if( e->button() == MidButton ) + else if( e->button() == Qt::MidButton ) { - QApplication::clipboard()->setSelectionMode( true ); + TQApplication::tqclipboard()->setSelectionMode( true ); m_currentTextObjectView->paste(); - QApplication::clipboard()->setSelectionMode( false ); + TQApplication::tqclipboard()->setSelectionMode( false ); } return; } @@ -722,7 +722,7 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) exitEditMode(); if ( editMode ) { - if ( e->button() == LeftButton ) { + if ( e->button() == Qt::LeftButton ) { mousePressed = true; m_view->enableAutoScroll(); @@ -736,14 +736,14 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) } if ( m_drawCubicBezierCurve && ( toolEditMode == INS_CUBICBEZIERCURVE - || toolEditMode == INS_QUADRICBEZIERCURVE + || toolEditMode == INS_TQUADRICBEZIERCURVE || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE - || toolEditMode == INS_CLOSED_QUADRICBEZIERCURVE ) ) { + || toolEditMode == INS_CLOSED_TQUADRICBEZIERCURVE ) ) { if ( m_drawLineWithCubicBezierCurve ) { - QPainter p( this ); - p.setPen( QPen( Qt::black, 1, Qt::SolidLine ) ); - p.setBrush( Qt::NoBrush ); - p.setRasterOp( Qt::NotROP ); + TQPainter p( this ); + p.setPen( TQPen( TQt::black, 1, TQt::SolidLine ) ); + p.setBrush( TQt::NoBrush ); + p.setRasterOp( TQt::NotROP ); p.translate( -diffx(), -diffy() ); KoPoint newStartPoint = snapPoint( docPoint ); @@ -760,11 +760,11 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) m_drawLineWithCubicBezierCurve = false; } else { - QPainter p( this ); - QPen _pen = QPen( Qt::black, 1, Qt::DashLine ); + TQPainter p( this ); + TQPen _pen = TQPen( TQt::black, 1, TQt::DashLine ); p.setPen( _pen ); - p.setBrush( Qt::NoBrush ); - p.setRasterOp( Qt::NotROP ); + p.setBrush( TQt::NoBrush ); + p.setRasterOp( TQt::NotROP ); p.translate( -diffx(), -diffy() ); p.save(); @@ -846,7 +846,7 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) recalcAutoGuides(); if ( m_view->kPresenterDoc()->showGuideLines() && !m_disableSnapping ) { - m_gl.repaintSnapping( objectRect( false ) ); + m_gl.tqrepaintSnapping( objectRect( false ) ); } } else @@ -865,7 +865,7 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) if ( kpobject ) { mousePressed = false; - QString msg( i18n( "The object you are trying to select belongs to the master slide. " + TQString msg( i18n( "The object you are trying to select belongs to the master slide. " "Editing the object can only be done on the master slide.\n" "Go there now?" ) ); m_view->disableAutoScroll(); // needed because the messagebox 'eats' the mouseRelease @@ -950,8 +950,8 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) m_pointArray.putPoints( m_indexPointArray, 1, m_startPoint.x(), m_startPoint.y() ); ++m_indexPointArray; } break; - case INS_CUBICBEZIERCURVE: case INS_QUADRICBEZIERCURVE: - case INS_CLOSED_CUBICBEZIERCURVE: case INS_CLOSED_QUADRICBEZIERCURVE: { + case INS_CUBICBEZIERCURVE: case INS_TQUADRICBEZIERCURVE: + case INS_CLOSED_CUBICBEZIERCURVE: case INS_CLOSED_TQUADRICBEZIERCURVE: { deSelectAllObj(); recalcAutoGuides(); mousePressed = true; @@ -978,12 +978,12 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) } } - if ( e->button() == RightButton && ( toolEditMode == INS_POLYLINE || toolEditMode == INS_CLOSED_POLYLINE ) + if ( e->button() == Qt::RightButton && ( toolEditMode == INS_POLYLINE || toolEditMode == INS_CLOSED_POLYLINE ) && !m_pointArray.isNull() && m_drawPolyline ) { if( m_indexPointArray > 1) { - QPainter p( this ); - p.setPen( QPen( black, 1, SolidLine ) ); + TQPainter p( this ); + p.setPen( TQPen( black, 1, SolidLine ) ); p.setBrush( NoBrush ); p.translate( -diffx(), -diffy() ); p.save(); @@ -997,7 +997,7 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) m_view->zoomHandler()->zoomPoint( m_pointArray.at( m_indexPointArray - 2 ) ) ); p.restore(); - m_indexPointArray = QMAX( 1, m_indexPointArray - 1 ); + m_indexPointArray = TQMAX( 1, m_indexPointArray - 1 ); m_pointArray.resize( m_indexPointArray ); m_startPoint = m_pointArray.at( m_indexPointArray - 1 ); @@ -1008,8 +1008,8 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) } else if( m_indexPointArray == 1) { - QPainter p( this ); - p.setPen( QPen( black, 1, SolidLine ) ); + TQPainter p( this ); + p.setPen( TQPen( black, 1, SolidLine ) ); p.setBrush( NoBrush ); p.setRasterOp( NotROP ); p.translate( -diffx(), -diffy() ); @@ -1026,8 +1026,8 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) return; } - if ( e->button() == RightButton && ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_QUADRICBEZIERCURVE - || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || toolEditMode == INS_CLOSED_QUADRICBEZIERCURVE ) + if ( e->button() == Qt::RightButton && ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_TQUADRICBEZIERCURVE + || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || toolEditMode == INS_CLOSED_TQUADRICBEZIERCURVE ) && !m_pointArray.isNull() && m_drawCubicBezierCurve ) { if ( m_drawLineWithCubicBezierCurve ) { KoPoint point = snapPoint( docPoint ); @@ -1042,17 +1042,17 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) endDrawCubicBezierCurve(); - m_gl.repaintAfterSnapping(); + m_gl.tqrepaintAfterSnapping(); return; } - if ( e->button() == RightButton && toolEditMode == TEM_MOUSE ) { + if ( e->button() == Qt::RightButton && toolEditMode == TEM_MOUSE ) { KPrObject * obj = getObjectAt( docPoint ); if ( obj ) { kpobject = obj; - QPoint pnt = QCursor::pos(); + TQPoint pnt = TQCursor::pos(); mousePressed = false; m_view->disableAutoScroll(); bool state=!( e->state() & ShiftButton ) && !( e->state() & ControlButton ) && !kpobject->isSelected(); @@ -1062,7 +1062,7 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) selectObj( kpobject ); objectPopup( kpobject, pnt ); } else { - QPoint pnt = QCursor::pos(); + TQPoint pnt = TQCursor::pos(); m_view->openPopupMenuMenuPage( pnt ); m_view->disableAutoScroll(); mousePressed = false; @@ -1070,30 +1070,30 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) modType = MT_NONE; } - else if( e->button() == RightButton && toolEditMode == TEM_ZOOM ) { - QPoint pnt = QCursor::pos(); + else if( e->button() == Qt::RightButton && toolEditMode == TEM_ZOOM ) { + TQPoint pnt = TQCursor::pos(); mousePressed = false; m_view->disableAutoScroll(); m_view->openPopupMenuZoom( pnt ); } - else if( e->button() == RightButton && toolEditMode != TEM_MOUSE ) { + else if( e->button() == Qt::RightButton && toolEditMode != TEM_MOUSE ) { //deactivate tools when you click on right button setToolEditMode( TEM_MOUSE ); } } else { - if ( e->button() == LeftButton ) { + if ( e->button() == Qt::LeftButton ) { if ( m_drawMode ) { setCursor( KPrUtils::penCursor() ); m_drawLineInDrawMode = true; m_drawModeLineIndex = 0; - m_drawModeLines.append( QPointArray() ); + m_drawModeLines.append( TQPointArray() ); m_drawModeLines[m_drawModeLines.count() - 1].putPoints( m_drawModeLineIndex++, 1, e->x(), e->y() ); } else m_view->screenNext(); - } else if ( e->button() == MidButton ) + } else if ( e->button() == Qt::MidButton ) m_view->screenPrev(); - else if ( e->button() == RightButton ) { + else if ( e->button() == Qt::RightButton ) { if ( !m_drawMode && !spManualSwitch() ) { finishObjectEffects(); @@ -1102,7 +1102,7 @@ void KPrCanvas::mousePressEvent( QMouseEvent *e ) } setCursor( arrowCursor ); - QPoint pnt = QCursor::pos(); + TQPoint pnt = TQCursor::pos(); int ret = m_presMenu->exec( pnt ); // we have to continue the timer if the menu was canceled and we draw mode is not active if ( ret == -1 && !m_presMenu->isItemChecked( PM_DM ) && !spManualSwitch() ) @@ -1122,7 +1122,7 @@ KoRect KPrCanvas::getAlignBoundingRect() const { KoRect boundingRect; - QPtrListIterator<KPrObject> it( m_activePage->objectList() ); + TQPtrListIterator<KPrObject> it( m_activePage->objectList() ); for ( ; it.current() ; ++it ) { if ( it.current() == m_view->kPresenterDoc()->header() || @@ -1136,12 +1136,12 @@ KoRect KPrCanvas::getAlignBoundingRect() const return boundingRect; } -void KPrCanvas::mouseReleaseEvent( QMouseEvent *e ) +void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e ) { if ( editMode && m_view->kPresenterDoc()->showGuideLines() && toolEditMode == TEM_MOUSE && m_gl.mouseReleaseEvent( e ) ) return; - QPoint contentsPoint( e->pos().x()+diffx(), e->pos().y()+diffy() ); + TQPoint contentsPoint( e->pos().x()+diffx(), e->pos().y()+diffy() ); if(m_currentTextObjectView) { m_currentTextObjectView->mouseReleaseEvent( e, contentsPoint ); @@ -1151,7 +1151,7 @@ void KPrCanvas::mouseReleaseEvent( QMouseEvent *e ) return; } - if ( e->button() != LeftButton ) + if ( e->button() != Qt::LeftButton ) return; if ( m_drawMode ) { @@ -1160,12 +1160,12 @@ void KPrCanvas::mouseReleaseEvent( QMouseEvent *e ) return; } - QPtrList<KPrObject> _objects; + TQPtrList<KPrObject> _objects; _objects.setAutoDelete( false ); if ( ( m_drawPolyline && ( toolEditMode == INS_POLYLINE || toolEditMode == INS_CLOSED_POLYLINE ) ) - || ( m_drawCubicBezierCurve && ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_QUADRICBEZIERCURVE - || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || toolEditMode == INS_CLOSED_QUADRICBEZIERCURVE ) ) ) { + || ( m_drawCubicBezierCurve && ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_TQUADRICBEZIERCURVE + || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || toolEditMode == INS_CLOSED_TQUADRICBEZIERCURVE ) ) ) { return; } @@ -1178,10 +1178,10 @@ void KPrCanvas::mouseReleaseEvent( QMouseEvent *e ) case MT_NONE: { if ( drawRubber ) { // used for selecting multiple object in with the mouse - QPainter p; + TQPainter p; p.begin( this ); p.setRasterOp( NotROP ); - p.setPen( QPen( black, 0, DotLine ) ); + p.setPen( TQPen( black, 0, DotLine ) ); p.translate( -diffx(), -diffy() ); p.drawRect( m_view->zoomHandler()->zoomRect( m_rubber ) ); p.end(); @@ -1189,7 +1189,7 @@ void KPrCanvas::mouseReleaseEvent( QMouseEvent *e ) m_rubber = m_rubber.normalize(); - QPtrListIterator<KPrObject> it( getObjectList() ); + TQPtrListIterator<KPrObject> it( getObjectList() ); for ( ; it.current() ; ++it ) { if ( it.current()->intersects( m_rubber ) ) @@ -1202,7 +1202,7 @@ void KPrCanvas::mouseReleaseEvent( QMouseEvent *e ) } if ( mouseSelectedObject ) - _repaint( false ); + _tqrepaint( false ); emit objectSelectedChanged(); } } break; @@ -1215,7 +1215,7 @@ void KPrCanvas::mouseReleaseEvent( QMouseEvent *e ) m_view->kPresenterDoc()->addCommand( cmd ); } else { - m_activePage->repaintObj(); + m_activePage->tqrepaintObj(); } m_isMoving = false; } @@ -1262,10 +1262,10 @@ void KPrCanvas::mouseReleaseEvent( QMouseEvent *e ) drawContour = FALSE; if( modType == MT_NONE && drawRubber ) { - QPainter p; + TQPainter p; p.begin( this ); p.setRasterOp( NotROP ); - p.setPen( QPen( black, 0, DotLine ) ); + p.setPen( TQPen( black, 0, DotLine ) ); p.translate( -diffx(), -diffy() ); p.drawRect( m_view->zoomHandler()->zoomRect( m_rubber ) ); p.end(); @@ -1287,7 +1287,7 @@ void KPrCanvas::mouseReleaseEvent( QMouseEvent *e ) if ( !m_rotateObject ) break; if ( m_angleBeforeRotate != m_rotateObject->getAngle() ) { - QPtrList<KPrObject> objects; + TQPtrList<KPrObject> objects; objects.append( m_rotateObject ); /* As the object is allready rotated set the angle to @@ -1374,12 +1374,12 @@ void KPrCanvas::mouseReleaseEvent( QMouseEvent *e ) default: break; } - m_gl.repaintAfterSnapping(); + m_gl.tqrepaintAfterSnapping(); emit objectSelectedChanged(); if ( toolEditMode != TEM_MOUSE && editMode ) - repaint( false ); + tqrepaint( false ); m_view->disableAutoScroll(); mousePressed = false; @@ -1388,25 +1388,25 @@ void KPrCanvas::mouseReleaseEvent( QMouseEvent *e ) mouseMoveEvent( e ); } -void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) +void KPrCanvas::mouseMoveEvent( TQMouseEvent *e ) { if ( editMode && m_view->kPresenterDoc()->showGuideLines() && toolEditMode == TEM_MOUSE && m_gl.mouseMoveEvent( e ) ) return; - QPoint contentsPoint( e->pos().x()+diffx(), e->pos().y()+diffy() ); + TQPoint contentsPoint( e->pos().x()+diffx(), e->pos().y()+diffy() ); KoPoint docPoint = m_view->zoomHandler()->unzoomPoint( contentsPoint ); if(m_currentTextObjectView) { if (m_currentTextObjectView->isLinkVariable(e->pos()) ) { - setCursor(Qt::PointingHandCursor); + setCursor(TQt::PointingHandCursor); return; } setCursor( arrowCursor ); KPrTextObject *txtObj=m_currentTextObjectView->kpTextObject(); Q_ASSERT(txtObj); - if(txtObj->contains( docPoint )&&mousePressed) + if(txtObj->tqcontains( docPoint )&&mousePressed) { KoPoint pos = docPoint - txtObj->innerRect().topLeft(); m_currentTextObjectView->mouseMoveEvent( e, m_view->zoomHandler()->ptToLayoutUnitPix( pos ) ); // in LU pixels @@ -1420,12 +1420,12 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) if(tmp_kpobject && tmp_kpobject->getType() == OT_TEXT) { KPrTextObject *kptextobject = static_cast<KPrTextObject*>( tmp_kpobject ); - QPoint iPoint = kptextobject->viewToInternal( e->pos(), this ); + TQPoint iPoint = kptextobject->viewToInternal( e->pos(), this ); KoLinkVariable* linkVar = dynamic_cast<KoLinkVariable *>( kptextobject->textObject()->variableAtPoint( iPoint ) ); if ( linkVar ) { - setCursor(Qt::PointingHandCursor); + setCursor(TQt::PointingHandCursor); return; } } @@ -1469,10 +1469,10 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) if ( modType == MT_NONE ) { if ( drawRubber ) { - QPainter p; + TQPainter p; p.begin( this ); p.setRasterOp( NotROP ); - p.setPen( QPen( black, 0, DotLine ) ); + p.setPen( TQPen( black, 0, DotLine ) ); p.translate( -diffx(), -diffy() ); p.drawRect( m_view->zoomHandler()->zoomRect( m_rubber ) ); m_rubber.setRight( docPoint.x() ); @@ -1512,10 +1512,10 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) } break; case TEM_ZOOM : { if ( drawRubber ) { - QPainter p; + TQPainter p; p.begin( this ); p.setRasterOp( NotROP ); - p.setPen( QPen( black, 0, DotLine ) ); + p.setPen( TQPen( black, 0, DotLine ) ); p.translate( -diffx(), -diffy() ); p.drawRect( m_view->zoomHandler()->zoomRect( m_rubber ) ); m_rubber.setRight( docPoint.x() ); @@ -1542,7 +1542,7 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) angle -= 360; m_rotateObject->rotate( angle ); - _repaint( m_rotateObject ); + _tqrepaint( m_rotateObject ); } }break; case INS_AUTOFORM: @@ -1554,8 +1554,8 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) case INS_TABLE: case INS_TEXT: { - QPainter p( this ); - p.setPen( QPen( black, 1, SolidLine ) ); + TQPainter p( this ); + p.setPen( TQPen( black, 1, SolidLine ) ); p.setBrush( NoBrush ); p.setRasterOp( NotROP ); p.translate( -diffx(), -diffy() ); @@ -1570,8 +1570,8 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) mouseSelectedObject = true; } break; case INS_ELLIPSE: { - QPainter p( this ); - p.setPen( QPen( black, 1, SolidLine ) ); + TQPainter p( this ); + p.setPen( TQPen( black, 1, SolidLine ) ); p.setBrush( NoBrush ); p.setRasterOp( NotROP ); p.translate( -diffx(), -diffy() ); @@ -1586,8 +1586,8 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) mouseSelectedObject = true; } break; case INS_RECT: { - QPainter p( this ); - p.setPen( QPen( black, 1, SolidLine ) ); + TQPainter p( this ); + p.setPen( TQPen( black, 1, SolidLine ) ); p.setBrush( NoBrush ); p.setRasterOp( NotROP ); p.translate( -diffx(), -diffy() ); @@ -1602,8 +1602,8 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) mouseSelectedObject = true; } break; case INS_LINE: { - QPainter p( this ); - p.setPen( QPen( black, 1, SolidLine ) ); + TQPainter p( this ); + p.setPen( TQPen( black, 1, SolidLine ) ); p.setBrush( NoBrush ); p.setRasterOp( NotROP ); p.translate( -diffx(), -diffy() ); @@ -1627,8 +1627,8 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) mouseSelectedObject = true; } break; case INS_PIE: { - QPainter p( this ); - p.setPen( QPen( black, 1, SolidLine ) ); + TQPainter p( this ); + p.setPen( TQPen( black, 1, SolidLine ) ); p.setBrush( NoBrush ); p.setRasterOp( NotROP ); p.translate( -diffx(), -diffy() ); @@ -1648,15 +1648,15 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) m_endPoint = snapPoint( docPoint ); if ( m_endPoint != m_startPoint ) { - QPainter p( this ); - p.setPen( QPen( black, 1, SolidLine ) ); + TQPainter p( this ); + p.setPen( TQPen( black, 1, SolidLine ) ); p.setBrush( NoBrush ); p.setRasterOp( NotROP ); p.translate( -diffx(), -diffy() ); if ( e->state() & AltButton ) { - QPointArray pointArray = m_pointArray.zoomPointArray( m_view->zoomHandler() ); + TQPointArray pointArray = m_pointArray.zoomPointArray( m_view->zoomHandler() ); // erase p.drawPolyline( pointArray ); m_pointArray.translate( m_endPoint.x() - m_startPoint.x(), @@ -1680,8 +1680,8 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) mouseSelectedObject = true; } break; case INS_POLYLINE: case INS_CLOSED_POLYLINE: { - QPainter p( this ); - p.setPen( QPen( black, 1, SolidLine ) ); + TQPainter p( this ); + p.setPen( TQPen( black, 1, SolidLine ) ); p.setBrush( NoBrush ); p.setRasterOp( NotROP ); p.translate( -diffx(), -diffy() ); @@ -1694,7 +1694,7 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) if ( e->state() & AltButton ) { - QPointArray pointArray = m_pointArray.zoomPointArray( m_view->zoomHandler() ); + TQPointArray pointArray = m_pointArray.zoomPointArray( m_view->zoomHandler() ); // erase p.drawPolyline( pointArray ); m_pointArray.translate( m_endPoint.x() - oldEndPoint.x(), @@ -1712,10 +1712,10 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) mouseSelectedObject = true; } break; - case INS_CUBICBEZIERCURVE: case INS_QUADRICBEZIERCURVE: - case INS_CLOSED_CUBICBEZIERCURVE: case INS_CLOSED_QUADRICBEZIERCURVE:{ - QPainter p( this ); - p.setPen( QPen( black, 1, SolidLine ) ); + case INS_CUBICBEZIERCURVE: case INS_TQUADRICBEZIERCURVE: + case INS_CLOSED_CUBICBEZIERCURVE: case INS_CLOSED_TQUADRICBEZIERCURVE:{ + TQPainter p( this ); + p.setPen( TQPen( black, 1, SolidLine ) ); p.setBrush( NoBrush ); p.setRasterOp( NotROP ); p.translate( -diffx(), -diffy() ); @@ -1766,7 +1766,7 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) double _thirdY = m_symmetricEndPoint.y() - _diffY; m_CubicBezierThirdPoint = KoPoint( _thirdX, _thirdY ); - if ( toolEditMode == INS_QUADRICBEZIERCURVE || toolEditMode == INS_CLOSED_QUADRICBEZIERCURVE ) { + if ( toolEditMode == INS_TQUADRICBEZIERCURVE || toolEditMode == INS_CLOSED_TQUADRICBEZIERCURVE ) { _secondX = _thirdX; _secondY = _thirdY; m_CubicBezierSecondPoint = KoPoint( _secondX, _secondY ); @@ -1783,8 +1783,8 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) mouseSelectedObject = true; } break; case INS_POLYGON: { - QPainter p( this ); - p.setPen( QPen( black, 1, SolidLine ) ); + TQPainter p( this ); + p.setPen( TQPen( black, 1, SolidLine ) ); p.setBrush( NoBrush ); p.setRasterOp( NotROP ); p.translate( -diffx(), -diffy() ); @@ -1802,7 +1802,7 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) } } } else if ( !editMode && m_drawMode && m_drawLineInDrawMode ) { - QPainter p; + TQPainter p; p.begin( this ); p.setPen( m_view->kPresenterDoc()->presPen() ); p.drawLine( m_drawModeLines[m_drawModeLines.count() - 1].point( m_drawModeLineIndex - 1 ), e->pos() ); @@ -1814,27 +1814,27 @@ void KPrCanvas::mouseMoveEvent( QMouseEvent *e ) setCursor( blankCursor ); } -void KPrCanvas::mouseDoubleClickEvent( QMouseEvent *e ) +void KPrCanvas::mouseDoubleClickEvent( TQMouseEvent *e ) { if(!m_view->koDocument()->isReadWrite()) return; - QPoint contentsPoint( e->pos().x()+diffx(), e->pos().y()+diffy() ); + TQPoint contentsPoint( e->pos().x()+diffx(), e->pos().y()+diffy() ); KoPoint docPoint = m_view->zoomHandler()->unzoomPoint( contentsPoint ); if(m_currentTextObjectView) { KPrTextObject *txtObj=m_currentTextObjectView->kpTextObject(); Q_ASSERT(txtObj); - if(txtObj->contains( docPoint )) + if(txtObj->tqcontains( docPoint )) { KoPoint pos = docPoint - txtObj->getOrig(); - //pos=m_view->zoomHandler()->pixelToLayoutUnit(QPoint(pos.x(),pos.y())); + //pos=m_view->zoomHandler()->pixelToLayoutUnit(TQPoint(pos.x(),pos.y())); m_currentTextObjectView->mouseDoubleClickEvent( e, m_view->zoomHandler()->ptToLayoutUnitPix( pos ) ); return; } } //disallow activating objects outside the "page" - if ( !m_activePage->getPageRect().contains(docPoint)) + if ( !m_activePage->getPageRect().tqcontains(docPoint)) return; @@ -1890,9 +1890,9 @@ void KPrCanvas::mouseDoubleClickEvent( QMouseEvent *e ) } } -void KPrCanvas::drawPieObject( QPainter *p, const KoRect & rect ) +void KPrCanvas::drawPieObject( TQPainter *p, const KoRect & rect ) { - QRect pRect( m_view->zoomHandler()->zoomRect( rect ) ); + TQRect pRect( m_view->zoomHandler()->zoomRect( rect ) ); switch ( m_view->getPieType() ) { case PT_PIE: p->drawPie( pRect.x(), pRect.y(), pRect.width() - 2, @@ -1911,7 +1911,7 @@ void KPrCanvas::drawPieObject( QPainter *p, const KoRect & rect ) } -void KPrCanvas::wheelEvent( QWheelEvent *e ) +void KPrCanvas::wheelEvent( TQWheelEvent *e ) { if ( !editMode && !m_drawMode ) { if ( e->delta() == -120 ) // wheel down @@ -1924,45 +1924,45 @@ void KPrCanvas::wheelEvent( QWheelEvent *e ) emit sigMouseWheelEvent( e ); } -void KPrCanvas::keyPressEvent( QKeyEvent *e ) +void KPrCanvas::keyPressEvent( TQKeyEvent *e ) { if ( editMode && m_view->kPresenterDoc()->showGuideLines() && m_gl.keyPressEvent( e ) ) return; if ( !editMode ) { switch ( e->key() ) { - case Qt::Key_Space: case Key_Right: case Key_Down: + case TQt::Key_Space: case Key_Right: case Key_Down: setSwitchingMode( false ); m_view->screenNext(); break; - case Qt::Key_Next: + case TQt::Key_Next: setSwitchingMode( false ); m_view->screenNext( true ); break; - case Qt::Key_Backspace: case Key_Left: case Key_Up: + case TQt::Key_Backspace: case Key_Left: case Key_Up: setSwitchingMode( false ); finishObjectEffects(); finishPageEffect( true ); m_view->screenPrev(); break; - case Qt::Key_Prior: + case TQt::Key_Prior: setSwitchingMode( false ); finishObjectEffects(); finishPageEffect( true ); m_view->screenPrev( true ); break; - case Qt::Key_Escape: case Key_Q: case Key_X: + case TQt::Key_Escape: case Key_Q: case Key_X: setSwitchingMode( false ); finishObjectEffects(); finishPageEffect( true ); m_view->screenStop(); break; - case Qt::Key_G: + case TQt::Key_G: // setSwitchingMode( false ) not needed as it is allready done in slotGotoPage; if ( !spManualSwitch() ) m_view->stopAutoPresTimer(); slotGotoPage(); break; - case Qt::Key_Home: // go to first page + case TQt::Key_Home: // go to first page setSwitchingMode( false ); presGotoFirstPage(); if ( !spManualSwitch() ) { @@ -1970,7 +1970,7 @@ void KPrCanvas::keyPressEvent( QKeyEvent *e ) m_setPageTimer = true; } break; - case Qt::Key_End: // go to last page + case TQt::Key_End: // go to last page setSwitchingMode( false ); if ( m_presentationSlidesIterator != m_presentationSlides.end() ) { gotoPage( *(--m_presentationSlides.end()) ); @@ -1983,7 +1983,7 @@ void KPrCanvas::keyPressEvent( QKeyEvent *e ) default: break; } } else if ( m_editObject ) { - if ( e->key() == Qt::Key_Escape ) { + if ( e->key() == TQt::Key_Escape ) { exitEditMode(); } else if ( m_currentTextObjectView ) @@ -1998,16 +1998,16 @@ void KPrCanvas::keyPressEvent( QKeyEvent *e ) { switch ( e->key() ) { - case Qt::Key_Next: + case TQt::Key_Next: m_view->nextPage(); break; - case Qt::Key_Prior: + case TQt::Key_Prior: m_view->prevPage(); break; - case Qt::Key_Home: // go to first page + case TQt::Key_Home: // go to first page m_view->screenFirst(); break; - case Qt::Key_End: // go to first page + case TQt::Key_End: // go to first page m_view->screenLast(); break; default: @@ -2023,8 +2023,8 @@ void KPrCanvas::keyPressEvent( QKeyEvent *e ) if ( e->state() & ControlButton ) { - offsetx = QMAX(1,m_view->zoomHandler()->zoomItX(10)); - offsety = QMAX(1,m_view->zoomHandler()->zoomItY(10)); + offsetx = TQMAX(1,m_view->zoomHandler()->zoomItX(10)); + offsety = TQMAX(1,m_view->zoomHandler()->zoomItY(10)); } if ( !m_keyPressEvent ) @@ -2033,27 +2033,27 @@ void KPrCanvas::keyPressEvent( QKeyEvent *e ) } switch ( e->key() ) { - case Qt::Key_Up: + case TQt::Key_Up: m_keyPressEvent = true; moveObjectsByKey( 0, -offsety ); break; - case Qt::Key_Down: + case TQt::Key_Down: m_keyPressEvent = true; moveObjectsByKey( 0, offsety ); break; - case Qt::Key_Right: + case TQt::Key_Right: m_keyPressEvent = true; moveObjectsByKey( offsetx, 0 ); break; - case Qt::Key_Left: + case TQt::Key_Left: m_keyPressEvent = true; moveObjectsByKey( -offsetx, 0 ); break; - case Qt::Key_Delete: + case TQt::Key_Delete: case Key_Backspace: m_view->editDelete(); break; - case Qt::Key_Escape: + case TQt::Key_Escape: { if ( mousePressed && toolEditMode == TEM_MOUSE ) { @@ -2068,12 +2068,12 @@ void KPrCanvas::keyPressEvent( QKeyEvent *e ) case MT_RESIZE_RU: case MT_RESIZE_RD: { - QRect oldBoundingRect = m_view->zoomHandler()->zoomRect( m_resizeObject->getRepaintRect() ); + TQRect oldBoundingRect = m_view->zoomHandler()->zoomRect( m_resizeObject->getRepaintRect() ); m_resizeObject->setOrig( m_rectBeforeResize.topLeft() ); m_resizeObject->setSize( m_rectBeforeResize.size() ); drawContour = false; - m_view->kPresenterDoc()->repaint( oldBoundingRect ); - m_view->kPresenterDoc()->repaint( m_resizeObject ); + m_view->kPresenterDoc()->tqrepaint( oldBoundingRect ); + m_view->kPresenterDoc()->tqrepaint( m_resizeObject ); m_ratio = 0.0; m_resizeObject = 0; m_isResizing = false; @@ -2104,13 +2104,13 @@ void KPrCanvas::keyPressEvent( QKeyEvent *e ) setToolEditMode( TEM_MOUSE ); break; } - case Qt::Key_Shift: + case TQt::Key_Shift: { bool oldChangeSnap = m_disableSnapping; - m_disableSnapping = e->key() == Qt::Key_Shift; + m_disableSnapping = e->key() == TQt::Key_Shift; if ( !oldChangeSnap && m_disableSnapping ) { - m_gl.repaintAfterSnapping(); + m_gl.tqrepaintAfterSnapping(); } // undo snapping for move by mouse if ( e->state() & Qt::LeftButton && m_isMoving ) @@ -2125,25 +2125,25 @@ void KPrCanvas::keyPressEvent( QKeyEvent *e ) else { switch ( e->key() ) { - case Qt::Key_Down: + case TQt::Key_Down: m_view->getVScrollBar()->addLine(); break; - case Qt::Key_Up: + case TQt::Key_Up: m_view->getVScrollBar()->subtractLine(); break; - case Qt::Key_Right: + case TQt::Key_Right: m_view->getHScrollBar()->addLine(); break; - case Qt::Key_Left: + case TQt::Key_Left: m_view->getHScrollBar()->subtractLine(); break; - case Qt::Key_Tab: + case TQt::Key_Tab: selectNext(); break; - case Qt::Key_Backtab: + case TQt::Key_Backtab: selectPrev(); break; - case Qt::Key_Escape: + case TQt::Key_Escape: if ( toolEditMode == TEM_ZOOM ) setToolEditMode( TEM_MOUSE ); break; @@ -2153,7 +2153,7 @@ void KPrCanvas::keyPressEvent( QKeyEvent *e ) } } -void KPrCanvas::keyReleaseEvent( QKeyEvent *e ) +void KPrCanvas::keyReleaseEvent( TQKeyEvent *e ) { if ( editMode && m_currentTextObjectView ) m_currentTextObjectView->keyReleaseEvent( e ); @@ -2161,7 +2161,7 @@ void KPrCanvas::keyReleaseEvent( QKeyEvent *e ) { if ( mouseSelectedObject ) { - if(e->key()==Qt::Key_Up || e->key()==Key_Down || e->key()==Key_Right || e->key()==Key_Left) + if(e->key()==TQt::Key_Up || e->key()==Key_Down || e->key()==Key_Right || e->key()==Key_Left) { if ( !e->isAutoRepeat() ) { @@ -2177,7 +2177,7 @@ void KPrCanvas::keyReleaseEvent( QKeyEvent *e ) } } -void KPrCanvas::imStartEvent( QIMEvent * e ) +void KPrCanvas::imStartEvent( TQIMEvent * e ) { if ( m_editObject && m_currentTextObjectView ) { @@ -2188,7 +2188,7 @@ void KPrCanvas::imStartEvent( QIMEvent * e ) } } -void KPrCanvas::imComposeEvent( QIMEvent * e ) +void KPrCanvas::imComposeEvent( TQIMEvent * e ) { if ( m_editObject && m_currentTextObjectView ) { @@ -2197,7 +2197,7 @@ void KPrCanvas::imComposeEvent( QIMEvent * e ) } } -void KPrCanvas::imEndEvent( QIMEvent * e ) +void KPrCanvas::imEndEvent( TQIMEvent * e ) { if ( m_editObject && m_currentTextObjectView ) { @@ -2206,14 +2206,14 @@ void KPrCanvas::imEndEvent( QIMEvent * e ) } } -void KPrCanvas::resizeEvent( QResizeEvent *e ) +void KPrCanvas::resizeEvent( TQResizeEvent *e ) { if ( editMode ) { - QWidget::resizeEvent( e ); + TQWidget::resizeEvent( e ); } else - QWidget::resizeEvent( new QResizeEvent( KGlobalSettings::desktopGeometry(this).size(), + TQWidget::resizeEvent( new TQResizeEvent( KGlobalSettings::desktopGeometry(this).size(), e->oldSize() ) ); buffer.resize( size() ); } @@ -2222,7 +2222,7 @@ bool KPrCanvas::close( bool alsoDelete ) { if ( editMode ) { - return QWidget::close(alsoDelete); + return TQWidget::close(alsoDelete); } else { @@ -2243,7 +2243,7 @@ KPrObject * KPrCanvas::getObjectAt( const KoPoint &pos, bool withoutProtected ) void KPrCanvas::selectObj( KPrObject *kpobject ) { kpobject->setSelected( true ); - _repaint( kpobject ); + _tqrepaint( kpobject ); emit objectSelectedChanged(); mouseSelectedObject = true; @@ -2252,7 +2252,7 @@ void KPrCanvas::selectObj( KPrObject *kpobject ) void KPrCanvas::deSelectObj( KPrObject *kpobject ) { kpobject->setSelected( false ); - _repaint( kpobject ); + _tqrepaint( kpobject ); if ( !m_activePage->isOneObjectSelected() ) { @@ -2263,7 +2263,7 @@ void KPrCanvas::deSelectObj( KPrObject *kpobject ) void KPrCanvas::selectAllObj() { - QPtrListIterator<KPrObject> it( m_activePage->objectList() ); + TQPtrListIterator<KPrObject> it( m_activePage->objectList() ); for ( ; it.current() ; ++it ) { if ( !objectIsAHeaderFooterHidden(it.current()) ) @@ -2271,7 +2271,7 @@ void KPrCanvas::selectAllObj() } mouseSelectedObject = true; - _repaint( false ); + _tqrepaint( false ); emit objectSelectedChanged(); } @@ -2310,12 +2310,12 @@ void KPrCanvas::setupMenus() Q_CHECK_PTR( m_presMenu ); m_presMenu->setCheckable( true ); m_presMenu->insertTitle( i18n( "Slide Show" ) ); - m_presMenu->insertItem( i18n( "&Continue" ), this, SLOT( setSwitchingMode() ) ); - PM_DM = m_presMenu->insertItem( i18n( "&Drawing Mode" ), this, SLOT( setDrawingMode() ) ); + m_presMenu->insertItem( i18n( "&Continue" ), this, TQT_SLOT( setSwitchingMode() ) ); + PM_DM = m_presMenu->insertItem( i18n( "&Drawing Mode" ), this, TQT_SLOT( setDrawingMode() ) ); m_presMenu->insertSeparator(); - m_presMenu->insertItem( SmallIcon("goto"), i18n( "&Goto Slide..." ), this, SLOT( slotGotoPage() ) ); + m_presMenu->insertItem( SmallIcon("goto"), i18n( "&Goto Slide..." ), this, TQT_SLOT( slotGotoPage() ) ); m_presMenu->insertSeparator(); - m_presMenu->insertItem( i18n( "&End" ), this, SLOT( slotExitPres() ) ); + m_presMenu->insertItem( i18n( "&End" ), this, TQT_SLOT( slotExitPres() ) ); m_presMenu->setItemChecked( PM_DM, false ); m_presMenu->setMouseTracking( true ); } @@ -2354,9 +2354,9 @@ bool KPrCanvas::exportPage( int nPage, int quality ) { bool res = false; - const QCursor oldCursor( cursor() ); + const TQCursor oldCursor( cursor() ); setCursor( waitCursor ); - QPixmap pix( nWidth, nHeight ); + TQPixmap pix( nWidth, nHeight ); drawPageInPix( pix, nPage, 0, true, nWidth, nHeight ); if( !pix.isNull() ){ // Depending on the desired target size due to rounding @@ -2365,7 +2365,7 @@ bool KPrCanvas::exportPage( int nPage, // remove the additional columns/rows. This can be done // since KPresenter is leaving a minimal border below/at // the right of the image anyway. - const QSize desiredSize(nWidth, nHeight); + const TQSize desiredSize(nWidth, nHeight); if( desiredSize != pix.size() ) pix.resize( desiredSize ); // save the pixmap to the desired file @@ -2377,7 +2377,7 @@ bool KPrCanvas::exportPage( int nPage, if( !bLocalFile ) tmpFile->setAutoDelete( true ); if( bLocalFile || 0 == tmpFile->status() ){ - QFile file( bLocalFile ? fileURL.path(0) : tmpFile->name() ); + TQFile file( bLocalFile ? fileURL.path(0) : tmpFile->name() ); if ( file.open( IO_ReadWrite ) ) { res = pix.save( &file, format, quality ); file.close(); @@ -2403,10 +2403,10 @@ void KPrCanvas::savePicture() void KPrCanvas::setTextFormat(const KoTextFormat &format, int flags) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; KMacroCommand* macroCmd = new KMacroCommand( i18n("Change Text Font") ); - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); for ( ; it.current() ; ++it ) { KCommand *cmd = it.current()->setFormatCommand(&format, flags, true); @@ -2416,11 +2416,11 @@ void KPrCanvas::setTextFormat(const KoTextFormat &format, int flags) m_view->kPresenterDoc()->addCommand( macroCmd ); } -void KPrCanvas::setTextColor( const QColor &color ) +void KPrCanvas::setTextColor( const TQColor &color ) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = new KMacroCommand( i18n("Set Text Color") ); for ( ; it.current() ; ++it ) { KCommand* cmd = it.current()->setTextColorCommand( color ); @@ -2430,11 +2430,11 @@ void KPrCanvas::setTextColor( const QColor &color ) m_view->kPresenterDoc()->addCommand( macroCmd ); } -void KPrCanvas::setTextBackgroundColor( const QColor &color ) +void KPrCanvas::setTextBackgroundColor( const TQColor &color ) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { KCommand* cmd = it.current()->setTextBackgroundColorCommand( color ); @@ -2451,9 +2451,9 @@ void KPrCanvas::setTextBackgroundColor( const QColor &color ) void KPrCanvas::setTextBold( bool b ) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { KCommand* cmd = it.current()->setBoldCommand( b ); @@ -2470,9 +2470,9 @@ void KPrCanvas::setTextBold( bool b ) void KPrCanvas::setTextItalic( bool b ) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { KCommand* cmd = it.current()->setItalicCommand( b ); @@ -2489,9 +2489,9 @@ void KPrCanvas::setTextItalic( bool b ) void KPrCanvas::setTextUnderline( bool b ) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { KCommand* cmd = it.current()->setUnderlineCommand( b ); @@ -2508,10 +2508,10 @@ void KPrCanvas::setTextUnderline( bool b ) void KPrCanvas::setTextStrikeOut( bool b ) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; KMacroCommand* macroCmd = 0L; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); for ( ; it.current() ; ++it ) { KCommand *cmd = it.current()->setStrikeOutCommand( b ); if ( cmd ) @@ -2525,12 +2525,12 @@ void KPrCanvas::setTextStrikeOut( bool b ) m_view->kPresenterDoc()->addCommand( macroCmd ); } -void KPrCanvas::setTextFamily( const QString &f ) +void KPrCanvas::setTextFamily( const TQString &f ) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; KMacroCommand* macroCmd = 0L; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); for ( ; it.current() ; ++it ) { KCommand* cmd = it.current()->setFamilyCommand( f ); if ( cmd ) @@ -2546,10 +2546,10 @@ void KPrCanvas::setTextFamily( const QString &f ) void KPrCanvas::setTextPointSize( int s ) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; KMacroCommand* macroCmd = 0L; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); for ( ; it.current() ; ++it ) { KCommand* cmd = it.current()->setPointSizeCommand( s ); if ( cmd ) @@ -2566,9 +2566,9 @@ void KPrCanvas::setTextPointSize( int s ) void KPrCanvas::setTextSubScript( bool b ) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { KCommand* cmd = it.current()->setTextSubScriptCommand( b ); @@ -2585,9 +2585,9 @@ void KPrCanvas::setTextSubScript( bool b ) void KPrCanvas::setTextSuperScript( bool b ) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { KCommand* cmd = it.current()->setTextSuperScriptCommand( b ); @@ -2604,9 +2604,9 @@ void KPrCanvas::setTextSuperScript( bool b ) void KPrCanvas::setTextDefaultFormat( ) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { KCommand* cmd = it.current()->setDefaultFormatCommand( ); @@ -2623,9 +2623,9 @@ void KPrCanvas::setTextDefaultFormat( ) void KPrCanvas::setIncreaseFontSize() { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); int size = it.current()->currentFormat()->pointSize(); KMacroCommand* macroCmd =0L; for ( ; it.current() ; ++it ) { @@ -2643,9 +2643,9 @@ void KPrCanvas::setIncreaseFontSize() void KPrCanvas::setDecreaseFontSize() { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); int size = it.current()->currentFormat()->pointSize(); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { @@ -2663,9 +2663,9 @@ void KPrCanvas::setDecreaseFontSize() void KPrCanvas::setTextAlign( int align ) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { KCommand* cmd = it.current()->setAlignCommand(align); @@ -2682,9 +2682,9 @@ void KPrCanvas::setTextAlign( int align ) void KPrCanvas::setTabList( const KoTabulatorList & tabList ) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { KCommand* cmd = it.current()->setTabListCommand(tabList ); @@ -2701,17 +2701,17 @@ void KPrCanvas::setTabList( const KoTabulatorList & tabList ) void KPrCanvas::setTextDepthPlus() { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; double leftMargin=0.0; if(!lst.isEmpty()) - leftMargin=lst.first()->currentParagLayoutFormat()->margins[QStyleSheetItem::MarginLeft]; + leftMargin=lst.first()->currentParagLayoutFormat()->margins[TQStyleSheetItem::MarginLeft]; double indent = m_view->kPresenterDoc()->getIndentValue(); double newVal = leftMargin + indent; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { - KCommand* cmd = it.current()->setMarginCommand(QStyleSheetItem::MarginLeft, newVal); + KCommand* cmd = it.current()->setMarginCommand(TQStyleSheetItem::MarginLeft, newVal); if ( cmd ) { if ( !macroCmd ) @@ -2723,25 +2723,25 @@ void KPrCanvas::setTextDepthPlus() m_view->kPresenterDoc()->addCommand( macroCmd ); if(!lst.isEmpty()) { - const KoParagLayout *layout=lst.first()->currentParagLayoutFormat(); - m_view->showRulerIndent( layout->margins[QStyleSheetItem::MarginLeft], layout->margins[QStyleSheetItem::MarginFirstLine], - layout->margins[QStyleSheetItem::MarginRight], lst.first()->rtl()); + const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat(); + m_view->showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], + tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); } } void KPrCanvas::setTextDepthMinus() { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; double leftMargin=0.0; if(!lst.isEmpty()) - leftMargin=lst.first()->currentParagLayoutFormat()->margins[QStyleSheetItem::MarginLeft]; + leftMargin=lst.first()->currentParagLayoutFormat()->margins[TQStyleSheetItem::MarginLeft]; double indent = m_view->kPresenterDoc()->getIndentValue(); - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); double newVal = leftMargin - indent; KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { - KCommand* cmd = it.current()->setMarginCommand(QStyleSheetItem::MarginLeft, QMAX( newVal, 0 )); + KCommand* cmd = it.current()->setMarginCommand(TQStyleSheetItem::MarginLeft, TQMAX( newVal, 0 )); if ( cmd ) { if ( !macroCmd ) @@ -2753,20 +2753,20 @@ void KPrCanvas::setTextDepthMinus() m_view->kPresenterDoc()->addCommand( macroCmd ); if(!lst.isEmpty()) { - const KoParagLayout *layout=lst.first()->currentParagLayoutFormat(); - m_view->showRulerIndent( layout->margins[QStyleSheetItem::MarginLeft], layout->margins[QStyleSheetItem::MarginFirstLine], - layout->margins[QStyleSheetItem::MarginRight], lst.first()->rtl()); + const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat(); + m_view->showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], + tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); } } void KPrCanvas::setNewFirstIndent(double _firstIndent) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { - KCommand* cmd = it.current()->setMarginCommand(QStyleSheetItem::MarginFirstLine, _firstIndent); + KCommand* cmd = it.current()->setMarginCommand(TQStyleSheetItem::MarginFirstLine, _firstIndent); if ( cmd ) { if ( !macroCmd ) @@ -2780,12 +2780,12 @@ void KPrCanvas::setNewFirstIndent(double _firstIndent) void KPrCanvas::setNewLeftIndent(double _leftIndent) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { - KCommand* cmd = it.current()->setMarginCommand(QStyleSheetItem::MarginLeft, _leftIndent); + KCommand* cmd = it.current()->setMarginCommand(TQStyleSheetItem::MarginLeft, _leftIndent); if ( cmd ) { if ( !macroCmd ) @@ -2799,12 +2799,12 @@ void KPrCanvas::setNewLeftIndent(double _leftIndent) void KPrCanvas::setNewRightIndent(double _rightIndent) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { - KCommand* cmd = it.current()->setMarginCommand(QStyleSheetItem::MarginRight, _rightIndent); + KCommand* cmd = it.current()->setMarginCommand(TQStyleSheetItem::MarginRight, _rightIndent); if ( cmd ) { if ( !macroCmd ) @@ -2818,9 +2818,9 @@ void KPrCanvas::setNewRightIndent(double _rightIndent) /*void KPrCanvas::setTextCounter(KoParagCounter counter) { - QPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { KCommand* cmd = it.current()->setCounterCommand(counter ); @@ -2863,9 +2863,9 @@ bool KPrCanvas::haveASelectedPixmapObj() const return m_activePage->haveASelectedPixmapObj(); } -QPtrList<KPrTextObject> KPrCanvas::applicableTextObjects() const +TQPtrList<KPrTextObject> KPrCanvas::applicableTextObjects() const { - QPtrList<KPrTextObject> lst; + TQPtrList<KPrTextObject> lst; // If we're editing a text object, then that's the one we return if ( m_currentTextObjectView ) lst.append( m_currentTextObjectView->kpTextObject() ); @@ -2874,10 +2874,10 @@ QPtrList<KPrTextObject> KPrCanvas::applicableTextObjects() const return lst; } -QPtrList<KoTextFormatInterface> KPrCanvas::applicableTextInterfaces() const +TQPtrList<KoTextFormatInterface> KPrCanvas::applicableTextInterfaces() const { - QPtrList<KoTextFormatInterface> lst; - QPtrList<KPrObject> lstObj; + TQPtrList<KoTextFormatInterface> lst; + TQPtrList<KPrObject> lstObj; // If we're editing a text object, then that's the one we return if ( m_currentTextObjectView ) { @@ -2887,7 +2887,7 @@ QPtrList<KoTextFormatInterface> KPrCanvas::applicableTextInterfaces() const else { m_activePage->getAllObjectSelectedList(lstObj); - QPtrListIterator<KPrObject> it(lstObj); + TQPtrListIterator<KPrObject> it(lstObj); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_TEXT ) { @@ -2900,10 +2900,10 @@ QPtrList<KoTextFormatInterface> KPrCanvas::applicableTextInterfaces() const return lst; } -QPtrList<KPrTextObject> KPrCanvas::selectedTextObjs() const +TQPtrList<KPrTextObject> KPrCanvas::selectedTextObjs() const { - QPtrList<KPrTextObject> lst; - QPtrListIterator<KPrObject> it(getObjectList()); + TQPtrList<KPrTextObject> lst; + TQPtrListIterator<KPrObject> it(getObjectList()); for ( ; it.current(); ++it ) { if ( it.current()->isSelected() && it.current()->getType() == OT_TEXT ) lst.append( static_cast<KPrTextObject*>( it.current() ) ); @@ -2932,19 +2932,19 @@ void KPrCanvas::startScreenPresentation( double zoomX, double zoomY, int curPgNu m_zoomBeforePresentation = doc->zoomHandler()->zoom(); kdDebug() << "old zoomed resolutions =" << doc->zoomHandler()->zoomedResolutionX() << "," << doc->zoomHandler()->zoomedResolutionY() << endl; - // Seems to fail (Qt uses the wrong font sizes...) + // Seems to fail (TQt uses the wrong font sizes...) //doc->zoomHandler()->setZoomedResolution( zoomX * doc->zoomHandler()->zoomedResolutionX(), // zoomY * doc->zoomHandler()->zoomedResolutionY() ); // Apply the new zooming to the existing one - doc->zoomHandler()->setZoomAndResolution( qRound( zoom * m_zoomBeforePresentation ), + doc->zoomHandler()->setZoomAndResolution( tqRound( zoom * m_zoomBeforePresentation ), KoGlobal::dpiX(), KoGlobal::dpiY() ); doc->newZoomAndResolution( false, false ); // add all selected slides m_presentationSlides.clear(); - QValueList<int> selected = doc->displaySelectedSlides(); - for ( QValueList<int>::Iterator it = selected.begin() ; it != selected.end(); ++ it ) + TQValueList<int> selected = doc->displaySelectedSlides(); + for ( TQValueList<int>::Iterator it = selected.begin() ; it != selected.end(); ++ it ) { // ARGLLLRGLRLGRLG selectedSlides gets us 0-based numbers, // and here we want 1-based numbers ! @@ -2989,7 +2989,7 @@ void KPrCanvas::stopScreenPresentation() m_step.m_pageNumber = 0; editMode = true; m_drawMode = false; - repaint( false ); + tqrepaint( false ); setToolEditMode( toolEditMode ); setWFlags( WResizeNoErase ); } @@ -3014,7 +3014,7 @@ bool KPrCanvas::pNext( bool gotoNextPage ) // First try to go one sub-step further, if any object requires it // ### should we also objects on the sticky page be checked for sub steps? - QPtrListIterator<KPrObject> oit( doc->pageList().at( m_step.m_pageNumber )->objectList() ); + TQPtrListIterator<KPrObject> oit( doc->pageList().at( m_step.m_pageNumber )->objectList() ); for ( int i = 0 ; oit.current(); ++oit, ++i ) { KPrObject *kpobject = oit.current(); @@ -3034,7 +3034,7 @@ bool KPrCanvas::pNext( bool gotoNextPage ) // Then try to see if there is still one step to do in the current page if ( m_step.m_step < *( --m_pageEffectSteps.end() ) ) { - QValueList<int>::ConstIterator it = m_pageEffectSteps.find( m_step.m_step ); + TQValueList<int>::ConstIterator it = m_pageEffectSteps.tqfind( m_step.m_step ); m_step.m_step = *( ++it ); m_step.m_subStep = 0; //kdDebug(33001) << "Page::pNext setting currentEffectStep to " << m_step.m_step << endl; @@ -3042,10 +3042,10 @@ bool KPrCanvas::pNext( bool gotoNextPage ) // if first step on page, draw background if ( m_step.m_step == 0 ) { - QPainter p; + TQPainter p; p.begin( this ); drawBackground( &p, - QRect( 0, 0, kapp->desktop()->width(), kapp->desktop()->height() ), + TQRect( 0, 0, kapp->desktop()->width(), kapp->desktop()->height() ), doc->pageList().at( m_step.m_pageNumber ) ); p.end(); } @@ -3063,7 +3063,7 @@ bool KPrCanvas::pNext( bool gotoNextPage ) } // No more steps in this page, try to go to the next page - QValueList<int>::ConstIterator test( m_presentationSlidesIterator ); + TQValueList<int>::ConstIterator test( m_presentationSlidesIterator ); if ( ++test != m_presentationSlides.end() ) { if ( !spManualSwitch() && m_setPageTimer ) @@ -3075,8 +3075,8 @@ bool KPrCanvas::pNext( bool gotoNextPage ) } m_setPageTimer = true; - QRect desk = KGlobalSettings::desktopGeometry(this); - QPixmap _pix1( desk.width(), desk.height() ); + TQRect desk = KGlobalSettings::desktopGeometry(this); + TQPixmap _pix1( desk.width(), desk.height() ); drawCurrentPageInPix( _pix1 ); m_view->setPageDuration( m_step.m_pageNumber ); @@ -3087,17 +3087,17 @@ bool KPrCanvas::pNext( bool gotoNextPage ) m_pageEffectSteps = doc->getPageEffectSteps( m_step.m_pageNumber ); m_step.m_step = *m_pageEffectSteps.begin(); - QPixmap _pix2( desk.width(), desk.height() ); + TQPixmap _pix2( desk.width(), desk.height() ); drawCurrentPageInPix( _pix2 ); - QValueList<int>::ConstIterator it( m_presentationSlidesIterator ); + TQValueList<int>::ConstIterator it( m_presentationSlidesIterator ); --it; KPrPage * page = doc->pageList().at( ( *it ) - 1 ); PageEffect _pageEffect = page->getPageEffect(); bool _soundEffect = page->getPageSoundEffect(); - QString _soundFileName = page->getPageSoundFileName(); + TQString _soundFileName = page->getPageSoundFileName(); if ( _soundEffect && !_soundFileName.isEmpty() ) { stopSound(); @@ -3107,7 +3107,7 @@ bool KPrCanvas::pNext( bool gotoNextPage ) if ( m_pageEffect ) finishPageEffect(); - m_pageEffect = new KPrPageEffects( this, _pix2, _pageEffect, page->getPageEffectSpeed() ); + m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(this), _pix2, _pageEffect, page->getPageEffectSpeed() ); if ( m_pageEffect->doEffect() ) { delete m_pageEffect; @@ -3117,7 +3117,7 @@ bool KPrCanvas::pNext( bool gotoNextPage ) } else { - connect( &m_pageEffectTimer, SIGNAL( timeout() ), SLOT( slotDoPageEffect() ) ); + connect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoPageEffect() ) ); m_pageEffectTimer.start( 50, true ); } @@ -3132,10 +3132,10 @@ bool KPrCanvas::pNext( bool gotoNextPage ) { m_view->setPageDuration( m_step.m_pageNumber ); - QRect desk = KGlobalSettings::desktopGeometry(this); - QPixmap lastSlide( desk.width(), desk.height() ); - QFont font( m_view->kPresenterDoc()->defaultFont().family() ); - QPainter p( &lastSlide ); + TQRect desk = KGlobalSettings::desktopGeometry(this); + TQPixmap lastSlide( desk.width(), desk.height() ); + TQFont font( m_view->kPresenterDoc()->defaultFont().family() ); + TQPainter p( &lastSlide ); p.setFont( font ); p.setPen( white ); @@ -3169,11 +3169,11 @@ bool KPrCanvas::pPrev( bool gotoPreviousPage ) m_drawModeLines.clear(); if ( !gotoPreviousPage && m_step.m_step > *m_pageEffectSteps.begin() ) { - QValueList<int>::ConstIterator it = m_pageEffectSteps.find( m_step.m_step ); + TQValueList<int>::ConstIterator it = m_pageEffectSteps.tqfind( m_step.m_step ); m_step.m_step = *( --it ); //hopefully there are never more than 1000 sub steps :-) m_step.m_subStep = 1000; - repaint( false ); + tqrepaint( false ); return false; } else { // when we go back on the first slide, thats like starting the presentation again @@ -3201,7 +3201,7 @@ bool KPrCanvas::pPrev( bool gotoPreviousPage ) else { m_step.m_step = *( --m_pageEffectSteps.end() ); - repaint( false ); + tqrepaint( false ); } return true; @@ -3210,9 +3210,9 @@ bool KPrCanvas::pPrev( bool gotoPreviousPage ) return false; } -bool KPrCanvas::canAssignEffect( QPtrList<KPrObject> &objs ) const +bool KPrCanvas::canAssignEffect( TQPtrList<KPrObject> &objs ) const { - QPtrListIterator<KPrObject> oIt( m_activePage->objectList() ); + TQPtrListIterator<KPrObject> oIt( m_activePage->objectList() ); for (; oIt.current(); ++oIt ) { //can't assign a effect to header/footer @@ -3235,7 +3235,7 @@ bool KPrCanvas::isOneObjectSelected() const // and obtain a pixmap of the specified width and/or height. // By omitting one of them you make sure that the aspect ratio // of your page is used for the resulting image. -void KPrCanvas::drawPageInPix( QPixmap &_pix, int pgnum, int zoom, +void KPrCanvas::drawPageInPix( TQPixmap &_pix, int pgnum, int zoom, bool forceRealVariableValue, int forceWidth, int forceHeight ) @@ -3248,7 +3248,7 @@ void KPrCanvas::drawPageInPix( QPixmap &_pix, int pgnum, int zoom, if( 0 < forceWidth || 0 < forceHeight ) { - const QRect rect( doc->getPageRect( true ) ); + const TQRect rect( doc->getPageRect( true ) ); const double dRectHeight = static_cast<double>(rect.height()); const double dRectWidth = static_cast<double>(rect.width()); double dForceHeight = static_cast<double>(forceHeight); @@ -3282,11 +3282,11 @@ void KPrCanvas::drawPageInPix( QPixmap &_pix, int pgnum, int zoom, } KPrPage * page = m_view->kPresenterDoc()->pageList().at(pgnum); - QRect rect = page->getZoomPageRect( ); + TQRect rect = page->getZoomPageRect( ); _pix.resize( rect.size() ); - _pix.fill( Qt::white ); + _pix.fill( TQt::white ); - QPainter p; + TQPainter p; p.begin( &_pix ); bool _editMode = editMode; @@ -3318,14 +3318,14 @@ void KPrCanvas::drawPageInPix( QPixmap &_pix, int pgnum, int zoom, // This one is used in fullscreenmode, to generate the pixmaps used for the // page effects. -void KPrCanvas::drawCurrentPageInPix( QPixmap &_pix ) const +void KPrCanvas::drawCurrentPageInPix( TQPixmap &_pix ) const { //kdDebug(33001) << "Page::drawCurrentPageInPix" << endl; // avoid garbage on "weird" DPIs - _pix.fill(Qt::black); + _pix.fill(TQt::black); - QPainter p; + TQPainter p; p.begin( &_pix ); drawBackground( &p, _pix.rect(), m_view->kPresenterDoc()->pageList().at( m_step.m_pageNumber ) ); @@ -3335,22 +3335,22 @@ void KPrCanvas::drawCurrentPageInPix( QPixmap &_pix ) const p.end(); } -void KPrCanvas::printPage( QPainter* painter, PresStep step, KPrinter *printer, int rows, int cols ) +void KPrCanvas::printPage( TQPainter* painter, PresStep step, KPrinter *printer, int rows, int cols ) { //kdDebug(33001) << "KPrCanvas::printPage" << endl; KPrDocument *doc = m_view->kPresenterDoc(); KPrPage* page = doc->pageList().at( step.m_pageNumber ); - QRect const rect = page->getZoomPageRect(); + TQRect const rect = page->getZoomPageRect(); bool const drawBorder = printer->option("kde-kpresenter-printslideborders").toInt() && rows>1 && cols>1; int height = rect.height(); int width = rect.width(); - QPaintDeviceMetrics metrics( printer ); + TQPaintDeviceMetrics metrics( printer ); int begin_left = ( metrics.width() - rect.width() ); int begin_top = ( metrics.height() - rect.height() ); - rows = cols = QMAX( rows, cols ); // all slides have the same size + rows = cols = TQMAX( rows, cols ); // all slides have the same size if ( rows > 1 ) { @@ -3371,7 +3371,7 @@ void KPrCanvas::printPage( QPainter* painter, PresStep step, KPrinter *printer, page = doc->pageList().at( step.m_pageNumber ); if ( !page ) return; - painter->setViewport( QRect(left, top, width, height) ); + painter->setViewport( TQRect(left, top, width, height) ); drawBackground( painter, rect, page, true ); drawPresPage( painter, rect, step ); if ( drawBorder ) @@ -3390,23 +3390,23 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted ) if ( m_effectHandler ) { m_effectTimer.stop(); - QObject::disconnect( &m_effectTimer, SIGNAL( timeout() ), this, SLOT( slotDoEffect() ) ); + TQObject::disconnect( &m_effectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoEffect() ) ); m_effectHandler->finish(); delete m_effectHandler; m_effectHandler = 0; } - QPixmap screen_orig( kapp->desktop()->width(), kapp->desktop()->height() ); + TQPixmap screen_orig( kapp->desktop()->width(), kapp->desktop()->height() ); KPrPage *page = m_view->kPresenterDoc()->pageList().at( m_step.m_pageNumber ); // YABADABADOOOOOOO.... That's a hack :-) if ( m_step.m_subStep == 0 && !isAllreadyPainted && isUpdatesEnabled() ) { //kdDebug(33001) << "Page::doObjEffects - in the strange hack" << endl; - QPainter p; + TQPainter p; p.begin( &screen_orig ); - QRect desktopRect = QRect( 0, 0, kapp->desktop()->width(), kapp->desktop()->height() ); + TQRect desktopRect = TQRect( 0, 0, kapp->desktop()->width(), kapp->desktop()->height() ); drawBackground( &p, desktopRect, page ); PresStep step( m_step.m_pageNumber, m_step.m_step, m_step.m_subStep, true, true ); drawPresPage( &p, desktopRect ,step ); @@ -3418,11 +3418,11 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted ) bitBlt( &screen_orig, 0, 0, this ); } - QPtrList<KPrObject> allObjects; + TQPtrList<KPrObject> allObjects; // master slide objects are below the objects of the normal slide if ( page->displayObjectFromMasterPage() ) { - QPtrListIterator<KPrObject> it( page->masterPage()->objectList() ); + TQPtrListIterator<KPrObject> it( page->masterPage()->objectList() ); for ( ; it.current(); ++it ) { if ( objectIsAHeaderFooterHidden( it.current() ) ) continue; @@ -3431,14 +3431,14 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted ) } } - QPtrListIterator<KPrObject> it( page->objectList() ); + TQPtrListIterator<KPrObject> it( page->objectList() ); for ( ; it.current(); ++it ) { allObjects.append( it.current() ); } //TODO add global presentation speed - m_effectHandler = new KPrEffectHandler( m_step, goingBack, this, &screen_orig, allObjects, m_view, 1 ); + m_effectHandler = new KPrEffectHandler( m_step, goingBack, TQT_TQPAINTDEVICE(this), &screen_orig, allObjects, m_view, 1 ); if ( m_effectHandler->doEffect() ) { delete m_effectHandler; @@ -3446,7 +3446,7 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted ) } else { - connect( &m_effectTimer, SIGNAL( timeout() ), SLOT( slotDoEffect() ) ); + connect( &m_effectTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoEffect() ) ); m_effectTimer.start( 50, true ); } @@ -3457,7 +3457,7 @@ void KPrCanvas::slotDoEffect() if ( m_effectHandler->doEffect() ) { m_effectTimer.stop(); - QObject::disconnect( &m_effectTimer, SIGNAL( timeout() ), this, SLOT( slotDoEffect() ) ); + TQObject::disconnect( &m_effectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoEffect() ) ); delete m_effectHandler; m_effectHandler = 0; } @@ -3473,7 +3473,7 @@ void KPrCanvas::slotDoPageEffect() if ( m_pageEffect->doEffect() ) { m_pageEffectTimer.stop(); - QObject::disconnect( &m_pageEffectTimer, SIGNAL( timeout() ), this, SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); delete m_pageEffect; m_pageEffect = 0; @@ -3485,10 +3485,10 @@ void KPrCanvas::slotDoPageEffect() } } -void KPrCanvas::slotAutoScroll(const QPoint &scrollDistance) +void KPrCanvas::slotAutoScroll(const TQPoint &scrollDistance) { - //QPoint d = m_view->zoomHandler()->zoomPoint( scrollDistance ); - QPoint d = scrollDistance; + //TQPoint d = m_view->zoomHandler()->zoomPoint( scrollDistance ); + TQPoint d = scrollDistance; m_view->getHScrollBar()->setValue( m_view->getHScrollBar()->value() + d.x() ); m_view->getVScrollBar()->setValue( m_view->getVScrollBar()->value() + d.y() ); } @@ -3500,7 +3500,7 @@ bool KPrCanvas::finishObjectEffects() if ( m_effectHandler ) { m_effectTimer.stop(); - QObject::disconnect( &m_effectTimer, SIGNAL( timeout() ), this, SLOT( slotDoEffect() ) ); + TQObject::disconnect( &m_effectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoEffect() ) ); m_effectHandler->finish(); delete m_effectHandler; m_effectHandler = 0; @@ -3516,7 +3516,7 @@ bool KPrCanvas::finishPageEffect( bool cancel ) if ( m_pageEffect ) { m_pageEffectTimer.stop(); - QObject::disconnect( &m_pageEffectTimer, SIGNAL( timeout() ), this, SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); if ( !cancel ) m_pageEffect->finish(); delete m_pageEffect; @@ -3538,13 +3538,13 @@ bool KPrCanvas::finishPageEffect( bool cancel ) } -void KPrCanvas::print( QPainter *painter, KPrinter *printer, float /*left_margin*/, float /*top_margin*/ ) +void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margin*/, float /*top_margin*/ ) { PresStep step( 0, 1000, 1000 ); //deSelectAllObj(); // already done in KPrView::setupPrinter int i = 0; - repaint( false ); + tqrepaint( false ); kapp->processEvents(); editMode = false; @@ -3556,7 +3556,7 @@ void KPrCanvas::print( QPainter *painter, KPrinter *printer, float /*left_margin //m_view->setDiffX( -static_cast<int>( MM_TO_POINT( left_margin ) ) ); //m_view->setDiffY( -static_cast<int>( MM_TO_POINT( top_margin ) ) ); - QProgressDialog progress( i18n( "Printing..." ), i18n( "Cancel" ), + TQProgressDialog progress( i18n( "Printing..." ), i18n( "Cancel" ), printer->pageList().count() + 2, this ); int j = 0; @@ -3576,8 +3576,8 @@ void KPrCanvas::print( QPainter *painter, KPrinter *printer, float /*left_margin m_view->setDiffY( ( printer->fromPage() - 1 ) * ( getPageRect( 1, 1.0, false ).height() ) - (int)MM_TO_POINT( top_margin ) );*/ int current_slide = 0; - QValueList<int> list=printer->pageList(); // 1-based - QValueList<int>::iterator it; + TQValueList<int> list=printer->pageList(); // 1-based + TQValueList<int>::iterator it; for( it=list.begin();it!=list.end();++it) { i=(*it); @@ -3633,11 +3633,11 @@ void KPrCanvas::print( QPainter *painter, KPrinter *printer, float /*left_margin fillBlack = true; editMode = true; - repaint( false ); + tqrepaint( false ); } -void KPrCanvas::updateInsertRect( const KoPoint &point, Qt::ButtonState state ) +void KPrCanvas::updateInsertRect( const KoPoint &point, TQt::ButtonState state ) { if ( state & AltButton ) { @@ -3762,13 +3762,13 @@ void KPrCanvas::insertCubicBezierCurve( const KoPointArray &_pointArray ) m_activePage->insertCubicBezierCurve( points, bezierPoints, rect, m_view->getPen(), m_view->getLineBegin(), m_view->getLineEnd() ); } - else if ( toolEditMode == INS_QUADRICBEZIERCURVE ) + else if ( toolEditMode == INS_TQUADRICBEZIERCURVE ) { m_activePage->insertQuadricBezierCurve( points, bezierPoints, rect, m_view->getPen(), m_view->getLineBegin(), m_view->getLineEnd() ); } else if ( toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || - toolEditMode == INS_CLOSED_QUADRICBEZIERCURVE ) + toolEditMode == INS_CLOSED_TQUADRICBEZIERCURVE ) { m_activePage->insertClosedLine( bezierPoints, rect, m_view->getPen(), m_view->getBrush(), m_view->getFillType(), m_view->getGColor1(), m_view->getGColor2(), @@ -3795,9 +3795,9 @@ void KPrCanvas::insertPolygon( const KoPointArray &_pointArray ) void KPrCanvas::insertPicture( const KoRect &rect ) { - QString file = m_activePage->insPictureFile(); + TQString file = m_activePage->insPictureFile(); - QCursor c = cursor(); + TQCursor c = cursor(); setCursor( waitCursor ); if ( !file.isEmpty() ) { if ( rect.width() > 10 && rect.height() > 10 ) @@ -3809,7 +3809,7 @@ void KPrCanvas::insertPicture( const KoRect &rect ) KoPoint tl( rect.topLeft() ); m_activePage->insertPicture( file, tl ); } - m_activePage->setInsPictureFile( QString::null ); + m_activePage->setInsPictureFile( TQString() ); } setCursor( c ); } @@ -3832,8 +3832,8 @@ void KPrCanvas::setToolEditMode( ToolEditMode _m, bool updateView ) if ( ( toolEditMode == INS_POLYLINE || toolEditMode == INS_CLOSED_POLYLINE ) && !m_pointArray.isNull()) endDrawPolyline(); - if ( ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_QUADRICBEZIERCURVE - || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || toolEditMode == INS_CLOSED_QUADRICBEZIERCURVE ) && !m_pointArray.isNull() ) + if ( ( toolEditMode == INS_CUBICBEZIERCURVE || toolEditMode == INS_TQUADRICBEZIERCURVE + || toolEditMode == INS_CLOSED_CUBICBEZIERCURVE || toolEditMode == INS_CLOSED_TQUADRICBEZIERCURVE ) && !m_pointArray.isNull() ) endDrawCubicBezierCurve(); exitEditMode(); @@ -3842,7 +3842,7 @@ void KPrCanvas::setToolEditMode( ToolEditMode _m, bool updateView ) if ( toolEditMode == TEM_MOUSE ) { setCursor( arrowCursor ); - QPoint pos = QCursor::pos(); + TQPoint pos = TQCursor::pos(); // ### missing some coord transformation here? KoPoint docPoint( m_view->zoomHandler()->unzoomPoint( pos ) ); KPrObject *obj=m_activePage->getCursor( pos); @@ -3872,7 +3872,7 @@ void KPrCanvas::endDrawPolyline() emit objectSelectedChanged(); if ( toolEditMode != TEM_MOUSE && editMode ) - repaint( false ); + tqrepaint( false ); m_view->disableAutoScroll(); mousePressed = false; modType = MT_NONE; @@ -3885,7 +3885,7 @@ void KPrCanvas::endDrawCubicBezierCurve() insertCubicBezierCurve( m_pointArray ); emit objectSelectedChanged(); if ( toolEditMode != TEM_MOUSE && editMode ) - repaint( false ); + tqrepaint( false ); m_view->disableAutoScroll(); mousePressed = false; modType = MT_NONE; @@ -3898,7 +3898,7 @@ void KPrCanvas::selectNext() if ( m_activePage->numSelected() == 0 ) objectList().at( 0 )->setSelected( true ); else { - int i = objectList().findRef( m_activePage->getSelectedObj() ); + int i = objectList().tqfindRef( m_activePage->getSelectedObj() ); if ( i < static_cast<int>( objectList().count() ) - 1 ) { m_view->kPresenterDoc()->deSelectAllObj(); objectList().at( ++i )->setSelected( true ); @@ -3908,7 +3908,7 @@ void KPrCanvas::selectNext() } } m_view->showObjectRect( m_activePage->getSelectedObj() ); - _repaint( false ); + _tqrepaint( false ); } void KPrCanvas::selectPrev() @@ -3917,7 +3917,7 @@ void KPrCanvas::selectPrev() if ( m_activePage->numSelected() == 0 ) objectList().at( objectList().count() - 1 )->setSelected( true ); else { - int i = objectList().findRef( m_activePage->getSelectedObj() ); + int i = objectList().tqfindRef( m_activePage->getSelectedObj() ); if ( i > 0 ) { m_view->kPresenterDoc()->deSelectAllObj(); objectList().at( --i )->setSelected( true ); @@ -3927,15 +3927,15 @@ void KPrCanvas::selectPrev() } } m_view->showObjectRect( m_activePage->getSelectedObj() ); - _repaint( false ); + _tqrepaint( false ); } -void KPrCanvas::dragEnterEvent( QDragEnterEvent *e ) +void KPrCanvas::dragEnterEvent( TQDragEnterEvent *e ) { if ( m_currentTextObjectView ) m_currentTextObjectView->dragEnterEvent( e ); - else if ( QTextDrag::canDecode( e ) - || QImageDrag::canDecode( e ) + else if ( TQTextDrag::canDecode( e ) + || TQImageDrag::canDecode( e ) || KURLDrag::canDecode(e)) { e->accept(); } @@ -3943,7 +3943,7 @@ void KPrCanvas::dragEnterEvent( QDragEnterEvent *e ) e->ignore(); } -void KPrCanvas::dragMoveEvent( QDragMoveEvent *e ) +void KPrCanvas::dragMoveEvent( TQDragMoveEvent *e ) { if( m_currentTextObjectView) { @@ -3953,13 +3953,13 @@ void KPrCanvas::dragMoveEvent( QDragMoveEvent *e ) emitChanged = checkCurrentTextEdit( obj ); if ( m_currentTextObjectView ) { - m_currentTextObjectView->dragMoveEvent( e, QPoint() ); + m_currentTextObjectView->dragMoveEvent( e, TQPoint() ); if ( emitChanged ) emit currentObjectEditChanged(); } } - else if ( QTextDrag::canDecode( e ) - || QImageDrag::canDecode( e ) + else if ( TQTextDrag::canDecode( e ) + || TQImageDrag::canDecode( e ) || KURLDrag::canDecode(e)) { e->accept(); } @@ -3967,13 +3967,13 @@ void KPrCanvas::dragMoveEvent( QDragMoveEvent *e ) e->ignore(); } -void KPrCanvas::dropImage( QMimeSource * data, bool resizeImageToOriginalSize, int posX, int posY ) +void KPrCanvas::dropImage( TQMimeSource * data, bool resizeImageToOriginalSize, int posX, int posY ) { setToolEditMode( TEM_MOUSE ); deSelectAllObj(); - QImage pix; - QImageDrag::decode( data, pix ); + TQImage pix; + TQImageDrag::decode( data, pix ); KTempFile tmpFile; tmpFile.setAutoDelete(true); @@ -3982,10 +3982,10 @@ void KPrCanvas::dropImage( QMimeSource * data, bool resizeImageToOriginalSize, i return; pix.save( tmpFile.name(), "PNG" ); - QCursor c = cursor(); + TQCursor c = cursor(); setCursor( waitCursor ); - QPoint pos( posX + diffx(), posY + diffy() ); + TQPoint pos( posX + diffx(), posY + diffy() ); KoPoint docPoint( m_view->zoomHandler()->unzoomPoint( pos ) ); m_activePage->insertPicture( tmpFile.name(), docPoint ); @@ -3997,14 +3997,14 @@ void KPrCanvas::dropImage( QMimeSource * data, bool resizeImageToOriginalSize, i setCursor( c ); } -void KPrCanvas::dropEvent( QDropEvent *e ) +void KPrCanvas::dropEvent( TQDropEvent *e ) { //disallow dropping objects outside the "page" - KoPoint docPoint = m_view->zoomHandler()->unzoomPoint( e->pos()+QPoint(diffx(),diffy()) ); - if ( !m_activePage->getZoomPageRect().contains(e->pos())) + KoPoint docPoint = m_view->zoomHandler()->unzoomPoint( e->pos()+TQPoint(diffx(),diffy()) ); + if ( !m_activePage->getZoomPageRect().tqcontains(e->pos())) return; - if ( QImageDrag::canDecode( e ) ) { + if ( TQImageDrag::canDecode( e ) ) { dropImage( e, true, e->pos().x(), e->pos().y() ); e->accept(); } else if ( KURLDrag::canDecode( e ) ) { @@ -4018,7 +4018,7 @@ void KPrCanvas::dropEvent( QDropEvent *e ) for ( ; it != lst.end(); ++it ) { const KURL &url( *it ); - QString filename; + TQString filename; if ( !url.isLocalFile() ) { if ( !KIO::NetAccess::download( url, filename, this ) ) continue; @@ -4029,18 +4029,18 @@ void KPrCanvas::dropEvent( QDropEvent *e ) KMimeMagicResult *res = KMimeMagic::self()->findFileType( filename ); if ( res && res->isValid() ) { - QString mimetype = res->mimeType(); - if ( mimetype.contains( "image" ) ) { - QCursor c = cursor(); + TQString mimetype = res->mimeType(); + if ( mimetype.tqcontains( "image" ) ) { + TQCursor c = cursor(); setCursor( waitCursor ); m_activePage->insertPicture( filename, docPoint ); setCursor( c ); - } else if ( mimetype.contains( "text" ) ) { - QCursor c = cursor(); + } else if ( mimetype.tqcontains( "text" ) ) { + TQCursor c = cursor(); setCursor( waitCursor ); - QFile f( filename ); - QTextStream t( &f ); - QString text = QString::null, tmp; + TQFile f( filename ); + TQTextStream t( &f ); + TQString text = TQString(), tmp; kdDebug()<<" filename :"<<filename<<endl; if ( f.open( IO_ReadOnly ) ) { while ( !t.eof() ) { @@ -4051,7 +4051,7 @@ void KPrCanvas::dropEvent( QDropEvent *e ) f.close(); } kdDebug()<<" text :"<<endl; - m_activePage->insertTextObject( m_view->zoomHandler()->unzoomRect(QRect( e->pos().x(), e->pos().y(), 250, 250 )), + m_activePage->insertTextObject( m_view->zoomHandler()->unzoomRect(TQRect( e->pos().x(), e->pos().y(), 250, 250 )), text, m_view ); setCursor( c ); @@ -4064,14 +4064,14 @@ void KPrCanvas::dropEvent( QDropEvent *e ) { m_currentTextObjectView->dropEvent( e ); } - else if ( QTextDrag::canDecode( e ) ) { + else if ( TQTextDrag::canDecode( e ) ) { setToolEditMode( TEM_MOUSE ); deSelectAllObj(); - QString text; - QTextDrag::decode( e, text ); - //kdDebug()<<" QTextDrag::decode( e, text ); :"<<text<<endl; - m_activePage->insertTextObject( m_view->zoomHandler()->unzoomRect( QRect( e->pos().x(), e->pos().y(), 250, 250 )), + TQString text; + TQTextDrag::decode( e, text ); + //kdDebug()<<" TQTextDrag::decode( e, text ); :"<<text<<endl; + m_activePage->insertTextObject( m_view->zoomHandler()->unzoomRect( TQRect( e->pos().x(), e->pos().y(), 250, 250 )), text, m_view ); e->accept(); } else @@ -4106,14 +4106,14 @@ void KPrCanvas::gotoPage( int pg ) m_step.m_pageNumber = page; kdDebug(33001) << "Page::gotoPage m_step.m_pageNumber =" << m_step.m_pageNumber << endl; - m_presentationSlidesIterator = m_presentationSlides.find( m_step.m_pageNumber + 1 ); + m_presentationSlidesIterator = m_presentationSlides.tqfind( m_step.m_pageNumber + 1 ); editMode = false; m_drawMode = false; m_pageEffectSteps = m_view->kPresenterDoc()->getPageEffectSteps( m_step.m_pageNumber ); m_step.m_step = *m_pageEffectSteps.begin(); m_step.m_subStep = 0; #if 0 - QRect desk = KGlobalSettings::desktopGeometry(this); + TQRect desk = KGlobalSettings::desktopGeometry(this); resize( desk.width(), desk.height() ); #endif doObjEffects(); @@ -4138,43 +4138,43 @@ void KPrCanvas::copyOasisObjs() { //todo copy object from selected object KoStoreDrag *kd = new KoStoreDrag( "application/vnd.oasis.opendocument.presentation", 0L ); - QDragObject* dragObject = kd; - QByteArray arr; - QBuffer buffer(arr); - KoStore* store = KoStore::createStore( &buffer, KoStore::Write, "application/vnd.oasis.opendocument.presentation" ); + TQDragObject* dragObject = kd; + TQByteArray arr; + TQBuffer buffer(arr); + KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Write, "application/vnd.oasis.opendocument.presentation" ); delete store; kd->setEncodedData( arr ); - QApplication::clipboard()->setData( dragObject, QClipboard::Clipboard ); + TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard ); } void KPrCanvas::copyObjs() { - QDomDocument doc("DOC"); - QDomElement presenter=doc.createElement("DOC"); + TQDomDocument doc("DOC"); + TQDomElement presenter=doc.createElement("DOC"); presenter.setAttribute("editor", "KPresenter"); presenter.setAttribute("mime", "application/x-kpresenter"); doc.appendChild(presenter); - QPtrList<KoDocumentChild> embeddedObjectsActivePage; + TQPtrList<KoDocumentChild> embeddedObjectsActivePage; KoStoreDrag *kd = new KoStoreDrag( "application/x-kpresenter", 0L ); - QDragObject* dragObject = kd; - QByteArray arr; - QBuffer buffer(arr); - KoStore* store = KoStore::createStore( &buffer, KoStore::Write, "application/x-kpresenter" ); + TQDragObject* dragObject = kd; + TQByteArray arr; + TQBuffer buffer(arr); + KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Write, "application/x-kpresenter" ); m_activePage->getAllEmbeddedObjectSelected(embeddedObjectsActivePage ); // Save internal embedded objects first, since it might change their URL int i = 0; - QValueList<KoPictureKey> savePictures; - QPtrListIterator<KoDocumentChild> chl( embeddedObjectsActivePage ); + TQValueList<KoPictureKey> savePictures; + TQPtrListIterator<KoDocumentChild> chl( embeddedObjectsActivePage ); for( ; chl.current(); ++chl ) { KoDocument* childDoc = chl.current()->document(); if ( childDoc && !childDoc->isStoredExtern() ) - (void) childDoc->saveToStore( store, QString::number( i++ ) ); + (void) childDoc->saveToStore( store, TQString::number( i++ ) ); } m_activePage->copyObjs(doc, presenter, savePictures); @@ -4194,7 +4194,7 @@ void KPrCanvas::copyObjs() if ( savePictures.count() == 1 ) { KoPicture pic = kprdoc->pictureCollection()->findPicture( savePictures.first() ); - QDragObject* picDrag = pic.dragObject( 0L ); + TQDragObject* picDrag = pic.dragObject( 0L ); if ( picDrag ) { KMultipleDrag* multipleDrag = new KMultipleDrag( 0L ); multipleDrag->addDragObject( kd ); @@ -4206,7 +4206,7 @@ void KPrCanvas::copyObjs() if ( store->open( "root" ) ) { - QCString s = doc.toCString(); // this is already Utf8! + TQCString s = doc.toCString(); // this is already Utf8! //kdDebug(33001) << "KPrCanvas::copyObject: " << s << endl; (void)store->write( s.data(), s.size()-1 ); store->close(); @@ -4214,7 +4214,7 @@ void KPrCanvas::copyObjs() delete store; kd->setEncodedData( arr ); - QApplication::clipboard()->setData( dragObject, QClipboard::Clipboard ); + TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard ); } void KPrCanvas::deleteObjs() @@ -4229,23 +4229,23 @@ void KPrCanvas::deleteObjs() } -void KPrCanvas::enterEvent( QEvent *e ) +void KPrCanvas::enterEvent( TQEvent *e ) { - m_view->setRulerMousePos( ( ( QMouseEvent* )e )->x(), ( ( QMouseEvent* )e )->y() ); + m_view->setRulerMousePos( ( ( TQMouseEvent* )e )->x(), ( ( TQMouseEvent* )e )->y() ); m_view->setRulerMouseShow( true ); } -void KPrCanvas::leaveEvent( QEvent * /*e*/ ) +void KPrCanvas::leaveEvent( TQEvent * /*e*/ ) { m_view->setRulerMouseShow( false ); } -QPtrList<KPrObject> KPrCanvas::objectList() const +TQPtrList<KPrObject> KPrCanvas::objectList() const { return m_activePage->objectList(); } -const QPtrList<KPrObject> &KPrCanvas::getObjectList() const +const TQPtrList<KPrObject> &KPrCanvas::getObjectList() const { return m_activePage->objectList(); } @@ -4255,7 +4255,7 @@ unsigned int KPrCanvas::currPgNum() const return m_view->getCurrPgNum(); } -QColor KPrCanvas::txtBackCol() const +TQColor KPrCanvas::txtBackCol() const { return m_view->kPresenterDoc()->txtBackCol(); } @@ -4275,7 +4275,7 @@ bool KPrCanvas::spManualSwitch() const return m_view->kPresenterDoc()->spManualSwitch(); } -QRect KPrCanvas::getPageRect( bool decBorders ) const +TQRect KPrCanvas::getPageRect( bool decBorders ) const { return m_view->kPresenterDoc()->getPageRect( decBorders ); } @@ -4285,19 +4285,19 @@ unsigned int KPrCanvas::pageNums() const return m_view->kPresenterDoc()->getPageNums(); } -void KPrCanvas::_repaint( bool /*erase*/ ) +void KPrCanvas::_tqrepaint( bool /*erase*/ ) { - m_view->kPresenterDoc()->repaint( false ); + m_view->kPresenterDoc()->tqrepaint( false ); } -void KPrCanvas::_repaint( const QRect &r ) +void KPrCanvas::_tqrepaint( const TQRect &r ) { - m_view->kPresenterDoc()->repaint( r ); + m_view->kPresenterDoc()->tqrepaint( r ); } -void KPrCanvas::_repaint( KPrObject *o ) +void KPrCanvas::_tqrepaint( KPrObject *o ) { - m_view->kPresenterDoc()->repaint( o ); + m_view->kPresenterDoc()->tqrepaint( o ); } void KPrCanvas::slotExitPres() @@ -4327,7 +4327,7 @@ void KPrCanvas::setSwitchingMode( bool continueTimer ) m_view->continueAutoPresTimer(); } -void KPrCanvas::exitEditMode( bool repaint ) +void KPrCanvas::exitEditMode( bool tqrepaint ) { if ( m_editObject ) { @@ -4337,7 +4337,7 @@ void KPrCanvas::exitEditMode( bool repaint ) { m_currentTextObjectView->clearSelection(); //hide cursor when we desactivate textObjectView - if ( repaint ) + if ( tqrepaint ) { m_currentTextObjectView->drawCursor( false ); m_currentTextObjectView->terminate(); @@ -4347,8 +4347,8 @@ void KPrCanvas::exitEditMode( bool repaint ) delete m_currentTextObjectView; m_currentTextObjectView = 0; - if ( repaint ) - _repaint( static_cast<KPrObject*>( kpTextObj ) ); + if ( tqrepaint ) + _tqrepaint( static_cast<KPrObject*>( kpTextObj ) ); } // Title of slide may have changed m_view->kPresenterDoc()->updateSideBarItem( m_activePage ); @@ -4358,7 +4358,7 @@ void KPrCanvas::exitEditMode( bool repaint ) else if (m_editObject->getType() == OT_PART ) { static_cast<KPrPartObject *>(m_editObject)->deactivate(); - _repaint( m_editObject ); + _tqrepaint( m_editObject ); m_editObject = 0; return; } @@ -4387,7 +4387,7 @@ void KPrCanvas::picViewOriginalSize() if ( newSize.width() > pageRect.width() ) fakt = pageRect.width() / newSize.width(); if ( newSize.height() > pageRect.height() ) - fakt = QMIN( fakt, pageRect.height() / newSize.height() ); + fakt = TQMIN( fakt, pageRect.height() / newSize.height() ); KoSize diff( newSize.width() * fakt - object->getSize().width(), newSize.height() * fakt - object->getSize().height() ); @@ -4440,7 +4440,7 @@ void KPrCanvas::picViewOrigHelper(int x, int y) y = (int)origSize.height(); } - QSize presSize( x, y ); + TQSize presSize( x, y ); scalePixmapToBeOrigIn( currentSize, pgSize, presSize, obj ); } @@ -4450,9 +4450,9 @@ void KPrCanvas::picViewOrigFactor() } void KPrCanvas::scalePixmapToBeOrigIn( const KoSize ¤tSize, const KoSize &pgSize, - const QSize &presSize, KPrPixmapObject *obj ) + const TQSize &presSize, KPrPixmapObject *obj ) { - QRect desk = KGlobalSettings::desktopGeometry(this); + TQRect desk = KGlobalSettings::desktopGeometry(this); double faktX = (double)presSize.width() / (double)desk.width(); double faktY = (double)presSize.height() / (double)desk.height(); double w = pgSize.width() * faktX; @@ -4470,15 +4470,15 @@ void KPrCanvas::setTextBackground( KPrTextObject */*obj*/ ) // This is called when double-clicking on a text object. // What should happen exactly ? (DF) #if 0 - QPixmap pix( m_activePage->getZoomPageRect().size() ); - QPainter painter( &pix ); + TQPixmap pix( m_activePage->getZoomPageRect().size() ); + TQPainter painter( &pix ); m_activePage->background()->drawBackground( &painter, FALSE ); - QPixmap bpix( obj->getSize().toQSize() ); // ## zoom it ! + TQPixmap bpix( obj->getSize().toTQSize() ); // ## zoom it ! bitBlt( &bpix, 0, 0, &pix, obj->getOrig().x(), obj->getOrig().y() - m_activePage->getZoomPageRect().height() * ( m_view->getCurrPgNum() - 1 ), bpix.width(), bpix.height() ); - QBrush b( white, bpix ); - QPalette pal( obj->textObjectView()->palette() ); - pal.setBrush( QColorGroup::Base, b ); + TQBrush b( white, bpix ); + TQPalette pal( obj->textObjectView()->palette() ); + pal.setBrush( TQColorGroup::Base, b ); obj->textObjectView()->setPalette( pal ); #endif } @@ -4602,8 +4602,8 @@ void KPrCanvas::moveObjectsByKey( int x, int y ) m_moveSnapDiff = KoPoint( 0, 0 ); - KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE; - m_gl.snapToGuideLines( movedRect, KEY_SNAP_DISTANCE, snapStatus, m_moveSnapDiff ); + KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE; + m_gl.snapToGuideLines( movedRect, KEY_SNAP_DISTANCE, snaptqStatus, m_moveSnapDiff ); move += m_moveSnapDiff; } @@ -4632,13 +4632,13 @@ void KPrCanvas::moveObjectsByKey( int x, int y ) move.setY( pageRect.bottom() - rect.bottom() ); } - // we only want a repaint if we have guide lines + // we only want a tqrepaint if we have guide lines if ( snapToGuideLines ) { // redraw guidelines (intentionally always) KoRect movedRect( rect ); movedRect.moveBy( move.x(), move.y() ); - m_gl.repaintSnapping( movedRect ); + m_gl.tqrepaintSnapping( movedRect ); } if ( move != KoPoint( 0, 0 ) ) @@ -4672,20 +4672,20 @@ void KPrCanvas::moveObjectsByMouse( KoPoint &pos, bool keepXorYunchanged ) move -= m_moveSnapDiff; m_moveSnapDiff = KoPoint( 0, 0 ); // needed if all snapping is off - KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE; + KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE; if ( snapToGrid ) { - m_moveSnapDiff.setX( qRound( movedRect.topLeft().x() / doc->getGridX()) * doc->getGridX() + m_moveSnapDiff.setX( tqRound( movedRect.topLeft().x() / doc->getGridX()) * doc->getGridX() - movedRect.topLeft().x() ); - m_moveSnapDiff.setY( qRound( movedRect.topLeft().y() / doc->getGridY()) * doc->getGridY() + m_moveSnapDiff.setY( tqRound( movedRect.topLeft().y() / doc->getGridY()) * doc->getGridY() - movedRect.topLeft().y() ); - snapStatus = KoGuides::SNAP_BOTH; + snaptqStatus = KoGuides::SNAP_BOTH; } if ( snapToGuideLines ) { - m_gl.snapToGuideLines( movedRect, MOUSE_SNAP_DISTANCE, snapStatus, m_moveSnapDiff ); + m_gl.snapToGuideLines( movedRect, MOUSE_SNAP_DISTANCE, snaptqStatus, m_moveSnapDiff ); } move += m_moveSnapDiff; @@ -4727,7 +4727,7 @@ void KPrCanvas::moveObjectsByMouse( KoPoint &pos, bool keepXorYunchanged ) if ( snapToGuideLines ) { // redraw guidelines (intentionally always) - m_gl.repaintSnapping( movedRect ); + m_gl.tqrepaintSnapping( movedRect ); } if ( move != KoPoint( 0, 0 ) ) @@ -4742,10 +4742,10 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k { KPrObject *kpobject = m_resizeObject; - QRect oldBoundingRect( m_view->zoomHandler()->zoomRect( kpobject->getRepaintRect() ) ); + TQRect oldBoundingRect( m_view->zoomHandler()->zoomRect( kpobject->getRepaintRect() ) ); KoRect objRect = kpobject->getRealRect(); - KoGuides::SnapStatus snapStatus( KoGuides::SNAP_NONE ); + KoGuides::SnaptqStatus snaptqStatus( KoGuides::SNAP_NONE ); bool left = false; bool right = false; @@ -4754,22 +4754,22 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k if ( _modType == MT_RESIZE_UP || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_RU ) { top = true; - snapStatus |= KoGuides::SNAP_HORIZ; + snaptqStatus |= KoGuides::SNAP_HORIZ; } if ( _modType == MT_RESIZE_DN || _modType == MT_RESIZE_LD || _modType == MT_RESIZE_RD ) { bottom = true; - snapStatus |= KoGuides::SNAP_HORIZ; + snaptqStatus |= KoGuides::SNAP_HORIZ; } if ( _modType == MT_RESIZE_LF || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_LD ) { left = true; - snapStatus |= KoGuides::SNAP_VERT; + snaptqStatus |= KoGuides::SNAP_VERT; } if ( _modType == MT_RESIZE_RT || _modType == MT_RESIZE_RU || _modType == MT_RESIZE_RD ) { right = true; - snapStatus |= KoGuides::SNAP_VERT; + snaptqStatus |= KoGuides::SNAP_VERT; } double newLeft = objRect.left(); @@ -4931,17 +4931,17 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k { sp.setY( rect.bottom() ); } - m_gl.repaintSnapping( sp, snapStatus ); + m_gl.tqrepaintSnapping( sp, snaptqStatus ); } - _repaint( oldBoundingRect ); - _repaint( kpobject ); + _tqrepaint( oldBoundingRect ); + _tqrepaint( kpobject ); emit objectSizeChanged(); } } -void KPrCanvas::finishResizeObject( const QString &name, bool layout ) +void KPrCanvas::finishResizeObject( const TQString &name, bool tqlayout ) { if ( m_resizeObject ) { @@ -4958,12 +4958,12 @@ void KPrCanvas::finishResizeObject( const QString &name, bool layout ) m_view->kPresenterDoc()->addCommand( resizeCmd ); } - if ( layout ) - m_view->kPresenterDoc()->layout( m_resizeObject ); + if ( tqlayout ) + m_view->kPresenterDoc()->tqlayout( m_resizeObject ); m_ratio = 0.0; m_isResizing = false; - _repaint( m_resizeObject ); + _tqrepaint( m_resizeObject ); m_resizeObject = NULL; } } @@ -4987,16 +4987,16 @@ void KPrCanvas::lowerObject() m_objectDisplayAbove = 0; } -const QPtrList<KPrObject> KPrCanvas::displayObjectList() const +const TQPtrList<KPrObject> KPrCanvas::displayObjectList() const { - QPtrList<KPrObject> list = objectList(); + TQPtrList<KPrObject> list = objectList(); list.setAutoDelete( false ); if ( m_objectDisplayAbove ) { // it can happen that the object is no longer there e.g. when // the insert of the object is undone - int pos = objectList().findRef( m_objectDisplayAbove ); + int pos = objectList().tqfindRef( m_objectDisplayAbove ); if ( pos != -1 && m_objectDisplayAbove->isSelected() ) { list.take( pos ); @@ -5011,7 +5011,7 @@ const QPtrList<KPrObject> KPrCanvas::displayObjectList() const return list; } -void KPrCanvas::playSound( const QString &soundFileName ) +void KPrCanvas::playSound( const TQString &soundFileName ) { if(soundPlayer) delete soundPlayer; @@ -5028,9 +5028,9 @@ void KPrCanvas::stopSound() } } -void KPrCanvas::setXimPosition( int x, int y, int w, int h, QFont *f ) +void KPrCanvas::setXimPosition( int x, int y, int w, int h, TQFont *f ) { - QWidget::setMicroFocusHint( x - diffx(), y - diffy(), w, h, true, f ); + TQWidget::setMicroFocusHint( x - diffx(), y - diffy(), w, h, true, f ); } void KPrCanvas::createEditing( KPrTextObject *textObj ) @@ -5057,12 +5057,12 @@ void KPrCanvas::terminateEditing( KPrTextObject *textObj ) } } -void KPrCanvas::drawCubicBezierCurve( QPainter &p, KoPointArray &points ) +void KPrCanvas::drawCubicBezierCurve( TQPainter &p, KoPointArray &points ) { p.save(); if ( !m_drawLineWithCubicBezierCurve ) { - QPen pen = QPen( Qt::black, 1, Qt::DashLine ); + TQPen pen = TQPen( TQt::black, 1, TQt::DashLine ); p.setPen( pen ); double angle = KoPoint::getAngle( m_endPoint, m_startPoint ); drawFigure( L_SQUARE, &p, m_endPoint, pen.color(), pen.width(), angle,m_view->zoomHandler() ); @@ -5080,7 +5080,7 @@ void KPrCanvas::drawCubicBezierCurve( QPainter &p, KoPointArray &points ) m_view->zoomHandler()->zoomPoint( symmetricEndPoint ) ); p.save(); - p.setPen( QPen( Qt::black, 1, Qt::SolidLine ) ); + p.setPen( TQPen( TQt::black, 1, TQt::SolidLine ) ); p.drawCubicBezier( points.zoomPointArray( m_view->zoomHandler() ) ); p.restore(); } @@ -5095,7 +5095,7 @@ void KPrCanvas::drawCubicBezierCurve( QPainter &p, KoPointArray &points ) } -void KPrCanvas::redrawCubicBezierCurve( QPainter &p ) +void KPrCanvas::redrawCubicBezierCurve( TQPainter &p ) { if ( m_indexPointArray > 0 ) { @@ -5122,7 +5122,7 @@ void KPrCanvas::redrawCubicBezierCurve( QPainter &p ) } -void KPrCanvas::drawPolygon( QPainter &p, const KoRect &rect ) +void KPrCanvas::drawPolygon( TQPainter &p, const KoRect &rect ) { KoRect nRect = rect.normalize(); bool checkConcavePolygon = m_view->getCheckConcavePolygon(); @@ -5131,14 +5131,14 @@ void KPrCanvas::drawPolygon( QPainter &p, const KoRect &rect ) KoRect _rect( 0, 0, nRect.width(), nRect.height() ); double angle = 2 * M_PI / cornersValue; - double diameter = static_cast<double>( QMAX( _rect.width(), _rect.height() ) ); + double diameter = static_cast<double>( TQMAX( _rect.width(), _rect.height() ) ); double radius = diameter * 0.5; KoPointArray _points( checkConcavePolygon ? cornersValue * 2 : cornersValue ); - _points.setPoint( 0, 0, qRound( -radius ) ); + _points.setPoint( 0, 0, tqRound( -radius ) ); double xmin = 0; - double ymin = qRound( -radius ); + double ymin = tqRound( -radius ); if ( checkConcavePolygon ) { angle = angle / 2.0; @@ -5264,13 +5264,13 @@ KoRect KPrCanvas::objectRect( bool all ) const return m_activePage->getRealRect( all ); } -void KPrCanvas::scrollTopLeftPoint( const QPoint & pos ) +void KPrCanvas::scrollTopLeftPoint( const TQPoint & pos ) { m_view->getHScrollBar()->setValue( pos.x() ); m_view->getVScrollBar()->setValue( pos.y() ); } -void KPrCanvas::changePicture( const KURL & url, QWidget *window ) +void KPrCanvas::changePicture( const KURL & url, TQWidget *window ) { m_activePage->changePicture( url, window ); } @@ -5309,10 +5309,10 @@ void KPrCanvas::ensureVisible( int x, int y, int xmargin, int ymargin ) // "Extend Contents to Object Height" void KPrCanvas::textContentsToHeight() { - QPtrList<KPrTextObject> lst = applicableTextObjects(); + TQPtrList<KPrTextObject> lst = applicableTextObjects(); if ( lst.isEmpty() ) return; - QPtrListIterator<KPrTextObject> it( lst ); + TQPtrListIterator<KPrTextObject> it( lst ); KMacroCommand * macro = 0L; for ( ; it.current() ; ++it ) { KCommand *cmd= it.current()->textContentsToHeight(); @@ -5321,24 +5321,24 @@ void KPrCanvas::textContentsToHeight() if ( !macro ) macro = new KMacroCommand(i18n("Extend Text Contents to Height")); macro->addCommand( cmd); - _repaint( it.current() ); + _tqrepaint( it.current() ); } } if( macro ) { macro->execute(); m_view->kPresenterDoc()->addCommand( macro ); - m_view->kPresenterDoc()->repaint(this); + m_view->kPresenterDoc()->tqrepaint(this); } } // "Resize Object to fit Contents" void KPrCanvas::textObjectToContents() { - QPtrList<KPrTextObject> lst = applicableTextObjects(); + TQPtrList<KPrTextObject> lst = applicableTextObjects(); if ( lst.isEmpty() ) return; - QPtrListIterator<KPrTextObject> it( lst ); + TQPtrListIterator<KPrTextObject> it( lst ); KMacroCommand * macro = 0L; for ( ; it.current() ; ++it ) { KCommand *cmd= it.current()->textObjectToContents(); @@ -5354,15 +5354,15 @@ void KPrCanvas::textObjectToContents() { macro->execute(); m_view->kPresenterDoc()->addCommand( macro ); - m_view->kPresenterDoc()->repaint(this); + m_view->kPresenterDoc()->tqrepaint(this); } } void KPrCanvas::flipObject( bool _horizontal ) { - QPtrList<KPrObject> lst; - QPtrListIterator<KPrObject> it(getObjectList()); + TQPtrList<KPrObject> lst; + TQPtrListIterator<KPrObject> it(getObjectList()); for ( ; it.current(); ++it ) { if ( it.current()->isSelected() && it.current()->getType() != OT_AUTOFORM && @@ -5394,10 +5394,10 @@ void KPrCanvas::raiseObjs( bool forward ) m_activePage->raiseObjs( forward ); } -QPtrList<KPrTextObject> KPrCanvas::listOfTextObjs() const +TQPtrList<KPrTextObject> KPrCanvas::listOfTextObjs() const { - QPtrList<KPrTextObject> lst; - QPtrListIterator<KPrObject> it(getObjectList()); + TQPtrList<KPrTextObject> lst; + TQPtrListIterator<KPrObject> it(getObjectList()); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_TEXT ) { @@ -5410,30 +5410,30 @@ QPtrList<KPrTextObject> KPrCanvas::listOfTextObjs() const return lst; } -KPrTextObject* KPrCanvas::textUnderMouse( const QPoint & point ) +KPrTextObject* KPrCanvas::textUnderMouse( const TQPoint & point ) { - QPtrList<KPrTextObject> obj = listOfTextObjs(); - QPtrListIterator<KPrTextObject> it2(obj ); + TQPtrList<KPrTextObject> obj = listOfTextObjs(); + TQPtrListIterator<KPrTextObject> it2(obj ); for ( ; it2.current() ; ++it2 ) { - QRect outerRect( m_view->kPresenterDoc()->zoomHandler()->zoomRect( it2.current()->getRect()) ); - if ( !it2.current()->isProtectContent() && outerRect.contains( point) ) + TQRect outerRect( m_view->kPresenterDoc()->zoomHandler()->zoomRect( it2.current()->getRect()) ); + if ( !it2.current()->isProtectContent() && outerRect.tqcontains( point) ) return it2.current(); } return 0L; } -void KPrCanvas::speakTextUnderMouse(QWidget* w, const QPoint& p, uint flags) +void KPrCanvas::speakTextUnderMouse(TQWidget* w, const TQPoint& p, uint flags) { Q_UNUSED( flags ); if ( w != this ) return; // Since text objects can't get focus without clicking with the mouse, // no point in supporting focus speaking. - if ( p == QPoint() ) return; + if ( p == TQPoint() ) return; KPrTextObject *to = textUnderMouse( w->mapFromGlobal( p ) ); if ( to == m_prevSpokenTO ) return; m_prevSpokenTO = to; if ( to ) { - QString text = to->textObject()->textDocument()->plainText(); + TQString text = to->textObject()->textDocument()->plainText(); if ( !text.isEmpty() ) kospeaker->sayWidget( text ); } } @@ -5444,7 +5444,7 @@ bool KPrCanvas::checkCurrentTextEdit( KPrTextObject * textObj ) if ( textObj && m_currentTextObjectView && m_currentTextObjectView->kpTextObject() != textObj ) { m_currentTextObjectView->kpTextObject()->setEditingTextObj( false ); - _repaint( m_currentTextObjectView->kpTextObject() ); + _tqrepaint( m_currentTextObjectView->kpTextObject() ); //don't remove selection otherwise break dnd. m_currentTextObjectView->terminate(false); delete m_currentTextObjectView; @@ -5465,7 +5465,7 @@ void KPrCanvas::alignObjects( AlignType at ) { KPrDocument * doc = m_view->kPresenterDoc(); - QString name; + TQString name; switch ( at ) { @@ -5489,9 +5489,9 @@ void KPrCanvas::alignObjects( AlignType at ) break; } - QPtrList<KPrObject> objects; + TQPtrList<KPrObject> objects; - QPtrListIterator<KPrObject> it( m_activePage->objectList() ); + TQPtrListIterator<KPrObject> it( m_activePage->objectList() ); for ( ; it.current() ; ++it ) { if ( it.current() == m_view->kPresenterDoc()->header() || @@ -5518,12 +5518,12 @@ bool KPrCanvas::canMoveOneObject() const void KPrCanvas::closeObject(bool /*close*/) { - QPtrList<KPrObject> lst; - QPtrListIterator<KPrObject> it(getObjectList()); + TQPtrList<KPrObject> lst; + TQPtrListIterator<KPrObject> it(getObjectList()); for ( ; it.current(); ++it ) { if ( it.current()->isSelected() && (it.current()->getType() == OT_POLYLINE || it.current()->getType() == OT_FREEHAND - || it.current()->getType() == OT_QUADRICBEZIERCURVE + || it.current()->getType() == OT_TQUADRICBEZIERCURVE || it.current()->getType() == OT_CUBICBEZIERCURVE )) lst.append( it.current() ); } @@ -5535,16 +5535,16 @@ void KPrCanvas::closeObject(bool /*close*/) m_view->kPresenterDoc()->addCommand( cmd ); } -void KPrCanvas::layout() +void KPrCanvas::tqlayout() { - QPtrListIterator<KPrObject> it(getObjectList()); + TQPtrListIterator<KPrObject> it(getObjectList()); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_TEXT ) - static_cast<KPrTextObject *>( it.current() )->layout(); + static_cast<KPrTextObject *>( it.current() )->tqlayout(); } } -KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool repaintSnapping ) +KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool tqrepaintSnapping ) { KoPoint sp( pos ); KPrDocument * doc( m_view->kPresenterDoc() ); @@ -5553,18 +5553,18 @@ KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool repaintSnapping ) bool snapToGuideLines = doc->showGuideLines() && !m_disableSnapping; KoPoint snapDiff = KoPoint( 0, 0 ); // needed if all snapping is off - KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE; + KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE; if ( snapToGrid ) { - snapDiff.setX( qRound( sp.x() / doc->getGridX()) * doc->getGridX() - sp.x() ); - snapDiff.setY( qRound( sp.y() / doc->getGridY()) * doc->getGridY() - sp.y() ); - snapStatus = KoGuides::SNAP_BOTH; + snapDiff.setX( tqRound( sp.x() / doc->getGridX()) * doc->getGridX() - sp.x() ); + snapDiff.setY( tqRound( sp.y() / doc->getGridY()) * doc->getGridY() - sp.y() ); + snaptqStatus = KoGuides::SNAP_BOTH; } if ( snapToGuideLines ) { - m_gl.snapToGuideLines( sp, MOUSE_SNAP_DISTANCE, snapStatus, snapDiff ); + m_gl.snapToGuideLines( sp, MOUSE_SNAP_DISTANCE, snaptqStatus, snapDiff ); } sp += snapDiff; @@ -5582,16 +5582,16 @@ KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool repaintSnapping ) sp.setY( pageRect.bottom() ); // redraw guidelines (intentionally always) - if ( repaintSnapping && snapToGuideLines ) + if ( tqrepaintSnapping && snapToGuideLines ) { - m_gl.repaintSnapping( sp, KoGuides::SNAP_BOTH ); + m_gl.tqrepaintSnapping( sp, KoGuides::SNAP_BOTH ); } return sp; } -void KPrCanvas::alignVertical( VerticalAlignmentType _type ) +void KPrCanvas::alignVertical(VerticalAlignmentType _type ) { KCommand *cmd = m_activePage->alignVertical( _type ); if ( cmd ) @@ -5614,7 +5614,7 @@ KoPointArray KPrCanvas::getObjectPoints( const KoPointArray &pointArray ) return points; } -void KPrCanvas::objectPopup( KPrObject *object, const QPoint &point ) +void KPrCanvas::objectPopup( KPrObject *object, const TQPoint &point ) { switch ( object->getType() ) { @@ -5644,7 +5644,7 @@ void KPrCanvas::objectPopup( KPrObject *object, const QPoint &point ) break; case OT_POLYLINE: case OT_CUBICBEZIERCURVE: - case OT_QUADRICBEZIERCURVE: + case OT_TQUADRICBEZIERCURVE: case OT_FREEHAND: m_view->openPopupMenuObject( "closed_popup", point ); break; @@ -5674,7 +5674,7 @@ void KPrCanvas::popupContextMenu() m_view->stopAutoPresTimer(); } setCursor( arrowCursor ); - QPoint p( width()/2, height()/2 ); + TQPoint p( width()/2, height()/2 ); int ret = m_presMenu->exec( p ); // we have to continue the timer if the menu was canceled and draw mode is not active if ( ret == -1 && !m_presMenu->isItemChecked( PM_DM ) && !spManualSwitch() ) @@ -5685,7 +5685,7 @@ void KPrCanvas::popupContextMenu() // TODO: Better to popup at caret position. // KoTextCursor* cursor = m_currentTextObjectView->cursor(); KoPoint kop = m_currentTextObjectView->kpTextObject()->getOrig(); - QPoint p = m_view->zoomHandler()->zoomPoint( kop ); + TQPoint p = m_view->zoomHandler()->zoomPoint( kop ); p = mapToGlobal( p ); m_currentTextObjectView->showPopup( m_view, p, m_view->actionList() ); return; @@ -5694,11 +5694,11 @@ void KPrCanvas::popupContextMenu() KPrObject* obj = m_activePage->getSelectedObj(); if (obj) { KoPoint kop = obj->getOrig(); - QPoint p = m_view->zoomHandler()->zoomPoint( kop ); + TQPoint p = m_view->zoomHandler()->zoomPoint( kop ); p = mapToGlobal( p ); objectPopup( obj, p ); } else { - QPoint p = mapToGlobal( QPoint() ); + TQPoint p = mapToGlobal( TQPoint() ); m_view->openPopupMenuMenuPage( p ); } } diff --git a/kpresenter/KPrCanvas.h b/kpresenter/KPrCanvas.h index ca81fdfc..9ab7de16 100644 --- a/kpresenter/KPrCanvas.h +++ b/kpresenter/KPrCanvas.h @@ -23,14 +23,14 @@ #ifndef __KPRCANVAS__ #define __KPRCANVAS__ -#include <qwidget.h> -#include <qptrlist.h> -#include <qpicture.h> -#include <qvaluelist.h> -#include <qpixmap.h> -#include <qpointarray.h> -#include <qvaluevector.h> -#include <qtimer.h> +#include <tqwidget.h> +#include <tqptrlist.h> +#include <tqpicture.h> +#include <tqvaluelist.h> +#include <tqpixmap.h> +#include <tqpointarray.h> +#include <tqvaluevector.h> +#include <tqtimer.h> #include <KoGuides.h> #include <KoRuler.h> @@ -45,25 +45,25 @@ class KURL; class KoTextFormatInterface; class KPrView; class KPrDocument; -class QPainter; +class TQPainter; class KTextEdit; class KPrTextObject; class KPrObject; class KPopupMenu; -class QResizeEvent; -class QPaintEvent; -class QDragEnterEvent; -class QDragMoveEvent; -class QDropEvent; -class QFocusEvent; -class QMouseEvent; -class QWheelEvent; -class QKeyEvent; +class TQResizeEvent; +class TQPaintEvent; +class TQDragEnterEvent; +class TQDragMoveEvent; +class TQDropEvent; +class TQFocusEvent; +class TQMouseEvent; +class TQWheelEvent; +class TQKeyEvent; class KPrPixmapObject; class KPrBackGround; -class QRect; -class QSize; -class QPoint; +class TQRect; +class TQSize; +class TQPoint; class KPrSoundPlayer; class KoTextObject; class KoParagCounter; @@ -79,20 +79,21 @@ class KPrPageEffects; * * It manages the graphical representation of all the objects. */ -class KPrCanvas : public QWidget +class KPrCanvas : public TQWidget { Q_OBJECT + TQ_OBJECT public: /// constructor - KPrCanvas( QWidget *parent=0,const char *name=0,KPrView *_view=0 ); + KPrCanvas( TQWidget *tqparent=0,const char *name=0,KPrView *_view=0 ); /// destructor ~KPrCanvas(); KPrView * getView()const { return m_view; } - // The equivalent of contentsX() and contentsY() for a QScrollView + // The equivalent of contentsX() and contentsY() for a TQScrollView // The Canvas is a widget, not a scrollview (because we handle the scrollbars ourselves, // to have the "goto page" buttons at the bottom of the scrollbars etc.) int diffx() const { return m_xOffset; } @@ -109,8 +110,8 @@ public: void deSelectObj( KPrObject* ); void setTextFormat(const KoTextFormat &format, int flags); - void setTextColor( const QColor & ); - void setTextBackgroundColor( const QColor & ); + void setTextColor( const TQColor & ); + void setTextBackgroundColor( const TQColor & ); void setTextAlign( int ); void setTextDepthPlus(); void setTextDepthMinus(); @@ -123,7 +124,7 @@ public: void setTextItalic( bool b ); void setTextUnderline( bool b ); void setTextStrikeOut( bool b ); - void setTextFamily( const QString &f ); + void setTextFamily( const TQString &f ); void setTextPointSize( int s ); void setTextSubScript( bool b ); void setTextSuperScript( bool b ); @@ -160,21 +161,21 @@ public: int numPresSteps() const { return m_pageEffectSteps.count(); } int numPresPages() const { return m_presentationSlides.count(); } - bool canAssignEffect( QPtrList<KPrObject> &objs ) const; + bool canAssignEffect( TQPtrList<KPrObject> &objs ) const; - void print( QPainter*, KPrinter*, float, float ); + void print( TQPainter*, KPrinter*, float, float ); void setPartEntry( KoDocumentEntry& _e ) { partEntry = _e; } void setToolEditMode( ToolEditMode _m, bool updateView = true ); - void setAutoForm( const QString &_autoform ) + void setAutoForm( const TQString &_autoform ) { autoform = _autoform; } /** - \brief Draw page into QPixmap. + \brief Draw page into TQPixmap. - Draws page pgnum of the currently open presentation into a QPixmap + Draws page pgnum of the currently open presentation into a TQPixmap using the specified zoom factor (or fixed width/height dimensions, resp.) Set forceWidth and/or forceHeight to override the zoom factor @@ -184,7 +185,7 @@ public: \sa exportPage */ - void drawPageInPix( QPixmap&, int pgnum, int zoom, + void drawPageInPix( TQPixmap&, int pgnum, int zoom, bool forceRealVariableValue = false, int forceWidth = 0, int forceHeight = 0 ); @@ -194,16 +195,16 @@ public: Export a page of the currently open presentation to disk using a bitmap format like e.g. PNG. - This method uses a QPixmap::save() call. + This method uses a TQPixmap::save() call. \param nPage the internally used <b>0-based</b> page number \param nWidth the desired image width in px \param nHeight the desired image height in px \param fileURL the URL of the image file to be created: if this - does not point to a local file a KTempFile is created by QPixmap::save() + does not point to a local file a KTempFile is created by TQPixmap::save() which is then copied over to the desired location. - \param format the format of the image file (see QPixmap::save()) - \param quality the quality of the image (see QPixmap::save()) + \param format the format of the image file (see TQPixmap::save()) + \param quality the quality of the image (see TQPixmap::save()) example: \verbatim @@ -232,17 +233,17 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 ); bool oneObjectTextSelected() const; bool isOneObjectSelected() const; /** Returns the list of selected text objects */ - QPtrList<KPrTextObject> selectedTextObjs() const; + TQPtrList<KPrTextObject> selectedTextObjs() const; /** * Returns the list of interfaces to use for changing the text format. * This can be either the currently edited text object, * or the list of text objects currently selected */ - QPtrList<KoTextFormatInterface> applicableTextInterfaces() const; + TQPtrList<KoTextFormatInterface> applicableTextInterfaces() const; /** * Returns the list of text objects, either selected or activated. */ - QPtrList<KPrTextObject> applicableTextObjects() const; + TQPtrList<KPrTextObject> applicableTextObjects() const; void setMouseSelectedObject(bool b); @@ -252,18 +253,18 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 ); KPrTextView *currentTextObjectView() const { return m_currentTextObjectView; } - QPtrList<KPrObject> objectList() const; + TQPtrList<KPrObject> objectList() const; // get - set data - const QPtrList<KPrObject> & getObjectList() const; + const TQPtrList<KPrObject> & getObjectList() const; - void playSound( const QString &soundFileName ); + void playSound( const TQString &soundFileName ); void stopSound(); ///for KPrTextView void dragStarted() { mousePressed = false; } - void setXimPosition( int x, int y, int w, int h, QFont *f ); + void setXimPosition( int x, int y, int w, int h, TQFont *f ); void createEditing( KPrTextObject *textObj ); @@ -309,7 +310,7 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 ); * @param rect the size and position of the picture */ void insertPicture( const KoRect &rect ); - void changePicture( const KURL & url, QWidget *window ); + void changePicture( const KURL & url, TQWidget *window ); int numberOfObjectSelected() const; KPrObject *getSelectedObj() const; @@ -334,7 +335,7 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 ); */ KoRect objectRect( bool all ) const; - void scrollTopLeftPoint( const QPoint & pos ); + void scrollTopLeftPoint( const TQPoint & pos ); void textContentsToHeight(); void textObjectToContents(); @@ -355,15 +356,15 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 ); void alignObjects( AlignType at ); bool canMoveOneObject()const; - QPtrList<KPrTextObject> listOfTextObjs() const; + TQPtrList<KPrTextObject> listOfTextObjs() const; - QPixmap getPicturePixmap() const; + TQPixmap getPicturePixmap() const; void closeObject(bool _close); - void layout(); - void alignVertical( VerticalAlignmentType _type ); + void tqlayout(); + void alignVertical(VerticalAlignmentType _type ); void savePicture(); - void dropImage( QMimeSource * data, bool resizeImageToOriginalSize = false , int posX = 10, int posY=10 ); + void dropImage( TQMimeSource * data, bool resizeImageToOriginalSize = false , int posX = 10, int posY=10 ); KoGuides & guideLines() { return m_gl; } /** @@ -372,11 +373,11 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 ); * @param object the selected object * @param point where the popup should be displayed */ - void objectPopup( KPrObject *object, const QPoint &point ); + void objectPopup( KPrObject *object, const TQPoint &point ); public slots: - // use repaint = false when the KPrCanvas is destroyed to avaid a possible crash - void exitEditMode( bool repaint = true ); + // use tqrepaint = false when the KPrCanvas is destroyed to avaid a possible crash + void exitEditMode( bool tqrepaint = true ); void clipCut(); void clipCopy(); @@ -406,8 +407,8 @@ public slots: signals: // signals to notify of changes - void fontChanged( const QFont & ); - void colorChanged( const QColor & ); + void fontChanged( const TQFont & ); + void colorChanged( const TQColor & ); void alignChanged( int ); /** * Emmitted when presentation should be restarted @@ -425,45 +426,45 @@ signals: void currentObjectEditChanged(); void selectionChanged( bool hasSelection ); - void sigMouseWheelEvent( QWheelEvent * ); + void sigMouseWheelEvent( TQWheelEvent * ); protected: struct PicCache { - QPicture pic; + TQPicture pic; int num; int subPresStep; }; // functions for displaying /** - * This method is used for repainting the canvas. + * This method is used for tqrepainting the canvas. */ - virtual void paintEvent( QPaintEvent* ); + virtual void paintEvent( TQPaintEvent* ); /** * Draws the background of page to painter. * Set edit to true if in edit mode, false in presentation mode. */ - void drawBackground( QPainter* painter, const QRect& rect, KPrPage * page, bool edit = false ) const; + void drawBackground( TQPainter* painter, const TQRect& rect, KPrPage * page, bool edit = false ) const; /** * Draw obj to painter. */ - void drawAllObjectsInPage( QPainter *painter, const QPtrList<KPrObject> & obj, int pageNum ) const; + void drawAllObjectsInPage( TQPainter *painter, const TQPtrList<KPrObject> & obj, int pageNum ) const; /** * Draw _objects shown at step to painter. * This method is used for presentation mode, printing. */ - void drawObjectsPres( QPainter *painter, const QPtrList<KPrObject> &_objects, PresStep step ) const; + void drawObjectsPres( TQPainter *painter, const TQPtrList<KPrObject> &_objects, PresStep step ) const; /** * Draw _objects to painter. * Only rect is painted. * This method is used for edit mode. */ - void drawObjectsEdit( QPainter *painter, const KoRect &rect, const QPtrList<KPrObject> &_objects, + void drawObjectsEdit( TQPainter *painter, const KoRect &rect, const TQPtrList<KPrObject> &_objects, SelectionMode selectionMode, int page ) const; /** @@ -473,24 +474,24 @@ protected: * textView if set print editable textobject (used by drawObjectsEdit) * This method is used by drawObjectsPres and drawObjectsEdit. */ - void drawObjects( QPainter *painter, const QPtrList<KPrObject> &objects, SelectionMode selectionMode, + void drawObjects( TQPainter *painter, const TQPtrList<KPrObject> &objects, SelectionMode selectionMode, bool contour, KPrTextView * textView, int pageNum ) const; /** * Draw _objects of page to painter. * This method is used for edit mode. */ - void drawEditPage( QPainter *painter, const QRect &_rect, + void drawEditPage( TQPainter *painter, const TQRect &_rect, KPrPage *page, SelectionMode selectionMode ) const; /** * Draw _objects of page shown at step to painter. * This method is used for presentation mode, printing. */ - void drawPresPage( QPainter *painter, const QRect &_rect, PresStep step ) const; + void drawPresPage( TQPainter *painter, const TQRect &_rect, PresStep step ) const; /// draw grid - void drawGrid(QPainter *painter, const QRect &rect2) const; + void drawGrid(TQPainter *painter, const TQRect &rect2) const; /** * Finish the object effects. @@ -501,13 +502,13 @@ protected: bool finishPageEffect( bool cancel = false ); - void drawCurrentPageInPix( QPixmap& ) const; - virtual void mousePressEvent( QMouseEvent *e ); - virtual void mouseReleaseEvent( QMouseEvent *e ); - virtual void mouseMoveEvent( QMouseEvent *e ); - virtual void mouseDoubleClickEvent( QMouseEvent *e ); - virtual void wheelEvent( QWheelEvent *e ); - virtual void resizeEvent( QResizeEvent *e ); + void drawCurrentPageInPix( TQPixmap& ) const; + virtual void mousePressEvent( TQMouseEvent *e ); + virtual void mouseReleaseEvent( TQMouseEvent *e ); + virtual void mouseMoveEvent( TQMouseEvent *e ); + virtual void mouseDoubleClickEvent( TQMouseEvent *e ); + virtual void wheelEvent( TQWheelEvent *e ); + virtual void resizeEvent( TQResizeEvent *e ); virtual bool close( bool alsoDelete ); /** * Returns the object at position pos @@ -516,41 +517,41 @@ protected: * @return the object at position pos */ KPrObject *getObjectAt( const KoPoint &pos, bool withoutProtected = false ); - virtual void focusInEvent( QFocusEvent* ) {} - virtual void focusOutEvent( QFocusEvent* ) {} - virtual void enterEvent( QEvent *e ); - virtual void leaveEvent( QEvent *e ); - virtual void dragEnterEvent( QDragEnterEvent *e ); - virtual void dragMoveEvent( QDragMoveEvent *e ); - virtual void dropEvent( QDropEvent *e ); - virtual void keyPressEvent( QKeyEvent *e ); - virtual void keyReleaseEvent( QKeyEvent *e ); - virtual void imStartEvent( QIMEvent * e ); - virtual void imComposeEvent( QIMEvent * e ); - virtual void imEndEvent( QIMEvent * e ); - - void eraseEmptySpace( QPainter * painter, const QRegion & emptySpaceRegion, const QBrush & brush ) const; + virtual void focusInEvent( TQFocusEvent* ) {} + virtual void focusOutEvent( TQFocusEvent* ) {} + virtual void enterEvent( TQEvent *e ); + virtual void leaveEvent( TQEvent *e ); + virtual void dragEnterEvent( TQDragEnterEvent *e ); + virtual void dragMoveEvent( TQDragMoveEvent *e ); + virtual void dropEvent( TQDropEvent *e ); + virtual void keyPressEvent( TQKeyEvent *e ); + virtual void keyReleaseEvent( TQKeyEvent *e ); + virtual void imStartEvent( TQIMEvent * e ); + virtual void imComposeEvent( TQIMEvent * e ); + virtual void imEndEvent( TQIMEvent * e ); + + void eraseEmptySpace( TQPainter * painter, const TQRegion & emptySpaceRegion, const TQBrush & brush ) const; /// setup popupmenus void setupMenus(); unsigned int currPgNum() const; - QColor txtBackCol() const; + TQColor txtBackCol() const; bool spInfiniteLoop() const; bool spShowEndOfPresentationSlide() const; bool spManualSwitch() const; - QRect getPageRect( bool decBorders = true ) const; + TQRect getPageRect( bool decBorders = true ) const; unsigned int pageNums() const; - void _repaint( bool erase=true ); - void _repaint( const QRect &r ); - void _repaint( KPrObject *o ); + void _tqrepaint( bool erase=true ); + void _tqrepaint( const TQRect &r ); + void _tqrepaint( KPrObject *o ); /** * Draw page defined in step to painter. * This method is used for printing a presentation. */ - void printPage( QPainter*, PresStep step, KPrinter *printer, int rows, int cols ); + void printPage( TQPainter*, PresStep step, KPrinter *printer, int rows, int cols ); /** * This method animates the objects in the presentation. @@ -580,10 +581,10 @@ protected: void selectPrev(); void scalePixmapToBeOrigIn( const KoSize ¤tSize, const KoSize &pgSize, - const QSize &presSize, KPrPixmapObject *obj ); + const TQSize &presSize, KPrPixmapObject *obj ); bool getPixmapOrigAndCurrentSize( KPrPixmapObject *&obj, KoSize *origSize, KoSize *currentSize ); void setTextBackground( KPrTextObject *obj ); - virtual bool eventFilter( QObject *o, QEvent *e ); + virtual bool eventFilter( TQObject *o, TQEvent *e ); virtual bool focusNextPrevChild( bool ); void endDrawPolyline(); @@ -591,7 +592,7 @@ protected: /** * @brief Draw a cubic bezier curve. */ - void drawCubicBezierCurve( QPainter &p, KoPointArray &points ); + void drawCubicBezierCurve( TQPainter &p, KoPointArray &points ); //void drawCubicBezierCurve( int _dx, int _dy ); void endDrawCubicBezierCurve(); @@ -600,7 +601,7 @@ protected: * * @param p painter used for drawing */ - void redrawCubicBezierCurve( QPainter &p ); + void redrawCubicBezierCurve( TQPainter &p ); #ifndef NDEBUG @@ -632,7 +633,7 @@ private: /// resize the m_resizeObject void resizeObject( ModifyType _modType, const KoPoint & point, bool keepRatio, bool scaleAroundCenter ); /// create KPrResizeCmd - void finishResizeObject( const QString &name, bool layout = true ); + void finishResizeObject( const TQString &name, bool tqlayout = true ); /** * @brief Display object above the other objects in editiong mode @@ -656,7 +657,7 @@ private: * * @return List of objects */ - const QPtrList<KPrObject> displayObjectList() const; + const TQPtrList<KPrObject> displayObjectList() const; /** * This is used in automatic presentation mode. @@ -667,19 +668,19 @@ private: bool m_setPageTimer; /// Helper function to draw a polygon - void drawPolygon( QPainter &p, const KoRect &rect ); + void drawPolygon( TQPainter &p, const KoRect &rect ); /// Helper function to draw a pie/arc/chord - void drawPieObject( QPainter *p, const KoRect &rect ); + void drawPieObject( TQPainter *p, const KoRect &rect ); - QPoint limitOfPoint(const QPoint& _point) const; + TQPoint limitOfPoint(const TQPoint& _point) const; /** * Return true if object is a header/footer which is hidden. */ bool objectIsAHeaderFooterHidden(KPrObject *obj) const; - KPrTextObject* textUnderMouse( const QPoint & point ); + KPrTextObject* textUnderMouse( const TQPoint & point ); bool checkCurrentTextEdit( KPrTextObject * textObj ); /** @@ -689,13 +690,13 @@ private: * If so it returns the position it has snapped to. * * @param pos the point which should be snapped - * @param repaintSnapping true if the guides should be repainted. - * @param repaintSnapping false when the guides should not be repainted. - * You have to call repaint by yourself. + * @param tqrepaintSnapping true if the guides should be tqrepainted. + * @param tqrepaintSnapping false when the guides should not be tqrepainted. + * You have to call tqrepaint by yourself. * * @return the position of the snapped point */ - KoPoint snapPoint( KoPoint &pos, bool repaintSnapping = true ); + KoPoint snapPoint( KoPoint &pos, bool tqrepaintSnapping = true ); /** * @brief Find the next grid in distance @@ -731,7 +732,7 @@ private: * @param The state of the mouse and modifier buttons * */ - void updateInsertRect( const KoPoint &point, Qt::ButtonState state ); + void updateInsertRect( const KoPoint &point, TQt::ButtonState state ); /** * @brief Popup context menu @@ -742,8 +743,8 @@ private: void popupContextMenu(); private slots: - void toFontChanged( const QFont &font ) { emit fontChanged( font ); } - void toColorChanged( const QColor &color ) { emit colorChanged( color ); } + void toFontChanged( const TQFont &font ) { emit fontChanged( font ); } + void toColorChanged( const TQColor &color ) { emit colorChanged( color ); } void toAlignChanged( int a ) { emit alignChanged( a ); } /** * Switch to drawing mode. In drawing mode it is possible to draw on the @@ -775,13 +776,13 @@ private slots: /** * Scroll canvas when receiving this signal */ - void slotAutoScroll(const QPoint &scrollDist); + void slotAutoScroll(const TQPoint &scrollDist); /** * Speak the text object under the mouse. This slot is normally * connected to the kospeaker customSpeakWidget signal. */ - void speakTextUnderMouse(QWidget* w, const QPoint& p, uint flags); + void speakTextUnderMouse(TQWidget* w, const TQPoint& p, uint flags); private: /// Distance for snapping to guide line with mouse @@ -818,10 +819,10 @@ private: * This is used for paint events. * Used in drawing mode. */ - QValueVector<QPointArray> m_drawModeLines; + TQValueVector<TQPointArray> m_drawModeLines; /** - * Index into the QPointArray for the next point of the line in draw mode. + * Index into the TQPointArray for the next point of the line in draw mode. * Used in drawing mode. */ int m_drawModeLineIndex; @@ -832,20 +833,20 @@ private: float _presFakt; int m_showOnlyPage; // 1-based (-1 = all) /// list of all effect steps occuring on the active page - QValueList<int> m_pageEffectSteps; + TQValueList<int> m_pageEffectSteps; /// List of the slides used in the presentation - QValueList<int> m_presentationSlides; + TQValueList<int> m_presentationSlides; /// Iterator over the slides of a presentation - QValueList<int>::Iterator m_presentationSlidesIterator; + TQValueList<int>::Iterator m_presentationSlidesIterator; /// KPrEffectHandler for object effects KPrEffectHandler *m_effectHandler; KPrPageEffects *m_pageEffect; /// EffectTimer - QTimer m_effectTimer; + TQTimer m_effectTimer; - QTimer m_pageEffectTimer; + TQTimer m_pageEffectTimer; /// menu identifier for draw mode int PM_DM; @@ -881,15 +882,15 @@ private: /// The rect of the object during insert. KoRect m_insertRect; KoDocumentEntry partEntry; - QString autoform; - QPixmap buffer; + TQString autoform; + TQPixmap buffer; KPrTextView *m_currentTextObjectView; KPrSoundPlayer *soundPlayer; KoPointArray m_pointArray, m_oldCubicBezierPointArray; - QPoint m_dragStartPoint, m_dragEndPoint, m_dragSymmetricEndPoint; + TQPoint m_dragStartPoint, m_dragEndPoint, m_dragSymmetricEndPoint; /// The start position of an insert for line objects KoPoint m_startPoint; /// The end position of an insert for line objects diff --git a/kpresenter/KPrClosedLineObject.cpp b/kpresenter/KPrClosedLineObject.cpp index 4e11006a..be409183 100644 --- a/kpresenter/KPrClosedLineObject.cpp +++ b/kpresenter/KPrClosedLineObject.cpp @@ -25,12 +25,12 @@ #include "KPrSVGPathParser.h" #include <KoTextZoomHandler.h> #include <kdebug.h> -#include <qbitmap.h> -#include <qregion.h> -#include <qregexp.h> -#include <qdom.h> -#include <qpicture.h> -#include <qpainter.h> +#include <tqbitmap.h> +#include <tqregion.h> +#include <tqregexp.h> +#include <tqdom.h> +#include <tqpicture.h> +#include <tqpainter.h> #include <KoOasisContext.h> #include <math.h> #include <KoUnit.h> @@ -44,9 +44,9 @@ KPrClosedLineObject::KPrClosedLineObject() { } -KPrClosedLineObject::KPrClosedLineObject( const KoPointArray &_points, const KoSize &_size, const KoPen &_pen, const QBrush &_brush, - FillType _fillType, const QColor &_gColor1, const QColor &_gColor2, BCType _gType, - bool _unbalanced, int _xfactor, int _yfactor, const QString _typeString ) +KPrClosedLineObject::KPrClosedLineObject( const KoPointArray &_points, const KoSize &_size, const KoPen &_pen, const TQBrush &_brush, + FillType _fillType, const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType, + bool _unbalanced, int _xfactor, int _yfactor, const TQString _typeString ) : KPr2DObject( _pen, _brush, _fillType, _gColor1, _gColor2, _gType, _unbalanced, _xfactor, _yfactor ) { points = KoPointArray( _points ); @@ -55,7 +55,7 @@ KPrClosedLineObject::KPrClosedLineObject( const KoPointArray &_points, const KoS } KPrClosedLineObject::KPrClosedLineObject( const KPrPointObject &object ) -: KPr2DObject( object.getPen(), QBrush::NoBrush, FT_BRUSH, QColor(), QColor(), BCT_PLAIN, false, 0, 0 ) +: KPr2DObject( object.getPen(), Qt::NoBrush, FT_BRUSH, TQColor(), TQColor(), BCT_PLAIN, false, 0, 0 ) { ext = object.getSize(); orig = object.getOrig(); @@ -73,7 +73,7 @@ KPrClosedLineObject::KPrClosedLineObject( const KPrPointObject &object ) case OT_CUBICBEZIERCURVE: typeString = i18n( "Closed Cubic Bezier Curve" ); break; - case OT_QUADRICBEZIERCURVE: + case OT_TQUADRICBEZIERCURVE: typeString = i18n( "Closed Quadric Bezier Curve" ); break; default: @@ -96,21 +96,21 @@ DCOPObject* KPrClosedLineObject::dcopObject() } #endif -QDomDocumentFragment KPrClosedLineObject::save( QDomDocument& doc, double offset ) +TQDomDocumentFragment KPrClosedLineObject::save( TQDomDocument& doc, double offset ) { - QDomDocumentFragment fragment = KPr2DObject::save( doc, offset ); + TQDomDocumentFragment fragment = KPr2DObject::save( doc, offset ); - QDomElement elemObjectsName = doc.createElement( "OBJECTSNAME" ); + TQDomElement elemObjectsName = doc.createElement( "OBJECTSNAME" ); elemObjectsName.setAttribute( "NAME", typeString ); fragment.appendChild( elemObjectsName ); if ( !points.isNull() ) { - QDomElement elemPoints = doc.createElement( "POINTS" ); + TQDomElement elemPoints = doc.createElement( "POINTS" ); KoPointArray::ConstIterator it; for ( it = points.begin(); it != points.end(); ++it ) { - QDomElement elemPoint = doc.createElement( "Point" ); + TQDomElement elemPoint = doc.createElement( "Point" ); KoPoint point = (*it); elemPoint.setAttribute( "point_x", point.x() ); elemPoint.setAttribute( "point_y", point.y() ); @@ -135,11 +135,11 @@ const char * KPrClosedLineObject::getOasisElementName() const } -double KPrClosedLineObject::load( const QDomElement &element ) +double KPrClosedLineObject::load( const TQDomElement &element ) { double offset = KPr2DObject::load( element ); - QDomElement e = element.namedItem( "OBJECTSNAME" ).toElement(); + TQDomElement e = element.namedItem( "OBJECTSNAME" ).toElement(); if ( !e.isNull() ) { if ( e.hasAttribute( "NAME" ) ) typeString = e.attribute( "NAME" ); @@ -147,7 +147,7 @@ double KPrClosedLineObject::load( const QDomElement &element ) e = element.namedItem( "POINTS" ).toElement(); if ( !e.isNull() ) { - QDomElement elemPoint = e.firstChild().toElement(); + TQDomElement elemPoint = e.firstChild().toElement(); unsigned int index = 0; while ( !elemPoint.isNull() ) { if ( elemPoint.tagName() == "Point" ) { @@ -194,22 +194,22 @@ void KPrClosedLineObject::updatePoints( double _fx, double _fy ) points = tmpPoints; } -void KPrClosedLineObject::paint( QPainter* _painter,KoTextZoomHandler*_zoomHandler, +void KPrClosedLineObject::paint( TQPainter* _painter,KoTextZoomHandler*_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour ) { - int _w = ( pen.style() == Qt::NoPen ) ? 1 : int( pen.pointWidth() ); + int _w = ( pen.style() == TQt::NoPen ) ? 1 : int( pen.pointWidth() ); if ( drawContour ) { - QPointArray pointArray2 = points.zoomPointArray( _zoomHandler ); - QPen pen3( Qt::black, 1, Qt::DotLine ); + TQPointArray pointArray2 = points.zoomPointArray( _zoomHandler ); + TQPen pen3( TQt::black, 1, TQt::DotLine ); _painter->setPen( pen3 ); - _painter->setRasterOp( Qt::NotXorROP ); + _painter->setRasterOp( TQt::NotXorROP ); _painter->drawPolygon( pointArray2 ); return; } - QPointArray pointArray = points.zoomPointArray( _zoomHandler, _w ); - QPen pen2 = pen.zoomedPen( _zoomHandler ); + TQPointArray pointArray = points.zoomPointArray( _zoomHandler, _w ); + TQPen pen2 = pen.zoomedPen( _zoomHandler ); if ( drawingShadow || getFillType() == FT_BRUSH || !gradient ) { _painter->setPen( pen2 ); @@ -217,16 +217,16 @@ void KPrClosedLineObject::paint( QPainter* _painter,KoTextZoomHandler*_zoomHandl _painter->drawPolygon( pointArray ); } else { - QSize size( _zoomHandler->zoomSize( ext ) ); + TQSize size( _zoomHandler->zoomSize( ext ) ); if ( m_redrawGradientPix || gradient->size() != size ) { m_redrawGradientPix = false; gradient->setSize( size ); - QRegion clipregion( pointArray ); + TQRegion clipregion( pointArray ); m_gradientPix.resize( size ); - m_gradientPix.fill( Qt::white ); + m_gradientPix.fill( TQt::white ); - QPainter p; + TQPainter p; p.begin( &m_gradientPix ); p.setClipRegion( clipregion ); p.drawPixmap( 0, 0, gradient->pixmap() ); @@ -235,11 +235,11 @@ void KPrClosedLineObject::paint( QPainter* _painter,KoTextZoomHandler*_zoomHandl m_gradientPix.setMask( m_gradientPix.createHeuristicMask() ); } - QRect _rect = pointArray.boundingRect(); + TQRect _rect = pointArray.boundingRect(); _painter->drawPixmap( 0, 0, m_gradientPix, 0, 0, _rect.width(), _rect.height() ); _painter->setPen( pen2 ); - _painter->setBrush( Qt::NoBrush ); + _painter->setBrush( TQt::NoBrush ); _painter->drawPolygon( pointArray ); } } @@ -279,32 +279,32 @@ void KPrClosedLineObject::flip( bool horizontal ) points = tmpPoints; } -void KPrClosedLineObject::loadOasis( const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info ) +void KPrClosedLineObject::loadOasis( const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info ) { - kdDebug()<<"void KPrClosedLineObject::loadOasis( const QDomElement &element )***********\n"; + kdDebug()<<"void KPrClosedLineObject::loadOasis( const TQDomElement &element )***********\n"; KPr2DObject::loadOasis( element,context, info ); - QString tag( element.tagName() ); + TQString tag( element.tagName() ); if ( tag == "polygon" ) { KPrShadowObject::loadOasisDrawPoints( points, element, context, info ); } else if ( tag == "path" ) // this is used to load closed draw:path objects { - QString d = element.attributeNS( KoXmlNS::svg, "d", QString::null); + TQString d = element.attributeNS( KoXmlNS::svg, "d", TQString()); kdDebug(33001) << "path d: " << d << endl; KPrSVGPathParser parser; points = parser.getPoints( d, true ); loadOasisApplyViewBox( element, points ); } - else if ( tag == "custom-shape" ) + else if ( tag == "custom-tqshape" ) { - QDomElement enhancedGeometry = KoDom::namedItemNS( element, KoXmlNS::draw, "enhanced-geometry" ); + TQDomElement enhancedGeometry = KoDom::namedItemNS( element, KoXmlNS::draw, "enhanced-tqgeometry" ); if ( !enhancedGeometry.isNull() ) { - QString d = enhancedGeometry.attributeNS( KoXmlNS::draw, "enhanced-path", QString::null ); - QRegExp rx( "^([0-9 MLZ]+)N$" ); + TQString d = enhancedGeometry.attributeNS( KoXmlNS::draw, "enhanced-path", TQString() ); + TQRegExp rx( "^([0-9 MLZ]+)N$" ); if ( rx.search( d ) != -1 ) { d = rx.cap( 1 ); diff --git a/kpresenter/KPrClosedLineObject.h b/kpresenter/KPrClosedLineObject.h index 60c07ea6..22aa06a5 100644 --- a/kpresenter/KPrClosedLineObject.h +++ b/kpresenter/KPrClosedLineObject.h @@ -22,12 +22,12 @@ #ifndef kpclosedlineoject_h #define kpclosedlineoject_h -#include <qpointarray.h> +#include <tqpointarray.h> #include "KoPointArray.h" #include "KPrObject.h" class KPrGradient; -class QPainter; +class TQPainter; class DCOPObject; class KPrPointObject; @@ -35,9 +35,9 @@ class KPrClosedLineObject : public KPr2DObject { public: KPrClosedLineObject(); - KPrClosedLineObject( const KoPointArray &_points, const KoSize &_size, const KoPen &_pen, const QBrush &_brush, - FillType _fillType, const QColor &_gColor1, const QColor &_gColor2, BCType _gType, - bool _unbalanced, int _xfactor, int _yfactor, const QString _type ); + KPrClosedLineObject( const KoPointArray &_points, const KoSize &_size, const KoPen &_pen, const TQBrush &_brush, + FillType _fillType, const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType, + bool _unbalanced, int _xfactor, int _yfactor, const TQString _type ); /** * @brief Construct object form a KPrPointObject. * @@ -57,12 +57,12 @@ public: virtual void setSize( const KoSize & _size ) { setSize( _size.width(), _size.height() ); } virtual ObjType getType() const { return OT_CLOSED_LINE; } - virtual QString getTypeString() const { return typeString; } + virtual TQString getTypeString() const { return typeString; } - virtual QDomDocumentFragment save( QDomDocument& doc, double offset ); - virtual double load( const QDomElement &element ); - virtual void loadOasis( const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info ); + virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset ); + virtual double load( const TQDomElement &element ); + virtual void loadOasis( const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info ); virtual void flip(bool horizontal ); virtual KoSize getRealSize() const; @@ -71,14 +71,14 @@ public: protected: virtual const char * getOasisElementName() const; virtual bool saveOasisObjectAttributes( KPOasisSaveContext &sc ) const; - virtual void paint( QPainter *_painter,KoTextZoomHandler*_zoomHandler, + virtual void paint( TQPainter *_painter,KoTextZoomHandler*_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour ); void updatePoints( double _fx, double _fy ); KoPointArray points; - QString typeString; + TQString typeString; }; #endif diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp index 62119e9f..491976cc 100644 --- a/kpresenter/KPrCommand.cpp +++ b/kpresenter/KPrCommand.cpp @@ -58,12 +58,12 @@ #include <KoOasisStyles.h> #include <KoOasisStore.h> -#include <qxml.h> -#include <qbuffer.h> +#include <tqxml.h> +#include <tqbuffer.h> -KPrShadowCmd::KPrShadowCmd( const QString &_name, QPtrList<ShadowValues> &_oldShadow, ShadowValues _newShadow, - QPtrList<KPrObject> &_objects, KPrDocument *_doc ) +KPrShadowCmd::KPrShadowCmd( const TQString &_name, TQPtrList<ShadowValues> &_oldShadow, ShadowValues _newShadow, + TQPtrList<KPrObject> &_objects, KPrDocument *_doc ) : KNamedCommand( _name ), oldShadow( _oldShadow ), objects( _objects ) { objects.setAutoDelete( false ); @@ -73,14 +73,14 @@ KPrShadowCmd::KPrShadowCmd( const QString &_name, QPtrList<ShadowValues> &_oldSh m_page = doc->findPage( objects ); - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrShadowCmd::~KPrShadowCmd() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); oldShadow.setAutoDelete( true ); @@ -89,12 +89,12 @@ KPrShadowCmd::~KPrShadowCmd() void KPrShadowCmd::execute() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setShadowParameter(newShadow.shadowDistance, newShadow.shadowDirection, newShadow.shadowColor); - doc->repaint( false ); + doc->tqrepaint( false ); doc->updateSideBarItem( m_page ); } @@ -105,15 +105,15 @@ void KPrShadowCmd::unexecute() objects.at( i )->setShadowParameter(oldShadow.at(i)->shadowDistance, oldShadow.at(i)->shadowDirection, oldShadow.at(i)->shadowColor); - doc->repaint( false ); + doc->tqrepaint( false ); doc->updateSideBarItem( m_page ); } -KPrSetOptionsCmd::KPrSetOptionsCmd( const QString &_name, QValueList<KoPoint> &_diffs, QPtrList<KPrObject> &_objects, +KPrSetOptionsCmd::KPrSetOptionsCmd( const TQString &_name, TQValueList<KoPoint> &_diffs, TQPtrList<KPrObject> &_objects, double _gridX, double _gridY, double _oldGridX, double _oldGridY, - const QColor &_txtBackCol, const QColor &_otxtBackCol, KPrDocument *_doc ) + const TQColor &_txtBackCol, const TQColor &_otxtBackCol, KPrDocument *_doc ) : KNamedCommand( _name ), diffs( _diffs ), objects( _objects ), @@ -125,14 +125,14 @@ KPrSetOptionsCmd::KPrSetOptionsCmd( const QString &_name, QValueList<KoPoint> &_ oldGridX = _oldGridX; oldGridY = _oldGridY; doc = _doc; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrSetOptionsCmd::~KPrSetOptionsCmd() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } @@ -145,7 +145,7 @@ void KPrSetOptionsCmd::execute() doc->setGridValue( gridX, gridY, false ); doc->updateRuler(); doc->setTxtBackCol( txtBackCol ); - doc->repaint( false ); + doc->tqrepaint( false ); } void KPrSetOptionsCmd::unexecute() @@ -155,10 +155,10 @@ void KPrSetOptionsCmd::unexecute() doc->setGridValue( oldGridX, oldGridY, false ); doc->updateRuler(); doc->setTxtBackCol( otxtBackCol ); - doc->repaint( false ); + doc->tqrepaint( false ); } -KPrSetBackCmd::KPrSetBackCmd( const QString &name, const KPrBackGround::Settings &settings, +KPrSetBackCmd::KPrSetBackCmd( const TQString &name, const KPrBackGround::Settings &settings, const KPrBackGround::Settings &oldSettings, bool useMasterBackground, bool takeGlobal, KPrDocument *doc, KPrPage *page ) @@ -180,7 +180,7 @@ void KPrSetBackCmd::execute() m_page->setUseMasterBackground( m_useMasterBackground ); m_doc->restoreBackground( m_page ); } else { - QPtrListIterator<KPrPage> it( m_doc->getPageList() ); + TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); for ( ; it.current() ; ++it ) { it.current()->background()->setBackGround( m_settings ); @@ -189,10 +189,10 @@ void KPrSetBackCmd::execute() } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); if ( m_takeGlobal ) { - QPtrListIterator<KPrPage> it( m_doc->getPageList() ); + TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); for ( int pos = 0; it.current(); ++it, ++pos ) { m_doc->updateSideBarItem( it.current() ); } @@ -209,7 +209,7 @@ void KPrSetBackCmd::unexecute() m_page->setUseMasterBackground( m_oldUseMasterBackground ); m_doc->restoreBackground( m_page ); } else { - QPtrListIterator<KPrPage> it( m_doc->getPageList() ); + TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); for ( ; it.current() ; ++it ) { it.current()->background()->setBackGround( m_oldSettings ); @@ -217,10 +217,10 @@ void KPrSetBackCmd::unexecute() m_doc->restoreBackground(it.current()); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); if ( m_takeGlobal ) { - QPtrListIterator<KPrPage> it( m_doc->getPageList() ); + TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); for ( int pos = 0; it.current(); ++it, ++pos ) { m_doc->updateSideBarItem( it.current() ); } @@ -230,14 +230,14 @@ void KPrSetBackCmd::unexecute() } } -KPrRotateCmd::KPrRotateCmd( const QString &_name, float newAngle, QPtrList<KPrObject> &objects, +KPrRotateCmd::KPrRotateCmd( const TQString &_name, float newAngle, TQPtrList<KPrObject> &objects, KPrDocument *doc, bool addAngle ) : KNamedCommand( _name ), m_doc( doc ), m_newAngle( newAngle ), m_addAngle( addAngle ) { m_objects.setAutoDelete( false ); m_oldAngles.setAutoDelete( false ); - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { m_objects.append( it.current() ); @@ -254,7 +254,7 @@ KPrRotateCmd::KPrRotateCmd( const QString &_name, float newAngle, QPtrList<KPrOb KPrRotateCmd::~KPrRotateCmd() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); m_oldAngles.setAutoDelete( true ); @@ -263,7 +263,7 @@ KPrRotateCmd::~KPrRotateCmd() void KPrRotateCmd::execute() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) { if ( m_addAngle ) @@ -272,7 +272,7 @@ void KPrRotateCmd::execute() it.current()->rotate( m_newAngle ); } m_doc->updateRuler(); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -282,13 +282,13 @@ void KPrRotateCmd::unexecute() for ( unsigned int i = 0; i < m_objects.count(); i++ ) m_objects.at(i)->rotate( m_oldAngles.at( i )->angle ); m_doc->updateRuler(); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -KPrChgPixCmd::KPrChgPixCmd( const QString &_name, KPrPixmapObject *_oldObject, KPrPixmapObject *_newObject, +KPrChgPixCmd::KPrChgPixCmd( const TQString &_name, KPrPixmapObject *_oldObject, KPrPixmapObject *_newObject, KPrDocument *_doc, KPrPage *_page) : KNamedCommand( _name ) { @@ -311,7 +311,7 @@ KPrChgPixCmd::~KPrChgPixCmd() void KPrChgPixCmd::execute() { m_page->replaceObject( oldObject, newObject ); - doc->repaint( newObject ); + doc->tqrepaint( newObject ); doc->updateSideBarItem( m_page ); } @@ -319,12 +319,12 @@ void KPrChgPixCmd::execute() void KPrChgPixCmd::unexecute() { m_page->replaceObject( newObject, oldObject ); - doc->repaint( oldObject ); + doc->tqrepaint( oldObject ); doc->updateSideBarItem( m_page ); } -KPrDeleteCmd::KPrDeleteCmd( const QString &_name, QPtrList<KPrObject> &_objects, +KPrDeleteCmd::KPrDeleteCmd( const TQString &_name, TQPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page ) : KNamedCommand( _name ) , m_oldObjectList( _page->objectList() ) @@ -332,14 +332,14 @@ KPrDeleteCmd::KPrDeleteCmd( const QString &_name, QPtrList<KPrObject> &_objects, , m_doc( _doc ) , m_page( _page ) { - QPtrListIterator<KPrObject> it( m_oldObjectList ); + TQPtrListIterator<KPrObject> it( m_oldObjectList ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrDeleteCmd::~KPrDeleteCmd() { - QPtrListIterator<KPrObject> it( m_oldObjectList ); + TQPtrListIterator<KPrObject> it( m_oldObjectList ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } @@ -348,9 +348,9 @@ void KPrDeleteCmd::execute() { bool textObj=false; - QPtrListIterator<KPrObject> it( m_oldObjectList ); - QPtrListIterator<KPrObject> itDelete( m_objectsToDelete ); - QPtrList<KPrObject> newObjectList; + TQPtrListIterator<KPrObject> it( m_oldObjectList ); + TQPtrListIterator<KPrObject> itDelete( m_objectsToDelete ); + TQPtrList<KPrObject> newObjectList; for ( ; it.current(); ++it ) { if ( it.current() == itDelete.current() ) @@ -377,8 +377,8 @@ void KPrDeleteCmd::execute() for ( itDelete.toFirst(); itDelete.current(); ++itDelete ) { - QRect oldRect = m_doc->zoomHandler()->zoomRect( itDelete.current()->getRepaintRect() ); - m_doc->repaint( oldRect ); + TQRect oldRect = m_doc->zoomHandler()->zoomRect( itDelete.current()->getRepaintRect() ); + m_doc->tqrepaint( oldRect ); } if(textObj) m_doc->updateRuler(); @@ -389,37 +389,37 @@ void KPrDeleteCmd::execute() void KPrDeleteCmd::unexecute() { m_page->setObjectList( m_oldObjectList ); - QPtrListIterator<KPrObject> it( m_objectsToDelete ); + TQPtrListIterator<KPrObject> it( m_objectsToDelete ); for ( ; it.current(); ++it ) { it.current()->addToObjList(); - m_doc->repaint( it.current() ); + m_doc->tqrepaint( it.current() ); } m_doc->updateSideBarItem( m_page ); } -KPrEffectCmd::KPrEffectCmd( const QString &_name, const QPtrList<KPrObject> &_objs, - const QValueList<EffectStruct> &_oldEffects, EffectStruct _newEffect ) +KPrEffectCmd::KPrEffectCmd( const TQString &_name, const TQPtrList<KPrObject> &_objs, + const TQValueList<EffectStruct> &_oldEffects, EffectStruct _newEffect ) : KNamedCommand( _name ), oldEffects( _oldEffects ), newEffect( _newEffect ), objs( _objs ) { - QPtrListIterator<KPrObject> it( objs ); + TQPtrListIterator<KPrObject> it( objs ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrEffectCmd::~KPrEffectCmd() { - QPtrListIterator<KPrObject> it( objs ); + TQPtrListIterator<KPrObject> it( objs ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } void KPrEffectCmd::execute() { - QPtrListIterator<KPrObject> it( objs ); + TQPtrListIterator<KPrObject> it( objs ); for ( ; it.current() ; ++it ) { it.current()->setAppearStep( newEffect.appearStep ); @@ -462,8 +462,8 @@ void KPrEffectCmd::unexecute() } } -KPrGroupObjCmd::KPrGroupObjCmd( const QString &_name, - const QPtrList<KPrObject> &_objects, +KPrGroupObjCmd::KPrGroupObjCmd( const TQString &_name, + const TQPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page ) : KNamedCommand( _name ) , m_objectsToGroup( _objects ) @@ -484,7 +484,7 @@ void KPrGroupObjCmd::execute() { KoRect r; int position = 0; - QPtrListIterator<KPrObject> it( m_objectsToGroup ); + TQPtrListIterator<KPrObject> it( m_objectsToGroup ); for ( ; it.current() ; ++it ) { it.current()->setSelected( false ); @@ -501,7 +501,7 @@ void KPrGroupObjCmd::execute() m_groupObject->setSelected( true ); m_doc->refreshGroupButton(); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -513,7 +513,7 @@ void KPrGroupObjCmd::unexecute() m_page->setObjectList( m_oldObjectList ); m_groupObject->removeFromObjList(); - QPtrListIterator<KPrObject> it( m_objectsToGroup ); + TQPtrListIterator<KPrObject> it( m_objectsToGroup ); for ( ; it.current() ; ++it ) { it.current()->addToObjList(); @@ -522,12 +522,12 @@ void KPrGroupObjCmd::unexecute() m_doc->refreshGroupButton(); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -UnGroupObjCmd::UnGroupObjCmd( const QString &_name, +UnGroupObjCmd::UnGroupObjCmd( const TQString &_name, KPrGroupObject *grpObj_, KPrDocument *_doc, KPrPage *_page ) : KNamedCommand( _name ) @@ -551,7 +551,7 @@ void UnGroupObjCmd::execute() int position = m_page->takeObject( m_groupObject ); m_groupObject->removeFromObjList(); - QPtrListIterator<KPrObject> it( m_groupedObjects ); + TQPtrListIterator<KPrObject> it( m_groupedObjects ); for ( it.toLast(); it.current() ; --it ) { m_page->insertObject( it.current(), position ); @@ -561,7 +561,7 @@ void UnGroupObjCmd::execute() m_doc->refreshGroupButton(); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -570,7 +570,7 @@ void UnGroupObjCmd::unexecute() { KoRect r=KoRect(); int position = 0; - QPtrListIterator<KPrObject> it( m_groupedObjects ); + TQPtrListIterator<KPrObject> it( m_groupedObjects ); for ( ; it.current() ; ++it ) { it.current()->setSelected( false ); @@ -587,12 +587,12 @@ void UnGroupObjCmd::unexecute() m_groupObject->setSelected( true ); m_doc->refreshGroupButton(); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -KPrInsertCmd::KPrInsertCmd( const QString &name, const QValueList<KPrObject *> objects, +KPrInsertCmd::KPrInsertCmd( const TQString &name, const TQValueList<KPrObject *> objects, KPrDocument *doc, KPrPage *page ) : KNamedCommand( name ) , m_objects( objects ) @@ -600,14 +600,14 @@ KPrInsertCmd::KPrInsertCmd( const QString &name, const QValueList<KPrObject *> o , m_doc( doc ) , m_page( page ) { - QValueListConstIterator<KPrObject *> it( m_objects.begin() ); + TQValueListConstIterator<KPrObject *> it( m_objects.begin() ); for ( ; it != m_objects.end(); ++it ) { ( *it )->incCmdRef(); } } -KPrInsertCmd::KPrInsertCmd( const QString &name, KPrObject *object, +KPrInsertCmd::KPrInsertCmd( const TQString &name, KPrObject *object, KPrDocument *doc, KPrPage *page ) : KNamedCommand( name ) , m_object( object ) @@ -625,7 +625,7 @@ KPrInsertCmd::~KPrInsertCmd() } else { - QValueListConstIterator<KPrObject *> it( m_objects.begin() ); + TQValueListConstIterator<KPrObject *> it( m_objects.begin() ); for ( ; it != m_objects.end(); ++it ) { ( *it )->decCmdRef(); @@ -641,19 +641,19 @@ void KPrInsertCmd::execute() m_object->addToObjList(); if ( m_object->getType() == OT_TEXT ) m_doc->updateRuler(); - m_doc->repaint( m_object ); + m_doc->tqrepaint( m_object ); } else { m_page->appendObjects( m_objects ); - QValueListConstIterator<KPrObject *> it( m_objects.begin() ); + TQValueListConstIterator<KPrObject *> it( m_objects.begin() ); bool updateRuler = false; for ( ; it != m_objects.end(); ++it ) { ( *it )->addToObjList(); if ( ( *it )->getType() == OT_TEXT ) updateRuler = true; - m_doc->repaint( *it ); + m_doc->tqrepaint( *it ); } if ( updateRuler ) m_doc->updateRuler(); @@ -666,9 +666,9 @@ void KPrInsertCmd::unexecute() { if ( m_object ) { - QRect oldRect = m_doc->zoomHandler()->zoomRect( m_object->getRepaintRect() ); - QPtrList<KPrObject> list(m_page->objectList()); - if ( list.findRef( m_object ) != -1 ) { + TQRect oldRect = m_doc->zoomHandler()->zoomRect( m_object->getRepaintRect() ); + TQPtrList<KPrObject> list(m_page->objectList()); + if ( list.tqfindRef( m_object ) != -1 ) { m_page->takeObject( m_object ); m_object->removeFromObjList(); if ( m_object->getType() == OT_TEXT ) @@ -678,17 +678,17 @@ void KPrInsertCmd::unexecute() m_doc->updateRuler(); } } - m_doc->repaint( oldRect ); + m_doc->tqrepaint( oldRect ); } else { - QPtrList<KPrObject> list(m_page->objectList()); + TQPtrList<KPrObject> list(m_page->objectList()); bool updateRuler = false; - QValueListConstIterator<KPrObject *> it( m_objects.begin() ); + TQValueListConstIterator<KPrObject *> it( m_objects.begin() ); for ( ; it != m_objects.end(); ++it ) { - if ( list.findRef( *it ) != -1 ) + if ( list.tqfindRef( *it ) != -1 ) { m_page->takeObject( *it ); ( *it )->removeFromObjList(); @@ -703,14 +703,14 @@ void KPrInsertCmd::unexecute() if ( updateRuler ) m_doc->updateRuler(); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); } m_doc->updateSideBarItem( m_page ); } -KPrLowerRaiseCmd::KPrLowerRaiseCmd( const QString &_name, const QPtrList<KPrObject>& _oldList, - const QPtrList<KPrObject>& _newList, KPrDocument *_doc, +KPrLowerRaiseCmd::KPrLowerRaiseCmd( const TQString &_name, const TQPtrList<KPrObject>& _oldList, + const TQPtrList<KPrObject>& _newList, KPrDocument *_doc, KPrPage *_page ) : KNamedCommand( _name ) { @@ -721,14 +721,14 @@ KPrLowerRaiseCmd::KPrLowerRaiseCmd( const QString &_name, const QPtrList<KPrObje newList.setAutoDelete( false ); doc = _doc; - QPtrListIterator<KPrObject> it( oldList ); + TQPtrListIterator<KPrObject> it( oldList ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrLowerRaiseCmd::~KPrLowerRaiseCmd() { - QPtrListIterator<KPrObject> it( oldList ); + TQPtrListIterator<KPrObject> it( oldList ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } @@ -736,7 +736,7 @@ KPrLowerRaiseCmd::~KPrLowerRaiseCmd() void KPrLowerRaiseCmd::execute() { m_page->setObjectList( newList ); - doc->repaint( false ); + doc->tqrepaint( false ); doc->updateSideBarItem( m_page ); } @@ -744,20 +744,20 @@ void KPrLowerRaiseCmd::execute() void KPrLowerRaiseCmd::unexecute() { m_page->setObjectList( oldList ); - doc->repaint( false ); + doc->tqrepaint( false ); doc->updateSideBarItem( m_page ); } -KPrMoveByCmd::KPrMoveByCmd( const QString &_name, const KoPoint &_diff, QPtrList<KPrObject> &_objects, +KPrMoveByCmd::KPrMoveByCmd( const TQString &_name, const KoPoint &_diff, TQPtrList<KPrObject> &_objects, KPrDocument *_doc,KPrPage *_page ) : KNamedCommand( _name ), diff( _diff ), objects( _objects ) { objects.setAutoDelete( false ); doc = _doc; m_page=_page; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { it.current()->incCmdRef(); @@ -766,14 +766,14 @@ KPrMoveByCmd::KPrMoveByCmd( const QString &_name, const KoPoint &_diff, QPtrList KPrMoveByCmd::~KPrMoveByCmd() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } void KPrMoveByCmd::execute() { - QRect oldRect; + TQRect oldRect; for ( unsigned int i = 0; i < objects.count(); i++ ) { oldRect = doc->zoomHandler()->zoomRect( objects.at( i )->getRepaintRect() ); @@ -783,8 +783,8 @@ void KPrMoveByCmd::execute() if(objects.at(i)->isSelected()) doc->updateRuler(); } - doc->repaint( oldRect ); - doc->repaint( objects.at( i ) ); + doc->tqrepaint( oldRect ); + doc->tqrepaint( objects.at( i ) ); } doc->updateSideBarItem( m_page ); @@ -793,7 +793,7 @@ void KPrMoveByCmd::execute() void KPrMoveByCmd::unexecute() { - QRect oldRect; + TQRect oldRect; for ( unsigned int i = 0; i < objects.count(); i++ ) { oldRect = doc->zoomHandler()->zoomRect( objects.at( i )->getRepaintRect() ); @@ -803,22 +803,22 @@ void KPrMoveByCmd::unexecute() if(objects.at(i)->isSelected()) doc->updateRuler(); } - doc->repaint( oldRect ); - doc->repaint( objects.at( i ) ); + doc->tqrepaint( oldRect ); + doc->tqrepaint( objects.at( i ) ); } doc->updateSideBarItem( m_page ); doc->updateObjectStatusBarItem(); } -KPrAlignCmd::KPrAlignCmd( const QString &_name, QPtrList<KPrObject> &_objects, AlignType _at, KPrDocument *_doc ) +KPrAlignCmd::KPrAlignCmd( const TQString &_name, TQPtrList<KPrObject> &_objects, AlignType _at, KPrDocument *_doc ) : KNamedCommand( _name ), doc(_doc) { objects.setAutoDelete( false ); diffs.setAutoDelete( true ); m_page = doc->findPage( _objects ); - QPtrListIterator<KPrObject> it( _objects ); + TQPtrListIterator<KPrObject> it( _objects ); KoRect boundingRect; for ( ; it.current() ; ++it ) { @@ -868,7 +868,7 @@ KPrAlignCmd::KPrAlignCmd( const QString &_name, QPtrList<KPrObject> &_objects, A KPrAlignCmd::~KPrAlignCmd() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); @@ -877,7 +877,7 @@ KPrAlignCmd::~KPrAlignCmd() void KPrAlignCmd::execute() { - QRect oldRect; + TQRect oldRect; for ( unsigned int i = 0; i < objects.count(); i++ ) { oldRect = doc->zoomHandler()->zoomRect( objects.at( i )->getRepaintRect() ); @@ -888,8 +888,8 @@ void KPrAlignCmd::execute() doc->updateRuler(); } - doc->repaint( oldRect ); - doc->repaint( objects.at( i ) ); + doc->tqrepaint( oldRect ); + doc->tqrepaint( objects.at( i ) ); } doc->updateSideBarItem( m_page ); @@ -897,7 +897,7 @@ void KPrAlignCmd::execute() void KPrAlignCmd::unexecute() { - QRect oldRect; + TQRect oldRect; for ( unsigned int i = 0; i < objects.count(); i++ ) { oldRect = doc->zoomHandler()->zoomRect(objects.at( i )->getRepaintRect() ); @@ -907,15 +907,15 @@ void KPrAlignCmd::unexecute() if(objects.at(i)->isSelected()) doc->updateRuler(); } - doc->repaint( oldRect ); - doc->repaint( objects.at( i ) ); + doc->tqrepaint( oldRect ); + doc->tqrepaint( objects.at( i ) ); doc->updateRuler(); } doc->updateSideBarItem( m_page ); } -KoPenCmd::KoPenCmd( const QString &_name, QPtrList<KPrObject> &_objects, Pen _newPen, +KoPenCmd::KoPenCmd( const TQString &_name, TQPtrList<KPrObject> &_objects, Pen _newPen, KPrDocument *_doc, KPrPage *_page, int _flags ) : KNamedCommand(_name), doc(_doc), m_page( _page ), newPen(_newPen), flags(_flags) { @@ -927,7 +927,7 @@ KoPenCmd::KoPenCmd( const QString &_name, QPtrList<KPrObject> &_objects, Pen _ne KoPenCmd::~KoPenCmd() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); @@ -976,12 +976,12 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen ) //obj->setPen( tmpPen->pen ); obj->setLineBegin( tmpPen->lineBegin ); obj->setLineEnd( tmpPen->lineEnd ); - //doc->repaint( obj ); + //doc->tqrepaint( obj ); } } break; case OT_FREEHAND: case OT_POLYLINE: - case OT_QUADRICBEZIERCURVE: + case OT_TQUADRICBEZIERCURVE: case OT_CUBICBEZIERCURVE: { KPrPointObject *obj = dynamic_cast<KPrPointObject*>( object ); @@ -990,7 +990,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen ) //obj->setPen( tmpPen->pen ); obj->setLineBegin( tmpPen->lineBegin ); obj->setLineEnd( tmpPen->lineEnd ); - //doc->repaint( obj ); + //doc->tqrepaint( obj ); } } break; case OT_PIE: @@ -1019,7 +1019,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen ) if ( obj ) { obj->setPen( tmpPen->pen ); - doc->repaint( obj ); + doc->tqrepaint( obj ); } } @@ -1036,9 +1036,9 @@ void KoPenCmd::unexecute() doc->updateSideBarItem( m_page ); } -void KoPenCmd::addObjects( const QPtrList<KPrObject> &_objects ) +void KoPenCmd::addObjects( const TQPtrList<KPrObject> &_objects ) { - QPtrListIterator<KPrObject> it( _objects ); + TQPtrListIterator<KPrObject> it( _objects ); for ( ; it.current(); ++it ) { KPrObject * object( it.current() ); @@ -1067,7 +1067,7 @@ void KoPenCmd::addObjects( const QPtrList<KPrObject> &_objects ) } break; case OT_FREEHAND: case OT_POLYLINE: - case OT_QUADRICBEZIERCURVE: + case OT_TQUADRICBEZIERCURVE: case OT_CUBICBEZIERCURVE: { KPrPointObject *obj = dynamic_cast<KPrPointObject*>( object ); @@ -1114,7 +1114,7 @@ void KoPenCmd::addObjects( const QPtrList<KPrObject> &_objects ) } -KPrBrushCmd::KPrBrushCmd( const QString &_name, QPtrList<KPrObject> &_objects, Brush _newBrush, +KPrBrushCmd::KPrBrushCmd( const TQString &_name, TQPtrList<KPrObject> &_objects, Brush _newBrush, KPrDocument *_doc, KPrPage *_page, int _flags ) : KNamedCommand(_name), doc(_doc), newBrush(_newBrush), m_page(_page), flags(_flags) { @@ -1124,9 +1124,9 @@ KPrBrushCmd::KPrBrushCmd( const QString &_name, QPtrList<KPrObject> &_objects, B addObjects( _objects ); } -void KPrBrushCmd::addObjects( const QPtrList<KPrObject> &_objects ) +void KPrBrushCmd::addObjects( const TQPtrList<KPrObject> &_objects ) { - QPtrListIterator<KPrObject> it( _objects ); + TQPtrListIterator<KPrObject> it( _objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) @@ -1163,7 +1163,7 @@ void KPrBrushCmd::addObjects( const QPtrList<KPrObject> &_objects ) KPrBrushCmd::~KPrBrushCmd() { - QPtrListIterator<KPr2DObject> it( objects ); + TQPtrListIterator<KPr2DObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); @@ -1220,7 +1220,7 @@ void KPrBrushCmd::applyBrush( KPr2DObject *object, Brush *tmpBrush ) object->setGUnbalanced( tmpBrush->unbalanced ); object->setGXFactor( tmpBrush->xfactor ); object->setGYFactor( tmpBrush->yfactor ); - doc->repaint( object ); + doc->tqrepaint( object ); } void KPrBrushCmd::unexecute() @@ -1233,12 +1233,12 @@ void KPrBrushCmd::unexecute() } -KPrPgConfCmd::KPrPgConfCmd( const QString &_name, bool _manualSwitch, bool _infiniteLoop, - bool _showEndOfPresentationSlide, bool _showPresentationDuration, QPen _pen, - QValueList<bool> _selectedSlides, const QString & _presentationName, +KPrPgConfCmd::KPrPgConfCmd( const TQString &_name, bool _manualSwitch, bool _infiniteLoop, + bool _showEndOfPresentationSlide, bool _showPresentationDuration, TQPen _pen, + TQValueList<bool> _selectedSlides, const TQString & _presentationName, bool _oldManualSwitch, bool _oldInfiniteLoop, - bool _oldShowEndOfPresentationSlide, bool _oldShowPresentationDuration, QPen _oldPen, - QValueList<bool> _oldSelectedSlides, const QString & _oldPresentationName, + bool _oldShowEndOfPresentationSlide, bool _oldShowPresentationDuration, TQPen _oldPen, + TQValueList<bool> _oldSelectedSlides, const TQString & _oldPresentationName, KPrDocument *_doc ) : KNamedCommand( _name ) { @@ -1267,7 +1267,7 @@ void KPrPgConfCmd::execute() doc->setPresentationDuration( showPresentationDuration ); doc->setPresPen( pen ); doc->setPresentationName( presentationName ); - QPtrList<KPrPage> pages = doc->pageList(); + TQPtrList<KPrPage> pages = doc->pageList(); unsigned count = selectedSlides.count(); if( count > pages.count() ) count = pages.count(); for( unsigned i = 0; i < selectedSlides.count(); i++ ) @@ -1283,7 +1283,7 @@ void KPrPgConfCmd::unexecute() doc->setPresPen( oldPen ); doc->setPresentationName( oldPresentationName ); - QPtrList<KPrPage> pages = doc->pageList(); + TQPtrList<KPrPage> pages = doc->pageList(); unsigned count = oldSelectedSlides.count(); if( count > pages.count() ) count = pages.count(); for( unsigned i = 0; i < oldSelectedSlides.count(); i++ ) @@ -1291,7 +1291,7 @@ void KPrPgConfCmd::unexecute() } -KPrTransEffectCmd::KPrTransEffectCmd( QValueVector<PageEffectSettings> oldSettings, +KPrTransEffectCmd::KPrTransEffectCmd( TQValueVector<PageEffectSettings> oldSettings, PageEffectSettings newSettings, KPrPage* page, KPrDocument* doc ) { @@ -1317,7 +1317,7 @@ void KPrTransEffectCmd::execute() if ( m_page ) m_newSettings.applyTo( m_page ); else - for( QPtrListIterator<KPrPage> it( m_doc->getPageList() ); *it; ++it ) + for( TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); *it; ++it ) m_newSettings.applyTo( it.current() ); } @@ -1327,12 +1327,12 @@ void KPrTransEffectCmd::unexecute() m_oldSettings[0].applyTo( m_page ); else { int i = 0; - for( QPtrListIterator<KPrPage> it( m_doc->getPageList() ); *it; ++it, ++i ) + for( TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); *it; ++it, ++i ) m_oldSettings[i].applyTo( it.current() ); } } -QString KPrTransEffectCmd::name() const +TQString KPrTransEffectCmd::name() const { if ( m_page ) return i18n( "Modify Slide Transition" ); @@ -1340,12 +1340,12 @@ QString KPrTransEffectCmd::name() const return i18n( "Modify Slide Transition For All Pages" ); } -KPrPgLayoutCmd::KPrPgLayoutCmd( const QString &_name, KoPageLayout _layout, KoPageLayout _oldLayout, +KPrPgLayoutCmd::KPrPgLayoutCmd( const TQString &_name, KoPageLayout _layout, KoPageLayout _oldLayout, KoUnit::Unit _oldUnit, KoUnit::Unit _unit,KPrDocument *_doc ) : KNamedCommand( _name ) { m_doc=_doc; - layout = _layout; + tqlayout = _layout; oldLayout = _oldLayout; oldUnit = _oldUnit; unit = _unit; @@ -1354,7 +1354,7 @@ KPrPgLayoutCmd::KPrPgLayoutCmd( const QString &_name, KoPageLayout _layout, KoPa void KPrPgLayoutCmd::execute() { m_doc->setUnit( unit ); - m_doc->setPageLayout( layout ); + m_doc->setPageLayout( tqlayout ); m_doc->updateHeaderFooterPosition(); m_doc->updateRuler(); m_doc->updateRulerPageLayout(); @@ -1370,8 +1370,8 @@ void KPrPgLayoutCmd::unexecute() } -KPrPieValueCmd::KPrPieValueCmd( const QString &name, PieValues newValues, - QPtrList<KPrObject> &objects, KPrDocument *doc, +KPrPieValueCmd::KPrPieValueCmd( const TQString &name, PieValues newValues, + TQPtrList<KPrObject> &objects, KPrDocument *doc, KPrPage *page, int flags ) : KNamedCommand( name ) , m_doc( doc ) @@ -1385,8 +1385,8 @@ KPrPieValueCmd::KPrPieValueCmd( const QString &name, PieValues newValues, addObjects( objects ); } -KPrPieValueCmd::KPrPieValueCmd( const QString &_name, QPtrList<PieValues> &_oldValues, PieValues _newValues, - QPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page, int _flags ) +KPrPieValueCmd::KPrPieValueCmd( const TQString &_name, TQPtrList<PieValues> &_oldValues, PieValues _newValues, + TQPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page, int _flags ) : KNamedCommand( _name ), m_oldValues( _oldValues ), m_objects( _objects ), m_flags(_flags) { m_objects.setAutoDelete( false ); @@ -1395,23 +1395,23 @@ KPrPieValueCmd::KPrPieValueCmd( const QString &_name, QPtrList<PieValues> &_oldV m_page = _page; m_newValues = _newValues; - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrPieValueCmd::~KPrPieValueCmd() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); m_oldValues.setAutoDelete( true ); m_oldValues.clear(); } -void KPrPieValueCmd::addObjects( const QPtrList<KPrObject> &objects ) +void KPrPieValueCmd::addObjects( const TQPtrList<KPrObject> &objects ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) @@ -1442,7 +1442,7 @@ void KPrPieValueCmd::addObjects( const QPtrList<KPrObject> &objects ) void KPrPieValueCmd::execute() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) { KPrPieObject* obj=dynamic_cast<KPrPieObject*>( it.current() ); @@ -1456,7 +1456,7 @@ void KPrPieValueCmd::execute() obj->setPieLength( m_newValues.pieLength ); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1473,14 +1473,14 @@ void KPrPieValueCmd::unexecute() obj->setPieLength( m_oldValues.at( i )->pieLength ); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -KPrPolygonSettingCmd::KPrPolygonSettingCmd( const QString &name, PolygonSettings newSettings, - QPtrList<KPrObject> &objects, KPrDocument *doc, +KPrPolygonSettingCmd::KPrPolygonSettingCmd( const TQString &name, PolygonSettings newSettings, + TQPtrList<KPrObject> &objects, KPrDocument *doc, KPrPage *page, int flags ) : KNamedCommand( name ) , m_doc( doc ) @@ -1497,16 +1497,16 @@ KPrPolygonSettingCmd::KPrPolygonSettingCmd( const QString &name, PolygonSettings KPrPolygonSettingCmd::~KPrPolygonSettingCmd() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); m_oldSettings.setAutoDelete( true ); m_oldSettings.clear(); } -void KPrPolygonSettingCmd::addObjects( const QPtrList<KPrObject> &objects ) +void KPrPolygonSettingCmd::addObjects( const TQPtrList<KPrObject> &objects ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) @@ -1539,7 +1539,7 @@ void KPrPolygonSettingCmd::addObjects( const QPtrList<KPrObject> &objects ) void KPrPolygonSettingCmd::execute() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) { KPrPolygonObject * obj=dynamic_cast<KPrPolygonObject*>( it.current() ); @@ -1553,7 +1553,7 @@ void KPrPolygonSettingCmd::execute() obj->setSharpnessValue(m_newSettings.sharpnessValue ); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1570,14 +1570,14 @@ void KPrPolygonSettingCmd::unexecute() obj->setSharpnessValue(m_oldSettings.at( i )->sharpnessValue); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -KPrPictureSettingCmd::KPrPictureSettingCmd( const QString &name, PictureSettings newSettings, - QPtrList<KPrObject> &objects, KPrDocument *doc, +KPrPictureSettingCmd::KPrPictureSettingCmd( const TQString &name, PictureSettings newSettings, + TQPtrList<KPrObject> &objects, KPrDocument *doc, KPrPage *page, int flags ) : KNamedCommand( name ) , m_doc( doc ) @@ -1591,8 +1591,8 @@ KPrPictureSettingCmd::KPrPictureSettingCmd( const QString &name, PictureSettings addObjects( objects ); } -KPrPictureSettingCmd::KPrPictureSettingCmd( const QString &_name, QPtrList<PictureSettings> &_oldSettings, - PictureSettings _newSettings, QPtrList<KPrObject> &_objects, +KPrPictureSettingCmd::KPrPictureSettingCmd( const TQString &_name, TQPtrList<PictureSettings> &_oldSettings, + PictureSettings _newSettings, TQPtrList<KPrObject> &_objects, KPrDocument *_doc, int flags ) : KNamedCommand( _name ), m_oldValues( _oldSettings ), m_objects( _objects ), m_flags( flags ) { @@ -1603,23 +1603,23 @@ KPrPictureSettingCmd::KPrPictureSettingCmd( const QString &_name, QPtrList<Pictu m_page = m_doc->findPage( m_objects ); - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrPictureSettingCmd::~KPrPictureSettingCmd() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); m_oldValues.setAutoDelete( true ); m_oldValues.clear(); } -void KPrPictureSettingCmd::addObjects( const QPtrList<KPrObject> &objects ) +void KPrPictureSettingCmd::addObjects( const TQPtrList<KPrObject> &objects ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) @@ -1654,7 +1654,7 @@ void KPrPictureSettingCmd::addObjects( const QPtrList<KPrObject> &objects ) void KPrPictureSettingCmd::execute() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) { KPrPixmapObject * obj = dynamic_cast<KPrPixmapObject*>( it.current() ); if ( obj ) { @@ -1670,7 +1670,7 @@ void KPrPictureSettingCmd::execute() obj->setPictureBright( m_newSettings.bright ); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1688,14 +1688,14 @@ void KPrPictureSettingCmd::unexecute() obj->setPictureBright( pictureSettings->bright ); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -KPrRectValueCmd::KPrRectValueCmd( const QString &_name, QPtrList<RectValues> &_oldValues, RectValues _newValues, - QPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page, int _flags ) +KPrRectValueCmd::KPrRectValueCmd( const TQString &_name, TQPtrList<RectValues> &_oldValues, RectValues _newValues, + TQPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page, int _flags ) : KNamedCommand( _name ), m_oldValues( _oldValues ), m_objects( _objects ), m_flags(_flags) { m_objects.setAutoDelete( false ); @@ -1704,13 +1704,13 @@ KPrRectValueCmd::KPrRectValueCmd( const QString &_name, QPtrList<RectValues> &_o m_page = _page; m_newValues = _newValues; - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } -KPrRectValueCmd::KPrRectValueCmd( const QString &name, QPtrList<KPrObject> &objects, RectValues newValues, +KPrRectValueCmd::KPrRectValueCmd( const TQString &name, TQPtrList<KPrObject> &objects, RectValues newValues, KPrDocument *doc, KPrPage *page, int flags ) : KNamedCommand( name ) , m_doc( doc ) @@ -1727,7 +1727,7 @@ KPrRectValueCmd::KPrRectValueCmd( const QString &name, QPtrList<KPrObject> &obje KPrRectValueCmd::~KPrRectValueCmd() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); @@ -1736,9 +1736,9 @@ KPrRectValueCmd::~KPrRectValueCmd() } -void KPrRectValueCmd::addObjects( const QPtrList<KPrObject> &objects ) +void KPrRectValueCmd::addObjects( const TQPtrList<KPrObject> &objects ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) @@ -1773,7 +1773,7 @@ void KPrRectValueCmd::addObjects( const QPtrList<KPrObject> &objects ) void KPrRectValueCmd::execute() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) { KPrRectObject *obj = dynamic_cast<KPrRectObject*>( it.current() ); @@ -1795,7 +1795,7 @@ void KPrRectValueCmd::execute() obj->setRnds( xtmp, ytmp ); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1809,13 +1809,13 @@ void KPrRectValueCmd::unexecute() if( obj ) obj->setRnds( m_oldValues.at( i )->xRnd, m_oldValues.at( i )->yRnd ); } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -KPrResizeCmd::KPrResizeCmd( const QString &_name, const KoPoint &_m_diff, const KoSize &_r_diff, +KPrResizeCmd::KPrResizeCmd( const TQString &_name, const KoPoint &_m_diff, const KoSize &_r_diff, KPrObject *_object, KPrDocument *_doc ) : KNamedCommand( _name ), m_diff( _m_diff ), r_diff( _r_diff ) { @@ -1833,7 +1833,7 @@ KPrResizeCmd::~KPrResizeCmd() void KPrResizeCmd::execute() { - QRect oldRect; + TQRect oldRect; oldRect = doc->zoomHandler()->zoomRect( object->getRepaintRect() ); object->moveBy( m_diff ); @@ -1842,19 +1842,19 @@ void KPrResizeCmd::execute() { if(object->isSelected()) doc->updateRuler(); - doc->layout( object ); + doc->tqlayout( object ); } if ( object->isSelected()) doc->updateObjectStatusBarItem(); - doc->repaint( oldRect ); - doc->repaint( object ); + doc->tqrepaint( oldRect ); + doc->tqrepaint( object ); doc->updateSideBarItem( m_page ); } void KPrResizeCmd::unexecute() { - QRect oldRect; + TQRect oldRect; oldRect = doc->zoomHandler()->zoomRect( object->getRepaintRect() ); object->moveBy( -m_diff.x(), -m_diff.y() ); @@ -1863,20 +1863,20 @@ void KPrResizeCmd::unexecute() { if(object->isSelected()) doc->updateRuler(); - doc->layout( object ); + doc->tqlayout( object ); } if ( object->isSelected()) doc->updateObjectStatusBarItem(); - doc->repaint( oldRect ); - doc->repaint( object ); + doc->tqrepaint( oldRect ); + doc->tqrepaint( object ); doc->updateSideBarItem( m_page ); } KPrOasisPasteTextCommand::KPrOasisPasteTextCommand( KoTextDocument *d, int parag, int idx, - const QByteArray &data ) + const TQByteArray &data ) : KoTextDocCommand( d ), m_parag( parag ), m_idx( idx ), m_data( data ), m_oldParagLayout( 0 ) { } @@ -1895,8 +1895,8 @@ KoTextCursor * KPrOasisPasteTextCommand::execute( KoTextCursor *c ) c->setParag( firstParag ); c->setIndex( m_idx ); - QBuffer buffer( m_data ); - KoStore * store = KoStore::createStore( &buffer, KoStore::Read ); + TQBuffer buffer( m_data ); + KoStore * store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read ); if ( store->bad() || !store->hasFile( "content.xml" ) ) { @@ -1908,8 +1908,8 @@ KoTextCursor * KPrOasisPasteTextCommand::execute( KoTextCursor *c ) store->disallowNameExpansion(); KoOasisStore oasisStore( store ); - QDomDocument contentDoc; - QString errorMessage; + TQDomDocument contentDoc; + TQString errorMessage; bool ok = oasisStore.loadAndParse( "content.xml", contentDoc, errorMessage ); if ( !ok ) { kdError(33001) << "Error parsing content.xml: " << errorMessage << endl; @@ -1917,20 +1917,20 @@ KoTextCursor * KPrOasisPasteTextCommand::execute( KoTextCursor *c ) } KoOasisStyles oasisStyles; - QDomDocument stylesDoc; + TQDomDocument stylesDoc; (void)oasisStore.loadAndParse( "styles.xml", stylesDoc, errorMessage ); // Load styles from style.xml oasisStyles.createStyleMap( stylesDoc, true ); // Also load styles from content.xml oasisStyles.createStyleMap( contentDoc, false ); - QDomElement content = contentDoc.documentElement(); + TQDomElement content = contentDoc.documentElement(); - QDomElement body ( KoDom::namedItemNS( content, KoXmlNS::office, "body" ) ); + TQDomElement body ( KoDom::namedItemNS( content, KoXmlNS::office, "body" ) ); // We then want to use whichever element is the child of <office:body>, // whether that's <office:text> or <office:presentation> or whatever. - QDomElement iter, realBody; + TQDomElement iter, realBody; forEachElement( iter, body ) { realBody = iter; } @@ -1988,7 +1988,7 @@ KoTextCursor * KPrOasisPasteTextCommand::unexecute( KoTextCursor *c ) } -KPrChangeStartingPageCommand::KPrChangeStartingPageCommand( const QString &name, KPrDocument *_doc, +KPrChangeStartingPageCommand::KPrChangeStartingPageCommand( const TQString &name, KPrDocument *_doc, int _oldStartingPage, int _newStartingPage): KNamedCommand(name), m_doc(_doc), @@ -2010,7 +2010,7 @@ void KPrChangeStartingPageCommand::unexecute() } -KPrChangeVariableSettingsCommand::KPrChangeVariableSettingsCommand( const QString &name, KPrDocument *_doc, +KPrChangeVariableSettingsCommand::KPrChangeVariableSettingsCommand( const TQString &name, KPrDocument *_doc, bool _oldValue, bool _newValue, VariableProperties _type): KNamedCommand(name), @@ -2054,7 +2054,7 @@ void KPrChangeVariableSettingsCommand::unexecute() changeValue(m_bOldValue); } -KPrDeletePageCmd::KPrDeletePageCmd( const QString &name, int pageNum, KPrDocument *doc ) +KPrDeletePageCmd::KPrDeletePageCmd( const TQString &name, int pageNum, KPrDocument *doc ) : KNamedCommand( name ) , m_doc( doc ) , m_pageNum( pageNum ) @@ -2069,18 +2069,18 @@ KPrDeletePageCmd::~KPrDeletePageCmd() void KPrDeletePageCmd::execute() { m_doc->deSelectAllObj(); - m_doc->takePage( m_page, QMAX( m_pageNum - 1, 0 ) ); + m_doc->takePage( m_page, TQMAX( m_pageNum - 1, 0 ) ); m_doc->updatePresentationButton(); } void KPrDeletePageCmd::unexecute() { m_doc->deSelectAllObj(); - m_doc->insertPage( m_page, QMAX( m_pageNum - 1, 0 ), m_pageNum ); + m_doc->insertPage( m_page, TQMAX( m_pageNum - 1, 0 ), m_pageNum ); m_doc->updatePresentationButton(); } -KPrInsertPageCmd::KPrInsertPageCmd( const QString &name, int pageNum, InsertPos pos, +KPrInsertPageCmd::KPrInsertPageCmd( const TQString &name, int pageNum, InsertPos pos, KPrPage *page, KPrDocument *doc ) : KNamedCommand(name) , m_doc( doc ) @@ -2118,7 +2118,7 @@ void KPrInsertPageCmd::unexecute() m_doc->updatePresentationButton(); } -KPrMovePageCmd::KPrMovePageCmd( const QString &_name,int from, int to, KPrDocument *_doc ) : +KPrMovePageCmd::KPrMovePageCmd( const TQString &_name,int from, int to, KPrDocument *_doc ) : KNamedCommand( _name ), m_doc( _doc ), m_oldPosition( from ), @@ -2143,9 +2143,9 @@ void KPrMovePageCmd::unexecute() } -KPrChangeTitlePageNameCommand::KPrChangeTitlePageNameCommand( const QString &_name,KPrDocument *_doc, - const QString &_oldPageName, - const QString &_newPageName, KPrPage *_page ) : +KPrChangeTitlePageNameCommand::KPrChangeTitlePageNameCommand( const TQString &_name,KPrDocument *_doc, + const TQString &_oldPageName, + const TQString &_newPageName, KPrPage *_page ) : KNamedCommand(_name), m_doc(_doc), oldPageName(_oldPageName), @@ -2168,8 +2168,8 @@ void KPrChangeTitlePageNameCommand::unexecute() m_doc->recalcVariables( VT_PGNUM ); } -KPrChangeCustomVariableValue::KPrChangeCustomVariableValue( const QString &name, KPrDocument *_doc, - const QString & _oldValue, const QString & _newValue, +KPrChangeCustomVariableValue::KPrChangeCustomVariableValue( const TQString &name, KPrDocument *_doc, + const TQString & _oldValue, const TQString & _newValue, KoCustomVariable *var): KNamedCommand(name), m_doc(_doc), @@ -2193,9 +2193,9 @@ void KPrChangeCustomVariableValue::unexecute() m_doc->recalcVariables( VT_CUSTOM ); } -KPrChangeLinkVariable::KPrChangeLinkVariable( const QString &name, KPrDocument *_doc, - const QString & _oldHref, const QString & _newHref, - const QString & _oldLink,const QString &_newLink, +KPrChangeLinkVariable::KPrChangeLinkVariable( const TQString &name, KPrDocument *_doc, + const TQString & _oldHref, const TQString & _newHref, + const TQString & _oldLink,const TQString &_newLink, KoLinkVariable *var): KNamedCommand(name), m_doc(_doc), @@ -2221,7 +2221,7 @@ void KPrChangeLinkVariable::unexecute() } -KPrNameObjectCommand::KPrNameObjectCommand( const QString &_name, const QString &_objectName, +KPrNameObjectCommand::KPrNameObjectCommand( const TQString &_name, const TQString &_objectName, KPrObject *_obj, KPrDocument *_doc ): KNamedCommand( _name ), newObjectName( _objectName ), @@ -2252,7 +2252,7 @@ void KPrNameObjectCommand::unexecute() doc->updateSideBarItem( m_page ); } -KPrDisplayObjectFromMasterPage::KPrDisplayObjectFromMasterPage(const QString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue) +KPrDisplayObjectFromMasterPage::KPrDisplayObjectFromMasterPage(const TQString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue) :KNamedCommand(name), m_doc( _doc ), m_page(_page), @@ -2273,7 +2273,7 @@ void KPrDisplayObjectFromMasterPage::unexecute() } -KPrDisplayBackgroundPage::KPrDisplayBackgroundPage(const QString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue) +KPrDisplayBackgroundPage::KPrDisplayBackgroundPage(const TQString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue) :KNamedCommand(name), m_doc( _doc ), m_page(_page), @@ -2294,7 +2294,7 @@ void KPrDisplayBackgroundPage::unexecute() } -KPrHideShowHeaderFooter::KPrHideShowHeaderFooter( const QString &name, KPrDocument *_doc, KPrPage *_page, +KPrHideShowHeaderFooter::KPrHideShowHeaderFooter( const TQString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue, KPrTextObject *_textObject): KNamedCommand(name), m_doc( _doc ), @@ -2329,8 +2329,8 @@ void KPrHideShowHeaderFooter::unexecute() m_doc->updateSideBarItem( m_doc->masterPage() ); } -KPrFlipObjectCommand::KPrFlipObjectCommand( const QString &name, KPrDocument *_doc, - bool _horizontal, QPtrList<KPrObject> &_objects ): +KPrFlipObjectCommand::KPrFlipObjectCommand( const TQString &name, KPrDocument *_doc, + bool _horizontal, TQPtrList<KPrObject> &_objects ): KNamedCommand( name ), m_doc( _doc ), objects( _objects ), @@ -2340,14 +2340,14 @@ KPrFlipObjectCommand::KPrFlipObjectCommand( const QString &name, KPrDocument *_d m_page = m_doc->findPage( objects ); - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrFlipObjectCommand::~KPrFlipObjectCommand() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } @@ -2364,18 +2364,18 @@ void KPrFlipObjectCommand::unexecute() void KPrFlipObjectCommand::flipObjects() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { it.current()->flip( horizontal ); - m_doc->repaint( it.current() ); + m_doc->tqrepaint( it.current() ); } m_doc->updateSideBarItem( m_page ); } -KPrGeometryPropertiesCommand::KPrGeometryPropertiesCommand( const QString &name, QPtrList<KPrObject> &objects, +KPrGeometryPropertiesCommand::KPrGeometryPropertiesCommand( const TQString &name, TQPtrList<KPrObject> &objects, bool newValue, KgpType type,KPrDocument *_doc ) : KNamedCommand( name ) , m_objects( objects ) @@ -2383,7 +2383,7 @@ KPrGeometryPropertiesCommand::KPrGeometryPropertiesCommand( const QString &name, , m_type( type ) , m_doc( _doc ) { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) { it.current()->incCmdRef(); @@ -2394,8 +2394,8 @@ KPrGeometryPropertiesCommand::KPrGeometryPropertiesCommand( const QString &name, } } -KPrGeometryPropertiesCommand::KPrGeometryPropertiesCommand( const QString &name, QValueList<bool> &lst, - QPtrList<KPrObject> &objects, bool newValue, +KPrGeometryPropertiesCommand::KPrGeometryPropertiesCommand( const TQString &name, TQValueList<bool> &lst, + TQPtrList<KPrObject> &objects, bool newValue, KgpType type, KPrDocument *_doc) : KNamedCommand( name ) , m_oldValue( lst ) @@ -2404,28 +2404,28 @@ KPrGeometryPropertiesCommand::KPrGeometryPropertiesCommand( const QString &name, , m_type( type ) , m_doc ( _doc ) { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrGeometryPropertiesCommand::~KPrGeometryPropertiesCommand() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } void KPrGeometryPropertiesCommand::execute() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) { if ( m_type == ProtectSize ) { it.current()->setProtect( m_newValue ); if ( it.current()->isSelected() ) - m_doc->repaint( it.current() ); + m_doc->tqrepaint( it.current() ); } else if ( m_type == KeepRatio) it.current()->setKeepRatio( m_newValue ); @@ -2441,14 +2441,14 @@ void KPrGeometryPropertiesCommand::unexecute() { obj->setProtect( *m_oldValue.at(i) ); if ( obj->isSelected() ) - m_doc->repaint( obj ); + m_doc->tqrepaint( obj ); } else if ( m_type == KeepRatio) obj->setKeepRatio( *m_oldValue.at(i) ); } } -KPrProtectContentCommand::KPrProtectContentCommand( const QString &name, QPtrList<KPrObject> &objects, +KPrProtectContentCommand::KPrProtectContentCommand( const TQString &name, TQPtrList<KPrObject> &objects, bool protectContent, KPrDocument *doc ) : KNamedCommand( name ) , m_protectContent( protectContent ) @@ -2459,7 +2459,7 @@ KPrProtectContentCommand::KPrProtectContentCommand( const QString &name, QPtrLis addObjects( objects ); } -KPrProtectContentCommand::KPrProtectContentCommand( const QString &name, bool protectContent, +KPrProtectContentCommand::KPrProtectContentCommand( const TQString &name, bool protectContent, KPrTextObject *obj, KPrDocument *doc ) : KNamedCommand( name ) , m_protectContent( protectContent ) @@ -2472,14 +2472,14 @@ KPrProtectContentCommand::KPrProtectContentCommand( const QString &name, bool pr KPrProtectContentCommand::~KPrProtectContentCommand() { - QPtrListIterator<KPrTextObject> it( m_objects ); + TQPtrListIterator<KPrTextObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } -void KPrProtectContentCommand::addObjects( const QPtrList<KPrObject> &objects ) +void KPrProtectContentCommand::addObjects( const TQPtrList<KPrObject> &objects ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) @@ -2506,7 +2506,7 @@ void KPrProtectContentCommand::addObjects( const QPtrList<KPrObject> &objects ) void KPrProtectContentCommand::execute() { - QPtrListIterator<KPrTextObject> it( m_objects ); + TQPtrListIterator<KPrTextObject> it( m_objects ); for ( ; it.current() ; ++it ) { it.current()->setProtectContent( m_protectContent ); @@ -2526,12 +2526,12 @@ void KPrProtectContentCommand::unexecute() m_doc->updateRulerInProtectContentMode(); } -KPrCloseObjectCommand::KPrCloseObjectCommand( const QString &name, QPtrList<KPrObject> objects, KPrDocument *doc ) +KPrCloseObjectCommand::KPrCloseObjectCommand( const TQString &name, TQPtrList<KPrObject> objects, KPrDocument *doc ) : KNamedCommand( name ) , m_doc( doc ) , m_page( doc->findPage( objects.at( 0 ) ) ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { KPrPointObject * pointObject = dynamic_cast<KPrPointObject *>( *it ); @@ -2548,18 +2548,18 @@ KPrCloseObjectCommand::KPrCloseObjectCommand( const QString &name, QPtrList<KPrO KPrCloseObjectCommand::~KPrCloseObjectCommand() { - QPtrListIterator<KPrObject> it( m_openObjects ); + TQPtrListIterator<KPrObject> it( m_openObjects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); - QPtrListIterator<KPrObject> it2( m_closedObjects ); + TQPtrListIterator<KPrObject> it2( m_closedObjects ); for ( ; it2.current() ; ++it2 ) it2.current()->decCmdRef(); } void KPrCloseObjectCommand::execute() { - QPtrListIterator<KPrObject> openIt( m_openObjects ); - QPtrListIterator<KPrObject> closeIt( m_closedObjects ); + TQPtrListIterator<KPrObject> openIt( m_openObjects ); + TQPtrListIterator<KPrObject> closeIt( m_closedObjects ); for ( ; openIt.current() ; ++openIt, ++closeIt ) { m_page->replaceObject( *openIt, *closeIt ); @@ -2568,15 +2568,15 @@ void KPrCloseObjectCommand::execute() ( *closeIt )->addToObjList(); ( *openIt )->setSelected( false ); ( *closeIt )->setSelected( selected ); - m_doc->repaint( *closeIt ); + m_doc->tqrepaint( *closeIt ); } m_doc->updateSideBarItem( m_page ); } void KPrCloseObjectCommand::unexecute() { - QPtrListIterator<KPrObject> openIt( m_openObjects ); - QPtrListIterator<KPrObject> closeIt( m_closedObjects ); + TQPtrListIterator<KPrObject> openIt( m_openObjects ); + TQPtrListIterator<KPrObject> closeIt( m_closedObjects ); for ( ; openIt.current() ; ++openIt, ++closeIt ) { m_page->replaceObject( *closeIt, *openIt ); @@ -2585,7 +2585,7 @@ void KPrCloseObjectCommand::unexecute() ( *openIt )->addToObjList(); ( *closeIt )->setSelected( false ); ( *openIt )->setSelected( selected ); - m_doc->repaint( *openIt ); + m_doc->tqrepaint( *openIt ); } m_doc->updateSideBarItem( m_page ); } @@ -2607,7 +2607,7 @@ MarginsStruct::MarginsStruct( double _left, double _top, double _right, double _ } -KPrChangeMarginCommand::KPrChangeMarginCommand( const QString &name, QPtrList<KPrObject> &objects, +KPrChangeMarginCommand::KPrChangeMarginCommand( const TQString &name, TQPtrList<KPrObject> &objects, MarginsStruct newMargins, KPrDocument *doc, KPrPage *page ) : KNamedCommand( name ) @@ -2624,7 +2624,7 @@ KPrChangeMarginCommand::KPrChangeMarginCommand( const QString &name, QPtrList<KP KPrChangeMarginCommand::~KPrChangeMarginCommand() { - QPtrListIterator<KPrTextObject> it( m_objects ); + TQPtrListIterator<KPrTextObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); m_oldMargins.setAutoDelete( true ); @@ -2632,9 +2632,9 @@ KPrChangeMarginCommand::~KPrChangeMarginCommand() } -void KPrChangeMarginCommand::addObjects( const QPtrList<KPrObject> &objects ) +void KPrChangeMarginCommand::addObjects( const TQPtrList<KPrObject> &objects ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) @@ -2662,15 +2662,15 @@ void KPrChangeMarginCommand::addObjects( const QPtrList<KPrObject> &objects ) void KPrChangeMarginCommand::execute() { - QPtrListIterator<KPrTextObject> it( m_objects ); + TQPtrListIterator<KPrTextObject> it( m_objects ); for ( ; it.current() ; ++it ) { it.current()->setTextMargins( m_newMargins.leftMargin, m_newMargins.topMargin, m_newMargins.rightMargin, m_newMargins.bottomMargin); it.current()->resizeTextDocument(); - it.current()->layout(); + it.current()->tqlayout(); } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -2684,15 +2684,15 @@ void KPrChangeMarginCommand::unexecute() object->setTextMargins( marginsStruct->leftMargin, marginsStruct->topMargin, marginsStruct->rightMargin, marginsStruct->bottomMargin); object->resizeTextDocument(); - object->layout(); + object->tqlayout(); } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -KPrChangeVerticalAlignmentCommand::KPrChangeVerticalAlignmentCommand( const QString &name, KPrTextObject *_obj, +KPrChangeVerticalAlignmentCommand::KPrChangeVerticalAlignmentCommand( const TQString &name, KPrTextObject *_obj, VerticalAlignmentType _oldAlign, VerticalAlignmentType _newAlign, KPrDocument *_doc) : @@ -2708,8 +2708,8 @@ KPrChangeVerticalAlignmentCommand::KPrChangeVerticalAlignmentCommand( const QStr void KPrChangeVerticalAlignmentCommand::execute() { m_obj->setVerticalAligment( m_newAlign ); - m_obj->kPresenterDocument()->layout(m_obj); - m_obj->kPresenterDocument()->repaint(m_obj); + m_obj->kPresenterDocument()->tqlayout(m_obj); + m_obj->kPresenterDocument()->tqrepaint(m_obj); m_doc->updateSideBarItem( m_page ); } @@ -2717,14 +2717,14 @@ void KPrChangeVerticalAlignmentCommand::execute() void KPrChangeVerticalAlignmentCommand::unexecute() { m_obj->setVerticalAligment( m_oldAlign ); - m_obj->kPresenterDocument()->layout(m_obj); - m_obj->kPresenterDocument()->repaint(m_obj); + m_obj->kPresenterDocument()->tqlayout(m_obj); + m_obj->kPresenterDocument()->tqrepaint(m_obj); m_doc->updateSideBarItem( m_page ); } -KPrChangeTabStopValueCommand::KPrChangeTabStopValueCommand( const QString &name, double _oldValue, double _newValue, +KPrChangeTabStopValueCommand::KPrChangeTabStopValueCommand( const TQString &name, double _oldValue, double _newValue, KPrDocument *_doc): KNamedCommand(name), m_doc( _doc ), @@ -2743,8 +2743,8 @@ void KPrChangeTabStopValueCommand::unexecute() m_doc->setTabStopValue ( m_oldValue ); } -KPrImageEffectCmd::KPrImageEffectCmd(const QString &_name, QPtrList<ImageEffectSettings> &_oldSettings, - ImageEffectSettings _newSettings, QPtrList<KPrObject> &_objects, +KPrImageEffectCmd::KPrImageEffectCmd(const TQString &_name, TQPtrList<ImageEffectSettings> &_oldSettings, + ImageEffectSettings _newSettings, TQPtrList<KPrObject> &_objects, KPrDocument *_doc ) :KNamedCommand( _name ), oldSettings( _oldSettings ), objects( _objects ) { @@ -2755,14 +2755,14 @@ KPrImageEffectCmd::KPrImageEffectCmd(const QString &_name, QPtrList<ImageEffectS m_page = doc->findPage( objects ); - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrImageEffectCmd::~KPrImageEffectCmd() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); oldSettings.setAutoDelete( true ); @@ -2771,7 +2771,7 @@ KPrImageEffectCmd::~KPrImageEffectCmd() void KPrImageEffectCmd::execute() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { KPrPixmapObject * obj = dynamic_cast<KPrPixmapObject*>( it.current() ); if ( obj ) { @@ -2779,7 +2779,7 @@ void KPrImageEffectCmd::execute() obj->setIEParams(newSettings.param1, newSettings.param2, newSettings.param3); } } - doc->repaint( false ); + doc->tqrepaint( false ); doc->updateSideBarItem( m_page ); } @@ -2794,13 +2794,13 @@ void KPrImageEffectCmd::unexecute() oldSettings.at( i )->param3); } } - doc->repaint( false ); + doc->tqrepaint( false ); doc->updateSideBarItem( m_page ); } -KPrChangeVariableNoteText::KPrChangeVariableNoteText( const QString &name, KPrDocument *_doc, - const QString &_oldValue,const QString &_newValue, +KPrChangeVariableNoteText::KPrChangeVariableNoteText( const TQString &name, KPrDocument *_doc, + const TQString &_oldValue,const TQString &_newValue, KoNoteVariable *var): KNamedCommand(name), m_doc(_doc), diff --git a/kpresenter/KPrCommand.h b/kpresenter/KPrCommand.h index a3e06e3e..4a4cc0ec 100644 --- a/kpresenter/KPrCommand.h +++ b/kpresenter/KPrCommand.h @@ -23,22 +23,22 @@ #define kprcommand_h #include <kcommand.h> -#include <qptrlist.h> -#include <qpoint.h> -#include <qcolor.h> -#include <qsize.h> +#include <tqptrlist.h> +#include <tqpoint.h> +#include <tqcolor.h> +#include <tqsize.h> #include "global.h" #include <KoPictureCollection.h> -#include <qvaluelist.h> -#include <qpen.h> -#include <qbrush.h> +#include <tqvaluelist.h> +#include <tqpen.h> +#include <tqbrush.h> #include <KoPageLayoutDia.h> #include <KoParagLayout.h> #include <KoTextCommand.h> #include <KoPoint.h> #include <KoSize.h> -#include <qvariant.h> -#include <qvaluevector.h> +#include <tqvariant.h> +#include <tqvaluevector.h> #include "KPrBackground.h" #include "KPrVariableCollection.h" #include <KoPen.h> @@ -67,11 +67,11 @@ public: { int shadowDistance; ShadowDirection shadowDirection; - QColor shadowColor; + TQColor shadowColor; }; - KPrShadowCmd( const QString &_name, QPtrList<ShadowValues> &_oldShadow, ShadowValues _newShadow, - QPtrList<KPrObject> &_objects, KPrDocument *_doc ); + KPrShadowCmd( const TQString &_name, TQPtrList<ShadowValues> &_oldShadow, ShadowValues _newShadow, + TQPtrList<KPrObject> &_objects, KPrDocument *_doc ); ~KPrShadowCmd(); virtual void execute(); @@ -79,8 +79,8 @@ public: protected: KPrDocument *doc; - QPtrList<ShadowValues> oldShadow; - QPtrList<KPrObject> objects; + TQPtrList<ShadowValues> oldShadow; + TQPtrList<KPrObject> objects; ShadowValues newShadow; KPrPage *m_page; }; @@ -88,9 +88,9 @@ protected: class KPrSetOptionsCmd : public KNamedCommand { public: - KPrSetOptionsCmd( const QString &_name, QValueList<KoPoint> &_diffs, QPtrList<KPrObject> &_objects, + KPrSetOptionsCmd( const TQString &_name, TQValueList<KoPoint> &_diffs, TQPtrList<KPrObject> &_objects, double _rastX, double _rastY, double _orastX, double _orastY, - const QColor &_txtBackCol, const QColor &_otxtBackCol, KPrDocument *_doc ); + const TQColor &_txtBackCol, const TQColor &_otxtBackCol, KPrDocument *_doc ); ~KPrSetOptionsCmd(); virtual void execute(); @@ -98,21 +98,21 @@ public: protected: - QValueList<KoPoint> diffs; - QPtrList<KPrObject> objects; + TQValueList<KoPoint> diffs; + TQPtrList<KPrObject> objects; double gridX; double gridY; double oldGridX; double oldGridY; KPrDocument *doc; - QColor txtBackCol; - QColor otxtBackCol; + TQColor txtBackCol; + TQColor otxtBackCol; }; class KPrSetBackCmd : public KNamedCommand { public: - KPrSetBackCmd( const QString &name, const KPrBackGround::Settings &settings, + KPrSetBackCmd( const TQString &name, const KPrBackGround::Settings &settings, const KPrBackGround::Settings &oldSettings, bool useMasterBackground, bool takeGlobal, KPrDocument *doc, KPrPage *page ); @@ -139,7 +139,7 @@ public: float angle; }; - KPrRotateCmd( const QString &_name, float newAngle, QPtrList<KPrObject> &objects, + KPrRotateCmd( const TQString &_name, float newAngle, TQPtrList<KPrObject> &objects, KPrDocument *doc, bool addAngle = false ); ~KPrRotateCmd(); @@ -148,8 +148,8 @@ public: protected: KPrDocument *m_doc; - QPtrList<RotateValues> m_oldAngles; - QPtrList<KPrObject> m_objects; + TQPtrList<RotateValues> m_oldAngles; + TQPtrList<KPrObject> m_objects; float m_newAngle; //necessary for duplicate object, we can duplicated and add angle. bool m_addAngle; @@ -159,7 +159,7 @@ protected: class KPrResizeCmd : public KNamedCommand { public: - KPrResizeCmd( const QString &_name, const KoPoint &_m_diff, const KoSize &_r_diff, + KPrResizeCmd( const TQString &_name, const KoPoint &_m_diff, const KoSize &_r_diff, KPrObject *_object, KPrDocument *_doc ); ~KPrResizeCmd(); @@ -178,7 +178,7 @@ protected: class KPrChgPixCmd : public KNamedCommand { public: - KPrChgPixCmd( const QString &_name, KPrPixmapObject *_oldObject, KPrPixmapObject *_newObject, + KPrChgPixCmd( const TQString &_name, KPrPixmapObject *_oldObject, KPrPixmapObject *_newObject, KPrDocument *_doc, KPrPage *_page ); ~KPrChgPixCmd(); @@ -195,7 +195,7 @@ protected: class KPrDeleteCmd : public KNamedCommand { public: - KPrDeleteCmd( const QString &_name, QPtrList<KPrObject> &_objects, KPrDocument *_doc, + KPrDeleteCmd( const TQString &_name, TQPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page); ~KPrDeleteCmd(); @@ -203,8 +203,8 @@ public: virtual void unexecute(); protected: - QPtrList<KPrObject> m_oldObjectList; - QPtrList<KPrObject> m_objectsToDelete; + TQPtrList<KPrObject> m_oldObjectList; + TQPtrList<KPrObject> m_objectsToDelete; KPrDocument *m_doc; KPrPage *m_page; }; @@ -222,11 +222,11 @@ public: bool disappear; int appearTimer, disappearTimer; bool appearSoundEffect, disappearSoundEffect; - QString a_fileName, d_fileName; + TQString a_fileName, d_fileName; }; - KPrEffectCmd( const QString &_name, const QPtrList<KPrObject> &_objs, - const QValueList<EffectStruct> &_oldEffects, EffectStruct _newEffect ); + KPrEffectCmd( const TQString &_name, const TQPtrList<KPrObject> &_objs, + const TQValueList<EffectStruct> &_oldEffects, EffectStruct _newEffect ); ~KPrEffectCmd(); virtual void execute(); @@ -234,16 +234,16 @@ public: protected: - QValueList<EffectStruct> oldEffects; + TQValueList<EffectStruct> oldEffects; EffectStruct newEffect; - QPtrList<KPrObject> objs; + TQPtrList<KPrObject> objs; }; class KPrGroupObjCmd : public KNamedCommand { public: - KPrGroupObjCmd( const QString &_name, - const QPtrList<KPrObject> &_objects, + KPrGroupObjCmd( const TQString &_name, + const TQPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page ); ~KPrGroupObjCmd(); @@ -252,8 +252,8 @@ public: protected: - QPtrList<KPrObject> m_objectsToGroup; - QPtrList<KPrObject> m_oldObjectList; + TQPtrList<KPrObject> m_objectsToGroup; + TQPtrList<KPrObject> m_oldObjectList; KPrDocument *m_doc; KPrGroupObject *m_groupObject; KPrPage *m_page; @@ -263,7 +263,7 @@ protected: class UnGroupObjCmd : public KNamedCommand { public: - UnGroupObjCmd( const QString &_name, + UnGroupObjCmd( const TQString &_name, KPrGroupObject *grpObj_, KPrDocument *_doc, KPrPage *_page ); ~UnGroupObjCmd(); @@ -273,7 +273,7 @@ public: protected: - QPtrList<KPrObject> m_groupedObjects; + TQPtrList<KPrObject> m_groupedObjects; KPrGroupObject *m_groupObject; KPrDocument *m_doc; KPrPage *m_page; @@ -283,15 +283,15 @@ protected: class KPrInsertCmd : public KNamedCommand { public: - KPrInsertCmd( const QString &name, const QValueList<KPrObject *> objects, KPrDocument *doc, KPrPage *page ); - KPrInsertCmd( const QString &name, KPrObject *object, KPrDocument *doc, KPrPage *page ); + KPrInsertCmd( const TQString &name, const TQValueList<KPrObject *> objects, KPrDocument *doc, KPrPage *page ); + KPrInsertCmd( const TQString &name, KPrObject *object, KPrDocument *doc, KPrPage *page ); ~KPrInsertCmd(); virtual void execute(); virtual void unexecute(); protected: - QValueList<KPrObject *> m_objects; + TQValueList<KPrObject *> m_objects; KPrObject *m_object; KPrDocument *m_doc; KPrPage *m_page; @@ -301,8 +301,8 @@ protected: class KPrLowerRaiseCmd : public KNamedCommand { public: - KPrLowerRaiseCmd( const QString &_name, const QPtrList<KPrObject>& _oldList, - const QPtrList<KPrObject>& _newList, + KPrLowerRaiseCmd( const TQString &_name, const TQPtrList<KPrObject>& _oldList, + const TQPtrList<KPrObject>& _newList, KPrDocument *_doc, KPrPage *_page ); ~KPrLowerRaiseCmd(); @@ -311,7 +311,7 @@ public: protected: - QPtrList<KPrObject> oldList, newList; + TQPtrList<KPrObject> oldList, newList; KPrDocument *doc; KPrPage *m_page; }; @@ -319,7 +319,7 @@ protected: class KPrMoveByCmd : public KNamedCommand { public: - KPrMoveByCmd( const QString &_name, const KoPoint &_diff, QPtrList<KPrObject> &_objects, + KPrMoveByCmd( const TQString &_name, const KoPoint &_diff, TQPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page ); ~KPrMoveByCmd(); @@ -329,7 +329,7 @@ public: protected: KoPoint diff; - QPtrList<KPrObject> objects; + TQPtrList<KPrObject> objects; KPrDocument *doc; KPrPage *m_page; }; @@ -340,15 +340,15 @@ protected: class KPrAlignCmd : public KNamedCommand { public: - KPrAlignCmd( const QString &_name, QPtrList<KPrObject> &_objects, AlignType _at, KPrDocument *_doc ); + KPrAlignCmd( const TQString &_name, TQPtrList<KPrObject> &_objects, AlignType _at, KPrDocument *_doc ); ~KPrAlignCmd(); virtual void execute(); virtual void unexecute(); protected: - QPtrList<KoPoint> diffs; - QPtrList<KPrObject> objects; + TQPtrList<KoPoint> diffs; + TQPtrList<KPrObject> objects; KPrDocument *doc; KPrPage *m_page; }; @@ -384,7 +384,7 @@ public: All = LineBegin | LineEnd | Color | Width | Style }; - KoPenCmd( const QString &_name, QPtrList<KPrObject> &_objects, Pen _newPen, + KoPenCmd( const TQString &_name, TQPtrList<KPrObject> &_objects, Pen _newPen, KPrDocument *_doc, KPrPage *_page, int _flags = All); ~KoPenCmd(); @@ -392,13 +392,13 @@ public: virtual void unexecute(); protected: - void addObjects( const QPtrList<KPrObject> &_objects ); + void addObjects( const TQPtrList<KPrObject> &_objects ); void applyPen( KPrObject *object, Pen *tmpPen ); KPrDocument *doc; KPrPage *m_page; - QPtrList<Pen> oldPen; - QPtrList<KPrObject> objects; + TQPtrList<Pen> oldPen; + TQPtrList<KPrObject> objects; Pen newPen; int flags; }; @@ -408,7 +408,7 @@ class KPrBrushCmd : public KNamedCommand public: struct Brush { Brush() {} - Brush( QBrush _brush, QColor _gColor1, QColor _gColor2, + Brush( TQBrush _brush, TQColor _gColor1, TQColor _gColor2, BCType _gType, FillType _fillType, bool _unbalanced, int _xfactor, int _yfactor ) : brush( _brush ) @@ -421,9 +421,9 @@ public: , yfactor( _yfactor ) {} - QBrush brush; - QColor gColor1; - QColor gColor2; + TQBrush brush; + TQColor gColor1; + TQColor gColor2; BCType gType; FillType fillType; bool unbalanced; @@ -456,7 +456,7 @@ public: All = BrushColor | BrushStyle | BrushGradientSelect | GradientColor1 | GradientColor2 | GradientType | GradientBalanced | GradientXFactor | GradientYFactor }; - KPrBrushCmd( const QString &_name, QPtrList<KPrObject> &_objects, Brush _newBrush, + KPrBrushCmd( const TQString &_name, TQPtrList<KPrObject> &_objects, Brush _newBrush, KPrDocument *_doc, KPrPage *_page, int _flags = All ); ~KPrBrushCmd(); @@ -464,12 +464,12 @@ public: virtual void unexecute(); protected: - void addObjects( const QPtrList<KPrObject> &_objects ); + void addObjects( const TQPtrList<KPrObject> &_objects ); void applyBrush( KPr2DObject *object, Brush *tmpBrush ); KPrDocument *doc; - QPtrList<Brush> oldBrush; - QPtrList<KPr2DObject> objects; + TQPtrList<Brush> oldBrush; + TQPtrList<KPr2DObject> objects; Brush newBrush; KPrPage *m_page; int flags; @@ -478,12 +478,12 @@ protected: class KPrPgConfCmd : public KNamedCommand { public: - KPrPgConfCmd( const QString &_name, bool _manualSwitch, bool _infiniteLoop, - bool _showEndOfPresentationSlide, bool _showPresentationDuration, QPen _pen, - QValueList<bool> _selectedSlides, const QString & _presentationName, + KPrPgConfCmd( const TQString &_name, bool _manualSwitch, bool _infiniteLoop, + bool _showEndOfPresentationSlide, bool _showPresentationDuration, TQPen _pen, + TQValueList<bool> _selectedSlides, const TQString & _presentationName, bool _oldManualSwitch, bool _oldInfiniteLoop, - bool _oldShowEndOfPresentationSlide, bool _oldShowPresentationDuration, QPen _oldPen, - QValueList<bool> _oldSelectedSlides, const QString & _oldPresentationName, + bool _oldShowEndOfPresentationSlide, bool _oldShowPresentationDuration, TQPen _oldPen, + TQValueList<bool> _oldSelectedSlides, const TQString & _oldPresentationName, KPrDocument *_doc ); virtual void execute(); @@ -494,9 +494,9 @@ protected: bool infiniteLoop, oldInfiniteLoop; bool showEndOfPresentationSlide, oldShowEndOfPresentationSlide; bool showPresentationDuration, oldShowPresentationDuration; - QPen pen, oldPen; - QValueList<bool> selectedSlides, oldSelectedSlides; - QString oldPresentationName, presentationName; + TQPen pen, oldPen; + TQValueList<bool> selectedSlides, oldSelectedSlides; + TQString oldPresentationName, presentationName; KPrDocument *doc; }; @@ -508,25 +508,25 @@ public: PageEffect pageEffect; EffectSpeed effectSpeed; bool soundEffect; - QString soundFileName; + TQString soundFileName; bool autoAdvance; int slideTime; void applyTo( KPrPage * ); }; // TODO also pass a flag to know which settings need to be applied (especially for "all pages") - KPrTransEffectCmd( QValueVector<PageEffectSettings> oldSettings, + KPrTransEffectCmd( TQValueVector<PageEffectSettings> oldSettings, PageEffectSettings newSettings, KPrPage* page, KPrDocument* doc ); virtual void execute(); virtual void unexecute(); - virtual QString name() const; + virtual TQString name() const; private: void exec( KPrPage* page ); void unexec( KPrPage* page ); - QValueVector<PageEffectSettings> m_oldSettings; + TQValueVector<PageEffectSettings> m_oldSettings; PageEffectSettings m_newSettings; KPrPage *m_page; KPrDocument *m_doc; @@ -535,7 +535,7 @@ private: class KPrPgLayoutCmd : public KNamedCommand { public: - KPrPgLayoutCmd( const QString &_name, KoPageLayout _layout, KoPageLayout _oldLayout, + KPrPgLayoutCmd( const TQString &_name, KoPageLayout _layout, KoPageLayout _oldLayout, KoUnit::Unit _oldUnit, KoUnit::Unit _unit,KPrDocument *_doc ); virtual void execute(); @@ -543,7 +543,7 @@ public: protected: KPrDocument *m_doc; - KoPageLayout layout, oldLayout; + KoPageLayout tqlayout, oldLayout; KoUnit::Unit unit, oldUnit; }; @@ -564,23 +564,23 @@ public: All = Type | Angle | Length }; - KPrPieValueCmd( const QString &name, PieValues newValues, - QPtrList<KPrObject> &objects, KPrDocument *doc, + KPrPieValueCmd( const TQString &name, PieValues newValues, + TQPtrList<KPrObject> &objects, KPrDocument *doc, KPrPage *page, int flags = All ); - KPrPieValueCmd( const QString &_name, QPtrList<PieValues> &_oldValues, PieValues _newValues, - QPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page, int _flags = All ); + KPrPieValueCmd( const TQString &_name, TQPtrList<PieValues> &_oldValues, PieValues _newValues, + TQPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page, int _flags = All ); ~KPrPieValueCmd(); virtual void execute(); virtual void unexecute(); protected: - void addObjects( const QPtrList<KPrObject> &objects ); + void addObjects( const TQPtrList<KPrObject> &objects ); KPrDocument *m_doc; KPrPage *m_page; - QPtrList<PieValues> m_oldValues; - QPtrList<KPrObject> m_objects; + TQPtrList<PieValues> m_oldValues; + TQPtrList<KPrObject> m_objects; PieValues m_newValues; int m_flags; }; @@ -603,8 +603,8 @@ public: All = ConcaveConvex | Corners | Sharpness }; - KPrPolygonSettingCmd( const QString &name, PolygonSettings newSettings, - QPtrList<KPrObject> &objects, KPrDocument *doc, + KPrPolygonSettingCmd( const TQString &name, PolygonSettings newSettings, + TQPtrList<KPrObject> &objects, KPrDocument *doc, KPrPage *page, int flags = All ); ~KPrPolygonSettingCmd(); @@ -612,12 +612,12 @@ public: virtual void unexecute(); protected: - void addObjects( const QPtrList<KPrObject> &objects ); + void addObjects( const TQPtrList<KPrObject> &objects ); KPrDocument *m_doc; KPrPage *m_page; - QPtrList<PolygonSettings> m_oldSettings; - QPtrList<KPrObject> m_objects; + TQPtrList<PolygonSettings> m_oldSettings; + TQPtrList<KPrObject> m_objects; PolygonSettings m_newSettings; int m_flags; }; @@ -643,11 +643,11 @@ public: All = MirrorType | Depth | SwapRGB | Grayscal | Bright }; - KPrPictureSettingCmd( const QString &name, PictureSettings newSettings, - QPtrList<KPrObject> &objects, KPrDocument *doc, + KPrPictureSettingCmd( const TQString &name, PictureSettings newSettings, + TQPtrList<KPrObject> &objects, KPrDocument *doc, KPrPage *page, int flags = All ); - KPrPictureSettingCmd( const QString &_name, QPtrList<PictureSettings> &_oldSettings, - PictureSettings _newSettings, QPtrList<KPrObject> &_objects, + KPrPictureSettingCmd( const TQString &_name, TQPtrList<PictureSettings> &_oldSettings, + PictureSettings _newSettings, TQPtrList<KPrObject> &_objects, KPrDocument *_doc, int flags = All ); ~KPrPictureSettingCmd(); @@ -655,11 +655,11 @@ public: virtual void unexecute(); protected: - void addObjects( const QPtrList<KPrObject> &_objects ); + void addObjects( const TQPtrList<KPrObject> &_objects ); KPrDocument *m_doc; - QPtrList<PictureSettings> m_oldValues; - QPtrList<KPrObject> m_objects; + TQPtrList<PictureSettings> m_oldValues; + TQPtrList<KPrObject> m_objects; PictureSettings m_newSettings; KPrPage *m_page; int m_flags; @@ -671,13 +671,13 @@ public: struct ImageEffectSettings { ImageEffect effect; - QVariant param1; - QVariant param2; - QVariant param3; + TQVariant param1; + TQVariant param2; + TQVariant param3; }; - KPrImageEffectCmd(const QString &_name, QPtrList<ImageEffectSettings> &_oldSettings, - ImageEffectSettings _newSettings, QPtrList<KPrObject> &_objects, + KPrImageEffectCmd(const TQString &_name, TQPtrList<ImageEffectSettings> &_oldSettings, + ImageEffectSettings _newSettings, TQPtrList<KPrObject> &_objects, KPrDocument *_doc ); ~KPrImageEffectCmd(); @@ -686,8 +686,8 @@ public: protected: KPrDocument *doc; - QPtrList<ImageEffectSettings> oldSettings; - QPtrList<KPrObject> objects; + TQPtrList<ImageEffectSettings> oldSettings; + TQPtrList<KPrObject> objects; ImageEffectSettings newSettings; KPrPage *m_page; @@ -708,9 +708,9 @@ public: All = XRnd | YRnd }; - KPrRectValueCmd( const QString &_name, QPtrList<RectValues> &_oldValues, RectValues _newValues, - QPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page, int _flags = All ); - KPrRectValueCmd( const QString &_name, QPtrList<KPrObject> &_objects, RectValues _newValues, + KPrRectValueCmd( const TQString &_name, TQPtrList<RectValues> &_oldValues, RectValues _newValues, + TQPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page, int _flags = All ); + KPrRectValueCmd( const TQString &_name, TQPtrList<KPrObject> &_objects, RectValues _newValues, KPrDocument *_doc, KPrPage *_page, int _flags = All ); ~KPrRectValueCmd(); @@ -718,12 +718,12 @@ public: virtual void unexecute(); protected: - void addObjects( const QPtrList<KPrObject> &_objects ); + void addObjects( const TQPtrList<KPrObject> &_objects ); KPrDocument *m_doc; KPrPage *m_page; - QPtrList<RectValues> m_oldValues; - QPtrList<KPrObject> m_objects; + TQPtrList<RectValues> m_oldValues; + TQPtrList<KPrObject> m_objects; RectValues m_newValues; int m_flags; }; @@ -731,7 +731,7 @@ protected: class KPrDeletePageCmd : public KNamedCommand { public: - KPrDeletePageCmd( const QString &name, int pageNum, KPrDocument *doc ); + KPrDeletePageCmd( const TQString &name, int pageNum, KPrDocument *doc ); ~KPrDeletePageCmd(); virtual void execute(); @@ -746,7 +746,7 @@ protected: class KPrInsertPageCmd : public KNamedCommand { public: - KPrInsertPageCmd( const QString &name, int currentPageNum, InsertPos pos, + KPrInsertPageCmd( const TQString &name, int currentPageNum, InsertPos pos, KPrPage *page, KPrDocument *doc ); ~KPrInsertPageCmd(); @@ -762,7 +762,7 @@ protected: class KPrMovePageCmd : public KNamedCommand { public: - KPrMovePageCmd( const QString &_name, int from,int to, KPrDocument *_doc ); + KPrMovePageCmd( const TQString &_name, int from,int to, KPrDocument *_doc ); ~KPrMovePageCmd(); virtual void execute(); @@ -780,13 +780,13 @@ class KPrOasisPasteTextCommand : public KoTextDocCommand { public: KPrOasisPasteTextCommand( KoTextDocument *d, int parag, int idx, - const QByteArray &data ); + const TQByteArray &data ); KoTextCursor *execute( KoTextCursor *c ); KoTextCursor *unexecute( KoTextCursor *c ); protected: int m_parag; int m_idx; - QByteArray m_data; + TQByteArray m_data; // filled in by execute(), for unexecute() int m_lastParag; int m_lastIndex; @@ -799,7 +799,7 @@ protected: class KPrChangeStartingPageCommand : public KNamedCommand { public: - KPrChangeStartingPageCommand( const QString &name, KPrDocument *_doc, + KPrChangeStartingPageCommand( const TQString &name, KPrDocument *_doc, int _oldStartingPage, int _newStartingPage); ~KPrChangeStartingPageCommand(){} @@ -818,7 +818,7 @@ class KPrChangeVariableSettingsCommand : public KNamedCommand { public: enum VariableProperties { VS_DISPLAYLINK, VS_UNDERLINELINK, VS_DISPLAYCOMMENT, VS_DISPLAYFIELDCODE}; - KPrChangeVariableSettingsCommand( const QString &name, KPrDocument *_doc, bool _oldValue, + KPrChangeVariableSettingsCommand( const TQString &name, KPrDocument *_doc, bool _oldValue, bool _newValue, VariableProperties _type); ~KPrChangeVariableSettingsCommand(){} @@ -838,48 +838,48 @@ protected: class KPrChangeTitlePageNameCommand : public KNamedCommand { public: - KPrChangeTitlePageNameCommand( const QString &name, KPrDocument *_doc, const QString &_oldPageName, - const QString &_newPageName, KPrPage *_page); + KPrChangeTitlePageNameCommand( const TQString &name, KPrDocument *_doc, const TQString &_oldPageName, + const TQString &_newPageName, KPrPage *_page); ~KPrChangeTitlePageNameCommand(){} void execute(); void unexecute(); protected: KPrDocument *m_doc; - QString oldPageName; - QString newPageName; + TQString oldPageName; + TQString newPageName; KPrPage *m_page; }; class KPrChangeCustomVariableValue : public KNamedCommand { public: - KPrChangeCustomVariableValue( const QString &name, KPrDocument *_doc,const QString & _oldValue, - const QString & _newValue, KoCustomVariable *var); + KPrChangeCustomVariableValue( const TQString &name, KPrDocument *_doc,const TQString & _oldValue, + const TQString & _newValue, KoCustomVariable *var); void execute(); void unexecute(); protected: KPrDocument *m_doc; - QString newValue; - QString oldValue; + TQString newValue; + TQString oldValue; KoCustomVariable *m_var; }; class KPrChangeLinkVariable : public KNamedCommand { public: - KPrChangeLinkVariable( const QString &name, KPrDocument *_doc,const QString & _oldHref, - const QString & _newHref, const QString & _oldLink,const QString &_newLink, KoLinkVariable *var); + KPrChangeLinkVariable( const TQString &name, KPrDocument *_doc,const TQString & _oldHref, + const TQString & _newHref, const TQString & _oldLink,const TQString &_newLink, KoLinkVariable *var); ~KPrChangeLinkVariable(){}; void execute(); void unexecute(); protected: KPrDocument *m_doc; - QString oldHref; - QString newHref; - QString oldLink; - QString newLink; + TQString oldHref; + TQString newHref; + TQString oldLink; + TQString newLink; KoLinkVariable *m_var; }; @@ -887,12 +887,12 @@ protected: class KPrNameObjectCommand : public KNamedCommand { public: - KPrNameObjectCommand( const QString &_name, const QString &_objectName, KPrObject *_obj, KPrDocument *_doc ); + KPrNameObjectCommand( const TQString &_name, const TQString &_objectName, KPrObject *_obj, KPrDocument *_doc ); ~KPrNameObjectCommand(); void execute(); void unexecute(); protected: - QString oldObjectName, newObjectName; + TQString oldObjectName, newObjectName; KPrObject *object; KPrDocument *doc; KPrPage *m_page; @@ -901,7 +901,7 @@ protected: class KPrDisplayObjectFromMasterPage : public KNamedCommand { public: - KPrDisplayObjectFromMasterPage( const QString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue); + KPrDisplayObjectFromMasterPage( const TQString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue); ~KPrDisplayObjectFromMasterPage(){}; void execute(); void unexecute(); @@ -914,7 +914,7 @@ protected: class KPrDisplayBackgroundPage : public KNamedCommand { public: - KPrDisplayBackgroundPage( const QString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue); + KPrDisplayBackgroundPage( const TQString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue); ~KPrDisplayBackgroundPage(){}; void execute(); void unexecute(); @@ -927,7 +927,7 @@ protected: class KPrHideShowHeaderFooter : public KNamedCommand { public: - KPrHideShowHeaderFooter( const QString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue,KPrTextObject *_textObject); + KPrHideShowHeaderFooter( const TQString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue,KPrTextObject *_textObject); ~KPrHideShowHeaderFooter(){}; void execute(); void unexecute(); @@ -941,15 +941,15 @@ protected: class KPrFlipObjectCommand : public KNamedCommand { public: - KPrFlipObjectCommand( const QString &name, KPrDocument *_doc, bool _horizontal , - QPtrList<KPrObject> &_objects ); + KPrFlipObjectCommand( const TQString &name, KPrDocument *_doc, bool _horizontal , + TQPtrList<KPrObject> &_objects ); ~KPrFlipObjectCommand(); void execute(); void unexecute(); protected: void flipObjects(); KPrDocument *m_doc; - QPtrList<KPrObject> objects; + TQPtrList<KPrObject> objects; bool horizontal; KPrPage *m_page; }; @@ -958,9 +958,9 @@ class KPrGeometryPropertiesCommand : public KNamedCommand { public: enum KgpType { ProtectSize, KeepRatio}; - KPrGeometryPropertiesCommand( const QString &name, QPtrList<KPrObject> &objects, + KPrGeometryPropertiesCommand( const TQString &name, TQPtrList<KPrObject> &objects, bool newValue, KgpType type, KPrDocument *_doc ); - KPrGeometryPropertiesCommand( const QString &name, QValueList<bool> &lst, QPtrList<KPrObject> &objects, + KPrGeometryPropertiesCommand( const TQString &name, TQValueList<bool> &lst, TQPtrList<KPrObject> &objects, bool newValue, KgpType type, KPrDocument *_doc ); ~KPrGeometryPropertiesCommand(); @@ -968,8 +968,8 @@ public: virtual void unexecute(); protected: - QValueList<bool> m_oldValue; - QPtrList<KPrObject> m_objects; + TQValueList<bool> m_oldValue; + TQPtrList<KPrObject> m_objects; bool m_newValue; KgpType m_type; KPrDocument *m_doc; @@ -978,9 +978,9 @@ protected: class KPrProtectContentCommand : public KNamedCommand { public: - KPrProtectContentCommand( const QString &name, QPtrList<KPrObject> &objects, + KPrProtectContentCommand( const TQString &name, TQPtrList<KPrObject> &objects, bool protectContent, KPrDocument *doc ); - KPrProtectContentCommand( const QString &name, bool protectContent, + KPrProtectContentCommand( const TQString &name, bool protectContent, KPrTextObject *obj, KPrDocument *doc ); ~KPrProtectContentCommand(); @@ -988,18 +988,18 @@ public: virtual void unexecute(); protected: - void addObjects( const QPtrList<KPrObject> &objects ); + void addObjects( const TQPtrList<KPrObject> &objects ); - QPtrList<KPrTextObject> m_objects; + TQPtrList<KPrTextObject> m_objects; bool m_protectContent; - QValueList<bool> m_oldValues; + TQValueList<bool> m_oldValues; KPrDocument *m_doc; }; class KPrCloseObjectCommand : public KNamedCommand { public: - KPrCloseObjectCommand( const QString &name, QPtrList<KPrObject> objects, KPrDocument *doc ); + KPrCloseObjectCommand( const TQString &name, TQPtrList<KPrObject> objects, KPrDocument *doc ); ~KPrCloseObjectCommand(); virtual void execute(); @@ -1008,8 +1008,8 @@ public: protected: void closeObject(bool close); - QPtrList<KPrObject> m_openObjects; - QPtrList<KPrObject> m_closedObjects; + TQPtrList<KPrObject> m_openObjects; + TQPtrList<KPrObject> m_closedObjects; KPrDocument * m_doc; KPrPage *m_page; }; @@ -1027,16 +1027,16 @@ struct MarginsStruct { class KPrChangeMarginCommand : public KNamedCommand { public: - KPrChangeMarginCommand( const QString &name, QPtrList<KPrObject> &objects, MarginsStruct newMargins, + KPrChangeMarginCommand( const TQString &name, TQPtrList<KPrObject> &objects, MarginsStruct newMargins, KPrDocument *doc, KPrPage *page ); ~KPrChangeMarginCommand(); virtual void execute(); virtual void unexecute(); protected: - void addObjects( const QPtrList<KPrObject> &objects ); - QPtrList<MarginsStruct> m_oldMargins; - QPtrList<KPrTextObject> m_objects; + void addObjects( const TQPtrList<KPrObject> &objects ); + TQPtrList<MarginsStruct> m_oldMargins; + TQPtrList<KPrTextObject> m_objects; MarginsStruct m_newMargins; KPrPage *m_page; KPrDocument *m_doc; @@ -1046,7 +1046,7 @@ protected: class KPrChangeVerticalAlignmentCommand : public KNamedCommand { public: - KPrChangeVerticalAlignmentCommand( const QString &name, KPrTextObject *_obj, VerticalAlignmentType _oldAlign, + KPrChangeVerticalAlignmentCommand( const TQString &name, KPrTextObject *_obj, VerticalAlignmentType _oldAlign, VerticalAlignmentType _newAlign, KPrDocument *_doc); ~KPrChangeVerticalAlignmentCommand() {} @@ -1064,7 +1064,7 @@ protected: class KPrChangeTabStopValueCommand : public KNamedCommand { public: - KPrChangeTabStopValueCommand( const QString &name, double _oldValue, double _newValue, KPrDocument *_doc); + KPrChangeTabStopValueCommand( const TQString &name, double _oldValue, double _newValue, KPrDocument *_doc); ~KPrChangeTabStopValueCommand() {} @@ -1079,14 +1079,14 @@ protected: class KPrChangeVariableNoteText : public KNamedCommand { public: - KPrChangeVariableNoteText( const QString &name, KPrDocument *_doc, const QString &_oldValue,const QString &_newValue, KoNoteVariable *var); + KPrChangeVariableNoteText( const TQString &name, KPrDocument *_doc, const TQString &_oldValue,const TQString &_newValue, KoNoteVariable *var); ~KPrChangeVariableNoteText(); void execute(); void unexecute(); protected: KPrDocument *m_doc; - QString newValue; - QString oldValue; + TQString newValue; + TQString oldValue; KoNoteVariable *m_var; }; diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index 6722edd2..e6498bc3 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -37,15 +37,15 @@ #include <KoSpeaker.h> -#include <qgroupbox.h> -#include <qvgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qvbox.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qtabwidget.h> -#include <qwhatsthis.h> +#include <tqgroupbox.h> +#include <tqvgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqvbox.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqtabwidget.h> +#include <tqwhatsthis.h> #include "KPrPenStyleWidget.h" #include "KPrBrushProperty.h" @@ -61,9 +61,9 @@ #include <float.h> #include <knumvalidator.h> -#include <qlineedit.h> +#include <tqlineedit.h> #include "KPrCommand.h" -#include <qvgroupbox.h> +#include <tqvgroupbox.h> #include <kfontdialog.h> #include <klineedit.h> #include <KoRect.h> @@ -79,50 +79,50 @@ #include <kspell2/broker.h> using namespace KSpell2; -KPrConfig::KPrConfig( KPrView* parent ) +KPrConfig::KPrConfig( KPrView* tqparent ) : KDialogBase(KDialogBase::IconList,i18n("Configure KPresenter") , KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel| KDialogBase::Default, - KDialogBase::Ok, parent) + KDialogBase::Ok, tqparent) { - m_doc = parent->kPresenterDoc(); - QVBox *page = addVBoxPage( i18n("Interface"), i18n("Interface"), + m_doc = tqparent->kPresenterDoc(); + TQVBox *page = addVBoxPage( i18n("Interface"), i18n("Interface"), BarIcon("misc", KIcon::SizeMedium) ); - _interfacePage=new KPrConfigureInterfacePage( parent, page ); + _interfacePage=new KPrConfigureInterfacePage( tqparent, page ); page = addVBoxPage( i18n("Color"), i18n("Color"), BarIcon("colorize", KIcon::SizeMedium) ); - _colorBackground = new KPrConfigureColorBackground( parent, page ); + _colorBackground = new KPrConfigureColorBackground( tqparent, page ); page = addVBoxPage( i18n("Spelling"), i18n("Spellchecker Behavior"), BarIcon("spellcheck", KIcon::SizeMedium) ); - _spellPage=new KPrConfigureSpellPage(parent, page); + _spellPage=new KPrConfigureSpellPage(tqparent, page); page = addVBoxPage( i18n("Misc"), i18n("Misc"), BarIcon("misc", KIcon::SizeMedium) ); - _miscPage=new KPrConfigureMiscPage(parent, page); + _miscPage=new KPrConfigureMiscPage(tqparent, page); page = addVBoxPage( i18n("Document"), i18n("Document Settings"), BarIcon("kpresenter_kpr", KIcon::SizeMedium) ); - _defaultDocPage=new KPrConfigureDefaultDocPage(parent, page); + _defaultDocPage=new KPrConfigureDefaultDocPage(tqparent, page); page = addVBoxPage( i18n("Tools"), i18n("Default Tools Settings"), BarIcon("configure", KIcon::SizeMedium) ); - _toolsPage=new KPrConfigureToolsPage(parent, page); + _toolsPage=new KPrConfigureToolsPage(tqparent, page); page = addVBoxPage( i18n("Paths"), i18n("Path Settings"), BarIcon("path") ); - m_pathPage=new KPrConfigurePathPage(parent, page); + m_pathPage=new KPrConfigurePathPage(tqparent, page); if (KoSpeaker::isKttsdInstalled()) { page = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"), i18n("Text-to-Speech Settings"), BarIcon("access", KIcon::SizeMedium) ); - m_ttsPage=new KPrConfigureTTSPage(parent, page); + m_ttsPage=new KPrConfigureTTSPage(tqparent, page); } else m_ttsPage = 0; - connect( this, SIGNAL( okClicked() ),this, SLOT( slotApply() ) ); + connect( this, TQT_SIGNAL( okClicked() ),this, TQT_SLOT( slotApply() ) ); } void KPrConfig::openPage(int flags) @@ -203,10 +203,10 @@ void KPrConfig::slotDefault() } } -KPrConfigureInterfacePage::KPrConfigureInterfacePage( KPrView *_view, QWidget *parent , char *name ) - :QWidget ( parent,name ) +KPrConfigureInterfacePage::KPrConfigureInterfacePage( KPrView *_view, TQWidget *tqparent , char *name ) + :TQWidget ( tqparent,name ) { - QVBoxLayout *box = new QVBoxLayout( this, 0, 0 ); + TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 ); m_pView=_view; config = KPrFactory::global()->config(); @@ -227,13 +227,13 @@ KPrConfigureInterfacePage::KPrConfigureInterfacePage( KPrView *_view, QWidget *p } - showRuler= new QCheckBox(i18n("Show rulers"),this); - QWhatsThis::add(showRuler, i18n( "When checked, both vertical and horizontal rulers are shown on the KPresenter slide (this is the default). When unchecked, the rulers are not shown on any slide." ) ); + showRuler= new TQCheckBox(i18n("Show rulers"),this); + TQWhatsThis::add(showRuler, i18n( "When checked, both vertical and horizontal rulers are shown on the KPresenter slide (this is the default). When unchecked, the rulers are not shown on any slide." ) ); showRuler->setChecked(bShowRuler); box->addWidget(showRuler); - showStatusBar = new QCheckBox(i18n("Show status bar"),this); - QWhatsThis::add(showStatusBar, i18n( "Toggle the statusbar, which is shown by default." ) ); + showStatusBar = new TQCheckBox(i18n("Show status bar"),this); + TQWhatsThis::add(showStatusBar, i18n( "Toggle the statusbar, which is shown by default." ) ); showStatusBar->setChecked(oldShowStatusBar); box->addWidget(showStatusBar); @@ -241,11 +241,11 @@ KPrConfigureInterfacePage::KPrConfigureInterfacePage( KPrView *_view, QWidget *p recentFiles=new KIntNumInput( oldNbRecentFiles, this); recentFiles->setRange(1, 20, 1); recentFiles->setLabel(i18n("Number of recent files:")); - QWhatsThis::add(recentFiles, i18n( "Set the number of recent files which will be opened using the File->Open Recent menu. Default is to remember 10 filenames. The maximum you can set is 20 and the minimum is 1." ) ); + TQWhatsThis::add(recentFiles, i18n( "Set the number of recent files which will be opened using the File->Open Recent menu. Default is to remember 10 filenames. The maximum you can set is 20 and the minimum is 1." ) ); box->addWidget(recentFiles); - QString suffix = KoUnit::unitName( unit ).prepend(' '); + TQString suffix = KoUnit::unitName( unit ).prepend(' '); indent = new KDoubleNumInput( this ); indent->setValue( KoUnit::toUserValue( ptIndent, unit ) ); indent->setRange(KoUnit::toUserValue( 0.1, unit ), KoUnit::toUserValue( 50, unit ), KoUnit::toUserValue( 0.1, unit )); @@ -253,11 +253,11 @@ KPrConfigureInterfacePage::KPrConfigureInterfacePage( KPrView *_view, QWidget *p indent->setSuffix( suffix ); indent->setLabel(i18n("Text indentation depth:")); - QWhatsThis::add(indent, i18n( "This setting is used by Increase Depth and Decrease Depth menu items (in the Text menu) to change the indentation depth. The Default is 1 centimeter." ) ); + TQWhatsThis::add(indent, i18n( "This setting is used by Increase Depth and Decrease Depth menu items (in the Text menu) to change the indentation depth. The Default is 1 centimeter." ) ); box->addWidget(indent); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); box->addItem( spacer); } @@ -312,19 +312,19 @@ void KPrConfigureInterfacePage::slotDefault() showStatusBar->setChecked(true); } -KPrConfigureColorBackground::KPrConfigureColorBackground( KPrView* _view, QWidget *parent , char *name ) - :QWidget ( parent,name ) +KPrConfigureColorBackground::KPrConfigureColorBackground( KPrView* _view, TQWidget *tqparent , char *name ) + :TQWidget ( tqparent,name ) { m_pView = _view; config = KPrFactory::global()->config(); oldBgColor = m_pView->kPresenterDoc()->txtBackCol(); oldGridColor = m_pView->kPresenterDoc()->gridColor(); - QVBoxLayout *box = new QVBoxLayout( this, 0, 0 ); + TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 ); - QLabel *lab = new QLabel( this, "label20" ); + TQLabel *lab = new TQLabel( this, "label20" ); lab->setText( i18n( "Background object color:" ) ); - QWhatsThis::add(lab, i18n( "Change the background color of the text box. The background is white by default. If you have a dark background color and you want to put some white text on it, you can change the color of the text box so that you can see what you are typing. When you have finished, the area around the text will revert to the background color. The Defaults button restores the original settings." ) ); + TQWhatsThis::add(lab, i18n( "Change the background color of the text box. The background is white by default. If you have a dark background color and you want to put some white text on it, you can change the color of the text box so that you can see what you are typing. When you have finished, the area around the text will revert to the background color. The Defaults button restores the original settings." ) ); box->addWidget(lab); bgColor = new KColorButton( oldBgColor, @@ -334,16 +334,16 @@ KPrConfigureColorBackground::KPrConfigureColorBackground( KPrView* _view, QWidge box->addWidget(bgColor); - lab = new QLabel( this, "label20" ); + lab = new TQLabel( this, "label20" ); lab->setText( i18n( "Grid color:" ) ); - QWhatsThis::add(lab, i18n( "Here you can change the grid color, which is black by default." ) ); + TQWhatsThis::add(lab, i18n( "Here you can change the grid color, which is black by default." ) ); box->addWidget(lab); gridColor = new KColorButton( oldGridColor, oldGridColor, this ); box->addWidget(gridColor); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); box->addItem( spacer); } @@ -351,43 +351,43 @@ KPrConfigureColorBackground::KPrConfigureColorBackground( KPrView* _view, QWidge void KPrConfigureColorBackground::apply() { KPrDocument * doc = m_pView->kPresenterDoc(); - bool repaintNeeded = false; - QColor _col = bgColor->color(); + bool tqrepaintNeeded = false; + TQColor _col = bgColor->color(); if( oldBgColor != _col ) { config->setGroup( "KPresenter Color" ); config->writeEntry( "BackgroundColor", _col ); doc->setTxtBackCol( _col ); doc->replaceObjs(); oldBgColor=_col; - repaintNeeded = true; + tqrepaintNeeded = true; } _col = gridColor->color(); if( oldGridColor != _col ) { config->setGroup( "KPresenter Color" ); config->writeEntry( "GridColor", _col ); - doc->repaint( false ); + doc->tqrepaint( false ); doc->setGridColor( _col ); oldGridColor=_col; - repaintNeeded = true; + tqrepaintNeeded = true; } - if (repaintNeeded) - doc->repaint( false ); + if (tqrepaintNeeded) + doc->tqrepaint( false ); } void KPrConfigureColorBackground::slotDefault() { - bgColor->setColor( Qt::white ); - gridColor->setColor( Qt::black ); + bgColor->setColor( TQt::white ); + gridColor->setColor( TQt::black ); } -KPrConfigureSpellPage::KPrConfigureSpellPage( KPrView *_view, QWidget *parent, char *name ) - : QWidget( parent, name ) +KPrConfigureSpellPage::KPrConfigureSpellPage( KPrView *_view, TQWidget *tqparent, char *name ) + : TQWidget( tqparent, name ) { m_pView=_view; config = KPrFactory::global()->config(); - m_spellConfigWidget = new ConfigWidget( _view->broker(), parent ); + m_spellConfigWidget = new ConfigWidget( _view->broker(), tqparent ); m_spellConfigWidget->setBackgroundCheckingButtonShown( true ); } @@ -410,18 +410,18 @@ void KPrConfigureSpellPage::slotDefault() m_spellConfigWidget->slotDefault(); } -KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, QWidget *parent, char *name ) - : QWidget( parent, name ) +KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *tqparent, char *name ) + : TQWidget( tqparent, name ) { - QVBoxLayout *box = new QVBoxLayout( this, 0, 0 ); + TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 ); m_pView=_view; config = KPrFactory::global()->config(); - QGroupBox* tmpQGroupBox = new QGroupBox( 0, Qt::Vertical, i18n("Misc"), this, "GroupBox" ); - tmpQGroupBox->layout()->setSpacing(KDialog::spacingHint()); - tmpQGroupBox->layout()->setMargin(KDialog::marginHint()); - QGridLayout *grid = new QGridLayout( tmpQGroupBox->layout(), 8, 1 ); + TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Misc"), this, "GroupBox" ); + tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint()); + tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid = new TQGridLayout( tmpTQGroupBox->tqlayout(), 8, 1 ); m_oldNbRedo=30; m_printNotes=true; @@ -432,68 +432,68 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, QWidget *parent, cha m_printNotes = config->readBoolEntry("PrintNotes", true); } - m_undoRedoLimit=new KIntNumInput( m_oldNbRedo, tmpQGroupBox ); + m_undoRedoLimit=new KIntNumInput( m_oldNbRedo, tmpTQGroupBox ); m_undoRedoLimit->setLabel(i18n("Undo/redo limit:")); m_undoRedoLimit->setRange(10, 60, 1); - QWhatsThis::add(m_undoRedoLimit, i18n( "Set the number of actions you can undo and redo (how many actions KPresenter keeps in its Undo buffer). This ranges from a minimum of 10 to a maximum of 60 (the default is 30). Once the number of actions reaches the number set here, earlier actions will be forgotten." ) ); + TQWhatsThis::add(m_undoRedoLimit, i18n( "Set the number of actions you can undo and redo (how many actions KPresenter keeps in its Undo buffer). This ranges from a minimum of 10 to a maximum of 60 (the default is 30). Once the number of actions reaches the number set here, earlier actions will be forgotten." ) ); grid->addWidget(m_undoRedoLimit,0,0); KPrDocument* doc = m_pView->kPresenterDoc(); - m_displayLink=new QCheckBox(i18n("Display links"),tmpQGroupBox); - QWhatsThis::add(m_displayLink, i18n( "When you want to include a link in your slide, you can use the Insert->Link... menu, which allows you to insert URL, mail or file links. If the option Display links is checked, all links will be active and displayed in a different color (this is the default behavior). If the option is unchecked, the links will be inactive and the same color as the text. This affects both the edited slides and the slide show." ) ); + m_displayLink=new TQCheckBox(i18n("Display links"),tmpTQGroupBox); + TQWhatsThis::add(m_displayLink, i18n( "When you want to include a link in your slide, you can use the Insert->Link... menu, which allows you to insert URL, mail or file links. If the option Display links is checked, all links will be active and displayed in a different color (this is the default behavior). If the option is unchecked, the links will be inactive and the same color as the text. This affects both the edited slides and the slide show." ) ); grid->addWidget(m_displayLink,3,0); m_displayLink->setChecked(doc->getVariableCollection()->variableSetting()->displayLink()); - m_underlineLink=new QCheckBox(i18n("&Underline all links"),tmpQGroupBox); + m_underlineLink=new TQCheckBox(i18n("&Underline all links"),tmpTQGroupBox); m_underlineLink->setChecked(doc->getVariableCollection()->variableSetting()->underlineLink()); - QWhatsThis::add(m_underlineLink, i18n( "If this is checked, all links will be underlined (this is the default). If it is not checked, the links will not be underlined." ) ); + TQWhatsThis::add(m_underlineLink, i18n( "If this is checked, all links will be underlined (this is the default). If it is not checked, the links will not be underlined." ) ); grid->addWidget(m_underlineLink,4,0); - m_displayComment=new QCheckBox(i18n("Display comments"),tmpQGroupBox); + m_displayComment=new TQCheckBox(i18n("Display comments"),tmpTQGroupBox); m_displayComment->setChecked(doc->getVariableCollection()->variableSetting()->displayComment()); - QWhatsThis::add(m_displayComment, i18n( "Comments are inserted in the text at the cursor using the Insert->Comment... menu. Comments can only be viewed in edit mode and not in the slide show. If this option is checked (default) then each comment will be shown as a small yellow rectangle. You can then right-click on them to edit them, remove them or copy the text." ) ); + TQWhatsThis::add(m_displayComment, i18n( "Comments are inserted in the text at the cursor using the Insert->Comment... menu. Comments can only be viewed in edit mode and not in the slide show. If this option is checked (default) then each comment will be shown as a small yellow rectangle. You can then right-click on them to edit them, remove them or copy the text." ) ); grid->addWidget(m_displayComment,5,0); - m_displayFieldCode=new QCheckBox(i18n("Display field code"),tmpQGroupBox); + m_displayFieldCode=new TQCheckBox(i18n("Display field code"),tmpTQGroupBox); m_displayFieldCode->setChecked(doc->getVariableCollection()->variableSetting()->displayFieldCode()); - QWhatsThis::add(m_displayFieldCode, i18n( "In editor mode (not in slide show) this option will display all the variable codes as well as Link at links location. This is very useful to see what variable is displayed. Variables are inserted using the Insert -> Variable menu." ) ); + TQWhatsThis::add(m_displayFieldCode, i18n( "In editor mode (not in slide show) this option will display all the variable codes as well as Link at links location. This is very useful to see what variable is displayed. Variables are inserted using the Insert -> Variable menu." ) ); grid->addWidget(m_displayFieldCode,6,0); - m_cbPrintNotes=new QCheckBox(i18n("Print slide notes"),tmpQGroupBox); + m_cbPrintNotes=new TQCheckBox(i18n("Print slide notes"),tmpTQGroupBox); m_cbPrintNotes->setChecked(m_printNotes); - QWhatsThis::add(m_cbPrintNotes, i18n( "If checked, all notes will be printed on paper. The notes will all be printed separately on the last page, from the first slide to the last and finally the Master Page Note. You can see the notes for each slide using the View->Show notebar menu." ) ); + TQWhatsThis::add(m_cbPrintNotes, i18n( "If checked, all notes will be printed on paper. The notes will all be printed separately on the last page, from the first slide to the last and finally the Master Page Note. You can see the notes for each slide using the View->Show notebar menu." ) ); grid->addWidget(m_cbPrintNotes,7,0); - box->addWidget(tmpQGroupBox); + box->addWidget(tmpTQGroupBox); - tmpQGroupBox = new QGroupBox( 0, Qt::Vertical, i18n("Grid"), this, "GroupBox" ); - tmpQGroupBox->layout()->setSpacing(KDialog::spacingHint()); - tmpQGroupBox->layout()->setMargin(KDialog::marginHint()); - grid = new QGridLayout( tmpQGroupBox->layout(), 8, 1 ); + tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Grid"), this, "GroupBox" ); + tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint()); + tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint()); + grid = new TQGridLayout( tmpTQGroupBox->tqlayout(), 8, 1 ); KoRect rect = doc->masterPage()->getPageRect(); - QLabel *lab=new QLabel(i18n("Horizontal grid size:"), tmpQGroupBox); - QWhatsThis::add(lab, i18n( "Set the space in millimeters between two horizontal points on the grid. Default is 5 millimeters." ) ); + TQLabel *lab=new TQLabel(i18n("Horizontal grid size:"), tmpTQGroupBox); + TQWhatsThis::add(lab, i18n( "Set the space in millimeters between two horizontal points on the grid. Default is 5 millimeters." ) ); grid->addWidget(lab,0,0); KoUnit::Unit unit = doc->unit(); - resolutionX = new KoUnitDoubleSpinBox(tmpQGroupBox, 5.0,rect.width(),1,doc->getGridX() ); + resolutionX = new KoUnitDoubleSpinBox(tmpTQGroupBox, 5.0,rect.width(),1,doc->getGridX() ); resolutionX->setUnit( unit ); grid->addWidget(resolutionX,1,0); - lab=new QLabel(i18n("Vertical grid size:"), tmpQGroupBox); - QWhatsThis::add(lab, i18n( "Set the space in millimeters between two vertical points on the grid. Default is 5 millimeters." ) ); + lab=new TQLabel(i18n("Vertical grid size:"), tmpTQGroupBox); + TQWhatsThis::add(lab, i18n( "Set the space in millimeters between two vertical points on the grid. Default is 5 millimeters." ) ); grid->addWidget(lab,2,0); - resolutionY = new KoUnitDoubleSpinBox(tmpQGroupBox, 5.0,rect.height(),1,doc->getGridY() ); + resolutionY = new KoUnitDoubleSpinBox(tmpTQGroupBox, 5.0,rect.height(),1,doc->getGridY() ); resolutionY->setUnit( unit ); grid->addWidget(resolutionY, 3, 0); - box->addWidget(tmpQGroupBox); + box->addWidget(tmpTQGroupBox); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); box->addItem( spacer); @@ -567,7 +567,7 @@ KCommand * KPrConfigureMiscPage::apply() doc->setGridValue( resolutionX->value(), resolutionY->value(), true); - doc->repaint( false ); + doc->tqrepaint( false ); config->sync(); @@ -588,10 +588,10 @@ void KPrConfigureMiscPage::slotDefault() resolutionX->setValue( MM_TO_POINT( 5.0 )); } -KPrConfigureDefaultDocPage::KPrConfigureDefaultDocPage(KPrView *_view, QWidget *parent, char *name ) - : QWidget( parent, name ) +KPrConfigureDefaultDocPage::KPrConfigureDefaultDocPage(KPrView *_view, TQWidget *tqparent, char *name ) + : TQWidget( tqparent, name ) { - QVBoxLayout *box = new QVBoxLayout( this, 0, 0 ); + TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 ); m_pView=_view; config = KPrFactory::global()->config(); @@ -608,62 +608,62 @@ KPrConfigureDefaultDocPage::KPrConfigureDefaultDocPage(KPrView *_view, QWidget * m_oldHyphenation = config->readBoolEntry( "hyphenation", m_oldHyphenation); } - QVGroupBox* gbDocumentDefaults = new QVGroupBox( i18n("Document Defaults"), this, "GroupBox" ); + TQVGroupBox* gbDocumentDefaults = new TQVGroupBox( i18n("Document Defaults"), this, "GroupBox" ); gbDocumentDefaults->setMargin( KDialog::marginHint() ); gbDocumentDefaults->setInsideSpacing( 5 ); - QWidget *fontContainer = new QWidget(gbDocumentDefaults); - QGridLayout * fontLayout = new QGridLayout(fontContainer, 1, 3); + TQWidget *fontContainer = new TQWidget(gbDocumentDefaults); + TQGridLayout * fontLayout = new TQGridLayout(fontContainer, 1, 3); fontLayout->setColStretch(0, 0); fontLayout->setColStretch(1, 1); fontLayout->setColStretch(2, 0); - QLabel *fontTitle = new QLabel(i18n("Default font:"), fontContainer); + TQLabel *fontTitle = new TQLabel(i18n("Default font:"), fontContainer); - font= new QFont( doc->defaultFont() ); + font= new TQFont( doc->defaultFont() ); - QString labelName = font->family() + ' ' + QString::number(font->pointSize()); - fontName = new QLabel(labelName, fontContainer); + TQString labelName = font->family() + ' ' + TQString::number(font->pointSize()); + fontName = new TQLabel(labelName, fontContainer); fontName->setFont(*font); - fontName->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); + fontName->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); - QPushButton *chooseButton = new QPushButton(i18n("Choose..."), fontContainer); - QWhatsThis::add(chooseButton, i18n( "Click here if you want to set a new font. The KDE default Select Font dialog will then be displayed." ) ); - connect(chooseButton, SIGNAL(clicked()), this, SLOT(selectNewDefaultFont())); + TQPushButton *chooseButton = new TQPushButton(i18n("Choose..."), fontContainer); + TQWhatsThis::add(chooseButton, i18n( "Click here if you want to set a new font. The KDE default Select Font dialog will then be displayed." ) ); + connect(chooseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectNewDefaultFont())); fontLayout->addWidget(fontTitle, 0, 0); fontLayout->addWidget(fontName, 0, 1); fontLayout->addWidget(chooseButton, 0, 2); - QWidget *languageContainer = new QWidget(gbDocumentDefaults); - QGridLayout * languageLayout = new QGridLayout(languageContainer, 1, 3); + TQWidget *languageContainer = new TQWidget(gbDocumentDefaults); + TQGridLayout * languageLayout = new TQGridLayout(languageContainer, 1, 3); languageLayout->setColStretch(0, 0); languageLayout->setColStretch(1, 1); - QLabel *languageTitle = new QLabel(i18n("Global language:"), languageContainer); - QWhatsThis::add(languageTitle, i18n( "Use this drop down box to determine the default language for the document. This setting is used by the hyphenation and spelling tools." ) ); + TQLabel *languageTitle = new TQLabel(i18n("Global language:"), languageContainer); + TQWhatsThis::add(languageTitle, i18n( "Use this drop down box to determine the default language for the document. This setting is used by the hyphenation and spelling tools." ) ); - m_globalLanguage = new QComboBox( languageContainer ); + m_globalLanguage = new TQComboBox( languageContainer ); m_globalLanguage->insertStringList( KoGlobal::listOfLanguages() ); m_globalLanguage->setCurrentText( KoGlobal::languageFromTag( doc->globalLanguage() ) ); languageLayout->addWidget(languageTitle, 0, 0); languageLayout->addWidget(m_globalLanguage, 0, 1); - m_autoHyphenation = new QCheckBox( i18n("Automatic hyphenation"), gbDocumentDefaults); - QWhatsThis::add(m_autoHyphenation, i18n( "Check this box if you want KPresenter to automatically hyphenate long words when it determines the word wrap in text frames. This is not set by default." ) ); + m_autoHyphenation = new TQCheckBox( i18n("Automatic hyphenation"), gbDocumentDefaults); + TQWhatsThis::add(m_autoHyphenation, i18n( "Check this box if you want KPresenter to automatically hyphenate long words when it determines the word wrap in text frames. This is not set by default." ) ); m_autoHyphenation->setChecked( m_oldHyphenation ); box->addWidget(gbDocumentDefaults); - QVGroupBox* gbDocumentSettings = new QVGroupBox( i18n("Document Settings"), this ); + TQVGroupBox* gbDocumentSettings = new TQVGroupBox( i18n("Document Settings"), this ); gbDocumentSettings->setMargin( KDialog::marginHint() ); gbDocumentSettings->setInsideSpacing( KDialog::spacingHint() ); - m_createBackupFile = new QCheckBox( i18n("Create backup file"), gbDocumentSettings); - QWhatsThis::add(m_createBackupFile, i18n( "If checked, this will create a .<name>.kpr.autosave.kpr in the folder where your file is. This backup file can then be used in case of a problem.\nThe backup file is updated every time you save your document or every time there is an autosave." ) ); + m_createBackupFile = new TQCheckBox( i18n("Create backup file"), gbDocumentSettings); + TQWhatsThis::add(m_createBackupFile, i18n( "If checked, this will create a .<name>.kpr.autosave.kpr in the folder where your file is. This backup file can then be used in case of a problem.\nThe backup file is updated every time you save your document or every time there is an autosave." ) ); m_createBackupFile->setChecked( m_oldBackupFile ); @@ -672,39 +672,39 @@ KPrConfigureDefaultDocPage::KPrConfigureDefaultDocPage(KPrView *_view, QWidget * autoSave->setLabel( i18n("Autosave (min):") ); autoSave->setSpecialValueText( i18n("No autosave") ); autoSave->setSuffix( i18n("min") ); - QWhatsThis::add(autoSave, i18n( "You can use this to adjust how often KPresenter saves a temporary file. If you set this value to No autosave, KPresenter will not autosave. You can adjust the autosave from 1 to 60 minutes." ) ); + TQWhatsThis::add(autoSave, i18n( "You can use this to adjust how often KPresenter saves a temporary file. If you set this value to No autosave, KPresenter will not autosave. You can adjust the autosave from 1 to 60 minutes." ) ); - new QLabel(i18n("Starting page number:"), gbDocumentSettings); + new TQLabel(i18n("Starting page number:"), gbDocumentSettings); m_oldStartingPage=doc->getVariableCollection()->variableSetting()->startingPageNumber(); m_variableNumberOffset=new KIntNumInput(gbDocumentSettings); m_variableNumberOffset->setRange(1, 9999, 1, false); m_variableNumberOffset->setValue(m_oldStartingPage); - QWhatsThis::add(m_variableNumberOffset, i18n( "Here you can change the number for the first page. It is set to 1 by default.\nTip: this is helpful if you have split a single document into multiple files." ) ); + TQWhatsThis::add(m_variableNumberOffset, i18n( "Here you can change the number for the first page. It is set to 1 by default.\nTip: this is helpful if you have split a single document into multiple files." ) ); - new QLabel(i18n("Tab stop:"), gbDocumentSettings); + new TQLabel(i18n("Tab stop:"), gbDocumentSettings); m_oldTabStopWidth = doc->tabStopValue(); KoRect rect = doc->masterPage()->getPageRect(); m_tabStopWidth = new KoUnitDoubleSpinBox( gbDocumentSettings , MM_TO_POINT(2), rect.width() ,0.1, m_oldTabStopWidth ); m_tabStopWidth->setUnit( doc->unit() ); - QWhatsThis::add(m_tabStopWidth, i18n( "Each KPresenter document has a default set of tab stops. If you add tab stops to your document, the newly added tab stops override the default ones. You can use this text box to define the spacing between default tab stops. As an example, if you enter 1.5 in this text box, and the unit of measurement is in centimeters, the first default tab stop will be located 1.5 cm to the right of the frame's left-hand margin. The second default tab stop will be located at 3 cm from the left-hand margin, and so on." ) ); + TQWhatsThis::add(m_tabStopWidth, i18n( "Each KPresenter document has a default set of tab stops. If you add tab stops to your document, the newly added tab stops override the default ones. You can use this text box to define the spacing between default tab stops. As an example, if you enter 1.5 in this text box, and the unit of measurement is in centimeters, the first default tab stop will be located 1.5 cm to the right of the frame's left-hand margin. The second default tab stop will be located at 3 cm from the left-hand margin, and so on." ) ); box->addWidget(gbDocumentSettings); - QVGroupBox* gbDocumentCursor = new QVGroupBox( i18n("Cursor"), this ); + TQVGroupBox* gbDocumentCursor = new TQVGroupBox( i18n("Cursor"), this ); gbDocumentCursor->setMargin( KDialog::marginHint() ); gbDocumentCursor->setInsideSpacing( KDialog::spacingHint() ); - m_cursorInProtectedArea= new QCheckBox(i18n("Cursor in protected area"),gbDocumentCursor); + m_cursorInProtectedArea= new TQCheckBox(i18n("Cursor in protected area"),gbDocumentCursor); m_cursorInProtectedArea->setChecked(doc->cursorInProtectedArea()); - QWhatsThis::add(m_cursorInProtectedArea, i18n( "When this box is checked and you click in a protected frame within your document, a cursor will appear. When this box is unchecked, and you click in a protected frame, no cursor will be visible." ) ); + TQWhatsThis::add(m_cursorInProtectedArea, i18n( "When this box is checked and you click in a protected frame within your document, a cursor will appear. When this box is unchecked, and you click in a protected frame, no cursor will be visible." ) ); - m_directInsertCursor= new QCheckBox(i18n("Direct insert cursor"),gbDocumentCursor); + m_directInsertCursor= new TQCheckBox(i18n("Direct insert cursor"),gbDocumentCursor); m_directInsertCursor->setChecked(doc->insertDirectCursor()); - QWhatsThis::add(m_directInsertCursor, i18n( "When this box is checked, you can select a section of text using your mouse. Move the mouse to a new area in your document and click once with the middle mouse button and a copy of the selected text will be copied and pasted to the new location in the document.\nWhen this box is unchecked, in order to copy text from one section to another, you must select the text, manually copy the text to the clipboard, then manually paste the text in the new location." ) ); + TQWhatsThis::add(m_directInsertCursor, i18n( "When this box is checked, you can select a section of text using your mouse. Move the mouse to a new area in your document and click once with the middle mouse button and a copy of the selected text will be copied and pasted to the new location in the document.\nWhen this box is unchecked, in order to copy text from one section to another, you must select the text, manually copy the text to the clipboard, then manually paste the text in the new location." ) ); box->addWidget(gbDocumentCursor); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); box->addItem(spacer); } @@ -718,7 +718,7 @@ KCommand *KPrConfigureDefaultDocPage::apply() { config->setGroup( "Document defaults" ); KPrDocument* doc = m_pView->kPresenterDoc(); - config->writeEntry("DefaultFont",font->toString()); + config->writeEntry("DefaultFont",TQString(font->toString())); config->setGroup( "Interface" ); int autoSaveVal = autoSave->value(); @@ -749,7 +749,7 @@ KCommand *KPrConfigureDefaultDocPage::apply() //Laurent Todo add a message box to inform user that //global language will change after re-launch kword - const QString lang = KoGlobal::tagOfLanguage( m_globalLanguage->currentText() ); + const TQString lang = KoGlobal::tagOfLanguage( m_globalLanguage->currentText() ); config->writeEntry( "language" , lang); m_oldLanguage = lang; //don't call this function otherwise we can have a textobject with @@ -797,30 +797,30 @@ void KPrConfigureDefaultDocPage::slotDefault() } void KPrConfigureDefaultDocPage::selectNewDefaultFont() { - QStringList list; + TQStringList list; KFontChooser::getFontList(list, KFontChooser::SmoothScalableFonts); KFontDialog dlg( this, "Font Selector", false, true, list, true ); dlg.setFont(*font); int result = dlg.exec(); if (KDialog::Accepted == result) { delete font; - font = new QFont(dlg.font()); - fontName->setText(font->family() + ' ' + QString::number(font->pointSize())); + font = new TQFont(dlg.font()); + fontName->setText(font->family() + ' ' + TQString::number(font->pointSize())); fontName->setFont(*font); m_pView->kPresenterDoc()->setDefaultFont( *font ); } } -KPrConfigureToolsPage::KPrConfigureToolsPage( KPrView *_view, QWidget *parent, char *name ) - : QWidget( parent, name ) +KPrConfigureToolsPage::KPrConfigureToolsPage( KPrView *_view, TQWidget *tqparent, char *name ) + : TQWidget( tqparent, name ) { - QVBoxLayout *box = new QVBoxLayout( this, 0, 0 ); + TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 ); m_pView = _view; config = KPrFactory::global()->config(); m_pView->getCanvas()->deSelectAllObj(); - QTabWidget *tab = new QTabWidget(this); + TQTabWidget *tab = new TQTabWidget(this); KoPenCmd::Pen pen( m_pView->getPen(), m_pView->getLineBegin(), m_pView->getLineEnd() ); m_confPenDia = new KPrPenStyleWidget(tab, 0, pen, true ); @@ -904,11 +904,11 @@ void KPrConfigureToolsPage::apply() void KPrConfigureToolsPage::slotDefault() { - KoPenCmd::Pen pen( KoPen(black, 1.0, SolidLine), L_NORMAL, L_NORMAL ); + KoPenCmd::Pen pen( KoPen(black, 1.0, Qt::SolidLine), L_NORMAL, L_NORMAL ); m_confPenDia->setPen( pen ); m_pView->getActionPenColor()->setCurrentColor( pen.pen.color() ); - KPrBrushCmd::Brush brush( QBrush( white, SolidPattern ), red, green, + KPrBrushCmd::Brush brush( TQBrush( white, SolidPattern ), red, green, BCT_GHORZ, FT_BRUSH, false, 100, 100 ); m_brushProperty->setBrush( brush ); m_pView->getActionBrushColor()->setCurrentColor( brush.brush.color() ); @@ -930,44 +930,44 @@ void KPrConfigureToolsPage::slotDefault() pieValues.pieLength = 270 * 16; } -KPrConfigurePathPage::KPrConfigurePathPage( KPrView *_view, QWidget *parent, char *name ) - : QWidget( parent, name ) +KPrConfigurePathPage::KPrConfigurePathPage( KPrView *_view, TQWidget *tqparent, char *name ) + : TQWidget( tqparent, name ) { - QVBoxLayout *box = new QVBoxLayout( this, 0, 0 ); + TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 ); m_pView=_view; KPrDocument* doc = m_pView->kPresenterDoc(); config = KPrFactory::global()->config(); m_pPathView = new KListView( this ); - m_pPathView->setResizeMode(QListView::NoColumn); + m_pPathView->setResizeMode(TQListView::NoColumn); m_pPathView->addColumn( i18n( "Type" ) ); m_pPathView->addColumn( i18n( "Path" ) ); - (void) new QListViewItem( m_pPathView, i18n("Picture Path"),doc->picturePath() ); - (void) new QListViewItem( m_pPathView, i18n("Backup Path"),doc->backupPath() ); - QWhatsThis::add(m_pPathView, i18n( "There are two paths that are set here: the Backup Path and the Picture Path. The Backup path is the folder where your backup files are saved and the Picture Path is the folder where your pictures are saved." ) ); + (void) new TQListViewItem( m_pPathView, i18n("Picture Path"),doc->picturePath() ); + (void) new TQListViewItem( m_pPathView, i18n("Backup Path"),doc->backupPath() ); + TQWhatsThis::add(m_pPathView, i18n( "There are two paths that are set here: the Backup Path and the Picture Path. The Backup path is the folder where your backup files are saved and the Picture Path is the folder where your pictures are saved." ) ); box->addWidget(m_pPathView); - m_modifyPath = new QPushButton( i18n("Modify Path..."), this); - connect( m_modifyPath, SIGNAL( clicked ()), this, SLOT( slotModifyPath())); - connect( m_pPathView, SIGNAL( doubleClicked (QListViewItem *, const QPoint &, int )), - this, SLOT( slotModifyPath())); - connect( m_pPathView, SIGNAL( selectionChanged ( QListViewItem * )), - this, SLOT( slotSelectionChanged(QListViewItem * ))); + m_modifyPath = new TQPushButton( i18n("Modify Path..."), this); + connect( m_modifyPath, TQT_SIGNAL( clicked ()), this, TQT_SLOT( slotModifyPath())); + connect( m_pPathView, TQT_SIGNAL( doubleClicked (TQListViewItem *, const TQPoint &, int )), + this, TQT_SLOT( slotModifyPath())); + connect( m_pPathView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )), + this, TQT_SLOT( slotSelectionChanged(TQListViewItem * ))); slotSelectionChanged(m_pPathView->currentItem()); - QWhatsThis::add(m_modifyPath, i18n( "When you click this button, a small dialog will appear and, if Default path is unchecked, you can either enter a path yourself or choose one using the standard KDE file dialog." ) ); + TQWhatsThis::add(m_modifyPath, i18n( "When you click this button, a small dialog will appear and, if Default path is unchecked, you can either enter a path yourself or choose one using the standard KDE file dialog." ) ); box->addWidget(m_modifyPath); } -void KPrConfigurePathPage::slotSelectionChanged(QListViewItem * item) +void KPrConfigurePathPage::slotSelectionChanged(TQListViewItem * item) { m_modifyPath->setEnabled( item ); } void KPrConfigurePathPage::slotModifyPath() { - QListViewItem *item = m_pPathView->currentItem (); + TQListViewItem *item = m_pPathView->currentItem (); if ( item ) { if ( item->text(0)==i18n("Picture Path")) @@ -992,20 +992,20 @@ void KPrConfigurePathPage::slotModifyPath() void KPrConfigurePathPage::slotDefault() { - QListViewItem * item = m_pPathView->findItem(i18n("Picture Path"), 0); + TQListViewItem * item = m_pPathView->tqfindItem(i18n("Picture Path"), 0); if ( item ) item->setText(1, KGlobalSettings::documentPath()); - item = m_pPathView->findItem(i18n("Backup Path"), 0); + item = m_pPathView->tqfindItem(i18n("Backup Path"), 0); if ( item ) - item->setText(1, QString::null ); + item->setText(1, TQString() ); } void KPrConfigurePathPage::apply() { - QListViewItem *item = m_pPathView->findItem(i18n("Backup Path"), 0); + TQListViewItem *item = m_pPathView->tqfindItem(i18n("Backup Path"), 0); if ( item ) { - QString res = item->text(1 ); + TQString res = item->text(1 ); if ( res != m_pView->kPresenterDoc()->backupPath()) { config->setGroup( "Kpresenter Path" ); @@ -1017,10 +1017,10 @@ void KPrConfigurePathPage::apply() #endif } } - item = m_pPathView->findItem(i18n("Picture Path"), 0); + item = m_pPathView->tqfindItem(i18n("Picture Path"), 0); if ( item ) { - QString res = item->text(1 ); + TQString res = item->text(1 ); if ( res != m_pView->kPresenterDoc()->picturePath()) { config->setGroup( "Kpresenter Path" ); @@ -1036,38 +1036,38 @@ void KPrConfigurePathPage::apply() //// -KPrConfigureTTSPage::KPrConfigureTTSPage( KPrView *_view, QWidget *parent, char *name ) - : QWidget( parent, name ) +KPrConfigureTTSPage::KPrConfigureTTSPage( KPrView *_view, TQWidget *tqparent, char *name ) + : TQWidget( tqparent, name ) { Q_UNUSED(_view); - QVBoxLayout *box = new QVBoxLayout( this, 0, 0 ); + TQVBoxLayout *box = new TQVBoxLayout( this, 0, 0 ); - m_cbSpeakPointerWidget = new QCheckBox(i18n("Speak widget under &mouse pointer"), this); - m_cbSpeakFocusWidget = new QCheckBox(i18n("Speak widget with &focus"), this); - m_gbScreenReaderOptions = new QVGroupBox("", this); + m_cbSpeakPointerWidget = new TQCheckBox(i18n("Speak widget under &mouse pointer"), this); + m_cbSpeakFocusWidget = new TQCheckBox(i18n("Speak widget with &focus"), this); + m_gbScreenReaderOptions = new TQVGroupBox("", this); box->add(m_cbSpeakPointerWidget); box->add(m_cbSpeakFocusWidget); box->add(m_gbScreenReaderOptions); m_gbScreenReaderOptions->setMargin( KDialog::marginHint() ); m_gbScreenReaderOptions->setInsideSpacing( KDialog::spacingHint() ); - m_cbSpeakTooltips = new QCheckBox(i18n("Speak &tool tips"), m_gbScreenReaderOptions); - m_cbSpeakWhatsThis = new QCheckBox(i18n("Speak &What's This?"), m_gbScreenReaderOptions); - m_cbSpeakDisabled = new QCheckBox(i18n("Verbal indication if widget is disabled (grayed)", + m_cbSpeakTooltips = new TQCheckBox(i18n("Speak &tool tips"), m_gbScreenReaderOptions); + m_cbSpeakWhatsThis = new TQCheckBox(i18n("Speak &What's This?"), m_gbScreenReaderOptions); + m_cbSpeakDisabled = new TQCheckBox(i18n("Verbal indication if widget is disabled (grayed)", "&Say whether disabled"), m_gbScreenReaderOptions); - m_cbSpeakAccelerators = new QCheckBox(i18n("Spea&k accelerators"), m_gbScreenReaderOptions); - QHBox* hbAcceleratorPrefix = new QHBox(m_gbScreenReaderOptions); - QWidget* spacer = new QWidget(hbAcceleratorPrefix); + m_cbSpeakAccelerators = new TQCheckBox(i18n("Spea&k accelerators"), m_gbScreenReaderOptions); + TQHBox* hbAcceleratorPrefix = new TQHBox(m_gbScreenReaderOptions); + TQWidget* spacer = new TQWidget(hbAcceleratorPrefix); spacer->setMinimumWidth(2 * KDialog::marginHint()); m_lblAcceleratorPrefix = - new QLabel(i18n("A word spoken before another word", "Pr&efaced by the word:"), + new TQLabel(i18n("A word spoken before another word", "Pr&efaced by the word:"), hbAcceleratorPrefix); - m_leAcceleratorPrefixWord = new QLineEdit(i18n("Keyboard accelerator, such as Alt+F", "Accelerator"), + m_leAcceleratorPrefixWord = new TQLineEdit(i18n("Keyboard accelerator, such as Alt+F", "Accelerator"), hbAcceleratorPrefix); m_lblAcceleratorPrefix->setBuddy(m_leAcceleratorPrefixWord); - QHBox* hbPollingInterval = new QHBox(m_gbScreenReaderOptions); + TQHBox* hbPollingInterval = new TQHBox(m_gbScreenReaderOptions); hbPollingInterval->setMargin( 0 ); - QLabel* lblPollingInterval = new QLabel(i18n("&Polling interval:"), hbPollingInterval); + TQLabel* lblPollingInterval = new TQLabel(i18n("&Polling interval:"), hbPollingInterval); m_iniPollingInterval = new KIntNumInput(hbPollingInterval); m_iniPollingInterval->setSuffix(" ms"); m_iniPollingInterval->setRange(100, 5000, 100, true); @@ -1086,9 +1086,9 @@ KPrConfigureTTSPage::KPrConfigureTTSPage( KPrView *_view, QWidget *parent, char m_iniPollingInterval->setValue(config->readNumEntry("PollingInterval", 600)); screenReaderOptionChanged(); - connect(m_cbSpeakPointerWidget, SIGNAL(toggled(bool)), this, SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakFocusWidget, SIGNAL(toggled(bool)), this, SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakAccelerators, SIGNAL(toggled(bool)), this, SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakPointerWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakFocusWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakAccelerators, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); } void KPrConfigureTTSPage::slotDefault() diff --git a/kpresenter/KPrConfig.h b/kpresenter/KPrConfig.h index da99cf44..604b283c 100644 --- a/kpresenter/KPrConfig.h +++ b/kpresenter/KPrConfig.h @@ -29,7 +29,7 @@ class KPrDocument; class KIntNumInput; class KColorButton; class KConfig; -class QCheckBox; +class TQCheckBox; class KLineEdit; class KDoubleNumInput; class KoSpellConfigWidget; @@ -39,18 +39,19 @@ class KPrRectProperty; class KPrPolygonProperty; class KPrPieProperty; class KoUnitDoubleSpinBox; -class QVGroupBox; +class TQVGroupBox; namespace KSpell2 { class ConfigWidget; } -class KPrConfigureInterfacePage : public QWidget +class KPrConfigureInterfacePage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrConfigureInterfacePage( KPrView *_view, QWidget *parent = 0, char *name = 0 ); + KPrConfigureInterfacePage( KPrView *_view, TQWidget *tqparent = 0, char *name = 0 ); void apply(); void slotDefault(); private: @@ -59,14 +60,15 @@ private: int oldNbRecentFiles; KDoubleNumInput* indent; KIntNumInput* recentFiles; - QCheckBox *showRuler, *showStatusBar; + TQCheckBox *showRuler, *showStatusBar; }; -class KPrConfigureColorBackground : public QWidget +class KPrConfigureColorBackground : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrConfigureColorBackground( KPrView* _view, QWidget *parent = 0, char *name = 0 ); + KPrConfigureColorBackground( KPrView* _view, TQWidget *tqparent = 0, char *name = 0 ); void apply(); void slotDefault(); protected: @@ -74,15 +76,16 @@ protected: KColorButton* bgColor; KColorButton* gridColor; KConfig* config; - QColor oldBgColor; - QColor oldGridColor; + TQColor oldBgColor; + TQColor oldGridColor; } ; -class KPrConfigureSpellPage : public QWidget +class KPrConfigureSpellPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrConfigureSpellPage( KPrView *_view, QWidget *parent, char *name = 0 ); + KPrConfigureSpellPage( KPrView *_view, TQWidget *tqparent, char *name = 0 ); void apply(); void slotDefault(); private: @@ -91,11 +94,12 @@ private: KConfig* config; }; -class KPrConfigureMiscPage : public QWidget +class KPrConfigureMiscPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrConfigureMiscPage( KPrView *_view, QWidget *parent, char *name = 0 ); + KPrConfigureMiscPage( KPrView *_view, TQWidget *tqparent, char *name = 0 ); KCommand *apply(); void slotDefault(); private: @@ -104,16 +108,17 @@ private: KIntNumInput* m_undoRedoLimit; int m_oldNbRedo; bool m_printNotes; - QCheckBox* m_displayLink, *m_displayComment, *m_underlineLink, *m_displayFieldCode, *m_cbPrintNotes; + TQCheckBox* m_displayLink, *m_displayComment, *m_underlineLink, *m_displayFieldCode, *m_cbPrintNotes; KoUnitDoubleSpinBox * resolutionY, * resolutionX; KDoubleNumInput *m_rotation; }; -class KPrConfigureDefaultDocPage : public QWidget +class KPrConfigureDefaultDocPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrConfigureDefaultDocPage( KPrView *_view, QWidget *parent, char *name = 0 ); + KPrConfigureDefaultDocPage( KPrView *_view, TQWidget *tqparent, char *name = 0 ); ~KPrConfigureDefaultDocPage(); KCommand *apply(); void slotDefault(); @@ -124,27 +129,28 @@ private: int m_oldStartingPage; double m_oldTabStopWidth; bool m_oldBackupFile; - QString m_oldLanguage; + TQString m_oldLanguage; KPrView* m_pView; KConfig* config; - QFont *font; - QLabel *fontName; + TQFont *font; + TQLabel *fontName; KIntNumInput* autoSave; KIntNumInput* m_variableNumberOffset; KoUnitDoubleSpinBox *m_tabStopWidth; - QCheckBox *m_cursorInProtectedArea; - QCheckBox *m_createBackupFile; - QCheckBox *m_directInsertCursor; - QComboBox *m_globalLanguage; - QCheckBox *m_autoHyphenation; + TQCheckBox *m_cursorInProtectedArea; + TQCheckBox *m_createBackupFile; + TQCheckBox *m_directInsertCursor; + TQComboBox *m_globalLanguage; + TQCheckBox *m_autoHyphenation; bool m_oldHyphenation; }; -class KPrConfigureToolsPage : public QWidget +class KPrConfigureToolsPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrConfigureToolsPage( KPrView *_view, QWidget *parent, char *name = 0 ); + KPrConfigureToolsPage( KPrView *_view, TQWidget *tqparent, char *name = 0 ); ~KPrConfigureToolsPage(); void apply(); void slotDefault(); @@ -161,43 +167,45 @@ private: KPrPieProperty *m_pieProperty; }; -class KPrConfigurePathPage : public QWidget +class KPrConfigurePathPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrConfigurePathPage( KPrView *_view, QWidget *parent, char *name = 0 ); + KPrConfigurePathPage( KPrView *_view, TQWidget *tqparent, char *name = 0 ); void slotDefault(); void apply(); private slots: void slotModifyPath(); - void slotSelectionChanged(QListViewItem *); + void slotSelectionChanged(TQListViewItem *); private: KPrView* m_pView; KConfig* config; KListView* m_pPathView; - QPushButton *m_modifyPath; + TQPushButton *m_modifyPath; }; -class KPrConfigureTTSPage : public QWidget +class KPrConfigureTTSPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrConfigureTTSPage( KPrView *_view, QWidget *parent, char *name = 0 ); + KPrConfigureTTSPage( KPrView *_view, TQWidget *tqparent, char *name = 0 ); void slotDefault(); void apply(); private slots: void screenReaderOptionChanged(); private: KConfig* config; - QCheckBox* m_cbSpeakPointerWidget; - QCheckBox* m_cbSpeakFocusWidget; - QVGroupBox* m_gbScreenReaderOptions; - QCheckBox* m_cbSpeakTooltips; - QCheckBox* m_cbSpeakWhatsThis; - QCheckBox* m_cbSpeakDisabled; - QCheckBox* m_cbSpeakAccelerators; - QLabel* m_lblAcceleratorPrefix; - QLineEdit* m_leAcceleratorPrefixWord; + TQCheckBox* m_cbSpeakPointerWidget; + TQCheckBox* m_cbSpeakFocusWidget; + TQVGroupBox* m_gbScreenReaderOptions; + TQCheckBox* m_cbSpeakTooltips; + TQCheckBox* m_cbSpeakWhatsThis; + TQCheckBox* m_cbSpeakDisabled; + TQCheckBox* m_cbSpeakAccelerators; + TQLabel* m_lblAcceleratorPrefix; + TQLineEdit* m_leAcceleratorPrefixWord; KIntNumInput* m_iniPollingInterval; }; @@ -205,9 +213,10 @@ private: class KPrConfig : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum { KP_INTERFACE = 1, KP_COLOR=2, KP_KSPELL=4,KP_MISC=8, KP_DOC=16, KP_TOOLS=32,KP_PATH = 64 }; - KPrConfig( KPrView* parent ); + KPrConfig( KPrView* tqparent ); public slots: void slotApply(); void slotDefault(); diff --git a/kpresenter/KPrCubicBezierCurveObjectIface.cpp b/kpresenter/KPrCubicBezierCurveObjectIface.cpp index 169cce6f..bcf02ad9 100644 --- a/kpresenter/KPrCubicBezierCurveObjectIface.cpp +++ b/kpresenter/KPrCubicBezierCurveObjectIface.cpp @@ -32,23 +32,23 @@ KPrCubicBezierCurveObjectIface::KPrCubicBezierCurveObjectIface( KPrCubicBezierCu obj = _obj; } -void KPrCubicBezierCurveObjectIface::setLineBegin( const QString & type) +void KPrCubicBezierCurveObjectIface::setLineBegin( const TQString & type) { obj->setLineBegin(lineEndBeginFromString( type )); } -void KPrCubicBezierCurveObjectIface::setLineEnd( const QString & type) +void KPrCubicBezierCurveObjectIface::setLineEnd( const TQString & type) { obj->setLineEnd(lineEndBeginFromString( type )); } -QString KPrCubicBezierCurveObjectIface::lineBegin()const +TQString KPrCubicBezierCurveObjectIface::lineBegin()const { LineEnd type=obj->getLineBegin(); return lineEndBeginName( type ); } -QString KPrCubicBezierCurveObjectIface::lineEnd() const +TQString KPrCubicBezierCurveObjectIface::lineEnd() const { LineEnd type=obj->getLineEnd(); return lineEndBeginName( type ); diff --git a/kpresenter/KPrCubicBezierCurveObjectIface.h b/kpresenter/KPrCubicBezierCurveObjectIface.h index 771e3d1f..b3e021f4 100644 --- a/kpresenter/KPrCubicBezierCurveObjectIface.h +++ b/kpresenter/KPrCubicBezierCurveObjectIface.h @@ -24,7 +24,7 @@ #include <dcopobject.h> #include <dcopref.h> #include "KPrObjectIface.h" -#include <qstring.h> +#include <tqstring.h> class KPrCubicBezierCurveObject; @@ -36,10 +36,10 @@ public: k_dcop: - void setLineBegin( const QString & ); - void setLineEnd( const QString & ); - QString lineBegin()const; - QString lineEnd() const; + void setLineBegin( const TQString & ); + void setLineEnd( const TQString & ); + TQString lineBegin()const; + TQString lineEnd() const; void horizontalFlip(); void verticalFlip(); diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp index 004652b9..19072278 100644 --- a/kpresenter/KPrCustomSlideShowDia.cpp +++ b/kpresenter/KPrCustomSlideShowDia.cpp @@ -17,14 +17,14 @@ * Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qlistbox.h> -#include <qpushbutton.h> -#include <qtoolbutton.h> -#include <qapplication.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqlistbox.h> +#include <tqpushbutton.h> +#include <tqtoolbutton.h> +#include <tqapplication.h> +#include <tqlayout.h> #include <kdebug.h> #include <kmessagebox.h> #include <klocale.h> @@ -40,40 +40,40 @@ KPrCustomSlideShowDia::KPrCustomSlideShowDia( KPrView* _view, KPrDocument *_doc, : KDialogBase( _view, name, true, i18n("Custom Slide Show"), Ok|Cancel ), m_doc( _doc ), m_view( _view ) , m_customSlideShowMap( m_doc->customSlideShows() ) { - QWidget* page = new QWidget( this ); + TQWidget* page = new TQWidget( this ); setMainWidget( page ); - QGridLayout *grid1 = new QGridLayout( page,10,3,KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout *grid1 = new TQGridLayout( page,10,3,KDialog::marginHint(), KDialog::spacingHint()); - list=new QListBox(page); + list=new TQListBox(page); grid1->addMultiCellWidget(list,0,8,0,0); - m_pAdd=new QPushButton(i18n("&Add..."),page); + m_pAdd=new TQPushButton(i18n("&Add..."),page); grid1->addWidget(m_pAdd,1,2); - m_pModify=new QPushButton(i18n("&Modify..."),page); + m_pModify=new TQPushButton(i18n("&Modify..."),page); grid1->addWidget(m_pModify,2,2); - m_pRemove=new QPushButton(i18n("&Remove"),page); + m_pRemove=new TQPushButton(i18n("&Remove"),page); grid1->addWidget(m_pRemove,3,2); - m_pCopy=new QPushButton(i18n("Co&py"),page); + m_pCopy=new TQPushButton(i18n("Co&py"),page); grid1->addWidget(m_pCopy,4,2); - m_pTest=new QPushButton(i18n("Test"),page); + m_pTest=new TQPushButton(i18n("Test"),page); grid1->addWidget(m_pTest,5,2); - connect( m_pRemove, SIGNAL( clicked() ), this, SLOT( slotRemove() ) ); - connect( m_pAdd, SIGNAL( clicked() ), this, SLOT( slotAdd() ) ); - connect( m_pModify, SIGNAL( clicked() ), this, SLOT( slotModify() ) ); - connect( m_pCopy, SIGNAL( clicked() ), this, SLOT( slotCopy() ) ); - connect( m_pTest, SIGNAL( clicked() ), this, SLOT( slotTest() ) ); + connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); + connect( m_pAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdd() ) ); + connect( m_pModify, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotModify() ) ); + connect( m_pCopy, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) ); + connect( m_pTest, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTest() ) ); - connect( list, SIGNAL(doubleClicked(QListBoxItem *)),this,SLOT(slotDoubleClicked(QListBoxItem *))); - connect( list, SIGNAL(clicked ( QListBoxItem * )),this,SLOT(slotTextClicked(QListBoxItem * ))); + connect( list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); + connect( list, TQT_SIGNAL(clicked ( TQListBoxItem * )),this,TQT_SLOT(slotTextClicked(TQListBoxItem * ))); - connect( m_view, SIGNAL( presentationFinished() ), this, SLOT( slotPresentationFinished() ) ); + connect( m_view, TQT_SIGNAL( presentationFinished() ), this, TQT_SLOT( slotPresentationFinished() ) ); init(); updateButton(); @@ -107,12 +107,12 @@ void KPrCustomSlideShowDia::updateButton() m_pTest->setEnabled( state ); } -void KPrCustomSlideShowDia::slotTextClicked(QListBoxItem*) +void KPrCustomSlideShowDia::slotTextClicked(TQListBoxItem*) { updateButton(); } -void KPrCustomSlideShowDia::slotDoubleClicked(QListBoxItem *) +void KPrCustomSlideShowDia::slotDoubleClicked(TQListBoxItem *) { updateButton(); slotModify(); @@ -125,13 +125,13 @@ void KPrCustomSlideShowDia::slotPresentationFinished() } -void KPrCustomSlideShowDia::hideEvent( QHideEvent* ) +void KPrCustomSlideShowDia::hideEvent( TQHideEvent* ) { } void KPrCustomSlideShowDia::slotTest() { - QListBoxItem *item = list->selectedItem(); + TQListBoxItem *item = list->selectedItem(); if ( item ) { m_doc->testCustomSlideShow( m_customSlideShowMap[item->text()], m_view ); @@ -141,7 +141,7 @@ void KPrCustomSlideShowDia::slotTest() void KPrCustomSlideShowDia::slotAdd() { - QStringList listCustomName; + TQStringList listCustomName; CustomSlideShowMap::Iterator it( m_customSlideShowMap.begin() ) ; for ( ; it != m_customSlideShowMap.end(); ++it ) { @@ -178,10 +178,10 @@ void KPrCustomSlideShowDia::slotOk() void KPrCustomSlideShowDia::slotModify() { - QListBoxItem *item = list->selectedItem(); + TQListBoxItem *item = list->selectedItem(); if ( item ) { - QStringList listCustomName; + TQStringList listCustomName; CustomSlideShowMap::ConstIterator it( m_customSlideShowMap.begin() ); for ( ; it != m_customSlideShowMap.end(); ++it ) { @@ -205,16 +205,16 @@ void KPrCustomSlideShowDia::slotModify() void KPrCustomSlideShowDia::slotCopy() { - QListBoxItem *item = list->selectedItem(); + TQListBoxItem *item = list->selectedItem(); if ( item ) { - QString str( list->selectedItem()->text() ); + TQString str( list->selectedItem()->text() ); str+=i18n( "(Copy %1)" ); for ( int i =1;; ++i ) { if ( !uniqueName( i, str ) ) { - str = str.arg( i ); + str = str.tqarg( i ); m_customSlideShowMap.insert( str, m_customSlideShowMap[item->text()] ); list->insertItem( str ); break; @@ -223,9 +223,9 @@ void KPrCustomSlideShowDia::slotCopy() } } -bool KPrCustomSlideShowDia::uniqueName( int val, const QString & name ) const +bool KPrCustomSlideShowDia::uniqueName( int val, const TQString & name ) const { - QString str = name.arg( val ); + TQString str = name.tqarg( val ); for ( int i= 0; i < ( int )list->count(); ++i ) { if ( list->text ( i ) == str ) @@ -235,48 +235,48 @@ bool KPrCustomSlideShowDia::uniqueName( int val, const QString & name ) const } -KPrCustomSlideShowItem::KPrCustomSlideShowItem( QListBox * listbox, KPrPage * page ) -: QListBoxText( listbox, page->pageTitle() ) +KPrCustomSlideShowItem::KPrCustomSlideShowItem( TQListBox * listbox, KPrPage * page ) +: TQListBoxText( listbox, page->pageTitle() ) , m_page( page ) { } KPrCustomSlideShowItem::KPrCustomSlideShowItem( KPrPage * page ) -: QListBoxText( page->pageTitle() ) +: TQListBoxText( page->pageTitle() ) , m_page( page ) { } -KPrCustomSlideShowItem::KPrCustomSlideShowItem( QListBox * listbox, KPrPage * page, QListBoxItem * after ) -: QListBoxText( listbox, page->pageTitle(), after ) +KPrCustomSlideShowItem::KPrCustomSlideShowItem( TQListBox * listbox, KPrPage * page, TQListBoxItem * after ) +: TQListBoxText( listbox, page->pageTitle(), after ) , m_page( page ) { } -KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( QWidget* parent, QStringList &_listNameSlideShow, - const QPtrList<KPrPage> &pages, const char *name ) -: KDialogBase( parent, name, true, i18n("Define Custom Slide Show"), Ok|Cancel ) +KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( TQWidget* tqparent, TQStringList &_listNameSlideShow, + const TQPtrList<KPrPage> &pages, const char *name ) +: KDialogBase( tqparent, name, true, i18n("Define Custom Slide Show"), Ok|Cancel ) , listNameCustomSlideShow( _listNameSlideShow ) { init(); - for ( QPtrList<KPrPage>::ConstIterator it = pages.begin(); it != pages.end(); ++it ) + for ( TQPtrList<KPrPage>::ConstIterator it = pages.begin(); it != pages.end(); ++it ) { listSlide->insertItem( new KPrCustomSlideShowItem( *it ) ); } } -KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( QWidget* parent, const QString &_customName, QStringList &_listNameSlideShow, - const QPtrList<KPrPage> &pages, QValueList<KPrPage *> &customPages, const char* name ) -: KDialogBase( parent, name, true, i18n("Define Custom Slide Show"), Ok|Cancel ) +KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( TQWidget* tqparent, const TQString &_customName, TQStringList &_listNameSlideShow, + const TQPtrList<KPrPage> &pages, TQValueList<KPrPage *> &customPages, const char* name ) +: KDialogBase( tqparent, name, true, i18n("Define Custom Slide Show"), Ok|Cancel ) , listNameCustomSlideShow( _listNameSlideShow ) { init(); m_name->setText( _customName ); - for ( QPtrList<KPrPage>::ConstIterator it = pages.begin(); it != pages.end(); ++it ) + for ( TQPtrList<KPrPage>::ConstIterator it = pages.begin(); it != pages.end(); ++it ) { listSlide->insertItem( new KPrCustomSlideShowItem( *it ) ); } - for ( QValueList<KPrPage *>::ConstIterator it = customPages.begin(); it != customPages.end(); ++it ) + for ( TQValueList<KPrPage *>::ConstIterator it = customPages.begin(); it != customPages.end(); ++it ) { listSlideShow->insertItem( new KPrCustomSlideShowItem( *it ) ); } @@ -284,49 +284,49 @@ KPrDefineCustomSlideShow::KPrDefineCustomSlideShow( QWidget* parent, const QStri void KPrDefineCustomSlideShow::init() { - QWidget* page = new QWidget( this ); + TQWidget* page = new TQWidget( this ); setMainWidget( page ); - QVBoxLayout *lov = new QVBoxLayout( page ); + TQVBoxLayout *lov = new TQVBoxLayout( page ); lov->setSpacing( KDialog::spacingHint() ); - QHBoxLayout *loh = new QHBoxLayout( lov ); + TQHBoxLayout *loh = new TQHBoxLayout( lov ); - QLabel *lab = new QLabel( i18n( "Name:" ), page ); + TQLabel *lab = new TQLabel( i18n( "Name:" ), page ); loh->addWidget( lab ); - m_name = new QLineEdit( page ); + m_name = new TQLineEdit( page ); loh->addWidget( m_name ); - QHBoxLayout *lo = new QHBoxLayout( lov ); + TQHBoxLayout *lo = new TQHBoxLayout( lov ); lo->setSpacing( KDialog::spacingHint() ); - QVBoxLayout *loAv = new QVBoxLayout( lo ); - lab = new QLabel( i18n("Existing slides:"), page ); + TQVBoxLayout *loAv = new TQVBoxLayout( lo ); + lab = new TQLabel( i18n("Existing slides:"), page ); loAv->addWidget( lab ); - listSlide = new QListBox( page ); + listSlide = new TQListBox( page ); loAv->addWidget( listSlide ); lab->setBuddy( listSlide ); - QVBoxLayout *loHBtns = new QVBoxLayout( lo ); + TQVBoxLayout *loHBtns = new TQVBoxLayout( lo ); loHBtns->addStretch( 1 ); - m_insertSlide = new QToolButton( page ); + m_insertSlide = new TQToolButton( page ); loHBtns->addWidget( m_insertSlide ); - m_removeSlide = new QToolButton( page ); + m_removeSlide = new TQToolButton( page ); loHBtns->addWidget( m_removeSlide ); loHBtns->addStretch( 1 ); - QVBoxLayout *loS = new QVBoxLayout( lo ); - lab = new QLabel( i18n("Selected slides:"), page ); + TQVBoxLayout *loS = new TQVBoxLayout( lo ); + lab = new TQLabel( i18n("Selected slides:"), page ); loS->addWidget( lab ); - listSlideShow = new QListBox( page ); + listSlideShow = new TQListBox( page ); loS->addWidget( listSlideShow ); lab->setBuddy( listSlideShow ); - QVBoxLayout *loVBtns = new QVBoxLayout( lo ); + TQVBoxLayout *loVBtns = new TQVBoxLayout( lo ); loVBtns->addStretch( 1 ); - m_moveUpSlide = new QToolButton( page ); + m_moveUpSlide = new TQToolButton( page ); m_moveUpSlide->setAutoRepeat( true ); loVBtns->addWidget( m_moveUpSlide ); - m_moveDownSlide = new QToolButton( page ); + m_moveDownSlide = new TQToolButton( page ); m_moveDownSlide->setAutoRepeat( true ); loVBtns->addWidget( m_moveDownSlide ); loVBtns->addStretch( 1 ); @@ -334,17 +334,17 @@ void KPrDefineCustomSlideShow::init() m_name->setFocus(); - connect( m_insertSlide, SIGNAL(clicked()), this, SLOT(slotMoveInsertSlide() ) ); - connect( m_removeSlide, SIGNAL(clicked()), this, SLOT(slotMoveRemoveSlide()) ); - connect( m_moveUpSlide, SIGNAL(clicked()), this, SLOT( slotMoveUpSlide() ) ); - connect( m_moveDownSlide, SIGNAL(clicked()), this, SLOT(slotMoveDownSlide()) ); - connect( m_name, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slideNameChanged( const QString & ) ) ); - connect( listSlideShow, SIGNAL( clicked ( QListBoxItem * ) ), this, SLOT( updateButton() ) ); - connect( listSlide, SIGNAL( clicked ( QListBoxItem * ) ), this, SLOT( updateButton() ) ); - connect( listSlide, SIGNAL( doubleClicked ( QListBoxItem * ) ), this, SLOT( slotMoveInsertSlide() ) ); - connect( listSlideShow, SIGNAL( doubleClicked( QListBoxItem * ) ), this, SLOT( slotMoveRemoveSlide() ) ); - m_insertSlide->setIconSet( SmallIconSet( ( QApplication::reverseLayout() ? "back" : "forward" ) ) ); - m_removeSlide->setIconSet( SmallIconSet( ( QApplication::reverseLayout() ? "forward" : "back") ) ); + connect( m_insertSlide, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveInsertSlide() ) ); + connect( m_removeSlide, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveRemoveSlide()) ); + connect( m_moveUpSlide, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotMoveUpSlide() ) ); + connect( m_moveDownSlide, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDownSlide()) ); + connect( m_name, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slideNameChanged( const TQString & ) ) ); + connect( listSlideShow, TQT_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQT_SLOT( updateButton() ) ); + connect( listSlide, TQT_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQT_SLOT( updateButton() ) ); + connect( listSlide, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), this, TQT_SLOT( slotMoveInsertSlide() ) ); + connect( listSlideShow, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotMoveRemoveSlide() ) ); + m_insertSlide->setIconSet( SmallIconSet( ( TQApplication::reverseLayout() ? "back" : "forward" ) ) ); + m_removeSlide->setIconSet( SmallIconSet( ( TQApplication::reverseLayout() ? "forward" : "back") ) ); m_moveUpSlide->setIconSet( SmallIconSet( "up" ) ); m_moveDownSlide->setIconSet( SmallIconSet( "down" ) ); @@ -354,7 +354,7 @@ void KPrDefineCustomSlideShow::init() } -void KPrDefineCustomSlideShow::slideNameChanged( const QString & _name) +void KPrDefineCustomSlideShow::slideNameChanged( const TQString & _name) { enableButtonOK( !_name.isEmpty() ); } @@ -372,7 +372,7 @@ void KPrDefineCustomSlideShow::slotMoveUpSlide() { int c = listSlideShow->currentItem(); if ( c < 1 ) return; - QListBoxItem *item = listSlideShow->item( c ); + TQListBoxItem *item = listSlideShow->item( c ); listSlideShow->takeItem( item ); listSlideShow->insertItem( item, c-1 ); listSlideShow->setCurrentItem( item ); @@ -384,7 +384,7 @@ void KPrDefineCustomSlideShow::slotMoveDownSlide() { int c = listSlideShow->currentItem(); if ( c < 0 || c == int( listSlideShow->count() ) - 1 ) return; - QListBoxItem *item = listSlideShow->item( c ); + TQListBoxItem *item = listSlideShow->item( c ); listSlideShow->takeItem( item ); listSlideShow->insertItem( item, c+1 ); listSlideShow->setCurrentItem( item ); @@ -394,7 +394,7 @@ void KPrDefineCustomSlideShow::slotMoveDownSlide() void KPrDefineCustomSlideShow::slotMoveRemoveSlide() { // move all selected items from selected to available listbox - QListBoxItem *item = listSlideShow->firstItem(); + TQListBoxItem *item = listSlideShow->firstItem(); while ( item ) { if ( item->isSelected() ) { listSlideShow->takeItem( item ); @@ -406,7 +406,7 @@ void KPrDefineCustomSlideShow::slotMoveRemoveSlide() void KPrDefineCustomSlideShow::slotMoveInsertSlide() { - QListBoxItem *item = listSlide->firstItem(); + TQListBoxItem *item = listSlide->firstItem(); while ( item ) { if ( item->isSelected() ) { KPrCustomSlideShowItem * i = dynamic_cast<KPrCustomSlideShowItem *>( item ); @@ -421,10 +421,10 @@ void KPrDefineCustomSlideShow::slotMoveInsertSlide() updateButton(); } -QValueList<KPrPage *> KPrDefineCustomSlideShow::customSlides() +TQValueList<KPrPage *> KPrDefineCustomSlideShow::customSlides() { - QValueList<KPrPage *> pages; - QListBoxItem *item = listSlideShow->firstItem(); + TQValueList<KPrPage *> pages; + TQListBoxItem *item = listSlideShow->firstItem(); while ( item ) { KPrCustomSlideShowItem * i = dynamic_cast<KPrCustomSlideShowItem *>( item ); @@ -437,7 +437,7 @@ QValueList<KPrPage *> KPrDefineCustomSlideShow::customSlides() return pages; } -QString KPrDefineCustomSlideShow::customSlideShowName() const +TQString KPrDefineCustomSlideShow::customSlideShowName() const { return m_name->text(); } @@ -445,7 +445,7 @@ QString KPrDefineCustomSlideShow::customSlideShowName() const void KPrDefineCustomSlideShow::slotOk() { - if ( listNameCustomSlideShow.contains( m_name->text() ) ) + if ( listNameCustomSlideShow.tqcontains( m_name->text() ) ) { KMessageBox::error(this, i18n("Custom Slide Show name is already used."), i18n("Define Custom Slide Show")); } diff --git a/kpresenter/KPrCustomSlideShowDia.h b/kpresenter/KPrCustomSlideShowDia.h index 203405bd..94e6bf2a 100644 --- a/kpresenter/KPrCustomSlideShowDia.h +++ b/kpresenter/KPrCustomSlideShowDia.h @@ -21,27 +21,28 @@ #define __CUSTOM_SLIDE_SHOW__ #include <kdialogbase.h> -#include <qlistbox.h> +#include <tqlistbox.h> #include "global.h" -class QLineEdit; -class QPushButton; +class TQLineEdit; +class TQPushButton; class KPrDocument; -class QToolButton; +class TQToolButton; class KPrView; class KPrPage; class KPrCustomSlideShowDia : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KPrCustomSlideShowDia( KPrView* _view, KPrDocument *_doc, const char* name ); ~KPrCustomSlideShowDia(); public slots: virtual void slotOk(); - void slotDoubleClicked(QListBoxItem *); - void slotTextClicked(QListBoxItem*); + void slotDoubleClicked(TQListBoxItem *); + void slotTextClicked(TQListBoxItem*); void slotRemove(); void slotAdd(); void slotModify(); @@ -50,31 +51,31 @@ public slots: void slotPresentationFinished(); protected: - void hideEvent( QHideEvent* ); + void hideEvent( TQHideEvent* ); void init(); void updateButton(); - bool uniqueName( int val, const QString & name ) const; - - QListBox * list; - QPushButton* m_pRemove; - QPushButton* m_pAdd; - QPushButton* m_pModify; - QPushButton* m_pCopy; - QPushButton* m_pTest; + bool uniqueName( int val, const TQString & name ) const; + + TQListBox * list; + TQPushButton* m_pRemove; + TQPushButton* m_pAdd; + TQPushButton* m_pModify; + TQPushButton* m_pCopy; + TQPushButton* m_pTest; bool m_bChanged; KPrDocument *m_doc; KPrView *m_view; CustomSlideShowMap m_customSlideShowMap; - QStringList listPageName; + TQStringList listPageName; }; -class KPrCustomSlideShowItem : public QListBoxText +class KPrCustomSlideShowItem : public TQListBoxText { public: - KPrCustomSlideShowItem( QListBox * listbox, KPrPage * page ); + KPrCustomSlideShowItem( TQListBox * listbox, KPrPage * page ); KPrCustomSlideShowItem( KPrPage * page ); - KPrCustomSlideShowItem( QListBox * listbox, KPrPage * page, QListBoxItem * after ); + KPrCustomSlideShowItem( TQListBox * listbox, KPrPage * page, TQListBoxItem * after ); KPrPage * getPage() { return m_page; } private: @@ -84,33 +85,34 @@ private: class KPrDefineCustomSlideShow : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KPrDefineCustomSlideShow( QWidget* parent, QStringList &_listNameSlideShow, const QPtrList<KPrPage> &pages, const char *name = 0L); - KPrDefineCustomSlideShow( QWidget* parent, const QString &_customName, QStringList &_listNameSlideShow, - const QPtrList<KPrPage> &pages, QValueList<KPrPage *> &customPages, const char* name = 0L ); + KPrDefineCustomSlideShow( TQWidget* tqparent, TQStringList &_listNameSlideShow, const TQPtrList<KPrPage> &pages, const char *name = 0L); + KPrDefineCustomSlideShow( TQWidget* tqparent, const TQString &_customName, TQStringList &_listNameSlideShow, + const TQPtrList<KPrPage> &pages, TQValueList<KPrPage *> &customPages, const char* name = 0L ); - QString customSlideShowName() const; - QValueList<KPrPage *> customSlides(); + TQString customSlideShowName() const; + TQValueList<KPrPage *> customSlides(); protected slots: void slotMoveUpSlide(); void slotMoveDownSlide(); void slotMoveRemoveSlide(); void slotMoveInsertSlide(); - void slideNameChanged( const QString & _name); + void slideNameChanged( const TQString & _name); void updateButton(); virtual void slotOk(); protected: void init(); - QStringList listNameCustomSlideShow; - QListBox *listSlide; - QListBox *listSlideShow; - QToolButton *m_insertSlide; - QToolButton *m_removeSlide; - QToolButton *m_moveUpSlide; - QToolButton *m_moveDownSlide; - QLineEdit *m_name; + TQStringList listNameCustomSlideShow; + TQListBox *listSlide; + TQListBox *listSlideShow; + TQToolButton *m_insertSlide; + TQToolButton *m_removeSlide; + TQToolButton *m_moveUpSlide; + TQToolButton *m_moveDownSlide; + TQLineEdit *m_name; }; diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index 595f4981..88f0fd3a 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -42,12 +42,12 @@ #include "KPrClosedLineObject.h" #include "KPrSVGPathParser.h" -#include <qpopupmenu.h> -#include <qclipboard.h> -#include <qregexp.h> -#include <qfileinfo.h> -#include <qdom.h> -#include <qdict.h> +#include <tqpopupmenu.h> +#include <tqclipboard.h> +#include <tqregexp.h> +#include <tqfileinfo.h> +#include <tqdom.h> +#include <tqdict.h> #include <KoDom.h> #include <KoXmlNS.h> @@ -113,7 +113,7 @@ static const int CURRENT_SYNTAX_VERSION = 2; // Make sure an appropriate DTD is available in www/koffice/DTD if changing this value static const char * CURRENT_DTD_VERSION = "1.2"; -KPrChild::KPrChild( KPrDocument *_kpr, KoDocument* _doc, const QRect& _rect ) +KPrChild::KPrChild( KPrDocument *_kpr, KoDocument* _doc, const TQRect& _rect ) : KoDocumentChild( _kpr, _doc, _rect ) { m_parent = _kpr; @@ -129,16 +129,16 @@ KPrChild::~KPrChild() { } -KoDocument *KPrChild::hitTest( const QPoint &, const QWMatrix & ) +KoDocument *KPrChild::hitTest( const TQPoint &, const TQWMatrix & ) { // hitTest functionality is disabled because kpresenter handles activation // of embedded parts by itself. See KPrPartObject::activate(). return 0; } -KPrDocument::KPrDocument( QWidget *parentWidget, const char *widgetName, QObject* parent, const char* name, +KPrDocument::KPrDocument( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) - : KoDocument( parentWidget,widgetName, parent, name, singleViewMode ), + : KoDocument( tqparentWidget,widgetName, tqparent, name, singleViewMode ), _gradientCollection(), m_customListTest( 0L ), m_childCountBeforeInsert( 0 ) { @@ -160,27 +160,27 @@ KPrDocument::KPrDocument( QWidget *parentWidget, const char *widgetName, QObject KConfig *config = KPrFactory::global()->config(); config->setGroup("Document defaults" ); - QString defaultFontname=config->readEntry("DefaultFont"); + TQString defaultFontname=config->readEntry("DefaultFont"); if ( !defaultFontname.isEmpty() ) m_defaultFont.fromString( defaultFontname ); // If not found, we automatically fallback to the application font (the one from KControl's font module) // Try to force a scalable font. - m_defaultFont.setStyleStrategy( QFont::ForceOutline ); + m_defaultFont.setStyleStrategy( TQFont::ForceOutline ); //kdDebug(33001) << "Default font: requested family: " << m_defaultFont.family() << endl; - //kdDebug(33001) << "Default font: real family: " << QFontInfo(m_defaultFont).family() << endl; + //kdDebug(33001) << "Default font: real family: " << TQFontInfo(m_defaultFont).family() << endl; int ptSize = m_defaultFont.pointSize(); if ( ptSize == -1 ) // specified with a pixel size ? - ptSize = QFontInfo(m_defaultFont).pointSize(); + ptSize = TQFontInfo(m_defaultFont).pointSize(); //kdDebug(33001) << "KPrDocument::KPrDocument[2] ptSize=" << ptSize << endl; // Ok, this is KPresenter. A default font of 10 makes no sense. Let's go for 20. - ptSize = QMAX( 20, ptSize ); + ptSize = TQMAX( 20, ptSize ); m_standardStyle->format().setFont( m_defaultFont ); /// KPresenter isn't color-scheme aware, it defaults to black on white. - m_standardStyle->format().setColor( Qt::black ); + m_standardStyle->format().setColor( TQt::black ); if( config->hasGroup("Interface") ) { config->setGroup( "Interface" ); @@ -204,7 +204,7 @@ KPrDocument::KPrDocument( QWidget *parentWidget, const char *widgetName, QObject _spShowEndOfPresentationSlide = true; _spManualSwitch = true; _showPresentationDuration = false; - tmpSoundFileList = QPtrList<KTempFile>(); + tmpSoundFileList = TQPtrList<KTempFile>(); _xRnd = 20; _yRnd = 20; _txtBackCol = lightGray; @@ -222,8 +222,8 @@ KPrDocument::KPrDocument( QWidget *parentWidget, const char *widgetName, QObject m_cursorInProtectectedArea=true; - usedSoundFile = QStringList(); - haveNotOwnDiskSoundFile = QStringList(); + usedSoundFile = TQStringList(); + haveNotOwnDiskSoundFile = TQStringList(); m_zoomHandler->setZoomAndResolution( 100, KoGlobal::dpiX(), KoGlobal::dpiY() ); newZoomAndResolution(false,false); @@ -256,10 +256,10 @@ KPrDocument::KPrDocument( QWidget *parentWidget, const char *widgetName, QObject m_bInsertDirectCursor = false; objStartY = 0; - _presPen = QPen( red, 3, SolidLine ); + _presPen = TQPen( red, 3, SolidLine ); ignoreSticky = TRUE; - m_gridColor=Qt::black; + m_gridColor=TQt::black; _header = new KPrTextObject( this ); _header->setDrawEditRect( false ); @@ -272,14 +272,14 @@ KPrDocument::KPrDocument( QWidget *parentWidget, const char *widgetName, QObject saveOnlyPage = -1; m_maxRecentFiles = 10; - connect( QApplication::clipboard(), SIGNAL( dataChanged() ), - this, SLOT( clipboardDataChanged() ) ); + connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + this, TQT_SLOT( clipboardDataChanged() ) ); m_commandHistory = new KoCommandHistory( actionCollection(), true ) ; initConfig(); - connect( m_commandHistory, SIGNAL( documentRestored() ), this, SLOT( slotDocumentRestored() ) ); - connect( m_commandHistory, SIGNAL( commandExecuted() ), this, SLOT( slotCommandExecuted() ) ); + connect( m_commandHistory, TQT_SIGNAL( documentRestored() ), this, TQT_SLOT( slotDocumentRestored() ) ); + connect( m_commandHistory, TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( slotCommandExecuted() ) ); dcopObject(); } @@ -350,8 +350,8 @@ void KPrDocument::initConfig() else zoom=100; - QColor oldBgColor = Qt::white; - QColor oldGridColor = Qt::black; + TQColor oldBgColor = TQt::white; + TQColor oldGridColor = TQt::black; if ( config->hasGroup( "KPresenter Color" ) ) { config->setGroup( "KPresenter Color" ); setTxtBackCol(config->readColorEntry( "BackgroundColor", &oldBgColor )); @@ -444,23 +444,23 @@ bool KPrDocument::saveChildren( KoStore* _store ) { int i = 0; - QPtrListIterator<KoDocumentChild> it( children() ); + TQPtrListIterator<KoDocumentChild> it( tqchildren() ); for( ; it.current(); ++it ) { - // Don't save children that are only in the undo/redo history + // Don't save tqchildren that are only in the undo/redo history // but not anymore in the presentation - QPtrListIterator<KPrPage> pageIt( m_pageList ); + TQPtrListIterator<KPrPage> pageIt( m_pageList ); for ( int pagePos = 0; pageIt.current(); ++pageIt, ++pagePos ) { if ( saveOnlyPage == -1 || pagePos == saveOnlyPage ) { - QPtrListIterator<KPrObject> oIt(pageIt.current()->objectList()); + TQPtrListIterator<KPrObject> oIt(pageIt.current()->objectList()); for (; oIt.current(); ++oIt ) { if ( oIt.current()->getType() == OT_PART && dynamic_cast<KPrPartObject*>( oIt.current() )->getChild() == it.current() ) { if (((KoDocumentChild*)(it.current()))->document()!=0) - if ( !((KoDocumentChild*)(it.current()))->document()->saveToStore( _store, QString::number( i++ ) ) ) + if ( !((KoDocumentChild*)(it.current()))->document()->saveToStore( _store, TQString::number( i++ ) ) ) return false; } } @@ -468,14 +468,14 @@ bool KPrDocument::saveChildren( KoStore* _store ) } if ( saveOnlyPage == -1 ) { - QPtrListIterator<KPrObject> oIt(m_masterPage->objectList()); + TQPtrListIterator<KPrObject> oIt(m_masterPage->objectList()); for (; oIt.current(); ++oIt ) { if ( oIt.current()->getType() == OT_PART && dynamic_cast<KPrPartObject*>( oIt.current() )->getChild() == it.current() ) { if (((KoDocumentChild*)(it.current()))->document()!=0) - if ( !((KoDocumentChild*)(it.current()))->document()->saveToStore( _store, QString::number( i++ ) ) ) + if ( !((KoDocumentChild*)(it.current()))->document()->saveToStore( _store, TQString::number( i++ ) ) ) return false; } } @@ -484,31 +484,31 @@ bool KPrDocument::saveChildren( KoStore* _store ) return true; } -QDomDocument KPrDocument::saveXML() +TQDomDocument KPrDocument::saveXML() { if ( saveOnlyPage == -1 ) { emit sigProgress( 0 ); } - m_varColl->variableSetting()->setModificationDate(QDateTime::currentDateTime()); + m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime()); recalcVariables( VT_DATE ); recalcVariables( VT_TIME ); recalcVariables( VT_STATISTIC ); - QDomDocument doc = createDomDocument( "DOC", CURRENT_DTD_VERSION ); - QDomElement presenter=doc.documentElement(); + TQDomDocument doc = createDomDocument( "DOC", CURRENT_DTD_VERSION ); + TQDomElement presenter=doc.documentElement(); presenter.setAttribute("editor", "KPresenter"); presenter.setAttribute("mime", "application/x-kpresenter"); presenter.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION); - QDomElement paper=doc.createElement("PAPER"); + TQDomElement paper=doc.createElement("PAPER"); paper.setAttribute("format", static_cast<int>( m_pageLayout.format )); - paper.setAttribute("ptWidth", QString::number( m_pageLayout.ptWidth, 'g', 10 )); - paper.setAttribute("ptHeight", QString::number( m_pageLayout.ptHeight, 'g', 10 )); + paper.setAttribute("ptWidth", TQString::number( m_pageLayout.ptWidth, 'g', 10 )); + paper.setAttribute("ptHeight", TQString::number( m_pageLayout.ptHeight, 'g', 10 )); paper.setAttribute("orientation", static_cast<int>( m_pageLayout.orientation )); paper.setAttribute("unit", unit() ); paper.setAttribute("tabStopValue", m_tabStop ); - QDomElement paperBorders=doc.createElement("PAPERBORDERS"); + TQDomElement paperBorders=doc.createElement("PAPERBORDERS"); paperBorders.setAttribute("ptLeft", m_pageLayout.ptLeft); paperBorders.setAttribute("ptTop", m_pageLayout.ptTop); @@ -524,7 +524,7 @@ QDomDocument KPrDocument::saveXML() if ( saveOnlyPage == -1 ) emit sigProgress( 5 ); - QDomElement element=doc.createElement("BACKGROUND"); + TQDomElement element=doc.createElement("BACKGROUND"); element.appendChild(saveBackground( doc )); presenter.appendChild(element); @@ -555,11 +555,11 @@ QDomDocument KPrDocument::saveXML() { if( !m_spellCheckIgnoreList.isEmpty() ) { - QDomElement spellCheckIgnore = doc.createElement( "SPELLCHECKIGNORELIST" ); + TQDomElement spellCheckIgnore = doc.createElement( "SPELLCHECKIGNORELIST" ); presenter.appendChild( spellCheckIgnore ); - for ( QStringList::Iterator it = m_spellCheckIgnoreList.begin(); it != m_spellCheckIgnoreList.end(); ++it ) + for ( TQStringList::Iterator it = m_spellCheckIgnoreList.begin(); it != m_spellCheckIgnoreList.end(); ++it ) { - QDomElement spellElem = doc.createElement( "SPELLCHECKIGNOREWORD" ); + TQDomElement spellElem = doc.createElement( "SPELLCHECKIGNOREWORD" ); spellCheckIgnore.appendChild( spellElem ); spellElem.setAttribute( "word", *it ); } @@ -599,24 +599,24 @@ QDomDocument KPrDocument::saveXML() { if ( !m_customListSlideShow.isEmpty() ) { - QMap<KPrPage *, QString> page2name; + TQMap<KPrPage *, TQString> page2name; int pos = 1; - for ( QPtrListIterator<KPrPage> it( m_pageList ); it.current(); ++it ) + for ( TQPtrListIterator<KPrPage> it( m_pageList ); it.current(); ++it ) { - page2name.insert( it.current(), "page" + QString::number( pos++ ) ) ; + page2name.insert( it.current(), "page" + TQString::number( pos++ ) ) ; } element = doc.createElement( "CUSTOMSLIDESHOWCONFIG" ); CustomSlideShowMap::Iterator it; for ( it = m_customListSlideShow.begin(); it != m_customListSlideShow.end(); ++it ) { - QDomElement slide=doc.createElement("CUSTOMSLIDESHOW"); + TQDomElement slide=doc.createElement("CUSTOMSLIDESHOW"); slide.setAttribute("name", it.key() ); - QString tmp; - QValueListIterator<KPrPage*> itPage ; + TQString tmp; + TQValueListIterator<KPrPage*> itPage ; for( itPage = ( *it ).begin(); itPage != ( *it ).end(); ++itPage ) { - int posPage = m_pageList.find( *itPage ); + int posPage = m_pageList.tqfind( *itPage ); if ( posPage != -1 ) { if ( itPage != ( *it ).begin() ) @@ -646,7 +646,7 @@ QDomDocument KPrDocument::saveXML() { element=doc.createElement("SELSLIDES"); for ( uint i = 0; i < m_pageList.count(); i++ ) { - QDomElement slide=doc.createElement("SLIDE"); + TQDomElement slide=doc.createElement("SLIDE"); slide.setAttribute("nr", i); slide.setAttribute("show", m_pageList.at(i)->isSlideSelected()); element.appendChild(slide); @@ -658,10 +658,10 @@ QDomDocument KPrDocument::saveXML() if ( saveOnlyPage == -1 ) { - QDomElement styles = doc.createElement( "STYLES" ); + TQDomElement styles = doc.createElement( "STYLES" ); presenter.appendChild( styles ); - QValueList<KoUserStyle *> styleList(m_styleColl->styleList()); - for ( QValueList<KoUserStyle *>::const_iterator it = styleList.begin(), end = styleList.end(); + TQValueList<KoUserStyle *> styleList(m_styleColl->styleList()); + for ( TQValueList<KoUserStyle *>::const_iterator it = styleList.begin(), end = styleList.end(); it != end ; ++it ) saveStyle( static_cast<KoParagStyle *>( *it ), styles ); @@ -669,9 +669,9 @@ QDomDocument KPrDocument::saveXML() } // Write "OBJECT" tag for every child - QPtrListIterator<KoDocumentChild> chl( children() ); + TQPtrListIterator<KoDocumentChild> chl( tqchildren() ); for( ; chl.current(); ++chl ) { - // Don't save children that are only in the undo/redo history + // Don't save tqchildren that are only in the undo/redo history // but not anymore in the presentation for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) { if ( saveOnlyPage != -1 && i != saveOnlyPage ) @@ -693,7 +693,7 @@ QDomDocument KPrDocument::saveXML() emit sigProgress( 70 ); makeUsedPixmapList(); - QDomElement pictures = m_pictureCollection.saveXML( KoPictureCollection::CollectionPicture, doc, usedPictures ); + TQDomElement pictures = m_pictureCollection.saveXML( KoPictureCollection::CollectionPicture, doc, usedPictures ); presenter.appendChild( pictures ); if ( saveOnlyPage == -1 ) @@ -701,7 +701,7 @@ QDomDocument KPrDocument::saveXML() // Save sound file list. makeUsedSoundFileList(); - QDomElement soundFiles = saveUsedSoundFileToXML( doc, usedSoundFile ); + TQDomElement soundFiles = saveUsedSoundFileToXML( doc, usedSoundFile ); presenter.appendChild( soundFiles ); if ( saveOnlyPage == -1 ) @@ -709,49 +709,49 @@ QDomDocument KPrDocument::saveXML() return doc; } -void KPrDocument::saveEmbeddedObject(KPrPage *page, const QPtrList<KoDocumentChild>& childList, - QDomDocument &doc,QDomElement &presenter ) +void KPrDocument::saveEmbeddedObject(KPrPage *page, const TQPtrList<KoDocumentChild>& childList, + TQDomDocument &doc,TQDomElement &presenter ) { - QPtrListIterator<KoDocumentChild> chl( childList ); + TQPtrListIterator<KoDocumentChild> chl( childList ); double offset = 0.0; // we need no offset for objects on the master page and when we copy a page - if ( m_pageList.findRef( page ) ) + if ( m_pageList.tqfindRef( page ) ) { - offset=m_pageList.findRef(page)*page->getPageRect().height(); + offset=m_pageList.tqfindRef(page)*page->getPageRect().height(); } for( ; chl.current(); ++chl ) saveEmbeddedObject(page, chl.current(),doc,presenter, offset ); } -void KPrDocument::saveEmbeddedObject(KPrPage *page, KoDocumentChild *chl, QDomDocument &doc, - QDomElement &presenter, double offset ) +void KPrDocument::saveEmbeddedObject(KPrPage *page, KoDocumentChild *chl, TQDomDocument &doc, + TQDomElement &presenter, double offset ) { - QPtrListIterator<KPrObject> oIt(page->objectList()); + TQPtrListIterator<KPrObject> oIt(page->objectList()); for ( int pos = 0; oIt.current(); ++oIt, ++pos ) { if ( oIt.current()->getType() == OT_PART && static_cast<KPrPartObject*>( oIt.current() )->getChild() == chl ) { - QDomElement embedded=doc.createElement("EMBEDDED"); + TQDomElement embedded=doc.createElement("EMBEDDED"); KPrChild* curr = (KPrChild*)chl; - // geometry is no zoom value ! - QRect _rect = curr->geometry(); + // tqgeometry is no zoom value ! + TQRect _rect = curr->tqgeometry(); int tmpX = (int)zoomHandler()->unzoomItX( _rect.x() ); int tmpY = (int)zoomHandler()->unzoomItY( _rect.y() ); int tmpWidth = (int)zoomHandler()->unzoomItX( _rect.width() ); int tmpHeight = (int)zoomHandler()->unzoomItY( _rect.height() ); - curr->setGeometry( QRect( tmpX, tmpY, tmpWidth, tmpHeight ) ); + curr->setGeometry( TQRect( tmpX, tmpY, tmpWidth, tmpHeight ) ); embedded.appendChild(curr->save(doc, true)); curr->setGeometry( _rect ); // replace zoom value - QDomElement settings=doc.createElement("SETTINGS"); + TQDomElement settings=doc.createElement("SETTINGS"); settings.setAttribute( "z-index", pos ); if ( page == m_masterPage ) settings.setAttribute("sticky", 1 ); - QPtrListIterator<KPrObject> setOIt(page->objectList()); + TQPtrListIterator<KPrObject> setOIt(page->objectList()); for (; setOIt.current(); ++setOIt ) { if ( setOIt.current()->getType() == OT_PART && @@ -800,14 +800,14 @@ void KPrDocument::compatibilityFromOldFileFormat() void KPrDocument::enableEmbeddedParts( bool f ) { - QPtrListIterator<KPrPage> it( m_pageList ); + TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) it.current()->enableEmbeddedParts(f); } -QDomDocumentFragment KPrDocument::saveBackground( QDomDocument &doc ) +TQDomDocumentFragment KPrDocument::saveBackground( TQDomDocument &doc ) { - QDomDocumentFragment fragment=doc.createDocumentFragment(); + TQDomDocumentFragment fragment=doc.createDocumentFragment(); for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) { if ( saveOnlyPage != -1 && i != saveOnlyPage ) continue; @@ -821,9 +821,9 @@ QDomDocumentFragment KPrDocument::saveBackground( QDomDocument &doc ) return fragment; } -QDomElement KPrDocument::saveObjects( QDomDocument &doc ) +TQDomElement KPrDocument::saveObjects( TQDomDocument &doc ) { - QDomElement objects=doc.createElement("OBJECTS"); + TQDomElement objects=doc.createElement("OBJECTS"); double yoffset=0.0; for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) { if ( saveOnlyPage != -1 && saveOnlyPage!=i) @@ -840,42 +840,42 @@ QDomElement KPrDocument::saveObjects( QDomDocument &doc ) return objects; } -QDomElement KPrDocument::saveTitle( QDomDocument &doc ) +TQDomElement KPrDocument::saveTitle( TQDomDocument &doc ) { - QDomElement titles=doc.createElement("PAGETITLES"); + TQDomElement titles=doc.createElement("PAGETITLES"); if ( saveOnlyPage == -1 ) { // All page titles. for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) { - QDomElement title=doc.createElement("Title"); + TQDomElement title=doc.createElement("Title"); title.setAttribute("title", m_pageList.at(i)->manualTitle()); titles.appendChild(title); } } else { // Only current page title. - QDomElement title=doc.createElement("Title"); + TQDomElement title=doc.createElement("Title"); title.setAttribute("title", m_pageList.at(saveOnlyPage)->manualTitle()); titles.appendChild(title); } return titles; } -QDomElement KPrDocument::saveNote( QDomDocument &doc ) +TQDomElement KPrDocument::saveNote( TQDomDocument &doc ) { - QDomElement notes=doc.createElement("PAGENOTES"); + TQDomElement notes=doc.createElement("PAGENOTES"); if ( saveOnlyPage == -1 ) { // All page notes. for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) { - QDomElement note=doc.createElement("Note"); + TQDomElement note=doc.createElement("Note"); note.setAttribute("note", m_pageList.at(i)->noteText( )); notes.appendChild(note); } } else { // Only current page note. - QDomElement note=doc.createElement("Note"); + TQDomElement note=doc.createElement("Note"); note.setAttribute("note", m_pageList.at(saveOnlyPage)->noteText( )); notes.appendChild(note); } @@ -883,15 +883,15 @@ QDomElement KPrDocument::saveNote( QDomDocument &doc ) return notes; } -QDomElement KPrDocument::saveAttribute( QDomDocument &doc ) +TQDomElement KPrDocument::saveAttribute( TQDomDocument &doc ) { - QDomElement attributes=doc.createElement("ATTRIBUTES"); + TQDomElement attributes=doc.createElement("ATTRIBUTES"); //store first view parameter. int activePage=0; if ( m_initialActivePage ) - activePage=m_pageList.findRef(m_initialActivePage); - activePage = QMAX( activePage, 0); + activePage=m_pageList.tqfindRef(m_initialActivePage); + activePage = TQMAX( activePage, 0); attributes.setAttribute("activePage",activePage ); attributes.setAttribute("gridx", m_gridX ); attributes.setAttribute("gridy", m_gridY ); @@ -899,19 +899,19 @@ QDomElement KPrDocument::saveAttribute( QDomDocument &doc ) return attributes; } -QDomElement KPrDocument::saveUsedSoundFileToXML( QDomDocument &_doc, QStringList _list ) +TQDomElement KPrDocument::saveUsedSoundFileToXML( TQDomDocument &_doc, TQStringList _list ) { - QDomElement soundFiles = _doc.createElement( "SOUNDS" ); + TQDomElement soundFiles = _doc.createElement( "SOUNDS" ); unsigned int i = 0; - QStringList::Iterator it = _list.begin(); + TQStringList::Iterator it = _list.begin(); for ( ; it != _list.end(); ++it ) { - QString soundFileName = *it; - int position = soundFileName.findRev( '.' ); - QString format = soundFileName.right( soundFileName.length() - position - 1 ); - QString _name = QString( "sounds/sound%1.%2" ).arg( ++i ).arg( format.lower() ); + TQString soundFileName = *it; + int position = soundFileName.tqfindRev( '.' ); + TQString format = soundFileName.right( soundFileName.length() - position - 1 ); + TQString _name = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( format.lower() ); - QDomElement fileElem = _doc.createElement( "FILE" ); + TQDomElement fileElem = _doc.createElement( "FILE" ); soundFiles.appendChild( fileElem ); fileElem.setAttribute( "filename", soundFileName ); fileElem.setAttribute( "name", _name ); @@ -947,19 +947,19 @@ int KPrDocument::supportedSpecialFormats() const return KoDocument::supportedSpecialFormats(); } -void KPrDocument::saveUsedSoundFileToStore( KoStore *_store, QStringList _list ) +void KPrDocument::saveUsedSoundFileToStore( KoStore *_store, TQStringList _list ) { unsigned int i = 0; - QStringList::Iterator it = _list.begin(); + TQStringList::Iterator it = _list.begin(); for ( ; it != _list.end(); ++it ) { - QString soundFileName = *it; - int position = soundFileName.findRev( '.' ); - QString format = soundFileName.right( soundFileName.length() - position - 1 ); - QString _storeURL = QString( "sounds/sound%1.%2" ).arg( ++i ).arg( format.lower() ); + TQString soundFileName = *it; + int position = soundFileName.tqfindRev( '.' ); + TQString format = soundFileName.right( soundFileName.length() - position - 1 ); + TQString _storeURL = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( format.lower() ); if ( _store->open( _storeURL ) ) { KoStoreDevice dev( _store ); - QFile _file( soundFileName ); + TQFile _file( soundFileName ); if ( _file.open( IO_ReadOnly ) ) { dev.writeBlock( ( _file.readAll() ).data(), _file.size() ); _file.close(); @@ -973,7 +973,7 @@ bool KPrDocument::loadChildren( KoStore* _store ) { if ( objStartY == 0 && _clean) // Don't do this when inserting a template or a page... { - QPtrListIterator<KoDocumentChild> it( children() ); + TQPtrListIterator<KoDocumentChild> it( tqchildren() ); for( ; it.current(); ++it ) { if ( !((KoDocumentChild*)it.current())->loadDocument( _store ) ) return false; @@ -981,7 +981,7 @@ bool KPrDocument::loadChildren( KoStore* _store ) } else // instead load form the correct child on, m_childCountBeforeInsert has the be set { - QPtrListIterator<KoDocumentChild> it( children() ); + TQPtrListIterator<KoDocumentChild> it( tqchildren() ); for( int i = 0; it.current(); ++it, ++i ) { if ( i < m_childCountBeforeInsert ) continue; @@ -1006,7 +1006,7 @@ bool KPrDocument::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) KoXmlWriter* contentWriter = createOasisXmlWriter( &contentDev, "office:document-content" ); - m_varColl->variableSetting()->setModificationDate(QDateTime::currentDateTime()); + m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime()); recalcVariables( VT_DATE ); recalcVariables( VT_TIME ); recalcVariables( VT_STATISTIC ); @@ -1018,15 +1018,15 @@ bool KPrDocument::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) KTempFile contentTmpFile; contentTmpFile.setAutoDelete( true ); - QFile* tmpFile = contentTmpFile.file(); - KoXmlWriter contentTmpWriter( tmpFile, 1 ); + TQFile* tmpFile = contentTmpFile.file(); + KoXmlWriter contentTmpWriter( TQT_TQIODEVICE(tmpFile), 1 ); //For sticky objects KTempFile stickyTmpFile; stickyTmpFile.setAutoDelete( true ); - QFile* masterStyles = stickyTmpFile.file(); - KoXmlWriter stickyTmpWriter( masterStyles, 1 ); + TQFile* masterStyles = stickyTmpFile.file(); + KoXmlWriter stickyTmpWriter( TQT_TQIODEVICE(masterStyles), 1 ); contentTmpWriter.startElement( "office:body" ); @@ -1038,15 +1038,15 @@ bool KPrDocument::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) int partIndexObj = 0; //save page - QMap<QString, int> pageNames; + TQMap<TQString, int> pageNames; if ( !_duplicatePage ) { m_masterPage->saveOasisPage( store, stickyTmpWriter, 0, savingContext, indexObj, partIndexObj, manifestWriter, pageNames ); // Now mark all autostyles as "for styles.xml" since headers/footers need them - QValueList<KoGenStyles::NamedStyle> autoStyles = mainStyles.styles( KoGenStyle::STYLE_AUTO ); - for ( QValueList<KoGenStyles::NamedStyle>::const_iterator it = autoStyles.begin(); + TQValueList<KoGenStyles::NamedStyle> autoStyles = mainStyles.styles( KoGenStyle::STYLE_AUTO ); + for ( TQValueList<KoGenStyles::NamedStyle>::const_iterator it = autoStyles.begin(); it != autoStyles.end(); ++it ) { kdDebug() << "marking for styles.xml:" << ( *it ).name << endl; mainStyles.markStyleForStylesXml( ( *it ).name ); @@ -1067,8 +1067,8 @@ bool KPrDocument::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) } if ( saveOnlyPage == -1 ) //don't save setting when we save on page { - QMap<int, QString> page2name; - QMap<QString, int>::ConstIterator it( pageNames.begin() ); + TQMap<int, TQString> page2name; + TQMap<TQString, int>::ConstIterator it( pageNames.begin() ); for ( ; it != pageNames.end(); ++it ) { page2name.insert( it.data(), it.key() ); @@ -1083,7 +1083,7 @@ bool KPrDocument::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) // And now we can copy over the contents from the tempfile to the real one tmpFile->close(); - contentWriter->addCompleteElement( tmpFile ); + contentWriter->addCompleteElement( TQT_TQIODEVICE(tmpFile) ); contentTmpFile.close(); contentWriter->endElement(); // root element @@ -1165,7 +1165,7 @@ bool KPrDocument::saveOasis( KoStore* store, KoXmlWriter* manifestWriter ) void KPrDocument::saveOasisCustomFied( KoXmlWriter &writer )const { bool customVariableFound = false; - QPtrListIterator<KoVariable> it( m_varColl->getVariables() ); + TQPtrListIterator<KoVariable> it( m_varColl->getVariables() ); for ( ; it.current() ; ++it ) { if ( it.current()->type() == VT_CUSTOM ) @@ -1193,8 +1193,8 @@ void KPrDocument::loadOasisIgnoreList( const KoOasisSettings& settings ) if ( !configurationSettings.isNull() ) { _showPresentationDuration = configurationSettings.parseConfigItemBool( "ShowPresentationDuration", false ); - const QString ignorelist = configurationSettings.parseConfigItemString( "SpellCheckerIgnoreList" ); - m_spellCheckIgnoreList = QStringList::split( ',', ignorelist ); + const TQString ignorelist = configurationSettings.parseConfigItemString( "SpellCheckerIgnoreList" ); + m_spellCheckIgnoreList = TQStringList::split( ',', ignorelist ); } } @@ -1205,8 +1205,8 @@ void KPrDocument::writeAutomaticStyles( KoXmlWriter& contentWriter, KoGenStyles& context.writeFontFaces( contentWriter ); contentWriter.startElement( "office:automatic-styles" ); } - QValueList<KoGenStyles::NamedStyle> styles = mainStyles.styles( KoGenStyle::STYLE_AUTO, stylesDotXml ); - QValueList<KoGenStyles::NamedStyle>::const_iterator it = styles.begin(); + TQValueList<KoGenStyles::NamedStyle> styles = mainStyles.styles( KoGenStyle::STYLE_AUTO, stylesDotXml ); + TQValueList<KoGenStyles::NamedStyle>::const_iterator it = styles.begin(); for ( ; it != styles.end() ; ++it ) { (*it).style->writeStyle( &contentWriter, mainStyles, "style:style", (*it).name, "style:paragraph-properties" ); } @@ -1246,9 +1246,9 @@ void KPrDocument::writeAutomaticStyles( KoXmlWriter& contentWriter, KoGenStyles& } } -void KPrDocument::loadOasisHeaderFooter(QDomNode & drawPage, KoOasisContext & context) +void KPrDocument::loadOasisHeaderFooter(TQDomNode & drawPage, KoOasisContext & context) { - QDomNode tmp = KoDom::namedItemNS( drawPage, KoXmlNS::style, "header" ); + TQDomNode tmp = KoDom::namedItemNS( drawPage, KoXmlNS::style, "header" ); if ( !tmp.isNull() ) { //kdDebug()<<" there is a header \n"; @@ -1270,18 +1270,18 @@ void KPrDocument::saveOasisSettings( KoXmlWriter &settingsWriter ) //ooimpress save it as this line. //<config:config-item config:name="SnapLinesDrawing" config:type="string">H2260V14397H7693H12415H15345H1424</config:config-item> - QString guideLinesOasis; + TQString guideLinesOasis; //save in mm as in oo - for( QValueList<double>::Iterator it = m_vGuideLines.begin(); it != m_vGuideLines.end(); ++it ) + for( TQValueList<double>::Iterator it = m_vGuideLines.begin(); it != m_vGuideLines.end(); ++it ) { int tmpX = ( int ) ( KoUnit::toMM( *it )*100 ); - guideLinesOasis += "V" + QString::number( tmpX ); + guideLinesOasis += "V" + TQString::number( tmpX ); } - for( QValueList<double>::Iterator it = m_hGuideLines.begin(); it != m_hGuideLines.end(); ++it ) + for( TQValueList<double>::Iterator it = m_hGuideLines.begin(); it != m_hGuideLines.end(); ++it ) { int tmpY = ( int ) ( KoUnit::toMM( *it )*100 ); - guideLinesOasis += "H" + QString::number( tmpY ); + guideLinesOasis += "H" + TQString::number( tmpY ); } if ( !guideLinesOasis.isEmpty() ) { @@ -1301,8 +1301,8 @@ void KPrDocument::saveOasisSettings( KoXmlWriter &settingsWriter ) //store first view parameter. int activePage=0; if ( m_initialActivePage ) - activePage=m_pageList.findRef(m_initialActivePage); - activePage = QMAX( activePage, 0); + activePage=m_pageList.tqfindRef(m_initialActivePage); + activePage = TQMAX( activePage, 0); settingsWriter.addConfigItem( "SelectedPage", activePage ); //not define into oo spec @@ -1311,9 +1311,9 @@ void KPrDocument::saveOasisSettings( KoXmlWriter &settingsWriter ) settingsWriter.endElement(); } -void KPrDocument::loadOasisSettings(const QDomDocument&settingsDoc) +void KPrDocument::loadOasisSettings(const TQDomDocument&settingsDoc) { - kdDebug(33001)<<"void KPrDocument::loadOasisSettings(const QDomDocument&settingsDoc)**********\n"; + kdDebug(33001)<<"void KPrDocument::loadOasisSettings(const TQDomDocument&settingsDoc)**********\n"; KoOasisSettings settings( settingsDoc ); KoOasisSettings::Items viewSettings = settings.itemSet( "view-settings" ); setUnit(KoUnit::unit(viewSettings.parseConfigItemString("unit"))); @@ -1339,9 +1339,9 @@ void KPrDocument::loadOasisSettings(const QDomDocument&settingsDoc) m_varColl->variableSetting()->loadOasis( settings ); } -void KPrDocument::parseOasisGuideLines( const QString &text ) +void KPrDocument::parseOasisGuideLines( const TQString &text ) { - QString str; + TQString str; int newPos = text.length()-1; //start to element = 1 for ( int pos = text.length()-1; pos >=0;--pos ) { @@ -1366,47 +1366,47 @@ void KPrDocument::parseOasisGuideLines( const QString &text ) } } -void KPrDocument::loadOasisPresentationSettings( QDomNode &settingsDoc ) +void KPrDocument::loadOasisPresentationSettings( TQDomNode &settingsDoc ) { //kdDebug()<<"presentation:settings ********************************************* \n"; - QDomElement settings( settingsDoc.toElement() ); - //kdDebug()<<"settings.attribute(presentation:endless) :"<<settings.attributeNS( KoXmlNS::presentation, "endless", QString::null)<<endl; - if (settings.attributeNS( KoXmlNS::presentation, "endless", QString::null)=="true") + TQDomElement settings( settingsDoc.toElement() ); + //kdDebug()<<"settings.attribute(presentation:endless) :"<<settings.attributeNS( KoXmlNS::presentation, "endless", TQString())<<endl; + if (settings.attributeNS( KoXmlNS::presentation, "endless", TQString())=="true") _spInfiniteLoop = true; - if (settings.attributeNS( KoXmlNS::presentation, "show-end-of-presentation-slide", QString::null)=="true") + if (settings.attributeNS( KoXmlNS::presentation, "show-end-of-presentation-slide", TQString())=="true") _spShowEndOfPresentationSlide = true; - if (settings.attributeNS( KoXmlNS::presentation, "force-manual", QString::null)=="true") + if (settings.attributeNS( KoXmlNS::presentation, "force-manual", TQString())=="true") _spManualSwitch = true; if ( settings.hasAttributeNS( KoXmlNS::presentation, "start-page" ) ) { //TODO allow to start presentation to specific page - //???? = settings.attributeNS( KoXmlNS::presentation, "start-page", QString::null ); + //???? = settings.attributeNS( KoXmlNS::presentation, "start-page", TQString() ); } if ( settings.hasAttributeNS( KoXmlNS::presentation, "show" ) ) { - m_presentationName = settings.attributeNS( KoXmlNS::presentation, "show", QString::null ); + m_presentationName = settings.attributeNS( KoXmlNS::presentation, "show", TQString() ); kdDebug()<<" default presentation name :"<<m_presentationName<<endl; } loadOasisPresentationCustomSlideShow( settingsDoc ); } -void KPrDocument::loadOasisPresentationCustomSlideShow( QDomNode &settingsDoc ) +void KPrDocument::loadOasisPresentationCustomSlideShow( TQDomNode &settingsDoc ) { - //kdDebug()<<"void KPrDocument::loadOasisPresentationCustomSlideShow( QDomNode &settingsDoc )**********\n"; - for ( QDomNode element = settingsDoc.firstChild(); !element.isNull(); element = element.nextSibling() ) + //kdDebug()<<"void KPrDocument::loadOasisPresentationCustomSlideShow( TQDomNode &settingsDoc )**********\n"; + for ( TQDomNode element = settingsDoc.firstChild(); !element.isNull(); element = element.nextSibling() ) { - QDomElement e = element.toElement(); - QCString tagName = e.tagName().latin1(); + TQDomElement e = element.toElement(); + TQCString tagName = e.tagName().latin1(); //kdDebug()<<" tagName :"<<tagName<<endl; if ( tagName == "show" && e.namespaceURI() == KoXmlNS::presentation ) { - //kdDebug()<<" e.attribute(presentation:name) :"<<e.attributeNS( KoXmlNS::presentation, "name", QString::null)<< " e.attribute(presentation:pages) :"<<e.attributeNS( KoXmlNS::presentation, "pages", QString::null)<<endl; - QString name = e.attributeNS( KoXmlNS::presentation, "name", QString::null ); - QStringList tmp = QStringList::split( ",", e.attributeNS( KoXmlNS::presentation, "pages", QString::null) ); - QValueList<KPrPage *> pageList; - for ( QStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it ) + //kdDebug()<<" e.attribute(presentation:name) :"<<e.attributeNS( KoXmlNS::presentation, "name", TQString())<< " e.attribute(presentation:pages) :"<<e.attributeNS( KoXmlNS::presentation, "pages", TQString())<<endl; + TQString name = e.attributeNS( KoXmlNS::presentation, "name", TQString() ); + TQStringList tmp = TQStringList::split( ",", e.attributeNS( KoXmlNS::presentation, "pages", TQString()) ); + TQValueList<KPrPage *> pageList; + for ( TQStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it ) { - if ( m_loadingInfo->m_name2page.contains( *it ) ) + if ( m_loadingInfo->m_name2page.tqcontains( *it ) ) { kdDebug(33001) << "slide show " << name << " page = " << *it << endl; pageList.push_back( m_loadingInfo->m_name2page[*it] ); @@ -1420,7 +1420,7 @@ void KPrDocument::loadOasisPresentationCustomSlideShow( QDomNode &settingsDoc ) } } -void KPrDocument::saveOasisPresentationSettings( KoXmlWriter &contentTmpWriter, QMap<int, QString> &page2name ) +void KPrDocument::saveOasisPresentationSettings( KoXmlWriter &contentTmpWriter, TQMap<int, TQString> &page2name ) { //todo don't save when is not value by default (check with oo) //FIXME @@ -1436,7 +1436,7 @@ void KPrDocument::saveOasisPresentationSettings( KoXmlWriter &contentTmpWriter, contentTmpWriter.endElement(); } -void KPrDocument::saveOasisPresentationCustomSlideShow( KoXmlWriter &contentTmpWriter, QMap<int, QString> &page2name ) +void KPrDocument::saveOasisPresentationCustomSlideShow( KoXmlWriter &contentTmpWriter, TQMap<int, TQString> &page2name ) { if ( m_customListSlideShow.isEmpty() ) return; @@ -1446,11 +1446,11 @@ void KPrDocument::saveOasisPresentationCustomSlideShow( KoXmlWriter &contentTmpW { contentTmpWriter.startElement( "presentation:show" ); contentTmpWriter.addAttribute( "presentation:name", it.key() ); - QString tmp; - QValueListIterator<KPrPage*> itPage ; + TQString tmp; + TQValueListIterator<KPrPage*> itPage ; for( itPage = ( *it ).begin(); itPage != ( *it ).end(); ++itPage ) { - int posPage = m_pageList.find(*itPage ); + int posPage = m_pageList.tqfind(*itPage ); if ( posPage != -1 ) { if ( itPage != ( *it ).begin() ) @@ -1465,7 +1465,7 @@ void KPrDocument::saveOasisPresentationCustomSlideShow( KoXmlWriter &contentTmpW //<presentation:show presentation:name="New Custom Slide Show" presentation:pages="page1,page1,page1,page1,page1"/> } -void KPrDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyles, QFile* masterStyles, +void KPrDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyles, TQFile* masterStyles, KoSavingContext & savingContext, SaveFlag saveFlag ) const { KoStoreDevice stylesDev( store ); @@ -1475,8 +1475,8 @@ void KPrDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyl savingContext.writeFontFaces( *stylesWriter ); stylesWriter->startElement( "office:styles" ); - QValueList<KoGenStyles::NamedStyle> styles = mainStyles.styles( KoGenStyle::STYLE_USER ); - QValueList<KoGenStyles::NamedStyle>::const_iterator it = styles.begin(); + TQValueList<KoGenStyles::NamedStyle> styles = mainStyles.styles( KoGenStyle::STYLE_USER ); + TQValueList<KoGenStyles::NamedStyle>::const_iterator it = styles.begin(); for ( ; it != styles.end() ; ++it ) { (*it).style->writeStyle( stylesWriter, mainStyles, "style:style", (*it).name, "style:paragraph-properties" ); } @@ -1535,7 +1535,7 @@ void KPrDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyl Q_ASSERT( styles.count() == 1 ); it = styles.begin(); for ( ; it != styles.end() ; ++it ) { - (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ ); + (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ ); stylesWriter->endElement(); } @@ -1552,7 +1552,7 @@ void KPrDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyl if ( masterStyles ) { stylesWriter->startElement( "office:master-styles" ); - stylesWriter->addCompleteElement( masterStyles ); + stylesWriter->addCompleteElement( TQT_TQIODEVICE(masterStyles) ); stylesWriter->endElement(); } } @@ -1562,9 +1562,9 @@ void KPrDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyl delete stylesWriter; } -bool KPrDocument::loadOasis( const QDomDocument& doc, KoOasisStyles&oasisStyles, const QDomDocument&settingsDoc, KoStore*store ) +bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles, const TQDomDocument&settingsDoc, KoStore*store ) { - QTime dt; + TQTime dt; dt.start(); m_loadingInfo = new KPrLoadingInfo; ignoreSticky = FALSE; @@ -1594,36 +1594,36 @@ bool KPrDocument::loadOasis( const QDomDocument& doc, KoOasisStyles&oasisStyles, m_spellCheckIgnoreList.clear(); emit sigProgress( 5 ); - QDomElement content = doc.documentElement(); - QDomElement realBody (KoDom::namedItemNS( content, KoXmlNS::office, "body" ) ); + TQDomElement content = doc.documentElement(); + TQDomElement realBody (KoDom::namedItemNS( content, KoXmlNS::office, "body" ) ); if ( realBody.isNull() ) { kdError(33001) << "No office:body found!" << endl; setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No office:body tag found." ) ); return false; } - QDomElement body = KoDom::namedItemNS( realBody, KoXmlNS::office, "presentation" ); + TQDomElement body = KoDom::namedItemNS( realBody, KoXmlNS::office, "presentation" ); if ( body.isNull() ) { kdError(33001) << "No office:presentation found!" << endl; - QDomElement childElem; - QString localName; + TQDomElement childElem; + TQString localName; forEachElement( childElem, realBody ) { localName = childElem.localName(); } if ( localName.isEmpty() ) setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) ); else - setErrorMessage( i18n( "This document is not a presentation, but a %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) ); + setErrorMessage( i18n( "This document is not a presentation, but a %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) ); return false; } // it seems that ooimpress has different paper-settings for every slide. // we take the settings of the first slide for the whole document. - QDomNode drawPage = KoDom::namedItemNS( body, KoXmlNS::draw, "page" ); + TQDomNode drawPage = KoDom::namedItemNS( body, KoXmlNS::draw, "page" ); if ( drawPage.isNull() ) // no slides? give up. return false; - QDomElement dp = drawPage.toElement(); + TQDomElement dp = drawPage.toElement(); //code from kword // TODO variable settings @@ -1641,14 +1641,14 @@ bool KPrDocument::loadOasis( const QDomDocument& doc, KoOasisStyles&oasisStyles, // also don't copy master when you insert file as long as we don't have multiple masters if ( !m_pageWhereLoadObject && _clean ) { - QString masterPageName = drawPage.toElement().attributeNS( KoXmlNS::draw, "master-page-name", QString::null ); - QDomElement *master = oasisStyles.masterPages()[ masterPageName]; + TQString masterPageName = drawPage.toElement().attributeNS( KoXmlNS::draw, "master-page-name", TQString() ); + TQDomElement *master = oasisStyles.masterPages()[ masterPageName]; kdDebug()<<" master :"<<master<<endl; kdDebug()<<" masterPageName:"<<masterPageName<<endl; if ( ! master ) { - masterPageName = "Standard"; // use default layout as fallback (default in kpresenter) + masterPageName = "Standard"; // use default tqlayout as fallback (default in kpresenter) master = oasisStyles.masterPages()[ masterPageName]; if ( !master ) //last test... master = oasisStyles.masterPages()["Default"]; @@ -1661,11 +1661,11 @@ bool KPrDocument::loadOasis( const QDomDocument& doc, KoOasisStyles&oasisStyles, } kdDebug()<<" load oasis master styles\n"; - QDomNode node = *master; - QDomElement masterElement = node.toElement(); - kdDebug()<<" node.isNull() :"<<node.isNull()<< ", " << masterElement.attributeNS( KoXmlNS::draw, "style-name", QString::null ) << endl; + TQDomNode node = *master; + TQDomElement masterElement = node.toElement(); + kdDebug()<<" node.isNull() :"<<node.isNull()<< ", " << masterElement.attributeNS( KoXmlNS::draw, "style-name", TQString() ) << endl; // add the correct styles - const QDomElement* masterPageStyle = context.oasisStyles().findStyleAutoStyle( masterElement.attributeNS( KoXmlNS::draw, "style-name", QString::null ), "drawing-page" ); + const TQDomElement* masterPageStyle = context.oasisStyles().findStyleAutoStyle( masterElement.attributeNS( KoXmlNS::draw, "style-name", TQString() ), "drawing-page" ); if (masterPageStyle) context.styleStack().push( *masterPageStyle ); @@ -1685,8 +1685,8 @@ bool KPrDocument::loadOasis( const QDomDocument& doc, KoOasisStyles&oasisStyles, kdDebug()<<" end load oasis master style \n"; Q_ASSERT( master ); - const QDomElement *style = master ? oasisStyles.findStyle(master->attributeNS( KoXmlNS::style, "page-layout-name", QString::null )) : 0; - const QDomElement *backgroundStyle = oasisStyles.findStyle( "Standard-background", "presentation" ); + const TQDomElement *style = master ? oasisStyles.findStyle(master->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() )) : 0; + const TQDomElement *backgroundStyle = oasisStyles.findStyle( "Standard-background", "presentation" ); kdDebug()<<"Standard background "<<backgroundStyle<<endl; // parse all pages Q_ASSERT( style ); @@ -1734,19 +1734,19 @@ bool KPrDocument::loadOasis( const QDomDocument& doc, KoOasisStyles&oasisStyles, } } //only set the manual title if it is different to the draw:id. Only in this case it had one. - QString str = dp.attributeNS( KoXmlNS::draw, "name", QString::null ); + TQString str = dp.attributeNS( KoXmlNS::draw, "name", TQString() ); m_loadingInfo->m_name2page.insert( str, newpage ); - QString idPage = dp.attributeNS( KoXmlNS::draw, "id", QString::null ); + TQString idPage = dp.attributeNS( KoXmlNS::draw, "id", TQString() ); if ( dp.hasAttributeNS( KoXmlNS::koffice, "name" ) ) { - str = dp.attributeNS( KoXmlNS::koffice, "name", QString::null ); + str = dp.attributeNS( KoXmlNS::koffice, "name", TQString() ); newpage->insertManualTitle(str); } else { // OO uses /page[0-9]+$/ as default for no name set - QRegExp rx( "^page[0-9]+$" ); + TQRegExp rx( "^page[0-9]+$" ); if ( rx.search( str ) == -1 ) newpage->insertManualTitle(str); } @@ -1767,7 +1767,7 @@ bool KPrDocument::loadOasis( const QDomDocument& doc, KoOasisStyles&oasisStyles, } //load settings at the end as we need to know what the draw:name of a page is - QDomNode settings = KoDom::namedItemNS( body, KoXmlNS::presentation, "settings" ); + TQDomNode settings = KoDom::namedItemNS( body, KoXmlNS::presentation, "settings" ); kdDebug()<<"settings :"<<settings.isNull()<<endl; if (!settings.isNull() && _clean /*don't load settings when we copy/paste a page*/) loadOasisPresentationSettings( settings ); @@ -1804,17 +1804,17 @@ bool KPrDocument::loadOasis( const QDomDocument& doc, KoOasisStyles&oasisStyles, } -void KPrDocument::loadOasisObject( KPrPage * newpage, QDomNode & drawPage, KoOasisContext & context, KPrGroupObject *groupObject ) +void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOasisContext & context, KPrGroupObject *groupObject ) { - for ( QDomNode object = drawPage.firstChild(); !object.isNull(); object = object.nextSibling() ) + for ( TQDomNode object = drawPage.firstChild(); !object.isNull(); object = object.nextSibling() ) { - QDomElement o = object.toElement(); - QString name = o.tagName(); + TQDomElement o = object.toElement(); + TQString name = o.tagName(); if ( !name.isEmpty() ) { kdDebug()<<" name :"<<name<<endl; if ( o.hasAttributeNS( KoXmlNS::presentation, "placeholder" ) && - o.attributeNS( KoXmlNS::presentation, "placeholder", QString::null ) == "true" ) + o.attributeNS( KoXmlNS::presentation, "placeholder", TQString() ) == "true" ) { kdDebug(33001) << "Placeholder" << endl; continue; @@ -1825,12 +1825,12 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, QDomNode & drawPage, KoOas if ( name == "frame" && isDrawNS ) { fillStyleStack( o, context, "graphic" ); - QDomElement elem; + TQDomElement elem; forEachElement( elem, o ) { if ( elem.namespaceURI() != KoXmlNS::draw ) continue; - const QString localName = elem.localName(); + const TQString localName = elem.localName(); if ( localName == "text-box" ) { KPrTextObject *kptextobject = new KPrTextObject( this ); @@ -1854,10 +1854,10 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, QDomNode & drawPage, KoOas else if ( localName == "object" ) { KPrChild *ch = new KPrChild( this ); - QRect r; + TQRect r; KPrPartObject *kppartobject = new KPrPartObject( ch ); kppartobject->loadOasis( o, context, m_loadingInfo ); - r = ch->geometry(); + r = ch->tqgeometry(); if ( groupObject ) groupObject->addObjects( kppartobject ); else @@ -1941,7 +1941,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, QDomNode & drawPage, KoOas else if ( name == "path" && isDrawNS) { fillStyleStack( o, context, "graphic" ); - QString d = o.attributeNS( KoXmlNS::svg, "d", QString::null); + TQString d = o.attributeNS( KoXmlNS::svg, "d", TQString()); KPrSVGPathParser parser; ObjType objType = parser.getType( d ); @@ -1958,7 +1958,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, QDomNode & drawPage, KoOas else newpage->appendObject( kpCurveObject ); } break; - case OT_QUADRICBEZIERCURVE: + case OT_TQUADRICBEZIERCURVE: { kdDebug(33001) << "Quadricbeziercurve" << endl; KPrQuadricBezierCurveObject *kpQuadricObject = new KPrQuadricBezierCurveObject(); @@ -1993,16 +1993,16 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, QDomNode & drawPage, KoOas break; } } - else if ( name == "custom-shape" && isDrawNS ) + else if ( name == "custom-tqshape" && isDrawNS ) { fillStyleStack( o, context, "graphic" ); - QDomElement enhancedGeometry = KoDom::namedItemNS( o, KoXmlNS::draw, "enhanced-geometry" ); + TQDomElement enhancedGeometry = KoDom::namedItemNS( o, KoXmlNS::draw, "enhanced-tqgeometry" ); if ( !enhancedGeometry.isNull() ) { - QString d = enhancedGeometry.attributeNS( KoXmlNS::draw, "enhanced-path", QString::null ); - QRegExp rx( "^([0-9 ML]+Z) N$" ); + TQString d = enhancedGeometry.attributeNS( KoXmlNS::draw, "enhanced-path", TQString() ); + TQRegExp rx( "^([0-9 ML]+Z) N$" ); if ( rx.search( d ) != -1 ) { d = rx.cap( 1 ); @@ -2022,7 +2022,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, QDomNode & drawPage, KoOas else newpage->appendObject( kpCurveObject ); } break; - case OT_QUADRICBEZIERCURVE: + case OT_TQUADRICBEZIERCURVE: { kdDebug(33001) << "Quadricbeziercurve" << endl; KPrQuadricBezierCurveObject *kpQuadricObject = new KPrQuadricBezierCurveObject(); @@ -2054,13 +2054,13 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, QDomNode & drawPage, KoOas newpage->appendObject( kpClosedObject ); } break; default: - kdDebug(33001) << "draw:custom-shape found unsupported object type " << objType << " in draw:enhanced-path " << d << endl; + kdDebug(33001) << "draw:custom-tqshape found unsupported object type " << objType << " in draw:enhanced-path " << d << endl; break; } } else { - kdDebug(33001) << "draw:custom-shape not supported" << endl; + kdDebug(33001) << "draw:custom-tqshape not supported" << endl; } } } @@ -2068,7 +2068,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, QDomNode & drawPage, KoOas { fillStyleStack( o, context, "graphic" ); KPrGroupObject *kpgroupobject = new KPrGroupObject(); - QDomNode nodegroup = object.firstChild(); + TQDomNode nodegroup = object.firstChild(); kpgroupobject->loadOasisGroupObject( this, newpage, object, context, m_loadingInfo); if ( groupObject ) @@ -2080,8 +2080,8 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, QDomNode & drawPage, KoOas { //we must extend note attribute //kdDebug()<<"presentation:notes----------------------------------\n"; - QDomNode frameBox = KoDom::namedItemNS( o, KoXmlNS::draw, "frame" ); - QString note; + TQDomNode frameBox = KoDom::namedItemNS( o, KoXmlNS::draw, "frame" ); + TQString note; while ( !frameBox.isNull() ) { @@ -2089,16 +2089,16 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, QDomNode & drawPage, KoOas if ( !note.isEmpty() ) note += "\n"; - //todo load layout for note. - QDomNode textBox = KoDom::namedItemNS( frameBox, KoXmlNS::draw, "text-box" ); + //todo load tqlayout for note. + TQDomNode textBox = KoDom::namedItemNS( frameBox, KoXmlNS::draw, "text-box" ); if ( !textBox.isNull() ) { - for ( QDomNode text = textBox.firstChild(); !text.isNull(); text = text.nextSibling() ) + for ( TQDomNode text = textBox.firstChild(); !text.isNull(); text = text.nextSibling() ) { // We don't care about styles as they are not supported in kpresenter. // Only add a linebreak for every child. - QDomElement t = text.toElement(); + TQDomElement t = text.toElement(); if ( t.tagName() == "p" ) { note += t.text() + "\n"; @@ -2124,33 +2124,33 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, QDomNode & drawPage, KoOas } -int KPrDocument::createPresentationAnimation(const QDomElement& element, int order, bool increaseOrder) +int KPrDocument::createPresentationAnimation(const TQDomElement& element, int order, bool increaseOrder) { - kdDebug()<<"void KPrDocument::createPresentationAnimation(const QDomElement& element)\n"; + kdDebug()<<"void KPrDocument::createPresentationAnimation(const TQDomElement& element)\n"; int orderAnimation = increaseOrder ? 0 : order; - for ( QDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) + for ( TQDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) { - QDomElement e = n.toElement(); - QCString tagName = e.tagName().latin1(); + TQDomElement e = n.toElement(); + TQCString tagName = e.tagName().latin1(); if ( ! tagName.isEmpty() ) // only tags that open { const bool isPresentationNS = e.namespaceURI() == KoXmlNS::presentation; if ( isPresentationNS && - ( tagName == "show-shape" || tagName == "hide-shape" ) ) + ( tagName == "show-tqshape" || tagName == "hide-tqshape" ) ) { - Q_ASSERT( e.hasAttributeNS( KoXmlNS::draw, "shape-id" ) ); - QString name = e.attributeNS( KoXmlNS::draw, "shape-id", QString::null ); + Q_ASSERT( e.hasAttributeNS( KoXmlNS::draw, "tqshape-id" ) ); + TQString name = e.attributeNS( KoXmlNS::draw, "tqshape-id", TQString() ); kdDebug()<<" insert animation " << tagName << " name :" << name << endl; if ( e.hasAttributeNS( KoXmlNS::koffice, "order-id" ) ) { - orderAnimation = e.attributeNS( KoXmlNS::koffice, "order-id", QString::null ).toInt(); + orderAnimation = e.attributeNS( KoXmlNS::koffice, "order-id", TQString() ).toInt(); } lstAnimation *tmp = new lstAnimation; - tmp->element = new QDomElement( e ); + tmp->element = new TQDomElement( e ); tmp->order = orderAnimation; - if ( tagName == "show-shape" ) + if ( tagName == "show-tqshape" ) { m_loadingInfo->storePresentationShowAnimation( tmp, name ); } @@ -2172,7 +2172,7 @@ int KPrDocument::createPresentationAnimation(const QDomElement& element, int ord return orderAnimation; } -void KPrDocument::fillStyleStack( const QDomElement& object, KoOasisContext & context, const char* family ) +void KPrDocument::fillStyleStack( const TQDomElement& object, KoOasisContext & context, const char* family ) { // See OpenDoc 9.2.15 Common Drawing Shape Attributes // presentation:style-name is allways family presentation @@ -2195,15 +2195,15 @@ void KPrDocument::fillStyleStack( const QDomElement& object, KoOasisContext & co } } -bool KPrDocument::loadXML( QIODevice * dev, const QDomDocument& doc ) +bool KPrDocument::loadXML( TQIODevice * dev, const TQDomDocument& doc ) { - QTime dt; + TQTime dt; dt.start(); m_loadingInfo = new KPrLoadingInfo( true ); ignoreSticky = FALSE; bool b=false; - QDomElement docelem = doc.documentElement(); + TQDomElement docelem = doc.documentElement(); const int syntaxVersion = docelem.attribute( "syntaxVersion" ).toInt(); if ( syntaxVersion < 2 ) { @@ -2221,7 +2221,7 @@ bool KPrDocument::loadXML( QIODevice * dev, const QDomDocument& doc ) // Launch the perl script on it KTempFile tmpFileOut; tmpFileOut.setAutoDelete( true ); - QString cmd = KGlobal::dirs()->findExe("perl"); + TQString cmd = KGlobal::dirs()->findExe("perl"); if (cmd.isEmpty()) { setErrorMessage( i18n("You don't appear to have PERL installed.\nIt is needed to convert this document.\nPlease install PERL and try again.")); @@ -2233,20 +2233,20 @@ bool KPrDocument::loadXML( QIODevice * dev, const QDomDocument& doc ) cmd += KProcess::quote( tmpFileIn.name() ); cmd += " "; cmd += KProcess::quote( tmpFileOut.name() ); - system( QFile::encodeName(cmd) ); + system( TQFile::encodeName(cmd) ); - // Build a new QDomDocument from the result - QString errorMsg; + // Build a new TQDomDocument from the result + TQString errorMsg; int errorLine; int errorColumn; - QDomDocument newdoc; + TQDomDocument newdoc; if ( ! newdoc.setContent( tmpFileOut.file(), &errorMsg, &errorLine, &errorColumn ) ) { kdError (33001) << "Parsing Error! Aborting! (in KPrDocument::loadXML)" << endl << " Line: " << errorLine << " Column: " << errorColumn << endl << " Message: " << errorMsg << endl; setErrorMessage( i18n( "parsing error in the main document (converted from an old KPresenter format) at line %1, column %2\nError message: %3" ) - .arg( errorLine ).arg( errorColumn ).arg( i18n ( errorMsg.utf8() ) ) ); + .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( errorMsg.utf8() ) ) ); return false; } b = loadXML( newdoc ); @@ -2280,26 +2280,26 @@ void KPrDocument::createHeaderFooter() m_masterPage->appendObject(_footer); } -void KPrDocument::insertEmbedded( KoStore *store, QDomElement topElem, KMacroCommand * macroCmd, KPrPage *page, int pos ) +void KPrDocument::insertEmbedded( KoStore *store, TQDomElement topElem, KMacroCommand * macroCmd, KPrPage *page, int pos ) { - QDomElement elem = topElem.firstChild().toElement(); + TQDomElement elem = topElem.firstChild().toElement(); for ( ; !elem.isNull() ; elem = elem.nextSibling().toElement() ) { kdDebug(33001) << "Element name: " << elem.tagName() << endl; if(elem.tagName()=="EMBEDDED") { KPrChild *ch = new KPrChild( this ); KPrPartObject *kppartobject = 0L; - QRect r; + TQRect r; - QDomElement object=elem.namedItem("OBJECT").toElement(); + TQDomElement object=elem.namedItem("OBJECT").toElement(); if(!object.isNull()) { ch->load(object, true); // true == uppercase - r = ch->geometry(); + r = ch->tqgeometry(); ch->loadDocument( store ); insertChild( ch ); kppartobject = new KPrPartObject( ch ); } - QDomElement settings=elem.namedItem("SETTINGS").toElement(); + TQDomElement settings=elem.namedItem("SETTINGS").toElement(); int zIndex = 0; if ( settings.hasAttribute( "z-index" ) ) { @@ -2314,7 +2314,7 @@ void KPrDocument::insertEmbedded( KoStore *store, QDomElement topElem, KMacroCom kppartobject = 0L; return; } - int index = m_pageList.findRef(page); + int index = m_pageList.tqfindRef(page); int pageIndex = (int)(offset/__pgLayout.ptHeight)+index; int newPos=(int)((offset+index*__pgLayout.ptHeight)-pageIndex*__pgLayout.ptHeight); kppartobject->setOrig(kppartobject->getOrig().x(),newPos); @@ -2326,7 +2326,7 @@ void KPrDocument::insertEmbedded( KoStore *store, QDomElement topElem, KMacroCom macroCmd->addCommand( insertCmd ); if ( pos != 0 ) { - const QPtrList<KPrObject>& oldList( page->objectList() ); + const TQPtrList<KPrObject>& oldList( page->objectList() ); // tz TODO this is not 100% correct if ( static_cast<int>( oldList.count() ) > pos + zIndex ) { @@ -2342,7 +2342,7 @@ void KPrDocument::insertEmbedded( KoStore *store, QDomElement topElem, KMacroCom } } -bool KPrDocument::loadXML( const QDomDocument &doc ) +bool KPrDocument::loadXML( const TQDomDocument &doc ) { emit sigProgress( 0 ); int activePage=0; @@ -2364,7 +2364,7 @@ bool KPrDocument::loadXML( const QDomDocument &doc ) m_spellCheckIgnoreList.clear(); emit sigProgress( 5 ); - QDomElement document=doc.documentElement(); + TQDomElement document=doc.documentElement(); // DOC if(document.tagName()!="DOC") { kdWarning(33001) << "Missing DOC" << endl; @@ -2376,7 +2376,7 @@ bool KPrDocument::loadXML( const QDomDocument &doc ) document.attribute("mime")!="application/x-kpresenter" && document.attribute("mime")!="application/vnd.kde.kpresenter" ) ) { kdError(33001) << "Unknown mime type " << document.attribute("mime") << endl; - setErrorMessage( i18n("Invalid document, expected mimetype application/x-kpresenter or application/vnd.kde.kpresenter, got %1").arg(document.attribute("mime")) ); + setErrorMessage( i18n("Invalid document, expected mimetype application/x-kpresenter or application/vnd.kde.kpresenter, got %1").tqarg(document.attribute("mime")) ); return false; } if(document.hasAttribute("url")) @@ -2384,7 +2384,7 @@ bool KPrDocument::loadXML( const QDomDocument &doc ) emit sigProgress( 10 ); - QDomElement elem=document.firstChild().toElement(); + TQDomElement elem=document.firstChild().toElement(); uint childTotalCount=document.childNodes().count(); uint childCount = 0; @@ -2396,17 +2396,17 @@ bool KPrDocument::loadXML( const QDomDocument &doc ) if(elem.tagName()=="EMBEDDED") { KPrChild *ch = new KPrChild( this ); KPrPartObject *kppartobject = 0L; - QRect r; + TQRect r; - QDomElement object=elem.namedItem("OBJECT").toElement(); + TQDomElement object=elem.namedItem("OBJECT").toElement(); if(!object.isNull()) { ch->load(object, true); // true == uppercase - r = ch->geometry(); + r = ch->tqgeometry(); insertChild( ch ); kppartobject = new KPrPartObject( ch ); //emit sig_insertObject( ch, kppartobject ); } - QDomElement settings=elem.namedItem("SETTINGS").toElement(); + TQDomElement settings=elem.namedItem("SETTINGS").toElement(); int tmp=0; int pos = -1; if ( settings.hasAttribute( "z-index" ) ) @@ -2479,7 +2479,7 @@ bool KPrDocument::loadXML( const QDomDocument &doc ) if(elem.hasAttribute("height")) __pgLayout.ptHeight = MM_TO_POINT( elem.attribute("height").toDouble() ); - QDomElement borders=elem.namedItem("PAPERBORDERS").toElement(); + TQDomElement borders=elem.namedItem("PAPERBORDERS").toElement(); if(!borders.isNull()) { if(borders.hasAttribute("left")) __pgLayout.ptLeft = MM_TO_POINT( borders.attribute("left").toDouble() ); @@ -2514,7 +2514,7 @@ bool KPrDocument::loadXML( const QDomDocument &doc ) else if(borders.hasAttribute("mmBottom")) //compatibility __pgLayout.ptBottom = MM_TO_POINT( borders.attribute("inchBottom").toDouble() ); } - // PAPER found and parsed -> apply page layout + // PAPER found and parsed -> apply page tqlayout // e.g. the text objects need it if ( _clean ) setPageLayout( __pgLayout ); @@ -2565,7 +2565,7 @@ bool KPrDocument::loadXML( const QDomDocument &doc ) loadGuideLines( elem ); } }else if( elem.tagName()=="SPELLCHECKIGNORELIST"){ - QDomElement spellWord=elem.toElement(); + TQDomElement spellWord=elem.toElement(); spellWord=spellWord.firstChild().toElement(); while ( !spellWord.isNull() ) { @@ -2630,21 +2630,21 @@ bool KPrDocument::loadXML( const QDomDocument &doc ) m_presentationName=elem.attribute( "name" ); } else if ( elem.tagName()=="CUSTOMSLIDESHOWCONFIG" ) { if ( _clean ) { - QMap<QString, KPrPage *> name2page; + TQMap<TQString, KPrPage *> name2page; int pos = 1; - for ( QPtrListIterator<KPrPage> it( m_pageList ); it.current(); ++it ) + for ( TQPtrListIterator<KPrPage> it( m_pageList ); it.current(); ++it ) { - name2page.insert( "page" + QString::number( pos++ ), it.current() ) ; + name2page.insert( "page" + TQString::number( pos++ ), it.current() ) ; } - QDomElement slide=elem.firstChild().toElement(); + TQDomElement slide=elem.firstChild().toElement(); while(!slide.isNull()) { if(slide.tagName()=="CUSTOMSLIDESHOW") { - QStringList tmp = QStringList::split( ",", slide.attribute( "pages" ) ); - QValueList<KPrPage *> pageList; - for ( QStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it ) + TQStringList tmp = TQStringList::split( ",", slide.attribute( "pages" ) ); + TQValueList<KPrPage *> pageList; + for ( TQStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it ) { - if ( name2page.contains( *it ) ) + if ( name2page.tqcontains( *it ) ) { kdDebug(33001) << "slide show " << slide.attribute( "name" ) << " page = " << *it << endl; pageList.push_back( name2page[*it] ); @@ -2660,7 +2660,7 @@ bool KPrDocument::loadXML( const QDomDocument &doc ) } } else if(elem.tagName()=="SELSLIDES") { if( _clean ) { // Skip this when loading a single page - QDomElement slide=elem.firstChild().toElement(); + TQDomElement slide=elem.firstChild().toElement(); while(!slide.isNull()) { if(slide.tagName()=="SLIDE") { int nr = -1; @@ -2702,37 +2702,37 @@ bool KPrDocument::loadXML( const QDomDocument &doc ) return true; } -void KPrDocument::loadTextStyle( const QDomElement& domElement ) +void KPrDocument::loadTextStyle( const TQDomElement& domElement ) { - QDomElement style = domElement.namedItem( "STYLES" ).toElement(); + TQDomElement style = domElement.namedItem( "STYLES" ).toElement(); if ( _clean && ! style.isNull() ) loadStyleTemplates( style ); } -void KPrDocument::loadPictureMap ( const QDomElement& domElement ) +void KPrDocument::loadPictureMap ( const TQDomElement& domElement ) { m_pictureMap.clear(); // <PICTURES> - QDomElement picturesElem = domElement.namedItem( "PICTURES" ).toElement(); + TQDomElement picturesElem = domElement.namedItem( "PICTURES" ).toElement(); if ( !picturesElem.isNull() ) m_pictureCollection.readXML( picturesElem, m_pictureMap ); // <PIXMAPS> - QDomElement pixmapsElem = domElement.namedItem( "PIXMAPS" ).toElement(); + TQDomElement pixmapsElem = domElement.namedItem( "PIXMAPS" ).toElement(); if ( !pixmapsElem.isNull() ) m_pictureCollection.readXML( pixmapsElem, m_pictureMap ); // <CLIPARTS> - QDomElement clipartsElem = domElement.namedItem( "CLIPARTS" ).toElement(); + TQDomElement clipartsElem = domElement.namedItem( "CLIPARTS" ).toElement(); if ( !clipartsElem.isNull() ) m_pictureCollection.readXML( pixmapsElem, m_pictureMap ); } -void KPrDocument::loadBackground( const QDomElement &element ) +void KPrDocument::loadBackground( const TQDomElement &element ) { kdDebug(33001) << "KPrDocument::loadBackground" << endl; - QDomElement page=element.firstChild().toElement(); + TQDomElement page=element.firstChild().toElement(); int i=m_insertFilePage; while(!page.isNull()) { if(m_pageWhereLoadObject) @@ -2761,11 +2761,11 @@ void KPrDocument::loadBackground( const QDomElement &element ) } } -KCommand *KPrDocument::loadObjects( const QDomElement &element, bool paste ) +KCommand *KPrDocument::loadObjects( const TQDomElement &element, bool paste ) { ObjType t = OT_LINE; - QDomElement obj=element.firstChild().toElement(); - QValueList<KPrObject *> pasteObjects; + TQDomElement obj=element.firstChild().toElement(); + TQValueList<KPrObject *> pasteObjects; while(!obj.isNull()) { if(obj.tagName()=="OBJECT" ) { bool sticky=false; @@ -2963,7 +2963,7 @@ KCommand *KPrDocument::loadObjects( const QDomElement &element, bool paste ) else insertObjectInPage(offset, kppolylineobject); } break; - case OT_QUADRICBEZIERCURVE: { + case OT_TQUADRICBEZIERCURVE: { KPrQuadricBezierCurveObject *kpQuadricBezierCurveObject = new KPrQuadricBezierCurveObject(); offset=kpQuadricBezierCurveObject->load(obj); if ( sticky && !ignoreSticky) @@ -3078,9 +3078,9 @@ KCommand *KPrDocument::loadObjects( const QDomElement &element, bool paste ) return insertCmd; } -void KPrDocument::loadTitle( const QDomElement &element ) +void KPrDocument::loadTitle( const TQDomElement &element ) { - QDomElement title=element.firstChild().toElement(); + TQDomElement title=element.firstChild().toElement(); int i=m_insertFilePage; while ( !title.isNull() ) { if ( title.tagName()=="Title" ) @@ -3101,9 +3101,9 @@ void KPrDocument::loadTitle( const QDomElement &element ) } } -void KPrDocument::loadNote( const QDomElement &element ) +void KPrDocument::loadNote( const TQDomElement &element ) { - QDomElement note=element.firstChild().toElement(); + TQDomElement note=element.firstChild().toElement(); int i=m_insertFilePage; while ( !note.isNull() ) { if ( note.tagName()=="Note" ) @@ -3124,20 +3124,20 @@ void KPrDocument::loadNote( const QDomElement &element ) } } -void KPrDocument::loadUsedSoundFileFromXML( const QDomElement &element ) +void KPrDocument::loadUsedSoundFileFromXML( const TQDomElement &element ) { - usedSoundFile = QStringList(); - haveNotOwnDiskSoundFile = QStringList(); - QDomElement fileElement = element.firstChild().toElement(); + usedSoundFile = TQStringList(); + haveNotOwnDiskSoundFile = TQStringList(); + TQDomElement fileElement = element.firstChild().toElement(); while ( !fileElement.isNull() ) { if ( fileElement.tagName() == "FILE" ) { - QString fileName; + TQString fileName; if ( fileElement.hasAttribute( "name" ) ) fileName = fileElement.attribute( "name" ); if ( fileElement.hasAttribute( "filename" ) ) { - QString name = fileElement.attribute( "filename" ); - QFile _file( name ); + TQString name = fileElement.attribute( "filename" ); + TQFile _file( name ); if ( _file.open( IO_ReadOnly ) ) { fileName = name; _file.close(); @@ -3183,7 +3183,7 @@ bool KPrDocument::completeLoading( KoStore* _store ) if ( saveOnlyPage == -1 ) { // ### following call independant of saveOnlyPage's value? m_masterPage->completeLoading( _clean, lastObj ); - QPtrListIterator<KPrPage> it( m_pageList ); + TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) it.current()->completeLoading( _clean, lastObj ); } @@ -3203,7 +3203,7 @@ bool KPrDocument::completeLoading( KoStore* _store ) recalcVariables( VT_FIELD ); emit sigProgress( -1 ); - connect( documentInfo(), SIGNAL( sigDocumentInfoModifed()),this,SLOT(slotDocumentInfoModifed() ) ); + connect( documentInfo(), TQT_SIGNAL( sigDocumentInfoModifed()),this,TQT_SLOT(slotDocumentInfoModifed() ) ); //desactivate bgspellchecking //attributes isReadWrite is not placed at the beginning ! if ( !isReadWrite()) @@ -3211,12 +3211,12 @@ bool KPrDocument::completeLoading( KoStore* _store ) return true; } -void KPrDocument::loadUsedSoundFileFromStore( KoStore *_store, QStringList _list ) +void KPrDocument::loadUsedSoundFileFromStore( KoStore *_store, TQStringList _list ) { int i = m_insertFilePage; - QStringList::Iterator it = _list.begin(); + TQStringList::Iterator it = _list.begin(); for ( ; it != _list.end(); ++it ) { - QString soundFile = *it; + TQString soundFile = *it; if ( _store->open( soundFile ) ) { kdDebug( 33001 ) << "Not found file on disk. Use this( " << soundFile << " ) file." << endl; @@ -3225,26 +3225,26 @@ void KPrDocument::loadUsedSoundFileFromStore( KoStore *_store, QStringList _list char *data = new char[size]; dev.readBlock( data, size ); - int position = soundFile.findRev( '.' ); - QString format = soundFile.right( soundFile.length() - position ); - KTempFile *tmpFile = new KTempFile( QString::null, format ); + int position = soundFile.tqfindRev( '.' ); + TQString format = soundFile.right( soundFile.length() - position ); + KTempFile *tmpFile = new KTempFile( TQString(), format ); tmpFile->setAutoDelete( true ); tmpFile->file()->writeBlock( data, size ); tmpFile->close(); - QString tmpFileName = tmpFile->name(); + TQString tmpFileName = tmpFile->name(); tmpSoundFileList.append( tmpFile ); - QString _fileName = *haveNotOwnDiskSoundFile.at( i ); + TQString _fileName = *haveNotOwnDiskSoundFile.at( i ); ++i; - QPtrListIterator<KPrPage> it( m_pageList ); + TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) { - QString _file = it.current()->getPageSoundFileName(); + TQString _file = it.current()->getPageSoundFileName(); if ( !_file.isEmpty() && _file == _fileName ) it.current()->setPageSoundFileName( tmpFileName ); - QPtrListIterator<KPrObject> oIt( it.current()->objectList() ); + TQPtrListIterator<KPrObject> oIt( it.current()->objectList() ); for ( ; oIt.current(); ++oIt ) { _file = oIt.current()->getAppearSoundEffectFileName(); if ( !_file.isEmpty() && _file == _fileName ) @@ -3275,34 +3275,34 @@ void KPrDocument::setPageLayout( const KoPageLayout &pgLayout ) //for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) // m_pageList.at( i )->updateBackgroundSize(); - repaint( false ); - layout(); + tqrepaint( false ); + tqlayout(); // don't setModified(true) here, since this is called on startup } -//when we change pagelayout we must re-position header/footer +//when we change pagetqlayout we must re-position header/footer void KPrDocument::updateHeaderFooterPosition( ) { KoRect pageRect=m_masterPage->getPageRect(); - QRect oldBoundingRect = zoomHandler()->zoomRect( _header->getRepaintRect() ); + TQRect oldBoundingRect = zoomHandler()->zoomRect( _header->getRepaintRect() ); _header->setOrig(pageRect.topLeft ()); _header->setSize(pageRect.width(),_header->getSize().height()); - repaint( oldBoundingRect ); - repaint(_header); + tqrepaint( oldBoundingRect ); + tqrepaint(_header); oldBoundingRect = zoomHandler()->zoomRect( _footer->getRepaintRect() ); _footer->setOrig(pageRect.left(),pageRect.bottom()-_footer->getSize().height()); _footer->setSize(pageRect.width(),_footer->getSize().height()); - repaint(oldBoundingRect); - repaint(_footer); + tqrepaint(oldBoundingRect); + tqrepaint(_footer); } -bool KPrDocument::initDoc(InitDocFlags flags, QWidget* parentWidget) +bool KPrDocument::initDoc(InitDocFlags flags, TQWidget* tqparentWidget) { if (flags==KoDocument::InitDocEmpty) { - QString fileName( locate("kpresenter_template", "Screenpresentations/.source/Plain.kpt", + TQString fileName( locate("kpresenter_template", "Screenpresentations/.source/Plain.kpt", KPrFactory::global() ) ); objStartY = 0; _clean = true; @@ -3314,7 +3314,7 @@ bool KPrDocument::initDoc(InitDocFlags flags, QWidget* parentWidget) return ok; } - QString file; + TQString file; KoTemplateChooseDia::ReturnType ret; KoTemplateChooseDia::DialogType dlgtype; if (flags != InitDocFileNew) @@ -3323,7 +3323,7 @@ bool KPrDocument::initDoc(InitDocFlags flags, QWidget* parentWidget) dlgtype = KoTemplateChooseDia::OnlyTemplates; ret = KoTemplateChooseDia::choose( KPrFactory::global(), file, - dlgtype, "kpresenter_template", parentWidget ); + dlgtype, "kpresenter_template", tqparentWidget ); if ( ret == KoTemplateChooseDia::Template ) { _clean = true; //was a parameter called "clean", but unused bool ok = loadNativeFormat( file ); @@ -3341,7 +3341,7 @@ bool KPrDocument::initDoc(InitDocFlags flags, QWidget* parentWidget) bool ok = openURL( url ); return ok; } else if ( ret == KoTemplateChooseDia::Empty ) { - QString fileName( locate("kpresenter_template", "Screenpresentations/.source/Plain.kpt", + TQString fileName( locate("kpresenter_template", "Screenpresentations/.source/Plain.kpt", KPrFactory::global() ) ); objStartY = 0; _clean = true; @@ -3355,14 +3355,14 @@ bool KPrDocument::initDoc(InitDocFlags flags, QWidget* parentWidget) return false; } -void KPrDocument::openExistingFile( const QString& file ) +void KPrDocument::openExistingFile( const TQString& file ) { objStartY = 0; _clean = true; KoDocument::openExistingFile( file ); } -void KPrDocument::openTemplate( const QString& file ) +void KPrDocument::openTemplate( const TQString& file ) { KoDocument::openTemplate( file ); objStartY = 0; @@ -3371,7 +3371,7 @@ void KPrDocument::openTemplate( const QString& file ) void KPrDocument::initEmpty() { - QString fileName( locate("kpresenter_template", "Screenpresentations/.source/Plain.kpt", + TQString fileName( locate("kpresenter_template", "Screenpresentations/.source/Plain.kpt", KPrFactory::global() ) ); objStartY = 0; _clean = true; @@ -3386,70 +3386,70 @@ void KPrDocument::setEmpty() { KoDocument::setEmpty(); // Whether loaded from template or from empty doc: this is a new one -> set creation date - m_varColl->variableSetting()->setCreationDate(QDateTime::currentDateTime()); + m_varColl->variableSetting()->setCreationDate(TQDateTime::tqcurrentDateTime()); recalcVariables( VT_DATE ); // , VST_CREATION_DATE ... // If we then load a document, it will override that date. } -void KPrDocument::setGridValue( double _x, double _y, bool _replace ) +void KPrDocument::setGridValue( double _x, double _y, bool _tqreplace ) { oldGridX = m_gridX; oldGridY = m_gridY; m_gridX=_x; m_gridY=_y; - if ( _replace ) + if ( _tqreplace ) replaceObjs(); } -void KPrDocument::repaint( bool erase ) +void KPrDocument::tqrepaint( bool erase ) { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for( ; it.current(); ++it ) { KPrCanvas* canvas = ((KPrView*)it.current())->getCanvas(); - canvas->repaint( erase ); + canvas->tqrepaint( erase ); } } -void KPrDocument::repaint( const QRect& rect ) +void KPrDocument::tqrepaint( const TQRect& rect ) { - QRect r; - QPtrListIterator<KoView> it( views() ); + TQRect r; + TQPtrListIterator<KoView> it( views() ); for( ; it.current(); ++it ) { r = rect; KPrCanvas* canvas = ((KPrView*)it.current())->getCanvas(); - r.moveTopLeft( QPoint( r.x() - canvas->diffx(), + r.moveTopLeft( TQPoint( r.x() - canvas->diffx(), r.y() - canvas->diffy() ) ); canvas->update( r ); } } -void KPrDocument::layout(KPrObject *kpobject) +void KPrDocument::tqlayout(KPrObject *kpobject) { KPrTextObject * obj = dynamic_cast<KPrTextObject *>( kpobject ); if (obj) - obj->layout(); + obj->tqlayout(); } -void KPrDocument::layout() +void KPrDocument::tqlayout() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for( ; it.current(); ++it ) { KPrCanvas* canvas = ((KPrView*)it.current())->getCanvas(); - canvas->layout(); + canvas->tqlayout(); } } -void KPrDocument::repaint( KPrObject *kpobject ) +void KPrDocument::tqrepaint( KPrObject *kpobject ) { - repaint( m_zoomHandler->zoomRect( kpobject->getRepaintRect() ) ); + tqrepaint( m_zoomHandler->zoomRect( kpobject->getRepaintRect() ) ); } -QValueList<int> KPrDocument::getPageEffectSteps( unsigned int num ) +TQValueList<int> KPrDocument::getPageEffectSteps( unsigned int num ) { return m_pageList.at(num)->getEffectSteps(); } -QRect KPrDocument::getPageRect( bool decBorders ) const +TQRect KPrDocument::getPageRect( bool decBorders ) const { int pw, ph, bl = static_cast<int>(m_pageLayout.ptLeft); int br = static_cast<int>(m_pageLayout.ptRight); @@ -3468,7 +3468,7 @@ QRect KPrDocument::getPageRect( bool decBorders ) const pw = wid - ( bl + br ); ph = hei - ( bt + bb ); - return QRect( bl, bt, pw, ph ); + return TQRect( bl, bt, pw, ph ); } int KPrDocument::getLeftBorder() const @@ -3505,7 +3505,7 @@ void KPrDocument::deletePage( int _page ) void KPrDocument::insertPage( KPrPage *page, int currentPageNum, int insertPageNum ) { // check if page was allready deleted - int pos = m_deletedPageList.findRef( page ); + int pos = m_deletedPageList.tqfindRef( page ); if ( pos != -1 ) m_deletedPageList.take( pos ); @@ -3513,7 +3513,7 @@ void KPrDocument::insertPage( KPrPage *page, int currentPageNum, int insertPageN pageOrderChanged(); //activate this page in all views which on slide currentPageNum - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) { KPrView *view = static_cast<KPrView*>( it.current() ); @@ -3533,13 +3533,13 @@ void KPrDocument::insertPage( KPrPage *page, int currentPageNum, int insertPageN void KPrDocument::takePage( KPrPage *page, int pageNum ) { - int pos = m_pageList.findRef( page ); + int pos = m_pageList.tqfindRef( page ); m_pageList.take( pos ); m_deletedPageList.append( page ); pageOrderChanged(); - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) { KPrView *view = static_cast<KPrView*>( it.current() ); @@ -3556,7 +3556,7 @@ void KPrDocument::takePage( KPrPage *page, int pageNum ) } } - repaint( false ); + tqrepaint( false ); } void KPrDocument::pageOrderChanged() @@ -3578,7 +3578,7 @@ void KPrDocument::movePageTo( int oldPos, int newPos ) pageOrderChanged(); // Update the sidebars - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) { KPrView *view = static_cast<KPrView*>( it.current() ); @@ -3596,23 +3596,23 @@ void KPrDocument::movePageTo( int oldPos, int newPos ) } } -QString KPrDocument::templateFileName( bool chooseTemplate, const QString &theFile ) +TQString KPrDocument::templateFileName( bool chooseTemplate, const TQString &theFile ) { - QString fileName; + TQString fileName; if ( !chooseTemplate ) { if ( theFile.isEmpty() ) fileName = locateLocal( "appdata", "default.kpr" ); else fileName = theFile; } else { - // TODO: pass parentWidget as parameter to this method - QWidget* parentWidget = 0; - QString _template; + // TODO: pass tqparentWidget as parameter to this method + TQWidget* tqparentWidget = 0; + TQString _template; if ( KoTemplateChooseDia::choose( KPrFactory::global(), _template, KoTemplateChooseDia::OnlyTemplates, - "kpresenter_template", parentWidget ) == KoTemplateChooseDia::Cancel ) - return QString::null; - QFileInfo fileInfo( _template ); + "kpresenter_template", tqparentWidget ) == KoTemplateChooseDia::Cancel ) + return TQString(); + TQFileInfo fileInfo( _template ); fileName = fileInfo.dirPath( true ) + "/" + fileInfo.baseName() + ".kpt"; KURL src, dest; @@ -3629,12 +3629,12 @@ QString KPrDocument::templateFileName( bool chooseTemplate, const QString &theFi return fileName; } -int KPrDocument::insertNewPage( const QString &cmdName, int _page, InsertPos _insPos, - bool chooseTemplate, const QString &theFile ) +int KPrDocument::insertNewPage( const TQString &cmdName, int _page, InsertPos _insPos, + bool chooseTemplate, const TQString &theFile ) { kdDebug(33001) << "KPrDocument::insertNewPage " << _page << endl; - QString fileName=templateFileName(chooseTemplate, theFile); + TQString fileName=templateFileName(chooseTemplate, theFile); if(fileName.isEmpty()) return -1; @@ -3646,7 +3646,7 @@ int KPrDocument::insertNewPage( const QString &cmdName, int _page, InsertPos _in KPrPage *newpage = new KPrPage( this, m_masterPage ); m_pageWhereLoadObject=newpage; - m_childCountBeforeInsert = children().count(); + m_childCountBeforeInsert = tqchildren().count(); bool ok = loadNativeFormat( fileName ); if ( !ok ) @@ -3664,7 +3664,7 @@ int KPrDocument::insertNewPage( const QString &cmdName, int _page, InsertPos _in return _page; } -void KPrDocument::savePage( const QString &file, int pgnum, bool ignore ) +void KPrDocument::savePage( const TQString &file, int pgnum, bool ignore ) { saveOnlyPage = pgnum; _duplicatePage=ignore; @@ -3676,7 +3676,7 @@ void KPrDocument::savePage( const QString &file, int pgnum, bool ignore ) void KPrDocument::replaceObjs( bool createUndoRedo ) { KMacroCommand * macroCmd = 0L; - QPtrListIterator<KPrPage> oIt(m_pageList); + TQPtrListIterator<KPrPage> oIt(m_pageList); for (; oIt.current(); ++oIt ) { KCommand *cmd=oIt.current()->replaceObjs( createUndoRedo, oldGridX,oldGridY,_txtBackCol, _otxtBackCol); @@ -3702,12 +3702,12 @@ void KPrDocument::restoreBackground( KPrPage *page ) page->background()->reload(); } -KCommand * KPrDocument::loadPastedObjs( const QString &in, KPrPage* _page ) +KCommand * KPrDocument::loadPastedObjs( const TQString &in, KPrPage* _page ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( in ); - QDomElement document=doc.documentElement(); + TQDomElement document=doc.documentElement(); // DOC if (document.tagName()!="DOC") { @@ -3726,39 +3726,39 @@ KCommand * KPrDocument::loadPastedObjs( const QString &in, KPrPage* _page ) KCommand *cmd = loadObjects(document,true); m_pageWhereLoadObject=0L; - repaint( false ); + tqrepaint( false ); setModified( true ); return cmd; } void KPrDocument::deSelectAllObj() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->getCanvas()->deSelectAllObj(); } void KPrDocument::deSelectObj(KPrObject *obj) { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->getCanvas()->deSelectObj( obj ); } void KPrDocument::setDisplayObjectMasterPage( bool b ) { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->updateDisplayObjectMasterPageButton(); - repaint(b); + tqrepaint(b); } void KPrDocument::setDisplayBackground( bool b ) { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->updateDisplayBackgroundButton(); - repaint(b); + tqrepaint(b); } void KPrDocument::setHeader( bool b ) @@ -3772,7 +3772,7 @@ void KPrDocument::setHeader( bool b ) } m_masterPage->setHeader( b, false ); updateHeaderFooterButton(); - repaint(b); + tqrepaint(b); } void KPrDocument::setFooter( bool b ) @@ -3786,12 +3786,12 @@ void KPrDocument::setFooter( bool b ) } m_masterPage->setFooter( b, false ); updateHeaderFooterButton(); - repaint(b); + tqrepaint(b); } void KPrDocument::updateHeaderFooterButton() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->updateHeaderFooterButton(); } @@ -3818,42 +3818,42 @@ void KPrDocument::makeUsedSoundFileList() usedSoundFile.clear(); - QPtrListIterator<KPrPage> it( m_pageList ); + TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) { - QString _file = it.current()->getPageSoundFileName(); - if ( !_file.isEmpty() && usedSoundFile.findIndex( _file ) == -1 ) + TQString _file = it.current()->getPageSoundFileName(); + if ( !_file.isEmpty() && usedSoundFile.tqfindIndex( _file ) == -1 ) usedSoundFile.append( _file ); - QPtrListIterator<KPrObject> oIt( it.current()->objectList() ); + TQPtrListIterator<KPrObject> oIt( it.current()->objectList() ); for ( ; oIt.current(); ++oIt ) { _file = oIt.current()->getAppearSoundEffectFileName(); - if ( !_file.isEmpty() && usedSoundFile.findIndex( _file ) == -1 ) + if ( !_file.isEmpty() && usedSoundFile.tqfindIndex( _file ) == -1 ) usedSoundFile.append( _file ); _file = oIt.current()->getDisappearSoundEffectFileName(); - if ( !_file.isEmpty() && usedSoundFile.findIndex( _file ) == -1 ) + if ( !_file.isEmpty() && usedSoundFile.tqfindIndex( _file ) == -1 ) usedSoundFile.append( _file ); } } } -KoView* KPrDocument::createViewInstance( QWidget* parent, const char* name ) +KoView* KPrDocument::createViewInstance( TQWidget* tqparent, const char* name ) { //the page numbers have to be recalced for the sticky objects //as it could not be done during the constructor of KPrView recalcPageNum(); - return new KPrView( this, parent, name ); + return new KPrView( this, tqparent, name ); } -void KPrDocument::paintContent( QPainter& painter, const QRect& rect, +void KPrDocument::paintContent( TQPainter& painter, const TQRect& rect, bool /*transparent*/, double zoomX, double zoomY ) { m_zoomHandler->setZoom( 100 ); if ( zoomHandler()->zoomedResolutionX() != zoomX || zoomHandler()->zoomedResolutionY() != zoomY ) { - int zoomLevel = qRound( 100 * zoomY / zoomHandler()->zoomedResolutionY() ); // ## ignores the case where the x and y scaling differs + int zoomLevel = tqRound( 100 * zoomY / zoomHandler()->zoomedResolutionY() ); // ## ignores the case where the x and y scaling differs zoomHandler()->setZoom( zoomLevel ); - bool forPrint = painter.device() && painter.device()->devType() == QInternal::Printer; + bool forPrint = painter.device() && painter.device()->devType() == TQInternal::Printer; newZoomAndResolution( false, forPrint ); } //for the moment draw first page. @@ -3861,7 +3861,7 @@ void KPrDocument::paintContent( QPainter& painter, const QRect& rect, if( m_initialActivePage ) page = m_initialActivePage; - int pageNum = m_pageList.findRef( page ); + int pageNum = m_pageList.tqfindRef( page ); if ( page->displayBackground() ) page->background()->drawBackground( &painter, zoomHandler(), rect, false ); @@ -3870,7 +3870,7 @@ void KPrDocument::paintContent( QPainter& painter, const QRect& rect, KPrPage *masterPage = page->masterPage(); if ( masterPage ) { - QPtrListIterator<KPrObject> it( masterPage->objectList() ); + TQPtrListIterator<KPrObject> it( masterPage->objectList() ); //draw objects on master slide for ( ; it.current() ; ++it ) { @@ -3880,18 +3880,18 @@ void KPrDocument::paintContent( QPainter& painter, const QRect& rect, } } } - QPtrListIterator<KPrObject> it( page->objectList() ); + TQPtrListIterator<KPrObject> it( page->objectList() ); for ( ; it.current() ; ++it ) it.current()->draw( &painter, zoomHandler(), pageNum, SM_NONE ); } -QPixmap KPrDocument::generatePreview( const QSize& size ) +TQPixmap KPrDocument::generatePreview( const TQSize& size ) { int oldZoom = zoomHandler()->zoom(); double oldResolutionX = zoomHandler()->resolutionX(); double oldResolutionY = zoomHandler()->resolutionY(); - QPixmap pix = KoDocument::generatePreview(size); + TQPixmap pix = KoDocument::generatePreview(size); zoomHandler()->setResolution( oldResolutionX, oldResolutionY ); zoomHandler()->setZoom(oldZoom); @@ -3902,7 +3902,7 @@ QPixmap KPrDocument::generatePreview( const QSize& size ) void KPrDocument::addShell( KoMainWindow *shell ) { - connect( shell, SIGNAL( documentSaved() ), m_commandHistory, SLOT( documentSaved() ) ); + connect( shell, TQT_SIGNAL( documentSaved() ), m_commandHistory, TQT_SLOT( documentSaved() ) ); KoDocument::addShell( shell ); } @@ -3917,14 +3917,14 @@ void KPrDocument::movePage( int from, int to ) void KPrDocument::copyPage( int from ) { _clean = false; - m_childCountBeforeInsert = children().count(); + m_childCountBeforeInsert = tqchildren().count(); _duplicatePage=true; // ### now also set via savePage() parameter below kdDebug(33001) << "KPrDocument::copyPage from=" << from << " to=" << from + 1 << endl; kdDebug(33001) << "mimeType = " << mimeType() << ", outputMimeType = " << outputMimeType() << endl; bool wasSelected = isSlideSelected( from ); - KTempFile tempFile( QString::null, mimeType() == nativeOasisMimeType() ? ".oop": ".kpr" ); + KTempFile tempFile( TQString(), mimeType() == nativeOasisMimeType() ? ".oop": ".kpr" ); tempFile.setAutoDelete( true ); savePage( tempFile.name(), from, true ); @@ -3958,16 +3958,16 @@ void KPrDocument::copyPageToClipboard( int pgnum ) // In fact it even allows copying a [1-page] kpr in konq and pasting it in kpresenter :)) kdDebug(33001) << "KPrDocument::copyPageToClipboard pgnum=" << pgnum << endl; kdDebug(33001) << "mimeType = " << mimeType() << ", outputMimeType = " << outputMimeType() << endl; - KTempFile tempFile( QString::null, mimeType() == nativeOasisMimeType() ? ".oop": ".kpr" ); + KTempFile tempFile( TQString(), mimeType() == nativeOasisMimeType() ? ".oop": ".kpr" ); savePage( tempFile.name(), pgnum, true ); KURL url; url.setPath( tempFile.name() ); KURL::List lst; lst.append( url ); - QApplication::clipboard()->setData( new KURLDrag( lst ) ); + TQApplication::tqclipboard()->setData( new KURLDrag( lst ) ); m_tempFileInClipboard = tempFile.name(); // do this last, the above calls clipboardDataChanged } -void KPrDocument::pastePage( const QMimeSource * data, int pgnum ) +void KPrDocument::pastePage( const TQMimeSource * data, int pgnum ) { KURL::List lst; if ( KURLDrag::decode( data, lst ) && !lst.isEmpty() ) @@ -3982,12 +3982,12 @@ void KPrDocument::clipboardDataChanged() if ( !m_tempFileInClipboard.isEmpty() ) { kdDebug(33001) << "KPrDocument::clipboardDataChanged, deleting temp file " << m_tempFileInClipboard << endl; - unlink( QFile::encodeName( m_tempFileInClipboard ) ); - m_tempFileInClipboard = QString::null; + unlink( TQFile::encodeName( m_tempFileInClipboard ) ); + m_tempFileInClipboard = TQString(); } // TODO enable paste as well, when a txtobject is activated // and there is plain text in the clipboard. Then enable this code. - //QMimeSource *data = QApplication::clipboard()->data(); + //TQMimeSource *data = TQApplication::tqclipboard()->data(); //bool canPaste = data->provides( "text/uri-list" ) || data->provides( "application/x-kpresenter-selection" ); // emit enablePaste( canPaste ); } @@ -4008,17 +4008,17 @@ void KPrDocument::selectPage( int pgNum /* 0-based */, bool select ) KPrPage * KPrDocument::findPage(KPrObject *object) { - QPtrList<KPrObject> masterObjects( m_masterPage->objectList() ); - if ( masterObjects.findRef( object ) != -1 ) + TQPtrList<KPrObject> masterObjects( m_masterPage->objectList() ); + if ( masterObjects.tqfindRef( object ) != -1 ) { //kdDebug(33001) << "Object is on the master page" << endl; return m_masterPage; } - QPtrListIterator<KPrPage> it( m_pageList ); + TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) { - QPtrList<KPrObject> list( it.current()->objectList() ); - if ( list.findRef( object ) != -1 ) { - //kdDebug(33001) << "Object is on page " << m_pageList.findRef(it.current()) + 1 << endl; + TQPtrList<KPrObject> list( it.current()->objectList() ); + if ( list.tqfindRef( object ) != -1 ) { + //kdDebug(33001) << "Object is on page " << m_pageList.tqfindRef(it.current()) + 1 << endl; return it.current(); } } @@ -4026,12 +4026,12 @@ KPrPage * KPrDocument::findPage(KPrObject *object) return 0L; } -KPrPage * KPrDocument::findPage(QPtrList<KPrObject> &objects) +KPrPage * KPrDocument::findPage(TQPtrList<KPrObject> &objects) { KPrObject *object; for ( object = objects.first(); object; object=objects.next() ) { - QPtrList<KPrObject> list( m_masterPage->objectList() ); - if ( list.findRef( object ) != -1 ) + TQPtrList<KPrObject> list( m_masterPage->objectList() ); + if ( list.tqfindRef( object ) != -1 ) { //kdDebug(33001) << "Object is on the master page" << endl; return m_masterPage; @@ -4039,9 +4039,9 @@ KPrPage * KPrDocument::findPage(QPtrList<KPrObject> &objects) } object = objects.first(); for ( KPrPage *page=m_pageList.first(); page; page=m_pageList.next() ) { - QPtrList<KPrObject> list( page->objectList() ); - if ( list.findRef( object ) != -1 ) { - //kdDebug(33001) << "The Objects are on page " << m_pageList.findRef(page) + 1 << endl; + TQPtrList<KPrObject> list( page->objectList() ); + if ( list.tqfindRef( object ) != -1 ) { + //kdDebug(33001) << "The Objects are on page " << m_pageList.tqfindRef(page) + 1 << endl; return page; } } @@ -4052,7 +4052,7 @@ KPrPage * KPrDocument::findPage(QPtrList<KPrObject> &objects) void KPrDocument::updateSideBarItem( KPrPage * page ) { // Update the views - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) static_cast<KPrView*>( it.current() )->updateSideBarItem( page ); } @@ -4063,14 +4063,14 @@ bool KPrDocument::isSlideSelected( int pgNum /* 0-based */ ) return m_pageList.at(pgNum)->isSlideSelected(); } -QValueList<int> KPrDocument::listOfDisplaySelectedSlides( const QValueList<KPrPage*> & lst) /* returned list is 0-based */ +TQValueList<int> KPrDocument::listOfDisplaySelectedSlides( const TQValueList<KPrPage*> & lst) /* returned list is 0-based */ { - QValueList<int> result; - QValueListConstIterator<KPrPage*> itPage; - QValueListConstIterator<KPrPage*> itPageEnd = lst.end(); + TQValueList<int> result; + TQValueListConstIterator<KPrPage*> itPage; + TQValueListConstIterator<KPrPage*> itPageEnd = lst.end(); for( itPage = lst.begin() ; itPage != itPageEnd; ++itPage ) { - int pageNum = m_pageList.find(*itPage ); + int pageNum = m_pageList.tqfind(*itPage ); if ( pageNum != -1 ) { kdDebug()<<" KPrDocument::displaySelectedSlide : add slide number :"<<pageNum<<endl; @@ -4081,9 +4081,9 @@ QValueList<int> KPrDocument::listOfDisplaySelectedSlides( const QValueList<KPrPa } -QValueList<int> KPrDocument::displaySelectedSlides() /* returned list is 0-based */ +TQValueList<int> KPrDocument::displaySelectedSlides() /* returned list is 0-based */ { - QValueList<int> result; + TQValueList<int> result; if ( m_customListTest ) return *m_customListTest; if ( m_presentationName.isEmpty() ) @@ -4096,9 +4096,9 @@ QValueList<int> KPrDocument::displaySelectedSlides() /* returned list is 0-base return result; } -QValueList<int> KPrDocument::selectedSlides() /* returned list is 0-based */ +TQValueList<int> KPrDocument::selectedSlides() /* returned list is 0-based */ { - QValueList<int> result; + TQValueList<int> result; for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) { if(m_pageList.at(i)->isSlideSelected()) result <<i; @@ -4106,8 +4106,8 @@ QValueList<int> KPrDocument::selectedSlides() /* returned list is 0-based */ return result; } -QString KPrDocument::selectedForPrinting() { - QString ret; +TQString KPrDocument::selectedForPrinting() { + TQString ret; int start=-1, end=-1; bool continuous=false; for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) { @@ -4123,18 +4123,18 @@ QString KPrDocument::selectedForPrinting() { else { if(continuous) { if(start==end) - ret+=QString::number(start+1)+","; + ret+=TQString::number(start+1)+","; else - ret+=QString::number(start+1)+"-"+QString::number(end+1)+","; + ret+=TQString::number(start+1)+"-"+TQString::number(end+1)+","; continuous=false; } } } if(continuous) { if(start==end) - ret+=QString::number(start+1); + ret+=TQString::number(start+1); else - ret+=QString::number(start+1)+"-"+QString::number(end+1); + ret+=TQString::number(start+1)+"-"+TQString::number(end+1); } if(','==ret[ret.length()-1]) ret.truncate(ret.length()-1); @@ -4145,19 +4145,19 @@ void KPrDocument::slotRepaintChanged( KPrTextObject *kptextobj ) { //todo //use this function for the moment - repaint( kptextobj ); + tqrepaint( kptextobj ); } void KPrDocument::recalcVariables( int type ) { recalcPageNum(); - QValueList<KoVariable* > modifiedVariables = m_varColl->recalcVariables(type); + TQValueList<KoVariable* > modifiedVariables = m_varColl->recalcVariables(type); if ( modifiedVariables.isEmpty() ) return; - // TODO use the return value from recalcVariables to only repaint what has changed. - QPtrListIterator<KPrPage> it( m_pageList ); + // TODO use the return value from recalcVariables to only tqrepaint what has changed. + TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) it.current()->slotRepaintVariable(); m_masterPage->slotRepaintVariable(); @@ -4166,7 +4166,7 @@ void KPrDocument::recalcVariables( int type ) void KPrDocument::slotGuideLinesChanged( KoView *view ) { ( (KPrView*)view )->getCanvas()->guideLines().getGuideLines( m_hGuideLines, m_vGuideLines ); - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) { if ( it.current() != view ) @@ -4184,7 +4184,7 @@ void KPrDocument::slotDocumentInfoModifed() void KPrDocument::reorganizeGUI() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->reorganize(); } @@ -4207,7 +4207,7 @@ void KPrDocument::updateRuler() void KPrDocument::recalcPageNum() { - QPtrListIterator<KPrPage> it( m_pageList ); + TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) it.current()->recalcPageNum(); m_masterPage->recalcPageNum(); @@ -4254,7 +4254,7 @@ void KPrDocument::insertObjectInPage(double offset, KPrObject *_obj, int pos) void KPrDocument::insertPixmapKey( KoPictureKey key ) { - if ( !usedPictures.contains( key ) ) + if ( !usedPictures.tqcontains( key ) ) usedPictures.append( key ); } @@ -4270,7 +4270,7 @@ void KPrDocument::displayActivePage(KPrPage * _page) void KPrDocument::updateZoomRuler() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) { ((KPrView*)it.current())->getHRuler()->setZoom( m_zoomHandler->zoomedResolutionX() ); @@ -4281,9 +4281,9 @@ void KPrDocument::updateZoomRuler() void KPrDocument::newZoomAndResolution( bool updateViews, bool /*forPrint*/ ) { - QPtrListIterator<KPrPage> it( m_pageList ); + TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) { - QPtrListIterator<KPrObject> oit(it.current()->objectList()); + TQPtrListIterator<KPrObject> oit(it.current()->objectList()); for ( ; oit.current(); ++oit ) { if ( oit.current()->getType() == OT_TEXT ) static_cast<KPrTextObject *>( oit.current() )->textDocument()->formatCollection()->zoomChanged(); @@ -4291,11 +4291,11 @@ void KPrDocument::newZoomAndResolution( bool updateViews, bool /*forPrint*/ ) } if ( updateViews ) { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) { static_cast<KPrView *>( it.current() )->getCanvas()->update(); - static_cast<KPrView *>( it.current() )->getCanvas()->layout(); + static_cast<KPrView *>( it.current() )->getCanvas()->tqlayout(); } } } @@ -4317,7 +4317,7 @@ bool KPrDocument::isHeaderFooter(const KPrObject *obj) const void KPrDocument::updateRulerPageLayout() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) { ((KPrView*)it.current())->getHRuler()->setPageLayout(m_pageLayout ); @@ -4326,10 +4326,10 @@ void KPrDocument::updateRulerPageLayout() } } -void KPrDocument::refreshAllNoteBarMasterPage(const QString &text, KPrView *exceptView) +void KPrDocument::refreshAllNoteBarMasterPage(const TQString &text, KPrView *exceptView) { m_masterPage->setNoteText(text ); - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) { KPrView* view=(KPrView*)it.current(); @@ -4338,10 +4338,10 @@ void KPrDocument::refreshAllNoteBarMasterPage(const QString &text, KPrView *exce } } -void KPrDocument::refreshAllNoteBar(int page, const QString &text, KPrView *exceptView) +void KPrDocument::refreshAllNoteBar(int page, const TQString &text, KPrView *exceptView) { m_pageList.at(page)->setNoteText(text ); - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) { KPrView* view=(KPrView*)it.current(); @@ -4350,11 +4350,11 @@ void KPrDocument::refreshAllNoteBar(int page, const QString &text, KPrView *exce } } -void KPrDocument::loadStyleTemplates( const QDomElement &stylesElem ) +void KPrDocument::loadStyleTemplates( const TQDomElement &stylesElem ) { - QValueList<QString> followingStyles; + TQValueList<TQString> followingStyles; - QDomNodeList listStyles = stylesElem.elementsByTagName( "STYLE" ); + TQDomNodeList listStyles = stylesElem.elementsByTagName( "STYLE" ); if( listStyles.count() > 0) { // we are going to import at least one style. KoParagStyle *s = m_styleColl->findStyle("Standard"); kdDebug(32001) << "KPrDocument::loadStyleTemplates looking for Standard, to delete it. Found " << s << endl; @@ -4362,13 +4362,13 @@ void KPrDocument::loadStyleTemplates( const QDomElement &stylesElem ) m_styleColl->removeStyle(s); } for (unsigned int item = 0; item < listStyles.count(); item++) { - QDomElement styleElem = listStyles.item( item ).toElement(); + TQDomElement styleElem = listStyles.item( item ).toElement(); - KoParagStyle *sty = new KoParagStyle( QString::null ); + KoParagStyle *sty = new KoParagStyle( TQString() ); // Load the style from the <STYLE> element sty->loadStyle( styleElem ); - QDomElement formatElem = styleElem.namedItem( "FORMAT" ).toElement(); + TQDomElement formatElem = styleElem.namedItem( "FORMAT" ).toElement(); if ( !formatElem.isNull() ) sty->format() = KPrTextObject::loadFormat( formatElem, 0L, defaultFont(), globalLanguage(), globalHyphenation() ); else @@ -4379,7 +4379,7 @@ void KPrDocument::loadStyleTemplates( const QDomElement &stylesElem ) kdDebug() << k_funcinfo << m_styleColl->styleList().count() << " styles, " << followingStyles.count() << " following styles" << endl; if(m_styleColl->styleList().count() > followingStyles.count() ) { - QString following = styleElem.namedItem("FOLLOWING").toElement().attribute("name"); + TQString following = styleElem.namedItem("FOLLOWING").toElement().attribute("name"); followingStyles.append( following ); } else @@ -4388,7 +4388,7 @@ void KPrDocument::loadStyleTemplates( const QDomElement &stylesElem ) Q_ASSERT( followingStyles.count() == m_styleColl->styleList().count() ); unsigned int i=0; - for( QValueList<QString>::Iterator it = followingStyles.begin(); it != followingStyles.end(); ++it ) { + for( TQValueList<TQString>::Iterator it = followingStyles.begin(); it != followingStyles.end(); ++it ) { KoParagStyle * style = m_styleColl->findStyle(*it); m_styleColl->styleAt( i++)->setFollowingStyle( style ); } @@ -4397,27 +4397,27 @@ void KPrDocument::loadStyleTemplates( const QDomElement &stylesElem ) void KPrDocument::updateAllStyleLists() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->updateStyleList(); } void KPrDocument::applyStyleChange( KoStyleChangeDefMap changed ) { - QPtrListIterator<KPrPage> it( m_pageList ); + TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) it.current()->applyStyleChange( changed ); m_masterPage->applyStyleChange( changed ); } -void KPrDocument::saveStyle( KoParagStyle *sty, QDomElement parentElem ) +void KPrDocument::saveStyle( KoParagStyle *sty, TQDomElement tqparentElem ) { - QDomDocument doc = parentElem.ownerDocument(); - QDomElement styleElem = doc.createElement( "STYLE" ); - parentElem.appendChild( styleElem ); + TQDomDocument doc = tqparentElem.ownerDocument(); + TQDomElement styleElem = doc.createElement( "STYLE" ); + tqparentElem.appendChild( styleElem ); sty->saveStyle( styleElem ); - QDomElement formatElem = doc.createElement("FORMAT"); + TQDomElement formatElem = doc.createElement("FORMAT"); KPrTextObject::saveFormat( formatElem, &sty->format() ); styleElem.appendChild( formatElem ); } @@ -4438,7 +4438,7 @@ void KPrDocument::enableBackgroundSpellCheck( bool b ) { //m_bgSpellCheck->enableBackgroundSpellCheck(b); m_bgSpellCheck->setEnabled(b); - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for( ; it.current(); ++it ) ((KPrView*)it.current())->updateBgSpellCheckingState(); } @@ -4450,7 +4450,7 @@ bool KPrDocument::backgroundSpellCheckEnabled() const void KPrDocument::reactivateBgSpellChecking(bool refreshTextObj) { - QPtrListIterator<KPrPage> it( m_pageList ); + TQPtrListIterator<KPrPage> it( m_pageList ); #if 0 if(m_kpresenterView && m_kpresenterView->getCanvas()) activePage=m_kpresenterView->getCanvas()->activePage(); @@ -4467,31 +4467,31 @@ void KPrDocument::reactivateBgSpellChecking(bool refreshTextObj) startBackgroundSpellCheck(); } -QPtrList<KoTextObject> KPrDocument::allTextObjects() const +TQPtrList<KoTextObject> KPrDocument::allTextObjects() const { - QPtrList<KoTextObject> lst; - QPtrListIterator<KPrPage> it( m_pageList ); + TQPtrList<KoTextObject> lst; + TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) it.current()->addTextObjects( lst ); m_masterPage->addTextObjects( lst ); return lst; } -QValueList<KoTextDocument *> KPrDocument::allTextDocuments() const +TQValueList<KoTextDocument *> KPrDocument::allTextDocuments() const { - QValueList<KoTextDocument *> lst; - const QPtrList<KoTextObject> textObjects = allTextObjects(); - QPtrListIterator<KoTextObject> it( textObjects ); + TQValueList<KoTextDocument *> lst; + const TQPtrList<KoTextObject> textObjects = allTextObjects(); + TQPtrListIterator<KoTextObject> it( textObjects ); for ( ; it.current() ; ++it ) { lst.append( it.current()->textDocument() ); } return lst; } -QValueList<KoTextObject *> KPrDocument::visibleTextObjects( ) const +TQValueList<KoTextObject *> KPrDocument::visibleTextObjects( ) const { - QValueList<KoTextObject *> lst; - QPtrList<KoTextObject> textFramesets = allTextObjects( ); + TQValueList<KoTextObject *> lst; + TQPtrList<KoTextObject> textFramesets = allTextObjects( ); KoTextObject *frm; for ( frm=textFramesets.first(); frm != 0; frm=textFramesets.next() ) { @@ -4509,12 +4509,12 @@ void KPrDocument::setShowGuideLines( bool b ) setModified( true ); } -void KPrDocument::horizontalGuideLines( const QValueList<double> &lines ) +void KPrDocument::horizontalGuideLines( const TQValueList<double> &lines ) { m_hGuideLines = lines; } -void KPrDocument::verticalGuideLines( const QValueList<double> &lines ) +void KPrDocument::verticalGuideLines( const TQValueList<double> &lines ) { m_vGuideLines = lines; } @@ -4531,7 +4531,7 @@ void KPrDocument::addGuideLine( Qt::Orientation o, double pos ) m_vGuideLines.append( pos ); } - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) { ( (KPrView*)it.current() )->getCanvas()->guideLines().setGuideLines( m_hGuideLines, m_vGuideLines ); @@ -4541,17 +4541,17 @@ void KPrDocument::addGuideLine( Qt::Orientation o, double pos ) void KPrDocument::updateGuideLineButton() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->updateGuideLineButton(); } -void KPrDocument::loadGuideLines( const QDomElement &element ) +void KPrDocument::loadGuideLines( const TQDomElement &element ) { // In early versions of KPresenter 1.2 (up to Beta 2), there is child also naed <HELPLINES> // Before KPresenter 1.5 the guide lines where named helplines that is why they are still // named like this in the fileformat - QDomElement guidelines = element.namedItem( "HELPLINES" ).toElement(); + TQDomElement guidelines = element.namedItem( "HELPLINES" ).toElement(); if ( guidelines.isNull() ) guidelines = element; @@ -4566,18 +4566,18 @@ void KPrDocument::loadGuideLines( const QDomElement &element ) } } -void KPrDocument::saveGuideLines( QDomDocument &doc, QDomElement& element ) +void KPrDocument::saveGuideLines( TQDomDocument &doc, TQDomElement& element ) { - for(QValueList<double>::Iterator it = m_vGuideLines.begin(); it != m_vGuideLines.end(); ++it) + for(TQValueList<double>::Iterator it = m_vGuideLines.begin(); it != m_vGuideLines.end(); ++it) { - QDomElement lines=doc.createElement("Vertical"); + TQDomElement lines=doc.createElement("Vertical"); lines.setAttribute("value", (double)*it); element.appendChild( lines ); } - for(QValueList<double>::Iterator it = m_hGuideLines.begin(); it != m_hGuideLines.end(); ++it) + for(TQValueList<double>::Iterator it = m_hGuideLines.begin(); it != m_hGuideLines.end(); ++it) { - QDomElement lines=doc.createElement("Horizontal"); + TQDomElement lines=doc.createElement("Horizontal"); lines.setAttribute("value", *it); element.appendChild( lines ); } @@ -4585,37 +4585,37 @@ void KPrDocument::saveGuideLines( QDomDocument &doc, QDomElement& element ) void KPrDocument::updateGridButton() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->updateGridButton(); } -void KPrDocument::setSpellCheckIgnoreList( const QStringList& lst ) +void KPrDocument::setSpellCheckIgnoreList( const TQStringList& lst ) { m_spellCheckIgnoreList = lst; m_bgSpellCheck->settings()->setCurrentIgnoreList( m_spellCheckIgnoreList + m_spellCheckPersonalDict ); setModified( true ); } -void KPrDocument::addSpellCheckIgnoreWord( const QString & word ) +void KPrDocument::addSpellCheckIgnoreWord( const TQString & word ) { // ### missing: undo/redo support - if( m_spellCheckIgnoreList.findIndex( word ) == -1 ) + if( m_spellCheckIgnoreList.tqfindIndex( word ) == -1 ) m_spellCheckIgnoreList.append( word ); setSpellCheckIgnoreList( m_spellCheckIgnoreList ); } void KPrDocument::updateObjectStatusBarItem() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->updateObjectStatusBarItem(); } void KPrDocument::updateObjectSelected() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->objectSelectedChanged(); } @@ -4623,7 +4623,7 @@ void KPrDocument::updateObjectSelected() void KPrDocument::setTabStopValue ( double _tabStop ) { m_tabStop = _tabStop; - QPtrListIterator<KPrPage> it( m_pageList ); + TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) it.current()->changeTabStopValue( m_tabStop ); //styckypage @@ -4655,17 +4655,17 @@ void KPrDocument::testAndCloseAllTextObjectProtectedContent() { if ( !m_cursorInProtectectedArea ) { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) static_cast<KPrView*>(it.current())->testAndCloseAllTextObjectProtectedContent(); } } -void KPrDocument::insertFile(const QString & file ) +void KPrDocument::insertFile(const TQString & file ) { m_insertFilePage = m_pageList.count(); - m_childCountBeforeInsert = children().count(); + m_childCountBeforeInsert = tqchildren().count(); objStartY = 0; bool clean = _clean; _clean = false; @@ -4690,14 +4690,14 @@ void KPrDocument::insertFile(const QString & file ) m_childCountBeforeInsert = 0; // Update the views int newPos = m_pageList.count()-1; - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) static_cast<KPrView*>(it.current())->updateSideBar(); _clean = clean; updatePresentationButton(); //activate this page in all views (...) - QPtrListIterator<KoView>it2( views() ); + TQPtrListIterator<KoView>it2( views() ); for (; it2.current(); ++it2 ) static_cast<KPrView*>(it2.current())->skipToPage(newPos); } @@ -4709,21 +4709,21 @@ void KPrDocument::spellCheckParagraphDeleted( KoTextParag * /* _parag */, KPrTe void KPrDocument::updateRulerInProtectContentMode() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) static_cast<KPrView*>(it.current())->updateRulerInProtectContentMode(); } void KPrDocument::updatePresentationButton() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) static_cast<KPrView*>(it.current())->updatePresentationButton((selectedSlides().count()>0)); } void KPrDocument::refreshGroupButton() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) static_cast<KPrView*>(it.current())->refreshGroupButton(); } @@ -4731,7 +4731,7 @@ void KPrDocument::refreshGroupButton() void KPrDocument::addView( KoView *_view ) { KoDocument::addView( _view ); - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) static_cast<KPrView*>(it.current())->closeTextObject(); } @@ -4739,19 +4739,19 @@ void KPrDocument::addView( KoView *_view ) void KPrDocument::removeView( KoView *_view ) { KoDocument::removeView( _view ); - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) static_cast<KPrView*>(it.current())->deSelectAllObjects(); } -void KPrDocument::updateStyleListOrder( const QStringList &list ) +void KPrDocument::updateStyleListOrder( const TQStringList &list ) { styleCollection()->updateStyleListOrder( list ); } void KPrDocument::updateDirectCursorButton() { - QPtrListIterator<KoView> it( views() ); + TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) static_cast<KPrView*>(it.current())->updateDirectCursorButton(); } @@ -4773,11 +4773,11 @@ KPrView *KPrDocument::firstView() const return 0L; } -void KPrDocument::addWordToDictionary( const QString & word) +void KPrDocument::addWordToDictionary( const TQString & word) { if ( m_bgSpellCheck ) { - if( m_spellCheckPersonalDict.findIndex( word ) == -1 ) + if( m_spellCheckPersonalDict.tqfindIndex( word ) == -1 ) m_spellCheckPersonalDict.append( word ); m_bgSpellCheck->settings()->setCurrentIgnoreList( m_spellCheckIgnoreList + m_spellCheckPersonalDict ); if ( backgroundSpellCheckEnabled() ) @@ -4786,11 +4786,11 @@ void KPrDocument::addWordToDictionary( const QString & word) } } -QValueList <KPrPage *> KPrDocument::customListPage( const QStringList & lst, bool loadOasis ) +TQValueList <KPrPage *> KPrDocument::customListPage( const TQStringList & lst, bool loadOasis ) { - QStringList tmp( lst ); - QValueList <KPrPage *> tmpValueList; - for ( QStringList::Iterator itList = tmp.begin(); itList != tmp.end(); ++itList ) + TQStringList tmp( lst ); + TQValueList <KPrPage *> tmpValueList; + for ( TQStringList::Iterator itList = tmp.begin(); itList != tmp.end(); ++itList ) { for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) { @@ -4826,9 +4826,9 @@ void KPrDocument::setCustomSlideShows( const CustomSlideShowMap & customSlideSho setModified( true ); } -QStringList KPrDocument::presentationList() +TQStringList KPrDocument::presentationList() { - QStringList lst; + TQStringList lst; if ( !m_customListSlideShow.isEmpty() ) { CustomSlideShowMap::Iterator it; @@ -4838,10 +4838,10 @@ QStringList KPrDocument::presentationList() return lst; } -void KPrDocument::testCustomSlideShow( const QValueList<KPrPage *> &pages, KPrView *view ) +void KPrDocument::testCustomSlideShow( const TQValueList<KPrPage *> &pages, KPrView *view ) { delete m_customListTest; - m_customListTest = new QValueList<int>( listOfDisplaySelectedSlides( pages ) ); + m_customListTest = new TQValueList<int>( listOfDisplaySelectedSlides( pages ) ); if ( view ) view->screenStartFromFirst(); diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h index 2522266f..749b7441 100644 --- a/kpresenter/KPrDocument.h +++ b/kpresenter/KPrDocument.h @@ -49,18 +49,18 @@ class KPrGroupObject; class KoOasisContext; class KoOasisSettings; class KoXmlWriter; -class QFile; +class TQFile; class KoSavingContext; #include <KoDocument.h> #include <KoDocumentChild.h> -#include <qptrlist.h> -#include <qobject.h> -#include <qstring.h> -#include <qvaluelist.h> -#include <qdatetime.h> -#include <qdict.h> +#include <tqptrlist.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqdatetime.h> +#include <tqdict.h> #include <KoPageLayoutDia.h> #include "global.h" @@ -86,14 +86,14 @@ class KPrChild : public KoDocumentChild public: // constructor - destructor - KPrChild( KPrDocument *_kpr, KoDocument* _doc, const QRect& _rect ); + KPrChild( KPrDocument *_kpr, KoDocument* _doc, const TQRect& _rect ); KPrChild( KPrDocument *_kpr ); ~KPrChild(); - // get parent - KPrDocument* parent()const { return m_parent; } + // get tqparent + KPrDocument* tqparent()const { return m_parent; } - virtual KoDocument *hitTest( const QPoint &, const QWMatrix & ); + virtual KoDocument *hitTest( const TQPoint &, const TQWMatrix & ); protected: KPrDocument *m_parent; @@ -102,73 +102,74 @@ protected: class KPrDocument : public KoDocument { Q_OBJECT - Q_PROPERTY( int maxRecentFiles READ maxRecentFiles ) - Q_PROPERTY( int undoRedoLimit READ undoRedoLimit WRITE setUndoRedoLimit ) - Q_PROPERTY( double indentValue READ getIndentValue WRITE setIndentValue ) - Q_PROPERTY( int getLeftBorder READ getLeftBorder ) - Q_PROPERTY( int getTopBorder READ getTopBorder ) - Q_PROPERTY( int getBottomBorder READ getBottomBorder ) - Q_PROPERTY( int getRightBorder READ getRightBorder ) - Q_PROPERTY( bool cursorInProtectedArea READ cursorInProtectedArea WRITE setCursorInProtectedArea ) - Q_PROPERTY( bool insertDirectCursor READ insertDirectCursor WRITE setInsertDirectCursor ) - Q_PROPERTY( QString picturePath READ picturePath WRITE setPicturePath ) - Q_PROPERTY( QString globalLanguage READ globalLanguage WRITE setGlobalLanguage ) - Q_PROPERTY( bool globalHyphenation READ globalHyphenation WRITE setGlobalHyphenation ) - Q_PROPERTY( double tabStopValue READ tabStopValue WRITE setTabStopValue ) - Q_PROPERTY( bool snapToGrid READ snapToGrid WRITE setSnapToGrid ) - Q_PROPERTY( bool backgroundSpellCheckEnabled READ backgroundSpellCheckEnabled WRITE enableBackgroundSpellCheck ) - Q_PROPERTY( bool spInfiniteLoop READ spInfiniteLoop WRITE setInfiniteLoop ) - Q_PROPERTY( bool spShowEndOfPresentationSlide READ spShowEndOfPresentationSlide WRITE setShowEndOfPresentationSlide ) - Q_PROPERTY( bool spManualSwitch READ spManualSwitch WRITE setManualSwitch ) - Q_PROPERTY( bool presentationDuration READ presentationDuration WRITE setPresentationDuration ) - Q_PROPERTY( QColor gridColor READ gridColor WRITE setGridColor ) - Q_PROPERTY( QColor txtBackCol READ txtBackCol WRITE setTxtBackCol ) + TQ_OBJECT + TQ_PROPERTY( int maxRecentFiles READ maxRecentFiles ) + TQ_PROPERTY( int undoRedoLimit READ undoRedoLimit WRITE setUndoRedoLimit ) + TQ_PROPERTY( double indentValue READ getIndentValue WRITE setIndentValue ) + TQ_PROPERTY( int getLeftBorder READ getLeftBorder ) + TQ_PROPERTY( int getTopBorder READ getTopBorder ) + TQ_PROPERTY( int getBottomBorder READ getBottomBorder ) + TQ_PROPERTY( int getRightBorder READ getRightBorder ) + TQ_PROPERTY( bool cursorInProtectedArea READ cursorInProtectedArea WRITE setCursorInProtectedArea ) + TQ_PROPERTY( bool insertDirectCursor READ insertDirectCursor WRITE setInsertDirectCursor ) + TQ_PROPERTY( TQString picturePath READ picturePath WRITE setPicturePath ) + TQ_PROPERTY( TQString globalLanguage READ globalLanguage WRITE setGlobalLanguage ) + TQ_PROPERTY( bool globalHyphenation READ globalHyphenation WRITE setGlobalHyphenation ) + TQ_PROPERTY( double tabStopValue READ tabStopValue WRITE setTabStopValue ) + TQ_PROPERTY( bool snapToGrid READ snapToGrid WRITE setSnapToGrid ) + TQ_PROPERTY( bool backgroundSpellCheckEnabled READ backgroundSpellCheckEnabled WRITE enableBackgroundSpellCheck ) + TQ_PROPERTY( bool spInfiniteLoop READ spInfiniteLoop WRITE setInfiniteLoop ) + TQ_PROPERTY( bool spShowEndOfPresentationSlide READ spShowEndOfPresentationSlide WRITE setShowEndOfPresentationSlide ) + TQ_PROPERTY( bool spManualSwitch READ spManualSwitch WRITE setManualSwitch ) + TQ_PROPERTY( bool presentationDuration READ presentationDuration WRITE setPresentationDuration ) + TQ_PROPERTY( TQColor gridColor READ gridColor WRITE setGridColor ) + TQ_PROPERTY( TQColor txtBackCol READ txtBackCol WRITE setTxtBackCol ) public: // constructor - destructor - KPrDocument( QWidget *parentWidget = 0, const char *widgetName = 0, QObject* doc = 0, + KPrDocument( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* doc = 0, const char* name = 0, bool singleViewMode = false ); ~KPrDocument(); // Drawing - virtual void paintContent( QPainter& painter, const QRect& rect, bool transparent = false, + virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 ); // save - virtual QDomDocument saveXML(); + virtual TQDomDocument saveXML(); virtual bool completeSaving( KoStore* _store ); virtual bool saveOasis( KoStore* store, KoXmlWriter* manifestWriter ); enum SaveFlag { SaveAll, SaveSelected, SavePage }; - void saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyles, QFile* masterStyles, + void saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyles, TQFile* masterStyles, KoSavingContext & savingContext, SaveFlag saveFlag = SaveAll ) const; enum { STYLE_BACKGROUNDPAGE = 20, STYLE_BACKGROUNDPAGEAUTO, STYLE_GRADIENT,STYLE_OBJECTANIMATION, STYLE_STROKE, STYLE_MARKER, STYLE_PICTURE, STYLE_PRESENTATIONSTICKYOBJECT }; // load - virtual bool loadOasis( const QDomDocument& doc, KoOasisStyles& styles, const QDomDocument&, KoStore* store ); + virtual bool loadOasis( const TQDomDocument& doc, KoOasisStyles& styles, const TQDomDocument&, KoStore* store ); /* * Load oasis object * @param pos: we use -1 for sticky page. */ - void loadOasisObject( KPrPage * page, QDomNode & drawPage, KoOasisContext & context, KPrGroupObject *groupObject = 0L); + void loadOasisObject( KPrPage * page, TQDomNode & drawPage, KoOasisContext & context, KPrGroupObject *groupObject = 0L); - virtual bool loadXML( const QDomDocument& doc ); - virtual bool loadXML( QIODevice *, const QDomDocument & doc ); + virtual bool loadXML( const TQDomDocument& doc ); + virtual bool loadXML( TQIODevice *, const TQDomDocument & doc ); virtual bool loadChildren( KoStore* _store ); virtual int supportedSpecialFormats() const; - virtual bool initDoc(InitDocFlags flags, QWidget* parentWidget=0); + virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0); virtual void setEmpty(); virtual void addView( KoView *_view ); virtual void removeView( KoView *_view ); - // page layout + // page tqlayout void setPageLayout( const KoPageLayout &); - virtual QPixmap generatePreview( const QSize &size ); + virtual TQPixmap generatePreview( const TQSize &size ); virtual void addShell( KoMainWindow *shell ); @@ -176,23 +177,23 @@ class KPrDocument : public KoDocument void createHeaderFooter(); void updateHeaderFooterPosition(); - const QPtrList<KPrPage> & getPageList() const {return m_pageList;} + const TQPtrList<KPrPage> & getPageList() const {return m_pageList;} // @return the master page KPrPage * masterPage() const { return m_masterPage; } KPrPage * activePage()const; - // We need one that's not const, due to QPtrList::at() not being const - QPtrList<KPrPage>& pageList() { return m_pageList;} + // We need one that's not const, due to TQPtrList::at() not being const + TQPtrList<KPrPage>& pageList() { return m_pageList;} void insertPixmapKey( KoPictureKey key ); void insertObjectInPage(double offset, KPrObject *_obj, int pos = -1); - void setGridValue( double rx, double ry, bool _replace = true ); + void setGridValue( double rx, double ry, bool _tqreplace = true ); // get - set options for editmodi - QColor txtBackCol() const { return _txtBackCol; } - void setTxtBackCol( const QColor &c ) { _otxtBackCol = _txtBackCol; _txtBackCol = c; } + TQColor txtBackCol() const { return _txtBackCol; } + void setTxtBackCol( const TQColor &c ) { _otxtBackCol = _txtBackCol; _txtBackCol = c; } // get - set roundedness unsigned int getRndX() const { return _xRnd; } @@ -210,17 +211,17 @@ class KPrDocument : public KoDocument // size of page - QRect getPageRect( bool decBorders = true ) const; + TQRect getPageRect( bool decBorders = true ) const; void insertObject(KPrChild* ch ){ insertChild(ch);} - void savePage( const QString &file, int pgnum, bool ignore = false ); + void savePage( const TQString &file, int pgnum, bool ignore = false ); - void pastePage( const QMimeSource * data, int pgnum ); + void pastePage( const TQMimeSource * data, int pgnum ); - QString templateFileName(bool chooseTemplate, const QString &theFile ); + TQString templateFileName(bool chooseTemplate, const TQString &theFile ); - int insertNewPage( const QString &cmdName,int _page, InsertPos _insPos, bool chooseTemplate, const QString &theFile ); + int insertNewPage( const TQString &cmdName,int _page, InsertPos _insPos, bool chooseTemplate, const TQString &theFile ); /** * insert page page and go to page insertPageNum on all views @@ -235,24 +236,24 @@ class KPrDocument : public KoDocument void deletePage( int _page ); void copyPageToClipboard( int pgnum ); - // repaint all views - void repaint( bool ); + // tqrepaint all views + void tqrepaint( bool ); - void repaint( const QRect& ); - void repaint( KPrObject* ); + void tqrepaint( const TQRect& ); + void tqrepaint( KPrObject* ); // stuff for screen-presentations /** * return the list of steps for the selected page * where objects appear/disappear. */ - QValueList<int> getPageEffectSteps( unsigned int ); + TQValueList<int> getPageEffectSteps( unsigned int ); - QPen presPen() const { return _presPen; } - void setPresPen( QPen p ) {_presPen = p; } + TQPen presPen() const { return _presPen; } + void setPresPen( TQPen p ) {_presPen = p; } void restoreBackground( KPrPage * ); - KCommand * loadPastedObjs( const QString &in, KPrPage* _page ); + KCommand * loadPastedObjs( const TQString &in, KPrPage* _page ); void deSelectAllObj(); void deSelectObj(KPrObject *obj); @@ -288,8 +289,8 @@ class KPrDocument : public KoDocument // Returns true if the slide pgNum (0 based) bool isSlideSelected( int pgNum) ; // Returns the list of selected slides. Slide numbers are 0-based. - QValueList<int> selectedSlides(); - QString selectedForPrinting(); + TQValueList<int> selectedSlides(); + TQString selectedForPrinting(); virtual DCOPObject* dcopObject(); @@ -301,13 +302,13 @@ class KPrDocument : public KoDocument void updateAllStyleLists(); void applyStyleChange( KoStyleChangeDefMap changed ); - void updateStyleListOrder( const QStringList &list ); + void updateStyleListOrder( const TQStringList &list ); void addCommand( KCommand * cmd ); KoTextZoomHandler* zoomHandler() const { return m_zoomHandler; } - QFont defaultFont() const { return m_defaultFont; } - void setDefaultFont( const QFont & newFont) { + TQFont defaultFont() const { return m_defaultFont; } + void setDefaultFont( const TQFont & newFont) { m_defaultFont = newFont; } @@ -370,10 +371,10 @@ class KPrDocument : public KoDocument void updateSideBarItem( KPrPage * page ); KPrPage * findPage(KPrObject *object); - KPrPage * findPage(QPtrList<KPrObject> &objects); + KPrPage * findPage(TQPtrList<KPrObject> &objects); - void refreshAllNoteBar(int page, const QString &text, KPrView *exceptView); - void refreshAllNoteBarMasterPage(const QString &text, KPrView *exceptView); + void refreshAllNoteBar(int page, const TQString &text, KPrView *exceptView); + void refreshAllNoteBarMasterPage(const TQString &text, KPrView *exceptView); bool backgroundSpellCheckEnabled() const; @@ -383,11 +384,11 @@ class KPrDocument : public KoDocument //refresh obj when we active or disactive void reactivateBgSpellChecking(bool refreshTextObj=false); - QPtrList<KoTextObject> allTextObjects() const; - QValueList<KoTextObject *> visibleTextObjects( ) const; + TQPtrList<KoTextObject> allTextObjects() const; + TQValueList<KoTextObject *> visibleTextObjects( ) const; /// Reimplementation from KoDocument. - virtual QValueList<KoTextDocument *> allTextDocuments() const; + virtual TQValueList<KoTextDocument *> allTextDocuments() const; bool allowAutoFormat() const { return m_bAllowAutoFormat; } void setAllowAutoFormat(bool _b){ m_bAllowAutoFormat=_b; } @@ -406,28 +407,28 @@ class KPrDocument : public KoDocument * * @return list of positions of the horizontal guide lines */ - QValueList<double> &horizontalGuideLines() { return m_hGuideLines; } + TQValueList<double> &horizontalGuideLines() { return m_hGuideLines; } /** * @brief Get the positions of the vertical guide lines * * @return list of positions of the vertical guide lines */ - QValueList<double> &verticalGuideLines() { return m_vGuideLines; } + TQValueList<double> &verticalGuideLines() { return m_vGuideLines; } /** * @brief Set the positions of the horizontal guide lines * * @param lines a list of positions of the horizontal guide lines */ - void horizontalGuideLines( const QValueList<double> &lines ); + void horizontalGuideLines( const TQValueList<double> &lines ); /** * @brief Set the positions of the vertical guide lines * * @param lines a list of positions of the vertical guide lines */ - void verticalGuideLines( const QValueList<double> &lines ); + void verticalGuideLines( const TQValueList<double> &lines ); /** * @brief Add a guide line @@ -450,67 +451,67 @@ class KPrDocument : public KoDocument bool snapToGrid() const { return m_bSnapToGrid; } void setSnapToGrid( bool _b ) { m_bSnapToGrid = _b; } - QColor gridColor() const { return m_gridColor; } - void setGridColor( const QColor & _col ) { m_gridColor = _col; } + TQColor gridColor() const { return m_gridColor; } + void setGridColor( const TQColor & _col ) { m_gridColor = _col; } - QStringList spellCheckIgnoreList() const { return m_spellCheckIgnoreList; } - void setSpellCheckIgnoreList( const QStringList& lst ); - void addSpellCheckIgnoreWord( const QString & ); + TQStringList spellCheckIgnoreList() const { return m_spellCheckIgnoreList; } + void setSpellCheckIgnoreList( const TQStringList& lst ); + void addSpellCheckIgnoreWord( const TQString & ); KoCommandHistory * commandHistory()const { return m_commandHistory; } void updateObjectStatusBarItem(); void updateObjectSelected(); - void layout(KPrObject *kpobject); - void layout(); + void tqlayout(KPrObject *kpobject); + void tqlayout(); void changeBgSpellCheckingState( bool b ); bool cursorInProtectedArea()const; void setCursorInProtectedArea( bool b ); - void insertFile(const QString & file ); + void insertFile(const TQString & file ); void spellCheckParagraphDeleted( KoTextParag *_parag, KPrTextObject *frm); - void loadPictureMap ( const QDomElement& domElement ); + void loadPictureMap ( const TQDomElement& domElement ); void updateRulerInProtectContentMode(); void updatePresentationButton(); void refreshGroupButton(); - QString picturePath()const { return m_picturePath; } - void setPicturePath( const QString & _path ) { m_picturePath = _path ; } + TQString picturePath()const { return m_picturePath; } + void setPicturePath( const TQString & _path ) { m_picturePath = _path ; } bool insertDirectCursor() const { return m_bInsertDirectCursor; } void setInsertDirectCursor(bool _b); void updateDirectCursorButton(); - QString globalLanguage()const { return m_globalLanguage; } - void setGlobalLanguage( const QString & _lang ){m_globalLanguage = _lang;} + TQString globalLanguage()const { return m_globalLanguage; } + void setGlobalLanguage( const TQString & _lang ){m_globalLanguage = _lang;} bool globalHyphenation() const { return m_bGlobalHyphenation; } void setGlobalHyphenation ( bool _hyphen ) { m_bGlobalHyphenation = _hyphen; } - void addWordToDictionary( const QString & word); + void addWordToDictionary( const TQString & word); void loadImagesFromStore( KoStore *_store ); - void saveEmbeddedObject(KPrPage *page, const QPtrList<KoDocumentChild>& childList ,QDomDocument &doc,QDomElement &presenter ); - void insertEmbedded( KoStore *store, QDomElement elem, KMacroCommand * macroCmd, KPrPage *page, int pos ); + void saveEmbeddedObject(KPrPage *page, const TQPtrList<KoDocumentChild>& childList ,TQDomDocument &doc,TQDomElement &presenter ); + void insertEmbedded( KoStore *store, TQDomElement elem, KMacroCommand * macroCmd, KPrPage *page, int pos ); KPrBgSpellCheck* backSpeller() const { return m_bgSpellCheck; } void setCustomSlideShows( const CustomSlideShowMap & customSlideShows ); - QValueList <KPrPage *> customListPage( const QStringList & lst, bool loadOasis=false ); + TQValueList <KPrPage *> customListPage( const TQStringList & lst, bool loadOasis=false ); - QString presentationName() const { return m_presentationName; } - void setPresentationName( const QString &_name ) { m_presentationName = _name; } + TQString presentationName() const { return m_presentationName; } + void setPresentationName( const TQString &_name ) { m_presentationName = _name; } - QStringList presentationList(); + TQStringList presentationList(); //return list of slide which be displaying: //return selected slide when presentation name is empty //otherwise return list of custom slide show - QValueList<int> displaySelectedSlides(); - QValueList<int> listOfDisplaySelectedSlides( const QValueList<KPrPage*>& lst ); - void testCustomSlideShow( const QValueList<KPrPage *> &pages, KPrView *view ); + TQValueList<int> displaySelectedSlides(); + TQValueList<int> listOfDisplaySelectedSlides( const TQValueList<KPrPage*>& lst ); + void testCustomSlideShow( const TQValueList<KPrPage *> &pages, KPrView *view ); void clearTestCustomSlideShow(); const CustomSlideShowMap & customSlideShows() { return m_customListSlideShow; } @@ -543,59 +544,59 @@ protected slots: void slotCommandExecuted(); void slotDocumentInfoModifed(); - virtual void openExistingFile( const QString& file ); - virtual void openTemplate( const QString& file ); + virtual void openExistingFile( const TQString& file ); + virtual void openTemplate( const TQString& file ); protected: - KoView* createViewInstance( QWidget* parent, const char* name ); + KoView* createViewInstance( TQWidget* tqparent, const char* name ); void testAndCloseAllTextObjectProtectedContent(); // ************ functions ************ /** - * Overloaded function from @ref Document_impl. Saves all children. + * Overloaded function from @ref Document_impl. Saves all tqchildren. */ virtual bool saveChildren( KoStore* _store ); - void loadStyleTemplates( const QDomElement &styles ); - void saveStyle( KoParagStyle *sty, QDomElement parentElem ); - - QDomDocumentFragment saveBackground( QDomDocument& ); - QDomElement saveObjects( QDomDocument &doc ); - QDomElement saveTitle( QDomDocument &doc ); - QDomElement saveNote( QDomDocument &doc ); - QDomElement saveAttribute( QDomDocument &doc ); - QDomElement saveUsedSoundFileToXML( QDomDocument &_doc, QStringList _list ); - void loadTextStyle( const QDomElement& domElement ); - void saveEmbeddedObject(KPrPage *page, KoDocumentChild *chl,QDomDocument &doc,QDomElement &presenter, double offset ); - void saveGuideLines( QDomDocument &doc, QDomElement& element ); - - void loadBackground( const QDomElement &element ); - void loadGuideLines( const QDomElement &element ); - KCommand * loadObjects( const QDomElement &element,bool paste=false ); - void loadTitle( const QDomElement &element ); - void loadNote( const QDomElement &element ); - void loadUsedSoundFileFromXML( const QDomElement &element ); + void loadStyleTemplates( const TQDomElement &styles ); + void saveStyle( KoParagStyle *sty, TQDomElement tqparentElem ); + + TQDomDocumentFragment saveBackground( TQDomDocument& ); + TQDomElement saveObjects( TQDomDocument &doc ); + TQDomElement saveTitle( TQDomDocument &doc ); + TQDomElement saveNote( TQDomDocument &doc ); + TQDomElement saveAttribute( TQDomDocument &doc ); + TQDomElement saveUsedSoundFileToXML( TQDomDocument &_doc, TQStringList _list ); + void loadTextStyle( const TQDomElement& domElement ); + void saveEmbeddedObject(KPrPage *page, KoDocumentChild *chl,TQDomDocument &doc,TQDomElement &presenter, double offset ); + void saveGuideLines( TQDomDocument &doc, TQDomElement& element ); + + void loadBackground( const TQDomElement &element ); + void loadGuideLines( const TQDomElement &element ); + KCommand * loadObjects( const TQDomElement &element,bool paste=false ); + void loadTitle( const TQDomElement &element ); + void loadNote( const TQDomElement &element ); + void loadUsedSoundFileFromXML( const TQDomElement &element ); virtual bool completeLoading( KoStore* /* _store */ ); void makeUsedPixmapList(); void makeUsedSoundFileList(); - void saveUsedSoundFileToStore( KoStore *_store, QStringList _list ); - void loadUsedSoundFileFromStore( KoStore *_store, QStringList _list ); - void fillStyleStack( const QDomElement& object, KoOasisContext & context, const char* family ); + void saveUsedSoundFileToStore( KoStore *_store, TQStringList _list ); + void loadUsedSoundFileFromStore( KoStore *_store, TQStringList _list ); + void fillStyleStack( const TQDomElement& object, KoOasisContext & context, const char* family ); /* * increaseOrder = true by default, put to false when we have group of animation */ - int createPresentationAnimation(const QDomElement& element, int order = 0 ,bool increaseOrder = true); + int createPresentationAnimation(const TQDomElement& element, int order = 0 ,bool increaseOrder = true); - void saveOasisPresentationSettings( KoXmlWriter &contentTmpWriter, QMap<int, QString> &page2name ); - void loadOasisPresentationSettings( QDomNode &settingsDoc ); - void saveOasisPresentationCustomSlideShow( KoXmlWriter &contentTmpWriter, QMap<int, QString> &page2name ); - void loadOasisPresentationCustomSlideShow( QDomNode &settingsDoc ); + void saveOasisPresentationSettings( KoXmlWriter &contentTmpWriter, TQMap<int, TQString> &page2name ); + void loadOasisPresentationSettings( TQDomNode &settingsDoc ); + void saveOasisPresentationCustomSlideShow( KoXmlWriter &contentTmpWriter, TQMap<int, TQString> &page2name ); + void loadOasisPresentationCustomSlideShow( TQDomNode &settingsDoc ); - void loadOasisHeaderFooter( QDomNode & drawPage, KoOasisContext & context); + void loadOasisHeaderFooter( TQDomNode & drawPage, KoOasisContext & context); void saveOasisSettings( KoXmlWriter &contentTmpWriter ); - void loadOasisSettings( const QDomDocument&settingsDoc ); + void loadOasisSettings( const TQDomDocument&settingsDoc ); void saveOasisCustomFied( KoXmlWriter &writer )const; @@ -604,7 +605,7 @@ protected: //we move presSpeed to each table => compatibility with old file format void compatibilityFromOldFileFormat(); - void parseOasisGuideLines( const QString &str ); + void parseOasisGuideLines( const TQString &str ); /** * recalc the variables @@ -620,20 +621,20 @@ protected: int _xRnd, _yRnd; // options for editmode - QColor _txtBackCol; - QColor _otxtBackCol; + TQColor _txtBackCol; + TQColor _otxtBackCol; bool _clean; int objStartY, objStartNum; - QPen _presPen; + TQPen _presPen; KoPictureCollection m_pictureCollection; KPrGradientCollection _gradientCollection; KPrTextObject *_header, *_footer; - QMap<KoPictureKey, QString> m_pictureMap; + TQMap<KoPictureKey, TQString> m_pictureMap; CustomSlideShowMap m_customListSlideShow; @@ -641,20 +642,20 @@ protected: KoPageLayout __pgLayout; int lastObj; - QString urlIntern; + TQString urlIntern; - QValueList<KoPictureKey> usedPictures; - QStringList usedSoundFile, haveNotOwnDiskSoundFile; - QPtrList<KTempFile> tmpSoundFileList; + TQValueList<KoPictureKey> usedPictures; + TQStringList usedSoundFile, haveNotOwnDiskSoundFile; + TQPtrList<KTempFile> tmpSoundFileList; DCOPObject *dcop; int saveOnlyPage; - QString m_tempFileInClipboard; + TQString m_tempFileInClipboard; bool ignoreSticky; KoCommandHistory * m_commandHistory; KoTextZoomHandler* m_zoomHandler; - QFont m_defaultFont; + TQFont m_defaultFont; KoAutoFormat * m_autoFormat; bool m_bShowRuler; @@ -673,19 +674,19 @@ protected: bool m_cursorInProtectectedArea; KoVariableFormatCollection *m_varFormatCollection; KPrVariableCollection *m_varColl; - QColor m_gridColor; + TQColor m_gridColor; bool _duplicatePage; private: /// list of positions of horizontal guide lines - QValueList<double> m_hGuideLines; + TQValueList<double> m_hGuideLines; /// list of positions of vertical guide lines - QValueList<double> m_vGuideLines; + TQValueList<double> m_vGuideLines; - QPtrList<KPrPage> m_pageList; - QPtrList<KPrPage> m_deletedPageList; + TQPtrList<KPrPage> m_pageList; + TQPtrList<KPrPage> m_deletedPageList; - QStringList m_spellCheckIgnoreList; // per-document - QStringList m_spellCheckPersonalDict; // per-user + TQStringList m_spellCheckIgnoreList; // per-document + TQStringList m_spellCheckPersonalDict; // per-user double m_gridX; double m_gridY; @@ -698,16 +699,16 @@ private: KPrBgSpellCheck *m_bgSpellCheck; KoStyleCollection *m_styleColl; KPrObject *bgObjSpellChecked; - QString m_picturePath; + TQString m_picturePath; bool m_bInsertDirectCursor; - QString m_globalLanguage; - QString m_presentationName; + TQString m_globalLanguage; + TQString m_presentationName; bool m_bGlobalHyphenation; KPrLoadingInfo *m_loadingInfo; - QValueList<int> *m_customListTest; + TQValueList<int> *m_customListTest; - /// here the amount of existing children before inserting a page/file - /// is saved, so that we load the correct children + /// here the amount of existing tqchildren before inserting a page/file + /// is saved, so that we load the correct tqchildren int m_childCountBeforeInsert; }; diff --git a/kpresenter/KPrDocumentIface.cpp b/kpresenter/KPrDocumentIface.cpp index f7cd4766..04235d73 100644 --- a/kpresenter/KPrDocumentIface.cpp +++ b/kpresenter/KPrDocumentIface.cpp @@ -77,7 +77,7 @@ void KPrDocumentIface::recalcVariables(int _var) doc->recalcVariables(_var); } -void KPrDocumentIface::recalcVariables(const QString &varName) +void KPrDocumentIface::recalcVariables(const TQString &varName) { if(varName=="VT_DATE") doc->recalcVariables(0); @@ -121,7 +121,7 @@ void KPrDocumentIface::setDisplayLink(bool b) doc->recalcVariables(VT_LINK); } -bool KPrDocumentIface::setCustomVariableValue(const QString & varname, const QString & value) +bool KPrDocumentIface::setCustomVariableValue(const TQString & varname, const TQString & value) { bool exist=doc->getVariableCollection()->customVariableExist(varname); if(exist) @@ -134,18 +134,18 @@ bool KPrDocumentIface::setCustomVariableValue(const QString & varname, const QSt return true; } -QString KPrDocumentIface::customVariableValue(const QString & varname)const +TQString KPrDocumentIface::customVariableValue(const TQString & varname)const { if(doc->getVariableCollection()->customVariableExist(varname)) return doc->getVariableCollection()->getVariableValue( varname ); - return QString::null; + return TQString(); } bool KPrDocumentIface::insertNewPage(int pos ) { if( pos < 0 || pos > (int)(doc->getPageNums())-1 ) pos=doc->getPageNums()-1; - int ret= doc->insertNewPage( i18n("Insert New Slide"), pos, IP_AFTER, false, QString::null ); + int ret= doc->insertNewPage( i18n("Insert New Slide"), pos, IP_AFTER, false, TQString() ); bool state = (ret !=-1); return state; } @@ -189,7 +189,7 @@ void KPrDocumentIface::saveConfig() doc->saveConfig(); } -QString KPrDocumentIface::selectedForPrinting()const +TQString KPrDocumentIface::selectedForPrinting()const { return doc->selectedForPrinting(); } @@ -432,13 +432,13 @@ void KPrDocumentIface::setShowGuideLines( bool b ) { doc->setShowGuideLines( b ); doc->updateGuideLineButton(); - doc->repaint( false ); + doc->tqrepaint( false ); } void KPrDocumentIface::addGuideLine( bool horizontal, double pos ) { doc->addGuideLine( horizontal ? Qt::Horizontal: Qt::Vertical, pos ); - doc->repaint( false ); + doc->tqrepaint( false ); } unsigned int KPrDocumentIface::nbHorizontalHelpLine() const @@ -460,7 +460,7 @@ void KPrDocumentIface::setShowGrid ( bool _grid ) { doc->setShowGrid( _grid); doc->updateGridButton(); - doc->repaint( false ); + doc->tqrepaint( false ); } double KPrDocumentIface::gridX() const @@ -472,7 +472,7 @@ void KPrDocumentIface::setGridX(double _x) { doc->setGridX( _x ); if( showGrid() ) - doc->repaint( false ); + doc->tqrepaint( false ); } double KPrDocumentIface::gridY() const @@ -484,7 +484,7 @@ void KPrDocumentIface::setGridY(double _y) { doc->setGridY( _y ); if( showGrid() ) - doc->repaint( false ); + doc->tqrepaint( false ); } bool KPrDocumentIface::configAutoSuperScript() const @@ -497,17 +497,17 @@ void KPrDocumentIface::setConfigAutoSuperScript( bool b) doc->getAutoFormat()->configAutoSuperScript( b ); } -void KPrDocumentIface::addIgnoreWordAll( const QString &word) +void KPrDocumentIface::addIgnoreWordAll( const TQString &word) { doc->addSpellCheckIgnoreWord( word ); } void KPrDocumentIface::clearIgnoreWordAll( ) { - doc->setSpellCheckIgnoreList( QStringList() ); + doc->setSpellCheckIgnoreList( TQStringList() ); } -QStringList KPrDocumentIface::spellListIgnoreAll() const +TQStringList KPrDocumentIface::spellListIgnoreAll() const { return doc->spellCheckIgnoreList(); } @@ -523,7 +523,7 @@ void KPrDocumentIface::setDisplayFieldCode( bool b) doc->recalcVariables(VT_ALL); } -QString KPrDocumentIface::configAutoFormatLanguage( )const +TQString KPrDocumentIface::configAutoFormatLanguage( )const { return doc->getAutoFormat()->getConfigAutoFormatLanguage( ); } @@ -539,25 +539,25 @@ void KPrDocumentIface::setConfigCapitalizeNameOfDays( bool b) doc->getAutoFormat()->configCapitalizeNameOfDays( b ); } -QString KPrDocumentIface::presentationName() const +TQString KPrDocumentIface::presentationName() const { return doc->presentationName(); } -void KPrDocumentIface::setPresentationName( const QString &_name ) +void KPrDocumentIface::setPresentationName( const TQString &_name ) { doc->setPresentationName( _name ); } -QStringList KPrDocumentIface::presentationList() +TQStringList KPrDocumentIface::presentationList() { return doc->presentationList(); } -void KPrDocumentIface::repaint() +void KPrDocumentIface::tqrepaint() { - doc->repaint( false ); + doc->tqrepaint( false ); } void KPrDocumentIface::setConfigToolTipCompletion( bool b ) diff --git a/kpresenter/KPrDocumentIface.h b/kpresenter/KPrDocumentIface.h index f28aa032..3dd061df 100644 --- a/kpresenter/KPrDocumentIface.h +++ b/kpresenter/KPrDocumentIface.h @@ -24,9 +24,9 @@ #include <KoDocumentIface.h> #include <dcopref.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qcolor.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqcolor.h> class KPrDocument; class KPrDocumentIface : public KoDocumentIface @@ -50,9 +50,9 @@ k_dcop: virtual void recalcVariables( int type ); virtual void recalcAllVariables(); - virtual void recalcVariables(const QString &varName); - virtual bool setCustomVariableValue(const QString & varname, const QString & value); - virtual QString customVariableValue(const QString & varname) const; + virtual void recalcVariables(const TQString &varName); + virtual bool setCustomVariableValue(const TQString & varname, const TQString & value); + virtual TQString customVariableValue(const TQString & varname) const; virtual int startingPage(); virtual void setStartingPage(int nb); @@ -68,7 +68,7 @@ k_dcop: virtual void initConfig(); virtual void saveConfig(); - virtual QString selectedForPrinting() const; + virtual TQString selectedForPrinting() const; //Be carefull ! when pgNum > num of page we return false virtual bool isSlideSelected( int pgNum); @@ -158,27 +158,27 @@ k_dcop: bool configAutoSuperScript() const; void setConfigAutoSuperScript( bool b); - void addIgnoreWordAll( const QString &); + void addIgnoreWordAll( const TQString &); void clearIgnoreWordAll( ); - QStringList spellListIgnoreAll() const; + TQStringList spellListIgnoreAll() const; bool displayFieldCode()const; void setDisplayFieldCode( bool b); - QString configAutoFormatLanguage( )const; + TQString configAutoFormatLanguage( )const; bool configCapitalizeNameOfDays() const; void setConfigCapitalizeNameOfDays( bool b); - QString presentationName() const; - void setPresentationName( const QString &_name ); + TQString presentationName() const; + void setPresentationName( const TQString &_name ); - QStringList presentationList(); + TQStringList presentationList(); /// Repaint document. Call this after moving or resizing an object, for instance. /// @since 1.4 - void repaint(); + void tqrepaint(); private: KPrDocument *doc; diff --git a/kpresenter/KPrDuplicateObjDia.cpp b/kpresenter/KPrDuplicateObjDia.cpp index 4b72e1de..3396e438 100644 --- a/kpresenter/KPrDuplicateObjDia.cpp +++ b/kpresenter/KPrDuplicateObjDia.cpp @@ -19,23 +19,23 @@ */ #include <klocale.h> -#include <qvbox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qbuttongroup.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqbuttongroup.h> #include "KPrDuplicateObjDia.h" #include "KPrPage.h" #include <knuminput.h> -#include <qlineedit.h> +#include <tqlineedit.h> #include <KoUnit.h> #include <knumvalidator.h> #include "KPrDocument.h" #include <kseparator.h> #include <KoUnitWidgets.h> -KPrDuplicatObjDia::KPrDuplicatObjDia( QWidget *parent, KPrDocument * _doc, const char *name) - : KDialogBase( parent, name, true, "", Ok | Cancel, Ok, true ) +KPrDuplicatObjDia::KPrDuplicatObjDia( TQWidget *tqparent, KPrDocument * _doc, const char *name) + : KDialogBase( tqparent, name, true, "", Ok | Cancel, Ok, true ) { m_doc=_doc; KoUnit::Unit unit = m_doc->unit(); @@ -44,28 +44,28 @@ KPrDuplicatObjDia::KPrDuplicatObjDia( QWidget *parent, KPrDocument * _doc, const setCaption( i18n("Duplicate Object") ); - QVBox *page = makeVBoxMainWidget(); - QLabel *lab=new QLabel(i18n("Number of copies:"), page); + TQVBox *page = makeVBoxMainWidget(); + TQLabel *lab=new TQLabel(i18n("Number of copies:"), page); m_nbCopy = new KIntNumInput( 1, page ); m_nbCopy->setRange( 1 , 10, 1); KSeparator *tmp=new KSeparator(page); - lab=new QLabel(i18n("Rotation angle:"), page); + lab=new TQLabel(i18n("Rotation angle:"), page); m_rotation = new KDoubleNumInput( page, "customInput" ); m_rotation->setRange(0.0, 360, 1, false); tmp=new KSeparator(page); - lab=new QLabel(i18n("Increase width:"), page); + lab=new TQLabel(i18n("Increase width:"), page); m_increaseX= new KoUnitDoubleSpinBox( page ); m_increaseX->setMinValue(0.0); m_increaseX->setMaxValue(pageRect.width()); m_increaseX->changeValue( 1 ); m_increaseX->setUnit(unit); - lab=new QLabel(i18n("Increase height:"), page); + lab=new TQLabel(i18n("Increase height:"), page); m_increaseY= new KoUnitDoubleSpinBox( page ); m_increaseY->setMinValue(0.0); m_increaseY->setMaxValue(pageRect.height()); @@ -73,7 +73,7 @@ KPrDuplicatObjDia::KPrDuplicatObjDia( QWidget *parent, KPrDocument * _doc, const m_increaseY->setUnit(unit); tmp=new KSeparator(page); - lab=new QLabel(i18n("Move X:"), page); + lab=new TQLabel(i18n("Move X:"), page); m_moveX= new KoUnitDoubleSpinBox( page ); m_moveX->setMinValue(0.0); m_moveX->setMaxValue(pageRect.width()); @@ -81,7 +81,7 @@ KPrDuplicatObjDia::KPrDuplicatObjDia( QWidget *parent, KPrDocument * _doc, const m_moveX->setUnit(unit); - lab=new QLabel(i18n("Move Y:"), page); + lab=new TQLabel(i18n("Move Y:"), page); m_moveY= new KoUnitDoubleSpinBox( page ); m_moveY->setMinValue(0.0); m_moveY->setMaxValue(pageRect.height()); @@ -103,22 +103,22 @@ double KPrDuplicatObjDia::angle() const double KPrDuplicatObjDia::increaseX() const { - return QMAX(0, m_increaseX->value()); + return TQMAX(0, m_increaseX->value()); } double KPrDuplicatObjDia::increaseY() const { - return QMAX(0, m_increaseY->value()); + return TQMAX(0, m_increaseY->value()); } double KPrDuplicatObjDia::moveX() const { - return QMAX(0, m_moveX->value()); + return TQMAX(0, m_moveX->value()); } double KPrDuplicatObjDia::moveY() const { - return QMAX(0, m_moveY->value()); + return TQMAX(0, m_moveY->value()); } diff --git a/kpresenter/KPrDuplicateObjDia.h b/kpresenter/KPrDuplicateObjDia.h index cba96b5f..1c49cb5e 100644 --- a/kpresenter/KPrDuplicateObjDia.h +++ b/kpresenter/KPrDuplicateObjDia.h @@ -32,8 +32,9 @@ class KoUnitDoubleSpinBox; class KPrDuplicatObjDia : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KPrDuplicatObjDia( QWidget *parent, KPrDocument * _doc, const char *name=0L); + KPrDuplicatObjDia( TQWidget *tqparent, KPrDocument * _doc, const char *name=0L); int nbCopy() const; double angle() const; double increaseX() const; diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp index 711b4cd6..cfc39358 100644 --- a/kpresenter/KPrEffectDia.cpp +++ b/kpresenter/KPrEffectDia.cpp @@ -25,19 +25,19 @@ #include "KPrObject.h" #include "KPrSoundPlayer.h" -#include <qpushbutton.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qvaluelist.h> -#include <qlayout.h> -#include <qspinbox.h> -#include <qstringlist.h> -#include <qdir.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqpushbutton.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqvaluelist.h> +#include <tqlayout.h> +#include <tqspinbox.h> +#include <tqstringlist.h> +#include <tqdir.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <kglobal.h> @@ -48,41 +48,41 @@ #include <kstandarddirs.h> #include <kfiledialog.h> -KPrEffectDia::KPrEffectDia( QWidget* parent, const char* name, const QPtrList<KPrObject>& _objs, +KPrEffectDia::KPrEffectDia( TQWidget* tqparent, const char* name, const TQPtrList<KPrObject>& _objs, KPrView *_view ) - : KDialogBase( parent, name, true ), objs( _objs ) + : KDialogBase( tqparent, name, true ), objs( _objs ) { view = _view; KPrObject *obj = objs.at( 0 ); soundPlayer1 = 0; soundPlayer2 = 0; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - topLayout = new QVBoxLayout( page, 0, spacingHint() ); + topLayout = new TQVBoxLayout( page, 0, spacingHint() ); - QGroupBox *grp1 = new QGroupBox(0, Qt::Vertical, i18n( "Appear" ), page ); - grp1->layout()->setSpacing(KDialog::spacingHint()); - grp1->layout()->setMargin(KDialog::marginHint()); + TQGroupBox *grp1 = new TQGroupBox(0, Qt::Vertical, i18n( "Appear" ), page ); + grp1->tqlayout()->setSpacing(KDialog::spacingHint()); + grp1->tqlayout()->setMargin(KDialog::marginHint()); topLayout->addWidget(grp1); - QGridLayout *upperRow = new QGridLayout(grp1->layout(), 6, 4); + TQGridLayout *upperRow = new TQGridLayout(grp1->tqlayout(), 6, 4); - lAppear = new QLabel( i18n( "Order of appearance:" ), grp1 ); - lAppear->setAlignment( AlignVCenter ); + lAppear = new TQLabel( i18n( "Order of appearance:" ), grp1 ); + lAppear->tqsetAlignment( AlignVCenter ); upperRow->addWidget(lAppear, 0, 0); - eAppearStep = new QSpinBox( 0, 100, 1, grp1 ); + eAppearStep = new TQSpinBox( 0, 100, 1, grp1 ); eAppearStep->setValue( obj->getAppearStep() ); upperRow->addWidget(eAppearStep, 0, 1); - //( void )new QWidget( grp1 ); - //( void )new QWidget( grp1 ); + //( void )new TQWidget( grp1 ); + //( void )new TQWidget( grp1 ); - lEffect = new QLabel( i18n( "Effect (appearing):" ), grp1 ); - lEffect->setAlignment( AlignVCenter ); + lEffect = new TQLabel( i18n( "Effect (appearing):" ), grp1 ); + lEffect->tqsetAlignment( AlignVCenter ); upperRow->addWidget(lEffect, 1, 0); - cEffect = new QComboBox( false, grp1, "cEffect" ); + cEffect = new TQComboBox( false, grp1, "cEffect" ); cEffect->insertItem( i18n( "No Effect" ) ); cEffect->insertItem( i18n( "Come From Right" ) ); cEffect->insertItem( i18n( "Come From Left" ) ); @@ -99,13 +99,13 @@ KPrEffectDia::KPrEffectDia( QWidget* parent, const char* name, const QPtrList<KP cEffect->setCurrentItem( static_cast<int>( obj->getEffect() ) ); upperRow->addWidget(cEffect, 1, 1); - connect( cEffect, SIGNAL( activated( int ) ), this, SLOT( appearEffectChanged( int ) ) ); + connect( cEffect, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( appearEffectChanged( int ) ) ); - lAppearSpeed = new QLabel( i18n( "Speed:" ), grp1 ); - lAppearSpeed->setAlignment( AlignVCenter ); + lAppearSpeed = new TQLabel( i18n( "Speed:" ), grp1 ); + lAppearSpeed->tqsetAlignment( AlignVCenter ); upperRow->addWidget(lAppearSpeed, 2, 0); - cAppearSpeed = new QComboBox( false, grp1, "cEffect" ); + cAppearSpeed = new TQComboBox( false, grp1, "cEffect" ); cAppearSpeed->insertItem( i18n( "Slow" ) ); cAppearSpeed->insertItem( i18n( "Medium" ) ); cAppearSpeed->insertItem( i18n( "Fast" ) ); @@ -113,11 +113,11 @@ KPrEffectDia::KPrEffectDia( QWidget* parent, const char* name, const QPtrList<KP upperRow->addWidget(cAppearSpeed, 2, 1); appearEffectChanged( cEffect->currentItem() ); - lEffect2 = new QLabel( i18n( "Effect (object specific):" ), grp1 ); - lEffect2->setAlignment( AlignVCenter ); + lEffect2 = new TQLabel( i18n( "Effect (object specific):" ), grp1 ); + lEffect2->tqsetAlignment( AlignVCenter ); upperRow->addWidget(lEffect2, 3, 0); - cEffect2 = new QComboBox( false, grp1, "cEffect2" ); + cEffect2 = new TQComboBox( false, grp1, "cEffect2" ); cEffect2->insertItem( i18n( "No Effect" ) ); upperRow->addWidget(cEffect2, 3, 1); @@ -143,8 +143,8 @@ KPrEffectDia::KPrEffectDia( QWidget* parent, const char* name, const QPtrList<KP } } - QLabel *lTimerOfAppear = new QLabel( i18n( "Timer of the object:" ), grp1 ); - lTimerOfAppear->setAlignment( AlignVCenter ); + TQLabel *lTimerOfAppear = new TQLabel( i18n( "Timer of the object:" ), grp1 ); + lTimerOfAppear->tqsetAlignment( AlignVCenter ); upperRow->addWidget( lTimerOfAppear, 4, 0 ); timerOfAppear = new KIntNumInput( obj->getAppearTimer(), grp1 ); @@ -157,64 +157,64 @@ KPrEffectDia::KPrEffectDia( QWidget* parent, const char* name, const QPtrList<KP // setup the Sound Effect stuff - appearSoundEffect = new QCheckBox( i18n( "Sound effect" ), grp1 ); + appearSoundEffect = new TQCheckBox( i18n( "Sound effect" ), grp1 ); appearSoundEffect->setChecked( obj->getAppearSoundEffect() ); upperRow->addWidget( appearSoundEffect, 5, 0 ); - connect( appearSoundEffect, SIGNAL( clicked() ), this, SLOT( appearSoundEffectChanged() ) ); + connect( appearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( appearSoundEffectChanged() ) ); - lSoundEffect1 = new QLabel( i18n( "File name:" ), grp1 ); - lSoundEffect1->setAlignment( AlignVCenter ); + lSoundEffect1 = new TQLabel( i18n( "File name:" ), grp1 ); + lSoundEffect1->tqsetAlignment( AlignVCenter ); upperRow->addWidget( lSoundEffect1, 6, 0 ); requester1 = new KURLRequester( grp1 ); requester1->setURL( obj->getAppearSoundEffectFileName() ); upperRow->addWidget( requester1, 6, 1 ); - connect( requester1, SIGNAL( openFileDialog( KURLRequester * ) ), - this, SLOT( slotRequesterClicked( KURLRequester * ) ) ); + connect( requester1, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), + this, TQT_SLOT( slotRequesterClicked( KURLRequester * ) ) ); - connect( requester1, SIGNAL( textChanged( const QString& ) ), - this, SLOT( slotAppearFileChanged( const QString& ) ) ); + connect( requester1, TQT_SIGNAL( textChanged( const TQString& ) ), + this, TQT_SLOT( slotAppearFileChanged( const TQString& ) ) ); - buttonTestPlaySoundEffect1 = new QPushButton( grp1 ); + buttonTestPlaySoundEffect1 = new TQPushButton( grp1 ); buttonTestPlaySoundEffect1->setIconSet( SmallIconSet("1rightarrow") ); - QToolTip::add( buttonTestPlaySoundEffect1, i18n("Play") ); + TQToolTip::add( buttonTestPlaySoundEffect1, i18n("Play") ); upperRow->addWidget( buttonTestPlaySoundEffect1, 6, 2 ); - connect( buttonTestPlaySoundEffect1, SIGNAL( clicked() ), this, SLOT( playSound1() ) ); + connect( buttonTestPlaySoundEffect1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound1() ) ); - buttonTestStopSoundEffect1 = new QPushButton( grp1 ); + buttonTestStopSoundEffect1 = new TQPushButton( grp1 ); buttonTestStopSoundEffect1->setIconSet( SmallIconSet("player_stop") ); - QToolTip::add( buttonTestStopSoundEffect1, i18n("Stop") ); + TQToolTip::add( buttonTestStopSoundEffect1, i18n("Stop") ); upperRow->addWidget( buttonTestStopSoundEffect1, 6, 3 ); - connect( buttonTestStopSoundEffect1, SIGNAL( clicked() ), this, SLOT( stopSound1() ) ); + connect( buttonTestStopSoundEffect1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound1() ) ); - disappear = new QCheckBox( i18n( "Disappear" ), page ); + disappear = new TQCheckBox( i18n( "Disappear" ), page ); disappear->setChecked( obj->getDisappear() ); topLayout->addWidget(disappear); - QGroupBox *grp2 = new QGroupBox(0, Qt::Vertical, i18n( "Disappear" ), page); - grp2->layout()->setSpacing(KDialog::spacingHint()); - grp2->layout()->setMargin(KDialog::marginHint()); + TQGroupBox *grp2 = new TQGroupBox(0, Qt::Vertical, i18n( "Disappear" ), page); + grp2->tqlayout()->setSpacing(KDialog::spacingHint()); + grp2->tqlayout()->setMargin(KDialog::marginHint()); topLayout->addWidget(grp2); - QGridLayout *lowerRow = new QGridLayout(grp2->layout(), 5, 4); + TQGridLayout *lowerRow = new TQGridLayout(grp2->tqlayout(), 5, 4); - lDisappear = new QLabel( i18n( "Order of disappearance:" ), grp2 ); - lDisappear->setAlignment( AlignVCenter ); + lDisappear = new TQLabel( i18n( "Order of disappearance:" ), grp2 ); + lDisappear->tqsetAlignment( AlignVCenter ); lowerRow->addWidget(lDisappear, 0, 0); - eDisappearStep = new QSpinBox( 0, 100, 1, grp2 ); + eDisappearStep = new TQSpinBox( 0, 100, 1, grp2 ); eDisappearStep->setValue( obj->getDisappearStep() ); lowerRow->addWidget(eDisappearStep, 0, 1); - lDEffect = new QLabel( i18n( "Effect (disappearing):" ), grp2 ); - lDEffect->setAlignment( AlignVCenter ); + lDEffect = new TQLabel( i18n( "Effect (disappearing):" ), grp2 ); + lDEffect->tqsetAlignment( AlignVCenter ); lowerRow->addWidget(lDEffect, 1, 0); - cDisappear = new QComboBox( false, grp2, "cDisappear" ); + cDisappear = new TQComboBox( false, grp2, "cDisappear" ); cDisappear->insertItem( i18n( "No Effect" ) ); cDisappear->insertItem( i18n( "Disappear to Right" ) ); cDisappear->insertItem( i18n( "Disappear to Left" ) ); @@ -231,13 +231,13 @@ KPrEffectDia::KPrEffectDia( QWidget* parent, const char* name, const QPtrList<KP cDisappear->setCurrentItem( static_cast<int>( obj->getEffect3() ) ); lowerRow->addWidget(cDisappear, 1, 1); - connect( cDisappear, SIGNAL( activated( int ) ), this, SLOT( disappearEffectChanged( int ) ) ); + connect( cDisappear, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( disappearEffectChanged( int ) ) ); - lDisappearSpeed = new QLabel( i18n( "Speed:" ), grp2 ); - lDisappearSpeed->setAlignment( AlignVCenter ); + lDisappearSpeed = new TQLabel( i18n( "Speed:" ), grp2 ); + lDisappearSpeed->tqsetAlignment( AlignVCenter ); lowerRow->addWidget(lDisappearSpeed, 2, 0); - cDisappearSpeed = new QComboBox( false, grp2, "cEffect" ); + cDisappearSpeed = new TQComboBox( false, grp2, "cEffect" ); cDisappearSpeed->insertItem( i18n( "Slow" ) ); cDisappearSpeed->insertItem( i18n( "Medium" ) ); cDisappearSpeed->insertItem( i18n( "Fast" ) ); @@ -246,8 +246,8 @@ KPrEffectDia::KPrEffectDia( QWidget* parent, const char* name, const QPtrList<KP //appearEffectChanged( cEffect->currentItem() ); - QLabel *lTimerOfDisappear = new QLabel( i18n( "Timer of the object:" ), grp2 ); - lTimerOfDisappear->setAlignment( AlignVCenter ); + TQLabel *lTimerOfDisappear = new TQLabel( i18n( "Timer of the object:" ), grp2 ); + lTimerOfDisappear->tqsetAlignment( AlignVCenter ); lowerRow->addWidget( lTimerOfDisappear, 3, 0 ); timerOfDisappear = new KIntNumInput( obj->getDisappearTimer(), grp2 ); @@ -260,47 +260,47 @@ KPrEffectDia::KPrEffectDia( QWidget* parent, const char* name, const QPtrList<KP // setup the Sound Effect stuff - disappearSoundEffect = new QCheckBox( i18n( "Sound effect" ), grp2 ); + disappearSoundEffect = new TQCheckBox( i18n( "Sound effect" ), grp2 ); disappearSoundEffect->setChecked( obj->getDisappearSoundEffect() ); lowerRow->addWidget( disappearSoundEffect, 4, 0 ); disappearSoundEffect->setEnabled( disappear->isChecked() ); - connect( disappearSoundEffect, SIGNAL( clicked() ), this, SLOT( disappearSoundEffectChanged() ) ); + connect( disappearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( disappearSoundEffectChanged() ) ); - lSoundEffect2 = new QLabel( i18n( "File name:" ), grp2 ); - lSoundEffect2->setAlignment( AlignVCenter ); + lSoundEffect2 = new TQLabel( i18n( "File name:" ), grp2 ); + lSoundEffect2->tqsetAlignment( AlignVCenter ); lowerRow->addWidget( lSoundEffect2, 5, 0 ); requester2 = new KURLRequester( grp2 ); requester2->setURL( obj->getDisappearSoundEffectFileName() ); lowerRow->addWidget( requester2, 5, 1 ); - connect( requester2, SIGNAL( openFileDialog( KURLRequester * ) ), - this, SLOT( slotRequesterClicked( KURLRequester * ) ) ); + connect( requester2, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), + this, TQT_SLOT( slotRequesterClicked( KURLRequester * ) ) ); - connect( requester2, SIGNAL( textChanged( const QString& ) ), - this, SLOT( slotDisappearFileChanged( const QString& ) ) ); + connect( requester2, TQT_SIGNAL( textChanged( const TQString& ) ), + this, TQT_SLOT( slotDisappearFileChanged( const TQString& ) ) ); - buttonTestPlaySoundEffect2 = new QPushButton( grp2 ); + buttonTestPlaySoundEffect2 = new TQPushButton( grp2 ); buttonTestPlaySoundEffect2->setIconSet( SmallIconSet("1rightarrow") ); - QToolTip::add( buttonTestPlaySoundEffect2, i18n("Play") ); + TQToolTip::add( buttonTestPlaySoundEffect2, i18n("Play") ); lowerRow->addWidget( buttonTestPlaySoundEffect2, 5, 2 ); - connect( buttonTestPlaySoundEffect2, SIGNAL( clicked() ), this, SLOT( playSound2() ) ); + connect( buttonTestPlaySoundEffect2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound2() ) ); - buttonTestStopSoundEffect2 = new QPushButton( grp2 ); + buttonTestStopSoundEffect2 = new TQPushButton( grp2 ); buttonTestStopSoundEffect2->setIconSet( SmallIconSet("player_stop") ); - QToolTip::add( buttonTestStopSoundEffect2, i18n("Stop") ); + TQToolTip::add( buttonTestStopSoundEffect2, i18n("Stop") ); lowerRow->addWidget( buttonTestStopSoundEffect2, 5, 3 ); - connect( buttonTestStopSoundEffect2, SIGNAL( clicked() ), this, SLOT( stopSound2() ) ); + connect( buttonTestStopSoundEffect2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound2() ) ); topLayout->activate(); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotEffectDiaOk() ) ); - connect( this, SIGNAL( okClicked() ), this, SLOT( accept() ) ); - connect( disappear, SIGNAL( clicked() ), this, SLOT( disappearChanged() ) ); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotEffectDiaOk() ) ); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); + connect( disappear, TQT_SIGNAL( clicked() ), this, TQT_SLOT( disappearChanged() ) ); disappearChanged(); appearSoundEffectChanged(); } @@ -316,7 +316,7 @@ KPrEffectDia::~KPrEffectDia() void KPrEffectDia::slotEffectDiaOk() { - QValueList<KPrEffectCmd::EffectStruct> oldEffects; + TQValueList<KPrEffectCmd::EffectStruct> oldEffects; for ( unsigned int i = 0; i < objs.count(); ++i ) { KPrObject *o = objs.at( i ); KPrEffectCmd::EffectStruct e; @@ -359,9 +359,9 @@ void KPrEffectDia::slotEffectDiaOk() accept(); } -void KPrEffectDia::resizeEvent( QResizeEvent *e ) +void KPrEffectDia::resizeEvent( TQResizeEvent *e ) { - QDialog::resizeEvent( e ); + TQDialog::resizeEvent( e ); //topLayout->resize( size() ); } @@ -423,16 +423,16 @@ void KPrEffectDia::disappearSoundEffectChanged() void KPrEffectDia::slotRequesterClicked( KURLRequester *requester ) { - QString filter = getSoundFileFilter(); + TQString filter = getSoundFileFilter(); requester->fileDialog()->setFilter( filter ); // find the first "sound"-resource that contains files - QStringList soundDirs = KGlobal::dirs()->resourceDirs( "sound" ); + TQStringList soundDirs = KGlobal::dirs()->resourceDirs( "sound" ); if ( !soundDirs.isEmpty() ) { KURL soundURL; - QDir dir; - dir.setFilter( QDir::Files | QDir::Readable ); - QStringList::ConstIterator it = soundDirs.begin(); + TQDir dir; + dir.setFilter( TQDir::Files | TQDir::Readable ); + TQStringList::ConstIterator it = soundDirs.begin(); while ( it != soundDirs.end() ) { dir = *it; if ( dir.isReadable() && dir.count() > 2 ) { @@ -445,13 +445,13 @@ void KPrEffectDia::slotRequesterClicked( KURLRequester *requester ) } } -void KPrEffectDia::slotAppearFileChanged( const QString &text ) +void KPrEffectDia::slotAppearFileChanged( const TQString &text ) { buttonTestPlaySoundEffect1->setEnabled( !text.isEmpty() ); buttonTestStopSoundEffect1->setEnabled( !text.isEmpty() ); } -void KPrEffectDia::slotDisappearFileChanged( const QString &text ) +void KPrEffectDia::slotDisappearFileChanged( const TQString &text ) { buttonTestPlaySoundEffect2->setEnabled( !text.isEmpty() ); buttonTestStopSoundEffect2->setEnabled( !text.isEmpty() ); @@ -501,22 +501,22 @@ void KPrEffectDia::stopSound2() } } -QString KPrEffectDia::getSoundFileFilter() const +TQString KPrEffectDia::getSoundFileFilter() const { - QStringList fileList; + TQStringList fileList; fileList << "wav" << "au" << "mp3" << "mp1" << "mp2" << "mpg" << "dat" << "mpeg" << "ogg" << "cdda" << "cda " << "vcd" << "null"; fileList.sort(); bool comma = false; - QString full, str; - for ( QStringList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it ) { + TQString full, str; + for ( TQStringList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it ) { if ( comma ) str += '\n'; comma = true; - str += QString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() ); + str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() ); - full += QString( "*.") + (*it) + ' '; + full += TQString( "*.") + (*it) + ' '; } str = full + '|' + i18n( "All Supported Files" ) + '\n' + str; diff --git a/kpresenter/KPrEffectDia.h b/kpresenter/KPrEffectDia.h index 7f59af0c..af0f4d00 100644 --- a/kpresenter/KPrEffectDia.h +++ b/kpresenter/KPrEffectDia.h @@ -22,55 +22,56 @@ #define EFFECTDIA_H #include <kdialogbase.h> -#include <qptrlist.h> +#include <tqptrlist.h> class KPrView; -class QWidget; -class QComboBox; -class QLabel; -class QPushButton; -class QCheckBox; -class QBoxLayout; -class QResizeEvent; -class QLineEdit; +class TQWidget; +class TQComboBox; +class TQLabel; +class TQPushButton; +class TQCheckBox; +class TQBoxLayout; +class TQResizeEvent; +class TQLineEdit; class KPrObject; class KIntNumInput; class KURLRequester; class KPrSoundPlayer; -class QSpinBox; +class TQSpinBox; class KPrEffectDia : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KPrEffectDia( QWidget* parent, const char*, const QPtrList<KPrObject> &_objs, + KPrEffectDia( TQWidget* tqparent, const char*, const TQPtrList<KPrObject> &_objs, KPrView* ); ~KPrEffectDia(); protected: - void resizeEvent( QResizeEvent *e ); + void resizeEvent( TQResizeEvent *e ); - QString getSoundFileFilter() const; + TQString getSoundFileFilter() const; - QComboBox *cEffect, *cEffect2, *cDisappear, *cAppearSpeed, *cDisappearSpeed; - QLabel *lEffect, *lEffect2, *lAppear, *lDisappear, *lDEffect, * lAppearSpeed, *lDisappearSpeed; - QSpinBox *eAppearStep,*eDisappearStep; - QCheckBox *disappear; - QBoxLayout *topLayout; + TQComboBox *cEffect, *cEffect2, *cDisappear, *cAppearSpeed, *cDisappearSpeed; + TQLabel *lEffect, *lEffect2, *lAppear, *lDisappear, *lDEffect, * lAppearSpeed, *lDisappearSpeed; + TQSpinBox *eAppearStep,*eDisappearStep; + TQCheckBox *disappear; + TQBoxLayout *topLayout; KIntNumInput *timerOfAppear, *timerOfDisappear; - QCheckBox *appearSoundEffect, *disappearSoundEffect; - QLabel *lSoundEffect1, *lSoundEffect2; + TQCheckBox *appearSoundEffect, *disappearSoundEffect; + TQLabel *lSoundEffect1, *lSoundEffect2; KURLRequester *requester1, *requester2; - QPushButton *buttonTestPlaySoundEffect1, *buttonTestStopSoundEffect1; - QPushButton *buttonTestPlaySoundEffect2, *buttonTestStopSoundEffect2; + TQPushButton *buttonTestPlaySoundEffect1, *buttonTestStopSoundEffect1; + TQPushButton *buttonTestPlaySoundEffect2, *buttonTestStopSoundEffect2; KPrSoundPlayer *soundPlayer1, *soundPlayer2; KPrView *view; - QPtrList<KPrObject> objs; + TQPtrList<KPrObject> objs; public slots: void slotEffectDiaOk(); @@ -82,8 +83,8 @@ protected slots: void appearSoundEffectChanged(); void disappearSoundEffectChanged(); void slotRequesterClicked( KURLRequester * ); - void slotAppearFileChanged( const QString& ); - void slotDisappearFileChanged( const QString& ); + void slotAppearFileChanged( const TQString& ); + void slotDisappearFileChanged( const TQString& ); void playSound1(); void playSound2(); void stopSound1(); diff --git a/kpresenter/KPrEffectHandler.cpp b/kpresenter/KPrEffectHandler.cpp index 79853dd7..ddc96d91 100644 --- a/kpresenter/KPrEffectHandler.cpp +++ b/kpresenter/KPrEffectHandler.cpp @@ -28,21 +28,21 @@ #include <KoZoomHandler.h> #include <kapplication.h> -#include <qpainter.h> -#include <qpaintdevice.h> +#include <tqpainter.h> +#include <tqpaintdevice.h> #include <unistd.h> -KPrEffectHandler::KPrEffectHandler( PresStep step, bool back, QPaintDevice *dst, QPixmap *src, - const QPtrList<KPrObject> &objects, KPrView *view, int _presSpeed ) +KPrEffectHandler::KPrEffectHandler( PresStep step, bool back, TQPaintDevice *dst, TQPixmap *src, + const TQPtrList<KPrObject> &objects, KPrView *view, int _presSpeed ) : m_effectStep(0), m_step(step), m_back(back), m_dst(dst), - m_paint(*src), m_objects(objects), m_view(view), m_soundEffect(QString::null), + m_paint(*src), m_objects(objects), m_view(view), m_soundEffect(TQString()), m_objectTimer(1) { - m_src = new QPixmap( *src ); + m_src = new TQPixmap( *src ); - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current(); ++it ) { KPrObject *object = it.current(); @@ -107,10 +107,10 @@ bool KPrEffectHandler::doEffect() } if ( !m_appearEffectObjects.isEmpty() || !m_disappearEffectObjects.isEmpty() ) { - QPtrList<QRect> m_removeRects; + TQPtrList<TQRect> m_removeRects; KPrObject *appearObject = m_appearEffectObjects.first(); KPrObject *disappearObject = m_disappearEffectObjects.first(); - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); KPrObject *object; while ( ( object = it.current() ) != 0 ) @@ -129,7 +129,7 @@ bool KPrEffectHandler::doEffect() if ( doAppearEffectStep( object ) ) { - m_removeRects.append( m_repaintRects.getLast() ); + m_removeRects.append( m_tqrepaintRects.getLast() ); if ( appearObject != m_appearEffectObjects.getLast() ) { next = false; @@ -170,31 +170,31 @@ bool KPrEffectHandler::doEffect() } ++m_effectStep; - QRect *r; + TQRect *r; #if 0 // used for debugging effects - QPtrListIterator<QRect> it_debug(m_repaintRects); + TQPtrListIterator<TQRect> it_debug(m_tqrepaintRects); while( ( r = it_debug.current() ) != 0 ) { ++it_debug; - QPainter p( &m_paint ); - QPen pen = QPen( Qt::red, 1, Qt::DashLine ); + TQPainter p( &m_paint ); + TQPen pen = TQPen( TQt::red, 1, TQt::DashLine ); p.setPen( pen ); p.drawRect( *r ); } - QPtrListIterator<QRect> it_debug2(m_lastRepaintRects); + TQPtrListIterator<TQRect> it_debug2(m_lastRepaintRects); while( ( r = it_debug2.current() ) != 0 ) { ++it_debug2; - QPainter p( &m_paint ); - QPen pen = QPen( Qt::green, 1, Qt::DashLine ); + TQPainter p( &m_paint ); + TQPen pen = TQPen( TQt::green, 1, TQt::DashLine ); p.setPen( pen ); p.drawRect( *r ); } sleep( 1 ); #endif - QPtrListIterator<QRect> it_r(m_repaintRects); + TQPtrListIterator<TQRect> it_r(m_tqrepaintRects); #if 1 while( ( r = it_r.current() ) != 0 ) { @@ -202,7 +202,7 @@ bool KPrEffectHandler::doEffect() //bitBlt( m_dst, r->x(), r->y(), &m_paint, r->x(), r->y(), r->width(), r->height() ); bitBlt( m_dst, r->x() - 5, r->y() - 5, &m_paint, r->x() - 5, r->y() - 5, r->width() + 10, r->height() + 10 ); } - QPtrListIterator<QRect> it2(m_lastRepaintRects); + TQPtrListIterator<TQRect> it2(m_lastRepaintRects); while( ( r = it2.current() ) != 0 ) { ++it2; @@ -213,15 +213,15 @@ bool KPrEffectHandler::doEffect() bitBlt( m_dst, 0, 0, &m_paint); #endif - m_lastRepaintRects = m_repaintRects; - QPtrListIterator<QRect> it3(m_removeRects); + m_lastRepaintRects = m_tqrepaintRects; + TQPtrListIterator<TQRect> it3(m_removeRects); while( ( r = it3.current() ) != 0 ) { ++it3; m_lastRepaintRects.remove( r ); } - m_repaintRects.clear(); + m_tqrepaintRects.clear(); m_paint = *m_src; @@ -240,7 +240,7 @@ void KPrEffectHandler::finish() { KPrObject *appearObject = m_appearEffectObjects.first(); KPrObject *disappearObject = m_disappearEffectObjects.first(); - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); KPrObject *object; while ( ( object = it.current() ) != 0 ) @@ -250,8 +250,8 @@ void KPrEffectHandler::finish() { bool next = true; - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - m_repaintRects.append( new QRect( objectRect ) ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + m_tqrepaintRects.append( new TQRect( objectRect ) ); if ( appearObject != m_appearEffectObjects.getLast() ) { @@ -396,8 +396,8 @@ bool KPrEffectHandler::doDisappearEffectStep( KPrObject *object ) bool KPrEffectHandler::appearNone( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - m_repaintRects.append( new QRect( objectRect ) ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + m_tqrepaintRects.append( new TQRect( objectRect ) ); drawObject( object, 0, 0, &m_paint ); return true; } @@ -405,10 +405,10 @@ bool KPrEffectHandler::appearNone( KPrObject *object ) bool KPrEffectHandler::appearComeLeft( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); - int xdiff = repaintRect.x() - ox; + int xdiff = tqrepaintRect.x() - ox; bool positionReached = false; int x = m_effectStep * m_stepWidth - objectRect.width(); @@ -417,8 +417,8 @@ bool KPrEffectHandler::appearComeLeft( KPrObject *object ) x = ox; positionReached = true; } - repaintRect.moveLeft( x + xdiff ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveLeft( x + xdiff ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeLeft x = " << x << " " << positionReached << endl; drawObject( object, x - ox, 0, &m_paint ); @@ -429,10 +429,10 @@ bool KPrEffectHandler::appearComeLeft( KPrObject *object ) bool KPrEffectHandler::appearComeTop( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int oy = objectRect.y(); - int ydiff = repaintRect.y() - oy; + int ydiff = tqrepaintRect.y() - oy; bool positionReached = false; int y = m_effectStep * m_stepHeight - objectRect.height(); @@ -441,8 +441,8 @@ bool KPrEffectHandler::appearComeTop( KPrObject *object ) y = oy; positionReached = true; } - repaintRect.moveTop( y + ydiff ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveTop( y + ydiff ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeTop y = " << y << " " << positionReached << endl; drawObject( object, 0, y - oy, &m_paint ); @@ -453,10 +453,10 @@ bool KPrEffectHandler::appearComeTop( KPrObject *object ) bool KPrEffectHandler::appearComeRight( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); - int xdiff = repaintRect.x() - ox; + int xdiff = tqrepaintRect.x() - ox; bool positionReached = false; int x = m_src->width() - m_effectStep * m_stepWidth; @@ -465,8 +465,8 @@ bool KPrEffectHandler::appearComeRight( KPrObject *object ) x = ox; positionReached = true; } - repaintRect.moveLeft( x + xdiff ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveLeft( x + xdiff ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeRight x = " << x << " " << positionReached << endl; drawObject( object, x - ox, 0, &m_paint ); @@ -477,10 +477,10 @@ bool KPrEffectHandler::appearComeRight( KPrObject *object ) bool KPrEffectHandler::appearComeBottom( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int oy = objectRect.y(); - int ydiff = repaintRect.y() - oy; + int ydiff = tqrepaintRect.y() - oy; bool positionReached = false; int y = m_src->height() - m_effectStep * m_stepHeight; @@ -489,8 +489,8 @@ bool KPrEffectHandler::appearComeBottom( KPrObject *object ) y = oy; positionReached = true; } - repaintRect.moveTop( y + ydiff ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveTop( y + ydiff ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeBottom y = " << y << " " << positionReached << endl; drawObject( object, 0, y - oy, &m_paint ); @@ -501,12 +501,12 @@ bool KPrEffectHandler::appearComeBottom( KPrObject *object ) bool KPrEffectHandler::appearComeLeftTop( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); - int xdiff = repaintRect.x() - ox; - int ydiff = repaintRect.y() - oy; + int xdiff = tqrepaintRect.x() - ox; + int ydiff = tqrepaintRect.y() - oy; bool positionReached = false; int x = m_effectStep * m_stepWidth - objectRect.width(); @@ -521,9 +521,9 @@ bool KPrEffectHandler::appearComeLeftTop( KPrObject *object ) if ( x == ox && y == oy ) positionReached = true; - repaintRect.moveLeft( x + xdiff ); - repaintRect.moveTop( y + ydiff ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveLeft( x + xdiff ); + tqrepaintRect.moveTop( y + ydiff ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeLeftTop x = " << x << ",y = " << y << " " << positionReached << endl; drawObject( object, x - ox, y - oy, &m_paint ); @@ -534,12 +534,12 @@ bool KPrEffectHandler::appearComeLeftTop( KPrObject *object ) bool KPrEffectHandler::appearComeLeftBottom( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); - int xdiff = repaintRect.x() - ox; - int ydiff = repaintRect.y() - oy; + int xdiff = tqrepaintRect.x() - ox; + int ydiff = tqrepaintRect.y() - oy; bool positionReached = false; int x = m_effectStep * m_stepWidth - objectRect.width(); @@ -554,9 +554,9 @@ bool KPrEffectHandler::appearComeLeftBottom( KPrObject *object ) if ( x == ox && y == oy ) positionReached = true; - repaintRect.moveLeft( x + xdiff ); - repaintRect.moveTop( y + ydiff ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveLeft( x + xdiff ); + tqrepaintRect.moveTop( y + ydiff ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeLeftBottom x = " << x << ",y = " << y << " " << positionReached << endl; drawObject( object, x - ox, y - oy, &m_paint ); @@ -567,12 +567,12 @@ bool KPrEffectHandler::appearComeLeftBottom( KPrObject *object ) bool KPrEffectHandler::appearComeRightTop( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); - int xdiff = repaintRect.x() - ox; - int ydiff = repaintRect.y() - oy; + int xdiff = tqrepaintRect.x() - ox; + int ydiff = tqrepaintRect.y() - oy; bool positionReached = false; int x = m_src->width() - m_effectStep * m_stepWidth; @@ -587,9 +587,9 @@ bool KPrEffectHandler::appearComeRightTop( KPrObject *object ) if ( x == ox && y == oy ) positionReached = true; - repaintRect.moveLeft( x + xdiff ); - repaintRect.moveTop( y + ydiff ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveLeft( x + xdiff ); + tqrepaintRect.moveTop( y + ydiff ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeRightTop x = " << x << ",y = " << y << " " << positionReached << endl; drawObject( object, x - ox, y - oy, &m_paint ); @@ -600,12 +600,12 @@ bool KPrEffectHandler::appearComeRightTop( KPrObject *object ) bool KPrEffectHandler::appearComeRightBottom( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); - int xdiff = repaintRect.x() - ox; - int ydiff = repaintRect.y() - oy; + int xdiff = tqrepaintRect.x() - ox; + int ydiff = tqrepaintRect.y() - oy; bool positionReached = false; int x = m_src->width() - m_effectStep * m_stepWidth; @@ -620,9 +620,9 @@ bool KPrEffectHandler::appearComeRightBottom( KPrObject *object ) if ( x == ox && y == oy ) positionReached = true; - repaintRect.moveLeft( x + xdiff ); - repaintRect.moveTop( y + ydiff ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveLeft( x + xdiff ); + tqrepaintRect.moveTop( y + ydiff ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler appearComeRightBottom x = " << x << ",y = " << y << " " << positionReached << endl; drawObject( object, x - ox, y - oy, &m_paint ); @@ -633,8 +633,8 @@ bool KPrEffectHandler::appearComeRightBottom( KPrObject *object ) bool KPrEffectHandler::appearWipeLeft( KPrObject *object ) { - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int ow = repaintRect.width(); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int ow = tqrepaintRect.width(); bool positionReached = false; int w = m_effectStep * m_stepWidth; @@ -644,17 +644,17 @@ bool KPrEffectHandler::appearWipeLeft( KPrObject *object ) positionReached = true; } - repaintRect.setWidth( w ); - m_repaintRects.append( new QRect( repaintRect ) ); - drawObject( object, 0, 0, &m_paint, &repaintRect ); + tqrepaintRect.setWidth( w ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft w = " << w << positionReached << endl; return positionReached; } bool KPrEffectHandler::appearWipeRight( KPrObject *object ) { - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int ow = repaintRect.width(); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int ow = tqrepaintRect.width(); bool positionReached = false; int w = m_effectStep * m_stepWidth; @@ -664,9 +664,9 @@ bool KPrEffectHandler::appearWipeRight( KPrObject *object ) positionReached = true; } - repaintRect.setLeft( repaintRect.right() - w ); - m_repaintRects.append( new QRect( repaintRect ) ); - drawObject( object, 0, 0, &m_paint, &repaintRect ); + tqrepaintRect.setLeft( tqrepaintRect.right() - w ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft w = " << w << positionReached << endl; return positionReached; } @@ -674,8 +674,8 @@ bool KPrEffectHandler::appearWipeRight( KPrObject *object ) bool KPrEffectHandler::appearWipeTop( KPrObject *object ) { - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int oh = repaintRect.height(); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int oh = tqrepaintRect.height(); bool positionReached = false; int h = m_effectStep * m_stepHeight; @@ -685,9 +685,9 @@ bool KPrEffectHandler::appearWipeTop( KPrObject *object ) positionReached = true; } - repaintRect.setHeight( h ); - m_repaintRects.append( new QRect( repaintRect ) ); - drawObject( object, 0, 0, &m_paint, &repaintRect ); + tqrepaintRect.setHeight( h ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft h = " << h << positionReached << endl; return positionReached; } @@ -695,8 +695,8 @@ bool KPrEffectHandler::appearWipeTop( KPrObject *object ) bool KPrEffectHandler::appearWipeBottom( KPrObject *object ) { - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int oh = repaintRect.height(); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int oh = tqrepaintRect.height(); bool positionReached = false; int h = m_effectStep * m_stepHeight; @@ -706,9 +706,9 @@ bool KPrEffectHandler::appearWipeBottom( KPrObject *object ) positionReached = true; } - repaintRect.setTop( repaintRect.bottom() - h ); - m_repaintRects.append( new QRect( repaintRect ) ); - drawObject( object, 0, 0, &m_paint, &repaintRect ); + tqrepaintRect.setTop( tqrepaintRect.bottom() - h ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft h = " << h << positionReached << endl; return positionReached; } @@ -716,8 +716,8 @@ bool KPrEffectHandler::appearWipeBottom( KPrObject *object ) bool KPrEffectHandler::disappearGoLeft( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); bool positionReached = false; @@ -728,8 +728,8 @@ bool KPrEffectHandler::disappearGoLeft( KPrObject *object ) } else { - repaintRect.moveBy( -x, 0 ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveBy( -x, 0 ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoLeft x = " << -x + ox << " " << positionReached << endl; drawObject( object, -x, 0, &m_paint ); } @@ -740,8 +740,8 @@ bool KPrEffectHandler::disappearGoLeft( KPrObject *object ) bool KPrEffectHandler::disappearGoTop( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int oy = objectRect.y(); bool positionReached = false; @@ -752,8 +752,8 @@ bool KPrEffectHandler::disappearGoTop( KPrObject *object ) } else { - repaintRect.moveBy( 0, -y ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveBy( 0, -y ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoTop y = " << -y + oy << " " << positionReached << endl; drawObject( object, 0, -y, &m_paint ); } @@ -765,7 +765,7 @@ bool KPrEffectHandler::disappearGoTop( KPrObject *object ) bool KPrEffectHandler::disappearGoRight( KPrObject *object ) { int ox = m_view->zoomHandler()->zoomItX( object->getRealRect().x() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); bool positionReached = false; int x = m_effectStep * m_stepWidth; @@ -775,8 +775,8 @@ bool KPrEffectHandler::disappearGoRight( KPrObject *object ) } else { - repaintRect.moveBy( x, 0 ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveBy( x, 0 ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoRight x = " << x + ox << " " << positionReached << endl; drawObject( object, x, 0, &m_paint ); } @@ -788,7 +788,7 @@ bool KPrEffectHandler::disappearGoRight( KPrObject *object ) bool KPrEffectHandler::disappearGoBottom( KPrObject *object ) { int oy = m_view->zoomHandler()->zoomItY( object->getRealRect().y() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); bool positionReached = false; int y = m_effectStep * m_stepHeight; @@ -798,8 +798,8 @@ bool KPrEffectHandler::disappearGoBottom( KPrObject *object ) } else { - repaintRect.moveBy( 0, y ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveBy( 0, y ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoBottom y = " << y + oy << " " << positionReached << endl; drawObject( object, 0, y, &m_paint ); } @@ -810,8 +810,8 @@ bool KPrEffectHandler::disappearGoBottom( KPrObject *object ) bool KPrEffectHandler::disappearGoLeftTop( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); @@ -824,8 +824,8 @@ bool KPrEffectHandler::disappearGoLeftTop( KPrObject *object ) } else { - repaintRect.moveBy( -x, -y ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveBy( -x, -y ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoLeftTop x = " << -x + ox << ", y = " << -y + oy << positionReached << endl; drawObject( object, -x, -y, &m_paint ); } @@ -836,8 +836,8 @@ bool KPrEffectHandler::disappearGoLeftTop( KPrObject *object ) bool KPrEffectHandler::disappearGoLeftBottom( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); @@ -850,8 +850,8 @@ bool KPrEffectHandler::disappearGoLeftBottom( KPrObject *object ) } else { - repaintRect.moveBy( -x, y ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveBy( -x, y ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoLeftTop x = " << -x + ox << ", y = " << y + oy << positionReached << endl; drawObject( object, -x, y, &m_paint ); } @@ -862,8 +862,8 @@ bool KPrEffectHandler::disappearGoLeftBottom( KPrObject *object ) bool KPrEffectHandler::disappearGoRightTop( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); @@ -876,8 +876,8 @@ bool KPrEffectHandler::disappearGoRightTop( KPrObject *object ) } else { - repaintRect.moveBy( x, -y ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveBy( x, -y ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoLeftTop x = " << x + ox << ", y = " << -y + oy << positionReached << endl; drawObject( object, x, -y, &m_paint ); } @@ -888,8 +888,8 @@ bool KPrEffectHandler::disappearGoRightTop( KPrObject *object ) bool KPrEffectHandler::disappearGoRightBottom( KPrObject *object ) { - QRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + TQRect objectRect = m_view->zoomHandler()->zoomRect( object->getRealRect() ); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); int ox = objectRect.x(); int oy = objectRect.y(); @@ -902,8 +902,8 @@ bool KPrEffectHandler::disappearGoRightBottom( KPrObject *object ) } else { - repaintRect.moveBy( x, y ); - m_repaintRects.append( new QRect( repaintRect ) ); + tqrepaintRect.moveBy( x, y ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); //kdDebug(33001) << "KPrEffectHandler disappearGoLeftTop x = " << x + ox << ", y = " << y + oy << positionReached << endl; drawObject( object, x, y, &m_paint ); } @@ -914,8 +914,8 @@ bool KPrEffectHandler::disappearGoRightBottom( KPrObject *object ) bool KPrEffectHandler::disappearWipeLeft( KPrObject *object ) { - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int ow = repaintRect.width(); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int ow = tqrepaintRect.width(); bool positionReached = false; int w = ow - m_effectStep * m_stepWidth; @@ -925,9 +925,9 @@ bool KPrEffectHandler::disappearWipeLeft( KPrObject *object ) } else { - repaintRect.setWidth( w ); - m_repaintRects.append( new QRect( repaintRect ) ); - drawObject( object, 0, 0, &m_paint, &repaintRect ); + tqrepaintRect.setWidth( w ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft w = " << w << positionReached << endl; } return positionReached; @@ -936,8 +936,8 @@ bool KPrEffectHandler::disappearWipeLeft( KPrObject *object ) bool KPrEffectHandler::disappearWipeRight( KPrObject *object ) { - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int ow = repaintRect.width(); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int ow = tqrepaintRect.width(); bool positionReached = false; int w = ow - m_effectStep * m_stepWidth; @@ -947,9 +947,9 @@ bool KPrEffectHandler::disappearWipeRight( KPrObject *object ) } else { - repaintRect.setLeft( repaintRect.right() - w ); - m_repaintRects.append( new QRect( repaintRect ) ); - drawObject( object, 0, 0, &m_paint, &repaintRect ); + tqrepaintRect.setLeft( tqrepaintRect.right() - w ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft w = " << w << positionReached << endl; } return positionReached; @@ -958,8 +958,8 @@ bool KPrEffectHandler::disappearWipeRight( KPrObject *object ) bool KPrEffectHandler::disappearWipeTop( KPrObject *object ) { - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int oh = repaintRect.height(); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int oh = tqrepaintRect.height(); bool positionReached = false; int h = oh - m_effectStep * m_stepHeight; @@ -969,9 +969,9 @@ bool KPrEffectHandler::disappearWipeTop( KPrObject *object ) } else { - repaintRect.setHeight( h ); - m_repaintRects.append( new QRect( repaintRect ) ); - drawObject( object, 0, 0, &m_paint, &repaintRect ); + tqrepaintRect.setHeight( h ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft h = " << h << positionReached << endl; } return positionReached; @@ -980,8 +980,8 @@ bool KPrEffectHandler::disappearWipeTop( KPrObject *object ) bool KPrEffectHandler::disappearWipeBottom( KPrObject *object ) { - QRect repaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); - int oh = repaintRect.height(); + TQRect tqrepaintRect = m_view->zoomHandler()->zoomRect( object->getRepaintRect() ); + int oh = tqrepaintRect.height(); bool positionReached = false; int h = oh - m_effectStep * m_stepHeight; @@ -991,22 +991,22 @@ bool KPrEffectHandler::disappearWipeBottom( KPrObject *object ) } else { - repaintRect.setTop( repaintRect.bottom() - h ); - m_repaintRects.append( new QRect( repaintRect ) ); - drawObject( object, 0, 0, &m_paint, &repaintRect ); + tqrepaintRect.setTop( tqrepaintRect.bottom() - h ); + m_tqrepaintRects.append( new TQRect( tqrepaintRect ) ); + drawObject( object, 0, 0, &m_paint, &tqrepaintRect ); //kdDebug(33001) << "KPrEffectHandler appearWipeLeft h = " << h << positionReached << endl; } return positionReached; } -void KPrEffectHandler::drawObject( KPrObject *object, int x, int y, QPixmap *screen, QRect *clipRect ) +void KPrEffectHandler::drawObject( KPrObject *object, int x, int y, TQPixmap *screen, TQRect *clipRect ) { - QPainter p; + TQPainter p; p.begin( screen ); if ( clipRect ) { - p.setClipRect( *clipRect, QPainter::CoordPainter ); + p.setClipRect( *clipRect, TQPainter::CoordPainter ); } p.translate( x, y ); @@ -1028,14 +1028,14 @@ void KPrEffectHandler::drawObject( KPrObject *object, int x, int y, QPixmap *scr p.translate( -x, -y ); // redraw objects which lie above the currenty drawn - m_objects.findRef( object ); + m_objects.tqfindRef( object ); KPrObject *obj; while ( ( obj = m_objects.next() ) != 0 ) { if ( ( obj->getAppearStep() < m_step.m_step - || obj->getAppearStep() == m_step.m_step && !m_appearEffectObjects.containsRef( obj ) ) + || obj->getAppearStep() == m_step.m_step && !m_appearEffectObjects.tqcontainsRef( obj ) ) && ( ( obj->getDisappear() && obj->getDisappearStep() > m_step.m_step ) || ! obj->getDisappear() ) - && m_view->zoomHandler()->zoomRect( obj->getRealRect()).intersects(*m_repaintRects.getLast()) ) + && m_view->zoomHandler()->zoomRect( obj->getRealRect()).intersects(*m_tqrepaintRects.getLast()) ) { if ( obj->getAppearStep() == m_step.m_step && ! m_back ) { diff --git a/kpresenter/KPrEffectHandler.h b/kpresenter/KPrEffectHandler.h index 8128b264..877ed2f0 100644 --- a/kpresenter/KPrEffectHandler.h +++ b/kpresenter/KPrEffectHandler.h @@ -21,14 +21,14 @@ #ifndef EFFECTHANDLER_H #define EFFECTHANDLER_H -#include <qpixmap.h> -#include <qptrlist.h> -#include <qstring.h> +#include <tqpixmap.h> +#include <tqptrlist.h> +#include <tqstring.h> #include "global.h" #include "presstep.h" -class QPaintDevice; +class TQPaintDevice; class KPrObject; class KPrView; @@ -45,7 +45,7 @@ public: * objects all objects of the page * view pointer to the active KPrView */ - KPrEffectHandler( PresStep step, bool back, QPaintDevice *dst, QPixmap *src, const QPtrList<KPrObject> &objects, KPrView *view, int _presSpeed ); + KPrEffectHandler( PresStep step, bool back, TQPaintDevice *dst, TQPixmap *src, const TQPtrList<KPrObject> &objects, KPrView *view, int _presSpeed ); /** * Delete the KPrEffectHandler. @@ -253,7 +253,7 @@ protected: * Draws the object object to the pixmap screen with the offset defined * in x and y. If clipRect is set the only the clipRect will be painted. */ - void drawObject( KPrObject *object, int x, int y, QPixmap *screen, QRect *clipRect = 0 ); + void drawObject( KPrObject *object, int x, int y, TQPixmap *screen, TQRect *clipRect = 0 ); /** * The internal step of the effect. This is used to calculate the position @@ -274,37 +274,37 @@ protected: /** * Paint device on which the effects will be displayed */ - QPaintDevice *m_dst; + TQPaintDevice *m_dst; /** * Pixmap used as source for displaying on. * m_src contains all objects which are allready on the * final position. */ - QPixmap *m_src; + TQPixmap *m_src; /** * Is used for printing all objects before bitblt to m_dst */ - QPixmap m_paint; + TQPixmap m_paint; /** * List of all objects of the current page */ - QPtrList<KPrObject> m_objects; + TQPtrList<KPrObject> m_objects; /** * List of all objects which appear in the current step. * If a object has reached its final position it is removed from * this list */ - QPtrList<KPrObject> m_appearEffectObjects; + TQPtrList<KPrObject> m_appearEffectObjects; /** * List of all objects which disappear in the current step. * If a object has disappeared it is removed from this list */ - QPtrList<KPrObject> m_disappearEffectObjects; + TQPtrList<KPrObject> m_disappearEffectObjects; /// the active KPrView KPrView *m_view; @@ -322,18 +322,18 @@ protected: /** * The rects which have to be bitblt */ - QPtrList<QRect> m_repaintRects; + TQPtrList<TQRect> m_tqrepaintRects; /** * The rects which have to be bitblt as the objects * are no longer there. */ - QPtrList<QRect> m_lastRepaintRects; + TQPtrList<TQRect> m_lastRepaintRects; /** * The filename of the sound file which should be played during the effect. */ - QString m_soundEffect; + TQString m_soundEffect; /** * Used the set the autopresentation timer. diff --git a/kpresenter/KPrEllipseObject.cpp b/kpresenter/KPrEllipseObject.cpp index d20f540f..c1209775 100644 --- a/kpresenter/KPrEllipseObject.cpp +++ b/kpresenter/KPrEllipseObject.cpp @@ -23,11 +23,11 @@ #include "KPrGradient.h" #include <kdebug.h> -#include <qbitmap.h> -#include <qregion.h> -#include <qdom.h> -#include <qpicture.h> -#include <qpainter.h> +#include <tqbitmap.h> +#include <tqregion.h> +#include <tqdom.h> +#include <tqpicture.h> +#include <tqpainter.h> #include <KoTextZoomHandler.h> #include <KoOasisContext.h> @@ -38,8 +38,8 @@ KPrEllipseObject::KPrEllipseObject() { } -KPrEllipseObject::KPrEllipseObject( const KoPen &_pen, const QBrush &_brush, FillType _fillType, - const QColor &_gColor1, const QColor &_gColor2, BCType _gType, +KPrEllipseObject::KPrEllipseObject( const KoPen &_pen, const TQBrush &_brush, FillType _fillType, + const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType, bool _unbalanced, int _xfactor, int _yfactor) : KPr2DObject( _pen, _brush, _fillType, _gColor1, _gColor2, _gType, _unbalanced, _xfactor, _yfactor ) { @@ -57,23 +57,23 @@ DCOPObject* KPrEllipseObject::dcopObject() return dcop; } -void KPrEllipseObject::paint( QPainter* _painter, KoTextZoomHandler *_zoomHandler, +void KPrEllipseObject::paint( TQPainter* _painter, KoTextZoomHandler *_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour ) { int ow = _zoomHandler->zoomItX( ext.width() ); int oh = _zoomHandler->zoomItY( ext.height() ); - QSize size( _zoomHandler->zoomSize( ext ) ); + TQSize size( _zoomHandler->zoomSize( ext ) ); if ( drawContour ) { - QPen pen3( Qt::black, 1, Qt::DotLine ); + TQPen pen3( TQt::black, 1, TQt::DotLine ); _painter->setPen( pen3 ); - _painter->setRasterOp( Qt::NotXorROP ); + _painter->setRasterOp( TQt::NotXorROP ); _painter->drawEllipse( 0, 0, ow, oh ); return; } - QPen pen2 = pen.zoomedPen( _zoomHandler ); - int pw = ( pen2.style() == Qt::NoPen ) ? 1 : pen2.width(); + TQPen pen2 = pen.zoomedPen( _zoomHandler ); + int pw = ( pen2.style() == TQt::NoPen ) ? 1 : pen2.width(); _painter->setPen( pen2 ); if ( drawingShadow || getFillType() == FT_BRUSH || !gradient ) @@ -82,10 +82,10 @@ void KPrEllipseObject::paint( QPainter* _painter, KoTextZoomHandler *_zoomHandle if ( m_redrawGradientPix || gradient->size() != size ) { m_redrawGradientPix = false; gradient->setSize( size ); - QRegion clipregion( 0, 0, ow - pw + 1, oh - pw + 1, QRegion::Ellipse ); + TQRegion clipregion( 0, 0, ow - pw + 1, oh - pw + 1, TQRegion::Ellipse ); m_gradientPix.resize ( ow, oh ); - m_gradientPix.fill( Qt::white ); - QPainter p; + m_gradientPix.fill( TQt::white ); + TQPainter p; p.begin( &m_gradientPix ); p.setClipRegion( clipregion ); p.drawPixmap( 0, 0, gradient->pixmap() ); @@ -96,7 +96,7 @@ void KPrEllipseObject::paint( QPainter* _painter, KoTextZoomHandler *_zoomHandle _painter->drawPixmap( pw / 2, pw / 2, m_gradientPix, 0, 0, ow - pw + 1, oh - pw + 1 ); - _painter->setBrush( Qt::NoBrush ); + _painter->setBrush( TQt::NoBrush ); } _painter->drawEllipse( pw / 2, pw / 2, ow - pw + 1, oh - pw + 1 ); } diff --git a/kpresenter/KPrEllipseObject.h b/kpresenter/KPrEllipseObject.h index 36349b8c..58692a1a 100644 --- a/kpresenter/KPrEllipseObject.h +++ b/kpresenter/KPrEllipseObject.h @@ -28,15 +28,15 @@ #include "global.h" class KPrGradient; -class QPainter; +class TQPainter; class DCOPObject; class KPrEllipseObject : public KPr2DObject { public: KPrEllipseObject(); - KPrEllipseObject( const KoPen &_pen, const QBrush &_brush, FillType _fillType, - const QColor &_gColor1, const QColor &_gColor2, BCType _gType, + KPrEllipseObject( const KoPen &_pen, const TQBrush &_brush, FillType _fillType, + const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType, bool _unbalanced, int _xfactor, int _yfactor ); virtual ~KPrEllipseObject() {} @@ -47,7 +47,7 @@ public: virtual ObjType getType() const { return OT_ELLIPSE; } - virtual QString getTypeString() const + virtual TQString getTypeString() const { return i18n("Ellipse"); } virtual KoSize getRealSize() const; @@ -56,7 +56,7 @@ protected: virtual const char * getOasisElementName() const; virtual bool saveOasisObjectAttributes( KPOasisSaveContext &sc ) const; - virtual void paint( QPainter *_painter,KoTextZoomHandler *_zoomHandler, + virtual void paint( TQPainter *_painter,KoTextZoomHandler *_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour = FALSE ); }; diff --git a/kpresenter/KPrFactory.cpp b/kpresenter/KPrFactory.cpp index 7fb6ebcd..96f71348 100644 --- a/kpresenter/KPrFactory.cpp +++ b/kpresenter/KPrFactory.cpp @@ -29,8 +29,8 @@ KInstance* KPrFactory::s_global = 0; KAboutData* KPrFactory::s_aboutData = 0; -KPrFactory::KPrFactory( QObject* parent, const char* name ) - : KoFactory( parent, name ) +KPrFactory::KPrFactory( TQObject* tqparent, const char* name ) + : KoFactory( tqparent, name ) { (void)global(); } @@ -43,12 +43,12 @@ KPrFactory::~KPrFactory() s_global=0; } -KParts::Part* KPrFactory::createPartObject( QWidget *parentWidget, const char *widgetName, QObject* parent, - const char* name, const char* classname, const QStringList & ) +KParts::Part* KPrFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, + const char* name, const char* classname, const TQStringList & ) { bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); - KPrDocument *doc = new KPrDocument( parentWidget, widgetName, parent, name, !bWantKoDocument ); + KPrDocument *doc = new KPrDocument( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument ); if ( !bWantKoDocument ) doc->setReadWrite( false ); diff --git a/kpresenter/KPrFactory.h b/kpresenter/KPrFactory.h index 35f1a601..6735ac15 100644 --- a/kpresenter/KPrFactory.h +++ b/kpresenter/KPrFactory.h @@ -27,13 +27,14 @@ class KAboutData; class KPrFactory : public KoFactory { Q_OBJECT + TQ_OBJECT public: - KPrFactory( QObject* parent = 0, const char* name = 0 ); + KPrFactory( TQObject* tqparent = 0, const char* name = 0 ); ~KPrFactory(); - virtual KParts::Part *createPartObject( QWidget *parentWidget = 0, const char *widgetName = 0, QObject *parent = 0, + virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", - const QStringList &args = QStringList() ); + const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/kpresenter/KPrFindReplace.cpp b/kpresenter/KPrFindReplace.cpp index ba268f00..59a5fcfe 100644 --- a/kpresenter/KPrFindReplace.cpp +++ b/kpresenter/KPrFindReplace.cpp @@ -29,16 +29,16 @@ #include <KoSearchDia.h> #include "KPrTextDocument.h" -KPrFindReplace::KPrFindReplace( QWidget* parent, KPrCanvas * canvas, KoSearchDia * dialog, - const QValueList<KoTextObject *> & lstObjects, KPrTextView *textView) - : KoFindReplace( parent, dialog, lstObjects, textView ) +KPrFindReplace::KPrFindReplace( TQWidget* tqparent, KPrCanvas * canvas, KoSearchDia * dialog, + const TQValueList<KoTextObject *> & lstObjects, KPrTextView *textView) + : KoFindReplace( tqparent, dialog, lstObjects, textView ) { m_canvas = canvas; } -KPrFindReplace::KPrFindReplace( QWidget* parent, KPrCanvas * canvas, KoReplaceDia * dialog, - const QValueList<KoTextObject *> & lstObjects, KPrTextView *textView ) - : KoFindReplace( parent, dialog, lstObjects, textView ) +KPrFindReplace::KPrFindReplace( TQWidget* tqparent, KPrCanvas * canvas, KoReplaceDia * dialog, + const TQValueList<KoTextObject *> & lstObjects, KPrTextView *textView ) + : KoFindReplace( tqparent, dialog, lstObjects, textView ) { m_canvas = canvas; } @@ -55,10 +55,10 @@ void KPrFindReplace::emitNewCommand(KCommand *cmd) void KPrFindReplace::highlightPortion(KoTextParag * parag, int index, int length, KoTextDocument *_textdoc, KDialogBase* dialog) { - bool repaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true; + bool tqrepaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true; KPrTextDocument *textdoc = static_cast<KPrTextDocument *>(_textdoc); KPrTextObject* textobj = textdoc->textObject(); - textobj->highlightPortion( parag, index, length, m_canvas, repaint, dialog ); + textobj->highlightPortion( parag, index, length, m_canvas, tqrepaint, dialog ); } #include "KPrFindReplace.moc" diff --git a/kpresenter/KPrFindReplace.h b/kpresenter/KPrFindReplace.h index 87f2799b..7754aa39 100644 --- a/kpresenter/KPrFindReplace.h +++ b/kpresenter/KPrFindReplace.h @@ -35,22 +35,23 @@ class KPrTextView; class KPrFindReplace; class KCommand; /** - * This class implements the 'find' functionality ( the "search next, prompt" loop ) - * and the 'replace' functionality. Same class, to allow centralizing the code that + * This class implements the 'tqfind' functionality ( the "search next, prompt" loop ) + * and the 'tqreplace' functionality. Same class, to allow centralizing the code that * finds the framesets and paragraphs to look into. */ class KPrFindReplace : public KoFindReplace { Q_OBJECT + TQ_OBJECT public: /** - * The parent widget can't be the canvas, otherwise the 'find next' dialog + * The tqparent widget can't be the canvas, otherwise the 'find next' dialog * scrolls up/down when using the scrollbars (hehe, cool effect). */ - KPrFindReplace( QWidget* parent, KPrCanvas * canvas, KoSearchDia * dialog, - const QValueList<KoTextObject *> & lstObjects, KPrTextView *textView ); - KPrFindReplace( QWidget* parent, KPrCanvas * canvas, KoReplaceDia * dialog, - const QValueList<KoTextObject *> & lstObjects, KPrTextView *textView ); + KPrFindReplace( TQWidget* tqparent, KPrCanvas * canvas, KoSearchDia * dialog, + const TQValueList<KoTextObject *> & lstObjects, KPrTextView *textView ); + KPrFindReplace( TQWidget* tqparent, KPrCanvas * canvas, KoReplaceDia * dialog, + const TQValueList<KoTextObject *> & lstObjects, KPrTextView *textView ); ~KPrFindReplace(); virtual void emitNewCommand(KCommand *); diff --git a/kpresenter/KPrFreehandObject.cpp b/kpresenter/KPrFreehandObject.cpp index 662c9a3c..077b9eed 100644 --- a/kpresenter/KPrFreehandObject.cpp +++ b/kpresenter/KPrFreehandObject.cpp @@ -22,9 +22,9 @@ #include "KPrFreehandObject.h" #include "KPrUtils.h" #include <KoTextZoomHandler.h> -#include <qpainter.h> -#include <qwmatrix.h> -#include <qdom.h> +#include <tqpainter.h> +#include <tqwmatrix.h> +#include <tqdom.h> #include <kdebug.h> #include <math.h> @@ -59,20 +59,20 @@ bool KPrFreehandObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) cons { // the rect for the view box have to be the rect and not the real rect KoRect rect( getRect() ); - sc.xmlWriter.addAttribute("svg:viewBox", QString( "0 0 %1 %2" ).arg( int( rect.width() * 100 ) ) - .arg( int( rect.height() * 100 ) ) ); + sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( int( rect.width() * 100 ) ) + .tqarg( int( rect.height() * 100 ) ) ); unsigned int pointCount = points.count(); unsigned int pos = 0; - QString d; - d += QString( "M%1 %2" ).arg( int( points.at(pos).x() * 100 ) ) - .arg( int( points.at(pos).y() * 100 ) ); + TQString d; + d += TQString( "M%1 %2" ).tqarg( int( points.at(pos).x() * 100 ) ) + .tqarg( int( points.at(pos).y() * 100 ) ); ++pos; while ( pos < pointCount ) { - d += QString( "L%1 %2" ).arg( int( points.at( pos ).x() * 100 ) ) - .arg( int( points.at( pos ).y() * 100 ) ); + d += TQString( "L%1 %2" ).tqarg( int( points.at( pos ).x() * 100 ) ) + .tqarg( int( points.at( pos ).y() * 100 ) ); ++pos; } @@ -86,7 +86,7 @@ const char * KPrFreehandObject::getOasisElementName() const return "draw:path"; } -void KPrFreehandObject::loadOasis( const QDomElement &element, KoOasisContext & context, KPrLoadingInfo* info ) +void KPrFreehandObject::loadOasis( const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo* info ) { kdDebug(33001) << "KPrFreehandObject::loadOasis" << endl; KPrPointObject::loadOasis( element, context, info ); @@ -95,12 +95,12 @@ void KPrFreehandObject::loadOasis( const QDomElement &element, KoOasisContext & loadOasisMarker( context ); } -QDomDocumentFragment KPrFreehandObject::save( QDomDocument& doc,double offset ) +TQDomDocumentFragment KPrFreehandObject::save( TQDomDocument& doc,double offset ) { return KPrPointObject::save( doc, offset ); } -double KPrFreehandObject::load( const QDomElement &element ) +double KPrFreehandObject::load( const TQDomElement &element ) { return KPrPointObject::load( element ); } diff --git a/kpresenter/KPrFreehandObject.h b/kpresenter/KPrFreehandObject.h index 17bab0b7..a515488d 100644 --- a/kpresenter/KPrFreehandObject.h +++ b/kpresenter/KPrFreehandObject.h @@ -24,7 +24,7 @@ #include "KPrPointObject.h" -class QPainter; +class TQPainter; class DCOPObject; class KoXmlWriter; @@ -40,11 +40,11 @@ public: KPrFreehandObject &operator=( const KPrFreehandObject & ); virtual ObjType getType() const { return OT_FREEHAND; } - virtual QString getTypeString() const { return i18n("Freehand"); } + virtual TQString getTypeString() const { return i18n("Freehand"); } - virtual QDomDocumentFragment save( QDomDocument& doc,double offset ); - virtual double load( const QDomElement &element ); - virtual void loadOasis( const QDomElement &element, KoOasisContext & context, KPrLoadingInfo* info ); + virtual TQDomDocumentFragment save( TQDomDocument& doc,double offset ); + virtual double load( const TQDomElement &element ); + virtual void loadOasis( const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo* info ); protected: virtual const char * getOasisElementName() const; diff --git a/kpresenter/KPrFreehandObjectIface.cpp b/kpresenter/KPrFreehandObjectIface.cpp index 8aab6f98..19843a1b 100644 --- a/kpresenter/KPrFreehandObjectIface.cpp +++ b/kpresenter/KPrFreehandObjectIface.cpp @@ -32,23 +32,23 @@ KPrFreehandObjectIface::KPrFreehandObjectIface( KPrFreehandObject *_obj ) obj = _obj; } -void KPrFreehandObjectIface::setLineBegin( const QString & type) +void KPrFreehandObjectIface::setLineBegin( const TQString & type) { obj->setLineBegin(lineEndBeginFromString( type )); } -void KPrFreehandObjectIface::setLineEnd( const QString & type) +void KPrFreehandObjectIface::setLineEnd( const TQString & type) { obj->setLineEnd(lineEndBeginFromString( type )); } -QString KPrFreehandObjectIface::lineBegin()const +TQString KPrFreehandObjectIface::lineBegin()const { LineEnd type=obj->getLineBegin(); return lineEndBeginName( type ); } -QString KPrFreehandObjectIface::lineEnd() const +TQString KPrFreehandObjectIface::lineEnd() const { LineEnd type=obj->getLineEnd(); return lineEndBeginName( type ); @@ -56,12 +56,12 @@ QString KPrFreehandObjectIface::lineEnd() const void KPrFreehandObjectIface::horizontalFlip() { - //todo repaint it + //todo tqrepaint it obj->flip(true ); } void KPrFreehandObjectIface::verticalFlip() { - //todo repaint it + //todo tqrepaint it obj->flip( false ); } diff --git a/kpresenter/KPrFreehandObjectIface.h b/kpresenter/KPrFreehandObjectIface.h index 2ead4e5a..6e13134d 100644 --- a/kpresenter/KPrFreehandObjectIface.h +++ b/kpresenter/KPrFreehandObjectIface.h @@ -24,7 +24,7 @@ #include <dcopobject.h> #include <dcopref.h> #include "KPrObjectIface.h" -#include <qstring.h> +#include <tqstring.h> class KPrFreehandObject; @@ -36,10 +36,10 @@ public: k_dcop: - void setLineBegin( const QString & ); - void setLineEnd( const QString & ); - QString lineBegin()const; - QString lineEnd() const; + void setLineBegin( const TQString & ); + void setLineEnd( const TQString & ); + TQString lineBegin()const; + TQString lineEnd() const; void horizontalFlip(); void verticalFlip(); diff --git a/kpresenter/KPrGeneralProperty.cpp b/kpresenter/KPrGeneralProperty.cpp index e07bf84c..16378ef4 100644 --- a/kpresenter/KPrGeneralProperty.cpp +++ b/kpresenter/KPrGeneralProperty.cpp @@ -19,11 +19,11 @@ */ #include "KPrGeneralProperty.h" -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> #include <knuminput.h> #include <klocale.h> @@ -31,17 +31,17 @@ #include <KoGeneralPropertyUi.h> -KPrGeneralProperty::KPrGeneralProperty( QWidget *parent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit ) -: QWidget( parent, name ) +KPrGeneralProperty::KPrGeneralProperty( TQWidget *tqparent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit ) +: TQWidget( tqparent, name ) , m_ratio( 1.0 ) , m_generalValue( generalValue ) , m_unit( unit ) { - QVBoxLayout *layout = new QVBoxLayout( this ); - layout->addWidget( m_ui = new KoGeneralPropertyUI( this ) ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->addWidget( m_ui = new KoGeneralPropertyUI( this ) ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); - layout->addItem( spacer ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + tqlayout->addItem( spacer ); if ( m_generalValue.m_name.isNull() ) { @@ -55,8 +55,8 @@ KPrGeneralProperty::KPrGeneralProperty( QWidget *parent, const char *name, Gener m_ui->positionGroup->setTitle( i18n( "Position" ) ); - connect( m_ui->protect, SIGNAL( toggled( bool ) ), this, SLOT( slotProtectToggled( bool ) ) ); - connect( m_ui->keepRatio, SIGNAL( toggled( bool ) ), this, SLOT( slotKeepRatioToggled( bool ) ) ); + connect( m_ui->protect, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotProtectToggled( bool ) ) ); + connect( m_ui->keepRatio, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotKeepRatioToggled( bool ) ) ); double dStep = KoUnit::fromUserValue( 0.5, m_unit ); double dMax = KoUnit::fromUserValue( 9999, m_unit ); @@ -68,11 +68,11 @@ KPrGeneralProperty::KPrGeneralProperty( QWidget *parent, const char *name, Gener m_ui->widthInput->setUnit( m_unit ); m_ui->widthInput->setMinMaxStep( 0, dMax, dStep ); - connect( m_ui->widthInput, SIGNAL( valueChanged( double ) ), this, SLOT( slotWidthChanged( double ) ) ); + connect( m_ui->widthInput, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotWidthChanged( double ) ) ); m_ui->heightInput->setUnit( m_unit ); m_ui->heightInput->setMinMaxStep( 0, dMax, dStep ); - connect( m_ui->heightInput, SIGNAL( valueChanged( double ) ), this, SLOT( slotHeightChanged( double ) ) ); + connect( m_ui->heightInput, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotHeightChanged( double ) ) ); slotReset(); } @@ -89,7 +89,7 @@ int KPrGeneralProperty::getGeneralPropertyChange() const if ( !m_generalValue.m_name.isNull() && m_generalValue.m_name != m_ui->nameInput->text() ) flags |= Name; - if ( m_ui->protect->state() != QButton::NoChange ) + if ( m_ui->protect->state() != TQButton::NoChange ) { if ( ( m_ui->protect->isOn() ? STATE_ON : STATE_OFF ) != m_generalValue.m_protect ) flags |= Protect; @@ -102,14 +102,14 @@ int KPrGeneralProperty::getGeneralPropertyChange() const if ( m_generalValue.m_rect.top() != rect.top() ) flags |= Top; // this has to be done as the rect cahnges width/hight if left or top is changed - if ( QABS( m_generalValue.m_rect.width() - rect.width() ) > 1e-6 ) + if ( TQABS( m_generalValue.m_rect.width() - rect.width() ) > 1e-6 ) flags |= Width; - if ( QABS( m_generalValue.m_rect.height() - rect.height() ) > 1e-6 ) + if ( TQABS( m_generalValue.m_rect.height() - rect.height() ) > 1e-6 ) flags |= Height; } } - if ( m_ui->keepRatio->state() != QButton::NoChange + if ( m_ui->keepRatio->state() != TQButton::NoChange && ( m_ui->keepRatio->isOn() ? STATE_ON : STATE_OFF ) != m_generalValue.m_keepRatio ) { flags |= KeepRatio; @@ -122,7 +122,7 @@ int KPrGeneralProperty::getGeneralPropertyChange() const KPrGeneralProperty::GeneralValue KPrGeneralProperty::getGeneralValue() const { GeneralValue generalValue; - generalValue.m_name = m_ui->nameInput->isEnabled() ? m_ui->nameInput->text() : QString(); + generalValue.m_name = m_ui->nameInput->isEnabled() ? m_ui->nameInput->text() : TQString(); generalValue.m_protect = m_ui->protect->isOn() ? STATE_ON : STATE_OFF; generalValue.m_keepRatio = m_ui->keepRatio->isOn() ? STATE_ON : STATE_OFF; generalValue.m_rect = getRect(); @@ -150,10 +150,10 @@ void KPrGeneralProperty::apply() KoRect KPrGeneralProperty::getRect() const { - double x = QMAX( 0, m_ui->xInput->value() ); - double y = QMAX( 0, m_ui->yInput->value() ); - double w = QMAX( 0, m_ui->widthInput->value() ); - double h = QMAX( 0, m_ui->heightInput->value() ); + double x = TQMAX( 0, m_ui->xInput->value() ); + double y = TQMAX( 0, m_ui->yInput->value() ); + double w = TQMAX( 0, m_ui->widthInput->value() ); + double h = TQMAX( 0, m_ui->heightInput->value() ); KoRect rect( x, y, w, h ); return rect; @@ -162,10 +162,10 @@ KoRect KPrGeneralProperty::getRect() const void KPrGeneralProperty::setRect( KoRect &rect ) { - m_ui->xInput->changeValue( QMAX( 0.00, rect.left() ) ); - m_ui->yInput->changeValue( QMAX( 0.00, rect.top() ) ); - m_ui->widthInput->changeValue( QMAX( 0.00, rect.width() ) ); - m_ui->heightInput->changeValue( QMAX( 0.00, rect.height() ) ); + m_ui->xInput->changeValue( TQMAX( 0.00, rect.left() ) ); + m_ui->yInput->changeValue( TQMAX( 0.00, rect.top() ) ); + m_ui->widthInput->changeValue( TQMAX( 0.00, rect.width() ) ); + m_ui->heightInput->changeValue( TQMAX( 0.00, rect.height() ) ); } diff --git a/kpresenter/KPrGeneralProperty.h b/kpresenter/KPrGeneralProperty.h index bc6f1665..73497851 100644 --- a/kpresenter/KPrGeneralProperty.h +++ b/kpresenter/KPrGeneralProperty.h @@ -20,7 +20,7 @@ #ifndef GENERALPROPERTY_H #define GENERALPROPERTY_H -#include <qwidget.h> +#include <tqwidget.h> #include <global.h> #include <KoRect.h> @@ -28,15 +28,16 @@ class KoGeneralPropertyUI; -class KPrGeneralProperty : public QWidget +class KPrGeneralProperty : public TQWidget { Q_OBJECT + TQ_OBJECT public: struct GeneralValue { GeneralValue() {} - QString m_name; + TQString m_name; PropValue m_keepRatio; PropValue m_protect; KoRect m_rect; @@ -53,7 +54,7 @@ public: Height = 64 }; - KPrGeneralProperty( QWidget *parent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit ); + KPrGeneralProperty( TQWidget *tqparent, const char *name, GeneralValue &generalValue, KoUnit::Unit unit ); ~KPrGeneralProperty(); int getGeneralPropertyChange() const; diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp index 44f372d1..6cbb97a7 100644 --- a/kpresenter/KPrGotoPage.cpp +++ b/kpresenter/KPrGotoPage.cpp @@ -20,10 +20,10 @@ #include "KPrGotoPage.h" -#include <qlabel.h> -#include <qlistbox.h> -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqlabel.h> +#include <tqlistbox.h> +#include <tqlayout.h> +#include <tqpushbutton.h> #include <klocale.h> #include <kdialog.h> @@ -32,60 +32,60 @@ #include "KPrPage.h" KPrGotoPage::KPrGotoPage( const KPrDocument *doc, - const QValueList<int> &slides, int start, - QWidget *parent, const char *name ) - : KDialogBase( parent, name, true, i18n("Goto Slide..."), Ok|Cancel), + const TQValueList<int> &slides, int start, + TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, true, i18n("Goto Slide..."), Ok|Cancel), oldPage(start) { - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *ml = new QVBoxLayout( page, KDialog::marginHint(), + TQVBoxLayout *ml = new TQVBoxLayout( page, KDialog::marginHint(), KDialog::spacingHint()); - QLabel *label = new QLabel( i18n( "Go to slide:" ), page ); + TQLabel *label = new TQLabel( i18n( "Go to slide:" ), page ); ml->addWidget( label ); - spinbox = new QListBox( page ); - connect( spinbox, SIGNAL(doubleClicked( QListBoxItem* )), - this, SLOT(accept()) ); - connect( spinbox, SIGNAL(returnPressed( QListBoxItem* )), - this, SLOT(accept()) ); + spinbox = new TQListBox( page ); + connect( spinbox, TQT_SIGNAL(doubleClicked( TQListBoxItem* )), + this, TQT_SLOT(accept()) ); + connect( spinbox, TQT_SIGNAL(returnPressed( TQListBoxItem* )), + this, TQT_SLOT(accept()) ); ml->addWidget( spinbox ); - QPtrList<KPrPage> pageList = doc->getPageList(); // because of const doc, we can't do doc->pageList()->at() - QValueList<int>::ConstIterator it = slides.begin(); + TQPtrList<KPrPage> pageList = doc->getPageList(); // because of const doc, we can't do doc->pageList()->at() + TQValueList<int>::ConstIterator it = slides.begin(); for ( ; it != slides.end(); ++it ) { - QString t( pageList.at( (*it) - 1 )->pageTitle() ); + TQString t( pageList.at( (*it) - 1 )->pageTitle() ); // cut ultra long titles... if(t.length() > 30) { t.truncate(30); t+="..."; } - spinbox->insertItem( QString( "%1 - %2" ).arg( *it ).arg( t ), -1 ); + spinbox->insertItem( TQString( "%1 - %2" ).tqarg( *it ).tqarg( t ), -1 ); if ( *it == start ) spinbox->setCurrentItem( spinbox->count()-1 ); } - if ( parent ) - parent->setCursor( Qt::forbiddenCursor ); + if ( tqparent ) + tqparent->setCursor( TQt::forbiddenCursor ); } int KPrGotoPage::gotoPage( const KPrDocument *doc, - const QValueList<int> &slides, int start, - QWidget *parent) + const TQValueList<int> &slides, int start, + TQWidget *tqparent) { - KPrGotoPage dia( doc, slides, start,parent, 0L ); + KPrGotoPage dia( doc, slides, start,tqparent, 0L ); dia.exec(); dia.resetCursor(); return dia.page(); } int KPrGotoPage::page() const { - if(result()==QDialog::Accepted) - return spinbox->currentText().left( spinbox->currentText().find( "-" ) - 1 ).toInt(); + if(result()==TQDialog::Accepted) + return spinbox->currentText().left( spinbox->currentText().tqfind( "-" ) - 1 ).toInt(); return oldPage; } void KPrGotoPage::resetCursor() { - if ( parentWidget() ) - parentWidget()->setCursor( Qt::blankCursor ); + if ( tqparentWidget() ) + tqparentWidget()->setCursor( TQt::blankCursor ); } diff --git a/kpresenter/KPrGotoPage.h b/kpresenter/KPrGotoPage.h index 2b96d4d6..22baf3cb 100644 --- a/kpresenter/KPrGotoPage.h +++ b/kpresenter/KPrGotoPage.h @@ -22,31 +22,31 @@ #define gotopage_h #include <kdialogbase.h> -#include <qvaluelist.h> +#include <tqvaluelist.h> -class QWidget; -class QObject; -class QResizeEvent; -class QListBox; +class TQWidget; +class TQObject; +class TQResizeEvent; +class TQListBox; class KPrDocument; class KPrGotoPage : public KDialogBase { public: KPrGotoPage( const KPrDocument *doc, - const QValueList<int> &slides, int start, - QWidget *parent = 0L, const char *name = 0L ); + const TQValueList<int> &slides, int start, + TQWidget *tqparent = 0L, const char *name = 0L ); static int gotoPage( const KPrDocument *doc, - const QValueList<int> &slides, int start, - QWidget *parent = 0L ); + const TQValueList<int> &slides, int start, + TQWidget *tqparent = 0L ); int page() const; private: void resetCursor(); - QListBox *spinbox; + TQListBox *spinbox; int oldPage; }; diff --git a/kpresenter/KPrGradient.cpp b/kpresenter/KPrGradient.cpp index 89728ece..f00c9d42 100644 --- a/kpresenter/KPrGradient.cpp +++ b/kpresenter/KPrGradient.cpp @@ -19,12 +19,12 @@ */ #include "KPrGradient.h" -#include <qpainter.h> +#include <tqpainter.h> #include <kpixmapeffect.h> #include <kdebug.h> #include <KoTextZoomHandler.h> -KPrGradient::KPrGradient( const QColor &_color1, const QColor &_color2, BCType _bcType, +KPrGradient::KPrGradient( const TQColor &_color1, const TQColor &_color2, BCType _bcType, bool _unbalanced, int _xfactor, int _yfactor ) : color1( _color1 ), color2( _color2 ), bcType( _bcType ), m_pixmap(), refCount( 0 ), @@ -34,7 +34,7 @@ KPrGradient::KPrGradient( const QColor &_color1, const QColor &_color2, BCType _ //m_pixmap.resize( _size ); } -void KPrGradient::setParameters(const QColor &c1, const QColor &c2, BCType _type, +void KPrGradient::setParameters(const TQColor &c1, const TQColor &c2, BCType _type, bool _unbalanced, int xf, int yf) { color1=c1; color2=c2; @@ -57,12 +57,12 @@ bool KPrGradient::removeRef() void KPrGradient::paint() { - QPainter painter; + TQPainter painter; switch ( bcType ) { case BCT_PLAIN: painter.begin( &m_pixmap ); - painter.setPen( Qt::NoPen ); + painter.setPen( TQt::NoPen ); painter.setBrush( color1 ); painter.drawRect( m_pixmap.rect() ); @@ -128,7 +128,7 @@ void KPrGradient::paint() m_bDirty = false; } -const QPixmap& KPrGradient::pixmap() const +const TQPixmap& KPrGradient::pixmap() const { if ( m_bDirty ) const_cast<KPrGradient *>(this)->paint(); diff --git a/kpresenter/KPrGradient.h b/kpresenter/KPrGradient.h index bbf8dc54..7ffad247 100644 --- a/kpresenter/KPrGradient.h +++ b/kpresenter/KPrGradient.h @@ -21,12 +21,12 @@ #ifndef kpgradient_h #define kpgradient_h -#include <qcolor.h> +#include <tqcolor.h> #include <KoBrush.h> #include <kpixmap.h> #include "global.h" -class QPainter; +class TQPainter; class KoTextZoomHandler; /** @@ -40,24 +40,24 @@ class KoTextZoomHandler; class KPrGradient { public: - KPrGradient( const QColor &_color1, const QColor &_color2, BCType _bcType, + KPrGradient( const TQColor &_color1, const TQColor &_color2, BCType _bcType, bool _unbalanced, int _xfactor, int _yfactor ); ~KPrGradient() {} - QColor getColor1() const { return color1; } - QColor getColor2() const { return color2; } + TQColor getColor1() const { return color1; } + TQColor getColor2() const { return color2; } BCType getBackColorType() const { return bcType; } bool getUnbalanced() const { return unbalanced; } int getXFactor() const { return xFactor; } int getYFactor() const { return yFactor; } - void setColor1( const QColor &_color ) { color1 = _color; m_bDirty = true; } - void setColor2( const QColor &_color ) { color2 = _color; m_bDirty = true; } + void setColor1( const TQColor &_color ) { color1 = _color; m_bDirty = true; } + void setColor2( const TQColor &_color ) { color2 = _color; m_bDirty = true; } void setBackColorType( BCType _type ) { bcType = _type; m_bDirty = true; } void setUnbalanced( bool b ) { unbalanced = b; m_bDirty = true; } void setXFactor( int i ) { xFactor = i; m_bDirty = true; } void setYFactor( int i ) { yFactor = i; m_bDirty = true; } - void setSize( const QSize& _size ) + void setSize( const TQSize& _size ) { if ( size() != _size ) { m_pixmap.resize( _size ); @@ -66,14 +66,14 @@ public: } // Sets all of the above at once. Used when loading. - void setParameters(const QColor &c1, const QColor &c2, BCType _type, + void setParameters(const TQColor &c1, const TQColor &c2, BCType _type, bool _unbalanced, int xf, int yf); /** Return the pixmap containing the gradient. * Calculated on demand if necessary (if m_bDirty is true). */ - const QPixmap& pixmap() const; - QSize size() const { return m_pixmap.size(); } + const TQPixmap& pixmap() const; + TQSize size() const { return m_pixmap.size(); } void addRef(); bool removeRef(); @@ -84,7 +84,7 @@ protected: KPrGradient() {} - QColor color1, color2; + TQColor color1, color2; BCType bcType; KPixmap m_pixmap; diff --git a/kpresenter/KPrGradientCollection.cpp b/kpresenter/KPrGradientCollection.cpp index 59dbde2d..5f783ea5 100644 --- a/kpresenter/KPrGradientCollection.cpp +++ b/kpresenter/KPrGradientCollection.cpp @@ -20,10 +20,10 @@ #include "KPrGradientCollection.h" #include "KPrGradient.h" -#include <qstring.h> +#include <tqstring.h> -const QPixmap& KPrGradientCollection::getGradient( const QColor &_color1, const QColor &_color2, - BCType _bcType, const QSize &_size, +const TQPixmap& KPrGradientCollection::getGradient( const TQColor &_color1, const TQColor &_color2, + BCType _bcType, const TQSize &_size, bool _unbalanced, int _xfactor, int _yfactor, bool addref ) { KPrGradient *cachedGradient = inGradientList( _color1, _color2, _bcType, _size, _unbalanced, _xfactor, _yfactor ); @@ -45,8 +45,8 @@ const QPixmap& KPrGradientCollection::getGradient( const QColor &_color1, const } } -void KPrGradientCollection::removeRef( const QColor &_color1, const QColor &_color2, - BCType _bcType, const QSize &_size, +void KPrGradientCollection::removeRef( const TQColor &_color1, const TQColor &_color2, + BCType _bcType, const TQSize &_size, bool _unbalanced, int _xfactor, int _yfactor) { KPrGradient* cachedGradient = inGradientList( _color1, _color2, _bcType, _size, _unbalanced, _xfactor, _yfactor ); @@ -56,11 +56,11 @@ void KPrGradientCollection::removeRef( const QColor &_color1, const QColor &_col } } -KPrGradient* KPrGradientCollection::inGradientList( const QColor &_color1, const QColor &_color2, - BCType _bcType, const QSize &_size, +KPrGradient* KPrGradientCollection::inGradientList( const TQColor &_color1, const TQColor &_color2, + BCType _bcType, const TQSize &_size, bool _unbalanced, int _xfactor, int _yfactor ) const { - QPtrListIterator<KPrGradient> it( gradientList ); + TQPtrListIterator<KPrGradient> it( gradientList ); for ( ; it.current() ; ++it ) { KPrGradient *kpgradient = it.current(); if ( kpgradient->getColor1() == _color1 && kpgradient->getColor2() == _color2 && diff --git a/kpresenter/KPrGradientCollection.h b/kpresenter/KPrGradientCollection.h index 49993fe6..7eed29d0 100644 --- a/kpresenter/KPrGradientCollection.h +++ b/kpresenter/KPrGradientCollection.h @@ -21,11 +21,11 @@ #ifndef kpgradientcollection_h #define kpgradientcollection_h -#include <qptrlist.h> +#include <tqptrlist.h> #include "global.h" #include "KPrGradient.h" -class QPixmap; +class TQPixmap; /** * Class: KPrGradientCollection @@ -45,19 +45,19 @@ public: { gradientList.clear(); } /** Retrieve or create gradient for the given parameters */ - const QPixmap& getGradient( const QColor &_color1, const QColor &_color2, BCType _bcType, const QSize &_size, + const TQPixmap& getGradient( const TQColor &_color1, const TQColor &_color2, BCType _bcType, const TQSize &_size, bool _unbalanced, int _xfactor, int _yfactor, bool addref = true ); /** Remove reference to gradient with the given parameters */ - void removeRef( const QColor &_color1, const QColor &_color2, BCType _bcType, const QSize &_size, + void removeRef( const TQColor &_color1, const TQColor &_color2, BCType _bcType, const TQSize &_size, bool _unbalanced, int _xfactor, int _yfactor ); protected: - KPrGradient* inGradientList( const QColor &_color1, const QColor &_color2, BCType _bcType, const QSize &_size, + KPrGradient* inGradientList( const TQColor &_color1, const TQColor &_color2, BCType _bcType, const TQSize &_size, bool _unbalanced, int _xfactor, int _yfactor ) const; private: - QPtrList<KPrGradient> gradientList; + TQPtrList<KPrGradient> gradientList; }; #endif diff --git a/kpresenter/KPrGroupObject.cpp b/kpresenter/KPrGroupObject.cpp index 5a21aaed..867155fe 100644 --- a/kpresenter/KPrGroupObject.cpp +++ b/kpresenter/KPrGroupObject.cpp @@ -37,16 +37,16 @@ #include <kdebug.h> #include <KoOasisContext.h> -#include <qpainter.h> +#include <tqpainter.h> using namespace std; KPrGroupObject::KPrGroupObject() - : KPrObject(), objects( QPtrList<KPrObject>() ), updateObjs( false ) + : KPrObject(), objects( TQPtrList<KPrObject>() ), updateObjs( false ) { objects.setAutoDelete( false ); } -KPrGroupObject::KPrGroupObject( const QPtrList<KPrObject> &objs ) +KPrGroupObject::KPrGroupObject( const TQPtrList<KPrObject> &objs ) : KPrObject(), objects( objs ), updateObjs( false ) { objects.setAutoDelete( false ); @@ -59,14 +59,14 @@ KPrGroupObject &KPrGroupObject::operator=( const KPrGroupObject & ) void KPrGroupObject::selectAllObj() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setSelected(true); } void KPrGroupObject::deSelectAllObj() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setSelected(false); } @@ -113,17 +113,17 @@ void KPrGroupObject::moveBy( double _dx, double _dy ) updateCoords( _dx, _dy ); } -QDomDocumentFragment KPrGroupObject::save( QDomDocument& doc, double offset ) +TQDomDocumentFragment KPrGroupObject::save( TQDomDocument& doc, double offset ) { - QDomDocumentFragment fragment=KPrObject::save(doc, offset); - QDomElement objs=doc.createElement("OBJECTS"); + TQDomDocumentFragment fragment=KPrObject::save(doc, offset); + TQDomElement objs=doc.createElement("OBJECTS"); fragment.appendChild(objs); - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { if ( it.current()->getType() == OT_PART ) continue; - QDomElement object=doc.createElement("OBJECT"); + TQDomElement object=doc.createElement("OBJECT"); object.setAttribute("type", static_cast<int>( it.current()->getType() )); object.appendChild(it.current()->save( doc,offset )); objs.appendChild(object); @@ -134,7 +134,7 @@ QDomDocumentFragment KPrGroupObject::save( QDomDocument& doc, double offset ) bool KPrGroupObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { //TODO what to do with parts? @@ -145,7 +145,7 @@ bool KPrGroupObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const void KPrGroupObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj ) const { - xmlWriter.addAttribute( "draw:id", "object" + QString::number( indexObj ) ); + xmlWriter.addAttribute( "draw:id", "object" + TQString::number( indexObj ) ); } @@ -155,12 +155,12 @@ const char * KPrGroupObject::getOasisElementName() const } -void KPrGroupObject::loadOasisGroupObject( KPrDocument *_doc, KPrPage * newpage, QDomNode &element, KoOasisContext & context, KPrLoadingInfo */*info*/ ) +void KPrGroupObject::loadOasisGroupObject( KPrDocument *_doc, KPrPage * newpage, TQDomNode &element, KoOasisContext & context, KPrLoadingInfo */*info*/ ) { //KPrObject::loadOasis( element, context, info ); updateObjs = false; _doc->loadOasisObject( newpage,element, context, this); - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); KoRect r=KoRect(); for ( ; it.current() ; ++it ) { @@ -177,14 +177,14 @@ void KPrGroupObject::addObjects( KPrObject * obj ) objects.append( obj ); } -double KPrGroupObject::load( const QDomElement &element, KPrDocument *doc) +double KPrGroupObject::load( const TQDomElement &element, KPrDocument *doc) { //FIXME double offset=KPrObject::load(element); updateObjs = false; - QDomElement group=element.namedItem("OBJECTS").toElement(); + TQDomElement group=element.namedItem("OBJECTS").toElement(); if(!group.isNull()) { - QDomElement current=group.firstChild().toElement(); + TQDomElement current=group.firstChild().toElement(); while(!current.isNull()) { ObjType t = OT_LINE; if(current.tagName()=="OBJECT") { @@ -248,7 +248,7 @@ double KPrGroupObject::load( const QDomElement &element, KPrDocument *doc) kppolylineobject->setOrig(kppolylineobject->getOrig().x(),objOffset - offset); objects.append( kppolylineobject ); } break; - case OT_QUADRICBEZIERCURVE: { + case OT_TQUADRICBEZIERCURVE: { KPrQuadricBezierCurveObject *kpQuadricBezierCurveObject = new KPrQuadricBezierCurveObject(); objOffset = kpQuadricBezierCurveObject->load( current ); kpQuadricBezierCurveObject->setOrig(kpQuadricBezierCurveObject->getOrig().x(),objOffset - offset); @@ -288,10 +288,10 @@ double KPrGroupObject::load( const QDomElement &element, KPrDocument *doc) return offset; } -void KPrGroupObject::draw( QPainter *_painter,KoTextZoomHandler *_zoomhandler, +void KPrGroupObject::draw( TQPainter *_painter,KoTextZoomHandler *_zoomhandler, int pageNum, SelectionMode selectionMode, bool drawContour ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->draw( _painter, _zoomhandler, pageNum, selectionMode, drawContour ); @@ -303,7 +303,7 @@ void KPrGroupObject::updateSizes( double fx, double fy ) if ( !updateObjs ) return; KoRect r = KoRect(); - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { double _x = ( it.current()->getOrig().x() - orig.x() ) * fx + orig.x(); @@ -320,7 +320,7 @@ void KPrGroupObject::updateCoords( double dx, double dy ) { if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->moveBy( dx, dy ); } @@ -339,7 +339,7 @@ void KPrGroupObject::rotate( float _angle ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { // find distance of object center to group center double px = it.current()->getOrig().x() + it.current()->getSize().width() / 2.0 - centerx; @@ -358,13 +358,13 @@ void KPrGroupObject::rotate( float _angle ) } } -void KPrGroupObject::setShadowParameter( int _distance, ShadowDirection _direction, const QColor &_color ) +void KPrGroupObject::setShadowParameter( int _distance, ShadowDirection _direction, const TQColor &_color ) { KPrObject::setShadowParameter( _distance, _direction, _color ); if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setShadowParameter( _distance, _direction, _color ); } @@ -375,7 +375,7 @@ void KPrGroupObject::setShadowDistance( int _distance ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setShadowDistance( _distance ); } @@ -386,18 +386,18 @@ void KPrGroupObject::setShadowDirection( ShadowDirection _direction ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setShadowDirection( _direction ); } -void KPrGroupObject::setShadowColor( const QColor &_color ) +void KPrGroupObject::setShadowColor( const TQColor &_color ) { KPrObject::setShadowColor( _color ); kdDebug(33001) << "KPrGroupObject::setShadowColor"<<updateObjs << endl; if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setShadowColor( _color ); } @@ -408,7 +408,7 @@ void KPrGroupObject::setEffect( Effect _effect ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setEffect( _effect ); } @@ -419,7 +419,7 @@ void KPrGroupObject::setEffect2( Effect2 _effect2 ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setEffect2( _effect2 ); } @@ -430,7 +430,7 @@ void KPrGroupObject::setAppearStep( int _appearStep ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setAppearStep( _appearStep ); } @@ -441,7 +441,7 @@ void KPrGroupObject::setDisappear( bool b ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setDisappear( b ); } @@ -452,7 +452,7 @@ void KPrGroupObject::setDisappearStep( int _disappearStep ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setDisappearStep( _disappearStep ); } @@ -463,7 +463,7 @@ void KPrGroupObject::setEffect3( Effect3 _effect3) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setEffect3( _effect3 ); } @@ -474,7 +474,7 @@ void KPrGroupObject::setAppearTimer( int _appearTimer ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setAppearTimer( _appearTimer ); } @@ -485,7 +485,7 @@ void KPrGroupObject::setDisappearTimer( int _disappearTimer ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setDisappearTimer( _disappearTimer ); } @@ -496,7 +496,7 @@ void KPrGroupObject::setOwnClipping( bool _ownClipping ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setOwnClipping( _ownClipping ); } @@ -507,7 +507,7 @@ void KPrGroupObject::setSubPresStep( int _subPresStep ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setSubPresStep( _subPresStep ); } @@ -518,7 +518,7 @@ void KPrGroupObject::doSpecificEffects( bool _specEffects, bool _onlyCurrStep ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->doSpecificEffects( _specEffects, _onlyCurrStep ); } @@ -529,7 +529,7 @@ void KPrGroupObject::setAppearSoundEffect( bool b ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setAppearSoundEffect( b ); } @@ -540,52 +540,52 @@ void KPrGroupObject::setDisappearSoundEffect( bool b ) if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects); + TQPtrListIterator<KPrObject> it( objects); for ( ; it.current() ; ++it ) it.current()->setDisappearSoundEffect( b ); } -void KPrGroupObject::setAppearSoundEffectFileName( const QString &_a_fileName ) +void KPrGroupObject::setAppearSoundEffectFileName( const TQString &_a_fileName ) { KPrObject::setAppearSoundEffectFileName( _a_fileName ); if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects); + TQPtrListIterator<KPrObject> it( objects); for ( ; it.current() ; ++it ) it.current()->setAppearSoundEffectFileName( _a_fileName ); } -void KPrGroupObject::setDisappearSoundEffectFileName( const QString &_d_fileName ) +void KPrGroupObject::setDisappearSoundEffectFileName( const TQString &_d_fileName ) { KPrObject::setDisappearSoundEffectFileName( _d_fileName ); if ( !updateObjs ) return; - QPtrListIterator<KPrObject> it( objects); + TQPtrListIterator<KPrObject> it( objects); for ( ; it.current() ; ++it ) it.current()->setDisappearSoundEffectFileName( _d_fileName ); } -void KPrGroupObject::getAllObjectSelectedList(QPtrList<KPrObject> &lst,bool force ) +void KPrGroupObject::getAllObjectSelectedList(TQPtrList<KPrObject> &lst,bool force ) { if ( selected || force) { - QPtrListIterator<KPrObject> it( objects); + TQPtrListIterator<KPrObject> it( objects); for ( ; it.current() ; ++it ) it.current()->getAllObjectSelectedList( lst, true ); } } -void KPrGroupObject::addTextObjects( QPtrList<KoTextObject> &lst ) const +void KPrGroupObject::addTextObjects( TQPtrList<KoTextObject> &lst ) const { - QPtrListIterator<KPrObject> it( objects); + TQPtrListIterator<KPrObject> it( objects); for ( ; it.current() ; ++it ) it.current()->addTextObjects( lst ); } void KPrGroupObject::flip( bool horizontal ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { it.current()->flip( horizontal ); double mx = 0; @@ -609,7 +609,7 @@ void KPrGroupObject::flip( bool horizontal ) { void KPrGroupObject::removeFromObjList() { inObjList = false; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->removeFromObjList(); } @@ -617,14 +617,14 @@ void KPrGroupObject::removeFromObjList() void KPrGroupObject::addToObjList() { inObjList = true; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->addToObjList(); } void KPrGroupObject::incCmdRef() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); @@ -633,7 +633,7 @@ void KPrGroupObject::incCmdRef() void KPrGroupObject::decCmdRef() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); diff --git a/kpresenter/KPrGroupObject.h b/kpresenter/KPrGroupObject.h index 0dfd28d2..f8183f77 100644 --- a/kpresenter/KPrGroupObject.h +++ b/kpresenter/KPrGroupObject.h @@ -33,7 +33,7 @@ class KPrGroupObject : public KPrObject { public: KPrGroupObject(); - KPrGroupObject( const QPtrList<KPrObject> &objs ); + KPrGroupObject( const TQPtrList<KPrObject> &objs ); virtual ~KPrGroupObject() {} KPrGroupObject &operator=( const KPrGroupObject & ); @@ -47,7 +47,7 @@ public: virtual void rotate( float _angle ); virtual void setShadowDistance( int _distance ); virtual void setShadowDirection( ShadowDirection _direction ); - virtual void setShadowColor( const QColor &_color ); + virtual void setShadowColor( const TQColor &_color ); virtual void setEffect( Effect _effect ); virtual void setEffect2( Effect2 _effect2 ); virtual void setAppearStep( int _appearStep ); @@ -58,21 +58,21 @@ public: virtual void setDisappearTimer( int _disappearTimer ); virtual void setAppearSoundEffect( bool b ); virtual void setDisappearSoundEffect( bool b ); - virtual void setAppearSoundEffectFileName( const QString &_a_fileName ); - virtual void setDisappearSoundEffectFileName( const QString &_d_fileName ); + virtual void setAppearSoundEffectFileName( const TQString &_a_fileName ); + virtual void setDisappearSoundEffectFileName( const TQString &_d_fileName ); - virtual void setShadowParameter(int _distance,ShadowDirection _direction,const QColor &_color); + virtual void setShadowParameter(int _distance,ShadowDirection _direction,const TQColor &_color); virtual ObjType getType() const { return OT_GROUP; } - virtual QString getTypeString() const + virtual TQString getTypeString() const { return i18n("Group"); } - virtual QDomDocumentFragment save( QDomDocument& doc, double offset ); - virtual double load(const QDomElement &element, KPrDocument *doc); - virtual void loadOasisGroupObject( KPrDocument *doc, KPrPage * newpage, QDomNode &element, KoOasisContext & context, KPrLoadingInfo *info); + virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset ); + virtual double load(const TQDomElement &element, KPrDocument *doc); + virtual void loadOasisGroupObject( KPrDocument *doc, KPrPage * newpage, TQDomNode &element, KoOasisContext & context, KPrLoadingInfo *info); - virtual void draw( QPainter *_painter, KoTextZoomHandler *_zoomhandler, + virtual void draw( TQPainter *_painter, KoTextZoomHandler *_zoomhandler, int pageNum, SelectionMode selectionMode, bool drawContour = FALSE ); void addObjects( KPrObject * obj ); @@ -80,11 +80,11 @@ public: void setUpdateObjects( bool b ) { updateObjs = b; } - QPtrList<KPrObject> getObjects() + TQPtrList<KPrObject> getObjects() { return objects; } - const QPtrList<KPrObject> &objectList() const + const TQPtrList<KPrObject> &objectList() const { return objects; } - virtual void addTextObjects( QPtrList<KoTextObject> & ) const; + virtual void addTextObjects( TQPtrList<KoTextObject> & ) const; void selectAllObj(); void deSelectAllObj(); @@ -92,7 +92,7 @@ public: virtual void setOwnClipping( bool _ownClipping ); virtual void setSubPresStep( int _subPresStep ); virtual void doSpecificEffects( bool _specEffects, bool _onlyCurrStep = true ); - virtual void getAllObjectSelectedList(QPtrList<KPrObject> &lst,bool force=false ); + virtual void getAllObjectSelectedList(TQPtrList<KPrObject> &lst,bool force=false ); virtual void flip( bool horizontal ); virtual void removeFromObjList(); @@ -108,7 +108,7 @@ protected: void updateSizes( double fx, double fy ); void updateCoords( double dx, double dy ); - QPtrList<KPrObject> objects; + TQPtrList<KPrObject> objects; bool updateObjs; }; diff --git a/kpresenter/KPrImageEffectDia.cpp b/kpresenter/KPrImageEffectDia.cpp index 0e62e7ea..a0354850 100644 --- a/kpresenter/KPrImageEffectDia.cpp +++ b/kpresenter/KPrImageEffectDia.cpp @@ -18,12 +18,12 @@ * Boston, MA 02110-1301, USA. */ -#include <qcombobox.h> -#include <qlabel.h> -#include <qspinbox.h> -#include <qwidgetstack.h> -#include <qcheckbox.h> -#include <qimage.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqspinbox.h> +#include <tqwidgetstack.h> +#include <tqcheckbox.h> +#include <tqimage.h> #include <kimageeffect.h> #include <klocale.h> @@ -32,15 +32,15 @@ #include "KPrImageEffectDia.h" -KPrImageEffectDia::KPrImageEffectDia(QWidget * parent, const char * name): - KDialogBase(parent, name, true, i18n("Image Effect"), Ok|Cancel, Ok) +KPrImageEffectDia::KPrImageEffectDia(TQWidget * tqparent, const char * name): + KDialogBase(tqparent, name, true, i18n("Image Effect"), Ok|Cancel, Ok) { - m_pix = QPixmap(); + m_pix = TQPixmap(); m_effect = IE_NONE; - m_param1 = QVariant(); - m_param2 = QVariant(); - m_param3 = QVariant(); + m_param1 = TQVariant(); + m_param2 = TQVariant(); + m_param3 = TQVariant(); base = new EffectBrowserBase(this, "effect_base"); @@ -48,11 +48,11 @@ KPrImageEffectDia::KPrImageEffectDia(QWidget * parent, const char * name): setupSignals(); - connect((QWidget *)base->m_effectCombo, SIGNAL(activated(int)), - this, SLOT(effectChanged(int))); + connect((TQWidget *)base->m_effectCombo, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(effectChanged(int))); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } KPrImageEffectDia::~KPrImageEffectDia() @@ -62,47 +62,47 @@ KPrImageEffectDia::~KPrImageEffectDia() void KPrImageEffectDia::effectChanged(int eff) { - QImage _tmpImage = m_origpix.convertToImage(); + TQImage _tmpImage = m_origpix.convertToImage(); //clear the (unused) params - m_param1 = QVariant(); - m_param2 = QVariant(); - m_param3 = QVariant(); + m_param1 = TQVariant(); + m_param2 = TQVariant(); + m_param3 = TQVariant(); m_effect = static_cast<ImageEffect>(eff); switch (m_effect) { case IE_CHANNEL_INTENSITY: { - m_param1 = QVariant(base->chanInt_value->value()); - m_param2 = QVariant(base->chanInt_component->currentItem()); + m_param1 = TQVariant(base->chanInt_value->value()); + m_param2 = TQVariant(base->chanInt_component->currentItem()); _tmpImage = KImageEffect::channelIntensity(_tmpImage, m_param1.toDouble()/100.0, static_cast<KImageEffect::RGBComponent>(m_param2.toInt())); break; } case IE_FADE: { - m_param1 = QVariant(base->fade_value->value()); - m_param2 = QVariant(base->fade_color->color()); + m_param1 = TQVariant(base->fade_value->value()); + m_param2 = TQVariant(base->fade_color->color()); _tmpImage = KImageEffect::fade(_tmpImage, m_param1.toDouble(), m_param2.toColor()); break; } case IE_FLATTEN: { - m_param1 = QVariant(base->flatten_color1->color()); - m_param2 = QVariant(base->flatten_color2->color()); + m_param1 = TQVariant(base->flatten_color1->color()); + m_param2 = TQVariant(base->flatten_color2->color()); _tmpImage = KImageEffect::flatten(_tmpImage, m_param1.toColor(), m_param2.toColor()); break; } case IE_INTENSITY: { - m_param1 = QVariant(base->intensity_value->value()); + m_param1 = TQVariant(base->intensity_value->value()); _tmpImage = KImageEffect::intensity(_tmpImage, m_param1.toDouble()/100.0); break; } case IE_DESATURATE: { - m_param1 = QVariant(base->desaturate_value->value()); + m_param1 = TQVariant(base->desaturate_value->value()); _tmpImage = KImageEffect::desaturate(_tmpImage, m_param1.toDouble()); break; } case IE_CONTRAST: { - m_param1 = QVariant(base->contrast_value->value()); + m_param1 = TQVariant(base->contrast_value->value()); _tmpImage = KImageEffect::contrast(_tmpImage, m_param1.toInt()); break; } @@ -115,12 +115,12 @@ void KPrImageEffectDia::effectChanged(int eff) break; } case IE_THRESHOLD: { - m_param1 = QVariant(base->threshold_value->value()); + m_param1 = TQVariant(base->threshold_value->value()); KImageEffect::threshold(_tmpImage, m_param1.toInt()); break; } case IE_SOLARIZE: { - m_param1 = QVariant(base->solarize_value->value()); + m_param1 = TQVariant(base->solarize_value->value()); KImageEffect::solarize(_tmpImage, m_param1.toDouble()); break; } @@ -133,60 +133,60 @@ void KPrImageEffectDia::effectChanged(int eff) break; } case IE_CHARCOAL: { - m_param1 = QVariant(base->charcoal_value->value()); + m_param1 = TQVariant(base->charcoal_value->value()); _tmpImage = KImageEffect::charcoal(_tmpImage, m_param1.toDouble()); break; } case IE_NOISE: { - m_param1 = QVariant(base->noise_type->currentItem()); + m_param1 = TQVariant(base->noise_type->currentItem()); _tmpImage = KImageEffect::addNoise(_tmpImage, static_cast<KImageEffect::NoiseType>(m_param1.toInt())); break; } case IE_BLUR: { - m_param1 = QVariant(base->blur_value->value()); + m_param1 = TQVariant(base->blur_value->value()); _tmpImage = KImageEffect::blur(_tmpImage, m_param1.toDouble()); break; } case IE_EDGE: { - m_param1 = QVariant(base->edge_value->value()); + m_param1 = TQVariant(base->edge_value->value()); _tmpImage = KImageEffect::edge(_tmpImage, m_param1.toDouble()); break; } case IE_IMPLODE: { - m_param1 = QVariant(base->implode_value->value()); + m_param1 = TQVariant(base->implode_value->value()); _tmpImage = KImageEffect::implode(_tmpImage, m_param1.toDouble()); break; } case IE_OIL_PAINT: { - m_param1 = QVariant(base->oilPaint_radius->value()); + m_param1 = TQVariant(base->oilPaint_radius->value()); _tmpImage = KImageEffect::oilPaint(_tmpImage, m_param1.toInt()); break; } case IE_SHARPEN: { - m_param1 = QVariant(base->sharpen_value->value()); + m_param1 = TQVariant(base->sharpen_value->value()); _tmpImage = KImageEffect::sharpen(_tmpImage, m_param1.toDouble()); break; } case IE_SPREAD: { - m_param1 = QVariant(base->spread_value->value()); + m_param1 = TQVariant(base->spread_value->value()); _tmpImage = KImageEffect::spread(_tmpImage, m_param1.toInt()); break; } case IE_SHADE: { - m_param1 = QVariant(base->shade_color->isChecked()); - m_param2 = QVariant(base->shade_azimuth->value()); - m_param3 = QVariant(base->shade_elevation->value()); + m_param1 = TQVariant(base->shade_color->isChecked()); + m_param2 = TQVariant(base->shade_azimuth->value()); + m_param3 = TQVariant(base->shade_elevation->value()); _tmpImage = KImageEffect::shade(_tmpImage, m_param1.toBool(), m_param2.toDouble(), m_param3.toDouble()); break; } case IE_SWIRL: { - m_param1 = QVariant(base->swirl_value->value()); + m_param1 = TQVariant(base->swirl_value->value()); _tmpImage = KImageEffect::swirl(_tmpImage, m_param1.toDouble()); break; } case IE_WAVE: { - m_param1 = QVariant(base->wave_amplitude->value()); - m_param2 = QVariant(base->wave_length->value()); + m_param1 = TQVariant(base->wave_amplitude->value()); + m_param2 = TQVariant(base->wave_length->value()); _tmpImage = KImageEffect::wave(_tmpImage, m_param1.toDouble(), m_param2.toDouble()); break; } @@ -206,7 +206,7 @@ void KPrImageEffectDia::okClicked() } -void KPrImageEffectDia::setPixmap(QPixmap pix) +void KPrImageEffectDia::setPixmap(TQPixmap pix) { m_pix = pix; m_origpix = pix; @@ -217,10 +217,10 @@ void KPrImageEffectDia::setPixmap(QPixmap pix) void KPrImageEffectDia::updatePreview() { base->m_previewLabel->setPixmap(m_pix); - base->m_previewLabel->repaint(false); + base->m_previewLabel->tqrepaint(false); } -void KPrImageEffectDia::setEffect(ImageEffect eff, QVariant p1, QVariant p2, QVariant p3) +void KPrImageEffectDia::setEffect(ImageEffect eff, TQVariant p1, TQVariant p2, TQVariant p3) { m_effect = eff; m_param1 = p1; @@ -323,10 +323,10 @@ void KPrImageEffectDia::setEffect(ImageEffect eff, QVariant p1, QVariant p2, QVa } base->m_effectCombo->setCurrentItem(static_cast<int>(m_effect)); - base->m_widgetStack->raiseWidget(static_cast<int>(m_effect)); //bug in Qt? the above doesn't emit this :( + base->m_widgetStack->raiseWidget(static_cast<int>(m_effect)); //bug in TQt? the above doesn't emit this :( } -void KPrImageEffectDia::showEvent(QShowEvent * e) +void KPrImageEffectDia::showEvent(TQShowEvent * e) { KDialogBase::showEvent(e); effectChanged((int)m_effect); @@ -334,74 +334,74 @@ void KPrImageEffectDia::showEvent(QShowEvent * e) void KPrImageEffectDia::setupSignals() { - connect((QWidget *)base->chanInt_value, SIGNAL(valueChanged(int)), - this, SLOT(effectParamChanged())); - connect((QWidget *)base->chanInt_component, SIGNAL(activated(int)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->chanInt_value, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->chanInt_component, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->fade_value, SIGNAL(valueChanged(double)), - this, SLOT(effectParamChanged())); - connect((QWidget *)base->fade_color, SIGNAL(changed(const QColor&)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->fade_value, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->fade_color, TQT_SIGNAL(changed(const TQColor&)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->flatten_color1, SIGNAL(changed(const QColor&)), - this, SLOT(effectParamChanged())); - connect((QWidget *)base->flatten_color2, SIGNAL(changed(const QColor&)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->flatten_color1, TQT_SIGNAL(changed(const TQColor&)), + this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->flatten_color2, TQT_SIGNAL(changed(const TQColor&)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->intensity_value, SIGNAL(valueChanged(int)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->intensity_value, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->desaturate_value, SIGNAL(valueChanged(double)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->desaturate_value, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->contrast_value, SIGNAL(valueChanged(int)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->contrast_value, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->threshold_value, SIGNAL(valueChanged(int)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->threshold_value, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->solarize_value, SIGNAL(valueChanged(double)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->solarize_value, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->charcoal_value, SIGNAL(valueChanged(double)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->charcoal_value, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->noise_type, SIGNAL(activated(int)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->noise_type, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->blur_value, SIGNAL(valueChanged(double)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->blur_value, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->edge_value, SIGNAL(valueChanged(double)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->edge_value, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->implode_value, SIGNAL(valueChanged(double)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->implode_value, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->oilPaint_radius, SIGNAL(valueChanged(int)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->oilPaint_radius, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->sharpen_value, SIGNAL(valueChanged(double)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->sharpen_value, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->spread_value, SIGNAL(valueChanged(int)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->spread_value, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->shade_color, SIGNAL(toggled(bool)), - this, SLOT(effectParamChanged())); - connect((QWidget *)base->shade_elevation, SIGNAL(valueChanged(double)), - this, SLOT(effectParamChanged())); - connect((QWidget *)base->shade_azimuth, SIGNAL(valueChanged(double)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->shade_color, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->shade_elevation, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->shade_azimuth, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->swirl_value, SIGNAL(valueChanged(double)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->swirl_value, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(effectParamChanged())); - connect((QWidget *)base->wave_amplitude, SIGNAL(valueChanged(double)), - this, SLOT(effectParamChanged())); - connect((QWidget *)base->wave_length, SIGNAL(valueChanged(double)), - this, SLOT(effectParamChanged())); + connect((TQWidget *)base->wave_amplitude, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(effectParamChanged())); + connect((TQWidget *)base->wave_length, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(effectParamChanged())); } void KPrImageEffectDia::effectParamChanged() diff --git a/kpresenter/KPrImageEffectDia.h b/kpresenter/KPrImageEffectDia.h index 7e26b50f..38b03937 100644 --- a/kpresenter/KPrImageEffectDia.h +++ b/kpresenter/KPrImageEffectDia.h @@ -21,7 +21,7 @@ #ifndef IMAGEEFFECTDIA_H #define IMAGEEFFECTDIA_H -#include <qpixmap.h> +#include <tqpixmap.h> #include <kdialogbase.h> @@ -30,15 +30,16 @@ class KPrImageEffectDia: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KPrImageEffectDia(QWidget * parent = 0, const char * name = 0); + KPrImageEffectDia(TQWidget * tqparent = 0, const char * name = 0); ~KPrImageEffectDia(); /** * Set the initial preview pixmap */ - void setPixmap(QPixmap pix); + void setPixmap(TQPixmap pix); /** * Returns the selected effect @@ -47,23 +48,23 @@ public: /** * Returns the first param of the selected effect */ - QVariant getParam1() const {return m_param1;} + TQVariant getParam1() const {return m_param1;} /** * Returns the second param of the the selected effect */ - QVariant getParam2() const {return m_param2;} + TQVariant getParam2() const {return m_param2;} /** * Returns the third param of the the selected effect */ - QVariant getParam3() const {return m_param3;} + TQVariant getParam3() const {return m_param3;} /** * Set the initial effect and its params before showing the dialog */ - void setEffect(ImageEffect eff, QVariant p1, QVariant p2, QVariant p3); + void setEffect(ImageEffect eff, TQVariant p1, TQVariant p2, TQVariant p3); protected: - virtual void showEvent(QShowEvent * e); + virtual void showEvent(TQShowEvent * e); private slots: void effectChanged(int); @@ -73,10 +74,10 @@ private slots: private: void updatePreview(); void setupSignals(); - QPixmap m_pix; - QPixmap m_origpix; + TQPixmap m_pix; + TQPixmap m_origpix; ImageEffect m_effect; - QVariant m_param1, m_param2, m_param3; + TQVariant m_param1, m_param2, m_param3; EffectBrowserBase * base; }; diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp index d271445e..72d3b9ab 100644 --- a/kpresenter/KPrImportStyleDia.cpp +++ b/kpresenter/KPrImportStyleDia.cpp @@ -20,23 +20,23 @@ #include <klocale.h> #include "KPrDocument.h" -#include <qvbox.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qlistbox.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqlistbox.h> #include <kmessagebox.h> #include "KPrImportStyleDia.h" #include <KoStore.h> -#include <qfile.h> +#include <tqfile.h> #include <kfiledialog.h> #include <kdebug.h> -#include <qlabel.h> +#include <tqlabel.h> #include "KPrTextObject.h" KPrImportStyleDia::KPrImportStyleDia( KPrDocument *_doc, KoStyleCollection* currentCollection, - QWidget *parent, const char *name ) - :KoImportStyleDia( currentCollection, parent, name ), + TQWidget *tqparent, const char *name ) + :KoImportStyleDia( currentCollection, tqparent, name ), m_doc(_doc) { } @@ -47,15 +47,15 @@ KPrImportStyleDia::~KPrImportStyleDia() void KPrImportStyleDia::loadFile() { - KFileDialog fd( QString::null, QString::null, 0, 0, TRUE ); - QStringList lst = "application/x-kpresenter"; + KFileDialog fd( TQString(), TQString(), 0, 0, TRUE ); + TQStringList lst = "application/x-kpresenter"; #if 0 //For the future lst << "application/vnd.oasis.opendocument.presentation"; #endif fd.setMimeFilter( lst ); fd.setCaption(i18n("Import Style")); KURL url; - if ( fd.exec() != QDialog::Accepted ) + if ( fd.exec() != TQDialog::Accepted ) return; url = fd.selectedURL(); if( url.isEmpty() ) @@ -65,7 +65,7 @@ void KPrImportStyleDia::loadFile() i18n("Import Style")); return; } - QMap<QString, QString>insertStyle; + TQMap<TQString, TQString>insertStyle; KoStore* store=KoStore::createStore( this, url.path(), KoStore::Read ); if (store ) { @@ -74,35 +74,35 @@ void KPrImportStyleDia::loadFile() clear(); m_listStyleName->clear(); - QDomDocument doc; + TQDomDocument doc; doc.setContent( store->device() ); - QDomElement word = doc.documentElement(); + TQDomElement word = doc.documentElement(); - QDomElement stylesElem = word.namedItem( "STYLES" ).toElement(); + TQDomElement stylesElem = word.namedItem( "STYLES" ).toElement(); if ( !stylesElem.isNull() ) { //todo //duplicate code try to remove it ! - QValueList<QString> followingStyles; - QDomNodeList listStyles = stylesElem.elementsByTagName( "STYLE" ); + TQValueList<TQString> followingStyles; + TQDomNodeList listStyles = stylesElem.elementsByTagName( "STYLE" ); for (unsigned int item = 0; item < listStyles.count(); item++) { - QDomElement styleElem = listStyles.item( item ).toElement(); + TQDomElement styleElem = listStyles.item( item ).toElement(); - KoParagStyle *sty = new KoParagStyle( QString::null ); + KoParagStyle *sty = new KoParagStyle( TQString() ); // Load the style from the <STYLE> element sty->loadStyle( styleElem ); if ( currentCollection()->findStyle( sty->name() ) ) sty->setName(generateStyleName(sty->name() + "-%1")); - QString name = sty->displayName(); + TQString name = sty->displayName(); // ### TODO: we should offer the option of updating the // existing style instead of creating a foo-1 style. Any ideas for a GUI? if ( currentCollection()->findStyleByDisplayName( name ) ) sty->setDisplayName(generateStyleDisplayName(sty->displayName() + "-%1")); insertStyle.insert( name, sty->name() ); - QDomElement formatElem = styleElem.namedItem( "FORMAT" ).toElement(); + TQDomElement formatElem = styleElem.namedItem( "FORMAT" ).toElement(); if ( !formatElem.isNull() ) sty->format() = KPrTextObject::loadFormat( formatElem, 0L, m_doc->defaultFont(), m_doc->globalLanguage(), m_doc->globalHyphenation() ); @@ -115,7 +115,7 @@ void KPrImportStyleDia::loadFile() if( m_styleList.count() >= 0 && uint( m_styleList.count() ) > followingStyles.count() ) { - QString following = styleElem.namedItem("FOLLOWING").toElement().attribute("name"); + TQString following = styleElem.namedItem("FOLLOWING").toElement().attribute("name"); followingStyles.append( following ); } else @@ -125,9 +125,9 @@ void KPrImportStyleDia::loadFile() Q_ASSERT( m_styleList.count() >= 0 && followingStyles.count() == uint( m_styleList.count() ) ); unsigned int i=0; - for( QValueList<QString>::Iterator it = followingStyles.begin(); it != followingStyles.end(); ++it ) { - QString newName =*it; - if ( insertStyle.contains( *it ) ) + for( TQValueList<TQString>::Iterator it = followingStyles.begin(); it != followingStyles.end(); ++it ) { + TQString newName =*it; + if ( insertStyle.tqcontains( *it ) ) newName = (insertStyle)[ *it ]; KoParagStyle * style = m_styleList.findStyle(newName); diff --git a/kpresenter/KPrImportStyleDia.h b/kpresenter/KPrImportStyleDia.h index b800d3dc..8b550d9f 100644 --- a/kpresenter/KPrImportStyleDia.h +++ b/kpresenter/KPrImportStyleDia.h @@ -23,18 +23,19 @@ #include <kdialogbase.h> #include <KoImportStyleDia.h> -#include <qstringlist.h> -class QLineEdit; -class QListBox; +#include <tqstringlist.h> +class TQLineEdit; +class TQListBox; class KPrDocument; -class QPushButton; +class TQPushButton; class KoParagStyle; class KPrImportStyleDia : public KoImportStyleDia { Q_OBJECT + TQ_OBJECT public: - KPrImportStyleDia( KPrDocument *_doc, KoStyleCollection* currentCollection, QWidget *parent, const char *name = 0 ); + KPrImportStyleDia( KPrDocument *_doc, KoStyleCollection* currentCollection, TQWidget *tqparent, const char *name = 0 ); ~KPrImportStyleDia(); protected: diff --git a/kpresenter/KPrLineObject.cpp b/kpresenter/KPrLineObject.cpp index f0ac86bc..1cd98819 100644 --- a/kpresenter/KPrLineObject.cpp +++ b/kpresenter/KPrLineObject.cpp @@ -27,9 +27,9 @@ #include <KoStyleStack.h> #include <KoOasisContext.h> -#include <qpainter.h> -#include <qwmatrix.h> -#include <qdom.h> +#include <tqpainter.h> +#include <tqwmatrix.h> +#include <tqdom.h> #include <kdebug.h> #include <KoUnit.h> #include <KoTextZoomHandler.h> @@ -80,7 +80,7 @@ bool KPrLineObject::saveOasisObjectAttributes( KPOasisSaveContext &/*sc*/ ) cons void KPrLineObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj ) const { - xmlWriter.addAttribute( "draw:id", "object" + QString::number( indexObj ) ); + xmlWriter.addAttribute( "draw:id", "object" + TQString::number( indexObj ) ); double x1 = 0.0; double y1 = 0.0; @@ -114,7 +114,7 @@ void KPrLineObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj ) c if ( kAbs( angle ) > 1E-6 ) { double angInRad = -angle * M_PI / 180.0; - QWMatrix m( cos( angInRad ), -sin( angInRad ), sin( angInRad ), cos( angInRad ), 0, 0 ); + TQWMatrix m( cos( angInRad ), -sin( angInRad ), sin( angInRad ), cos( angInRad ), 0, 0 ); double transX1 = 0.0; double transY1 = 0.0; double transX2 = 0.0; @@ -144,27 +144,27 @@ const char * KPrLineObject::getOasisElementName() const return "draw:line"; } -QDomDocumentFragment KPrLineObject::save( QDomDocument& doc, double offset ) +TQDomDocumentFragment KPrLineObject::save( TQDomDocument& doc, double offset ) { - QDomDocumentFragment fragment=KPrShadowObject::save(doc, offset); + TQDomDocumentFragment fragment=KPrShadowObject::save(doc, offset); if (lineType!=LT_HORZ) fragment.appendChild(KPrObject::createValueElement("LINETYPE", static_cast<int>(lineType), doc)); KPrStartEndLine::save( fragment, doc ); return fragment; } -void KPrLineObject::loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info) +void KPrLineObject::loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info) { KPrShadowObject::loadOasis(element, context, info); - double x1 = KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x1", QString::null ) ); - double y1 = KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y1", QString::null ) ); - double x2 = KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x2", QString::null ) ); - double y2 = KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y2", QString::null ) ); + double x1 = KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x1", TQString() ) ); + double y1 = KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y1", TQString() ) ); + double x2 = KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x2", TQString() ) ); + double y2 = KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y2", TQString() ) ); - kdDebug()<<" KPrLineObject::loadOasis(const QDomElement &element) : x1 "<< x1 <<" y1 : "<<y1<<" x2 :"<<x2 <<" y2 "<<y2<<endl; - double x = QMIN( x1, x2 ); - double y = QMIN( y1, y2 ); + kdDebug()<<" KPrLineObject::loadOasis(const TQDomElement &element) : x1 "<< x1 <<" y1 : "<<y1<<" x2 :"<<x2 <<" y2 "<<y2<<endl; + double x = TQMIN( x1, x2 ); + double y = TQMIN( y1, y2 ); orig.setX( x ); orig.setY( y ); @@ -191,19 +191,19 @@ void KPrLineObject::loadOasis(const QDomElement &element, KoOasisContext & conte else lineType=LT_LD_RU; - kdDebug()<<"KPrLineObject::loadOasis(const QDomElement &element) : real position x :"<<orig.x()<<" y "<<orig.y()<< " width :"<<ext.width()<<" height :"<<ext.height()<<endl; + kdDebug()<<"KPrLineObject::loadOasis(const TQDomElement &element) : real position x :"<<orig.x()<<" y "<<orig.y()<< " width :"<<ext.width()<<" height :"<<ext.height()<<endl; - QString attr = (x1 <= x2) ? "marker-start" : "marker-end"; + TQString attr = (x1 <= x2) ? "marker-start" : "marker-end"; loadOasisMarkerElement( context, attr, lineBegin ); attr = (x1 <= x2) ? "marker-end" : "marker-start"; loadOasisMarkerElement( context, attr, lineEnd ); } -double KPrLineObject::load(const QDomElement &element) +double KPrLineObject::load(const TQDomElement &element) { double offset=KPrShadowObject::load(element); - QDomElement e=element.namedItem("LINETYPE").toElement(); + TQDomElement e=element.namedItem("LINETYPE").toElement(); if(!e.isNull()) { int tmp=0; if(e.hasAttribute("value")) @@ -214,17 +214,17 @@ double KPrLineObject::load(const QDomElement &element) return offset; } -void KPrLineObject::paint( QPainter* _painter, KoTextZoomHandler*_zoomHandler, +void KPrLineObject::paint( TQPainter* _painter, KoTextZoomHandler*_zoomHandler, int /* pageNum */, bool /*drawingShadow*/, bool drawContour ) { double ow = ext.width(); double oh = ext.height(); int _w = int( pen.pointWidth() ); - QPen pen2; + TQPen pen2; if ( drawContour ) { - pen2 = QPen( Qt::black, 1, Qt::DotLine ); - _painter->setRasterOp( Qt::NotXorROP ); + pen2 = TQPen( TQt::black, 1, TQt::DotLine ); + _painter->setRasterOp( TQt::NotXorROP ); } else { pen2 = pen.zoomedPen( _zoomHandler ); diff --git a/kpresenter/KPrLineObject.h b/kpresenter/KPrLineObject.h index 3785d443..a709779b 100644 --- a/kpresenter/KPrLineObject.h +++ b/kpresenter/KPrLineObject.h @@ -25,7 +25,7 @@ #include "KPrObject.h" #include <KoStyleStack.h> -class QPainter; +class TQPainter; class DCOPObject; class KoXmlWriter; @@ -51,7 +51,7 @@ public: virtual ObjType getType() const { return OT_LINE; } - virtual QString getTypeString() const + virtual TQString getTypeString() const { return i18n("Line"); } virtual LineEnd getLineBegin() const { return lineBegin; } @@ -60,9 +60,9 @@ public: virtual LineType getLineType() const { return lineType; } - virtual QDomDocumentFragment save( QDomDocument& doc, double offset ); - virtual double load(const QDomElement &element); - virtual void loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); + virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset ); + virtual double load(const TQDomElement &element); + virtual void loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); virtual void flip(bool horizontal ); @@ -76,7 +76,7 @@ protected: virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const; - virtual void paint( QPainter *_painter, KoTextZoomHandler*_zoomHandler, + virtual void paint( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour = FALSE ); LineType lineType; }; diff --git a/kpresenter/KPrLineObjectIface.cpp b/kpresenter/KPrLineObjectIface.cpp index e9e8664f..8fa03726 100644 --- a/kpresenter/KPrLineObjectIface.cpp +++ b/kpresenter/KPrLineObjectIface.cpp @@ -33,23 +33,23 @@ KPrLineObjectIface::KPrLineObjectIface( KPrLineObject *_obj ) obj = _obj; } -void KPrLineObjectIface::setLineBegin( const QString & type) +void KPrLineObjectIface::setLineBegin( const TQString & type) { obj->setLineBegin(lineEndBeginFromString( type )); } -void KPrLineObjectIface::setLineEnd( const QString & type) +void KPrLineObjectIface::setLineEnd( const TQString & type) { obj->setLineEnd(lineEndBeginFromString( type )); } -QString KPrLineObjectIface::lineBegin()const +TQString KPrLineObjectIface::lineBegin()const { LineEnd type=obj->getLineBegin(); return lineEndBeginName( type ); } -QString KPrLineObjectIface::lineEnd() const +TQString KPrLineObjectIface::lineEnd() const { LineEnd type=obj->getLineEnd(); return lineEndBeginName( type ); diff --git a/kpresenter/KPrLineObjectIface.h b/kpresenter/KPrLineObjectIface.h index b00b4654..76b60240 100644 --- a/kpresenter/KPrLineObjectIface.h +++ b/kpresenter/KPrLineObjectIface.h @@ -24,7 +24,7 @@ #include <dcopobject.h> #include <dcopref.h> #include "KPrObjectIface.h" -#include <qstring.h> +#include <tqstring.h> class KPrLineObject; @@ -36,10 +36,10 @@ public: k_dcop: - void setLineBegin( const QString & ); - void setLineEnd( const QString & ); - QString lineBegin()const; - QString lineEnd() const; + void setLineBegin( const TQString & ); + void setLineEnd( const TQString & ); + TQString lineBegin()const; + TQString lineEnd() const; void horizontalFlip(); void verticalFlip(); private: diff --git a/kpresenter/KPrLoadingInfo.h b/kpresenter/KPrLoadingInfo.h index 3bfea0b9..af17f2b5 100644 --- a/kpresenter/KPrLoadingInfo.h +++ b/kpresenter/KPrLoadingInfo.h @@ -22,7 +22,7 @@ struct lstAnimation { - QDomElement *element; + TQDomElement *element; int order; }; @@ -42,14 +42,14 @@ public: } ~KPrLoadingInfo() {} - lstAnimation* animationShowById( const QString& id ) const { + lstAnimation* animationShowById( const TQString& id ) const { return m_animationsShowDict[id]; // returns 0 if not found } - void storePresentationShowAnimation( lstAnimation * element, const QString& id ) { + void storePresentationShowAnimation( lstAnimation * element, const TQString& id ) { m_animationsShowDict.insert( id , element ); } void clearAnimationShowDict() { - QDictIterator<lstAnimation> it( m_animationsShowDict ); // See QDictIterator + TQDictIterator<lstAnimation> it( m_animationsShowDict ); // See TQDictIterator for( ; it.current(); ++it ) { delete it.current()->element; @@ -57,14 +57,14 @@ public: m_animationsShowDict.clear(); } - lstAnimation* animationHideById( const QString& id ) const { + lstAnimation* animationHideById( const TQString& id ) const { return m_animationsHideDict[id]; // returns 0 if not found } - void storePresentationHideAnimation( lstAnimation * element, const QString& id ) { + void storePresentationHideAnimation( lstAnimation * element, const TQString& id ) { m_animationsHideDict.insert( id , element ); } void clearAnimationHideDict() { - QDictIterator<lstAnimation> it( m_animationsHideDict ); // See QDictIterator + TQDictIterator<lstAnimation> it( m_animationsHideDict ); // See TQDictIterator for( ; it.current(); ++it ) { delete it.current()->element; @@ -73,13 +73,13 @@ public: } bool oldFormat() const { return m_oldFormat; } int presSpeed; - QMap<QString, KPrPage *> m_name2page; + TQMap<TQString, KPrPage *> m_name2page; bool m_header; bool m_footer; bool m_headerFooterByPage; private: - QDict<lstAnimation> m_animationsShowDict; - QDict<lstAnimation> m_animationsHideDict; + TQDict<lstAnimation> m_animationsShowDict; + TQDict<lstAnimation> m_animationsHideDict; bool m_oldFormat; }; diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp index eb639604..f9a87fd5 100644 --- a/kpresenter/KPrMSPresentationSetup.cpp +++ b/kpresenter/KPrMSPresentationSetup.cpp @@ -33,17 +33,17 @@ #include <kio/netaccess.h> #include <ktempfile.h> -#include <qdir.h> -#include <qframe.h> -#include <qfileinfo.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qpushbutton.h> -#include <qvbox.h> -#include <qwhatsthis.h> +#include <tqdir.h> +#include <tqframe.h> +#include <tqfileinfo.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqpushbutton.h> +#include <tqvbox.h> +#include <tqwhatsthis.h> #include <kapplication.h> #include <kbuttonbox.h> @@ -84,15 +84,15 @@ void KPrMSPresentation::initCreation( KProgress *progressBar ) // we create the DCIM file, and then iterate through looking // for the next "available" directory slot KURL str( path + "/DCIM" ); - KIO::NetAccess::mkdir( str,( QWidget* )0L ); + KIO::NetAccess::mkdir( str,( TQWidget* )0L ); p = progressBar->progress(); progressBar->setProgress( ++p ); kapp->processEvents(); for (int dirNum = 101; dirNum < 999; dirNum++) { - slidePath = QString("/DCIM/%1MSPJP").arg(dirNum); - if (! KIO::NetAccess::exists(( path + slidePath), true, ( QWidget* )0L) ) + slidePath = TQString("/DCIM/%1MSPJP").tqarg(dirNum); + if (! KIO::NetAccess::exists(( path + slidePath), true, ( TQWidget* )0L) ) break; } @@ -101,20 +101,20 @@ void KPrMSPresentation::initCreation( KProgress *progressBar ) kapp->processEvents(); str = ( path + slidePath ); - KIO::NetAccess::mkdir( str,( QWidget* )0L ); + KIO::NetAccess::mkdir( str,( TQWidget* )0L ); p = progressBar->progress(); progressBar->setProgress( ++p ); kapp->processEvents(); // now do the SPP file directory str = ( path + "/MSSONY" ); - KIO::NetAccess::mkdir( str,( QWidget* )0L ); + KIO::NetAccess::mkdir( str,( TQWidget* )0L ); p = progressBar->progress(); progressBar->setProgress( ++p ); kapp->processEvents(); str = ( path + "/MSSONY/PJ" ); - KIO::NetAccess::mkdir( str,( QWidget* )0L ); + KIO::NetAccess::mkdir( str,( TQWidget* )0L ); p = progressBar->progress(); @@ -122,13 +122,13 @@ void KPrMSPresentation::initCreation( KProgress *progressBar ) kapp->processEvents(); // create the title slides - QPixmap titleSlide( 1024, 768 ); + TQPixmap titleSlide( 1024, 768 ); titleSlide.fill( backColour ); - QPainter painter( &titleSlide ); + TQPainter painter( &titleSlide ); //the second title is just blank, so create that now KTempFile tmp; - QString filename = path + slidePath + "/SPJT0002.JPG"; + TQString filename = path + slidePath + "/SPJT0002.JPG"; titleSlide.save( tmp.name(), "JPEG" ); KIO::NetAccess::file_move( tmp.name(), filename, -1, true /*overwrite*/); @@ -137,10 +137,10 @@ void KPrMSPresentation::initCreation( KProgress *progressBar ) kapp->processEvents(); // and put the specified title string on the first slide - QFont textFont( "SansSerif", 96 ); + TQFont textFont( "SansSerif", 96 ); painter.setFont( textFont ); painter.setPen( textColour ); - painter.drawText( titleSlide.rect(), Qt::AlignCenter | Qt::WordBreak, title ); + painter.drawText( titleSlide.rect(), TQt::AlignCenter | TQt::WordBreak, title ); filename = path + slidePath + "/SPJT0001.JPG"; KTempFile tmp2; @@ -157,7 +157,7 @@ void KPrMSPresentation::createSlidesPictures( KProgress *progressBar ) { if ( slideInfos.isEmpty() ) return; - QString filename; + TQString filename; int p; for ( unsigned int i = 0; i < slideInfos.count(); i++ ) { int pgNum = slideInfos[i].pageNumber; @@ -181,34 +181,34 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar ) int p; KTempFile sppFile; - QString filenameStore = (path + "/MSSONY/PJ/" + title + ".SPP"); + TQString filenameStore = (path + "/MSSONY/PJ/" + title + ".SPP"); - QDataStream sppStream( sppFile.file() ); - sppStream.setByteOrder(QDataStream::LittleEndian); + TQDataStream sppStream( sppFile.file() ); + sppStream.setByteOrder(TQDataStream::LittleEndian); p = progressBar->progress(); progressBar->setProgress( ++p ); kapp->processEvents(); // We are doing little endian - sppStream << (Q_UINT32)0x00505053; // SPP magic header - sppStream << (Q_UINT32)0x00000000; // four null bytes - sppStream << (Q_UINT32)0x30303130; // version(?) 0100 - sppStream << (Q_UINT32)0x00000000; // more nulls - sppStream << (Q_UINT32)(slideInfos.count()); + sppStream << (TQ_UINT32)0x00505053; // SPP magic header + sppStream << (TQ_UINT32)0x00000000; // four null bytes + sppStream << (TQ_UINT32)0x30303130; // version(?) 0100 + sppStream << (TQ_UINT32)0x00000000; // more nulls + sppStream << (TQ_UINT32)(slideInfos.count()); // DCIM path 1, 68 bytes null padded char buff[68]; - strncpy( buff, QString("%1").arg(slidePath).ascii(), 67 ); + strncpy( buff, TQString("%1").tqarg(slidePath).ascii(), 67 ); buff[67] = 0x00; sppStream.writeRawBytes( buff, 68 ); - sppStream << (Q_UINT32)0x00000001; // fixed value - sppStream << (Q_UINT32)0x00000005; // fixed value - sppStream << (Q_UINT32)0x00000000; // more nulls - sppStream << (Q_UINT32)0x00000000; // more nulls - sppStream << (Q_UINT32)0x00000000; // more nulls - sppStream << (Q_UINT32)0x00000000; // more nulls - sppStream << (Q_UINT32)0x00000000; // more nulls - sppStream << (Q_UINT32)0x00000000; // more nulls + sppStream << (TQ_UINT32)0x00000001; // fixed value + sppStream << (TQ_UINT32)0x00000005; // fixed value + sppStream << (TQ_UINT32)0x00000000; // more nulls + sppStream << (TQ_UINT32)0x00000000; // more nulls + sppStream << (TQ_UINT32)0x00000000; // more nulls + sppStream << (TQ_UINT32)0x00000000; // more nulls + sppStream << (TQ_UINT32)0x00000000; // more nulls + sppStream << (TQ_UINT32)0x00000000; // more nulls p = progressBar->progress(); progressBar->setProgress( ++p ); kapp->processEvents(); @@ -230,20 +230,20 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar ) sppStream.writeRawBytes( buff, 44 ); //not really sure what this is about - sppStream << (Q_UINT32)0xffff0000; - sppStream << (Q_UINT32)0xffff00ff; - sppStream << (Q_UINT32)0xffff00ff; - sppStream << (Q_UINT32)0x000000ff; - sppStream << (Q_UINT32)0x00000002; + sppStream << (TQ_UINT32)0xffff0000; + sppStream << (TQ_UINT32)0xffff00ff; + sppStream << (TQ_UINT32)0xffff00ff; + sppStream << (TQ_UINT32)0x000000ff; + sppStream << (TQ_UINT32)0x00000002; for (int i = 0; i < (296/4); i++) { - sppStream << (Q_UINT32)0x00000000; + sppStream << (TQ_UINT32)0x00000000; } p = progressBar->progress(); progressBar->setProgress( ++p ); kapp->processEvents(); // Add in the slide filenames - QString filename; + TQString filename; for ( unsigned int i = 0; i < slideInfos.count(); i++ ) { filename.sprintf("SPJP%04i.JPG", i+3); strncpy( buff, filename.ascii(), 63 ); @@ -258,7 +258,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar ) // the logic is 16384 bytes total, lead in is 512 bytes, and there // is 64 bytes for each real slide for(unsigned int i = 0; i < (16384-512-64*(slideInfos.count()))/4; i++) { - sppStream << (Q_UINT32)0x00000000; + sppStream << (TQ_UINT32)0x00000000; } p = progressBar->progress(); @@ -284,114 +284,114 @@ void KPrMSPresentation::init() } if ( slideInfos.isEmpty() ) kdWarning() << "No slides selected!" << endl; - backColour = Qt::black; - textColour = Qt::white; + backColour = TQt::black; + textColour = TQt::white; path = KGlobalSettings::documentPath(); } KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_view ) - : QDialog( 0, "", false ), msPres( _doc, _view ) + : TQDialog( 0, "", false ), msPres( _doc, _view ) { doc = _doc; view = _view; - QLabel *helptext = new QLabel( this ); - helptext->setAlignment( Qt::WordBreak | Qt::AlignTop| Qt::AlignLeft ); + TQLabel *helptext = new TQLabel( this ); + helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft ); helptext->setText( i18n( "Please enter the directory where the memory stick " "presentation should be saved. Please also enter a " "title for the slideshow presentation. " ) ); - QLabel *lable2 = new QLabel( i18n("Path:"), this ); - lable2->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); + TQLabel *lable2 = new TQLabel( i18n("Path:"), this ); + lable2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); path=new KURLRequester( this ); path->setMode( KFile::Directory); path->lineEdit()->setText(msPres.getPath()); lable2->setBuddy(path); - QHBoxLayout *pathLayout = new QHBoxLayout; + TQHBoxLayout *pathLayout = new TQHBoxLayout; pathLayout->addWidget(lable2); pathLayout->addWidget(path); - connect( path, SIGNAL( textChanged(const QString&) ), - this, SLOT( slotChoosePath(const QString&) ) ); - connect( path, SIGNAL( urlSelected( const QString&) ), - this, SLOT( slotChoosePath(const QString&) ) ); + connect( path, TQT_SIGNAL( textChanged(const TQString&) ), + this, TQT_SLOT( slotChoosePath(const TQString&) ) ); + connect( path, TQT_SIGNAL( urlSelected( const TQString&) ), + this, TQT_SLOT( slotChoosePath(const TQString&) ) ); - QLabel *lable1 = new QLabel( i18n("Title:"), this, "lable1" ); - lable1->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); + TQLabel *lable1 = new TQLabel( i18n("Title:"), this, "lable1" ); + lable1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); // TODO - check if there is already a presentation with this title, and // add a number after it until there isn't. title = new KLineEdit( msPres.getTitle(), this ); lable1->setBuddy( title ); - QHBoxLayout *titleLayout = new QHBoxLayout; + TQHBoxLayout *titleLayout = new TQHBoxLayout; titleLayout->addWidget( lable1 ); titleLayout->addWidget( title ); - QHBox *moreBox = new QHBox( this ); - QPushButton *showColourButton = new QPushButton( i18n("&Set Colors"), moreBox ); + TQHBox *moreBox = new TQHBox( this ); + TQPushButton *showColourButton = new TQPushButton( i18n("&Set Colors"), moreBox ); showColourButton->setToggleButton( true ); - connect( showColourButton, SIGNAL( toggled(bool) ), this, SLOT( showColourGroup(bool) ) ); + connect( showColourButton, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( showColourGroup(bool) ) ); - QVBoxLayout *topLayout = new QVBoxLayout; + TQVBoxLayout *topLayout = new TQVBoxLayout; topLayout->addWidget( helptext ); topLayout->addSpacing( 10 ); topLayout->addLayout( pathLayout ); topLayout->addLayout( titleLayout ); topLayout->addWidget( moreBox ); - colourGroup = new QGroupBox( 2, Qt::Vertical, + colourGroup = new TQGroupBox( 2, Qt::Vertical, i18n("Preliminary Slides"), this , "colourBox" ); - QWhatsThis::add( colourGroup, + TQWhatsThis::add( colourGroup, i18n( "This section allows you to set the colors for " "the preliminary slides; it does not affect the " "presentation in any way, and it is normal to " "leave these set to the default.") ); - QHBox *textColourLayout = new QHBox( colourGroup ); - QLabel *lable3 = new QLabel( i18n("Text color:"), textColourLayout ); - lable3->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); + TQHBox *textColourLayout = new TQHBox( colourGroup ); + TQLabel *lable3 = new TQLabel( i18n("Text color:"), textColourLayout ); + lable3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); textColour = new KColorButton( msPres.getTextColour(), textColourLayout ); lable3->setBuddy( textColour ); - QHBox *backgroundColourLayout = new QHBox( colourGroup ); - QLabel *lable4 = new QLabel( i18n("Background color:"), backgroundColourLayout ); - lable4->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); + TQHBox *backgroundColourLayout = new TQHBox( colourGroup ); + TQLabel *lable4 = new TQLabel( i18n("Background color:"), backgroundColourLayout ); + lable4->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); backColour = new KColorButton( msPres.getBackColour(), backgroundColourLayout ); lable4->setBuddy( backColour ); colourGroup->setHidden( true ); - QHBox *buttonLayout = new QHBox( this ); + TQHBox *buttonLayout = new TQHBox( this ); KPushButton *helpButton = new KPushButton( KStdGuiItem::help(), buttonLayout ); - QWhatsThis::add( helpButton, + TQWhatsThis::add( helpButton, i18n( "Selecting this button will take you to the KPresenter " "documentation that provides more information on how " "to use the Memory Stick export function. ") ); KPushButton *createButton = new KPushButton( KStdGuiItem::ok(), buttonLayout ); - QWhatsThis::add( createButton, + TQWhatsThis::add( createButton, i18n( "Selecting this button will proceed to generating " "the presentation in the special Sony format." ) ); KPushButton *cancelButton = new KPushButton( KStdGuiItem::cancel(), buttonLayout ); - QWhatsThis::add( cancelButton, + TQWhatsThis::add( cancelButton, i18n( "Selecting this button will cancel out of the " "generation of the presentation, and return " "to the normal KPresenter view. No files will " "be affected." ) ); - mainLayout = new QVBoxLayout( this ); + mainLayout = new TQVBoxLayout( this ); mainLayout->setMargin(11); mainLayout->setSpacing(6); mainLayout->addLayout(topLayout); mainLayout->addSpacing( 10 ); mainLayout->addWidget(colourGroup); mainLayout->addWidget(buttonLayout); - mainLayout->setResizeMode( QLayout::Fixed ); - mainLayout->setGeometry( QRect( 0, 0, 300, 220 ) ); + mainLayout->setResizeMode( TQLayout::Fixed ); + mainLayout->setGeometry( TQRect( 0, 0, 300, 220 ) ); - connect( helpButton, SIGNAL( clicked() ), this, SLOT ( helpMe() ) ); - connect( cancelButton, SIGNAL( clicked() ), this, SLOT( reject() ) ); - connect( createButton, SIGNAL( clicked() ), this, SLOT( finish() ) ); + connect( helpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT ( helpMe() ) ); + connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); + connect( createButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( finish() ) ); } KPrMSPresentationSetup::~KPrMSPresentationSetup() @@ -412,10 +412,10 @@ void KPrMSPresentationSetup::showColourGroup(bool on) { if (on) { colourGroup->setHidden( false ); - mainLayout->setGeometry( QRect(0, 0, 300, 220 ) ); + mainLayout->setGeometry( TQRect(0, 0, 300, 220 ) ); } else { colourGroup->setHidden( true ); - mainLayout->setGeometry( QRect(0, 0, 300, 320 ) ); + mainLayout->setGeometry( TQRect(0, 0, 300, 320 ) ); } } @@ -438,18 +438,18 @@ void KPrMSPresentationSetup::finish() // 3. that the .spp file doesn't already exist. If it does, offer to overwrite it. // If we fail to create a directory, or the user tells us not to bother creating it, // or the user doesn't want to overwrite it, go back. - QString pathname = path->lineEdit()->text(); + TQString pathname = path->lineEdit()->text(); // path doesn't exist. ask user if it should be created. if ( !KIO::NetAccess::exists(pathname, false, this) ) { - QString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>" + TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>" "Do you want create it?</qt>" ); - if( KMessageBox::questionYesNo( this, msg.arg( pathname ), + if( KMessageBox::questionYesNo( this, msg.tqarg( pathname ), i18n( "Directory Not Found" ) ) == KMessageBox::Yes) { // we are trying to create the directory - QDir dir; + TQDir dir; bool ok = KIO::NetAccess::mkdir( pathname,this ); if( !ok ) { // then directory couldn't be created @@ -466,12 +466,12 @@ void KPrMSPresentationSetup::finish() } } - QString sppFile( pathname + "/MSSONY/PJ/" + title->text() + ".SPP" ); + TQString sppFile( pathname + "/MSSONY/PJ/" + title->text() + ".SPP" ); if (KIO::NetAccess::exists(sppFile, false, this ) ) { if ( KMessageBox::warningYesNo( 0, i18n( "You are about to overwrite an existing index " "file : %1.\n " - "Do you want to proceed?" ).arg( sppFile ), + "Do you want to proceed?" ).tqarg( sppFile ), i18n( "Overwrite Presentation" ) ) == KMessageBox::No) { path->setFocus(); @@ -485,7 +485,7 @@ void KPrMSPresentationSetup::finish() } -void KPrMSPresentationSetup::slotChoosePath(const QString &text) +void KPrMSPresentationSetup::slotChoosePath(const TQString &text) { msPres.setPath(text); } @@ -495,7 +495,7 @@ void KPrMSPresentationSetup::slotChoosePath(const QString &text) KPrMSPresentationCreateDialog::KPrMSPresentationCreateDialog( KPrDocument *_doc, KPrView *_view, const KPrMSPresentation &_msPres ) - : QDialog( 0, "", false ), msPres( _msPres ) + : TQDialog( 0, "", false ), msPres( _msPres ) { doc = _doc; view = _view; @@ -532,7 +532,7 @@ void KPrMSPresentationCreateDialog::start() void KPrMSPresentationCreateDialog::initCreation() { - QFont f = step1->font(), f2 = step1->font(); + TQFont f = step1->font(), f2 = step1->font(); f.setBold( true ); step1->setFont( f ); @@ -547,7 +547,7 @@ void KPrMSPresentationCreateDialog::initCreation() void KPrMSPresentationCreateDialog::createSlidesPictures() { - QFont f = step2->font(), f2 = f; + TQFont f = step2->font(), f2 = f; f.setBold( true ); step2->setFont( f ); @@ -564,7 +564,7 @@ void KPrMSPresentationCreateDialog::createSlidesPictures() void KPrMSPresentationCreateDialog::createIndexFile() { - QFont f = step3->font(), f2 = f; + TQFont f = step3->font(), f2 = f; f.setBold( true ); step3->setFont( f ); @@ -581,23 +581,23 @@ void KPrMSPresentationCreateDialog::createIndexFile() void KPrMSPresentationCreateDialog::setupGUI() { - back = new QVBox( this ); + back = new TQVBox( this ); back->setMargin( KDialog::marginHint() ); - QFrame *line; + TQFrame *line; - step1 = new QLabel( i18n( "Create directory structure" ), back ); - step2 = new QLabel( i18n( "Create pictures of the slides" ), back ); - step3 = new QLabel( i18n( "Create index file" ), back ); + step1 = new TQLabel( i18n( "Create directory structure" ), back ); + step2 = new TQLabel( i18n( "Create pictures of the slides" ), back ); + step3 = new TQLabel( i18n( "Create index file" ), back ); - line = new QFrame( back ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + line = new TQFrame( back ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); line->setMaximumHeight( 20 ); progressBar = new KProgress( back ); - line = new QFrame( back ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + line = new TQFrame( back ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); line->setMaximumHeight( 20 ); KButtonBox *bb = new KButtonBox( back ); @@ -606,12 +606,12 @@ void KPrMSPresentationCreateDialog::setupGUI() bDone->setEnabled( false ); - connect( bDone, SIGNAL( clicked() ), this, SLOT( accept() ) ); + connect( bDone, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); } -void KPrMSPresentationCreateDialog::resizeEvent( QResizeEvent *e ) +void KPrMSPresentationCreateDialog::resizeEvent( TQResizeEvent *e ) { - QDialog::resizeEvent( e ); + TQDialog::resizeEvent( e ); back->resize( size() ); } diff --git a/kpresenter/KPrMSPresentationSetup.h b/kpresenter/KPrMSPresentationSetup.h index 7bceb412..c4ce5190 100644 --- a/kpresenter/KPrMSPresentationSetup.h +++ b/kpresenter/KPrMSPresentationSetup.h @@ -25,8 +25,8 @@ #include <kwizard.h> -#include <qdialog.h> -#include <qvaluelist.h> +#include <tqdialog.h> +#include <tqvaluelist.h> class KPrDocument; @@ -39,15 +39,15 @@ class KIntNumInput; class KLineEdit; class KComboBox; -class QVBox; -class QHBox; +class TQVBox; +class TQHBox; -class QListViewItem; -class QCloseEvent; +class TQListViewItem; +class TQCloseEvent; class KProgress; -class QLabel; -class QGroupBox; -class QVBoxLayout; +class TQLabel; +class TQGroupBox; +class TQVBoxLayout; class KPrMSPresentation { @@ -56,24 +56,24 @@ public: KPrMSPresentation( KPrDocument *_doc, KPrView *_view ); KPrMSPresentation( const KPrMSPresentation &msPres ); - void setTitle( const QString &_title ) + void setTitle( const TQString &_title ) { title = _title; } - void setBackColour( const QColor &_backColour ) + void setBackColour( const TQColor &_backColour ) { backColour = _backColour; } - void setTextColour( const QColor &_textColour ) + void setTextColour( const TQColor &_textColour ) { textColour = _textColour; } - void setPath( const QString &_path ) + void setPath( const TQString &_path ) { path = _path; } - QString getTitle() const { return title; } - QColor getBackColour() const { return backColour; } - QColor getTextColour() const { return textColour; } - QString getPath() const { return path; } + TQString getTitle() const { return title; } + TQColor getBackColour() const { return backColour; } + TQColor getTextColour() const { return textColour; } + TQString getPath() const { return path; } struct SlideInfo { int pageNumber; /* 0-based */ }; - QValueList<SlideInfo> getSlideInfos() const { return slideInfos; } + TQValueList<SlideInfo> getSlideInfos() const { return slideInfos; } int initSteps() const { return 7; } int slidesSteps() { return slideInfos.count(); } @@ -89,17 +89,18 @@ protected: KPrDocument *doc; KPrView *view; - QString title; - QValueList<SlideInfo> slideInfos; - QColor backColour, textColour; - QString path; - QString slidePath; // directory relative to path, containing slides + TQString title; + TQValueList<SlideInfo> slideInfos; + TQColor backColour, textColour; + TQString path; + TQString slidePath; // directory relative to path, containing slides }; -class KPrMSPresentationSetup : public QDialog +class KPrMSPresentationSetup : public TQDialog { Q_OBJECT + TQ_OBJECT public: KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_view ); @@ -114,20 +115,21 @@ protected: KLineEdit *title; KColorButton *textColour, *backColour; - QGroupBox *colourGroup; - QVBoxLayout *mainLayout; + TQGroupBox *colourGroup; + TQVBoxLayout *mainLayout; KURLRequester *path; protected slots: - void slotChoosePath(const QString &); + void slotChoosePath(const TQString &); virtual void finish(); virtual void helpMe(); void showColourGroup(bool on); }; -class KPrMSPresentationCreateDialog : public QDialog +class KPrMSPresentationCreateDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: KPrMSPresentationCreateDialog( KPrDocument *_doc, KPrView *_view, const KPrMSPresentation &_msPres ); @@ -143,16 +145,16 @@ public: protected: void setupGUI(); - void resizeEvent( QResizeEvent *e ); + void resizeEvent( TQResizeEvent *e ); KPrView *view; KPrDocument *doc; KPrMSPresentation msPres; KProgress *progressBar; - QLabel *step1, *step2, *step3; - QPushButton *bDone; - QVBox *back; + TQLabel *step1, *step2, *step3; + TQPushButton *bDone; + TQVBox *back; }; #endif diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp index 3a5874d4..2e942de7 100644 --- a/kpresenter/KPrMarginWidget.cpp +++ b/kpresenter/KPrMarginWidget.cpp @@ -22,9 +22,9 @@ #include "KPrMarginWidget.h" -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qlayout.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqlayout.h> #include <klocale.h> #include <knuminput.h> @@ -32,19 +32,19 @@ #include "marginui.h" #include <KoUnitWidgets.h>//for KoUnitDoubleSpinBox -KPrMarginWidget::KPrMarginWidget( QWidget *parent, const char *name, const KoUnit::Unit unit ) -: QWidget( parent, name ) +KPrMarginWidget::KPrMarginWidget( TQWidget *tqparent, const char *name, const KoUnit::Unit unit ) +: TQWidget( tqparent, name ) , m_unit( unit ) , m_changed( false ) , m_noSignal( false ) { - QVBoxLayout *layout = new QVBoxLayout( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); m_ui = new MarginUI( this ); - layout->addWidget( m_ui ); + tqlayout->addWidget( m_ui ); - QSpacerItem *spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); - layout->addItem( spacer ); + TQSpacerItem *spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + tqlayout->addItem( spacer ); m_ui->margins->setTitle( i18n( "Margins" ) ); @@ -62,14 +62,14 @@ KPrMarginWidget::KPrMarginWidget( QWidget *parent, const char *name, const KoUni m_ui->bottomInput->setUnit( unit ); m_ui->bottomInput->setMinMaxStep( 0, dMax, dStep ); - connect( m_ui->leftInput, SIGNAL( valueChanged( double ) ), - this, SLOT( slotValueChanged( double ) ) ); - connect( m_ui->rightInput, SIGNAL( valueChanged( double ) ), - this, SLOT( slotValueChanged( double ) ) ); - connect( m_ui->topInput, SIGNAL( valueChanged( double ) ), - this, SLOT( slotValueChanged( double ) ) ); - connect( m_ui->bottomInput, SIGNAL( valueChanged( double ) ), - this, SLOT( slotValueChanged( double ) ) ); + connect( m_ui->leftInput, TQT_SIGNAL( valueChanged( double ) ), + this, TQT_SLOT( slotValueChanged( double ) ) ); + connect( m_ui->rightInput, TQT_SIGNAL( valueChanged( double ) ), + this, TQT_SLOT( slotValueChanged( double ) ) ); + connect( m_ui->topInput, TQT_SIGNAL( valueChanged( double ) ), + this, TQT_SLOT( slotValueChanged( double ) ) ); + connect( m_ui->bottomInput, TQT_SIGNAL( valueChanged( double ) ), + this, TQT_SLOT( slotValueChanged( double ) ) ); } diff --git a/kpresenter/KPrMarginWidget.h b/kpresenter/KPrMarginWidget.h index 3352aee0..fc8930ee 100644 --- a/kpresenter/KPrMarginWidget.h +++ b/kpresenter/KPrMarginWidget.h @@ -22,17 +22,18 @@ #ifndef KPMARGINWIDGET_H #define KPMARGINWIDGET_H -#include <qwidget.h> +#include <tqwidget.h> #include <KoUnit.h> class MarginUI; -class KPrMarginWidget : public QWidget +class KPrMarginWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrMarginWidget( QWidget *parent, const char *name, const KoUnit::Unit unit ); + KPrMarginWidget( TQWidget *tqparent, const char *name, const KoUnit::Unit unit ); ~KPrMarginWidget(); bool changed() const { return m_changed; } diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp index f01dd1e7..74fb88c4 100644 --- a/kpresenter/KPrMoveHelpLineDia.cpp +++ b/kpresenter/KPrMoveHelpLineDia.cpp @@ -19,12 +19,12 @@ */ #include <klocale.h> -#include <qvbox.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <knuminput.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> #include <KoUnit.h> #include <klineedit.h> #include <knumvalidator.h> @@ -34,21 +34,21 @@ #include "KPrDocument.h" -KPrMoveHelpLineDia::KPrMoveHelpLineDia( QWidget *parent, double value, double limitTop, double limitBottom, +KPrMoveHelpLineDia::KPrMoveHelpLineDia( TQWidget *tqparent, double value, double limitTop, double limitBottom, KPrDocument *_doc, const char *name) - : KDialogBase( parent, name , true, "", Ok | Cancel | User1, Ok, true ) + : KDialogBase( tqparent, name , true, "", Ok | Cancel | User1, Ok, true ) { m_doc=_doc; m_bRemoveLine = false; setButtonText( KDialogBase::User1, i18n("Remove") ); setCaption( i18n("Change Help Line Position") ); - QVBox *page = makeVBoxMainWidget(); - new QLabel(i18n("Position:"), page); - position= new KoUnitDoubleSpinBox( page, QMAX(0.00, limitTop), QMAX(0.00, limitBottom), 1, QMAX(0.00, value)); + TQVBox *page = makeVBoxMainWidget(); + new TQLabel(i18n("Position:"), page); + position= new KoUnitDoubleSpinBox( page, TQMAX(0.00, limitTop), TQMAX(0.00, limitBottom), 1, TQMAX(0.00, value)); position->setUnit(m_doc->unit() ); - connect( this, SIGNAL( user1Clicked() ), this ,SLOT( slotRemoveHelpLine() )); + connect( this, TQT_SIGNAL( user1Clicked() ), this ,TQT_SLOT( slotRemoveHelpLine() )); resize( 300,100 ); } @@ -64,25 +64,25 @@ double KPrMoveHelpLineDia::newPosition() const } -KPrInsertHelpLineDia::KPrInsertHelpLineDia( QWidget *parent, const KoRect & _pageRect, +KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *tqparent, const KoRect & _pageRect, KPrDocument *_doc, const char *name) - : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) + : KDialogBase( tqparent, name , true, "", Ok|Cancel, Ok, true ) { limitOfPage=_pageRect; m_doc=_doc; setCaption( i18n("Add New Help Line") ); - QVBox *page = makeVBoxMainWidget(); - QButtonGroup *group = new QButtonGroup( 1, QGroupBox::Horizontal,i18n("Orientation"), page ); + TQVBox *page = makeVBoxMainWidget(); + TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal,i18n("Qt::Orientation"), page ); group->setRadioButtonExclusive( TRUE ); - group->layout(); - m_rbHoriz = new QRadioButton( i18n("Horizontal"), group ); - m_rbVert = new QRadioButton( i18n("Vertical"), group ); + group->tqlayout(); + m_rbHoriz = new TQRadioButton( i18n("Horizontal"), group ); + m_rbVert = new TQRadioButton( i18n("Vertical"), group ); - connect( group , SIGNAL( clicked( int) ), this, SLOT( slotRadioButtonClicked() )); + connect( group , TQT_SIGNAL( clicked( int) ), this, TQT_SLOT( slotRadioButtonClicked() )); - new QLabel(i18n("Position:"), page); + new TQLabel(i18n("Position:"), page); - position= new KoUnitDoubleSpinBox( page,QMAX(0.00, limitOfPage.top() ), QMAX(0.00, limitOfPage.bottom()),1,0.00 ); + position= new KoUnitDoubleSpinBox( page,TQMAX(0.00, limitOfPage.top() ), TQMAX(0.00, limitOfPage.bottom()),1,0.00 ); position->setUnit( m_doc->unit() ); m_rbHoriz->setChecked( true ); @@ -103,38 +103,38 @@ void KPrInsertHelpLineDia::slotRadioButtonClicked() { if ( m_rbHoriz->isChecked() ) { - position->setMinValue( QMAX(0.00, limitOfPage.top() ) ); - position->setMaxValue( QMAX(0.00, limitOfPage.bottom() ) ); + position->setMinValue( TQMAX(0.00, limitOfPage.top() ) ); + position->setMaxValue( TQMAX(0.00, limitOfPage.bottom() ) ); } else if ( m_rbVert->isChecked() ) { - position->setMinValue( QMAX(0.00, limitOfPage.left()) ); - position->setMaxValue( QMAX(0.00, limitOfPage.right()) ); + position->setMinValue( TQMAX(0.00, limitOfPage.left()) ); + position->setMaxValue( TQMAX(0.00, limitOfPage.right()) ); } } -KPrInsertHelpPointDia::KPrInsertHelpPointDia( QWidget *parent, const KoRect & _pageRect, +KPrInsertHelpPointDia::KPrInsertHelpPointDia( TQWidget *tqparent, const KoRect & _pageRect, KPrDocument *_doc, double posX, double posY, const char *name) - : KDialogBase( parent, name , true, "", Ok|Cancel| User1, Ok, true ), + : KDialogBase( tqparent, name , true, "", Ok|Cancel| User1, Ok, true ), m_bRemovePoint( false ) { limitOfPage=_pageRect; m_doc=_doc; setButtonText( KDialogBase::User1, i18n("Remove") ); setCaption( i18n("Add New Help Point") ); - QVBox *page = makeVBoxMainWidget(); - QLabel *lab=new QLabel(i18n("X position:"), page); - positionX= new KoUnitDoubleSpinBox( page, QMAX(0.00, limitOfPage.left()),QMAX(0.00, limitOfPage.right()),1,QMAX(0.00, posX) ) ; + TQVBox *page = makeVBoxMainWidget(); + TQLabel *lab=new TQLabel(i18n("X position:"), page); + positionX= new KoUnitDoubleSpinBox( page, TQMAX(0.00, limitOfPage.left()),TQMAX(0.00, limitOfPage.right()),1,TQMAX(0.00, posX) ) ; positionX->setUnit( m_doc->unit() ); - lab=new QLabel(i18n("Y position:"), page); - positionY= new KoUnitDoubleSpinBox( page, QMAX(0.00, limitOfPage.top()),QMAX(0.00, limitOfPage.bottom()),1, QMAX(0.00, posY) ); + lab=new TQLabel(i18n("Y position:"), page); + positionY= new KoUnitDoubleSpinBox( page, TQMAX(0.00, limitOfPage.top()),TQMAX(0.00, limitOfPage.bottom()),1, TQMAX(0.00, posY) ); positionY->setUnit( m_doc->unit() ); showButton( KDialogBase::User1, (posX!=0.0 || posY!=0.0) ); - connect( this, SIGNAL( user1Clicked() ), this ,SLOT( slotRemoveHelpPoint() )); + connect( this, TQT_SIGNAL( user1Clicked() ), this ,TQT_SLOT( slotRemoveHelpPoint() )); resize( 300,100 ); } diff --git a/kpresenter/KPrMoveHelpLineDia.h b/kpresenter/KPrMoveHelpLineDia.h index 5990bb80..7bed8b88 100644 --- a/kpresenter/KPrMoveHelpLineDia.h +++ b/kpresenter/KPrMoveHelpLineDia.h @@ -24,7 +24,7 @@ #include <kdialogbase.h> #include <KoRect.h> -class QRadioButton; +class TQRadioButton; class KPrDocument; class KLineEdit; class KFloatValidator; @@ -33,8 +33,9 @@ class KoUnitDoubleSpinBox; class KPrMoveHelpLineDia : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KPrMoveHelpLineDia( QWidget *parent, double value, double limitTop, double limitBottom, + KPrMoveHelpLineDia( TQWidget *tqparent, double value, double limitTop, double limitBottom, KPrDocument *_doc, const char *name=0L); double newPosition() const; @@ -52,8 +53,9 @@ protected: class KPrInsertHelpLineDia : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KPrInsertHelpLineDia( QWidget *parent, const KoRect &r, KPrDocument *_doc, const char *name=0L); + KPrInsertHelpLineDia( TQWidget *tqparent, const KoRect &r, KPrDocument *_doc, const char *name=0L); double newPosition() const; //return true if we add a new horizontal line help @@ -65,8 +67,8 @@ private slots: protected: KoRect limitOfPage; KoUnitDoubleSpinBox* position; - QRadioButton *m_rbHoriz; - QRadioButton *m_rbVert; + TQRadioButton *m_rbHoriz; + TQRadioButton *m_rbVert; KPrDocument *m_doc; }; @@ -74,8 +76,9 @@ protected: class KPrInsertHelpPointDia : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KPrInsertHelpPointDia( QWidget *parent, const KoRect &r, KPrDocument *_doc, double poxX=0.0, + KPrInsertHelpPointDia( TQWidget *tqparent, const KoRect &r, KPrDocument *_doc, double poxX=0.0, double posY=0.0, const char *name=0L); KoPoint newPosition() const; diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp index f44865f1..9862e2c6 100644 --- a/kpresenter/KPrNoteBar.cpp +++ b/kpresenter/KPrNoteBar.cpp @@ -19,11 +19,11 @@ */ -#include <qlayout.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> -#include <qsimplerichtext.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> +#include <tqsimplerichtext.h> +#include <tqlabel.h> #include <kglobalsettings.h> #include <kprinter.h> @@ -37,40 +37,40 @@ #include "KPrPage.h" -KPrNoteBar::KPrNoteBar( QWidget *_parent, KPrView *_view ) - : QWidget( _parent ), +KPrNoteBar::KPrNoteBar( TQWidget *_parent, KPrView *_view ) + : TQWidget( _parent ), view( _view ), initialize( true ) { - QBoxLayout *topLayout = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - label = new QLabel(i18n("Note"), this); + label = new TQLabel(i18n("Note"), this); textEdit = new KTextEdit( this ); - QFont font = KoGlobal::defaultFont(); + TQFont font = KoGlobal::defaultFont(); textEdit->setCurrentFont( font ); int currentPageNum = view->getCurrentPresPage(); // 1 base. - QString text=QString::null; + TQString text=TQString(); if (currentPageNum!=-1) text = view->kPresenterDoc()->pageList().at(currentPageNum - 1)->noteText( ); textEdit->setText( text ); - connect( textEdit, SIGNAL( textChanged() ), - this, SLOT( slotTextChanged() ) ); + connect( textEdit, TQT_SIGNAL( textChanged() ), + this, TQT_SLOT( slotTextChanged() ) ); - connect( textEdit, SIGNAL( selectionChanged() ), - this, SLOT( slotSelectionChanged() ) ); + connect( textEdit, TQT_SIGNAL( selectionChanged() ), + this, TQT_SLOT( slotSelectionChanged() ) ); - connect( textEdit, SIGNAL( copyAvailable( bool ) ), - this, SLOT( slotSelectionChanged() ) ); + connect( textEdit, TQT_SIGNAL( copyAvailable( bool ) ), + this, TQT_SLOT( slotSelectionChanged() ) ); - connect( textEdit, SIGNAL( undoAvailable( bool ) ), - this, SLOT( slotUndoAvailable( bool ) ) ); + connect( textEdit, TQT_SIGNAL( undoAvailable( bool ) ), + this, TQT_SLOT( slotUndoAvailable( bool ) ) ); - connect( textEdit, SIGNAL( redoAvailable( bool ) ), - this, SLOT( slotRedoAvailable( bool ) ) ); + connect( textEdit, TQT_SIGNAL( redoAvailable( bool ) ), + this, TQT_SLOT( slotRedoAvailable( bool ) ) ); topLayout->addWidget( label ); topLayout->addWidget( textEdit ); @@ -81,7 +81,7 @@ KPrNoteBar::~KPrNoteBar() delete textEdit; } -void KPrNoteBar::setCurrentNoteText( const QString &_text ) +void KPrNoteBar::setCurrentNoteText( const TQString &_text ) { initialize = true; textEdit->setText( _text ); @@ -120,32 +120,32 @@ void KPrNoteBar::slotRedoAvailable( bool /*yes*/ ) //kdDebug(33001) << "slotRedoAvailable( " << yes << " )" << endl; } -void KPrNoteBar::printNotes( QPainter *_painter, KPrinter *_printer, QValueList<int> _list ) +void KPrNoteBar::printNotes( TQPainter *_painter, KPrinter *_printer, TQValueList<int> _list ) { - // base code from $QTDIR/example/textedit/textedit.cpp + // base code from $TQTDIR/example/textedit/textedit.cpp _painter->save(); - QPaintDeviceMetrics metrics( _painter->device() ); + TQPaintDeviceMetrics metrics( _painter->device() ); int dpix = metrics.logicalDpiX(); int dpiy = metrics.logicalDpiY(); const int margin = 72; // pt - QRect body( margin * dpix / 72, margin * dpiy / 72, + TQRect body( margin * dpix / 72, margin * dpiy / 72, metrics.width() - margin * dpix / 72 * 2, metrics.height() - margin * dpiy / 72 * 2 ); - QFont font = KoGlobal::defaultFont(); - QString allText = getNotesTextForPrinting(_list); - QString str = QStyleSheet::convertFromPlainText( allText ); + TQFont font = KoGlobal::defaultFont(); + TQString allText = getNotesTextForPrinting(_list); + TQString str = TQStyleSheet::convertFromPlainText( allText ); - QSimpleRichText richText( str, font, QString::null, QStyleSheet::defaultSheet(), - QMimeSourceFactory::defaultFactory(), body.height() ); + TQSimpleRichText richText( str, font, TQString(), TQStyleSheet::defaultSheet(), + TQMimeSourceFactory::defaultFactory(), body.height() ); richText.setWidth( _painter, body.width() ); - QRect viewRect( body ); + TQRect viewRect( body ); do { - richText.draw( _painter, body.left(), body.top(), viewRect, colorGroup() ); + richText.draw( _painter, body.left(), body.top(), viewRect, tqcolorGroup() ); viewRect.moveBy( 0, body.height() ); _painter->translate( 0, -body.height() ); _painter->setFont( font ); @@ -159,22 +159,22 @@ void KPrNoteBar::printNotes( QPainter *_painter, KPrinter *_printer, QValueList< _painter->restore(); } -QString KPrNoteBar::getNotesTextForPrinting(QValueList<int> _list) const +TQString KPrNoteBar::getNotesTextForPrinting(TQValueList<int> _list) const { - QString allText = QString::null; + TQString allText = TQString(); bool firstText = true; bool noteIsEmpty = true; int pageCount = 1; KPrDocument *doc=view->kPresenterDoc(); for ( int i = 0; i < static_cast<int>( doc->pageList().count() ); i++, ++pageCount ) { - if (_list.contains(i+1)==0) // that slide isn't printed, don't print its note either + if (_list.tqcontains(i+1)==0) // that slide isn't printed, don't print its note either continue; if ( !firstText ) - allText += QString("\n\n"); + allText += TQString("\n\n"); - allText += i18n( "Slide Note %1:\n" ).arg( pageCount ); + allText += i18n( "Slide Note %1:\n" ).tqarg( pageCount ); if(noteIsEmpty && !doc->pageList().at(i)->noteText().isEmpty()) noteIsEmpty = false; allText += doc->pageList().at(i)->noteText(); @@ -183,14 +183,14 @@ QString KPrNoteBar::getNotesTextForPrinting(QValueList<int> _list) const } //code for master page if ( !firstText ) - allText += QString("\n\n"); + allText += TQString("\n\n"); allText += i18n( "Master Page Note:\n" ); if ( !doc->masterPage()->noteText().isEmpty() ) noteIsEmpty = false; allText += doc->masterPage()->noteText(); if( noteIsEmpty ) - return QString::null; + return TQString(); return allText; } diff --git a/kpresenter/KPrNoteBar.h b/kpresenter/KPrNoteBar.h index 94659f03..6c13891c 100644 --- a/kpresenter/KPrNoteBar.h +++ b/kpresenter/KPrNoteBar.h @@ -21,30 +21,31 @@ #ifndef NOTEBAR_H #define NOTEBAR_H -#include <qwidget.h> +#include <tqwidget.h> -class QPainter; -class QLabel; +class TQPainter; +class TQLabel; class KPrDocument; class KPrView; class KPrinter; class KTextEdit; -class KPrNoteBar : public QWidget +class KPrNoteBar : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrNoteBar( QWidget *_parent, KPrView *_view ); + KPrNoteBar( TQWidget *_parent, KPrView *_view ); ~KPrNoteBar(); - void setCurrentNoteText( const QString &_text ); + void setCurrentNoteText( const TQString &_text ); // print - void printNotes( QPainter *_painter, KPrinter *_printer, QValueList<int> ); + void printNotes( TQPainter *_painter, KPrinter *_printer, TQValueList<int> ); - QString getNotesTextForPrinting(QValueList<int>) const; + TQString getNotesTextForPrinting(TQValueList<int>) const; private slots: void slotTextChanged(); @@ -55,7 +56,7 @@ private slots: private: ::KTextEdit *textEdit; - QLabel *label; + TQLabel *label; KPrView *view; diff --git a/kpresenter/KPrObject.cpp b/kpresenter/KPrObject.cpp index ad246527..8c0284a3 100644 --- a/kpresenter/KPrObject.cpp +++ b/kpresenter/KPrObject.cpp @@ -25,13 +25,13 @@ #include "KPrDocument.h" #include "KPrUtils.h" -#include <qpainter.h> -#include <qwmatrix.h> -#include <qpointarray.h> -#include <qregion.h> -#include <qdom.h> -#include <qbuffer.h> -#include <qregexp.h> +#include <tqpainter.h> +#include <tqwmatrix.h> +#include <tqpointarray.h> +#include <tqregion.h> +#include <tqdom.h> +#include <tqbuffer.h> +#include <tqregexp.h> #include <kapplication.h> #include <KoOasisContext.h> @@ -50,43 +50,43 @@ #include <KoDom.h> #include <kdebug.h> -const QString &KPrObject::tagORIG=KGlobal::staticQString("ORIG"); -const QString &KPrObject::attrX=KGlobal::staticQString("x"); -const QString &KPrObject::attrY=KGlobal::staticQString("y"); -const QString &KPrObject::tagSIZE=KGlobal::staticQString("SIZE"); -const QString &KPrObject::attrWidth=KGlobal::staticQString("width"); -const QString &KPrObject::attrHeight=KGlobal::staticQString("height"); -const QString &KPrObject::tagSHADOW=KGlobal::staticQString("SHADOW"); -const QString &KPrObject::attrDistance=KGlobal::staticQString("distance"); -const QString &KPrObject::attrDirection=KGlobal::staticQString("direction"); -const QString &KPrObject::attrColor=KGlobal::staticQString("color"); -const QString &KPrObject::tagEFFECTS=KGlobal::staticQString("EFFECTS"); -const QString &KPrObject::attrEffect=KGlobal::staticQString("effect"); -const QString &KPrObject::attrEffect2=KGlobal::staticQString("effect2"); -const QString &KPrObject::tagPRESNUM=KGlobal::staticQString("PRESNUM"); -const QString &KPrObject::tagANGLE=KGlobal::staticQString("ANGLE"); -const QString &KPrObject::tagDISAPPEAR=KGlobal::staticQString("DISAPPEAR"); -const QString &KPrObject::attrDoit=KGlobal::staticQString("doit"); -const QString &KPrObject::attrNum=KGlobal::staticQString("num"); -const QString &KPrObject::tagFILLTYPE=KGlobal::staticQString("FILLTYPE"); -const QString &KPrObject::tagGRADIENT=KGlobal::staticQString("GRADIENT"); -const QString &KPrObject::tagPEN=KGlobal::staticQString("PEN"); -const QString &KPrObject::tagBRUSH=KGlobal::staticQString("BRUSH"); -const QString &KPrObject::attrValue=KGlobal::staticQString("value"); -const QString &KPrObject::attrC1=KGlobal::staticQString("color1"); -const QString &KPrObject::attrC2=KGlobal::staticQString("color2"); -const QString &KPrObject::attrType=KGlobal::staticQString("type"); -const QString &KPrObject::attrUnbalanced=KGlobal::staticQString("unbalanced"); -const QString &KPrObject::attrXFactor=KGlobal::staticQString("xfactor"); -const QString &KPrObject::attrYFactor=KGlobal::staticQString("yfactor"); -const QString &KPrObject::attrStyle=KGlobal::staticQString("style"); +const TQString &KPrObject::tagORIG=KGlobal::staticQString("ORIG"); +const TQString &KPrObject::attrX=KGlobal::staticQString("x"); +const TQString &KPrObject::attrY=KGlobal::staticQString("y"); +const TQString &KPrObject::tagSIZE=KGlobal::staticQString("SIZE"); +const TQString &KPrObject::attrWidth=KGlobal::staticQString("width"); +const TQString &KPrObject::attrHeight=KGlobal::staticQString("height"); +const TQString &KPrObject::tagSHADOW=KGlobal::staticQString("SHADOW"); +const TQString &KPrObject::attrDistance=KGlobal::staticQString("distance"); +const TQString &KPrObject::attrDirection=KGlobal::staticQString("direction"); +const TQString &KPrObject::attrColor=KGlobal::staticQString("color"); +const TQString &KPrObject::tagEFFECTS=KGlobal::staticQString("EFFECTS"); +const TQString &KPrObject::attrEffect=KGlobal::staticQString("effect"); +const TQString &KPrObject::attrEffect2=KGlobal::staticQString("effect2"); +const TQString &KPrObject::tagPRESNUM=KGlobal::staticQString("PRESNUM"); +const TQString &KPrObject::tagANGLE=KGlobal::staticQString("ANGLE"); +const TQString &KPrObject::tagDISAPPEAR=KGlobal::staticQString("DISAPPEAR"); +const TQString &KPrObject::attrDoit=KGlobal::staticQString("doit"); +const TQString &KPrObject::attrNum=KGlobal::staticQString("num"); +const TQString &KPrObject::tagFILLTYPE=KGlobal::staticQString("FILLTYPE"); +const TQString &KPrObject::tagGRADIENT=KGlobal::staticQString("GRADIENT"); +const TQString &KPrObject::tagPEN=KGlobal::staticQString("PEN"); +const TQString &KPrObject::tagBRUSH=KGlobal::staticQString("BRUSH"); +const TQString &KPrObject::attrValue=KGlobal::staticQString("value"); +const TQString &KPrObject::attrC1=KGlobal::staticQString("color1"); +const TQString &KPrObject::attrC2=KGlobal::staticQString("color2"); +const TQString &KPrObject::attrType=KGlobal::staticQString("type"); +const TQString &KPrObject::attrUnbalanced=KGlobal::staticQString("unbalanced"); +const TQString &KPrObject::attrXFactor=KGlobal::staticQString("xfactor"); +const TQString &KPrObject::attrYFactor=KGlobal::staticQString("yfactor"); +const TQString &KPrObject::attrStyle=KGlobal::staticQString("style"); KPrStartEndLine::KPrStartEndLine( LineEnd _start, LineEnd _end ) : lineBegin( _start ), lineEnd( _end ) { } -void KPrStartEndLine::save( QDomDocumentFragment &fragment, QDomDocument& doc ) +void KPrStartEndLine::save( TQDomDocumentFragment &fragment, TQDomDocument& doc ) { if (lineBegin!=L_NORMAL) fragment.appendChild(KPrStartEndLine::createValueElement("LINEBEGIN", static_cast<int>(lineBegin), doc)); @@ -94,17 +94,17 @@ void KPrStartEndLine::save( QDomDocumentFragment &fragment, QDomDocument& doc ) fragment.appendChild(KPrStartEndLine::createValueElement("LINEEND", static_cast<int>(lineEnd), doc)); } -QDomElement KPrStartEndLine::createValueElement(const QString &tag, int value, QDomDocument &doc) +TQDomElement KPrStartEndLine::createValueElement(const TQString &tag, int value, TQDomDocument &doc) { - QDomElement elem=doc.createElement(tag); + TQDomElement elem=doc.createElement(tag); elem.setAttribute("value", value); return elem; } -void KPrStartEndLine::load( const QDomElement &element ) +void KPrStartEndLine::load( const TQDomElement &element ) { - QDomElement e=element.namedItem("LINEBEGIN").toElement(); + TQDomElement e=element.namedItem("LINEBEGIN").toElement(); if(!e.isNull()) { int tmp=0; if(e.hasAttribute("value")) @@ -120,26 +120,26 @@ void KPrStartEndLine::load( const QDomElement &element ) } } -void KPrStartEndLine::loadOasisMarkerElement( KoOasisContext & context, const QString & attr, LineEnd &_element ) +void KPrStartEndLine::loadOasisMarkerElement( KoOasisContext & context, const TQString & attr, LineEnd &_element ) { - //kdDebug()<<"void KPrStartEndLine::loadOasisMarkerElement( KoOasisContext & context, const QString & attr, LineEnd &_element ) :"<<attr<<endl; + //kdDebug()<<"void KPrStartEndLine::loadOasisMarkerElement( KoOasisContext & context, const TQString & attr, LineEnd &_element ) :"<<attr<<endl; KoStyleStack &styleStack = context.styleStack(); styleStack.setTypeProperties( "graphic" ); if ( styleStack.hasAttributeNS( KoXmlNS::draw,attr.latin1() ) ) { - QString style = styleStack.attributeNS( KoXmlNS::draw, attr.latin1() ); + TQString style = styleStack.attributeNS( KoXmlNS::draw, attr.latin1() ); //kdDebug()<<" marker style is : "<<style<<endl; //type not defined by default //try to use style. - QDomElement* draw = context.oasisStyles().drawStyles()[style]; + TQDomElement* draw = context.oasisStyles().drawStyles()[style]; //kdDebug()<<" marker have oasis style defined :"<<draw<<endl; if ( draw ) { if( draw->hasAttributeNS( KoXmlNS::svg, "d" )) { - QString str = draw->attributeNS( KoXmlNS::svg, "d", QString::null ); + TQString str = draw->attributeNS( KoXmlNS::svg, "d", TQString() ); kdDebug()<<" svg type = "<<str<<endl; if ( str == lineEndBeginSvg( L_ARROW ) ) _element = L_ARROW; @@ -179,7 +179,7 @@ void KPrStartEndLine::saveOasisMarkerElement( KoGenStyles& mainStyles, KoGenSty } } -QString KPrStartEndLine::saveOasisMarkerStyle( KoGenStyles &mainStyles, const LineEnd &_element ) const +TQString KPrStartEndLine::saveOasisMarkerStyle( KoGenStyles &mainStyles, const LineEnd &_element ) const { KoGenStyle marker( KPrDocument::STYLE_MARKER /*, "graphic"*/ /*no name*/ ); // value used from ooimpress filter I don't know if it's good @@ -219,7 +219,7 @@ QString KPrStartEndLine::saveOasisMarkerStyle( KoGenStyles &mainStyles, const Li } KPrObject::KPrObject() - : orig(), ext(), shadowColor( Qt::gray ) + : orig(), ext(), shadowColor( TQt::gray ) { appearStep = 0; disappearStep = 1; @@ -233,9 +233,9 @@ KPrObject::KPrObject() disappearTimer = 1; appearSoundEffect = false; disappearSoundEffect = false; - a_fileName = QString::null; - d_fileName = QString::null; - objectName = QString::null; + a_fileName = TQString(); + d_fileName = TQString(); + objectName = TQString(); angle = 0.0; shadowDirection = SD_RIGHT_BOTTOM; shadowDistance = 0; @@ -257,18 +257,18 @@ KPrObject::~KPrObject() delete dcop; } -QDomDocumentFragment KPrObject::save( QDomDocument& doc, double offset ) +TQDomDocumentFragment KPrObject::save( TQDomDocument& doc, double offset ) { - QDomDocumentFragment fragment=doc.createDocumentFragment(); - QDomElement elem=doc.createElement(tagORIG); + TQDomDocumentFragment fragment=doc.createDocumentFragment(); + TQDomElement elem=doc.createElement(tagORIG); elem.setAttribute(attrX, orig.x()); - elem.setAttribute(attrY, QString::number( orig.y() + offset, 'g', DBL_DIG ) ); + elem.setAttribute(attrY, TQString::number( orig.y() + offset, 'g', DBL_DIG ) ); fragment.appendChild(elem); elem=doc.createElement(tagSIZE); elem.setAttribute(attrWidth, ext.width()); elem.setAttribute(attrHeight, ext.height()); fragment.appendChild(elem); - if(shadowDistance!=0 || shadowDirection!=SD_RIGHT_BOTTOM || shadowColor!=Qt::gray) { + if(shadowDistance!=0 || shadowDirection!=SD_RIGHT_BOTTOM || shadowColor!=TQt::gray) { elem=doc.createElement(tagSHADOW); elem.setAttribute(attrDistance, shadowDistance); elem.setAttribute(attrDirection, static_cast<int>( shadowDirection )); @@ -337,7 +337,7 @@ QDomDocumentFragment KPrObject::save( QDomDocument& doc, double offset ) void KPrObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj ) const { - xmlWriter.addAttribute( "draw:id", "object" + QString::number( indexObj ) ); + xmlWriter.addAttribute( "draw:id", "object" + TQString::number( indexObj ) ); //save all into pt xmlWriter.addAttributePt( "svg:width", ext.width() ); xmlWriter.addAttributePt( "svg:height", ext.height() ); @@ -345,7 +345,7 @@ void KPrObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj ) const if ( kAbs( angle ) > 1E-6 ) { double angInRad = -angle * M_PI / 180.0; - QWMatrix m( cos( angInRad ), -sin( angInRad ), sin( angInRad ), cos( angInRad ), 0, 0 ); + TQWMatrix m( cos( angInRad ), -sin( angInRad ), sin( angInRad ), cos( angInRad ), 0, 0 ); KoPoint center( ext.width() / 2, ext.height() / 2 ); double rotX = 0.0; double rotY = 0.0; @@ -353,11 +353,11 @@ void KPrObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj ) const KoPoint rot( rotX, rotY ); KoPoint trans( center - rot + orig ); - QCString transX; + TQCString transX; transX.setNum( trans.x(), 'g', DBL_DIG ); - QCString transY; + TQCString transY; transY.setNum( trans.y(), 'g', DBL_DIG ); - QString str = QString( "rotate(%1) translate(%2pt %3pt)" ).arg( angInRad ).arg( transX ).arg( transY ); + TQString str = TQString( "rotate(%1) translate(%2pt %3pt)" ).tqarg( angInRad ).tqarg( transX.data() ).tqarg( transY.data() ); xmlWriter.addAttribute( "draw:transform", str ); } else @@ -376,7 +376,7 @@ void KPrObject::saveOasisObjectProtectStyle( KoGenStyle &styleobjectauto ) const } } -QString KPrObject::getStyle( KPOasisSaveContext &sc ) const +TQString KPrObject::getStyle( KPOasisSaveContext &sc ) const { kdDebug(33001) << "KPrObject::getStyle" << endl; KoGenStyle styleObjectAuto; @@ -422,8 +422,8 @@ bool KPrObject::saveOasisObjectStyleShowAnimation( KoXmlWriter &animation, int o { if ( effect != EF_NONE || appearStep != 0 || !a_fileName.isEmpty() ) { - animation.startElement( "presentation:show-shape" ); - animation.addAttribute( "draw:shape-id", "object" + QString::number( objectId ) ); + animation.startElement( "presentation:show-tqshape" ); + animation.addAttribute( "draw:tqshape-id", "object" + TQString::number( objectId ) ); animation.addAttribute( "koffice:order-id", appearStep ); switch( effect ) @@ -522,8 +522,8 @@ bool KPrObject::saveOasisObjectStyleHideAnimation( KoXmlWriter &animation, int o //FIXME oo doesn't support hide animation object if ( effect3 != EF3_NONE || disappearStep != 0 || !d_fileName.isEmpty()) { - animation.startElement( "presentation:hide-shape" ); - animation.addAttribute( "draw:shape-id", "object" + QString::number( objectId ) ); + animation.startElement( "presentation:hide-tqshape" ); + animation.addAttribute( "draw:tqshape-id", "object" + TQString::number( objectId ) ); animation.addAttribute( "koffice:order-id", disappearStep ); switch( effect3 ) { @@ -611,14 +611,14 @@ bool KPrObject::saveOasisObjectStyleHideAnimation( KoXmlWriter &animation, int o return true; } -void KPrObject::loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info) +void KPrObject::loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info) { if(element.hasAttributeNS( KoXmlNS::draw, "name" )) - objectName = element.attributeNS( KoXmlNS::draw, "name", QString::null); - orig.setX( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x", QString::null ) ) ); - orig.setY( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y", QString::null ) ) ); - ext.setWidth(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "width", QString::null )) ); - ext.setHeight(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "height", QString::null ) ) ); + objectName = element.attributeNS( KoXmlNS::draw, "name", TQString()); + orig.setX( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x", TQString() ) ) ); + orig.setY( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y", TQString() ) ) ); + ext.setWidth(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "width", TQString() )) ); + ext.setHeight(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "height", TQString() ) ) ); //kdDebug()<<" orig.x() :"<<orig.x() <<" orig.y() :"<<orig.y() <<"ext.width() :"<<ext.width()<<" ext.height(): "<<ext.height()<<endl; KoStyleStack &styleStack = context.styleStack(); styleStack.setTypeProperties( "" ); //no type default type @@ -626,9 +626,9 @@ void KPrObject::loadOasis(const QDomElement &element, KoOasisContext & context, { // there is some more stuff in the spezification // TODO make it work for all cases - QString transform = element.attributeNS( KoXmlNS::draw, "transform", QString::null ); + TQString transform = element.attributeNS( KoXmlNS::draw, "transform", TQString() ); kdDebug()<<" transform action :"<<transform<<endl; - QRegExp rx( "rotate ?\\(([^)]+)\\) translate ?\\(([^ ]+) ([^)]+)\\)" ); + TQRegExp rx( "rotate ?\\(([^)]+)\\) translate ?\\(([^ ]+) ([^)]+)\\)" ); if ( rx.search( transform ) != - 1 && rx.numCaptures() == 3 ) { bool ok = false; @@ -642,7 +642,7 @@ void KPrObject::loadOasis(const QDomElement &element, KoOasisContext & context, angle = 0.0; angInRad = 0.0; } - QWMatrix m( cos( angInRad ), -sin( angInRad ), sin( angInRad ), cos( angInRad ), 0, 0 ); + TQWMatrix m( cos( angInRad ), -sin( angInRad ), sin( angInRad ), cos( angInRad ), 0, 0 ); KoPoint center( ext.width() / 2, ext.height() / 2 ); double transX = 0.0; double transY = 0.0; @@ -653,20 +653,20 @@ void KPrObject::loadOasis(const QDomElement &element, KoOasisContext & context, kdDebug(33001) << "trans = " << trans << ", center = " << center << ", diff = " << diff << ", orig = " << orig << endl; } } - QDomElement *animation = 0L; + TQDomElement *animation = 0L; lstAnimation *tmp = 0L; if( element.hasAttributeNS( KoXmlNS::draw, "id")) { - tmp = info->animationShowById(element.attributeNS( KoXmlNS::draw, "id", QString::null) ); + tmp = info->animationShowById(element.attributeNS( KoXmlNS::draw, "id", TQString()) ); if ( tmp ) animation = tmp->element; } if( animation) { - QString effectStr = animation->attributeNS( KoXmlNS::presentation, "effect", QString::null); - QString dir = animation->attributeNS( KoXmlNS::presentation, "direction", QString::null); - QString speed = animation->attributeNS( KoXmlNS::presentation, "speed", QString::null ); + TQString effectStr = animation->attributeNS( KoXmlNS::presentation, "effect", TQString()); + TQString dir = animation->attributeNS( KoXmlNS::presentation, "direction", TQString()); + TQString speed = animation->attributeNS( KoXmlNS::presentation, "speed", TQString() ); appearStep = tmp->order; kdDebug()<<" appear direction : "<<dir<<" effect :"<< effectStr <<" speed :"<<speed<<endl; @@ -687,7 +687,7 @@ void KPrObject::loadOasis(const QDomElement &element, KoOasisContext & context, if ( animation->hasAttributeNS( KoXmlNS::presentation, "animation-delay" ) ) { - appearTimer = loadOasisTimer(animation->attributeNS( KoXmlNS::presentation, "animation-delay", QString::null ) ); + appearTimer = loadOasisTimer(animation->attributeNS( KoXmlNS::presentation, "animation-delay", TQString() ) ); } if (effectStr=="fade") { @@ -733,19 +733,19 @@ void KPrObject::loadOasis(const QDomElement &element, KoOasisContext & context, effect = EF_NONE; } - QString byParagaph = animation->attributeNS( KoXmlNS::koffice, "by-paragraph", QString::null ); + TQString byParagaph = animation->attributeNS( KoXmlNS::koffice, "by-paragraph", TQString() ); if ( byParagaph == "true" ) { effect2 = EF2T_PARA; } - QDomElement sound = KoDom::namedItemNS( *animation, KoXmlNS::presentation, "sound" ); + TQDomElement sound = KoDom::namedItemNS( *animation, KoXmlNS::presentation, "sound" ); if ( !sound.isNull() ) { kdDebug()<<" object has sound effect \n"; if ( sound.hasAttributeNS( KoXmlNS::xlink, "href" ) ) { - a_fileName =sound.attributeNS( KoXmlNS::xlink, "href", QString::null ); + a_fileName =sound.attributeNS( KoXmlNS::xlink, "href", TQString() ); appearSoundEffect = true; } } @@ -755,16 +755,16 @@ void KPrObject::loadOasis(const QDomElement &element, KoOasisContext & context, tmp = 0L; if( element.hasAttributeNS( KoXmlNS::draw, "id")) { - tmp = info->animationHideById(element.attributeNS( KoXmlNS::draw, "id", QString::null) ); + tmp = info->animationHideById(element.attributeNS( KoXmlNS::draw, "id", TQString()) ); if ( tmp ) animation = tmp->element; } if( animation) { - QString effectStr = animation->attributeNS( KoXmlNS::presentation, "effect", QString::null); - QString dir = animation->attributeNS( KoXmlNS::presentation, "direction", QString::null); - QString speed = animation->attributeNS( KoXmlNS::presentation, "speed", QString::null ); + TQString effectStr = animation->attributeNS( KoXmlNS::presentation, "effect", TQString()); + TQString dir = animation->attributeNS( KoXmlNS::presentation, "direction", TQString()); + TQString speed = animation->attributeNS( KoXmlNS::presentation, "speed", TQString() ); kdDebug()<<" disappear direction : "<<dir<<" effect :"<< effectStr <<" speed :"<<speed<<endl; disappearStep = tmp->order; @@ -785,7 +785,7 @@ void KPrObject::loadOasis(const QDomElement &element, KoOasisContext & context, if ( animation->hasAttributeNS( KoXmlNS::presentation, "animation-delay" ) ) { - disappearTimer = loadOasisTimer(animation->attributeNS( KoXmlNS::presentation, "animation-delay", QString::null ) ); + disappearTimer = loadOasisTimer(animation->attributeNS( KoXmlNS::presentation, "animation-delay", TQString() ) ); } if (effectStr=="fade") { @@ -833,13 +833,13 @@ void KPrObject::loadOasis(const QDomElement &element, KoOasisContext & context, disappear = true; - QDomElement sound = KoDom::namedItemNS( *animation, KoXmlNS::presentation, "sound" ); + TQDomElement sound = KoDom::namedItemNS( *animation, KoXmlNS::presentation, "sound" ); if ( !sound.isNull() ) { kdDebug()<<" object has sound effect \n"; if ( sound.hasAttributeNS( KoXmlNS::xlink, "href" ) ) { - d_fileName =sound.attributeNS( KoXmlNS::xlink, "href", QString::null ); + d_fileName =sound.attributeNS( KoXmlNS::xlink, "href", TQString() ); disappearSoundEffect = true; } } @@ -853,11 +853,11 @@ void KPrObject::loadOasis(const QDomElement &element, KoOasisContext & context, if ( styleStack.hasAttributeNS( KoXmlNS::fo, "text-shadow" ) && styleStack.attributeNS( KoXmlNS::fo, "text-shadow" ) != "none" ) { - QString distance = styleStack.attributeNS( KoXmlNS::fo, "text-shadow" ); - distance.truncate( distance.find( ' ' ) ); + TQString distance = styleStack.attributeNS( KoXmlNS::fo, "text-shadow" ); + distance.truncate( distance.tqfind( ' ' ) ); shadowDistance = (int)KoUnit::parseValue( distance ); shadowDirection = SD_RIGHT_BOTTOM; - shadowColor= QColor("#a0a0a0" ); + shadowColor= TQColor("#a0a0a0" ); } } #endif @@ -933,8 +933,8 @@ void KPrObject::loadOasis(const QDomElement &element, KoOasisContext & context, shadowDistance = (int) fabs ( x ); } if ( styleStack.hasAttributeNS( KoXmlNS::draw, "shadow-color" ) ) - shadowColor= QColor(styleStack.attributeNS( KoXmlNS::draw, "shadow-color" ) ); - kdDebug()<<" shadow color : "<<shadowColor.name()<<endl; + shadowColor= TQColor(styleStack.attributeNS( KoXmlNS::draw, "shadow-color" ) ); + kdDebug()<<" shadow color : "<<TQString(shadowColor.name())<<endl; } } @@ -955,7 +955,7 @@ bool KPrObject::saveOasisObject( KPOasisSaveContext &sc ) const void KPrObject::saveOasisShadowElement( KoGenStyle &styleobjectauto ) const { //FIXME default value - if(shadowDistance!=0 || shadowDirection!=SD_RIGHT_BOTTOM || shadowColor!=Qt::gray) { + if(shadowDistance!=0 || shadowDirection!=SD_RIGHT_BOTTOM || shadowColor!=TQt::gray) { styleobjectauto.addProperty( "draw:shadow", "visible" ); switch( shadowDirection ) { @@ -996,10 +996,10 @@ void KPrObject::saveOasisShadowElement( KoGenStyle &styleobjectauto ) const } } -double KPrObject::load(const QDomElement &element) { +double KPrObject::load(const TQDomElement &element) { double offset=-1.0; - QDomElement e=element.namedItem(tagORIG).toElement(); + TQDomElement e=element.namedItem(tagORIG).toElement(); if(!e.isNull()) { if(e.hasAttribute(attrX)) orig.setX(e.attribute(attrX).toDouble()); @@ -1027,7 +1027,7 @@ double KPrObject::load(const QDomElement &element) { else { shadowDistance=0; shadowDirection=SD_RIGHT_BOTTOM; - shadowColor=Qt::gray; + shadowColor=TQt::gray; } e=element.namedItem(tagEFFECTS).toElement(); if(!e.isNull()) { @@ -1100,7 +1100,7 @@ double KPrObject::load(const QDomElement &element) { } else { appearSoundEffect = false; - a_fileName = QString::null; + a_fileName = TQString(); } e=element.namedItem("DISAPPEARSOUNDEFFECT").toElement(); if(!e.isNull()) { @@ -1111,7 +1111,7 @@ double KPrObject::load(const QDomElement &element) { } else { disappearSoundEffect = false; - d_fileName = QString::null; + d_fileName = TQString(); } e=element.namedItem("OBJECTNAME").toElement(); if(!e.isNull()) { @@ -1119,7 +1119,7 @@ double KPrObject::load(const QDomElement &element) { objectName = e.attribute("objectName"); } else { - objectName = QString::null; + objectName = TQString(); } e=element.namedItem("PROTECT").toElement(); if (!e.isNull()) @@ -1223,20 +1223,20 @@ KoRect KPrObject::rotateRectObject() const double yPos = -rr.y(); double xPos = -rr.x(); rr.moveTopLeft( KoPoint( -rr.width() / 2.0, -rr.height() / 2.0 ) ); - QWMatrix m; + TQWMatrix m; m.translate( pw / 2.0, ph / 2.0 ); m.rotate( angle ); m.translate( rr.left() + xPos, rr.top() + yPos ); - KoRect r = KoRect::fromQRect(m.mapRect( br.toQRect() )); // see above TODO + KoRect r = KoRect::fromTQRect(m.mapRect( br.toTQRect() )); // see above TODO r.moveBy( orig.x() , orig.y() ); return r; } -void KPrObject::rotateObject(QPainter *paint,KoTextZoomHandler *_zoomHandler) +void KPrObject::rotateObject(TQPainter *paint,KoTextZoomHandler *_zoomHandler) { KoRect rr = KoRect( 0, 0, ext.width(), ext.height() ); rr.moveTopLeft( KoPoint( -ext.width() / 2.0, -ext.height() / 2.0 ) ); - QWMatrix m; + TQWMatrix m; m.translate( _zoomHandler->zoomItX(ext.width() / 2.0), _zoomHandler->zoomItY(ext.height() / 2.0 )); m.rotate( angle ); m.translate( _zoomHandler->zoomItX(rr.left()), _zoomHandler->zoomItY(rr.top()) ); @@ -1244,9 +1244,9 @@ void KPrObject::rotateObject(QPainter *paint,KoTextZoomHandler *_zoomHandler) paint->setWorldMatrix( m, true ); } -bool KPrObject::contains( const KoPoint &point ) const +bool KPrObject::tqcontains( const KoPoint &point ) const { - return getRealRect().contains( point ); + return getRealRect().tqcontains( point ); } bool KPrObject::intersects( const KoRect &rect ) const @@ -1254,14 +1254,14 @@ bool KPrObject::intersects( const KoRect &rect ) const return getRealRect().intersects( rect ); } -QCursor KPrObject::getCursor( const KoPoint &_point, ModifyType &_modType, +TQCursor KPrObject::getCursor( const KoPoint &_point, ModifyType &_modType, KPrDocument *doc ) const { KoTextZoomHandler * zh = doc->zoomHandler(); int px = zh->zoomItX(_point.x()); int py = zh->zoomItY(_point.y()); - QRect rect = zh->zoomRect( getRealRect() ); + TQRect rect = zh->zoomRect( getRealRect() ); int ox = rect.left(); int oy = rect.top(); int ow = rect.width(); @@ -1270,84 +1270,84 @@ QCursor KPrObject::getCursor( const KoPoint &_point, ModifyType &_modType, bool headerFooter=doc->isHeaderFooter(this); int sz = 4; - if ( px >= ox && py >= oy && px <= ox + QMIN( ow / 3, sz ) && py <= oy + QMIN( oh / 3, sz ) ) + if ( px >= ox && py >= oy && px <= ox + TQMIN( ow / 3, sz ) && py <= oy + TQMIN( oh / 3, sz ) ) { _modType = MT_RESIZE_LU; if ( protect) - return Qt::ForbiddenCursor; - return Qt::sizeFDiagCursor; + return TQt::ForbiddenCursor; + return TQt::sizeFDiagCursor; } - if ( px >= ox && py >= oy + oh / 2 - QMIN( oh / 6, sz / 2 ) - && px <= ox + QMIN( ow / 3, sz) - && py <= oy + oh / 2 + QMIN( oh / 6, sz / 2 ) ) + if ( px >= ox && py >= oy + oh / 2 - TQMIN( oh / 6, sz / 2 ) + && px <= ox + TQMIN( ow / 3, sz) + && py <= oy + oh / 2 + TQMIN( oh / 6, sz / 2 ) ) { _modType = MT_RESIZE_LF; if ( protect) - return Qt::ForbiddenCursor; - return Qt::sizeHorCursor; + return TQt::ForbiddenCursor; + return TQt::sizeHorCursor; } - if ( px >= ox && py >= oy + oh - QMIN( oh / 3, sz ) && px <= ox + QMIN( ow / 3, sz ) && py <= oy + oh ) + if ( px >= ox && py >= oy + oh - TQMIN( oh / 3, sz ) && px <= ox + TQMIN( ow / 3, sz ) && py <= oy + oh ) { _modType = MT_RESIZE_LD; if ( protect) - return Qt::ForbiddenCursor; - return Qt::sizeBDiagCursor; + return TQt::ForbiddenCursor; + return TQt::sizeBDiagCursor; } - if ( px >= ox + ow / 2 - QMIN( ow / 6, sz / 2 ) && py >= oy - && px <= ox + ow / 2 + QMIN( ow / 6, sz / 2 ) - && py <= oy + QMIN( oh / 3, sz ) ) + if ( px >= ox + ow / 2 - TQMIN( ow / 6, sz / 2 ) && py >= oy + && px <= ox + ow / 2 + TQMIN( ow / 6, sz / 2 ) + && py <= oy + TQMIN( oh / 3, sz ) ) { _modType = MT_RESIZE_UP; if ( protect) - return Qt::ForbiddenCursor; - return Qt::sizeVerCursor; + return TQt::ForbiddenCursor; + return TQt::sizeVerCursor; } - if ( px >= ox + ow / 2 - QMIN( ow / 6, sz / 2 ) && py >= oy + oh - QMIN( oh / 3, sz ) - && px <= ox + ow / 2 + QMIN( ow / 6, sz / 2 ) && py <= oy + oh ) + if ( px >= ox + ow / 2 - TQMIN( ow / 6, sz / 2 ) && py >= oy + oh - TQMIN( oh / 3, sz ) + && px <= ox + ow / 2 + TQMIN( ow / 6, sz / 2 ) && py <= oy + oh ) { _modType = MT_RESIZE_DN; if ( protect) - return Qt::ForbiddenCursor; - return Qt::sizeVerCursor; + return TQt::ForbiddenCursor; + return TQt::sizeVerCursor; } - if ( px >= ox + ow - QMIN( ow / 3, sz ) && py >= oy && px <= ox + ow && py <= oy + QMIN( oh / 3, sz) ) + if ( px >= ox + ow - TQMIN( ow / 3, sz ) && py >= oy && px <= ox + ow && py <= oy + TQMIN( oh / 3, sz) ) { _modType = MT_RESIZE_RU; if ( protect) - return Qt::ForbiddenCursor; - return Qt::sizeBDiagCursor; + return TQt::ForbiddenCursor; + return TQt::sizeBDiagCursor; } - if ( px >= ox + ow - QMIN( ow / 3, sz ) && py >= oy + oh / 2 - QMIN( oh / 6, sz / 2 ) - && px <= ox + ow && py <= oy + oh / 2 + QMIN( oh / 6, sz / 2) ) + if ( px >= ox + ow - TQMIN( ow / 3, sz ) && py >= oy + oh / 2 - TQMIN( oh / 6, sz / 2 ) + && px <= ox + ow && py <= oy + oh / 2 + TQMIN( oh / 6, sz / 2) ) { _modType = MT_RESIZE_RT; if ( protect) - return Qt::ForbiddenCursor; - return Qt::sizeHorCursor; + return TQt::ForbiddenCursor; + return TQt::sizeHorCursor; } - if ( px >= ox + ow - QMIN( ow / 3, sz ) && py >= oy + oh - QMIN( oh / 3, sz) + if ( px >= ox + ow - TQMIN( ow / 3, sz ) && py >= oy + oh - TQMIN( oh / 3, sz) && px <= ox + ow && py <= oy + oh ) { _modType = MT_RESIZE_RD; if ( protect) - return Qt::ForbiddenCursor; - return Qt::sizeFDiagCursor; + return TQt::ForbiddenCursor; + return TQt::sizeFDiagCursor; } //header footer can't move if(!headerFooter) _modType = MT_MOVE; if ( protect ) - return Qt::ForbiddenCursor; + return TQt::ForbiddenCursor; else - return Qt::sizeAllCursor; + return TQt::sizeAllCursor; } void KPrObject::getShadowCoords( double& _x, double& _y ) const @@ -1401,15 +1401,15 @@ void KPrObject::getShadowCoords( double& _x, double& _y ) const _x = sx; _y = sy; } -void KPrObject::paintSelection( QPainter *_painter, KoTextZoomHandler *_zoomHandler, SelectionMode mode ) +void KPrObject::paintSelection( TQPainter *_painter, KoTextZoomHandler *_zoomHandler, SelectionMode mode ) { if ( !selected || mode == SM_NONE ) return; _painter->save(); _painter->translate( _zoomHandler->zoomItX(orig.x()), _zoomHandler->zoomItY(orig.y()) ); - _painter->setPen( QPen( Qt::black, 1, QPen::SolidLine ) ); - _painter->setBrush( kapp->palette().color( QPalette::Active, QColorGroup::Highlight ) ); + _painter->setPen( TQPen( TQt::black, 1, TQPen::SolidLine ) ); + _painter->setBrush( kapp->palette().color( TQPalette::Active, TQColorGroup::Highlight ) ); KoRect r = getRealRect(); @@ -1445,7 +1445,7 @@ void KPrObject::paintSelection( QPainter *_painter, KoTextZoomHandler *_zoomHand zX6=zX6-2; zY6=zY6-2; - QBrush brush=kapp->palette().color( QPalette::Active,QColorGroup::Base ); + TQBrush brush=kapp->palette().color( TQPalette::Active,TQColorGroup::Base ); _painter->fillRect( x, y, zX6, zY6, brush ); _painter->fillRect( x, y + h / 2, zX6, zY6, brush); _painter->fillRect( x, y + h, zX6, zY6, brush ); @@ -1479,27 +1479,27 @@ DCOPObject* KPrObject::dcopObject() return dcop; } -void KPrObject::setupClipRegion( QPainter *painter, const QRegion &clipRegion ) +void KPrObject::setupClipRegion( TQPainter *painter, const TQRegion &clipRegion ) { - QRegion region = painter->clipRegion( QPainter::CoordPainter ); + TQRegion region = painter->clipRegion( TQPainter::CoordPainter ); if ( region.isEmpty() ) region = clipRegion; else region.unite( clipRegion ); - painter->setClipRegion( region, QPainter::CoordPainter ); + painter->setClipRegion( region, TQPainter::CoordPainter ); } -QDomElement KPrObject::createValueElement(const QString &tag, int value, QDomDocument &doc) { - QDomElement elem=doc.createElement(tag); +TQDomElement KPrObject::createValueElement(const TQString &tag, int value, TQDomDocument &doc) { + TQDomElement elem=doc.createElement(tag); elem.setAttribute(attrValue, value); return elem; } -QDomElement KPrObject::createGradientElement(const QString &tag, const QColor &c1, const QColor &c2, +TQDomElement KPrObject::createGradientElement(const TQString &tag, const TQColor &c1, const TQColor &c2, int type, bool unbalanced, int xfactor, - int yfactor, QDomDocument &doc) { - QDomElement elem=doc.createElement(tag); + int yfactor, TQDomDocument &doc) { + TQDomElement elem=doc.createElement(tag); elem.setAttribute(attrC1, c1.name()); elem.setAttribute(attrC2, c2.name()); elem.setAttribute(attrType, type); @@ -1509,16 +1509,16 @@ QDomElement KPrObject::createGradientElement(const QString &tag, const QColor &c return elem; } -QDomElement KPrObject::createPenElement(const QString &tag, const KoPen &pen, QDomDocument &doc) { +TQDomElement KPrObject::createPenElement(const TQString &tag, const KoPen &pen, TQDomDocument &doc) { - QDomElement elem=doc.createElement(tag); + TQDomElement elem=doc.createElement(tag); elem.setAttribute(attrColor, pen.color().name()); elem.setAttribute(attrWidth, pen.pointWidth()); elem.setAttribute(attrStyle, static_cast<int>(pen.style())); return elem; } -KoPen KPrObject::toPen(const QDomElement &element) const { +KoPen KPrObject::toPen(const TQDomElement &element) const { KoPen pen; pen.setColor(retrieveColor(element)); @@ -1529,26 +1529,26 @@ KoPen KPrObject::toPen(const QDomElement &element) const { return pen; } -QDomElement KPrObject::createBrushElement(const QString &tag, const QBrush &brush, QDomDocument &doc) { +TQDomElement KPrObject::createBrushElement(const TQString &tag, const TQBrush &brush, TQDomDocument &doc) { - QDomElement elem=doc.createElement(tag); + TQDomElement elem=doc.createElement(tag); elem.setAttribute(attrColor, brush.color().name()); elem.setAttribute(attrStyle, static_cast<int>(brush.style())); return elem; } -QBrush KPrObject::toBrush(const QDomElement &element) const { +TQBrush KPrObject::toBrush(const TQDomElement &element) const { - QBrush brush; + TQBrush brush; brush.setColor(retrieveColor(element)); if(element.hasAttribute(attrStyle)) brush.setStyle(static_cast<Qt::BrushStyle>(element.attribute(attrStyle).toInt())); return brush; } -QColor KPrObject::retrieveColor(const QDomElement &element, const QString &cattr, - const QString &rattr, const QString &gattr, const QString &battr) const { - QColor ret; +TQColor KPrObject::retrieveColor(const TQDomElement &element, const TQString &cattr, + const TQString &rattr, const TQString &gattr, const TQString &battr) const { + TQColor ret; if(element.hasAttribute(cattr)) ret.setNamedColor(element.attribute(cattr)); else { @@ -1564,7 +1564,7 @@ QColor KPrObject::retrieveColor(const QDomElement &element, const QString &cattr return ret; } -void KPrObject::draw( QPainter *_painter, KoTextZoomHandler*_zoomHandler, +void KPrObject::draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, int /*pageNum*/, SelectionMode selectionMode, bool drawContour ) { if ( selectionMode != SM_NONE && !drawContour ) @@ -1622,7 +1622,7 @@ void KPrObject::getRealSizeAndOrigFromPoints( KoPointArray &points, float angle, orig.setY( orig.y() + mid_y + min_y ); } -void KPrObject::addSelfToGuides(QValueList<double> &horizontalPos, QValueList<double> &verticalPos ) +void KPrObject::addSelfToGuides(TQValueList<double> &horizontalPos, TQValueList<double> &verticalPos ) { KoRect bounds = getRealRect(); @@ -1647,9 +1647,9 @@ KPrShadowObject &KPrShadowObject::operator=( const KPrShadowObject & ) return *this; } -QDomDocumentFragment KPrShadowObject::save( QDomDocument& doc,double offset ) +TQDomDocumentFragment KPrShadowObject::save( TQDomDocument& doc,double offset ) { - QDomDocumentFragment fragment=KPrObject::save(doc, offset); + TQDomDocumentFragment fragment=KPrObject::save(doc, offset); if(pen!=defaultPen()) fragment.appendChild(KPrObject::createPenElement(tagPEN, pen, doc)); @@ -1660,16 +1660,16 @@ void KPrShadowObject::saveOasisStrokeElement( KoGenStyles& mainStyles, KoGenStyl { switch( pen.style() ) { - case Qt::NoPen: + case TQt::NoPen: styleobjectauto.addProperty( "draw:stroke" , "none" ); break; - case Qt::SolidLine: + case TQt::SolidLine: styleobjectauto.addProperty( "draw:stroke" , "solid" ); break; - case Qt::DashLine: - case Qt::DotLine: - case Qt::DashDotLine: - case Qt::DashDotDotLine: + case TQt::DashLine: + case TQt::DotLine: + case TQt::DashDotLine: + case TQt::DashDotDotLine: styleobjectauto.addProperty( "draw:stroke" , "dash" ); //TODO FIXME styleobjectauto.addProperty( "draw:stroke-dash", saveOasisStrokeStyle( mainStyles ) ); @@ -1677,25 +1677,25 @@ void KPrShadowObject::saveOasisStrokeElement( KoGenStyles& mainStyles, KoGenStyl default: break; } - if ( pen.style() != Qt::NoPen ) + if ( pen.style() != TQt::NoPen ) { styleobjectauto.addProperty( "svg:stroke-color", pen.color().name() ); styleobjectauto.addPropertyPt( "svg:stroke-width", pen.pointWidth() ); } } -QString KPrShadowObject::saveOasisStrokeStyle( KoGenStyles& mainStyles ) const +TQString KPrShadowObject::saveOasisStrokeStyle( KoGenStyles& mainStyles ) const { KoGenStyle stroke( KPrDocument::STYLE_STROKE /*, "graphic"*/ /*no name*/ ); switch( pen.style() ) { - case Qt::NoPen: + case TQt::NoPen: //nothing break; - case Qt::SolidLine: + case TQt::SolidLine: //nothing break; - case Qt::DashLine: //value from ooimpress filter + case TQt::DashLine: //value from ooimpress filter stroke.addAttribute( "draw:style", "rect" ); stroke.addAttribute( "draw:dots1", "1" ); stroke.addAttribute( "draw:dots2", "1" ); @@ -1703,12 +1703,12 @@ QString KPrShadowObject::saveOasisStrokeStyle( KoGenStyles& mainStyles ) const stroke.addAttribute( "draw:dots2-length", "0.508cm" ); stroke.addAttribute( "draw:distance", "0.508cm" ); break; - case Qt::DotLine: + case TQt::DotLine: stroke.addAttribute( "draw:style", "rect" ); stroke.addAttribute( "draw:dots1", "1" ); stroke.addAttribute( "draw:distance", "0.257cm" ); break; - case Qt::DashDotLine: + case TQt::DashDotLine: stroke.addAttribute( "draw:style", "rect" ); stroke.addAttribute( "draw:dots1", "1" ); stroke.addAttribute( "draw:dots2", "1" ); @@ -1716,7 +1716,7 @@ QString KPrShadowObject::saveOasisStrokeStyle( KoGenStyles& mainStyles ) const stroke.addAttribute( "draw:dots2-length", "0.254cm" ); stroke.addAttribute( "draw:distance", "0.127cm" ); break; - case Qt::DashDotDotLine: + case TQt::DashDotDotLine: stroke.addAttribute( "draw:style", "rect" ); stroke.addAttribute( "draw:dots1", "2" ); stroke.addAttribute( "draw:dots2", "1" ); @@ -1732,7 +1732,7 @@ QString KPrShadowObject::saveOasisStrokeStyle( KoGenStyles& mainStyles ) const bool KPrShadowObject::saveOasisDrawPoints( const KoPointArray &points, KPOasisSaveContext &sc ) { - QString listOfPoint; + TQString listOfPoint; int maxX=0; int maxY=0; KoPointArray::ConstIterator it( points.begin() ); @@ -1743,26 +1743,26 @@ bool KPrShadowObject::saveOasisDrawPoints( const KoPointArray &points, KPOasisSa int tmpY = int( ( *it ).y() * 10000 ); // no space allows before first element if ( !listOfPoint.isEmpty() ) - listOfPoint += QString( " %1,%2" ).arg( tmpX ).arg( tmpY ); + listOfPoint += TQString( " %1,%2" ).tqarg( tmpX ).tqarg( tmpY ); else - listOfPoint = QString( "%1,%2" ).arg( tmpX ).arg( tmpY ); - maxX = QMAX( maxX, tmpX ); - maxY = QMAX( maxY, tmpY ); + listOfPoint = TQString( "%1,%2" ).tqarg( tmpX ).tqarg( tmpY ); + maxX = TQMAX( maxX, tmpX ); + maxY = TQMAX( maxY, tmpY ); } sc.xmlWriter.addAttribute("draw:points", listOfPoint ); - sc.xmlWriter.addAttribute("svg:viewBox", QString( "0 0 %1 %2" ).arg( maxX ).arg( maxY ) ); + sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( maxX ).tqarg( maxY ) ); return true; } -bool KPrShadowObject::loadOasisDrawPoints( KoPointArray &points, const QDomElement &element, +bool KPrShadowObject::loadOasisDrawPoints( KoPointArray &points, const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info ) { Q_UNUSED( context ); Q_UNUSED( info ); - QStringList ptList = QStringList::split(' ', element.attributeNS( KoXmlNS::draw, "points", QString::null)); + TQStringList ptList = TQStringList::split(' ', element.attributeNS( KoXmlNS::draw, "points", TQString())); unsigned int index = 0; - for (QStringList::Iterator it = ptList.begin(); it != ptList.end(); ++it) + for (TQStringList::Iterator it = ptList.begin(); it != ptList.end(); ++it) { points.putPoints( index++, 1, ( *it ).section( ',', 0, 0 ).toInt(), ( *it ).section( ',', 1, 1 ).toInt() ); } @@ -1771,15 +1771,15 @@ bool KPrShadowObject::loadOasisDrawPoints( KoPointArray &points, const QDomEleme } -bool KPrShadowObject::loadOasisApplyViewBox( const QDomElement &element, KoPointArray &points ) +bool KPrShadowObject::loadOasisApplyViewBox( const TQDomElement &element, KoPointArray &points ) { - kdDebug(33001) << "loadOasisApplayViewBox svg:viewBox = " << element.attributeNS( KoXmlNS::svg, "viewBox", QString::null ) << endl; - QStringList viewBoxPoints = QStringList::split( ' ', element.attributeNS( KoXmlNS::svg, "viewBox", QString::null ) ); + kdDebug(33001) << "loadOasisApplayViewBox svg:viewBox = " << element.attributeNS( KoXmlNS::svg, "viewBox", TQString() ) << endl; + TQStringList viewBoxPoints = TQStringList::split( ' ', element.attributeNS( KoXmlNS::svg, "viewBox", TQString() ) ); KoRect viewBox; if ( viewBoxPoints.size() == 4 ) { - QStringList::Iterator it = viewBoxPoints.begin(); + TQStringList::Iterator it = viewBoxPoints.begin(); //viewBox.setCoords( ( *it++ ).toInt(), ( *it++ ).toInt(), ( *it++ ).toInt(), ( *it ).toInt() ); viewBox.setLeft( ( *it++ ).toInt() ); viewBox.setTop( ( *it++ ).toInt() ); @@ -1803,10 +1803,10 @@ bool KPrShadowObject::loadOasisApplyViewBox( const QDomElement &element, KoPoint } else { - viewBox.setLeft( QMIN( viewBox.left(), p.x() ) ); - viewBox.setRight( QMAX( viewBox.right(), p.x() ) ); - viewBox.setTop( QMIN( viewBox.top(), p.y() ) ); - viewBox.setBottom( QMAX( viewBox.bottom(), p.y() ) ); + viewBox.setLeft( TQMIN( viewBox.left(), p.x() ) ); + viewBox.setRight( TQMAX( viewBox.right(), p.x() ) ); + viewBox.setTop( TQMIN( viewBox.top(), p.y() ) ); + viewBox.setBottom( TQMAX( viewBox.bottom(), p.y() ) ); } } kdDebug(33001) << "viewBox calculated = " << viewBox << endl; @@ -1837,9 +1837,9 @@ void KPrShadowObject::fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainS saveOasisStrokeElement( mainStyles, styleObjectAuto ); } -void KPrShadowObject::loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info) +void KPrShadowObject::loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info) { - //kdDebug()<<"void KPrShadowObject::loadOasis(const QDomElement &element)**********************\n"; + //kdDebug()<<"void KPrShadowObject::loadOasis(const TQDomElement &element)**********************\n"; KPrObject::loadOasis(element, context, info); KoStyleStack &styleStack = context.styleStack(); styleStack.setTypeProperties( "graphic" ); @@ -1851,37 +1851,37 @@ void KPrShadowObject::loadOasis(const QDomElement &element, KoOasisContext & con pen.setStyle(Qt::SolidLine ); else if ( styleStack.attributeNS( KoXmlNS::draw, "stroke" ) == "dash" ) { - QString style = styleStack.attributeNS( KoXmlNS::draw, "stroke-dash" ); + TQString style = styleStack.attributeNS( KoXmlNS::draw, "stroke-dash" ); kdDebug()<<" stroke style is : "<<style<<endl; //type not defined by default //try to use style. - QDomElement* draw = context.oasisStyles().drawStyles()[style]; + TQDomElement* draw = context.oasisStyles().drawStyles()[style]; kdDebug()<<" stroke have oasis style defined :"<<draw<<endl; if ( draw ) { //FIXME - if ( draw->attributeNS( KoXmlNS::draw, "style", QString::null )=="rect" ) + if ( draw->attributeNS( KoXmlNS::draw, "style", TQString() )=="rect" ) { - if ( draw->attributeNS( KoXmlNS::draw, "dots1", QString::null )=="1" && - draw->attributeNS( KoXmlNS::draw, "dots2", QString::null )=="1" && - draw->attributeNS( KoXmlNS::draw, "dots1-length", QString::null )=="0.508cm" && - draw->attributeNS( KoXmlNS::draw, "dots2-length", QString::null )=="0.508cm" && - draw->attributeNS( KoXmlNS::draw, "distance", QString::null )=="0.508cm" ) - pen.setStyle( Qt::DashLine ); - else if ( draw->attributeNS( KoXmlNS::draw, "dots1", QString::null )=="1" && - draw->attributeNS( KoXmlNS::draw, "distance", QString::null )=="0.257cm" ) + if ( draw->attributeNS( KoXmlNS::draw, "dots1", TQString() )=="1" && + draw->attributeNS( KoXmlNS::draw, "dots2", TQString() )=="1" && + 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 ); + else if ( draw->attributeNS( KoXmlNS::draw, "dots1", TQString() )=="1" && + draw->attributeNS( KoXmlNS::draw, "distance", TQString() )=="0.257cm" ) pen.setStyle(Qt::DotLine ); - else if ( draw->attributeNS( KoXmlNS::draw, "dots1", QString::null )=="1" && - draw->attributeNS( KoXmlNS::draw, "dots2", QString::null )=="1" && - draw->attributeNS( KoXmlNS::draw, "dots1-length", QString::null )=="0.051cm" && - draw->attributeNS( KoXmlNS::draw, "dots2-length", QString::null )=="0.254cm" && - draw->attributeNS( KoXmlNS::draw, "distance", QString::null )=="0.127cm" ) + 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 ); - else if ( draw->attributeNS( KoXmlNS::draw, "dots1", QString::null )=="2" && - draw->attributeNS( KoXmlNS::draw, "dots2", QString::null )=="1" && - draw->attributeNS( KoXmlNS::draw, "dots2-length", QString::null )=="0.203cm" && - draw->attributeNS( KoXmlNS::draw, "distance", QString::null )=="0.203cm" ) + 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 ); else { @@ -1903,10 +1903,10 @@ void KPrShadowObject::loadOasis(const QDomElement &element, KoOasisContext & con kdDebug()<<"pen style :"<<pen<<endl; } -double KPrShadowObject::load(const QDomElement &element) +double KPrShadowObject::load(const TQDomElement &element) { double offset=KPrObject::load(element); - QDomElement e=element.namedItem(tagPEN).toElement(); + TQDomElement e=element.namedItem(tagPEN).toElement(); if(!e.isNull()) setPen(KPrObject::toPen(e)); else @@ -1914,7 +1914,7 @@ double KPrShadowObject::load(const QDomElement &element) return offset; } -void KPrShadowObject::draw( QPainter *_painter, KoTextZoomHandler*_zoomHandler, +void KPrShadowObject::draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, int pageNum, SelectionMode selectionMode, bool drawContour ) { double ox = orig.x(); @@ -1928,7 +1928,7 @@ void KPrShadowObject::draw( QPainter *_painter, KoTextZoomHandler*_zoomHandler, // tz TODO fix tmpPen usage KoPen tmpPen( pen ); pen.setColor( shadowColor ); - QBrush brush; + TQBrush brush; brush.setColor( shadowColor ); double sx = ox; @@ -1964,7 +1964,7 @@ KoPen KPrShadowObject::defaultPen() const return KoPen(); } -void KPrShadowObject::paint(QPainter* painter, KoTextZoomHandler* zoomHandler, int pageNum, bool drawingShadow, bool drawContour) { +void KPrShadowObject::paint(TQPainter* painter, KoTextZoomHandler* zoomHandler, int pageNum, bool drawingShadow, bool drawContour) { Q_UNUSED(painter); Q_UNUSED(zoomHandler); Q_UNUSED(pageNum); @@ -1979,8 +1979,8 @@ KPr2DObject::KPr2DObject() { } -KPr2DObject::KPr2DObject( const KoPen &_pen, const QBrush &_brush, FillType _fillType, - const QColor &_gColor1, const QColor &_gColor2, BCType _gType, +KPr2DObject::KPr2DObject( const KoPen &_pen, const TQBrush &_brush, FillType _fillType, + const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType, bool _unbalanced, int _xfactor, int _yfactor ) : KPrShadowObject( _pen ) , m_brush( _brush, _gColor1, _gColor2, _gType, _fillType, _unbalanced, _xfactor, _yfactor ) @@ -2014,23 +2014,23 @@ void KPr2DObject::setFillType( FillType _fillType ) } } -QDomDocumentFragment KPr2DObject::save( QDomDocument& doc,double offset ) +TQDomDocumentFragment KPr2DObject::save( TQDomDocument& doc,double offset ) { - QDomDocumentFragment fragment=KPrShadowObject::save(doc, offset); - QBrush brush = getBrush(); - if ( brush != QBrush() ) + TQDomDocumentFragment fragment=KPrShadowObject::save(doc, offset); + TQBrush brush = getBrush(); + if ( brush != TQBrush() ) fragment.appendChild( KPrObject::createBrushElement( tagBRUSH, brush, doc ) ); FillType fillType = getFillType(); if ( fillType != FT_BRUSH ) fragment.appendChild( KPrObject::createValueElement( tagFILLTYPE, static_cast<int>(fillType), doc ) ); - QColor gColor1 = getGColor1(); - QColor gColor2 = getGColor2(); + TQColor gColor1 = getGColor1(); + TQColor gColor2 = getGColor2(); BCType gType = getGType(); bool unbalanced = getGUnbalanced(); int xfactor = getGXFactor(); int yfactor = getGYFactor(); - if ( gColor1!=Qt::red || gColor2!=Qt::green || gType!=BCT_GHORZ || unbalanced || xfactor != 100 || yfactor != 100 ) + if ( gColor1!=TQt::red || gColor2!=TQt::green || gType!=BCT_GHORZ || unbalanced || xfactor != 100 || yfactor != 100 ) fragment.appendChild( KPrObject::createGradientElement( tagGRADIENT, gColor1, gColor2, static_cast<int>(gType), unbalanced, xfactor, yfactor, doc)); return fragment; @@ -2044,21 +2044,21 @@ void KPr2DObject::fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyle } -void KPr2DObject::loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info) +void KPr2DObject::loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info) { - kdDebug()<<"void KPr2DObject::loadOasis(const QDomElement &element)\n"; - QBrush tmpBrush; + kdDebug()<<"void KPr2DObject::loadOasis(const TQDomElement &element)\n"; + TQBrush tmpBrush; KPrShadowObject::loadOasis(element, context, info); m_brush.loadOasisFillStyle( context, "graphic" ); setFillType( m_brush.getFillType() ); } -double KPr2DObject::load(const QDomElement &element) +double KPr2DObject::load(const TQDomElement &element) { double offset=KPrShadowObject::load(element); - QDomElement e=element.namedItem(tagFILLTYPE).toElement(); + TQDomElement e=element.namedItem(tagFILLTYPE).toElement(); if(!e.isNull()) { if(e.hasAttribute(attrValue)) setFillType(static_cast<FillType>(e.attribute(attrValue).toInt())); @@ -2070,7 +2070,7 @@ double KPr2DObject::load(const QDomElement &element) if(!e.isNull()) setBrush(KPrObject::toBrush(e)); else - setBrush( QBrush() ); + setBrush( TQBrush() ); e=element.namedItem(tagGRADIENT).toElement(); if(!e.isNull()) { @@ -2088,8 +2088,8 @@ double KPr2DObject::load(const QDomElement &element) gradient->setParameters(getGColor1(), getGColor2(), getGType(), getGUnbalanced(), getGXFactor(), getGYFactor() ); } else { - setGColor1( Qt::red ); - setGColor2( Qt::green ); + setGColor1( TQt::red ); + setGColor2( TQt::green ); setGType( BCT_GHORZ ); setGUnbalanced( false ); setGXFactor( 100 ); @@ -2098,7 +2098,7 @@ double KPr2DObject::load(const QDomElement &element) return offset; } -void KPr2DObject::draw( QPainter *_painter, KoTextZoomHandler*_zoomHandler, +void KPr2DObject::draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, int pageNum, SelectionMode selectionMode, bool drawContour ) { double ox = orig.x(); @@ -2111,8 +2111,8 @@ void KPr2DObject::draw( QPainter *_painter, KoTextZoomHandler*_zoomHandler, _painter->save(); KoPen tmpPen( pen ); pen.setColor( shadowColor ); - QBrush tmpBrush( m_brush.getBrush() ); - QBrush shadowBrush( tmpBrush ); + TQBrush tmpBrush( m_brush.getBrush() ); + TQBrush shadowBrush( tmpBrush ); shadowBrush.setColor( shadowColor ); m_brush.setBrush( shadowBrush ); @@ -2161,7 +2161,7 @@ void KPr2DObject::flip( bool horizontal ) { ( ! horizontal && gType == BCT_GDIAGONAL2 ) || ( ! horizontal && gType == BCT_GHORZ ) || ( horizontal && gType == BCT_GVERT ) ) { - QColor gColorTemp; + TQColor gColorTemp; gColorTemp = getGColor1(); setGColor1( getGColor2() ); setGColor2( gColorTemp ); diff --git a/kpresenter/KPrObject.h b/kpresenter/KPrObject.h index bc532f5a..ce5b37c5 100644 --- a/kpresenter/KPrObject.h +++ b/kpresenter/KPrObject.h @@ -22,8 +22,8 @@ #ifndef kpobject_h #define kpobject_h -#include <qbrush.h> -#include <qcursor.h> +#include <tqbrush.h> +#include <tqcursor.h> #include "global.h" @@ -42,11 +42,11 @@ #include <KoPen.h> class KoSavingContext; -class QPainter; +class TQPainter; class DCOPObject; -class QDomDocumentFragment; -class QDomDocument; -class QDomElement; +class TQDomDocumentFragment; +class TQDomDocument; +class TQDomElement; class KoTextZoomHandler; class KPrDocument; class KPrTextObject; @@ -72,7 +72,7 @@ public: virtual void setSize( const KoSize & _size ) { setSize( _size.width(), _size.height() ); } virtual void setSize(double _width, double _height ) - { ext = KoSize( QMAX( MIN_SIZE, _width ), QMAX( MIN_SIZE, _height ) ); } // no object is smaller than 10x10 + { ext = KoSize( TQMAX( MIN_SIZE, _width ), TQMAX( MIN_SIZE, _height ) ); } // no object is smaller than 10x10 virtual void setOrig( const KoPoint & _point ) { orig = _point; } virtual void setOrig( double _x, double _y ) @@ -86,7 +86,7 @@ public: virtual void resizeBy( double _dx, double _dy ) { setSize( ext.width() + _dx, ext.height() + _dy ); } // call (possibly reimplemented) setSize - virtual void setShadowParameter(int _distance,ShadowDirection _direction,const QColor &_color) + virtual void setShadowParameter(int _distance,ShadowDirection _direction,const TQColor &_color) { shadowDistance = _distance; shadowDirection = _direction; @@ -97,7 +97,7 @@ public: { shadowDistance = _distance; } virtual void setShadowDirection( ShadowDirection _direction ) { shadowDirection = _direction; } - virtual void setShadowColor( const QColor & _color ) + virtual void setShadowColor( const TQColor & _color ) { shadowColor = _color; } virtual void setEffect( Effect _effect ) { effect = _effect; } @@ -123,19 +123,19 @@ public: { appearSoundEffect = b; } virtual void setDisappearSoundEffect( bool b ) { disappearSoundEffect = b; } - virtual void setAppearSoundEffectFileName( const QString & _a_fileName ) + virtual void setAppearSoundEffectFileName( const TQString & _a_fileName ) { a_fileName = _a_fileName; } - virtual void setDisappearSoundEffectFileName( const QString &_d_fileName ) + virtual void setDisappearSoundEffectFileName( const TQString &_d_fileName ) { d_fileName = _d_fileName; } - virtual void setObjectName( const QString &_objectName ) + virtual void setObjectName( const TQString &_objectName ) { objectName = _objectName; } - virtual QString getObjectName() const + virtual TQString getObjectName() const { return objectName; } - virtual QDomDocumentFragment save( QDomDocument& doc, double offset ); - virtual double load(const QDomElement &element); - virtual void loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); + virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset ); + virtual double load(const TQDomElement &element); + virtual void loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); struct KPOasisSaveContext { @@ -164,8 +164,8 @@ public: virtual ObjType getType() const { return OT_UNDEFINED; } - virtual QString getTypeString() const - { return QString(); } + virtual TQString getTypeString() const + { return TQString(); } virtual bool isSelected() const { return selected; } @@ -175,7 +175,7 @@ public: { return shadowDistance; } virtual ShadowDirection getShadowDirection() const { return shadowDirection; } - virtual QColor getShadowColor() const + virtual TQColor getShadowColor() const { return shadowColor; } virtual KoSize getSize() const { return ext; } @@ -188,7 +188,7 @@ public: virtual KoPoint getRealOrig() const; KoRect getRealRect() const; /** - * @brief Get the rect which has to be repainted + * @brief Get the rect which has to be tqrepainted * * This also contains the shadow. */ @@ -212,9 +212,9 @@ public: { return appearSoundEffect; } virtual bool getDisappearSoundEffect() const { return disappearSoundEffect; } - virtual QString getAppearSoundEffectFileName() const + virtual TQString getAppearSoundEffectFileName() const { return a_fileName; } - virtual QString getDisappearSoundEffectFileName() const + virtual TQString getDisappearSoundEffectFileName() const { return d_fileName; } /** * get the step when the object appears on the site @@ -239,7 +239,7 @@ public: { specEffects = _specEffects; onlyCurrStep = _onlyCurrStep; } // the main drawing method. - virtual void draw( QPainter *_painter, KoTextZoomHandler*_zoomHandler, + virtual void draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, int /*pageNum*/, SelectionMode selectionMode, bool drawContour = FALSE ); /** @@ -250,7 +250,7 @@ public: * @return true if point lies in rect of object * @return false otherwise */ - virtual bool contains( const KoPoint &point ) const; + virtual bool tqcontains( const KoPoint &point ) const; /** * @brief Check if rect intersects with rect of object @@ -262,10 +262,10 @@ public: */ virtual bool intersects( const KoRect & rect ) const; - virtual QCursor getCursor( const KoPoint &_point, ModifyType &_modType, KPrDocument *doc ) const; + virtual TQCursor getCursor( const KoPoint &_point, ModifyType &_modType, KPrDocument *doc ) const; KoRect rotateRectObject() const; - void rotateObject(QPainter *paint,KoTextZoomHandler *_zoomHandler); + void rotateObject(TQPainter *paint,KoTextZoomHandler *_zoomHandler); virtual void removeFromObjList() { inObjList = false; } @@ -282,20 +282,20 @@ public: virtual void setKeepRatio( bool b ) { keepRatio = b; } bool isKeepRatio() const { return keepRatio; } - static void setupClipRegion( QPainter *painter, const QRegion &clipRegion ); + static void setupClipRegion( TQPainter *painter, const TQRegion &clipRegion ); - void paintSelection( QPainter *_painter,KoTextZoomHandler *_zoomHandler, + void paintSelection( TQPainter *_painter,KoTextZoomHandler *_zoomHandler, SelectionMode selectionMode ); /** * Collect all textobjects. - * (KPrTextObject returns the object it contains, - * a KPrGroupObject returns all the text objects it contains) + * (KPrTextObject returns the object it tqcontains, + * a KPrGroupObject returns all the text objects it tqcontains) */ - virtual void addTextObjects( QPtrList<KoTextObject> & ) const {} + virtual void addTextObjects( TQPtrList<KoTextObject> & ) const {} virtual KPrTextObject *nextTextObject() { return 0L;} // deprecated - virtual void getAllObjectSelectedList(QPtrList<KPrObject> &lst, bool force = false ) + virtual void getAllObjectSelectedList(TQPtrList<KPrObject> &lst, bool force = false ) { if (selected || force ) lst.append( this );} virtual KoPen getPen() const; @@ -304,7 +304,7 @@ public: /** * Adds its edges to the KoGuides objectCollect all textobjects. */ - void addSelfToGuides( QValueList<double> &horizontalPos, QValueList<double> &verticalPos ); + void addSelfToGuides( TQValueList<double> &horizontalPos, TQValueList<double> &verticalPos ); protected: /** @@ -323,23 +323,23 @@ protected: virtual void doDelete(); - QDomElement createValueElement(const QString &tag, int value, QDomDocument &doc); - QDomElement createGradientElement(const QString &tag, const QColor &c1, const QColor &c2, - int type, bool unbalanced, int xfactor, int yfactor, QDomDocument &doc); - QDomElement createPenElement(const QString &tag, const KoPen &pen, QDomDocument &doc); - KoPen toPen(const QDomElement &element) const; + TQDomElement createValueElement(const TQString &tag, int value, TQDomDocument &doc); + TQDomElement createGradientElement(const TQString &tag, const TQColor &c1, const TQColor &c2, + int type, bool unbalanced, int xfactor, int yfactor, TQDomDocument &doc); + TQDomElement createPenElement(const TQString &tag, const KoPen &pen, TQDomDocument &doc); + KoPen toPen(const TQDomElement &element) const; - QDomElement createBrushElement(const QString &tag, const QBrush &brush, QDomDocument &doc); - QBrush toBrush(const QDomElement &element) const; + TQDomElement createBrushElement(const TQString &tag, const TQBrush &brush, TQDomDocument &doc); + TQBrush toBrush(const TQDomElement &element) const; - QColor retrieveColor(const QDomElement &element, const QString &cattr="color", - const QString &rattr="red", const QString &gattr="green", - const QString &battr="blue") const; + TQColor retrieveColor(const TQDomElement &element, const TQString &cattr="color", + const TQString &rattr="red", const TQString &gattr="green", + const TQString &battr="blue") const; void saveOasisObjectProtectStyle( KoGenStyle &styleobjectauto ) const; void saveOasisShadowElement( KoGenStyle &styleobjectauto ) const; - QString getStyle( KPOasisSaveContext &sc ) const; + TQString getStyle( KPOasisSaveContext &sc ) const; virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const; /** * Get the element name for saving the object @@ -354,15 +354,15 @@ protected: KoSize ext; int shadowDistance; ShadowDirection shadowDirection; - QColor shadowColor; + TQColor shadowColor; Effect effect; Effect2 effect2; Effect3 effect3; EffectSpeed m_appearSpeed; EffectSpeed m_disappearSpeed; int appearTimer, disappearTimer; - QString a_fileName, d_fileName; - QString objectName; + TQString a_fileName, d_fileName; + TQString objectName; // step when objects appears/disappears int appearStep, disappearStep; @@ -383,7 +383,7 @@ protected: DCOPObject *dcop; - static const QString &tagORIG, &attrX, &attrY, + static const TQString &tagORIG, &attrX, &attrY, &tagSIZE, &attrWidth, &attrHeight, &tagSHADOW, &attrDistance, &attrDirection, &attrColor, &attrC1, &attrC2, &attrType, &attrUnbalanced, &attrXFactor, @@ -417,13 +417,13 @@ public: virtual KoPen getPen() const { return pen; } - virtual QDomDocumentFragment save( QDomDocument& doc, double offset ); - virtual double load(const QDomElement &element); - virtual void loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); - virtual void draw( QPainter *_painter, KoTextZoomHandler*_zoomHandler, + virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset ); + virtual double load(const TQDomElement &element); + virtual void loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); + virtual void draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, int pageNum, SelectionMode selectionMode, bool drawContour = FALSE ); virtual void saveOasisStrokeElement( KoGenStyles& mainStyles, KoGenStyle &styleobjectauto ) const; - QString saveOasisStrokeStyle( KoGenStyles& mainStyles ) const; + TQString saveOasisStrokeStyle( KoGenStyles& mainStyles ) const; protected: /** @@ -434,7 +434,7 @@ protected: /** * Helper method for loading draw:points. The svg:viewBox is taken into account. */ - bool loadOasisDrawPoints( KoPointArray &points, const QDomElement &element, + bool loadOasisDrawPoints( KoPointArray &points, const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info ); @@ -449,7 +449,7 @@ protected: * @param element the xml element from which the viewBox attribute should be read. * @param points which should be updated. */ - bool loadOasisApplyViewBox( const QDomElement &element, KoPointArray &points ); + bool loadOasisApplyViewBox( const TQDomElement &element, KoPointArray &points ); virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const; @@ -471,7 +471,7 @@ protected: * * This method isn't pure virtual because some objects implement draw() directly. */ - virtual void paint( QPainter* /* painter */, KoTextZoomHandler* /* zoomHandler */, + virtual void paint( TQPainter* /* painter */, KoTextZoomHandler* /* zoomHandler */, int /* pageNum */, bool drawingShadow, bool /* drawContour */ = FALSE ); KoPen pen; }; @@ -480,17 +480,17 @@ class KPr2DObject : public KPrShadowObject { public: KPr2DObject(); - KPr2DObject( const KoPen &_pen, const QBrush &_brush, FillType _fillType, - const QColor &_gColor1, const QColor &_gColor2, BCType _gType, + KPr2DObject( const KoPen &_pen, const TQBrush &_brush, FillType _fillType, + const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType, bool _unbalanced, int _xfactor, int _yfactor ); virtual ~KPr2DObject() { delete gradient; } virtual void setFillType( FillType fillType ); - virtual void setBrush( const QBrush &brush ) + virtual void setBrush( const TQBrush &brush ) { m_brush.setBrush( brush ); } - virtual void setGColor1( const QColor &gColor1 ) + virtual void setGColor1( const TQColor &gColor1 ) { if ( gradient ) gradient->setColor1( gColor1 ); m_brush.setGColor1( gColor1 ); m_redrawGradientPix = true; } - virtual void setGColor2( const QColor &gColor2 ) + virtual void setGColor2( const TQColor &gColor2 ) { if ( gradient ) gradient->setColor2( gColor2 ); m_brush.setGColor2( gColor2 ); m_redrawGradientPix = true; } virtual void setGType( BCType gType ) { if ( gradient ) gradient->setBackColorType( gType ); m_brush.setGType( gType ); m_redrawGradientPix = true; } @@ -503,11 +503,11 @@ public: virtual FillType getFillType() const { return m_brush.getFillType(); } - virtual QBrush getBrush() const + virtual TQBrush getBrush() const { return m_brush.getBrush(); } - virtual QColor getGColor1() const + virtual TQColor getGColor1() const { return m_brush.getGColor1(); } - virtual QColor getGColor2() const + virtual TQColor getGColor2() const { return m_brush.getGColor2(); } virtual BCType getGType() const { return m_brush.getGType(); } @@ -518,10 +518,10 @@ public: virtual int getGYFactor() const { return m_brush.getGYFactor(); } - virtual QDomDocumentFragment save( QDomDocument& doc, double offset ); - virtual double load(const QDomElement &element); - virtual void loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); - virtual void draw( QPainter *_painter, KoTextZoomHandler*_zoomHandler, + virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset ); + virtual double load(const TQDomElement &element); + virtual void loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); + virtual void draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, int pageNum, SelectionMode selectionMode, bool drawContour = FALSE ); virtual void flip(bool horizontal ); @@ -532,7 +532,7 @@ protected: KPrBrush m_brush; KPrGradient *gradient; /// holds the painted gradient - QPixmap m_gradientPix; + TQPixmap m_gradientPix; bool m_redrawGradientPix; }; @@ -540,16 +540,16 @@ class KPrStartEndLine { public: KPrStartEndLine( LineEnd _start, LineEnd _end ); - void save( QDomDocumentFragment &fragment, QDomDocument& doc ); - void load( const QDomElement &element ); + void save( TQDomDocumentFragment &fragment, TQDomDocument& doc ); + void load( const TQDomElement &element ); void saveOasisMarkerElement( KoGenStyles& mainStyles, KoGenStyle &styleobjectauto ) const; - QString saveOasisMarkerStyle( KoGenStyles &mainStyles, const LineEnd &_element ) const; - void loadOasisMarkerElement( KoOasisContext & context, const QString & attr, LineEnd &_element ); + TQString saveOasisMarkerStyle( KoGenStyles &mainStyles, const LineEnd &_element ) const; + void loadOasisMarkerElement( KoOasisContext & context, const TQString & attr, LineEnd &_element ); protected: //duplicate from kpobject - QDomElement createValueElement(const QString &tag, int value, QDomDocument &doc); + TQDomElement createValueElement(const TQString &tag, int value, TQDomDocument &doc); LineEnd lineBegin, lineEnd; }; diff --git a/kpresenter/KPrObject2DIface.cpp b/kpresenter/KPrObject2DIface.cpp index 0849dfb9..729d8587 100644 --- a/kpresenter/KPrObject2DIface.cpp +++ b/kpresenter/KPrObject2DIface.cpp @@ -32,12 +32,12 @@ KPrObject2DIface::KPrObject2DIface(KPr2DObject *obj_) obj = obj_; } -QColor KPrObject2DIface::gradientColor1() const +TQColor KPrObject2DIface::gradientColor1() const { return obj->getGColor1(); } -QColor KPrObject2DIface::gradientColor2() const +TQColor KPrObject2DIface::gradientColor2() const { return obj->getGColor2(); } @@ -67,19 +67,19 @@ int KPrObject2DIface::yGradientFactor() const return obj->getGYFactor(); } -QString KPrObject2DIface::gradientFillType() const +TQString KPrObject2DIface::gradientFillType() const { switch(obj->getFillType()) { case FT_BRUSH: - return QString("BRUSH"); + return TQString("BRUSH"); case FT_GRADIENT: - return QString("GRADIENT"); + return TQString("GRADIENT"); } - return QString::null; + return TQString(); } -void KPrObject2DIface::setGradientType( const QString & type) +void KPrObject2DIface::setGradientType( const TQString & type) { if(type=="PLAIN") obj->setGType(BCT_PLAIN); @@ -103,7 +103,7 @@ void KPrObject2DIface::setGradientType( const QString & type) kdDebug(33001)<<"Error KPrObject2DIface::setGradientType\n"; } -void KPrObject2DIface::setFillType( const QString & type) +void KPrObject2DIface::setFillType( const TQString & type) { if(type=="BRUSH") obj->setFillType(FT_BRUSH); @@ -113,12 +113,12 @@ void KPrObject2DIface::setFillType( const QString & type) kdDebug(33001)<<"Error KPrObject2DIface::setFillType\n"; } -void KPrObject2DIface::setGradientColor1( const QColor &col ) +void KPrObject2DIface::setGradientColor1( const TQColor &col ) { obj->setGColor1( col ); } -void KPrObject2DIface::setGradientColor2( const QColor &col ) +void KPrObject2DIface::setGradientColor2( const TQColor &col ) { obj->setGColor2( col ); } diff --git a/kpresenter/KPrObject2DIface.h b/kpresenter/KPrObject2DIface.h index d1b351d0..35a7fd08 100644 --- a/kpresenter/KPrObject2DIface.h +++ b/kpresenter/KPrObject2DIface.h @@ -24,8 +24,8 @@ #include <dcopobject.h> #include <dcopref.h> -#include <qstring.h> -#include <qcolor.h> +#include <tqstring.h> +#include <tqcolor.h> #include "KPrObjectIface.h" @@ -38,18 +38,18 @@ public: KPrObject2DIface( KPr2DObject *obj_ ); k_dcop: - virtual QColor gradientColor1() const; - virtual QColor gradientColor2() const; + virtual TQColor gradientColor1() const; + virtual TQColor gradientColor2() const; virtual void setGUnbalanced( bool b ); virtual void setGXFactor( int f ); virtual void setGYFactor( int f ); virtual int xGradientFactor() const; virtual int yGradientFactor() const; - virtual QString gradientFillType() const; - virtual void setGradientType( const QString & ); - virtual void setFillType( const QString & ); - virtual void setGradientColor1( const QColor &col ); - virtual void setGradientColor2( const QColor &col ); + virtual TQString gradientFillType() const; + virtual void setGradientType( const TQString & ); + virtual void setFillType( const TQString & ); + virtual void setGradientColor1( const TQColor &col ); + virtual void setGradientColor2( const TQColor &col ); private: KPr2DObject *obj; diff --git a/kpresenter/KPrObjectIface.cpp b/kpresenter/KPrObjectIface.cpp index 6f7913bf..25aba98c 100644 --- a/kpresenter/KPrObjectIface.cpp +++ b/kpresenter/KPrObjectIface.cpp @@ -57,7 +57,7 @@ int KPrObjectIface::shadowDirection() const return (int)obj->getShadowDirection(); } -QColor KPrObjectIface::shadowColor() const +TQColor KPrObjectIface::shadowColor() const { return obj->getShadowColor(); } @@ -112,7 +112,7 @@ void KPrObjectIface::setShadowDistance( int _distance ) obj->setShadowDistance(_distance); } -void KPrObjectIface::shadowColor( const QColor & _color ) +void KPrObjectIface::shadowColor( const TQColor & _color ) { obj->setShadowColor(_color); } @@ -136,16 +136,16 @@ void KPrObjectIface::setDisappearSoundEffect( bool b ) { obj->setDisappearSoundEffect(b); } -void KPrObjectIface::setAppearSoundEffectFileName( const QString & _a_fileName ) +void KPrObjectIface::setAppearSoundEffectFileName( const TQString & _a_fileName ) { obj->setAppearSoundEffectFileName(_a_fileName); } -void KPrObjectIface::setDisappearSoundEffectFileName( const QString &_d_fileName ) +void KPrObjectIface::setDisappearSoundEffectFileName( const TQString &_d_fileName ) { obj->setDisappearSoundEffectFileName(_d_fileName); } -void KPrObjectIface::setObjectName( const QString &_objectName ) +void KPrObjectIface::setObjectName( const TQString &_objectName ) { obj->setObjectName(_objectName); } @@ -180,22 +180,22 @@ bool KPrObjectIface::disappearSoundEffect() const return obj->getDisappearSoundEffect(); } -QString KPrObjectIface::appearSoundEffectFileName() const +TQString KPrObjectIface::appearSoundEffectFileName() const { return obj->getAppearSoundEffectFileName(); } -QString KPrObjectIface::disappearSoundEffectFileName() const +TQString KPrObjectIface::disappearSoundEffectFileName() const { return obj->getDisappearSoundEffectFileName(); } -QString KPrObjectIface::typeString() const +TQString KPrObjectIface::typeString() const { return obj->getTypeString(); } -void KPrObjectIface::setEffect(const QString & effect) +void KPrObjectIface::setEffect(const TQString & effect) { if(effect=="NONE") obj->setEffect(EF_NONE); @@ -227,7 +227,7 @@ void KPrObjectIface::setEffect(const QString & effect) kdDebug(33001)<<"Error : setEffect()\n"; } -void KPrObjectIface::setEffect3(const QString & effect) +void KPrObjectIface::setEffect3(const TQString & effect) { if(effect=="NONE") obj->setEffect3(EF3_NONE); diff --git a/kpresenter/KPrObjectIface.h b/kpresenter/KPrObjectIface.h index 5f8186b2..356f50ca 100644 --- a/kpresenter/KPrObjectIface.h +++ b/kpresenter/KPrObjectIface.h @@ -25,8 +25,8 @@ #include <dcopobject.h> #include <dcopref.h> -#include <qstring.h> -#include <qcolor.h> +#include <tqstring.h> +#include <tqcolor.h> class KPrObject; @@ -48,7 +48,7 @@ k_dcop: float angle() const; int shadowDistance() const; int shadowDirection() const; - QColor shadowColor() const; + TQColor shadowColor() const; int effect() const; int effect2() const; int appearStep() const; @@ -57,24 +57,24 @@ k_dcop: int disappearStep() const; int effect3() const; - void setEffect(const QString & effect); - void setEffect3(const QString & effect); + void setEffect(const TQString & effect); + void setEffect3(const TQString & effect); void setSelected( bool _selected ); void rotate( float _angle ); void setShadowDistance( int _distance ); - void shadowColor( const QColor & _color ); + void shadowColor( const TQColor & _color ); void setAppearTimer( int _appearTimer ); void setDisappearTimer( int _disappearTimer ); void setAppearSoundEffect( bool b ); void setDisappearSoundEffect( bool b ); - void setAppearSoundEffectFileName( const QString & _a_fileName ); - void setDisappearSoundEffectFileName( const QString &_d_fileName ); + void setAppearSoundEffectFileName( const TQString & _a_fileName ); + void setDisappearSoundEffectFileName( const TQString &_d_fileName ); - void setObjectName( const QString &_objectName ); + void setObjectName( const TQString &_objectName ); void setAppearStep( int _appearStep ); @@ -84,9 +84,9 @@ k_dcop: int disappearTimer() const; bool appearSoundEffect() const; bool disappearSoundEffect() const; - QString appearSoundEffectFileName() const; - QString disappearSoundEffectFileName() const; - QString typeString() const; + TQString appearSoundEffectFileName() const; + TQString disappearSoundEffectFileName() const; + TQString typeString() const; void setProtected( bool b ); bool isProtected() const; diff --git a/kpresenter/KPrObjectProperties.cpp b/kpresenter/KPrObjectProperties.cpp index ede72009..c0c8d581 100644 --- a/kpresenter/KPrObjectProperties.cpp +++ b/kpresenter/KPrObjectProperties.cpp @@ -31,10 +31,10 @@ #include "KPrBezierCurveObject.h" #include "KPrTextObject.h" -KPrObjectProperties::KPrObjectProperties( const QPtrList<KPrObject> &objects ) +KPrObjectProperties::KPrObjectProperties( const TQPtrList<KPrObject> &objects ) : m_objects( objects ) , m_flags( 0 ) -, m_pen( KoPen( Qt::black, 1.0, Qt::SolidLine ), L_NORMAL, L_NORMAL ) +, m_pen( KoPen( TQt::black, 1.0, Qt::SolidLine ), L_NORMAL, L_NORMAL ) , m_protectContent( STATE_UNDEF ) { getProperties( m_objects ); @@ -46,9 +46,9 @@ KPrObjectProperties::~KPrObjectProperties() } -void KPrObjectProperties::getProperties( const QPtrList<KPrObject> &objects ) +void KPrObjectProperties::getProperties( const TQPtrList<KPrObject> &objects ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { switch ( it.current()->getType() ) @@ -56,7 +56,7 @@ void KPrObjectProperties::getProperties( const QPtrList<KPrObject> &objects ) case OT_LINE: case OT_FREEHAND: case OT_POLYLINE: - case OT_QUADRICBEZIERCURVE: + case OT_TQUADRICBEZIERCURVE: case OT_CUBICBEZIERCURVE: getPenProperties( it.current() ); getLineEndsProperties( it.current() ); @@ -117,7 +117,7 @@ void KPrObjectProperties::getPenProperties( KPrObject *object ) if ( !( m_flags & PtPenWidth ) ) { KPrShadowObject *obj = dynamic_cast<KPrShadowObject*>( object ); - if ( obj && obj->getPen().style() != Qt::NoPen ) + if ( obj && obj->getPen().style() != TQt::NoPen ) { m_flags |= PtPenWidth; } @@ -145,7 +145,7 @@ void KPrObjectProperties::getLineEndsProperties( KPrObject *object ) } case OT_FREEHAND: case OT_POLYLINE: - case OT_QUADRICBEZIERCURVE: + case OT_TQUADRICBEZIERCURVE: case OT_CUBICBEZIERCURVE: { KPrPointObject *obj = dynamic_cast<KPrPointObject*>( object ); diff --git a/kpresenter/KPrObjectProperties.h b/kpresenter/KPrObjectProperties.h index 3f794db0..b1e67aa6 100644 --- a/kpresenter/KPrObjectProperties.h +++ b/kpresenter/KPrObjectProperties.h @@ -39,7 +39,7 @@ public: PtPenWidth = 512 }; - KPrObjectProperties( const QPtrList<KPrObject> &objects ); + KPrObjectProperties( const TQPtrList<KPrObject> &objects ); ~KPrObjectProperties(); int getPropertyFlags() { return m_flags; } @@ -56,13 +56,13 @@ public: KPrPieValueCmd::PieValues getPieValues() const { return m_pieValues; } // get picture properties KPrPictureSettingCmd::PictureSettings getPictureSettings() const { return m_pictureSettings; } - const QPixmap &getPixmap() const { return m_pixmap; } + const TQPixmap &getPixmap() const { return m_pixmap; } /// get text properties MarginsStruct getMarginsStruct() { return m_marginsStruct; } PropValue getProtectContent() { return m_protectContent; } protected: - void getProperties( const QPtrList<KPrObject> &objects ); + void getProperties( const TQPtrList<KPrObject> &objects ); void getPenProperties( KPrObject *object ); void getLineEndsProperties( KPrObject *object ); @@ -74,7 +74,7 @@ protected: void getTextProperties( KPrObject *object ); private: - QPtrList<KPrObject> m_objects; + TQPtrList<KPrObject> m_objects; int m_flags; /// pen properties @@ -89,7 +89,7 @@ private: KPrPieValueCmd::PieValues m_pieValues; /// picture properties KPrPictureSettingCmd::PictureSettings m_pictureSettings; - QPixmap m_pixmap; + TQPixmap m_pixmap; /// text properties MarginsStruct m_marginsStruct; PropValue m_protectContent; diff --git a/kpresenter/KPrPBPreview.cpp b/kpresenter/KPrPBPreview.cpp index 07209b93..bbc14a57 100644 --- a/kpresenter/KPrPBPreview.cpp +++ b/kpresenter/KPrPBPreview.cpp @@ -20,20 +20,20 @@ #include "KPrPBPreview.h" -#include <qpainter.h> +#include <tqpainter.h> #include <KoTextZoomHandler.h> #include "KPrUtils.h" -KPrPBPreview::KPrPBPreview( QWidget* parent, const char* name, PaintType _paintType ) - : QFrame( parent, name ) +KPrPBPreview::KPrPBPreview( TQWidget* tqparent, const char* name, PaintType _paintType ) + : TQFrame( tqparent, name ) { //FIXME zoom _zoomHandler=new KoTextZoomHandler(); paintType = _paintType; - pen = KoPen( black, 1, SolidLine ); - brush = QBrush( white, SolidPattern ); - gradient = new KPrGradient( Qt::red, Qt::green, BCT_GHORZ, false, 100, 100 ); + pen = KoPen( black, 1, Qt::SolidLine ); + brush = TQBrush( white, SolidPattern ); + gradient = new KPrGradient( TQt::red, TQt::green, BCT_GHORZ, false, 100, 100 ); savedGradient = gradient; setFrameStyle( WinPanel | Sunken ); @@ -48,26 +48,26 @@ KPrPBPreview::KPrPBPreview( QWidget* parent, const char* name, PaintType _paintT } } -void KPrPBPreview::resizeEvent( QResizeEvent *e ) +void KPrPBPreview::resizeEvent( TQResizeEvent *e ) { - QFrame::resizeEvent( e ); + TQFrame::resizeEvent( e ); if ( gradient ) { #if 1 gradient->setSize( contentsRect().size() ); - repaint(); + tqrepaint(); #endif } } -void KPrPBPreview::drawContents( QPainter *painter ) +void KPrPBPreview::drawContents( TQPainter *painter ) { painter->save(); painter->translate( contentsRect().x(), contentsRect().y() ); if ( paintType == Pen ) { painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(), - colorGroup().base() ); + tqcolorGroup().base() ); KoSize diff1( 0, 0 ), diff2( 0, 0 ); int _w = int( pen.pointWidth() ); @@ -94,7 +94,7 @@ void KPrPBPreview::drawContents( QPainter *painter ) } else if ( paintType == Brush ) { painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(), - colorGroup().base() ); + tqcolorGroup().base() ); painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(), brush ); } else if ( paintType == Gradient ) painter->drawPixmap( 0, 0, gradient->pixmap()); @@ -109,7 +109,7 @@ KPrPBPreview::~KPrPBPreview() } -void KPrPBPreview::setGradient( const QColor &_c1, const QColor &_c2, BCType _t, +void KPrPBPreview::setGradient( const TQColor &_c1, const TQColor &_c2, BCType _t, bool _unbalanced, int _xfactor, int _yfactor ) { gradient->setColor1( _c1 ); @@ -118,7 +118,7 @@ void KPrPBPreview::setGradient( const QColor &_c1, const QColor &_c2, BCType _t, gradient->setUnbalanced( _unbalanced ); gradient->setXFactor( _xfactor ); gradient->setYFactor( _yfactor ); - repaint( false ); + tqrepaint( false ); } diff --git a/kpresenter/KPrPBPreview.h b/kpresenter/KPrPBPreview.h index ac26918d..092adb4e 100644 --- a/kpresenter/KPrPBPreview.h +++ b/kpresenter/KPrPBPreview.h @@ -23,7 +23,7 @@ #include "global.h" -#include <qframe.h> +#include <tqframe.h> #include "KPrGradient.h" #include <KoBrush.h> @@ -35,9 +35,10 @@ class KoTextZoomHandler; /* class Pen and Brush preview */ /******************************************************************/ -class KPrPBPreview : public QFrame +class KPrPBPreview : public TQFrame { Q_OBJECT + TQ_OBJECT public: enum PaintType { @@ -46,32 +47,32 @@ public: Gradient }; - KPrPBPreview( QWidget* parent, const char* name, PaintType _paintType = Pen ); + KPrPBPreview( TQWidget* tqparent, const char* name, PaintType _paintType = Pen ); ~KPrPBPreview(); - void setPen( const KoPen &_pen ) { pen = _pen; repaint( true ); } - void setBrush( const QBrush &_brush ) { brush = _brush; repaint( true ); } - void setLineBegin( LineEnd lb ) { lineBegin = lb; repaint( true ); } - void setLineEnd( LineEnd le ) { lineEnd = le; repaint( true ); } - void setGradient( KPrGradient *g ) { if ( g ) { gradient = g; } repaint( true ); } - void setPaintType( PaintType pt ) { paintType = pt; repaint(true); } - - void setGradient( const QColor &_c1, const QColor &_c2, BCType _t, + void setPen( const KoPen &_pen ) { pen = _pen; tqrepaint( true ); } + void setBrush( const TQBrush &_brush ) { brush = _brush; tqrepaint( true ); } + void setLineBegin( LineEnd lb ) { lineBegin = lb; tqrepaint( true ); } + void setLineEnd( LineEnd le ) { lineEnd = le; tqrepaint( true ); } + void setGradient( KPrGradient *g ) { if ( g ) { gradient = g; } tqrepaint( true ); } + void setPaintType( PaintType pt ) { paintType = pt; tqrepaint(true); } + + void setGradient( const TQColor &_c1, const TQColor &_c2, BCType _t, bool _unbalanced, int _xfactor, int _yfactor ); - void setColor1( const QColor &_color ) { gradient->setColor1( _color ); repaint( false ); } - void setColor2( const QColor &_color ) { gradient->setColor2( _color ); repaint( false ); } - void setBackColorType( BCType _type ) { gradient->setBackColorType( _type ); repaint( false ); } - void setUnbalanced( bool b ) { gradient->setUnbalanced( b ); repaint( false ); } - void setXFactor( int i ) { gradient->setXFactor( i ); repaint( false ); } - void setYFactor( int i ) { gradient->setYFactor( i ); repaint( false ); } + void setColor1( const TQColor &_color ) { gradient->setColor1( _color ); tqrepaint( false ); } + void setColor2( const TQColor &_color ) { gradient->setColor2( _color ); tqrepaint( false ); } + void setBackColorType( BCType _type ) { gradient->setBackColorType( _type ); tqrepaint( false ); } + void setUnbalanced( bool b ) { gradient->setUnbalanced( b ); tqrepaint( false ); } + void setXFactor( int i ) { gradient->setXFactor( i ); tqrepaint( false ); } + void setYFactor( int i ) { gradient->setYFactor( i ); tqrepaint( false ); } protected: - void drawContents( QPainter *p ); - void resizeEvent( QResizeEvent *e ); + void drawContents( TQPainter *p ); + void resizeEvent( TQResizeEvent *e ); private: PaintType paintType; KoPen pen; - QBrush brush; + TQBrush brush; LineEnd lineBegin, lineEnd; KPrGradient *gradient; KPrGradient *savedGradient; diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp index 8529d2ea..2fbbbaa2 100644 --- a/kpresenter/KPrPage.cpp +++ b/kpresenter/KPrPage.cpp @@ -55,15 +55,15 @@ #include <KoTextObject.h> #include <KoTextParag.h> #include <KoRect.h> -#include <qapplication.h> +#include <tqapplication.h> #include <KoStyleCollection.h> #include <KoVariable.h> #include <KoGenStyles.h> #include <KoXmlWriter.h> #include <ktempfile.h> -#include <qbuffer.h> -#include <qregexp.h> -#include <qfile.h> +#include <tqbuffer.h> +#include <tqregexp.h> +#include <tqfile.h> struct listAnimation { KPrObject *obj; @@ -71,7 +71,7 @@ struct listAnimation { bool appear; }; -typedef QMap<int, QPtrList<listAnimation> > lstMap; +typedef TQMap<int, TQPtrList<listAnimation> > lstMap; KPrPage::KPrPage(KPrDocument *_doc, KPrPage *masterPage ) @@ -87,7 +87,7 @@ KPrPage::KPrPage(KPrDocument *_doc, KPrPage *masterPage ) , m_pageEffect( PEF_NONE ) , m_pageEffectSpeed( ES_MEDIUM ) , m_soundEffect( false ) - , m_soundFileName( QString::null ) + , m_soundFileName( TQString() ) , m_pageTimer( 1 ) { kdDebug(33001)<<"create page : KPrPage::KPrPage(KPrDocument *_doc )"<<this<<endl; @@ -114,7 +114,7 @@ DCOPObject* KPrPage::dcopObject() if ( !m_dcop ) { // 0-based. 1-based would be nicer for the dcop user, but well, docs and views are 0-based, // and the page(int) DCOP call is 0-based. - int pgnum = m_doc->pageList().findRef( this ); + int pgnum = m_doc->pageList().tqfindRef( this ); m_dcop = new KPrPageIface( this, pgnum ); } @@ -130,10 +130,10 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC KTempFile animationTmpFile; animationTmpFile.setAutoDelete( true ); - QFile* tmpFile = animationTmpFile.file(); - KoXmlWriter animationTmpWriter( tmpFile ); + TQFile* tmpFile = animationTmpFile.file(); + KoXmlWriter animationTmpWriter( TQT_TQIODEVICE(tmpFile) ); lstMap listObjectAnimation; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()== m_doc->header() || it.current()== m_doc->footer()) @@ -152,7 +152,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC lstappear->objIndex = indexObj; lstappear->appear = true; //kdDebug()<<" indexObj :"<<indexObj<<endl; - lstMap::Iterator tmp = listObjectAnimation.find( it.current()->getAppearStep() ); + lstMap::Iterator tmp = listObjectAnimation.tqfind( it.current()->getAppearStep() ); if ( tmp!= listObjectAnimation.end() ) { //kdDebug()<<" group already exist \n"; @@ -161,7 +161,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC else { //kdDebug()<<" create new list \n"; - QPtrList<listAnimation> tmp2; + TQPtrList<listAnimation> tmp2; tmp2.append( lstappear ); listObjectAnimation.insert( it.current()->getAppearStep(), tmp2 ); } @@ -173,7 +173,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC lstappear->objIndex = indexObj; lstappear->appear = false; //kdDebug()<<" indexObj :"<<indexObj<<endl; - lstMap::Iterator tmp = listObjectAnimation.find( it.current()->getDisappearStep() ); + lstMap::Iterator tmp = listObjectAnimation.tqfind( it.current()->getDisappearStep() ); if ( tmp!= listObjectAnimation.end() ) { //kdDebug()<<" group already exist \n"; @@ -182,7 +182,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC else { //kdDebug()<<" create new list \n"; - QPtrList<listAnimation> tmp2; + TQPtrList<listAnimation> tmp2; tmp2.append( lstappear ); listObjectAnimation.insert( it.current()->getDisappearStep(), tmp2 ); } @@ -210,7 +210,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC } else if ( it.data().count() > 1 ) { - QPtrList<listAnimation> list = it.data(); + TQPtrList<listAnimation> list = it.data(); animationTmpWriter.startElement( "presentation:animation-group" ); for ( uint i = 0; i < list.count(); ++i ) { @@ -229,7 +229,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC } animationTmpWriter.endElement();//close "presentation:animations" tmpFile->close(); - xmlWriter.addCompleteElement( tmpFile ); + xmlWriter.addCompleteElement( TQT_TQIODEVICE(tmpFile) ); } else @@ -237,10 +237,10 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC animationTmpFile.close(); } -void KPrPage::load( const QDomElement &element ) +void KPrPage::load( const TQDomElement &element ) { m_kpbackground->load( element ); - QDomElement e=element.namedItem("PGEFFECT").toElement(); + TQDomElement e=element.namedItem("PGEFFECT").toElement(); if(!e.isNull()) { int tmp=0; if(e.hasAttribute("value")) @@ -273,7 +273,7 @@ void KPrPage::load( const QDomElement &element ) m_soundFileName=e.attribute("soundFileName"); } else { - m_soundFileName=QString::null; + m_soundFileName=TQString(); } e=element.namedItem("HEADERFOOTER").toElement(); @@ -309,19 +309,19 @@ void KPrPage::loadOasis(KoOasisContext & context ) //FIXME: fix it in old file format if ( styleStack.hasAttributeNS( KoXmlNS::presentation, "background-objects-visible" ) ) { - const QString str = styleStack.attributeNS( KoXmlNS::presentation, "background-objects-visible" ); + const TQString str = styleStack.attributeNS( KoXmlNS::presentation, "background-objects-visible" ); m_displayObjectFromMasterPage = ( str == "true" ) ? true : false; } if ( styleStack.hasAttributeNS( KoXmlNS::presentation, "background-visible" ) ) { - const QString str = styleStack.attributeNS( KoXmlNS::presentation, "background-visible" ); + const TQString str = styleStack.attributeNS( KoXmlNS::presentation, "background-visible" ); m_displayBackground = ( str == "true" ) ? true : false; } if ( styleStack.hasAttributeNS( KoXmlNS::presentation, "visibility" ) ) { - const QString str = styleStack.attributeNS( KoXmlNS::presentation, "visibility" ); + const TQString str = styleStack.attributeNS( KoXmlNS::presentation, "visibility" ); if ( str=="hidden" ) slideSelected( false ); else @@ -332,7 +332,7 @@ void KPrPage::loadOasis(KoOasisContext & context ) { // this argument is not defined into kpresenter_doc and not into kprpage // TODO add it into each page. - QString speed = styleStack.attributeNS( KoXmlNS::presentation, "transition-speed" ); + TQString speed = styleStack.attributeNS( KoXmlNS::presentation, "transition-speed" ); if ( speed == "slow" ) { m_pageEffectSpeed = ES_SLOW; @@ -360,20 +360,20 @@ void KPrPage::loadOasis(KoOasisContext & context ) } if ( styleStack.hasAttributeNS( KoXmlNS::presentation, "display-header" ) ) { - QString tmp = styleStack.attributeNS( KoXmlNS::presentation, "display-header" ); + TQString tmp = styleStack.attributeNS( KoXmlNS::presentation, "display-header" ); setHeader( tmp =="true" ? true : false ); } if ( styleStack.hasAttributeNS( KoXmlNS::presentation, "display-footer" ) ) { - QString tmp = styleStack.attributeNS( KoXmlNS::presentation, "display-footer" ); + TQString tmp = styleStack.attributeNS( KoXmlNS::presentation, "display-footer" ); setFooter(tmp =="true" ? true : false); } //TODO presentation:display-date-time; presentation:display-page-number if ( styleStack.hasAttributeNS( KoXmlNS::presentation, "transition-style")) { //kdDebug()<<" have a presentation:transition-style------------\n"; - const QString effect = styleStack.attributeNS( KoXmlNS::presentation, "transition-style"); - QString additionalEffect; + const TQString effect = styleStack.attributeNS( KoXmlNS::presentation, "transition-style"); + TQString additionalEffect; if ( styleStack.hasAttributeNS( KoXmlNS::koffice, "additional-transition-style" ) ) { additionalEffect = styleStack.attributeNS( KoXmlNS::koffice, "additional-transition-style" ); @@ -484,17 +484,17 @@ void KPrPage::loadOasis(KoOasisContext & context ) if ( styleStack.hasChildNodeNS( KoXmlNS::presentation, "sound")) { //kdDebug()<<" presentation:sound !!!!!!!!!!!!!!!!!!!!!\n"; - QDomElement sound = styleStack.childNodeNS( KoXmlNS::presentation, "sound"); + TQDomElement sound = styleStack.childNodeNS( KoXmlNS::presentation, "sound"); m_soundEffect = true; - m_soundFileName = sound.attributeNS( KoXmlNS::xlink, "href", QString::null ); + m_soundFileName = sound.attributeNS( KoXmlNS::xlink, "href", TQString() ); } } } -QDomElement KPrPage::save( QDomDocument &doc ) +TQDomElement KPrPage::save( TQDomDocument &doc ) { - QDomElement page = m_kpbackground->save( doc ); - QDomElement element; + TQDomElement page = m_kpbackground->save( doc ); + TQDomElement element; if ( m_pageEffect != PEF_NONE) { element = doc.createElement("PGEFFECT"); @@ -522,25 +522,25 @@ QDomElement KPrPage::save( QDomDocument &doc ) return page; } -QString KPrPage::oasisNamePage( int posPage ) const +TQString KPrPage::oasisNamePage( int posPage ) const { - return ( m_manualTitle.isEmpty() ? QString( "page%1" ).arg( posPage ) : m_manualTitle ); + return ( m_manualTitle.isEmpty() ? TQString( "page%1" ).tqarg( posPage ) : m_manualTitle ); } bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage, KoSavingContext& context, - int & indexObj, int &partIndexObj, KoXmlWriter* manifestWriter, QMap<QString, int> &pageNames ) const + int & indexObj, int &partIndexObj, KoXmlWriter* manifestWriter, TQMap<TQString, int> &pageNames ) const { if ( isMasterPage() ) { KoGenStyle pageLayout = m_doc->pageLayout().saveOasis(); pageLayout.addAttribute( "style:page-usage", "all" ); // needed? - QString pageLayoutName( context.mainStyles().lookup( pageLayout, "pm" ) ); + TQString pageLayoutName( context.mainStyles().lookup( pageLayout, "pm" ) ); xmlWriter.startElement( "style:master-page" ); xmlWriter.addAttribute( "style:name", "Standard" ); - xmlWriter.addAttribute( "style:page-layout-name", pageLayoutName ); + xmlWriter.addAttribute( "style:page-tqlayout-name", pageLayoutName ); - QString styleName = saveOasisPageStyle( store, context.mainStyles() ); + TQString styleName = saveOasisPageStyle( store, context.mainStyles() ); if ( !styleName.isEmpty() ) xmlWriter.addAttribute( "draw:style-name", styleName ); @@ -561,19 +561,19 @@ bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage //store use to save picture and co xmlWriter.startElement( "draw:page" ); - QString drawName( m_manualTitle ); - QRegExp rx( "^page[0-9]+$" ); - if ( drawName.isEmpty() || pageNames.contains( drawName ) || rx.search( drawName ) != -1 ) + TQString drawName( m_manualTitle ); + TQRegExp rx( "^page[0-9]+$" ); + if ( drawName.isEmpty() || pageNames.tqcontains( drawName ) || rx.search( drawName ) != -1 ) { - drawName = "page" + QString::number( posPage ); + drawName = "page" + TQString::number( posPage ); } pageNames.insert( drawName, posPage ); xmlWriter.addAttribute( "draw:name", drawName ); //we must store a name xmlWriter.addAttribute( "koffice:name", m_manualTitle ); // so that we can have the same name for different pages - xmlWriter.addAttribute( "draw:id", "page" + QString::number( posPage ) ); + xmlWriter.addAttribute( "draw:id", "page" + TQString::number( posPage ) ); xmlWriter.addAttribute( "draw:master-page-name", "Standard"); //by default name of page is Standard - QString styleName = saveOasisPageStyle( store, context.mainStyles() ); + TQString styleName = saveOasisPageStyle( store, context.mainStyles() ); kdDebug()<<" styleName :"<<styleName<<endl; if ( !styleName.isEmpty() ) xmlWriter.addAttribute( "draw:style-name", styleName ); @@ -586,7 +586,7 @@ bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage return true; } -QString KPrPage::saveOasisPageStyle( KoStore *, KoGenStyles& mainStyles ) const +TQString KPrPage::saveOasisPageStyle( KoStore *, KoGenStyles& mainStyles ) const { KoGenStyle stylepageauto( isMasterPage() ? KPrDocument::STYLE_BACKGROUNDPAGE : KPrDocument::STYLE_BACKGROUNDPAGEAUTO, "drawing-page" ); @@ -594,11 +594,11 @@ QString KPrPage::saveOasisPageStyle( KoStore *, KoGenStyles& mainStyles ) const { stylepageauto.addProperty( "presentation:background-visible", ( m_displayBackground == true ) ? "true" : "false" ); stylepageauto.addProperty( "presentation:background-objects-visible", ( m_displayObjectFromMasterPage == true ) ? "true" : "false" ); - QString transition = saveOasisPageEffect(); + TQString transition = saveOasisPageEffect(); if ( !transition.isEmpty() ) { stylepageauto.addProperty( "presentation:transition-style", transition ); - QString additionalTransition = saveOasisAdditionalPageEffect(); + TQString additionalTransition = saveOasisAdditionalPageEffect(); if ( !additionalTransition.isEmpty() ) { stylepageauto.addProperty( "koffice:additional-transition-style", additionalTransition ); @@ -625,9 +625,9 @@ QString KPrPage::saveOasisPageStyle( KoStore *, KoGenStyles& mainStyles ) const stylepageauto.addProperty( "presentation:visibility", "hidden" ); if ( !m_soundFileName.isEmpty() && m_soundEffect ) { - QBuffer buffer; + TQBuffer buffer; buffer.open( IO_WriteOnly ); - KoXmlWriter elementWriter( &buffer ); // TODO pass indentation level + KoXmlWriter elementWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level elementWriter.startElement( "presentation:sound" ); elementWriter.addAttribute( "xlink:href", m_soundFileName ); elementWriter.addAttribute( "xlink:type", "simple" ); @@ -635,7 +635,7 @@ QString KPrPage::saveOasisPageStyle( KoStore *, KoGenStyles& mainStyles ) const elementWriter.addAttribute( "xlink:actuate", "onRequest"); elementWriter.endElement(); - QString elementContents = QString::fromUtf8( buffer.buffer(), buffer.buffer().size() ); + TQString elementContents = TQString::fromUtf8( buffer.buffer(), buffer.buffer().size() ); stylepageauto.addChildElement( "sound effect", elementContents ); } } @@ -655,14 +655,14 @@ bool KPrPage::saveOasisNote( KoXmlWriter &xmlWriter ) const return true; //todo : add size for draw:text-box otherwise we can't import into oo - //<draw:text-box presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="layout" svg:width="14.5cm" svg:height="11.408cm" svg:x="3.247cm" svg:y="14.126cm" presentation:class="notes"> + //<draw:text-box presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="tqlayout" svg:width="14.5cm" svg:height="11.408cm" svg:x="3.247cm" svg:y="14.126cm" presentation:class="notes"> xmlWriter.startElement( "presentation:notes" ); xmlWriter.startElement( "draw:frame" ); //todo save style xmlWriter.startElement( "draw:text-box" ); - QStringList text = QStringList::split( "\n", m_noteText ); - for ( QStringList::Iterator it = text.begin(); it != text.end(); ++it ) { + TQStringList text = TQStringList::split( "\n", m_noteText ); + for ( TQStringList::Iterator it = text.begin(); it != text.end(); ++it ) { xmlWriter.startElement( "text:p" ); xmlWriter.addTextNode( *it ); xmlWriter.endElement(); @@ -674,9 +674,9 @@ bool KPrPage::saveOasisNote( KoXmlWriter &xmlWriter ) const return true; } -QString KPrPage::saveOasisPageEffect() const +TQString KPrPage::saveOasisPageEffect() const { - QString transition; + TQString transition; switch( m_pageEffect ) { case PEF_NONE: @@ -813,9 +813,9 @@ QString KPrPage::saveOasisPageEffect() const } -QString KPrPage::saveOasisAdditionalPageEffect() const +TQString KPrPage::saveOasisAdditionalPageEffect() const { - QString additionalEffect; + TQString additionalEffect; switch( m_pageEffect ) { case PEF_STRIPS_LEFT_UP: @@ -846,8 +846,8 @@ KPrObject *KPrPage::getObject(int num) /* * Check if object name already exists. */ -bool KPrPage::objectNameExists( KPrObject *object, QPtrList<KPrObject> &list ) { - QPtrListIterator<KPrObject> it( list ); +bool KPrPage::objectNameExists( KPrObject *object, TQPtrList<KPrObject> &list ) { + TQPtrListIterator<KPrObject> it( list ); for ( it.toFirst(); it.current(); ++it ) { // object name can exist in current object. @@ -856,7 +856,7 @@ bool KPrPage::objectNameExists( KPrObject *object, QPtrList<KPrObject> &list ) { return true; } else if ( it.current()->getType() == OT_GROUP ) { - QPtrList<KPrObject> objectList( static_cast<KPrGroupObject*>(it.current())->getObjects() ); + TQPtrList<KPrObject> objectList( static_cast<KPrGroupObject*>(it.current())->getObjects() ); if ( objectNameExists( object, objectList ) ) { return true; } @@ -869,19 +869,19 @@ void KPrPage::unifyObjectName( KPrObject *object ) { if ( object->getObjectName().isEmpty() ) { object->setObjectName( object->getTypeString() ); } - QString objectName( object->getObjectName() ); + TQString objectName( object->getObjectName() ); - QPtrList<KPrObject> list( m_objectList ); + TQPtrList<KPrObject> list( m_objectList ); int count = 1; while ( objectNameExists( object, list ) ) { count++; - QRegExp rx( " \\(\\d{1,}\\)$" ); + TQRegExp rx( " \\(\\d{1,}\\)$" ); if ( rx.search( objectName ) != -1 ) { objectName.remove( rx ); } - objectName += QString(" (%1)").arg( count ); + objectName += TQString(" (%1)").tqarg( count ); object->setObjectName( objectName ); } } @@ -892,16 +892,16 @@ void KPrPage::appendObject(KPrObject *_obj) m_objectList.append(_obj); } -void KPrPage::appendObjects( const QValueList<KPrObject *> &objects ) +void KPrPage::appendObjects( const TQValueList<KPrObject *> &objects ) { - QMap <QString, int> usedPageNames; - QPtrListIterator<KPrObject> it( m_objectList ); + TQMap <TQString, int> usedPageNames; + TQPtrListIterator<KPrObject> it( m_objectList ); // find the biggest number for ( ; it.current() ; ++it ) { - QString objectName( it.current()->getObjectName() ); + TQString objectName( it.current()->getObjectName() ); - QRegExp rx( "(.*) \\((\\d{1,})\\)$" ); + TQRegExp rx( "(.*) \\((\\d{1,})\\)$" ); rx.setMinimal( true ); if ( rx.search( objectName ) != -1 && rx.numCaptures() == 2 ) { @@ -917,20 +917,20 @@ void KPrPage::appendObjects( const QValueList<KPrObject *> &objects ) } } - QValueListConstIterator<KPrObject *> oIt( objects.begin() ); + TQValueListConstIterator<KPrObject *> oIt( objects.begin() ); for ( ; oIt != objects.end(); ++oIt ) { - QString objectName( ( *oIt )->getObjectName() ); - QRegExp rx( " \\(\\d{1,}\\)$" ); + TQString objectName( ( *oIt )->getObjectName() ); + TQRegExp rx( " \\(\\d{1,}\\)$" ); if ( rx.search( objectName ) != -1 ) { objectName.remove( rx ); } - if ( usedPageNames.contains( objectName ) ) + if ( usedPageNames.tqcontains( objectName ) ) { usedPageNames[objectName]++; - objectName += QString(" (%1)").arg( usedPageNames[objectName] ); + objectName += TQString(" (%1)").tqarg( usedPageNames[objectName] ); ( *oIt )->setObjectName( objectName ); } m_objectList.append( *oIt ); @@ -939,7 +939,7 @@ void KPrPage::appendObjects( const QValueList<KPrObject *> &objects ) int KPrPage::takeObject( KPrObject *object ) { - int pos = m_objectList.findRef( object ); + int pos = m_objectList.tqfindRef( object ); m_objectList.take( pos ); return pos; } @@ -947,7 +947,7 @@ int KPrPage::takeObject( KPrObject *object ) void KPrPage::replaceObject( KPrObject *oldObject, KPrObject *newObject ) { //XXX check if object name gets set - unsigned int pos = m_objectList.findRef( oldObject ); + unsigned int pos = m_objectList.tqfindRef( oldObject ); m_objectList.take( pos ); m_objectList.insert( pos, newObject ); } @@ -961,7 +961,7 @@ void KPrPage::insertObject( KPrObject *object, int pos ) KCommand * KPrPage::deleteSelectedObjects() { - QPtrList<KPrObject> objects = getSelectedObjects( true ); + TQPtrList<KPrObject> objects = getSelectedObjects( true ); KPrDeleteCmd *deleteCmd=0L; @@ -975,12 +975,12 @@ KCommand * KPrPage::deleteSelectedObjects() return deleteCmd ; } -void KPrPage::copyObjs(QDomDocument &doc, QDomElement &presenter, QValueList<KoPictureKey> & savePictures) const +void KPrPage::copyObjs(TQDomDocument &doc, TQDomElement &presenter, TQValueList<KoPictureKey> & savePictures) const { if ( !numSelected() ) return; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->isSelected()) @@ -988,10 +988,10 @@ void KPrPage::copyObjs(QDomDocument &doc, QDomElement &presenter, QValueList<KoP if ( it.current()->getType() == OT_PICTURE ) { KoPictureKey key = static_cast<KPrPixmapObject *>( it.current() )->getKey(); - if ( !savePictures.contains( key ) ) + if ( !savePictures.tqcontains( key ) ) savePictures.append( key ); } - QDomElement object=doc.createElement("OBJECT"); + TQDomElement object=doc.createElement("OBJECT"); object.setAttribute("type", static_cast<int>( it.current()->getType() )); object.appendChild(it.current()->save( doc,0 )); presenter.appendChild(object); @@ -999,25 +999,25 @@ void KPrPage::copyObjs(QDomDocument &doc, QDomElement &presenter, QValueList<KoP } } -void KPrPage::pasteObjs( const QByteArray & data,int nbCopy, double angle, +void KPrPage::pasteObjs( const TQByteArray & data,int nbCopy, double angle, double increaseX, double increaseY, double moveX, double moveY ) { m_doc->deSelectAllObj(); int num = m_objectList.count(); if ( !data.size() ) return; - QBuffer buffer( data ); - KoStore* store = KoStore::createStore( &buffer, KoStore::Read ); + TQBuffer buffer( data ); + KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read ); int nbNewObject = -1 ; KMacroCommand *macro = 0L; if ( !store->bad() ) { if ( store->open( "root" ) ) { - QString errorMsg; + TQString errorMsg; int errorLine; int errorColumn; - QDomDocument domDoc; + TQDomDocument domDoc; if ( !domDoc.setContent( store->device(), &errorMsg, &errorLine, &errorColumn ) ) { kdError (30003) << "Parsing Error! Aborting! (in KPrPage::PasteObj)" << endl @@ -1026,7 +1026,7 @@ void KPrPage::pasteObjs( const QByteArray & data,int nbCopy, double angle, delete store; return; } - QDomElement topElem = domDoc.documentElement(); + TQDomElement topElem = domDoc.documentElement(); for ( int i = 0 ; i < nbCopy ; i++ ) { @@ -1065,7 +1065,7 @@ void KPrPage::pasteObjs( const QByteArray & data,int nbCopy, double angle, _tempObj->moveBy( moveX*(double)mod,moveY*(double)mod); _tempObj->setSelected( true ); if ( angle == 0.0 || (increaseY == 0.0 && increaseX == 0.0)) - m_doc->repaint(_tempObj); + m_doc->tqrepaint(_tempObj); } if ( angle != 0.0) @@ -1080,7 +1080,7 @@ void KPrPage::pasteObjs( const QByteArray & data,int nbCopy, double angle, } if ( increaseX != 0.0 || increaseY != 0.0 ) { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->isSelected()) @@ -1112,7 +1112,7 @@ void KPrPage::pasteObjs( const QByteArray & data,int nbCopy, double angle, KPrTextObject * KPrPage::textFrameSet ( unsigned int _num ) const { unsigned int i = 0; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->getType()==OT_TEXT) @@ -1129,7 +1129,7 @@ int KPrPage::numSelected() const { int num = 0; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->isSelected()) @@ -1143,7 +1143,7 @@ int KPrPage::numTextObject() const { int num = 0; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->getType()==OT_TEXT) @@ -1155,7 +1155,7 @@ int KPrPage::numTextObject() const KPrObject* KPrPage::getSelectedObj() const { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->isSelected()) @@ -1165,10 +1165,10 @@ KPrObject* KPrPage::getSelectedObj() const } -QPtrList<KPrObject> KPrPage::getSelectedObjects( bool withoutHeaderFooter ) const +TQPtrList<KPrObject> KPrPage::getSelectedObjects( bool withoutHeaderFooter ) const { - QPtrList<KPrObject> objects; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrList<KPrObject> objects; + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if( it.current()->isSelected() @@ -1184,7 +1184,7 @@ QPtrList<KPrObject> KPrPage::getSelectedObjects( bool withoutHeaderFooter ) cons void KPrPage::groupObjects() { - QPtrList<KPrObject> objects( getSelectedObjects( true ) ); + TQPtrList<KPrObject> objects( getSelectedObjects( true ) ); if ( objects.count() > 1 ) { KPrGroupObjCmd *groupObjCmd = new KPrGroupObjCmd( i18n( "Group Objects" ), objects, m_doc,this ); @@ -1195,8 +1195,8 @@ void KPrPage::groupObjects() void KPrPage::ungroupObjects( KMacroCommand ** macro ) { - QPtrList<KPrObject> objects( getSelectedObjects( true ) ); - QPtrListIterator<KPrObject> it( objects ); + TQPtrList<KPrObject> objects( getSelectedObjects( true ) ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { KPrObject *object = it.current(); @@ -1217,7 +1217,7 @@ void KPrPage::lowerObjs(bool backward) { KPrObject *kpobject = 0; - QPtrList<KPrObject> _new; + TQPtrList<KPrObject> _new; for ( unsigned int j = 0; j < m_objectList.count(); j++ ) _new.append( m_objectList.at( j ) ); @@ -1236,7 +1236,7 @@ void KPrPage::lowerObjs(bool backward) createCmd = true; _new.take( i ); if ( backward ) - _new.insert(QMAX(i-1,0) , kpobject); + _new.insert(TQMAX(i-1,0) , kpobject); else _new.insert( insertPos++, kpobject ); } @@ -1254,7 +1254,7 @@ void KPrPage::raiseObjs(bool forward) { KPrObject *kpobject = 0; - QPtrList<KPrObject> _new; + TQPtrList<KPrObject> _new; for ( unsigned int j = 0; j < m_objectList.count(); j++ ) _new.append( m_objectList.at( j ) ); @@ -1276,7 +1276,7 @@ void KPrPage::raiseObjs(bool forward) createCmd = true; _new.take( i ); if ( forward ) - _new.insert( QMIN( i+1, size - 1), kpobject); + _new.insert( TQMIN( i+1, size - 1), kpobject); else _new.insert( insertPos--, kpobject ); } @@ -1289,7 +1289,7 @@ void KPrPage::raiseObjs(bool forward) } } -KCommand *KPrPage::insertObject( const QString &name, KPrObject * object, const KoRect &r, bool addCommand ) +KCommand *KPrPage::insertObject( const TQString &name, KPrObject * object, const KoRect &r, bool addCommand ) { object->setOrig( r.x(), r.y() ); object->setSize( r.width(), r.height() ); @@ -1311,8 +1311,8 @@ void KPrPage::insertLine( const KoRect &r, const KoPen & pen, LineEnd lb, LineEn insertObject( i18n( "Insert Line" ), kplineobject, r ); } -void KPrPage::insertRectangle( const KoRect &r, const KoPen & pen, const QBrush &brush, FillType ft, - const QColor &g1, const QColor &g2, +void KPrPage::insertRectangle( const KoRect &r, const KoPen & pen, const TQBrush &brush, FillType ft, + const TQColor &g1, const TQColor &g2, BCType gt, int rndX, int rndY, bool unbalanced, int xfactor, int yfactor ) { KPrRectObject *kprectobject = new KPrRectObject( pen, brush, ft, g1, g2, gt, rndX, rndY, @@ -1320,8 +1320,8 @@ void KPrPage::insertRectangle( const KoRect &r, const KoPen & pen, const QBrush insertObject( i18n( "Insert Rectangle" ), kprectobject, r ); } -void KPrPage::insertCircleOrEllipse( const KoRect &r, const KoPen &pen, const QBrush & brush, FillType ft, - const QColor &g1, const QColor &g2, +void KPrPage::insertCircleOrEllipse( const KoRect &r, const KoPen &pen, const TQBrush & brush, FillType ft, + const TQColor &g1, const TQColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor ) { KPrEllipseObject *kpellipseobject = new KPrEllipseObject( pen, brush, ft, g1, g2, gt, @@ -1329,8 +1329,8 @@ void KPrPage::insertCircleOrEllipse( const KoRect &r, const KoPen &pen, const QB insertObject( i18n( "Insert Ellipse" ), kpellipseobject, r ); } -void KPrPage::insertPie( const KoRect &r, const KoPen &pen, const QBrush &brush, FillType ft, - const QColor &g1, const QColor &g2, +void KPrPage::insertPie( const KoRect &r, const KoPen &pen, const TQBrush &brush, FillType ft, + const TQColor &g1, const TQColor &g2, BCType gt, PieType pt, int _angle, int _len, LineEnd lb, LineEnd le, bool unbalanced, int xfactor, int yfactor ) { @@ -1339,25 +1339,25 @@ void KPrPage::insertPie( const KoRect &r, const KoPen &pen, const QBrush &brush, insertObject( i18n( "Insert Pie/Arc/Chord" ), kppieobject, r ); } -KPrTextObject* KPrPage::insertTextObject( const KoRect& r, const QString& text , KPrView * _view ) +KPrTextObject* KPrPage::insertTextObject( const KoRect& r, const TQString& text , KPrView * _view ) { KPrTextObject *kptextobject = new KPrTextObject( m_doc ); insertObject( i18n( "Insert Textbox" ), kptextobject, r ); //TODO create macro command : now insertObject can return KCommand - //TODO fix repaint object + //TODO fix tqrepaint object if ( !text.isEmpty() ) { KPrTextView *view = kptextobject->createKPTextView( _view ? _view->getCanvas() : 0L ); view->insertText( text ); view->terminate(); delete view; - m_doc->repaint( kptextobject ); + m_doc->tqrepaint( kptextobject ); } return kptextobject; } -void KPrPage::insertAutoform( const KoRect &r, const KoPen &pen, const QBrush &brush, LineEnd lb, LineEnd le, FillType ft, - const QColor &g1, const QColor &g2, BCType gt, const QString &fileName, bool unbalanced, +void KPrPage::insertAutoform( const KoRect &r, const KoPen &pen, const TQBrush &brush, LineEnd lb, LineEnd le, FillType ft, + const TQColor &g1, const TQColor &g2, BCType gt, const TQString &fileName, bool unbalanced, int xfactor, int yfactor ){ KPrAutoformObject *kpautoformobject = new KPrAutoformObject( pen, brush, fileName, lb, le, ft, g1, g2, gt, unbalanced, xfactor, yfactor ); @@ -1401,8 +1401,8 @@ void KPrPage::insertCubicBezierCurve( const KoPointArray &points, const KoPointA insertObject( i18n( "Insert Cubic Bezier Curve" ), kpCubicBezierCurveObject, r ); } -void KPrPage::insertPolygon( const KoPointArray &points, const KoRect &r, const KoPen &pen, const QBrush &brush, FillType ft, - const QColor &g1, const QColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor, +void KPrPage::insertPolygon( const KoPointArray &points, const KoRect &r, const KoPen &pen, const TQBrush &brush, FillType ft, + const TQColor &g1, const TQColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor, bool _checkConcavePolygon, int _cornersValue, int _sharpnessValue ) { KoSize size( r.width(), r.height() ); @@ -1413,12 +1413,12 @@ void KPrPage::insertPolygon( const KoPointArray &points, const KoRect &r, const insertObject( i18n( "Insert Polygon" ), kpPolygonObject, r ); } -void KPrPage::insertClosedLine( const KoPointArray &points, const KoRect &r, const KoPen &pen, const QBrush &brush, - FillType ft,const QColor &g1, const QColor &g2, +void KPrPage::insertClosedLine( const KoPointArray &points, const KoRect &r, const KoPen &pen, const TQBrush &brush, + FillType ft,const TQColor &g1, const TQColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor, ToolEditMode _mode ) { - QString _type; - QString _name; + TQString _type; + TQString _name; if ( _mode == INS_CLOSED_FREEHAND ) { _type = i18n( "Closed Freehand" ); _name = i18n( "Insert Closed Freehand" ); @@ -1427,7 +1427,7 @@ void KPrPage::insertClosedLine( const KoPointArray &points, const KoRect &r, con _type = i18n( "Closed Polyline" ); _name = i18n( "Insert Closed Polyline" ); } - else if ( _mode == INS_CLOSED_QUADRICBEZIERCURVE ) { + else if ( _mode == INS_CLOSED_TQUADRICBEZIERCURVE ) { _type = i18n( "Closed Quadric Bezier Curve" ); _name = i18n( "Insert Closed Quadric Bezier Curve" ); } @@ -1449,10 +1449,10 @@ KPrPartObject* KPrPage::insertObject( const KoRect& _rect, KoDocumentEntry& _e ) if ( !doc ) return NULL; - if ( !doc->showEmbedInitDialog( 0 ) ) //TODO should really have parent + if ( !doc->showEmbedInitDialog( 0 ) ) //TODO should really have tqparent return NULL; - QRect r = QRect( (int)_rect.left(), (int)_rect.top(), + TQRect r = TQRect( (int)_rect.left(), (int)_rect.top(), (int)_rect.width(), (int)_rect.height() ); KPrChild* ch = new KPrChild( m_doc, doc, r ); m_doc->insertObject( ch ); @@ -1461,7 +1461,7 @@ KPrPartObject* KPrPage::insertObject( const KoRect& _rect, KoDocumentEntry& _e ) insertObject( i18n( "Embed Object" ), kppartobject, _rect ); //emit sig_insertObject( ch, kppartobject ); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); return kppartobject; } @@ -1472,10 +1472,10 @@ KCommand* KPrPage::setPen( const KoPen &pen, LineEnd lb, LineEnd le, int flags ) KoPenCmd::Pen _newPen( pen, lb, le); - QPtrList<KPrObject> _objects; + TQPtrList<KPrObject> _objects; _objects.setAutoDelete( false ); - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if( it.current()->isSelected() ) @@ -1492,14 +1492,14 @@ KCommand* KPrPage::setPen( const KoPen &pen, LineEnd lb, LineEnd le, int flags ) return cmd; } -KCommand * KPrPage::setBrush( const QBrush &brush, FillType ft, const QColor &g1, const QColor &g2, +KCommand * KPrPage::setBrush( const TQBrush &brush, FillType ft, const TQColor &g1, const TQColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor, int flags ) { KPrBrushCmd * cmd = NULL; KPrBrushCmd::Brush _newBrush; - _newBrush.brush = QBrush( brush ); + _newBrush.brush = TQBrush( brush ); _newBrush.fillType = ft; _newBrush.gColor1 = g1; _newBrush.gColor2 = g2; @@ -1508,10 +1508,10 @@ KCommand * KPrPage::setBrush( const QBrush &brush, FillType ft, const QColor &g1 _newBrush.xfactor = xfactor; _newBrush.yfactor = yfactor; - QPtrList<KPrObject> _objects; + TQPtrList<KPrObject> _objects; _objects.setAutoDelete( false ); - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if( it.current()->isSelected() ) @@ -1530,33 +1530,33 @@ KCommand * KPrPage::setBrush( const QBrush &brush, FillType ft, const QColor &g1 void KPrPage::slotRepaintVariable() { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()->getType() == OT_TEXT ) - m_doc->repaint( it.current() ); + m_doc->tqrepaint( it.current() ); } } void KPrPage::recalcPageNum() { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()->getType() == OT_TEXT ) { ( (KPrTextObject*)it.current() )->recalcPageNum( this ); - m_doc->repaint( it.current() ); // TODO only if something changed + m_doc->tqrepaint( it.current() ); // TODO only if something changed } } } -void KPrPage::changePicture( const KURL & url, QWidget *parent ) +void KPrPage::changePicture( const KURL & url, TQWidget *tqparent ) { // filename has been chosen in KPrView with a filedialog, // so we know it exists - KoPicture image = m_doc->pictureCollection()->downloadPicture( url, parent ); + KoPicture image = m_doc->pictureCollection()->downloadPicture( url, tqparent ); - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->isSelected() && it.current()->getType()==OT_PICTURE) @@ -1574,7 +1574,7 @@ void KPrPage::changePicture( const KURL & url, QWidget *parent ) } } -void KPrPage::insertPicture( const QString &filename, const KoPoint &pos ) +void KPrPage::insertPicture( const TQString &filename, const KoPoint &pos ) { KoPictureKey key = m_doc->pictureCollection()->loadPicture( filename ).getKey(); KPrPixmapObject *kppixmapobject = new KPrPixmapObject(m_doc->pictureCollection() , key ); @@ -1595,7 +1595,7 @@ void KPrPage::insertPicture( const QString &filename, const KoPoint &pos ) if ( kppixmapobject->getSize().width() > s.width() ) fakt = (float)s.width() / (float)kppixmapobject->getSize().width(); if ( kppixmapobject->getSize().height() > s.height() ) - fakt = QMIN( fakt, (float)s.height() / (float)kppixmapobject->getSize().height() ); + fakt = TQMIN( fakt, (float)s.height() / (float)kppixmapobject->getSize().height() ); //kdDebug(33001) << k_funcinfo << "Fakt: " << fakt << endl; @@ -1605,11 +1605,11 @@ void KPrPage::insertPicture( const QString &filename, const KoPoint &pos ) //kdDebug(33001) << k_funcinfo << "Size: " << w << ", " << h << endl; kppixmapobject->setOrig(0,0); kppixmapobject->setSize(w, h); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); } } -void KPrPage::insertPicture( const QString &_file, const KoRect &_rect ) +void KPrPage::insertPicture( const TQString &_file, const KoRect &_rect ) { KoPictureKey key = m_doc->pictureCollection()->loadPicture( _file ).getKey(); KPrPixmapObject *kppixmapobject = new KPrPixmapObject( m_doc->pictureCollection(), key ); @@ -1620,7 +1620,7 @@ void KPrPage::insertPicture( const QString &_file, const KoRect &_rect ) void KPrPage::enableEmbeddedParts( bool f ) { KPrPartObject *obj=0L; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->getType()==OT_PART) @@ -1633,7 +1633,7 @@ void KPrPage::enableEmbeddedParts( bool f ) } -void KPrPage::setBackColor(const QColor &backColor1, const QColor &backColor2, BCType bcType, +void KPrPage::setBackColor(const TQColor &backColor1, const TQColor &backColor2, BCType bcType, bool unbalanced, int xfactor, int yfactor ) { m_kpbackground->setBackColor1( backColor1 ); @@ -1684,7 +1684,7 @@ void KPrPage::setPageSoundEffect( bool soundEffect ) m_soundEffect = soundEffect; } -void KPrPage::setPageSoundFileName( const QString &fileName ) +void KPrPage::setPageSoundFileName( const TQString &fileName ) { m_soundFileName = fileName; } @@ -1709,12 +1709,12 @@ KoPicture KPrPage::getBackPicture() const return m_kpbackground->getBackPicture(); } -QColor KPrPage::getBackColor1() const +TQColor KPrPage::getBackColor1() const { return m_kpbackground->getBackColor1(); } -QColor KPrPage::getBackColor2() const +TQColor KPrPage::getBackColor2() const { return m_kpbackground->getBackColor2(); } @@ -1754,7 +1754,7 @@ bool KPrPage::getPageSoundEffect() const return m_soundEffect; } -QString KPrPage::getPageSoundFileName() const +TQString KPrPage::getPageSoundFileName() const { return m_soundFileName; } @@ -1765,21 +1765,21 @@ KoRect KPrPage::getPageRect() const return KoRect( p.ptLeft, p.ptTop, p.ptWidth - p.ptRight - p.ptLeft, p.ptHeight - p.ptTop - p.ptBottom ); } -QRect KPrPage::getZoomPageRect() const +TQRect KPrPage::getZoomPageRect() const { return m_doc->zoomHandler()->zoomRect(getPageRect()); } void KPrPage::completeLoading( bool _clean, int lastObj ) { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { // Pictures and cliparts have been loaded from the store, we can now // get the picture from the collection, and set it in the image/clipart object if ( ( it.current()->getType() == OT_PICTURE ) || ( it.current()->getType() == OT_CLIPART ) ) { - if ( _clean || m_objectList.findRef( it.current() ) > lastObj ) + if ( _clean || m_objectList.tqfindRef( it.current() ) > lastObj ) { KPrPixmapObject* obj=dynamic_cast<KPrPixmapObject*>( it.current()); if(obj) @@ -1803,7 +1803,7 @@ void KPrPage::completeLoadingForGroupObject( KPrObject *_obj ) KPrGroupObject *_groupObj = static_cast<KPrGroupObject*>( _obj ); if ( _groupObj ) { - QPtrListIterator<KPrObject> it( _groupObj->objectList() ); + TQPtrListIterator<KPrObject> it( _groupObj->objectList() ); for ( ; it.current(); ++it ) { if ( ( it.current()->getType() == OT_PICTURE ) || ( it.current()->getType() == OT_CLIPART ) ) { @@ -1822,13 +1822,13 @@ void KPrPage::completeLoadingForGroupObject( KPrObject *_obj ) } } -KCommand * KPrPage::replaceObjs( bool createUndoRedo, double _orastX,double _orastY,const QColor & _txtBackCol, - const QColor & _otxtBackCol ) +KCommand * KPrPage::replaceObjs( bool createUndoRedo, double _orastX,double _orastY,const TQColor & _txtBackCol, + const TQColor & _otxtBackCol ) { KPrObject *kpobject = 0; double ox=0, oy=0; - QPtrList<KPrObject> _objects; - QValueList<KoPoint> _diffs; + TQPtrList<KPrObject> _objects; + TQValueList<KoPoint> _diffs; _objects.setAutoDelete( false ); for ( int i = 0; i < static_cast<int>( m_objectList.count() ); i++ ) { @@ -1851,39 +1851,39 @@ KCommand * KPrPage::replaceObjs( bool createUndoRedo, double _orastX,double _ora return 0L; } -QString KPrPage::manualTitle() const +TQString KPrPage::manualTitle() const { return m_manualTitle; } -void KPrPage::insertManualTitle(const QString & title) +void KPrPage::insertManualTitle(const TQString & title) { m_manualTitle=title; } -QString KPrPage::pageTitle( const QString &_title ) const +TQString KPrPage::pageTitle( const TQString &_title ) const { // If a user sets a title with manual, return it. if ( !m_manualTitle.isEmpty() ) return m_manualTitle; - QPtrList<KPrTextObject> objs; + TQPtrList<KPrTextObject> objs; // Create list of text objects in this page - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->getType()==OT_TEXT) objs.append( static_cast<KPrTextObject*>( it.current() ) ); } - QString title; + TQString title; if ( _title.isNull() ) { // MASTERPAGE if ( m_masterPage ) - title = i18n( "Slide %1" ).arg( m_doc->pageList().findRef( this ) + 1 ); + title = i18n( "Slide %1" ).tqarg( m_doc->pageList().tqfindRef( this ) + 1 ); else title = i18n( "Slide Master" ); } @@ -1904,9 +1904,9 @@ QString KPrPage::pageTitle( const QString &_title ) const // this can't happen, but you never know :- ) if ( !textobject ) - return QString( title ); + return TQString( title ); - QString txt; + TQString txt; if ( textobject->textDocument()->firstParag() ) txt = textobject->textDocument()->firstParag()->toString(); if ( txt.stripWhiteSpace().isEmpty() || txt=="\n" ) @@ -1914,20 +1914,20 @@ QString KPrPage::pageTitle( const QString &_title ) const return txt; } -void KPrPage::setNoteText( const QString &_text ) +void KPrPage::setNoteText( const TQString &_text ) { m_noteText=_text; m_doc->setModified(true); } -QString KPrPage::noteText() const +TQString KPrPage::noteText() const { return m_noteText; } void KPrPage::makeUsedPixmapList() { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if( it.current()->getType()==OT_PICTURE || it.current()->getType()==OT_CLIPART) @@ -1945,7 +1945,7 @@ void KPrPage::makeUsedPixmapListForGroupObject( KPrObject *_obj ) KPrGroupObject *_groupObj = static_cast<KPrGroupObject*>( _obj ); if ( _groupObj ) { - QPtrListIterator<KPrObject> it( _groupObj->objectList() ); + TQPtrListIterator<KPrObject> it( _groupObj->objectList() ); for ( ; it.current(); ++it ) { if ( ( it.current()->getType() == OT_PICTURE ) || ( it.current()->getType() == OT_CLIPART ) ) @@ -1957,12 +1957,12 @@ void KPrPage::makeUsedPixmapListForGroupObject( KPrObject *_obj ) } -QValueList<int> KPrPage::getEffectSteps() const +TQValueList<int> KPrPage::getEffectSteps() const { - QMap<int,bool> stepmap; + TQMap<int,bool> stepmap; stepmap[0] = true; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current(); ++it ) { stepmap[it.current()->getAppearStep()] = true; @@ -1979,7 +1979,7 @@ QValueList<int> KPrPage::getEffectSteps() const void KPrPage::deSelectAllObj() { - QPtrListIterator<KPrObject> sIt( m_objectList ); + TQPtrListIterator<KPrObject> sIt( m_objectList ); for ( ; sIt.current() ; ++sIt ) { if(sIt.current()->isSelected()) @@ -1990,13 +1990,13 @@ void KPrPage::deSelectAllObj() void KPrPage::deSelectObj( KPrObject *kpobject ) { kpobject->setSelected( false ); - m_doc->repaint( kpobject ); + m_doc->tqrepaint( kpobject ); } -QDomElement KPrPage::saveObjects( QDomDocument &doc, QDomElement &objects, double yoffset, +TQDomElement KPrPage::saveObjects( TQDomDocument &doc, TQDomElement &objects, double yoffset, int saveOnlyPage ) const { - QPtrListIterator<KPrObject> oIt(m_objectList); + TQPtrListIterator<KPrObject> oIt(m_objectList); for (; oIt.current(); ++oIt ) { //don't store header/footer (store in header/footer section) @@ -2004,7 +2004,7 @@ QDomElement KPrPage::saveObjects( QDomDocument &doc, QDomElement &objects, doubl || oIt.current()==m_doc->footer() || oIt.current()->getType() == OT_PART) continue; - QDomElement object=doc.createElement("OBJECT"); + TQDomElement object=doc.createElement("OBJECT"); object.setAttribute("type", static_cast<int>( oIt.current()->getType() )); bool _sticky = ( this->m_masterPage == 0 ); if (_sticky) @@ -2021,9 +2021,9 @@ QDomElement KPrPage::saveObjects( QDomDocument &doc, QDomElement &objects, doubl bool KPrPage::oneObjectTextExist(bool forceAllTextObject) { - QPtrList<KPrObject> lst; + TQPtrList<KPrObject> lst; getAllObjectSelectedList(lst,forceAllTextObject ); - QPtrListIterator<KPrObject> it( lst ); + TQPtrListIterator<KPrObject> it( lst ); for ( ; it.current() ; ++it ) { if ( (it.current() == m_doc->header() && !hasHeader()) @@ -2048,9 +2048,9 @@ bool KPrPage::isOneObjectSelected() bool KPrPage::haveASelectedPartObj() { - QPtrList<KPrObject> lst; + TQPtrList<KPrObject> lst; getAllObjectSelectedList(lst ); - QPtrListIterator<KPrObject> it( lst ); + TQPtrListIterator<KPrObject> it( lst ); for ( ; it.current(); ++it ) { if (it.current()->getType() == OT_PART ) return true; @@ -2060,8 +2060,8 @@ bool KPrPage::haveASelectedPartObj() bool KPrPage::haveASelectedGroupObj() { - QPtrList<KPrObject> objects( getSelectedObjects( true ) ); - QPtrListIterator<KPrObject> it( objects ); + TQPtrList<KPrObject> objects( getSelectedObjects( true ) ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) return true; @@ -2071,9 +2071,9 @@ bool KPrPage::haveASelectedGroupObj() bool KPrPage::haveASelectedPixmapObj() { - QPtrList<KPrObject> lst; + TQPtrList<KPrObject> lst; getAllObjectSelectedList(lst ); - QPtrListIterator<KPrObject> it( lst ); + TQPtrListIterator<KPrObject> it( lst ); for ( ; it.current() ; ++it ) { if (( it.current()->getType() == OT_PICTURE ) || ( it.current()->getType() == OT_CLIPART ) ) @@ -2086,7 +2086,7 @@ KoRect KPrPage::getRealRect( bool all ) const { KoRect rect; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()== m_doc->header() || it.current()== m_doc->footer()) @@ -2102,7 +2102,7 @@ KoRect KPrPage::getRealRect( bool all ) const //return true if we change picture bool KPrPage::chPic( KPrView *_view) { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()->isSelected() && @@ -2122,7 +2122,7 @@ bool KPrPage::chPic( KPrView *_view) bool KPrPage::savePicture( KPrView *_view ) const { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()->isSelected() && @@ -2145,9 +2145,9 @@ KCommand *KPrPage::moveObject(KPrView *_view, double diffx, double diffy) { bool createCommand=false; KPrMoveByCmd *moveByCmd=0L; - QPtrList<KPrObject> _objects; + TQPtrList<KPrObject> _objects; _objects.setAutoDelete( false ); - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { //don't move a header/footer @@ -2156,10 +2156,10 @@ KCommand *KPrPage::moveObject(KPrView *_view, double diffx, double diffy) if ( it.current()->isSelected() && !it.current()->isProtect()) { _objects.append( it.current() ); - QRect br = _view->zoomHandler()->zoomRect( it.current()->getRepaintRect() ); + TQRect br = _view->zoomHandler()->zoomRect( it.current()->getRepaintRect() ); br.moveBy( _view->zoomHandler()->zoomItX( diffx ), _view->zoomHandler()->zoomItY( diffy ) ); - m_doc->repaint( br ); // Previous position - m_doc->repaint( it.current() ); // New position + m_doc->tqrepaint( br ); // Previous position + m_doc->tqrepaint( it.current() ); // New position createCommand=true; } } @@ -2174,10 +2174,10 @@ KCommand *KPrPage::moveObject(KPrView *_view, double diffx, double diffy) KCommand *KPrPage::moveObject(KPrView *m_view,const KoPoint &_move,bool key) { - QPtrList<KPrObject> _objects; + TQPtrList<KPrObject> _objects; _objects.setAutoDelete( false ); KPrMoveByCmd *moveByCmd=0L; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { //don't move a header/footer @@ -2185,12 +2185,12 @@ KCommand *KPrPage::moveObject(KPrView *m_view,const KoPoint &_move,bool key) continue; if ( it.current()->isSelected() && !it.current()->isProtect()) { - QRect oldBoundingRect = m_view->zoomHandler()->zoomRect( it.current()->getRepaintRect() ); + TQRect oldBoundingRect = m_view->zoomHandler()->zoomRect( it.current()->getRepaintRect() ); it.current()->moveBy( _move ); _objects.append( it.current() ); - m_doc->repaint( oldBoundingRect ); - m_doc->repaint( it.current() ); + m_doc->tqrepaint( oldBoundingRect ); + m_doc->tqrepaint( it.current() ); } } @@ -2202,13 +2202,13 @@ KCommand *KPrPage::moveObject(KPrView *m_view,const KoPoint &_move,bool key) return moveByCmd; } -void KPrPage::repaintObj() +void KPrPage::tqrepaintObj() { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->isSelected()) - m_doc->repaint(it.current() ); + m_doc->tqrepaint(it.current() ); } } @@ -2216,10 +2216,10 @@ KCommand *KPrPage::rotateSelectedObjects( float _newAngle, bool addAngle ) { KPrRotateCmd * cmd = NULL; - QPtrList<KPrObject> _objects; + TQPtrList<KPrObject> _objects; _objects.setAutoDelete( false ); - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()== m_doc->header() || it.current()== m_doc->footer() ) @@ -2239,12 +2239,12 @@ KCommand *KPrPage::rotateSelectedObjects( float _newAngle, bool addAngle ) } -KCommand *KPrPage::shadowObj(ShadowDirection dir,int dist, const QColor &col) +KCommand *KPrPage::shadowObj(ShadowDirection dir,int dist, const TQColor &col) { KPrShadowCmd *shadowCmd=0L; bool newShadow=false; - QPtrList<KPrObject> _objects; - QPtrList<KPrShadowCmd::ShadowValues> _oldShadow; + TQPtrList<KPrObject> _objects; + TQPtrList<KPrShadowCmd::ShadowValues> _oldShadow; KPrShadowCmd::ShadowValues _newShadow, *tmp; _objects.setAutoDelete( false ); @@ -2254,7 +2254,7 @@ KCommand *KPrPage::shadowObj(ShadowDirection dir,int dist, const QColor &col) _newShadow.shadowDistance = dist; _newShadow.shadowColor = col; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { //don't shadow a header/footer @@ -2290,31 +2290,31 @@ KCommand *KPrPage::shadowObj(ShadowDirection dir,int dist, const QColor &col) return shadowCmd; } -QPtrList<KoTextObject> KPrPage::allTextObjects() const +TQPtrList<KoTextObject> KPrPage::allTextObjects() const { - QPtrList<KoTextObject> lst; + TQPtrList<KoTextObject> lst; addTextObjects( lst ); return lst; } -void KPrPage::addTextObjects(QPtrList<KoTextObject>& lst) const +void KPrPage::addTextObjects(TQPtrList<KoTextObject>& lst) const { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) it.current()->addTextObjects( lst ); } -KPrObject * KPrPage::getCursor( const QPoint &pos ) +KPrObject * KPrPage::getCursor( const TQPoint &pos ) { return getCursor( m_doc->zoomHandler()->unzoomPoint( pos ) ); } KPrObject * KPrPage::getCursor(const KoPoint &pos ) { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); KPrObject *kpobject = it.toLast(); while ( kpobject ) { - if ( kpobject->contains( pos ) && kpobject->isSelected() ) + if ( kpobject->tqcontains( pos ) && kpobject->isSelected() ) return kpobject; kpobject = --it; } @@ -2323,7 +2323,7 @@ KPrObject * KPrPage::getCursor(const KoPoint &pos ) KPrObject* KPrPage::getObjectAt( const KoPoint &pos, bool withoutProtected ) const { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); KPrObject *o = 0; //tz Check first if there is a selected object at this pos! for ( int i = 0; i < 2; ++i ) @@ -2336,7 +2336,7 @@ KPrObject* KPrPage::getObjectAt( const KoPoint &pos, bool withoutProtected ) con ( m_bHasHeader && o == m_doc->header() ) ) { if ( ( o->isSelected() || i > 0 ) && - o->contains( pos ) && !( o->isProtect() && withoutProtected ) ) + o->tqcontains( pos ) && !( o->isProtect() && withoutProtected ) ) return o; } o = --it; @@ -2348,7 +2348,7 @@ KPrObject* KPrPage::getObjectAt( const KoPoint &pos, bool withoutProtected ) con KPrPixmapObject * KPrPage::picViewOrigHelper() const { KPrPixmapObject *obj=0L; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()->isSelected() && @@ -2364,9 +2364,9 @@ KPrPixmapObject * KPrPage::picViewOrigHelper() const void KPrPage::applyStyleChange( KoStyleChangeDefMap changed ) { - QPtrList<KPrObject> lst; + TQPtrList<KPrObject> lst; getAllObjectSelectedList(lst,true /*force*/ ); - QPtrListIterator<KPrObject> it( lst ); + TQPtrListIterator<KPrObject> it( lst ); for ( ; it.current() ; ++it ) { @@ -2378,9 +2378,9 @@ void KPrPage::applyStyleChange( KoStyleChangeDefMap changed ) void KPrPage::reactivateBgSpellChecking(bool refreshTextObj) { - QPtrList<KPrObject> lst; + TQPtrList<KPrObject> lst; getAllObjectSelectedList(lst,true /*force*/ ); - QPtrListIterator<KPrObject> oIt( lst ); + TQPtrListIterator<KPrObject> oIt( lst ); for ( ; oIt.current() ; ++oIt ) { @@ -2388,14 +2388,14 @@ void KPrPage::reactivateBgSpellChecking(bool refreshTextObj) { static_cast<KPrTextObject*>( oIt.current() )->textObject()->setNeedSpellCheck(true); if(refreshTextObj) - m_doc->repaint( oIt.current() ); + m_doc->tqrepaint( oIt.current() ); } } } bool KPrPage::canMoveOneObject() const { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { //don't test header/footer all the time sticky @@ -2407,12 +2407,12 @@ bool KPrPage::canMoveOneObject() const return false; } -KCommand *KPrPage::alignVertical( VerticalAlignmentType _type ) +KCommand *KPrPage::alignVertical(VerticalAlignmentType _type ) { KMacroCommand *macro = 0L; - QPtrList<KPrObject> lst; + TQPtrList<KPrObject> lst; getAllObjectSelectedList(lst ); - QPtrListIterator<KPrObject> it( lst ); + TQPtrListIterator<KPrObject> it( lst ); for ( ; it.current() ; ++it ) { if(it.current()->getType()==OT_TEXT) @@ -2420,10 +2420,10 @@ KCommand *KPrPage::alignVertical( VerticalAlignmentType _type ) KPrTextObject *obj = dynamic_cast<KPrTextObject *>(it.current()); if ( obj && !obj->isProtectContent()) { - KPrChangeVerticalAlignmentCommand * cmd = new KPrChangeVerticalAlignmentCommand( i18n("Change Vertical Alignment"), + KPrChangeVerticalAlignmentCommand * cmd = new KPrChangeVerticalAlignmentCommand( i18n("ChangeQt::Vertical Alignment"), obj, obj->verticalAlignment(),_type, m_doc); if ( !macro ) - macro = new KMacroCommand( i18n("Change Vertical Alignment")); + macro = new KMacroCommand( i18n("ChangeQt::Vertical Alignment")); macro->addCommand( cmd ); cmd->execute(); } @@ -2434,9 +2434,9 @@ KCommand *KPrPage::alignVertical( VerticalAlignmentType _type ) void KPrPage::changeTabStopValue ( double _tabStop ) { - QPtrList<KPrObject> lst; + TQPtrList<KPrObject> lst; getAllObjectSelectedList(lst,true /*force*/ ); - QPtrListIterator<KPrObject> it( lst ); + TQPtrListIterator<KPrObject> it( lst ); for ( ; it.current() ; ++it ) { if(it.current()->getType()==OT_TEXT) @@ -2445,8 +2445,8 @@ void KPrPage::changeTabStopValue ( double _tabStop ) if ( obj ) { obj->textDocument()->setTabStops( m_doc->zoomHandler()->ptToLayoutUnitPixX( _tabStop )); - obj->layout(); - m_doc->repaint( obj ); + obj->tqlayout(); + m_doc->tqrepaint( obj ); } } } @@ -2458,7 +2458,7 @@ KPrObject *KPrPage::nextTextObject(KPrTextObject *obj) return 0L; int pos = -1; if ( obj ) - pos = m_objectList.findNextRef(obj); + pos = m_objectList.tqfindNextRef(obj); if (pos != -1 ) { @@ -2485,19 +2485,19 @@ KPrObject *KPrPage::nextTextObject(KPrTextObject *obj) bool KPrPage::findTextObject( KPrObject *obj ) { - return (m_objectList.findRef( obj )>=0 ); + return (m_objectList.tqfindRef( obj )>=0 ); } -void KPrPage::getAllObjectSelectedList(QPtrList<KPrObject> &lst, bool force ) +void KPrPage::getAllObjectSelectedList(TQPtrList<KPrObject> &lst, bool force ) { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) it.current()->getAllObjectSelectedList( lst,force ); } -void KPrPage::getAllEmbeddedObjectSelected(QPtrList<KoDocumentChild> &embeddedObjects ) +void KPrPage::getAllEmbeddedObjectSelected(TQPtrList<KoDocumentChild> &embeddedObjects ) { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()->isSelected() && it.current()->getType() == OT_PART ) @@ -2508,7 +2508,7 @@ void KPrPage::getAllEmbeddedObjectSelected(QPtrList<KoDocumentChild> &embeddedOb KPrPixmapObject* KPrPage::getSelectedImage() const { KPrPixmapObject *obj=0L; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()->isSelected() && it.current()->getType() == OT_PICTURE ) @@ -2520,12 +2520,12 @@ KPrPixmapObject* KPrPage::getSelectedImage() const return obj; } -KCommand * KPrPage::setImageEffect(ImageEffect eff, QVariant param1, QVariant param2, QVariant param3) +KCommand * KPrPage::setImageEffect(ImageEffect eff, TQVariant param1, TQVariant param2, TQVariant param3) { bool changed = false; KPrImageEffectCmd *imageEffectCmd = 0L; - QPtrList<KPrObject> _objects; - QPtrList<KPrImageEffectCmd::ImageEffectSettings> _oldSettings; + TQPtrList<KPrObject> _objects; + TQPtrList<KPrImageEffectCmd::ImageEffectSettings> _oldSettings; KPrImageEffectCmd::ImageEffectSettings _newSettings, *tmp; _objects.setAutoDelete( false ); @@ -2536,7 +2536,7 @@ KCommand * KPrPage::setImageEffect(ImageEffect eff, QVariant param1, QVariant pa _newSettings.param2 = param2; _newSettings.param3 = param3; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_PICTURE && it.current()->isSelected()) { tmp = new KPrImageEffectCmd::ImageEffectSettings; diff --git a/kpresenter/KPrPage.h b/kpresenter/KPrPage.h index 533e1e0c..03953df9 100644 --- a/kpresenter/KPrPage.h +++ b/kpresenter/KPrPage.h @@ -22,14 +22,14 @@ #ifndef KPRPAGE_H #define KPRPAGE_H -#include <qwidget.h> -#include <qptrlist.h> +#include <tqwidget.h> +#include <tqptrlist.h> #include "global.h" #include <KoBrush.h> #include <KoPoint.h> #include <KoRect.h> #include <KoStyleCollection.h> // for KoStyleChangeDefMap -#include <qvariant.h> +#include <tqvariant.h> #include <KoDocumentChild.h> #include <KoPictureCollection.h> @@ -87,14 +87,14 @@ public: * * @return the manual title */ - QString manualTitle()const; + TQString manualTitle()const; /** * @brief Set the manual title * * @param title which sould be set */ - void insertManualTitle(const QString & title); + void insertManualTitle(const TQString & title); /** * @brief Get the page title. @@ -106,21 +106,21 @@ public: * - If a title is passed to the function it is returned * - Slide %PAGENUMBER or Master Slide */ - QString pageTitle( const QString &_title = QString() ) const; + TQString pageTitle( const TQString &_title = TQString() ) const; /** * @brief Set the note text * * @param text which should be set */ - void setNoteText( const QString &_text ); + void setNoteText( const TQString &_text ); /** * @brief Get the note text * * @return the text of the note */ - QString noteText( )const; + TQString noteText( )const; /** * @brief Set the master page to masterPage @@ -149,7 +149,7 @@ public: * * @return object list */ - const QPtrList<KPrObject> & objectList() const { return m_objectList; } + const TQPtrList<KPrObject> & objectList() const { return m_objectList; } /** * @brief Get object at position @@ -178,7 +178,7 @@ public: * * @param obj objects to append */ - void appendObjects( const QValueList<KPrObject *> &objects ); + void appendObjects( const TQValueList<KPrObject *> &objects ); /** * @brief Replaces an object @@ -248,14 +248,14 @@ public: * * @return the page rect */ - QRect getZoomPageRect()const; + TQRect getZoomPageRect()const; /** * @brief Set object for the page * * @param list of objects */ - void setObjectList( QPtrList<KPrObject> objectLlist ) { + void setObjectList( TQPtrList<KPrObject> objectLlist ) { m_objectList.setAutoDelete( false ); m_objectList = objectLlist; m_objectList.setAutoDelete( false ); } @@ -296,19 +296,19 @@ public: /** * @brief */ - void pasteObjs( const QByteArray & data, int nbCopy = 1, double angle = 0.0 , + void pasteObjs( const TQByteArray & data, int nbCopy = 1, double angle = 0.0 , double _increaseX=0.0, double increaseY = 0.0, double moveX=0.0, double moveY=0.0); /** * @brief */ KCommand * replaceObjs( bool createUndoRedo, double _orastX, double _orastY, - const QColor & _txtBackCol, const QColor & _otxtBackCol); + const TQColor & _txtBackCol, const TQColor & _otxtBackCol); /** * @brief */ - void copyObjs(QDomDocument &doc, QDomElement &presenter, QValueList<KoPictureKey> & lst) const; + void copyObjs(TQDomDocument &doc, TQDomElement &presenter, TQValueList<KoPictureKey> & lst) const; /** * @brief Get the first selected object @@ -326,7 +326,7 @@ public: * * @return list of selected objets. */ - QPtrList<KPrObject> getSelectedObjects( bool withoutHeaderFooter = false ) const; + TQPtrList<KPrObject> getSelectedObjects( bool withoutHeaderFooter = false ) const; /** * @brief Get the first selected pictur @@ -344,7 +344,7 @@ public: * @param param1 effect parameter 2 * @param param1 effect parameter 3 */ - KCommand * setImageEffect(ImageEffect eff, QVariant param1, QVariant param2, QVariant param3); + KCommand * setImageEffect(ImageEffect eff, TQVariant param1, TQVariant param2, TQVariant param3); /** * @brief Group selected objects. @@ -372,32 +372,32 @@ public: void lowerObjs( bool backward ); KCommand* setPen( const KoPen &pen, LineEnd lb, LineEnd le, int flags ); - KCommand* setBrush( const QBrush &brush, FillType ft, const QColor& g1, const QColor &g2, + KCommand* setBrush( const TQBrush &brush, FillType ft, const TQColor& g1, const TQColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor, int flags ); /** * Insert an object into the page */ - KCommand * insertObject( const QString &name, KPrObject * object, const KoRect &r, bool addCommand = true ); + KCommand * insertObject( const TQString &name, KPrObject * object, const KoRect &r, bool addCommand = true ); virtual KPrPartObject* insertObject( const KoRect&, KoDocumentEntry& ); - void insertRectangle( const KoRect &r, const KoPen & pen, const QBrush &brush, FillType ft, - const QColor &g1, const QColor & g2,BCType gt, int rndX, int rndY, + void insertRectangle( const KoRect &r, const KoPen & pen, const TQBrush &brush, FillType ft, + const TQColor &g1, const TQColor & g2,BCType gt, int rndX, int rndY, bool unbalanced, int xfactor, int yfactor ); - void insertCircleOrEllipse( const KoRect &r, const KoPen &pen, const QBrush &brush, FillType ft, - const QColor &g1, const QColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor ); + void insertCircleOrEllipse( const KoRect &r, const KoPen &pen, const TQBrush &brush, FillType ft, + const TQColor &g1, const TQColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor ); - void insertPie( const KoRect &r, const KoPen &pen, const QBrush &brush, FillType ft, - const QColor &g1, const QColor &g2,BCType gt, PieType pt, int _angle, int _len, + void insertPie( const KoRect &r, const KoPen &pen, const TQBrush &brush, FillType ft, + const TQColor &g1, const TQColor &g2,BCType gt, PieType pt, int _angle, int _len, LineEnd lb,LineEnd le,bool unbalanced, int xfactor, int yfactor ); - KPrTextObject* insertTextObject( const KoRect& r, const QString& text = QString::null, KPrView *_view = 0L ); + KPrTextObject* insertTextObject( const KoRect& r, const TQString& text = TQString(), KPrView *_view = 0L ); void insertLine( const KoRect &r, const KoPen &pen, LineEnd lb, LineEnd le, LineType lt ); - void insertAutoform( const KoRect &r, const KoPen &pen, const QBrush &brush, LineEnd lb, LineEnd le, - FillType ft,const QColor &g1, const QColor &g2, BCType gt, const QString &fileName, + void insertAutoform( const KoRect &r, const KoPen &pen, const TQBrush &brush, LineEnd lb, LineEnd le, + FillType ft,const TQColor &g1, const TQColor &g2, BCType gt, const TQString &fileName, bool unbalanced,int xfactor, int yfactor ); void insertFreehand( const KoPointArray &points, const KoRect &r, const KoPen &pen,LineEnd lb, LineEnd le ); @@ -407,19 +407,19 @@ public: void insertCubicBezierCurve( const KoPointArray &points, const KoPointArray &allPoints, const KoRect &r, const KoPen &pen,LineEnd lb, LineEnd le ); - void insertPolygon( const KoPointArray &points, const KoRect &r, const KoPen &pen, const QBrush &brush, - FillType ft,const QColor &g1, const QColor &g2, BCType gt, bool unbalanced, + void insertPolygon( const KoPointArray &points, const KoRect &r, const KoPen &pen, const TQBrush &brush, + FillType ft,const TQColor &g1, const TQColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor, bool _checkConcavePolygon, int _cornersValue, int _sharpnessValue ); - void insertClosedLine( const KoPointArray &points, const KoRect &r, const KoPen &pen, const QBrush &brush, - FillType ft,const QColor &g1, const QColor &g2, + void insertClosedLine( const KoPointArray &points, const KoRect &r, const KoPen &pen, const TQBrush &brush, + FillType ft,const TQColor &g1, const TQColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor, ToolEditMode _mode ); void slotRepaintVariable(); void recalcPageNum(); - void changePicture( const KURL & url, QWidget *parent ); - void insertPicture( const QString &filename, const KoPoint &pos ); - void insertPicture( const QString &_file, const KoRect &_rect ); + void changePicture( const KURL & url, TQWidget *tqparent ); + void insertPicture( const TQString &filename, const KoPoint &pos ); + void insertPicture( const TQString &_file, const KoRect &_rect ); void enableEmbeddedParts( bool f ); @@ -427,7 +427,7 @@ public: void makeUsedPixmapList(); - void setBackColor( const QColor &backColor1, const QColor &backColor2, BCType bcType, + void setBackColor( const TQColor &backColor1, const TQColor &backColor2, BCType bcType, bool unbalanced, int xfactor, int yfactor ); void setBackPicture( const KoPictureKey & key ); bool getBackUnbalanced( )const; @@ -438,13 +438,13 @@ public: void setPageEffectSpeed( EffectSpeed pageEffectSpeed ); void setPageTimer( int pageTimer ); void setPageSoundEffect( bool soundEffect ); - void setPageSoundFileName( const QString &fileName ); + void setPageSoundFileName( const TQString &fileName ); BackType getBackType( ) const ; BackView getBackView( )const ; KoPictureKey getBackPictureKey( )const ; KoPicture getBackPicture( )const ; - QColor getBackColor1( )const ; - QColor getBackColor2()const ; + TQColor getBackColor1( )const ; + TQColor getBackColor2()const ; int getBackXFactor()const ; int getBackYFactor( )const; BCType getBackColorType( )const; @@ -452,7 +452,7 @@ public: EffectSpeed getPageEffectSpeed() const; int getPageTimer( )const; bool getPageSoundEffect( )const; - QString getPageSoundFileName()const; + TQString getPageSoundFileName()const; void setUseMasterBackground( bool useMasterBackground ); @@ -461,18 +461,18 @@ public: /** * return the list of steps where objects appear/disappear. */ - QValueList<int> getEffectSteps() const; + TQValueList<int> getEffectSteps() const; bool isSlideSelected() const {return m_selectedSlides;} void slideSelected(bool _b){m_selectedSlides=_b;} - void setInsPictureFile( const QString &_file ) { m_pictureFile = _file; } + void setInsPictureFile( const TQString &_file ) { m_pictureFile = _file; } - QString insPictureFile() const { return m_pictureFile; } + TQString insPictureFile() const { return m_pictureFile; } void deSelectAllObj(); void deSelectObj( KPrObject *kpobject ); - QDomElement saveObjects( QDomDocument &doc, QDomElement &objects, double yoffset, + TQDomElement saveObjects( TQDomDocument &doc, TQDomElement &objects, double yoffset, int saveOnlyPage ) const; bool oneObjectTextExist(bool forceAllTextObject = true) ; @@ -498,14 +498,14 @@ public: KCommand *moveObject(KPrView *m_view,const KoPoint &_move,bool key); KCommand *rotateSelectedObjects(float _newAngle, bool addAngle=false); - KCommand *shadowObj(ShadowDirection dir,int dist, const QColor &col); + KCommand *shadowObj(ShadowDirection dir,int dist, const TQColor &col); - QPtrList<KoTextObject> allTextObjects() const; - void addTextObjects(QPtrList<KoTextObject>& lst) const; + TQPtrList<KoTextObject> allTextObjects() const; + void addTextObjects(TQPtrList<KoTextObject>& lst) const; - void repaintObj(); + void tqrepaintObj(); - KPrObject * getCursor(const QPoint &pos ); + KPrObject * getCursor(const TQPoint &pos ); KPrObject * getCursor(const KoPoint &pos ); /** @@ -521,25 +521,25 @@ public: void reactivateBgSpellChecking(bool refreshTextObj); bool canMoveOneObject() const; - KCommand *alignVertical( VerticalAlignmentType _type ); + KCommand *alignVertical(VerticalAlignmentType _type ); void changeTabStopValue ( double _tabStop ); bool savePicture( KPrView *_view ) const; bool findTextObject( KPrObject *obj ); KPrObject *nextTextObject(KPrTextObject *obj); - void getAllObjectSelectedList(QPtrList<KPrObject> &lst,bool force = false ); - void getAllEmbeddedObjectSelected(QPtrList<KoDocumentChild> &embeddedObjects ); + void getAllObjectSelectedList(TQPtrList<KPrObject> &lst,bool force = false ); + void getAllEmbeddedObjectSelected(TQPtrList<KoDocumentChild> &embeddedObjects ); - void load( const QDomElement &element ); + void load( const TQDomElement &element ); void loadOasis( KoOasisContext & context ); - QDomElement save( QDomDocument &doc ); + TQDomElement save( TQDomDocument &doc ); bool saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage, KoSavingContext& context, - int & indexObj, int &partIndexObj, KoXmlWriter* manifestWriter, QMap<QString, int> &pageNames ) const; - QString saveOasisPageStyle( KoStore *store, KoGenStyles& mainStyles ) const; - QString saveOasisPageEffect() const; - QString saveOasisAdditionalPageEffect() const; + int & indexObj, int &partIndexObj, KoXmlWriter* manifestWriter, TQMap<TQString, int> &pageNames ) const; + TQString saveOasisPageStyle( KoStore *store, KoGenStyles& mainStyles ) const; + TQString saveOasisPageEffect() const; + TQString saveOasisAdditionalPageEffect() const; bool saveOasisNote( KoXmlWriter &xmlWriter ) const; bool hasHeader() const { return m_bHasHeader; } @@ -553,26 +553,26 @@ public: void setDisplayBackground( bool _b ); bool displayBackground() const { return m_displayBackground; } - QString oasisNamePage( int posPage ) const; + TQString oasisNamePage( int posPage ) const; private: void makeUsedPixmapListForGroupObject( KPrObject *_obj ); void completeLoadingForGroupObject( KPrObject *_obj ); - bool objectNameExists( KPrObject *object, QPtrList<KPrObject> &list ); + bool objectNameExists( KPrObject *object, TQPtrList<KPrObject> &list ); void saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingContext& context, int & indexObj, int &partIndexObj, KoXmlWriter* manifestWriter ) const; // list of objects - QPtrList<KPrObject> m_objectList; + TQPtrList<KPrObject> m_objectList; KPrDocument *m_doc; KPrPage *m_masterPage; KPrBackGround *m_kpbackground; - QString m_manualTitle; - QString m_noteText; + TQString m_manualTitle; + TQString m_noteText; DCOPObject *m_dcop; bool m_selectedSlides; - QString m_pictureFile; + TQString m_pictureFile; bool m_bHasHeader, m_bHasFooter; bool m_useMasterBackground; @@ -598,7 +598,7 @@ private: /** * Sound played when showing this page */ - QString m_soundFileName; + TQString m_soundFileName; /** * TODO */ diff --git a/kpresenter/KPrPageEffects.cpp b/kpresenter/KPrPageEffects.cpp index d98f5141..a8192edb 100644 --- a/kpresenter/KPrPageEffects.cpp +++ b/kpresenter/KPrPageEffects.cpp @@ -23,16 +23,16 @@ #include "KPrPageEffects.h" -#include <qpixmap.h> -#include <qwidget.h> -#include <qwmatrix.h> +#include <tqpixmap.h> +#include <tqwidget.h> +#include <tqwmatrix.h> #include <kapplication.h> #include <kdebug.h> #include <krandomsequence.h> -KPrPageEffects::KPrPageEffects( QPaintDevice *dst, const QPixmap &pageTo, PageEffect effect, EffectSpeed speed ) +KPrPageEffects::KPrPageEffects( TQPaintDevice *dst, const TQPixmap &pageTo, PageEffect effect, EffectSpeed speed ) : m_dst( dst ), m_pageTo( pageTo ), m_pageFrom(m_pageTo.width(),m_pageTo.height()), m_effect(effect), m_speed(speed), m_effectStep(0) , m_width(m_pageTo.width()), m_height(m_pageTo.height()), m_finished(false) { @@ -436,15 +436,15 @@ bool KPrPageEffects::effectSurround1() const int h = m_height / 10; int w = m_width / 10; - int repaint_h = h; - int repaint_w = w; + int tqrepaint_h = h; + int tqrepaint_w = w; bool finished = false; - bool repaint= false; + bool tqrepaint= false; int rh = 0; int rw = 0; - int repaint_rh = 0; - int repaint_rw = 0; + int tqrepaint_rh = 0; + int tqrepaint_rw = 0; // 1 if ( step < m_height ) @@ -454,11 +454,11 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= m_height ) { - repaint = true; + tqrepaint = true; - repaint_rh = m_height - repaint_h; - repaint_rw = step - m_height + repaint_w; - repaint_w = stepSize; + tqrepaint_rh = m_height - tqrepaint_h; + tqrepaint_rw = step - m_height + tqrepaint_w; + tqrepaint_w = stepSize; } } // 2 @@ -467,13 +467,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - h; rw = step - m_height + w; w = stepSize; - if ( step + stepSize >= m_height + m_width - repaint_w ) + if ( step + stepSize >= m_height + m_width - tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = m_height - ( step - m_height + repaint_h - m_width + repaint_w + stepSize ); - repaint_rw = m_width - repaint_w; - repaint_h = stepSize; + tqrepaint_rh = m_height - ( step - m_height + tqrepaint_h - m_width + tqrepaint_w + stepSize ); + tqrepaint_rw = m_width - tqrepaint_w; + tqrepaint_h = stepSize; } } // 3 @@ -482,13 +482,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - ( step - m_height + h - m_width + w + stepSize ); rw = m_width - w; h = stepSize; - if ( step + stepSize >= 2 * m_height - repaint_h + m_width - repaint_w ) + if ( step + stepSize >= 2 * m_height - tqrepaint_h + m_width - tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = 0; - repaint_rw = m_width - ( step - 2 * m_height + repaint_h - m_width + 2 * repaint_w + stepSize ); - repaint_w = stepSize; + tqrepaint_rh = 0; + tqrepaint_rw = m_width - ( step - 2 * m_height + tqrepaint_h - m_width + 2 * tqrepaint_w + stepSize ); + tqrepaint_w = stepSize; } } // 4 @@ -497,13 +497,13 @@ bool KPrPageEffects::effectSurround1() const rh = 0; rw = m_width - ( step - 2 * m_height + h - m_width + 2 * w + stepSize ); w = stepSize; - if ( step + stepSize >= 2 * m_height - repaint_h + 2 * m_width - 3 * repaint_w ) + if ( step + stepSize >= 2 * m_height - tqrepaint_h + 2 * m_width - 3 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = step - 2 * m_height + 2 * repaint_h - 2 * m_width + 3 * repaint_w; - repaint_rw = repaint_w; - repaint_h = stepSize; + tqrepaint_rh = step - 2 * m_height + 2 * tqrepaint_h - 2 * m_width + 3 * tqrepaint_w; + tqrepaint_rw = tqrepaint_w; + tqrepaint_h = stepSize; } } // 5 @@ -512,13 +512,13 @@ bool KPrPageEffects::effectSurround1() const rh = step - 2 * m_height + 2 * h - 2 * m_width + 3 * w; rw = w; h = stepSize; - if ( step + stepSize >= 3 * m_height - 3 * repaint_h + 2 * m_width - 3 * repaint_w ) + if ( step + stepSize >= 3 * m_height - 3 * tqrepaint_h + 2 * m_width - 3 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = m_height - 2 * repaint_h; - repaint_rw = step - 3 * m_height + 3 * repaint_h - 2 * m_width + 5 * repaint_w; - repaint_w = stepSize; + tqrepaint_rh = m_height - 2 * tqrepaint_h; + tqrepaint_rw = step - 3 * m_height + 3 * tqrepaint_h - 2 * m_width + 5 * tqrepaint_w; + tqrepaint_w = stepSize; } } // 6 @@ -527,13 +527,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - 2 * h; rw = step - 3 * m_height + 3 * h - 2 * m_width + 5 * w; w = stepSize; - if ( step + stepSize >= 3 * m_height - 3 * repaint_h + 3 * m_width - 6 * repaint_w ) + if ( step + stepSize >= 3 * m_height - 3 * tqrepaint_h + 3 * m_width - 6 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = m_height - ( step - 3 * m_height + 5 * repaint_h - 3 * m_width + 6 * repaint_w + stepSize ); - repaint_rw = m_width - 2 * repaint_w; - repaint_h = stepSize; + tqrepaint_rh = m_height - ( step - 3 * m_height + 5 * tqrepaint_h - 3 * m_width + 6 * tqrepaint_w + stepSize ); + tqrepaint_rw = m_width - 2 * tqrepaint_w; + tqrepaint_h = stepSize; } } // 7 @@ -542,13 +542,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - ( step - 3 * m_height + 5 * h - 3 * m_width + 6 * w + stepSize ); rw = m_width - 2 * w; h = stepSize; - if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 3 * m_width - 6 * repaint_w ) + if ( step + stepSize >= 4 * m_height - 6 * tqrepaint_h + 3 * m_width - 6 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = repaint_h; - repaint_rw = m_width - ( step - 4 * m_height + 6 * repaint_h - 3 * m_width + 8 * repaint_w + stepSize ); - repaint_w = stepSize; + tqrepaint_rh = tqrepaint_h; + tqrepaint_rw = m_width - ( step - 4 * m_height + 6 * tqrepaint_h - 3 * m_width + 8 * tqrepaint_w + stepSize ); + tqrepaint_w = stepSize; } } // 8 @@ -557,13 +557,13 @@ bool KPrPageEffects::effectSurround1() const rh = h; rw = m_width - ( step - 4 * m_height + 6 * h - 3 * m_width + 8 * w + stepSize ); w = stepSize; - if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 4 * m_width - 10 * repaint_w ) + if ( step + stepSize >= 4 * m_height - 6 * tqrepaint_h + 4 * m_width - 10 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = step - 4 * m_height + 8 * repaint_h - 4 * m_width + 10 * repaint_w; - repaint_rw = 2 * repaint_w; - repaint_h = stepSize; + tqrepaint_rh = step - 4 * m_height + 8 * tqrepaint_h - 4 * m_width + 10 * tqrepaint_w; + tqrepaint_rw = 2 * tqrepaint_w; + tqrepaint_h = stepSize; } } // 9 @@ -572,13 +572,13 @@ bool KPrPageEffects::effectSurround1() const rh = step - 4 * m_height + 8 * h - 4 * m_width + 10 * w; rw = 2 * w; h = stepSize; - if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 4 * m_width - 10 * repaint_w ) + if ( step + stepSize >= 5 * m_height - 10 * tqrepaint_h + 4 * m_width - 10 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = m_height - 3 * repaint_h; - repaint_rw = step - 5 * m_height + 10 * repaint_h - 4 * m_width + 13 * repaint_w; - repaint_w = stepSize; + tqrepaint_rh = m_height - 3 * tqrepaint_h; + tqrepaint_rw = step - 5 * m_height + 10 * tqrepaint_h - 4 * m_width + 13 * tqrepaint_w; + tqrepaint_w = stepSize; } } // 10 @@ -587,13 +587,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - 3 * h; rw = step - 5 * m_height + 10 * h - 4 * m_width + 13 * w; w = stepSize; - if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 5 * m_width - 15 * repaint_w ) + if ( step + stepSize >= 5 * m_height - 10 * tqrepaint_h + 5 * m_width - 15 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = m_height - ( step - 5 * m_height + 13 * repaint_h - 5 * m_width + 15 * repaint_w + stepSize ); - repaint_rw = m_width - 3 * repaint_w; - repaint_h = stepSize; + tqrepaint_rh = m_height - ( step - 5 * m_height + 13 * tqrepaint_h - 5 * m_width + 15 * tqrepaint_w + stepSize ); + tqrepaint_rw = m_width - 3 * tqrepaint_w; + tqrepaint_h = stepSize; } } // 11 @@ -602,13 +602,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - ( step - 5 * m_height + 13 * h - 5 * m_width + 15 * w + stepSize ); rw = m_width - 3 * w; h = stepSize; - if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 5 * m_width - 15 * repaint_w ) + if ( step + stepSize >= 6 * m_height - 15 * tqrepaint_h + 5 * m_width - 15 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = 2 * repaint_h; - repaint_rw = m_width - ( step - 6 * m_height + 15 * repaint_h - 5 * m_width + 18 * repaint_w + stepSize ); - repaint_w = stepSize; + tqrepaint_rh = 2 * tqrepaint_h; + tqrepaint_rw = m_width - ( step - 6 * m_height + 15 * tqrepaint_h - 5 * m_width + 18 * tqrepaint_w + stepSize ); + tqrepaint_w = stepSize; } } // 12 @@ -617,13 +617,13 @@ bool KPrPageEffects::effectSurround1() const rh = 2 * h; rw = m_width - ( step - 6 * m_height + 15 * h - 5 * m_width + 18 * w + stepSize ); w = stepSize; - if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 6 * m_width - 21 * repaint_w ) + if ( step + stepSize >= 6 * m_height - 15 * tqrepaint_h + 6 * m_width - 21 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = step - 6 * m_height + 18 * repaint_h - 6 * m_width + 21 * repaint_w; - repaint_rw = 3 * repaint_w; - repaint_h = stepSize; + tqrepaint_rh = step - 6 * m_height + 18 * tqrepaint_h - 6 * m_width + 21 * tqrepaint_w; + tqrepaint_rw = 3 * tqrepaint_w; + tqrepaint_h = stepSize; } } // 13 @@ -632,13 +632,13 @@ bool KPrPageEffects::effectSurround1() const rh = step - 6 * m_height + 18 * h - 6 * m_width + 21 * w; rw = 3 * w; h = stepSize; - if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 6 * m_width - 21 * repaint_w ) + if ( step + stepSize >= 7 * m_height - 21 * tqrepaint_h + 6 * m_width - 21 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = m_height - 4 * repaint_h; - repaint_rw = step - 7 * m_height + 21 * repaint_h - 6 * m_width + 25 * repaint_w; - repaint_w = stepSize; + tqrepaint_rh = m_height - 4 * tqrepaint_h; + tqrepaint_rw = step - 7 * m_height + 21 * tqrepaint_h - 6 * m_width + 25 * tqrepaint_w; + tqrepaint_w = stepSize; } } // 14 @@ -647,13 +647,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - 4 * h; rw = step - 7 * m_height + 21 * h - 6 * m_width + 25 * w; w = stepSize; - if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 7 * m_width - 28 * repaint_w ) + if ( step + stepSize >= 7 * m_height - 21 * tqrepaint_h + 7 * m_width - 28 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = m_height - ( step - 7 * m_height + 25 * repaint_h - 7 * m_width + 28 * repaint_w + stepSize ); - repaint_rw = m_width - 4 * repaint_w; - repaint_h = stepSize; + tqrepaint_rh = m_height - ( step - 7 * m_height + 25 * tqrepaint_h - 7 * m_width + 28 * tqrepaint_w + stepSize ); + tqrepaint_rw = m_width - 4 * tqrepaint_w; + tqrepaint_h = stepSize; } } // 15 @@ -662,13 +662,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - ( step - 7 * m_height + 25 * h - 7 * m_width + 28 * w + stepSize ); rw = m_width - 4 * w; h = stepSize; - if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 7 * m_width - 28 * repaint_w ) + if ( step + stepSize >= 8 * m_height - 28 * tqrepaint_h + 7 * m_width - 28 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = 3 * repaint_h; - repaint_rw = m_width - ( step - 8 * m_height + 28 * repaint_h - 7 * m_width + 32 * repaint_w + stepSize ); - repaint_w = stepSize; + tqrepaint_rh = 3 * tqrepaint_h; + tqrepaint_rw = m_width - ( step - 8 * m_height + 28 * tqrepaint_h - 7 * m_width + 32 * tqrepaint_w + stepSize ); + tqrepaint_w = stepSize; } } // 16 @@ -677,13 +677,13 @@ bool KPrPageEffects::effectSurround1() const rh = 3 * h; rw = m_width - ( step - 8 * m_height + 28 * h - 7 * m_width + 32 * w + stepSize ); w = stepSize; - if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 8 * m_width - 36 * repaint_w ) + if ( step + stepSize >= 8 * m_height - 28 * tqrepaint_h + 8 * m_width - 36 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = step - 8 * m_height + 32 * repaint_h - 8 * m_width + 36 * repaint_w; - repaint_rw = 4 * repaint_w; - repaint_h = stepSize; + tqrepaint_rh = step - 8 * m_height + 32 * tqrepaint_h - 8 * m_width + 36 * tqrepaint_w; + tqrepaint_rw = 4 * tqrepaint_w; + tqrepaint_h = stepSize; } } // 17 @@ -692,13 +692,13 @@ bool KPrPageEffects::effectSurround1() const rh = step - 8 * m_height + 32 * h - 8 * m_width + 36 * w; rw = 4 * w; h = stepSize; - if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 8 * m_width - 36 * repaint_w ) + if ( step + stepSize >= 9 * m_height - 36 * tqrepaint_h + 8 * m_width - 36 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = m_height - 5 * repaint_h; - repaint_rw = step - 9 * m_height + 36 * repaint_h - 8 * m_width + 41 * repaint_w; - repaint_w = stepSize; + tqrepaint_rh = m_height - 5 * tqrepaint_h; + tqrepaint_rw = step - 9 * m_height + 36 * tqrepaint_h - 8 * m_width + 41 * tqrepaint_w; + tqrepaint_w = stepSize; } } // 18 @@ -707,13 +707,13 @@ bool KPrPageEffects::effectSurround1() const rh = m_height - 5 * h; rw = step - 9 * m_height + 36 * h - 8 * m_width + 41 * w; w = stepSize; - if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 9 * m_width - 45 * repaint_w ) + if ( step + stepSize >= 9 * m_height - 36 * tqrepaint_h + 9 * m_width - 45 * tqrepaint_w ) { - repaint = true; + tqrepaint = true; - repaint_rh = m_height - ( step - 9 * m_height + 41 * repaint_h - 9 * m_width + 45 * repaint_w + stepSize ); - repaint_rw = m_width - 5 * repaint_w; - repaint_h = stepSize; + tqrepaint_rh = m_height - ( step - 9 * m_height + 41 * tqrepaint_h - 9 * m_width + 45 * tqrepaint_w + stepSize ); + tqrepaint_rw = m_width - 5 * tqrepaint_w; + tqrepaint_h = stepSize; } } // 19 @@ -737,9 +737,9 @@ bool KPrPageEffects::effectSurround1() const bitBlt( m_dst, rw, rh, &m_pageTo, rw, rh, w, h ); - if ( repaint ) + if ( tqrepaint ) { - bitBlt( m_dst, repaint_rw, repaint_rh, &m_pageTo, repaint_rw, repaint_rh, repaint_w, repaint_h ); + bitBlt( m_dst, tqrepaint_rw, tqrepaint_rh, &m_pageTo, tqrepaint_rw, tqrepaint_rh, tqrepaint_w, tqrepaint_h ); } return finished; @@ -764,9 +764,9 @@ bool KPrPageEffects::effectFlyAway1() { double dw = 1.0 - 83.0 / 100.0 * m_effectStep / (double)pSteps; - QWMatrix m; + TQWMatrix m; m.scale( dw, dw ); - QPixmap pix( m_pageFrom.xForm( m ) ); + TQPixmap pix( m_pageFrom.xForm( m ) ); if ( m_effectStep == pSteps ) m_pageFrom = pix; @@ -1421,7 +1421,7 @@ bool KPrPageEffects::effectDissolve() --dissove; int index = random.getLong( m_list.count() ); - QValueListIterator<int> it = m_list.at( index ); + TQValueListIterator<int> it = m_list.at( index ); unsigned int x = ( *it % colno ) * blockSize; unsigned int y = ( *it / colno ) * blockSize; @@ -1558,7 +1558,7 @@ bool KPrPageEffects::effectMelting() int w = ( m_width + count - 1 ) / count; - QValueListIterator<int> it = m_list.begin(); + TQValueListIterator<int> it = m_list.begin(); int finished = 32; for ( int c = 0; c < count; c++ ) diff --git a/kpresenter/KPrPageEffects.h b/kpresenter/KPrPageEffects.h index 5c52b24d..4942132d 100644 --- a/kpresenter/KPrPageEffects.h +++ b/kpresenter/KPrPageEffects.h @@ -25,11 +25,11 @@ #define PAGEEFFECTS_H #include "global.h" -#include <qvaluelist.h> +#include <tqvaluelist.h> -class QPaintDevice; -class QPixmap; +class TQPaintDevice; +class TQPixmap; class KPrPageEffects @@ -46,7 +46,7 @@ public: * effect The effect which sould be used. * speed The speed which should be used. */ - KPrPageEffects( QPaintDevice *dst, const QPixmap &pageTo, PageEffect effect, EffectSpeed speed ); + KPrPageEffects( TQPaintDevice *dst, const TQPixmap &pageTo, PageEffect effect, EffectSpeed speed ); ~KPrPageEffects(); @@ -103,13 +103,13 @@ protected: bool effectStripesRigthDown() const; bool effectMelting(); - QPaintDevice *m_dst; - const QPixmap m_pageTo; - QPixmap m_pageFrom; + TQPaintDevice *m_dst; + const TQPixmap m_pageTo; + TQPixmap m_pageFrom; PageEffect m_effect; PageEffect m_randomEffect; EffectSpeed m_speed; - QValueList<int> m_list; + TQValueList<int> m_list; int m_effectStep; int m_stepWidth; int m_stepHeight; diff --git a/kpresenter/KPrPageIface.cpp b/kpresenter/KPrPageIface.cpp index 4eaa2078..c1ecdac9 100644 --- a/kpresenter/KPrPageIface.cpp +++ b/kpresenter/KPrPageIface.cpp @@ -37,7 +37,7 @@ KPrPageIface::KPrPageIface( KPrPage *_page, int pgnum ) // Make up a nice DCOPObject name like "Document-0 Page-1". // ### But the page number will be stale if pages are added/removed/moved around.... - : DCOPObject( QCString( _page->kPresenterDoc()->dcopObject()->objId() ) + " Page-" + QString::number( pgnum ).latin1() ) + : DCOPObject( TQCString( _page->kPresenterDoc()->dcopObject()->objId() ) + " Page-" + TQString::number( pgnum ).latin1() ) { m_page = _page; } @@ -75,28 +75,28 @@ DCOPRef KPrPageIface::object( int num ) m_page->getObject(num)->dcopObject()->objId() ); } -QString KPrPageIface::manualTitle()const +TQString KPrPageIface::manualTitle()const { return m_page->manualTitle(); } -void KPrPageIface::insertManualTitle(const QString & title) +void KPrPageIface::insertManualTitle(const TQString & title) { m_page->insertManualTitle(title); m_page->kPresenterDoc()->updateSideBarItem( m_page ); } -QString KPrPageIface::pageTitle( const QString &_title ) const +TQString KPrPageIface::pageTitle( const TQString &_title ) const { return m_page->pageTitle(_title); } -void KPrPageIface::setNoteText( const QString &_text ) +void KPrPageIface::setNoteText( const TQString &_text ) { m_page->setNoteText(_text); } -QString KPrPageIface::noteText( )const +TQString KPrPageIface::noteText( )const { return m_page->noteText(); } @@ -169,7 +169,7 @@ void KPrPageIface::setPageSoundEffect( bool soundEffect ) m_page->setPageSoundEffect(soundEffect); } -void KPrPageIface::setPageSoundFileName( const QString &fileName ) +void KPrPageIface::setPageSoundFileName( const TQString &fileName ) { m_page->setPageSoundFileName(fileName); } @@ -204,12 +204,12 @@ int KPrPageIface::backView() const return (int)m_page->getBackView(); } -QColor KPrPageIface::backColor1() const +TQColor KPrPageIface::backColor1() const { return m_page->getBackColor1(); } -QColor KPrPageIface::backColor2() const +TQColor KPrPageIface::backColor2() const { return m_page->getBackColor2(); } @@ -219,12 +219,12 @@ int KPrPageIface::backColorType() const return (int)m_page->getBackColorType(); } -QString KPrPageIface::backPixFilename() const +TQString KPrPageIface::backPixFilename() const { return m_page->getBackPictureKey().filename(); } -QString KPrPageIface::backClipFilename() const +TQString KPrPageIface::backClipFilename() const { return m_page->getBackPictureKey().filename(); } @@ -234,7 +234,7 @@ int KPrPageIface::pageEffect() const return (int)m_page->getPageEffect(); } -void KPrPageIface::setPageEffect(const QString &effect ) +void KPrPageIface::setPageEffect(const TQString &effect ) { if(effect=="NONE") m_page->setPageEffect(PEF_NONE); @@ -324,135 +324,135 @@ void KPrPageIface::setPageEffect(const QString &effect ) kdDebug(33001) << "Error in setPageEffect" << endl; } -QString KPrPageIface::pageEffectString( )const +TQString KPrPageIface::pageEffectString( )const { switch(m_page->getPageEffect( )) { case PEF_NONE: - return QString("NONE"); + return TQString("NONE"); break; case PEF_CLOSE_HORZ: - return QString("CLOSE_HORZ"); + return TQString("CLOSE_HORZ"); break; case PEF_CLOSE_VERT: - return QString("CLOSE_VERT"); + return TQString("CLOSE_VERT"); break; case PEF_CLOSE_ALL: - return QString("CLOSE_ALL"); + return TQString("CLOSE_ALL"); break; case PEF_OPEN_HORZ: - return QString("OPEN_HORZ"); + return TQString("OPEN_HORZ"); break; case PEF_OPEN_VERT: - return QString("OPEN_VERT"); + return TQString("OPEN_VERT"); break; case PEF_OPEN_ALL: - return QString("OPEN_ALL"); + return TQString("OPEN_ALL"); break; case PEF_INTERLOCKING_HORZ_1: - return QString("INTERLOCKING_HORZ_1"); + return TQString("INTERLOCKING_HORZ_1"); break; case PEF_INTERLOCKING_HORZ_2: - return QString("INTERLOCKING_HORZ_2"); + return TQString("INTERLOCKING_HORZ_2"); break; case PEF_INTERLOCKING_VERT_1: - return QString("INTERLOCKING_VERT_1"); + return TQString("INTERLOCKING_VERT_1"); break; case PEF_INTERLOCKING_VERT_2: - return QString("INTERLOCKING_VERT_2"); + return TQString("INTERLOCKING_VERT_2"); break; case PEF_SURROUND1: - return QString("SURROUND1"); + return TQString("SURROUND1"); break; case PEF_BLINDS_HOR: - return QString("BLINDS_HOR"); + return TQString("BLINDS_HOR"); break; case PEF_BLINDS_VER: - return QString("BLINDS_VER"); + return TQString("BLINDS_VER"); break; case PEF_BOX_IN: - return QString("BOX_IN"); + return TQString("BOX_IN"); break; case PEF_BOX_OUT: - return QString("BOX_OUT"); + return TQString("BOX_OUT"); break; case PEF_CHECKBOARD_ACROSS: - return QString("CHECKBOARD_ACROSS"); + return TQString("CHECKBOARD_ACROSS"); break; case PEF_COVER_DOWN: - return QString("COVER_DOWN"); + return TQString("COVER_DOWN"); break; case PEF_UNCOVER_DOWN: - return QString("UNCOVER_DOWN"); + return TQString("UNCOVER_DOWN"); break; case PEF_COVER_UP: - return QString("COVER_UP"); + return TQString("COVER_UP"); break; case PEF_UNCOVER_UP: - return QString("UNCOVER_UP"); + return TQString("UNCOVER_UP"); break; case PEF_COVER_LEFT: - return QString("COVER_LEFT"); + return TQString("COVER_LEFT"); break; case PEF_UNCOVER_LEFT: - return QString("UNCOVER_LEFT"); + return TQString("UNCOVER_LEFT"); break; case PEF_COVER_RIGHT: - return QString("COVER_RIGHT"); + return TQString("COVER_RIGHT"); break; case PEF_UNCOVER_RIGHT: - return QString("UNCOVER_RIGHT"); + return TQString("UNCOVER_RIGHT"); break; case PEF_COVER_LEFT_UP: - return QString("COVER_LEFT_UP"); + return TQString("COVER_LEFT_UP"); break; case PEF_UNCOVER_LEFT_UP: - return QString("UNCOVER_LEFT_UP"); + return TQString("UNCOVER_LEFT_UP"); break; case PEF_COVER_LEFT_DOWN: - return QString("COVER_LEFT_DOWN"); + return TQString("COVER_LEFT_DOWN"); break; case PEF_UNCOVER_LEFT_DOWN: - return QString("UNCOVER_LEFT_DOWN"); + return TQString("UNCOVER_LEFT_DOWN"); break; case PEF_COVER_RIGHT_UP: - return QString("COVER_RIGHT_UP"); + return TQString("COVER_RIGHT_UP"); break; case PEF_UNCOVER_RIGHT_UP: - return QString("UNCOVER_RIGHT_UP"); + return TQString("UNCOVER_RIGHT_UP"); break; case PEF_COVER_RIGHT_DOWN: - return QString("COVER_RIGHT_DOWN"); + return TQString("COVER_RIGHT_DOWN"); break; case PEF_UNCOVER_RIGHT_DOWN: - return QString("UNCOVER_RIGHT_DOWN"); + return TQString("UNCOVER_RIGHT_DOWN"); break; case PEF_DISSOLVE: - return QString("DISSOLVE"); + return TQString("DISSOLVE"); break; case PEF_STRIPS_LEFT_UP: - return QString("STRIPS_LEFT_UP"); + return TQString("STRIPS_LEFT_UP"); break; case PEF_STRIPS_LEFT_DOWN: - return QString("STRIPS_LEFT_DOWN"); + return TQString("STRIPS_LEFT_DOWN"); break; case PEF_STRIPS_RIGHT_UP: - return QString("STRIPS_RIGHT_UP"); + return TQString("STRIPS_RIGHT_UP"); break; case PEF_STRIPS_RIGHT_DOWN: - return QString("STRIPS_RIGHT_DOWN"); + return TQString("STRIPS_RIGHT_DOWN"); break; case PEF_MELTING: - return QString("MELTING"); + return TQString("MELTING"); break; case PEF_RANDOM: - return QString("RANDOM"); + return TQString("RANDOM"); break; default: kdDebug(33001) << "Page effect not defined!" << endl; break; } - return QString(""); + return TQString(""); } bool KPrPageIface::backUnbalanced() const @@ -460,12 +460,12 @@ bool KPrPageIface::backUnbalanced() const return (int)m_page->getBackUnbalanced(); } -QString KPrPageIface::pageSoundFileName() const +TQString KPrPageIface::pageSoundFileName() const { return m_page->getPageSoundFileName(); } -QRect KPrPageIface::pageRect() const +TQRect KPrPageIface::pageRect() const { return m_page->getZoomPageRect(); } @@ -482,9 +482,9 @@ void KPrPageIface::slideSelected(bool _b) m_page->kPresenterDoc()->updatePresentationButton(); } -void KPrPageIface::changePicture( const QString & filename ) +void KPrPageIface::changePicture( const TQString & filename ) { - // TODO: find a better parent + // TODO: find a better tqparent m_page->changePicture(filename, 0); } @@ -543,7 +543,7 @@ DCOPRef KPrPageIface::insertTextObject( double x, double y, double h, double w ) return selectedObject(); } -DCOPRef KPrPageIface::insertPicture( const QString & file, double x, double y, double h, double w ) +DCOPRef KPrPageIface::insertPicture( const TQString & file, double x, double y, double h, double w ) { m_page->setInsPictureFile(file); KPrView *view=m_page->kPresenterDoc()->firstView(); @@ -555,21 +555,21 @@ DCOPRef KPrPageIface::insertPicture( const QString & file, double x, double y, d return selectedObject(); } -void KPrPageIface::setBackGroundColor1(const QColor &col) +void KPrPageIface::setBackGroundColor1(const TQColor &col) { - const QColor col2=backColor2(); + const TQColor col2=backColor2(); m_page->setBackColor( col, col2, m_page->getBackColorType(), m_page->getBackUnbalanced(), backXFactor(), backYFactor() ); } -void KPrPageIface::setBackGroundColor2(const QColor &col) +void KPrPageIface::setBackGroundColor2(const TQColor &col) { - const QColor col1=backColor1(); + const TQColor col1=backColor1(); m_page->setBackColor( col1, col, m_page->getBackColorType(), m_page->getBackUnbalanced(), backXFactor(), backYFactor() ); } -void KPrPageIface::setBackGroundColorType(const QString &type) +void KPrPageIface::setBackGroundColorType(const TQString &type) { BCType bctype; if(type=="PLAIN") diff --git a/kpresenter/KPrPageIface.h b/kpresenter/KPrPageIface.h index e1c2d1ac..17b9c54c 100644 --- a/kpresenter/KPrPageIface.h +++ b/kpresenter/KPrPageIface.h @@ -24,8 +24,8 @@ #include <KoDocumentIface.h> #include <dcopref.h> -#include <qstring.h> -#include <qcolor.h> +#include <tqstring.h> +#include <tqcolor.h> #include "global.h" class KPrPage; @@ -45,12 +45,12 @@ k_dcop: virtual int numTextObject() const; - virtual QString manualTitle()const; - virtual void insertManualTitle(const QString & title); - virtual QString pageTitle( const QString &_title = QString() ) const; + virtual TQString manualTitle()const; + virtual void insertManualTitle(const TQString & title); + virtual TQString pageTitle( const TQString &_title = TQString() ) const; - virtual void setNoteText( const QString &_text ); - virtual QString noteText( )const; + virtual void setNoteText( const TQString &_text ); + virtual TQString noteText( )const; virtual unsigned int objNums() const; virtual int numSelected() const; @@ -64,8 +64,8 @@ k_dcop: virtual void setPageTimer( int pageTimer ); virtual void setPageSoundEffect( bool soundEffect ); - virtual void setPageSoundFileName( const QString &fileName ); - virtual QString pageSoundFileName()const; + virtual void setPageSoundFileName( const TQString &fileName ); + virtual TQString pageSoundFileName()const; virtual bool pageSoundEffect() const; virtual int pageTimer() const; @@ -74,33 +74,33 @@ k_dcop: virtual int backType()const ; virtual int backView()const; - virtual QColor backColor1()const; - virtual QColor backColor2()const ; + virtual TQColor backColor1()const; + virtual TQColor backColor2()const ; virtual int backColorType()const; - virtual QString backPixFilename()const; - virtual QString backClipFilename()const; + virtual TQString backPixFilename()const; + virtual TQString backClipFilename()const; virtual int pageEffect()const; - virtual QString pageEffectString( )const; - virtual void setPageEffect(const QString & ); + virtual TQString pageEffectString( )const; + virtual void setPageEffect(const TQString & ); virtual bool backUnbalanced()const ; - virtual QRect pageRect()const; + virtual TQRect pageRect()const; virtual bool isSlideSelected(); virtual void slideSelected(bool _b); - virtual void changePicture( const QString & ); + virtual void changePicture( const TQString & ); - virtual void setBackGroundColor1(const QColor &col); - virtual void setBackGroundColor2(const QColor &col); - virtual void setBackGroundColorType(const QString &type); + virtual void setBackGroundColor1(const TQColor &col); + virtual void setBackGroundColor2(const TQColor &col); + virtual void setBackGroundColorType(const TQString &type); DCOPRef insertRectangle(double x,double y, double h, double w); DCOPRef insertEllipse(double x,double y, double h, double w ); DCOPRef insertPie( double x,double y, double h, double w ); DCOPRef insertLine( double x1, double y1, double x2, double y2 ); DCOPRef insertTextObject( double x, double y, double h, double w ); - DCOPRef insertPicture( const QString & file, double x, double y, double h, double w ); + DCOPRef insertPicture( const TQString & file, double x, double y, double h, double w ); void deSelectAllObj(); diff --git a/kpresenter/KPrPartObject.cpp b/kpresenter/KPrPartObject.cpp index f4bbd3d2..e2c24e1a 100644 --- a/kpresenter/KPrPartObject.cpp +++ b/kpresenter/KPrPartObject.cpp @@ -28,7 +28,7 @@ #include "KoOasisContext.h" #include <kparts/partmanager.h> -#include <qpainter.h> +#include <tqpainter.h> #include <kdebug.h> using namespace std; @@ -36,7 +36,7 @@ KPrPartObject::KPrPartObject( KPrChild *_child ) : KPr2DObject() { child = _child; - pen = KoPen( Qt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, Qt::NoPen ); _enableDrawing = true; } @@ -47,9 +47,9 @@ KPrPartObject &KPrPartObject::operator=( const KPrPartObject & ) void KPrPartObject::updateChildGeometry() { - KoTextZoomHandler* zh = child->parent()->zoomHandler(); + KoTextZoomHandler* zh = child->tqparent()->zoomHandler(); child->setGeometry( zh->zoomRect( getRect() ), true ); - child->setRotationPoint( QPoint( zh->zoomItX( getOrig().x() + getSize().width() / 2 ), + child->setRotationPoint( TQPoint( zh->zoomItX( getOrig().x() + getSize().width() / 2 ), zh->zoomItY( getOrig().y() + getSize().height() / 2 ) ) ); } @@ -58,8 +58,8 @@ void KPrPartObject::rotate( float _angle ) KPrObject::rotate( _angle ); child->setRotation( _angle ); - KoTextZoomHandler* zh = child->parent()->zoomHandler(); - child->setRotationPoint( QPoint( zh->zoomItX( getOrig().x() + getSize().width() / 2 ), + KoTextZoomHandler* zh = child->tqparent()->zoomHandler(); + child->setRotationPoint( TQPoint( zh->zoomItX( getOrig().x() + getSize().width() / 2 ), zh->zoomItY( getOrig().y() + getSize().height() / 2 ) ) ); } @@ -68,7 +68,7 @@ bool KPrPartObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const kdDebug() << "KPrPartObject::saveOasisPart " << sc.partIndexObj << endl; sc.xmlWriter.startElement( "draw:object" ); - const QString name = QString( "Object_%1" ).arg( sc.partIndexObj + 1 ); + const TQString name = TQString( "Object_%1" ).tqarg( sc.partIndexObj + 1 ); ++sc.partIndexObj; child->saveOasisAttributes( sc.xmlWriter, name ); @@ -82,36 +82,36 @@ const char * KPrPartObject::getOasisElementName() const } -void KPrPartObject::loadOasis(const QDomElement &element, KoOasisContext&context, KPrLoadingInfo */*info*/) +void KPrPartObject::loadOasis(const TQDomElement &element, KoOasisContext&context, KPrLoadingInfo */*info*/) { - kdDebug()<<"void KPrPartObject::loadOasis(const QDomElement &element)******************\n"; + kdDebug()<<"void KPrPartObject::loadOasis(const TQDomElement &element)******************\n"; - QDomElement objectElement = KoDom::namedItemNS( element, KoXmlNS::draw, "object" ); + TQDomElement objectElement = KoDom::namedItemNS( element, KoXmlNS::draw, "object" ); child->loadOasis( element, objectElement ); if(element.hasAttributeNS( KoXmlNS::draw, "name" )) - objectName = element.attributeNS( KoXmlNS::draw, "name", QString::null); + KPrObject::objectName = element.attributeNS( KoXmlNS::draw, "name", TQString()); (void)child->loadOasisDocument( context.store(), context.manifestDocument() ); } -void KPrPartObject::draw( QPainter *_painter, KoTextZoomHandler *_zoomhandler, +void KPrPartObject::draw( TQPainter *_painter, KoTextZoomHandler *_zoomhandler, int pageNum, SelectionMode selectionMode, bool drawContour ) { updateChildGeometry(); double ow = ext.width(); double oh = ext.height(); - QSize size( _zoomhandler->zoomSize( ext ) ); - int penw = ( ( pen.style() == Qt::NoPen ) ? 1 : int( pen.pointWidth() ) ) / 2; + TQSize size( _zoomhandler->zoomSize( ext ) ); + int penw = ( ( pen.style() == TQt::NoPen ) ? 1 : int( pen.pointWidth() ) ) / 2; - QPen pen2; + TQPen pen2; if ( drawContour ) - pen2 = QPen( Qt::black, 1, Qt::NoPen ); + pen2 = TQPen( TQt::black, 1, TQt::NoPen ); else { pen2 = pen.zoomedPen( _zoomhandler ); } _painter->save(); child->transform( *_painter ); - _painter->setPen( Qt::NoPen ); + _painter->setPen( TQt::NoPen ); _painter->setBrush( getBrush() ); if ( angle == 0 ) { @@ -140,7 +140,7 @@ void KPrPartObject::draw( QPainter *_painter, KoTextZoomHandler *_zoomhandler, } _painter->setPen( pen2 ); - _painter->setBrush( Qt::NoBrush ); + _painter->setBrush( TQt::NoBrush ); _painter->drawRect( _zoomhandler->zoomItX( penw ), _zoomhandler->zoomItY( penw ), _zoomhandler->zoomItX( ow - 2 * penw ), _zoomhandler->zoomItY( oh - 2 * penw ) ); paint( _painter, _zoomhandler, pageNum, selectionMode, drawContour ); @@ -151,21 +151,21 @@ void KPrPartObject::draw( QPainter *_painter, KoTextZoomHandler *_zoomhandler, void KPrPartObject::slot_changed( KoChild *_koChild ) { - KoTextZoomHandler* zh = child->parent()->zoomHandler(); - KoRect g = zh->unzoomRect( _koChild->geometry() ); + KoTextZoomHandler* zh = child->tqparent()->zoomHandler(); + KoRect g = zh->unzoomRect( _koChild->tqgeometry() ); KPrObject::setOrig( g.x(), g.y() ); KPrObject::setSize( g.width(), g.height() ); } -void KPrPartObject::paint( QPainter *_painter, KoTextZoomHandler *_zoomHandler, +void KPrPartObject::paint( TQPainter *_painter, KoTextZoomHandler *_zoomHandler, int /* pageNum */, bool /*drawingShadow*/, bool drawContour ) { if ( !_enableDrawing ) return; if ( drawContour ) { - QPen pen3( Qt::black, 1, Qt::DotLine ); + TQPen pen3( TQt::black, 1, TQt::DotLine ); _painter->setPen( pen3 ); - _painter->setRasterOp( Qt::NotXorROP ); + _painter->setRasterOp( TQt::NotXorROP ); _painter->drawRect( _zoomHandler->zoomRect( KoRect( KoPoint( 0.0, 0.0 ), getSize() ) ) ); return; } @@ -173,7 +173,7 @@ void KPrPartObject::paint( QPainter *_painter, KoTextZoomHandler *_zoomHandler, if ( !child || !child->document() ) return; - int penw = ( pen.style() == Qt::NoPen ) ? 0 : int( pen.pointWidth() ); + int penw = ( pen.style() == TQt::NoPen ) ? 0 : int( pen.pointWidth() ); KoRect r( KoPoint( penw, penw ), KoPoint( getSize().width() - ( penw * 2.0 ), getSize().height() - ( penw * 2.0 ) ) ); double zoomX = static_cast<double>( _zoomHandler->zoom() ) / 100; @@ -186,7 +186,7 @@ void KPrPartObject::paint( QPainter *_painter, KoTextZoomHandler *_zoomHandler, zoomY ); } -void KPrPartObject::activate( QWidget *_widget ) +void KPrPartObject::activate( TQWidget *_widget ) { KPrView *view = dynamic_cast<KPrView*>( _widget ); KoDocument* part = child->document(); diff --git a/kpresenter/KPrPartObject.h b/kpresenter/KPrPartObject.h index a2f40ece..8689e63d 100644 --- a/kpresenter/KPrPartObject.h +++ b/kpresenter/KPrPartObject.h @@ -28,9 +28,10 @@ class KPrChild; class KoXmlWriter; class KoStore; -class KPrPartObject : public QObject, public KPr2DObject +class KPrPartObject : public TQObject, public KPr2DObject { Q_OBJECT + TQ_OBJECT public: KPrPartObject( KPrChild *_child ); virtual ~KPrPartObject() {} @@ -39,17 +40,17 @@ public: virtual void rotate( float _angle ); virtual ObjType getType() const { return OT_PART; } - virtual QString getTypeString() const { return i18n("Embedded Object"); } + virtual TQString getTypeString() const { return i18n("Embedded Object"); } - virtual void draw( QPainter *_painter, KoTextZoomHandler *_zoomhandler, + virtual void draw( TQPainter *_painter, KoTextZoomHandler *_zoomhandler, int pageNum, SelectionMode selectionMode, bool drawContour = FALSE ); - void activate( QWidget *_widget ); + void activate( TQWidget *_widget ); void deactivate(); KPrChild *getChild() const { return child; } void enableDrawing( bool f ) { _enableDrawing = f; } - virtual void loadOasis(const QDomElement &element, KoOasisContext &context, KPrLoadingInfo *info); + virtual void loadOasis(const TQDomElement &element, KoOasisContext &context, KPrLoadingInfo *info); public slots: void slot_changed( KoChild *_koChild ); @@ -59,7 +60,7 @@ protected: virtual bool saveOasisObjectAttributes( KPOasisSaveContext &sc ) const; void updateChildGeometry(); - virtual void paint( QPainter *_painter,KoTextZoomHandler*_zoomHandler, + virtual void paint( TQPainter *_painter,KoTextZoomHandler*_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour = FALSE ); bool _enableDrawing; diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp index 6973c2f4..388d7dee 100644 --- a/kpresenter/KPrPenStyleWidget.cpp +++ b/kpresenter/KPrPenStyleWidget.cpp @@ -23,9 +23,9 @@ #include "penstyle.h" #include "KPrPBPreview.h" -#include <qlayout.h> -#include <qlabel.h> -#include <qvbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqvbox.h> #include <kcolorbutton.h> #include <kcombobox.h> @@ -33,18 +33,18 @@ #include <knuminput.h> -KPrPenStyleWidget::KPrPenStyleWidget( QWidget *parent, const char *name, const KoPenCmd::Pen &pen, bool configureLineEnds ) -: QWidget( parent, name ) +KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *tqparent, const char *name, const KoPenCmd::Pen &pen, bool configureLineEnds ) +: TQWidget( tqparent, name ) , m_pen( pen ) { - QVBoxLayout *layout = new QVBoxLayout( this ); - layout->addWidget( m_ui = new PenStyleUI( this ) ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->addWidget( m_ui = new PenStyleUI( this ) ); - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); - layout->addItem( spacer ); + TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + tqlayout->addItem( spacer ); - connect( m_ui->colorChooser, SIGNAL( changed( const QColor& ) ), - this, SLOT( slotPenChanged() ) ); + connect( m_ui->colorChooser, TQT_SIGNAL( changed( const TQColor& ) ), + this, TQT_SLOT( slotPenChanged() ) ); m_ui->styleCombo->insertItem( i18n( "No Outline" ) ); m_ui->styleCombo->insertItem( "__________" ); @@ -55,11 +55,11 @@ KPrPenStyleWidget::KPrPenStyleWidget( QWidget *parent, const char *name, const K m_ui->widthInput->setRange( 1, 10, 1, false); - connect( m_ui->styleCombo, SIGNAL( activated( int ) ), - this, SLOT( slotPenChanged() ) ); + connect( m_ui->styleCombo, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( slotPenChanged() ) ); - connect( m_ui->widthInput, SIGNAL( valueChanged( double ) ), - this, SLOT( slotPenChanged() ) ); + connect( m_ui->widthInput, TQT_SIGNAL( valueChanged( double ) ), + this, TQT_SLOT( slotPenChanged() ) ); m_ui->lineBeginCombo->insertItem( i18n("Normal") ); m_ui->lineBeginCombo->insertItem( i18n("Arrow") ); @@ -70,8 +70,8 @@ KPrPenStyleWidget::KPrPenStyleWidget( QWidget *parent, const char *name, const K m_ui->lineBeginCombo->insertItem( i18n("Double Arrow") ); m_ui->lineBeginCombo->insertItem( i18n("Double Line Arrow") ); - connect( m_ui->lineBeginCombo, SIGNAL( activated( int ) ), - this, SLOT( slotLineBeginChanged() ) ); + connect( m_ui->lineBeginCombo, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( slotLineBeginChanged() ) ); m_ui->lineEndCombo->insertItem( i18n("Normal") ); m_ui->lineEndCombo->insertItem( i18n("Arrow") ); @@ -82,8 +82,8 @@ KPrPenStyleWidget::KPrPenStyleWidget( QWidget *parent, const char *name, const K m_ui->lineEndCombo->insertItem( i18n("Double Arrow") ); m_ui->lineEndCombo->insertItem( i18n("Double Line Arrow") ); - connect( m_ui->lineEndCombo, SIGNAL( activated( int ) ), - this, SLOT( slotLineEndChanged() ) ); + connect( m_ui->lineEndCombo, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( slotLineEndChanged() ) ); if ( !configureLineEnds ) m_ui->arrowGroup->hide(); @@ -153,22 +153,22 @@ KoPen KPrPenStyleWidget::getKPPen() const switch ( m_ui->styleCombo->currentItem() ) { case 0: - pen.setStyle( NoPen ); + pen.setStyle( Qt::NoPen ); break; case 1: - pen.setStyle( SolidLine ); + pen.setStyle( Qt::SolidLine ); break; case 2: - pen.setStyle( DashLine ); + pen.setStyle( Qt::DashLine ); break; case 3: - pen.setStyle( DotLine ); + pen.setStyle( Qt::DotLine ); break; case 4: - pen.setStyle( DashDotLine ); + pen.setStyle( Qt::DashDotLine ); break; case 5: - pen.setStyle( DashDotDotLine ); + pen.setStyle( Qt::DashDotDotLine ); break; } diff --git a/kpresenter/KPrPenStyleWidget.h b/kpresenter/KPrPenStyleWidget.h index 42ce56dc..7bbd2c01 100644 --- a/kpresenter/KPrPenStyleWidget.h +++ b/kpresenter/KPrPenStyleWidget.h @@ -23,7 +23,7 @@ #include "global.h" -#include <qwidget.h> +#include <tqwidget.h> #include "KPrCommand.h" #include <KoPen.h> @@ -31,11 +31,12 @@ class PenStyleUI; -class KPrPenStyleWidget : public QWidget +class KPrPenStyleWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrPenStyleWidget( QWidget *parent, const char *name, const KoPenCmd::Pen &pen, bool configureLineEnds = true ); + KPrPenStyleWidget( TQWidget *tqparent, const char *name, const KoPenCmd::Pen &pen, bool configureLineEnds = true ); ~KPrPenStyleWidget(); int getPenConfigChange() const; diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp index ccb12719..378b8990 100644 --- a/kpresenter/KPrPgConfDia.cpp +++ b/kpresenter/KPrPgConfDia.cpp @@ -23,56 +23,56 @@ #include "KPrDocument.h" #include "KPrPage.h" -#include <qbuttongroup.h> -#include <qhbuttongroup.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qhbox.h> -#include <qvbox.h> -#include <qvgroupbox.h> -#include <qheader.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlistview.h> -#include <qpen.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qvaluelist.h> -#include <qvbuttongroup.h> -#include <qwhatsthis.h> +#include <tqbuttongroup.h> +#include <tqhbuttongroup.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqvgroupbox.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlistview.h> +#include <tqpen.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqvaluelist.h> +#include <tqvbuttongroup.h> +#include <tqwhatsthis.h> #include <kcolorbutton.h> #include <kglobal.h> #include <klocale.h> #include <knuminput.h> -#include <qslider.h> +#include <tqslider.h> -KPrPgConfDia::KPrPgConfDia( QWidget* parent, KPrDocument* doc ) +KPrPgConfDia::KPrPgConfDia( TQWidget* tqparent, KPrDocument* doc ) : KDialogBase( KDialogBase::Tabbed, i18n("Configure Slide Show"), - Ok|Cancel, Ok, parent, "pgConfDia", true ), + Ok|Cancel, Ok, tqparent, "pgConfDia", true ), m_doc( doc ) { setupPageGeneral(); setupPageSlides(); - connect( this, SIGNAL( okClicked() ), this, SLOT( confDiaOk() ) ); - connect( this, SIGNAL( okClicked() ), this, SLOT( accept() ) ); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( confDiaOk() ) ); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ); } void KPrPgConfDia::setupPageGeneral() { - QFrame* generalPage = addPage( i18n("&General") ); - QWhatsThis::add( generalPage, i18n("<p>This dialog allows you to configure how the slideshow " + TQFrame* generalPage = addPage( i18n("&General") ); + TQWhatsThis::add( generalPage, i18n("<p>This dialog allows you to configure how the slideshow " "will be displayed, including whether the slides are " "automatically sequenced or manually controlled, and also " "allows you to configure a <em>drawing pen</em> that can " "be used during the display of the presentation to add " "additional information or to emphasise particular points.</p>") ); - QVBoxLayout *generalLayout = new QVBoxLayout( generalPage, 0, KDialog::spacingHint() ); + TQVBoxLayout *generalLayout = new TQVBoxLayout( generalPage, 0, KDialog::spacingHint() ); - QVButtonGroup *switchGroup = new QVButtonGroup( i18n("&Transition Type"), generalPage ); + TQVButtonGroup *switchGroup = new TQVButtonGroup( i18n("&Transition Type"), generalPage ); generalLayout->addWidget( switchGroup ); - QWhatsThis::add( switchGroup, i18n("<li><p>If you select <b>Manual transition to next step or slide</b> " + TQWhatsThis::add( switchGroup, i18n("<li><p>If you select <b>Manual transition to next step or slide</b> " "then each transition and effect on a slide, or transition from " "one slide to the next, will require an action. Typically this " "action will be a mouse click, or the space bar.</p></li>" @@ -83,14 +83,14 @@ void KPrPgConfDia::setupPageGeneral() "of sequencing is controlled using the slider below. This also " "enables the option to automatically loop back to the first " "slide after the last slide has been shown.</p></li>") ); - m_manualButton = new QRadioButton( i18n("&Manual transition to next step or slide"), switchGroup ); + m_manualButton = new TQRadioButton( i18n("&Manual transition to next step or slide"), switchGroup ); m_manualButton->setChecked( m_doc->spManualSwitch() ); - m_autoButton = new QRadioButton( i18n("&Automatic transition to next step or slide"), switchGroup ); + m_autoButton = new TQRadioButton( i18n("&Automatic transition to next step or slide"), switchGroup ); m_autoButton->setChecked( !m_doc->spManualSwitch() ); - infiniteLoop = new QCheckBox( i18n( "&Infinite loop" ), generalPage ); + infiniteLoop = new TQCheckBox( i18n( "&Infinite loop" ), generalPage ); generalLayout->addWidget( infiniteLoop ); - QWhatsThis::add( infiniteLoop, i18n("<p>If this checkbox is selected, then the slideshow " + TQWhatsThis::add( infiniteLoop, i18n("<p>If this checkbox is selected, then the slideshow " "will restart at the first slide after the last slide " "has been displayed. It is only available if the " "<b>Automatic transition to next step or slide</b> " @@ -98,22 +98,22 @@ void KPrPgConfDia::setupPageGeneral() "useful if you are running a promotional display.</p>") ); infiniteLoop->setEnabled( !m_doc->spManualSwitch() ); - connect( m_autoButton, SIGNAL( toggled(bool) ), infiniteLoop, SLOT( setEnabled(bool) ) ); - connect( m_autoButton, SIGNAL( toggled(bool) ), infiniteLoop, SLOT( setChecked(bool) ) ); + connect( m_autoButton, TQT_SIGNAL( toggled(bool) ), infiniteLoop, TQT_SLOT( setEnabled(bool) ) ); + connect( m_autoButton, TQT_SIGNAL( toggled(bool) ), infiniteLoop, TQT_SLOT( setChecked(bool) ) ); - endOfPresentationSlide = new QCheckBox( i18n( "&Show 'End of presentation' slide" ), generalPage ); + endOfPresentationSlide = new TQCheckBox( i18n( "&Show 'End of presentation' slide" ), generalPage ); generalLayout->addWidget( endOfPresentationSlide ); - QWhatsThis::add( endOfPresentationSlide, i18n("<p>If this checkbox is selected, when the slideshow " + TQWhatsThis::add( endOfPresentationSlide, i18n("<p>If this checkbox is selected, when the slideshow " "has finished a black slideshow containing the " "message 'End of presentation. Click to exit' will " "be shown.") ); endOfPresentationSlide->setChecked( m_doc->spShowEndOfPresentationSlide() ); endOfPresentationSlide->setDisabled( infiniteLoop->isEnabled() && getInfiniteLoop() ); - connect( infiniteLoop, SIGNAL( toggled(bool) ), endOfPresentationSlide, SLOT( setDisabled(bool) ) ); + connect( infiniteLoop, TQT_SIGNAL( toggled(bool) ), endOfPresentationSlide, TQT_SLOT( setDisabled(bool) ) ); - presentationDuration = new QCheckBox( i18n( "Measure presentation &duration" ), generalPage ); + presentationDuration = new TQCheckBox( i18n( "Measure presentation &duration" ), generalPage ); generalLayout->addWidget( presentationDuration ); - QWhatsThis::add( presentationDuration, i18n("<p>If this checkbox is selected, the time that " + TQWhatsThis::add( presentationDuration, i18n("<p>If this checkbox is selected, the time that " "each slide was displayed for, and the total time " "for the presentation will be measured.</p> " "<p>The times will be displayed at the end of the " @@ -126,27 +126,27 @@ void KPrPgConfDia::setupPageGeneral() // presentation pen (color and width) - QGroupBox* penGroup = new QGroupBox( 2, Qt::Horizontal, i18n("Presentation Pen") , generalPage ); + TQGroupBox* penGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("Presentation Pen") , generalPage ); generalLayout->addWidget( penGroup ); - QWhatsThis::add( penGroup, i18n("<p>This part of the dialog allows you to configure the " + 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 " "information, emphasise particular content, or to correct " "errors during the presentation by drawing on the slides " "using the mouse.</p>" "<p>You can configure the color of the drawing pen and the " "width of the pen.</p>" ) ); - penGroup->layout()->setSpacing(KDialog::marginHint()); - penGroup->layout()->setMargin(KDialog::spacingHint()); - //QGridLayout *grid = new QGridLayout(penGroup->layout(), 3, 2 ); + penGroup->tqlayout()->setSpacing(KDialog::marginHint()); + penGroup->tqlayout()->setMargin(KDialog::spacingHint()); + //TQGridLayout *grid = new TQGridLayout(penGroup->tqlayout(), 3, 2 ); - QLabel* label = new QLabel( i18n( "Color:" ), penGroup ); + TQLabel* label = new TQLabel( i18n( "Color:" ), penGroup ); //grid->addWidget( label, 0, 0 ); penColor = new KColorButton( m_doc->presPen().color(), m_doc->presPen().color(), penGroup ); //grid->addWidget( penColor, 0, 1 ); - label = new QLabel( i18n( "Width:" ), penGroup ); + label = new TQLabel( i18n( "Width:" ), penGroup ); // grid->addWidget( label, 1, 0 ); - penWidth = new QSpinBox( 1, 10, 1, penGroup ); + penWidth = new TQSpinBox( 1, 10, 1, penGroup ); penWidth->setSuffix( i18n(" pt") ); penWidth->setValue( m_doc->presPen().width() ); //grid->addWidget( penWidth, 1, 1 ); @@ -156,33 +156,33 @@ void KPrPgConfDia::setupPageGeneral() void KPrPgConfDia::setupPageSlides() { - QFrame* slidesPage = addPage( i18n("&Slides") ); - QWhatsThis::add( slidesPage, i18n("<p>This dialog allows you to configure which slides " + TQFrame* slidesPage = addPage( i18n("&Slides") ); + TQWhatsThis::add( slidesPage, i18n("<p>This dialog allows you to configure which slides " "are used in the presentation. Slides that are not " "selected will not be displayed during the slide " "show.</p>") ); - QGridLayout *slidesLayout = new QGridLayout( slidesPage,7 , 2, 0, KDialog::spacingHint()); + TQGridLayout *slidesLayout = new TQGridLayout( slidesPage,7 , 2, 0, KDialog::spacingHint()); - QButtonGroup *group=new QVButtonGroup( slidesPage ); + TQButtonGroup *group=new TQVButtonGroup( slidesPage ); group->setRadioButtonExclusive( true ); - m_customSlide = new QRadioButton( i18n( "Custom slide show" ), group, "customslide" ); + m_customSlide = new TQRadioButton( i18n( "Custom slide show" ), group, "customslide" ); - connect( m_customSlide, SIGNAL( clicked () ), this, SLOT( radioButtonClicked() ) ); + connect( m_customSlide, TQT_SIGNAL( clicked () ), this, TQT_SLOT( radioButtonClicked() ) ); - QHBox *box = new QHBox( group ); + TQHBox *box = new TQHBox( group ); - m_labelCustomSlide = new QLabel( i18n( "Custom slide:" ),box ); + m_labelCustomSlide = new TQLabel( i18n( "Custom slide:" ),box ); - m_customSlideCombobox = new QComboBox( box ); + m_customSlideCombobox = new TQComboBox( box ); m_customSlideCombobox->insertStringList( m_doc->presentationList() ); - m_selectedSlide = new QRadioButton( i18n( "Selected pages:" ), group, "selectedslide" ); + m_selectedSlide = new TQRadioButton( i18n( "Selected pages:" ), group, "selectedslide" ); slidesLayout->addMultiCellWidget( group, 0,2,0,1 ); - connect( m_selectedSlide, SIGNAL( clicked () ), this, SLOT( radioButtonClicked() ) ); + connect( m_selectedSlide, TQT_SIGNAL( clicked () ), this, TQT_SLOT( radioButtonClicked() ) ); - slides = new QListView( slidesPage ); + slides = new TQListView( slidesPage ); slidesLayout->addMultiCellWidget( slides, 3, 3, 0, 1 ); slidesLayout->setRowStretch( 3, 10 ); slides->addColumn( i18n("Slide") ); @@ -192,24 +192,24 @@ void KPrPgConfDia::setupPageSlides() for ( int i = m_doc->getPageNums() - 1; i >= 0; --i ) { KPrPage *page=m_doc->pageList().at( i ); - QCheckListItem* item = new QCheckListItem( slides, + TQCheckListItem* item = new TQCheckListItem( slides, page->pageTitle(), - QCheckListItem::CheckBox ); + TQCheckListItem::CheckBox ); item->setOn( page->isSlideSelected() ); } - QHBox* buttonGroup = new QHBox( slidesPage ); + TQHBox* buttonGroup = new TQHBox( slidesPage ); buttonGroup->setSpacing( KDialog::spacingHint() ); - QPushButton* selectAllButton = new QPushButton( i18n( "Select &All" ), buttonGroup ); - connect( selectAllButton, SIGNAL( clicked() ), this, SLOT( selectAllSlides() ) ); + TQPushButton* selectAllButton = new TQPushButton( i18n( "Select &All" ), buttonGroup ); + connect( selectAllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectAllSlides() ) ); - QPushButton* deselectAllButton = new QPushButton( i18n( "&Deselect All" ), buttonGroup ); - connect( deselectAllButton, SIGNAL( clicked() ), this, SLOT( deselectAllSlides() ) ); + TQPushButton* deselectAllButton = new TQPushButton( i18n( "&Deselect All" ), buttonGroup ); + connect( deselectAllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deselectAllSlides() ) ); - QWidget* spacer = new QWidget( buttonGroup ); + TQWidget* spacer = new TQWidget( buttonGroup ); - spacer->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) ); + spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); slidesLayout->addMultiCellWidget( buttonGroup, 4, 4, 0, 1 ); if ( !m_doc->presentationName().isEmpty() ) @@ -269,19 +269,19 @@ bool KPrPgConfDia::getPresentationDuration() const return presentationDuration->isChecked(); } -QPen KPrPgConfDia::getPen() const +TQPen KPrPgConfDia::getPen() const { - return QPen( penColor->color(), penWidth->value() ); + return TQPen( penColor->color(), penWidth->value() ); } -QValueList<bool> KPrPgConfDia::getSelectedSlides() const +TQValueList<bool> KPrPgConfDia::getSelectedSlides() const { - QValueList<bool> selectedSlides; + TQValueList<bool> selectedSlides; - QListViewItem *item = slides->firstChild(); + TQListViewItem *item = slides->firstChild(); while( item ) { - QCheckListItem *checkItem = dynamic_cast<QCheckListItem*>( item ); + TQCheckListItem *checkItem = dynamic_cast<TQCheckListItem*>( item ); bool selected = false; if( checkItem ) selected = checkItem->isOn(); item = item->nextSibling(); @@ -292,10 +292,10 @@ QValueList<bool> KPrPgConfDia::getSelectedSlides() const void KPrPgConfDia::selectAllSlides() { - QListViewItem *item = slides->firstChild(); + TQListViewItem *item = slides->firstChild(); while( item ) { - QCheckListItem *checkItem = dynamic_cast<QCheckListItem*>( item ); + TQCheckListItem *checkItem = dynamic_cast<TQCheckListItem*>( item ); if( checkItem ) checkItem->setOn( true ); item = item->nextSibling(); } @@ -303,21 +303,21 @@ void KPrPgConfDia::selectAllSlides() void KPrPgConfDia::deselectAllSlides() { - QListViewItem *item = slides->firstChild(); + TQListViewItem *item = slides->firstChild(); while( item ) { - QCheckListItem *checkItem = dynamic_cast<QCheckListItem*>( item ); + TQCheckListItem *checkItem = dynamic_cast<TQCheckListItem*>( item ); if( checkItem ) checkItem->setOn( false ); item = item->nextSibling(); } } -QString KPrPgConfDia::presentationName() const +TQString KPrPgConfDia::presentationName() const { if ( m_customSlide->isChecked() ) return m_customSlideCombobox->currentText(); else - return QString::null; + return TQString(); } #include "KPrGradient.h" diff --git a/kpresenter/KPrPgConfDia.h b/kpresenter/KPrPgConfDia.h index e25fdf79..d322c6e9 100644 --- a/kpresenter/KPrPgConfDia.h +++ b/kpresenter/KPrPgConfDia.h @@ -24,54 +24,55 @@ #include "global.h" -#include <qmap.h> -#include <qpen.h> -#include <qvaluelist.h> +#include <tqmap.h> +#include <tqpen.h> +#include <tqvaluelist.h> #include <kdialogbase.h> class KPrDocument; -class QCheckBox; -class QComboBox; -class QColor; -class QListView; -class QRadioButton; -class QSpinBox; +class TQCheckBox; +class TQComboBox; +class TQColor; +class TQListView; +class TQRadioButton; +class TQSpinBox; class KColorButton; -class QSlider; +class TQSlider; class KPrPgConfDia : public KDialogBase { Q_OBJECT + TQ_OBJECT public: // constructor - destructor - KPrPgConfDia( QWidget* parent, KPrDocument* doc ); + KPrPgConfDia( TQWidget* tqparent, KPrDocument* doc ); ~KPrPgConfDia(); bool getInfiniteLoop() const; bool getShowEndOfPresentationSlide() const; bool getManualSwitch() const; bool getPresentationDuration() const; - QPen getPen() const; - QValueList<bool> getSelectedSlides() const; + TQPen getPen() const; + TQValueList<bool> getSelectedSlides() const; - QString presentationName() const; + TQString presentationName() const; protected: KPrDocument* m_doc; - QCheckBox *infiniteLoop, *presentationDuration, *endOfPresentationSlide; - QRadioButton *m_manualButton, *m_autoButton; + TQCheckBox *infiniteLoop, *presentationDuration, *endOfPresentationSlide; + TQRadioButton *m_manualButton, *m_autoButton; KColorButton* penColor; - QSpinBox* penWidth; - QComboBox *m_customSlideCombobox; - QListView *slides; - QRadioButton *m_customSlide, *m_selectedSlide; - QLabel *m_labelCustomSlide; + TQSpinBox* penWidth; + TQComboBox *m_customSlideCombobox; + TQListView *slides; + TQRadioButton *m_customSlide, *m_selectedSlide; + TQLabel *m_labelCustomSlide; void setupPageGeneral(); void setupPageSlides(); diff --git a/kpresenter/KPrPicturePreview.cpp b/kpresenter/KPrPicturePreview.cpp index 7dd8cf8c..7964b4bc 100644 --- a/kpresenter/KPrPicturePreview.cpp +++ b/kpresenter/KPrPicturePreview.cpp @@ -23,12 +23,12 @@ #include "KPrPicturePreview.h" -#include <qimage.h> -#include <qpainter.h> +#include <tqimage.h> +#include <tqpainter.h> -KPrPicturePreview::KPrPicturePreview( QWidget* parent, const char* name) -: QFrame( parent, name ) +KPrPicturePreview::KPrPicturePreview( TQWidget* tqparent, const char* name) +: TQFrame( tqparent, name ) , mirrorType( PM_NORMAL ) , depth( 0 ) , swapRGB( false ) @@ -40,12 +40,12 @@ KPrPicturePreview::KPrPicturePreview( QWidget* parent, const char* name) } -void KPrPicturePreview::drawContents( QPainter *painter ) +void KPrPicturePreview::drawContents( TQPainter *painter ) { - QSize ext = contentsRect().size(); + TQSize ext = contentsRect().size(); - QPixmap _pix = origPixmap; - QImage img( _pix.convertToImage().smoothScale( ext.width(),ext.height(), QImage::ScaleMin ) ); + TQPixmap _pix = origPixmap; + TQImage img( _pix.convertToImage().smoothScale( ext.width(),ext.height(), TQ_ScaleMin ) ); bool _horizontal = false; bool _vertical = false; @@ -61,7 +61,7 @@ void KPrPicturePreview::drawContents( QPainter *painter ) img = img.mirror( _horizontal, _vertical ); if ( depth != 0 ) { - QImage tmpImg = img.convertDepth( depth ); + TQImage tmpImg = img.convertDepth( depth ); if ( !tmpImg.isNull() ) img = tmpImg; } @@ -73,9 +73,9 @@ void KPrPicturePreview::drawContents( QPainter *painter ) if ( grayscal ) { if ( depth == 1 || depth == 8 ) { for ( int i = 0; i < img.numColors(); ++i ) { - QRgb rgb = img.color( i ); - int gray = qGray( rgb ); - rgb = qRgb( gray, gray, gray ); + TQRgb rgb = img.color( i ); + int gray = tqGray( rgb ); + rgb = tqRgb( gray, gray, gray ); img.setColor( i, rgb ); } } @@ -88,9 +88,9 @@ void KPrPicturePreview::drawContents( QPainter *painter ) for ( _x = 0; _x < _width; ++_x ) { for ( _y = 0; _y < _height; ++_y ) { if ( img.valid( _x, _y ) ) { - QRgb rgb = img.pixel( _x, _y ); - int gray = qGray( rgb ); - rgb = qRgb( gray, gray, gray ); + TQRgb rgb = img.pixel( _x, _y ); + int gray = tqGray( rgb ); + rgb = tqRgb( gray, gray, gray ); img.setPixel( _x, _y, rgb ); } } @@ -102,8 +102,8 @@ void KPrPicturePreview::drawContents( QPainter *painter ) if ( bright != 0 ) { if ( depth == 1 || depth == 8 ) { for ( int i = 0; i < img.numColors(); ++i ) { - QRgb rgb = img.color( i ); - QColor c( rgb ); + TQRgb rgb = img.color( i ); + TQColor c( rgb ); if ( bright > 0 ) rgb = c.light( 100 + bright ).rgb(); @@ -122,8 +122,8 @@ void KPrPicturePreview::drawContents( QPainter *painter ) for ( _x = 0; _x < _width; ++_x ) { for ( _y = 0; _y < _height; ++_y ) { if ( img.valid( _x, _y ) ) { - QRgb rgb = img.pixel( _x, _y ); - QColor c( rgb ); + TQRgb rgb = img.pixel( _x, _y ); + TQColor c( rgb ); if ( bright > 0 ) rgb = c.light( 100 + bright ).rgb(); @@ -139,15 +139,15 @@ void KPrPicturePreview::drawContents( QPainter *painter ) _pix.convertFromImage( img ); - QPixmap tmpPix( _pix.size() ); - tmpPix.fill( Qt::white ); + TQPixmap tmpPix( _pix.size() ); + tmpPix.fill( TQt::white ); - QPainter _p; + TQPainter _p; _p.begin( &tmpPix ); _p.drawPixmap( 0, 0, _pix ); _p.end(); - QSize _pixSize = _pix.size(); + TQSize _pixSize = _pix.size(); int _x = 0, _y = 0; int w = _pixSize.width(), h = _pixSize.height(); _x = ( ext.width() - w ) / 2; @@ -162,7 +162,7 @@ void KPrPicturePreview::slotNormalPicture() if ( mirrorType != PM_NORMAL ) { mirrorType = PM_NORMAL; - repaint( false ); + tqrepaint( false ); } } @@ -172,7 +172,7 @@ void KPrPicturePreview::slotHorizontalMirrorPicture() if ( mirrorType != PM_HORIZONTAL ) { mirrorType = PM_HORIZONTAL; - repaint( false ); + tqrepaint( false ); } } @@ -182,7 +182,7 @@ void KPrPicturePreview::slotVerticalMirrorPicture() if ( mirrorType != PM_VERTICAL ) { mirrorType = PM_VERTICAL; - repaint( false ); + tqrepaint( false ); } } @@ -192,7 +192,7 @@ void KPrPicturePreview::slotHorizontalAndVerticalMirrorPicture() if ( mirrorType != PM_HORIZONTALANDVERTICAL ) { mirrorType = PM_HORIZONTALANDVERTICAL; - repaint( false ); + tqrepaint( false ); } } @@ -202,7 +202,7 @@ void KPrPicturePreview::slotPictureDepth0() if ( depth !=0 ) { depth = 0; - repaint( false ); + tqrepaint( false ); } } @@ -212,7 +212,7 @@ void KPrPicturePreview::slotPictureDepth1() if ( depth != 1 ) { depth = 1; - repaint( false ); + tqrepaint( false ); } } @@ -222,7 +222,7 @@ void KPrPicturePreview::slotPictureDepth8() if ( depth != 8) { depth = 8; - repaint( false ); + tqrepaint( false ); } } @@ -232,7 +232,7 @@ void KPrPicturePreview::slotPictureDepth16() if ( depth != 16 ) { depth = 16; - repaint( false ); + tqrepaint( false ); } } @@ -242,7 +242,7 @@ void KPrPicturePreview::slotPictureDepth32() if ( depth !=32 ) { depth = 32; - repaint( false ); + tqrepaint( false ); } } @@ -252,7 +252,7 @@ void KPrPicturePreview::slotSwapRGBPicture( bool _on ) if ( swapRGB != _on ) { swapRGB = _on; - repaint( false ); + tqrepaint( false ); } } @@ -262,7 +262,7 @@ void KPrPicturePreview::slotGrayscalPicture( bool _on ) if ( grayscal != _on ) { grayscal = _on; - repaint( false ); + tqrepaint( false ); } } @@ -272,7 +272,7 @@ void KPrPicturePreview::slotBrightValue( int _value ) if ( bright != _value ) { bright = _value; - repaint( false ); + tqrepaint( false ); } } @@ -282,7 +282,7 @@ void KPrPicturePreview::setDepth( int _depth) if ( _depth != depth ) { depth = _depth; - repaint( false ); + tqrepaint( false ); } } @@ -292,15 +292,15 @@ void KPrPicturePreview::setMirrorType (PictureMirrorType _t) if ( mirrorType != _t ) { mirrorType = _t; - repaint( false ); + tqrepaint( false ); } } -void KPrPicturePreview::setPicturePixmap(const QPixmap &_pixmap) +void KPrPicturePreview::setPicturePixmap(const TQPixmap &_pixmap) { origPixmap = _pixmap; - repaint( false ); + tqrepaint( false ); } diff --git a/kpresenter/KPrPicturePreview.h b/kpresenter/KPrPicturePreview.h index abe70ca8..766025e7 100644 --- a/kpresenter/KPrPicturePreview.h +++ b/kpresenter/KPrPicturePreview.h @@ -24,21 +24,22 @@ #ifndef PICTUREPREVIEW_H #define PICTUREPREVIEW_H -#include <qframe.h> +#include <tqframe.h> #include "global.h" -class KPrPicturePreview : public QFrame +class KPrPicturePreview : public TQFrame { Q_OBJECT + TQ_OBJECT public: - KPrPicturePreview( QWidget* parent, const char* name); + KPrPicturePreview( TQWidget* tqparent, const char* name); ~KPrPicturePreview() {} void setDepth( int depth); void setMirrorType (PictureMirrorType _t); - void setPicturePixmap(const QPixmap &_pixmap); + void setPicturePixmap(const TQPixmap &_pixmap); int getDepth() const { return depth; } @@ -61,14 +62,14 @@ public slots: void slotBrightValue( int _value ); protected: - virtual void drawContents( QPainter *painter ); + virtual void drawContents( TQPainter *painter ); PictureMirrorType mirrorType; int depth; bool swapRGB; int bright; bool grayscal; - QPixmap origPixmap; + TQPixmap origPixmap; }; #endif /* PICTUREPREVIEW_H */ diff --git a/kpresenter/KPrPictureProperty.cpp b/kpresenter/KPrPictureProperty.cpp index c3492673..135cc189 100644 --- a/kpresenter/KPrPictureProperty.cpp +++ b/kpresenter/KPrPictureProperty.cpp @@ -24,29 +24,29 @@ #include "KPrPicturePreview.h" #include <knuminput.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlayout.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlayout.h> -KPrPictureProperty::KPrPictureProperty( QWidget *parent, const char *name, const QPixmap &pixmap, +KPrPictureProperty::KPrPictureProperty( TQWidget *tqparent, const char *name, const TQPixmap &pixmap, KPrPictureSettingCmd::PictureSettings pictureSettings ) -: QWidget( parent, name ) +: TQWidget( tqparent, name ) , m_pictureSettings( pictureSettings ) { - QVBoxLayout *layout = new QVBoxLayout( this ); - layout->addWidget( m_ui = new PicturePropertyUI( this ) ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->addWidget( m_ui = new PicturePropertyUI( this ) ); - connect( m_ui->depth0, SIGNAL( clicked() ), m_ui->picturePreview, SLOT( slotPictureDepth0() ) ); - connect( m_ui->depth1, SIGNAL( clicked() ), m_ui->picturePreview, SLOT( slotPictureDepth1() ) ); - connect( m_ui->depth8, SIGNAL( clicked() ), m_ui->picturePreview, SLOT( slotPictureDepth8() ) ); - connect( m_ui->depth16, SIGNAL( clicked() ), m_ui->picturePreview, SLOT( slotPictureDepth16() ) ); - connect( m_ui->depth32, SIGNAL( clicked() ), m_ui->picturePreview, SLOT( slotPictureDepth32() ) ); + connect( m_ui->depth0, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth0() ) ); + connect( m_ui->depth1, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth1() ) ); + connect( m_ui->depth8, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth8() ) ); + connect( m_ui->depth16, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth16() ) ); + connect( m_ui->depth32, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth32() ) ); - connect( m_ui->swapRGB, SIGNAL( toggled( bool ) ), m_ui->picturePreview, SLOT( slotSwapRGBPicture( bool ) ) ); + connect( m_ui->swapRGB, TQT_SIGNAL( toggled( bool ) ), m_ui->picturePreview, TQT_SLOT( slotSwapRGBPicture( bool ) ) ); - connect( m_ui->grayscale, SIGNAL( toggled( bool ) ), m_ui->picturePreview, SLOT( slotGrayscalPicture( bool ) ) ); + connect( m_ui->grayscale, TQT_SIGNAL( toggled( bool ) ), m_ui->picturePreview, TQT_SLOT( slotGrayscalPicture( bool ) ) ); - connect( m_ui->brightnessInput, SIGNAL( valueChanged( int ) ), m_ui->picturePreview, SLOT( slotBrightValue( int ) ) ); + connect( m_ui->brightnessInput, TQT_SIGNAL( valueChanged( int ) ), m_ui->picturePreview, TQT_SLOT( slotBrightValue( int ) ) ); m_ui->picturePreview->setPicturePixmap( pixmap ); diff --git a/kpresenter/KPrPictureProperty.h b/kpresenter/KPrPictureProperty.h index 5c1e4d7c..8dc7debe 100644 --- a/kpresenter/KPrPictureProperty.h +++ b/kpresenter/KPrPictureProperty.h @@ -21,18 +21,19 @@ #ifndef PICTUREPROPERTY_H #define PICTUREPROPERTY_H -#include <qwidget.h> +#include <tqwidget.h> #include "KPrCommand.h" class PicturePropertyUI; -class QPixmap; +class TQPixmap; -class KPrPictureProperty : public QWidget +class KPrPictureProperty : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrPictureProperty( QWidget *parent, const char *name, const QPixmap &pixmap, + KPrPictureProperty( TQWidget *tqparent, const char *name, const TQPixmap &pixmap, KPrPictureSettingCmd::PictureSettings pictureSettings ); ~KPrPictureProperty(); diff --git a/kpresenter/KPrPieObject.cpp b/kpresenter/KPrPieObject.cpp index 9ed85109..efbe6953 100644 --- a/kpresenter/KPrPieObject.cpp +++ b/kpresenter/KPrPieObject.cpp @@ -30,11 +30,11 @@ #include <kdebug.h> -#include <qregion.h> -#include <qpicture.h> -#include <qdom.h> -#include <qpainter.h> -#include <qbitmap.h> +#include <tqregion.h> +#include <tqpicture.h> +#include <tqdom.h> +#include <tqpainter.h> +#include <tqbitmap.h> using namespace std; KPrPieObject::KPrPieObject() @@ -46,8 +46,8 @@ KPrPieObject::KPrPieObject() p_len = 270 * 16; } -KPrPieObject::KPrPieObject( const KoPen &_pen, const QBrush &_brush, FillType _fillType, - const QColor &_gColor1, const QColor &_gColor2, BCType _gType, +KPrPieObject::KPrPieObject( const KoPen &_pen, const TQBrush &_brush, FillType _fillType, + const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType, PieType _pieType, int _p_angle, int _p_len, LineEnd _lineBegin, LineEnd _lineEnd, bool _unbalanced, int _xfactor, int _yfactor ) @@ -71,9 +71,9 @@ KPrPieObject &KPrPieObject::operator=( const KPrPieObject & ) return *this; } -QDomDocumentFragment KPrPieObject::save( QDomDocument& doc, double offset ) +TQDomDocumentFragment KPrPieObject::save( TQDomDocument& doc, double offset ) { - QDomDocumentFragment fragment=KPr2DObject::save(doc, offset); + TQDomDocumentFragment fragment=KPr2DObject::save(doc, offset); KPrStartEndLine::save( fragment, doc ); if (p_angle!=720) fragment.appendChild(KPrObject::createValueElement("PIEANGLE", p_angle, doc)); @@ -129,11 +129,11 @@ const char * KPrPieObject::getOasisElementName() const } -void KPrPieObject::loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info) +void KPrPieObject::loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info) { - kdDebug()<<"void KPrPieObject::loadOasis(const QDomElement &element) ***************\n"; + kdDebug()<<"void KPrPieObject::loadOasis(const TQDomElement &element) ***************\n"; KPr2DObject::loadOasis(element, context, info); - QString kind = element.attributeNS( KoXmlNS::draw, "kind", QString::null ); + TQString kind = element.attributeNS( KoXmlNS::draw, "kind", TQString() ); if ( kind == "section" ) pieType = PT_PIE; else if ( kind == "cut" ) @@ -142,21 +142,21 @@ void KPrPieObject::loadOasis(const QDomElement &element, KoOasisContext & contex pieType =PT_ARC; else { - kdDebug()<<" KPrPieObject::loadOasis(const QDomElement &element) type indefined :"<<kind<<endl; + kdDebug()<<" KPrPieObject::loadOasis(const TQDomElement &element) type indefined :"<<kind<<endl; pieType = PT_PIE; } kdDebug()<<" type of pie object :"<<( ( pieType == PT_PIE ) ? "pie" : ( pieType == PT_CHORD )?"cut" : "arc" )<<endl; - int start = (int) ( element.attributeNS( KoXmlNS::draw, "start-angle", QString::null ).toDouble() ); + int start = (int) ( element.attributeNS( KoXmlNS::draw, "start-angle", TQString() ).toDouble() ); p_angle=start*16; - int end = (int) ( element.attributeNS( KoXmlNS::draw, "end-angle", QString::null ).toDouble() ); + int end = (int) ( element.attributeNS( KoXmlNS::draw, "end-angle", TQString() ).toDouble() ); if ( end < start ) p_len = ( ( 360 - start + end ) * 16 ); else p_len = ( ( end - start ) * 16 ); - kdDebug()<<"KPrPieObject::loadOasis(const QDomElement &element) : p_angle :"<<p_angle<<" p_len :"<<p_len<<endl; + kdDebug()<<"KPrPieObject::loadOasis(const TQDomElement &element) : p_angle :"<<p_angle<<" p_len :"<<p_len<<endl; if ( pieType == PT_ARC ) { loadOasisMarkerElement( context, "marker-start", lineBegin ); @@ -164,11 +164,11 @@ void KPrPieObject::loadOasis(const QDomElement &element, KoOasisContext & contex } } -double KPrPieObject::load(const QDomElement &element) +double KPrPieObject::load(const TQDomElement &element) { double offset=KPr2DObject::load(element); KPrStartEndLine::load( element ); - QDomElement e=element.namedItem("PIEANGLE").toElement(); + TQDomElement e=element.namedItem("PIEANGLE").toElement(); if(!e.isNull()) { int tmp=0; if(e.hasAttribute("value")) @@ -195,20 +195,20 @@ double KPrPieObject::load(const QDomElement &element) return offset; } -void KPrPieObject::paint( QPainter* _painter, KoTextZoomHandler*_zoomHandler, +void KPrPieObject::paint( TQPainter* _painter, KoTextZoomHandler*_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour ) { double ow = ext.width(); double oh = ext.height(); - double pw = ( ( pen.style() == Qt::NoPen ) ? 1 : pen.pointWidth() ) / 2.0; + double pw = ( ( pen.style() == TQt::NoPen ) ? 1 : pen.pointWidth() ) / 2.0; if ( drawContour ) { - QPen pen3( Qt::black, 1, Qt::DotLine ); + TQPen pen3( TQt::black, 1, TQt::DotLine ); _painter->setPen( pen3 ); - _painter->setRasterOp( Qt::NotXorROP ); + _painter->setRasterOp( TQt::NotXorROP ); } else { - QPen pen2 = pen.zoomedPen( _zoomHandler ); + TQPen pen2 = pen.zoomedPen( _zoomHandler ); _painter->setPen( pen2 ); if ( drawingShadow || getFillType() == FT_BRUSH || !gradient ) { @@ -218,7 +218,7 @@ void KPrPieObject::paint( QPainter* _painter, KoTextZoomHandler*_zoomHandler, { if ( pieType != PT_ARC ) { - QSize size( _zoomHandler->zoomSize( ext ) ); + TQSize size( _zoomHandler->zoomSize( ext ) ); if ( m_redrawGradientPix || gradient->size() != size ) { @@ -226,16 +226,16 @@ void KPrPieObject::paint( QPainter* _painter, KoTextZoomHandler*_zoomHandler, gradient->setSize( size ); m_gradientPix.resize ( size ); - m_gradientPix.fill( Qt::white ); - QPainter p; + m_gradientPix.fill( TQt::white ); + TQPainter p; p.begin( &m_gradientPix ); p.drawPixmap( 0, 0, gradient->pixmap() ); p.end(); - QBitmap mask( size, true ); - p.begin( &mask ); - p.setPen( QPen( Qt::color1 ) ); - p.setBrush( QBrush( Qt::color1 ) ); + TQBitmap tqmask( size, true ); + p.begin( &tqmask ); + p.setPen( TQPen( TQt::color1 ) ); + p.setBrush( TQBrush( TQt::color1 ) ); if ( pieType == PT_CHORD ) { p.drawChord( _zoomHandler->zoomItX(pw), _zoomHandler->zoomItY(pw), @@ -249,10 +249,10 @@ void KPrPieObject::paint( QPainter* _painter, KoTextZoomHandler*_zoomHandler, _zoomHandler->zoomItY( oh - 2 * pw), p_angle, p_len ); } p.end(); - m_gradientPix.setMask( mask ); + m_gradientPix.setMask( tqmask ); } _painter->drawPixmap( 0, 0, m_gradientPix, 0, 0, size.width(), size.height() ); - _painter->setBrush( Qt::NoBrush ); + _painter->setBrush( TQt::NoBrush ); } } if ( pieType == PT_ARC ) diff --git a/kpresenter/KPrPieObject.h b/kpresenter/KPrPieObject.h index 0bb75e90..0e32ad2b 100644 --- a/kpresenter/KPrPieObject.h +++ b/kpresenter/KPrPieObject.h @@ -32,8 +32,8 @@ class KPrPieObject : public KPr2DObject, public KPrStartEndLine { public: KPrPieObject(); - KPrPieObject( const KoPen &_pen, const QBrush &_brush, FillType _fillType, - const QColor &_gColor1, const QColor &_gColor2, BCType _gType, PieType _pieType, + KPrPieObject( const KoPen &_pen, const TQBrush &_brush, FillType _fillType, + const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType, PieType _pieType, int _p_angle, int _p_len, LineEnd _lineBegin, LineEnd _lineEnd, bool _unbalanced, int _xfactor, int _yfactor ); virtual ~KPrPieObject() {} @@ -53,7 +53,7 @@ public: virtual ObjType getType() const { return OT_PIE; } - virtual QString getTypeString() const + virtual TQString getTypeString() const { switch ( pieType ) { case PT_PIE: @@ -66,7 +66,7 @@ public: return i18n("Chord"); break; } - return QString::null; + return TQString(); } virtual PieType getPieType() const @@ -80,11 +80,11 @@ public: virtual LineEnd getLineEnd() const { return lineEnd; } - virtual QDomDocumentFragment save( QDomDocument& doc, double offset ); + virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset ); - virtual double load(const QDomElement &element); + virtual double load(const TQDomElement &element); virtual void flip(bool horizontal ); - virtual void loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); + virtual void loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); virtual KoSize getRealSize() const; virtual KoPoint getRealOrig() const; @@ -94,7 +94,7 @@ protected: virtual bool saveOasisObjectAttributes( KPOasisSaveContext &sc ) const; virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const; - virtual void paint( QPainter *_painter, KoTextZoomHandler*_zoomHandler, + virtual void paint( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour ); void setMinMax( double &min_x, double &min_y, double &max_x, double &max_y, KoPoint point ) const; diff --git a/kpresenter/KPrPieObjectIface.cpp b/kpresenter/KPrPieObjectIface.cpp index 080b188c..e5a3d4f4 100644 --- a/kpresenter/KPrPieObjectIface.cpp +++ b/kpresenter/KPrPieObjectIface.cpp @@ -52,7 +52,7 @@ int KPrPieObjectIface::pieLength() const return obj->getPieLength(); } -void KPrPieObjectIface::setPieType( const QString & type ) +void KPrPieObjectIface::setPieType( const TQString & type ) { if( type =="Pie") obj->setPieType(PT_PIE); @@ -62,12 +62,12 @@ void KPrPieObjectIface::setPieType( const QString & type ) obj->setPieType(PT_CHORD); } -void KPrPieObjectIface::setLineBegin( const QString & type) +void KPrPieObjectIface::setLineBegin( const TQString & type) { obj->setLineBegin(lineEndBeginFromString( type )); } -void KPrPieObjectIface::setLineEnd( const QString & type) +void KPrPieObjectIface::setLineEnd( const TQString & type) { obj->setLineEnd(lineEndBeginFromString( type )); } diff --git a/kpresenter/KPrPieObjectIface.h b/kpresenter/KPrPieObjectIface.h index 362ae0d8..efeeef28 100644 --- a/kpresenter/KPrPieObjectIface.h +++ b/kpresenter/KPrPieObjectIface.h @@ -24,7 +24,7 @@ #include <dcopobject.h> #include <dcopref.h> #include "KPrObject2DIface.h" -#include <qstring.h> +#include <tqstring.h> class KPrPieObject; @@ -39,9 +39,9 @@ k_dcop: virtual void setPieLength( int _p_len ); virtual int pieAngle() const; virtual int pieLength() const; - void setPieType( const QString & type ); - virtual void setLineBegin( const QString &); - virtual void setLineEnd(const QString & ); + void setPieType( const TQString & type ); + virtual void setLineBegin( const TQString &); + virtual void setLineEnd(const TQString & ); void horizontalFlip(); void verticalFlip(); diff --git a/kpresenter/KPrPiePreview.cpp b/kpresenter/KPrPiePreview.cpp index e9feb9ef..d7091b26 100644 --- a/kpresenter/KPrPiePreview.cpp +++ b/kpresenter/KPrPiePreview.cpp @@ -22,23 +22,23 @@ #include "KPrPiePreview.h" -#include <qpainter.h> +#include <tqpainter.h> -KPrPiePreview::KPrPiePreview( QWidget* parent, const char* name ) - : QFrame( parent, name ) +KPrPiePreview::KPrPiePreview( TQWidget* tqparent, const char* name ) + : TQFrame( tqparent, name ) { setFrameStyle( WinPanel | Sunken ); setBackgroundColor( white ); angle = 720; //45 * 16 len = 1440; //90 * 16 - pen = QPen( black ); - brush = QBrush( white ); + pen = TQPen( black ); + brush = TQBrush( white ); type = PT_PIE; setMinimumSize( 200, 100 ); } -void KPrPiePreview::drawContents( QPainter* painter ) +void KPrPiePreview::drawContents( TQPainter* painter ) { int ow = width() - 8; int oh = height() - 8; diff --git a/kpresenter/KPrPiePreview.h b/kpresenter/KPrPiePreview.h index 4e796be9..8ac068a2 100644 --- a/kpresenter/KPrPiePreview.h +++ b/kpresenter/KPrPiePreview.h @@ -23,36 +23,37 @@ #ifndef PIEPREVIEW_H #define PIEPREVIEW_H -#include <qframe.h> -#include <qpen.h> -#include <qbrush.h> +#include <tqframe.h> +#include <tqpen.h> +#include <tqbrush.h> #include "global.h" -class KPrPiePreview : public QFrame +class KPrPiePreview : public TQFrame { Q_OBJECT + TQ_OBJECT public: - KPrPiePreview( QWidget* parent, const char* ); + KPrPiePreview( TQWidget* tqparent, const char* ); ~KPrPiePreview() {} void setAngle( int _angle ) - { angle = _angle; repaint( true ); } + { angle = _angle; tqrepaint( true ); } void setLength( int _len ) - { len = _len; repaint( true ); } + { len = _len; tqrepaint( true ); } void setType( PieType _type ) - { type = _type; repaint( true ); } - void setPenBrush( const QPen &_pen, const QBrush &_brush ) - { pen = _pen; brush = _brush; repaint( true ); } + { type = _type; tqrepaint( true ); } + void setPenBrush( const TQPen &_pen, const TQBrush &_brush ) + { pen = _pen; brush = _brush; tqrepaint( true ); } protected: - void drawContents( QPainter* ); + void drawContents( TQPainter* ); int angle, len; PieType type; - QPen pen; - QBrush brush; + TQPen pen; + TQBrush brush; }; #endif /* PIEPREVIEW_H */ diff --git a/kpresenter/KPrPieProperty.cpp b/kpresenter/KPrPieProperty.cpp index 6aeffe3f..44996750 100644 --- a/kpresenter/KPrPieProperty.cpp +++ b/kpresenter/KPrPieProperty.cpp @@ -20,7 +20,7 @@ #include "KPrPieProperty.h" -#include <qlayout.h> +#include <tqlayout.h> #include <kcombobox.h> #include <klocale.h> @@ -31,21 +31,21 @@ #include "KPrPiePreview.h" -KPrPieProperty::KPrPieProperty( QWidget *parent, const char *name, KPrPieValueCmd::PieValues pieValues ) -: QWidget( parent, name ) +KPrPieProperty::KPrPieProperty( TQWidget *tqparent, const char *name, KPrPieValueCmd::PieValues pieValues ) +: TQWidget( tqparent, name ) , m_pieValues( pieValues ) { - QVBoxLayout *layout = new QVBoxLayout( this ); - layout->addWidget( m_ui = new PiePropertyUI( this ) ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->addWidget( m_ui = new PiePropertyUI( this ) ); m_ui->typeCombo->insertItem( i18n( "Pie" ) ); m_ui->typeCombo->insertItem( i18n( "Arc" ) ); m_ui->typeCombo->insertItem( i18n( "Chord" ) ); - connect( m_ui->typeCombo, SIGNAL( activated( int ) ), this, SLOT( slotTypeChanged( int ) ) ); + connect( m_ui->typeCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotTypeChanged( int ) ) ); - connect( m_ui->angleInput, SIGNAL( valueChanged( int ) ), this, SLOT( slotAngleChanged( int ) ) ); - connect( m_ui->lengthInput, SIGNAL( valueChanged( int ) ), this, SLOT( slotLengthChanged( int ) ) ); + connect( m_ui->angleInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotAngleChanged( int ) ) ); + connect( m_ui->lengthInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotLengthChanged( int ) ) ); slotReset(); } diff --git a/kpresenter/KPrPieProperty.h b/kpresenter/KPrPieProperty.h index 5507222b..82542fc0 100644 --- a/kpresenter/KPrPieProperty.h +++ b/kpresenter/KPrPieProperty.h @@ -21,17 +21,18 @@ #ifndef PIEPROPERTY_H #define PIEPROPERTY_H -#include <qwidget.h> +#include <tqwidget.h> #include "KPrCommand.h" class PiePropertyUI; -class KPrPieProperty : public QWidget +class KPrPieProperty : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrPieProperty( QWidget *parent, const char *name, KPrPieValueCmd::PieValues pieValues ); + KPrPieProperty( TQWidget *tqparent, const char *name, KPrPieValueCmd::PieValues pieValues ); ~KPrPieProperty(); int getPiePropertyChange() const; diff --git a/kpresenter/KPrPixmapObject.cpp b/kpresenter/KPrPixmapObject.cpp index 34e3ff3f..d64c5b60 100644 --- a/kpresenter/KPrPixmapObject.cpp +++ b/kpresenter/KPrPixmapObject.cpp @@ -25,14 +25,14 @@ #include <stdlib.h> #include <float.h> -#include <qbuffer.h> -#include <qpainter.h> -#include <qwmatrix.h> -#include <qfileinfo.h> -#include <qpixmap.h> -#include <qdom.h> -#include <qimage.h> -#include <qbitmap.h> +#include <tqbuffer.h> +#include <tqpainter.h> +#include <tqwmatrix.h> +#include <tqfileinfo.h> +#include <tqpixmap.h> +#include <tqdom.h> +#include <tqimage.h> +#include <tqbitmap.h> #include <kdebug.h> #include <kimageeffect.h> @@ -53,18 +53,18 @@ KPrPixmapObject::KPrPixmapObject( KoPictureCollection *_imageCollection ) : KPr2DObject() { imageCollection = _imageCollection; - pen = KoPen( Qt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, Qt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; grayscal = false; bright = 0; m_effect = IE_NONE; - m_ie_par1 = QVariant(); - m_ie_par2 = QVariant(); - m_ie_par3 = QVariant(); - // Forbid QPixmap to cache the X-Window resources (Yes, it is slower!) - m_cachedPixmap.setOptimization(QPixmap::MemoryOptim); + m_ie_par1 = TQVariant(); + m_ie_par2 = TQVariant(); + m_ie_par3 = TQVariant(); + // Forbid TQPixmap to cache the X-Window resources (Yes, it is slower!) + m_cachedPixmap.setOptimization(TQPixmap::MemoryOptim); keepRatio = true; } @@ -74,18 +74,18 @@ KPrPixmapObject::KPrPixmapObject( KoPictureCollection *_imageCollection, const K imageCollection = _imageCollection; ext = KoSize(); // invalid size means unset - pen = KoPen( Qt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, Qt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; grayscal = false; bright = 0; m_effect = IE_NONE; - m_ie_par1 = QVariant(); - m_ie_par2 = QVariant(); - m_ie_par3 = QVariant(); - // Forbid QPixmap to cache the X-Window resources (Yes, it is slower!) - m_cachedPixmap.setOptimization(QPixmap::MemoryOptim); + m_ie_par1 = TQVariant(); + m_ie_par2 = TQVariant(); + m_ie_par3 = TQVariant(); + // Forbid TQPixmap to cache the X-Window resources (Yes, it is slower!) + m_cachedPixmap.setOptimization(TQPixmap::MemoryOptim); setPicture( key ); } @@ -97,9 +97,9 @@ DCOPObject* KPrPixmapObject::dcopObject() return dcop; } -QString KPrPixmapObject::convertValueToPercent( int val ) const +TQString KPrPixmapObject::convertValueToPercent( int val ) const { - return QString::number( val )+"%"; + return TQString::number( val )+"%"; } void KPrPixmapObject::saveOasisPictureElement( KoGenStyle &styleobjectauto ) const @@ -122,7 +122,7 @@ void KPrPixmapObject::saveOasisPictureElement( KoGenStyle &styleobjectauto ) con case IE_CHANNEL_INTENSITY: { //for the moment kpresenter support just one channel - QString percent = convertValueToPercent( m_ie_par1.toInt() ); + TQString percent = convertValueToPercent( m_ie_par1.toInt() ); KImageEffect::RGBComponent channel = static_cast<KImageEffect::RGBComponent>( m_ie_par2.toInt() ); switch( channel ) { @@ -221,12 +221,12 @@ const char * KPrPixmapObject::getOasisElementName() const // Deprecated, same as KPrPixmapObject::loadPicture -void KPrPixmapObject::loadImage( const QString & fileName ) +void KPrPixmapObject::loadImage( const TQString & fileName ) { loadPicture( fileName ); } -void KPrPixmapObject::loadPicture( const QString & fileName ) +void KPrPixmapObject::loadPicture( const TQString & fileName ) { image = imageCollection->loadPicture( fileName ); } @@ -257,14 +257,14 @@ void KPrPixmapObject::reload( void ) } } -QDomDocumentFragment KPrPixmapObject::save( QDomDocument& doc, double offset ) +TQDomDocumentFragment KPrPixmapObject::save( TQDomDocument& doc, double offset ) { - QDomDocumentFragment fragment=KPr2DObject::save(doc, offset); - QDomElement elem=doc.createElement("KEY"); + TQDomDocumentFragment fragment=KPr2DObject::save(doc, offset); + TQDomElement elem=doc.createElement("KEY"); image.getKey().saveAttributes(elem); fragment.appendChild(elem); - QDomElement elemSettings = doc.createElement( "PICTURESETTINGS" ); + TQDomElement elemSettings = doc.createElement( "PICTURESETTINGS" ); elemSettings.setAttribute( "mirrorType", static_cast<int>( mirrorType ) ); elemSettings.setAttribute( "depth", depth ); @@ -274,7 +274,7 @@ QDomDocumentFragment KPrPixmapObject::save( QDomDocument& doc, double offset ) fragment.appendChild( elemSettings ); if (m_effect!=IE_NONE) { - QDomElement imageEffects = doc.createElement("EFFECTS"); + TQDomElement imageEffects = doc.createElement("EFFECTS"); imageEffects.setAttribute("type", static_cast<int>(m_effect)); if (m_ie_par1.isValid()) imageEffects.setAttribute("param1", m_ie_par1.toString()); @@ -299,43 +299,43 @@ void KPrPixmapObject::loadOasisPictureEffect(KoOasisContext & context ) if ( styleStack.hasAttributeNS( KoXmlNS::draw, "contrast" ) ) { - QString str( styleStack.attributeNS( KoXmlNS::draw, "contrast" ) ); + TQString str( styleStack.attributeNS( KoXmlNS::draw, "contrast" ) ); str = str.remove( '%' ); int val = str.toInt(); m_effect = IE_CONTRAST; val = ( int )( 255.0 *val/100.0 ); - m_ie_par1 = QVariant(val); + m_ie_par1 = TQVariant(val); } if ( styleStack.hasAttributeNS( KoXmlNS::draw, "red" ) && styleStack.attributeNS( KoXmlNS::draw, "red" ) != "0%" ) { - QString str( styleStack.attributeNS( KoXmlNS::draw, "red" ) ); + TQString str( styleStack.attributeNS( KoXmlNS::draw, "red" ) ); str = str.remove( '%' ); int val = str.toInt(); m_effect = IE_CHANNEL_INTENSITY; - m_ie_par1 = QVariant(val); - m_ie_par2 = QVariant( ( int )KImageEffect::Red ); + m_ie_par1 = TQVariant(val); + m_ie_par2 = TQVariant( ( int )KImageEffect::Red ); } if ( styleStack.hasAttributeNS( KoXmlNS::draw, "green" ) && styleStack.attributeNS( KoXmlNS::draw, "green" ) != "0%" ) { - QString str( styleStack.attributeNS( KoXmlNS::draw, "green" ) ); + TQString str( styleStack.attributeNS( KoXmlNS::draw, "green" ) ); str = str.remove( '%' ); int val = str.toInt(); m_effect = IE_CHANNEL_INTENSITY; - m_ie_par1 = QVariant(val); - m_ie_par2 = QVariant( ( int )KImageEffect::Green ); + m_ie_par1 = TQVariant(val); + m_ie_par2 = TQVariant( ( int )KImageEffect::Green ); } if ( styleStack.hasAttributeNS( KoXmlNS::draw, "blue" ) && styleStack.attributeNS( KoXmlNS::draw, "blue" ) != "0%" ) { - QString str( styleStack.attributeNS( KoXmlNS::draw, "blue" ) ); + TQString str( styleStack.attributeNS( KoXmlNS::draw, "blue" ) ); str = str.remove( '%' ); int val = str.toInt(); m_effect = IE_CHANNEL_INTENSITY; - m_ie_par1 = QVariant(val); - m_ie_par2 = QVariant( ( int )KImageEffect::Blue ); + m_ie_par1 = TQVariant(val); + m_ie_par2 = TQVariant( ( int )KImageEffect::Blue ); } if ( styleStack.hasAttributeNS( KoXmlNS::draw, "luminance" ) ) { - QString str( styleStack.attributeNS( KoXmlNS::draw, "luminance" ) ); + TQString str( styleStack.attributeNS( KoXmlNS::draw, "luminance" ) ); str = str.remove( '%' ); bright = str.toInt(); } @@ -348,24 +348,24 @@ void KPrPixmapObject::fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainS saveOasisPictureElement( styleObjectAuto ); } -void KPrPixmapObject::loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info) +void KPrPixmapObject::loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info) { //load it into kpresenter_doc KPr2DObject::loadOasis( element, context, info ); loadOasisPictureEffect( context ); - QDomNode imageBox = KoDom::namedItemNS( element, KoXmlNS::draw, "image" ); - const QString href( imageBox.toElement().attributeNS( KoXmlNS::xlink, "href", QString::null) ); + TQDomNode imageBox = KoDom::namedItemNS( element, KoXmlNS::draw, "image" ); + const TQString href( imageBox.toElement().attributeNS( KoXmlNS::xlink, "href", TQString()) ); kdDebug()<<" href: "<<href<<endl; if ( !href.isEmpty() /*&& href[0] == '#'*/ ) { - QString strExtension; - const int result=href.findRev("."); + TQString strExtension; + const int result=href.tqfindRev("."); if (result>=0) { strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } - QString filename(href/*.mid(1)*/); - const KoPictureKey key(filename, QDateTime::currentDateTime(Qt::UTC)); + TQString filename(href/*.mid(1)*/); + const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC)); image.setKey(key); KoStore* store = context.store(); @@ -382,10 +382,10 @@ void KPrPixmapObject::loadOasis(const QDomElement &element, KoOasisContext & con } -double KPrPixmapObject::load(const QDomElement &element) +double KPrPixmapObject::load(const TQDomElement &element) { double offset=KPr2DObject::load(element); - QDomElement e=element.namedItem("KEY").toElement(); + TQDomElement e=element.namedItem("KEY").toElement(); if(!e.isNull()) { KoPictureKey key; key.loadAttributes( e ); @@ -404,8 +404,8 @@ double KPrPixmapObject::load(const QDomElement &element) } } else { bool openPic = true; - QString _data; - QString _fileName; + TQString _data; + TQString _fileName; if(e.hasAttribute("data")) _data=e.attribute("data"); if ( _data.isEmpty() ) @@ -416,12 +416,12 @@ double KPrPixmapObject::load(const QDomElement &element) _fileName=e.attribute("filename"); if ( !_fileName.isEmpty() ) { - if ( int _envVarB = _fileName.find( '$' ) >= 0 ) + if ( int _envVarB = _fileName.tqfind( '$' ) >= 0 ) { - int _envVarE = _fileName.find( '/', _envVarB ); - // ### FIXME: it should be QString::local8Bit instead of QFile::encodeName, shouldn't it? - QString path = getenv( QFile::encodeName(_fileName.mid( _envVarB, _envVarE-_envVarB )) ); - _fileName.replace( _envVarB-1, _envVarE-_envVarB+1, path ); + int _envVarE = _fileName.tqfind( '/', _envVarB ); + // ### FIXME: it should be TQString::local8Bit instead of TQFile::encodeName, shouldn't it? + TQString path = getenv( TQFile::encodeName(_fileName.mid( _envVarB, _envVarE-_envVarB )) ); + _fileName.tqreplace( _envVarB-1, _envVarE-_envVarB+1, path ); } } @@ -433,10 +433,10 @@ double KPrPixmapObject::load(const QDomElement &element) KoPictureKey key( _fileName ); image.clear(); image.setKey(key); - QByteArray rawData=_data.utf8(); // XPM is normally ASCII, therefore UTF-8 + TQByteArray rawData=_data.utf8(); // XPM is normally ASCII, therefore UTF-8 rawData[rawData.size()-1]=char(10); // Replace the NULL character by a LINE FEED - QBuffer buffer(rawData); // ### TODO: open? - image.loadXpm(&buffer); + TQBuffer buffer(rawData); // ### TODO: open? + image.loadXpm(TQT_TQIODEVICE(&buffer)); } } } @@ -479,17 +479,17 @@ double KPrPixmapObject::load(const QDomElement &element) if (e.hasAttribute("type")) m_effect = static_cast<ImageEffect>(e.attribute("type").toInt()); if (e.hasAttribute("param1")) - m_ie_par1 = QVariant(e.attribute("param1")); + m_ie_par1 = TQVariant(e.attribute("param1")); else - m_ie_par1 = QVariant(); + m_ie_par1 = TQVariant(); if (e.hasAttribute("param2")) - m_ie_par2 = QVariant(e.attribute("param2")); + m_ie_par2 = TQVariant(e.attribute("param2")); else - m_ie_par2 = QVariant(); + m_ie_par2 = TQVariant(); if (e.hasAttribute("param3")) - m_ie_par3 = QVariant(e.attribute("param3")); + m_ie_par3 = TQVariant(e.attribute("param3")); else - m_ie_par3 = QVariant(); + m_ie_par3 = TQVariant(); } else m_effect = IE_NONE; @@ -497,7 +497,7 @@ double KPrPixmapObject::load(const QDomElement &element) return offset; } -void KPrPixmapObject::drawShadow( QPainter* _painter, KoZoomHandler* _zoomHandler) +void KPrPixmapObject::drawShadow( TQPainter* _painter, KoZoomHandler* _zoomHandler) { const double ox = orig.x(); const double oy = orig.y(); @@ -506,7 +506,7 @@ void KPrPixmapObject::drawShadow( QPainter* _painter, KoZoomHandler* _zoomHandle _painter->save(); - QPen pen2 = pen.zoomedPen( _zoomHandler ); + TQPen pen2 = pen.zoomedPen( _zoomHandler ); _painter->setPen( pen2 ); _painter->setBrush( getBrush() ); @@ -516,24 +516,24 @@ void KPrPixmapObject::drawShadow( QPainter* _painter, KoZoomHandler* _zoomHandle getShadowCoords( sx, sy ); _painter->translate( _zoomHandler->zoomItX( ox ), _zoomHandler->zoomItY( oy ) ); - _painter->setPen( QPen( shadowColor ) ); + _painter->setPen( TQPen( shadowColor ) ); _painter->setBrush( shadowColor ); if ( kAbs(angle) <= DBL_EPSILON ) _painter->drawRect( _zoomHandler->zoomItX( sx ), _zoomHandler->zoomItY( sy ), _zoomHandler->zoomItX( ext.width() ), _zoomHandler->zoomItY( ext.height() ) ); else { - QSize bs = QSize( _zoomHandler->zoomItX( ow ), _zoomHandler->zoomItY( oh ) ); - QRect br = QRect( 0, 0, bs.width(), bs.height() ); + TQSize bs = TQSize( _zoomHandler->zoomItX( ow ), _zoomHandler->zoomItY( oh ) ); + TQRect br = TQRect( 0, 0, bs.width(), bs.height() ); int pw = br.width(); int ph = br.height(); - QRect rr = br; + TQRect rr = br; int pixYPos = -rr.y(); int pixXPos = -rr.x(); - br.moveTopLeft( QPoint( -br.width() / 2, -br.height() / 2 ) ); - rr.moveTopLeft( QPoint( -rr.width() / 2, -rr.height() / 2 ) ); + br.moveTopLeft( TQPoint( -br.width() / 2, -br.height() / 2 ) ); + rr.moveTopLeft( TQPoint( -rr.width() / 2, -rr.height() / 2 ) ); - QWMatrix m; + TQWMatrix m; m.translate( pw / 2, ph / 2 ); m.rotate( angle ); m.translate( rr.left() + pixXPos + _zoomHandler->zoomItX( sx ), @@ -547,23 +547,23 @@ void KPrPixmapObject::drawShadow( QPainter* _painter, KoZoomHandler* _zoomHandle _painter->restore(); } -QPixmap KPrPixmapObject::generatePixmap(KoZoomHandler*_zoomHandler) +TQPixmap KPrPixmapObject::generatePixmap(KoZoomHandler*_zoomHandler) { - const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1 : pen.width() ) / 2.0 ); + const double penw = _zoomHandler->zoomItX( ( ( pen.style() == TQt::NoPen ) ? 1 : pen.width() ) / 2.0 ); - QSize size( _zoomHandler->zoomSize( ext ) ); + TQSize size( _zoomHandler->zoomSize( ext ) ); //kdDebug(33001) << "KPrPixmapObject::generatePixmap size= " << size << endl; - QPixmap pixmap(size); - QPainter paint; + TQPixmap pixmap(size); + TQPainter paint; paint.begin( &pixmap ); - pixmap.fill( Qt::white ); + pixmap.fill( TQt::white ); // Draw background - paint.setPen( Qt::NoPen ); + paint.setPen( TQt::NoPen ); paint.setBrush( getBrush() ); - QRect rect( (int)( penw ), (int)( penw ), + TQRect rect( (int)( penw ), (int)( penw ), (int)( _zoomHandler->zoomItX( ext.width() ) - 2.0 * penw ), (int)( _zoomHandler->zoomItY( ext.height() ) - 2.0 * penw ) ); @@ -583,7 +583,7 @@ QPixmap KPrPixmapObject::generatePixmap(KoZoomHandler*_zoomHandler) image.clearCache(); // Release the memoy of the picture cache image.setAlphaBuffer(true); - QBitmap tmpMask; + TQBitmap tmpMask; tmpMask = image.createAlphaMask().scale(size); pixmap.setMask(tmpMask); @@ -591,7 +591,7 @@ QPixmap KPrPixmapObject::generatePixmap(KoZoomHandler*_zoomHandler) return pixmap; } -void KPrPixmapObject::draw( QPainter *_painter, KoTextZoomHandler*_zoomHandler, +void KPrPixmapObject::draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, int pageNum, SelectionMode selectionMode, bool drawContour ) { if ( image.isNull() ) return; @@ -603,24 +603,24 @@ void KPrPixmapObject::draw( QPainter *_painter, KoTextZoomHandler*_zoomHandler, const double oy = orig.y(); const double ow = ext.width(); const double oh = ext.height(); - const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1.0 : pen.width() ) / 2.0 ); + const double penw = _zoomHandler->zoomItX( ( ( pen.style() == TQt::NoPen ) ? 1.0 : pen.width() ) / 2.0 ); _painter->save(); _painter->translate( _zoomHandler->zoomItX( ox ), _zoomHandler->zoomItY( oy ) ); if ( kAbs(angle)> DBL_EPSILON ) { - QSize bs = QSize( _zoomHandler->zoomItX( ow ), _zoomHandler->zoomItY( oh ) ); - QRect br = QRect( 0, 0, bs.width(), bs.height() ); + TQSize bs = TQSize( _zoomHandler->zoomItX( ow ), _zoomHandler->zoomItY( oh ) ); + TQRect br = TQRect( 0, 0, bs.width(), bs.height() ); int pw = br.width(); int ph = br.height(); - QRect rr = br; + TQRect rr = br; int pixYPos = -rr.y(); int pixXPos = -rr.x(); - br.moveTopLeft( QPoint( -br.width() / 2, -br.height() / 2 ) ); - rr.moveTopLeft( QPoint( -rr.width() / 2, -rr.height() / 2 ) ); + br.moveTopLeft( TQPoint( -br.width() / 2, -br.height() / 2 ) ); + rr.moveTopLeft( TQPoint( -rr.width() / 2, -rr.height() / 2 ) ); - QWMatrix m; + TQWMatrix m; m.translate( pw / 2, ph / 2 ); m.rotate( angle ); m.translate( rr.left() + pixXPos, rr.top() + pixYPos ); @@ -629,9 +629,9 @@ void KPrPixmapObject::draw( QPainter *_painter, KoTextZoomHandler*_zoomHandler, if ( !drawContour ) { - QRect rect( 0, 0, (int)( _zoomHandler->zoomItX( ow ) ), + TQRect rect( 0, 0, (int)( _zoomHandler->zoomItX( ow ) ), (int)( _zoomHandler->zoomItY( oh ) ) ); - // ### HACK QT seems not to be able to correctly compare QVariant + // ### HACK QT seems not to be able to correctly compare TQVariant bool variants1; if (m_ie_par1.isNull()) variants1=m_cachedPar1.isNull(); @@ -686,17 +686,17 @@ void KPrPixmapObject::draw( QPainter *_painter, KoTextZoomHandler*_zoomHandler, // Draw border // ### TODO port to KoBorder::drawBorders() (after writing a simplified version of it, that takes the same border on each size) - QPen pen2; + TQPen pen2; if ( drawContour ) { - pen2 = QPen( Qt::black, 1, Qt::DotLine ); - _painter->setRasterOp( Qt::NotXorROP ); + pen2 = TQPen( TQt::black, 1, TQt::DotLine ); + _painter->setRasterOp( TQt::NotXorROP ); } else { pen2 = pen; - pen2.setWidth( _zoomHandler->zoomItX( ( pen.style() == Qt::NoPen ) ? 1.0 : (double)pen.width() ) ); + pen2.setWidth( _zoomHandler->zoomItX( ( pen.style() == TQt::NoPen ) ? 1.0 : (double)pen.width() ) ); } _painter->setPen( pen2 ); - _painter->setBrush( Qt::NoBrush ); + _painter->setBrush( TQt::NoBrush ); _painter->drawRect( (int)( penw ), (int)( penw ), (int)( _zoomHandler->zoomItX( ow ) - 2.0 * penw ), (int)( _zoomHandler->zoomItY( oh ) - 2.0 * penw ) ); @@ -706,19 +706,19 @@ void KPrPixmapObject::draw( QPainter *_painter, KoTextZoomHandler*_zoomHandler, KPrObject::draw( _painter, _zoomHandler, pageNum, selectionMode, drawContour ); } -QPixmap KPrPixmapObject::getOriginalPixmap() +TQPixmap KPrPixmapObject::getOriginalPixmap() { - QSize _pixSize = image.getOriginalSize(); + TQSize _pixSize = image.getOriginalSize(); kdDebug(33001) << "KPrPixmapObject::getOriginalPixmap size= " << _pixSize << endl; - QPixmap _pixmap = image.generatePixmap( _pixSize, true ); + TQPixmap _pixmap = image.generatePixmap( _pixSize, true ); image.clearCache(); // Release the memoy of the picture cache return _pixmap; } -QPixmap KPrPixmapObject::changePictureSettings( QPixmap _tmpPixmap ) +TQPixmap KPrPixmapObject::changePictureSettings( TQPixmap _tmpPixmap ) { - QImage _tmpImage = _tmpPixmap.convertToImage(); + TQImage _tmpImage = _tmpPixmap.convertToImage(); if (_tmpImage.isNull()) return _tmpPixmap; @@ -737,7 +737,7 @@ QPixmap KPrPixmapObject::changePictureSettings( QPixmap _tmpPixmap ) _tmpImage = _tmpImage.mirror( _horizontal, _vertical ); if ( depth != 0 ) { - QImage tmpImg = _tmpImage.convertDepth( depth ); + TQImage tmpImg = _tmpImage.convertDepth( depth ); if ( !tmpImg.isNull() ) _tmpImage = tmpImg; } @@ -748,9 +748,9 @@ QPixmap KPrPixmapObject::changePictureSettings( QPixmap _tmpPixmap ) if ( grayscal ) { if ( depth == 1 || depth == 8 ) { for ( int i = 0; i < _tmpImage.numColors(); ++i ) { - QRgb rgb = _tmpImage.color( i ); - int gray = qGray( rgb ); - rgb = qRgb( gray, gray, gray ); + TQRgb rgb = _tmpImage.color( i ); + int gray = tqGray( rgb ); + rgb = tqRgb( gray, gray, gray ); _tmpImage.setColor( i, rgb ); } } @@ -763,9 +763,9 @@ QPixmap KPrPixmapObject::changePictureSettings( QPixmap _tmpPixmap ) for ( _x = 0; _x < _width; ++_x ) { for ( _y = 0; _y < _height; ++_y ) { if ( _tmpImage.valid( _x, _y ) ) { - QRgb rgb = _tmpImage.pixel( _x, _y ); - int gray = qGray( rgb ); - rgb = qRgb( gray, gray, gray ); + TQRgb rgb = _tmpImage.pixel( _x, _y ); + int gray = tqGray( rgb ); + rgb = tqRgb( gray, gray, gray ); _tmpImage.setPixel( _x, _y, rgb ); } } @@ -776,8 +776,8 @@ QPixmap KPrPixmapObject::changePictureSettings( QPixmap _tmpPixmap ) if ( bright != 0 ) { if ( depth == 1 || depth == 8 ) { for ( int i = 0; i < _tmpImage.numColors(); ++i ) { - QRgb rgb = _tmpImage.color( i ); - QColor c( rgb ); + TQRgb rgb = _tmpImage.color( i ); + TQColor c( rgb ); if ( bright > 0 ) rgb = c.light( 100 + bright ).rgb(); @@ -796,8 +796,8 @@ QPixmap KPrPixmapObject::changePictureSettings( QPixmap _tmpPixmap ) for ( _x = 0; _x < _width; ++_x ) { for ( _y = 0; _y < _height; ++_y ) { if ( _tmpImage.valid( _x, _y ) ) { - QRgb rgb = _tmpImage.pixel( _x, _y ); - QColor c( rgb ); + TQRgb rgb = _tmpImage.pixel( _x, _y ); + TQColor c( rgb ); if ( bright > 0 ) rgb = c.light( 100 + bright ).rgb(); diff --git a/kpresenter/KPrPixmapObject.h b/kpresenter/KPrPixmapObject.h index 1be1dbee..4237d96e 100644 --- a/kpresenter/KPrPixmapObject.h +++ b/kpresenter/KPrPixmapObject.h @@ -24,14 +24,14 @@ #ifndef kppixmapobject_h #define kppixmapobject_h -#include <qdatetime.h> -#include <qvariant.h> +#include <tqdatetime.h> +#include <tqvariant.h> #include "KPrObject.h" #include <KoPictureCollection.h> #include <KoSize.h> -class QPixmap; +class TQPixmap; // ### TODO rename the class (and the related files/classes) to a better name (for example KPPictureObject) @@ -51,13 +51,13 @@ public: * Only used as a default value in the filedialog, in changePicture * \warning Do not use for anything else */ - QString getFileName() const + TQString getFileName() const { return image.getKey().filename(); } KoPictureKey getKey() const { return image.getKey(); } - QSize originalSize() const + TQSize originalSize() const { return image.getOriginalSize(); } /// Deprecated, please use KPrPixmapObject::setPicture @@ -68,18 +68,18 @@ public: virtual ObjType getType() const { return OT_PICTURE; } - virtual QString getTypeString() const + virtual TQString getTypeString() const { return i18n("Picture"); } - virtual QDomDocumentFragment save( QDomDocument& doc, double offset ); + virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset ); - virtual double load(const QDomElement &element); - virtual void loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); + virtual double load(const TQDomElement &element); + virtual void loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); - virtual void draw( QPainter *_painter, KoTextZoomHandler*_zoomHandler, + virtual void draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, int /* page */, SelectionMode selectionMode, bool drawContour = FALSE ); - QPixmap getOriginalPixmap(); + TQPixmap getOriginalPixmap(); PictureMirrorType getPictureMirrorType() const { return mirrorType; } int getPictureDepth() const { return depth; } bool getPictureSwapRGB() const { return swapRGB; } @@ -87,11 +87,11 @@ public: int getPictureBright() const { return bright; } ImageEffect getImageEffect() const {return m_effect;} - QVariant getIEParam1() const {return m_ie_par1;} - QVariant getIEParam2() const {return m_ie_par2;} - QVariant getIEParam3() const {return m_ie_par3;} + TQVariant getIEParam1() const {return m_ie_par1;} + TQVariant getIEParam2() const {return m_ie_par2;} + TQVariant getIEParam3() const {return m_ie_par3;} void setImageEffect(ImageEffect eff) { m_effect = eff; } - void setIEParams(QVariant p1, QVariant p2, QVariant p3) { + void setIEParams(TQVariant p1, TQVariant p2, TQVariant p3) { m_ie_par1=p1; m_ie_par2=p2; m_ie_par3=p3; @@ -106,8 +106,8 @@ public: KoPicture picture() const { return image;} /// Deprecated, please use KPrPixmapObject::loadPicture - void loadImage( const QString & fileName ) KDE_DEPRECATED; - void loadPicture( const QString & fileName ); + void loadImage( const TQString & fileName ) KDE_DEPRECATED; + void loadPicture( const TQString & fileName ); virtual void flip(bool horizontal ); @@ -117,7 +117,7 @@ protected: KPrPixmapObject() {} - QPixmap changePictureSettings( QPixmap _tmpPixmap ); + TQPixmap changePictureSettings( TQPixmap _tmpPixmap ); virtual void saveOasisPictureElement( KoGenStyle &styleobjectauto ) const; void loadOasisPictureEffect(KoOasisContext & context ); virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const; @@ -126,10 +126,10 @@ protected: * @internal * Draws the shadow */ - void drawShadow( QPainter* _painter, KoZoomHandler* _zoomHandler); + void drawShadow( TQPainter* _painter, KoZoomHandler* _zoomHandler); - QPixmap generatePixmap(KoZoomHandler*_zoomHandler); - QString convertValueToPercent( int val ) const; + TQPixmap generatePixmap(KoZoomHandler*_zoomHandler); + TQString convertValueToPercent( int val ) const; KoPictureCollection *imageCollection; KoPicture image; @@ -142,12 +142,12 @@ protected: //image effect and its params ImageEffect m_effect, m_cachedEffect; - QVariant m_ie_par1, m_cachedPar1; - QVariant m_ie_par2, m_cachedPar2; - QVariant m_ie_par3, m_cachedPar3; + TQVariant m_ie_par1, m_cachedPar1; + TQVariant m_ie_par2, m_cachedPar2; + TQVariant m_ie_par3, m_cachedPar3; - QPixmap m_cachedPixmap; - QRect m_cachedRect; + TQPixmap m_cachedPixmap; + TQRect m_cachedRect; }; #endif diff --git a/kpresenter/KPrPixmapObjectIface.cpp b/kpresenter/KPrPixmapObjectIface.cpp index ec7b10d7..e84e3c52 100644 --- a/kpresenter/KPrPixmapObjectIface.cpp +++ b/kpresenter/KPrPixmapObjectIface.cpp @@ -31,7 +31,7 @@ KPrPixmapObjectIface::KPrPixmapObjectIface( KPrPixmapObject *_obj ) obj = _obj; } -QString KPrPixmapObjectIface::fileName() const +TQString KPrPixmapObjectIface::fileName() const { return obj->getFileName(); } @@ -81,12 +81,12 @@ void KPrPixmapObjectIface::setGrayscale( bool grayscal ) obj->setPictureGrayscal(grayscal); } -void KPrPixmapObjectIface::loadImage( const QString & fileName ) +void KPrPixmapObjectIface::loadImage( const TQString & fileName ) { obj->loadPicture(fileName); } -void KPrPixmapObjectIface::setPictureMirrorType(const QString & _mirror) +void KPrPixmapObjectIface::setPictureMirrorType(const TQString & _mirror) { if ( _mirror.lower()=="normal") obj->setPictureMirrorType( PM_NORMAL); diff --git a/kpresenter/KPrPixmapObjectIface.h b/kpresenter/KPrPixmapObjectIface.h index 6a9cb388..d2d143a4 100644 --- a/kpresenter/KPrPixmapObjectIface.h +++ b/kpresenter/KPrPixmapObjectIface.h @@ -24,7 +24,7 @@ #include <dcopobject.h> #include <dcopref.h> #include "KPrObject2DIface.h" -#include <qstring.h> +#include <tqstring.h> class KPrPixmapObject; @@ -35,7 +35,7 @@ public: KPrPixmapObjectIface( KPrPixmapObject *obj_ ); k_dcop: - QString fileName() const; + TQString fileName() const; int depth() const; bool swapRGB() const; bool grayscale() const; @@ -46,8 +46,8 @@ k_dcop: void setBrightness(int bright ); void setSwapRGB(bool swapRGB ); void setGrayscale( bool grayscal ); - void loadImage( const QString & fileName ); - void setPictureMirrorType(const QString & _mirror); + void loadImage( const TQString & fileName ); + void setPictureMirrorType(const TQString & _mirror); private: KPrPixmapObject *obj; diff --git a/kpresenter/KPrPointObject.cpp b/kpresenter/KPrPointObject.cpp index 5295228b..a1fb0564 100644 --- a/kpresenter/KPrPointObject.cpp +++ b/kpresenter/KPrPointObject.cpp @@ -24,8 +24,8 @@ #include "KPrSVGPathParser.h" #include <KoTextZoomHandler.h> #include <KoUnit.h> -#include <qdom.h> -#include <qpainter.h> +#include <tqdom.h> +#include <tqpainter.h> #include <KoStyleStack.h> #include <KoOasisContext.h> #include <KoXmlNS.h> @@ -62,12 +62,12 @@ KoPoint KPrPointObject::getRealOrig() const } -void KPrPointObject::loadOasis( const QDomElement &element, KoOasisContext & context, KPrLoadingInfo* info ) +void KPrPointObject::loadOasis( const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo* info ) { kdDebug(33001) << "KPrPointObject::loadOasis" << endl; KPrShadowObject::loadOasis( element, context, info ); - QString d = element.attributeNS( KoXmlNS::svg, "d", QString::null); + TQString d = element.attributeNS( KoXmlNS::svg, "d", TQString()); kdDebug(33001) << "path d: " << d << endl; KPrSVGPathParser parser; @@ -76,14 +76,14 @@ void KPrPointObject::loadOasis( const QDomElement &element, KoOasisContext & con } -QDomDocumentFragment KPrPointObject::save( QDomDocument& doc, double offset ) +TQDomDocumentFragment KPrPointObject::save( TQDomDocument& doc, double offset ) { - QDomDocumentFragment fragment = KPrShadowObject::save( doc, offset ); + TQDomDocumentFragment fragment = KPrShadowObject::save( doc, offset ); if ( !points.isNull() ) { - QDomElement elemPoints = doc.createElement( "POINTS" ); + TQDomElement elemPoints = doc.createElement( "POINTS" ); KoPointArray::ConstIterator it; for ( it = points.begin(); it != points.end(); ++it ) { - QDomElement elemPoint = doc.createElement( "Point" ); + TQDomElement elemPoint = doc.createElement( "Point" ); KoPoint point = (*it); elemPoint.setAttribute( "point_x", point.x() ); elemPoint.setAttribute( "point_y", point.y() ); @@ -100,7 +100,7 @@ QDomDocumentFragment KPrPointObject::save( QDomDocument& doc, double offset ) const char * KPrPointObject::getOasisElementName() const { - return "draw:custom-shape"; + return "draw:custom-tqshape"; } void KPrPointObject::loadOasisMarker( KoOasisContext & context ) @@ -116,13 +116,13 @@ void KPrPointObject::fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainSt } -double KPrPointObject::load( const QDomElement &element ) +double KPrPointObject::load( const TQDomElement &element ) { double offset = KPrShadowObject::load( element ); - QDomElement e = element.namedItem( "POINTS" ).toElement(); + TQDomElement e = element.namedItem( "POINTS" ).toElement(); if ( !e.isNull() ) { - QDomElement elemPoint = e.firstChild().toElement(); + TQDomElement elemPoint = e.firstChild().toElement(); unsigned int index = 0; while ( !elemPoint.isNull() ) { if ( elemPoint.tagName() == "Point" ) { @@ -193,35 +193,35 @@ void KPrPointObject::flip( bool horizontal ) } -void KPrPointObject::paint( QPainter* _painter, KoTextZoomHandler*_zoomHandler, +void KPrPointObject::paint( TQPainter* _painter, KoTextZoomHandler*_zoomHandler, int /* pageNum */, bool /*drawingShadow*/, bool drawContour ) { int _w = int( pen.pointWidth() ); - QPen pen2; + TQPen pen2; if ( drawContour ) { - pen2 = QPen( Qt::black, 1, Qt::DotLine ); - _painter->setRasterOp( Qt::NotXorROP ); + pen2 = TQPen( TQt::black, 1, TQt::DotLine ); + _painter->setRasterOp( TQt::NotXorROP ); } else { pen2 = pen.zoomedPen( _zoomHandler ); } _painter->setPen( pen2 ); - QPointArray pointArray = getDrawingPoints().zoomPointArray( _zoomHandler, _w ); + TQPointArray pointArray = getDrawingPoints().zoomPointArray( _zoomHandler, _w ); _painter->drawPolyline( pointArray ); if ( lineBegin != L_NORMAL && !drawContour ) { - QPoint startPoint; + TQPoint startPoint; bool first = true; - QPointArray::ConstIterator it1; + TQPointArray::ConstIterator it1; for ( it1 = pointArray.begin(); it1 != pointArray.end(); ++it1 ) { if ( first ) { startPoint = (*it1); first = false; } - QPoint point = (*it1); + TQPoint point = (*it1); if ( startPoint != point ) { float angle = KoPoint::getAngle( KoPoint( startPoint ), KoPoint( point ) ); drawFigureWithOffset( lineBegin, _painter, startPoint, pen2.color(), _w, angle,_zoomHandler ); @@ -232,16 +232,16 @@ void KPrPointObject::paint( QPainter* _painter, KoTextZoomHandler*_zoomHandler, } if ( lineEnd != L_NORMAL && !drawContour ) { - QPoint endPoint; + TQPoint endPoint; bool last = true; - QPointArray::ConstIterator it2 = pointArray.end(); + TQPointArray::ConstIterator it2 = pointArray.end(); for ( it2 = it2 - 1; it2 != pointArray.begin(); --it2 ) { if ( last ) { endPoint = (*it2); last = false; } - QPoint point = (*it2); + TQPoint point = (*it2); if ( endPoint != point ) { float angle = KoPoint::getAngle( KoPoint( endPoint ), KoPoint( point ) ); drawFigureWithOffset( lineEnd, _painter, endPoint, pen2.color(), _w, angle,_zoomHandler ); diff --git a/kpresenter/KPrPointObject.h b/kpresenter/KPrPointObject.h index a93ede27..bee64b5b 100644 --- a/kpresenter/KPrPointObject.h +++ b/kpresenter/KPrPointObject.h @@ -33,10 +33,10 @@ public: virtual KoSize getRealSize() const; virtual KoPoint getRealOrig() const; - virtual QDomDocumentFragment save( QDomDocument& doc, double offset ); + virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset ); - virtual double load( const QDomElement &element ); - virtual void loadOasis( const QDomElement &element, KoOasisContext & context, KPrLoadingInfo* info ); + virtual double load( const TQDomElement &element ); + virtual void loadOasis( const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo* info ); virtual void setLineBegin( LineEnd _lineBegin ) { lineBegin = _lineBegin; } virtual void setLineEnd( LineEnd _lineEnd ) { lineEnd = _lineEnd; } @@ -63,7 +63,7 @@ protected: void loadOasisMarker( KoOasisContext & context ); virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const; - virtual void paint( QPainter *_painter,KoTextZoomHandler*_zoomHandler, + virtual void paint( TQPainter *_painter,KoTextZoomHandler*_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour = FALSE ); virtual void updatePoints( double _fx, double _fy ); virtual KoPointArray getDrawingPoints() const; diff --git a/kpresenter/KPrPolyLineObjectIface.cpp b/kpresenter/KPrPolyLineObjectIface.cpp index 8283a4c5..cd419aec 100644 --- a/kpresenter/KPrPolyLineObjectIface.cpp +++ b/kpresenter/KPrPolyLineObjectIface.cpp @@ -34,12 +34,12 @@ KPrPolyLineObjectIface::KPrPolyLineObjectIface( KPrPolylineObject *_obj ) void KPrPolyLineObjectIface::horizontalFlip() { - //todo repaint it + //todo tqrepaint it obj->flip(true ); } void KPrPolyLineObjectIface::verticalFlip() { - //todo repaint it + //todo tqrepaint it obj->flip( false ); } diff --git a/kpresenter/KPrPolygonObject.cpp b/kpresenter/KPrPolygonObject.cpp index 120cd89c..451b1a48 100644 --- a/kpresenter/KPrPolygonObject.cpp +++ b/kpresenter/KPrPolygonObject.cpp @@ -23,11 +23,11 @@ #include "KPrGradient.h" #include <KoTextZoomHandler.h> #include <kdebug.h> -#include <qbitmap.h> -#include <qregion.h> -#include <qdom.h> -#include <qpicture.h> -#include <qpainter.h> +#include <tqbitmap.h> +#include <tqregion.h> +#include <tqdom.h> +#include <tqpicture.h> +#include <tqpainter.h> #include "KPrPolygonObjectIface.h" #include <KoUnit.h> #include <KoOasisContext.h> @@ -43,8 +43,8 @@ KPrPolygonObject::KPrPolygonObject() } KPrPolygonObject::KPrPolygonObject( const KoPointArray &_points, const KoSize &_size, - const KoPen &_pen, const QBrush &_brush, - FillType _fillType, const QColor &_gColor1, const QColor &_gColor2, BCType _gType, + const KoPen &_pen, const TQBrush &_brush, + FillType _fillType, const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType, bool _unbalanced, int _xfactor, int _yfactor, bool _checkConcavePolygon, int _cornersValue, int _sharpnessValue ) : KPr2DObject( _pen, _brush, _fillType, _gColor1, _gColor2, _gType, _unbalanced, _xfactor, _yfactor ) @@ -75,7 +75,7 @@ bool KPrPolygonObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const sc.xmlWriter.addAttribute( "draw:concave", checkConcavePolygon ? "true" : "false" ); if ( checkConcavePolygon ) { - sc.xmlWriter.addAttribute( "draw:sharpness", QString( "%1%").arg( sharpnessValue ) ); + sc.xmlWriter.addAttribute( "draw:sharpness", TQString( "%1%").tqarg( sharpnessValue ) ); } return true; @@ -87,11 +87,11 @@ const char * KPrPolygonObject::getOasisElementName() const } -QDomDocumentFragment KPrPolygonObject::save( QDomDocument& doc, double offset ) +TQDomDocumentFragment KPrPolygonObject::save( TQDomDocument& doc, double offset ) { - QDomDocumentFragment fragment = KPr2DObject::save( doc, offset ); + TQDomDocumentFragment fragment = KPr2DObject::save( doc, offset ); - QDomElement elemSettings = doc.createElement( "SETTINGS" ); + TQDomElement elemSettings = doc.createElement( "SETTINGS" ); elemSettings.setAttribute( "checkConcavePolygon", static_cast<int>( checkConcavePolygon ) ); elemSettings.setAttribute( "cornersValue", cornersValue ); @@ -100,10 +100,10 @@ QDomDocumentFragment KPrPolygonObject::save( QDomDocument& doc, double offset ) fragment.appendChild( elemSettings ); if ( !points.isNull() ) { - QDomElement elemPoints = doc.createElement( "POINTS" ); + TQDomElement elemPoints = doc.createElement( "POINTS" ); KoPointArray::ConstIterator it; for ( it = points.begin(); it != points.end(); ++it ) { - QDomElement elemPoint = doc.createElement( "Point" ); + TQDomElement elemPoint = doc.createElement( "Point" ); KoPoint point = (*it); elemPoint.setAttribute( "point_x", point.x() ); elemPoint.setAttribute( "point_y", point.y() ); @@ -116,25 +116,25 @@ QDomDocumentFragment KPrPolygonObject::save( QDomDocument& doc, double offset ) return fragment; } -void KPrPolygonObject::loadOasis( const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info ) +void KPrPolygonObject::loadOasis( const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info ) { - kdDebug()<<"void KPrPolygonObject::loadOasis( const QDomElement &element )***********\n"; + kdDebug()<<"void KPrPolygonObject::loadOasis( const TQDomElement &element )***********\n"; KPr2DObject::loadOasis( element,context, info ); - cornersValue = element.attributeNS( KoXmlNS::draw, "corners", QString::null ).toInt(); - checkConcavePolygon = element.attributeNS( KoXmlNS::draw, "concave", QString::null ) == "true"; + cornersValue = element.attributeNS( KoXmlNS::draw, "corners", TQString() ).toInt(); + checkConcavePolygon = element.attributeNS( KoXmlNS::draw, "concave", TQString() ) == "true"; sharpnessValue = 0; if ( checkConcavePolygon ) { - sharpnessValue = element.attributeNS( KoXmlNS::draw, "sharpness", QString::null ).remove( '%').toInt(); + sharpnessValue = element.attributeNS( KoXmlNS::draw, "sharpness", TQString() ).remove( '%').toInt(); } drawPolygon(); } -double KPrPolygonObject::load( const QDomElement &element ) +double KPrPolygonObject::load( const TQDomElement &element ) { double offset=KPr2DObject::load( element ); - QDomElement e = element.namedItem( "SETTINGS" ).toElement(); + TQDomElement e = element.namedItem( "SETTINGS" ).toElement(); if ( !e.isNull() ) { bool _checkConcavePolygon = false; int _cornersValue = 3; @@ -154,7 +154,7 @@ double KPrPolygonObject::load( const QDomElement &element ) e = element.namedItem( "POINTS" ).toElement(); if ( !e.isNull() ) { - QDomElement elemPoint = e.firstChild().toElement(); + TQDomElement elemPoint = e.firstChild().toElement(); unsigned int index = 0; while ( !elemPoint.isNull() ) { if ( elemPoint.tagName() == "Point" ) { @@ -201,22 +201,22 @@ void KPrPolygonObject::updatePoints( double _fx, double _fy ) points = tmpPoints; } -void KPrPolygonObject::paint( QPainter* _painter,KoTextZoomHandler*_zoomHandler, +void KPrPolygonObject::paint( TQPainter* _painter,KoTextZoomHandler*_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour ) { - int _w = ( pen.style() == Qt::NoPen ) ? 1 : pen.width();//pen.width(); + int _w = ( pen.style() == TQt::NoPen ) ? 1 : pen.width();//pen.width(); if ( drawContour ) { - QPointArray pointArray2 = points.zoomPointArray( _zoomHandler ); - QPen pen3( Qt::black, 1, Qt::DotLine ); + TQPointArray pointArray2 = points.zoomPointArray( _zoomHandler ); + TQPen pen3( TQt::black, 1, TQt::DotLine ); _painter->setPen( pen3 ); - _painter->setRasterOp( Qt::NotXorROP ); + _painter->setRasterOp( TQt::NotXorROP ); _painter->drawPolygon( pointArray2 ); return; } - QPointArray pointArray = points.zoomPointArray( _zoomHandler, _w ); - QPen pen2 = pen.zoomedPen( _zoomHandler ); + TQPointArray pointArray = points.zoomPointArray( _zoomHandler, _w ); + TQPen pen2 = pen.zoomedPen( _zoomHandler ); if ( drawingShadow || getFillType() == FT_BRUSH || !gradient ) { _painter->setPen( pen2 ); @@ -224,16 +224,16 @@ void KPrPolygonObject::paint( QPainter* _painter,KoTextZoomHandler*_zoomHandler, _painter->drawPolygon( pointArray ); } else { - QSize size( _zoomHandler->zoomSize( ext ) ); + TQSize size( _zoomHandler->zoomSize( ext ) ); if ( m_redrawGradientPix || gradient->size() != size ) { m_redrawGradientPix = false; gradient->setSize( size ); - QRegion clipregion( pointArray ); + TQRegion clipregion( pointArray ); m_gradientPix.resize( size ); - m_gradientPix.fill( Qt::white ); + m_gradientPix.fill( TQt::white ); - QPainter p; + TQPainter p; p.begin( &m_gradientPix ); p.setClipRegion( clipregion ); p.drawPixmap( 0, 0, gradient->pixmap() ); @@ -242,11 +242,11 @@ void KPrPolygonObject::paint( QPainter* _painter,KoTextZoomHandler*_zoomHandler, m_gradientPix.setMask( m_gradientPix.createHeuristicMask() ); } - QRect _rect = pointArray.boundingRect(); + TQRect _rect = pointArray.boundingRect(); _painter->drawPixmap( 0, 0, m_gradientPix, 0, 0, _rect.width(), _rect.height() ); _painter->setPen( pen2 ); - _painter->setBrush( Qt::NoBrush ); + _painter->setBrush( TQt::NoBrush ); _painter->drawPolygon( pointArray ); } @@ -257,14 +257,14 @@ void KPrPolygonObject::drawPolygon() kdDebug()<<"void KPrPolygonObject::drawPolygon()***********\n"; KoRect _rect( 0, 0, ext.width(), ext.height() ); double angle = 2 * M_PI / cornersValue; - double diameter = static_cast<double>( QMAX( _rect.width(), _rect.height() ) ); + double diameter = static_cast<double>( TQMAX( _rect.width(), _rect.height() ) ); double radius = diameter * 0.5; KoPointArray _points( checkConcavePolygon ? cornersValue * 2 : cornersValue ); - _points.setPoint( 0, 0, qRound( -radius ) ); + _points.setPoint( 0, 0, tqRound( -radius ) ); double xmin = 0; - double ymin = qRound( -radius ); + double ymin = tqRound( -radius ); if ( checkConcavePolygon ) { angle = angle / 2.0; diff --git a/kpresenter/KPrPolygonObject.h b/kpresenter/KPrPolygonObject.h index a7506ca8..7ef997ed 100644 --- a/kpresenter/KPrPolygonObject.h +++ b/kpresenter/KPrPolygonObject.h @@ -22,12 +22,12 @@ #ifndef kppolygonobject_h #define kppolygonobject_h -#include <qpointarray.h> +#include <tqpointarray.h> #include "KoPointArray.h" #include "KPrObject.h" class KPrGradient; -class QPainter; +class TQPainter; class DCOPObject; class KoPen; @@ -35,8 +35,8 @@ class KPrPolygonObject : public KPr2DObject { public: KPrPolygonObject(); - KPrPolygonObject( const KoPointArray &_points, const KoSize &_size, const KoPen &_pen, const QBrush &_brush, - FillType _fillType, const QColor &_gColor1, const QColor &_gColor2, BCType _gType, + KPrPolygonObject( const KoPointArray &_points, const KoSize &_size, const KoPen &_pen, const TQBrush &_brush, + FillType _fillType, const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType, bool _unbalanced, int _xfactor, int _yfactor, bool _checkConcavePolygon, int _cornersValue, int _sharpnessValue ); @@ -50,7 +50,7 @@ public: { setSize( _size.width(), _size.height() ); } virtual ObjType getType() const { return OT_POLYGON; } - virtual QString getTypeString() const { return i18n( "Polygon" ); } + virtual TQString getTypeString() const { return i18n( "Polygon" ); } void setCheckConcavePolygon(bool _concavePolygon) { checkConcavePolygon = _concavePolygon; drawPolygon(); } void setCornersValue(int _cornersValue) { cornersValue = _cornersValue; drawPolygon(); } @@ -59,10 +59,10 @@ public: int getCornersValue() const { return cornersValue; } int getSharpnessValue() const { return sharpnessValue; } - virtual QDomDocumentFragment save( QDomDocument& doc, double offset ); + virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset ); - virtual double load( const QDomElement &element ); - virtual void loadOasis( const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info ); + virtual double load( const TQDomElement &element ); + virtual void loadOasis( const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info ); virtual void flip( bool horizontal ); virtual KoSize getRealSize() const; @@ -72,7 +72,7 @@ protected: virtual const char * getOasisElementName() const; virtual bool saveOasisObjectAttributes( KPOasisSaveContext &sc ) const; - virtual void paint( QPainter *_painter,KoTextZoomHandler*_zoomHandler, + virtual void paint( TQPainter *_painter,KoTextZoomHandler*_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour ); void updatePoints( double _fx, double _fy ); diff --git a/kpresenter/KPrPolygonPreview.cpp b/kpresenter/KPrPolygonPreview.cpp index 985c1eef..114420bc 100644 --- a/kpresenter/KPrPolygonPreview.cpp +++ b/kpresenter/KPrPolygonPreview.cpp @@ -23,12 +23,12 @@ #include "KPrPolygonPreview.h" -#include <qpainter.h> +#include <tqpainter.h> #include <math.h> -KPrPolygonPreview::KPrPolygonPreview( QWidget* parent, const char* name) - : QFrame( parent, name ) +KPrPolygonPreview::KPrPolygonPreview( TQWidget* tqparent, const char* name) + : TQFrame( tqparent, name ) { setFrameStyle( WinPanel | Sunken ); setBackgroundColor( white ); @@ -37,19 +37,19 @@ KPrPolygonPreview::KPrPolygonPreview( QWidget* parent, const char* name) } -void KPrPolygonPreview::drawContents( QPainter *painter ) +void KPrPolygonPreview::drawContents( TQPainter *painter ) { double angle = 2 * M_PI / nCorners; - double diameter = static_cast<double>( QMAX( width(), height() ) - 10 ); + double diameter = static_cast<double>( TQMAX( width(), height() ) - 10 ); double radius = diameter * 0.5; - painter->setWindow( qRound( -radius ), qRound( -radius ), qRound( diameter ), qRound( diameter ) ); + painter->setWindow( tqRound( -radius ), tqRound( -radius ), tqRound( diameter ), tqRound( diameter ) ); painter->setViewport( 5, 5, width() - 10, height() - 10 ); painter->setPen( pen ); painter->setBrush( brush ); - QPointArray points( isConcave ? nCorners * 2 : nCorners ); - points.setPoint( 0, 0, qRound( -radius ) ); + TQPointArray points( isConcave ? nCorners * 2 : nCorners ); + points.setPoint( 0, 0, tqRound( -radius ) ); if ( isConcave ) { angle = angle / 2.0; @@ -85,35 +85,35 @@ void KPrPolygonPreview::drawContents( QPainter *painter ) void KPrPolygonPreview::slotConvexConcave( bool convexConcave ) { isConcave = convexConcave; - repaint(); + tqrepaint(); } void KPrPolygonPreview::slotConvexPolygon() { isConcave = false; - repaint(); + tqrepaint(); } void KPrPolygonPreview::slotConcavePolygon() { isConcave = true; - repaint(); + tqrepaint(); } void KPrPolygonPreview::slotCornersValue( int value ) { nCorners = value; - repaint(); + tqrepaint(); } void KPrPolygonPreview::slotSharpnessValue( int value ) { sharpness = value; - repaint(); + tqrepaint(); } diff --git a/kpresenter/KPrPolygonPreview.h b/kpresenter/KPrPolygonPreview.h index 64ffda4d..ce1aa948 100644 --- a/kpresenter/KPrPolygonPreview.h +++ b/kpresenter/KPrPolygonPreview.h @@ -24,22 +24,23 @@ #ifndef POLYGONPREVIEW_H #define POLYGONPREVIEW_H -#include <qframe.h> -#include <qpen.h> -#include <qbrush.h> +#include <tqframe.h> +#include <tqpen.h> +#include <tqbrush.h> -class QPainter; +class TQPainter; -class KPrPolygonPreview : public QFrame +class KPrPolygonPreview : public TQFrame { Q_OBJECT + TQ_OBJECT public: - KPrPolygonPreview( QWidget* parent, const char*); + KPrPolygonPreview( TQWidget* tqparent, const char*); ~KPrPolygonPreview() {} - void setPenBrush( const QPen &_pen, const QBrush &_brush ) - { pen = _pen; brush = _brush; repaint( true ); } + void setPenBrush( const TQPen &_pen, const TQBrush &_brush ) + { pen = _pen; brush = _brush; tqrepaint( true ); } public slots: void slotConvexConcave( bool convexConcave ); @@ -49,13 +50,13 @@ public slots: void slotSharpnessValue( int value ); protected: - void drawContents( QPainter* ); + void drawContents( TQPainter* ); int nCorners; int sharpness; bool isConcave; - QPen pen; - QBrush brush; + TQPen pen; + TQBrush brush; }; #endif /* POLYGONPREVIEW_H */ diff --git a/kpresenter/KPrPolygonProperty.cpp b/kpresenter/KPrPolygonProperty.cpp index e7188de4..d065c628 100644 --- a/kpresenter/KPrPolygonProperty.cpp +++ b/kpresenter/KPrPolygonProperty.cpp @@ -20,7 +20,7 @@ #include "KPrPolygonProperty.h" -#include <qlayout.h> +#include <tqlayout.h> #include <kcombobox.h> #include <klocale.h> @@ -29,23 +29,23 @@ #include "polygonpropertyui.h" #include "KPrPolygonPreview.h" -KPrPolygonProperty::KPrPolygonProperty( QWidget *parent, const char *name, KPrPolygonSettingCmd::PolygonSettings &polygonSettings ) -: QWidget( parent, name ) +KPrPolygonProperty::KPrPolygonProperty( TQWidget *tqparent, const char *name, KPrPolygonSettingCmd::PolygonSettings &polygonSettings ) +: TQWidget( tqparent, name ) , m_polygonSettings( polygonSettings ) { - QVBoxLayout *layout = new QVBoxLayout( this ); - layout->addWidget( m_ui = new PolygonPropertyUI( this ) ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->addWidget( m_ui = new PolygonPropertyUI( this ) ); m_ui->typeCombo->insertItem( i18n( "Polygon" ) ); m_ui->typeCombo->insertItem( i18n( "Convex/Concave" ) ); - connect( m_ui->typeCombo, SIGNAL( activated( int ) ), - this, SLOT(slotTypeChanged( int ) ) ); + connect( m_ui->typeCombo, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT(slotTypeChanged( int ) ) ); - connect( m_ui->cornersInput, SIGNAL( valueChanged( int ) ), - m_ui->polygonPreview, SLOT( slotCornersValue( int ) ) ); - connect( m_ui->sharpnessInput, SIGNAL( valueChanged( int ) ), - m_ui->polygonPreview, SLOT( slotSharpnessValue( int ) ) ); + connect( m_ui->cornersInput, TQT_SIGNAL( valueChanged( int ) ), + m_ui->polygonPreview, TQT_SLOT( slotCornersValue( int ) ) ); + connect( m_ui->sharpnessInput, TQT_SIGNAL( valueChanged( int ) ), + m_ui->polygonPreview, TQT_SLOT( slotSharpnessValue( int ) ) ); slotReset(); } diff --git a/kpresenter/KPrPolygonProperty.h b/kpresenter/KPrPolygonProperty.h index 8d5af6c2..5b41391e 100644 --- a/kpresenter/KPrPolygonProperty.h +++ b/kpresenter/KPrPolygonProperty.h @@ -20,17 +20,18 @@ #ifndef POLYGONPROPERTY_H #define POLYGONPROPERTY_H -#include <qwidget.h> +#include <tqwidget.h> #include "KPrCommand.h" class PolygonPropertyUI; -class KPrPolygonProperty : public QWidget +class KPrPolygonProperty : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrPolygonProperty( QWidget *parent, const char *name, KPrPolygonSettingCmd::PolygonSettings &polygonSettings ); + KPrPolygonProperty( TQWidget *tqparent, const char *name, KPrPolygonSettingCmd::PolygonSettings &polygonSettings ); ~KPrPolygonProperty(); int getPolygonPropertyChange() const; diff --git a/kpresenter/KPrPolylineObject.cpp b/kpresenter/KPrPolylineObject.cpp index b9268201..900ecc1e 100644 --- a/kpresenter/KPrPolylineObject.cpp +++ b/kpresenter/KPrPolylineObject.cpp @@ -23,9 +23,9 @@ #include "KPrUtils.h" #include "KPrPolyLineObjectIface.h" -#include <qpainter.h> -#include <qwmatrix.h> -#include <qdom.h> +#include <tqpainter.h> +#include <tqwmatrix.h> +#include <tqdom.h> #include <kdebug.h> #include <KoTextZoomHandler.h> @@ -60,12 +60,12 @@ KPrPolylineObject &KPrPolylineObject::operator=( const KPrPolylineObject & ) return *this; } -QDomDocumentFragment KPrPolylineObject::save( QDomDocument& doc, double offset ) +TQDomDocumentFragment KPrPolylineObject::save( TQDomDocument& doc, double offset ) { return KPrPointObject::save( doc, offset ); } -double KPrPolylineObject::load(const QDomElement &element) +double KPrPolylineObject::load(const TQDomElement &element) { return KPrPointObject::load( element ); } @@ -82,9 +82,9 @@ const char * KPrPolylineObject::getOasisElementName() const } -void KPrPolylineObject::loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info) +void KPrPolylineObject::loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info) { - kdDebug()<<"void KPrPolylineObject::loadOasis(const QDomElement &element)************\n"; + kdDebug()<<"void KPrPolylineObject::loadOasis(const TQDomElement &element)************\n"; KPrShadowObject::loadOasis( element, context, info ); KPrShadowObject::loadOasisDrawPoints( points, element, context, info ); loadOasisMarker( context ); diff --git a/kpresenter/KPrPolylineObject.h b/kpresenter/KPrPolylineObject.h index 1d25aeb0..e99963ff 100644 --- a/kpresenter/KPrPolylineObject.h +++ b/kpresenter/KPrPolylineObject.h @@ -26,7 +26,7 @@ #define RAD_FACTOR 180.0 / M_PI -class QPainter; +class TQPainter; class DCOPObject; class KPrPolylineObject : public KPrPointObject @@ -42,11 +42,11 @@ public: KPrPolylineObject &operator=( const KPrPolylineObject & ); virtual ObjType getType() const { return OT_POLYLINE; } - virtual QString getTypeString() const { return i18n("Polyline"); } + virtual TQString getTypeString() const { return i18n("Polyline"); } - virtual QDomDocumentFragment save( QDomDocument& doc, double offset ); - virtual double load( const QDomElement &element ); - virtual void loadOasis(const QDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); + virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset ); + virtual double load( const TQDomElement &element ); + virtual void loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); protected: virtual const char * getOasisElementName() const; diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp index 7feb5bcf..c1e7b80f 100644 --- a/kpresenter/KPrPresDurationDia.cpp +++ b/kpresenter/KPrPresDurationDia.cpp @@ -22,41 +22,41 @@ #include "KPrCanvas.h" #include "KPrPage.h" #include "KPrDocument.h" -#include <qlabel.h> -#include <qheader.h> -#include <qvbox.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqheader.h> +#include <tqvbox.h> +#include <tqlayout.h> #include <klistview.h> #include <kdebug.h> #include <klocale.h> -KPrPresDurationDia::KPrPresDurationDia( QWidget *parent, const char *name, - KPrDocument *_doc, QStringList _durationListString, - const QString &_durationString ) - : KDialogBase( parent, name, false, "", KDialogBase::Close ), +KPrPresDurationDia::KPrPresDurationDia( TQWidget *tqparent, const char *name, + KPrDocument *_doc, TQStringList _durationListString, + const TQString &_durationString ) + : KDialogBase( tqparent, name, false, "", KDialogBase::Close ), doc( _doc ) { m_durationListString = _durationListString; m_durationString = _durationString; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget( page ); - QVBoxLayout *topLayout = new QVBoxLayout( page, 2 ); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 2 ); setupSlideList( page ); topLayout->addWidget( slides ); slides->setSelected( slides->firstChild(), true ); - label = new QLabel( i18n( "Presentation duration: " ) + _durationString, page ); - label->setAlignment( AlignVCenter ); + label = new TQLabel( i18n( "Presentation duration: " ) + _durationString, page ); + label->tqsetAlignment( AlignVCenter ); topLayout->addWidget( label ); setMinimumSize( 600, 400 ); - connect( this, SIGNAL( closeClicked() ), this, SLOT( slotCloseDialog() ) ); + connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( slotCloseDialog() ) ); } -void KPrPresDurationDia::setupSlideList( QWidget *_page ) +void KPrPresDurationDia::setupSlideList( TQWidget *_page ) { slides = new KListView( _page ); slides->addColumn( i18n( "No." ) ); @@ -71,7 +71,7 @@ void KPrPresDurationDia::setupSlideList( QWidget *_page ) if ( doc->pageList().at( i )->isSlideSelected() ) { KListViewItem *item = new KListViewItem( slides ); item->setPixmap( 0, KPBarIcon( "slide" ) ); - item->setText( 0, QString( "%1" ).arg( i + 1 ) ); + item->setText( 0, TQString( "%1" ).tqarg( i + 1 ) ); item->setText( 1, *m_durationListString.at( i ) ); item->setText( 2, doc->pageList().at( i )->pageTitle() ); } diff --git a/kpresenter/KPrPresDurationDia.h b/kpresenter/KPrPresDurationDia.h index b58d3f4d..92395994 100644 --- a/kpresenter/KPrPresDurationDia.h +++ b/kpresenter/KPrPresDurationDia.h @@ -25,28 +25,29 @@ class KPrDocument; class KListView; -class QLabel; +class TQLabel; class KPrPresDurationDia : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KPrPresDurationDia( QWidget *parent, const char *name, + KPrPresDurationDia( TQWidget *tqparent, const char *name, KPrDocument *_doc, - QStringList _durationListString, - const QString &_durationString ); + TQStringList _durationListString, + const TQString &_durationString ); protected: - void setupSlideList( QWidget *_page ); + void setupSlideList( TQWidget *_page ); private: KPrDocument *doc; KListView *slides; - QLabel *label; + TQLabel *label; - QStringList m_durationListString; - QString m_durationString; + TQStringList m_durationListString; + TQString m_durationString; protected slots: void slotCloseDialog() { emit presDurationDiaClosed(); } diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp index 68fc4d79..5e0b573d 100644 --- a/kpresenter/KPrPrinterDlg.cpp +++ b/kpresenter/KPrPrinterDlg.cpp @@ -20,23 +20,23 @@ * */ -// Qt includes -#include <qlayout.h> +// TQt includes +#include <tqlayout.h> // KDE includes #include <kdebug.h> #include <kdialog.h> #include <klocale.h> -#include <qtooltip.h> +#include <tqtooltip.h> // local includes #include "KPrPrinterDlg.h" - KPrPrinterDlg::KPrPrinterDlg( QWidget *parent, const char *name ) - : KPrintDialogPage( parent, name ) + KPrPrinterDlg::KPrPrinterDlg( TQWidget *tqparent, const char *name ) + : KPrintDialogPage( tqparent, name ) { setTitle( i18n( "KPresenter Options" ) ); - QGridLayout *layout = new QGridLayout( this, 2, 1, 11, 6 ); + TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, 11, 6 ); txtRows = new KIntNumInput(this ); txtRows->setMinValue(1); txtRows->setMaxValue(5); @@ -45,36 +45,36 @@ txtColumns->setMinValue(1); txtColumns->setMaxValue(5); txtColumns->setValue(1); - connect( txtRows, SIGNAL( valueChanged( int ) ), this, SLOT( txtRows_valueChanged( int ) ) ); - connect( txtColumns, SIGNAL( valueChanged( int ) ), this, SLOT( txtColumns_valueChanged( int ) ) ); + connect( txtRows, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( txtRows_valueChanged( int ) ) ); + connect( txtColumns, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( txtColumns_valueChanged( int ) ) ); - QLabel *caption = new QLabel(i18n("Slides in the pages:"), this ); - QToolTip::add( caption, i18n("Choose how many rows and columns with slides you want to have on all pages") ); - layout->addMultiCellWidget( caption, 0, 0, 0, 1 ); - QVBoxLayout *l2 = new QVBoxLayout( 0, 0, 6 ); - l2->addWidget( new QLabel(i18n("Rows: "), this) ); - l2->addWidget( new QLabel(i18n("Columns: "), this) ); - layout->addLayout( l2, 1, 0 ); + TQLabel *caption = new TQLabel(i18n("Slides in the pages:"), this ); + TQToolTip::add( caption, i18n("Choose how many rows and columns with slides you want to have on all pages") ); + tqlayout->addMultiCellWidget( caption, 0, 0, 0, 1 ); + TQVBoxLayout *l2 = new TQVBoxLayout( 0, 0, 6 ); + l2->addWidget( new TQLabel(i18n("Rows: "), this) ); + l2->addWidget( new TQLabel(i18n("Columns: "), this) ); + tqlayout->addLayout( l2, 1, 0 ); - QVBoxLayout *l3 = new QVBoxLayout( 0, 0, 6 ); + TQVBoxLayout *l3 = new TQVBoxLayout( 0, 0, 6 ); l3->addWidget( txtRows ); l3->addWidget( txtColumns ); - layout->addLayout( l3, 1, 1 ); + tqlayout->addLayout( l3, 1, 1 ); - drawBorder = new QCheckBox(i18n("Draw border around the slides"), this ); + drawBorder = new TQCheckBox(i18n("Draw border around the slides"), this ); drawBorder->setChecked( true ); drawBorder->setEnabled( false ); - layout->addMultiCellWidget( drawBorder, 2, 2, 0, 1 ); + tqlayout->addMultiCellWidget( drawBorder, 2, 2, 0, 1 ); } -void KPrPrinterDlg::getOptions( QMap<QString, QString>& opts, bool ) +void KPrPrinterDlg::getOptions( TQMap<TQString, TQString>& opts, bool ) { - opts["kde-kpresenter-printrows"] = QString::number(txtRows->value()); - opts["kde-kpresenter-printcolumns"] = QString::number(txtColumns->value()); - opts["kde-kpresenter-printslideborders"] = QString::number(drawBorder->isEnabled() && drawBorder->isChecked()); + opts["kde-kpresenter-printrows"] = TQString::number(txtRows->value()); + opts["kde-kpresenter-printcolumns"] = TQString::number(txtColumns->value()); + opts["kde-kpresenter-printslideborders"] = TQString::number(drawBorder->isEnabled() && drawBorder->isChecked()); } -void KPrPrinterDlg::setOptions( const QMap<QString, QString>& opts ) +void KPrPrinterDlg::setOptions( const TQMap<TQString, TQString>& opts ) { if ( opts["kde-kpresenter-printrows"].isEmpty() ) txtRows->setValue(1); @@ -91,7 +91,7 @@ void KPrPrinterDlg::setOptions( const QMap<QString, QString>& opts ) drawBorder->setChecked((opts["kde-kpresenter-printslideborders"]).toInt()); } -bool KPrPrinterDlg::isValid( const QString& ) +bool KPrPrinterDlg::isValid( const TQString& ) { return true; } diff --git a/kpresenter/KPrPrinterDlg.h b/kpresenter/KPrPrinterDlg.h index 5c081cc3..404fcf8d 100644 --- a/kpresenter/KPrPrinterDlg.h +++ b/kpresenter/KPrPrinterDlg.h @@ -26,22 +26,23 @@ #include <kdeprint/kprintdialogpage.h> #include <knuminput.h> -#include <qcheckbox.h> -#include <qlabel.h> +#include <tqcheckbox.h> +#include <tqlabel.h> class KPrPrinterDlg : public KPrintDialogPage { Q_OBJECT + TQ_OBJECT public: /// Getting the common arguments. - KPrPrinterDlg( QWidget *parent = 0, const char *name = 0 ); + KPrPrinterDlg( TQWidget *tqparent = 0, const char *name = 0 ); /// Reimplemented. - void getOptions( QMap<QString, QString>& opts, bool include_def = false ); + void getOptions( TQMap<TQString, TQString>& opts, bool include_def = false ); /// Reimplemented - void setOptions( const QMap<QString, QString>& opts ); + void setOptions( const TQMap<TQString, TQString>& opts ); /// Reimplemented. - bool isValid( const QString& msg ); + bool isValid( const TQString& msg ); private slots: void txtRows_valueChanged( int ); @@ -50,7 +51,7 @@ class KPrPrinterDlg : public KPrintDialogPage private: KIntNumInput *txtRows; KIntNumInput *txtColumns; - QCheckBox *drawBorder; + TQCheckBox *drawBorder; }; #endif //kpresenterprinterdlg_included diff --git a/kpresenter/KPrPropertyEditor.cpp b/kpresenter/KPrPropertyEditor.cpp index 3fe64f05..4e8ec38f 100644 --- a/kpresenter/KPrPropertyEditor.cpp +++ b/kpresenter/KPrPropertyEditor.cpp @@ -36,8 +36,8 @@ #include <klocale.h> #include <kstdguiitem.h> -KPrPropertyEditor::KPrPropertyEditor( QWidget *parent, const char *name, KPrPage *page, KPrDocument *doc ) - : QTabDialog( parent, name, true ) +KPrPropertyEditor::KPrPropertyEditor( TQWidget *tqparent, const char *name, KPrPage *page, KPrDocument *doc ) + : TQTabDialog( tqparent, name, true ) , m_page( page ) , m_doc( doc ) , m_objects( page->getSelectedObjects() ) @@ -55,7 +55,7 @@ KPrPropertyEditor::KPrPropertyEditor( QWidget *parent, const char *name, KPrPage setOkButton( KStdGuiItem::ok().text() ); setApplyButton( KStdGuiItem::apply().text() ); - connect( this, SIGNAL( applyButtonPressed() ), this, SLOT( slotDone() ) ); + connect( this, TQT_SIGNAL( applyButtonPressed() ), this, TQT_SLOT( slotDone() ) ); m_objectProperties = new KPrObjectProperties( m_objects ); @@ -275,7 +275,7 @@ KCommand * KPrPropertyEditor::getCommand() macro = new KMacroCommand( i18n( "Apply Properties" ) ); } - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current(); ++it ) { KoRect oldRect = it.current()->getRect(); @@ -438,7 +438,7 @@ KPrGeneralProperty::GeneralValue KPrPropertyEditor::getGeneralValue() bool keepRatio = false; generalValue.m_keepRatio = STATE_OFF; - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); if ( it.current() ) { protect = it.current()->isProtect(); diff --git a/kpresenter/KPrPropertyEditor.h b/kpresenter/KPrPropertyEditor.h index 71d1dc3f..d6fccd6d 100644 --- a/kpresenter/KPrPropertyEditor.h +++ b/kpresenter/KPrPropertyEditor.h @@ -20,7 +20,7 @@ #ifndef PROPERTYEDITOR_H #define PROPERTYEDITOR_H -#include <qtabdialog.h> +#include <tqtabdialog.h> #include <KPrGeneralProperty.h> class KCommand; @@ -36,12 +36,13 @@ class KPrPictureProperty; class KPrTextProperty; class KPrObjectProperties; -class KPrPropertyEditor : public QTabDialog +class KPrPropertyEditor : public TQTabDialog { Q_OBJECT + TQ_OBJECT public: - KPrPropertyEditor( QWidget *parent = 0, const char *name = 0, KPrPage *page = 0, KPrDocument *doc = 0 ); + KPrPropertyEditor( TQWidget *tqparent = 0, const char *name = 0, KPrPage *page = 0, KPrDocument *doc = 0 ); ~KPrPropertyEditor(); KCommand * getCommand(); @@ -64,7 +65,7 @@ private: KPrPage *m_page; KPrDocument *m_doc; - QPtrList<KPrObject> m_objects; + TQPtrList<KPrObject> m_objects; KPrPenStyleWidget *m_penProperty; KPrBrushProperty *m_brushProperty; diff --git a/kpresenter/KPrQuadricBezierCurveObjectIface.cpp b/kpresenter/KPrQuadricBezierCurveObjectIface.cpp index 5db58acd..361060c5 100644 --- a/kpresenter/KPrQuadricBezierCurveObjectIface.cpp +++ b/kpresenter/KPrQuadricBezierCurveObjectIface.cpp @@ -33,23 +33,23 @@ KPrQuadricBezierCurveObjectIface::KPrQuadricBezierCurveObjectIface( KPrQuadricBe obj = _obj; } -void KPrQuadricBezierCurveObjectIface::setLineBegin( const QString & type) +void KPrQuadricBezierCurveObjectIface::setLineBegin( const TQString & type) { obj->setLineBegin(lineEndBeginFromString( type )); } -void KPrQuadricBezierCurveObjectIface::setLineEnd( const QString & type) +void KPrQuadricBezierCurveObjectIface::setLineEnd( const TQString & type) { obj->setLineEnd(lineEndBeginFromString( type )); } -QString KPrQuadricBezierCurveObjectIface::lineBegin()const +TQString KPrQuadricBezierCurveObjectIface::lineBegin()const { LineEnd type=obj->getLineBegin(); return lineEndBeginName( type ); } -QString KPrQuadricBezierCurveObjectIface::lineEnd() const +TQString KPrQuadricBezierCurveObjectIface::lineEnd() const { LineEnd type=obj->getLineEnd(); return lineEndBeginName( type ); diff --git a/kpresenter/KPrQuadricBezierCurveObjectIface.h b/kpresenter/KPrQuadricBezierCurveObjectIface.h index ed13a75f..3b1d383f 100644 --- a/kpresenter/KPrQuadricBezierCurveObjectIface.h +++ b/kpresenter/KPrQuadricBezierCurveObjectIface.h @@ -18,13 +18,13 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KPQUADRI_OBJECT_IFACE_H -#define KPQUADRI_OBJECT_IFACE_H +#ifndef KPTQUADRI_OBJECT_IFACE_H +#define KPTQUADRI_OBJECT_IFACE_H #include <dcopobject.h> #include <dcopref.h> #include "KPrObjectIface.h" -#include <qstring.h> +#include <tqstring.h> class KPrQuadricBezierCurveObject; @@ -36,10 +36,10 @@ public: k_dcop: - virtual void setLineBegin( const QString & ); - virtual void setLineEnd( const QString & ); - QString lineBegin()const; - QString lineEnd() const; + virtual void setLineBegin( const TQString & ); + virtual void setLineEnd( const TQString & ); + TQString lineBegin()const; + TQString lineEnd() const; void horizontalFlip(); void verticalFlip(); diff --git a/kpresenter/KPrRectObject.cpp b/kpresenter/KPrRectObject.cpp index b7dc7bcf..b32f6f73 100644 --- a/kpresenter/KPrRectObject.cpp +++ b/kpresenter/KPrRectObject.cpp @@ -29,10 +29,10 @@ #include <KoXmlNS.h> #include <kdebug.h> -#include <qregion.h> -#include <qbitmap.h> -#include <qdom.h> -#include <qpainter.h> +#include <tqregion.h> +#include <tqbitmap.h> +#include <tqdom.h> +#include <tqpainter.h> KPrRectObject::KPrRectObject() : KPr2DObject() @@ -48,8 +48,8 @@ DCOPObject* KPrRectObject::dcopObject() return dcop; } -KPrRectObject::KPrRectObject( const KoPen &_pen, const QBrush &_brush, FillType _fillType, - const QColor &_gColor1, const QColor &_gColor2, +KPrRectObject::KPrRectObject( const KoPen &_pen, const TQBrush &_brush, FillType _fillType, + const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType, int _xRnd, int _yRnd, bool _unbalanced, int _xfactor, int _yfactor) : KPr2DObject( _pen, _brush, _fillType, _gColor1, _gColor2, _gType, @@ -64,11 +64,11 @@ KPrRectObject &KPrRectObject::operator=( const KPrRectObject & ) return *this; } -QDomDocumentFragment KPrRectObject::save( QDomDocument& doc, double offset ) +TQDomDocumentFragment KPrRectObject::save( TQDomDocument& doc, double offset ) { - QDomDocumentFragment fragment=KPr2DObject::save(doc, offset); + TQDomDocumentFragment fragment=KPr2DObject::save(doc, offset); if (xRnd!=0 || yRnd!=0) { - QDomElement elem=doc.createElement("RNDS"); + TQDomElement elem=doc.createElement("RNDS"); elem.setAttribute("x", xRnd); elem.setAttribute("y", yRnd); fragment.appendChild(elem); @@ -82,7 +82,7 @@ bool KPrRectObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const { double cornerRadiusX = ext.width() / 200.0 * xRnd; double cornerRadiusY = ext.height() / 200.0 * yRnd; - double cornerRadius = QMIN( cornerRadiusX, cornerRadiusY ); + double cornerRadius = TQMIN( cornerRadiusX, cornerRadiusY ); sc.xmlWriter.addAttributePt( "draw:corner-radius", cornerRadius ); if ( cornerRadiusX != cornerRadiusY ) { @@ -100,33 +100,33 @@ const char * KPrRectObject::getOasisElementName() const } -void KPrRectObject::loadOasis(const QDomElement &element, KoOasisContext&context, KPrLoadingInfo *info) +void KPrRectObject::loadOasis(const TQDomElement &element, KoOasisContext&context, KPrLoadingInfo *info) { KPr2DObject::loadOasis(element, context, info); if ( element.hasAttributeNS( KoXmlNS::koffice, "corner-radius-x" ) && element.hasAttributeNS( KoXmlNS::koffice, "corner-radius-y" ) ) { xRnd = int( KoUnit::parseValue( - element.attributeNS( KoXmlNS::koffice, "corner-radius-x", QString::null ) + element.attributeNS( KoXmlNS::koffice, "corner-radius-x", TQString() ) ) * 200.0 / ext.width() ); yRnd = int( KoUnit::parseValue( - element.attributeNS( KoXmlNS::koffice, "corner-radius-y", QString::null ) + element.attributeNS( KoXmlNS::koffice, "corner-radius-y", TQString() ) ) * 200.0 / ext.height() ); } else if ( element.hasAttributeNS( KoXmlNS::draw, "corner-radius" ) ) { xRnd = int( KoUnit::parseValue( - element.attributeNS( KoXmlNS::draw, "corner-radius", QString::null ) + element.attributeNS( KoXmlNS::draw, "corner-radius", TQString() ) ) * 200.0 / ext.width() ); yRnd = xRnd; } kdDebug(33001) << " KPrRectObject : radius xRnd :" << xRnd << " yRnd :" << yRnd <<endl; } -double KPrRectObject::load(const QDomElement &element) +double KPrRectObject::load(const TQDomElement &element) { double offset=KPr2DObject::load(element); - QDomElement e=element.namedItem("RNDS").toElement(); + TQDomElement e=element.namedItem("RNDS").toElement(); if(!e.isNull()) { int tmp=0; if(e.hasAttribute("x")) @@ -140,7 +140,7 @@ double KPrRectObject::load(const QDomElement &element) return offset; } -QPointArray KPrRectObject::boundingRegion( int x, int y, int w, int h, int _xRnd, int _yRnd) const +TQPointArray KPrRectObject::boundingRegion( int x, int y, int w, int h, int _xRnd, int _yRnd) const { w--; h--; @@ -153,12 +153,12 @@ QPointArray KPrRectObject::boundingRegion( int x, int y, int w, int h, int _xRnd ryy = h/200*_yRnd; int rxx2 = 2*rxx; int ryy2 = 2*ryy; - QPointArray a[4]; + TQPointArray a[4]; a[0].makeArc( x, y, rxx2, ryy2, 1440, 1440); // ..., 1*16*90, 16*90); a[1].makeArc( x, y+h-ryy2, rxx2, ryy2, 2880, 1440); // ..., 2*16*90, 16*90); a[2].makeArc( x+w-rxx2, y+h-ryy2, rxx2, ryy2, 4320, 1440); // ..., 3*16*90, 16*90); a[3].makeArc( x+w-rxx2, y, rxx2, ryy2, 0, 1440); // ..., 0*16*90, 16*90); - QPointArray aa; + TQPointArray aa; aa.resize( a[0].size() + a[1].size() + a[2].size() + a[3].size() ); uint j = 0; for ( int k=0; k<4; k++ ) { @@ -170,23 +170,23 @@ QPointArray KPrRectObject::boundingRegion( int x, int y, int w, int h, int _xRnd return aa; } -void KPrRectObject::paint( QPainter* _painter, KoTextZoomHandler*_zoomHandler, +void KPrRectObject::paint( TQPainter* _painter, KoTextZoomHandler*_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour ) { int ow = _zoomHandler->zoomItX( ext.width() ); int oh = _zoomHandler->zoomItY( ext.height() ); if ( drawContour ) { - QPen pen3( Qt::black, 1, Qt::DotLine ); + TQPen pen3( TQt::black, 1, TQt::DotLine ); _painter->setPen( pen3 ); - _painter->setRasterOp( Qt::NotXorROP ); + _painter->setRasterOp( TQt::NotXorROP ); _painter->drawRoundRect( 0, 0, ow, oh, xRnd, yRnd ); return; } - QPen pen2 = pen.zoomedPen( _zoomHandler ); - int pw = ( pen2.style() == Qt::NoPen ) ? 1 : pen2.width(); + TQPen pen2 = pen.zoomedPen( _zoomHandler ); + int pw = ( pen2.style() == TQt::NoPen ) ? 1 : pen2.width(); _painter->setPen( pen2 ); if ( drawingShadow || getFillType() == FT_BRUSH || !gradient ) { //plain fill @@ -194,15 +194,15 @@ void KPrRectObject::paint( QPainter* _painter, KoTextZoomHandler*_zoomHandler, _painter->setBrush( getBrush() ); } else { //gradient - QSize size( _zoomHandler->zoomSize( ext ) ); + TQSize size( _zoomHandler->zoomSize( ext ) ); if ( m_redrawGradientPix || gradient->size() != size ) { m_redrawGradientPix = false; gradient->setSize( size ); - QPointArray arr = boundingRegion( 0, 0, ow - pw + 1, oh - pw + 1, xRnd, yRnd ); - QRegion clipregion(arr); + TQPointArray arr = boundingRegion( 0, 0, ow - pw + 1, oh - pw + 1, xRnd, yRnd ); + TQRegion clipregion(arr); m_gradientPix.resize ( ow, oh ); - m_gradientPix.fill( Qt::white ); - QPainter p; + m_gradientPix.fill( TQt::white ); + TQPainter p; p.begin( &m_gradientPix ); p.setClipRegion( clipregion ); p.drawPixmap( 0, 0, gradient->pixmap() ); @@ -212,7 +212,7 @@ void KPrRectObject::paint( QPainter* _painter, KoTextZoomHandler*_zoomHandler, } _painter->drawPixmap( pw / 2, pw / 2, m_gradientPix, 0, 0, ow - pw + 1, oh - pw + 1 ); - _painter->setBrush( Qt::NoBrush ); + _painter->setBrush( TQt::NoBrush ); } _painter->drawRoundRect( pw / 2, pw / 2, ow - pw + 1, oh - pw + 1, xRnd, yRnd ); diff --git a/kpresenter/KPrRectObject.h b/kpresenter/KPrRectObject.h index e803a133..518ef671 100644 --- a/kpresenter/KPrRectObject.h +++ b/kpresenter/KPrRectObject.h @@ -33,8 +33,8 @@ class KPrRectObject : public KPr2DObject { public: KPrRectObject(); - KPrRectObject( const KoPen &_pen, const QBrush &_brush, FillType _fillType, - const QColor &_gColor1, const QColor &_gColor2, + KPrRectObject( const KoPen &_pen, const TQBrush &_brush, FillType _fillType, + const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType, int _xRnd, int _yRnd, bool _unbalanced, int _xfactor, int _yfactor ); virtual ~KPrRectObject() {} @@ -47,20 +47,20 @@ public: virtual ObjType getType() const { return OT_RECT; } - virtual QString getTypeString() const + virtual TQString getTypeString() const { return i18n("Rectangle"); } virtual void getRnds( int &_xRnd, int &_yRnd ) const { _xRnd = xRnd; _yRnd = yRnd; } - virtual QDomDocumentFragment save( QDomDocument& doc, double offset ); - virtual double load(const QDomElement &element); - virtual void loadOasis(const QDomElement &element, KoOasisContext &context, KPrLoadingInfo *info); + virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset ); + virtual double load(const TQDomElement &element); + virtual void loadOasis(const TQDomElement &element, KoOasisContext &context, KPrLoadingInfo *info); protected: virtual const char * getOasisElementName() const; virtual bool saveOasisObjectAttributes( KPOasisSaveContext &sc ) const; - virtual void paint( QPainter *_painter,KoTextZoomHandler*_zoomHandler, + virtual void paint( TQPainter *_painter,KoTextZoomHandler*_zoomHandler, int /* pageNum */, bool drawingShadow, bool drawContour ); int xRnd, yRnd; @@ -69,7 +69,7 @@ private: Returns a bounding region for a rounded-corners rectangle. Useful for setting further clipping (e.g. to draw a pixmap on such a rectangle). */ - QPointArray boundingRegion( int x, int y, int w, int h, int _xRnd, int _yRnd) const; + TQPointArray boundingRegion( int x, int y, int w, int h, int _xRnd, int _yRnd) const; }; #endif diff --git a/kpresenter/KPrRectPreview.cpp b/kpresenter/KPrRectPreview.cpp index 754dadf9..a1f7311c 100644 --- a/kpresenter/KPrRectPreview.cpp +++ b/kpresenter/KPrRectPreview.cpp @@ -21,10 +21,10 @@ */ #include "KPrRectPreview.h" -#include <qpainter.h> +#include <tqpainter.h> -KPrRectPreview::KPrRectPreview( QWidget* parent, const char* name ) - : QFrame( parent, name ) +KPrRectPreview::KPrRectPreview( TQWidget* tqparent, const char* name ) + : TQFrame( tqparent, name ) { setFrameStyle( WinPanel | Sunken ); setBackgroundColor( white ); @@ -34,7 +34,7 @@ KPrRectPreview::KPrRectPreview( QWidget* parent, const char* name ) setMinimumSize( 200, 100 ); } -void KPrRectPreview::drawContents( QPainter* painter ) +void KPrRectPreview::drawContents( TQPainter* painter ) { int ow = width(); int oh = height(); diff --git a/kpresenter/KPrRectPreview.h b/kpresenter/KPrRectPreview.h index 2983c94a..3b91fe33 100644 --- a/kpresenter/KPrRectPreview.h +++ b/kpresenter/KPrRectPreview.h @@ -23,29 +23,30 @@ #ifndef RECTPREVIEW_H #define RECTPREVIEW_H -#include <qframe.h> -#include <qpen.h> -#include <qbrush.h> +#include <tqframe.h> +#include <tqpen.h> +#include <tqbrush.h> -class KPrRectPreview : public QFrame +class KPrRectPreview : public TQFrame { Q_OBJECT + TQ_OBJECT public: - KPrRectPreview( QWidget* parent, const char* ); + KPrRectPreview( TQWidget* tqparent, const char* ); ~KPrRectPreview() {} void setRnds( int _rx, int _ry ) - { xRnd = _rx; yRnd = _ry; repaint( contentsRect(), true ); } - void setPenBrush( const QPen &_pen, const QBrush &_brush ) - { pen = _pen; brush = _brush; repaint( true ); } + { xRnd = _rx; yRnd = _ry; tqrepaint( contentsRect(), true ); } + void setPenBrush( const TQPen &_pen, const TQBrush &_brush ) + { pen = _pen; brush = _brush; tqrepaint( true ); } protected: - void drawContents( QPainter* ); + void drawContents( TQPainter* ); int xRnd, yRnd; - QPen pen; - QBrush brush; + TQPen pen; + TQBrush brush; }; #endif /* RECTPREVIEW_H */ diff --git a/kpresenter/KPrRectProperty.cpp b/kpresenter/KPrRectProperty.cpp index f1732476..73573646 100644 --- a/kpresenter/KPrRectProperty.cpp +++ b/kpresenter/KPrRectProperty.cpp @@ -25,23 +25,23 @@ #include <KoImageResource.h> -#include <qspinbox.h> -#include <qtoolbutton.h> -#include <qlayout.h> +#include <tqspinbox.h> +#include <tqtoolbutton.h> +#include <tqlayout.h> -KPrRectProperty::KPrRectProperty( QWidget *parent, const char *name, KPrRectValueCmd::RectValues &rectValue ) -: QWidget( parent, name ) +KPrRectProperty::KPrRectProperty( TQWidget *tqparent, const char *name, KPrRectValueCmd::RectValues &rectValue ) +: TQWidget( tqparent, name ) , m_rectValue( rectValue ) { formerVerticalValue = 0; - QVBoxLayout *layout = new QVBoxLayout( this ); - layout->addWidget( m_ui = new RectPropertyUI( this ) ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->addWidget( m_ui = new RectPropertyUI( this ) ); KoImageResource kir; m_ui->combineButton->setPixmap(kir.chain()); - connect( m_ui->xRndInput, SIGNAL( valueChanged( int ) ), this, SLOT( slotRndChanged() ) ); - connect( m_ui->yRndInput, SIGNAL( valueChanged( int ) ), this, SLOT( slotRndChanged() ) ); - connect( m_ui->combineButton, SIGNAL( toggled( bool ) ), this, SLOT( combineToggled( bool ) ) ); + connect( m_ui->xRndInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotRndChanged() ) ); + connect( m_ui->yRndInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotRndChanged() ) ); + connect( m_ui->combineButton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( combineToggled( bool ) ) ); slotReset(); } @@ -127,17 +127,17 @@ void KPrRectProperty::combineToggled( bool on) if( on ) { formerVerticalValue = getYRnd(); m_ui->yRndInput->setValue( getXRnd() ); - connect(m_ui->yRndInput, SIGNAL( valueChanged ( int ) ), - m_ui->xRndInput, SLOT( setValue ( int ) )); - connect(m_ui->xRndInput, SIGNAL( valueChanged ( int ) ), - m_ui->yRndInput, SLOT( setValue ( int ) )); + connect(m_ui->yRndInput, TQT_SIGNAL( valueChanged ( int ) ), + m_ui->xRndInput, TQT_SLOT( setValue ( int ) )); + connect(m_ui->xRndInput, TQT_SIGNAL( valueChanged ( int ) ), + m_ui->yRndInput, TQT_SLOT( setValue ( int ) )); m_ui->combineButton->setPixmap(kir.chain()); } else { - disconnect(m_ui->yRndInput, SIGNAL( valueChanged ( int ) ), - m_ui->xRndInput, SLOT( setValue ( int ) )); - disconnect(m_ui->xRndInput, SIGNAL( valueChanged ( int ) ), - m_ui->yRndInput, SLOT( setValue ( int ) )); + disconnect(m_ui->yRndInput, TQT_SIGNAL( valueChanged ( int ) ), + m_ui->xRndInput, TQT_SLOT( setValue ( int ) )); + disconnect(m_ui->xRndInput, TQT_SIGNAL( valueChanged ( int ) ), + m_ui->yRndInput, TQT_SLOT( setValue ( int ) )); if(formerVerticalValue != 0) m_ui->yRndInput->setValue( formerVerticalValue ); m_ui->combineButton->setPixmap(kir.chainBroken()); diff --git a/kpresenter/KPrRectProperty.h b/kpresenter/KPrRectProperty.h index 53b20f0e..b276d9c9 100644 --- a/kpresenter/KPrRectProperty.h +++ b/kpresenter/KPrRectProperty.h @@ -21,17 +21,18 @@ #ifndef RECTPROPERTY_H #define RECTPROPERTY_H -#include <qwidget.h> +#include <tqwidget.h> #include "KPrCommand.h" class RectPropertyUI; -class KPrRectProperty : public QWidget +class KPrRectProperty : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KPrRectProperty( QWidget *parent, const char *name, KPrRectValueCmd::RectValues &rectValue ); + KPrRectProperty( TQWidget *tqparent, const char *name, KPrRectValueCmd::RectValues &rectValue ); ~KPrRectProperty(); int getRectPropertyChange() const; diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp index f6463e50..6f751698 100644 --- a/kpresenter/KPrRotationDialogImpl.cpp +++ b/kpresenter/KPrRotationDialogImpl.cpp @@ -16,13 +16,13 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include <qtoolbutton.h> -#include <qslider.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qbuttongroup.h> -#include <qobject.h> -#include <qevent.h> +#include <tqtoolbutton.h> +#include <tqslider.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqbuttongroup.h> +#include <tqobject.h> +#include <tqevent.h> #include <kiconloader.h> #include <kdebug.h> @@ -33,23 +33,23 @@ #include "rotationpropertyui.h" #include "KPrTextPreview.h" -KPrRotationDialogImpl::KPrRotationDialogImpl( QWidget *parent, const char* name ) -: KDialogBase( parent, name, true, i18n( "Rotation"), Ok|Cancel|Apply, Ok, true ) +KPrRotationDialogImpl::KPrRotationDialogImpl( TQWidget *tqparent, const char* name ) +: KDialogBase( tqparent, name, true, i18n( "Rotation"), Ok|Cancel|Apply, Ok, true ) , m_dialog( new RotationPropertyUI( this, name ) ) { noSignals = false; m_preview = new KPrTextPreview( m_dialog->previewPanel ); - QHBoxLayout *lay = new QHBoxLayout( m_dialog->previewPanel, m_dialog->previewPanel->lineWidth(), 0 ); + TQHBoxLayout *lay = new TQHBoxLayout( m_dialog->previewPanel, m_dialog->previewPanel->lineWidth(), 0 ); lay->addWidget( m_preview ); - QHBoxLayout *hbox = new QHBoxLayout(m_dialog->angleFrame); + TQHBoxLayout *hbox = new TQHBoxLayout(m_dialog->angleFrame); m_angleGroup = new KPrCircleGroup(m_dialog->angleFrame); hbox->addWidget(m_angleGroup); // Draw the circle of checkboxes. - QGridLayout *circleLayout = new QGridLayout(m_angleGroup, 4, 5); - circleLayout->addItem(new QSpacerItem ( 1, 1 , QSizePolicy::MinimumExpanding ), 0, 0); - circleLayout->addItem(new QSpacerItem ( 1, 1 , QSizePolicy::MinimumExpanding ), 0, 5); + TQGridLayout *circleLayout = new TQGridLayout(m_angleGroup, 4, 5); + circleLayout->addItem(new TQSpacerItem ( 1, 1 , TQSizePolicy::MinimumExpanding ), 0, 0); + circleLayout->addItem(new TQSpacerItem ( 1, 1 , TQSizePolicy::MinimumExpanding ), 0, 5); KPrCircleToggle *r0 = new KPrCircleToggle(m_angleGroup, "tm", 0); KPrCircleToggle *r45 = new KPrCircleToggle(m_angleGroup, "tr", 45); KPrCircleToggle *r90 = new KPrCircleToggle(m_angleGroup, "mr", 90); @@ -67,13 +67,13 @@ KPrRotationDialogImpl::KPrRotationDialogImpl( QWidget *parent, const char* name circleLayout->addWidget(r90, 1, 3); circleLayout->addWidget(r270, 1, 1); - connect( m_angleGroup, SIGNAL (clicked (int)), - this, SLOT( angleMode( int ) ) ); - connect (m_dialog->angleSlider, SIGNAL( valueChanged (int ) ), - this, SLOT( angleMode( int ) ) ); - connect (m_dialog->angleSpinbox, SIGNAL (valueChanged (double) ), - this, SLOT( angleChanged( double ) ) ); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); + connect( m_angleGroup, TQT_SIGNAL (clicked (int)), + this, TQT_SLOT( angleMode( int ) ) ); + connect (m_dialog->angleSlider, TQT_SIGNAL( valueChanged (int ) ), + this, TQT_SLOT( angleMode( int ) ) ); + connect (m_dialog->angleSpinbox, TQT_SIGNAL (valueChanged (double) ), + this, TQT_SLOT( angleChanged( double ) ) ); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); setMainWidget( m_dialog ); } @@ -114,8 +114,8 @@ void KPrRotationDialogImpl::angleMode( int angle ) } -KPrCircleToggle::KPrCircleToggle( QWidget *parent, const QString &image, int id ) - : QLabel( parent ) +KPrCircleToggle::KPrCircleToggle( TQWidget *tqparent, const TQString &image, int id ) + : TQLabel( tqparent ) { KIconLoader il("kpresenter"); m_off = il.loadIcon("rotate/" + image, KIcon::NoGroup, 28); @@ -125,12 +125,12 @@ KPrCircleToggle::KPrCircleToggle( QWidget *parent, const QString &image, int id m_id = id; setMouseTracking(true); setPixmap( m_off ); - KPrCircleGroup *cg = dynamic_cast<KPrCircleGroup*> (parent); + KPrCircleGroup *cg = dynamic_cast<KPrCircleGroup*> (tqparent); if(cg != 0) cg->add(this); } -void KPrCircleToggle::mousePressEvent ( QMouseEvent * e ) { +void KPrCircleToggle::mousePressEvent ( TQMouseEvent * e ) { if(e->button() != Qt:: LeftButton) return; setChecked(!m_selected); @@ -143,8 +143,8 @@ void KPrCircleToggle::setChecked(bool on) { emit clicked(m_id); } -KPrCircleGroup::KPrCircleGroup(QWidget *parent) - : QFrame(parent), m_buttons() +KPrCircleGroup::KPrCircleGroup(TQWidget *tqparent) + : TQFrame(tqparent), m_buttons() { noSignals=false; } @@ -158,7 +158,7 @@ void KPrCircleGroup::setAngle(int angle) { } void KPrCircleGroup::add(KPrCircleToggle *button) { - connect (button, SIGNAL(clicked (int)), this, SLOT (selectionChanged (int)) ); + connect (button, TQT_SIGNAL(clicked (int)), this, TQT_SLOT (selectionChanged (int)) ); m_buttons.append(button); } diff --git a/kpresenter/KPrRotationDialogImpl.h b/kpresenter/KPrRotationDialogImpl.h index 2eb2586b..7741ff76 100644 --- a/kpresenter/KPrRotationDialogImpl.h +++ b/kpresenter/KPrRotationDialogImpl.h @@ -19,13 +19,13 @@ #ifndef __rotationdialogimpl_h__ #define __rotationdialogimpl_h__ -#include <qlabel.h> +#include <tqlabel.h> #include <kdialogbase.h> class KPrTextPreview; class RotationPropertyUI; -class QObject; -class QEvent; +class TQObject; +class TQEvent; class KPrCircleGroup; /** @@ -34,9 +34,10 @@ class KPrCircleGroup; class KPrRotationDialogImpl : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KPrRotationDialogImpl( QWidget *parent, const char* name = 0 ); + KPrRotationDialogImpl( TQWidget *tqparent, const char* name = 0 ); ~KPrRotationDialogImpl() {} void setAngle( double angle ); @@ -60,18 +61,19 @@ private: * A toggle-button like widget that shows one pixmap when it is checked, * and another when it is unselected. */ -class KPrCircleToggle : public QLabel +class KPrCircleToggle : public TQLabel { Q_OBJECT + TQ_OBJECT public: /** * Constructor. - * @param parent the parent widget, as required by Qt. + * @param tqparent the tqparent widget, as required by TQt. * @param image the named image that we will use. "rotate/" is * prepended and "dn" is appended for the checked state. * @param id the id that will be used in the clicked signal */ - KPrCircleToggle(QWidget *parent, const QString &image, int id); + KPrCircleToggle(TQWidget *tqparent, const TQString &image, int id); /// return the id which is passed in the constructor int id() { return m_id; } @@ -87,11 +89,11 @@ public slots: void setChecked(bool on); protected: - /// overwritten method from QWidget. - void mousePressEvent ( QMouseEvent * e ); + /// overwritten method from TQWidget. + void mousePressEvent ( TQMouseEvent * e ); private: - QPixmap m_on, m_off; + TQPixmap m_on, m_off; bool m_selected; int m_id; }; @@ -99,15 +101,16 @@ private: /** * A button-group equivalent for a set of KPrCircleToggle classes. */ -class KPrCircleGroup : public QFrame +class KPrCircleGroup : public TQFrame { Q_OBJECT + TQ_OBJECT public: /** * Constructor. - * @param parent the parent widget, as required by Qt. + * @param tqparent the tqparent widget, as required by TQt. */ - KPrCircleGroup(QWidget *parent); + KPrCircleGroup(TQWidget *tqparent); /** * Set the angle the group is currently representing. If there is a child button * that registred itself (using add()) with an ID that matches the argument angle @@ -129,7 +132,7 @@ private slots: void selectionChanged(int buttonId); private: - QPtrList<KPrCircleToggle> m_buttons; + TQPtrList<KPrCircleToggle> m_buttons; bool noSignals; }; diff --git a/kpresenter/KPrSVGPathParser.cpp b/kpresenter/KPrSVGPathParser.cpp index b2fd853f..e452cdfa 100644 --- a/kpresenter/KPrSVGPathParser.cpp +++ b/kpresenter/KPrSVGPathParser.cpp @@ -20,7 +20,7 @@ #include "KPrSVGPathParser.h" -ObjType KPrSVGPathParser::getType( QString &d ) +ObjType KPrSVGPathParser::getType( TQString &d ) { m_type = true; m_pathType = 0; @@ -38,9 +38,9 @@ ObjType KPrSVGPathParser::getType( QString &d ) { objType = OT_FREEHAND; } - else if ( ( m_pathType & SEEN_QUADRIC ) && ! ( m_pathType & SEEN_CUBIC ) ) + else if ( ( m_pathType & SEEN_TQUADRIC ) && ! ( m_pathType & SEEN_CUBIC ) ) { - objType = OT_QUADRICBEZIERCURVE; + objType = OT_TQUADRICBEZIERCURVE; } else if ( m_pathType & SEEN_CUBIC ) { @@ -50,7 +50,7 @@ ObjType KPrSVGPathParser::getType( QString &d ) } -KoPointArray KPrSVGPathParser::getPoints( QString &d, bool convert2lines ) +KoPointArray KPrSVGPathParser::getPoints( TQString &d, bool convert2lines ) { m_type = false; m_pointIdx = 0; @@ -119,7 +119,7 @@ void KPrSVGPathParser::svgCurveToCubic( double x1, double y1, double x2, double if ( x1 == x2 && y1 == y2 ) { - m_pathType |= SEEN_QUADRIC; + m_pathType |= SEEN_TQUADRIC; } else { diff --git a/kpresenter/KPrSVGPathParser.h b/kpresenter/KPrSVGPathParser.h index 064616cd..523e4695 100644 --- a/kpresenter/KPrSVGPathParser.h +++ b/kpresenter/KPrSVGPathParser.h @@ -40,12 +40,12 @@ public: * @return The object type. This can be: * OT_FREEHAND * OT_CLOSED_LINE - * OT_QUADRICBEZIERCURVE + * OT_TQUADRICBEZIERCURVE * OT_CUBICBEZIERCURVE * or * OT_UNDEFINED if path is not supported */ - ObjType getType( QString &d ); + ObjType getType( TQString &d ); /** * @brief Get the points of the path @@ -55,7 +55,7 @@ public: * * @return points of the path */ - KoPointArray getPoints( QString &d, bool convert2lines = false ); + KoPointArray getPoints( TQString &d, bool convert2lines = false ); protected: virtual void svgMoveTo( double x1, double y1, bool abs = true ); @@ -71,7 +71,7 @@ private: SEEN_MOVE = 1, SEEN_LINE = 2, SEEN_CUBIC = 4, - SEEN_QUADRIC = 8, + SEEN_TQUADRIC = 8, SEEN_CLOSE = 16, NO_BEZIER = 32, UNSUPPORTED = 64 diff --git a/kpresenter/KPrShadowDialogImpl.cpp b/kpresenter/KPrShadowDialogImpl.cpp index c97a5068..8fd0cb00 100644 --- a/kpresenter/KPrShadowDialogImpl.cpp +++ b/kpresenter/KPrShadowDialogImpl.cpp @@ -1,8 +1,8 @@ // -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*- -#include <qspinbox.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qbuttongroup.h> +#include <tqspinbox.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqbuttongroup.h> #include <kcolorbutton.h> #include <klocale.h> @@ -10,11 +10,11 @@ #include "KPrShadowDialogImpl.h" #include "KPrTextPreview.h" -KPrShadowDialogImpl::KPrShadowDialogImpl( QWidget *parent, const char* name ) - : ShadowDialogBase( parent, name ) +KPrShadowDialogImpl::KPrShadowDialogImpl( TQWidget *tqparent, const char* name ) + : ShadowDialogBase( tqparent, name ) { _preview = new KPrTextPreview( previewPanel ); - QHBoxLayout *lay = new QHBoxLayout( previewPanel, previewPanel->lineWidth(), 0 ); + TQHBoxLayout *lay = new TQHBoxLayout( previewPanel, previewPanel->lineWidth(), 0 ); lay->addWidget( _preview ); distanceSpinBox->setSuffix(i18n("pt")); ltButton->setPixmap( BarIcon( "shadowLU" ) ); @@ -26,8 +26,8 @@ KPrShadowDialogImpl::KPrShadowDialogImpl( QWidget *parent, const char* name ) lbButton->setPixmap( BarIcon( "shadowLB" ) ); lButton->setPixmap( BarIcon( "shadowL" ) ); - connect( colorButton, SIGNAL( changed( const QColor& ) ), - SLOT( colorChanged( const QColor& ) ) ); + connect( colorButton, TQT_SIGNAL( changed( const TQColor& ) ), + TQT_SLOT( colorChanged( const TQColor& ) ) ); } void KPrShadowDialogImpl::setShadowDirection( ShadowDirection d ) @@ -42,13 +42,13 @@ void KPrShadowDialogImpl::setShadowDistance( int d ) distanceSpinBox->setValue( d ); } -void KPrShadowDialogImpl::setShadowColor( const QColor &c ) +void KPrShadowDialogImpl::setShadowColor( const TQColor &c ) { _preview->setShadowColor( c ); colorButton->setColor( c ); } -void KPrShadowDialogImpl::colorChanged( const QColor& c ) +void KPrShadowDialogImpl::colorChanged( const TQColor& c ) { _preview->setShadowColor( c ); } @@ -84,7 +84,7 @@ int KPrShadowDialogImpl::shadowDistance() return distanceSpinBox->value(); } -QColor KPrShadowDialogImpl::shadowColor() +TQColor KPrShadowDialogImpl::shadowColor() { return colorButton->color(); } diff --git a/kpresenter/KPrShadowDialogImpl.h b/kpresenter/KPrShadowDialogImpl.h index ad536f5f..c6c95876 100644 --- a/kpresenter/KPrShadowDialogImpl.h +++ b/kpresenter/KPrShadowDialogImpl.h @@ -10,24 +10,25 @@ class KPrTextPreview; class KPrShadowDialogImpl : public ShadowDialogBase { Q_OBJECT + TQ_OBJECT public: - KPrShadowDialogImpl( QWidget *parent, const char* name = 0 ); + KPrShadowDialogImpl( TQWidget *tqparent, const char* name = 0 ); ~KPrShadowDialogImpl() {} void setShadowDirection( ShadowDirection sd ); void setShadowDistance( int sd ); - void setShadowColor( const QColor &sc ); + void setShadowColor( const TQColor &sc ); ShadowDirection shadowDirection(); int shadowDistance(); - QColor shadowColor(); + TQColor shadowColor(); signals: void apply(); protected slots: - void colorChanged( const QColor& ); + void colorChanged( const TQColor& ); void directionChanged( int ); void distanceChanged( int ); void applyClicked(); diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp index 281c7929..51db3f4e 100644 --- a/kpresenter/KPrSideBar.cpp +++ b/kpresenter/KPrSideBar.cpp @@ -22,12 +22,12 @@ * Boston, MA 02110-1301, USA. */ -#include <qheader.h> -#include <qtimer.h> -#include <qpopupmenu.h> -#include <qimage.h> -#include <qtabwidget.h> -#include <qtooltip.h> +#include <tqheader.h> +#include <tqtimer.h> +#include <tqpopupmenu.h> +#include <tqimage.h> +#include <tqtabwidget.h> +#include <tqtooltip.h> #include <kwordwrap.h> #include <kmessagebox.h> @@ -43,9 +43,9 @@ #include "KPrCanvas.h" #include "KPrPage.h" #include "KPrObject.h" -#include <qapplication.h> +#include <tqapplication.h> #include "KPrCommand.h" -#include <qvalidator.h> +#include <tqvalidator.h> #include "KPrFreehandObject.h" #include "KPrBezierCurveObject.h" #include "KPrTextObject.h" @@ -54,31 +54,31 @@ #include "KPrGroupObject.h" -QValidator::State KPrRenamePageValidator::validate( QString & input, int& ) const +TQValidator::State KPrRenamePageValidator::validate( TQString & input, int& ) const { - QString str = input.stripWhiteSpace(); + TQString str = input.stripWhiteSpace(); if ( str.isEmpty() ) // we want to allow empty titles. Empty == automatic. return Acceptable; - if ( mStringList.find( str ) == mStringList.end() ) + if ( mStringList.tqfind( str ) == mStringList.end() ) return Acceptable; else return Intermediate; } -class ThumbToolTip : public QToolTip +class ThumbToolTip : public TQToolTip { public: - ThumbToolTip( KPrThumbBar *parent ) - : QToolTip( parent->viewport() ) - , m_thumbBar( parent ) + ThumbToolTip( KPrThumbBar *tqparent ) + : TQToolTip( tqparent->viewport() ) + , m_thumbBar( tqparent ) {} protected: - void maybeTip(const QPoint &pos) + void maybeTip(const TQPoint &pos) { - QString title; - QRect r( m_thumbBar->tip( pos, title ) ); + TQString title; + TQRect r( m_thumbBar->tip( pos, title ) ); if (!r.isValid()) return; @@ -92,8 +92,8 @@ private: class OutlineSlideItem: public KListViewItem { public: - OutlineSlideItem( KListView * parent, KPrPage* page, bool _masterPage ); - OutlineSlideItem( KListView * parent, OutlineSlideItem *after, KPrPage* page, bool _masterPage ); + OutlineSlideItem( KListView * tqparent, KPrPage* page, bool _masterPage ); + OutlineSlideItem( KListView * tqparent, OutlineSlideItem *after, KPrPage* page, bool _masterPage ); KPrPage* page() const { return m_page; } @@ -110,8 +110,8 @@ private: class OutlineObjectItem: public KListViewItem { public: - OutlineObjectItem( OutlineSlideItem * parent, KPrObject* object, - const QString& name = QString::null ); + OutlineObjectItem( OutlineSlideItem * tqparent, KPrObject* object, + const TQString& name = TQString() ); KPrObject* object() const { return m_object; } @@ -121,14 +121,14 @@ private: KPrObject* m_object; }; -class ThumbItem : public QIconViewItem +class ThumbItem : public TQIconViewItem { public: - ThumbItem( QIconView *parent, const QString & text, const QPixmap & icon ) - : QIconViewItem( parent, text, icon ) + ThumbItem( TQIconView *tqparent, const TQString & text, const TQPixmap & icon ) + : TQIconViewItem( tqparent, text, icon ) { uptodate = true; } - ThumbItem( QIconView *parent, QIconViewItem *after, const QString & text, const QPixmap & icon ) - : QIconViewItem( parent, after, text, icon ) + ThumbItem( TQIconView *tqparent, TQIconViewItem *after, const TQString & text, const TQPixmap & icon ) + : TQIconViewItem( tqparent, after, text, icon ) { uptodate = true; } virtual bool isUptodate() { return uptodate; }; @@ -138,11 +138,11 @@ private: bool uptodate; }; -KPrSideBar::KPrSideBar(QWidget *parent, KPrDocument *d, KPrView *v) - :QTabWidget(parent), m_doc(d), m_view(v) +KPrSideBar::KPrSideBar(TQWidget *tqparent, KPrDocument *d, KPrView *v) + :TQTabWidget(tqparent), m_doc(d), m_view(v) { - setTabPosition(QTabWidget::Top); - setTabShape(QTabWidget::Triangular); + setTabPosition(TQTabWidget::Top); + setTabShape(TQTabWidget::Triangular); m_outline = new KPrOutline(this, m_doc, m_view); addTab(m_outline, i18n("Structure of the presentation", "Outline")); @@ -152,24 +152,24 @@ KPrSideBar::KPrSideBar(QWidget *parent, KPrDocument *d, KPrView *v) //TODO find a better way - connect(m_outline, SIGNAL(showPage(int)), - this, SIGNAL(showPage(int))); + connect(m_outline, TQT_SIGNAL(showPage(int)), + this, TQT_SIGNAL(showPage(int))); - connect(m_thb, SIGNAL(showPage(int)), - this, SIGNAL(showPage(int))); + connect(m_thb, TQT_SIGNAL(showPage(int)), + this, TQT_SIGNAL(showPage(int))); - connect(m_outline, SIGNAL(movePage(int,int)), - this, SIGNAL(movePage(int,int))); + connect(m_outline, TQT_SIGNAL(movePage(int,int)), + this, TQT_SIGNAL(movePage(int,int))); - connect(m_outline, SIGNAL(selectPage(int,bool)), - this, SIGNAL(selectPage(int,bool))); + connect(m_outline, TQT_SIGNAL(selectPage(int,bool)), + this, TQT_SIGNAL(selectPage(int,bool))); - connect(this, SIGNAL(currentChanged(QWidget *)), - this, SLOT(currentChanged(QWidget *))); + connect(this, TQT_SIGNAL(currentChanged(TQWidget *)), + this, TQT_SLOT(currentChanged(TQWidget *))); } -void KPrSideBar::currentChanged(QWidget *tab) +void KPrSideBar::currentChanged(TQWidget *tab) { if (tab == m_thb) { if (!m_thb->uptodate && m_thb->isVisible()) @@ -208,7 +208,7 @@ void KPrSideBar::updateItem( KPrPage *page ) } else { - pos = m_doc->pageList().findRef( page ); + pos = m_doc->pageList().tqfindRef( page ); } m_outline->updateItem( pos, sticky ); @@ -233,25 +233,25 @@ void KPrSideBarBase::setViewMasterPage( bool _b ) m_viewMasterPage = _b; } -KPrThumbBar::KPrThumbBar(QWidget *parent, KPrDocument *d, KPrView *v) - :KIconView(parent), KPrSideBarBase( d,v) +KPrThumbBar::KPrThumbBar(TQWidget *tqparent, KPrDocument *d, KPrView *v) + :KIconView(tqparent), KPrSideBarBase( d,v) { uptodate = false; m_offsetX = 0; m_offsetY = 0; - setArrangement(QIconView::LeftToRight); + setArrangement(TQIconView::LeftToRight); setAutoArrange(true); setSorting(false); setItemsMovable(false); - setResizeMode(QIconView::Adjust); + setResizeMode(TQIconView::Adjust); m_thumbTip = new ThumbToolTip(this); - connect(this, SIGNAL(currentChanged(QIconViewItem *)), - this, SLOT(itemClicked(QIconViewItem *))); - connect(this, SIGNAL(contentsMoving(int, int)), - this, SLOT(slotContentsMoving(int, int))); + connect(this, TQT_SIGNAL(currentChanged(TQIconViewItem *)), + this, TQT_SLOT(itemClicked(TQIconViewItem *))); + connect(this, TQT_SIGNAL(contentsMoving(int, int)), + this, TQT_SLOT(slotContentsMoving(int, int))); } KPrThumbBar::~KPrThumbBar() @@ -261,7 +261,7 @@ KPrThumbBar::~KPrThumbBar() void KPrThumbBar::setCurrentPage( int pg ) { - for ( QIconViewItem *it = firstItem(); it; it = it->nextItem() ) + for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) { if ( it->text().toInt() - 1 == pg ) { blockSignals( true ); @@ -275,17 +275,17 @@ void KPrThumbBar::setCurrentPage( int pg ) } } -QRect KPrThumbBar::tip(const QPoint &pos, QString &title) +TQRect KPrThumbBar::tip(const TQPoint &pos, TQString &title) { - QIconViewItem *item = findItem(viewportToContents(pos)); + TQIconViewItem *item = tqfindItem(viewportToContents(pos)); if (!item) - return QRect(0, 0, -1, -1); + return TQRect(0, 0, -1, -1); int pagenr = item->index(); title = m_doc->pageList().at(pagenr)->pageTitle(); - QRect r = item->pixmapRect(FALSE); - r = QRect(contentsToViewport(QPoint(r.x(), r.y())), QSize(r.width(), r.height())); + TQRect r = item->pixmapRect(FALSE); + r = TQRect(contentsToViewport(TQPoint(r.x(), r.y())), TQSize(r.width(), r.height())); return r; } @@ -296,7 +296,7 @@ void KPrThumbBar::rebuildItems() return; kdDebug(33001) << "KPrThumbBar::rebuildItems" << endl; - QApplication::setOverrideCursor( Qt::waitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); clear(); if ( m_viewMasterPage ) @@ -306,7 +306,7 @@ void KPrThumbBar::rebuildItems() { for ( unsigned int i = 0; i < m_doc->getPageNums(); i++ ) { // calculate the size of the thumb - QRect rect = m_doc->pageList().at(i)->getZoomPageRect( ); + TQRect rect = m_doc->pageList().at(i)->getZoomPageRect( ); int w = rect.width(); int h = rect.height(); @@ -336,34 +336,34 @@ void KPrThumbBar::rebuildItems() } // draw an empty thumb - QPixmap pix(w, h); - pix.fill( Qt::white ); + TQPixmap pix(w, h); + pix.fill( TQt::white ); - QPainter p(&pix); - p.setPen(Qt::black); + TQPainter p(&pix); + p.setPen(TQt::black); p.drawRect(pix.rect()); - ThumbItem *item = new ThumbItem(static_cast<QIconView *>(this), QString::number(i+1), pix); + ThumbItem *item = new ThumbItem(static_cast<TQIconView *>(this), TQString::number(i+1), pix); item->setUptodate( false ); item->setDragEnabled(false); //no dragging for now } - QTimer::singleShot( 10, this, SLOT( slotRefreshItems() ) ); + TQTimer::singleShot( 10, this, TQT_SLOT( slotRefreshItems() ) ); } uptodate = true; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } void KPrThumbBar::refreshItems(bool offset) { - QRect vRect = visibleRect(); + TQRect vRect = visibleRect(); if ( offset ) vRect.moveBy( m_offsetX, m_offsetY ); else vRect.moveBy( contentsX(), contentsY() ); - QIconViewItem *it = findFirstVisibleItem( vRect ); + TQIconViewItem *it = tqfindFirstVisibleItem( vRect ); while ( it ) { kdDebug(33001) << "visible page = " << it->text().toInt() << endl; @@ -373,7 +373,7 @@ void KPrThumbBar::refreshItems(bool offset) static_cast<ThumbItem *>(it)->setUptodate( true ); } - if ( it == findLastVisibleItem( vRect ) ) + if ( it == tqfindLastVisibleItem( vRect ) ) break; it = it->nextItem(); } @@ -390,14 +390,14 @@ void KPrThumbBar::updateItem( int pagenr /* 0-based */, bool sticky ) return; int pagecnt = 0; // calculate rect of visible objects - QRect vRect = visibleRect(); + TQRect vRect = visibleRect(); vRect.moveBy( contentsX(), contentsY() ); // Find icon - QIconViewItem *it = firstItem(); + TQIconViewItem *it = firstItem(); do { - if ( it == findFirstVisibleItem( vRect ) ) { + if ( it == tqfindFirstVisibleItem( vRect ) ) { do { if ( sticky || it->text().toInt() == pagenr + 1 ) { @@ -407,7 +407,7 @@ void KPrThumbBar::updateItem( int pagenr /* 0-based */, bool sticky ) if ( !sticky ) return; } - if ( it == findLastVisibleItem( vRect ) ) + if ( it == tqfindLastVisibleItem( vRect ) ) break; pagecnt++; it = it->nextItem(); @@ -431,24 +431,24 @@ void KPrThumbBar::addItem( int pos ) { kdDebug(33001)<< "KPrThumbBar::addItem" << endl; int page = 0; - for ( QIconViewItem *it = firstItem(); it; it = it->nextItem() ) { + for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) { // find page which should move // do stuff because a item can not be insert at the beginning if ( pos == 0 && page == pos ){ - ThumbItem *item = new ThumbItem(static_cast<QIconView *>(this), it, QString::number(2), getSlideThumb(1)); + ThumbItem *item = new ThumbItem(static_cast<TQIconView *>(this), it, TQString::number(2), getSlideThumb(1)); item->setDragEnabled(false); //no dragging for now it->setPixmap(getSlideThumb( 0 )); // move on to next item as we have inserted one it = it->nextItem(); } else if ( (page + 1) == pos ) { - ThumbItem *item = new ThumbItem(static_cast<QIconView *>(this), it, QString::number(pos+1), getSlideThumb(pos)); + ThumbItem *item = new ThumbItem(static_cast<TQIconView *>(this), it, TQString::number(pos+1), getSlideThumb(pos)); item->setDragEnabled(false); //no dragging for now it = it->nextItem(); } // update page numbers if ( page >= pos ) - it->setText( QString::number(page+2) ); + it->setText( TQString::number(page+2) ); page++; } } @@ -458,9 +458,9 @@ void KPrThumbBar::moveItem( int oldPos, int newPos ) { kdDebug(33001)<< "KPrThumbBar::moveItem " << oldPos << " to " << newPos << endl; int page = 0; - QIconViewItem *after = 0; - QIconViewItem *take = 0; - for ( QIconViewItem *it = firstItem(); it; it = it->nextItem() ) { + TQIconViewItem *after = 0; + TQIconViewItem *take = 0; + for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) { // find page which should move if ( page == oldPos ) take = it; @@ -479,7 +479,7 @@ void KPrThumbBar::moveItem( int oldPos, int newPos ) // TODO remove workaround when qt 3.1.2 comes out tz //takeItem( take ); //insertItem( take, after); - ThumbItem *item = new ThumbItem( static_cast<QIconView *>(this), after, QString::number( newPos ), *(take->pixmap()) ); + ThumbItem *item = new ThumbItem( static_cast<TQIconView *>(this), after, TQString::number( newPos ), *(take->pixmap()) ); item->setDragEnabled(false); //no dragging for now delete take; // update the thumbs if new pos was 0 @@ -495,9 +495,9 @@ void KPrThumbBar::moveItem( int oldPos, int newPos ) int lowPage = oldPos > newPos ? newPos : oldPos; int highPage = oldPos < newPos ? newPos : oldPos; page = 0; - for ( QIconViewItem *it = firstItem(); it; it = it->nextItem() ) { + for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) { if ( page >= lowPage && page <= highPage) - it->setText( QString::number(page+1) ); + it->setText( TQString::number(page+1) ); page++; } } @@ -507,9 +507,9 @@ void KPrThumbBar::removeItem( int pos ) kdDebug(33001)<< "KPrThumbBar::removeItem" << endl; int page = 0; bool change = false; - QIconViewItem *itemToDelete = 0; + TQIconViewItem *itemToDelete = 0; - for ( QIconViewItem *it = firstItem(); it; it = it->nextItem() ) { + for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) { if ( page == pos ) { itemToDelete = it; if ( it->nextItem() ) @@ -517,16 +517,16 @@ void KPrThumbBar::removeItem( int pos ) change = true; } if ( change ) - it->setText( QString::number( page + 1 ) ); + it->setText( TQString::number( page + 1 ) ); page++; } delete itemToDelete; } -QPixmap KPrThumbBar::getSlideThumb(int slideNr) const +TQPixmap KPrThumbBar::getSlideThumb(int slideNr) const { //kdDebug(33001) << "KPrThumbBar::getSlideThumb: " << slideNr << endl; - QPixmap pix( 10, 10 ); + TQPixmap pix( 10, 10 ); m_view->getCanvas()->drawPageInPix( pix, slideNr, 60 ); @@ -546,18 +546,18 @@ QPixmap KPrThumbBar::getSlideThumb(int slideNr) const h = 130; } - const QImage img(pix.convertToImage().smoothScale( w, h, QImage::ScaleMin )); + const TQImage img(pix.convertToImage().smoothScale( w, h, TQ_ScaleMin )); pix.convertFromImage(img); // draw a frame around the thumb to show its size - QPainter p(&pix); - p.setPen(Qt::black); + TQPainter p(&pix); + p.setPen(TQt::black); p.drawRect(pix.rect()); return pix; } -void KPrThumbBar::itemClicked(QIconViewItem *i) +void KPrThumbBar::itemClicked(TQIconViewItem *i) { if ( !i ) return; @@ -577,16 +577,16 @@ void KPrThumbBar::slotRefreshItems() refreshItems(); } -OutlineSlideItem::OutlineSlideItem( KListView* parent, KPrPage* _page, bool _masterPage ) - : KListViewItem( parent ), m_page( _page ), m_masterPage( _masterPage ) +OutlineSlideItem::OutlineSlideItem( KListView* tqparent, KPrPage* _page, bool _masterPage ) + : KListViewItem( tqparent ), m_page( _page ), m_masterPage( _masterPage ) { setDragEnabled(true); setPage( _page ); setPixmap( 0, KPBarIcon( "slide" ) ); } -OutlineSlideItem::OutlineSlideItem( KListView* parent, OutlineSlideItem * after, KPrPage* _page, bool _masterPage ) - : KListViewItem( parent, after ), m_page( _page ), m_masterPage( _masterPage ) +OutlineSlideItem::OutlineSlideItem( KListView* tqparent, OutlineSlideItem * after, KPrPage* _page, bool _masterPage ) + : KListViewItem( tqparent, after ), m_page( _page ), m_masterPage( _masterPage ) { setDragEnabled(true); setPage( _page ); @@ -614,7 +614,7 @@ void OutlineSlideItem::update() // keep selected object ooi = 0; - QPtrListIterator<KPrObject> it( m_page->objectList() ); + TQPtrListIterator<KPrObject> it( m_page->objectList() ); if ( !m_masterPage ) { @@ -670,20 +670,20 @@ void OutlineSlideItem::update() void OutlineSlideItem::updateTitle() { - QString title = m_page->pageTitle(); + TQString title = m_page->pageTitle(); if ( ! m_page->isSlideSelected() ) - title = i18n( "(%1)" ).arg( title ); + title = i18n( "(%1)" ).tqarg( title ); setText( 0, title ); } -OutlineObjectItem::OutlineObjectItem( OutlineSlideItem* parent, KPrObject* _object, - const QString& name ) - : KListViewItem( parent ), m_object( _object ) +OutlineObjectItem::OutlineObjectItem( OutlineSlideItem* tqparent, KPrObject* _object, + const TQString& name ) + : KListViewItem( tqparent ), m_object( _object ) { setObject( m_object ); setDragEnabled( false ); - QString objectName = name.isEmpty() ? m_object->getObjectName() : name; + TQString objectName = name.isEmpty() ? m_object->getObjectName() : name; //if( sticky ) objectName += i18n(" (Sticky)" ); setText( 0, objectName ); } @@ -727,7 +727,7 @@ void OutlineObjectItem::setObject( KPrObject* object ) case OT_POLYLINE: setPixmap( 0, KPBarIcon( "polyline" ) ); break; - case OT_QUADRICBEZIERCURVE: + case OT_TQUADRICBEZIERCURVE: setPixmap( 0, KPBarIcon( "quadricbeziercurve" ) ); break; case OT_CUBICBEZIERCURVE: @@ -737,7 +737,7 @@ void OutlineObjectItem::setObject( KPrObject* object ) setPixmap( 0, KPBarIcon( "mini_polygon" ) ); break; case OT_CLOSED_LINE: { - QString name = m_object->getTypeString(); + TQString name = m_object->getTypeString(); if ( name == i18n( "Closed Freehand" ) ) setPixmap( 0, KPBarIcon( "closed_freehand" ) ); else if ( name == i18n( "Closed Polyline" ) ) @@ -755,25 +755,25 @@ void OutlineObjectItem::setObject( KPrObject* object ) } } -KPrOutline::KPrOutline( QWidget *parent, KPrDocument *d, KPrView *v ) - : KListView( parent ), KPrSideBarBase( d, v) +KPrOutline::KPrOutline( TQWidget *tqparent, KPrDocument *d, KPrView *v ) + : KListView( tqparent ), KPrSideBarBase( d, v) { rebuildItems(); setSorting( -1 ); header()->hide(); addColumn( i18n( "Slide" ) ); - setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); - connect( this, SIGNAL( currentChanged( QListViewItem * ) ), this, SLOT( itemClicked( QListViewItem * ) ) ); - connect( this, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ), - this, SLOT( rightButtonPressed( QListViewItem *, const QPoint &, int ) ) ); - connect( this, SIGNAL( contextMenu( KListView*, QListViewItem*, const QPoint& ) ), - this, SLOT( slotContextMenu( KListView*, QListViewItem*, const QPoint&) ) ); + connect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); + connect( this, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotContextMenu( KListView*, TQListViewItem*, const TQPoint&) ) ); - connect( this, SIGNAL( doubleClicked ( QListViewItem * )), - this, SLOT(renamePageTitle())); - connect( this, SIGNAL( dropped( QDropEvent*, QListViewItem*, QListViewItem* ) ), - this, SLOT( slotDropped( QDropEvent*, QListViewItem*, QListViewItem* ) )); + connect( this, TQT_SIGNAL( doubleClicked ( TQListViewItem * )), + this, TQT_SLOT(renamePageTitle())); + connect( this, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem*, TQListViewItem* ) ), + this, TQT_SLOT( slotDropped( TQDropEvent*, TQListViewItem*, TQListViewItem* ) )); setItemsMovable( false ); setDragEnabled( true ); @@ -809,7 +809,7 @@ void KPrOutline::rebuildItems() // returns 0 upon stupid things (e.g. invalid page number) OutlineSlideItem* KPrOutline::slideItem( int pageNumber ) { - QListViewItem* item = firstChild(); + TQListViewItem* item = firstChild(); for( int index = 0; item; ++index, item = item->nextSibling() ) { if( index == pageNumber ) return dynamic_cast<OutlineSlideItem*>( item ); @@ -831,7 +831,7 @@ void KPrOutline::updateItem( int pagenr /* 0-based */, bool sticky ) } } else { blockSignals(true); - for( QListViewItem *item = this->firstChild(); item; item = item->nextSibling() ) + for( TQListViewItem *item = this->firstChild(); item; item = item->nextSibling() ) dynamic_cast<OutlineSlideItem*>(item)->update(); blockSignals(false); } @@ -866,8 +866,8 @@ void KPrOutline::moveItem( int oldPos, int newPos ) int highPage = oldPos < newPos ? newPos : oldPos; OutlineSlideItem *item = dynamic_cast<OutlineSlideItem*>( firstChild() ); - QListViewItem *itemToMove = 0; - QListViewItem *itemAfter = 0; + TQListViewItem *itemToMove = 0; + TQListViewItem *itemAfter = 0; // moving backwards if ( newPos < oldPos ) @@ -900,7 +900,7 @@ void KPrOutline::removeItem( int pos ) item->updateTitle(); } -void KPrOutline::itemClicked( QListViewItem *item ) +void KPrOutline::itemClicked( TQListViewItem *item ) { if( !item ) return; @@ -911,7 +911,7 @@ void KPrOutline::itemClicked( QListViewItem *item ) KPrPage* page = slideItem->page(); if( !page ) return; if ( !m_viewMasterPage ) - emit showPage( m_doc->pageList().findRef( page ) ); + emit showPage( m_doc->pageList().tqfindRef( page ) ); } // check if we need to show chosen object @@ -922,20 +922,20 @@ void KPrOutline::itemClicked( QListViewItem *item ) if( !object ) return; // ensure the owner slide is shown first - OutlineSlideItem* slideItem = dynamic_cast<OutlineSlideItem*>(objectItem->parent()); + OutlineSlideItem* slideItem = dynamic_cast<OutlineSlideItem*>(objectItem->tqparent()); if( slideItem && m_doc->activePage() != slideItem->page() ) { KPrPage* page = slideItem->page(); if( !page ) return; if ( !m_viewMasterPage ) - emit showPage( m_doc->pageList().findRef( page ) ); + emit showPage( m_doc->pageList().tqfindRef( page ) ); } // select the object, make sure it's visible m_doc->deSelectAllObj(); m_view->getCanvas()->selectObj( object ); m_view->showObjectRect( object ); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); } } @@ -946,16 +946,16 @@ void KPrOutline::itemClicked( QListViewItem *item ) * When an item is about to move (using drag-and-drop), it makes shure that * it's not moved right after an object. */ -void KPrOutline::slotDropped( QDropEvent * /* e */, QListViewItem *parent, QListViewItem *target ) +void KPrOutline::slotDropped( TQDropEvent * /* e */, TQListViewItem *tqparent, TQListViewItem *target ) { kdDebug(33001) << "slotDropped" << endl; - /* slide doesn't have parent (always 0) + /* slide doesn't have tqparent (always 0) * Only slides can move at the moment, objects can't. */ - if ( parent ) + if ( tqparent ) return; // This code is taken from KListView - for (QListViewItem *i = firstChild(), *iNext = 0; i != 0; i = iNext) + for (TQListViewItem *i = firstChild(), *iNext = 0; i != 0; i = iNext) { iNext = i->itemBelow(); if ( !i->isSelected() ) @@ -969,7 +969,7 @@ void KPrOutline::slotDropped( QDropEvent * /* e */, QListViewItem *parent, QList i->setSelected( false ); // don't move the item as it is allready - moveItem(i, parent, target ); + moveItem(i, tqparent, target ); // Only one item can be moved break; @@ -978,7 +978,7 @@ void KPrOutline::slotDropped( QDropEvent * /* e */, QListViewItem *parent, QList // We have to overwrite this method as it checks if an item is movable // and we have disabled it. -bool KPrOutline::acceptDrag( QDropEvent* e ) const +bool KPrOutline::acceptDrag( TQDropEvent* e ) const { return acceptDrops() && (e->source()==viewport()); } @@ -987,7 +987,7 @@ bool KPrOutline::acceptDrag( QDropEvent* e ) const void KPrOutline::setCurrentPage( int pg ) { OutlineSlideItem *item = slideItem( pg ); - if( item && ( item!=currentItem()->parent() ) ) + if( item && ( item!=currentItem()->tqparent() ) ) { blockSignals( true ); setCurrentItem( item ); @@ -997,20 +997,20 @@ void KPrOutline::setCurrentPage( int pg ) } } -void KPrOutline::contentsDropEvent( QDropEvent *e ) +void KPrOutline::contentsDropEvent( TQDropEvent *e ) { - disconnect( this, SIGNAL( currentChanged( QListViewItem * ) ), this, SLOT( itemClicked( QListViewItem * ) ) ); + disconnect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); KListView::contentsDropEvent( e ); - connect( this, SIGNAL( currentChanged( QListViewItem * ) ), this, SLOT( itemClicked( QListViewItem * ) ) ); + connect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) ); } -void KPrOutline::moveItem( QListViewItem *i, QListViewItem *, QListViewItem *newAfter ) +void KPrOutline::moveItem( TQListViewItem *i, TQListViewItem *, TQListViewItem *newAfter ) { OutlineSlideItem* srcItem = dynamic_cast<OutlineSlideItem*>( i ); if ( !srcItem ) return; - int num = m_doc->pageList().findRef( srcItem->page() ); + int num = m_doc->pageList().tqfindRef( srcItem->page() ); int numNow = 0; if ( newAfter ) @@ -1019,7 +1019,7 @@ void KPrOutline::moveItem( QListViewItem *i, QListViewItem *, QListViewItem *new if( !dstItem ) return; - numNow = m_doc->pageList().findRef( dstItem->page() ); + numNow = m_doc->pageList().tqfindRef( dstItem->page() ); if ( numNow < num ) numNow++; } @@ -1028,11 +1028,11 @@ void KPrOutline::moveItem( QListViewItem *i, QListViewItem *, QListViewItem *new m_doc->movePage( num, numNow ); } -void KPrOutline::rightButtonPressed( QListViewItem *, const QPoint &pnt, int ) +void KPrOutline::rightButtonPressed( TQListViewItem *, const TQPoint &pnt, int ) { if ( !m_doc->isReadWrite() || m_viewMasterPage ) return; - QListViewItem *item = QListView::selectedItem(); + TQListViewItem *item = TQListView::selectedItem(); if( !item ) return; OutlineSlideItem* slideItem = dynamic_cast<OutlineSlideItem*>(item); @@ -1058,14 +1058,14 @@ void KPrOutline::rightButtonPressed( QListViewItem *, const QPoint &pnt, int ) } } -void KPrOutline::slotContextMenu( KListView*, QListViewItem* item, const QPoint& p ) +void KPrOutline::slotContextMenu( KListView*, TQListViewItem* item, const TQPoint& p ) { rightButtonPressed( item, p, 0 ); } void KPrOutline::renamePageTitle() { - QListViewItem *item = QListView::selectedItem(); + TQListViewItem *item = TQListView::selectedItem(); if( !item || m_viewMasterPage) return; OutlineSlideItem* slideItem = dynamic_cast<OutlineSlideItem*>(item); @@ -1075,16 +1075,16 @@ void KPrOutline::renamePageTitle() if( !page ) return; bool ok = false; - QString activeTitle = item->text( 0 ); + TQString activeTitle = item->text( 0 ); - QStringList page_titles; + TQStringList page_titles; KPrPage *it; for ( it = m_doc->pageList().first(); it; it = m_doc->pageList().next() ) if ( it->pageTitle() != activeTitle ) page_titles.append( it->pageTitle() ); KPrRenamePageValidator validator( page_titles ); - QString newTitle = KInputDialog::getText( i18n("Rename Slide"), + TQString newTitle = KInputDialog::getText( i18n("Rename Slide"), i18n("Slide title:"), activeTitle, &ok, this, 0, &validator ); @@ -1099,7 +1099,7 @@ void KPrOutline::renamePageTitle() } } -QDragObject* KPrOutline::dragObject() +TQDragObject* KPrOutline::dragObject() { if( !selectedItem()->dragEnabled() ) { return 0; diff --git a/kpresenter/KPrSideBar.h b/kpresenter/KPrSideBar.h index b11b8d5a..b1d7eeb3 100644 --- a/kpresenter/KPrSideBar.h +++ b/kpresenter/KPrSideBar.h @@ -21,19 +21,19 @@ #ifndef SIDEBAR_H #define SIDEBAR_H -#include <qrect.h> -#include <qstringlist.h> -#include <qtabwidget.h> -#include <qvalidator.h> +#include <tqrect.h> +#include <tqstringlist.h> +#include <tqtabwidget.h> +#include <tqvalidator.h> #include <kiconview.h> #include <klistview.h> -class QListViewItem; +class TQListViewItem; class KPrDocument; class KPrView; -class QDropEvent; -class QPopupMenu; +class TQDropEvent; +class TQPopupMenu; class KPrOutline; class OutlineSlideItem; class KPrThumbBar; @@ -41,15 +41,15 @@ class ThumbToolTip; class KPrPage; -class KPrRenamePageValidator : public QValidator +class KPrRenamePageValidator : public TQValidator { public: - KPrRenamePageValidator( const QStringList & list=QStringList() ) - : QValidator( 0, 0 ), mStringList( list ) {} - virtual State validate( QString & input, int & pos ) const; + KPrRenamePageValidator( const TQStringList & list=TQStringList() ) + : TQValidator( 0, 0 ), mStringList( list ) {} + virtual State validate( TQString & input, int & pos ) const; protected: - QStringList mStringList; + TQStringList mStringList; }; class KPrSideBarBase @@ -66,9 +66,10 @@ protected: class KPrThumbBar : public KIconView, public KPrSideBarBase { Q_OBJECT + TQ_OBJECT public: - KPrThumbBar(QWidget *parent, KPrDocument *d, KPrView *v); + KPrThumbBar(TQWidget *tqparent, KPrDocument *d, KPrView *v); ~KPrThumbBar(); void setCurrentPage( int pg ); void updateItem( int pagenr, bool sticky = false ); @@ -76,7 +77,7 @@ public: void moveItem( int oldPos, int newPos ); void removeItem( int pos ); void refreshItems ( bool offset = false ); - QRect tip(const QPoint &pos, QString &title); + TQRect tip(const TQPoint &pos, TQString &title); bool uptodate; @@ -87,12 +88,12 @@ public slots: void rebuildItems(); private slots: - void itemClicked(QIconViewItem *i); + void itemClicked(TQIconViewItem *i); void slotContentsMoving(int x, int y); void slotRefreshItems(); private: - QPixmap getSlideThumb(int slideNr) const; + TQPixmap getSlideThumb(int slideNr) const; ThumbToolTip *m_thumbTip; int m_offsetX; @@ -102,24 +103,25 @@ private: class KPrOutline: public KListView, public KPrSideBarBase { Q_OBJECT + TQ_OBJECT public: - KPrOutline( QWidget *parent, KPrDocument *d, KPrView *v ); + KPrOutline( TQWidget *tqparent, KPrDocument *d, KPrView *v ); ~KPrOutline(); void setCurrentPage( int pg ); - QSize sizeHint() const { return QSize( 145, KListView::sizeHint().height() ); } + TQSize tqsizeHint() const { return TQSize( 145, KListView::tqsizeHint().height() ); } void updateItem( int pagenr, bool sticky = false); void addItem( int pos ); void moveItem( int oldPos, int newPos ); void removeItem( int pos ); protected: - void contentsDropEvent( QDropEvent *e ); - void moveItem( QListViewItem *i, QListViewItem *firstAfter, QListViewItem *newAfter ); + void contentsDropEvent( TQDropEvent *e ); + void moveItem( TQListViewItem *i, TQListViewItem *firstAfter, TQListViewItem *newAfter ); OutlineSlideItem* slideItem( int pageNumber ); - bool acceptDrag( QDropEvent* e ) const; + bool acceptDrag( TQDropEvent* e ) const; - virtual QDragObject* dragObject(); + virtual TQDragObject* dragObject(); signals: // all page numbers 0-based void showPage( int i ); @@ -131,27 +133,28 @@ public slots: void renamePageTitle(); private slots: - void itemClicked( QListViewItem *i ); - void slotDropped( QDropEvent *e, QListViewItem *parent, QListViewItem *target ); - void rightButtonPressed( QListViewItem *i, const QPoint &pnt, int c ); - void slotContextMenu( KListView*, QListViewItem *item, const QPoint &p ); + void itemClicked( TQListViewItem *i ); + void slotDropped( TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *target ); + void rightButtonPressed( TQListViewItem *i, const TQPoint &pnt, int c ); + void slotContextMenu( KListView*, TQListViewItem *item, const TQPoint &p ); private: - QListViewItem *m_movedItem, *m_movedAfter; + TQListViewItem *m_movedItem, *m_movedAfter; }; -class KPrSideBar: public QTabWidget +class KPrSideBar: public TQTabWidget { Q_OBJECT + TQ_OBJECT public: - KPrSideBar(QWidget *parent, KPrDocument *d, KPrView *v); + KPrSideBar(TQWidget *tqparent, KPrDocument *d, KPrView *v); void setCurrentPage( int pg ) { m_outline->setCurrentPage(pg); m_thb->setCurrentPage(pg); }; void setOn( int , bool ) { }; - //QSize sizeHint() const { return QSize( 120, QTabWidget::sizeHint().height() ); }; + //TQSize tqsizeHint() const { return TQSize( 120, TQTabWidget::tqsizeHint().height() ); }; void updateItem( KPrPage *page ); void addItem( int pos ); void moveItem( int oldPos, int newPos ); @@ -169,7 +172,7 @@ signals: // all page numbers 0-based public slots: //void rebuildItems() { m_outline->rebuildItems(); m_thb->rebuildItems();}; void renamePageTitle() { m_outline->renamePageTitle(); }; - void currentChanged(QWidget *tab); + void currentChanged(TQWidget *tab); private: KPrOutline *m_outline; diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp index ba15c4fb..0f95e03b 100644 --- a/kpresenter/KPrSlideTransitionDia.cpp +++ b/kpresenter/KPrSlideTransitionDia.cpp @@ -27,11 +27,11 @@ #include <kstandarddirs.h> #include <kurlrequester.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qimage.h> -#include <qlabel.h> -#include <qpushbutton.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqpushbutton.h> #include "KPrBackground.h" #include "KPrCanvas.h" @@ -43,8 +43,8 @@ #include "KPrPageEffects.h" #include "slidetransitionwidget.h" -KPrSlideTransitionDia::KPrSlideTransitionDia( QWidget *parent, const char *name, KPrView *view ) -: KDialogBase( parent, name, true, i18n( "Slide Transition" ), User1|Ok|Cancel, Ok, true ) +KPrSlideTransitionDia::KPrSlideTransitionDia( TQWidget *tqparent, const char *name, KPrView *view ) +: KDialogBase( tqparent, name, true, i18n( "Slide Transition" ), User1|Ok|Cancel, Ok, true ) , m_dialog( new SlideTransitionWidget( this ) ), m_view( view ), m_soundPlayer(0), m_pageEffect( 0 ) { int pgnum = m_view->getCurrPgNum() - 1; @@ -71,30 +71,30 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( QWidget *parent, const char *name, h = 300; } - const QImage img(m_pixmap.convertToImage().smoothScale( w, h )); + const TQImage img(m_pixmap.convertToImage().smoothScale( w, h )); m_pixmap.convertFromImage(img); m_dialog->previewPixmap->setPixmap( m_pixmap ); m_dialog->previewPixmap->setFixedSize( w, h ); m_target.resize( m_pixmap.size() ); - m_target.fill( Qt::black ); + m_target.fill( TQt::black ); // fill effect combo m_dialog->effectCombo->insertItem( i18n( "No Effect" ) ); - m_dialog->effectCombo->insertItem( i18n( "Close Horizontal" ) ); - m_dialog->effectCombo->insertItem( i18n( "Close Vertical" ) ); + m_dialog->effectCombo->insertItem( i18n( "CloseQt::Horizontal" ) ); + m_dialog->effectCombo->insertItem( i18n( "CloseQt::Vertical" ) ); m_dialog->effectCombo->insertItem( i18n( "Close From All Directions" ) ); - m_dialog->effectCombo->insertItem( i18n( "Open Horizontal" ) ); - m_dialog->effectCombo->insertItem( i18n( "Open Vertical" ) ); + m_dialog->effectCombo->insertItem( i18n( "OpenQt::Horizontal" ) ); + m_dialog->effectCombo->insertItem( i18n( "OpenQt::Vertical" ) ); m_dialog->effectCombo->insertItem( i18n( "Open From All Directions" ) ); - m_dialog->effectCombo->insertItem( i18n( "Interlocking Horizontal 1" ) ); - m_dialog->effectCombo->insertItem( i18n( "Interlocking Horizontal 2" ) ); - m_dialog->effectCombo->insertItem( i18n( "Interlocking Vertical 1" ) ); - m_dialog->effectCombo->insertItem( i18n( "Interlocking Vertical 2" ) ); + m_dialog->effectCombo->insertItem( i18n( "InterlockingQt::Horizontal 1" ) ); + m_dialog->effectCombo->insertItem( i18n( "InterlockingQt::Horizontal 2" ) ); + m_dialog->effectCombo->insertItem( i18n( "InterlockingQt::Vertical 1" ) ); + m_dialog->effectCombo->insertItem( i18n( "InterlockingQt::Vertical 2" ) ); m_dialog->effectCombo->insertItem( i18n( "Surround 1" ) ); m_dialog->effectCombo->insertItem( i18n( "Fly Away 1" ) ); - m_dialog->effectCombo->insertItem( i18n( "Blinds Horizontal" ) ); - m_dialog->effectCombo->insertItem( i18n( "Blinds Vertical" ) ); + m_dialog->effectCombo->insertItem( i18n( "BlindsQt::Horizontal" ) ); + m_dialog->effectCombo->insertItem( i18n( "BlindsQt::Vertical" ) ); m_dialog->effectCombo->insertItem( i18n( "Box In" ) ); m_dialog->effectCombo->insertItem( i18n( "Box Out" ) ); m_dialog->effectCombo->insertItem( i18n( "Checkerboard Across" ) ); @@ -129,7 +129,7 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( QWidget *parent, const char *name, if( m_effect == PEF_RANDOM ) m_dialog->effectCombo->setCurrentItem( m_dialog->effectCombo->count()-1 ); - connect( m_dialog->effectCombo, SIGNAL( activated( int ) ), this, SLOT( effectChanged( int ) ) ); + connect( m_dialog->effectCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( effectChanged( int ) ) ); // setup speed combo m_dialog->speedCombo->insertItem( i18n("Slow") ); @@ -138,7 +138,7 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( QWidget *parent, const char *name, m_dialog->speedCombo->setCurrentItem( m_effectSpeed ); - connect( m_dialog->speedCombo, SIGNAL( activated( int ) ), this, SLOT( effectChanged( int ) ) ); + connect( m_dialog->speedCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( effectChanged( int ) ) ); // set up sound m_dialog->soundCheckBox->setChecked( m_soundEffect ); @@ -146,24 +146,24 @@ KPrSlideTransitionDia::KPrSlideTransitionDia( QWidget *parent, const char *name, soundEffectChanged(); m_dialog->playButton->setIconSet( SmallIconSet( "player_play" ) ); m_dialog->stopButton->setIconSet( SmallIconSet( "player_stop" ) ); - connect( m_dialog->playButton, SIGNAL( clicked() ), this, SLOT( playSound() ) ); - connect( m_dialog->stopButton, SIGNAL( clicked() ), this, SLOT( stopSound() ) ); + connect( m_dialog->playButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound() ) ); + connect( m_dialog->stopButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound() ) ); - connect( m_dialog->soundCheckBox, SIGNAL( clicked()), this, SLOT( soundEffectChanged() ) ); - connect( m_dialog->soundRequester, SIGNAL( openFileDialog( KURLRequester * ) ), this, SLOT( slotRequesterClicked( KURLRequester * ) ) ); - connect( m_dialog->soundRequester, SIGNAL( textChanged( const QString& ) ), this, SLOT( slotSoundFileChanged( const QString& ) ) ); + connect( m_dialog->soundCheckBox, TQT_SIGNAL( clicked()), this, TQT_SLOT( soundEffectChanged() ) ); + connect( m_dialog->soundRequester, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), this, TQT_SLOT( slotRequesterClicked( KURLRequester * ) ) ); + connect( m_dialog->soundRequester, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotSoundFileChanged( const TQString& ) ) ); // set up automatic tansition m_dialog->automaticTransitionInput->setRange( 1, 600, 1 ); m_dialog->automaticTransitionInput->setValue( m_slideTime ); // set up preview button - connect( m_dialog->previewButton, SIGNAL( clicked() ), this, SLOT( preview() ) ); + connect( m_dialog->previewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( preview() ) ); setButtonText(KDialogBase::User1,i18n( "Apply &Global" )); - connect( this, SIGNAL( okClicked() ), this, SLOT( slotOk() ) ); - connect( this, SIGNAL( user1Clicked() ), this, SLOT( slotUser1() ) ); + connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotUser1() ) ); setMainWidget( m_dialog ); } @@ -192,16 +192,16 @@ void KPrSlideTransitionDia::preview() if ( m_pageEffect ) { m_pageEffectTimer.stop(); - QObject::disconnect( &m_pageEffectTimer, SIGNAL( timeout() ), this, SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); m_pageEffect->finish(); delete m_pageEffect; m_pageEffect = 0; - m_dialog->previewPixmap->repaint(); + m_dialog->previewPixmap->tqrepaint(); } - m_pageEffect = new KPrPageEffects( m_dialog->previewPixmap, m_target, effect, effectSpeed ); + m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(m_dialog->previewPixmap), m_target, effect, effectSpeed ); if ( m_pageEffect->doEffect() ) { delete m_pageEffect; @@ -210,7 +210,7 @@ void KPrSlideTransitionDia::preview() } else { - connect( &m_pageEffectTimer, SIGNAL( timeout() ), SLOT( slotDoPageEffect() ) ); + connect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoPageEffect() ) ); m_pageEffectTimer.start( 50, true ); } } @@ -221,7 +221,7 @@ void KPrSlideTransitionDia::slotDoPageEffect() if ( m_pageEffect->doEffect() ) { m_pageEffectTimer.stop(); - QObject::disconnect( &m_pageEffectTimer, SIGNAL( timeout() ), this, SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); delete m_pageEffect; m_pageEffect = 0; m_dialog->previewPixmap->update(); @@ -235,16 +235,16 @@ void KPrSlideTransitionDia::slotDoPageEffect() void KPrSlideTransitionDia::slotRequesterClicked( KURLRequester * ) { - QString filter( getSoundFileFilter() ); + TQString filter( getSoundFileFilter() ); m_dialog->soundRequester->fileDialog()->setFilter( filter ); // find the first "sound"-resource that contains files - QStringList soundDirs = KGlobal::dirs()->resourceDirs( "sound" ); + TQStringList soundDirs = KGlobal::dirs()->resourceDirs( "sound" ); if ( !soundDirs.isEmpty() ) { KURL soundURL; - QDir dir; - dir.setFilter( QDir::Files | QDir::Readable ); - QStringList::ConstIterator it = soundDirs.begin(); + TQDir dir; + dir.setFilter( TQDir::Files | TQDir::Readable ); + TQStringList::ConstIterator it = soundDirs.begin(); while ( it != soundDirs.end() ) { dir = *it; if ( dir.isReadable() && dir.count() > 2 ) { @@ -258,22 +258,22 @@ void KPrSlideTransitionDia::slotRequesterClicked( KURLRequester * ) } -QString KPrSlideTransitionDia::getSoundFileFilter() +TQString KPrSlideTransitionDia::getSoundFileFilter() { - QStringList fileList; + TQStringList fileList; fileList << "wav" << "au" << "mp3" << "mp1" << "mp2" << "mpg" << "dat" << "mpeg" << "ogg" << "cdda" << "cda " << "vcd" << "null"; fileList.sort(); bool comma = false; - QString full, str; - for ( QStringList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it ) { + TQString full, str; + for ( TQStringList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it ) { if ( comma ) str += '\n'; comma = true; - str += QString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() ); + str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() ); - full += QString( "*.") + (*it) + ' '; + full += TQString( "*.") + (*it) + ' '; } str = full + '|' + i18n( "All Supported Files" ) + '\n' + str; @@ -301,7 +301,7 @@ void KPrSlideTransitionDia::soundEffectChanged() } -void KPrSlideTransitionDia::slotSoundFileChanged( const QString& text ) +void KPrSlideTransitionDia::slotSoundFileChanged( const TQString& text ) { m_dialog->playButton->setEnabled( !text.isEmpty() ); m_dialog->stopButton->setEnabled( !text.isEmpty() ); @@ -328,7 +328,7 @@ void KPrSlideTransitionDia::apply( bool global ) EffectSpeed effectSpeed = static_cast<EffectSpeed>( m_dialog->speedCombo->currentItem() ); bool soundEffect = m_dialog->soundCheckBox->isChecked(); - QString soundFileName = m_dialog->soundRequester->url(); + TQString soundFileName = m_dialog->soundRequester->url(); int slideTime = m_dialog->automaticTransitionInput->value(); if ( effect != m_effect || @@ -347,13 +347,13 @@ void KPrSlideTransitionDia::apply( bool global ) newSettings.slideTime = slideTime; // Collect info about current settings - QValueVector<KPrTransEffectCmd::PageEffectSettings> oldSettings; + TQValueVector<KPrTransEffectCmd::PageEffectSettings> oldSettings; KPrPage *page = 0; if ( global ) { oldSettings.resize( m_view->kPresenterDoc()->getPageList().count() ); int i = 0; - for( QPtrListIterator<KPrPage> it( m_view->kPresenterDoc()->getPageList() ); *it; ++it, ++i ) + for( TQPtrListIterator<KPrPage> it( m_view->kPresenterDoc()->getPageList() ); *it; ++it, ++i ) { oldSettings[i].pageEffect = it.current()->getPageEffect(); oldSettings[i].effectSpeed = it.current()->getPageEffectSpeed(); diff --git a/kpresenter/KPrSlideTransitionDia.h b/kpresenter/KPrSlideTransitionDia.h index df1c0b37..e339b62c 100644 --- a/kpresenter/KPrSlideTransitionDia.h +++ b/kpresenter/KPrSlideTransitionDia.h @@ -22,8 +22,8 @@ #ifndef SLIDETRANSITIONDIA_H #define SLIDETRANSITIONDIA_H -#include <qtimer.h> -#include <qwidget.h> +#include <tqtimer.h> +#include <tqwidget.h> #include <kdialogbase.h> @@ -38,14 +38,15 @@ class SlideTransitionWidget; class KPrSlideTransitionDia : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KPrSlideTransitionDia( QWidget *parent, const char *name, KPrView *view ); + KPrSlideTransitionDia( TQWidget *tqparent, const char *name, KPrView *view ); ~KPrSlideTransitionDia(); protected: void apply( bool global ); // TODO reuse - QString getSoundFileFilter(); + TQString getSoundFileFilter(); SlideTransitionWidget *m_dialog; KPrView *m_view; @@ -54,13 +55,13 @@ protected: PageEffect m_effect; EffectSpeed m_effectSpeed; bool m_soundEffect; - QString m_soundFileName; + TQString m_soundFileName; int m_slideTime; KPrPageEffects *m_pageEffect; - QTimer m_pageEffectTimer; - QPixmap m_pixmap; - QPixmap m_target; + TQTimer m_pageEffectTimer; + TQPixmap m_pixmap; + TQPixmap m_target; protected slots: void effectChanged( int ); @@ -70,7 +71,7 @@ protected slots: void slotDoPageEffect(); void slotOk(); void slotRequesterClicked( KURLRequester * ); - void slotSoundFileChanged( const QString& text ); + void slotSoundFileChanged( const TQString& text ); void slotUser1(); void soundEffectChanged(); }; diff --git a/kpresenter/KPrSoundPlayer.cpp b/kpresenter/KPrSoundPlayer.cpp index f35d6d3f..5ec7610a 100644 --- a/kpresenter/KPrSoundPlayer.cpp +++ b/kpresenter/KPrSoundPlayer.cpp @@ -43,9 +43,9 @@ using namespace std; class KPresenterSoundPlayerPrivate { public: - QString fileName; + TQString fileName; - KPresenterSoundPlayerPrivate( QString fileName ) : fileName( fileName ) {}; + KPresenterSoundPlayerPrivate( TQString fileName ) : fileName( fileName ) {}; #ifndef WITHOUT_ARTS KArtsDispatcher m_dispatche; @@ -55,8 +55,8 @@ public: #endif }; -KPrSoundPlayer::KPrSoundPlayer( const QString &fileName, QObject *parent, const char *name ) - : QObject( parent, name ) +KPrSoundPlayer::KPrSoundPlayer( const TQString &fileName, TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ) { d = new KPresenterSoundPlayerPrivate( fileName ); @@ -76,7 +76,7 @@ KPrSoundPlayer::~KPrSoundPlayer() delete d; } -void KPrSoundPlayer::play( const QString &fileName ) +void KPrSoundPlayer::play( const TQString &fileName ) { KPrSoundPlayer sp( fileName ); sp.play(); diff --git a/kpresenter/KPrSoundPlayer.h b/kpresenter/KPrSoundPlayer.h index 59d5d084..1f4cc52e 100644 --- a/kpresenter/KPrSoundPlayer.h +++ b/kpresenter/KPrSoundPlayer.h @@ -30,7 +30,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, #ifndef kpresenter_sound_player_h #define kpresenter_sound_player_h -#include <qobject.h> +#include <tqobject.h> /* @@ -42,15 +42,16 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, calss KPlayObject; } */ -class KPrSoundPlayer : public QObject +class KPrSoundPlayer : public TQObject { Q_OBJECT + TQ_OBJECT public: - KPrSoundPlayer( const QString &fileName, QObject *parent = 0, const char *name = 0 ); + KPrSoundPlayer( const TQString &fileName, TQObject *tqparent = 0, const char *name = 0 ); ~KPrSoundPlayer(); - void play( const QString &fileName ); + void play( const TQString &fileName ); void stop(); public slots: diff --git a/kpresenter/KPrStyleManager.cpp b/kpresenter/KPrStyleManager.cpp index 37635388..0d20af9c 100644 --- a/kpresenter/KPrStyleManager.cpp +++ b/kpresenter/KPrStyleManager.cpp @@ -26,8 +26,8 @@ #include <KoStyleManager.h> #include <KoStyleCollection.h> -KPrStyleManager::KPrStyleManager( QWidget *_parent, KoUnit::Unit unit,KPrDocument *_doc, - const KoStyleCollection& styleCollection, const QString & activeStyleName) +KPrStyleManager::KPrStyleManager( TQWidget *_parent, KoUnit::Unit unit,KPrDocument *_doc, + const KoStyleCollection& styleCollection, const TQString & activeStyleName) : KoStyleManager(_parent,unit,styleCollection,activeStyleName) { m_doc = _doc; @@ -55,7 +55,7 @@ void KPrStyleManager::updateAllStyleLists() m_doc->updateAllStyleLists(); } -void KPrStyleManager::updateStyleListOrder( const QStringList & list) +void KPrStyleManager::updateStyleListOrder( const TQStringList & list) { m_doc->updateStyleListOrder( list ); } diff --git a/kpresenter/KPrStyleManager.h b/kpresenter/KPrStyleManager.h index 953f2a8c..55cd8ecf 100644 --- a/kpresenter/KPrStyleManager.h +++ b/kpresenter/KPrStyleManager.h @@ -22,7 +22,7 @@ #define kprstylemanager_h #include <kdialogbase.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include <KoStyleManager.h> class KPrDocument; @@ -32,16 +32,17 @@ class KoUnit; class KPrStyleManager : public KoStyleManager { Q_OBJECT + TQ_OBJECT public: - KPrStyleManager( QWidget *_parent, KoUnit::Unit unit,KPrDocument *_doc, - const KoStyleCollection & styleCollection, const QString & activeStyleName ); + KPrStyleManager( TQWidget *_parent, KoUnit::Unit unit,KPrDocument *_doc, + const KoStyleCollection & styleCollection, const TQString & activeStyleName ); virtual KoParagStyle* addStyleTemplate(KoParagStyle *style); virtual void applyStyleChange( KoStyleChangeDefMap changed ); virtual void removeStyleTemplate( KoParagStyle *style ); virtual void updateAllStyleLists(); - virtual void updateStyleListOrder( const QStringList & list); + virtual void updateStyleListOrder( const TQStringList & list); protected: KPrDocument *m_doc; }; diff --git a/kpresenter/KPrTextDocument.cpp b/kpresenter/KPrTextDocument.cpp index 51a5be7f..97bfd44c 100644 --- a/kpresenter/KPrTextDocument.cpp +++ b/kpresenter/KPrTextDocument.cpp @@ -42,11 +42,11 @@ KPrTextDocument::~KPrTextDocument() } -bool KPrTextDocument::loadSpanTag( const QDomElement& tag, KoOasisContext& context, +bool KPrTextDocument::loadSpanTag( const TQDomElement& tag, KoOasisContext& context, KoTextParag* parag, uint pos, - QString& textData, KoTextCustomItem* & customItem ) + TQString& textData, KoTextCustomItem* & customItem ) { - const QString localName( tag.localName() ); + const TQString localName( tag.localName() ); const bool isTextNS = tag.namespaceURI() == KoXmlNS::text; kdDebug( 32500 ) << "KPrTextDocument::loadSpanTag: " << localName << endl; @@ -54,7 +54,7 @@ bool KPrTextDocument::loadSpanTag( const QDomElement& tag, KoOasisContext& conte { if ( localName == "a" ) { - QString href( tag.attributeNS( KoXmlNS::xlink, "href", QString::null ) ); + TQString href( tag.attributeNS( KoXmlNS::xlink, "href", TQString() ) ); if ( href.startsWith( "#" ) ) { context.styleStack().save(); @@ -69,8 +69,8 @@ bool KPrTextDocument::loadSpanTag( const QDomElement& tag, KoOasisContext& conte // we could have multiple spans there, but OO ensures that there is always only one, // splitting the hyperlink if necessary (at format changes). // Note that we ignore the formatting of the span. - QDomElement spanElem = KoDom::namedItemNS( tag, KoXmlNS::text, "span" ); - QString text; + TQDomElement spanElem = KoDom::namedItemNS( tag, KoXmlNS::text, "span" ); + TQString text; if ( spanElem.isNull() ) text = tag.text(); if ( spanElem.isNull() ) @@ -78,12 +78,12 @@ bool KPrTextDocument::loadSpanTag( const QDomElement& tag, KoOasisContext& conte else { // The save/restore of the stack is done by the caller (KoTextParag::loadOasisSpan) // This allows to use the span's format for the variable. - //kdDebug(32500) << "filling stack with " << spanElem.attributeNS( KoXmlNS::text, "style-name", QString::null ) << endl; + //kdDebug(32500) << "filling stack with " << spanElem.attributeNS( KoXmlNS::text, "style-name", TQString() ) << endl; context.fillStyleStack( spanElem, KoXmlNS::text, "style-name", "text" ); text = spanElem.text(); } textData = KoTextObject::customItemChar(); // hyperlink placeholder - // unused tag.attributeNS( KoXmlNS::office, "name", QString::null ) + // unused tag.attributeNS( KoXmlNS::office, "name", TQString() ) KoVariableCollection& coll = context.variableCollection(); customItem = new KoLinkVariable( this, text, href, coll.formatCollection()->format( "STRING" ), diff --git a/kpresenter/KPrTextDocument.h b/kpresenter/KPrTextDocument.h index a3a123c5..0587e39c 100644 --- a/kpresenter/KPrTextDocument.h +++ b/kpresenter/KPrTextDocument.h @@ -34,6 +34,7 @@ class KoTextFormatCollection; class KPrTextDocument : public KoTextDocument { Q_OBJECT + TQ_OBJECT public: /** A text document inside a kptextobject */ KPrTextDocument( KPrTextObject * textobj, KoTextFormatCollection *fc, KoTextFormatter *formatter = 0L ); @@ -44,9 +45,9 @@ public: * Note that this can be 0L (e.g. for paragraphs in the paragdia preview) */ KPrTextObject * textObject() const { return m_textobj; } /// Extensions to KoTextParag::loadOasisSpan - bool loadSpanTag( const QDomElement& tag, KoOasisContext& context, + bool loadSpanTag( const TQDomElement& tag, KoOasisContext& context, KoTextParag* parag, uint pos, - QString& textData, KoTextCustomItem* & customItem ); + TQString& textData, KoTextCustomItem* & customItem ); private: KPrTextObject * m_textobj; diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 74d3ee7e..90b3c66f 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -48,17 +48,17 @@ #include <kdeversion.h> #include <kmultipledrag.h> -#include <qfont.h> -#include <qfile.h> -#include <qwidget.h> -#include <qpicture.h> -#include <qpainter.h> -#include <qwmatrix.h> -#include <qdom.h> -#include <qapplication.h> -#include <qfontdatabase.h> -#include <qpopupmenu.h> -#include <qclipboard.h> +#include <tqfont.h> +#include <tqfile.h> +#include <tqwidget.h> +#include <tqpicture.h> +#include <tqpainter.h> +#include <tqwmatrix.h> +#include <tqdom.h> +#include <tqapplication.h> +#include <tqfontdatabase.h> +#include <tqpopupmenu.h> +#include <tqclipboard.h> #include <KoParagCounter.h> #include <kaction.h> @@ -77,33 +77,33 @@ using namespace std; #undef S_NONE // Solaris defines it in sys/signal.h -const QString &KPrTextObject::tagTEXTOBJ=KGlobal::staticQString("TEXTOBJ"); -const QString &KPrTextObject::attrLineSpacing=KGlobal::staticQString("lineSpacing"); -const QString &KPrTextObject::attrParagSpacing=KGlobal::staticQString("paragSpacing"); -const QString &KPrTextObject::attrMargin=KGlobal::staticQString("margin"); -const QString &KPrTextObject::attrBulletType1=KGlobal::staticQString("bulletType1"); -const QString &KPrTextObject::attrBulletType2=KGlobal::staticQString("bulletType2"); -const QString &KPrTextObject::attrBulletType3=KGlobal::staticQString("bulletType3"); -const QString &KPrTextObject::attrBulletType4=KGlobal::staticQString("bulletType4"); -const QString &KPrTextObject::attrBulletColor1=KGlobal::staticQString("bulletColor1"); -const QString &KPrTextObject::attrBulletColor2=KGlobal::staticQString("bulletColor2"); -const QString &KPrTextObject::attrBulletColor3=KGlobal::staticQString("bulletColor3"); -const QString &KPrTextObject::attrBulletColor4=KGlobal::staticQString("bulletColor4"); -const QString &KPrTextObject::tagP=KGlobal::staticQString("P"); -const QString &KPrTextObject::attrAlign=KGlobal::staticQString("align"); -const QString &KPrTextObject::attrType=KGlobal::staticQString("type"); -const QString &KPrTextObject::attrDepth=KGlobal::staticQString("depth"); -const QString &KPrTextObject::tagTEXT=KGlobal::staticQString("TEXT"); -const QString &KPrTextObject::attrFamily=KGlobal::staticQString("family"); -const QString &KPrTextObject::attrPointSize=KGlobal::staticQString("pointSize"); -const QString &KPrTextObject::attrBold=KGlobal::staticQString("bold"); -const QString &KPrTextObject::attrItalic=KGlobal::staticQString("italic"); -const QString &KPrTextObject::attrUnderline=KGlobal::staticQString("underline"); -const QString &KPrTextObject::attrStrikeOut=KGlobal::staticQString("strikeOut"); -const QString &KPrTextObject::attrColor=KGlobal::staticQString("color"); -const QString &KPrTextObject::attrWhitespace=KGlobal::staticQString("whitespace"); -const QString &KPrTextObject::attrTextBackColor=KGlobal::staticQString("textbackcolor"); -const QString &KPrTextObject::attrVertAlign=KGlobal::staticQString("VERTALIGN"); +const TQString &KPrTextObject::tagTEXTOBJ=KGlobal::staticQString("TEXTOBJ"); +const TQString &KPrTextObject::attrLineSpacing=KGlobal::staticQString("lineSpacing"); +const TQString &KPrTextObject::attrParagSpacing=KGlobal::staticQString("paragSpacing"); +const TQString &KPrTextObject::attrMargin=KGlobal::staticQString("margin"); +const TQString &KPrTextObject::attrBulletType1=KGlobal::staticQString("bulletType1"); +const TQString &KPrTextObject::attrBulletType2=KGlobal::staticQString("bulletType2"); +const TQString &KPrTextObject::attrBulletType3=KGlobal::staticQString("bulletType3"); +const TQString &KPrTextObject::attrBulletType4=KGlobal::staticQString("bulletType4"); +const TQString &KPrTextObject::attrBulletColor1=KGlobal::staticQString("bulletColor1"); +const TQString &KPrTextObject::attrBulletColor2=KGlobal::staticQString("bulletColor2"); +const TQString &KPrTextObject::attrBulletColor3=KGlobal::staticQString("bulletColor3"); +const TQString &KPrTextObject::attrBulletColor4=KGlobal::staticQString("bulletColor4"); +const TQString &KPrTextObject::tagP=KGlobal::staticQString("P"); +const TQString &KPrTextObject::attrAlign=KGlobal::staticQString("align"); +const TQString &KPrTextObject::attrType=KGlobal::staticQString("type"); +const TQString &KPrTextObject::attrDepth=KGlobal::staticQString("depth"); +const TQString &KPrTextObject::tagTEXT=KGlobal::staticQString("TEXT"); +const TQString &KPrTextObject::attrFamily=KGlobal::staticQString("family"); +const TQString &KPrTextObject::attrPointSize=KGlobal::staticQString("pointSize"); +const TQString &KPrTextObject::attrBold=KGlobal::staticQString("bold"); +const TQString &KPrTextObject::attrItalic=KGlobal::staticQString("italic"); +const TQString &KPrTextObject::attrUnderline=KGlobal::staticQString("underline"); +const TQString &KPrTextObject::attrStrikeOut=KGlobal::staticQString("strikeOut"); +const TQString &KPrTextObject::attrColor=KGlobal::staticQString("color"); +const TQString &KPrTextObject::attrWhitespace=KGlobal::staticQString("whitespace"); +const TQString &KPrTextObject::attrTextBackColor=KGlobal::staticQString("textbackcolor"); +const TQString &KPrTextObject::attrVertAlign=KGlobal::staticQString("VERTALIGN"); KPrTextObject::KPrTextObject( KPrDocument *doc ) @@ -111,8 +111,8 @@ KPrTextObject::KPrTextObject( KPrDocument *doc ) { m_doc=doc; m_textVertAlign = KP_TOP; - // Default color should be QColor() ... but kpresenter isn't fully color-scheme-aware yet - KoTextFormatCollection* fc = new KoTextFormatCollection( doc->defaultFont(), Qt::black, doc->globalLanguage(), doc->globalHyphenation() ); + // Default color should be TQColor() ... but kpresenter isn't fully color-scheme-aware yet + KoTextFormatCollection* fc = new KoTextFormatCollection( doc->defaultFont(), TQt::black, doc->globalLanguage(), doc->globalHyphenation() ); KPrTextDocument * textdoc = new KPrTextDocument( this, fc ); if ( m_doc->tabStopValue() != -1 ) textdoc->setTabStops( m_doc->zoomHandler()->ptToLayoutUnitPixX( m_doc->tabStopValue() )); @@ -132,22 +132,22 @@ KPrTextObject::KPrTextObject( KPrDocument *doc ) bbottom = 0.0; alignVertical = 0.0; - connect( m_textobj, SIGNAL( newCommand( KCommand * ) ), - SLOT( slotNewCommand( KCommand * ) ) ); - connect( m_textobj, SIGNAL( availableHeightNeeded() ), - SLOT( slotAvailableHeightNeeded() ) ); - connect( m_textobj, SIGNAL( repaintChanged( KoTextObject* ) ), - SLOT( slotRepaintChanged() ) ); + connect( m_textobj, TQT_SIGNAL( newCommand( KCommand * ) ), + TQT_SLOT( slotNewCommand( KCommand * ) ) ); + connect( m_textobj, TQT_SIGNAL( availableHeightNeeded() ), + TQT_SLOT( slotAvailableHeightNeeded() ) ); + connect( m_textobj, TQT_SIGNAL( tqrepaintChanged( KoTextObject* ) ), + TQT_SLOT( slotRepaintChanged() ) ); - // Send our "repaintChanged" signals to the document. - connect( this, SIGNAL( repaintChanged( KPrTextObject * ) ), - m_doc, SLOT( slotRepaintChanged( KPrTextObject * ) ) ); - connect(m_textobj, SIGNAL( showFormatObject(const KoTextFormat &) ), - SLOT( slotFormatChanged(const KoTextFormat &)) ); - connect( m_textobj, SIGNAL( afterFormatting( int, KoTextParag*, bool* ) ), - SLOT( slotAfterFormatting( int, KoTextParag*, bool* ) ) ); - connect( m_textobj, SIGNAL( paragraphDeleted( KoTextParag*) ), - SLOT( slotParagraphDeleted(KoTextParag*) )); + // Send our "tqrepaintChanged" signals to the document. + connect( this, TQT_SIGNAL( tqrepaintChanged( KPrTextObject * ) ), + m_doc, TQT_SLOT( slotRepaintChanged( KPrTextObject * ) ) ); + connect(m_textobj, TQT_SIGNAL( showFormatObject(const KoTextFormat &) ), + TQT_SLOT( slotFormatChanged(const KoTextFormat &)) ); + connect( m_textobj, TQT_SIGNAL( afterFormatting( int, KoTextParag*, bool* ) ), + TQT_SLOT( slotAfterFormatting( int, KoTextParag*, bool* ) ) ); + connect( m_textobj, TQT_SIGNAL( paragraphDeleted( KoTextParag*) ), + TQT_SLOT( slotParagraphDeleted(KoTextParag*) )); } @@ -169,11 +169,11 @@ void KPrTextObject::slotParagraphDeleted(KoTextParag*_parag) m_doc->spellCheckParagraphDeleted( _parag, this); } -QBrush KPrTextObject::getBrush() const +TQBrush KPrTextObject::getBrush() const { - QBrush tmpBrush( m_brush.getBrush() ); + TQBrush tmpBrush( m_brush.getBrush() ); if(!tmpBrush.color().isValid()) - tmpBrush.setColor(QApplication::palette().color( QPalette::Active, QColorGroup::Base )); + tmpBrush.setColor(TQApplication::palette().color( TQPalette::Active, TQColorGroup::Base )); return tmpBrush; } @@ -207,9 +207,9 @@ void KPrTextObject::setSize( double _width, double _height ) } } -QDomDocumentFragment KPrTextObject::save( QDomDocument& doc, double offset ) +TQDomDocumentFragment KPrTextObject::save( TQDomDocument& doc, double offset ) { - QDomDocumentFragment fragment=KPr2DObject::save(doc, offset); + TQDomDocumentFragment fragment=KPr2DObject::save(doc, offset); fragment.appendChild(saveKTextObject( doc )); return fragment; } @@ -239,7 +239,7 @@ void KPrTextObject::saveOasisMarginElement( KoGenStyle &styleobjectauto ) const if ( bright != 0.0 ) styleobjectauto.addPropertyPt("fo:padding-right", bright ); - //add vertical alignment + //add vertical tqalignment switch( m_textVertAlign ) { case KP_TOP: @@ -256,7 +256,7 @@ void KPrTextObject::saveOasisMarginElement( KoGenStyle &styleobjectauto ) const // fo:padding-top="1.372cm" fo:padding-bottom="0.711cm" fo:padding-left="1.118cm" fo:padding-right="1.27cm" } -void KPrTextObject::loadOasis(const QDomElement &element, KoOasisContext& context, +void KPrTextObject::loadOasis(const TQDomElement &element, KoOasisContext& context, KPrLoadingInfo *info ) { KPr2DObject::loadOasis(element, context, info); @@ -272,28 +272,28 @@ void KPrTextObject::loadOasis(const QDomElement &element, KoOasisContext& contex if( styleStack.hasAttributeNS( KoXmlNS::fo, "padding-right" ) ) bright = KoUnit::parseValue( styleStack.attributeNS( KoXmlNS::fo, "padding-right" ) ); kdDebug()<<" KPrTextObject::loadOasis : btp :"<<btop<<" bbottom :"<<bbottom<<" bleft :"<<bleft<<" bright :"<<bright<<endl; - // vertical alignment + // vertical tqalignment if ( styleStack.hasAttributeNS( KoXmlNS::draw, "textarea-vertical-align" ) ) { - QString alignment = styleStack.attributeNS( KoXmlNS::draw, "textarea-vertical-align" ); - if ( alignment == "top" ) + TQString tqalignment = styleStack.attributeNS( KoXmlNS::draw, "textarea-vertical-align" ); + if ( tqalignment == "top" ) m_textVertAlign= KP_TOP; - else if ( alignment == "middle" ) + else if ( tqalignment == "middle" ) m_textVertAlign= KP_CENTER; - else if ( alignment == "bottom" ) + else if ( tqalignment == "bottom" ) m_textVertAlign= KP_BOTTOM; } kdDebug()<<" vertical Alignment :"<< ( ( m_textVertAlign== KP_TOP ) ? "top" : ( m_textVertAlign== KP_CENTER ) ? "center": "bottom" )<<endl; - QDomElement tmp = KoDom::namedItemNS( element, KoXmlNS::draw, "text-box"); + TQDomElement tmp = KoDom::namedItemNS( element, KoXmlNS::draw, "text-box"); m_textobj->loadOasisContent( tmp, context, m_doc->styleCollection() ); resizeTextDocument(); // this will to formatMore() } -double KPrTextObject::load(const QDomElement &element) +double KPrTextObject::load(const TQDomElement &element) { double offset=KPr2DObject::load(element); - QDomElement e=element.namedItem(tagTEXTOBJ).toElement(); + TQDomElement e=element.namedItem(tagTEXTOBJ).toElement(); if(!e.isNull()) { if ( e.hasAttribute( "protectcontent")) setProtectContent((bool)e.attribute( "protectcontent" ).toInt()); @@ -307,7 +307,7 @@ double KPrTextObject::load(const QDomElement &element) bbottom = e.attribute( "bbottompt").toDouble(); if ( e.hasAttribute("verticalAlign")) { - QString str =e.attribute("verticalAlign"); + TQString str =e.attribute("verticalAlign"); if ( str == "bottom" ) m_textVertAlign= KP_BOTTOM; else if ( str == "center" ) @@ -367,12 +367,12 @@ void KPrTextObject::shadowCompatibility() //force to reset shadow compatibility between koffice 1.1 and 1.2 shadowDirection = SD_RIGHT_BOTTOM; shadowDistance = 0; - shadowColor = Qt::gray; + shadowColor = TQt::gray; } // Standard paint method for KP2DObjects. -void KPrTextObject::paint( QPainter *_painter, KoTextZoomHandler*_zoomHandler, +void KPrTextObject::paint( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, int pageNum, bool drawingShadow, bool drawContour ) { // Never draw shadow (in text objects, it's a character property, not an object property) @@ -385,7 +385,7 @@ void KPrTextObject::paint( QPainter *_painter, KoTextZoomHandler*_zoomHandler, } // Special method for drawing a text object that is being edited -void KPrTextObject::paintEdited( QPainter *_painter, KoTextZoomHandler*_zoomHandler, +void KPrTextObject::paintEdited( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged ) { _painter->save(); @@ -398,7 +398,7 @@ void KPrTextObject::paintEdited( QPainter *_painter, KoTextZoomHandler*_zoomHand } // Common functionality for the above 2 methods -void KPrTextObject::paint( QPainter *_painter, KoTextZoomHandler*_zoomHandler, +void KPrTextObject::paint( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged, bool drawContour ) { @@ -406,9 +406,9 @@ void KPrTextObject::paint( QPainter *_painter, KoTextZoomHandler*_zoomHandler, double oh = ext.height(); double pw = pen.pointWidth() / 2; if ( drawContour ) { - QPen pen3( Qt::black, 1, Qt::DotLine ); + TQPen pen3( TQt::black, 1, TQt::DotLine ); _painter->setPen( pen3 ); - _painter->setRasterOp( Qt::NotXorROP ); + _painter->setRasterOp( TQt::NotXorROP ); _painter->drawRect( _zoomHandler->zoomItX(pw), _zoomHandler->zoomItY(pw), _zoomHandler->zoomItX(ow), _zoomHandler->zoomItY( oh) ); @@ -416,22 +416,22 @@ void KPrTextObject::paint( QPainter *_painter, KoTextZoomHandler*_zoomHandler, } _painter->save(); - QPen pen2 = pen.zoomedPen(_zoomHandler); - //QRect clip=QRect(_zoomHandler->zoomItX(pw), _zoomHandler->zoomItY(pw), _zoomHandler->zoomItX( ow - 2 * pw),_zoomHandler->zoomItY( oh - 2 * pw)); + TQPen pen2 = pen.zoomedPen(_zoomHandler); + //TQRect clip=TQRect(_zoomHandler->zoomItX(pw), _zoomHandler->zoomItY(pw), _zoomHandler->zoomItX( ow - 2 * pw),_zoomHandler->zoomItY( oh - 2 * pw)); //setupClipRegion( _painter, clip ); //for debug - //_painter->fillRect( clip, Qt::blue ); + //_painter->fillRect( clip, TQt::blue ); _painter->setPen( pen2 ); - if ( editingTextObj && _painter->device() && _painter->device()->devType() != QInternal::Printer) // editing text object - _painter->setBrush( QBrush( m_doc->txtBackCol(), Qt::SolidPattern ) ); + if ( editingTextObj && _painter->device() && _painter->device()->devType() != TQInternal::Printer) // editing text object + _painter->setBrush( TQBrush( m_doc->txtBackCol(), TQt::SolidPattern ) ); else { // Handle the rotation, draw the background/border, then call drawText() if ( getFillType() == FT_BRUSH || !gradient ) { _painter->setBrush( getBrush() ); } else { - QSize size( _zoomHandler->zoomSize( ext ) ); + TQSize size( _zoomHandler->zoomSize( ext ) ); gradient->setSize( size ); _painter->drawPixmap( _zoomHandler->zoomItX(pw), _zoomHandler->zoomItX(pw), gradient->pixmap(), 0, 0, _zoomHandler->zoomItX( ow - 2 * pw ), @@ -454,13 +454,13 @@ void KPrTextObject::paint( QPainter *_painter, KoTextZoomHandler*_zoomHandler, // When they are drawn outside of the object, this can be moved to the standard paint() method, // so that we don't have to do it while editing the object, maybe. if ( m_doc->firstView() && m_doc->firstView()->getCanvas()->getEditMode() && - getDrawEditRect() && getPen().style() == Qt::NoPen ) + getDrawEditRect() && getPen().style() == TQt::NoPen ) { _painter->save(); - _painter->setPen( QPen( Qt::gray, 1, Qt::DotLine ) ); - _painter->setBrush( Qt::NoBrush ); - _painter->setRasterOp( Qt::NotXorROP ); + _painter->setPen( TQPen( TQt::gray, 1, TQt::DotLine ) ); + _painter->setBrush( TQt::NoBrush ); + _painter->setRasterOp( TQt::NotXorROP ); _painter->drawRect( 0, 0, _zoomHandler->zoomItX(ow), _zoomHandler->zoomItY( oh) ); _painter->restore(); @@ -469,25 +469,25 @@ void KPrTextObject::paint( QPainter *_painter, KoTextZoomHandler*_zoomHandler, // This method simply draws the paragraphs in the given painter // Assumes the painter is already set up correctly. -void KPrTextObject::drawText( QPainter* _painter, KoTextZoomHandler *zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged ) +void KPrTextObject::drawText( TQPainter* _painter, KoTextZoomHandler *zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged ) { //kdDebug(33001) << "KPrTextObject::drawText onlyChanged=" << onlyChanged << " cursor=" << cursor << " resetChanged=" << resetChanged << endl; recalcVerticalAlignment(); - QColorGroup cg = QApplication::palette().active(); + TQColorGroup cg = TQApplication::tqpalette().active(); _painter->save(); _painter->translate( m_doc->zoomHandler()->zoomItX( bLeft()), m_doc->zoomHandler()->zoomItY( bTop()+alignVertical)); - if ( !editingTextObj || (_painter->device() && _painter->device()->devType() == QInternal::Printer)) - cg.setBrush( QColorGroup::Base, NoBrush ); + if ( !editingTextObj || (_painter->device() && _painter->device()->devType() == TQInternal::Printer)) + cg.setBrush( TQColorGroup::Base, Qt::NoBrush ); else - cg.setColor( QColorGroup::Base, m_doc->txtBackCol() ); + cg.setColor( TQColorGroup::Base, m_doc->txtBackCol() ); - QRect r = zoomHandler->zoomRect( KoRect( 0, 0, innerWidth(), innerHeight() ) ); + TQRect r = zoomHandler->zoomRect( KoRect( 0, 0, innerWidth(), innerHeight() ) ); bool editMode = false; if( m_doc->firstView() && m_doc->firstView()->getCanvas()) editMode = m_doc->firstView()->getCanvas()->getEditMode(); uint drawingFlags = 0; - if ( _painter->device() && _painter->device()->devType() != QInternal::Printer ) + if ( _painter->device() && _painter->device()->devType() != TQInternal::Printer ) drawingFlags |= KoTextDocument::DrawSelections; if ( m_doc->backgroundSpellCheckEnabled() && editMode ) drawingFlags |= KoTextDocument::DrawMisspelledLine; @@ -533,14 +533,14 @@ int KPrTextObject::getSubPresSteps() const } -QDomElement KPrTextObject::saveKTextObject( QDomDocument& doc ) +TQDomElement KPrTextObject::saveKTextObject( TQDomDocument& doc ) { #if 0 KTextEditParag *parag = ktextobject.document()->firstParag(); KTextEditDocument::TextSettings textSettings = ktextobject.document()->textSettings(); #endif - QDomElement textobj=doc.createElement(tagTEXTOBJ); + TQDomElement textobj=doc.createElement(tagTEXTOBJ); if ( isProtectContent() ) textobj.setAttribute( "protectcontent", (int)isProtectContent()); if (bleft !=0.0) @@ -583,9 +583,9 @@ QDomElement KPrTextObject::saveKTextObject( QDomDocument& doc ) return textobj; } -void KPrTextObject::saveFormat( QDomElement & element, KoTextFormat*lastFormat ) +void KPrTextObject::saveFormat( TQDomElement & element, KoTextFormat*lastFormat ) { - QString tmpFamily, tmpColor, tmpTextBackColor; + TQString tmpFamily, tmpColor, tmpTextBackColor; unsigned int tmpBold=false, tmpItalic=false, tmpUnderline=false,tmpStrikeOut=false; int tmpVerticalAlign=-1; @@ -616,7 +616,7 @@ void KPrTextObject::saveFormat( QDomElement & element, KoTextFormat*lastFormat ) element.setAttribute(attrUnderline, "wave"); else if(tmpUnderline) element.setAttribute(attrUnderline, tmpUnderline); - QString strLineType=KoTextFormat::underlineStyleToString( lastFormat->underlineStyle() ); + TQString strLineType=KoTextFormat::underlineStyleToString( lastFormat->underlineStyle() ); element.setAttribute( "underlinestyleline", strLineType ); if ( lastFormat->textUnderlineColor().isValid() ) element.setAttribute( "underlinecolor", lastFormat->textUnderlineColor().name() ); @@ -629,7 +629,7 @@ void KPrTextObject::saveFormat( QDomElement & element, KoTextFormat*lastFormat ) element.setAttribute(attrStrikeOut, "single-bold"); else if(tmpStrikeOut) element.setAttribute(attrStrikeOut, tmpStrikeOut); - QString strLineType=KoTextFormat::strikeOutStyleToString( lastFormat->strikeOutStyle() ); + TQString strLineType=KoTextFormat::strikeOutStyleToString( lastFormat->strikeOutStyle() ); element.setAttribute( "strikeoutstyleline", strLineType ); } @@ -657,14 +657,14 @@ void KPrTextObject::saveFormat( QDomElement & element, KoTextFormat*lastFormat ) element.setAttribute("language", lastFormat->language()); } -QDomElement KPrTextObject::saveHelper(const QString &tmpText,KoTextFormat*lastFormat , QDomDocument &doc) +TQDomElement KPrTextObject::saveHelper(const TQString &tmpText,KoTextFormat*lastFormat , TQDomDocument &doc) { - QDomElement element=doc.createElement(tagTEXT); + TQDomElement element=doc.createElement(tagTEXT); saveFormat ( element, lastFormat ); if(tmpText.stripWhiteSpace().isEmpty()) - // working around a bug in QDom + // working around a bug in TQDom element.setAttribute(attrWhitespace, tmpText.length()); element.appendChild(doc.createTextNode(tmpText)); return element; @@ -676,9 +676,9 @@ void KPrTextObject::fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainSty saveOasisMarginElement( styleObjectAuto ); } -void KPrTextObject::loadKTextObject( const QDomElement &elem ) +void KPrTextObject::loadKTextObject( const TQDomElement &elem ) { - QDomElement e = elem.firstChild().toElement(); + TQDomElement e = elem.firstChild().toElement(); KoTextParag *lastParag = static_cast<KoTextParag *>(textDocument()->firstParag()); int i = 0; int listNum = 0; @@ -689,11 +689,11 @@ void KPrTextObject::loadKTextObject( const QDomElement &elem ) int topBorder = 0; while ( !e.isNull() ) { - QValueList<QDomElement> listVariable; + TQValueList<TQDomElement> listVariable; listVariable.clear(); if ( e.tagName() == tagP ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); //skip the whitespace if it's a bullet/number if( e.hasAttribute( attrType ) && n.hasAttribute( attrWhitespace ) ) @@ -708,13 +708,13 @@ void KPrTextObject::loadKTextObject( const QDomElement &elem ) double depth = 0.0; if( e.hasAttribute(attrDepth) ) { depth = e.attribute( attrDepth ).toDouble(); - paragLayout.margins[QStyleSheetItem::MarginLeft] = depth * MM_TO_POINT(10.0); + paragLayout.margins[TQStyleSheetItem::MarginLeft] = depth * MM_TO_POINT(10.0); } //kdDebug(33001) << k_funcinfo << "old bullet depth is: " << depth << endl; // 1.1 compatibility (bullets) - QString type; + TQString type; if( e.hasAttribute(attrType) ) type = e.attribute( attrType ); @@ -727,8 +727,8 @@ void KPrTextObject::loadKTextObject( const QDomElement &elem ) paragLayout.counter = new KoParagCounter; paragLayout.counter->setStyle(KoParagCounter::STYLE_DISCBULLET); paragLayout.counter->setNumbering(KoParagCounter::NUM_LIST); - paragLayout.counter->setPrefix(QString::null); - paragLayout.counter->setSuffix(QString::null); + paragLayout.counter->setPrefix(TQString()); + paragLayout.counter->setSuffix(TQString()); } // This is for very old (KOffice-1.0) documents. @@ -742,24 +742,24 @@ void KPrTextObject::loadKTextObject( const QDomElement &elem ) // Apply values coming from 1.0 or 1.1 documents if ( paragLayout.lineSpacingValue() == 0 ) paragLayout.setLineSpacingValue(lineSpacing); - if ( paragLayout.margins[ QStyleSheetItem::MarginTop ] == 0 ) - paragLayout.margins[ QStyleSheetItem::MarginTop ] = topBorder; - if ( paragLayout.margins[ QStyleSheetItem::MarginBottom ] == 0 ) - paragLayout.margins[ QStyleSheetItem::MarginBottom ] = bottomBorder; + if ( paragLayout.margins[ TQStyleSheetItem::MarginTop ] == 0 ) + paragLayout.margins[ TQStyleSheetItem::MarginTop ] = topBorder; + if ( paragLayout.margins[ TQStyleSheetItem::MarginBottom ] == 0 ) + paragLayout.margins[ TQStyleSheetItem::MarginBottom ] = bottomBorder; lastParag->setParagLayout( paragLayout ); - //lastParag->setAlign(Qt::AlignAuto); + //lastParag->setAlign(TQt::AlignAuto); if(e.hasAttribute(attrAlign)) { int tmpAlign=e.attribute( attrAlign ).toInt(); if(tmpAlign==1 || tmpAlign==0 /* a kpresenter version I think a cvs version saved leftAlign = 0 for header/footer */) - lastParag->setAlign(Qt::AlignLeft); + lastParag->setAlign(TQt::AlignLeft); else if(tmpAlign==2) - lastParag->setAlign(Qt::AlignRight); + lastParag->setAlign(TQt::AlignRight); else if(tmpAlign==4) - lastParag->setAlign(Qt::AlignHCenter); + lastParag->setAlign(TQt::AlignHCenter); else if(tmpAlign==8) - lastParag->setAlign(Qt::AlignJustify); + lastParag->setAlign(TQt::AlignJustify); else kdDebug(33001) << "Error in e.attribute( attrAlign ).toInt()" << endl; } @@ -777,7 +777,7 @@ void KPrTextObject::loadKTextObject( const QDomElement &elem ) KoTextFormat fm = loadFormat( n, lastParag->paragraphFormat(), m_doc->defaultFont(), m_doc->globalLanguage(), m_doc->globalHyphenation() ); - QString txt = n.firstChild().toText().data(); + TQString txt = n.firstChild().toText().data(); if(n.hasAttribute(attrWhitespace)) { int ws=n.attribute(attrWhitespace).toInt(); @@ -801,7 +801,7 @@ void KPrTextObject::loadKTextObject( const QDomElement &elem ) } } else if ( e.tagName() == "UNSORTEDLISTTYPE" ) { if ( listNum < 4 ) { - //QColor c( e.attribute( "red" ).toInt(), e.attribute( "green" ).toInt(), e.attribute( "blue" ).toInt() ); + //TQColor c( e.attribute( "red" ).toInt(), e.attribute( "green" ).toInt(), e.attribute( "blue" ).toInt() ); // ## settings.bulletColor[ listNum++ ] = c; } } @@ -815,23 +815,23 @@ void KPrTextObject::loadKTextObject( const QDomElement &elem ) } } -void KPrTextObject::loadVariable( QValueList<QDomElement> & listVariable,KoTextParag *lastParag, int offset ) +void KPrTextObject::loadVariable( TQValueList<TQDomElement> & listVariable,KoTextParag *lastParag, int offset ) { - QValueList<QDomElement>::Iterator it = listVariable.begin(); - QValueList<QDomElement>::Iterator end = listVariable.end(); + TQValueList<TQDomElement>::Iterator it = listVariable.begin(); + TQValueList<TQDomElement>::Iterator end = listVariable.end(); for ( ; it != end ; ++it ) { - QDomElement elem = *it; + TQDomElement elem = *it; if ( !elem.hasAttribute("pos")) continue; int index = elem.attribute("pos").toInt(); index+=offset; - QDomElement varElem = elem.namedItem( "VARIABLE" ).toElement(); + TQDomElement varElem = elem.namedItem( "VARIABLE" ).toElement(); if ( !varElem.isNull() ) { - QDomElement typeElem = varElem.namedItem( "TYPE" ).toElement(); + TQDomElement typeElem = varElem.namedItem( "TYPE" ).toElement(); int type = typeElem.attribute( "type" ).toInt(); - QString key = typeElem.attribute( "key" ); + TQString key = typeElem.attribute( "key" ); int correct = 0; if (typeElem.hasAttribute( "correct" )) correct = typeElem.attribute("correct").toInt(); @@ -853,12 +853,12 @@ void KPrTextObject::loadVariable( QValueList<QDomElement> & listVariable,KoTextP } } -KoTextFormat KPrTextObject::loadFormat( QDomElement &n, KoTextFormat * refFormat, const QFont & defaultFont, - const QString & defaultLanguage, bool hyphen ) +KoTextFormat KPrTextObject::loadFormat( TQDomElement &n, KoTextFormat * refFormat, const TQFont & defaultFont, + const TQString & defaultLanguage, bool hyphen ) { KoTextFormat format; format.setHyphenation( hyphen ); - QFont fn; + TQFont fn; if ( refFormat ) { format = *refFormat; @@ -870,9 +870,9 @@ KoTextFormat KPrTextObject::loadFormat( QDomElement &n, KoTextFormat * refFormat if ( !n.isNull() ) { - QFontDatabase fdb; - QStringList families = fdb.families(); - if ( families.findIndex( n.attribute( attrFamily ) ) != -1 ) + TQFontDatabase fdb; + TQStringList families = fdb.tqfamilies(); + if ( families.tqfindIndex( n.attribute( attrFamily ) ) != -1 ) fn.setFamily( n.attribute( attrFamily ) ); else fn = defaultFont; @@ -893,7 +893,7 @@ KoTextFormat KPrTextObject::loadFormat( QDomElement &n, KoTextFormat * refFormat if(n.hasAttribute( attrUnderline )) { - QString value = n.attribute( attrUnderline ); + TQString value = n.attribute( attrUnderline ); if ( value == "double" ) format.setUnderlineType ( KoTextFormat::U_DOUBLE); else if ( value == "single" ) @@ -909,11 +909,11 @@ KoTextFormat KPrTextObject::loadFormat( QDomElement &n, KoTextFormat * refFormat format.setUnderlineStyle( KoTextFormat::stringToUnderlineStyle( n.attribute("underlinestyleline") )); if (n.hasAttribute("underlinecolor")) - format.setTextUnderlineColor(QColor(n.attribute("underlinecolor"))); + format.setTextUnderlineColor(TQColor(n.attribute("underlinecolor"))); if(n.hasAttribute(attrStrikeOut)) { - QString value = n.attribute( attrStrikeOut ); + TQString value = n.attribute( attrStrikeOut ); if ( value == "double" ) format.setStrikeOutType ( KoTextFormat::S_DOUBLE); else if ( value == "single" ) @@ -926,24 +926,24 @@ KoTextFormat KPrTextObject::loadFormat( QDomElement &n, KoTextFormat * refFormat if (n.hasAttribute("strikeoutstyleline")) { - QString strLineType = n.attribute("strikeoutstyleline"); + TQString strLineType = n.attribute("strikeoutstyleline"); format.setStrikeOutStyle( KoTextFormat::stringToStrikeOutStyle( strLineType )); } - QString color = n.attribute( attrColor ); + TQString color = n.attribute( attrColor ); fn.setPointSize( size ); fn.setBold( bold ); fn.setItalic( italic ); //kdDebug(33001) << "KPrTextObject::loadFormat: family=" << fn.family() << " size=" << fn.pointSize() << endl; - QColor col( color ); + TQColor col( color ); format.setFont( fn ); format.setColor( col ); - QString textBackColor=n.attribute(attrTextBackColor); + TQString textBackColor=n.attribute(attrTextBackColor); if(!textBackColor.isEmpty()) { - QColor tmpCol(textBackColor); - tmpCol=tmpCol.isValid() ? tmpCol : QApplication::palette().color( QPalette::Active, QColorGroup::Base ); + TQColor tmpCol(textBackColor); + tmpCol=tmpCol.isValid() ? tmpCol : TQApplication::palette().color( TQPalette::Active, TQColorGroup::Base ); format.setTextBackgroundColor(tmpCol); } if(n.hasAttribute(attrVertAlign)) @@ -970,9 +970,9 @@ KoTextFormat KPrTextObject::loadFormat( QDomElement &n, KoTextFormat * refFormat return format; } -KoParagLayout KPrTextObject::loadParagLayout( QDomElement & parentElem, KPrDocument *doc, bool findStyle) +KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & tqparentElem, KPrDocument *doc, bool findStyle) { - KoParagLayout layout; + KoParagLayout tqlayout; // Only when loading paragraphs, not when loading styles if ( findStyle ) @@ -980,10 +980,10 @@ KoParagLayout KPrTextObject::loadParagLayout( QDomElement & parentElem, KPrDocum KoParagStyle *style; // Name of the style. If there is no style, then we do not supply // any default! - QDomElement element = parentElem.namedItem( "NAME" ).toElement(); + TQDomElement element = tqparentElem.namedItem( "NAME" ).toElement(); if ( !element.isNull() ) { - QString styleName = element.attribute( "value" ); + TQString styleName = element.attribute( "value" ); style = doc->styleCollection()->findStyle( styleName ); if (!style) { @@ -998,128 +998,128 @@ KoParagLayout KPrTextObject::loadParagLayout( QDomElement & parentElem, KPrDocum style = doc->styleCollection()->findStyle( "Standard" ); } Q_ASSERT(style); - layout.style = style; + tqlayout.style = style; } - QDomElement element = parentElem.namedItem( "INDENTS" ).toElement(); + TQDomElement element = tqparentElem.namedItem( "INDENTS" ).toElement(); if ( !element.isNull() ) { double val=0.0; if(element.hasAttribute("first")) val=element.attribute("first").toDouble(); - layout.margins[QStyleSheetItem::MarginFirstLine] = val; + tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = val; val=0.0; if(element.hasAttribute( "left")) // The GUI prevents a negative indent, so let's fixup broken docs too - val=QMAX(0, element.attribute( "left").toDouble()); - layout.margins[QStyleSheetItem::MarginLeft] = val; + val=TQMAX(0, element.attribute( "left").toDouble()); + tqlayout.margins[TQStyleSheetItem::MarginLeft] = val; val=0.0; if(element.hasAttribute("right")) // The GUI prevents a negative indent, so let's fixup broken docs too - val=QMAX(0, element.attribute("right").toDouble()); - layout.margins[QStyleSheetItem::MarginRight] = val; + val=TQMAX(0, element.attribute("right").toDouble()); + tqlayout.margins[TQStyleSheetItem::MarginRight] = val; } - element = parentElem.namedItem( "LINESPACING" ).toElement(); + element = tqparentElem.namedItem( "LINESPACING" ).toElement(); if ( !element.isNull() ) { //compatibility with koffice 1.1 if ( element.hasAttribute( "value" )) { - QString value = element.attribute( "value" ); + TQString value = element.attribute( "value" ); if ( value == "oneandhalf" ) { - layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; - layout.setLineSpacingValue(0); + tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; + tqlayout.setLineSpacingValue(0); } else if ( value == "double" ) { - layout.lineSpacingType = KoParagLayout::LS_DOUBLE; - layout.setLineSpacingValue(0); + tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; + tqlayout.setLineSpacingValue(0); } else { - layout.lineSpacingType = KoParagLayout::LS_CUSTOM; - layout.setLineSpacingValue(value.toDouble()); + tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; + tqlayout.setLineSpacingValue(value.toDouble()); } } else { - QString type = element.attribute( "type" ); + TQString type = element.attribute( "type" ); if ( type == "oneandhalf" ) { - layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; - layout.setLineSpacingValue(0); + tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; + tqlayout.setLineSpacingValue(0); } else if ( type == "double" ) { - layout.lineSpacingType = KoParagLayout::LS_DOUBLE; - layout.setLineSpacingValue(0); + tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; + tqlayout.setLineSpacingValue(0); } else if ( type == "custom" ) { - layout.lineSpacingType = KoParagLayout::LS_CUSTOM; - layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); + tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; + tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); } else if ( type == "atleast" ) { - layout.lineSpacingType = KoParagLayout::LS_AT_LEAST; - layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); + tqlayout.lineSpacingType = KoParagLayout::LS_AT_LEAST; + tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); } else if ( type == "multiple" ) { - layout.lineSpacingType = KoParagLayout::LS_MULTIPLE; - layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); + tqlayout.lineSpacingType = KoParagLayout::LS_MULTIPLE; + tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); } } } - element = parentElem.namedItem( "OFFSETS" ).toElement(); + element = tqparentElem.namedItem( "OFFSETS" ).toElement(); if ( !element.isNull() ) { double val =0.0; if(element.hasAttribute("before")) - val=QMAX(0, element.attribute("before").toDouble()); - layout.margins[QStyleSheetItem::MarginTop] = val; + val=TQMAX(0, element.attribute("before").toDouble()); + tqlayout.margins[TQStyleSheetItem::MarginTop] = val; val = 0.0; if(element.hasAttribute("after")) - val=QMAX(0, element.attribute("after").toDouble()); - layout.margins[QStyleSheetItem::MarginBottom] = val; + val=TQMAX(0, element.attribute("after").toDouble()); + tqlayout.margins[TQStyleSheetItem::MarginBottom] = val; } - element = parentElem.namedItem( "LEFTBORDER" ).toElement(); + element = tqparentElem.namedItem( "LEFTBORDER" ).toElement(); if ( !element.isNull() ) - layout.leftBorder = KoBorder::loadBorder( element ); + tqlayout.leftBorder = KoBorder::loadBorder( element ); else - layout.leftBorder.setPenWidth( 0); + tqlayout.leftBorder.setPenWidth( 0); - element = parentElem.namedItem( "RIGHTBORDER" ).toElement(); + element = tqparentElem.namedItem( "RIGHTBORDER" ).toElement(); if ( !element.isNull() ) - layout.rightBorder = KoBorder::loadBorder( element ); + tqlayout.rightBorder = KoBorder::loadBorder( element ); else - layout.rightBorder.setPenWidth( 0); + tqlayout.rightBorder.setPenWidth( 0); - element = parentElem.namedItem( "TOPBORDER" ).toElement(); + element = tqparentElem.namedItem( "TOPBORDER" ).toElement(); if ( !element.isNull() ) - layout.topBorder = KoBorder::loadBorder( element ); + tqlayout.topBorder = KoBorder::loadBorder( element ); else - layout.topBorder.setPenWidth(0); + tqlayout.topBorder.setPenWidth(0); - element = parentElem.namedItem( "BOTTOMBORDER" ).toElement(); + element = tqparentElem.namedItem( "BOTTOMBORDER" ).toElement(); if ( !element.isNull() ) - layout.bottomBorder = KoBorder::loadBorder( element ); + tqlayout.bottomBorder = KoBorder::loadBorder( element ); else - layout.bottomBorder.setPenWidth(0); + tqlayout.bottomBorder.setPenWidth(0); - element = parentElem.namedItem( "COUNTER" ).toElement(); + element = tqparentElem.namedItem( "COUNTER" ).toElement(); if ( !element.isNull() ) { - layout.counter = new KoParagCounter; - layout.counter->load( element ); + tqlayout.counter = new KoParagCounter; + tqlayout.counter->load( element ); } KoTabulatorList tabList; - element = parentElem.firstChild().toElement(); + element = tqparentElem.firstChild().toElement(); for ( ; !element.isNull() ; element = element.nextSibling().toElement() ) { if ( element.tagName() == "TABULATOR" ) @@ -1140,115 +1140,115 @@ KoParagLayout KPrTextObject::loadParagLayout( QDomElement & parentElem, KPrDocum tabList.append( tab ); } } - layout.setTabList( tabList ); + tqlayout.setTabList( tabList ); - return layout; + return tqlayout; } -void KPrTextObject::saveParagLayout( const KoParagLayout& layout, QDomElement & parentElem ) +void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & tqparentElem ) { - QDomDocument doc = parentElem.ownerDocument(); - QDomElement element = doc.createElement( "NAME" ); - parentElem.appendChild( element ); - if ( layout.style ) - element.setAttribute( "value", layout.style->name() ); + TQDomDocument doc = tqparentElem.ownerDocument(); + TQDomElement element = doc.createElement( "NAME" ); + tqparentElem.appendChild( element ); + if ( tqlayout.style ) + element.setAttribute( "value", tqlayout.style->name() ); else kdWarning() << "KWTextParag::saveParagLayout: style==0L!" << endl; - if ( layout.margins[QStyleSheetItem::MarginFirstLine] != 0 || - layout.margins[QStyleSheetItem::MarginLeft] != 0 || - layout.margins[QStyleSheetItem::MarginRight] != 0 ) + if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 || + tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 || + tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 ) { element = doc.createElement( "INDENTS" ); - parentElem.appendChild( element ); - if ( layout.margins[QStyleSheetItem::MarginFirstLine] != 0 ) - element.setAttribute( "first", layout.margins[QStyleSheetItem::MarginFirstLine] ); - if ( layout.margins[QStyleSheetItem::MarginLeft] != 0 ) - element.setAttribute( "left", layout.margins[QStyleSheetItem::MarginLeft] ); - if ( layout.margins[QStyleSheetItem::MarginRight] != 0 ) - element.setAttribute( "right", layout.margins[QStyleSheetItem::MarginRight] ); + tqparentElem.appendChild( element ); + if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ) + element.setAttribute( "first", tqlayout.margins[TQStyleSheetItem::MarginFirstLine] ); + if ( tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 ) + element.setAttribute( "left", tqlayout.margins[TQStyleSheetItem::MarginLeft] ); + if ( tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 ) + element.setAttribute( "right", tqlayout.margins[TQStyleSheetItem::MarginRight] ); } - if ( layout.margins[QStyleSheetItem::MarginTop] != 0 || - layout.margins[QStyleSheetItem::MarginBottom] != 0 ) + if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 || + tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 ) { element = doc.createElement( "OFFSETS" ); - parentElem.appendChild( element ); - if ( layout.margins[QStyleSheetItem::MarginTop] != 0 ) - element.setAttribute( "before", layout.margins[QStyleSheetItem::MarginTop] ); - if ( layout.margins[QStyleSheetItem::MarginBottom] != 0 ) - element.setAttribute( "after", layout.margins[QStyleSheetItem::MarginBottom] ); + tqparentElem.appendChild( element ); + if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 ) + element.setAttribute( "before", tqlayout.margins[TQStyleSheetItem::MarginTop] ); + if ( tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 ) + element.setAttribute( "after", tqlayout.margins[TQStyleSheetItem::MarginBottom] ); } - if ( layout.lineSpacingType != KoParagLayout::LS_SINGLE ) + if ( tqlayout.lineSpacingType != KoParagLayout::LS_SINGLE ) { element = doc.createElement( "LINESPACING" ); - parentElem.appendChild( element ); - if ( layout.lineSpacingType == KoParagLayout::LS_ONEANDHALF ) + tqparentElem.appendChild( element ); + if ( tqlayout.lineSpacingType == KoParagLayout::LS_ONEANDHALF ) element.setAttribute( "type", "oneandhalf" ); - else if ( layout.lineSpacingType == KoParagLayout::LS_DOUBLE ) + else if ( tqlayout.lineSpacingType == KoParagLayout::LS_DOUBLE ) element.setAttribute( "type", "double" ); - else if ( layout.lineSpacingType == KoParagLayout::LS_CUSTOM ) + else if ( tqlayout.lineSpacingType == KoParagLayout::LS_CUSTOM ) { element.setAttribute( "type", "custom" ); - element.setAttribute( "spacingvalue", layout.lineSpacingValue()); + element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue()); } - else if ( layout.lineSpacingType == KoParagLayout::LS_AT_LEAST ) + else if ( tqlayout.lineSpacingType == KoParagLayout::LS_AT_LEAST ) { element.setAttribute( "type", "atleast" ); - element.setAttribute( "spacingvalue", layout.lineSpacingValue()); + element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue()); } - else if ( layout.lineSpacingType == KoParagLayout::LS_MULTIPLE ) + else if ( tqlayout.lineSpacingType == KoParagLayout::LS_MULTIPLE ) { element.setAttribute( "type", "multiple" ); - element.setAttribute( "spacingvalue", layout.lineSpacingValue()); + element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue()); } else kdDebug(33001) << " error in lineSpacing Type" << endl; } - if ( layout.leftBorder.penWidth() > 0 ) + if ( tqlayout.leftBorder.penWidth() > 0 ) { element = doc.createElement( "LEFTBORDER" ); - parentElem.appendChild( element ); - layout.leftBorder.save( element ); + tqparentElem.appendChild( element ); + tqlayout.leftBorder.save( element ); } - if ( layout.rightBorder.penWidth() > 0 ) + if ( tqlayout.rightBorder.penWidth() > 0 ) { element = doc.createElement( "RIGHTBORDER" ); - parentElem.appendChild( element ); - layout.rightBorder.save( element ); + tqparentElem.appendChild( element ); + tqlayout.rightBorder.save( element ); } - if ( layout.topBorder.penWidth() > 0 ) + if ( tqlayout.topBorder.penWidth() > 0 ) { element = doc.createElement( "TOPBORDER" ); - parentElem.appendChild( element ); - layout.topBorder.save( element ); + tqparentElem.appendChild( element ); + tqlayout.topBorder.save( element ); } - if ( layout.bottomBorder.penWidth() > 0 ) + if ( tqlayout.bottomBorder.penWidth() > 0 ) { element = doc.createElement( "BOTTOMBORDER" ); - parentElem.appendChild( element ); - layout.bottomBorder.save( element ); + tqparentElem.appendChild( element ); + tqlayout.bottomBorder.save( element ); } - if ( layout.counter && layout.counter->numbering() != KoParagCounter::NUM_NONE ) + if ( tqlayout.counter && tqlayout.counter->numbering() != KoParagCounter::NUM_NONE ) { element = doc.createElement( "COUNTER" ); - parentElem.appendChild( element ); - if (layout.counter ) - layout.counter->save( element ); + tqparentElem.appendChild( element ); + if (tqlayout.counter ) + tqlayout.counter->save( element ); } - KoTabulatorList tabList = layout.tabList(); + KoTabulatorList tabList = tqlayout.tabList(); KoTabulatorList::ConstIterator it = tabList.begin(); for ( ; it != tabList.end() ; it++ ) { element = doc.createElement( "TABULATOR" ); - parentElem.appendChild( element ); + tqparentElem.appendChild( element ); element.setAttribute( "type", (*it).type ); element.setAttribute( "ptpos", (*it).ptPos ); element.setAttribute( "filling", (*it).filling ); @@ -1258,10 +1258,10 @@ void KPrTextObject::saveParagLayout( const KoParagLayout& layout, QDomElement & void KPrTextObject::recalcPageNum( KPrPage *page ) { - int pgnum=m_doc->pageList().findRef(page); + int pgnum=m_doc->pageList().tqfindRef(page); pgnum+=1; - QPtrListIterator<KoTextCustomItem> cit( textDocument()->allCustomItems() ); + TQPtrListIterator<KoTextCustomItem> cit( textDocument()->allCustomItems() ); for ( ; cit.current() ; ++cit ) { KPrPgNumVariable * var = dynamic_cast<KPrPgNumVariable *>( cit.current() ); @@ -1275,11 +1275,11 @@ void KPrTextObject::recalcPageNum( KPrPage *page ) var->setSectionTitle( page->pageTitle() ); break; case KPrPgNumVariable::VST_PGNUM_PREVIOUS: - var->setPgNum( QMAX( pgnum -1 , 0) + + var->setPgNum( TQMAX( pgnum -1 , 0) + kPresenterDocument()->getVariableCollection()->variableSetting()->startingPageNumber()); break; case KPrPgNumVariable::VST_PGNUM_NEXT: - var->setPgNum( QMIN( (int)m_doc->getPageNums(), pgnum+1 ) + + var->setPgNum( TQMIN( (int)m_doc->getPageNums(), pgnum+1 ) + kPresenterDocument()->getVariableCollection()->variableSetting()->startingPageNumber()); break; default: @@ -1287,29 +1287,29 @@ void KPrTextObject::recalcPageNum( KPrPage *page ) } var->resize(); - var->paragraph()->invalidate( 0 ); // size may have changed -> need reformatting ! + var->paragraph()->tqinvalidate( 0 ); // size may have changed -> need reformatting ! var->paragraph()->setChanged( true ); } } } -void KPrTextObject::layout() +void KPrTextObject::tqlayout() { - invalidate(); - // Get the thing going though, repainting doesn't call formatMore + tqinvalidate(); + // Get the thing going though, tqrepainting doesn't call formatMore m_textobj->formatMore( 2 ); } -void KPrTextObject::invalidate() +void KPrTextObject::tqinvalidate() { - //kdDebug(33001) << "KWTextFrameSet::invalidate " << getName() << endl; + //kdDebug(33001) << "KWTextFrameSet::tqinvalidate " << getName() << endl; m_textobj->setLastFormattedParag( textDocument()->firstParag() ); textDocument()->formatter()->setViewFormattingChars( m_doc->viewFormattingChars() ); - textDocument()->invalidate(); // lazy layout, real update follows upon next repaint + textDocument()->tqinvalidate(); // lazy tqlayout, real update follows upon next tqrepaint } // For the "paragraph after paragraph" effect -void KPrTextObject::drawParags( QPainter *painter, KoTextZoomHandler* zoomHandler, const QColorGroup& cg, int from, int to ) +void KPrTextObject::drawParags( TQPainter *painter, KoTextZoomHandler* zoomHandler, const TQColorGroup& cg, int from, int to ) { // The fast and difficult way would be to call drawParagWYSIWYG // only on the paragraphs to be drawn. Then we have duplicate quite some code @@ -1322,15 +1322,15 @@ void KPrTextObject::drawParags( QPainter *painter, KoTextZoomHandler* zoomHandle if( m_doc->firstView() && m_doc->firstView()->getCanvas()) editMode = m_doc->firstView()->getCanvas()->getEditMode(); - QRect r = zoomHandler->zoomRect( KoRect( 0, 0, innerWidth(), innerHeight() ) ); + TQRect r = zoomHandler->zoomRect( KoRect( 0, 0, innerWidth(), innerHeight() ) ); KoTextParag *parag = textDocument()->firstParag(); while ( parag ) { if ( !parag->isValid() ) parag->format(); if ( i == from ) - r.setTop( m_doc->zoomHandler()->layoutUnitToPixelY( parag->rect().top() ) ); + r.setTop( m_doc->zoomHandler()->tqlayoutUnitToPixelY( parag->rect().top() ) ); if ( i == to ) { - r.setBottom( m_doc->zoomHandler()->layoutUnitToPixelY( parag->rect().bottom() ) ); + r.setBottom( m_doc->zoomHandler()->tqlayoutUnitToPixelY( parag->rect().bottom() ) ); break; } ++i; @@ -1347,41 +1347,41 @@ void KPrTextObject::drawParags( QPainter *painter, KoTextZoomHandler* zoomHandle true /*resetChanged*/, drawingFlags ); } -void KPrTextObject::drawCursor( QPainter *p, KoTextCursor *cursor, bool cursorVisible, KPrCanvas* canvas ) +void KPrTextObject::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursorVisible, KPrCanvas* canvas ) { // The implementation is very related to KWord's KWTextFrameSet::drawCursor KoTextZoomHandler *zh = m_doc->zoomHandler(); - QPoint origPix = zh->zoomPoint( orig+KoPoint(bLeft(), bTop()+alignVertical) ); + TQPoint origPix = zh->zoomPoint( orig+KoPoint(bLeft(), bTop()+alignVertical) ); // Painter is already translated for diffx/diffy, but not for the object yet p->translate( origPix.x(), origPix.y() ); if ( angle != 0 ) rotateObject( p, zh ); KoTextParag* parag = cursor->parag(); - QPoint topLeft = parag->rect().topLeft(); // in QRT coords + TQPoint topLeft = parag->rect().topLeft(); // in TQRT coords int lineY; // Cursor height, in pixels - int cursorHeight = zh->layoutUnitToPixelY( topLeft.y(), parag->lineHeightOfChar( cursor->index(), 0, &lineY ) ); - QPoint iPoint( topLeft.x() + cursor->x(), + int cursorHeight = zh->tqlayoutUnitToPixelY( topLeft.y(), parag->lineHeightOfChar( cursor->index(), 0, &lineY ) ); + TQPoint iPoint( topLeft.x() + cursor->x(), topLeft.y() + lineY ); // from now on, iPoint will be in pixels - iPoint = zh->layoutUnitToPixel( iPoint ); + iPoint = zh->tqlayoutUnitToPixel( iPoint ); - QPoint vPoint = iPoint; // vPoint and iPoint are the same currently + TQPoint vPoint = iPoint; // vPoint and iPoint are the same currently // do not simplify this, will be useful with viewmodes. //int xadj = parag->at( cursor->index() )->pixelxadj; //iPoint.rx() += xadj; //vPoint.rx() += xadj; // very small clipping around the cursor - QRect clip( vPoint.x() - 5, vPoint.y() , 10, cursorHeight ); + TQRect clip( vPoint.x() - 5, vPoint.y() , 10, cursorHeight ); setupClipRegion( p, clip ); // for debug only! - //p->fillRect( clip, Qt::blue ); + //p->fillRect( clip, TQt::blue ); - QPixmap *pix = 0; - QColorGroup cg = QApplication::palette().active(); - cg.setColor( QColorGroup::Base, m_doc->txtBackCol() ); + TQPixmap *pix = 0; + TQColorGroup cg = TQApplication::tqpalette().active(); + cg.setColor( TQColorGroup::Base, m_doc->txtBackCol() ); uint drawingFlags = KoTextDocument::DrawSelections; if ( m_doc->backgroundSpellCheckEnabled() ) @@ -1400,7 +1400,7 @@ void KPrTextObject::drawCursor( QPainter *p, KoTextCursor *cursor, bool cursorVi textDocument()->drawParagWYSIWYG( p, parag, - QMAX(0, iPoint.x() - 5), // negative values create problems + TQMAX(0, iPoint.x() - 5), // negative values create problems iPoint.y(), clip.width(), clip.height(), pix, cg, m_doc->zoomHandler(), cursorVisible, cursor, FALSE /*resetChanged*/, drawingFlags ); @@ -1411,8 +1411,8 @@ void KPrTextObject::drawCursor( QPainter *p, KoTextCursor *cursor, bool cursorVi cursor->parag()->setChanged( false ); // XIM Position - QPoint ximPoint = vPoint; - QFont f = parag->at( cursor->index() )->format()->font(); + TQPoint ximPoint = vPoint; + TQFont f = parag->at( cursor->index() )->format()->font(); canvas->setXimPosition( ximPoint.x() + origPix.x(), ximPoint.y() + origPix.y(), 0, cursorHeight - parag->lineSpacing( line ), &f ); } @@ -1441,7 +1441,7 @@ void KPrTextObject::slotAvailableHeightNeeded() void KPrTextObject::slotRepaintChanged() { - emit repaintChanged( this ); + emit tqrepaintChanged( this ); } KPrTextView * KPrTextObject::createKPTextView( KPrCanvas * _canvas, bool temp ) @@ -1451,13 +1451,13 @@ KPrTextView * KPrTextObject::createKPTextView( KPrCanvas * _canvas, bool temp ) void KPrTextObject::removeHighlight () { - m_textobj->removeHighlight( true /*repaint*/ ); + m_textobj->removeHighlight( true /*tqrepaint*/ ); } -void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas* canvas, bool repaint, KDialogBase* dialog ) +void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas* canvas, bool tqrepaint, KDialogBase* dialog ) { - m_textobj->highlightPortion( parag, index, length, repaint ); - if ( repaint ) + m_textobj->highlightPortion( parag, index, length, tqrepaint ); + if ( tqrepaint ) { KPrDocument* doc = canvas->getView()->kPresenterDoc(); @@ -1472,7 +1472,7 @@ void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length // ** slow method ** KPrPage* page = doc->findPage( this ); if ( page ) { - int pageNum = doc->pageList().findRef( page ); + int pageNum = doc->pageList().tqfindRef( page ); // if the pageNum is -1 the object is located on the master slide if ( pageNum > -1 ) { @@ -1482,8 +1482,8 @@ void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length kdWarning(33001) << "object " << this << " not found in any page!?" << endl; } // Now ensure text is fully visible - QRect rect = m_doc->zoomHandler()->zoomRect( getRect() ); - QRect expose = m_doc->zoomHandler()->layoutUnitToPixel( parag->rect() ); + TQRect rect = m_doc->zoomHandler()->zoomRect( getRect() ); + TQRect expose = m_doc->zoomHandler()->tqlayoutUnitToPixel( parag->rect() ); expose.moveBy( rect.x(), rect.y() ); canvas->ensureVisible( (expose.left()+expose.right()) / 2, // point = center of the rect (expose.top()+expose.bottom()) / 2, @@ -1491,7 +1491,7 @@ void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length (expose.bottom()-expose.top()) / 2); #if KDE_IS_VERSION(3,1,90) if ( dialog ) { - QRect globalRect( expose ); + TQRect globalRect( expose ); globalRect.moveTopLeft( canvas->mapToGlobal( globalRect.topLeft() ) ); KDialog::avoidArea( dialog, globalRect ); } @@ -1499,7 +1499,7 @@ void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length } } -KCommand * KPrTextObject::pasteOasis( KoTextCursor * cursor, const QByteArray & data, bool removeSelected ) +KCommand * KPrTextObject::pasteOasis( KoTextCursor * cursor, const TQByteArray & data, bool removeSelected ) { //kdDebug(33001) << "KPrTextObject::pasteOasis" << endl; KMacroCommand * macroCmd = new KMacroCommand( i18n("Paste Text") ); @@ -1514,11 +1514,11 @@ KCommand * KPrTextObject::pasteOasis( KoTextCursor * cursor, const QByteArray & KPrOasisPasteTextCommand * cmd = new KPrOasisPasteTextCommand( textDocument(), cursor->parag()->paragId(), cursor->index(), data ); textDocument()->addCommand( cmd ); - macroCmd->addCommand( new KoTextCommand( m_textobj, /*cmd, */QString::null ) ); + macroCmd->addCommand( new KoTextCommand( m_textobj, /*cmd, */TQString() ) ); *cursor = *( cmd->execute( cursor ) ); m_textobj->formatMore( 2 ); - emit repaintChanged( this ); + emit tqrepaintChanged( this ); m_textobj->emitEnsureCursorVisible(); m_textobj->emitUpdateUI( true ); m_textobj->emitShowCursor(); @@ -1527,7 +1527,7 @@ KCommand * KPrTextObject::pasteOasis( KoTextCursor * cursor, const QByteArray & } -void KPrTextObject::setShadowParameter(int _distance,ShadowDirection _direction,const QColor &_color) +void KPrTextObject::setShadowParameter(int _distance,ShadowDirection _direction,const TQColor &_color) { int sx = 0; int sy = 0; @@ -1578,11 +1578,11 @@ void KPrTextObject::applyStyleChange( KoStyleChangeDefMap changed ) void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted, bool* abort) { recalcVerticalAlignment(); - int availHeight = availableHeight() - m_doc->zoomHandler()->ptToLayoutUnitPixY(alignmentValue()); + int availHeight = availableHeight() - m_doc->zoomHandler()->ptToLayoutUnitPixY(tqalignmentValue()); if ( ( bottom > availHeight ) || // this parag is already below the avail height ( lastFormatted && (bottom + lastFormatted->rect().height() > availHeight) ) ) // or next parag will be below it { - int difference = ( bottom + 2 ) - availHeight; // in layout unit pixels + int difference = ( bottom + 2 ) - availHeight; // in tqlayout unit pixels if( lastFormatted && bottom + lastFormatted->rect().height() > availHeight ) { difference += lastFormatted->rect().height(); @@ -1601,22 +1601,22 @@ void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted, // We only auto-grow. We don't auto-shrink. if(difference > 0 && !isProtect()) { - double wantedPosition = m_doc->zoomHandler()->layoutUnitPtToPt( m_doc->zoomHandler()->pixelYToPt( difference ) ) + double wantedPosition = m_doc->zoomHandler()->tqlayoutUnitPtToPt( m_doc->zoomHandler()->pixelYToPt( difference ) ) + getRect().bottom(); const KoPageLayout& p = m_doc->pageLayout(); double pageBottom = p.ptHeight - p.ptBottom; - double newBottom = QMIN( wantedPosition, pageBottom ); // don't grow bigger than the page - newBottom = QMAX( newBottom, getOrig().y() ); // avoid negative heights + double newBottom = TQMIN( wantedPosition, pageBottom ); // don't grow bigger than the page + newBottom = TQMAX( newBottom, getOrig().y() ); // avoid negative heights //kdDebug(33001) << k_funcinfo << " current bottom=" << getRect().bottom() << " newBottom=" << newBottom << endl; if ( getRect().bottom() != newBottom ) { // We resize the text object, but skipping the KPrTextObject::setSize code - // (which invalidates everything etc.) + // (which tqinvalidates everything etc.) KPrObject::setSize( getSize().width(), newBottom - getOrig().y() ); // Do recalculate the new available height though slotAvailableHeightNeeded(); m_doc->updateRuler(); - m_doc->repaint( true ); + m_doc->tqrepaint( true ); *abort = false; } } @@ -1652,7 +1652,7 @@ KCommand * KPrTextObject::textContentsToHeight() } } - double textHeight = m_doc->zoomHandler()->layoutUnitPtToPt( textHeightLU ); + double textHeight = m_doc->zoomHandler()->tqlayoutUnitPtToPt( textHeightLU ); double lineSpacing = ( innerHeight() - textHeight ) / numLines; // this gives the linespacing diff to apply, in pt //kdDebug(33001) << k_funcinfo << "lineSpacing=" << lineSpacing << endl; @@ -1681,18 +1681,18 @@ KCommand * KPrTextObject::textObjectToContents() KoTextParag * parag = textDocument()->firstParag(); double txtWidth = 10; for ( ; parag ; parag = parag->next() ) - txtWidth = QMAX( txtWidth, m_doc->zoomHandler()->layoutUnitPtToPt( parag->widthUsed() )); + txtWidth = TQMAX( txtWidth, m_doc->zoomHandler()->tqlayoutUnitPtToPt( parag->widthUsed() )); // Calculate text height int heightLU = textDocument()->height(); - double txtHeight = m_doc->zoomHandler()->layoutUnitPtToPt( heightLU ); + double txtHeight = m_doc->zoomHandler()->tqlayoutUnitPtToPt( heightLU ); // Compare with current object's size KoSize sizeDiff = KoSize( txtWidth, txtHeight ) - innerRect().size(); if( !sizeDiff.isNull() ) { // The command isn't named since it's always put into a macro command. - return new KPrResizeCmd( QString::null, KoPoint( 0, 0 ), sizeDiff, this, m_doc); + return new KPrResizeCmd( TQString(), KoPoint( 0, 0 ), sizeDiff, this, m_doc); } return 0L; } @@ -1732,7 +1732,7 @@ void KPrTextObject::setVerticalAligment( VerticalAlignmentType _type) void KPrTextObject::recalcVerticalAlignment() { - double txtHeight = m_doc->zoomHandler()->layoutUnitPtToPt( m_doc->zoomHandler()->pixelYToPt( textDocument()->height() ) ) + btop + bbottom; + double txtHeight = m_doc->zoomHandler()->tqlayoutUnitPtToPt( m_doc->zoomHandler()->pixelYToPt( textDocument()->height() ) ) + btop + bbottom; double diffy = getSize().height() - txtHeight; //kdDebug(33001) << k_funcinfo << "txtHeight: " << txtHeight << " rectHeight:" << getSize().height() << " -> diffy=" << diffy << endl; @@ -1755,17 +1755,17 @@ void KPrTextObject::recalcVerticalAlignment() } } -QPoint KPrTextObject::cursorPos(KPrCanvas *canvas, KoTextCursor *cursor) const +TQPoint KPrTextObject::cursorPos(KPrCanvas *canvas, KoTextCursor *cursor) const { KoTextZoomHandler *zh = m_doc->zoomHandler(); - QPoint origPix = zh->zoomPoint( orig+KoPoint(bLeft(), bTop()+alignVertical) ); + TQPoint origPix = zh->zoomPoint( orig+KoPoint(bLeft(), bTop()+alignVertical) ); KoTextParag* parag = cursor->parag(); - QPoint topLeft = parag->rect().topLeft(); // in QRT coords + TQPoint topLeft = parag->rect().topLeft(); // in TQRT coords int lineY = 0; // Cursor height, in pixels - //int cursorHeight = zh->layoutUnitToPixelY( topLeft.y(), parag->lineHeightOfChar( cursor->index(), 0, &lineY ) ); - QPoint iPoint( topLeft.x() + cursor->x(), topLeft.y() + lineY ); - iPoint = zh->layoutUnitToPixel( iPoint ); + //int cursorHeight = zh->tqlayoutUnitToPixelY( topLeft.y(), parag->lineHeightOfChar( cursor->index(), 0, &lineY ) ); + TQPoint iPoint( topLeft.x() + cursor->x(), topLeft.y() + lineY ); + iPoint = zh->tqlayoutUnitToPixel( iPoint ); iPoint.rx() -= canvas->diffx(); iPoint.ry() -= canvas->diffy(); return origPix+iPoint; @@ -1779,12 +1779,12 @@ KPrTextView::KPrTextView( KPrTextObject * txtObj, KPrCanvas *_canvas, bool temp m_kptextobj=txtObj; if (temp) return; - connect( txtObj->textObject(), SIGNAL( selectionChanged(bool) ), - m_canvas, SIGNAL( selectionChanged(bool) ) ); + connect( txtObj->textObject(), TQT_SIGNAL( selectionChanged(bool) ), + m_canvas, TQT_SIGNAL( selectionChanged(bool) ) ); KoTextView::setReadWrite( txtObj->kPresenterDocument()->isReadWrite() ); - connect( textView(), SIGNAL( cut() ), SLOT( cut() ) ); - connect( textView(), SIGNAL( copy() ), SLOT( copy() ) ); - connect( textView(), SIGNAL( paste() ), SLOT( paste() ) ); + connect( textView(), TQT_SIGNAL( cut() ), TQT_SLOT( cut() ) ); + connect( textView(), TQT_SIGNAL( copy() ), TQT_SLOT( copy() ) ); + connect( textView(), TQT_SIGNAL( paste() ), TQT_SLOT( paste() ) ); updateUI( true, true ); txtObj->setEditingTextObj( true ); @@ -1804,8 +1804,8 @@ KoTextViewIface* KPrTextView::dcopObject() void KPrTextView::terminate(bool removeSelection) { - disconnect( textView()->textObject(), SIGNAL( selectionChanged(bool) ), - m_canvas, SIGNAL( selectionChanged(bool) ) ); + disconnect( textView()->textObject(), TQT_SIGNAL( selectionChanged(bool) ), + m_canvas, TQT_SIGNAL( selectionChanged(bool) ) ); textView()->terminate(removeSelection); } @@ -1821,8 +1821,8 @@ void KPrTextView::copy() { //kdDebug(33001)<<"void KPrTextView::copy() "<<endl; if ( textDocument()->hasSelection( KoTextDocument::Standard ) ) { - QDragObject *drag = newDrag( 0 ); - QApplication::clipboard()->setData( drag ); + TQDragObject *drag = newDrag( 0 ); + TQApplication::tqclipboard()->setData( drag ); } } @@ -1830,15 +1830,15 @@ void KPrTextView::paste() { //kdDebug(33001) << "KPrTextView::paste()" << endl; - QMimeSource *data = QApplication::clipboard()->data(); - QCString returnedMimeType = KoTextObject::providesOasis( data ); + TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQCString returnedMimeType = KoTextObject::providesOasis( data ); if ( !returnedMimeType.isEmpty() ) { - QByteArray arr = data->encodedData( returnedMimeType ); + TQByteArray arr = data->tqencodedData( returnedMimeType ); if ( arr.size() ) { #if 0 - QFile paste( "/tmp/oasis.tmp" ); + TQFile paste( "/tmp/oasis.tmp" ); paste.open( IO_WriteOnly ); paste.writeBlock( arr ); paste.close(); @@ -1850,13 +1850,13 @@ void KPrTextView::paste() } else { - // Note: QClipboard::text() seems to do a better job than encodedData( "text/plain" ) + // Note: TQClipboard::text() seems to do a better job than tqencodedData( "text/plain" ) // In particular it handles charsets (in the mimetype). - QString text = QApplication::clipboard()->text(); + TQString text = TQApplication::tqclipboard()->text(); if ( !text.isEmpty() ) textObject()->pasteText( cursor(), text, currentFormat(), true /*removeSelected*/ ); } - kpTextObject()->layout(); + kpTextObject()->tqlayout(); } void KPrTextView::updateUI( bool updateFormat, bool force ) @@ -1864,9 +1864,9 @@ void KPrTextView::updateUI( bool updateFormat, bool force ) KoTextView::updateUI( updateFormat, force ); // Paragraph settings KoTextParag * parag = static_cast<KoTextParag*>( cursor()->parag()); - if ( m_paragLayout.alignment != parag->resolveAlignment() || force ) { - m_paragLayout.alignment = parag->resolveAlignment(); - m_canvas->getView()->alignChanged( m_paragLayout.alignment ); + if ( m_paragLayout.tqalignment != parag->resolveAlignment() || force ) { + m_paragLayout.tqalignment = parag->resolveAlignment(); + m_canvas->getView()->alignChanged( m_paragLayout.tqalignment ); } // Counter @@ -1905,17 +1905,17 @@ void KPrTextView::updateUI( bool updateFormat, bool force ) m_canvas->getView()->showStyle( m_paragLayout.style->name() ); } - if( m_paragLayout.margins[QStyleSheetItem::MarginLeft] != parag->margin(QStyleSheetItem::MarginLeft) - || m_paragLayout.margins[QStyleSheetItem::MarginFirstLine] != parag->margin(QStyleSheetItem::MarginFirstLine) - || m_paragLayout.margins[QStyleSheetItem::MarginRight] != parag->margin(QStyleSheetItem::MarginRight) + if( m_paragLayout.margins[TQStyleSheetItem::MarginLeft] != parag->margin(TQStyleSheetItem::MarginLeft) + || m_paragLayout.margins[TQStyleSheetItem::MarginFirstLine] != parag->margin(TQStyleSheetItem::MarginFirstLine) + || m_paragLayout.margins[TQStyleSheetItem::MarginRight] != parag->margin(TQStyleSheetItem::MarginRight) || force ) { - m_paragLayout.margins[QStyleSheetItem::MarginFirstLine] = parag->margin(QStyleSheetItem::MarginFirstLine); - m_paragLayout.margins[QStyleSheetItem::MarginLeft] = parag->margin(QStyleSheetItem::MarginLeft); - m_paragLayout.margins[QStyleSheetItem::MarginRight] = parag->margin(QStyleSheetItem::MarginRight); - m_canvas->getView()->showRulerIndent( m_paragLayout.margins[QStyleSheetItem::MarginLeft], - m_paragLayout.margins[QStyleSheetItem::MarginFirstLine], - m_paragLayout.margins[QStyleSheetItem::MarginRight], + m_paragLayout.margins[TQStyleSheetItem::MarginFirstLine] = parag->margin(TQStyleSheetItem::MarginFirstLine); + m_paragLayout.margins[TQStyleSheetItem::MarginLeft] = parag->margin(TQStyleSheetItem::MarginLeft); + m_paragLayout.margins[TQStyleSheetItem::MarginRight] = parag->margin(TQStyleSheetItem::MarginRight); + m_canvas->getView()->showRulerIndent( m_paragLayout.margins[TQStyleSheetItem::MarginLeft], + m_paragLayout.margins[TQStyleSheetItem::MarginFirstLine], + m_paragLayout.margins[TQStyleSheetItem::MarginRight], parag->string()->isRightToLeft() ); } @@ -1943,12 +1943,12 @@ void KPrTextView::ensureCursorVisible() int w = 1; KPrDocument *doc= m_kptextobj->kPresenterDocument(); KoPoint pt= kpTextObject()->getOrig(); - pt.setX( doc->zoomHandler()->layoutUnitPtToPt( doc->zoomHandler()->pixelXToPt( x) ) +pt.x()); - pt.setY( doc->zoomHandler()->layoutUnitPtToPt( doc->zoomHandler()->pixelYToPt( y ))+pt.y() ); + pt.setX( doc->zoomHandler()->tqlayoutUnitPtToPt( doc->zoomHandler()->pixelXToPt( x) ) +pt.x()); + pt.setY( doc->zoomHandler()->tqlayoutUnitPtToPt( doc->zoomHandler()->pixelYToPt( y ))+pt.y() ); - QPoint p = m_kptextobj->kPresenterDocument()->zoomHandler()->zoomPoint( pt ); - w = m_kptextobj->kPresenterDocument()->zoomHandler()->layoutUnitToPixelX( w ); - h = m_kptextobj->kPresenterDocument()->zoomHandler()->layoutUnitToPixelY( h ); + TQPoint p = m_kptextobj->kPresenterDocument()->zoomHandler()->zoomPoint( pt ); + w = m_kptextobj->kPresenterDocument()->zoomHandler()->tqlayoutUnitToPixelX( w ); + h = m_kptextobj->kPresenterDocument()->zoomHandler()->tqlayoutUnitToPixelY( h ); m_canvas->ensureVisible( p.x(), p.y() + h / 2, w, h / 2 + 2 ); } @@ -1973,7 +1973,7 @@ bool KPrTextView::doToolTipCompletion( KoTextCursor* cursor, KoTextParag *parag, } return false; } -void KPrTextView::showToolTipBox(KoTextParag *parag, int index, QWidget *widget, const QPoint &pos) +void KPrTextView::showToolTipBox(KoTextParag *parag, int index, TQWidget *widget, const TQPoint &pos) { if( m_kptextobj->kPresenterDocument()->allowAutoFormat() ) { @@ -1999,7 +1999,7 @@ void KPrTextView::textIncreaseIndent() bool KPrTextView::textDecreaseIndent() { - if (m_paragLayout.margins[QStyleSheetItem::MarginLeft]>0) + if (m_paragLayout.margins[TQStyleSheetItem::MarginLeft]>0) { m_canvas->setTextDepthMinus(); return true; @@ -2008,7 +2008,7 @@ bool KPrTextView::textDecreaseIndent() return false; } -void KPrTextView::doAutoFormat( KoTextCursor* cursor, KoTextParag *parag, int index, QChar ch ) +void KPrTextView::doAutoFormat( KoTextCursor* cursor, KoTextParag *parag, int index, TQChar ch ) { if( m_kptextobj->kPresenterDocument()->allowAutoFormat()) { @@ -2018,7 +2018,7 @@ void KPrTextView::doAutoFormat( KoTextCursor* cursor, KoTextParag *parag, int in } } -bool KPrTextView::doIgnoreDoubleSpace(KoTextParag * parag, int index,QChar ch ) +bool KPrTextView::doIgnoreDoubleSpace(KoTextParag * parag, int index,TQChar ch ) { if( m_kptextobj->kPresenterDocument()->allowAutoFormat()) { @@ -2034,12 +2034,12 @@ void KPrTextView::startDrag() { textView()->dragStarted(); m_canvas->dragStarted(); - QDragObject *drag = newDrag( m_canvas ); + TQDragObject *drag = newDrag( m_canvas ); if ( !kpTextObject()->kPresenterDocument()->isReadWrite() ) drag->dragCopy(); else { - if ( drag->drag() && QDragObject::target() != m_canvas ) + if ( drag->drag() && TQDragObject::target() != m_canvas ) textObject()->removeSelectedText( cursor() ); } } @@ -2070,29 +2070,29 @@ bool KPrTextView::pgDownKeyPressed() return true; } -void KPrTextView::keyPressEvent( QKeyEvent *e ) +void KPrTextView::keyPressEvent( TQKeyEvent *e ) { //Calculate position of tooltip for autocompletion - const QPoint pos = kpTextObject()->cursorPos(m_canvas, cursor()); + const TQPoint pos = kpTextObject()->cursorPos(m_canvas, cursor()); textView()->handleKeyPressEvent( e, m_canvas, pos ); } -void KPrTextView::keyReleaseEvent( QKeyEvent *e ) +void KPrTextView::keyReleaseEvent( TQKeyEvent *e ) { handleKeyReleaseEvent(e); } -void KPrTextView::imStartEvent( QIMEvent *e ) +void KPrTextView::imStartEvent( TQIMEvent *e ) { handleImStartEvent(e); } -void KPrTextView::imComposeEvent( QIMEvent *e ) +void KPrTextView::imComposeEvent( TQIMEvent *e ) { handleImComposeEvent(e); } -void KPrTextView::imEndEvent( QIMEvent *e ) +void KPrTextView::imEndEvent( TQIMEvent *e ) { handleImEndEvent(e); } @@ -2116,20 +2116,20 @@ void KPrTextView::drawCursor( bool b ) if ( !kpTextObject()->kPresenterDocument()->isReadWrite() ) return; - QPainter painter( m_canvas ); + TQPainter painter( m_canvas ); painter.translate( -m_canvas->diffx(), -m_canvas->diffy() ); painter.setBrushOrigin( -m_canvas->diffx(), -m_canvas->diffy() ); kpTextObject()->drawCursor( &painter, cursor(), b, m_canvas ); } -// Convert a mouse position into a QRT document position -QPoint KPrTextView::viewToInternal( const QPoint & pos ) const +// Convert a mouse position into a TQRT document position +TQPoint KPrTextView::viewToInternal( const TQPoint & pos ) const { #if 0 KoTextZoomHandler* zh = kpTextObject()->kPresenterDocument()->zoomHandler(); - QPoint tmp(pos); - QWMatrix m; + TQPoint tmp(pos); + TQWMatrix m; m.translate( zh->zoomItX(kpTextObject()->getSize().width() / 2.0), zh->zoomItY(kpTextObject()->getSize().height() / 2.0) ); m.rotate( kpTextObject()->getAngle() ); @@ -2167,7 +2167,7 @@ QPoint KPrTextView::viewToInternal( const QPoint & pos ) const return kpTextObject()->viewToInternal( pos, m_canvas ); } -void KPrTextView::mousePressEvent( QMouseEvent *e, const QPoint &/*_pos*/) +void KPrTextView::mousePressEvent( TQMouseEvent *e, const TQPoint &/*_pos*/) { bool addParag = handleMousePressEvent( e, viewToInternal( e->pos() ),true /*bool canStartDrag*/, kpTextObject()->kPresenterDocument()->insertDirectCursor() ); @@ -2176,12 +2176,12 @@ void KPrTextView::mousePressEvent( QMouseEvent *e, const QPoint &/*_pos*/) kpTextObject()->kPresenterDocument()->setModified( true ); } -void KPrTextView::mouseDoubleClickEvent( QMouseEvent *e, const QPoint &pos) +void KPrTextView::mouseDoubleClickEvent( TQMouseEvent *e, const TQPoint &pos) { handleMouseDoubleClickEvent( e, pos ); } -void KPrTextView::mouseMoveEvent( QMouseEvent *e, const QPoint &_pos ) +void KPrTextView::mouseMoveEvent( TQMouseEvent *e, const TQPoint &_pos ) { if ( textView()->maybeStartDrag( e ) ) return; @@ -2189,9 +2189,9 @@ void KPrTextView::mouseMoveEvent( QMouseEvent *e, const QPoint &_pos ) textView()->handleMouseMoveEvent( e,viewToInternal( e->pos() ) ); } -bool KPrTextView::isLinkVariable( const QPoint & pos ) +bool KPrTextView::isLinkVariable( const TQPoint & pos ) { - const QPoint iPoint = viewToInternal( pos ); + const TQPoint iPoint = viewToInternal( pos ); KoLinkVariable* linkVariable = dynamic_cast<KoLinkVariable *>( textObject()->variableAtPoint( iPoint ) ); return linkVariable != 0; } @@ -2206,19 +2206,19 @@ void KPrTextView::openLink() } } -void KPrTextView::mouseReleaseEvent( QMouseEvent *, const QPoint & ) +void KPrTextView::mouseReleaseEvent( TQMouseEvent *, const TQPoint & ) { handleMouseReleaseEvent(); } -void KPrTextView::showPopup( KPrView *view, const QPoint &point, QPtrList<KAction>& actionList ) +void KPrTextView::showPopup( KPrView *view, const TQPoint &point, TQPtrList<KAction>& actionList ) { - QString word = wordUnderCursor( *cursor() ); + TQString word = wordUnderCursor( *cursor() ); view->unplugActionList( "datatools" ); view->unplugActionList( "datatools_link" ); view->unplugActionList( "spell_result_action" ); view->unplugActionList( "variable_action" ); - QPtrList<KAction> &variableList = view->variableActionList(); + TQPtrList<KAction> &variableList = view->variableActionList(); variableList.clear(); actionList.clear(); @@ -2232,7 +2232,7 @@ void KPrTextView::showPopup( KPrView *view, const QPoint &point, QPtrList<KActio if( variableList.count()>0) { view->plugActionList( "variable_action", variableList ); - QPopupMenu * popup = view->popupMenu("variable_popup"); + TQPopupMenu * popup = view->popupMenu("variable_popup"); Q_ASSERT(popup); if (popup) popup->popup( point ); // using exec() here breaks the spellcheck tool (event loop pb) @@ -2244,7 +2244,7 @@ void KPrTextView::showPopup( KPrView *view, const QPoint &point, QPtrList<KActio actionList = dataToolActionList(view->kPresenterDoc()->instance(), word, singleWord); //kdDebug(33001) << "KWView::openPopupMenuInsideFrame plugging actionlist with " << actionList.count() << " actions" << endl; KoLinkVariable* linkVar = dynamic_cast<KoLinkVariable *>( var ); - QPopupMenu * popup; + TQPopupMenu * popup; if ( !linkVar ) { view->plugActionList( "datatools", actionList ); @@ -2259,7 +2259,7 @@ void KPrTextView::showPopup( KPrView *view, const QPoint &point, QPtrList<KActio { if ( singleWord ) { - QPtrList<KAction> actionCheckSpellList =view->listOfResultOfCheckWord( word ); + TQPtrList<KAction> actionCheckSpellList =view->listOfResultOfCheckWord( word ); if ( actionCheckSpellList.count()>0) { view->plugActionList( "spell_result_action", actionCheckSpellList ); @@ -2283,7 +2283,7 @@ void KPrTextView::showPopup( KPrView *view, const QPoint &point, QPtrList<KActio } } -void KPrTextView::insertCustomVariable( const QString &name) +void KPrTextView::insertCustomVariable( const TQString &name) { KPrDocument * doc = kpTextObject()->kPresenterDocument(); KoVariable * var = new KoCustomVariable( textDocument(), name, doc->variableFormatCollection()->format( "STRING" ), @@ -2291,7 +2291,7 @@ void KPrTextView::insertCustomVariable( const QString &name) insertVariable( var ); } -void KPrTextView::insertLink(const QString &_linkName, const QString & hrefName) +void KPrTextView::insertLink(const TQString &_linkName, const TQString & hrefName) { KPrDocument * doc = kpTextObject()->kPresenterDocument(); KoVariable * var = new KoLinkVariable( textDocument(), _linkName, hrefName, @@ -2300,7 +2300,7 @@ void KPrTextView::insertLink(const QString &_linkName, const QString & hrefName) insertVariable( var ); } -void KPrTextView::insertComment(const QString &_comment) +void KPrTextView::insertComment(const TQString &_comment) { KPrDocument * doc = kpTextObject()->kPresenterDocument(); @@ -2318,7 +2318,7 @@ void KPrTextView::insertVariable( int type, int subtype ) if ( type == VT_CUSTOM ) { KoCustomVarDialog dia( m_canvas ); - if ( dia.exec() == QDialog::Accepted ) + if ( dia.exec() == TQDialog::Accepted ) { KoCustomVariable *v = new KoCustomVariable( textDocument(), dia.name(), doc->variableFormatCollection()->format( "STRING" ), @@ -2356,20 +2356,20 @@ void KPrTextView::insertVariable( KoVariable *var, KoTextFormat *format, bool re customItemsMap ); if ( refreshCustomMenu && var->type() == VT_CUSTOM ) kpTextObject()->kPresenterDocument()->refreshMenuCustomVariable(); - kpTextObject()->kPresenterDocument()->repaint( kpTextObject() ); + kpTextObject()->kPresenterDocument()->tqrepaint( kpTextObject() ); } } -bool KPrTextView::canDecode( QMimeSource *e ) +bool KPrTextView::canDecode( TQMimeSource *e ) { - return kpTextObject()->kPresenterDocument()->isReadWrite() && ( KoTextObject::providesOasis( e ) || QTextDrag::canDecode( e ) ); + return kpTextObject()->kPresenterDocument()->isReadWrite() && ( !KoTextObject::providesOasis( e ).isNull() || TQTextDrag::canDecode( e ) ); } -QDragObject * KPrTextView::newDrag( QWidget * parent ) +TQDragObject * KPrTextView::newDrag( TQWidget * tqparent ) { - QBuffer buffer; - const QCString mimeType = "application/vnd.oasis.opendocument.text"; - KoStore * store = KoStore::createStore( &buffer, KoStore::Write, mimeType ); + TQBuffer buffer; + const TQCString mimeType = "application/vnd.oasis.opendocument.text"; + KoStore * store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Write, mimeType ); Q_ASSERT( store ); Q_ASSERT( !store->bad() ); @@ -2379,7 +2379,7 @@ QDragObject * KPrTextView::newDrag( QWidget * parent ) KPrDocument * doc = kpTextObject()->kPresenterDocument(); - doc->getVariableCollection()->variableSetting()->setModificationDate( QDateTime::currentDateTime() ); + doc->getVariableCollection()->variableSetting()->setModificationDate( TQDateTime::tqcurrentDateTime() ); doc->recalcVariables( VT_DATE ); doc->recalcVariables( VT_TIME ); doc->recalcVariables( VT_STATISTIC ); @@ -2393,7 +2393,7 @@ QDragObject * KPrTextView::newDrag( QWidget * parent ) bodyWriter->startElement( "office:body" ); bodyWriter->startElement( "office:text" ); - const QString plainText = textDocument()->copySelection( *bodyWriter, savingContext, KoTextDocument::Standard ); + const TQString plainText = textDocument()->copySelection( *bodyWriter, savingContext, KoTextDocument::Standard ); bodyWriter->endElement(); // office:text bodyWriter->endElement(); // office:body @@ -2415,9 +2415,9 @@ QDragObject * KPrTextView::newDrag( QWidget * parent ) delete store; - KMultipleDrag* multiDrag = new KMultipleDrag( parent ); + KMultipleDrag* multiDrag = new KMultipleDrag( tqparent ); if ( !plainText.isEmpty() ) - multiDrag->addDragObject( new QTextDrag( plainText, 0 ) ); + multiDrag->addDragObject( new TQTextDrag( plainText, 0 ) ); KoStoreDrag* storeDrag = new KoStoreDrag( mimeType, 0 ); kdDebug() << k_funcinfo << "setting zip data: " << buffer.buffer().size() << " bytes." << endl; storeDrag->setEncodedData( buffer.buffer() ); @@ -2425,7 +2425,7 @@ QDragObject * KPrTextView::newDrag( QWidget * parent ) return multiDrag; } -void KPrTextView::dragEnterEvent( QDragEnterEvent *e ) +void KPrTextView::dragEnterEvent( TQDragEnterEvent *e ) { if ( !canDecode( e ) ) { @@ -2435,14 +2435,14 @@ void KPrTextView::dragEnterEvent( QDragEnterEvent *e ) e->acceptAction(); } -void KPrTextView::dragMoveEvent( QDragMoveEvent *e, const QPoint & ) +void KPrTextView::dragMoveEvent( TQDragMoveEvent *e, const TQPoint & ) { if ( !canDecode( e ) ) { e->ignore(); return; } - QPoint iPoint = viewToInternal( e->pos() ); + TQPoint iPoint = viewToInternal( e->pos() ); textObject()->emitHideCursor(); placeCursor( iPoint ); @@ -2450,29 +2450,29 @@ void KPrTextView::dragMoveEvent( QDragMoveEvent *e, const QPoint & ) e->acceptAction(); // here or out of the if ? } -void KPrTextView::dropEvent( QDropEvent * e ) +void KPrTextView::dropEvent( TQDropEvent * e ) { if ( canDecode( e ) ) { KPrDocument *doc = kpTextObject()->kPresenterDocument(); e->acceptAction(); KoTextCursor dropCursor( textDocument() ); - QPoint dropPoint = viewToInternal( e->pos() ); + TQPoint dropPoint = viewToInternal( e->pos() ); KMacroCommand *macroCmd=new KMacroCommand(i18n("Paste Text")); bool addMacroCmd = false; dropCursor.place( dropPoint, textDocument()->firstParag() ); kdDebug(33001) << "KPrTextView::dropEvent dropCursor at parag=" << dropCursor.parag()->paragId() << " index=" << dropCursor.index() << endl; if ( ( e->source() == m_canvas ) && - e->action() == QDropEvent::Move && + e->action() == TQDropEvent::Move && // this is the indicator that the source and dest text objects are the same textDocument()->hasSelection( KoTextDocument::Standard ) ) { - //kdDebug(33001)<<"decodeFrameSetNumber( QMimeSource *e ) :"<<numberFrameSet<<endl; + //kdDebug(33001)<<"decodeFrameSetNumber( TQMimeSource *e ) :"<<numberFrameSet<<endl; KCommand *cmd = textView()->prepareDropMove( dropCursor ); if(cmd) { - kpTextObject()->layout(); + kpTextObject()->tqlayout(); macroCmd->addCommand(cmd); addMacroCmd = true; } @@ -2487,10 +2487,10 @@ void KPrTextView::dropEvent( QDropEvent * e ) textDocument()->removeSelection( KoTextDocument::Standard ); textObject()->selectionChangedNotify(); } - QCString returnedTypeMime = KoTextObject::providesOasis( e ); + TQCString returnedTypeMime = KoTextObject::providesOasis( e ); if ( !returnedTypeMime.isEmpty() ) { - QByteArray arr = e->encodedData( returnedTypeMime ); + TQByteArray arr = e->tqencodedData( returnedTypeMime ); if ( arr.size() ) { KCommand *cmd = kpTextObject()->pasteOasis( cursor(), arr, false ); @@ -2503,8 +2503,8 @@ void KPrTextView::dropEvent( QDropEvent * e ) } else { - QString text; - if ( QTextDrag::decode( e, text ) ) + TQString text; + if ( TQTextDrag::decode( e, text ) ) textObject()->pasteText( cursor(), text, currentFormat(), false /*do not remove selected text*/ ); } @@ -2515,26 +2515,26 @@ void KPrTextView::dropEvent( QDropEvent * e ) } } -void KPrTextObject::saveParagraph( QDomDocument& doc,KoTextParag * parag,QDomElement &parentElem, +void KPrTextObject::saveParagraph( TQDomDocument& doc,KoTextParag * parag,TQDomElement &tqparentElem, int from /* default 0 */, int to /* default length()-2 */ ) { if(!parag) return; - QDomElement paragraph=doc.createElement(tagP); + TQDomElement paragraph=doc.createElement(tagP); int tmpAlign=0; switch(parag->resolveAlignment()) { - case Qt::AlignLeft: + case TQt::AlignLeft: tmpAlign=1; break; - case Qt::AlignRight: + case TQt::AlignRight: tmpAlign=2; break; - case Qt::AlignHCenter: + case TQt::AlignHCenter: tmpAlign=4; break; - case Qt::AlignJustify: + case TQt::AlignJustify: tmpAlign=8; } if(tmpAlign!=1) @@ -2542,12 +2542,12 @@ void KPrTextObject::saveParagraph( QDomDocument& doc,KoTextParag * parag,QDomEle saveParagLayout( parag->paragLayout(), paragraph ); KoTextFormat *lastFormat = 0; - QString tmpText; + TQString tmpText; for ( int i = from; i <= to; ++i ) { KoTextStringChar &c = parag->string()->at(i); if ( c.isCustom() ) { - QDomElement variable = doc.createElement("CUSTOM"); + TQDomElement variable = doc.createElement("CUSTOM"); variable.setAttribute("pos", (i-from)); saveFormat( variable, c.format() ); paragraph.appendChild( variable ); @@ -2557,30 +2557,30 @@ void KPrTextObject::saveParagraph( QDomDocument& doc,KoTextParag * parag,QDomEle if ( lastFormat ) paragraph.appendChild(saveHelper(tmpText, lastFormat, doc)); lastFormat = static_cast<KoTextFormat*> (c.format()); - tmpText=QString::null; + tmpText=TQString(); } - tmpText+=QString(c.c); + tmpText+=TQString(c.c); } if ( lastFormat ) paragraph.appendChild(saveHelper(tmpText, lastFormat, doc)); else paragraph.appendChild(saveHelper(tmpText, parag->string()->at(0).format(), doc)); - parentElem.appendChild(paragraph); + tqparentElem.appendChild(paragraph); } KoPen KPrTextObject::defaultPen() const { - return KoPen( Qt::black, 1.0, Qt::NoPen ); + return KoPen( TQt::black, 1.0, Qt::NoPen ); } -QPoint KPrTextObject::viewToInternal( const QPoint & pos, KPrCanvas* canvas ) const +TQPoint KPrTextObject::viewToInternal( const TQPoint & pos, KPrCanvas* canvas ) const { KoTextZoomHandler* zh = kPresenterDocument()->zoomHandler(); - QPoint iPoint = pos - zh->zoomPoint( + TQPoint iPoint = pos - zh->zoomPoint( getOrig() + KoPoint( bLeft(), - bTop() + alignmentValue()) ); + bTop() + tqalignmentValue()) ); iPoint = zh->pixelToLayoutUnit( - QPoint( iPoint.x() + canvas->diffx(), iPoint.y() + canvas->diffy() ) ); + TQPoint( iPoint.x() + canvas->diffx(), iPoint.y() + canvas->diffy() ) ); return iPoint; } diff --git a/kpresenter/KPrTextObject.h b/kpresenter/KPrTextObject.h index b30754c7..a85b2e8a 100644 --- a/kpresenter/KPrTextObject.h +++ b/kpresenter/KPrTextObject.h @@ -28,12 +28,12 @@ #include <KoStyleCollection.h> // for KoStyleChangeDefMap #include <KoStyleStack.h> -class QDragObject; +class TQDragObject; class KoSavingContext; class KPrView; class KPrDocument; -class QDomElement; +class TQDomElement; class TextCmd; class KPrGradient; @@ -49,9 +49,10 @@ class DCOPObject; class KPrPage; class KoParagStyle; -class KPrTextObject : public QObject, public KPr2DObject, public KoTextFlow +class KPrTextObject : public TQObject, public KPr2DObject, public KoTextFlow { Q_OBJECT + TQ_OBJECT public: KPrTextObject( KPrDocument *doc ); virtual ~KPrTextObject(); @@ -67,7 +68,7 @@ public: virtual ObjType getType() const { return OT_TEXT; } - virtual QString getTypeString() const + virtual TQString getTypeString() const { return i18n("Text"); } virtual bool getDrawEditRect() const @@ -76,32 +77,32 @@ public: { return drawEmpty; } virtual int getSubPresSteps() const; - virtual QBrush getBrush() const; + virtual TQBrush getBrush() const; - virtual void setShadowParameter(int _distance,ShadowDirection _direction,const QColor &_color); + virtual void setShadowParameter(int _distance,ShadowDirection _direction,const TQColor &_color); - virtual QDomDocumentFragment save( QDomDocument& doc, double offset ); - virtual double load(const QDomElement &element); - virtual void loadOasis(const QDomElement &element, KoOasisContext& context, KPrLoadingInfo *info); + virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset ); + virtual double load(const TQDomElement &element); + virtual void loadOasis(const TQDomElement &element, KoOasisContext& context, KPrLoadingInfo *info); virtual void saveOasisMarginElement( KoGenStyle &styleobjectauto ) const; - virtual void paint( QPainter *_painter, KoTextZoomHandler*_zoomHandler, + virtual void paint( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, int pageNum, bool drawingShadow, bool drawContour ); - void paint( QPainter *_painter, KoTextZoomHandler*_zoomHandler, bool onlyChanged, KoTextCursor* cursor, + void paint( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged, bool drawContour ); - void paintEdited( QPainter *_painter, KoTextZoomHandler*_zoomHandler, + void paintEdited( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged ); - void drawCursor( QPainter *p, KoTextCursor *cursor, bool cursorVisible, KPrCanvas* /*canvas*/ ); + void drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursorVisible, KPrCanvas* /*canvas*/ ); void recalcPageNum( KPrPage *page ); /// Return the current text cursor position - QPoint cursorPos(KPrCanvas*, KoTextCursor *) const; + TQPoint cursorPos(KPrCanvas*, KoTextCursor *) const; /** Return the contained text object */ KoTextObject * textObject() const { return m_textobj; } - virtual void addTextObjects( QPtrList<KoTextObject> &lst ) const { + virtual void addTextObjects( TQPtrList<KoTextObject> &lst ) const { if ( !isProtectContent() ) lst.append( m_textobj ); } @@ -114,19 +115,19 @@ public: void applyStyleChange( KoStyleChangeDefMap changed ); void removeHighlight(); - void highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas *canvas, bool repaint, KDialogBase* dialog = 0 ); + void highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas *canvas, bool tqrepaint, KDialogBase* dialog = 0 ); - KCommand * pasteOasis( KoTextCursor * cursor, const QByteArray & data, bool removeSelected ); + KCommand * pasteOasis( KoTextCursor * cursor, const TQByteArray & data, bool removeSelected ); - void saveParagraph( QDomDocument& doc, + void saveParagraph( TQDomDocument& doc, KoTextParag * parag, - QDomElement &parentElem, + TQDomElement &tqparentElem, int from /* default 0 */, int to /* default length()-2 */ ); - KoParagLayout loadParagLayout( QDomElement & parentElem, KPrDocument *doc, bool useRefStyle); + KoParagLayout loadParagLayout( TQDomElement & tqparentElem, KPrDocument *doc, bool useRefStyle); - static KoTextFormat loadFormat( QDomElement &n, KoTextFormat * refFormat, const QFont & defaultFont, - const QString & defaultLanguage, bool hyphen ); + static KoTextFormat loadFormat( TQDomElement &n, KoTextFormat * refFormat, const TQFont & defaultFont, + const TQString & defaultLanguage, bool hyphen ); void setEditingTextObj( bool _edit ) { editingTextObj = _edit; } @@ -134,9 +135,9 @@ public: KCommand *textObjectToContents(); void setProtectContent ( bool _protect ) { textObject()->setProtectContent(_protect);} bool isProtectContent() const { return textObject()->protectContent();} - void loadVariable( QValueList<QDomElement> & listVariable,KoTextParag *lastParag, int offset=0 ); + void loadVariable( TQValueList<TQDomElement> & listVariable,KoTextParag *lastParag, int offset=0 ); - void layout(); + void tqlayout(); /** Reimplemented from KoTextFlow */ int availableHeight() const; @@ -168,14 +169,14 @@ public: VerticalAlignmentType verticalAlignment() const { return m_textVertAlign; } void setVerticalAligment( VerticalAlignmentType _type) ; - double alignmentValue() const { return alignVertical; } + double tqalignmentValue() const { return alignVertical; } virtual KPrTextObject *nextTextObject() { return this;} - static void saveFormat( QDomElement & element, KoTextFormat*lastFormat ); + static void saveFormat( TQDomElement & element, KoTextFormat*lastFormat ); - QPoint viewToInternal( const QPoint & pos, KPrCanvas* canvas ) const; + TQPoint viewToInternal( const TQPoint & pos, KPrCanvas* canvas ) const; signals: - void repaintChanged( KPrTextObject* ); + void tqrepaintChanged( KPrTextObject* ); protected slots: void slotFormatChanged(const KoTextFormat &); @@ -185,16 +186,16 @@ protected: virtual const char * getOasisElementName() const; virtual bool saveOasisObjectAttributes( KPOasisSaveContext &sc ) const; - virtual QDomElement saveKTextObject( QDomDocument& doc ); - QDomElement saveHelper(const QString &tmpText,KoTextFormat*lastFormat ,QDomDocument &doc); + virtual TQDomElement saveKTextObject( TQDomDocument& doc ); + TQDomElement saveHelper(const TQString &tmpText,KoTextFormat*lastFormat ,TQDomDocument &doc); virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const; - virtual void loadKTextObject( const QDomElement &e ); - void drawText( QPainter* _painter, KoTextZoomHandler* zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged ); - void drawParags( QPainter *p, KoTextZoomHandler* zoomHandler, const QColorGroup& cg, int from, int to ); - void saveParagLayout( const KoParagLayout& layout, QDomElement & parentElem ); - void invalidate(); + virtual void loadKTextObject( const TQDomElement &e ); + void drawText( TQPainter* _painter, KoTextZoomHandler* zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged ); + void drawParags( TQPainter *p, KoTextZoomHandler* zoomHandler, const TQColorGroup& cg, int from, int to ); + void saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & tqparentElem ); + void tqinvalidate(); void recalcVerticalAlignment(); virtual KoPen defaultPen() const; protected slots: @@ -204,7 +205,7 @@ protected slots: private: KPrTextObject &operator=( const KPrTextObject & ); void shadowCompatibility(); - static const QString &tagTEXTOBJ, &attrLineSpacing, &attrParagSpacing, + static const TQString &tagTEXTOBJ, &attrLineSpacing, &attrParagSpacing, &attrMargin, &attrBulletType1, &attrBulletType2, &attrBulletType3, &attrBulletType4, &attrBulletColor1, &attrBulletColor2, &attrBulletColor3, &attrBulletColor4, @@ -229,6 +230,7 @@ private: class KPrTextView : public KoTextView { Q_OBJECT + TQ_OBJECT public: KPrTextView( KPrTextObject * txtObj, KPrCanvas *_canvas, bool temp=false ); virtual ~KPrTextView(); @@ -238,41 +240,41 @@ public: KoTextView * textView() { return this; } KPrTextObject * kpTextObject() const { return m_kptextobj; } - void keyPressEvent( QKeyEvent * ); - void keyReleaseEvent( QKeyEvent * ); - void imStartEvent( QIMEvent * ); - void imComposeEvent( QIMEvent * ); - void imEndEvent( QIMEvent * ); - void mousePressEvent( QMouseEvent *, const QPoint &); - void mouseMoveEvent( QMouseEvent *, const QPoint & ); - void mouseReleaseEvent( QMouseEvent *, const QPoint & ); - void mouseDoubleClickEvent( QMouseEvent *, const QPoint &); - void dragEnterEvent( QDragEnterEvent * ); - void dragMoveEvent( QDragMoveEvent *, const QPoint & ); - void dropEvent( QDropEvent * ); + void keyPressEvent( TQKeyEvent * ); + void keyReleaseEvent( TQKeyEvent * ); + void imStartEvent( TQIMEvent * ); + void imComposeEvent( TQIMEvent * ); + void imEndEvent( TQIMEvent * ); + void mousePressEvent( TQMouseEvent *, const TQPoint &); + void mouseMoveEvent( TQMouseEvent *, const TQPoint & ); + void mouseReleaseEvent( TQMouseEvent *, const TQPoint & ); + void mouseDoubleClickEvent( TQMouseEvent *, const TQPoint &); + void dragEnterEvent( TQDragEnterEvent * ); + void dragMoveEvent( TQDragMoveEvent *, const TQPoint & ); + void dropEvent( TQDropEvent * ); void clearSelection(); void selectAll(bool select = true); virtual void drawCursor( bool b ); const KoParagLayout & currentParagLayout() const { return m_paragLayout; } - void showPopup( KPrView *view, const QPoint &point, QPtrList<KAction> &actionList ); + void showPopup( KPrView *view, const TQPoint &point, TQPtrList<KAction> &actionList ); void insertVariable( int type, int subtype = 0 ); - void insertCustomVariable( const QString &name); - void insertLink(const QString &_linkName, const QString & hrefName); + void insertCustomVariable( const TQString &name); + void insertLink(const TQString &_linkName, const TQString & hrefName); void insertVariable( KoVariable *var, KoTextFormat *format =0, bool refreshCustomMenu =false /*don't refresh variable custom menu all the time */); void terminate(bool removeSelection=true); - void insertComment(const QString &_note); + void insertComment(const TQString &_note); /** return true if some text is selected */ bool hasSelection() const; virtual void removeToolTipCompletion(); - bool isLinkVariable(const QPoint &); + bool isLinkVariable(const TQPoint &); void openLink(); - QPoint viewToInternal( const QPoint & pos ) const; + TQPoint viewToInternal( const TQPoint & pos ) const; public slots: void cut(); @@ -287,14 +289,14 @@ protected slots: virtual void startDrag(); protected: - bool canDecode( QMimeSource *e ); - QDragObject * newDrag( QWidget * parent ); + bool canDecode( TQMimeSource *e ); + TQDragObject * newDrag( TQWidget * tqparent ); // Reimplemented from KoTextView - virtual void doAutoFormat( KoTextCursor* cursor, KoTextParag *parag, int index, QChar ch ); - virtual bool doIgnoreDoubleSpace(KoTextParag * parag, int index,QChar ch ); + virtual void doAutoFormat( KoTextCursor* cursor, KoTextParag *parag, int index, TQChar ch ); + virtual bool doIgnoreDoubleSpace(KoTextParag * parag, int index,TQChar ch ); virtual bool doCompletion( KoTextCursor* cursor, KoTextParag *parag, int index ); virtual bool doToolTipCompletion( KoTextCursor* , KoTextParag *, int, int ); - virtual void showToolTipBox(KoTextParag *parag, int index, QWidget *widget, const QPoint &pos); + virtual void showToolTipBox(KoTextParag *parag, int index, TQWidget *widget, const TQPoint &pos); virtual void textIncreaseIndent(); virtual bool textDecreaseIndent(); virtual void showFormat( KoTextFormat *format ) ; @@ -305,7 +307,7 @@ protected: KPrTextObject *m_kptextobj; KPrCanvas *m_canvas; KoParagLayout m_paragLayout; - QPtrList<KAction> m_actionList; // for the kodatatools + TQPtrList<KAction> m_actionList; // for the kodatatools }; diff --git a/kpresenter/KPrTextObjectIface.cpp b/kpresenter/KPrTextObjectIface.cpp index 2b53aaf4..0dfc1d79 100644 --- a/kpresenter/KPrTextObjectIface.cpp +++ b/kpresenter/KPrTextObjectIface.cpp @@ -50,7 +50,7 @@ bool KPrTextObjectIface::hasSelection() const return m_textobject->textObject()->hasSelection(); } -QString KPrTextObjectIface::selectedText() const +TQString KPrTextObjectIface::selectedText() const { return m_textobject->textObject()->selectedText(); } @@ -90,7 +90,7 @@ void KPrTextObjectIface::setDoubleUnderlineText(bool b) delete cmd; } -void KPrTextObjectIface::setUnderlineColor( const QColor & color ) +void KPrTextObjectIface::setUnderlineColor( const TQColor & color ) { KCommand *cmd=m_textobject->textObject()->setUnderlineColorCommand( color ); delete cmd; @@ -102,7 +102,7 @@ void KPrTextObjectIface::setStrikeOutText( bool b ) delete cmd; } -void KPrTextObjectIface::setTextColor( const QColor &col ) +void KPrTextObjectIface::setTextColor( const TQColor &col ) { KCommand *cmd=m_textobject->textObject()->setTextColorCommand(col); delete cmd; @@ -132,7 +132,7 @@ void KPrTextObjectIface::setTextDefaultFormat() delete cmd; } -void KPrTextObjectIface::setTextBackgroundColor(const QColor & col) +void KPrTextObjectIface::setTextBackgroundColor(const TQColor & col) { KCommand *cmd=m_textobject->textObject()->setTextBackgroundColorCommand(col); delete cmd; @@ -143,27 +143,27 @@ bool KPrTextObjectIface::textDoubleUnderline()const return m_textobject->textObject()->textDoubleUnderline(); } -QColor KPrTextObjectIface::textUnderlineColor() const +TQColor KPrTextObjectIface::textUnderlineColor() const { return m_textobject->textObject()->textUnderlineColor(); } -QColor KPrTextObjectIface::textColor() const +TQColor KPrTextObjectIface::textColor() const { return m_textobject->textObject()->textColor(); } -QFont KPrTextObjectIface::textFont() const +TQFont KPrTextObjectIface::textFont() const { return m_textobject->textObject()->textFont(); } -QString KPrTextObjectIface::textFontFamily()const +TQString KPrTextObjectIface::textFontFamily()const { return m_textobject->textObject()->textFontFamily(); } -QColor KPrTextObjectIface::textBackgroundColor() const +TQColor KPrTextObjectIface::textBackgroundColor() const { return m_textobject->textObject()->textBackgroundColor(); } @@ -198,13 +198,13 @@ bool KPrTextObjectIface::textSuperScript() const return m_textobject->textObject()->textSuperScript(); } -void KPrTextObjectIface::setTextFamilyFont(const QString &font) +void KPrTextObjectIface::setTextFamilyFont(const TQString &font) { KCommand *cmd=m_textobject->textObject()->setFamilyCommand(font); delete cmd; } -void KPrTextObjectIface::changeCaseOfText( const QString & caseType) +void KPrTextObjectIface::changeCaseOfText( const TQString & caseType) { KCommand *cmd = 0L; if( caseType.lower() == "uppercase" ) @@ -218,7 +218,7 @@ void KPrTextObjectIface::changeCaseOfText( const QString & caseType) else if( caseType.lower() =="sentencecase" ) cmd = m_textobject->textObject()->setChangeCaseOfTextCommand( KoChangeCaseDia::SentenceCase ); else - kdDebug(33001)<<"Error in void KWordTextFrameSetIface::changeCaseOfText( const QString & caseType) parameter\n"; + kdDebug(33001)<<"Error in void KWordTextFrameSetIface::changeCaseOfText( const TQString & caseType) parameter\n"; delete cmd; } @@ -247,25 +247,25 @@ bool KPrTextObjectIface::isProtectContent() const void KPrTextObjectIface::setPtMarginLeft(double val) { m_textobject->setBLeft(val); - m_textobject->kPresenterDocument()->layout( m_textobject ); + m_textobject->kPresenterDocument()->tqlayout( m_textobject ); } void KPrTextObjectIface::setPtMarginRight(double val) { m_textobject->setBRight(val); - m_textobject->kPresenterDocument()->layout( m_textobject ); + m_textobject->kPresenterDocument()->tqlayout( m_textobject ); } void KPrTextObjectIface::setPtMarginTop(double val) { m_textobject->setBTop(val); - m_textobject->kPresenterDocument()->layout( m_textobject ); + m_textobject->kPresenterDocument()->tqlayout( m_textobject ); } void KPrTextObjectIface::setPtMarginBottom(double val) { m_textobject->setBBottom(val); - m_textobject->kPresenterDocument()->layout( m_textobject ); + m_textobject->kPresenterDocument()->tqlayout( m_textobject ); } double KPrTextObjectIface::ptMarginLeft()const @@ -288,7 +288,7 @@ double KPrTextObjectIface::ptMarginBottom()const return m_textobject->bBottom(); } -void KPrTextObjectIface::setVerticalAligment( const QString & type) +void KPrTextObjectIface::setVerticalAligment( const TQString & type) { if ( type.lower() =="center" ) m_textobject->setVerticalAligment( KP_CENTER ); @@ -298,23 +298,23 @@ void KPrTextObjectIface::setVerticalAligment( const QString & type) m_textobject->setVerticalAligment( KP_BOTTOM ); } -QString KPrTextObjectIface::verticalAlignment() const +TQString KPrTextObjectIface::verticalAlignment() const { switch( m_textobject->verticalAlignment() ) { case KP_CENTER: - return QString("center"); + return TQString("center"); break; case KP_TOP: - return QString("top"); + return TQString("top"); break; case KP_BOTTOM: - return QString("bottom"); + return TQString("bottom"); break; default: break; } - return QString::null; + return TQString(); } //bool KPrTextObjectIface::textShadow() const @@ -350,17 +350,17 @@ void KPrTextObjectIface::setWordByWord( bool _b ) delete cmd; } -QString KPrTextObjectIface::fontAttribute()const +TQString KPrTextObjectIface::fontAttribute()const { return KoTextFormat::attributeFontToString( m_textobject->textObject()->fontAttribute() ); } -QString KPrTextObjectIface::underlineLineStyle() const +TQString KPrTextObjectIface::underlineLineStyle() const { return KoTextFormat::underlineStyleToString( m_textobject->textObject()->underlineStyle() ); } -QString KPrTextObjectIface::strikeOutLineStyle()const +TQString KPrTextObjectIface::strikeOutLineStyle()const { return KoTextFormat::strikeOutStyleToString( m_textobject->textObject()->strikeOutStyle() ); } diff --git a/kpresenter/KPrTextObjectIface.h b/kpresenter/KPrTextObjectIface.h index 1626b3a8..77274c97 100644 --- a/kpresenter/KPrTextObjectIface.h +++ b/kpresenter/KPrTextObjectIface.h @@ -24,9 +24,9 @@ #include <KoDocumentIface.h> #include <dcopref.h> #include "KPrObject2DIface.h" -#include <qstring.h> -#include <qcolor.h> -#include <qfont.h> +#include <tqstring.h> +#include <tqcolor.h> +#include <tqfont.h> class KPrTextObject; class KPrTextObjectIface : public KPrObject2DIface @@ -38,7 +38,7 @@ public: k_dcop: DCOPRef startEditing(); bool hasSelection() const; - QString selectedText() const; + TQString selectedText() const; void selectAll( bool select ); void recalcPageNum( ); @@ -46,22 +46,22 @@ k_dcop: void setItalicText( bool b ); void setUnderlineText( bool b ); void setStrikeOutText( bool b ); - void setTextColor( const QColor &col ); + void setTextColor( const TQColor &col ); void setTextPointSize( int s ); void setTextSubScript( bool b ); void setTextSuperScript( bool b ); void setTextDefaultFormat(); - void setTextBackgroundColor(const QColor & col); - void setTextFamilyFont(const QString &font); - void changeCaseOfText( const QString & caseType); + void setTextBackgroundColor(const TQColor & col); + void setTextFamilyFont(const TQString &font); + void changeCaseOfText( const TQString & caseType); void setDoubleUnderlineText(bool on); - void setUnderlineColor( const QColor & color ); + void setUnderlineColor( const TQColor & color ); - QColor textColor() const; - QFont textFont() const; - QString textFontFamily()const; - QColor textBackgroundColor()const; - QColor textUnderlineColor() const; + TQColor textColor() const; + TQFont textFont() const; + TQString textFontFamily()const; + TQColor textBackgroundColor()const; + TQColor textUnderlineColor() const; bool textItalic() const; bool textBold() const; @@ -86,8 +86,8 @@ k_dcop: void setPtMarginTop(double val); void setPtMarginBottom(double val); - void setVerticalAligment( const QString & type); - QString verticalAlignment() const; + void setVerticalAligment( const TQString & type); + TQString verticalAlignment() const; //bool textShadow() const; //void setTextShadow( bool b ); @@ -98,9 +98,9 @@ k_dcop: bool wordByWord() const; void setWordByWord( bool _b ); - QString fontAttribute()const; - QString underlineLineStyle() const; - QString strikeOutLineStyle()const; + TQString fontAttribute()const; + TQString underlineLineStyle() const; + TQString strikeOutLineStyle()const; private: diff --git a/kpresenter/KPrTextPreview.cpp b/kpresenter/KPrTextPreview.cpp index b77e067e..27bb8b5b 100644 --- a/kpresenter/KPrTextPreview.cpp +++ b/kpresenter/KPrTextPreview.cpp @@ -2,11 +2,11 @@ #include <KoGlobal.h> -#include <qpainter.h> -#include <qfont.h> +#include <tqpainter.h> +#include <tqfont.h> -KPrTextPreview::KPrTextPreview( QWidget* parent, const char* name ) - : QFrame( parent, name ), +KPrTextPreview::KPrTextPreview( TQWidget* tqparent, const char* name ) + : TQFrame( tqparent, name ), shadowDirection( SD_LEFT_BOTTOM ), shadowDistance( 0 ), angle( 0 ) @@ -15,19 +15,19 @@ KPrTextPreview::KPrTextPreview( QWidget* parent, const char* name ) setFrameStyle( NoFrame ); } -void KPrTextPreview::drawContents( QPainter* painter ) +void KPrTextPreview::drawContents( TQPainter* painter ) { - QFont font(KoGlobal::defaultFont().family(), 30, QFont::Bold); - QFontMetrics fm( font ); + TQFont font(KoGlobal::defaultFont().family(), 30, TQFont::Bold); + TQFontMetrics fm( font ); - QRect br = fm.boundingRect( "KOffice" ); + TQRect br = fm.boundingRect( "KOffice" ); int pw = br.width(); int ph = br.height(); - QRect r = br; + TQRect r = br; int textYPos = -r.y(); int textXPos = -r.x(); - br.moveTopLeft( QPoint( -br.width() / 2, -br.height() / 2 ) ); - r.moveTopLeft( QPoint( -r.width() / 2, -r.height() / 2 ) ); + br.moveTopLeft( TQPoint( -br.width() / 2, -br.height() / 2 ) ); + r.moveTopLeft( TQPoint( -r.width() / 2, -r.height() / 2 ) ); int x = r.left() + textXPos; int y = r.top() + textYPos; @@ -81,7 +81,7 @@ void KPrTextPreview::drawContents( QPainter* painter ) painter->setViewport( ( width() - pw ) / 2, ( height() - ph ) / 2, width(), height() ); - QWMatrix m, mtx; + TQWMatrix m, mtx; mtx.rotate( angle ); m.translate( pw / 2, ph / 2 ); m = mtx * m; @@ -91,10 +91,10 @@ void KPrTextPreview::drawContents( QPainter* painter ) if ( shadowDistance > 0 ) { painter->setPen( shadowColor ); - painter->drawText( sx, sy, "KOffice" ); + painter->drawText( sx, sy, TQString("KOffice") ); } painter->setPen( blue ); - painter->drawText( x, y, "KOffice" ); + painter->drawText( x, y, TQString("KOffice") ); painter->restore(); } diff --git a/kpresenter/KPrTextPreview.h b/kpresenter/KPrTextPreview.h index e9d91616..b4914251 100644 --- a/kpresenter/KPrTextPreview.h +++ b/kpresenter/KPrTextPreview.h @@ -1,28 +1,29 @@ #ifndef __textpreview_h__ #define __textpreview_h__ -#include <qframe.h> +#include <tqframe.h> #include "global.h" -class KPrTextPreview : public QFrame +class KPrTextPreview : public TQFrame { Q_OBJECT + TQ_OBJECT public: - KPrTextPreview( QWidget* parent, const char* name = 0 ); + KPrTextPreview( TQWidget* tqparent, const char* name = 0 ); ~KPrTextPreview() {} - void setShadowDirection( ShadowDirection sd ) { shadowDirection = sd; repaint( true ); } - void setShadowDistance( int sd ) { shadowDistance = sd; repaint( true ); } - void setShadowColor( const QColor &sc ) { shadowColor = sc; repaint( true ); } - void setAngle( double a ) { angle = a; repaint( true ); } + void setShadowDirection( ShadowDirection sd ) { shadowDirection = sd; tqrepaint( true ); } + void setShadowDistance( int sd ) { shadowDistance = sd; tqrepaint( true ); } + void setShadowColor( const TQColor &sc ) { shadowColor = sc; tqrepaint( true ); } + void setAngle( double a ) { angle = a; tqrepaint( true ); } protected: - void drawContents( QPainter* ); + void drawContents( TQPainter* ); ShadowDirection shadowDirection; int shadowDistance; - QColor shadowColor; + TQColor shadowColor; double angle; }; diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp index 1f610538..850c89b4 100644 --- a/kpresenter/KPrTextProperty.cpp +++ b/kpresenter/KPrTextProperty.cpp @@ -22,8 +22,8 @@ #include "KPrTextProperty.h" -#include <qcheckbox.h> -#include <qlayout.h> +#include <tqcheckbox.h> +#include <tqlayout.h> #include <klocale.h> #include <kdebug.h> @@ -31,21 +31,21 @@ #include "KPrMarginWidget.h" -KPrTextProperty::KPrTextProperty( QWidget *parent, const char *name, const MarginsStruct &marginsStruct, +KPrTextProperty::KPrTextProperty( TQWidget *tqparent, const char *name, const MarginsStruct &marginsStruct, const KoUnit::Unit unit, PropValue protectContent ) -: QWidget( parent, name ) +: TQWidget( tqparent, name ) , m_unit( unit ) , m_protectContent( protectContent ) { - QGridLayout *layout = new QGridLayout( this, 1, 1, 11, 6 ); + TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, 11, 6 ); - layout->addWidget( m_protectContentCheck = new QCheckBox( i18n( "Protect content" ), this ), 0, 0 ); - layout->addWidget( m_margins = new KPrMarginWidget( this, name, m_unit ), 1, 0 ); + tqlayout->addWidget( m_protectContentCheck = new TQCheckBox( i18n( "Protect content" ), this ), 0, 0 ); + tqlayout->addWidget( m_margins = new KPrMarginWidget( this, name, m_unit ), 1, 0 ); - connect( m_protectContentCheck, SIGNAL( toggled ( bool ) ), - this, SLOT( slotProtectContentChanged( bool ) ) ); + connect( m_protectContentCheck, TQT_SIGNAL( toggled ( bool ) ), + this, TQT_SLOT( slotProtectContentChanged( bool ) ) ); - resize( QSize( 301, 217 ).expandedTo( minimumSizeHint() ) ); + resize( TQSize( 301, 217 ).expandedTo( tqminimumSizeHint() ) ); m_margins->setValues( marginsStruct.leftMargin, marginsStruct.rightMargin, marginsStruct.topMargin, marginsStruct.bottomMargin ); @@ -63,7 +63,7 @@ int KPrTextProperty::getTextPropertyChange() const { int flags = 0; - if ( m_protectContentCheck->state() != QButton::NoChange ) + if ( m_protectContentCheck->state() != TQButton::NoChange ) { if ( ( m_protectContentCheck->isOn() ? STATE_ON : STATE_OFF ) != m_protectContent ) { diff --git a/kpresenter/KPrTextProperty.h b/kpresenter/KPrTextProperty.h index 5e7e5cbe..ec19483f 100644 --- a/kpresenter/KPrTextProperty.h +++ b/kpresenter/KPrTextProperty.h @@ -23,18 +23,19 @@ #ifndef TEXTPROPERTY_H #define TEXTPROPERTY_H -#include <qwidget.h> +#include <tqwidget.h> #include <KoUnit.h> #include "KPrCommand.h" class KPrMarginWidget; -class QCheckBox; +class TQCheckBox; -class KPrTextProperty : public QWidget +class KPrTextProperty : public TQWidget { Q_OBJECT + TQ_OBJECT public: enum TextValueChange { @@ -42,7 +43,7 @@ public: Margins = 2 }; - KPrTextProperty( QWidget *parent, const char *name, const MarginsStruct &marginsStruct, + KPrTextProperty( TQWidget *tqparent, const char *name, const MarginsStruct &marginsStruct, const KoUnit::Unit unit, PropValue protectContent ); ~KPrTextProperty(); @@ -54,7 +55,7 @@ public: private: KPrMarginWidget *m_margins; - QCheckBox *m_protectContentCheck; + TQCheckBox *m_protectContentCheck; KoUnit::Unit m_unit; PropValue m_protectContent; diff --git a/kpresenter/KPrTextViewIface.cpp b/kpresenter/KPrTextViewIface.cpp index 25346274..e9180d35 100644 --- a/kpresenter/KPrTextViewIface.cpp +++ b/kpresenter/KPrTextViewIface.cpp @@ -35,12 +35,12 @@ void KPrTextViewIface::insertVariable( int type, int subtype ) m_textview->insertVariable(type,subtype); } -void KPrTextViewIface::insertCustomVariable( const QString &name) +void KPrTextViewIface::insertCustomVariable( const TQString &name) { m_textview->insertCustomVariable(name); } -void KPrTextViewIface::insertLink(const QString &_linkName, const QString & hrefName) +void KPrTextViewIface::insertLink(const TQString &_linkName, const TQString & hrefName) { m_textview->insertLink(_linkName,hrefName); } @@ -70,7 +70,7 @@ void KPrTextViewIface::paste() m_textview->paste(); } -void KPrTextViewIface::insertVariable( const QString & var) +void KPrTextViewIface::insertVariable( const TQString & var) { if( var=="DATE") m_textview->insertVariable(0,1); @@ -116,7 +116,7 @@ void KPrTextViewIface::insertVariable( const QString & var) m_textview->insertVariable(8,14); } -void KPrTextViewIface::insertNote(const QString &_note) +void KPrTextViewIface::insertNote(const TQString &_note) { m_textview->insertComment(_note); } diff --git a/kpresenter/KPrTextViewIface.h b/kpresenter/KPrTextViewIface.h index 827e3156..1ddee7b6 100644 --- a/kpresenter/KPrTextViewIface.h +++ b/kpresenter/KPrTextViewIface.h @@ -26,7 +26,7 @@ #include <KoTextViewIface.h> class KPrTextView; -class QString; +class TQString; class KPrTextViewIface : public KoTextViewIface { @@ -36,10 +36,10 @@ public: k_dcop: void insertVariable( int type, int subtype = 0 ); - void insertCustomVariable( const QString &name); - void insertLink(const QString &_linkName, const QString & hrefName); - void insertVariable( const QString & var); - void insertNote(const QString &_note); + void insertCustomVariable( const TQString &name); + void insertLink(const TQString &_linkName, const TQString & hrefName); + void insertVariable( const TQString & var); + void insertNote(const TQString &_note); void clearSelection(); void selectAll(); diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp index 120b9bfc..2d305841 100644 --- a/kpresenter/KPrTransEffectDia.cpp +++ b/kpresenter/KPrTransEffectDia.cpp @@ -30,20 +30,20 @@ #include "KPrPageEffects.h" #include "KPrSoundPlayer.h" -#include <qsplitter.h> -#include <qheader.h> -#include <qwmatrix.h> -#include <qvbox.h> -#include <qlayout.h> -#include <qimage.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qslider.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qframe.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqsplitter.h> +#include <tqheader.h> +#include <tqwmatrix.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqimage.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqslider.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <kdebug.h> #include <kurlrequester.h> @@ -55,16 +55,16 @@ #include <kfiledialog.h> -KPrEffectPreview::KPrEffectPreview( QWidget *parent, KPrDocument *_doc, KPrView *_view ) - : QLabel( parent ), doc( _doc ), view( _view ), m_pageEffect( 0 ) +KPrEffectPreview::KPrEffectPreview( TQWidget *tqparent, KPrDocument *_doc, KPrView *_view ) + : TQLabel( tqparent ), doc( _doc ), view( _view ), m_pageEffect( 0 ) { setFrameStyle( StyledPanel | Sunken ); } -void KPrEffectPreview::setPixmap( const QPixmap& pixmap ) +void KPrEffectPreview::setPixmap( const TQPixmap& pixmap ) { // find the right size - QRect rect = pixmap.rect(); + TQRect rect = pixmap.rect(); int w = rect.width(); int h = rect.height(); if ( w > h ) { @@ -83,45 +83,45 @@ void KPrEffectPreview::setPixmap( const QPixmap& pixmap ) setMinimumSize( w, h ); // create smaller pixmap for preview - const QImage img( pixmap.convertToImage().smoothScale( w, h, QImage::ScaleFree ) ); + const TQImage img( pixmap.convertToImage().smoothScale( w, h, TQ_ScaleFree ) ); m_pixmap.convertFromImage( img ); - QLabel::setPixmap( m_pixmap ); + TQLabel::setPixmap( m_pixmap ); } void KPrEffectPreview::run( PageEffect effect, EffectSpeed speed ) { - QRect rect = m_pixmap.rect(); + TQRect rect = m_pixmap.rect(); m_target.resize( rect.size() ); - m_target.fill( Qt::black ); + m_target.fill( TQt::black ); //kPchangePages( this, m_pixmap, m_target, effect, speed ); if ( m_pageEffect ) { m_pageEffectTimer.stop(); - QObject::disconnect( &m_pageEffectTimer, SIGNAL( timeout() ), this, SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); m_pageEffect->finish(); delete m_pageEffect; m_pageEffect = 0; - QLabel::repaint(); + TQLabel::tqrepaint(); } - m_pageEffect = new KPrPageEffects( this, m_target, effect, speed ); + m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(this), m_target, effect, speed ); if ( m_pageEffect->doEffect() ) { delete m_pageEffect; m_pageEffect = 0; - QLabel::update(); + TQLabel::update(); } else { - connect( &m_pageEffectTimer, SIGNAL( timeout() ), SLOT( slotDoPageEffect() ) ); + connect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoPageEffect() ) ); m_pageEffectTimer.start( 50, true ); } - //QLabel::update(); + //TQLabel::update(); } @@ -130,10 +130,10 @@ void KPrEffectPreview::slotDoPageEffect() if ( m_pageEffect->doEffect() ) { m_pageEffectTimer.stop(); - QObject::disconnect( &m_pageEffectTimer, SIGNAL( timeout() ), this, SLOT( slotDoPageEffect() ) ); + TQObject::disconnect( &m_pageEffectTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDoPageEffect() ) ); delete m_pageEffect; m_pageEffect = 0; - QLabel::update(); + TQLabel::update(); } else { @@ -142,26 +142,26 @@ void KPrEffectPreview::slotDoPageEffect() } -KPrTransEffectDia::KPrTransEffectDia( QWidget *parent, const char *name, +KPrTransEffectDia::KPrTransEffectDia( TQWidget *tqparent, const char *name, KPrDocument *_doc, KPrView *_view ) - : KDialogBase( parent, name, true, "", KDialogBase::User1|Ok|Cancel ), + : KDialogBase( tqparent, name, true, "", KDialogBase::User1|Ok|Cancel ), doc( _doc ), view( _view ), soundPlayer( 0 ) { enableButtonSeparator( true ); - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QBoxLayout *topLayout = new QHBoxLayout( page, KDialog::marginHint(), KDialog::spacingHint() ); - QWidget* leftpart = new QWidget( page ); + TQBoxLayout *topLayout = new TQHBoxLayout( page, KDialog::marginHint(), KDialog::spacingHint() ); + TQWidget* leftpart = new TQWidget( page ); topLayout->addWidget( leftpart ); - QWidget* rightpart = new QWidget( page ); + TQWidget* rightpart = new TQWidget( page ); topLayout->addWidget( rightpart ); // right-side of the dialog, for showing effect preview - QVBoxLayout *rightlayout = new QVBoxLayout( rightpart, KDialog::marginHint(), KDialog::spacingHint() ); - rightlayout->setAutoAdd( true ); + TQVBoxLayout *righttqlayout = new TQVBoxLayout( rightpart, KDialog::marginHint(), KDialog::spacingHint() ); + righttqlayout->setAutoAdd( true ); effectPreview = new KPrEffectPreview( rightpart, doc, view ); @@ -169,36 +169,36 @@ KPrTransEffectDia::KPrTransEffectDia( QWidget *parent, const char *name, KPrPage* pg = doc->pageList().at( pgnum ); // pixmap for effect preview - QRect rect= pg->getZoomPageRect(); - QPixmap pix( rect.size() ); - pix.fill( Qt::white ); + TQRect rect= pg->getZoomPageRect(); + TQPixmap pix( rect.size() ); + pix.fill( TQt::white ); view->getCanvas()->drawPageInPix( pix, pgnum, 100 ); effectPreview->setPixmap( pix ); pageEffect = pg->getPageEffect(); speed = pg->getPageEffectSpeed(); - QVBoxLayout *leftlayout = new QVBoxLayout( leftpart, KDialog::marginHint(), KDialog::spacingHint() ); - leftlayout->setAutoAdd( true ); + TQVBoxLayout *lefttqlayout = new TQVBoxLayout( leftpart, KDialog::marginHint(), KDialog::spacingHint() ); + lefttqlayout->setAutoAdd( true ); - new QLabel( i18n("Effect:"), leftpart ); + new TQLabel( i18n("Effect:"), leftpart ); - effectList = new QListBox( leftpart ); + effectList = new TQListBox( leftpart ); effectList->insertItem( i18n( "No Effect" ) ); - effectList->insertItem( i18n( "Close Horizontal" ) ); - effectList->insertItem( i18n( "Close Vertical" ) ); + effectList->insertItem( i18n( "CloseQt::Horizontal" ) ); + effectList->insertItem( i18n( "CloseQt::Vertical" ) ); effectList->insertItem( i18n( "Close From All Directions" ) ); - effectList->insertItem( i18n( "Open Horizontal" ) ); - effectList->insertItem( i18n( "Open Vertical" ) ); + effectList->insertItem( i18n( "OpenQt::Horizontal" ) ); + effectList->insertItem( i18n( "OpenQt::Vertical" ) ); effectList->insertItem( i18n( "Open From All Directions" ) ); - effectList->insertItem( i18n( "Interlocking Horizontal 1" ) ); - effectList->insertItem( i18n( "Interlocking Horizontal 2" ) ); - effectList->insertItem( i18n( "Interlocking Vertical 1" ) ); - effectList->insertItem( i18n( "Interlocking Vertical 2" ) ); + effectList->insertItem( i18n( "InterlockingQt::Horizontal 1" ) ); + effectList->insertItem( i18n( "InterlockingQt::Horizontal 2" ) ); + effectList->insertItem( i18n( "InterlockingQt::Vertical 1" ) ); + effectList->insertItem( i18n( "InterlockingQt::Vertical 2" ) ); effectList->insertItem( i18n( "Surround 1" ) ); effectList->insertItem( i18n( "Fly Away 1" ) ); - effectList->insertItem( i18n( "Blinds Horizontal" ) ); - effectList->insertItem( i18n( "Blinds Vertical" ) ); + effectList->insertItem( i18n( "BlindsQt::Horizontal" ) ); + effectList->insertItem( i18n( "BlindsQt::Vertical" ) ); effectList->insertItem( i18n( "Box In" ) ); effectList->insertItem( i18n( "Box Out" ) ); effectList->insertItem( i18n( "Checkerboard Across" ) ); @@ -232,16 +232,16 @@ KPrTransEffectDia::KPrTransEffectDia( QWidget *parent, const char *name, if( pageEffect == PEF_RANDOM ) effectList->setCurrentItem( effectList->count()-1 ); - connect( effectList, SIGNAL(highlighted(int)), this, SLOT(effectChanged(int)) ); - connect( effectList, SIGNAL( doubleClicked ( QListBoxItem *) ), this, SLOT( effectChanged()) ); + connect( effectList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(effectChanged(int)) ); + connect( effectList, TQT_SIGNAL( doubleClicked ( TQListBoxItem *) ), this, TQT_SLOT( effectChanged()) ); - new QLabel( i18n("Speed:"), leftpart ); + new TQLabel( i18n("Speed:"), leftpart ); - QWidget* sp = new QWidget( leftpart ); - QBoxLayout* speedLayout = new QHBoxLayout( sp, KDialog::marginHint(), KDialog::spacingHint() ); + TQWidget* sp = new TQWidget( leftpart ); + TQBoxLayout* speedLayout = new TQHBoxLayout( sp, KDialog::marginHint(), KDialog::spacingHint() ); speedLayout->setAutoAdd( true ); - speedCombo = new QComboBox( sp ); + speedCombo = new TQComboBox( sp ); speedCombo->insertItem(i18n("Slow") ); speedCombo->insertItem(i18n("Medium") ); speedCombo->insertItem(i18n("Fast") ); @@ -249,74 +249,74 @@ KPrTransEffectDia::KPrTransEffectDia( QWidget *parent, const char *name, speedCombo->setCurrentItem( speed ); - connect( speedCombo, SIGNAL(activated(int)), this, SLOT(speedChanged(int)) ); + connect( speedCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(speedChanged(int)) ); - QWidget* previewgrp = new QWidget( leftpart ); - QBoxLayout* previewLayout = new QHBoxLayout( previewgrp, KDialog::marginHint(), KDialog::spacingHint() ); + TQWidget* previewgrp = new TQWidget( leftpart ); + TQBoxLayout* previewLayout = new TQHBoxLayout( previewgrp, KDialog::marginHint(), KDialog::spacingHint() ); previewLayout->setAutoAdd( true ); - automaticPreview = new QCheckBox( i18n( "Automatic preview" ), previewgrp ); + automaticPreview = new TQCheckBox( i18n( "Automatic preview" ), previewgrp ); automaticPreview->setChecked( true ); - QWidget* previewspacer = new QWidget( previewgrp ); - previewspacer->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, - QSizePolicy::Expanding ) ); + TQWidget* previewspacer = new TQWidget( previewgrp ); + previewspacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + TQSizePolicy::Expanding ) ); - previewButton = new QPushButton( previewgrp ); + previewButton = new TQPushButton( previewgrp ); previewButton->setText( i18n("Preview") ); - connect( previewButton, SIGNAL(clicked()), this, SLOT(preview()) ); + connect( previewButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(preview()) ); - QFrame* line = new QFrame( leftpart ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + TQFrame* line = new TQFrame( leftpart ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); soundFileName = pg->getPageSoundFileName(); soundEffect = pg->getPageSoundEffect(); - checkSoundEffect = new QCheckBox( i18n( "Sound effect" ), leftpart ); + checkSoundEffect = new TQCheckBox( i18n( "Sound effect" ), leftpart ); checkSoundEffect->setChecked( soundEffect ); - connect( checkSoundEffect, SIGNAL( clicked() ), this, SLOT( soundEffectChanged() ) ); + connect( checkSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( soundEffectChanged() ) ); - QWidget* soundgrp = new QWidget( leftpart ); - QBoxLayout* soundLayout = new QHBoxLayout( soundgrp, KDialog::marginHint(), KDialog::spacingHint() ); + TQWidget* soundgrp = new TQWidget( leftpart ); + TQBoxLayout* soundLayout = new TQHBoxLayout( soundgrp, KDialog::marginHint(), KDialog::spacingHint() ); soundLayout->setAutoAdd( true ); - lSoundEffect = new QLabel( i18n( "File name:" ), soundgrp ); + lSoundEffect = new TQLabel( i18n( "File name:" ), soundgrp ); requester = new KURLRequester( soundgrp ); requester->setURL( soundFileName ); - connect( requester, SIGNAL( openFileDialog( KURLRequester * ) ), - this, SLOT( slotRequesterClicked( KURLRequester * ) ) ); - connect( requester, SIGNAL( textChanged( const QString& ) ), - this, SLOT( slotSoundFileChanged( const QString& ) ) ); + connect( requester, TQT_SIGNAL( openFileDialog( KURLRequester * ) ), + this, TQT_SLOT( slotRequesterClicked( KURLRequester * ) ) ); + connect( requester, TQT_SIGNAL( textChanged( const TQString& ) ), + this, TQT_SLOT( slotSoundFileChanged( const TQString& ) ) ); - buttonTestPlaySoundEffect = new QPushButton( soundgrp ); + buttonTestPlaySoundEffect = new TQPushButton( soundgrp ); buttonTestPlaySoundEffect->setPixmap( BarIcon("1rightarrow", KIcon::SizeSmall) ); - QToolTip::add( buttonTestPlaySoundEffect, i18n("Play") ); + TQToolTip::add( buttonTestPlaySoundEffect, i18n("Play") ); - connect( buttonTestPlaySoundEffect, SIGNAL( clicked() ), this, SLOT( playSound() ) ); + connect( buttonTestPlaySoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound() ) ); - buttonTestStopSoundEffect = new QPushButton( soundgrp ); + buttonTestStopSoundEffect = new TQPushButton( soundgrp ); buttonTestStopSoundEffect->setPixmap( BarIcon("player_stop", KIcon::SizeSmall) ); - QToolTip::add( buttonTestStopSoundEffect, i18n("Stop") ); + TQToolTip::add( buttonTestStopSoundEffect, i18n("Stop") ); - connect( buttonTestStopSoundEffect, SIGNAL( clicked() ), this, SLOT( stopSound() ) ); + connect( buttonTestStopSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound() ) ); soundEffect = pg->getPageSoundEffect(); setButtonText(KDialogBase::User1,i18n( "Apply &Global" )); slideTime = pg->getPageTimer(); - new QLabel( i18n("Automatically advance to the next slide after:"), rightpart ); + new TQLabel( i18n("Automatically advance to the next slide after:"), rightpart ); timeSlider = new KIntNumInput( slideTime, rightpart ); timeSlider->setRange( 1, 600, 1 ); timeSlider->setSuffix( i18n( " seconds" ) ); - connect( timeSlider, SIGNAL(valueChanged(int)), this, SLOT(timeChanged(int)) ); + connect( timeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(timeChanged(int)) ); - QWidget* rspacer = new QWidget( rightpart ); - rspacer->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) ); + TQWidget* rspacer = new TQWidget( rightpart ); + rspacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); - QWidget* lspacer = new QWidget( leftpart ); + TQWidget* lspacer = new TQWidget( leftpart ); lspacer->setMinimumSize( 10, spacingHint() ); soundEffectChanged(); @@ -372,23 +372,23 @@ void KPrTransEffectDia::soundEffectChanged() } } -static QString getSoundFileFilter() +static TQString getSoundFileFilter() { - QStringList fileList; + TQStringList fileList; fileList << "wav" << "au" << "mp3" << "mp1" << "mp2" << "mpg" << "dat" << "mpeg" << "ogg" << "cdda" << "cda " << "vcd" << "null"; fileList.sort(); bool comma = false; - QString full, str; - QStringList::ConstIterator end( fileList.end() ); - for ( QStringList::ConstIterator it = fileList.begin(); it != end; ++it ) { + TQString full, str; + TQStringList::ConstIterator end( fileList.end() ); + for ( TQStringList::ConstIterator it = fileList.begin(); it != end; ++it ) { if ( comma ) str += '\n'; comma = true; - str += QString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() ); + str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() ); - full += QString( "*.") + (*it) + ' '; + full += TQString( "*.") + (*it) + ' '; } str = full + '|' + i18n( "All Supported Files" ) + '\n' + str; @@ -399,16 +399,16 @@ static QString getSoundFileFilter() void KPrTransEffectDia::slotRequesterClicked( KURLRequester * ) { - QString filter = getSoundFileFilter(); + TQString filter = getSoundFileFilter(); requester->fileDialog()->setFilter( filter ); // find the first "sound"-resource that contains files - QStringList soundDirs = KGlobal::dirs()->resourceDirs( "sound" ); + TQStringList soundDirs = KGlobal::dirs()->resourceDirs( "sound" ); if ( !soundDirs.isEmpty() ) { KURL soundURL; - QDir dir; - dir.setFilter( QDir::Files | QDir::Readable ); - QStringList::ConstIterator it = soundDirs.begin(); + TQDir dir; + dir.setFilter( TQDir::Files | TQDir::Readable ); + TQStringList::ConstIterator it = soundDirs.begin(); while ( it != soundDirs.end() ) { dir = *it; if ( dir.isReadable() && dir.count() > 2 ) { @@ -421,7 +421,7 @@ void KPrTransEffectDia::slotRequesterClicked( KURLRequester * ) } } -void KPrTransEffectDia::slotSoundFileChanged( const QString& text ) +void KPrTransEffectDia::slotSoundFileChanged( const TQString& text ) { soundFileName = text; diff --git a/kpresenter/KPrTransEffectDia.h b/kpresenter/KPrTransEffectDia.h index 17d8f0ce..b6018d43 100644 --- a/kpresenter/KPrTransEffectDia.h +++ b/kpresenter/KPrTransEffectDia.h @@ -24,20 +24,20 @@ #define __TRANSEFFECTDIA_H #include <kdialogbase.h> -#include <qlabel.h> -#include <qtimer.h> +#include <tqlabel.h> +#include <tqtimer.h> #include "global.h" class KPrDocument; class KPrView; -class QCheckBox; -class QSplitter; -class QLabel; -class QPushButton; -class QCheckBox; -class QSlider; -class QString; -class QComboBox; +class TQCheckBox; +class TQSplitter; +class TQLabel; +class TQPushButton; +class TQCheckBox; +class TQSlider; +class TQString; +class TQComboBox; class KPrBackGround; class KPrObject; class KPPresStructObjectItem; @@ -46,24 +46,25 @@ class KIntNumInput; class KPrSoundPlayer; class KPrPageEffects; -class KPrEffectPreview : public QLabel +class KPrEffectPreview : public TQLabel { Q_OBJECT + TQ_OBJECT public: - KPrEffectPreview( QWidget *parent, KPrDocument *_doc, KPrView *_view ); + KPrEffectPreview( TQWidget *tqparent, KPrDocument *_doc, KPrView *_view ); public slots: - void setPixmap( const QPixmap& pixmap ); + void setPixmap( const TQPixmap& pixmap ); void run( PageEffect effect, EffectSpeed speed ); protected: KPrDocument *doc; KPrView *view; - QPixmap m_pixmap; - QPixmap m_target; + TQPixmap m_pixmap; + TQPixmap m_target; - QTimer m_pageEffectTimer; + TQTimer m_pageEffectTimer; KPrPageEffects *m_pageEffect; protected slots: @@ -74,15 +75,16 @@ protected slots: class KPrTransEffectDia: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KPrTransEffectDia( QWidget *parent, const char *name, + KPrTransEffectDia( TQWidget *tqparent, const char *name, KPrDocument *_doc, KPrView *_view ); PageEffect getPageEffect() const { return pageEffect; } EffectSpeed getPageEffectSpeed() const { return speed; } bool getSoundEffect() const { return soundEffect; } - QString getSoundFileName() const { return soundFileName; } + TQString getSoundFileName() const { return soundFileName; } bool getAutoAdvance() const { return false; } // FIXME ! int getSlideTime() const { return slideTime; } @@ -99,20 +101,20 @@ protected: PageEffect pageEffect; EffectSpeed speed; bool soundEffect; - QString soundFileName; + TQString soundFileName; KPrEffectPreview *effectPreview; - QListBox *effectList; - QComboBox *speedCombo; + TQListBox *effectList; + TQComboBox *speedCombo; - QCheckBox *automaticPreview; - QPushButton *previewButton; + TQCheckBox *automaticPreview; + TQPushButton *previewButton; - QCheckBox *checkSoundEffect; - QLabel *lSoundEffect; + TQCheckBox *checkSoundEffect; + TQLabel *lSoundEffect; KURLRequester *requester; - QPushButton *buttonTestPlaySoundEffect, *buttonTestStopSoundEffect; + TQPushButton *buttonTestPlaySoundEffect, *buttonTestStopSoundEffect; KIntNumInput* timeSlider; int slideTime; @@ -130,7 +132,7 @@ protected slots: void soundEffectChanged(); void slotRequesterClicked( KURLRequester * ); - void slotSoundFileChanged( const QString& ); + void slotSoundFileChanged( const TQString& ); void playSound(); void stopSound(); }; diff --git a/kpresenter/KPrUtils.cpp b/kpresenter/KPrUtils.cpp index 0387de48..fbf91cc9 100644 --- a/kpresenter/KPrUtils.cpp +++ b/kpresenter/KPrUtils.cpp @@ -31,22 +31,22 @@ #include <KoTextZoomHandler.h> #include <KoPoint.h> -#include <qpainter.h> -#include <qpointarray.h> -#include <qpoint.h> -#include <qcolor.h> -#include <qsize.h> -#include <qbitmap.h> -#include <qcursor.h> -#include <qdatetime.h> -#include <qdom.h> - -void drawFigure( LineEnd figure, QPainter* painter, const KoPoint &coord, const QColor &color, +#include <tqpainter.h> +#include <tqpointarray.h> +#include <tqpoint.h> +#include <tqcolor.h> +#include <tqsize.h> +#include <tqbitmap.h> +#include <tqcursor.h> +#include <tqdatetime.h> +#include <tqdom.h> + +void drawFigure( LineEnd figure, TQPainter* painter, const KoPoint &coord, const TQColor &color, int _w, float angle, KoZoomHandler* _zoomHandler) { painter->save(); - painter->setPen( Qt::NoPen ); - painter->setBrush( Qt::NoBrush ); + painter->setPen( TQt::NoPen ); + painter->setBrush( TQt::NoBrush ); switch ( figure ) { @@ -77,7 +77,7 @@ void drawFigure( LineEnd figure, QPainter* painter, const KoPoint &coord, const KoPoint p1( -10 - _w, -3 - _w / 2 ); KoPoint p2( 0 , 0 ); KoPoint p3( -10 - _w, 3 + _w / 2 ); - QPointArray pArray( 3 ); + TQPointArray pArray( 3 ); pArray.setPoint( 0, _zoomHandler->zoomPoint(p1) ); pArray.setPoint( 1, _zoomHandler->zoomPoint(p2) ); pArray.setPoint( 2, _zoomHandler->zoomPoint(p3) ); @@ -91,23 +91,23 @@ void drawFigure( LineEnd figure, QPainter* painter, const KoPoint &coord, const case L_LINE_ARROW: { painter->translate( _zoomHandler->zoomItX(coord.x()),_zoomHandler->zoomItY( coord.y()) ); - painter->setPen( QPen(color , _zoomHandler->zoomItX( _w )) ); + painter->setPen( TQPen(color , _zoomHandler->zoomItX( _w )) ); painter->rotate( angle ); painter->scale( 1, 1 ); - QPoint p1( _zoomHandler->zoomItX(-10 - _w), _zoomHandler->zoomItY(-3 - _w / 2) ); - QPoint p2( _zoomHandler->zoomItX(0), _zoomHandler->zoomItY(0) ); - QPoint p3( _zoomHandler->zoomItX(-10 - _w), _zoomHandler->zoomItY(3 + _w / 2) ); + TQPoint p1( _zoomHandler->zoomItX(-10 - _w), _zoomHandler->zoomItY(-3 - _w / 2) ); + TQPoint p2( _zoomHandler->zoomItX(0), _zoomHandler->zoomItY(0) ); + TQPoint p3( _zoomHandler->zoomItX(-10 - _w), _zoomHandler->zoomItY(3 + _w / 2) ); painter->drawLine( p2, p1); painter->drawLine( p2, p3); }break; case L_DIMENSION_LINE: { painter->translate( _zoomHandler->zoomItX(coord.x()),_zoomHandler->zoomItY( coord.y()) ); - painter->setPen( QPen(color , _zoomHandler->zoomItX( _w )) ); + painter->setPen( TQPen(color , _zoomHandler->zoomItX( _w )) ); painter->rotate( angle ); painter->scale( 1, 1 ); - QPoint p1( _zoomHandler->zoomItX(- _w / 2), _zoomHandler->zoomItY(-5 - _w / 2) ); - QPoint p2( _zoomHandler->zoomItX(- _w / 2), _zoomHandler->zoomItY(5 + _w / 2 ) ); + TQPoint p1( _zoomHandler->zoomItX(- _w / 2), _zoomHandler->zoomItY(-5 - _w / 2) ); + TQPoint p2( _zoomHandler->zoomItX(- _w / 2), _zoomHandler->zoomItY(5 + _w / 2 ) ); painter->drawLine( p1, p2); }break; case L_DOUBLE_ARROW: @@ -125,7 +125,7 @@ void drawFigure( LineEnd figure, QPainter* painter, const KoPoint &coord, const KoPoint p5( -10, 0 ); KoPoint p6( -20 - _w, 3 + _w / 2 ); - QPointArray pArray( 3 ); + TQPointArray pArray( 3 ); pArray.setPoint( 0, _zoomHandler->zoomPoint(p1) ); pArray.setPoint( 1, _zoomHandler->zoomPoint(p2) ); pArray.setPoint( 2, _zoomHandler->zoomPoint(p3) ); @@ -139,12 +139,12 @@ void drawFigure( LineEnd figure, QPainter* painter, const KoPoint &coord, const case L_DOUBLE_LINE_ARROW: { painter->translate( _zoomHandler->zoomItX(coord.x()),_zoomHandler->zoomItY( coord.y()) ); - painter->setPen( QPen(color , _zoomHandler->zoomItX( _w )) ); + painter->setPen( TQPen(color , _zoomHandler->zoomItX( _w )) ); painter->rotate( angle ); painter->scale( 1, 1 ); - QPoint p1( _zoomHandler->zoomItX(-10 - _w), _zoomHandler->zoomItY(-3 - _w / 2) ); - QPoint p2( _zoomHandler->zoomItX(0), _zoomHandler->zoomItY(0) ); - QPoint p3( _zoomHandler->zoomItX(-10 - _w), _zoomHandler->zoomItY(3 + _w / 2) ); + TQPoint p1( _zoomHandler->zoomItX(-10 - _w), _zoomHandler->zoomItY(-3 - _w / 2) ); + TQPoint p2( _zoomHandler->zoomItX(0), _zoomHandler->zoomItY(0) ); + TQPoint p3( _zoomHandler->zoomItX(-10 - _w), _zoomHandler->zoomItY(3 + _w / 2) ); painter->drawLine( p2, p1); painter->drawLine( p2, p3); @@ -159,7 +159,7 @@ void drawFigure( LineEnd figure, QPainter* painter, const KoPoint &coord, const painter->restore(); } -void drawFigureWithOffset( LineEnd figure, QPainter* painter, const QPoint &coord, const QColor &color, +void drawFigureWithOffset( LineEnd figure, TQPainter* painter, const TQPoint &coord, const TQColor &color, int _w, float angle, KoZoomHandler*_zoomHandler) { KoSize diff = getOffset( figure, _w, angle ); @@ -168,7 +168,7 @@ void drawFigureWithOffset( LineEnd figure, QPainter* painter, const QPoint &coor drawFigure( figure, painter, offsetPoint, color, _w, angle,_zoomHandler ); } -void drawFigureWithOffset( LineEnd figure, QPainter* painter, const KoPoint &coord, const QColor &color, +void drawFigureWithOffset( LineEnd figure, TQPainter* painter, const KoPoint &coord, const TQColor &color, int w, float angle, KoZoomHandler*_zoomHandler, bool begin ) { KoSize diff = getOffset( figure, w, angle ); @@ -253,31 +253,31 @@ KoSize getOffset( LineEnd figure, int _w, float angle ) return KoSize( x * cos( angle * M_PI / 180.0 ), y * sin( angle * M_PI / 180 ) ); } -QString lineEndBeginName( LineEnd type ) +TQString lineEndBeginName( LineEnd type ) { switch(type) { case L_NORMAL: - return QString("NORMAL"); + return TQString("NORMAL"); case L_ARROW: - return QString("ARROW"); + return TQString("ARROW"); case L_SQUARE: - return QString("SQUARE"); + return TQString("SQUARE"); case L_CIRCLE: - return QString("CIRCLE"); + return TQString("CIRCLE"); case L_LINE_ARROW: - return QString("LINE_ARROW"); + return TQString("LINE_ARROW"); case L_DIMENSION_LINE: - return QString("DIMENSION_LINE"); + return TQString("DIMENSION_LINE"); case L_DOUBLE_ARROW: - return QString("DOUBLE_ARROW"); + return TQString("DOUBLE_ARROW"); case L_DOUBLE_LINE_ARROW: - return QString("DOUBLE_LINE_ARROW"); + return TQString("DOUBLE_LINE_ARROW"); } - return QString::null; + return TQString(); } -LineEnd lineEndBeginFromString( const QString & type ) +LineEnd lineEndBeginFromString( const TQString & type ) { if(type=="NORMAL") return L_NORMAL; @@ -296,13 +296,13 @@ LineEnd lineEndBeginFromString( const QString & type ) else if (type=="DOUBLE_LINE_ARROW") return L_DOUBLE_LINE_ARROW; else - kdDebug(33001)<<"Error in LineEnd lineEndBeginFromString( const QString & name )\n"; + kdDebug(33001)<<"Error in LineEnd lineEndBeginFromString( const TQString & name )\n"; return L_NORMAL; } -QString lineEndBeginSvg( LineEnd element ) +TQString lineEndBeginSvg( LineEnd element ) { - QString str; + TQString str; switch( element ) { case L_NORMAL: @@ -334,7 +334,7 @@ QString lineEndBeginSvg( LineEnd element ) return str; } -QCursor KPrUtils::penCursor() +TQCursor KPrUtils::penCursor() { static unsigned char pen_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x7d, @@ -344,16 +344,16 @@ QCursor KPrUtils::penCursor() 0xd0, 0x0f, 0x00, 0x88, 0x07, 0x00, 0x88, 0x03, 0x00, 0xe4, 0x01, 0x00, 0x7c, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00}; - QBitmap pen_bitmap( 24, 24, pen_bits, true ); - QBitmap pen_mask( 24, 24 ); - QPixmap pix( pen_bitmap ); - pen_mask = pix.createHeuristicMask( false ); - pix.setMask( pen_mask ); + TQBitmap pen_bitmap( 24, 24, pen_bits, true ); + TQBitmap pen_tqmask( 24, 24 ); + TQPixmap pix( pen_bitmap ); + pen_tqmask = pix.createHeuristicMask( false ); + pix.setMask( pen_tqmask ); - return QCursor( pix, 1, 22 ); + return TQCursor( pix, 1, 22 ); } -QCursor KPrUtils::rotateCursor() +TQCursor KPrUtils::rotateCursor() { static unsigned char rotate_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0xc0, 0xf3, 0x00, 0xe0, 0xff, 0x01, @@ -363,33 +363,33 @@ QCursor KPrUtils::rotateCursor() 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - QBitmap rotate_bitmap( 22, 22, rotate_bits, true ); - QBitmap rotate_mask( 22, 22 ); - QPixmap pix( rotate_bitmap ); - rotate_mask = pix.createHeuristicMask( false ); - pix.setMask( rotate_mask ); + TQBitmap rotate_bitmap( 22, 22, rotate_bits, true ); + TQBitmap rotate_tqmask( 22, 22 ); + TQPixmap pix( rotate_bitmap ); + rotate_tqmask = pix.createHeuristicMask( false ); + pix.setMask( rotate_tqmask ); - return QCursor( pix, 11, 13 ); + return TQCursor( pix, 11, 13 ); } -QString saveOasisTimer( int second ) +TQString saveOasisTimer( int second ) { - QTime time; + TQTime time; time = time.addSecs( second ); - QString hours( QString::number( time.hour() ).rightJustify( 2, '0' ) ); - QString ms( QString::number( time.minute() ).rightJustify( 2, '0' ) ); - QString sec( QString::number( time.second() ).rightJustify( 2, '0' ) ); + TQString hours( TQString::number( time.hour() ).rightJustify( 2, '0' ) ); + TQString ms( TQString::number( time.minute() ).rightJustify( 2, '0' ) ); + TQString sec( TQString::number( time.second() ).rightJustify( 2, '0' ) ); //ISO8601 chapter 5.5.3.2 - //QDate doesn't encode it as this format. - QString timeIso = QString( "PT%1H%2M%3S" ).arg( hours ).arg( ms ).arg( sec ); + //TQDate doesn't encode it as this format. + TQString timeIso = TQString( "PT%1H%2M%3S" ).tqarg( hours ).tqarg( ms ).tqarg( sec ); return timeIso; } -int loadOasisTimer( const QString & timer ) +int loadOasisTimer( const TQString & timer ) { - QString str( timer ); + TQString str( timer ); //convert date duration int hour( str.mid( 2, 2 ).toInt() ); int minute( str.mid( 5, 2 ).toInt() ); @@ -399,12 +399,12 @@ int loadOasisTimer( const QString & timer ) } -int readOasisSettingsInt( const QDomElement & element ) +int readOasisSettingsInt( const TQDomElement & element ) { if ( element.hasAttributeNS( KoXmlNS::config, "type" ) ) { - QString type = element.attributeNS( KoXmlNS::config, "type", QString::null ); - QString str = element.text(); + TQString type = element.attributeNS( KoXmlNS::config, "type", TQString() ); + TQString str = element.text(); bool b; int value = str.toInt( &b ); return ( b ? value : 0 ); @@ -412,12 +412,12 @@ int readOasisSettingsInt( const QDomElement & element ) return 0; } -double readOasisSettingsDouble( const QDomElement & element ) +double readOasisSettingsDouble( const TQDomElement & element ) { if ( element.hasAttributeNS( KoXmlNS::config, "type" ) ) { - QString type = element.attributeNS( KoXmlNS::config, "type", QString::null ); - QString str = element.text(); + TQString type = element.attributeNS( KoXmlNS::config, "type", TQString() ); + TQString str = element.text(); bool b; double value = str.toDouble( &b ); return ( b ? value : 0 ); @@ -425,24 +425,24 @@ double readOasisSettingsDouble( const QDomElement & element ) return 0.0; } -bool readOasisSettingsBool( const QDomElement & element ) +bool readOasisSettingsBool( const TQDomElement & element ) { if ( element.hasAttributeNS( KoXmlNS::config, "type" ) ) { - QString type = element.attributeNS( KoXmlNS::config, "type", QString::null ); - QString str = element.text(); + TQString type = element.attributeNS( KoXmlNS::config, "type", TQString() ); + TQString str = element.text(); return ( str == "true" ? true : false ); } return false; } -QString readOasisSettingsString( const QDomElement & element ) +TQString readOasisSettingsString( const TQDomElement & element ) { if ( element.hasAttributeNS( KoXmlNS::config, "type" ) ) { - QString type = element.attributeNS( KoXmlNS::config, "type", QString::null ); - QString str = element.text(); + TQString type = element.attributeNS( KoXmlNS::config, "type", TQString() ); + TQString str = element.text(); return str; } - return QString::null; + return TQString(); } diff --git a/kpresenter/KPrUtils.h b/kpresenter/KPrUtils.h index 560fa75f..2ef52122 100644 --- a/kpresenter/KPrUtils.h +++ b/kpresenter/KPrUtils.h @@ -23,40 +23,40 @@ #include "global.h" #include "KoPointArray.h" -#include <qcursor.h> -class QPoint; -class QColor; -class QPainter; +#include <tqcursor.h> +class TQPoint; +class TQColor; +class TQPainter; class KoZoomHandler; class KoSize; class KoPoint; -class QDomElement; +class TQDomElement; class KPrObject; -void drawFigure( LineEnd figure, QPainter* painter, const KoPoint &coord, const QColor & color, +void drawFigure( LineEnd figure, TQPainter* painter, const KoPoint &coord, const TQColor & color, int _w, float angle, KoZoomHandler*_zoomHandler ); -void drawFigureWithOffset( LineEnd figure, QPainter* painter, const QPoint &coord, const QColor & color, +void drawFigureWithOffset( LineEnd figure, TQPainter* painter, const TQPoint &coord, const TQColor & color, int _w, float angle, KoZoomHandler*_zoomHandler ); -void drawFigureWithOffset( LineEnd figure, QPainter* painter, const KoPoint &coord, const QColor &color, +void drawFigureWithOffset( LineEnd figure, TQPainter* painter, const KoPoint &coord, const TQColor &color, int w, float angle, KoZoomHandler*_zoomHandler, bool begin); KoSize getBoundingSize( LineEnd figure, int _w, const KoZoomHandler*_zoomHandler ); KoSize getOffset( LineEnd figure, int _w, float angle ); -QString lineEndBeginName( LineEnd type ); -LineEnd lineEndBeginFromString( const QString & name ); -QString lineEndBeginSvg( LineEnd element ); -QString saveOasisTimer( int second ); -int loadOasisTimer( const QString & timer ); +TQString lineEndBeginName( LineEnd type ); +LineEnd lineEndBeginFromString( const TQString & name ); +TQString lineEndBeginSvg( LineEnd element ); +TQString saveOasisTimer( int second ); +int loadOasisTimer( const TQString & timer ); class KPrUtils { public: - static QCursor penCursor(); // pen tool cursors - static QCursor rotateCursor(); // rotate tool cursor + static TQCursor penCursor(); // pen tool cursors + static TQCursor rotateCursor(); // rotate tool cursor }; -int readOasisSettingsInt( const QDomElement & element ); -double readOasisSettingsDouble( const QDomElement & element ); -bool readOasisSettingsBool( const QDomElement & element ); -QString readOasisSettingsString( const QDomElement & element ); +int readOasisSettingsInt( const TQDomElement & element ); +double readOasisSettingsDouble( const TQDomElement & element ); +bool readOasisSettingsBool( const TQDomElement & element ); +TQString readOasisSettingsString( const TQDomElement & element ); #endif diff --git a/kpresenter/KPrVariableCollection.cpp b/kpresenter/KPrVariableCollection.cpp index 2c436a52..d7312e75 100644 --- a/kpresenter/KPrVariableCollection.cpp +++ b/kpresenter/KPrVariableCollection.cpp @@ -34,9 +34,9 @@ KPrVariableCollection::KPrVariableCollection(KoVariableSettings *_setting, KoVar { } -KoVariable* KPrVariableCollection::loadOasisField( KoTextDocument* textdoc, const QDomElement& tag, KoOasisContext& context ) +KoVariable* KPrVariableCollection::loadOasisField( KoTextDocument* textdoc, const TQDomElement& tag, KoOasisContext& context ) { - const QString localName( tag.localName() ); + const TQString localName( tag.localName() ); const bool isTextNS = tag.namespaceURI() == KoXmlNS::text; if ( isTextNS ) { @@ -51,7 +51,7 @@ KoVariable* KPrVariableCollection::loadOasisField( KoTextDocument* textdoc, cons localName == "non-whitespace-character-count" || localName == "syllable-count" ) { - QString key = "NUMBER"; + TQString key = "NUMBER"; int type = VT_STATISTIC; return loadOasisFieldCreateVariable( textdoc, tag, context, key, type ); } @@ -101,7 +101,7 @@ void KPrPgNumVariable::recalc() { if ( m_subtype == VST_PGNUM_TOTAL ) { - m_varValue = QVariant( (int)(m_doc->getPageNums()+m_varColl->variableSetting()->startingPageNumber()-1)); + m_varValue = TQVariant( (int)(m_doc->getPageNums()+m_varColl->variableSetting()->startingPageNumber()-1)); resize(); } // But we don't want to keep a width of -1 ... @@ -131,7 +131,7 @@ void KPrStatisticVariable::recalc() KPrPage *page = m_doc->activePage(); if( !page) //When we load activePage is null return; - QPtrListIterator<KPrObject> objIt( page->objectList() ); + TQPtrListIterator<KPrObject> objIt( page->objectList() ); for ( objIt.toFirst(); objIt.current(); ++objIt ) { @@ -183,13 +183,13 @@ void KPrStatisticVariable::recalc() nb = 0; } - m_varValue = QVariant(nb); + m_varValue = TQVariant(nb); resize(); if ( width == -1 ) width = 0; } -QString KPrStatisticVariable::text(bool realValue) +TQString KPrStatisticVariable::text(bool realValue) { if (m_varColl->variableSetting()->displayFieldCode()&& !realValue) return fieldCode(); diff --git a/kpresenter/KPrVariableCollection.h b/kpresenter/KPrVariableCollection.h index 060e5747..6ac4864c 100644 --- a/kpresenter/KPrVariableCollection.h +++ b/kpresenter/KPrVariableCollection.h @@ -21,8 +21,8 @@ #ifndef kprvariable_h #define kprvariable_h -#include <qstring.h> -#include <qasciidict.h> +#include <tqstring.h> +#include <tqasciidict.h> #include <KoVariable.h> #include "KPrTextDocument.h" @@ -39,7 +39,7 @@ public: virtual KoVariable *createVariable( int type, short int subtype, KoVariableFormatCollection * coll, KoVariableFormat *varFormat,KoTextDocument *textdoc, KoDocument * doc, int _correct, bool _forceDefaultFormat=false , bool loadFootNote= true); - virtual KoVariable* loadOasisField( KoTextDocument* textdoc, const QDomElement& tag, KoOasisContext& context ); + virtual KoVariable* loadOasisField( KoTextDocument* textdoc, const TQDomElement& tag, KoOasisContext& context ); }; /** @@ -63,7 +63,7 @@ class KPrStatisticVariable : public KoStatisticVariable public: KPrStatisticVariable( KoTextDocument *textdoc, int subtype, KoVariableFormat *varFormat,KoVariableCollection *_varColl, KPrDocument *doc ); virtual void recalc(); - virtual QString text(bool realValue=false); + virtual TQString text(bool realValue=false); protected: KPrDocument *m_doc; diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 7e7e52cf..7382cc5e 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -21,20 +21,20 @@ #include <kprinter.h> #include <kaccel.h> #include <kglobalsettings.h> -#include <qpainter.h> -#include <qscrollbar.h> -#include <qpopupmenu.h> -#include <qcursor.h> -#include <qfileinfo.h> -#include <qtextstream.h> +#include <tqpainter.h> +#include <tqscrollbar.h> +#include <tqpopupmenu.h> +#include <tqcursor.h> +#include <tqfileinfo.h> +#include <tqtextstream.h> #include <assert.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qdir.h> -#include <qclipboard.h> -#include <qradiobutton.h> -#include <qdragobject.h> -#include <qfile.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqdir.h> +#include <tqclipboard.h> +#include <tqradiobutton.h> +#include <tqdragobject.h> +#include <tqfile.h> #include "KPrPage.h" #include "KPrBackDia.h" @@ -97,8 +97,8 @@ #include <kcoloractions.h> #include <tkcoloractions.h> #include <kaction.h> -#include <qspinbox.h> -#include <qcombobox.h> +#include <tqspinbox.h> +#include <tqcombobox.h> #include <KoPartSelectAction.h> #include <KoTextZoomHandler.h> #include <Kolinestyleaction.h> @@ -131,13 +131,13 @@ #include "KPrTextDocument.h" #include <KoChangeCaseDia.h> -#include <qregexp.h> +#include <tqregexp.h> #include <KoSearchDia.h> #include "KPrFindReplace.h" #include "KPrVariableCollection.h" #include "KPrCanvas.h" -#include <qpaintdevicemetrics.h> +#include <tqpaintdevicemetrics.h> #include <KoStyleCollection.h> #include "KPrStyleManager.h" #include "KPrPixmapObject.h" @@ -268,7 +268,7 @@ static bool isDPMSEnabled() return result; } -KPrView::KPrView( KPrDocument* _doc, QWidget *_parent, const char *_name ) +KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) : KoView( _doc, _parent, _name ) { @@ -292,8 +292,8 @@ KPrView::KPrView( KPrDocument* _doc, QWidget *_parent, const char *_name ) presDurationDia = 0; v_ruler = 0; h_ruler = 0; - pen = KoPen( black, 1.0, SolidLine ); - brush = QBrush( white, SolidPattern ); + pen = KoPen( black, 1.0, Qt::SolidLine ); + brush = TQBrush( white, SolidPattern ); lineBegin = L_NORMAL; lineEnd = L_NORMAL; gColor1 = red; @@ -333,7 +333,7 @@ KPrView::KPrView( KPrDocument* _doc, QWidget *_parent, const char *_name ) checkConcavePolygon = false; cornersValue = 3; sharpnessValue = 0; - tbAlign = Qt::AlignLeft; + tbAlign = TQt::AlignLeft; tbFont = font(); tbColor = black; @@ -364,41 +364,41 @@ KPrView::KPrView( KPrDocument* _doc, QWidget *_parent, const char *_name ) if ( shell() ) changeNbOfRecentFiles( m_pKPresenterDoc->maxRecentFiles() ); - connect(this, SIGNAL(embeddImage(const QString &)), SLOT(insertPicture(const QString &))); - connect( m_pKPresenterDoc, SIGNAL( sig_refreshMenuCustomVariable()), - this, SLOT( refreshCustomMenu())); + connect(TQT_TQOBJECT(this), TQT_SIGNAL(embeddImage(const TQString &)), TQT_SLOT(insertPicture(const TQString &))); + connect( m_pKPresenterDoc, TQT_SIGNAL( sig_refreshMenuCustomVariable()), + TQT_TQOBJECT(this), TQT_SLOT( refreshCustomMenu())); // Cut and copy are directly connected to the selectionChanged signal if ( m_pKPresenterDoc->isReadWrite() ) - connect( m_canvas, SIGNAL(selectionChanged(bool)), - this, SLOT(slotChangeCutState(bool )/*setEnabled(bool)*/) ); + connect( m_canvas, TQT_SIGNAL(selectionChanged(bool)), + TQT_TQOBJECT(this), TQT_SLOT(slotChangeCutState(bool )/*setEnabled(bool)*/) ); else actionEditCut->setEnabled( false ); - connect( m_canvas, SIGNAL(selectionChanged(bool)), - actionEditCopy, SLOT(setEnabled(bool)) ); + connect( m_canvas, TQT_SIGNAL(selectionChanged(bool)), + actionEditCopy, TQT_SLOT(setEnabled(bool)) ); - connect (m_canvas, SIGNAL(selectionChanged(bool)), - actionChangeCase, SLOT(setEnabled(bool))); - //connect (m_canvas, SIGNAL(selectionChanged(bool)), - // actionCreateStyleFromSelection, SLOT(setEnabled(bool))); + connect (m_canvas, TQT_SIGNAL(selectionChanged(bool)), + actionChangeCase, TQT_SLOT(setEnabled(bool))); + //connect (m_canvas, TQT_SIGNAL(selectionChanged(bool)), + // actionCreateStyleFromSelection, TQT_SLOT(setEnabled(bool))); - connect( m_canvas, SIGNAL( currentObjectEditChanged() ), this, SLOT( slotObjectEditChanged())); + connect( m_canvas, TQT_SIGNAL( currentObjectEditChanged() ), this, TQT_SLOT( slotObjectEditChanged())); - connect( h_ruler, SIGNAL( tabListChanged( const KoTabulatorList & ) ), this, - SLOT( tabListChanged( const KoTabulatorList & ) ) ); + connect( h_ruler, TQT_SIGNAL( tabListChanged( const KoTabulatorList & ) ), this, + TQT_SLOT( tabListChanged( const KoTabulatorList & ) ) ); //statusbar stuff - connect( m_pKPresenterDoc, SIGNAL( pageNumChanged() ), this, SLOT( pageNumChanged()) ); - connect( this, SIGNAL( currentPageChanged(int) ), this, SLOT( pageNumChanged()) ); - connect( m_canvas, SIGNAL( objectSizeChanged() ), this, SLOT( updateObjectStatusBarItem() )); - connect( m_canvas, SIGNAL( objectSelectedChanged() ), this, SLOT( updateObjectStatusBarItem() )); - connect (m_pKPresenterDoc, SIGNAL(sig_updateRuler()),this, SLOT( slotUpdateRuler())); - connect (m_pKPresenterDoc, SIGNAL(sig_updateRuler()),this, SLOT( slotUpdateScrollBarRanges())); - connect (m_pKPresenterDoc, SIGNAL(sig_updateMenuBar()),this, SLOT(updateSideBarMenu())); - connect (m_pKPresenterDoc, SIGNAL(unitChanged(KoUnit::Unit)),this, SLOT(slotUnitChanged(KoUnit::Unit))); - connect( m_pKPresenterDoc, SIGNAL( modified( bool ) ), this, SLOT( documentModified( bool )) ); - connect( m_pKPresenterDoc, SIGNAL(completed()), this, SLOT(loadingFinished())); + connect( m_pKPresenterDoc, TQT_SIGNAL( pageNumChanged() ), TQT_TQOBJECT(this), TQT_SLOT( pageNumChanged()) ); + connect( TQT_TQOBJECT(this), TQT_SIGNAL( currentPageChanged(int) ), TQT_TQOBJECT(this), TQT_SLOT( pageNumChanged()) ); + connect( m_canvas, TQT_SIGNAL( objectSizeChanged() ), TQT_TQOBJECT(this), TQT_SLOT( updateObjectStatusBarItem() )); + connect( m_canvas, TQT_SIGNAL( objectSelectedChanged() ), TQT_TQOBJECT(this), TQT_SLOT( updateObjectStatusBarItem() )); + connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateRuler()),TQT_TQOBJECT(this), TQT_SLOT( slotUpdateRuler())); + connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateRuler()),TQT_TQOBJECT(this), TQT_SLOT( slotUpdateScrollBarRanges())); + connect (m_pKPresenterDoc, TQT_SIGNAL(sig_updateMenuBar()),TQT_TQOBJECT(this), TQT_SLOT(updateSideBarMenu())); + connect (m_pKPresenterDoc, TQT_SIGNAL(unitChanged(KoUnit::Unit)),TQT_TQOBJECT(this), TQT_SLOT(slotUnitChanged(KoUnit::Unit))); + connect( m_pKPresenterDoc, TQT_SIGNAL( modified( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( documentModified( bool )) ); + connect( m_pKPresenterDoc, TQT_SIGNAL(completed()), TQT_TQOBJECT(this), TQT_SLOT(loadingFinished())); KStatusBar * sb = statusBar(); m_sbPageLabel = 0L; @@ -409,24 +409,24 @@ KPrView::KPrView( KPrDocument* _doc, QWidget *_parent, const char *_name ) if ( sb ) // No statusbar in e.g. konqueror { - m_sbPageLabel = new KStatusBarLabel( QString::null, 0, sb ); - m_sbPageLabel->setAlignment( AlignLeft | AlignVCenter ); + m_sbPageLabel = new KStatusBarLabel( TQString(), 0, sb ); + m_sbPageLabel->tqsetAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbPageLabel, 0 ); m_sbModifiedLabel = new KStatusBarLabel( " ", 0, sb ); - m_sbModifiedLabel->setAlignment( AlignLeft | AlignVCenter ); + m_sbModifiedLabel->tqsetAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbModifiedLabel, 0 ); - m_sbObjectLabel = new KStatusBarLabel( QString::null, 0, sb ); - m_sbObjectLabel->setAlignment( AlignLeft | AlignVCenter ); + m_sbObjectLabel = new KStatusBarLabel( TQString(), 0, sb ); + m_sbObjectLabel->tqsetAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbObjectLabel, 1 ); - m_sbZoomLabel = new KStatusBarLabel( ' ' + QString::number( m_pKPresenterDoc->zoomHandler()->zoom() ) + "% ", 0, sb ); - m_sbZoomLabel->setAlignment( AlignHCenter | AlignVCenter ); + m_sbZoomLabel = new KStatusBarLabel( ' ' + TQString::number( m_pKPresenterDoc->zoomHandler()->zoom() ) + "% ", 0, sb ); + m_sbZoomLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbZoomLabel, 0 ); m_sbUnitLabel = new KStatusBarLabel( ' ' + KoUnit::unitDescription( m_pKPresenterDoc->unit() ) + ' ', 0, sb ); - m_sbUnitLabel->setAlignment( AlignHCenter | AlignVCenter ); + m_sbUnitLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); addStatusBarItem( m_sbUnitLabel, 0 ); } @@ -502,12 +502,12 @@ void KPrView::setupPrinter( KPrinter &prt ) prt.setFromTo( 1, m_pKPresenterDoc->getPageNums() ); prt.setOption( "kde-range", m_pKPresenterDoc->selectedForPrinting() ); prt.setPageSelection(KPrinter::ApplicationSide); - KoPageLayout layout = m_pKPresenterDoc->pageLayout(); - prt.setOption( "kde-margin-top", QString::number(layout.ptTop) ); - prt.setOption( "kde-margin-bottom", QString::number(layout.ptBottom) ); - prt.setOption( "kde-margin-left", QString::number(layout.ptLeft) ); - prt.setOption( "kde-margin-right", QString::number(layout.ptRight) ); - KoFormat pageFormat = layout.format; + KoPageLayout tqlayout = m_pKPresenterDoc->pageLayout(); + prt.setOption( "kde-margin-top", TQString::number(tqlayout.ptTop) ); + prt.setOption( "kde-margin-bottom", TQString::number(tqlayout.ptBottom) ); + prt.setOption( "kde-margin-left", TQString::number(tqlayout.ptLeft) ); + prt.setOption( "kde-margin-right", TQString::number(tqlayout.ptRight) ); + KoFormat pageFormat = tqlayout.format; prt.setPageSize( static_cast<KPrinter::PageSize>( KoPageFormat::printerPageSize( pageFormat ) ) ); if ( m_pKPresenterDoc->pageLayout().orientation == PG_LANDSCAPE || pageFormat == PG_SCREEN ) @@ -551,7 +551,7 @@ void KPrView::print( KPrinter &prt ) m_pKPresenterDoc->recalcVariables( VT_ALL ); } - QPaintDeviceMetrics metrics( &prt ); + TQPaintDeviceMetrics metrics( &prt ); unZoomDocument(dpiX,dpiY); if ( m_pKPresenterDoc->pageLayout().format == PG_SCREEN ) { @@ -559,15 +559,15 @@ void KPrView::print( KPrinter &prt ) top_margin = 15.0; } - QPainter painter; + TQPainter painter; painter.begin( &prt ); - QRect rect = m_pKPresenterDoc->pageList().at( 0 )->getZoomPageRect(); - double zoom = QMIN( double( metrics.width() ) / double( rect.width() ), + TQRect rect = m_pKPresenterDoc->pageList().at( 0 )->getZoomPageRect(); + double zoom = TQMIN( double( metrics.width() ) / double( rect.width() ), double( metrics.height() ) / double( rect.height() ) ); double newZoom = zoom * m_pKPresenterDoc->zoomHandler()->zoom(); kdDebug(33001) << "KPrView::print newZoom = " << newZoom << endl; setZoom( int( newZoom ), false ); - QRect paintingRect = m_pKPresenterDoc->pageList().at( 0 )->getZoomPageRect(); + TQRect paintingRect = m_pKPresenterDoc->pageList().at( 0 )->getZoomPageRect(); m_canvas->print( &painter, &prt, left_margin, top_margin ); painter.end(); @@ -579,9 +579,9 @@ void KPrView::print( KPrinter &prt ) m_pKPresenterDoc->recalcVariables( VT_ALL ); } - m_canvas->repaint(); + m_canvas->tqrepaint(); kdDebug(33001) << "KPrView::print zoom&res reset" << endl; - m_pKPresenterDoc->getVariableCollection()->variableSetting()->setLastPrintingDate(QDateTime::currentDateTime()); + m_pKPresenterDoc->getVariableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::tqcurrentDateTime()); m_pKPresenterDoc->recalcVariables( VT_DATE ); } @@ -620,7 +620,7 @@ void KPrView::editPaste() if ( !m_canvas->currentTextObjectView() ) { m_canvas->setToolEditMode( TEM_MOUSE ); deSelectAllObjects(); - QMimeSource *data = QApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::tqclipboard()->data(); if ( data->provides( "text/uri-list" ) ) { m_pKPresenterDoc->pastePage( data, currPg ); @@ -632,7 +632,7 @@ void KPrView::editPaste() { // TODO: it would be nice to have no offset when pasting onto a different page... m_canvas->activePage()->pasteObjs( - data->encodedData(KoStoreDrag::mimeType("application/x-kpresenter")), + data->tqencodedData(KoStoreDrag::mimeType("application/x-kpresenter")), 1, 0.0, 0.0, 0.0, 20.0, 20.0); m_canvas->setMouseSelectedObject(true); @@ -644,14 +644,14 @@ void KPrView::editPaste() //TODO : fix me !! // TODO: it would be nice to have no offset when pasting onto a different page... //m_canvas->activePage()->pasteObjs( - //data->encodedData(KoStoreDrag::mimeType("application/vnd.oasis.opendocument.presentation")), + //data->tqencodedData(KoStoreDrag::mimeType("application/vnd.oasis.opendocument.presentation")), //1, 0.0, 0.0, 0.0, 20.0, 20.0); m_canvas->setMouseSelectedObject(true); emit objectSelectedChanged(); } #endif - else if (QImageDrag::canDecode (data)) { + else if (TQImageDrag::canDecode (data)) { m_canvas->dropImage( data ); } } else { @@ -719,31 +719,31 @@ void KPrView::insertPage() { InsertPageDia dia( this, 0, TRUE ); #if COPYOASISFORMAT - QString templ = locateLocal( "data", "kpresenter/default.oop" ); + TQString templ = locateLocal( "data", "kpresenter/default.oop" ); #else - QString templ = locateLocal( "data", "kpresenter/default.kpr" ); + TQString templ = locateLocal( "data", "kpresenter/default.kpr" ); #endif - if ( !QFile::exists( templ ) ) { + if ( !TQFile::exists( templ ) ) { dia.radioDifferent->setChecked( TRUE ); dia.radioDefault->setEnabled( FALSE ); } - if ( dia.exec() != QDialog::Accepted ) + if ( dia.exec() != TQDialog::Accepted ) return; if (dia.radioCurrentDefault->isChecked()) { #if COPYOASISFORMAT - QString file = locateLocal( "data", "kpresenter/default.oop" ); + TQString file = locateLocal( "data", "kpresenter/default.oop" ); m_pKPresenterDoc->savePage( file, currPg, true /*ignore stickies*/ ); #else - QString file = locateLocal( "data", "kpresenter/default.kpr" ); + TQString file = locateLocal( "data", "kpresenter/default.kpr" ); m_pKPresenterDoc->savePage( file, currPg, true /*ignore stickies*/ ); #endif } InsertPos pos = (InsertPos)dia.locationCombo->currentItem(); m_pKPresenterDoc->insertNewPage( i18n("Insert new slide"), currPg, pos, - dia.radioDifferent->isChecked(), QString::null ); + dia.radioDifferent->isChecked(), TQString() ); setRanges(); } @@ -752,17 +752,17 @@ void KPrView::insertPicture() m_canvas->setToolEditMode( INS_PICTURE ); deSelectAllObjects(); - QStringList mimetypes; + TQStringList mimetypes; mimetypes += KImageIO::mimeTypes( KImageIO::Reading ); mimetypes += KoPictureFilePreview::clipartMimeTypes(); - KFileDialog fd( m_pKPresenterDoc->picturePath(), QString::null, this, 0, true ); + KFileDialog fd( m_pKPresenterDoc->picturePath(), TQString(), this, 0, true ); fd.setCaption( i18n( "Insert Picture" ) ); fd.setMimeFilter( mimetypes ); fd.setPreviewWidget( new KoPictureFilePreview( &fd ) ); KURL url; - if ( fd.exec() == QDialog::Accepted ) + if ( fd.exec() == TQDialog::Accepted ) url = fd.selectedURL(); if( url.isEmpty() || !url.isValid() ) @@ -770,7 +770,7 @@ void KPrView::insertPicture() m_canvas->setToolEditMode( TEM_MOUSE, false ); return; } - QString file; + TQString file; if ( !KIO::NetAccess::download( url, file, this ) ) { m_canvas->setToolEditMode( TEM_MOUSE, false ); @@ -781,7 +781,7 @@ void KPrView::insertPicture() m_canvas->activePage()->setInsPictureFile( file ); } -void KPrView::insertPicture(const QString &file) +void KPrView::insertPicture(const TQString &file) { m_canvas->setToolEditMode( INS_PICTURE ); deSelectAllObjects(); @@ -795,34 +795,34 @@ void KPrView::savePicture() m_canvas->savePicture(); } -void KPrView::savePicture( const QString& oldName, KoPicture& picture) +void KPrView::savePicture( const TQString& oldName, KoPicture& picture) { - QString oldFile(oldName); + TQString oldFile(oldName); KURL url; url.setPath( oldFile ); - if (!QDir(url.directory()).exists()) + if (!TQDir(url.directory()).exists()) oldFile = url.fileName(); - QString mimetype=picture.getMimeType(); + TQString mimetype=picture.getMimeType(); kdDebug(33001) << "Picture has mime type: " << mimetype << endl; - QStringList mimetypes; + TQStringList mimetypes; mimetypes << mimetype; - KFileDialog fd( oldFile, QString::null, this, 0, TRUE ); + KFileDialog fd( oldFile, TQString(), this, 0, TRUE ); fd.setMimeFilter( mimetypes ); fd.setCaption(i18n("Save Picture")); fd.setOperationMode(KFileDialog::Saving); - if ( fd.exec() == QDialog::Accepted ) + if ( fd.exec() == TQDialog::Accepted ) { url = fd.selectedURL(); if ( url.isValid() ) { if ( url.isLocalFile() ) { - QFile file( url.path() ); + TQFile file( url.path() ); if ( file.open( IO_ReadWrite ) ) { - picture.save( &file ); + picture.save( TQT_TQIODEVICE(&file) ); file.close(); } else @@ -838,15 +838,15 @@ void KPrView::savePicture( const QString& oldName, KoPicture& picture) tempFile.setAutoDelete( true ); if ( tempFile.status() == 0 ) { - QFile file( tempFile.name() ); + TQFile file( tempFile.name() ); if ( file.open( IO_ReadWrite ) ) { - picture.save( &file ); + picture.save( TQT_TQIODEVICE(&file) ); file.close(); if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) ) { KMessageBox::sorry( this, i18n( - "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ), + "Unable to save the file to '%1'. %2.").tqarg( url.prettyURL() ).tqarg( KIO::NetAccess::lastErrorString() ), i18n("Save Failed") ); } } @@ -857,7 +857,7 @@ void KPrView::savePicture( const QString& oldName, KoPicture& picture) } else KMessageBox::sorry( this, i18n( - "Error during saving: could not create temporary file: %1.").arg( strerror( tempFile.status() ) ), + "Error during saving: could not create temporary file: %1.").tqarg( strerror( tempFile.status() ) ), i18n("Save Picture") ); } } @@ -866,7 +866,7 @@ void KPrView::savePicture( const QString& oldName, KoPicture& picture) void KPrView::savePicture( KPrPixmapObject* obj ) { - QString oldFile=obj->getFileName(); + TQString oldFile=obj->getFileName(); KoPicture picture(obj->picture()); savePicture(oldFile, picture); } @@ -1074,14 +1074,14 @@ void KPrView::toolsAutoform() afChoose->resize( 400, 300 ); afChoose->setCaption( i18n( "Insert Autoform" ) ); - QObject::connect( afChoose, SIGNAL( formChosen( const QString & ) ), - this, SLOT( afChooseOk( const QString & ) ) ); - QObject::connect( afChoose, SIGNAL( afchooseCanceled()), - this,SLOT(slotAfchooseCanceled())); + TQObject::connect( afChoose, TQT_SIGNAL( formChosen( const TQString & ) ), + TQT_TQOBJECT(this), TQT_SLOT( afChooseOk( const TQString & ) ) ); + TQObject::connect( afChoose, TQT_SIGNAL( afchooseCanceled()), + TQT_TQOBJECT(this), TQT_SLOT(slotAfchooseCanceled())); afChoose->exec(); - QObject::disconnect( afChoose, SIGNAL( formChosen( const QString & ) ), - this, SLOT( afChooseOk( const QString & ) ) ); + TQObject::disconnect( afChoose, TQT_SIGNAL( formChosen( const TQString & ) ), + TQT_TQOBJECT(this), TQT_SLOT( afChooseOk( const TQString & ) ) ); delete afChoose; afChoose = 0; } @@ -1128,7 +1128,7 @@ void KPrView::toolsPolyline() void KPrView::toolsQuadricBezierCurve() { if ( actionToolsQuadricBezierCurve->isChecked() ) { - m_canvas->setToolEditMode( INS_QUADRICBEZIERCURVE, false ); + m_canvas->setToolEditMode( INS_TQUADRICBEZIERCURVE, false ); deSelectAllObjects(); m_currentLineTool = LtQuadricBezier; actionToolsLinePopup->setIcon("quadricbeziercurve"); @@ -1207,7 +1207,7 @@ void KPrView::toolsClosedPolyline() void KPrView::toolsClosedQuadricBezierCurve() { if ( actionToolsClosedQuadricBezierCurve->isChecked() ) { - m_canvas->setToolEditMode( INS_CLOSED_QUADRICBEZIERCURVE, false ); + m_canvas->setToolEditMode( INS_CLOSED_TQUADRICBEZIERCURVE, false ); deSelectAllObjects(); m_currentClosedLineTool = CltQuadricBezier; actionToolsClosedLinePopup->setIcon("closed_quadricbeziercurve"); @@ -1235,9 +1235,9 @@ void KPrView::extraProperties() m_propertyEditor = new KPrPropertyEditor( this, "KPrPropertyEditor", m_canvas->activePage(), m_pKPresenterDoc ); m_propertyEditor->setCaption( i18n( "Properties" ) ); - connect( m_propertyEditor, SIGNAL( propertiesOk() ), this, SLOT( propertiesOk() ) ); + connect( m_propertyEditor, TQT_SIGNAL( propertiesOk() ), TQT_TQOBJECT(this), TQT_SLOT( propertiesOk() ) ); m_propertyEditor->exec(); - disconnect( m_propertyEditor, SIGNAL( propertiesOk() ), this, SLOT( propertiesOk() ) ); + disconnect( m_propertyEditor, TQT_SIGNAL( propertiesOk() ), TQT_TQOBJECT(this), TQT_SLOT( propertiesOk() ) ); delete m_propertyEditor; m_propertyEditor = 0; @@ -1260,7 +1260,7 @@ void KPrView::extraRotate() if ( m_canvas->numberOfObjectSelected() > 0 ) { if ( !rotateDia ) { rotateDia = new KPrRotationDialogImpl( this ); - connect( rotateDia, SIGNAL( apply() ), this, SLOT( rotateOk() ) ); + connect( rotateDia, TQT_SIGNAL( apply() ), TQT_TQOBJECT(this), TQT_SLOT( rotateOk() ) ); } rotateDia->setAngle( m_canvas->getSelectedObj()->getAngle() ); m_canvas->setToolEditMode( TEM_MOUSE ); @@ -1274,8 +1274,8 @@ void KPrView::extraShadow() if ( !shadowDia ) { shadowDia = new KPrShadowDialogImpl( this ); - shadowDia->resize( shadowDia->minimumSize() ); - connect( shadowDia, SIGNAL( apply() ), this, SLOT( shadowOk() ) ); + shadowDia->resize( shadowDia->tqminimumSize() ); + connect( shadowDia, TQT_SIGNAL( apply() ), TQT_TQOBJECT(this), TQT_SLOT( shadowOk() ) ); } KPrObject *object=m_canvas->getSelectedObj(); @@ -1305,10 +1305,10 @@ void KPrView::extraBackground() page->getBackYFactor( ), page ); backDia->setCaption( i18n( "Slide Background" ) ); - QObject::connect( backDia, SIGNAL( backOk( KPrBackDialog*, bool ) ), this, SLOT( backOk( KPrBackDialog*, bool ) ) ) ; + TQObject::connect( backDia, TQT_SIGNAL( backOk( KPrBackDialog*, bool ) ), TQT_TQOBJECT(this), TQT_SLOT( backOk( KPrBackDialog*, bool ) ) ) ; backDia->exec(); - QObject::disconnect( backDia, SIGNAL( backOk( KPrBackDialog*, bool ) ), this, SLOT( backOk( KPrBackDialog*, bool ) ) ); + TQObject::disconnect( backDia, TQT_SIGNAL( backOk( KPrBackDialog*, bool ) ), TQT_TQOBJECT(this), TQT_SLOT( backOk( KPrBackDialog*, bool ) ) ); delete backDia; } @@ -1339,13 +1339,13 @@ void KPrView::extraCreateTemplate() { int width = 60; int height = 60; - QPixmap pix = m_pKPresenterDoc->generatePreview(QSize(width, height)); + TQPixmap pix = m_pKPresenterDoc->generatePreview(TQSize(width, height)); #if COPYOASISFORMAT - KTempFile tempFile( QString::null, ".otp" ); + KTempFile tempFile( TQString(), ".otp" ); tempFile.setAutoDelete( true ); m_pKPresenterDoc->savePage( tempFile.name(), getCurrPgNum() - 1); #else - KTempFile tempFile( QString::null, ".kpt" ); + KTempFile tempFile( TQString(), ".kpt" ); tempFile.setAutoDelete( true ); m_pKPresenterDoc->savePage( tempFile.name(), getCurrPgNum() - 1); #endif @@ -1360,10 +1360,10 @@ void KPrView::extraCreateTemplate() void KPrView::extraDefaultTemplate() { #if COPYOASISFORMAT - QString file = locateLocal( "data", "kpresenter/default.oop" ); + TQString file = locateLocal( "data", "kpresenter/default.oop" ); m_pKPresenterDoc->savePage( file, currPg ); #else - QString file = locateLocal( "data", "kpresenter/default.kpr" ); + TQString file = locateLocal( "data", "kpresenter/default.kpr" ); m_pKPresenterDoc->savePage( file, currPg ); #endif } @@ -1374,7 +1374,7 @@ void KPrView::extraWebPres() return; KURL url; - QString config = QString::null; + TQString config = TQString(); int ret =KMessageBox::questionYesNoCancel( this, i18n( "Do you want to load a previously saved configuration" " which will be used for this HTML Presentation?" ), @@ -1383,7 +1383,7 @@ void KPrView::extraWebPres() return; else if ( ret == KMessageBox::Yes ) { - url = KFileDialog::getOpenURL( QString::null, i18n("*.kpweb|KPresenter HTML Presentation (*.kpweb)"), this ); + url = KFileDialog::getOpenURL( TQString(), i18n("*.kpweb|KPresenter HTML Presentation (*.kpweb)"), this ); if( url.isEmpty() ) return; @@ -1411,14 +1411,14 @@ void KPrView::extraMSPres() void KPrView::extraLineBegin() { m_canvas->setToolEditMode( TEM_MOUSE ); - QPoint pnt( QCursor::pos() ); + TQPoint pnt( TQCursor::pos() ); rb_lbegin->popup( pnt ); } void KPrView::extraLineEnd() { m_canvas->setToolEditMode( TEM_MOUSE ); - QPoint pnt( QCursor::pos() ); + TQPoint pnt( TQCursor::pos() ); rb_lend->popup( pnt ); } @@ -1453,10 +1453,10 @@ void KPrView::screenConfigPages() delete pgConfDia; pgConfDia = new KPrPgConfDia( this, kPresenterDoc() ); pgConfDia->setCaption( i18n( "Configure Slide Show" ) ); - QObject::connect( pgConfDia, SIGNAL( pgConfDiaOk() ), this, SLOT( pgConfOk() ) ); + TQObject::connect( pgConfDia, TQT_SIGNAL( pgConfDiaOk() ), TQT_TQOBJECT(this), TQT_SLOT( pgConfOk() ) ); pgConfDia->exec(); - QObject::disconnect( pgConfDia, SIGNAL( pgConfDiaOk() ), this, SLOT( pgConfOk() ) ); + TQObject::disconnect( pgConfDia, TQT_SIGNAL( pgConfDiaOk() ), TQT_TQOBJECT(this), TQT_SLOT( pgConfOk() ) ); delete pgConfDia; pgConfDia = 0; } @@ -1472,7 +1472,7 @@ void KPrView::screenAssignEffect() { m_canvas->setToolEditMode( TEM_MOUSE ); - QPtrList<KPrObject> objs; + TQPtrList<KPrObject> objs; if ( m_canvas->canAssignEffect( objs ) ) { KPrEffectDia *effectDia = new KPrEffectDia( this, "Object Effect", objs, this ); effectDia->setCaption( i18n( "Object Effect" ) ); @@ -1504,30 +1504,30 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) m_canvas->setToolEditMode( TEM_MOUSE ); if ( m_canvas && !presStarted ) { - const QString xdgScreenSaver = KStandardDirs::findExe("xdg-screensaver"); + const TQString xdgScreenSaver = KStandardDirs::findExe("xdg-screensaver"); if (!xdgScreenSaver.isEmpty()) { KProcess proc; proc << xdgScreenSaver; proc << "suspend"; - proc << QString::number( topLevelWidget()->winId() ); + proc << TQString::number( tqtopLevelWidget()->winId() ); kdDebug() << k_funcinfo << proc.args() << endl; proc.start( KProcess::DontCare ); } else { - QByteArray data; - QByteArray replyData; - QCString replyType; + TQByteArray data; + TQByteArray replyData; + TQCString replyType; m_screenSaverWasEnabled = false; // is screensaver enabled? if (kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "isEnabled()", data, replyType, replyData) && replyType=="bool") { - QDataStream replyArg(replyData, IO_ReadOnly); + TQDataStream replyArg(replyData, IO_ReadOnly); replyArg >> m_screenSaverWasEnabled; kdDebug() << "Screensaver was enabled:" << m_screenSaverWasEnabled << endl; if ( m_screenSaverWasEnabled ) { // disable screensaver - QDataStream arg(data, IO_WriteOnly); + TQDataStream arg(data, IO_WriteOnly); arg << false; if (!kapp->dcopClient()->send("kdesktop", "KScreensaverIface", "enable(bool)", data)) kdWarning(33001) << "Couldn't disable screensaver (using dcop to kdesktop)!" << endl; @@ -1548,9 +1548,9 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) deSelectAllObjects(); presStarted = true; m_autoPresRestart = false; - QRect desk = KGlobalSettings::desktopGeometry(this); + TQRect desk = KGlobalSettings::desktopGeometry(this); kdDebug(33001) << "KPrView::startScreenPres desk=" << desk << endl; - QRect pgRect = kPresenterDoc()->pageList().at(0)->getZoomPageRect(); + TQRect pgRect = kPresenterDoc()->pageList().at(0)->getZoomPageRect(); kdDebug(33001) << "KPrView::startScreenPres pgRect=" << pgRect << endl; double zoomX = static_cast<double>( desk.width() ) / (double)pgRect.width(); @@ -1572,18 +1572,18 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) vert->setEnabled( false ); horz->setEnabled( false ); m_bShowGUI = false; - m_canvas->reparent( ( QWidget* )0L, 0, QPoint( 0, 0 ), FALSE ); - m_canvas->setPaletteBackgroundColor( Qt::white ); + m_canvas->reparent( ( TQWidget* )0L, 0, TQPoint( 0, 0 ), FALSE ); + m_canvas->setPaletteBackgroundColor( TQt::white ); m_canvas->showFullScreen(); - m_canvas->setFocusPolicy( QWidget::StrongFocus ); + m_canvas->setFocusPolicy( TQ_StrongFocus ); if ( !kPresenterDoc()->spManualSwitch() ) { m_autoPresStop = false; - m_pKPresenterDoc->repaint( false ); + m_pKPresenterDoc->tqrepaint( false ); if ( ! m_autoPresTimerConnected ) { - connect( &m_autoPresTimer, SIGNAL( timeout() ), SLOT( doAutomaticScreenPres() ) ); + connect( &m_autoPresTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( doAutomaticScreenPres() ) ); m_autoPresTimerConnected = true; } } @@ -1595,7 +1595,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) if ( kPresenterDoc()->presentationDuration() ) { m_duration.start(); - // ### make m_presentationDurationList a QMemArray or QValueVector + // ### make m_presentationDurationList a TQMemArray or TQValueVector for ( unsigned int i = 0; i < kPresenterDoc()->pageList().count(); ++i ) m_presentationDurationList.append( 0 ); // initialization } @@ -1609,7 +1609,7 @@ void KPrView::screenStop() m_canvas->stopSound(); m_canvas->showNormal(); m_canvas->hide(); - m_canvas->reparent( pageBase, 0, QPoint( 0, 0 ), true ); + m_canvas->reparent( pageBase, 0, TQPoint( 0, 0 ), true ); m_canvas->lower(); setCanvasXOffset( xOffsetSaved ); setCanvasYOffset( yOffsetSaved ); @@ -1626,22 +1626,22 @@ void KPrView::screenStop() horz->setEnabled( true ); m_bShowGUI = true; m_canvas->setMouseTracking( true ); - m_canvas->setBackgroundMode( Qt::NoBackground ); + m_canvas->setBackgroundMode( TQt::NoBackground ); - const QString xdgScreenSaver = KStandardDirs::findExe("xdg-screensaver"); + const TQString xdgScreenSaver = KStandardDirs::findExe("xdg-screensaver"); if (!xdgScreenSaver.isEmpty()) { KProcess proc; proc << xdgScreenSaver; proc << "resume"; - proc << QString::number( topLevelWidget()->winId() ); + proc << TQString::number( tqtopLevelWidget()->winId() ); kdDebug() << k_funcinfo << proc.args() << endl; proc.start( KProcess::DontCare ); } else { if ( m_screenSaverWasEnabled ) { // start screensaver again - QByteArray data; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data; + TQDataStream arg(data, IO_WriteOnly); arg << true; if (!kapp->dcopClient()->send("kdesktop", "KScreensaverIface", "enable(bool)", data)) kdWarning(33001) << "Couldn't re-enabled screensaver (using dcop to kdesktop)" << endl; @@ -1728,7 +1728,7 @@ void KPrView::sizeSelected( int size ) m_canvas->setFocus(); } -void KPrView::fontSelected( const QString &fontFamily ) +void KPrView::fontSelected( const TQString &fontFamily ) { tbFont.setFamily( fontFamily ); m_canvas->setTextFamily( fontFamily ); @@ -1774,7 +1774,7 @@ void KPrView::textAlignLeft() { if ( actionTextAlignLeft->isChecked() ) { - tbAlign = Qt::AlignLeft; + tbAlign = TQt::AlignLeft; m_canvas->setTextAlign( tbAlign ); } else @@ -1785,7 +1785,7 @@ void KPrView::textAlignCenter() { if ( actionTextAlignCenter->isChecked() ) { - tbAlign = Qt::AlignHCenter; + tbAlign = TQt::AlignHCenter; m_canvas->setTextAlign(tbAlign); } else @@ -1796,7 +1796,7 @@ void KPrView::textAlignRight() { if ( actionTextAlignRight->isChecked() ) { - tbAlign = Qt::AlignRight; + tbAlign = TQt::AlignRight; m_canvas->setTextAlign(tbAlign); } else @@ -1808,7 +1808,7 @@ void KPrView::textAlignBlock() { if ( actionTextAlignBlock->isChecked() ) { - tbAlign = Qt::AlignJustify; + tbAlign = TQt::AlignJustify; m_canvas->setTextAlign(tbAlign); } else @@ -1826,10 +1826,10 @@ void KPrView::textInsertPageNum() void KPrView::mtextFont() { KoTextFormatInterface* textIface = m_canvas->applicableTextInterfaces().first(); - QColor col; + TQColor col; if (textIface) col = textIface->textBackgroundColor(); - col = col.isValid() ? col : QApplication::palette().color( QPalette::Active, QColorGroup::Base ); + col = col.isValid() ? col : TQApplication::palette().color( TQPalette::Active, TQColorGroup::Base ); delete m_fontDlg; @@ -1837,8 +1837,8 @@ void KPrView::mtextFont() , m_broker , this, 0 ); - connect( m_fontDlg, SIGNAL( applyFont() ), - this, SLOT( slotApplyFont() ) ); + connect( m_fontDlg, TQT_SIGNAL( applyFont() ), + TQT_TQOBJECT(this), TQT_SLOT( slotApplyFont() ) ); m_fontDlg->exec(); delete m_fontDlg; @@ -1856,10 +1856,10 @@ void KPrView::slotApplyFont() void KPrView::slotCounterStyleSelected() { - QString actionName = QString::fromLatin1(sender()->name()); + TQString actionName = TQString::tqfromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); if ( actionName.startsWith( "counterstyle_" ) ) { - QString styleStr = actionName.mid(13); + TQString styleStr = actionName.mid(13); //kdDebug(33001) << "KWView::slotCounterStyleSelected styleStr=" << styleStr << endl; KoParagCounter::Style style = (KoParagCounter::Style)(styleStr.toInt()); KoParagCounter c; @@ -1869,7 +1869,7 @@ void KPrView::slotCounterStyleSelected() c.setNumbering( KoParagCounter::NUM_LIST ); c.setStyle( style ); if ( c.isBullet() ) - c.setSuffix( QString::null ); + c.setSuffix( TQString() ); // else the suffix remains the default, '.' // TODO save this setting, to use the last one selected in the dialog? // (same for custom bullet char etc.) @@ -1884,8 +1884,8 @@ void KPrView::slotCounterStyleSelected() } } - QPtrList<KoTextFormatInterface> lst = m_canvas->applicableTextInterfaces(); - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrList<KoTextFormatInterface> lst = m_canvas->applicableTextInterfaces(); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand* macroCmd = 0L; for ( ; it.current() ; ++it ) { @@ -1925,7 +1925,7 @@ void KPrView::textObjectToContents() void KPrView::penChosen() { - QColor c = actionPenColor->color(); + TQColor c = actionPenColor->color(); if ( !m_canvas->currentTextObjectView() ) { KCommand * cmd( getPenCmd( i18n( "Change Outline Color" ), KoPen(c), @@ -1944,16 +1944,16 @@ void KPrView::penChosen() void KPrView::brushChosen() { - QColor c = actionBrushColor->color(); + TQColor c = actionBrushColor->color(); KPrTextView *edit = m_canvas->currentTextObjectView(); if ( !edit ) { //tz TODO remove macro, add parameter for command name in setBrush() KMacroCommand * macro= NULL; KCommand * cmd = NULL; - QBrush newBrush( c ); + TQBrush newBrush( c ); - cmd = m_canvas->activePage()->setBrush( newBrush, FT_BRUSH, QColor(), QColor(), BCT_PLAIN, false, + cmd = m_canvas->activePage()->setBrush( newBrush, FT_BRUSH, TQColor(), TQColor(), BCT_PLAIN, false, 0, 0, KPrBrushCmd::BrushColor | KPrBrushCmd::BrushStyle | KPrBrushCmd::BrushGradientSelect ); if( cmd ) @@ -2146,49 +2146,49 @@ void KPrView::newPageLayout( const KoPageLayout &_layout ) void KPrView::updateRuler() { //update koruler - QRect r=m_canvas->activePage()->getZoomPageRect(); + TQRect r=m_canvas->activePage()->getZoomPageRect(); getHRuler()->setFrameStartEnd( r.left(), r.right()/*+m_canvas->diffx()*/ ); getVRuler()->setFrameStartEnd( r.top(), r.bottom()/*+m_canvas->diffy()*/ ); } void KPrView::createGUI() { - splitter = new QSplitter( this ); + splitter = new TQSplitter( this ); if ( !m_pKPresenterDoc->isEmbedded() && !m_pKPresenterDoc->isSingleViewMode() ) // No sidebar if the document is embedded { sidebar = new KPrSideBar( splitter, m_pKPresenterDoc, this ); - connect( sidebar, SIGNAL( movePage( int, int ) ), - m_pKPresenterDoc, SLOT( movePage( int, int ) ) ); - connect( sidebar, SIGNAL( selectPage( int, bool ) ), - m_pKPresenterDoc, SLOT( selectPage( int, bool ) ) ); - connect( sidebar, SIGNAL( showPage( int ) ), - this, SLOT( skipToPage( int ) ) ); + connect( sidebar, TQT_SIGNAL( movePage( int, int ) ), + m_pKPresenterDoc, TQT_SLOT( movePage( int, int ) ) ); + connect( sidebar, TQT_SIGNAL( selectPage( int, bool ) ), + m_pKPresenterDoc, TQT_SLOT( selectPage( int, bool ) ) ); + connect( sidebar, TQT_SIGNAL( showPage( int ) ), + TQT_TQOBJECT(this), TQT_SLOT( skipToPage( int ) ) ); // This sucks when resizing the window - //splitter->setResizeMode( sidebar, QSplitter::FollowSizeHint ); - //splitter->setResizeMode( pageBase, QSplitter::Stretch ); - splitter->setResizeMode( sidebar, QSplitter::KeepSize ); + //splitter->setResizeMode( sidebar, TQSplitter::FollowSizeHint ); + //splitter->setResizeMode( pageBase, TQSplitter::Stretch ); + splitter->setResizeMode( sidebar, TQSplitter::KeepSize ); } - QSplitter *splitterVertical = new QSplitter( QSplitter::Vertical, splitter ); + TQSplitter *splitterVertical = new TQSplitter( Qt::Vertical, splitter ); // setup page pageBase = new PageBase( splitterVertical, this ); - pageBase->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); + pageBase->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); m_canvas=new KPrCanvas( pageBase, "Canvas", this ); - QObject::connect( m_canvas, SIGNAL( fontChanged( const QFont & ) ), - this, SLOT( fontChanged( const QFont & ) ) ); - QObject::connect( m_canvas, SIGNAL( colorChanged( const QColor & ) ), - this, SLOT( colorChanged( const QColor & ) ) ); - QObject::connect( m_canvas, SIGNAL( alignChanged( int ) ), - this, SLOT( alignChanged( int ) ) ); - QObject::connect( m_canvas, SIGNAL( objectSelectedChanged()), - this, SLOT( objectSelectedChanged())); - QObject::connect( m_canvas, SIGNAL( sigMouseWheelEvent( QWheelEvent* ) ), - this, SLOT( getPageMouseWheelEvent( QWheelEvent* ) ) ); + TQObject::connect( m_canvas, TQT_SIGNAL( fontChanged( const TQFont & ) ), + TQT_TQOBJECT(this), TQT_SLOT( fontChanged( const TQFont & ) ) ); + TQObject::connect( m_canvas, TQT_SIGNAL( colorChanged( const TQColor & ) ), + TQT_TQOBJECT(this), TQT_SLOT( colorChanged( const TQColor & ) ) ); + TQObject::connect( m_canvas, TQT_SIGNAL( alignChanged( int ) ), + TQT_TQOBJECT(this), TQT_SLOT( alignChanged( int ) ) ); + TQObject::connect( m_canvas, TQT_SIGNAL( objectSelectedChanged()), + TQT_TQOBJECT(this), TQT_SLOT( objectSelectedChanged())); + TQObject::connect( m_canvas, TQT_SIGNAL( sigMouseWheelEvent( TQWheelEvent* ) ), + TQT_TQOBJECT(this), TQT_SLOT( getPageMouseWheelEvent( TQWheelEvent* ) ) ); // setup notebar. @@ -2207,23 +2207,23 @@ void KPrView::createGUI() if ( m_pKPresenterDoc && m_canvas ) { - QObject::connect( m_canvas, SIGNAL( stopAutomaticPresentation() ), this, SLOT( stopAutomaticPresentation() ) ); - QObject::connect( m_canvas, SIGNAL( restartPresentation() ), this, SLOT( restartPresentation() ) ); - - connect( getVRuler(), SIGNAL( addGuide( const QPoint &, bool, int ) ), - &( m_canvas->guideLines() ), SLOT( addGuide( const QPoint &, bool, int ) ) ); - connect( getVRuler(), SIGNAL( moveGuide( const QPoint &, bool, int ) ), - &( m_canvas->guideLines() ), SLOT( moveGuide( const QPoint &, bool, int ) ) ); - connect( getHRuler(), SIGNAL( addGuide( const QPoint &, bool, int ) ), - &( m_canvas->guideLines() ), SLOT( addGuide( const QPoint &, bool, int ) ) ); - connect( getHRuler(), SIGNAL( moveGuide( const QPoint &, bool, int ) ), - &( m_canvas->guideLines() ), SLOT( moveGuide( const QPoint &, bool, int ) ) ); - connect( &( m_canvas->guideLines() ), SIGNAL( moveGuides( bool ) ), - m_canvas, SLOT( setPaintGuides( bool ) ) ); - connect( &( m_canvas->guideLines() ), SIGNAL( paintGuides( bool ) ), - m_canvas, SLOT( setPaintGuides( bool ) ) ); - connect( &( m_canvas->guideLines() ), SIGNAL( guideLinesChanged( KoView * ) ), - m_pKPresenterDoc, SLOT( slotGuideLinesChanged( KoView * ) ) ); + TQObject::connect( m_canvas, TQT_SIGNAL( stopAutomaticPresentation() ), TQT_TQOBJECT(this), TQT_SLOT( stopAutomaticPresentation() ) ); + TQObject::connect( m_canvas, TQT_SIGNAL( restartPresentation() ), TQT_TQOBJECT(this), TQT_SLOT( restartPresentation() ) ); + + connect( getVRuler(), TQT_SIGNAL( addGuide( const TQPoint &, bool, int ) ), + &( m_canvas->guideLines() ), TQT_SLOT( addGuide( const TQPoint &, bool, int ) ) ); + connect( getVRuler(), TQT_SIGNAL( moveGuide( const TQPoint &, bool, int ) ), + &( m_canvas->guideLines() ), TQT_SLOT( moveGuide( const TQPoint &, bool, int ) ) ); + connect( getHRuler(), TQT_SIGNAL( addGuide( const TQPoint &, bool, int ) ), + &( m_canvas->guideLines() ), TQT_SLOT( addGuide( const TQPoint &, bool, int ) ) ); + connect( getHRuler(), TQT_SIGNAL( moveGuide( const TQPoint &, bool, int ) ), + &( m_canvas->guideLines() ), TQT_SLOT( moveGuide( const TQPoint &, bool, int ) ) ); + connect( &( m_canvas->guideLines() ), TQT_SIGNAL( moveGuides( bool ) ), + m_canvas, TQT_SLOT( setPaintGuides( bool ) ) ); + connect( &( m_canvas->guideLines() ), TQT_SIGNAL( paintGuides( bool ) ), + m_canvas, TQT_SLOT( setPaintGuides( bool ) ) ); + connect( &( m_canvas->guideLines() ), TQT_SIGNAL( guideLinesChanged( KoView * ) ), + m_pKPresenterDoc, TQT_SLOT( slotGuideLinesChanged( KoView * ) ) ); m_canvas->guideLines().setGuideLines( m_pKPresenterDoc->horizontalGuideLines(), m_pKPresenterDoc->verticalGuideLines() ); } @@ -2250,20 +2250,20 @@ void KPrView::createGUI() } else actionViewShowNoteBar->setChecked(true); // HACK This is needed to be able to calculate a good initial size for the notebar - QTimer::singleShot( 0, this, SLOT( initialLayoutOfSplitter() ) ); + TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( initialLayoutOfSplitter() ) ); } KPrPage *initPage=m_pKPresenterDoc->initialActivePage(); if ( !initPage ) m_pKPresenterDoc->pageList().at( 0 ); // first page - skipToPage( m_pKPresenterDoc->pageList().findRef( initPage ) ); + skipToPage( m_pKPresenterDoc->pageList().tqfindRef( initPage ) ); } void KPrView::initGui() { - tbColor = Qt::black; - actionTextColor->setCurrentColor( Qt::black ); - actionBrushColor->setCurrentColor( Qt::white ); - actionPenColor->setCurrentColor( Qt::black ); + tbColor = TQt::black; + actionTextColor->setCurrentColor( TQt::black ); + actionBrushColor->setCurrentColor( TQt::white ); + actionPenColor->setCurrentColor( TQt::black ); updateSideBarMenu(); objectSelectedChanged(); refreshPageButton(); @@ -2316,179 +2316,179 @@ void KPrView::guiActivateEvent( KParts::GUIActivateEvent *ev ) void KPrView::setupActions() { - actionEditCut = KStdAction::cut( this, SLOT( editCut() ), actionCollection(), "edit_cut" ); - actionEditCopy = KStdAction::copy( this, SLOT( editCopy() ), actionCollection(), "edit_copy" ); - actionEditPaste = KStdAction::paste( this, SLOT( editPaste() ), actionCollection(), "edit_paste" ); - connect( m_pKPresenterDoc, SIGNAL( enablePaste( bool ) ), - actionEditPaste, SLOT( setEnabled( bool ) ) ); + actionEditCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( editCut() ), actionCollection(), "edit_cut" ); + actionEditCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( editCopy() ), actionCollection(), "edit_copy" ); + actionEditPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( editPaste() ), actionCollection(), "edit_paste" ); + connect( m_pKPresenterDoc, TQT_SIGNAL( enablePaste( bool ) ), + actionEditPaste, TQT_SLOT( setEnabled( bool ) ) ); m_pKPresenterDoc->clipboardDataChanged(); // set paste's initial state - actionEditDelete = new KAction( i18n( "&Delete" ), "editdelete", CTRL + Qt::Key_Delete, - this, SLOT( editDelete() ), + actionEditDelete = new KAction( i18n( "&Delete" ), "editdelete", CTRL + TQt::Key_Delete, + TQT_TQOBJECT(this), TQT_SLOT( editDelete() ), actionCollection(), "edit_delete" ); - actionEditSelectAll = KStdAction::selectAll( this, SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); - actionEditDeSelectAll= KStdAction::deselect( this, SLOT( editDeSelectAll()), actionCollection(), "edit_deselectall"); + actionEditSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); + actionEditDeSelectAll= KStdAction::deselect( TQT_TQOBJECT(this), TQT_SLOT( editDeSelectAll()), actionCollection(), "edit_deselectall"); actionEditCopyPage = new KAction( i18n( "Copy Slide" ), "editcopy", - 0, this, SLOT( editCopyPage() ), + 0, TQT_TQOBJECT(this), TQT_SLOT( editCopyPage() ), actionCollection(), "edit_copypage" ); actionEditDuplicatePage = new KAction( i18n( "Duplicate Slide" ), "newslide", - 0, this, SLOT( editDuplicatePage() ), + 0, TQT_TQOBJECT(this), TQT_SLOT( editDuplicatePage() ), actionCollection(), "edit_duplicatepage" ); actionEditDelPage = new KAction( i18n( "Delete Slide" ), "delslide", 0, - this, SLOT( editDelPage() ), + TQT_TQOBJECT(this), TQT_SLOT( editDelPage() ), actionCollection(), "edit_delpage" ); - actionEditFind=KStdAction::find( this, SLOT( editFind() ), actionCollection(), "edit_find" ); - actionEditFindNext = KStdAction::findNext( this, SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); - actionEditFindPrevious = KStdAction::findPrev( this, SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); - actionEditReplace=KStdAction::replace( this, SLOT( editReplace() ), actionCollection(), "edit_replace" ); + actionEditFind=KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( editFind() ), actionCollection(), "edit_tqfind" ); + actionEditFindNext = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); + actionEditFindPrevious = KStdAction::findPrev( TQT_TQOBJECT(this), TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); + actionEditReplace=KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_tqreplace" ); // ---------------- View actions if ( !m_pKPresenterDoc->isEmbedded() ) { actionViewShowSideBar = new KToggleAction( i18n("Show Sidebar"), 0, - this, SLOT( viewShowSideBar() ), + TQT_TQOBJECT(this), TQT_SLOT( viewShowSideBar() ), actionCollection(), "view_showsidebar" ); actionViewShowSideBar->setCheckedState(i18n("Hide Sidebar")); actionViewShowNoteBar = new KToggleAction( i18n("Show Notebar"), 0, - this, SLOT( viewShowNoteBar() ), + TQT_TQOBJECT(this), TQT_SLOT( viewShowNoteBar() ), actionCollection(), "view_shownotebar" ); actionViewShowNoteBar->setCheckedState(i18n("Hide Notebar")); } actionViewFormattingChars = new KToggleAction( i18n( "&Formatting Characters" ), 0, - this, SLOT( slotViewFormattingChars() ), + TQT_TQOBJECT(this), TQT_SLOT( slotViewFormattingChars() ), actionCollection(), "view_formattingchars" ); actionViewFormattingChars->setToolTip( i18n( "Toggle the display of non-printing characters." ) ); actionViewFormattingChars->setWhatsThis( i18n( "Toggle the display of non-printing characters.<br><br>When this is enabled, KPresenter shows you tabs, spaces, carriage returns and other non-printing characters." ) ); actionViewSlideMaster = new KToggleAction( i18n( "Slide &Master" ), 0, - this, SLOT( viewSlideMaster() ), + TQT_TQOBJECT(this), TQT_SLOT( viewSlideMaster() ), actionCollection(), "view_master" ); actionViewShowGuideLine= new KToggleAction( i18n( "Guide Lines" ), 0, - this, SLOT( viewGuideLines() ), + TQT_TQOBJECT(this), TQT_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" ); actionViewShowGrid = new KToggleAction( i18n( "Show &Grid" ), 0, - this, SLOT( viewGrid() ), + TQT_TQOBJECT(this), TQT_SLOT( viewGrid() ), actionCollection(), "view_grid" ); actionViewShowGrid->setCheckedState(i18n("Hide &Grid")); actionViewSnapToGrid= new KToggleAction( i18n( "Snap to Grid" ), 0, - this, SLOT(viewSnapToGrid() ), + TQT_TQOBJECT(this), TQT_SLOT(viewSnapToGrid() ), actionCollection(), "view_snaptogrid" ); // ---------------- insert actions - actionInsertPage = new KAction( i18n( "&Slide..." ), "slide", Qt::Key_F2, - this, SLOT( insertPage() ), + actionInsertPage = new KAction( i18n( "&Slide..." ), "slide", TQt::Key_F2, + TQT_TQOBJECT(this), TQT_SLOT( insertPage() ), actionCollection(), "insert_page" ); new KAction( i18n( "Insert &Slide..." ), "newslide", 0, - this, SLOT( insertPage() ), + TQT_TQOBJECT(this), TQT_SLOT( insertPage() ), actionCollection(), "insert_page_popup" ); - actionInsertPicture = new KAction( i18n( "P&icture..." ), "frame_image", Qt::SHIFT+Qt::Key_F5, - this, SLOT( insertPicture() ), + actionInsertPicture = new KAction( i18n( "P&icture..." ), "frame_image", TQt::SHIFT+TQt::Key_F5, + TQT_TQOBJECT(this), TQT_SLOT( insertPicture() ), actionCollection(), "insert_picture" ); // ----------------- tools actions actionToolsMouse = new KToggleAction( i18n( "Select" ), "select", 0, - this, SLOT( toolsMouse() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsMouse() ), actionCollection(), "tools_mouse" ); actionToolsMouse->setExclusiveGroup( "tools" ); actionToolsMouse->setChecked( true ); actionToolsRotate = new KToggleAction( i18n( "&Rotate" ), "rotate", 0, - this, SLOT( toolsRotate() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsRotate() ), actionCollection(), "tools_rotate" ); actionToolsRotate->setExclusiveGroup( "tools" ); actionToolsZoom = new KToggleAction( i18n( "&Zoom" ), "viewmag", 0, - this, SLOT( toolsZoom() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsZoom() ), actionCollection(), "tools_zoom" ); actionToolsZoom->setExclusiveGroup( "tools" ); actionToolsShapePopup = new KActionMenu( i18n( "&Shape" ), "rectangle", - actionCollection(), "tools_shapepopup" ); + actionCollection(), "tools_tqshapepopup" ); actionToolsShapePopup->setDelayed(true); - connect(actionToolsShapePopup, SIGNAL(activated()), this, SLOT(toolsShapePopup())); + connect(actionToolsShapePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsShapePopup())); actionToolsRectangle = new KToggleAction( i18n( "&Rectangle" ), "rectangle", - 0, this, SLOT( toolsRectangle() ), + 0, TQT_TQOBJECT(this), TQT_SLOT( toolsRectangle() ), actionCollection(), "tools_rectangle" ); actionToolsRectangle->setExclusiveGroup( "tools" ); actionToolsCircleOrEllipse = new KToggleAction( i18n( "&Circle/Ellipse" ), "circle", - 0, this, SLOT( toolsCircleOrEllipse() ), + 0, TQT_TQOBJECT(this), TQT_SLOT( toolsCircleOrEllipse() ), actionCollection(), "tools_circle" ); actionToolsCircleOrEllipse->setExclusiveGroup( "tools" ); actionToolsPie = new KToggleAction( i18n( "&Pie/Arc/Chord" ), "pie", 0, - this, SLOT( toolsPie() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsPie() ), actionCollection(), "tools_pie" ); actionToolsPie->setExclusiveGroup( "tools" ); - actionToolsText = new KToggleAction( i18n( "&Text" ), "frame_text", Qt::Key_F10, // same shortcut as KWord - this, SLOT( toolsText() ), + actionToolsText = new KToggleAction( i18n( "&Text" ), "frame_text", TQt::Key_F10, // same shortcut as KWord + TQT_TQOBJECT(this), TQT_SLOT( toolsText() ), actionCollection(), "tools_text" ); actionToolsText->setExclusiveGroup( "tools" ); actionToolsAutoform = new KToggleAction( i18n( "&Arrows && Connections" ), "autoform", - 0, this, SLOT( toolsAutoform() ), + 0, TQT_TQOBJECT(this), TQT_SLOT( toolsAutoform() ), actionCollection(), "tools_autoform" ); actionToolsAutoform->setExclusiveGroup( "tools" ); actionToolsDiagramm = new KToggleAction( i18n( "&Chart" ), "frame_chart", 0, - this, SLOT( toolsDiagramm() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsDiagramm() ), actionCollection(), "tools_diagramm" ); actionToolsDiagramm->setExclusiveGroup( "tools" ); - actionToolsTable = new KToggleAction( i18n( "Ta&ble"), "frame_spreadsheet", Qt::Key_F5 /*same as kword*/, - this, SLOT( toolsTable() ), + actionToolsTable = new KToggleAction( i18n( "Ta&ble"), "frame_spreadsheet", TQt::Key_F5 /*same as kword*/, + TQT_TQOBJECT(this), TQT_SLOT( toolsTable() ), actionCollection(), "tools_table" ); actionToolsTable->setExclusiveGroup( "tools" ); actionToolsObject = new KoPartSelectAction( i18n( "&Object" ), "frame_query", - this, SLOT( toolsObject() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsObject() ), actionCollection(), "tools_object" ); actionToolsLinePopup = new KActionMenu( i18n( "&Line" ), "line", actionCollection(), "tools_linepopup" ); actionToolsLinePopup->setDelayed(true); - connect(actionToolsLinePopup, SIGNAL(activated()), this, SLOT(toolsLinePopup())); + connect(actionToolsLinePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsLinePopup())); actionToolsLine = new KToggleAction( i18n( "&Line" ), "line", 0, - this, SLOT( toolsLine() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsLine() ), actionCollection(), "tools_line" ); actionToolsLine->setExclusiveGroup( "tools" ); actionToolsFreehand = new KToggleAction( i18n( "&Freehand" ), "freehand", 0, - this, SLOT( toolsFreehand() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsFreehand() ), actionCollection(), "tools_freehand" ); actionToolsFreehand->setExclusiveGroup( "tools" ); actionToolsPolyline = new KToggleAction( i18n( "Po&lyline" ), "polyline", 0, - this, SLOT( toolsPolyline() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsPolyline() ), actionCollection(), "tools_polyline" ); actionToolsPolyline->setExclusiveGroup( "tools" ); actionToolsQuadricBezierCurve = new KToggleAction( i18n( "&Quadric Bezier Curve" ), "quadricbeziercurve", 0, - this, SLOT( toolsQuadricBezierCurve() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsQuadricBezierCurve() ), actionCollection(), "tools_quadricbeziercurve" ); actionToolsQuadricBezierCurve->setExclusiveGroup( "tools" ); actionToolsCubicBezierCurve = new KToggleAction( i18n( "C&ubic Bezier Curve" ), "cubicbeziercurve", 0, - this, SLOT( toolsCubicBezierCurve() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsCubicBezierCurve() ), actionCollection(), "tools_cubicbeziercurve" ); actionToolsCubicBezierCurve->setExclusiveGroup( "tools" ); actionToolsConvexOrConcavePolygon = new KToggleAction( i18n( "Co&nvex/Concave Polygon" ), "polygon", 0, - this, SLOT( toolsConvexOrConcavePolygon() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsConvexOrConcavePolygon() ), actionCollection(), "tools_polygon" ); actionToolsConvexOrConcavePolygon->setExclusiveGroup( "tools" ); @@ -2496,39 +2496,39 @@ void KPrView::setupActions() actionToolsClosedLinePopup = new KActionMenu( i18n( "&Closed Line" ), "closed_freehand", actionCollection(), "tools_closed_linepopup" ); actionToolsClosedLinePopup->setDelayed(true); - connect(actionToolsClosedLinePopup, SIGNAL(activated()), this, SLOT(toolsClosedLinePopup())); + connect(actionToolsClosedLinePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsClosedLinePopup())); actionToolsClosedFreehand = new KToggleAction( i18n( "Closed &Freehand" ), "closed_freehand", 0, - this, SLOT( toolsClosedFreehand() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsClosedFreehand() ), actionCollection(), "tools_closed_freehand" ); actionToolsClosedFreehand->setExclusiveGroup( "tools" ); actionToolsClosedPolyline = new KToggleAction( i18n( "Closed Po&lyline" ), "closed_polyline", 0, - this, SLOT( toolsClosedPolyline() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsClosedPolyline() ), actionCollection(), "tools_closed_polyline" ); actionToolsClosedPolyline->setExclusiveGroup( "tools" ); actionToolsClosedQuadricBezierCurve = new KToggleAction( i18n( "Closed &Quadric Bezier Curve" ), "closed_quadricbeziercurve", 0, - this, SLOT( toolsClosedQuadricBezierCurve() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsClosedQuadricBezierCurve() ), actionCollection(), "tools_closed_quadricbeziercurve" ); actionToolsClosedQuadricBezierCurve->setExclusiveGroup( "tools" ); actionToolsClosedCubicBezierCurve = new KToggleAction( i18n( "Closed C&ubic Bezier Curve" ), "closed_cubicbeziercurve", 0, - this, SLOT( toolsClosedCubicBezierCurve() ), + TQT_TQOBJECT(this), TQT_SLOT( toolsClosedCubicBezierCurve() ), actionCollection(), "tools_closed_cubicbeziercurve" ); actionToolsClosedCubicBezierCurve->setExclusiveGroup( "tools" ); // ----------------- text actions - actionTextFont = new KAction( i18n( "&Font..." ), 0, this, SLOT( mtextFont() ), + actionTextFont = new KAction( i18n( "&Font..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( mtextFont() ), actionCollection(), "text_font" ); actionTextFontSize = new KFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "text_fontsize" ); - connect( actionTextFontSize, SIGNAL( fontSizeChanged( int ) ), - this, SLOT( sizeSelected( int ) ) ); + connect( actionTextFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), + TQT_TQOBJECT(this), TQT_SLOT( sizeSelected( int ) ) ); #ifdef KFONTACTION_HAS_CRITERIA_ARG actionTextFontFamily = new KFontAction( KFontChooser::SmoothScalableFonts, @@ -2538,49 +2538,49 @@ void KPrView::setupActions() actionTextFontFamily = new KFontAction( i18n( "Font Family" ), 0, actionCollection(), "text_fontfamily" ); #endif - connect( actionTextFontFamily , SIGNAL( activated( const QString & ) ), - this, SLOT( fontSelected( const QString & ) ) ); + connect( actionTextFontFamily , TQT_SIGNAL( activated( const TQString & ) ), + TQT_TQOBJECT(this), TQT_SLOT( fontSelected( const TQString & ) ) ); - actionTextBold = new KToggleAction( i18n( "&Bold" ), "text_bold", CTRL + Qt::Key_B, - this, SLOT( textBold() ), + actionTextBold = new KToggleAction( i18n( "&Bold" ), "text_bold", CTRL + TQt::Key_B, + TQT_TQOBJECT(this), TQT_SLOT( textBold() ), actionCollection(), "text_bold" ); - actionTextItalic = new KToggleAction( i18n( "&Italic" ), "text_italic", CTRL + Qt::Key_I, - this, SLOT( textItalic() ), + actionTextItalic = new KToggleAction( i18n( "&Italic" ), "text_italic", CTRL + TQt::Key_I, + TQT_TQOBJECT(this), TQT_SLOT( textItalic() ), actionCollection(), "text_italic" ); - actionTextUnderline = new KToggleAction( i18n( "&Underline" ), "text_under", CTRL + Qt::Key_U, - this, SLOT( textUnderline() ), + actionTextUnderline = new KToggleAction( i18n( "&Underline" ), "text_under", CTRL + TQt::Key_U, + TQT_TQOBJECT(this), TQT_SLOT( textUnderline() ), actionCollection(), "text_underline" ); actionFormatStrikeOut = new KToggleAction( i18n( "&Strike Out" ), "text_strike", 0 , - this, SLOT( textStrikeOut() ), + TQT_TQOBJECT(this), TQT_SLOT( textStrikeOut() ), actionCollection(), "format_strike" ); actionTextColor = new TKSelectColorAction( i18n( "&Color..." ), TKSelectColorAction::TextColor, actionCollection(), "text_color" ,true); - connect( actionTextColor, SIGNAL( activated() ), SLOT( textColor() ) ); - actionTextColor->setDefaultColor(QColor()); + connect( actionTextColor, TQT_SIGNAL( activated() ), TQT_SLOT( textColor() ) ); + actionTextColor->setDefaultColor(TQColor()); - actionTextAlignLeft = new KToggleAction( i18n( "Align &Left" ), "text_left", ALT + Qt::Key_L, - this, SLOT( textAlignLeft() ), + actionTextAlignLeft = new KToggleAction( i18n( "Align &Left" ), "text_left", ALT + TQt::Key_L, + TQT_TQOBJECT(this), TQT_SLOT( textAlignLeft() ), actionCollection(), "text_alignleft" ); actionTextAlignLeft->setExclusiveGroup( "align" ); actionTextAlignLeft->setChecked( true ); - actionTextAlignCenter = new KToggleAction( i18n( "Align &Center" ), "text_center", ALT + Qt::Key_C, - this, SLOT( textAlignCenter() ), + actionTextAlignCenter = new KToggleAction( i18n( "Align &Center" ), "text_center", ALT + TQt::Key_C, + TQT_TQOBJECT(this), TQT_SLOT( textAlignCenter() ), actionCollection(), "text_aligncenter" ); actionTextAlignCenter->setExclusiveGroup( "align" ); - actionTextAlignRight = new KToggleAction( i18n( "Align &Right" ), "text_right", ALT + Qt::Key_R, - this, SLOT( textAlignRight() ), + actionTextAlignRight = new KToggleAction( i18n( "Align &Right" ), "text_right", ALT + TQt::Key_R, + TQT_TQOBJECT(this), TQT_SLOT( textAlignRight() ), actionCollection(), "text_alignright" ); actionTextAlignRight->setExclusiveGroup( "align" ); - actionTextAlignBlock = new KToggleAction( i18n( "Align &Block" ), "text_block", CTRL + Qt::Key_J, - this, SLOT( textAlignBlock() ), + actionTextAlignBlock = new KToggleAction( i18n( "Align &Block" ), "text_block", CTRL + TQt::Key_J, + TQT_TQOBJECT(this), TQT_SLOT( textAlignBlock() ), actionCollection(), "text_alignblock" ); actionTextAlignBlock->setExclusiveGroup( "align" ); @@ -2589,15 +2589,15 @@ void KPrView::setupActions() actionFormatNumber->setDelayed( false ); actionFormatBullet = new KActionMenu( i18n( "Bullet" ), "unsortedList", actionCollection(), "format_bullet" ); actionFormatBullet->setDelayed( false ); - QPtrList<KoCounterStyleWidget::StyleRepresenter> stylesList; + TQPtrList<KoCounterStyleWidget::StyleRepresenter> stylesList; KoCounterStyleWidget::makeCounterRepresenterList( stylesList ); - QPtrListIterator<KoCounterStyleWidget::StyleRepresenter> styleIt( stylesList ); + TQPtrListIterator<KoCounterStyleWidget::StyleRepresenter> styleIt( stylesList ); for ( ; styleIt.current() ; ++styleIt ) { // Dynamically create toggle-actions for each list style. // This approach allows to edit toolbars and extract separate actions from this menu KToggleAction* act = new KToggleAction( styleIt.current()->name(), /*TODO icon,*/ - 0, this, SLOT( slotCounterStyleSelected() ), - actionCollection(), QString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ), + actionCollection(), TQString("counterstyle_%1").tqarg( styleIt.current()->style() ).latin1() ); act->setExclusiveGroup( "counterstyle" ); // Add to the right menu: both for "none", bullet for bullets, numbers otherwise if ( styleIt.current()->style() == KoParagCounter::STYLE_NONE ) { @@ -2608,30 +2608,30 @@ void KPrView::setupActions() else actionFormatNumber->insert( act ); } - actionTextDepthPlus = new KAction( i18n( "&Increase Depth" ), QApplication::reverseLayout() ?"format_decreaseindent" : "format_increaseindent", - CTRL + Qt::Key_Plus, this, SLOT( textDepthPlus() ), + actionTextDepthPlus = new KAction( i18n( "&Increase Depth" ), TQApplication::reverseLayout() ?"format_decreaseindent" : "format_increaseindent", + CTRL + TQt::Key_Plus, TQT_TQOBJECT(this), TQT_SLOT( textDepthPlus() ), actionCollection(), "text_depthPlus" ); - actionTextDepthMinus = new KAction( i18n( "&Decrease Depth" ), QApplication::reverseLayout() ?"format_increaseindent" : "format_decreaseindent", - CTRL + Qt::Key_Minus, this, SLOT( textDepthMinus() ), + actionTextDepthMinus = new KAction( i18n( "&Decrease Depth" ), TQApplication::reverseLayout() ?"format_increaseindent" : "format_decreaseindent", + CTRL + TQt::Key_Minus, TQT_TQOBJECT(this), TQT_SLOT( textDepthMinus() ), actionCollection(), "text_depthMinus" ); actionTextExtentCont2Height = new KAction( i18n( "Extend Contents to Object &Height" ), 0, - this, SLOT( textContentsToHeight() ), + TQT_TQOBJECT(this), TQT_SLOT( textContentsToHeight() ), actionCollection(), "text_con2hei" ); actionTextExtendObj2Cont = new KAction( i18n( "&Extend Object to Fit Contents" ), 0, - this, SLOT( textObjectToContents() ), + TQT_TQOBJECT(this), TQT_SLOT( textObjectToContents() ), actionCollection(), "text_obj2cont" ); actionTextInsertPageNum = new KAction( i18n( "&Insert Slide Number" ), "pgnum", 0, - this, SLOT( textInsertPageNum() ), + TQT_TQOBJECT(this), TQT_SLOT( textInsertPageNum() ), actionCollection(), "text_inspgnum" ); // ----------------- format actions actionExtraProperties = new KAction( i18n( "&Properties" ), "penbrush", 0, - this, SLOT( extraProperties() ), + TQT_TQOBJECT(this), TQT_SLOT( extraProperties() ), actionCollection(), "extra_properties" ); actionExtraArrangePopup = new KActionMenu( i18n( "Arra&nge Objects" ), "arrange", @@ -2639,98 +2639,98 @@ void KPrView::setupActions() actionExtraArrangePopup->setDelayed( false ); actionExtraRaise = new KAction( i18n( "Ra&ise Objects" ), "raise", - CTRL+Qt::SHIFT+Qt::Key_R, this, SLOT( extraRaise() ), + CTRL+TQt::SHIFT+TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT( extraRaise() ), actionCollection(), "extra_raise" ); - actionExtraLower = new KAction( i18n( "&Lower Objects" ), "lower", CTRL +Qt::SHIFT+ Qt::Key_L, - this, SLOT( extraLower() ), + actionExtraLower = new KAction( i18n( "&Lower Objects" ), "lower", CTRL +TQt::SHIFT+ TQt::Key_L, + TQT_TQOBJECT(this), TQT_SLOT( extraLower() ), actionCollection(), "extra_lower" ); actionExtraBringForward= new KAction( i18n( "Bring to Front" ), "bring_forward", - 0, this, SLOT( extraBringForward() ), + 0, TQT_TQOBJECT(this), TQT_SLOT( extraBringForward() ), actionCollection(), "extra_bring_forward" ); actionExtraSendBackward= new KAction( i18n( "Send to Back" ), "send_backward", - 0, this, SLOT( extraSendBackward() ), + 0, TQT_TQOBJECT(this), TQT_SLOT( extraSendBackward() ), actionCollection(), "extra_send_backward" ); actionExtraRotate = new KAction( i18n( "R&otate Objects..." ), "rotate_cw", 0, - this, SLOT( extraRotate() ), + TQT_TQOBJECT(this), TQT_SLOT( extraRotate() ), actionCollection(), "extra_rotate" ); actionExtraShadow = new KAction( i18n( "&Shadow Objects..." ), "shadow", 0, - this, SLOT( extraShadow() ), + TQT_TQOBJECT(this), TQT_SLOT( extraShadow() ), actionCollection(), "extra_shadow" ); actionExtraAlignObjLeft = new KAction( i18n( "Align &Left" ), "aoleft", 0, - this, SLOT( extraAlignObjLeft() ), + TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjLeft() ), actionCollection(), "extra_alignleft" ); actionExtraAlignObjCenterH = new KAction( i18n( "Align Center (&horizontally)" ), "aocenterh", 0, - this, SLOT( extraAlignObjCenterH() ), + TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjCenterH() ), actionCollection(), "extra_aligncenterh" ); actionExtraAlignObjRight = new KAction( i18n( "Align &Right" ), "aoright", 0, - this, SLOT( extraAlignObjRight() ), + TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjRight() ), actionCollection(), "extra_alignright" ); actionExtraAlignObjTop = new KAction( i18n( "Align &Top" ), "aotop", 0, - this, SLOT( extraAlignObjTop() ), + TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjTop() ), actionCollection(), "extra_aligntop" ); actionExtraAlignObjCenterV = new KAction( i18n( "Align Center (&vertically)" ), "aocenterv", 0, - this, SLOT( extraAlignObjCenterV() ), + TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjCenterV() ), actionCollection(), "extra_aligncenterv" ); actionExtraAlignObjBottom = new KAction( i18n( "Align &Bottom" ), "aobottom", 0, - this, SLOT( extraAlignObjBottom() ), + TQT_TQOBJECT(this), TQT_SLOT( extraAlignObjBottom() ), actionCollection(), "extra_alignbottom" ); actionExtraBackground = new KAction( i18n( "Slide Bac&kground..." ), "background", 0, - this, SLOT( extraBackground() ), + TQT_TQOBJECT(this), TQT_SLOT( extraBackground() ), actionCollection(), "extra_background" ); actionExtraLayout = new KAction( i18n( "Page &Layout..." ), 0, - this, SLOT( extraLayout() ), + TQT_TQOBJECT(this), TQT_SLOT( extraLayout() ), actionCollection(), "extra_layout" ); m_actionExtraHeader = new KToggleAction( i18n( "Enable Document &Header" ), 0, - this, SLOT( viewHeader() ), + TQT_TQOBJECT(this), TQT_SLOT( viewHeader() ), actionCollection(), "extra_header" ); m_actionExtraHeader->setCheckedState( i18n( "Disable Document &Header" ) ); m_actionExtraHeader->setToolTip( i18n( "Shows and hides header display for the current slide." ) ); m_actionExtraFooter = new KToggleAction( i18n( "Enable Document Foo&ter" ), 0, - this, SLOT( viewFooter() ), + TQT_TQOBJECT(this), TQT_SLOT( viewFooter() ), actionCollection(), "extra_footer" ); m_actionExtraFooter->setCheckedState( i18n( "Disable Document Foo&ter" ) ); m_actionExtraFooter->setToolTip( i18n( "Shows and hides footer display for the current slide." ) ); actionExtraConfigure = new KAction( i18n( "Configure KPresenter..." ), "configure", 0, - this, SLOT( extraConfigure() ), + TQT_TQOBJECT(this), TQT_SLOT( extraConfigure() ), actionCollection(), "extra_configure" ); actionExtraWebPres = new KAction( i18n( "Create &HTML Slideshow..." ), "webpres", 0, - this, SLOT( extraWebPres() ), + TQT_TQOBJECT(this), TQT_SLOT( extraWebPres() ), actionCollection(), "extra_webpres" ); actionExtraMSPres = new KAction( i18n( "Create Memor&y Stick Slideshow..." ), - 0, this, SLOT( extraMSPres() ), + 0, TQT_TQOBJECT(this), TQT_SLOT( extraMSPres() ), actionCollection(), "extra_mspres" ); actionExtraCreateTemplate = new KAction( i18n( "Template Manager" ), 0, - this, SLOT( extraCreateTemplate() ), + TQT_TQOBJECT(this), TQT_SLOT( extraCreateTemplate() ), actionCollection(), "extra_template" ); actionExtraDefaultTemplate = new KAction( i18n( "Use Current Slide as Default Template" ), 0, - this, SLOT( extraDefaultTemplate() ), + TQT_TQOBJECT(this), TQT_SLOT( extraDefaultTemplate() ), actionCollection(), "extra_defaulttemplate" ); actionExtraAlignObjsPopup = new KActionMenu( i18n("Align O&bjects"), "alignobjs", @@ -2738,207 +2738,207 @@ void KPrView::setupActions() actionExtraAlignObjsPopup->setDelayed( false ); actionExtraLineBegin = new KAction( i18n("Line Begin"), "line_begin", 0, - this, SLOT( extraLineBegin() ), + TQT_TQOBJECT(this), TQT_SLOT( extraLineBegin() ), actionCollection(), "extra_linebegin" ); actionExtraLineEnd = new KAction( i18n("Line End"), "line_end", 0, - this, SLOT( extraLineEnd() ), + TQT_TQOBJECT(this), TQT_SLOT( extraLineEnd() ), actionCollection(), "extra_lineend" ); actionExtraPenStyle = new KoLineStyleAction( i18n("Outline Style"), "pen_style", - this, SLOT( extraPenStyle(int) ), + TQT_TQOBJECT(this), TQT_SLOT( extraPenStyle(int) ), actionCollection(), "extra_penstyle" ); actionExtraPenStyle->setShowCurrentSelection(false); actionExtraPenWidth = new KoLineWidthAction( i18n("Outline Width"), "pen_width", - this, SLOT( extraPenWidth(double) ), + TQT_TQOBJECT(this), TQT_SLOT( extraPenWidth(double) ), actionCollection(), "extra_penwidth" ); actionExtraPenWidth->setUnit( kPresenterDoc()->unit() ); actionExtraPenWidth->setShowCurrentSelection(false); - connect( kPresenterDoc(), SIGNAL( unitChanged( KoUnit::Unit ) ), - actionExtraPenWidth, SLOT( setUnit( KoUnit::Unit ) ) ); + connect( kPresenterDoc(), TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), + actionExtraPenWidth, TQT_SLOT( setUnit( KoUnit::Unit ) ) ); actionExtraGroup = new KAction( i18n( "&Group Objects" ), "group", - QKeySequence( "Ctrl+G" ), - this, SLOT( extraGroup() ), + TQKeySequence( "Ctrl+G" ), + TQT_TQOBJECT(this), TQT_SLOT( extraGroup() ), actionCollection(), "extra_group" ); actionExtraUnGroup = new KAction( i18n( "&Ungroup Objects" ), "ungroup", - QKeySequence( "Ctrl+Shift+G" ), - this, SLOT( extraUnGroup() ), + TQKeySequence( "Ctrl+Shift+G" ), + TQT_TQOBJECT(this), TQT_SLOT( extraUnGroup() ), actionCollection(), "extra_ungroup" ); // ----------------- slideshow actions actionScreenConfigPages = new KAction( i18n( "&Configure Slide Show..." ), "configure", 0, - this, SLOT( screenConfigPages() ), + TQT_TQOBJECT(this), TQT_SLOT( screenConfigPages() ), actionCollection(), "screen_configpages" ); actionScreenAssignEffect = new KAction( i18n( "Edit &Object Effect..." ), "effect", 0, - this, SLOT( screenAssignEffect() ), + TQT_TQOBJECT(this), TQT_SLOT( screenAssignEffect() ), actionCollection(), "screen_assigneffect"); actionScreenTransEffect = new KAction( i18n( "Edit Slide &Transition..." ), "slide_effect", 0, - this, SLOT( screenTransEffect() ), + TQT_TQOBJECT(this), TQT_SLOT( screenTransEffect() ), actionCollection(), "screen_transeffect"); actionScreenStart = new KAction( i18n( "&Start" ), - "2rightarrow", Qt::Key_F12, - this, SLOT( screenStart() ), + "2rightarrow", TQt::Key_F12, + TQT_TQOBJECT(this), TQT_SLOT( screenStart() ), actionCollection(), "screen_start" ); actionScreenStartFromFirst = new KAction( i18n( "Start From &First Slide" ), "1rightarrow", 0, - this, SLOT( screenStartFromFirst() ), + TQT_TQOBJECT(this), TQT_SLOT( screenStartFromFirst() ), actionCollection(), "screen_startfromfirst" ); actionScreenFirst = new KAction( i18n( "&Go to Start" ), "start", 0, - this, SLOT( screenFirst() ), + TQT_TQOBJECT(this), TQT_SLOT( screenFirst() ), actionCollection(), "screen_first" ); actionScreenPrev = new KAction( i18n( "&Previous Slide" ), - "back", Qt::Key_Prior, - this, SLOT( screenPrev() ), + "back", TQt::Key_Prior, + TQT_TQOBJECT(this), TQT_SLOT( screenPrev() ), actionCollection(), "screen_prev" ); actionScreenNext = new KAction( i18n( "&Next Slide" ), - "forward", Qt::Key_Next, - this, SLOT( screenNext() ), + "forward", TQt::Key_Next, + TQT_TQOBJECT(this), TQT_SLOT( screenNext() ), actionCollection(), "screen_next" ); actionScreenLast = new KAction( i18n( "Go to &End" ), "finish", 0, - this, SLOT( screenLast() ), + TQT_TQOBJECT(this), TQT_SLOT( screenLast() ), actionCollection(), "screen_last" ); actionScreenSkip = new KAction( i18n( "Goto &Slide..." ), "goto", 0, - this, SLOT( screenSkip() ), + TQT_TQOBJECT(this), TQT_SLOT( screenSkip() ), actionCollection(), "screen_skip" ); // ----------------- colorbar(Brush and Pen) action actionBrushColor = new TKSelectColorAction( i18n( "Fill Color..." ), TKSelectColorAction::FillColor, actionCollection(), "brush_color" ,true); - connect( actionBrushColor, SIGNAL( activated() ), SLOT( brushChosen() ) ); - actionBrushColor->setDefaultColor(QColor()); + connect( actionBrushColor, TQT_SIGNAL( activated() ), TQT_SLOT( brushChosen() ) ); + actionBrushColor->setDefaultColor(TQColor()); actionPenColor = new TKSelectColorAction( i18n( "Outline Color..." ), TKSelectColorAction::LineColor, actionCollection(), "pen_color" ); - connect( actionPenColor, SIGNAL( activated() ), SLOT( penChosen() ) ); - actionPenColor->setDefaultColor(QColor()); - actionExtendObjectHeight = new KAction( i18n( "&Extend Contents to Object Height" ),0, this, SLOT( textContentsToHeight() ), + connect( actionPenColor, TQT_SIGNAL( activated() ), TQT_SLOT( penChosen() ) ); + actionPenColor->setDefaultColor(TQColor()); + actionExtendObjectHeight = new KAction( i18n( "&Extend Contents to Object Height" ),0, TQT_TQOBJECT(this), TQT_SLOT( textContentsToHeight() ), actionCollection(), "extendobjectheight" ); - actionResizeTextObject = new KAction( i18n( "&Resize Object to Fit Contents" ),0, this, SLOT( textObjectToContents() ), + actionResizeTextObject = new KAction( i18n( "&Resize Object to Fit Contents" ),0, TQT_TQOBJECT(this), TQT_SLOT( textObjectToContents() ), actionCollection(), "resizetextobject" ); - actionRenamePage=new KAction(i18n( "&Rename Slide..." ),0,this, - SLOT( renamePageTitle() ), + actionRenamePage=new KAction(i18n( "&Rename Slide..." ),0,TQT_TQOBJECT(this), + TQT_SLOT( renamePageTitle() ), actionCollection(), "rename_page" ); - actionPicOriginalSize = new KAction( i18n( "Sca&le to Original Size" ), 0, this, - SLOT( picViewOriginalSize() ), + actionPicOriginalSize = new KAction( i18n( "Sca&le to Original Size" ), 0, TQT_TQOBJECT(this), + TQT_SLOT( picViewOriginalSize() ), actionCollection(), "pic_original_size" ); - actionPic640x480=new KAction(i18n( "640x480" ),0,this, - SLOT( picViewOrig640x480() ), + actionPic640x480=new KAction(i18n( "640x480" ),0,TQT_TQOBJECT(this), + TQT_SLOT( picViewOrig640x480() ), actionCollection(), "pic_640_480" ); - actionPic800x600=new KAction(i18n( "800x600" ),0,this, - SLOT( picViewOrig800x600() ), + actionPic800x600=new KAction(i18n( "800x600" ),0,TQT_TQOBJECT(this), + TQT_SLOT( picViewOrig800x600() ), actionCollection(), "pic_800_600" ); - actionPic1024x768=new KAction(i18n( "1024x768" ),0,this, - SLOT( picViewOrig1024x768() ), + actionPic1024x768=new KAction(i18n( "1024x768" ),0,TQT_TQOBJECT(this), + TQT_SLOT( picViewOrig1024x768() ), actionCollection(), "pic_1024_768" ); - actionPic1280x1024=new KAction(i18n( "1280x1024" ),0,this, - SLOT( picViewOrig1280x1024() ), + actionPic1280x1024=new KAction(i18n( "1280x1024" ),0,TQT_TQOBJECT(this), + TQT_SLOT( picViewOrig1280x1024() ), actionCollection(), "pic_1280_1024" ); - actionPic1600x1200=new KAction(i18n( "1600x1200" ),0,this, - SLOT( picViewOrig1600x1200() ), + actionPic1600x1200=new KAction(i18n( "1600x1200" ),0,TQT_TQOBJECT(this), + TQT_SLOT( picViewOrig1600x1200() ), actionCollection(), "pic_1600_1200" ); - actionChangePic=new KAction( i18n( "&Change Picture..." ),"frame_image",0,this, - SLOT( chPic() ), actionCollection(), "change_picture" ); + actionChangePic=new KAction( i18n( "&Change Picture..." ),"frame_image",0,TQT_TQOBJECT(this), + TQT_SLOT( chPic() ), actionCollection(), "change_picture" ); - actionImageEffect = new KAction( i18n("Image &Effect..."), 0, this, - SLOT(imageEffect()), actionCollection(), "image_effect"); + actionImageEffect = new KAction( i18n("Image &Effect..."), 0, TQT_TQOBJECT(this), + TQT_SLOT(imageEffect()), actionCollection(), "image_effect"); actionFormatSuper = new KToggleAction( i18n( "Superscript" ), "super", 0, - this, SLOT( textSuperScript() ), + TQT_TQOBJECT(this), TQT_SLOT( textSuperScript() ), actionCollection(), "format_super" ); actionFormatSuper->setExclusiveGroup( "valign" ); actionFormatSub = new KToggleAction( i18n( "Subscript" ), "sub", 0, - this, SLOT( textSubScript() ), + TQT_TQOBJECT(this), TQT_SLOT( textSubScript() ), actionCollection(), "format_sub" ); actionFormatSub->setExclusiveGroup( "valign" ); actionInsertSpecialChar = new KAction( i18n( "Sp&ecial Character..." ), "char", - ALT + Qt::SHIFT + Qt::Key_C, - this, SLOT( insertSpecialChar() ), + ALT + TQt::SHIFT + TQt::Key_C, + TQT_TQOBJECT(this), TQT_SLOT( insertSpecialChar() ), actionCollection(), "insert_specialchar" ); actionInsertLink = new KAction( i18n( "Link..." ), 0, - this, SLOT( insertLink() ), + TQT_TQOBJECT(this), TQT_SLOT( insertLink() ), actionCollection(), "insert_link" ); #if 0 //code from page.cc //not implemented picResizeMenu->insertSeparator(); - picResizeMenu->insertItem( i18n( "Enter Custom Factor..." ), this, SLOT( picViewOrigFactor() ) ); + picResizeMenu->insertItem( i18n( "Enter Custom Factor..." ), TQT_TQOBJECT(this), TQT_SLOT( picViewOrigFactor() ) ); #endif (void) new KAction( i18n( "Configure &Autocorrection..." ), 0, - this, SLOT( extraAutoFormat() ), + TQT_TQOBJECT(this), TQT_SLOT( extraAutoFormat() ), actionCollection(), "extra_autocorrection" ); - actionExtraSpellCheck = KStdAction::spelling( this, SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); + actionExtraSpellCheck = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); - actionFormatParag = new KAction( i18n( "&Paragraph..." ), ALT + CTRL + Qt::Key_P, - this, SLOT( formatParagraph() ), + actionFormatParag = new KAction( i18n( "&Paragraph..." ), ALT + CTRL + TQt::Key_P, + TQT_TQOBJECT(this), TQT_SLOT( formatParagraph() ), actionCollection(), "format_paragraph" ); actionFormatDefault=new KAction( i18n( "Default Format" ), 0, - this, SLOT( textDefaultFormat() ), + TQT_TQOBJECT(this), TQT_SLOT( textDefaultFormat() ), actionCollection(), "text_default" ); actionOpenLink = new KAction( i18n( "Open Link" ), 0, - this, SLOT( openLink() ), + TQT_TQOBJECT(this), TQT_SLOT( openLink() ), actionCollection(), "open_link" ); actionChangeLink=new KAction( i18n("Change Link..."), 0, - this,SLOT(changeLink()), + TQT_TQOBJECT(this), TQT_SLOT(changeLink()), actionCollection(), "change_link"); actionCopyLink = new KAction( i18n( "Copy Link" ), 0, - this, SLOT( copyLink() ), + TQT_TQOBJECT(this), TQT_SLOT( copyLink() ), actionCollection(), "copy_link" ); actionRemoveLink = new KAction( i18n( "Remove Link" ), 0, - this, SLOT( removeLink() ), + TQT_TQOBJECT(this), TQT_SLOT( removeLink() ), actionCollection(), "remove_link" ); actionAddLinkToBookmak = new KAction( i18n( "Add to Bookmark" ), 0, - this, SLOT( addToBookmark() ), + TQT_TQOBJECT(this), TQT_SLOT( addToBookmark() ), actionCollection(), "add_to_bookmark" ); actionEditCustomVarsEdit = new KAction( i18n( "&Custom Variables..." ), 0, - this, SLOT( editCustomVars() ), + TQT_TQOBJECT(this), TQT_SLOT( editCustomVars() ), actionCollection(), "edit_vars" ); actionEditCustomVars = new KAction( i18n( "Edit Variable..." ), 0, - this, SLOT( editCustomVariable() ), + TQT_TQOBJECT(this), TQT_SLOT( editCustomVariable() ), actionCollection(), "edit_customvars" ); @@ -2960,31 +2960,31 @@ void KPrView::setupActions() actionInsertVariable->popupMenu()->insertSeparator(); actionRefreshAllVariable = new KAction( i18n( "&Refresh All Variables" ), 0, - this, SLOT( refreshAllVariable() ), + TQT_TQOBJECT(this), TQT_SLOT( refreshAllVariable() ), actionCollection(), "refresh_all_variable" ); actionInsertVariable->insert(actionRefreshAllVariable); actionIncreaseFontSize = new KAction( i18n("Increase Font Size"),"fontsizeup", 0, - this, SLOT( increaseFontSize() ), + TQT_TQOBJECT(this), TQT_SLOT( increaseFontSize() ), actionCollection(), "increaseFontSize" ); actionDecreaseFontSize = new KAction( i18n("Decrease Font Size"),"fontsizedown", 0, - this, SLOT( decreaseFontSize() ), + TQT_TQOBJECT(this), TQT_SLOT( decreaseFontSize() ), actionCollection(), "decreaseFontSize" ); actionChangeCase=new KAction( i18n( "Change Case..." ), 0, - this, SLOT( changeCaseOfText() ), + TQT_TQOBJECT(this), TQT_SLOT( changeCaseOfText() ), actionCollection(), "change_case" ); actionViewZoom = new KSelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" ); - connect( actionViewZoom, SIGNAL( activated( const QString & ) ), - this, SLOT( viewZoom( const QString & ) ) ); + connect( actionViewZoom, TQT_SIGNAL( activated( const TQString & ) ), + TQT_TQOBJECT(this), TQT_SLOT( viewZoom( const TQString & ) ) ); actionViewZoom->setEditable(true); changeZoomMenu( ); - actionFormatStylist = new KAction( i18n( "&Style Manager" ), ALT + CTRL + Qt::Key_S, - this, SLOT( extraStylist() ), + actionFormatStylist = new KAction( i18n( "&Style Manager" ), ALT + CTRL + TQt::Key_S, + TQT_TQOBJECT(this), TQT_SLOT( extraStylist() ), actionCollection(), "format_stylist" ); actionFormatStyleMenu = new KActionMenu( i18n( "St&yle" ), 0, @@ -2993,167 +2993,167 @@ void KPrView::setupActions() actionFormatStyle = new KSelectAction( i18n( "St&yle" ), 0, actionCollection(), "format_style" ); - connect( actionFormatStyle, SIGNAL( activated( int ) ), - this, SLOT( textStyleSelected( int ) ) ); + connect( actionFormatStyle, TQT_SIGNAL( activated( int ) ), + TQT_TQOBJECT(this), TQT_SLOT( textStyleSelected( int ) ) ); actionFormatStyle->setMenuAccelsEnabled( true ); updateStyleList(); actionAllowAutoFormat = new KToggleAction( i18n( "Enable Autocorrection" ), 0, - this, SLOT( slotAllowAutoFormat() ), + TQT_TQOBJECT(this), TQT_SLOT( slotAllowAutoFormat() ), actionCollection(), "enable_autocorrection" ); actionAllowAutoFormat->setCheckedState(i18n("Disable Autocorrection")); // ------------------- Actions with a key binding and no GUI item - new KAction( i18n( "Insert Non-Breaking Space" ), CTRL+Qt::Key_Space, - this, SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); - new KAction( i18n( "Insert Non-Breaking Hyphen" ), CTRL+Qt::SHIFT+Qt::Key_Minus, - this, SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); - new KAction( i18n( "Insert Soft Hyphen" ), CTRL+Qt::Key_Minus, - this, SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); - new KAction( i18n( "Line Break" ), Qt::SHIFT+Qt::Key_Return, - this, SLOT( slotLineBreak() ), actionCollection(), "line_break" ); + new KAction( i18n( "Insert Non-Breaking Space" ), CTRL+TQt::Key_Space, + TQT_TQOBJECT(this), TQT_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); + new KAction( i18n( "Insert Non-Breaking Hyphen" ), CTRL+TQt::SHIFT+TQt::Key_Minus, + TQT_TQOBJECT(this), TQT_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); + new KAction( i18n( "Insert Soft Hyphen" ), CTRL+TQt::Key_Minus, + TQT_TQOBJECT(this), TQT_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); + new KAction( i18n( "Line Break" ), TQt::SHIFT+TQt::Key_Return, + TQT_TQOBJECT(this), TQT_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); new KAction( i18n( "Completion" ), KStdAccel::shortcut(KStdAccel::TextCompletion), - this, SLOT( slotCompletion() ), actionCollection(), "completion" ); + TQT_TQOBJECT(this), TQT_SLOT( slotCompletion() ), actionCollection(), "completion" ); - new KAction( i18n( "Increase Numbering Level" ), ALT+Qt::Key_Right, - this, SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); - new KAction( i18n( "Decrease Numbering Level" ), ALT+Qt::Key_Left, - this, SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); + new KAction( i18n( "Increase Numbering Level" ), ALT+TQt::Key_Right, + TQT_TQOBJECT(this), TQT_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); + new KAction( i18n( "Decrease Numbering Level" ), ALT+TQt::Key_Left, + TQT_TQOBJECT(this), TQT_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); actionInsertComment = new KAction( i18n( "Comment..." ), 0, - this, SLOT( insertComment() ), + TQT_TQOBJECT(this), TQT_SLOT( insertComment() ), actionCollection(), "insert_comment" ); actionEditComment = new KAction( i18n("Edit Comment..."), 0, - this,SLOT(editComment()), + TQT_TQOBJECT(this), TQT_SLOT(editComment()), actionCollection(), "edit_comment"); actionAddGuideLine = new KAction( i18n( "Add Guide Line..."), 0, - this, SLOT( addGuideLine()), + TQT_TQOBJECT(this), TQT_SLOT( addGuideLine()), actionCollection(), "add_guideline"); actionRemoveComment = new KAction( i18n("Remove Comment"), 0, - this,SLOT(removeComment()), + TQT_TQOBJECT(this), TQT_SLOT(removeComment()), actionCollection(), "remove_comment"); actionCopyTextOfComment = new KAction( i18n("Copy Text of Comment..."), 0, - this,SLOT(copyTextOfComment()), + TQT_TQOBJECT(this), TQT_SLOT(copyTextOfComment()), actionCollection(), "copy_text_comment"); actionConfigureCompletion = new KAction( i18n( "&Configure Completion..." ), 0, - this, SLOT( configureCompletion() ), + TQT_TQOBJECT(this), TQT_SLOT( configureCompletion() ), actionCollection(), "configure_completion" ); actionZoomMinus = new KAction( i18n( "Zoom Out" ), "viewmag-",0, - this, SLOT( zoomMinus() ), + TQT_TQOBJECT(this), TQT_SLOT( zoomMinus() ), actionCollection(), "zoom_minus" ); actionZoomPlus = new KAction( i18n( "Zoom In" ), "viewmag+",0, - this, SLOT( zoomPlus() ), + TQT_TQOBJECT(this), TQT_SLOT( zoomPlus() ), actionCollection(), "zoom_plus" ); actionZoomEntirePage = new KAction( i18n( "Zoom Entire Slide" ), 0, - this, SLOT( zoomEntirePage() ), + TQT_TQOBJECT(this), TQT_SLOT( zoomEntirePage() ), actionCollection(), "zoom_entire_page" ); actionZoomMinus = new KAction( i18n( "Zoom Slide Width" ), 0, - this, SLOT( zoomPageWidth() ), + TQT_TQOBJECT(this), TQT_SLOT( zoomPageWidth() ), actionCollection(), "zoom_page_width" ); actionZoomSelectedObject= new KAction( i18n( "Zoom Selected Objects" ), "viewmagfit",0, - this, SLOT( zoomSelectedObject() ), + TQT_TQOBJECT(this), TQT_SLOT( zoomSelectedObject() ), actionCollection(), "zoom_selected_object" ); actionZoomPageHeight= new KAction( i18n( "Zoom Slide Height" ), 0, - this, SLOT( zoomPageHeight() ), + TQT_TQOBJECT(this), TQT_SLOT( zoomPageHeight() ), actionCollection(), "zoom_page_height" ); actionZoomAllObject= new KAction( i18n( "Zoom All Objects" ), 0, - this, SLOT( zoomAllObject() ), + TQT_TQOBJECT(this), TQT_SLOT( zoomAllObject() ), actionCollection(), "zoom_all_object" ); actionFlipHorizontal= new KAction( i18n( "Horizontal Flip" ), 0, - this, SLOT( flipHorizontal() ), + TQT_TQOBJECT(this), TQT_SLOT( flipHorizontal() ), actionCollection(), "horizontal_flip" ); actionFlipVertical= new KAction( i18n( "Vertical Flip" ), 0, - this, SLOT( flipVertical() ), + TQT_TQOBJECT(this), TQT_SLOT( flipVertical() ), actionCollection(), "vertical_flip" ); actionDuplicateObj = new KAction( i18n( "Duplicate Object..." ), 0, - this, SLOT( duplicateObj() ), + TQT_TQOBJECT(this), TQT_SLOT( duplicateObj() ), actionCollection(), "duplicate_obj" ); actionApplyAutoFormat= new KAction( i18n( "Apply Autocorrection" ), 0, - this, SLOT( applyAutoFormat() ), + TQT_TQOBJECT(this), TQT_SLOT( applyAutoFormat() ), actionCollection(), "apply_autoformat" ); actionCreateStyleFromSelection = new KAction( i18n( "Create Style From Selection..." ), 0, - this, SLOT( createStyleFromSelection()), + TQT_TQOBJECT(this), TQT_SLOT( createStyleFromSelection()), actionCollection(), "create_style" ); actionCloseObject = new KAction( i18n( "Close Object" ), 0, - this, SLOT( closeObject()), + TQT_TQOBJECT(this), TQT_SLOT( closeObject()), actionCollection(), "close_object" ); actionAlignVerticalTop = new KToggleAction( i18n( "Align Top" ), 0, - this, SLOT( alignVerticalTop() ), + TQT_TQOBJECT(this), TQT_SLOT( alignVerticalTop() ), actionCollection(), "align_top" ); - actionAlignVerticalTop->setExclusiveGroup( "vertical_alignment" ); + actionAlignVerticalTop->setExclusiveGroup( "vertical_tqalignment" ); actionAlignVerticalTop->setChecked( true ); actionAlignVerticalBottom = new KToggleAction( i18n( "Align Bottom" ), 0, - this, SLOT( alignVerticalBottom() ), + TQT_TQOBJECT(this), TQT_SLOT( alignVerticalBottom() ), actionCollection(), "align_bottom" ); - actionAlignVerticalBottom->setExclusiveGroup( "vertical_alignment" ); + actionAlignVerticalBottom->setExclusiveGroup( "vertical_tqalignment" ); actionAlignVerticalCenter = new KToggleAction( i18n( "Align Middle" ), 0, - this, SLOT( alignVerticalCenter() ), + TQT_TQOBJECT(this), TQT_SLOT( alignVerticalCenter() ), actionCollection(), "align_center" ); - actionAlignVerticalCenter->setExclusiveGroup( "vertical_alignment" ); + actionAlignVerticalCenter->setExclusiveGroup( "vertical_tqalignment" ); actionSavePicture= new KAction( i18n("Save Picture..."), 0, - this, SLOT( savePicture() ), + TQT_TQOBJECT(this), TQT_SLOT( savePicture() ), actionCollection(), "save_picture"); actionAllowBgSpellCheck = new KToggleAction( i18n( "Autospellcheck" ), 0, - this, SLOT( autoSpellCheck() ), + TQT_TQOBJECT(this), TQT_SLOT( autoSpellCheck() ), actionCollection(), "tool_auto_spellcheck" ); actionInsertFile= new KAction( i18n( "File..." ), 0, - this, SLOT( insertFile() ), + TQT_TQOBJECT(this), TQT_SLOT( insertFile() ), actionCollection(), "insert_file" ); actionImportStyle= new KAction( i18n( "Import Styles..." ), 0, - this, SLOT( importStyle() ), + TQT_TQOBJECT(this), TQT_SLOT( importStyle() ), actionCollection(), "import_style" ); actionSaveBackgroundPicture= new KAction( i18n( "Save Background Picture..." ), 0, - this, SLOT(backgroundPicture() ), + TQT_TQOBJECT(this), TQT_SLOT(backgroundPicture() ), actionCollection(), "save_bgpicture" ); #if 0 actionInsertDirectCursor = new KToggleAction( i18n( "Type Anywhere Cursor" ), 0, - this, SLOT( insertDirectCursor() ), + TQT_TQOBJECT(this), TQT_SLOT( insertDirectCursor() ), actionCollection(), "direct_cursor" ); #endif actionSpellIgnoreAll = new KAction( i18n( "Ignore All" ), 0, - this, SLOT( slotAddIgnoreAllWord() ), + TQT_TQOBJECT(this), TQT_SLOT( slotAddIgnoreAllWord() ), actionCollection(), "ignore_all" ); actionAddWordToPersonalDictionary=new KAction( i18n( "Add Word to Dictionary" ),0, - this, SLOT( addWordToDictionary() ), + TQT_TQOBJECT(this), TQT_SLOT( addWordToDictionary() ), actionCollection(), "add_word_to_dictionary" ); actionCustomSlideShow = new KAction( i18n( "Custom Slide Show..." ), 0, - this, SLOT( customSlideShow() ), + TQT_TQOBJECT(this), TQT_SLOT( customSlideShow() ), actionCollection(), "custom_slide_show" ); actionDisplayObjectFromMasterPage = new KToggleAction( i18n( "Hide Object From Slide Master" ), 0, - this, SLOT( displayObjectFromMasterPage() ), + TQT_TQOBJECT(this), TQT_SLOT( displayObjectFromMasterPage() ), actionCollection(), "display_object_from_master_page" ); actionDisplayObjectFromMasterPage->setCheckedState(i18n("Display Object From Slide Master")); actionDisplayBackgroundPage = new KToggleAction( i18n( "Hide Background" ), 0, - this, SLOT( displayBackground() ), + TQT_TQOBJECT(this), TQT_SLOT( displayBackground() ), actionCollection(), "display_background" ); actionDisplayBackgroundPage->setCheckedState(i18n("Display Background")); } @@ -3281,10 +3281,10 @@ void KPrView::backOk( KPrBackDialog* backDia, bool takeGlobal ) m_pKPresenterDoc->addCommand( setBackCmd ); } -void KPrView::afChooseOk( const QString & c ) +void KPrView::afChooseOk( const TQString & c ) { - QFileInfo fileInfo( c ); - QString fileName = locate( "autoforms", + TQFileInfo fileInfo( c ); + TQString fileName = locate( "autoforms", fileInfo.dirPath( false ) + "/" + fileInfo.baseName() + ".atf", KPrFactory::global() ); @@ -3311,7 +3311,7 @@ void KPrView::propertiesOk() void KPrView::pgConfOk() { - QValueList<bool> selectedSlides; + TQValueList<bool> selectedSlides; for( unsigned i = 0; i < kPresenterDoc()->pageList().count(); i++ ) { selectedSlides.append( kPresenterDoc()->pageList().at( i )->isSlideSelected() ); } @@ -3332,7 +3332,7 @@ void KPrView::pgConfOk() pgConfCmd->execute(); kPresenterDoc()->addCommand( pgConfCmd ); - QPtrListIterator<KPrPage> it( kPresenterDoc()->pageList() ); + TQPtrListIterator<KPrPage> it( kPresenterDoc()->pageList() ); for ( ; it.current(); ++it ) updateSideBarItem( it.current() ); } @@ -3366,9 +3366,9 @@ void KPrView::recalcCurrentPageNum() { KPrPage *activePage = m_canvas->activePage(); - QPtrList<KPrPage> pageList( m_pKPresenterDoc->pageList() ); + TQPtrList<KPrPage> pageList( m_pKPresenterDoc->pageList() ); - int pos = pageList.findRef( activePage ); + int pos = pageList.tqfindRef( activePage ); if ( pos != -1 ) { @@ -3403,7 +3403,7 @@ void KPrView::scrollV( int value ) } } -void KPrView::fontChanged( const QFont &font ) +void KPrView::fontChanged( const TQFont &font ) { tbFont.setFamily( font.family() ); tbFont.setBold( font.bold() ); @@ -3418,7 +3418,7 @@ void KPrView::fontChanged( const QFont &font ) actionTextUnderline->setChecked( tbFont.underline() ); } -void KPrView::colorChanged( const QColor &color ) +void KPrView::colorChanged( const TQColor &color ) { tbColor = color; actionTextColor->setEnabled( true ); @@ -3450,19 +3450,19 @@ void KPrView::alignChanged( int align ) } } -void KPrView::changePicture( const QString & filename ) +void KPrView::changePicture( const TQString & filename ) { - QStringList mimetypes; + TQStringList mimetypes; mimetypes += KImageIO::mimeTypes( KImageIO::Reading ); mimetypes += KoPictureFilePreview::clipartMimeTypes(); - KFileDialog fd( filename, QString::null, this, 0, true ); + KFileDialog fd( filename, TQString(), this, 0, true ); fd.setCaption(i18n("Select New Picture")); fd.setMimeFilter( mimetypes ); fd.setPreviewWidget( new KoPictureFilePreview( &fd ) ); KURL url; - if ( fd.exec() == QDialog::Accepted ) + if ( fd.exec() == TQDialog::Accepted ) url = fd.selectedURL(); if( url.isEmpty() || !url.isValid()) @@ -3471,12 +3471,12 @@ void KPrView::changePicture( const QString & filename ) m_canvas->changePicture( url, m_canvas ); } -void KPrView::resizeEvent( QResizeEvent *e ) +void KPrView::resizeEvent( TQResizeEvent *e ) { if ( !presStarted ) - QWidget::resizeEvent( e ); + TQWidget::resizeEvent( e ); - QSize s = e ? e->size() : size(); + TQSize s = e ? e->size() : size(); splitter->setGeometry( 0, 0, s.width(), s.height() ); } @@ -3491,8 +3491,8 @@ void KPrView::reorganize() if(kPresenterDoc()->showRuler()) { - int hSpace = v_ruler->minimumSizeHint().width(); - int vSpace = h_ruler->minimumSizeHint().height(); + int hSpace = v_ruler->tqminimumSizeHint().width(); + int vSpace = h_ruler->tqminimumSizeHint().height(); m_canvas->move( hSpace, vSpace ); if ( h_ruler ) @@ -3544,16 +3544,16 @@ void KPrView::reorganize() } } -void PageBase::resizeEvent( QResizeEvent *e ) +void PageBase::resizeEvent( TQResizeEvent *e ) { if ( !view->presStarted ) - QWidget::resizeEvent( e ); + TQWidget::resizeEvent( e ); - QSize s = e ? e->size() : size(); + TQSize s = e ? e->size() : size(); if ( view->m_bShowGUI ) { - int hSpace = view->getVRuler()->minimumSizeHint().width(); - int vSpace = view->getVRuler()->minimumSizeHint().height(); + int hSpace = view->getVRuler()->tqminimumSizeHint().width(); + int vSpace = view->getVRuler()->tqminimumSizeHint().height(); view->m_canvas->resize( s.width() - ( hSpace + 16 ), s.height() - ( vSpace + 16 ) ); view->vert->setGeometry( s.width() - 16, 0, 16, s.height() - 32 ); @@ -3569,37 +3569,37 @@ void PageBase::resizeEvent( QResizeEvent *e ) view->reorganize(); } -void KPrView::dragEnterEvent( QDragEnterEvent *e ) +void KPrView::dragEnterEvent( TQDragEnterEvent *e ) { - QApplication::sendEvent( m_canvas, e ); + TQApplication::sendEvent( m_canvas, e ); } -void KPrView::dragMoveEvent( QDragMoveEvent *e ) +void KPrView::dragMoveEvent( TQDragMoveEvent *e ) { - QApplication::sendEvent( m_canvas, e ); + TQApplication::sendEvent( m_canvas, e ); } -void KPrView::dragLeaveEvent( QDragLeaveEvent *e ) +void KPrView::dragLeaveEvent( TQDragLeaveEvent *e ) { - QApplication::sendEvent( m_canvas, e ); + TQApplication::sendEvent( m_canvas, e ); } -void KPrView::dropEvent( QDropEvent *e ) +void KPrView::dropEvent( TQDropEvent *e ) { - QApplication::sendEvent( m_canvas, e ); + TQApplication::sendEvent( m_canvas, e ); } -void KPrView::getPageMouseWheelEvent( QWheelEvent *e ) +void KPrView::getPageMouseWheelEvent( TQWheelEvent *e ) { - QApplication::sendEvent( vert, e ); + TQApplication::sendEvent( vert, e ); } -void KPrView::keyPressEvent( QKeyEvent *e ) +void KPrView::keyPressEvent( TQKeyEvent *e ) { - if ( e->key() == Qt::Key_Delete && !m_canvas->currentTextObjectView() ) + if ( e->key() == TQt::Key_Delete && !m_canvas->currentTextObjectView() ) editDelete(); else - QApplication::sendEvent( m_canvas, e ); + TQApplication::sendEvent( m_canvas, e ); } void KPrView::doAutomaticScreenPres() @@ -3617,11 +3617,11 @@ void KPrView::doAutomaticScreenPres() void KPrView::updateReadWrite( bool readwrite ) { // First disable or enable everything - QValueList<KAction*> actions = actionCollection()->actions(); + TQValueList<KAction*> actions = actionCollection()->actions(); // Also grab actions from the document actions += m_pKPresenterDoc->actionCollection()->actions(); - QValueList<KAction*>::ConstIterator aIt = actions.begin(); - QValueList<KAction*>::ConstIterator aEnd = actions.end(); + TQValueList<KAction*>::ConstIterator aIt = actions.begin(); + TQValueList<KAction*>::ConstIterator aEnd = actions.end(); for (; aIt != aEnd; ++aIt ) (*aIt)->setEnabled( readwrite ); @@ -3656,57 +3656,57 @@ void KPrView::updateReadWrite( bool readwrite ) void KPrView::setupPopupMenus() { // create right button line begin - rb_lbegin = new QPopupMenu(); + rb_lbegin = new TQPopupMenu(); Q_CHECK_PTR( rb_lbegin ); - rb_lbegin->insertItem( KPBarIcon("line_normal_begin" ), this, SLOT( extraLineBeginNormal() ) ); + rb_lbegin->insertItem( KPBarIcon("line_normal_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginNormal() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_arrow_begin" ), this, SLOT( extraLineBeginArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_arrow_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_rect_begin" ), this, SLOT( extraLineBeginRect() ) ); + rb_lbegin->insertItem( KPBarIcon("line_rect_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginRect() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_circle_begin" ), this, SLOT( extraLineBeginCircle() ) ); + rb_lbegin->insertItem( KPBarIcon("line_circle_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginCircle() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_line_arrow_begin" ), this, SLOT( extraLineBeginLineArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_line_arrow_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginLineArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_dimension_line_begin" ), this, SLOT( extraLineBeginDimensionLine() ) ); + rb_lbegin->insertItem( KPBarIcon("line_dimension_line_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginDimensionLine() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_double_arrow_begin" ), this, SLOT( extraLineBeginDoubleArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_double_arrow_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginDoubleArrow() ) ); rb_lbegin->insertSeparator(); - rb_lbegin->insertItem( KPBarIcon("line_double_line_arrow_begin" ), this, SLOT( extraLineBeginDoubleLineArrow() ) ); + rb_lbegin->insertItem( KPBarIcon("line_double_line_arrow_begin" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineBeginDoubleLineArrow() ) ); rb_lbegin->setMouseTracking( true ); rb_lbegin->setCheckable( false ); // create right button line end - rb_lend = new QPopupMenu(); + rb_lend = new TQPopupMenu(); Q_CHECK_PTR( rb_lend ); - rb_lend->insertItem( KPBarIcon("line_normal_end" ), this, SLOT( extraLineEndNormal() ) ); + rb_lend->insertItem( KPBarIcon("line_normal_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndNormal() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_arrow_end" ), this, SLOT( extraLineEndArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_arrow_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_rect_end" ), this, SLOT( extraLineEndRect() ) ); + rb_lend->insertItem( KPBarIcon("line_rect_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndRect() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_circle_end" ), this, SLOT( extraLineEndCircle() ) ); + rb_lend->insertItem( KPBarIcon("line_circle_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndCircle() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_line_arrow_end" ), this, SLOT( extraLineEndLineArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_line_arrow_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndLineArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_dimension_line_end" ), this, SLOT( extraLineEndDimensionLine() ) ); + rb_lend->insertItem( KPBarIcon("line_dimension_line_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndDimensionLine() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_double_arrow_end" ), this, SLOT( extraLineEndDoubleArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_double_arrow_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndDoubleArrow() ) ); rb_lend->insertSeparator(); - rb_lend->insertItem( KPBarIcon("line_double_line_arrow_end" ), this, SLOT( extraLineEndDoubleLineArrow() ) ); + rb_lend->insertItem( KPBarIcon("line_double_line_arrow_end" ), TQT_TQOBJECT(this), TQT_SLOT( extraLineEndDoubleLineArrow() ) ); rb_lend->setMouseTracking( true ); rb_lend->setCheckable( false ); // create arrange-objects popup - m_arrangeObjectsPopup = new QPopupMenu(); + m_arrangeObjectsPopup = new TQPopupMenu(); Q_CHECK_PTR(m_arrangeObjectsPopup); - m_arrangeObjectsPopup->insertItem(KPBarIcon("lower"), this, SLOT(extraLower())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("lower"), TQT_TQOBJECT(this), TQT_SLOT(extraLower())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("send_backward"), this, SLOT(extraSendBackward())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("send_backward"), TQT_TQOBJECT(this), TQT_SLOT(extraSendBackward())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("bring_forward"), this, SLOT(extraBringForward())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("bring_forward"), TQT_TQOBJECT(this), TQT_SLOT(extraBringForward())); m_arrangeObjectsPopup->insertSeparator(); - m_arrangeObjectsPopup->insertItem(KPBarIcon("raise"), this, SLOT(extraRaise())); + m_arrangeObjectsPopup->insertItem(KPBarIcon("raise"), TQT_TQOBJECT(this), TQT_SLOT(extraRaise())); m_arrangeObjectsPopup->setMouseTracking(true); m_arrangeObjectsPopup->setCheckable(false); @@ -3717,7 +3717,7 @@ void KPrView::setupPopupMenus() actionToolsLinePopup->insert(actionToolsCubicBezierCurve); actionToolsLinePopup->insert(actionToolsQuadricBezierCurve); - // create insert-shape popup + // create insert-tqshape popup actionToolsShapePopup->insert(actionToolsRectangle); actionToolsShapePopup->insert(actionToolsCircleOrEllipse); actionToolsShapePopup->insert(actionToolsPie); @@ -3744,26 +3744,26 @@ void KPrView::setupPopupMenus() void KPrView::setupScrollbars() { - vert = new QScrollBar( QScrollBar::Vertical, pageBase ); - horz = new QScrollBar( QScrollBar::Horizontal, pageBase ); + vert = new TQScrollBar( Qt::Vertical, pageBase ); + horz = new TQScrollBar( Qt::Horizontal, pageBase ); vert->show(); horz->show(); - QObject::connect( vert, SIGNAL( valueChanged( int ) ), this, SLOT( scrollV( int ) ) ); - QObject::connect( horz, SIGNAL( valueChanged( int ) ), this, SLOT( scrollH( int ) ) ); + TQObject::connect( vert, TQT_SIGNAL( valueChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( scrollV( int ) ) ); + TQObject::connect( horz, TQT_SIGNAL( valueChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( scrollH( int ) ) ); vert->setValue(vert->maxValue()); horz->setValue(horz->maxValue()); vert->setValue(vert->minValue()); horz->setValue(horz->minValue()); - pgNext = new QToolButton( pageBase ); - pgNext->setPixmap( QPixmap( pagedown_xpm ) ); + pgNext = new TQToolButton( pageBase ); + pgNext->setPixmap( TQPixmap( pagedown_xpm ) ); pgNext->setAutoRepeat( TRUE ); - QToolTip::add( pgNext, i18n( "Next slide" ) ); - connect( pgNext, SIGNAL( clicked() ), this, SLOT( nextPage() ) ); - pgPrev = new QToolButton( pageBase ); - pgPrev->setPixmap( QPixmap( pageup_xpm ) ); + TQToolTip::add( pgNext, i18n( "Next slide" ) ); + connect( pgNext, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( nextPage() ) ); + pgPrev = new TQToolButton( pageBase ); + pgPrev->setPixmap( TQPixmap( pageup_xpm ) ); pgPrev->setAutoRepeat( TRUE ); - QToolTip::add( pgPrev, i18n( "Previous slide" ) ); - connect( pgPrev, SIGNAL( clicked() ), this, SLOT( prevPage() ) ); + TQToolTip::add( pgPrev, i18n( "Previous slide" ) ); + connect( pgPrev, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( prevPage() ) ); } void KPrView::setupRulers() @@ -3778,34 +3778,34 @@ void KPrView::setupRulers() v_ruler = new KoRuler( pageBase, m_canvas, Qt::Vertical, kPresenterDoc()->pageLayout(), 0, kPresenterDoc()->unit() ); v_ruler->setReadWrite(kPresenterDoc()->isReadWrite()); - int hSpace = v_ruler->minimumSizeHint().width(); - int vSpace = h_ruler->minimumSizeHint().height(); + int hSpace = v_ruler->tqminimumSizeHint().width(); + int vSpace = h_ruler->tqminimumSizeHint().height(); m_canvas->resize( m_canvas->width() - hSpace, m_canvas->height() - vSpace ); m_canvas->move( hSpace, vSpace ); h_ruler->setGeometry( hSpace, 0, m_canvas->width(), vSpace ); v_ruler->setGeometry( 0, vSpace, hSpace, m_canvas->height() ); - QObject::connect( h_ruler, SIGNAL( unitChanged( KoUnit::Unit ) ), - this, SLOT( unitChanged( KoUnit::Unit ) ) ); - QObject::connect( h_ruler, SIGNAL( newPageLayout( const KoPageLayout & ) ), - this, SLOT( newPageLayout( const KoPageLayout & ) ) ); + TQObject::connect( h_ruler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), + TQT_TQOBJECT(this), TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); + TQObject::connect( h_ruler, TQT_SIGNAL( newPageLayout( const KoPageLayout & ) ), + TQT_TQOBJECT(this), TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); - connect( h_ruler, SIGNAL( doubleClicked() ), this, - SLOT( slotHRulerDoubleClicked() ) ); - connect( h_ruler, SIGNAL( doubleClicked(double) ), this, - SLOT( slotHRulerDoubleClicked(double) ) ); + connect( h_ruler, TQT_SIGNAL( doubleClicked() ), this, + TQT_SLOT( slotHRulerDoubleClicked() ) ); + connect( h_ruler, TQT_SIGNAL( doubleClicked(double) ), this, + TQT_SLOT( slotHRulerDoubleClicked(double) ) ); - QObject::connect( v_ruler, SIGNAL( unitChanged( KoUnit::Unit ) ), - this, SLOT( unitChanged( KoUnit::Unit ) ) ); - QObject::connect( v_ruler, SIGNAL( newPageLayout( const KoPageLayout & ) ), - this, SLOT( newPageLayout( const KoPageLayout & ) ) ); - QObject::connect( v_ruler, SIGNAL( doubleClicked() ), - this, SLOT( openPageLayoutDia() ) ); + TQObject::connect( v_ruler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), + TQT_TQOBJECT(this), TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); + TQObject::connect( v_ruler, TQT_SIGNAL( newPageLayout( const KoPageLayout & ) ), + TQT_TQOBJECT(this), TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); + TQObject::connect( v_ruler, TQT_SIGNAL( doubleClicked() ), + TQT_TQOBJECT(this), TQT_SLOT( openPageLayoutDia() ) ); - connect( h_ruler, SIGNAL( newLeftIndent( double ) ), this, SLOT( newLeftIndent( double ) ) ); - connect( h_ruler, SIGNAL( newFirstIndent( double ) ), this, SLOT( newFirstIndent( double ) ) ); - connect( h_ruler, SIGNAL( newRightIndent( double ) ), this, SLOT( newRightIndent( double ) ) ); + connect( h_ruler, TQT_SIGNAL( newLeftIndent( double ) ), TQT_TQOBJECT(this), TQT_SLOT( newLeftIndent( double ) ) ); + connect( h_ruler, TQT_SIGNAL( newFirstIndent( double ) ), TQT_TQOBJECT(this), TQT_SLOT( newFirstIndent( double ) ) ); + connect( h_ruler, TQT_SIGNAL( newRightIndent( double ) ), TQT_TQOBJECT(this), TQT_SLOT( newRightIndent( double ) ) ); } void KPrView::unitChanged( KoUnit::Unit u ) @@ -3817,9 +3817,9 @@ void KPrView::setRanges() { if ( vert && horz && m_canvas && m_pKPresenterDoc ) { vert->setSteps( 10, m_canvas->height() ); - vert->setRange( 0, QMAX( 0, m_canvas->activePage()->getZoomPageRect().height() - m_canvas->height() ) ); + vert->setRange( 0, TQMAX( 0, m_canvas->activePage()->getZoomPageRect().height() - m_canvas->height() ) ); horz->setSteps( 10, m_canvas->width() ); - horz->setRange( 0, QMAX( 0, m_canvas->activePage()->getZoomPageRect().width() + 16 - m_canvas->width() ) ); + horz->setRange( 0, TQMAX( 0, m_canvas->activePage()->getZoomPageRect().width() + 16 - m_canvas->width() ) ); } } @@ -3840,14 +3840,14 @@ void KPrView::skipToPage( int num ) vert->setValue( 0 ); horz->setValue( 0 ); if ( notebar ) { - QString text = page->noteText( ); + TQString text = page->noteText( ); notebar->setCurrentNoteText( text ); } refreshPageButton(); //(Laurent) deselect object when we change page. //otherwise you can change object properties on other page deSelectAllObjects(); - m_pKPresenterDoc->repaint( FALSE ); + m_pKPresenterDoc->tqrepaint( FALSE ); m_pKPresenterDoc->displayActivePage( page ); } @@ -3869,11 +3869,11 @@ void KPrView::refreshPageButton() void KPrView::showObjectRect( const KPrObject * object ) { - QRect r = zoomHandler()->zoomRect( object->getRealRect() ); - if ( ! QRect( getCanvas()->diffx(), + TQRect r = zoomHandler()->zoomRect( object->getRealRect() ); + if ( ! TQRect( getCanvas()->diffx(), getCanvas()->diffy(), getCanvas()->width(), - getCanvas()->height() ).contains( r ) ) + getCanvas()->height() ).tqcontains( r ) ) { int x = r.left() - 20; int y = r.top() - 20; @@ -3959,7 +3959,7 @@ bool KPrView::doubleClickActivation() const return true; } -QWidget* KPrView::canvas() const +TQWidget* KPrView::canvas() const { return m_canvas; } @@ -4101,9 +4101,9 @@ void KPrView::removeSideBarItem( int pos ) void KPrView::updatePageInfo() { if (m_sbPageLabel) - m_sbPageLabel->setText( QString(" ") + - i18n("Slide %1/%2").arg(getCurrPgNum()).arg(m_pKPresenterDoc->getPageNums())+ - QString(" ") ); + m_sbPageLabel->setText( TQString(" ") + + i18n("Slide %1/%2").tqarg(getCurrPgNum()).tqarg(m_pKPresenterDoc->getPageNums())+ + TQString(" ") ); } void KPrView::updateObjectStatusBarItem() @@ -4116,23 +4116,23 @@ void KPrView::updateObjectStatusBarItem() if (nbSelected == 1) { KoUnit::Unit unit = m_pKPresenterDoc->unit(); - //QString unitName = m_pKPresenterDoc->unitName(); + //TQString unitName = m_pKPresenterDoc->unitName(); KPrObject * obj = m_canvas->getSelectedObj(); KoSize size = obj->getSize(); m_sbObjectLabel->setText( ' ' + i18n( "Statusbar info", "%1: %2, %3 - %4, %5 (width: %6, height: %7)" ) - .arg( /*frame->frameSet()->name()*/obj->getObjectName() ) - .arg( KoUnit::toUserStringValue( obj->getOrig().x(), unit ) ) - .arg( KoUnit::toUserStringValue( obj->getOrig().y() , unit) ) - .arg( KoUnit::toUserStringValue( obj->getOrig().x() + size.width(), unit ) ) - .arg( KoUnit::toUserStringValue( obj->getOrig().y() + size.height(), unit ) ) - .arg( KoUnit::toUserStringValue( size.width(), unit ) ) - .arg( KoUnit::toUserStringValue( size.height(), unit ) ) ); + .tqarg( /*frame->frameSet()->name()*/obj->getObjectName() ) + .tqarg( KoUnit::toUserStringValue( obj->getOrig().x(), unit ) ) + .tqarg( KoUnit::toUserStringValue( obj->getOrig().y() , unit) ) + .tqarg( KoUnit::toUserStringValue( obj->getOrig().x() + size.width(), unit ) ) + .tqarg( KoUnit::toUserStringValue( obj->getOrig().y() + size.height(), unit ) ) + .tqarg( KoUnit::toUserStringValue( size.width(), unit ) ) + .tqarg( KoUnit::toUserStringValue( size.height(), unit ) ) ); } else m_sbObjectLabel->setText( i18n("1 object selected", "%n objects selected", nbSelected) ); } else if ( sb && m_sbObjectLabel ) - m_sbObjectLabel->setText( QString::null ); + m_sbObjectLabel->setText( TQString() ); } void KPrView::pageNumChanged() @@ -4206,7 +4206,7 @@ void KPrView::setEditMaster( bool editMaster ) if ( sidebar ) sidebar->setViewMasterPage( m_editMaster ); updateNoteBarText(); - m_canvas->repaint( false ); + m_canvas->tqrepaint( false ); } } @@ -4215,22 +4215,22 @@ void KPrView::updateNoteBarText() if ( notebar ) { if ( m_editMaster ) { - QString text = m_pKPresenterDoc->masterPage()->noteText(); + TQString text = m_pKPresenterDoc->masterPage()->noteText(); notebar->setCurrentNoteText( text ); } else { - QString text = m_pKPresenterDoc->pageList().at( currPg )->noteText( ); + TQString text = m_pKPresenterDoc->pageList().at( currPg )->noteText( ); notebar->setCurrentNoteText( text ); } } } -void KPrView::openPopupMenuMenuPage( const QPoint & _point ) +void KPrView::openPopupMenuMenuPage( const TQPoint & _point ) { if(!koDocument()->isReadWrite() || !factory()) return; - QPtrList<KAction> actionList= QPtrList<KAction>(); + TQPtrList<KAction> actionList= TQPtrList<KAction>(); KActionSeparator *separator=new KActionSeparator(); switch( m_canvas->activePage()->getBackType()) { @@ -4246,26 +4246,26 @@ void KPrView::openPopupMenuMenuPage( const QPoint & _point ) if ( actionList.count()>0) plugActionList( "picture_action", actionList ); m_mousePos = m_canvas->mapFromGlobal( _point ); - QPopupMenu* menu = dynamic_cast<QPopupMenu*>(factory()->container("menupage_popup",this)); + TQPopupMenu* menu = dynamic_cast<TQPopupMenu*>(factory()->container("menupage_popup",this)); if ( menu ) menu->exec(_point); - m_mousePos = QPoint( 0, 0 ); + m_mousePos = TQPoint( 0, 0 ); unplugActionList( "picture_action" ); delete separator; } -void KPrView::openPopupMenuObject( const QString & name, const QPoint & _point ) +void KPrView::openPopupMenuObject( const TQString & name, const TQPoint & _point ) { if(!koDocument()->isReadWrite() || !factory()) return; - dynamic_cast<QPopupMenu*>(factory()->container(name, this))->popup(_point); + dynamic_cast<TQPopupMenu*>(factory()->container(name, this))->popup(_point); } -void KPrView::openPopupMenuSideBar(const QPoint & _point) +void KPrView::openPopupMenuSideBar(const TQPoint & _point) { if(!koDocument()->isReadWrite() || !factory()) return; - dynamic_cast<QPopupMenu*>(factory()->container("sidebarmenu_popup", this))->popup(_point); + dynamic_cast<TQPopupMenu*>(factory()->container("sidebarmenu_popup", this))->popup(_point); } void KPrView::renamePageTitle() @@ -4315,10 +4315,10 @@ void KPrView::penColorChanged( const KoPen & _pen ) actionPenColor->setCurrentColor( _pen.color() ); } -void KPrView::brushColorChanged( const QBrush & _brush ) +void KPrView::brushColorChanged( const TQBrush & _brush ) { //actionBrushColor->setEnabled( true ); - actionBrushColor->setCurrentColor(_brush.style ()==Qt::NoBrush ? Qt::white : _brush.color() ); + actionBrushColor->setCurrentColor(_brush.style ()==TQt::NoBrush ? TQt::white : _brush.color() ); } void KPrView::restartAutoPresTimer() @@ -4352,15 +4352,15 @@ void KPrView::insertSpecialChar() KPrTextView *edit=m_canvas->currentTextObjectView(); if ( !edit ) return; - QString f = edit->textFontFamily(); - QChar c=' '; + TQString f = edit->textFontFamily(); + TQChar c=' '; if (m_specialCharDlg==0) { m_specialCharDlg = new KoCharSelectDia( this, "insert special char", f, c, false ); - connect( m_specialCharDlg, SIGNAL(insertChar(QChar,const QString &)), - this, SLOT(slotSpecialChar(QChar,const QString &))); - connect( m_specialCharDlg, SIGNAL( finished() ), - this, SLOT( slotSpecialCharDlgClosed() ) ); + connect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), + TQT_TQOBJECT(this), TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); + connect( m_specialCharDlg, TQT_SIGNAL( finished() ), + TQT_TQOBJECT(this), TQT_SLOT( slotSpecialCharDlgClosed() ) ); } m_specialCharDlg->show(); } @@ -4369,16 +4369,16 @@ void KPrView::slotSpecialCharDlgClosed() { if ( m_specialCharDlg) { - disconnect( m_specialCharDlg, SIGNAL(insertChar(QChar,const QString &)), - this, SLOT(slotSpecialChar(QChar,const QString &))); - disconnect( m_specialCharDlg, SIGNAL( finished() ), - this, SLOT( slotSpecialCharDlgClosed() ) ); + disconnect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), + TQT_TQOBJECT(this), TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); + disconnect( m_specialCharDlg, TQT_SIGNAL( finished() ), + TQT_TQOBJECT(this), TQT_SLOT( slotSpecialCharDlgClosed() ) ); m_specialCharDlg->deleteLater(); m_specialCharDlg = 0L; } } -void KPrView::slotSpecialChar(QChar c, const QString &_font) +void KPrView::slotSpecialChar(TQChar c, const TQString &_font) { KPrTextView *edit=m_canvas->currentTextObjectView(); if ( !edit ) @@ -4391,12 +4391,12 @@ void KPrView::insertLink() KPrTextView *edit=m_canvas->currentTextObjectView(); if ( !edit ) return; - QString link; - QString ref; + TQString link; + TQString ref; if ( edit->textObject()->hasSelection() ) { - QString selectedText = edit->textObject()->selectedText(); - if ( edit->textObject()->selectionHasCustomItems() || selectedText.contains('\n') ) + TQString selectedText = edit->textObject()->selectedText(); + if ( edit->textObject()->selectionHasCustomItems() || selectedText.tqcontains('\n') ) return; if ( selectedText.startsWith( "mailto:/" ) || selectedText.startsWith( "ftp:/" ) || @@ -4412,7 +4412,7 @@ void KPrView::insertLink() } } - if(KoInsertLinkDia::createLinkDia(link, ref, QStringList(), false, this)) + if(KoInsertLinkDia::createLinkDia(link, ref, TQStringList(), false, this)) { if(!link.isEmpty() && !ref.isEmpty()) edit->insertLink(link, ref); @@ -4427,11 +4427,11 @@ void KPrView::changeLink() KoLinkVariable * var=edit->linkVariable(); if(var) { - QString oldhref= var->url(); - QString oldLinkName=var->value(); - QString link=oldLinkName; - QString ref=oldhref; - if(KoInsertLinkDia::createLinkDia(link, ref, QStringList(), false, this)) + TQString oldhref= var->url(); + TQString oldLinkName=var->value(); + TQString link=oldLinkName; + TQString ref=oldhref; + if(KoInsertLinkDia::createLinkDia(link, ref, TQStringList(), false, this)) { if(!link.isEmpty() && !ref.isEmpty()) { @@ -4543,7 +4543,7 @@ void KPrView::slotSpellCheck() //m_doc->setReadWrite(false); // prevent editing text - not anymore m_spell.macroCmdSpellCheck = 0L; m_spell.replaceAll.clear(); - QValueList<KoTextObject *> objects; + TQValueList<KoTextObject *> objects; KPrTextView *edit=m_canvas->currentTextObjectView(); int options = 0; if ( edit && edit->textObject()->hasSelection() ) @@ -4554,7 +4554,7 @@ void KPrView::slotSpellCheck() else { objects = spellAddTextObject(); - QPtrList<KPrObject> lstObj; + TQPtrList<KPrObject> lstObj; } if ( ! objects.empty() ) { @@ -4563,12 +4563,12 @@ void KPrView::slotSpellCheck() } } -QValueList<KoTextObject *> KPrView::spellAddTextObject() const +TQValueList<KoTextObject *> KPrView::spellAddTextObject() const { - QValueList<KoTextObject *> lst; - QPtrList<KPrObject> lstObj; + TQValueList<KoTextObject *> lst; + TQPtrList<KPrObject> lstObj; m_canvas->activePage()->getAllObjectSelectedList(lstObj, true); - QPtrListIterator<KPrObject> it( lstObj ); + TQPtrListIterator<KPrObject> it( lstObj ); for ( ; it.current() ; ++it ) { if(it.current()->getType()==OT_TEXT) @@ -4587,22 +4587,22 @@ void KPrView::startKSpell() { // m_spellCurrFrameSetNum is supposed to be set by the caller of this method if ( !m_spell.kospell ) - m_spell.kospell = new KoSpell( m_broker, this ); + m_spell.kospell = new KoSpell( m_broker, TQT_TQOBJECT(this) ); m_spell.kospell->check( m_spell.textIterator, true ); delete m_spell.dlg; m_spell.dlg = new KSpell2::Dialog( m_spell.kospell, this ); m_spell.dlg->activeAutoCorrect( true ); - QObject::connect( m_spell.dlg, SIGNAL(misspelling(const QString&, int)), - this, SLOT(spellCheckerMisspelling(const QString&, int)) ); - QObject::connect( m_spell.dlg, SIGNAL(replace(const QString&, int, const QString&)), - this, SLOT(spellCheckerCorrected(const QString&, int, const QString&)) ); - QObject::connect( m_spell.dlg, SIGNAL(done(const QString&) ), - this, SLOT(spellCheckerDone(const QString&)) ); - QObject::connect( m_spell.dlg, SIGNAL(cancel() ), - this, SLOT( spellCheckerCancel() ) ); - QObject::connect( m_spell.dlg, SIGNAL(autoCorrect(const QString &, const QString & ) ), - this, SLOT( spellAddAutoCorrect (const QString &, const QString &) ) ); + TQObject::connect( m_spell.dlg, TQT_SIGNAL(misspelling(const TQString&, int)), + TQT_TQOBJECT(this), TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) ); + TQObject::connect( m_spell.dlg, TQT_SIGNAL(tqreplace(const TQString&, int, const TQString&)), + TQT_TQOBJECT(this), TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); + TQObject::connect( m_spell.dlg, TQT_SIGNAL(done(const TQString&) ), + TQT_TQOBJECT(this), TQT_SLOT(spellCheckerDone(const TQString&)) ); + TQObject::connect( m_spell.dlg, TQT_SIGNAL(cancel() ), + TQT_TQOBJECT(this), TQT_SLOT( spellCheckerCancel() ) ); + TQObject::connect( m_spell.dlg, TQT_SIGNAL(autoCorrect(const TQString &, const TQString & ) ), + TQT_TQOBJECT(this), TQT_SLOT( spellAddAutoCorrect (const TQString &, const TQString &) ) ); m_spell.dlg->show(); } @@ -4660,7 +4660,7 @@ void KPrView::clearSpellChecker(bool cancelSpellCheck) } -void KPrView::spellCheckerMisspelling( const QString &old, int pos ) +void KPrView::spellCheckerMisspelling( const TQString &old, int pos ) { //kdDebug(32001) << "KWView::spellCheckerMisspelling old=" << old << " pos=" << pos << endl; KoTextObject* textobj = m_spell.kospell->currentTextObject(); @@ -4675,10 +4675,10 @@ void KPrView::spellCheckerMisspelling( const QString &old, int pos ) kdDebug() << "KWView::spellCheckerMisspelling parag=" << parag->paragId() << " pos=" << pos << " length=" << old.length() << endl; - textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*repaint*/ ); + textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*tqrepaint*/ ); } -void KPrView::spellCheckerCorrected( const QString &old, int pos, const QString &corr ) +void KPrView::spellCheckerCorrected( const TQString &old, int pos, const TQString &corr ) { //kdDebug(33001) << "KWView::spellCheckerCorrected old=" << old << " corr=" << corr << " pos=" << pos << endl; @@ -4694,17 +4694,17 @@ void KPrView::spellCheckerCorrected( const QString &old, int pos, const QString if ( !textdoc ) return; pos += m_spell.kospell->currentStartIndex(); - textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*repaint*/ ); + textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*tqrepaint*/ ); KoTextCursor cursor( textdoc ); cursor.setParag( parag ); cursor.setIndex( pos ); if(!m_spell.macroCmdSpellCheck) m_spell.macroCmdSpellCheck=new KMacroCommand(i18n("Correct Misspelled Word")); - m_spell.macroCmdSpellCheck->addCommand(textobj->replaceSelectionCommand(&cursor, corr, QString::null, KoTextDocument::HighlightSelection)); + m_spell.macroCmdSpellCheck->addCommand(textobj->replaceSelectionCommand(&cursor, corr, TQString(), KoTextDocument::HighlightSelection)); } -void KPrView::spellCheckerDone( const QString & ) +void KPrView::spellCheckerDone( const TQString & ) { /* See also KWView::spellCheckerDone from KWord */ kdDebug() << "KPrView::spellCheckerDone" << endl; @@ -4718,8 +4718,8 @@ void KPrView::spellCheckerDone( const QString & ) void KPrView::showCounter( KoParagCounter &c ) { - QString styleStr("counterstyle_"); - styleStr += QString::number( c.style() ); + TQString styleStr("counterstyle_"); + styleStr += TQString::number( c.style() ); //kdDebug(33001) << "KWView::showCounter styleStr=" << styleStr << endl; KToggleAction* act = static_cast<KToggleAction *>( actionCollection()->action( styleStr.latin1() ) ); Q_ASSERT( act ); @@ -4734,10 +4734,10 @@ void KPrView::formatParagraph() void KPrView::showParagraphDialog(int initialPage, double initialTabPos) { - QPtrList<KoTextFormatInterface> lst = m_canvas->applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = m_canvas->applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrList<KPrTextObject> lstObjects = m_canvas->applicableTextObjects(); + TQPtrList<KPrTextObject> lstObjects = m_canvas->applicableTextObjects(); if ( lstObjects.isEmpty() ) return; @@ -4759,7 +4759,7 @@ void KPrView::showParagraphDialog(int initialPage, double initialTabPos) if ( initialPage == KoParagDia::PD_TABS ) m_paragDlg->tabulatorsWidget()->setCurrentTab( initialTabPos ); } - connect( m_paragDlg, SIGNAL( applyParagStyle() ), this, SLOT( slotApplyParag() ) ); + connect( m_paragDlg, TQT_SIGNAL( applyParagStyle() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplyParag() ) ); m_paragDlg->exec(); delete m_paragDlg; @@ -4769,10 +4769,10 @@ void KPrView::showParagraphDialog(int initialPage, double initialTabPos) void KPrView::slotApplyParag() { - QPtrList<KoTextFormatInterface> lst = m_canvas->applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = m_canvas->applicableTextInterfaces(); Q_ASSERT( !lst.isEmpty() ); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KMacroCommand * macroCommand = new KMacroCommand( i18n( "Paragraph Settings" ) ); KoParagLayout newLayout = m_paragDlg->paragLayout(); int flags = m_paragDlg->changedFlags(); @@ -4810,26 +4810,26 @@ void KPrView::changeNbOfRecentFiles(int _nb) shell()->setMaxRecentItems( _nb ); } -QPopupMenu * KPrView::popupMenu( const QString& name ) +TQPopupMenu * KPrView::popupMenu( const TQString& name ) { Q_ASSERT(factory()); if ( factory() ) - return ((QPopupMenu*)factory()->container( name, this )); + return ((TQPopupMenu*)factory()->container( name, this )); return 0L; } -void KPrView::addVariableActions( int type, const QStringList & texts, - KActionMenu * parentMenu, const QString & menuText ) +void KPrView::addVariableActions( int type, const TQStringList & texts, + KActionMenu * tqparentMenu, const TQString & menuText ) { - // Single items go directly into parentMenu. + // Single items go directly into tqparentMenu. // For multiple items we create a submenu. if ( texts.count() > 1 && !menuText.isEmpty() ) { KActionMenu * subMenu = new KActionMenu( menuText, actionCollection() ); - parentMenu->insert( subMenu ); - parentMenu = subMenu; + tqparentMenu->insert( subMenu ); + tqparentMenu = subMenu; } - QStringList::ConstIterator it = texts.begin(); + TQStringList::ConstIterator it = texts.begin(); for ( int i = 0; it != texts.end() ; ++it, ++i ) { if ( !(*it).isEmpty() ) // in case of removed subtypes or placeholders @@ -4837,10 +4837,10 @@ void KPrView::addVariableActions( int type, const QStringList & texts, VariableDef v; v.type = type; v.subtype = i; - KAction * act = new KAction( (*it), 0, this, SLOT( insertVariable() ), + KAction * act = new KAction( (*it), 0, TQT_TQOBJECT(this), TQT_SLOT( insertVariable() ), actionCollection(), "var-action" ); m_variableDefMap.insert( act, v ); - parentMenu->insert( act ); + tqparentMenu->insert( act ); } } } @@ -4848,10 +4848,10 @@ void KPrView::addVariableActions( int type, const QStringList & texts, void KPrView::refreshCustomMenu() { KActionPtrList lst2 = actionCollection()->actions("custom-variable-action"); - QValueList<KAction *> actions = lst2; - QValueList<KAction *>::ConstIterator it2 = lst2.begin(); - QValueList<KAction *>::ConstIterator end = lst2.end(); - QMap<QString, KShortcut> shortCuts; + TQValueList<KAction *> actions = lst2; + TQValueList<KAction *>::ConstIterator it2 = lst2.begin(); + TQValueList<KAction *>::ConstIterator end = lst2.end(); + TQMap<TQString, KShortcut> shortCuts; for (; it2 != end; ++it2 ) { @@ -4867,10 +4867,10 @@ void KPrView::refreshCustomMenu() actionInsertCustom->popupMenu()->clear(); - QPtrListIterator<KoVariable> it( m_pKPresenterDoc->getVariableCollection()->getVariables() ); + TQPtrListIterator<KoVariable> it( m_pKPresenterDoc->getVariableCollection()->getVariables() ); KAction * act=0; - QStringList lst; - QString varName; + TQStringList lst; + TQString varName; int i = 0; for ( ; it.current() ; ++it ) { @@ -4878,12 +4878,12 @@ void KPrView::refreshCustomMenu() if ( var->type() == VT_CUSTOM ) { varName=( (KoCustomVariable*) var )->name(); - if ( !lst.contains( varName) ) + if ( !lst.tqcontains( varName) ) { lst.append( varName ); - QCString name = QString("custom-action_%1").arg(i).latin1(); - act = new KAction( varName, shortCuts[varName], this, - SLOT( insertCustomVariable() ), actionCollection(), name ); + TQCString name = TQString("custom-action_%1").tqarg(i).latin1(); + act = new KAction( varName, shortCuts[varName], TQT_TQOBJECT(this), + TQT_SLOT( insertCustomVariable() ), actionCollection(), name ); act->setGroup( "custom-variable-action" ); actionInsertCustom->insert( act ); @@ -4895,8 +4895,8 @@ void KPrView::refreshCustomMenu() if(state) actionInsertCustom->popupMenu()->insertSeparator(); - act = new KAction( i18n("New..."), 0, this, SLOT( insertNewCustomVariable() ), actionCollection(), - QString("custom-action_%1").arg(i).latin1() ); + act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(), + TQString("custom-action_%1").tqarg(i).latin1() ); act->setGroup( "custom-variable-action" ); actionInsertCustom->insert( act ); @@ -4912,7 +4912,7 @@ void KPrView::insertCustomVariable() KPrTextView *edit=m_canvas->currentTextObjectView(); if ( edit ) { - KAction * act = (KAction *)(sender()); + KAction * act = (KAction *)(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); edit->insertCustomVariable(act->text()); } } @@ -4932,7 +4932,7 @@ void KPrView::editCustomVariable() KoCustomVariable *var = static_cast<KoCustomVariable *>(edit->variable()); if (var) { - QString oldvalue = var->value(); + TQString oldvalue = var->value(); KoCustomVarDialog dia( this, var ); if ( dia.exec() ) { @@ -4951,8 +4951,8 @@ void KPrView::editCustomVariable() void KPrView::editCustomVars() { KoCustomVariablesDia dia( this, m_pKPresenterDoc->getVariableCollection()->getVariables() ); - QStringList listOldCustomValue; - QPtrListIterator<KoVariable> oldIt( m_pKPresenterDoc->getVariableCollection()->getVariables() ); + TQStringList listOldCustomValue; + TQPtrListIterator<KoVariable> oldIt( m_pKPresenterDoc->getVariableCollection()->getVariables() ); for ( ; oldIt.current() ; ++oldIt ) { if(oldIt.current()->type()==VT_CUSTOM) @@ -4961,7 +4961,7 @@ void KPrView::editCustomVars() if(dia.exec()) { m_pKPresenterDoc->recalcVariables( VT_CUSTOM ); - QPtrListIterator<KoVariable> it( m_pKPresenterDoc->getVariableCollection()->getVariables() ); + TQPtrListIterator<KoVariable> it( m_pKPresenterDoc->getVariableCollection()->getVariables() ); KMacroCommand * macroCommand = 0L; int i=0; for ( ; it.current() ; ++it ) @@ -4992,8 +4992,8 @@ void KPrView::insertVariable() KPrTextView *edit=m_canvas->currentTextObjectView(); if ( edit ) { - KAction * act = (KAction *)(sender()); - VariableDefMap::ConstIterator it = m_variableDefMap.find( act ); + KAction * act = (KAction *)(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); + VariableDefMap::ConstIterator it = m_variableDefMap.tqfind( act ); if ( it == m_variableDefMap.end() ) kdWarning(33001) << "Action not found in m_variableDefMap." << endl; else @@ -5058,7 +5058,7 @@ void KPrView::slotUpdateRuler() KPrTextObject *txtobj= m_canvas->applicableTextObjects().first(); if ( txtobj ) { - QRect r= zoomHandler()->zoomRect(txtobj->getRealRect()); + TQRect r= zoomHandler()->zoomRect(txtobj->getRealRect()); getHRuler()->setFrameStartEnd( r.left() /*+ m_canvas->diffx()*//*- pc.x()*/, r.right()/*+m_canvas->diffx()*/ /*- pc.x()*/ ); getVRuler()->setFrameStartEnd( r.top()/*+ m_canvas->diffy()*//*- pc.y()*/, r.bottom()/*+m_canvas->diffy()*//*- pc.y()*/ ); if( getHRuler()) @@ -5067,7 +5067,7 @@ void KPrView::slotUpdateRuler() if( getHRuler()->flags()!= flags ) { getHRuler()->changeFlags(flags); - getHRuler()->repaint(); + getHRuler()->tqrepaint(); } } if( getVRuler()) @@ -5075,7 +5075,7 @@ void KPrView::slotUpdateRuler() if( getVRuler()->flags() != 0 ) { getVRuler()->changeFlags(0); - getVRuler()->repaint(); + getVRuler()->tqrepaint(); } } } @@ -5110,9 +5110,9 @@ void KPrView::slotHRulerDoubleClicked() void KPrView::changeCaseOfText() { - QPtrList<KoTextFormatInterface> lst = m_canvas->applicableTextInterfaces(); + TQPtrList<KoTextFormatInterface> lst = m_canvas->applicableTextInterfaces(); if ( lst.isEmpty() ) return; - QPtrListIterator<KoTextFormatInterface> it( lst ); + TQPtrListIterator<KoTextFormatInterface> it( lst ); KoChangeCaseDia *caseDia=new KoChangeCaseDia( this,"change case" ); if(caseDia->exec()) { @@ -5140,19 +5140,19 @@ void KPrView::editFind() KPrTextView * edit = m_canvas->currentTextObjectView(); bool hasSelection = edit && (edit->kpTextObject())->textObject()->hasSelection(); bool hasCursor = edit != 0; - KoSearchDia dialog( m_canvas, "find", m_searchEntry, hasSelection, hasCursor ); + KoSearchDia dialog( m_canvas, "tqfind", m_searchEntry, hasSelection, hasCursor ); - /// KoFindReplace needs a QValueList<KoTextObject *>... - QValueList<KoTextObject *> list; - QPtrList<KoTextObject> list2 = m_pKPresenterDoc->allTextObjects(); - QPtrListIterator<KoTextObject> it( list2 ); + /// KoFindReplace needs a TQValueList<KoTextObject *>... + TQValueList<KoTextObject *> list; + TQPtrList<KoTextObject> list2 = m_pKPresenterDoc->allTextObjects(); + TQPtrListIterator<KoTextObject> it( list2 ); for ( ; it.current() ; ++it ) list.append(it.current()); if( list.isEmpty() ) return; - if ( dialog.exec() == QDialog::Accepted ) + if ( dialog.exec() == TQDialog::Accepted ) { delete m_findReplace; m_findReplace = new KPrFindReplace( this, m_canvas, &dialog, list, edit ); @@ -5170,19 +5170,19 @@ void KPrView::editReplace() KPrTextView * edit = m_canvas->currentTextObjectView(); bool hasSelection = edit && (edit->kpTextObject())->textObject()->hasSelection(); bool hasCursor = edit != 0; - KoReplaceDia dialog( m_canvas, "replace", m_searchEntry, m_replaceEntry, hasSelection, hasCursor ); + KoReplaceDia dialog( m_canvas, "tqreplace", m_searchEntry, m_replaceEntry, hasSelection, hasCursor ); - /// KoFindReplace needs a QValueList<KoTextObject *>... - QValueList<KoTextObject *> list; - QPtrList<KoTextObject> list2 = m_pKPresenterDoc->allTextObjects(); - QPtrListIterator<KoTextObject> it( list2 ); + /// KoFindReplace needs a TQValueList<KoTextObject *>... + TQValueList<KoTextObject *> list; + TQPtrList<KoTextObject> list2 = m_pKPresenterDoc->allTextObjects(); + TQPtrListIterator<KoTextObject> it( list2 ); for ( ; it.current() ; ++it ) list.append(it.current()); if( list.isEmpty() ) return; - if ( dialog.exec() == QDialog::Accepted ) + if ( dialog.exec() == TQDialog::Accepted ) { delete m_findReplace; m_findReplace = new KPrFindReplace( this, m_canvas, &dialog, list, edit ); @@ -5217,73 +5217,73 @@ void KPrView::refreshAllVariable() void KPrView::changeZoomMenu( int zoom ) { - QStringList lst; + TQStringList lst; lst << i18n( "Width" ); lst << i18n( "Whole Slide" ); if(zoom>0) { - QValueList<int> list; + TQValueList<int> list; bool ok; - const QStringList itemsList ( actionViewZoom->items() ); - QRegExp regexp("(\\d+)"); // "Captured" non-empty sequence of digits + const TQStringList itemsList ( actionViewZoom->items() ); + TQRegExp regexp("(\\d+)"); // "Captured" non-empty sequence of digits - for (QStringList::ConstIterator it = itemsList.begin() ; it != itemsList.end() ; ++it) + for (TQStringList::ConstIterator it = itemsList.begin() ; it != itemsList.end() ; ++it) { regexp.search(*it); const int val=regexp.cap(1).toInt(&ok); //zoom : limit inferior=10 - if(ok && val>9 && list.contains(val)==0) + if(ok && val>9 && list.tqcontains(val)==0) list.append( val ); } //necessary at the beginning when we read config //this value is not in combo list - if(list.contains(zoom)==0) + if(list.tqcontains(zoom)==0) list.append( zoom ); qHeapSort( list ); - for (QValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it) - lst.append( i18n("%1%").arg(*it) ); + for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it) + lst.append( i18n("%1%").tqarg(*it) ); } else { - lst << i18n("%1%").arg("33"); - lst << i18n("%1%").arg("50"); - lst << i18n("%1%").arg("75"); - lst << i18n("%1%").arg("100"); - lst << i18n("%1%").arg("125"); - lst << i18n("%1%").arg("150"); - lst << i18n("%1%").arg("200"); - lst << i18n("%1%").arg("250"); - lst << i18n("%1%").arg("350"); - lst << i18n("%1%").arg("400"); - lst << i18n("%1%").arg("450"); - lst << i18n("%1%").arg("500"); + lst << i18n("%1%").tqarg("33"); + lst << i18n("%1%").tqarg("50"); + lst << i18n("%1%").tqarg("75"); + lst << i18n("%1%").tqarg("100"); + lst << i18n("%1%").tqarg("125"); + lst << i18n("%1%").tqarg("150"); + lst << i18n("%1%").tqarg("200"); + lst << i18n("%1%").tqarg("250"); + lst << i18n("%1%").tqarg("350"); + lst << i18n("%1%").tqarg("400"); + lst << i18n("%1%").tqarg("450"); + lst << i18n("%1%").tqarg("500"); } actionViewZoom->setItems( lst ); } void KPrView::showZoom( int zoom ) { - QStringList list = actionViewZoom->items(); - QString zoomStr( i18n("%1%").arg( zoom ) ); - int pos = list.findIndex(zoomStr); + TQStringList list = actionViewZoom->items(); + TQString zoomStr( i18n("%1%").tqarg( zoom ) ); + int pos = list.tqfindIndex(zoomStr); if( pos == -1) { changeZoomMenu( zoom ); list = actionViewZoom->items(); } - actionViewZoom->setCurrentItem( list.findIndex(zoomStr) ); + actionViewZoom->setCurrentItem( list.tqfindIndex(zoomStr) ); } -void KPrView::viewZoom( const QString &s ) +void KPrView::viewZoom( const TQString &s ) { bool ok=false; int zoom = 0; if ( s == i18n("Width") ) { - zoom = qRound( static_cast<double>(m_canvas->visibleRect().width() * 100 ) / + zoom = tqRound( static_cast<double>(m_canvas->visibleRect().width() * 100 ) / (zoomHandler()->resolutionX() * m_pKPresenterDoc->pageLayout().ptWidth ) ); ok = true; } @@ -5294,13 +5294,13 @@ void KPrView::viewZoom( const QString &s ) } else { - QRegExp regexp("(\\d+)"); // "Captured" non-empty sequence of digits + TQRegExp regexp("(\\d+)"); // "Captured" non-empty sequence of digits regexp.search(s); zoom=regexp.cap(1).toInt(&ok); } if( !ok || zoom<10 ) //zoom should be valid and >10 zoom = zoomHandler()->zoom(); - zoom = QMIN( zoom, 4000); + zoom = TQMIN( zoom, 4000); //refresh menu changeZoomMenu( zoom ); //refresh menu item @@ -5315,23 +5315,23 @@ void KPrView::viewZoom( const QString &s ) } m_canvas->setFocus(); - m_canvas->repaint(); + m_canvas->tqrepaint(); } void KPrView::setZoomRect( const KoRect & rect ) { double height = zoomHandler()->resolutionY() * rect.height(); double width = zoomHandler()->resolutionX() * rect.width(); - int zoom = QMIN( qRound( static_cast<double>( m_canvas->visibleRect().height() * 100 ) / height ), - qRound( static_cast<double>( m_canvas->visibleRect().width() * 100 ) / width ) ); + int zoom = TQMIN( tqRound( static_cast<double>( m_canvas->visibleRect().height() * 100 ) / height ), + tqRound( static_cast<double>( m_canvas->visibleRect().width() * 100 ) / width ) ); m_canvas->setUpdatesEnabled( false ); - viewZoom( QString::number( zoom ) ); + viewZoom( TQString::number( zoom ) ); m_canvas->setToolEditMode( TEM_MOUSE ); m_canvas->scrollTopLeftPoint( zoomHandler()->zoomPoint( rect.topLeft() ) ); m_canvas->setUpdatesEnabled( true ); - m_canvas->repaint(); + m_canvas->tqrepaint(); } void KPrView::setZoom( int zoom, bool updateViews ) @@ -5344,7 +5344,7 @@ void KPrView::setZoom( int zoom, bool updateViews ) setRanges(); if ( statusBar() ) - m_sbZoomLabel->setText( ' ' + QString::number( zoom ) + "% " ); + m_sbZoomLabel->setText( ' ' + TQString::number( zoom ) + "% " ); } void KPrView::slotUpdateScrollBarRanges() @@ -5360,8 +5360,8 @@ KoTextZoomHandler *KPrView::zoomHandler() const void KPrView::slotViewFormattingChars() { m_pKPresenterDoc->setViewFormattingChars(actionViewFormattingChars->isChecked()); - m_pKPresenterDoc->layout(); // Due to the different formatting when this option is activated - m_pKPresenterDoc->repaint(false); + m_pKPresenterDoc->tqlayout(); // Due to the different formatting when this option is activated + m_pKPresenterDoc->tqrepaint(false); } void KPrView::setPageDuration( int _pgNum ) @@ -5377,16 +5377,16 @@ void KPrView::setPageDuration( int _pgNum ) void KPrView::openThePresentationDurationDialog() { int totalTime = 0; - QStringList presentationDurationStringList; - for ( QValueList<int>::Iterator it = m_presentationDurationList.begin(); + TQStringList presentationDurationStringList; + for ( TQValueList<int>::Iterator it = m_presentationDurationList.begin(); it != m_presentationDurationList.end(); ++it ) { int _time = *it; - QString presentationDurationString = presentationDurationDataFormatChange( _time ); + TQString presentationDurationString = presentationDurationDataFormatChange( _time ); presentationDurationStringList.append( presentationDurationString ); totalTime += _time; } - QString presentationTotalDurationString = presentationDurationDataFormatChange( totalTime ); + TQString presentationTotalDurationString = presentationDurationDataFormatChange( totalTime ); delete presDurationDia; presDurationDia = 0; @@ -5394,7 +5394,7 @@ void KPrView::openThePresentationDurationDialog() presDurationDia = new KPrPresDurationDia( this, "presDurationDia", kPresenterDoc(), presentationDurationStringList, presentationTotalDurationString ); presDurationDia->setCaption( i18n( "Presentation Duration" ) ); - QObject::connect( presDurationDia, SIGNAL( presDurationDiaClosed() ), this, SLOT( pddClosed() ) ); + TQObject::connect( presDurationDia, TQT_SIGNAL( presDurationDiaClosed() ), TQT_TQOBJECT(this), TQT_SLOT( pddClosed() ) ); presDurationDia->exec(); delete presDurationDia; @@ -5411,9 +5411,9 @@ void KPrView::pddClosed() // allows formatting of time as a duration. Before this, you can get // weirdness (such as a duration of 12:00:03 am) depending on how the // time format is set. -QString KPrView::presentationDurationDataFormatChange( int _time ) +TQString KPrView::presentationDurationDataFormatChange( int _time ) { - QTime time( 0, 0, 0 ); + TQTime time( 0, 0, 0 ); return KGlobal::locale()->formatTime( time.addMSecs( _time ), true, true ); } @@ -5440,7 +5440,7 @@ void KPrView::viewHeader() m_pKPresenterDoc->updateSideBarItem( m_pKPresenterDoc->masterPage() ); } -void KPrView::showStyle( const QString & styleName ) +void KPrView::showStyle( const TQString & styleName ) { KoParagStyle* style = m_pKPresenterDoc->styleCollection()->findStyle( styleName ); if ( style ) { @@ -5452,10 +5452,10 @@ void KPrView::showStyle( const QString & styleName ) void KPrView::updateStyleList() { - QString currentStyle = actionFormatStyle->currentText(); + TQString currentStyle = actionFormatStyle->currentText(); // Generate list of styles - const QStringList lst = m_pKPresenterDoc->styleCollection()->displayNameList(); - const int pos = lst.findIndex( currentStyle ); + const TQStringList lst = m_pKPresenterDoc->styleCollection()->displayNameList(); + const int pos = lst.tqfindIndex( currentStyle ); // Fill the combo - using a KSelectAction actionFormatStyle->setItems( lst ); if ( pos > -1 ) @@ -5463,32 +5463,32 @@ void KPrView::updateStyleList() // Fill the menu - using a KActionMenu, so that it's possible to bind keys // to individual actions - QStringList lstWithAccels; + TQStringList lstWithAccels; // Generate unique accelerators for the menu items KAccelGen::generate( lst, lstWithAccels ); - QMap<QString, KShortcut> shortCuts; + TQMap<TQString, KShortcut> shortCuts; KActionPtrList lst2 = actionCollection()->actions("styleList"); - QValueList<KAction *> actions = lst2; - QValueList<KAction *>::ConstIterator it = lst2.begin(); - QValueList<KAction *>::ConstIterator end = lst2.end(); + TQValueList<KAction *> actions = lst2; + TQValueList<KAction *>::ConstIterator it = lst2.begin(); + TQValueList<KAction *>::ConstIterator end = lst2.end(); for (; it != end; ++it ) { - shortCuts.insert( QString::fromUtf8( (*it)->name() ), (*it)->shortcut() ); + shortCuts.insert( TQString::fromUtf8( (*it)->name() ), (*it)->shortcut() ); actionFormatStyleMenu->remove( *it ); delete *it; } uint i = 0; - for ( QStringList::Iterator it = lstWithAccels.begin(); it != lstWithAccels.end(); ++it, ++i ) + for ( TQStringList::Iterator it = lstWithAccels.begin(); it != lstWithAccels.end(); ++it, ++i ) { KoParagStyle *style = m_pKPresenterDoc->styleCollection()->styleAt( i ); if ( style ) { - QString name = "paragstyle_" + style->name(); + TQString name = "paragstyle_" + style->name(); KToggleAction* act = new KToggleAction( (*it), - shortCuts[name], this, SLOT( slotStyleSelected() ), + shortCuts[name], TQT_TQOBJECT(this), TQT_SLOT( slotStyleSelected() ), actionCollection(), name.utf8() ); act->setGroup( "styleList" ); act->setExclusiveGroup( "styleListAction" ); @@ -5504,7 +5504,7 @@ void KPrView::updateStyleList() void KPrView::extraStylist() { KPrTextView *edit=m_canvas->currentTextObjectView(); - QString activeStyleName = QString::null; + TQString activeStyleName = TQString(); if ( edit ) { edit->hideCursor(); @@ -5522,7 +5522,7 @@ void KPrView::extraStylist() // Called when selecting a style in the Format / Style menu void KPrView::slotStyleSelected() { - QString actionName = QString::fromUtf8(sender()->name()); + TQString actionName = TQString::fromUtf8(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); kdDebug(33001) << "KPrView::slotStyleSelected " << actionName << endl; textStyleSelected( m_pKPresenterDoc->styleCollection()->findStyle( actionName ) ); } @@ -5545,12 +5545,12 @@ void KPrView::textStyleSelected( KoParagStyle *_sty ) } else { - QPtrList<KPrTextObject> selectedFrames = m_canvas->selectedTextObjs(); + TQPtrList<KPrTextObject> selectedFrames = m_canvas->selectedTextObjs(); if (selectedFrames.count() <= 0) return; // nope, no frames are selected. // yes, indeed frames are selected. - QPtrListIterator<KPrTextObject> it( selectedFrames ); + TQPtrListIterator<KPrTextObject> it( selectedFrames ); KMacroCommand *globalCmd = 0L; for ( ; it.current() ; ++it ) { @@ -5592,7 +5592,7 @@ void KPrView::insertComment() KPrTextView *edit=m_canvas->currentTextObjectView(); if ( !edit ) return; - QString authorName; + TQString authorName; KoDocumentInfo * info = m_pKPresenterDoc->documentInfo(); KoDocumentInfoAuthor * authorPage = static_cast<KoDocumentInfoAuthor *>(info->page( "author" )); if ( !authorPage ) @@ -5600,7 +5600,7 @@ void KPrView::insertComment() else authorName = authorPage->fullName(); - KoCommentDia *commentDia = new KoCommentDia( this, QString::null,authorName ); + KoCommentDia *commentDia = new KoCommentDia( this, TQString(),authorName ); if( commentDia->exec() ) edit->insertComment(commentDia->commentText()); delete commentDia; @@ -5615,15 +5615,15 @@ void KPrView::editComment() KoNoteVariable * var = dynamic_cast<KoNoteVariable *>(tmpVar); if(var) { - QString authorName; + TQString authorName; KoDocumentInfo * info = m_pKPresenterDoc->documentInfo(); KoDocumentInfoAuthor * authorPage = static_cast<KoDocumentInfoAuthor *>(info->page( "author" )); if ( !authorPage ) kdWarning() << "Author information not found in documentInfo !" << endl; else authorName = authorPage->fullName(); - QString oldValue = var->note(); - QString createDate = var->createdNote(); + TQString oldValue = var->note(); + TQString createDate = var->createdNote(); KoCommentDia *commentDia = new KoCommentDia( this, oldValue, authorName, createDate); if( commentDia->exec() ) @@ -5647,7 +5647,7 @@ void KPrView::viewGuideLines() m_pKPresenterDoc->updateGuideLineButton(); deSelectAllObjects(); refreshRuler( state ); - m_pKPresenterDoc->repaint(false); + m_pKPresenterDoc->tqrepaint(false); } @@ -5656,7 +5656,7 @@ void KPrView::viewGrid() m_pKPresenterDoc->setShowGrid( actionViewShowGrid->isChecked() ); m_pKPresenterDoc->setModified( true ); m_pKPresenterDoc->updateGridButton(); - m_pKPresenterDoc->repaint(false); + m_pKPresenterDoc->tqrepaint(false); } @@ -5681,7 +5681,7 @@ void KPrView::refreshRuler( bool state ) if ( !m_pKPresenterDoc->isReadWrite()) { getHRuler()->changeFlags(KoRuler::F_NORESIZE); - getHRuler()->repaint(); + getHRuler()->tqrepaint(); } else { @@ -5690,7 +5690,7 @@ void KPrView::refreshRuler( bool state ) if( getHRuler()->flags() != KoRuler::F_HELPLINES ) { getHRuler()->changeFlags(KoRuler::F_HELPLINES); - getHRuler()->repaint(); + getHRuler()->tqrepaint(); } } else @@ -5698,7 +5698,7 @@ void KPrView::refreshRuler( bool state ) if( getHRuler()->flags() != 0 ) { getHRuler()->changeFlags( 0 ); - getHRuler()->repaint(); + getHRuler()->tqrepaint(); } } } @@ -5709,7 +5709,7 @@ void KPrView::refreshRuler( bool state ) if ( !m_pKPresenterDoc->isReadWrite()) { getVRuler()->changeFlags(KoRuler::F_NORESIZE); - getVRuler()->repaint(); + getVRuler()->tqrepaint(); } else { @@ -5718,7 +5718,7 @@ void KPrView::refreshRuler( bool state ) if( getVRuler()->flags() != KoRuler::F_HELPLINES ) { getVRuler()->changeFlags(KoRuler::F_HELPLINES); - getVRuler()->repaint(); + getVRuler()->tqrepaint(); } } else @@ -5726,7 +5726,7 @@ void KPrView::refreshRuler( bool state ) if( getVRuler()->flags()!= 0) { getVRuler()->changeFlags(0); - getVRuler()->repaint(); + getVRuler()->tqrepaint(); } } } @@ -5738,9 +5738,9 @@ void KPrView::addGuideLine() { KoRect rect( m_canvas->activePage()->getPageRect() ); - KoPoint pos( zoomHandler()->unzoomPoint( m_mousePos + QPoint( m_canvas->diffx(), m_canvas->diffy() ) ) ); + KoPoint pos( zoomHandler()->unzoomPoint( m_mousePos + TQPoint( m_canvas->diffx(), m_canvas->diffy() ) ) ); KoGuideLineDia dia( 0, pos, rect, m_pKPresenterDoc->unit() ); - if ( dia.exec() == QDialog::Accepted ) + if ( dia.exec() == TQDialog::Accepted ) { m_pKPresenterDoc->addGuideLine( dia.orientation(), dia.pos() ); } @@ -5760,42 +5760,42 @@ void KPrView::configureCompletion() dia.exec(); } -void KPrView::openPopupMenuZoom( const QPoint & _point ) +void KPrView::openPopupMenuZoom( const TQPoint & _point ) { if(!koDocument()->isReadWrite() || !factory()) return; actionZoomSelectedObject->setEnabled( m_canvas->isOneObjectSelected()); int nbObj = m_canvas->activePage()->objectList().count(); actionZoomAllObject->setEnabled( nbObj > 0); - static_cast<QPopupMenu*>(factory()->container("zoom_popup",this))->popup(_point); + static_cast<TQPopupMenu*>(factory()->container("zoom_popup",this))->popup(_point); } void KPrView::zoomMinus() { //unzoom from 25% int zoom = zoomHandler()->zoom() - (int)(zoomHandler()->zoom()*0.25); - viewZoom( QString::number(zoom ) ); + viewZoom( TQString::number(zoom ) ); m_canvas->setToolEditMode( TEM_MOUSE ); } void KPrView::zoomPageWidth() { - int zoom = qRound( static_cast<double>(m_canvas->visibleRect().width() * 100 ) / + int zoom = tqRound( static_cast<double>(m_canvas->visibleRect().width() * 100 ) / (zoomHandler()->resolutionX() * m_pKPresenterDoc->pageLayout().ptWidth ) ); - viewZoom( QString::number(zoom ) ); + viewZoom( TQString::number(zoom ) ); m_canvas->setToolEditMode( TEM_MOUSE ); } void KPrView::zoomEntirePage() { - viewZoom( QString::number(getZoomEntirePage() ) ); + viewZoom( TQString::number(getZoomEntirePage() ) ); m_canvas->setToolEditMode( TEM_MOUSE ); } void KPrView::zoomPlus() { int zoom = zoomHandler()->zoom() + int( zoomHandler()->zoom() * 0.25 ); - viewZoom( QString::number( zoom ) ); + viewZoom( TQString::number( zoom ) ); m_canvas->setToolEditMode( TEM_MOUSE ); } @@ -5803,8 +5803,8 @@ int KPrView::getZoomEntirePage() const { double height = zoomHandler()->resolutionY() * m_pKPresenterDoc->pageLayout().ptHeight; double width = zoomHandler()->resolutionX() * m_pKPresenterDoc->pageLayout().ptWidth; - int zoom = QMIN( qRound( static_cast<double>(m_canvas->visibleRect().height() * 100 ) / height ), - qRound( static_cast<double>(m_canvas->visibleRect().width() * 100 ) / width ) ); + int zoom = TQMIN( tqRound( static_cast<double>(m_canvas->visibleRect().height() * 100 ) / height ), + tqRound( static_cast<double>(m_canvas->visibleRect().width() * 100 ) / width ) ); return zoom; } @@ -5819,9 +5819,9 @@ void KPrView::zoomSelectedObject() void KPrView::zoomPageHeight() { - int zoom = qRound( static_cast<double>(m_canvas->visibleRect().height() * 100 ) / + int zoom = tqRound( static_cast<double>(m_canvas->visibleRect().height() * 100 ) / (zoomHandler()->resolutionX() * m_pKPresenterDoc->pageLayout().ptHeight ) ); - viewZoom( QString::number(zoom ) ); + viewZoom( TQString::number(zoom ) ); m_canvas->setToolEditMode( TEM_MOUSE ); } @@ -5830,9 +5830,9 @@ void KPrView::zoomAllObject() KoRect rect = m_canvas->objectRect( true ); double height = zoomHandler()->resolutionY() * rect.height(); double width = zoomHandler()->resolutionX() * rect.width(); - int zoom = QMIN( qRound( static_cast<double>(m_canvas->visibleRect().height() * 100 ) / height ), - qRound( static_cast<double>(m_canvas->visibleRect().width() * 100 ) / width ) ); - viewZoom( QString::number(zoom ) ); + int zoom = TQMIN( tqRound( static_cast<double>(m_canvas->visibleRect().height() * 100 ) / height ), + tqRound( static_cast<double>(m_canvas->visibleRect().width() * 100 ) / width ) ); + viewZoom( TQString::number(zoom ) ); m_canvas->setToolEditMode( TEM_MOUSE ); m_canvas->scrollTopLeftPoint( zoomHandler()->zoomPoint( rect.topLeft()) ); @@ -5889,9 +5889,9 @@ void KPrView::slotObjectEditChanged() KoParagCounter counter; if(paragLayout->counter) counter = *(paragLayout->counter); - int align = paragLayout->alignment; - if ( align == Qt::AlignAuto ) - align = Qt::AlignLeft; // ## seems hard to detect RTL here + int align = paragLayout->tqalignment; + if ( align == TQt::AlignAuto ) + align = TQt::AlignLeft; // ## seems hard to detect RTL here alignChanged( align ); } @@ -5910,7 +5910,7 @@ void KPrView::slotObjectEditChanged() bool hasSelection = false ; if(edit) { - double leftMargin =edit->currentParagLayout().margins[QStyleSheetItem::MarginLeft]; + double leftMargin =edit->currentParagLayout().margins[TQStyleSheetItem::MarginLeft]; actionTextDepthMinus->setEnabled(val && leftMargin>0); hasSelection = edit->textObject()->hasSelection(); actionEditCut->setEnabled(hasSelection); @@ -5964,11 +5964,11 @@ void KPrView::duplicateObj() m_canvas->copyObjs(); m_canvas->setToolEditMode( TEM_MOUSE ); deSelectAllObjects(); - QMimeSource *data = QApplication::clipboard()->data(); - QCString clip_str = KoStoreDrag::mimeType("application/x-kpresenter"); + TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQCString clip_str = KoStoreDrag::mimeType("application/x-kpresenter"); if ( data->provides( clip_str ) ) { - m_canvas->activePage()->pasteObjs( data->encodedData(clip_str), + m_canvas->activePage()->pasteObjs( data->tqencodedData(clip_str), nbCopy, angle, increaseX,increaseY, moveX, moveY ); m_canvas->setMouseSelectedObject(true); emit objectSelectedChanged(); @@ -5980,7 +5980,7 @@ void KPrView::duplicateObj() void KPrView::extraArrangePopup() { m_canvas->setToolEditMode( TEM_MOUSE ); - QPoint pnt( QCursor::pos() ); + TQPoint pnt( TQCursor::pos() ); m_arrangeObjectsPopup->popup( pnt ); } @@ -6000,9 +6000,9 @@ void KPrView::applyAutoFormat() { m_pKPresenterDoc->getAutoFormat()->readConfig(); KMacroCommand *macro = 0L; - m_switchPage=m_pKPresenterDoc->pageList().findRef(m_canvas->activePage()); + m_switchPage=m_pKPresenterDoc->pageList().tqfindRef(m_canvas->activePage()); m_initSwitchPage=m_switchPage; - QPtrList<KoTextObject> list=m_canvas->activePage()->allTextObjects(); + TQPtrList<KoTextObject> list=m_canvas->activePage()->allTextObjects(); KCommand * cmd2 = applyAutoFormatToCurrentPage( list ); if ( cmd2 ) @@ -6028,7 +6028,7 @@ void KPrView::applyAutoFormat() m_initSwitchPage=-1; } -bool KPrView::switchInOtherPage( const QString & text ) +bool KPrView::switchInOtherPage( const TQString & text ) { //there is not other page if(m_pKPresenterDoc->pageList().count()==1) @@ -6044,11 +6044,11 @@ bool KPrView::switchInOtherPage( const QString & text ) return true; } -KCommand * KPrView::applyAutoFormatToCurrentPage( const QPtrList<KoTextObject> & lst) +KCommand * KPrView::applyAutoFormatToCurrentPage( const TQPtrList<KoTextObject> & lst) { KMacroCommand *macro = 0L; - QPtrList<KoTextObject> list(lst); - QPtrListIterator<KoTextObject> fit(list); + TQPtrList<KoTextObject> list(lst); + TQPtrListIterator<KoTextObject> fit(list); for ( ; fit.current() ; ++fit ) { KCommand *cmd = m_pKPresenterDoc->getAutoFormat()->applyAutoFormat( fit.current() ); @@ -6068,10 +6068,10 @@ void KPrView::createStyleFromSelection() if ( edit ) { KoStyleCollection* coll = m_pKPresenterDoc->styleCollection(); - KoCreateStyleDia *dia = new KoCreateStyleDia( QStringList(), this, 0 ); + KoCreateStyleDia *dia = new KoCreateStyleDia( TQStringList(), this, 0 ); if ( dia->exec() ) { - QString name = dia->nameOfNewStyle(); + TQString name = dia->nameOfNewStyle(); KoParagStyle* style = coll->findStyleByDisplayName( name ); if ( style ) // update existing style { @@ -6126,7 +6126,7 @@ void KPrView::alignVerticalCenter() actionAlignVerticalCenter->setChecked(true); } -void KPrView::changeVerticalAlignmentStatus(VerticalAlignmentType _type ) +void KPrView::changeVerticalAlignmentStatus( VerticalAlignmentType _type ) { switch( _type ) { @@ -6149,15 +6149,15 @@ void KPrView::autoSpellCheck() void KPrView::insertFile( ) { - KFileDialog fd( QString::null, QString::null, this, 0, TRUE ); - QStringList filter; + KFileDialog fd( TQString(), TQString(), this, 0, TRUE ); + TQStringList filter; filter<<"application/x-kpresenter"; filter<<"application/vnd.oasis.opendocument.presentation"; fd.setMimeFilter( filter ); fd.setCaption(i18n("Insert File")); KURL url; - if ( fd.exec() == QDialog::Accepted ) + if ( fd.exec() == TQDialog::Accepted ) { url = fd.selectedURL(); if( url.isEmpty() ) @@ -6171,7 +6171,7 @@ void KPrView::insertFile( ) } } -void KPrView::insertFile(const QString &path) +void KPrView::insertFile(const TQString &path) { m_pKPresenterDoc->insertFile(path); } @@ -6224,7 +6224,7 @@ void KPrView::updateRulerInProtectContentMode() getHRuler()->changeFlags(KoRuler::F_INDENTS | KoRuler::F_TABS); else getHRuler()->changeFlags(0); - getHRuler()->repaint(); + getHRuler()->tqrepaint(); } } @@ -6328,7 +6328,7 @@ void KPrView::addWordToDictionary() KPrTextView* edit = m_canvas->currentTextObjectView(); if ( edit ) { - QString word = edit->wordUnderCursor( *edit->cursor() ); + TQString word = edit->wordUnderCursor( *edit->cursor() ); if ( !word.isEmpty() ) m_pKPresenterDoc->addWordToDictionary( word ); } @@ -6347,7 +6347,7 @@ void KPrView::imageEffect() m_canvas->setToolEditMode(TEM_MOUSE); - if (imageEffectDia->exec()==QDialog::Accepted) { + if (imageEffectDia->exec()==TQDialog::Accepted) { KCommand *cmd=m_canvas->activePage()->setImageEffect(imageEffectDia->getEffect(), imageEffectDia->getParam1(), imageEffectDia->getParam2(), imageEffectDia->getParam3()); if ( cmd ) @@ -6359,25 +6359,25 @@ void KPrView::imageEffect() } } -void KPrView::spellAddAutoCorrect (const QString & originalword, const QString & newword) +void KPrView::spellAddAutoCorrect (const TQString & originalword, const TQString & newword) { m_pKPresenterDoc->getAutoFormat()->addAutoFormatEntry( originalword, newword ); } -QPtrList<KAction> KPrView::listOfResultOfCheckWord( const QString &word ) +TQPtrList<KAction> KPrView::listOfResultOfCheckWord( const TQString &word ) { - QPtrList<KAction> listAction; + TQPtrList<KAction> listAction; DefaultDictionary *dict = m_broker->defaultDictionary(); - QStringList lst = dict->suggest( word ); - if ( !lst.contains( word )) + TQStringList lst = dict->suggest( word ); + if ( !lst.tqcontains( word )) { - QStringList::ConstIterator it = lst.begin(); + TQStringList::ConstIterator it = lst.begin(); for ( int i = 0; it != lst.end() ; ++it, ++i ) { if ( !(*it).isEmpty() ) // in case of removed subtypes or placeholders { KAction * act = new KAction( (*it)); - connect( act, SIGNAL(activated()), this, SLOT(slotCorrectWord()) ); + connect( act, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(slotCorrectWord()) ); listAction.append( act ); } } @@ -6388,7 +6388,7 @@ QPtrList<KAction> KPrView::listOfResultOfCheckWord( const QString &word ) void KPrView::slotCorrectWord() { - KAction * act = (KAction *)(sender()); + KAction * act = (KAction *)(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); KPrTextView* edit = m_canvas->currentTextObjectView(); if ( edit ) { @@ -6399,7 +6399,7 @@ void KPrView::slotCorrectWord() } } -KCommand * KPrView::getPenCmd( const QString &name, KoPen pen, LineEnd lb, LineEnd le, int flags ) +KCommand * KPrView::getPenCmd( const TQString &name, KoPen pen, LineEnd lb, LineEnd le, int flags ) { KMacroCommand * macro = NULL; @@ -6421,8 +6421,8 @@ void KPrView::initialLayoutOfSplitter() return; } - QSplitter* splitterVertical = static_cast<QSplitter*>( notebar->parent() ); - QValueList<int> tmpList; + TQSplitter* splitterVertical = static_cast<TQSplitter*>( TQT_TQWIDGET(notebar->tqparent()) ); + TQValueList<int> tmpList; int noteHeight = height() / 25; tmpList << height() - noteHeight << noteHeight; splitterVertical->setSizes( tmpList ); @@ -6430,7 +6430,7 @@ void KPrView::initialLayoutOfSplitter() void KPrView::slotChildActivated(bool a) { - KoViewChild* ch = child( (KoView*)sender() ); + KoViewChild* ch = child( (KoView*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())) ); if ( !ch ) return; diff --git a/kpresenter/KPrView.h b/kpresenter/KPrView.h index 01c67e16..f50816ba 100644 --- a/kpresenter/KPrView.h +++ b/kpresenter/KPrView.h @@ -25,9 +25,9 @@ #include <config.h> #endif -#include <qguardedptr.h> -#include <qtimer.h> -#include <qdatetime.h> +#include <tqguardedptr.h> +#include <tqtimer.h> +#include <tqdatetime.h> #include <KoView.h> #include "global.h" @@ -35,14 +35,14 @@ #include <KoPen.h> #include <KoRuler.h> -class QPopupMenu; -class QSplitter; -class QLabel; +class TQPopupMenu; +class TQSplitter; +class TQLabel; class DCOPObject; class KPrView; class KPrBackDialog; class KoRuler; -class QScrollBar; +class TQScrollBar; class AFChoose; class KPrPropertyEditor; class KPrPgConfDia; @@ -55,7 +55,7 @@ class ConfRectDia; class ConfPolygonDia; class ConfPictureDia; class KPrPresDurationDia; -class QToolButton; +class TQToolButton; class KPrSideBar; class KPrNoteBar; @@ -102,11 +102,11 @@ namespace KSpell2 { class Dialog; } -class PageBase : public QWidget +class PageBase : public TQWidget { public: - PageBase( QWidget *parent, KPrView *v ) : QWidget( parent ), view( v ) {} - void resizeEvent( QResizeEvent *e ); + PageBase( TQWidget *tqparent, KPrView *v ) : TQWidget( tqparent ), view( v ) {} + void resizeEvent( TQResizeEvent *e ); private: KPrView *view; @@ -118,9 +118,10 @@ class KPrView : public KoView { friend class PageBase; Q_OBJECT + TQ_OBJECT public: - KPrView( KPrDocument* _doc, QWidget *_parent = 0, const char *_name = 0 ); + KPrView( KPrDocument* _doc, TQWidget *_parent = 0, const char *_name = 0 ); ~KPrView(); void initGui(); @@ -141,7 +142,7 @@ public: void showZoom( int zoom ); // show a zoom value in the combo void setZoom( int zoom, bool updateViews ); // change the zoom value void changeZoomMenu( int zoom=-1); - void showStyle( const QString & styleName ); + void showStyle( const TQString & styleName ); void updateStyleList(); KoTextZoomHandler *zoomHandler() const; @@ -156,21 +157,21 @@ public: void updateDisplayObjectMasterPageButton(); void updateDisplayBackgroundButton(); - virtual int leftBorder() const { return canvas()->mapTo(const_cast<KPrView *>(this), QPoint(0,0)).x(); }; - virtual int rightBorder() const { return width() - canvas()->mapTo(const_cast<KPrView *>(this), QPoint(canvas()->width(), 0)).x(); }; - virtual int topBorder() const { return canvas()->mapTo(const_cast<KPrView *>(this), QPoint(0,0)).y(); }; - virtual int bottomBorder() const { return height() - canvas()->mapTo(const_cast<KPrView *>(this), QPoint(0, canvas()->height())).y(); }; + virtual int leftBorder() const { return canvas()->mapTo(const_cast<KPrView *>(this), TQPoint(0,0)).x(); }; + virtual int rightBorder() const { return width() - canvas()->mapTo(const_cast<KPrView *>(this), TQPoint(canvas()->width(), 0)).x(); }; + virtual int topBorder() const { return canvas()->mapTo(const_cast<KPrView *>(this), TQPoint(0,0)).y(); }; + virtual int bottomBorder() const { return height() - canvas()->mapTo(const_cast<KPrView *>(this), TQPoint(0, canvas()->height())).y(); }; void updateGuideLineButton(); void updateGridButton(); - void savePicture( const QString& oldName, KoPicture& picture); + void savePicture( const TQString& oldName, KoPicture& picture); void savePicture( KPrPixmapObject* obj ); - void insertFile(const QString &path); + void insertFile(const TQString &path); void testAndCloseAllTextObjectProtectedContent(); void updateRulerInProtectContentMode(); - QPtrList<KAction> listOfResultOfCheckWord( const QString &word ); + TQPtrList<KAction> listOfResultOfCheckWord( const TQString &word ); /** * Returns the KPresenter global KSpell2 Broker object. @@ -200,7 +201,7 @@ public slots: void viewShowSideBar(); void viewShowNoteBar(); void viewSlideMaster(); - void viewZoom( const QString &s ); + void viewZoom( const TQString &s ); void viewFooter(); void viewHeader(); @@ -216,7 +217,7 @@ public slots: // insert menu void insertPage(); void insertPicture(); - void insertPicture(const QString &file); + void insertPicture(const TQString &file); void insertSpecialChar(); // tools menu @@ -305,7 +306,7 @@ public slots: // text toolbar void sizeSelected( int size ); - void fontSelected( const QString &fontFamily ); + void fontSelected( const TQString &fontFamily ); void textBold(); void textItalic(); void textUnderline(); @@ -365,7 +366,7 @@ public slots: void textSubScript(); void textSuperScript(); - void slotSpecialChar(QChar, const QString &); + void slotSpecialChar(TQChar, const TQString &); void slotSpecialCharDlgClosed(); void insertLink(); @@ -384,12 +385,12 @@ public slots: void slotSpellCheck(); - void spellCheckerDone( const QString & ); + void spellCheckerDone( const TQString & ); void spellCheckerCancel(); void startKSpell(); - void spellAddAutoCorrect (const QString & originalword, const QString & newword); - void spellCheckerMisspelling( const QString &, int ); - void spellCheckerCorrected( const QString &, int, const QString & ); + void spellAddAutoCorrect (const TQString & originalword, const TQString & newword); + void spellCheckerMisspelling( const TQString &, int ); + void spellCheckerCorrected( const TQString &, int, const TQString & ); void alignChanged( int ); void formatParagraph(); @@ -487,7 +488,7 @@ public: KPrDocument *kPresenterDoc() const {return m_pKPresenterDoc; } // properties - void changePicture( const QString & ); + void changePicture( const TQString & ); KPrCanvas* getCanvas() const { return m_canvas;} @@ -500,8 +501,8 @@ public: KoRuler *getHRuler() const { return h_ruler; } KoRuler *getVRuler() const { return v_ruler; } KoTabChooser *getTabChooser() const { return tabChooser; } - QScrollBar *getHScrollBar() const { return horz; } - QScrollBar *getVScrollBar() const { return vert; } + TQScrollBar *getHScrollBar() const { return horz; } + TQScrollBar *getVScrollBar() const { return vert; } /** * @brief Show the rect where object lies @@ -517,11 +518,11 @@ public: int getPieAngle() const { return pieAngle; } int getPieLength() const { return pieLength; } KoPen getPen() const { return pen; } - QBrush getBrush() const { return brush; } + TQBrush getBrush() const { return brush; } LineEnd getLineBegin() const { return lineBegin; } LineEnd getLineEnd() const{ return lineEnd; } - QColor getGColor1() const { return gColor1; } - QColor getGColor2() const { return gColor2; } + TQColor getGColor1() const { return gColor1; } + TQColor getGColor2() const { return gColor2; } BCType getGType() const { return gType; } FillType getFillType() const { return fillType; } bool getGUnbalanced() const { return gUnbalanced; } @@ -534,11 +535,11 @@ public: void setPieAngle(int _pieAngle) { pieAngle = _pieAngle; } void setPieLength(int _pieLength) { pieLength = _pieLength; } void setPen(KoPen _pen) { pen = _pen; } - void setBrush(QBrush _brush) { brush = _brush; } + void setBrush(TQBrush _brush) { brush = _brush; } void setLineBegin(LineEnd _lineBegin) { lineBegin = _lineBegin; } void setLineEnd(LineEnd _lineEnd){ lineEnd = _lineEnd; } - void setGColor1(QColor _gColor1) { gColor1 = _gColor1; } - void setGColor2(QColor _gColor2) { gColor2 = _gColor2; } + void setGColor1(TQColor _gColor1) { gColor1 = _gColor1; } + void setGColor2(TQColor _gColor2) { gColor2 = _gColor2; } void setGType(BCType _gType) { gType = _gType; } void setFillType(FillType _fillType) { fillType = _fillType; } void setGUnbalanced(bool _gUnbalanced) { gUnbalanced = _gUnbalanced; } @@ -553,8 +554,8 @@ public: void setRndX(int _rndX) { rndX = _rndX; } void setRndY(int _rndY) { rndY = _rndY; } -// QFont &currFont() { return tbFont; } -// QColor &currColor() { return tbColor; } +// TQFont &currFont() { return tbFont; } +// TQColor &currColor() { return tbColor; } void enableWebPres(); void enableMSPres(); @@ -566,7 +567,7 @@ public: /** * Overloaded from View */ - QWidget* canvas() const; + TQWidget* canvas() const; /** * Overloaded from View */ @@ -586,14 +587,14 @@ public: void setCanvasXOffset( int _x ); void setCanvasYOffset( int _y ); - void openPopupMenuObject( const QString & name , const QPoint & _point ); - void openPopupMenuMenuPage( const QPoint & _point ); - void openPopupMenuSideBar(const QPoint & _point); + void openPopupMenuObject( const TQString & name , const TQPoint & _point ); + void openPopupMenuMenuPage( const TQPoint & _point ); + void openPopupMenuSideBar(const TQPoint & _point); - void openPopupMenuZoom( const QPoint & _point ); + void openPopupMenuZoom( const TQPoint & _point ); void penColorChanged( const KoPen & _pen ); - void brushColorChanged( const QBrush & _brush ); + void brushColorChanged( const TQBrush & _brush ); /** * Restart the timer for going to the next page. @@ -621,7 +622,7 @@ public: void showCounter( KoParagCounter &c ); - QPopupMenu * popupMenu( const QString& name ); + TQPopupMenu * popupMenu( const TQString& name ); void showRulerIndent( double _leftMargin, double _firstLine, double _rightMargin, bool rtl ); @@ -631,9 +632,9 @@ public: KPrNoteBar *getNoteBar() const { return notebar; } // Used by Page to plug/unplug the datatool actions - QPtrList<KAction>& actionList() { return m_actionList; } + TQPtrList<KAction>& actionList() { return m_actionList; } // Used by Page to plug/unplug the variable actions - QPtrList<KAction> &variableActionList() { return m_variableActionList; } + TQPtrList<KAction> &variableActionList() { return m_variableActionList; } // for Polygon object bool getCheckConcavePolygon() const { return checkConcavePolygon; } @@ -677,7 +678,7 @@ public: protected slots: // dialog slots void backOk( KPrBackDialog*, bool ); - void afChooseOk( const QString & ); + void afChooseOk( const TQString & ); void slotAfchooseCanceled(); void propertiesOk(); void pgConfOk(); @@ -690,8 +691,8 @@ protected slots: void scrollV( int ); // textobject - void fontChanged( const QFont & ); - void colorChanged( const QColor &color ); + void fontChanged( const TQFont & ); + void colorChanged( const TQColor &color ); void extraLineBeginNormal(); void extraLineBeginArrow(); @@ -732,7 +733,7 @@ protected slots: void doAutomaticScreenPres(); - void getPageMouseWheelEvent( QWheelEvent *e ); + void getPageMouseWheelEvent( TQWheelEvent *e ); void updateRuler(); void refreshAllVariable(); @@ -759,13 +760,13 @@ protected slots: void loadingFinished(); protected: - virtual void resizeEvent( QResizeEvent* ); - virtual void dragEnterEvent( QDragEnterEvent *e ); - virtual void dragMoveEvent( QDragMoveEvent *e ); - virtual void dragLeaveEvent( QDragLeaveEvent *e ); - virtual void dropEvent( QDropEvent *e ); + virtual void resizeEvent( TQResizeEvent* ); + virtual void dragEnterEvent( TQDragEnterEvent *e ); + virtual void dragMoveEvent( TQDragMoveEvent *e ); + virtual void dragLeaveEvent( TQDragLeaveEvent *e ); + virtual void dropEvent( TQDropEvent *e ); - virtual void keyPressEvent( QKeyEvent* ); + virtual void keyPressEvent( TQKeyEvent* ); virtual void guiActivateEvent( KParts::GUIActivateEvent *ev ); @@ -779,28 +780,28 @@ protected: virtual void updateReadWrite( bool readwrite ); - void addVariableActions( int type, const QStringList & texts, - KActionMenu * parentMenu, const QString & menuText ); + void addVariableActions( int type, const TQStringList & texts, + KActionMenu * tqparentMenu, const TQString & menuText ); void showParagraphDialog( int initialPage = -1, double initialTabPos = 0.0 ); - QValueList<KoTextObject *> spellAddTextObject() const; + TQValueList<KoTextObject *> spellAddTextObject() const; - bool switchInOtherPage( const QString & text ); + bool switchInOtherPage( const TQString & text ); void openThePresentationDurationDialog(); - QString presentationDurationDataFormatChange( int _time ); + TQString presentationDurationDataFormatChange( int _time ); int getZoomEntirePage() const; - KCommand * applyAutoFormatToCurrentPage( const QPtrList<KoTextObject> & lst); + KCommand * applyAutoFormatToCurrentPage( const TQPtrList<KoTextObject> & lst); void textStyleSelected( KoParagStyle *_sty ); /* * create a command which sets the pen according to the flags * for the selected objects on the active and sticky page */ - KCommand * getPenCmd( const QString &name, KoPen pen, LineEnd lb, LineEnd le, int flags ); + KCommand * getPenCmd( const TQString &name, KoPen pen, LineEnd lb, LineEnd le, int flags ); void spellCheckerRemoveHighlight(); @@ -829,13 +830,13 @@ private: bool m_dpmsWasEnabled; // right button popup menus - QPopupMenu *rb_lbegin, *rb_lend; - QPopupMenu *m_arrangeObjectsPopup; - QPtrList<KAction> m_actionList; // for the kodatatools - QPtrList<KAction> m_variableActionList; + TQPopupMenu *rb_lbegin, *rb_lend; + TQPopupMenu *m_arrangeObjectsPopup; + TQPtrList<KAction> m_actionList; // for the kodatatools + TQPtrList<KAction> m_variableActionList; // scrollbars - QScrollBar *vert, *horz; + TQScrollBar *vert, *horz; // dialogs AFChoose *afChoose; @@ -848,10 +849,10 @@ private: // default pen and brush KoPen pen; - QBrush brush; + TQBrush brush; LineEnd lineBegin; LineEnd lineEnd; - QColor gColor1, gColor2; + TQColor gColor1, gColor2; BCType gType; FillType fillType; PieType pieType; @@ -864,7 +865,7 @@ private: int cornersValue; int sharpnessValue; /// used to save mouse pos - QPoint m_mousePos; + TQPoint m_mousePos; // for Picture Object PictureMirrorType mirrorType; @@ -878,9 +879,9 @@ private: KoRuler *h_ruler, *v_ruler; KoTabChooser *tabChooser; // text toolbar values - QFont tbFont; + TQFont tbFont; int tbAlign; - QColor tbColor; + TQColor tbColor; bool m_bShowGUI; bool presStarted; @@ -892,14 +893,14 @@ private: bool allowMSPres; int currPg; // 0-based - QSize oldSize; + TQSize oldSize; int screensaver_pid; // Statusbar items - QLabel * m_sbPageLabel; // 'Current page number and page count' label - QLabel * m_sbObjectLabel; // Info about selected object - QLabel *m_sbSavingLabel; // use when saving file + TQLabel * m_sbPageLabel; // 'Current page number and page count' label + TQLabel * m_sbObjectLabel; // Info about selected object + TQLabel *m_sbSavingLabel; // use when saving file KStatusBarLabel* m_sbModifiedLabel; KStatusBarLabel* m_sbUnitLabel; KStatusBarLabel* m_sbZoomLabel; @@ -1062,10 +1063,10 @@ private: DCOPObject *dcop; - QToolButton *pgNext, *pgPrev; + TQToolButton *pgNext, *pgPrev; KPrSideBar *sidebar; KPrNoteBar *notebar; - QSplitter *splitter; + TQSplitter *splitter; PageBase *pageBase; KToggleAction *actionFormatSuper; @@ -1143,9 +1144,9 @@ private: KAction *actionAddWordToPersonalDictionary; /// timer for automatic presentation mode - QTimer m_autoPresTimer; + TQTimer m_autoPresTimer; /// time for messuring the elapsed time of the timer - QTime m_autoPresTime; + TQTime m_autoPresTime; /// the elapsed time if the timer gets stopped in milliseconds int m_autoPresElapsedTime; /// the value of m_autoPresTimer in milliseconds @@ -1154,9 +1155,9 @@ private: bool m_autoPresTimerConnected; /// timer for duration of a page - QTime m_duration; + TQTime m_duration; /// list for saving the duration of the pages - QValueList<int> m_presentationDurationList; + TQValueList<int> m_presentationDurationList; KoCharSelectDia *m_specialCharDlg; @@ -1171,7 +1172,7 @@ private: CurrentLineTool m_currentLineTool; - // store the currently selected shape-tool + // store the currently selected tqshape-tool enum CurrentShapeTool { StRectangle = 1, StCircle = 2, @@ -1195,7 +1196,7 @@ private: struct { KoSpell *kospell; KMacroCommand * macroCmdSpellCheck; - QStringList replaceAll; + TQStringList replaceAll; KoTextIterator * textIterator; KSpell2::Dialog *dlg; } m_spell; @@ -1211,7 +1212,7 @@ private: int type; int subtype; }; - typedef QMap<KAction *, VariableDef> VariableDefMap; + typedef TQMap<KAction *, VariableDef> VariableDefMap; VariableDefMap m_variableDefMap; KoSearchContext *m_searchEntry, *m_replaceEntry; diff --git a/kpresenter/KPrViewIface.cpp b/kpresenter/KPrViewIface.cpp index 8186e284..6f8aa314 100644 --- a/kpresenter/KPrViewIface.cpp +++ b/kpresenter/KPrViewIface.cpp @@ -356,7 +356,7 @@ void KPrViewIface::sizeSelected( int size ) view->sizeSelected( size ); } -void KPrViewIface::fontSelected( const QString &fontFamily ) +void KPrViewIface::fontSelected( const TQString &fontFamily ) { view->fontSelected( fontFamily ); } @@ -610,15 +610,15 @@ void KPrViewIface::viewHeader() // note: _nPage is the user visible 1-based page number // if 0 < _verbose exportPage() returns the title and notes of the page // if not verbose it returns an empty string -QStringList KPrViewIface::exportPage( int _nPage, +TQStringList KPrViewIface::exportPage( int _nPage, int _nWidth, int _nHeight, - const QString & _fileName, - const QString & _format, + const TQString & _fileName, + const TQString & _format, int _quality, int _verbose )const { - QStringList res; + TQStringList res; // we translate the user visible 1-based page number // to KPresenter's internal 0-based page number const int nPage = _nPage-1; @@ -629,11 +629,11 @@ QStringList KPrViewIface::exportPage( int _nPage, KPrCanvas* canvas = view->getCanvas(); if( canvas ){ if( canvas->exportPage( nPage, - QMAX(8, _nWidth), - QMAX(8, _nHeight), + TQMAX(8, _nWidth), + TQMAX(8, _nHeight), KURL::fromPathOrURL( _fileName ), _format.isEmpty() ? "PNG" : _format.latin1(), - QMAX(-1, QMIN(100, _quality))) ){ + TQMAX(-1, TQMIN(100, _quality))) ){ if( 0 < _verbose ){ KPrPage* page = view->kPresenterDoc()->pageList().at( nPage ); if( page ){ @@ -641,10 +641,10 @@ QStringList KPrViewIface::exportPage( int _nPage, // to be written to an IndeView page information file, // see http://www.indeview.org for details. // Note: We use the 1-based page number as fallback page title. - res << QString("Name=%1") - .arg( page->pageTitle( QString("Page%1").arg(_nPage) ) ); - res << QString("Notes=%1") - .arg( page->noteText() ); + res << TQString("Name=%1") + .tqarg( page->pageTitle( TQString("Page%1").tqarg(_nPage) ) ); + res << TQString("Notes=%1") + .tqarg( page->noteText() ); } } } @@ -668,7 +668,7 @@ void KPrViewIface::backgroundPicture() view->backgroundPicture(); } -void KPrViewIface::insertFile( const QString & file ) +void KPrViewIface::insertFile( const TQString & file ) { view->insertFile( file ); } diff --git a/kpresenter/KPrViewIface.h b/kpresenter/KPrViewIface.h index b9561023..67ce19ec 100644 --- a/kpresenter/KPrViewIface.h +++ b/kpresenter/KPrViewIface.h @@ -23,8 +23,8 @@ #include <KoViewIface.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> class KPrView; @@ -131,7 +131,7 @@ k_dcop: // text toolbar virtual void sizeSelected( int size ); - virtual void fontSelected( const QString &fontFamily ); + virtual void fontSelected( const TQString &fontFamily ); virtual void textBold(); virtual void textItalic(); virtual void textUnderline(); @@ -187,14 +187,14 @@ k_dcop: Export a page of the currently open presentation to disk using a bitmap format like e.g. PNG. - This method uses a QPixmap::save() call. + This method uses a TQPixmap::save() call. \param _nPage the user visible <b>1-based</b> page number \param _nWidth the desired image width in px \param _nHeight the desired image height in px - \param _fileName the name of the image file to be created (see QPixmap::save()) - \param _format the format of the image file (see QPixmap::save()) - \param _quality the quality of the image (see QPixmap::save()) + \param _fileName the name of the image file to be created (see TQPixmap::save()) + \param _format the format of the image file (see TQPixmap::save()) + \param _quality the quality of the image (see TQPixmap::save()) \param _verbose the verbosity of the method's return value: if 0 < _verbose exportPage() returns the title and the notes of the page if not _verbose it returns an empty string @@ -203,17 +203,17 @@ k_dcop: \sa KPrCanvas::exportPage */ - QStringList exportPage( int _nPage, + TQStringList exportPage( int _nPage, int _nWidth, int _nHeight, - const QString & _fileName, - const QString & _format, + const TQString & _fileName, + const TQString & _format, int _quality, int _verbose )const; void insertFile(); void importStyle(); void backgroundPicture(); - void insertFile( const QString & file ); + void insertFile( const TQString & file ); void addWordToDictionary(); void customSlideShow(); diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 627013f9..78afb783 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -32,26 +32,26 @@ #include <sys/types.h> #include <ktempfile.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qvbox.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qfileinfo.h> -#include <qframe.h> -#include <qfont.h> -#include <qpixmap.h> -#include <qdatetime.h> -#include <qdir.h> -#include <qheader.h> -#include <qwmatrix.h> -#include <qtextcodec.h> -#include <qregexp.h> -#include <qimage.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqvbox.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqfileinfo.h> +#include <tqframe.h> +#include <tqfont.h> +#include <tqpixmap.h> +#include <tqdatetime.h> +#include <tqdir.h> +#include <tqheader.h> +#include <tqwmatrix.h> +#include <tqtextcodec.h> +#include <tqregexp.h> +#include <tqimage.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> #include <kdebug.h> #include <klocale.h> @@ -78,16 +78,16 @@ // Comes from koffice/filters/libexport/KWEFUtils.cc -static QString EscapeSgmlText(const QTextCodec* codec, const QString& strIn, +static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn, const bool quot = false , const bool apos = false ) { - QString strReturn; - QChar ch; + TQString strReturn; + TQChar ch; for (uint i=0; i<strIn.length(); i++) { ch=strIn[i]; - switch (ch.unicode()) + switch (ch.tqunicode()) { case 38: // & { @@ -129,7 +129,7 @@ static QString EscapeSgmlText(const QTextCodec* codec, const QString& strIn, { if (!codec->canEncode(ch)) { - strReturn+=QString("&#%1;").arg(ch.unicode()); + strReturn+=TQString("&#%1;").tqarg(ch.tqunicode()); break; } } @@ -144,10 +144,10 @@ static QString EscapeSgmlText(const QTextCodec* codec, const QString& strIn, // Escape only if the encoding do not support the character // Special SGML characters like < > & are supposed to be already escaped. -static QString EscapeEncodingOnly(const QTextCodec* codec, const QString& strIn) +static TQString EscapeEncodingOnly(const TQTextCodec* codec, const TQString& strIn) { - QString strReturn; - QChar ch; + TQString strReturn; + TQChar ch; for (uint i=0; i<strIn.length(); i++) { @@ -156,7 +156,7 @@ static QString EscapeEncodingOnly(const QTextCodec* codec, const QString& strIn) { if (!codec->canEncode(ch)) { - strReturn+=QString("&#%1;").arg(ch.unicode()); + strReturn+=TQString("&#%1;").tqarg(ch.tqunicode()); continue; } } @@ -166,14 +166,14 @@ static QString EscapeEncodingOnly(const QTextCodec* codec, const QString& strIn) } KPrWebPresentation::KPrWebPresentation( KPrDocument *_doc, KPrView *_view ) - : config( QString::null ), xml( false ) + : config( TQString() ), xml( false ) { doc = _doc; view = _view; init(); } -KPrWebPresentation::KPrWebPresentation( const QString &_config, KPrDocument *_doc, KPrView *_view ) +KPrWebPresentation::KPrWebPresentation( const TQString &_config, KPrDocument *_doc, KPrView *_view ) : config( _config ), xml( false ), m_bWriteHeader( true ), m_bWriteFooter( true ), m_bLoopSlides( false ) { doc = _doc; @@ -211,7 +211,7 @@ void KPrWebPresentation::loadConfig() if ( num <= slideInfos.count() ) { for ( unsigned int i = 0; i < num; i++ ) { - QString key = QString::fromLatin1( "SlideTitle%1" ).arg( i ); + TQString key = TQString::tqfromLatin1( "SlideTitle%1" ).tqarg( i ); if ( cfg.hasKey( key ) ) { // We'll assume that the selected pages haven't changed... Hmm. @@ -245,7 +245,7 @@ void KPrWebPresentation::saveConfig() cfg.writeEntry( "Slides", slideInfos.count() ); for ( unsigned int i = 0; i < slideInfos.count(); i++ ) - cfg.writeEntry( QString::fromLatin1( "SlideTitle%1" ).arg( i ), slideInfos[ i ].slideTitle ); + cfg.writeEntry( TQString::tqfromLatin1( "SlideTitle%1" ).tqarg( i ), slideInfos[ i ].slideTitle ); cfg.writeEntry( "BackColor", backColor ); cfg.writeEntry( "TitleColor", titleColor ); @@ -266,17 +266,17 @@ void KPrWebPresentation::saveConfig() void KPrWebPresentation::initCreation( KProgress *progressBar ) { - QString cmd; + TQString cmd; int p; KURL str( path + "/html" ); - KIO::NetAccess::mkdir( str,( QWidget* )0L ); + KIO::NetAccess::mkdir( str,( TQWidget* )0L ); p = progressBar->progress(); progressBar->setProgress( ++p ); kapp->processEvents(); str = path + "/pics"; - KIO::NetAccess::mkdir( str,( QWidget* )0L ); + KIO::NetAccess::mkdir( str,( TQWidget* )0L ); p = progressBar->progress(); progressBar->setProgress( ++p ); @@ -288,7 +288,7 @@ void KPrWebPresentation::initCreation( KProgress *progressBar ) for ( uint index = 0; pics[ index ]; index ++ ) { - QString filename = pics[ index ]; + TQString filename = pics[ index ]; filename += ".png"; srcurl.setPath( locate( "slideshow", filename, KPrFactory::global() ) ); desturl = path; @@ -304,13 +304,13 @@ void KPrWebPresentation::createSlidesPictures( KProgress *progressBar ) { if ( slideInfos.isEmpty() ) return; - QPixmap pix( 10, 10 ); - QString filename; + TQPixmap pix( 10, 10 ); + TQString filename; int p; for ( unsigned int i = 0; i < slideInfos.count(); i++ ) { int pgNum = slideInfos[i].pageNumber; view->getCanvas()->drawPageInPix( pix, pgNum, zoom, true /*force real variable value*/ ); - filename = QString( "%1/pics/slide_%2.png" ).arg( path ).arg( i + 1 ); + filename = TQString( "%1/pics/slide_%2.png" ).tqarg( path ).tqarg( i + 1 ); KTempFile tmp; pix.save( tmp.name(), "PNG" ); @@ -323,16 +323,16 @@ void KPrWebPresentation::createSlidesPictures( KProgress *progressBar ) } } -QString KPrWebPresentation::escapeHtmlText( QTextCodec *codec, const QString& strText ) const +TQString KPrWebPresentation::escapeHtmlText( TQTextCodec *codec, const TQString& strText ) const { // Escape quotes (needed in attributes) // Do not escape apostrophs (only allowed in XHTML!) return EscapeSgmlText( codec, strText, true, false ); } -void KPrWebPresentation::writeStartOfHeader(QTextStream& streamOut, QTextCodec *codec, const QString& subtitle, const QString& next) +void KPrWebPresentation::writeStartOfHeader(TQTextStream& streamOut, TQTextCodec *codec, const TQString& subtitle, const TQString& next) { - QString mimeName ( codec->mimeName() ); + TQString mimeName ( codec->mimeName() ); if ( isXML() ) { //Write out the XML declaration streamOut << "<?xml version=\"1.0\" encoding=\"" @@ -363,11 +363,11 @@ void KPrWebPresentation::writeStartOfHeader(QTextStream& streamOut, QTextCodec * streamOut << mimeName << '"' << ( isXML() ?" /":"") << ">\n" ; // Tell who we are (with the CVS revision number) in case we have a bug in our output! - QString strVersion("$Revision: 508787 $"); + TQString strVersion("$Revision: 508787 $"); // Eliminate the dollar signs // (We don't want that the version number changes if the HTML file is itself put in a CVS storage.) streamOut << "<meta name=\"Generator\" content=\"KPresenter's Web Presentation " - << strVersion.mid(10).replace("$","") + << strVersion.mid(10).tqreplace("$","") << "\""<< ( isXML() ?" /":"") // X(HT)ML closes empty elements, HTML not! << ">\n"; @@ -387,20 +387,20 @@ void KPrWebPresentation::writeStartOfHeader(QTextStream& streamOut, QTextCodec * void KPrWebPresentation::createSlidesHTML( KProgress *progressBar ) { - QTextCodec *codec = KGlobal::charsets()->codecForName( m_encoding ); + TQTextCodec *codec = KGlobal::charsets()->codecForName( m_encoding ); - const QString brtag ( "<br" + QString(isXML()?" /":"") + ">" ); + const TQString brtag ( "<br" + TQString(isXML()?" /":"") + ">" ); for ( unsigned int i = 0; i < slideInfos.count(); i++ ) { unsigned int pgNum = i + 1; // pgquiles # elpauer . org - I think this is a bug, seems to be an overflow if we have max_unsigned_int slides KTempFile tmp; - QString dest= QString( "%1/html/slide_%2.html" ).arg( path ).arg( pgNum ); - QString next= QString( "slide_%2.html" ).arg( pgNum<slideInfos.count() ? pgNum+1 : (m_bLoopSlides ? 1 : pgNum ) ); // Ugly, but it works + TQString dest= TQString( "%1/html/slide_%2.html" ).tqarg( path ).tqarg( pgNum ); + TQString next= TQString( "slide_%2.html" ).tqarg( pgNum<slideInfos.count() ? pgNum+1 : (m_bLoopSlides ? 1 : pgNum ) ); // Ugly, but it works - QFile file( tmp.name() ); + TQFile file( tmp.name() ); file.open( IO_WriteOnly ); - QTextStream streamOut( &file ); + TQTextStream streamOut( &file ); streamOut.setCodec( codec ); writeStartOfHeader( streamOut, codec, slideInfos[ i ].slideTitle, next ); @@ -480,7 +480,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar ) streamOut << "<a href=\"" << next << "\">"; streamOut << "<img src=\"../pics/slide_" << pgNum << ".png\" border=\"0\" alt=\"" - << i18n( "Slide %1" ).arg( pgNum ) << "\"" << ( isXML() ?" /":"") << ">"; + << i18n( "Slide %1" ).tqarg( pgNum ) << "\"" << ( isXML() ?" /":"") << ">"; if ( i < slideInfos.count() - 1 ) streamOut << "</a>"; @@ -492,26 +492,26 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar ) if (m_bWriteFooter) { streamOut << brtag << "<hr noshade=\"noshade\"" << ( isXML() ?" /":"") << ">\n"; - QPtrList<KPrPage> _tmpList( doc->getPageList() ); - QString note ( escapeHtmlText( codec, _tmpList.at(i)->noteText() ) ); + TQPtrList<KPrPage> _tmpList( doc->getPageList() ); + TQString note ( escapeHtmlText( codec, _tmpList.at(i)->noteText() ) ); if ( !note.isEmpty() ) { streamOut << " <b>" << escapeHtmlText( codec, i18n( "Note" ) ) << "</b>\n"; streamOut << " <blockquote>\n"; - streamOut << note.replace( "\n", brtag ); + streamOut << note.tqreplace( "\n", brtag ); streamOut << " </blockquote><hr noshade=\"noshade\"" << ( isXML() ?" /":"") << ">\n"; } streamOut << " <center>\n"; - QString htmlAuthor; + TQString htmlAuthor; if (email.isEmpty()) htmlAuthor=escapeHtmlText( codec, author ); else - htmlAuthor=QString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author )); + htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author )); streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" ) - .arg( KGlobal::locale()->formatDate ( QDate::currentDate() ) ).arg( htmlAuthor ) ); + .tqarg( KGlobal::locale()->formatDate ( TQDate::tqcurrentDate() ) ).tqarg( htmlAuthor ) ); streamOut << " </center><hr noshade=\"noshade\"" << ( isXML() ?" /":"") << ">\n"; } @@ -530,15 +530,15 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar ) void KPrWebPresentation::createMainPage( KProgress *progressBar ) { - QTextCodec *codec = KGlobal::charsets()->codecForName( m_encoding ); + TQTextCodec *codec = KGlobal::charsets()->codecForName( m_encoding ); KTempFile tmp; - QString dest = QString( "%1/index.html" ).arg( path ); - QFile file( tmp.name() ); + TQString dest = TQString( "%1/index.html" ).tqarg( path ); + TQFile file( tmp.name() ); file.open( IO_WriteOnly ); - QTextStream streamOut( &file ); + TQTextStream streamOut( &file ); streamOut.setCodec( codec ); - writeStartOfHeader( streamOut, codec, i18n("Table of Contents"), QString() ); + writeStartOfHeader( streamOut, codec, i18n("Table of Contents"), TQString() ); streamOut << "</head>\n"; streamOut << "<body bgcolor=\"" << backColor.name() << "\" text=\"" << textColor.name() << "\">\n"; @@ -559,10 +559,10 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar ) streamOut << "</ol>\n"; // footer: author name, e-mail - QString htmlAuthor = email.isEmpty() ? escapeHtmlText( codec, author ) : - QString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author )); + TQString htmlAuthor = email.isEmpty() ? escapeHtmlText( codec, author ) : + TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author )); streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" ) - .arg( KGlobal::locale()->formatDate ( QDate::currentDate() ) ).arg( htmlAuthor ) ); + .tqarg( KGlobal::locale()->formatDate ( TQDate::tqcurrentDate() ) ).tqarg( htmlAuthor ) ); streamOut << "</body>\n</html>\n"; file.close(); @@ -601,9 +601,9 @@ void KPrWebPresentation::init() } if ( slideInfos.isEmpty() ) kdWarning() << "No slides selected!" << endl; - backColor = Qt::white; - textColor = Qt::black; - titleColor = Qt::red; + backColor = TQt::white; + textColor = TQt::black; + titleColor = TQt::red; path = KGlobalSettings::documentPath() + "www"; @@ -611,10 +611,10 @@ void KPrWebPresentation::init() timeBetweenSlides = 0; - m_encoding = QTextCodec::codecForLocale()->name(); + m_encoding = TQTextCodec::codecForLocale()->name(); } -KPrWebPresentationWizard::KPrWebPresentationWizard( const QString &_config, KPrDocument *_doc, +KPrWebPresentationWizard::KPrWebPresentationWizard( const TQString &_config, KPrDocument *_doc, KPrView *_view ) : KWizard( 0, "", false ), config( _config ), webPres( config, _doc, _view ) { @@ -627,9 +627,9 @@ KPrWebPresentationWizard::KPrWebPresentationWizard( const QString &_config, KPrD setupPage4(); setupPage5(); - connect( nextButton(), SIGNAL( clicked() ), this, SLOT( pageChanged() ) ); - connect( backButton(), SIGNAL( clicked() ), this, SLOT( pageChanged() ) ); - connect( finishButton(), SIGNAL( clicked() ), this, SLOT( finish() ) ); + connect( nextButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( pageChanged() ) ); + connect( backButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( pageChanged() ) ); + connect( finishButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( finish() ) ); } KPrWebPresentationWizard::~KPrWebPresentationWizard() @@ -637,7 +637,7 @@ KPrWebPresentationWizard::~KPrWebPresentationWizard() view->enableWebPres(); } -void KPrWebPresentationWizard::createWebPresentation( const QString &_config, KPrDocument *_doc, +void KPrWebPresentationWizard::createWebPresentation( const TQString &_config, KPrDocument *_doc, KPrView *_view ) { KPrWebPresentationWizard *dlg = new KPrWebPresentationWizard( _config, _doc, _view ); @@ -648,97 +648,97 @@ void KPrWebPresentationWizard::createWebPresentation( const QString &_config, KP void KPrWebPresentationWizard::setupPage1() { - page1 = new QHBox( this ); - QWhatsThis::add( page1, i18n("This page allows you to specify some of the key" + page1 = new TQHBox( this ); + TQWhatsThis::add( page1, i18n("This page allows you to specify some of the key" " values for how your presentation will be shown" " in HTML. Select individual items for more help" " on what they do.") ); page1->setSpacing( KDialog::spacingHint() ); page1->setMargin( KDialog::marginHint() ); - QLabel* sidebar = new QLabel( page1 ); + TQLabel* sidebar = new TQLabel( page1 ); sidebar->setMinimumSize( 106, 318 ); sidebar->setMaximumSize( 106, 318 ); - sidebar->setFrameShape( QFrame::Panel ); - sidebar->setFrameShadow( QFrame::Sunken ); + sidebar->setFrameShape( TQFrame::Panel ); + sidebar->setFrameShadow( TQFrame::Sunken ); sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); - QWidget* canvas = new QWidget( page1 ); - QGridLayout *layout = new QGridLayout( canvas, 7, 2, + TQWidget* canvas = new TQWidget( page1 ); + TQGridLayout *tqlayout = new TQGridLayout( canvas, 7, 2, KDialog::marginHint(), KDialog::spacingHint() ); - QLabel *helptext = new QLabel( canvas ); - helptext->setAlignment( Qt::WordBreak | Qt::AlignTop| Qt::AlignLeft ); + TQLabel *helptext = new TQLabel( canvas ); + helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft ); helptext->setText( i18n( "Enter your name, email address and " "the title of the web presentation. " "Also enter the output directory where the " "web presentation should be saved. " ) ); - layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - layout->addMultiCell( new QSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); - QLabel *label1 = new QLabel( i18n("Author:"), canvas ); - label1->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); - QWhatsThis::add( label1, i18n("This is where you enter the name of the person or " + TQLabel *label1 = new TQLabel( i18n("Author:"), canvas ); + label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + TQWhatsThis::add( label1, i18n("This is where you enter the name of the person or " "organization that should be named as the author of " "the presentation.") ); - layout->addWidget( label1, 2, 0 ); + tqlayout->addWidget( label1, 2, 0 ); - QLabel *label2 = new QLabel( i18n("Title:"), canvas ); - label2->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); - QWhatsThis::add( label2, i18n("This is where you enter the title of the overall " + TQLabel *label2 = new TQLabel( i18n("Title:"), canvas ); + label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + TQWhatsThis::add( label2, i18n("This is where you enter the title of the overall " "presentation." ) ); - layout->addWidget( label2, 3, 0 ); + tqlayout->addWidget( label2, 3, 0 ); - QLabel *label3 = new QLabel( i18n("Email address:"), canvas ); - label3->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); - QWhatsThis::add( label3, i18n("This is where you enter the email address of the " + TQLabel *label3 = new TQLabel( i18n("Email address:"), canvas ); + label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + TQWhatsThis::add( label3, i18n("This is where you enter the email address of the " "person or organization that is responsible for " "the presentation.") ); - layout->addWidget( label3, 4, 0 ); + tqlayout->addWidget( label3, 4, 0 ); - QLabel *label4 = new QLabel( i18n("Path:"), canvas ); - label4->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); - QWhatsThis::add( label4, i18n("The value entered for the path is the directory " + TQLabel *label4 = new TQLabel( i18n("Path:"), canvas ); + label4->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + TQWhatsThis::add( label4, i18n("The value entered for the path is the directory " "where the presentation will be saved. If it does " "not exist, you'll be asked if you want to create " "the directory or abort the creation.") ); - layout->addWidget( label4, 5, 0 ); + tqlayout->addWidget( label4, 5, 0 ); author = new KLineEdit( webPres.getAuthor(), canvas ); - QWhatsThis::add( author, i18n("This is where you enter the name of the person or " + TQWhatsThis::add( author, i18n("This is where you enter the name of the person or " "organization that should be named as the author of " "the presentation.") ); - layout->addWidget( author, 2, 1 ); + tqlayout->addWidget( author, 2, 1 ); title = new KLineEdit( webPres.getTitle(), canvas ); - QWhatsThis::add( title, i18n("This is where you enter the title of the overall " + TQWhatsThis::add( title, i18n("This is where you enter the title of the overall " "presentation." ) ); - layout->addWidget( title, 3, 1 ); + tqlayout->addWidget( title, 3, 1 ); email = new KLineEdit( webPres.getEmail(), canvas ); - QWhatsThis::add( email, i18n("This is where you enter the email address of the " + TQWhatsThis::add( email, i18n("This is where you enter the email address of the " "person or organization that is responsible for " "the presentation.") ); - layout->addWidget( email, 4, 1 ); + tqlayout->addWidget( email, 4, 1 ); path=new KURLRequester( canvas ); path->setMode( KFile::Directory); path->lineEdit()->setText(webPres.getPath()); - QWhatsThis::add( path, i18n("The value entered for the path is the directory " + TQWhatsThis::add( path, i18n("The value entered for the path is the directory " "where the presentation will be saved. If it does " "not exist, you'll be asked if you want to create " "the directory or abort the creation.") ); - layout->addWidget( path, 5, 1 ); + tqlayout->addWidget( path, 5, 1 ); - QSpacerItem* spacer = new QSpacerItem( 1, 10, - QSizePolicy::Minimum, QSizePolicy::Expanding ); - layout->addMultiCell( spacer, 6, 6, 0, 1 ); + TQSpacerItem* spacer = new TQSpacerItem( 1, 10, + TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + tqlayout->addMultiCell( spacer, 6, 6, 0, 1 ); - connect(path, SIGNAL(textChanged(const QString&)), - this,SLOT(slotChoosePath(const QString&))); - connect(path, SIGNAL(urlSelected( const QString& )), - this,SLOT(slotChoosePath(const QString&))); + connect(path, TQT_SIGNAL(textChanged(const TQString&)), + this,TQT_SLOT(slotChoosePath(const TQString&))); + connect(path, TQT_SIGNAL(urlSelected( const TQString& )), + this,TQT_SLOT(slotChoosePath(const TQString&))); addPage( page1, i18n( "Step 1: General Information" ) ); @@ -747,67 +747,67 @@ void KPrWebPresentationWizard::setupPage1() void KPrWebPresentationWizard::setupPage2() { - page2 = new QHBox( this ); - QWhatsThis::add( page2, i18n("This page allows you to specify how the HTML " + page2 = new TQHBox( this ); + TQWhatsThis::add( page2, i18n("This page allows you to specify how the HTML " "for your presentation will be displayed. Select " "individual items for more help on what they do.") ); page2->setSpacing( KDialog::spacingHint() ); page2->setMargin( KDialog::marginHint() ); - QLabel* sidebar = new QLabel( page2 ); + TQLabel* sidebar = new TQLabel( page2 ); sidebar->setMinimumSize( 106, 318 ); sidebar->setMaximumSize( 106, 318 ); - sidebar->setFrameShape( QFrame::Panel ); - sidebar->setFrameShadow( QFrame::Sunken ); + sidebar->setFrameShape( TQFrame::Panel ); + sidebar->setFrameShadow( TQFrame::Sunken ); sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); - QWidget* canvas = new QWidget( page2 ); - QGridLayout *layout = new QGridLayout( canvas, 6, 2, + TQWidget* canvas = new TQWidget( page2 ); + TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2, KDialog::marginHint(), KDialog::spacingHint() ); - QLabel *helptext = new QLabel( canvas ); - helptext->setAlignment( Qt::WordBreak | Qt::AlignVCenter| Qt::AlignLeft ); - QString help = i18n("Here you can configure the style of the web pages."); + TQLabel *helptext = new TQLabel( canvas ); + helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); + TQString help = i18n("Here you can configure the style of the web pages."); help += i18n( "You can also specify the zoom for the slides." ); helptext->setText(help); - layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - layout->addMultiCell( new QSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); - QLabel *label1 = new QLabel( i18n("Zoom:"), canvas ); - label1->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); - QWhatsThis::add( label1, i18n( "This selection allows you to specify " + TQLabel *label1 = new TQLabel( i18n("Zoom:"), canvas ); + label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + TQWhatsThis::add( label1, i18n( "This selection allows you to specify " "the size of the slide image." ) ); - layout->addWidget( label1, 2, 0 ); + tqlayout->addWidget( label1, 2, 0 ); - QLabel *label2 = new QLabel( i18n( "Encoding:" ), canvas ); - label2->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); + TQLabel *label2 = new TQLabel( i18n( "Encoding:" ), canvas ); + label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); - layout->addWidget( label2, 3, 0 ); + tqlayout->addWidget( label2, 3, 0 ); - QLabel *label3 = new QLabel( i18n( "Document type:" ), canvas ); - label3->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); - layout->addWidget( label3, 4, 0 ); + TQLabel *label3 = new TQLabel( i18n( "Document type:" ), canvas ); + label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + tqlayout->addWidget( label3, 4, 0 ); zoom = new KIntNumInput( webPres.getZoom(), canvas ); - QWhatsThis::add( zoom, i18n( "This selection allows you to specify " + TQWhatsThis::add( zoom, i18n( "This selection allows you to specify " "the size of the slide image." ) ); - layout->addWidget( zoom, 2, 1 ); + tqlayout->addWidget( zoom, 2, 1 ); zoom->setSuffix( " %" ); zoom->setRange( 25, 1000, 5 ); encoding = new KComboBox( false, canvas ); - layout->addWidget( encoding, 3, 1 ); + tqlayout->addWidget( encoding, 3, 1 ); // Fill encoding combo // Stolen from kdelibs/kate/part/katedialogs.cpp - QStringList encodings(KGlobal::charsets()->descriptiveEncodingNames()); + TQStringList encodings(KGlobal::charsets()->descriptiveEncodingNames()); int idx = 0; for (uint i = 0; i < encodings.count(); i++) { bool found = false; - QTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encodings[i]), found); + TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encodings[i]), found); if (found) { encoding->insertItem(encodings[i]); @@ -819,15 +819,15 @@ void KPrWebPresentationWizard::setupPage2() } doctype = new KComboBox( false, canvas ); - layout->addWidget( doctype, 4, 1 ); + tqlayout->addWidget( doctype, 4, 1 ); doctype->insertItem( "HTML 4.01", -1 ); doctype->insertItem( "XHTML 1.0", -1 ); doctype->setCurrentItem( webPres.isXML() ? 1 : 0 ); - QSpacerItem* spacer = new QSpacerItem( 1, 10, - QSizePolicy::Minimum, QSizePolicy::Expanding ); - layout->addMultiCell( spacer, 5, 5, 0, 1 ); + TQSpacerItem* spacer = new TQSpacerItem( 1, 10, + TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + tqlayout->addMultiCell( spacer, 5, 5, 0, 1 ); addPage( page2, i18n( "Step 2: Configure HTML" ) ); @@ -836,56 +836,56 @@ void KPrWebPresentationWizard::setupPage2() void KPrWebPresentationWizard::setupPage3() { - page3 = new QHBox( this ); - QWhatsThis::add( page3, i18n("This page allows you to specify the colors for " + page3 = new TQHBox( this ); + TQWhatsThis::add( page3, i18n("This page allows you to specify the colors for " "your presentation display. Select individual " "items for more help on what they do.") ); page3->setSpacing( KDialog::spacingHint() ); page3->setMargin( KDialog::marginHint() ); - QLabel* sidebar = new QLabel( page3 ); + TQLabel* sidebar = new TQLabel( page3 ); sidebar->setMinimumSize( 106, 318 ); sidebar->setMaximumSize( 106, 318 ); - sidebar->setFrameShape( QFrame::Panel ); - sidebar->setFrameShadow( QFrame::Sunken ); + sidebar->setFrameShape( TQFrame::Panel ); + sidebar->setFrameShadow( TQFrame::Sunken ); sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); - QWidget* canvas = new QWidget( page3 ); - QGridLayout *layout = new QGridLayout( canvas, 6, 2, + TQWidget* canvas = new TQWidget( page3 ); + TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2, KDialog::marginHint(), KDialog::spacingHint() ); - QLabel *helptext = new QLabel( canvas ); - helptext->setAlignment( Qt::WordBreak | Qt::AlignVCenter| Qt::AlignLeft ); + TQLabel *helptext = new TQLabel( canvas ); + helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); helptext->setText( i18n( "Now you can customize the colors of the web pages." ) ); - layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - layout->addMultiCell( new QSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); - QLabel *label1 = new QLabel( i18n("Text color:"), canvas ); - label1->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); - layout->addWidget( label1, 2, 0 ); + TQLabel *label1 = new TQLabel( i18n("Text color:"), canvas ); + label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + tqlayout->addWidget( label1, 2, 0 ); - QLabel *label2 = new QLabel( i18n("Title color:"), canvas ); - label2->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); - layout->addWidget( label2, 3, 0 ); + TQLabel *label2 = new TQLabel( i18n("Title color:"), canvas ); + label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + tqlayout->addWidget( label2, 3, 0 ); - QLabel *label3 = new QLabel( i18n("Background color:"), canvas ); - label3->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); - layout->addWidget( label3, 4, 0 ); + TQLabel *label3 = new TQLabel( i18n("Background color:"), canvas ); + label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + tqlayout->addWidget( label3, 4, 0 ); textColor = new KColorButton( webPres.getTextColor(), canvas ); - layout->addWidget( textColor, 2, 1 ); + tqlayout->addWidget( textColor, 2, 1 ); titleColor = new KColorButton( webPres.getTitleColor(), canvas ); - layout->addWidget( titleColor, 3, 1 ); + tqlayout->addWidget( titleColor, 3, 1 ); backColor = new KColorButton( webPres.getBackColor(), canvas ); - layout->addWidget( backColor, 4, 1 ); + tqlayout->addWidget( backColor, 4, 1 ); - QSpacerItem* spacer = new QSpacerItem( 1, 10, - QSizePolicy::Minimum, QSizePolicy::Expanding ); - layout->addMultiCell( spacer, 5, 5, 0, 1 ); + TQSpacerItem* spacer = new TQSpacerItem( 1, 10, + TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + tqlayout->addMultiCell( spacer, 5, 5, 0, 1 ); addPage( page3, i18n( "Step 3: Customize Colors" ) ); @@ -894,26 +894,26 @@ void KPrWebPresentationWizard::setupPage3() void KPrWebPresentationWizard::setupPage4() { - page4 = new QHBox( this ); - QWhatsThis::add( page4, i18n("This page allows you to modify the titles of " + page4 = new TQHBox( this ); + TQWhatsThis::add( page4, i18n("This page allows you to modify the titles of " "each slide, if required. You normally do not need " "to do this, but it is available if required.") ); page4->setSpacing( KDialog::spacingHint() ); page4->setMargin( KDialog::marginHint() ); - QLabel* sidebar = new QLabel( page4 ); + TQLabel* sidebar = new TQLabel( page4 ); sidebar->setMinimumSize( 106, 318 ); sidebar->setMaximumSize( 106, 318 ); - sidebar->setFrameShape( QFrame::Panel ); - sidebar->setFrameShadow( QFrame::Sunken ); + sidebar->setFrameShape( TQFrame::Panel ); + sidebar->setFrameShadow( TQFrame::Sunken ); sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); - QWidget* canvas = new QWidget( page4 ); - QGridLayout *layout = new QGridLayout( canvas, 3, 2, + TQWidget* canvas = new TQWidget( page4 ); + TQGridLayout *tqlayout = new TQGridLayout( canvas, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); - QLabel *helptext = new QLabel( canvas ); - helptext->setAlignment( Qt::WordBreak | Qt::AlignVCenter| Qt::AlignLeft ); + TQLabel *helptext = new TQLabel( canvas ); + helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); helptext->setText( i18n( "Here you can specify titles for " "each slide. Click on a slide in " "the list and then enter the title " @@ -921,32 +921,32 @@ void KPrWebPresentationWizard::setupPage4() "click on a title, KPresenter " "mainview will display the slide.") ); - layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - QLabel *label = new QLabel( i18n( "Slide title:" ), canvas ); - label->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); - layout->addWidget( label, 1, 0 ); + TQLabel *label = new TQLabel( i18n( "Slide title:" ), canvas ); + label->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + tqlayout->addWidget( label, 1, 0 ); slideTitle = new KLineEdit( canvas ); - layout->addWidget( slideTitle, 1, 1 ); - connect( slideTitle, SIGNAL( textChanged( const QString & ) ), this, - SLOT( slideTitleChanged( const QString & ) ) ); + tqlayout->addWidget( slideTitle, 1, 1 ); + connect( slideTitle, TQT_SIGNAL( textChanged( const TQString & ) ), this, + TQT_SLOT( slideTitleChanged( const TQString & ) ) ); slideTitles = new KListView( canvas ); - layout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 ); + tqlayout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 ); slideTitles->addColumn( i18n( "No." ) ); slideTitles->addColumn( i18n( "Slide Title" ) ); - connect( slideTitles, SIGNAL( selectionChanged( QListViewItem * ) ), this, - SLOT( slideTitleChanged( QListViewItem * ) ) ); + connect( slideTitles, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, + TQT_SLOT( slideTitleChanged( TQListViewItem * ) ) ); slideTitles->setSorting( -1 ); slideTitles->setAllColumnsShowFocus( true ); - slideTitles->setResizeMode( QListView::LastColumn ); + slideTitles->setResizeMode( TQListView::LastColumn ); slideTitles->header()->setMovingEnabled( false ); - QValueList<KPrWebPresentation::SlideInfo> infos = webPres.getSlideInfos(); + TQValueList<KPrWebPresentation::SlideInfo> infos = webPres.getSlideInfos(); for ( int i = infos.count() - 1; i >= 0; --i ) { KListViewItem *item = new KListViewItem( slideTitles ); - item->setText( 0, QString::number( i + 1 ) ); + item->setText( 0, TQString::number( i + 1 ) ); //kdDebug(33001) << "KPrWebPresentationWizard::setupPage3 " << infos[ i ].slideTitle << endl; item->setText( 1, infos[ i ].slideTitle ); } @@ -960,8 +960,8 @@ void KPrWebPresentationWizard::setupPage4() void KPrWebPresentationWizard::setupPage5() { - page5 = new QHBox( this ); - QWhatsThis::add( page5, i18n("This page allows you to specify some options for " + page5 = new TQHBox( this ); + TQWhatsThis::add( page5, i18n("This page allows you to specify some options for " "presentations which run unattended, such as time " "elapsed before advancing to the next slide, looping " "and the presence of headers. If you do not want " @@ -969,68 +969,68 @@ void KPrWebPresentationWizard::setupPage5() page5->setSpacing( KDialog::spacingHint() ); page5->setMargin( KDialog::marginHint() ); - QLabel* sidebar = new QLabel( page5 ); + TQLabel* sidebar = new TQLabel( page5 ); sidebar->setMinimumSize( 106, 318 ); sidebar->setMaximumSize( 106, 318 ); - sidebar->setFrameShape( QFrame::Panel ); - sidebar->setFrameShadow( QFrame::Sunken ); + sidebar->setFrameShape( TQFrame::Panel ); + sidebar->setFrameShadow( TQFrame::Sunken ); sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); - QWidget* canvas = new QWidget( page5 ); - QGridLayout *layout = new QGridLayout( canvas, 6, 2, + TQWidget* canvas = new TQWidget( page5 ); + TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2, KDialog::marginHint(), KDialog::spacingHint() ); - QLabel *helptext = new QLabel( canvas ); - helptext->setAlignment( Qt::WordBreak | Qt::AlignVCenter| Qt::AlignLeft ); - QString help = i18n("Here you can configure some options for unattended " + TQLabel *helptext = new TQLabel( canvas ); + helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); + TQString help = i18n("Here you can configure some options for unattended " "presentations, such as time elapsed before automatically advance to " "the next slide, looping and the presence of headers."); helptext->setText(help); - layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - layout->addMultiCell( new QSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); - QLabel *label1 = new QLabel( i18n("Advance after:"), canvas ); - label1->setAlignment( Qt::AlignVCenter | Qt::AlignRight ); - QWhatsThis::add( label1, i18n( "This selection allows you to specify " + TQLabel *label1 = new TQLabel( i18n("Advance after:"), canvas ); + label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight ); + TQWhatsThis::add( label1, i18n( "This selection allows you to specify " "the time between slides." ) ); - layout->addWidget( label1, 2, 0 ); + tqlayout->addWidget( label1, 2, 0 ); timeBetweenSlides = new KIntNumInput( webPres.getTimeBetweenSlides(), canvas ); timeBetweenSlides->setSpecialValueText(i18n( "Disabled" )); - QWhatsThis::add( timeBetweenSlides, i18n( "This selection allows you to specify " + TQWhatsThis::add( timeBetweenSlides, i18n( "This selection allows you to specify " "the time between slides." ) ); - layout->addWidget( timeBetweenSlides, 2, 1 ); + tqlayout->addWidget( timeBetweenSlides, 2, 1 ); timeBetweenSlides->setSuffix( " seconds" ); timeBetweenSlides->setRange( 0, 900, 1 ); - layout->addMultiCell( new QSpacerItem( 1, 10 ), 1, 1, 0, 1 ); + tqlayout->addMultiCell( new TQSpacerItem( 1, 10 ), 1, 1, 0, 1 ); - writeHeader=new QCheckBox( i18n("Write header to the slides"), canvas); - QWhatsThis::add( writeHeader, i18n( "This checkbox allows you to specify if you " + writeHeader=new TQCheckBox( i18n("Write header to the slides"), canvas); + TQWhatsThis::add( writeHeader, i18n( "This checkbox allows you to specify if you " "want to write the navigation buttons on top " "of the slide." ) ); writeHeader->setChecked( webPres.wantHeader() ); - layout->addWidget( writeHeader, 3, 1); + tqlayout->addWidget( writeHeader, 3, 1); - writeFooter=new QCheckBox( i18n("Write footer to the slides"), canvas); - QWhatsThis::add( writeFooter, i18n( "This checkbox allows you to specify if you " + writeFooter=new TQCheckBox( i18n("Write footer to the slides"), canvas); + TQWhatsThis::add( writeFooter, i18n( "This checkbox allows you to specify if you " "want to write an imprint consisting on the author " "and the software used to create these slides." ) ); writeFooter->setChecked( webPres.wantFooter() ); - layout->addWidget( writeFooter, 4, 1); + tqlayout->addWidget( writeFooter, 4, 1); - loopSlides=new QCheckBox( i18n("Loop presentation"), canvas); - QWhatsThis::add( loopSlides, i18n( "This checkbox allows you to specify if you " + loopSlides=new TQCheckBox( i18n("Loop presentation"), canvas); + TQWhatsThis::add( loopSlides, i18n( "This checkbox allows you to specify if you " "want the presentation to start again once " "the latest slide is reached." ) ); loopSlides->setChecked( webPres.wantLoopSlides() ); - layout->addWidget( loopSlides, 5, 1); + tqlayout->addWidget( loopSlides, 5, 1); - QSpacerItem* spacer = new QSpacerItem( 1, 10, - QSizePolicy::Minimum, QSizePolicy::Expanding ); - layout->addMultiCell( spacer, 5, 5, 0, 1 ); + TQSpacerItem* spacer = new TQSpacerItem( 1, 10, + TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + tqlayout->addMultiCell( spacer, 5, 5, 0, 1 ); addPage( page5, i18n( "Step 5: Options for Unattended Presentations" ) ); @@ -1045,7 +1045,7 @@ void KPrWebPresentationWizard::finish() webPres.setEMail( email->text() ); webPres.setTitle( title->text() ); - QListViewItemIterator it( slideTitles ); + TQListViewItemIterator it( slideTitles ); for ( ; it.current(); ++it ) webPres.setSlideTitle( it.current()->text( 0 ).toInt() - 1, it.current()->text( 1 ) ); @@ -1060,7 +1060,7 @@ void KPrWebPresentationWizard::finish() webPres.setLoopSlides( loopSlides->isChecked() ); webPres.setXML( doctype->currentItem() != 0 ); bool found = false; - QTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encoding->currentText()), found); + TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encoding->currentText()), found); if ( found ) { webPres.setEncoding( codecForEnc->name() ); @@ -1074,14 +1074,14 @@ void KPrWebPresentationWizard::pageChanged() { if ( currentPage() != page5 ) { - QString pathname = path->lineEdit()->text(); + TQString pathname = path->lineEdit()->text(); // path doesn't exist. ask user if it should be created. if ( !KIO::NetAccess::exists( pathname, true/*write*/,this ) ) { - QString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>" + TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>" "Do you want create it?</qt>" ); - if( KMessageBox::questionYesNo( this, msg.arg( pathname ), + if( KMessageBox::questionYesNo( this, msg.tqarg( pathname ), i18n( "Directory Not Found" ) ) == KMessageBox::Yes) { @@ -1107,13 +1107,13 @@ void KPrWebPresentationWizard::pageChanged() finishButton()->setEnabled( true ); } -void KPrWebPresentationWizard::slideTitleChanged( const QString &s ) +void KPrWebPresentationWizard::slideTitleChanged( const TQString &s ) { if ( slideTitles->currentItem() ) slideTitles->currentItem()->setText( 1, s ); } -void KPrWebPresentationWizard::slideTitleChanged( QListViewItem *i ) +void KPrWebPresentationWizard::slideTitleChanged( TQListViewItem *i ) { if ( !i ) return; @@ -1121,20 +1121,20 @@ void KPrWebPresentationWizard::slideTitleChanged( QListViewItem *i ) view->skipToPage( i->text( 0 ).toInt() - 1 ); } -void KPrWebPresentationWizard::closeEvent( QCloseEvent *e ) +void KPrWebPresentationWizard::closeEvent( TQCloseEvent *e ) { view->enableWebPres(); KWizard::closeEvent( e ); } -void KPrWebPresentationWizard::slotChoosePath(const QString &text) +void KPrWebPresentationWizard::slotChoosePath(const TQString &text) { webPres.setPath(text); } KPrWebPresentationCreateDialog::KPrWebPresentationCreateDialog( KPrDocument *_doc, KPrView *_view, const KPrWebPresentation &_webPres ) - : QDialog( 0, "", false ), webPres( _webPres ) + : TQDialog( 0, "", false ), webPres( _webPres ) { doc = _doc; view = _view; @@ -1173,7 +1173,7 @@ void KPrWebPresentationCreateDialog::start() void KPrWebPresentationCreateDialog::initCreation() { - QFont f = step1->font(), f2 = step1->font(); + TQFont f = step1->font(), f2 = step1->font(); f.setBold( true ); step1->setFont( f ); @@ -1188,7 +1188,7 @@ void KPrWebPresentationCreateDialog::initCreation() void KPrWebPresentationCreateDialog::createSlidesPictures() { - QFont f = step2->font(), f2 = f; + TQFont f = step2->font(), f2 = f; f.setBold( true ); step2->setFont( f ); @@ -1205,7 +1205,7 @@ void KPrWebPresentationCreateDialog::createSlidesPictures() void KPrWebPresentationCreateDialog::createSlidesHTML() { - QFont f = step3->font(), f2 = step3->font(); + TQFont f = step3->font(), f2 = step3->font(); f.setBold( true ); step3->setFont( f ); @@ -1222,7 +1222,7 @@ void KPrWebPresentationCreateDialog::createSlidesHTML() void KPrWebPresentationCreateDialog::createMainPage() { - QFont f = step4->font(), f2 = step4->font(); + TQFont f = step4->font(), f2 = step4->font(); f.setBold( true ); step4->setFont( f ); @@ -1237,29 +1237,29 @@ void KPrWebPresentationCreateDialog::createMainPage() void KPrWebPresentationCreateDialog::setupGUI() { - back = new QVBox( this ); + back = new TQVBox( this ); back->setMargin( KDialog::marginHint() ); - QFrame *line; + TQFrame *line; - line = new QFrame( back ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + line = new TQFrame( back ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); line->setMaximumHeight( 20 ); - step1 = new QLabel( i18n( "Initialize (create file structure, etc.)" ), back ); - step2 = new QLabel( i18n( "Create Pictures of the Slides" ), back ); - step3 = new QLabel( i18n( "Create HTML Pages for the Slides" ), back ); - step4 = new QLabel( i18n( "Create Main Page (Table of Contents)" ), back ); - step5 = new QLabel( i18n( "Options for Unattended Presentations" ), back); + step1 = new TQLabel( i18n( "Initialize (create file structure, etc.)" ), back ); + step2 = new TQLabel( i18n( "Create Pictures of the Slides" ), back ); + step3 = new TQLabel( i18n( "Create HTML Pages for the Slides" ), back ); + step4 = new TQLabel( i18n( "Create Main Page (Table of Contents)" ), back ); + step5 = new TQLabel( i18n( "Options for Unattended Presentations" ), back); - line = new QFrame( back ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + line = new TQFrame( back ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); line->setMaximumHeight( 20 ); progressBar = new KProgress( back ); - line = new QFrame( back ); - line->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + line = new TQFrame( back ); + line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); line->setMaximumHeight( 20 ); KButtonBox *bb = new KButtonBox( back ); @@ -1270,26 +1270,26 @@ void KPrWebPresentationCreateDialog::setupGUI() bSave->setEnabled( false ); bDone->setEnabled( false ); - connect( bDone, SIGNAL( clicked() ), this, SLOT( accept() ) ); - connect( bSave, SIGNAL( clicked() ), this, SLOT( saveConfig() ) ); + connect( bDone, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( bSave, TQT_SIGNAL( clicked() ), this, TQT_SLOT( saveConfig() ) ); } -void KPrWebPresentationCreateDialog::resizeEvent( QResizeEvent *e ) +void KPrWebPresentationCreateDialog::resizeEvent( TQResizeEvent *e ) { - QDialog::resizeEvent( e ); + TQDialog::resizeEvent( e ); back->resize( size() ); } void KPrWebPresentationCreateDialog::saveConfig() { - QString filename = webPres.getConfig(); - if ( QFileInfo( filename ).exists() ) - filename = QFileInfo( filename ).absFilePath(); + TQString filename = webPres.getConfig(); + if ( TQFileInfo( filename ).exists() ) + filename = TQFileInfo( filename ).absFilePath(); else - filename = QString::null; + filename = TQString(); KFileDialog fd (filename, i18n("*.kpweb|KPresenter Web-Presentation (*.kpweb)"), - 0/*parent*/, 0/*name*/, true/*modal*/); + 0/*tqparent*/, 0/*name*/, true/*modal*/); fd.setCaption (i18n ("Save Web Presentation Configuration")); fd.setOperationMode (KFileDialog::Saving); fd.setMode (KFile::File | KFile::LocalOnly); diff --git a/kpresenter/KPrWebPresentation.h b/kpresenter/KPrWebPresentation.h index 873c4927..d5ffae15 100644 --- a/kpresenter/KPrWebPresentation.h +++ b/kpresenter/KPrWebPresentation.h @@ -23,8 +23,8 @@ #include <kwizard.h> -#include <qdialog.h> -#include <qvaluelist.h> +#include <tqdialog.h> +#include <tqvaluelist.h> class KPrDocument; @@ -37,35 +37,35 @@ class KIntNumInput; class KLineEdit; class KComboBox; -class QVBox; -class QHBox; +class TQVBox; +class TQHBox; -class QListViewItem; -class QCloseEvent; +class TQListViewItem; +class TQCloseEvent; class KProgress; -class QLabel; +class TQLabel; -class QCheckBox; +class TQCheckBox; class KPrWebPresentation { public: KPrWebPresentation( KPrDocument *_doc, KPrView *_view ); - KPrWebPresentation( const QString &_config, KPrDocument *_doc, KPrView *_view ); + KPrWebPresentation( const TQString &_config, KPrDocument *_doc, KPrView *_view ); KPrWebPresentation( const KPrWebPresentation &webPres ); - void setAuthor( const QString &_author ) + void setAuthor( const TQString &_author ) { author = _author; } - void setEMail( const QString &_email ) + void setEMail( const TQString &_email ) { email = _email; } - void setTitle( const QString &_title ) + void setTitle( const TQString &_title ) { title = _title; } - void setBackColor( const QColor &_backColor ) + void setBackColor( const TQColor &_backColor ) { backColor = _backColor; } - void setTitleColor( const QColor &_titleColor ) + void setTitleColor( const TQColor &_titleColor ) { titleColor = _titleColor; } - void setTextColor( const QColor &_textColor ) + void setTextColor( const TQColor &_textColor ) { textColor = _textColor; } void setXML( bool _xml ) { xml = _xml; } @@ -75,43 +75,43 @@ public: { m_bWriteFooter = _writeFooter; } void setLoopSlides( bool _loopSlides ) { m_bLoopSlides = _loopSlides; } - void setPath( const QString &_path ) + void setPath( const TQString &_path ) { path = _path; } void setZoom( int _zoom ) { zoom = _zoom; } void setTimeBetweenSlides( int _timeBetweenSlides ) { timeBetweenSlides = _timeBetweenSlides; } // PAU - void setEncoding( const QString &_encoding ) { m_encoding = _encoding; } - - QString getAuthor() const { return author; } - QString getEmail() const { return email; } - QString getTitle() const { return title; } - QColor getBackColor() const { return backColor; } - QColor getTitleColor() const { return titleColor; } - QColor getTextColor() const { return textColor; } + void setEncoding( const TQString &_encoding ) { m_encoding = _encoding; } + + TQString getAuthor() const { return author; } + TQString getEmail() const { return email; } + TQString getTitle() const { return title; } + TQColor getBackColor() const { return backColor; } + TQColor getTitleColor() const { return titleColor; } + TQColor getTextColor() const { return textColor; } bool isXML() const { return xml; } bool wantHeader() const { return m_bWriteHeader; } bool wantFooter() const { return m_bWriteFooter; } bool wantLoopSlides() const { return m_bLoopSlides; } - QString getPath() const { return path; } + TQString getPath() const { return path; } int getZoom() const { return zoom; } int getTimeBetweenSlides() const { return timeBetweenSlides; } // PAU - QString getEncoding() const { return m_encoding; } + TQString getEncoding() const { return m_encoding; } struct SlideInfo { int pageNumber; /* 0-based */ - QString slideTitle; + TQString slideTitle; }; // Each entry in this list is a page (number+title). // This allows to skip pages. - QValueList<SlideInfo> getSlideInfos() const { return slideInfos; } + TQValueList<SlideInfo> getSlideInfos() const { return slideInfos; } - void setSlideTitle( int i, const QString &slideTitle ) + void setSlideTitle( int i, const TQString &slideTitle ) { slideInfos[i].slideTitle = slideTitle; } - void setConfig( const QString &_config ) + void setConfig( const TQString &_config ) { config = _config; } - QString getConfig() const { return config; } + TQString getConfig() const { return config; } void loadConfig(); void saveConfig(); @@ -128,33 +128,34 @@ public: protected: void init(); - QString escapeHtmlText( QTextCodec *codec, const QString& strText ) const; - void writeStartOfHeader(QTextStream& streamOut, QTextCodec *codec, - const QString& subtitle, const QString& dest ); + TQString escapeHtmlText( TQTextCodec *codec, const TQString& strText ) const; + void writeStartOfHeader(TQTextStream& streamOut, TQTextCodec *codec, + const TQString& subtitle, const TQString& dest ); KPrDocument *doc; KPrView *view; - QString config; - QString author, title, email; - QValueList<SlideInfo> slideInfos; - QColor backColor, titleColor, textColor; - QString path; + TQString config; + TQString author, title, email; + TQValueList<SlideInfo> slideInfos; + TQColor backColor, titleColor, textColor; + TQString path; bool xml; bool m_bWriteHeader, m_bWriteFooter, m_bLoopSlides; int timeBetweenSlides; int zoom; - QString m_encoding; + TQString m_encoding; }; class KPrWebPresentationWizard : public KWizard { Q_OBJECT + TQ_OBJECT public: - KPrWebPresentationWizard( const QString &_config, KPrDocument *_doc, KPrView *_view ); + KPrWebPresentationWizard( const TQString &_config, KPrDocument *_doc, KPrView *_view ); ~KPrWebPresentationWizard(); - static void createWebPresentation( const QString &_config, KPrDocument *_doc, KPrView *_view ); + static void createWebPresentation( const TQString &_config, KPrDocument *_doc, KPrView *_view ); protected: @@ -164,15 +165,15 @@ protected: void setupPage4(); void setupPage5(); // PAU - void closeEvent( QCloseEvent *e ); + void closeEvent( TQCloseEvent *e ); - QString config; + TQString config; KPrDocument *doc; KPrView *view; KPrWebPresentation webPres; - QHBox *page1, *page2, *page3, *page4, *page5; // PAU - QCheckBox *writeHeader, *writeFooter, *loopSlides; // PAU + TQHBox *page1, *page2, *page3, *page4, *page5; // PAU + TQCheckBox *writeHeader, *writeFooter, *loopSlides; // PAU KLineEdit *author, *title, *email; KColorButton *textColor, *titleColor, *backColor; KComboBox *encoding, *doctype; @@ -184,15 +185,16 @@ protected: protected slots: virtual void finish(); void pageChanged(); - void slotChoosePath(const QString &); - void slideTitleChanged( const QString & ); - void slideTitleChanged( QListViewItem * ); + void slotChoosePath(const TQString &); + void slideTitleChanged( const TQString & ); + void slideTitleChanged( TQListViewItem * ); }; -class KPrWebPresentationCreateDialog : public QDialog +class KPrWebPresentationCreateDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: KPrWebPresentationCreateDialog( KPrDocument *_doc, KPrView *_view, const KPrWebPresentation &_webPres ); @@ -209,16 +211,16 @@ public: protected: void setupGUI(); - void resizeEvent( QResizeEvent *e ); + void resizeEvent( TQResizeEvent *e ); KPrView *view; KPrDocument *doc; KPrWebPresentation webPres; KProgress *progressBar; - QLabel *step1, *step2, *step3, *step4, *step5; - QPushButton *bDone, *bSave; - QVBox *back; + TQLabel *step1, *step2, *step3, *step4, *step5; + TQPushButton *bDone, *bSave; + TQVBox *back; protected slots: void saveConfig(); diff --git a/kpresenter/KoPointArray.cpp b/kpresenter/KoPointArray.cpp index 17f54e66..2ac496ea 100644 --- a/kpresenter/KoPointArray.cpp +++ b/kpresenter/KoPointArray.cpp @@ -36,7 +36,7 @@ void KoPointArray::translate( double dx, double dy ) void KoPointArray::point( uint index, double *x, double *y ) const { - KoPoint p = QMemArray<KoPoint>::at( index ); + KoPoint p = TQMemArray<KoPoint>::at( index ); if ( x ) *x = (double)p.x(); if ( y ) @@ -45,12 +45,12 @@ void KoPointArray::point( uint index, double *x, double *y ) const KoPoint KoPointArray::point( uint index ) const { // #### index out of bounds - return QMemArray<KoPoint>::at( index ); + return TQMemArray<KoPoint>::at( index ); } void KoPointArray::setPoint( uint index, double x, double y ) { // #### index out of bounds - QMemArray<KoPoint>::at( index ) = KoPoint( x, y ); + TQMemArray<KoPoint>::at( index ) = KoPoint( x, y ); } @@ -152,8 +152,8 @@ int pnt_on_line( const int* p, const int* q, const int* t ) return 2; } - if ( QABS((q[1]-p[1])*(t[0]-p[0])-(t[1]-p[1])*(q[0]-p[0])) >= - (QMAX(QABS(q[0]-p[0]), QABS(q[1]-p[1])))) return 0; + if ( TQABS((q[1]-p[1])*(t[0]-p[0])-(t[1]-p[1])*(q[0]-p[0])) >= + (TQMAX(TQABS(q[0]-p[0]), TQABS(q[1]-p[1])))) return 0; if (((q[0]<p[0])&&(p[0]<t[0])) || ((q[1]<p[1])&&(p[1]<t[1]))) return 1 ; @@ -168,7 +168,7 @@ int pnt_on_line( const int* p, const int* q, const int* t ) } static -void polygonizeQBezier( double* acc, int& accsize, const double ctrl[], +void polygonizeTQBezier( double* acc, int& accsize, const double ctrl[], int maxsize ) { if ( accsize > maxsize / 2 ) @@ -197,9 +197,9 @@ void polygonizeQBezier( double* acc, int& accsize, const double ctrl[], int c3[2]; c3[0] = int(ctrl[6]); c3[1] = int(ctrl[7]); // #### Duplication needed? - if ( QABS(c1[0]-c0[0]) <= 1 && QABS(c1[1]-c0[1]) <= 1 - && QABS(c2[0]-c0[0]) <= 1 && QABS(c2[1]-c0[1]) <= 1 - && QABS(c3[0]-c1[0]) <= 1 && QABS(c3[1]-c0[1]) <= 1 ) + if ( TQABS(c1[0]-c0[0]) <= 1 && TQABS(c1[1]-c0[1]) <= 1 + && TQABS(c2[0]-c0[0]) <= 1 && TQABS(c2[1]-c0[1]) <= 1 + && TQABS(c3[0]-c1[0]) <= 1 && TQABS(c3[1]-c0[1]) <= 1 ) { // Approximate by one line. // Dont need to write last pt as it is the same as first pt @@ -210,9 +210,9 @@ void polygonizeQBezier( double* acc, int& accsize, const double ctrl[], } if ( ( pnt_on_line( c0, c3, c1 ) == 2 && pnt_on_line( c0, c3, c2 ) == 2 ) - || ( QABS(c1[0]-c0[0]) <= 1 && QABS(c1[1]-c0[1]) <= 1 - && QABS(c2[0]-c0[0]) <= 1 && QABS(c2[1]-c0[1]) <= 1 - && QABS(c3[0]-c1[0]) <= 1 && QABS(c3[1]-c0[1]) <= 1 ) ) + || ( TQABS(c1[0]-c0[0]) <= 1 && TQABS(c1[1]-c0[1]) <= 1 + && TQABS(c2[0]-c0[0]) <= 1 && TQABS(c2[1]-c0[1]) <= 1 + && TQABS(c3[0]-c1[0]) <= 1 && TQABS(c3[1]-c0[1]) <= 1 ) ) { // Approximate by one line. // Dont need to write last pt as it is the same as first pt @@ -223,8 +223,8 @@ void polygonizeQBezier( double* acc, int& accsize, const double ctrl[], } // Too big and too curved - recusively subdivide. - polygonizeQBezier( acc, accsize, l, maxsize ); - polygonizeQBezier( acc, accsize, r, maxsize ); + polygonizeTQBezier( acc, accsize, l, maxsize ); + polygonizeTQBezier( acc, accsize, r, maxsize ); } @@ -255,14 +255,14 @@ KoRect KoPointArray::boundingRect() const KoPointArray KoPointArray::cubicBezier() const { if ( size() != 4 ) { -#if defined(QT_CHECK_RANGE) - qWarning( "QPointArray::bezier: The array must have 4 control points" ); +#if defined(TQT_CHECK_RANGE) + qWarning( "TQPointArray::bezier: The array must have 4 control points" ); #endif KoPointArray pa; return pa; } else { KoRect r = boundingRect(); - int m = (int)(4+2*QMAX(r.width(),r.height())); + int m = (int)(4+2*TQMAX(r.width(),r.height())); double *p = new double[m]; double ctrl[8]; int i; @@ -271,12 +271,12 @@ KoPointArray KoPointArray::cubicBezier() const ctrl[i*2+1] = at(i).y(); } int len=0; - polygonizeQBezier( p, len, ctrl, m ); + polygonizeTQBezier( p, len, ctrl, m ); KoPointArray pa((len/2)+1); // one extra point for last point on line int j=0; for (i=0; j<len; i++) { - double x = qRound(p[j++]); - double y = qRound(p[j++]); + double x = tqRound(p[j++]); + double y = tqRound(p[j++]); pa[i] = KoPoint(x,y); } // add last pt on the line, which will be at the last control pt @@ -287,9 +287,9 @@ KoPointArray KoPointArray::cubicBezier() const } } -QPointArray KoPointArray::zoomPointArray( const KoZoomHandler* zoomHandler ) const +TQPointArray KoPointArray::zoomPointArray( const KoZoomHandler* zoomHandler ) const { - QPointArray tmpPoints(size()); + TQPointArray tmpPoints(size()); for ( uint i= 0; i<size();i++ ) { KoPoint p = at( i ); tmpPoints.putPoints( i, 1, zoomHandler->zoomItX(p.x()),zoomHandler->zoomItY(p.y()) ); @@ -297,7 +297,7 @@ QPointArray KoPointArray::zoomPointArray( const KoZoomHandler* zoomHandler ) con return tmpPoints; } -QPointArray KoPointArray::zoomPointArray( const KoZoomHandler* zoomHandler, int penWidth ) const +TQPointArray KoPointArray::zoomPointArray( const KoZoomHandler* zoomHandler, int penWidth ) const { double fx; double fy; @@ -308,11 +308,11 @@ QPointArray KoPointArray::zoomPointArray( const KoZoomHandler* zoomHandler, int fy = (double)( zoomHandler->zoomItY(ext.height()) - 2 * pw ) / ext.height(); unsigned int index = 0; - QPointArray tmpPoints; + TQPointArray tmpPoints; KoPointArray::ConstIterator it; for ( it = begin(); it != end(); ++it, ++index ) { - int tmpX = qRound((*it).x() * fx + pw); - int tmpY = qRound((*it).y() * fy + pw); + int tmpX = tqRound((*it).x() * fx + pw); + int tmpY = tqRound((*it).y() * fy + pw); tmpPoints.putPoints( index, 1, tmpX, tmpY ); } diff --git a/kpresenter/KoPointArray.h b/kpresenter/KoPointArray.h index c7868941..40df0294 100644 --- a/kpresenter/KoPointArray.h +++ b/kpresenter/KoPointArray.h @@ -20,18 +20,18 @@ #ifndef KOPOINTARRAY_H #define KOPOINTARRAY_H -#include <qmemarray.h> +#include <tqmemarray.h> #include <KoPoint.h> #include <KoRect.h> class KoZoomHandler; -class KoPointArray : public QMemArray<KoPoint> +class KoPointArray : public TQMemArray<KoPoint> { public: KoPointArray() {} ~KoPointArray() {} - KoPointArray( int size ) : QMemArray<KoPoint>( size ) {} - KoPointArray( const KoPointArray &a ) : QMemArray<KoPoint>( a ) {} + KoPointArray( int size ) : TQMemArray<KoPoint>( size ) {} + KoPointArray( const KoPointArray &a ) : TQMemArray<KoPoint>( a ) {} KoPointArray &operator=( const KoPointArray &a ) { return (KoPointArray&)assign( a ); } @@ -51,10 +51,10 @@ public: KoPointArray cubicBezier() const; static void cleanBuffers(); - QPointArray zoomPointArray( const KoZoomHandler* zoomHandler ) const; + TQPointArray zoomPointArray( const KoZoomHandler* zoomHandler ) const; // Zoom the point array, taking into account the width of the pen // (reducing the figure as necessary) - QPointArray zoomPointArray( const KoZoomHandler* zoomHandler, int penWidth ) const; + TQPointArray zoomPointArray( const KoZoomHandler* zoomHandler, int penWidth ) const; protected: static uint splen; diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp index d5f00758..64268e28 100644 --- a/kpresenter/autoformEdit/AFChoose.cpp +++ b/kpresenter/autoformEdit/AFChoose.cpp @@ -20,11 +20,11 @@ #include "AFChoose.h" -#include <qlabel.h> -#include <qvbox.h> -#include <qtextstream.h> -#include <qdir.h> -#include <qwhatsthis.h> +#include <tqlabel.h> +#include <tqvbox.h> +#include <tqtextstream.h> +#include <tqdir.h> +#include <tqwhatsthis.h> #include <klocale.h> #include <ksimpleconfig.h> @@ -34,8 +34,8 @@ #include <KPrFactory.h> -AFChoose::AFChoose(QWidget *parent, const QString &caption, const char *name) - : QTabDialog(parent,name,true) +AFChoose::AFChoose(TQWidget *tqparent, const TQString &caption, const char *name) + : TQTabDialog(tqparent,name,true) { setCaption(caption); setCancelButton(i18n("&Cancel")); @@ -43,8 +43,8 @@ AFChoose::AFChoose(QWidget *parent, const QString &caption, const char *name) groupList.setAutoDelete(true); getGroups(); setupTabs(); - connect(this,SIGNAL(applyButtonPressed()),this,SLOT(chosen())); - connect(this,SIGNAL(cancelButtonPressed()),this,SLOT(cancelClicked())); + connect(this,TQT_SIGNAL(applyButtonPressed()),this,TQT_SLOT(chosen())); + connect(this,TQT_SIGNAL(cancelButtonPressed()),this,TQT_SLOT(cancelClicked())); } AFChoose::~AFChoose() @@ -54,19 +54,19 @@ AFChoose::~AFChoose() void AFChoose::getGroups() { // global autoforms (as we don't have an editor we don't have local ones) - QString afDir = locate( "autoforms", ".autoforms", KPrFactory::global() ); + TQString afDir = locate( "autoforms", ".autoforms", KPrFactory::global() ); - QFile f( afDir ); + TQFile f( afDir ); if ( f.open(IO_ReadOnly) ) { - QTextStream t( &f ); - QString s; + TQTextStream t( &f ); + TQString s; while ( !t.eof() ) { s = t.readLine(); if ( !s.isEmpty() ) { grpPtr = new Group; - QString directory=QFileInfo( afDir ).dirPath() + "/" + s.simplifyWhiteSpace(); + TQString directory=TQFileInfo( afDir ).dirPath() + "/" + s.simplifyWhiteSpace(); grpPtr->dir.setFile(directory); - QDir d(directory); + TQDir d(directory); if(d.exists(".directory")) { KSimpleConfig config(d.absPath()+"/.directory", true); config.setDesktopGroup(); @@ -85,25 +85,25 @@ void AFChoose::setupTabs() { for (grpPtr=groupList.first();grpPtr != 0;grpPtr=groupList.next()) { - grpPtr->tab = new QVBox(this); - QWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined shape by clicking on it then clicking the OK button (or just double-click on the shape). You can then insert the shape onto your slide by drawing the area with the mouse pointer." ) ); + grpPtr->tab = new TQVBox(this); + TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined tqshape by clicking on it then clicking the OK button (or just double-click on the tqshape). You can then insert the tqshape onto your slide by drawing the area with the mouse pointer." ) ); grpPtr->loadWid = new KIconCanvas(grpPtr->tab); // Changes for the new KIconCanvas (Werner) - QDir d( grpPtr->dir.absFilePath() ); + TQDir d( grpPtr->dir.absFilePath() ); d.setNameFilter( "*.desktop" ); if( d.exists() ) { - QStringList files=d.entryList( QDir::Files | QDir::Readable, QDir::Name ); + TQStringList files=d.entryList( TQDir::Files | TQDir::Readable, TQDir::Name ); for(unsigned int i=0; i<files.count(); ++i) { - QString path=grpPtr->dir.absFilePath() + QChar('/'); + TQString path=grpPtr->dir.absFilePath() + TQChar('/'); files[i]=path + files[i]; KSimpleConfig config(files[i]); config.setDesktopGroup(); if (config.readEntry("Type")=="Link") { - QString text=config.readEntry("Name"); - QString icon=config.readEntry("Icon"); + TQString text=config.readEntry("Name"); + TQString icon=config.readEntry("Icon"); if(icon[0]!='/') // allow absolute paths for icons icon=path + icon; - QString filename=config.readPathEntry("URL"); + TQString filename=config.readPathEntry("URL"); if(filename[0]!='/') { if(filename.left(6)=="file:/") // I doubt this will happen filename=filename.right(filename.length()-6); @@ -112,7 +112,7 @@ void AFChoose::setupTabs() grpPtr->entries.insert(text, filename); // now load the icon and create the item // This code is shamelessly borrowed from KIconCanvas::slotLoadFiles - QImage img; + TQImage img; img.load(icon); if (img.isNull()) { kdWarning() << "Couldn't find icon " << icon << endl; @@ -127,9 +127,9 @@ void AFChoose::setupTabs() img = img.smoothScale(width, 60); } } - QPixmap pic; + TQPixmap pic; pic.convertFromImage(img); - QIconViewItem *item = new QIconViewItem(grpPtr->loadWid, text, pic); + TQIconViewItem *item = new TQIconViewItem(grpPtr->loadWid, text, pic); item->setKey(text); item->setDragEnabled(false); item->setDropEnabled(false); @@ -137,18 +137,18 @@ void AFChoose::setupTabs() continue; // Invalid .desktop file } } - grpPtr->loadWid->setBackgroundColor(colorGroup().base()); - grpPtr->loadWid->setResizeMode(QIconView::Adjust); + grpPtr->loadWid->setBackgroundColor(tqcolorGroup().base()); + grpPtr->loadWid->setResizeMode(TQIconView::Adjust); grpPtr->loadWid->sort(); - connect(grpPtr->loadWid,SIGNAL(nameChanged(QString)), - this,SLOT(nameChanged(QString))); - connect(this, SIGNAL(currentChanged(QWidget *)), this, - SLOT(tabChanged(QWidget*))); - connect(grpPtr->loadWid,SIGNAL( doubleClicked ( QIconViewItem *)),this, - SLOT(slotDoubleClick())); - grpPtr->label = new QLabel(grpPtr->tab); + connect(grpPtr->loadWid,TQT_SIGNAL(nameChanged(TQString)), + this,TQT_SLOT(nameChanged(TQString))); + connect(this, TQT_SIGNAL(currentChanged(TQWidget *)), this, + TQT_SLOT(tabChanged(TQWidget*))); + connect(grpPtr->loadWid,TQT_SIGNAL( doubleClicked ( TQIconViewItem *)),this, + TQT_SLOT(slotDoubleClick())); + grpPtr->label = new TQLabel(grpPtr->tab); grpPtr->label->setText(" "); - grpPtr->label->setMaximumHeight(grpPtr->label->sizeHint().height()); + grpPtr->label->setMaximumHeight(grpPtr->label->tqsizeHint().height()); addTab(grpPtr->tab,grpPtr->name); } } @@ -160,13 +160,13 @@ void AFChoose::slotDoubleClick() accept(); } -void AFChoose::nameChanged(QString name) +void AFChoose::nameChanged(TQString name) { for (grpPtr=groupList.first();grpPtr != 0;grpPtr=groupList.next()) grpPtr->label->setText(name); } -void AFChoose::tabChanged(QWidget *w) { +void AFChoose::tabChanged(TQWidget *w) { for(grpPtr=groupList.first();grpPtr != 0;grpPtr=groupList.next()) { if(grpPtr->tab==w) @@ -193,10 +193,10 @@ void AFChoose::cancelClicked() emit afchooseCanceled(); } -void AFChoose::closeEvent ( QCloseEvent *e ) +void AFChoose::closeEvent ( TQCloseEvent *e ) { emit afchooseCanceled(); - QTabDialog::closeEvent ( e ); + TQTabDialog::closeEvent ( e ); } #include "AFChoose.moc" diff --git a/kpresenter/autoformEdit/AFChoose.h b/kpresenter/autoformEdit/AFChoose.h index e767e4bf..d109059d 100644 --- a/kpresenter/autoformEdit/AFChoose.h +++ b/kpresenter/autoformEdit/AFChoose.h @@ -21,22 +21,23 @@ #ifndef AFCHOOSE_H #define AFCHOOSE_H -#include <qtabdialog.h> -#include <qptrlist.h> -#include <qmap.h> -#include <qfileinfo.h> +#include <tqtabdialog.h> +#include <tqptrlist.h> +#include <tqmap.h> +#include <tqfileinfo.h> -class QLabel; +class TQLabel; class KIconCanvas; -class AFChoose : public QTabDialog +class AFChoose : public TQTabDialog { Q_OBJECT + TQ_OBJECT public: // constructor - destructor - AFChoose(QWidget *parent=0, const QString &caption=QString::null, const char *name=0); + AFChoose(TQWidget *tqparent=0, const TQString &caption=TQString(), const char *name=0); ~AFChoose(); private: @@ -44,12 +45,12 @@ private: // structure of a group struct Group { - QFileInfo dir; - QString name; - QWidget *tab; + TQFileInfo dir; + TQString name; + TQWidget *tab; KIconCanvas *loadWid; - QLabel *label; - QMap<QString, QString> entries; + TQLabel *label; + TQMap<TQString, TQString> entries; }; // set groups @@ -61,14 +62,14 @@ private: // ********** variables ********** // list of groups and a pointer to a group - QPtrList<Group> groupList; + TQPtrList<Group> groupList; Group *grpPtr; private slots: // name changed - void nameChanged(QString); - void tabChanged(QWidget *); + void nameChanged(TQString); + void tabChanged(TQWidget *); // autoform chosen void chosen(); @@ -77,12 +78,12 @@ private slots: void slotDoubleClick(); protected: - void closeEvent ( QCloseEvent * ); + void closeEvent ( TQCloseEvent * ); signals: //autoform chosen - void formChosen(const QString &); + void formChosen(const TQString &); void afchooseCanceled(); }; diff --git a/kpresenter/autoformEdit/ATFInterpreter.cpp b/kpresenter/autoformEdit/ATFInterpreter.cpp index a32ff7ea..ff2b1037 100644 --- a/kpresenter/autoformEdit/ATFInterpreter.cpp +++ b/kpresenter/autoformEdit/ATFInterpreter.cpp @@ -20,8 +20,8 @@ #include "ATFInterpreter.h" -#include <qvaluestack.h> -#include <qfile.h> +#include <tqvaluestack.h> +#include <tqfile.h> const char ATFInterpreter::PNT_BG[] = "POINT {"; const char ATFInterpreter::X_BG[] = "X {"; @@ -92,10 +92,10 @@ ATFInterpreter::~ATFInterpreter() attrLs.setAutoDelete( true ); } -void ATFInterpreter::load(const QString & fileName) +void ATFInterpreter::load(const TQString & fileName) { - QString line; - QFile ptA(fileName); + TQString line; + TQFile ptA(fileName); coordList.clear(); lines.clear(); @@ -112,14 +112,14 @@ void ATFInterpreter::load(const QString & fileName) } } -QPointArray ATFInterpreter::getPointArray(int wid,int heig) +TQPointArray ATFInterpreter::getPointArray(int wid,int heig) { unsigned int px = 0,py = 0,a = 0,b = 0,c = 0,d = 0,e = 0,f = 0; unsigned int tmp = 0,num = 0; bool calc = false,res = false; char op = OP_EQUAL,var = VAR_1; - QPtrList<Sign> slp; - QPointArray pntArray(coordList.count()); + TQPtrList<Sign> slp; + TQPointArray pntArray(coordList.count()); if (!coordList.isEmpty()) { @@ -199,13 +199,13 @@ QPointArray ATFInterpreter::getPointArray(int wid,int heig) if (i == 14) py = tmp; } } - pntArray.setPoint(coordList.at(),px,py); + pntArray.setPoint(coordList.tqat(),px,py); } } return pntArray; } -QPtrList<ATFInterpreter::AttribList> ATFInterpreter::getAttribList() +TQPtrList<ATFInterpreter::AttribList> ATFInterpreter::getAttribList() { if(!attrLs.isEmpty()) return attrLs; @@ -228,7 +228,7 @@ QPtrList<ATFInterpreter::AttribList> ATFInterpreter::getAttribList() void ATFInterpreter::interpret() { - QValueStack<int> level; + TQValueStack<int> level; Value value; bool v = false; int pw = 1; @@ -237,9 +237,9 @@ void ATFInterpreter::interpret() level.push(LEVEL_NULL); - for (QStringList::Iterator it=lines.begin(); it!=lines.end(); ++it) + for (TQStringList::Iterator it=lines.begin(); it!=lines.end(); ++it) { - if (!(*it).isEmpty() && (*it).at(0) != COMMENT) + if (!(*it).isEmpty() && (*it).tqat(0) != COMMENT) { if (level.top() == LEVEL_NULL) { @@ -257,7 +257,7 @@ void ATFInterpreter::interpret() level.push(LEVEL_Y); else if ((*it) == ATTR_BG) level.push(LEVEL_ATTR); - else if ((*it) == QString(END)) + else if ((*it) == TQString(END)) { level.pop(); coordList.append(coordPtr); @@ -265,7 +265,7 @@ void ATFInterpreter::interpret() } else if (level.top() == LEVEL_X || level.top() == LEVEL_Y || level.top() == LEVEL_ATTR) { - switch (((*it).at(0)).latin1()) + switch (((*it).tqat(0)).latin1()) { case VAR_1: { @@ -304,13 +304,13 @@ void ATFInterpreter::interpret() } break; case VAR_VARIA: { - if ((*it).find('0') != -1) v = false; + if ((*it).tqfind('0') != -1) v = false; else v = true; attrib.isVariable = (*it); } break; case VAR_PW: { - pw = 1; pw = ((*it).at(4)).latin1() - 48; + pw = 1; pw = ((*it).tqat(4)).latin1() - 48; attrib.pwDiv = (*it); } break; case '}': @@ -320,24 +320,24 @@ void ATFInterpreter::interpret() case LEVEL_X: { coordPtr->pntX = value; - coord.a = QString::null; - coord.b = QString::null; - coord.c = QString::null; - coord.d = QString::null; - coord.e = QString::null; - coord.f = QString::null; - coord.result = QString::null; + coord.a = TQString(); + coord.b = TQString(); + coord.c = TQString(); + coord.d = TQString(); + coord.e = TQString(); + coord.f = TQString(); + coord.result = TQString(); } break; case LEVEL_Y: { coordPtr->pntY = value; - coord.a = QString::null; - coord.b = QString::null; - coord.c = QString::null; - coord.d = QString::null; - coord.e = QString::null; - coord.f = QString::null; - coord.result = QString::null; + coord.a = TQString(); + coord.b = TQString(); + coord.c = TQString(); + coord.d = TQString(); + coord.e = TQString(); + coord.f = TQString(); + coord.result = TQString(); } break; case LEVEL_ATTR: { @@ -345,7 +345,7 @@ void ATFInterpreter::interpret() coordPtr->pwDiv = pw; pw = 1; v = false; - attrib.isVariable = QString::null; + attrib.isVariable = TQString(); attrib.pwDiv = 1; } break; } @@ -357,16 +357,16 @@ void ATFInterpreter::interpret() } } -QPtrList<ATFInterpreter::Sign> ATFInterpreter::getVar(const QString &s) +TQPtrList<ATFInterpreter::Sign> ATFInterpreter::getVar(const TQString &s) { - QPtrList<Sign> list; + TQPtrList<Sign> list; for (unsigned int i=1; i<s.length(); ++i) { - if(s.at(i)==' ') + if(s.tqat(i)==' ') continue; signPtr = new Sign; - switch (s.at(i).latin1()) + switch (s.tqat(i).latin1()) { case VAR_W: signPtr->type = ST_WIDTH; break; case VAR_H: signPtr->type = ST_HEIGHT; break; @@ -431,20 +431,20 @@ QPtrList<ATFInterpreter::Sign> ATFInterpreter::getVar(const QString &s) signPtr->type = ST_NUMBER; if (s.length() - 1 > i) { - switch (s.at(i+1).latin1()) + switch (s.tqat(i+1).latin1()) { case NUM_0: case NUM_1: case NUM_2: case NUM_3: case NUM_4: case NUM_5: case NUM_6: case NUM_7: case NUM_8: case NUM_9: { - signPtr->num = (s.at(i).latin1() - 48) * 10 + s.at(i+1).latin1() - 48; + signPtr->num = (s.tqat(i).latin1() - 48) * 10 + s.tqat(i+1).latin1() - 48; i++; } break; default: - signPtr->num = s.at(i).latin1() - 48; break; + signPtr->num = s.tqat(i).latin1() - 48; break; } } else - signPtr->num = s.at(i).latin1() - 48; + signPtr->num = s.tqat(i).latin1() - 48; } break; } list.append(signPtr); diff --git a/kpresenter/autoformEdit/ATFInterpreter.h b/kpresenter/autoformEdit/ATFInterpreter.h index 8e0feebb..e532a49a 100644 --- a/kpresenter/autoformEdit/ATFInterpreter.h +++ b/kpresenter/autoformEdit/ATFInterpreter.h @@ -21,9 +21,9 @@ #ifndef ATFINTERP_H #define ATFINTERP_H -#include <qpointarray.h> -#include <qptrlist.h> -#include <qstringlist.h> +#include <tqpointarray.h> +#include <tqptrlist.h> +#include <tqstringlist.h> class ATFInterpreter { @@ -39,20 +39,20 @@ public: // coordinate structure struct CoordStruct { - QString a; - QString b; - QString c; - QString d; - QString e; - QString f; - QString result; + TQString a; + TQString b; + TQString c; + TQString d; + TQString e; + TQString f; + TQString result; }; // attribute structure struct AttribStruct { - QString isVariable; - QString pwDiv; + TQString isVariable; + TQString pwDiv; }; // structure of signs @@ -67,13 +67,13 @@ public: // structure of values struct Value { - QPtrList<Sign> var1; - QPtrList<Sign> var2; - QPtrList<Sign> var3; - QPtrList<Sign> var4; - QPtrList<Sign> var5; - QPtrList<Sign> var6; - QPtrList<Sign> result; + TQPtrList<Sign> var1; + TQPtrList<Sign> var2; + TQPtrList<Sign> var3; + TQPtrList<Sign> var4; + TQPtrList<Sign> var5; + TQPtrList<Sign> var6; + TQPtrList<Sign> result; }; // constructure - destructure @@ -81,11 +81,11 @@ public: ~ATFInterpreter(); // load autoform - void load(const QString &); + void load(const TQString &); // get pointarray/attribute list/points - QPointArray getPointArray(int,int); - QPtrList<AttribList> getAttribList(); + TQPointArray getPointArray(int,int); + TQPtrList<AttribList> getAttribList(); protected: @@ -157,19 +157,19 @@ protected: void interpret(); // get varaible of a line - QPtrList<Sign> getVar(const QString&); + TQPtrList<Sign> getVar(const TQString&); // ********** variables ********** // list of coordinates and pointers to coordinate/sign/value - QPtrList<Coord> coordList; - QPtrList<AttribList> attrLs; + TQPtrList<Coord> coordList; + TQPtrList<AttribList> attrLs; Coord *coordPtr; Sign *signPtr; Value *valuePtr; // list of lines - QStringList lines; + TQStringList lines; }; #endif //ATFINTERP_H diff --git a/kpresenter/brushpropertyui.ui b/kpresenter/brushpropertyui.ui index 639bb06b..58d680cb 100644 --- a/kpresenter/brushpropertyui.ui +++ b/kpresenter/brushpropertyui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>BrushPropertyUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>BrushPropertyUI</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>styleLabel</cstring> </property> @@ -52,7 +52,7 @@ <string>Choose the color (white is the default). Clicking on the color will display the standard KDE color chooser dialog.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>colorLabel</cstring> </property> @@ -63,7 +63,7 @@ <cstring>colorChooser</cstring> </property> </widget> - <widget class="QFrame" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQFrame" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>previewPanel</cstring> </property> @@ -78,7 +78,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kpresenter/generalpropertyui.ui b/kpresenter/generalpropertyui.ui index 6e3728b2..4a89074d 100644 --- a/kpresenter/generalpropertyui.ui +++ b/kpresenter/generalpropertyui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GeneralPropertyUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GeneralPropertyUI</cstring> </property> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>nameLabel</cstring> </property> @@ -38,14 +38,14 @@ <cstring>nameInput</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>nameInput</cstring> </property> </widget> </hbox> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>protect</cstring> </property> @@ -53,7 +53,7 @@ <string>Protect si&ze and position</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>keepRatio</cstring> </property> @@ -61,7 +61,7 @@ <string>Keep &aspect ratio</string> </property> </widget> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>positionGroup</cstring> </property> @@ -81,7 +81,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>widthLabel</cstring> </property> @@ -92,7 +92,7 @@ <cstring>widthInput</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>heightLabel</cstring> </property> @@ -103,7 +103,7 @@ <cstring>heightInput</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>topLabel</cstring> </property> @@ -114,7 +114,7 @@ <cstring>yInput</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>leftLabel</cstring> </property> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -189,5 +189,5 @@ <data format="PNG" length="1008">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b749444154388db59541681d551486bf49aef55c4965061b98815a5e20a5790b912c0d66d12c0381361004219bae0a45041111a92d28086a4110eaa68a8bd8b8a97121348b96b810cca6988281111a9c27446720afcc8516efa94e3b2e665e6244832e3c70b8cce5f2cf77cffc734e50d735830882600818060c3004046d1e14759b8f800a7858d7f5a360207cfe8df34f7627ba679d7367f27e7ea27425168bc71fb896ae24bd936eaddf5a5fa6e213e02ef0c00c48af5dbd76364a7837390e9d4a5b98128c0025d608e0f7f6d97b4eefc8389f8617d66f3a0b7c0894a63d395cf48b33d1d390f5bf40ef65f84ab116fcefe00a212f1441b04760ec38882854a0801c866854015e00aeee1203a6ec97273c0ebd57e02b873d1c926dc0daaab271ab400c68a5880989c785d98588a9698fd0ec872302e83120fa33f150ee7226517c95636dc8b73794e52b0e2a08432119174420ef29bd2de5a3b7338ac598f9451069c4dbb0c0a18170608d05147b58c83660a5159d3d1573720e92c482f1a846acad7a56ae3856967ac4719799d316314a53188681606820ec2b0f08dec3f5af1c5a29b3a762e6cf4094286a72dc8ee5fa9725b30b112fbe148211969772b4bfcf7e01100c88b1c682297145447a3b230c1b5291e68aee7ec2e5f74bb24d47b903e75e4b58bfe1c87e50d2d423b2dfdc03627ce5b146c88b120c241d884641519c8bb8fc564ebae99050989a8e60a4a43b19a295926f8356ff20dcd41804814a0947da8fb29370f99d926cb3b157382224472112c08018412b90bf20ef2306b047001392f61455cbda4ddf908e08f1d1905eafe0d2c59c742322cf14ad94b18e853d5734fedd4f5cd23d0e9d8e50f494b555cffc6244b9a34c9d8c4862b874117a5b05e75fced1fb8e380ee94e425e1c50631010657641d04a59b9e2585b2d39f74ac2e4b4a733e979f5cd84380e71fd022a989a0b199bd8e7e3bf23f6500953d3506cc7ac2cf558fe00d66f38bacf846020cf4a5c5f9bdaa2a4df28e96d4b2842ebe37dc275d92fdb7f5f11607e5188e32e2b9fe7a49b4a7abbd79cae203c1232733ae4bbaf95fcbe43ab88a2bf2b5a03f5ae707a27dd4a331997a821110333739ea9e98434f5e4db8d68d2b17427616c02d2390b5502a624fb1e805f8087401dd4754d100416c3ebcf3d2f17a2a4b194aa3270bdb4af17d37633da9b19c139483794bc505cc155e063e047da46ff18700c780ff889bda9f06ff367e033e034f02c303a201ea2e94a11f054bb5ada86c2c151b7d7f73413e02e50ee8ea620080cf038f0442b7a88ff36f37e6bc57f051e04ffd730fd03ef8bd61b5b2ca6900000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kpresenter/global.h b/kpresenter/global.h index e7d9b044..656f6735 100644 --- a/kpresenter/global.h +++ b/kpresenter/global.h @@ -66,7 +66,7 @@ enum ObjType { OT_GROUP = 10, OT_FREEHAND = 11, OT_POLYLINE = 12, - OT_QUADRICBEZIERCURVE = 13, + OT_TQUADRICBEZIERCURVE = 13, OT_CUBICBEZIERCURVE = 14, OT_POLYGON = 15, OT_CLOSED_LINE = 16 @@ -258,7 +258,7 @@ enum ToolEditMode { INS_AUTOFORM = 10, INS_FREEHAND = 11, INS_POLYLINE = 12, - INS_QUADRICBEZIERCURVE = 13, + INS_TQUADRICBEZIERCURVE = 13, INS_CUBICBEZIERCURVE = 14, INS_POLYGON = 15, INS_PICTURE = 16, @@ -267,7 +267,7 @@ enum ToolEditMode { TEM_ZOOM = 19, INS_CLOSED_FREEHAND = 20, INS_CLOSED_POLYLINE = 21, - INS_CLOSED_QUADRICBEZIERCURVE = 22, + INS_CLOSED_TQUADRICBEZIERCURVE = 22, INS_CLOSED_CUBICBEZIERCURVE = 23 }; @@ -294,6 +294,6 @@ enum VerticalAlignmentType { // offsets of the effects in the Effect2 enum accoording to a objType const int TxtObjOffset = 0; -typedef QMap<QString, QValueList<KPrPage *> > CustomSlideShowMap; +typedef TQMap<TQString, TQValueList<KPrPage *> > CustomSlideShowMap; #endif //GLOBAL_H diff --git a/kpresenter/gradientpropertyui.ui b/kpresenter/gradientpropertyui.ui index 92411fcd..488550d6 100644 --- a/kpresenter/gradientpropertyui.ui +++ b/kpresenter/gradientpropertyui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GradientPropertyUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>GradientPropertyUI</cstring> </property> @@ -22,9 +22,9 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <grid> <property name="name"> @@ -43,7 +43,7 @@ <cstring>styleCombo</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>styleLabel</cstring> </property> @@ -54,7 +54,7 @@ <cstring>styleCombo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>colorLabel</cstring> </property> @@ -75,15 +75,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>xFactorLabel</cstring> </property> @@ -94,7 +94,7 @@ <cstring>xSlider</cstring> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>unbalancedCheckBox</cstring> </property> @@ -102,7 +102,7 @@ <string>Un&balanced:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>yFactorLabel</cstring> </property> @@ -113,7 +113,7 @@ <cstring>ySlider</cstring> </property> </widget> - <widget class="QSlider" row="2" column="1"> + <widget class="TQSlider" row="2" column="1"> <property name="name"> <cstring>ySlider</cstring> </property> @@ -130,7 +130,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QSlider" row="1" column="1"> + <widget class="TQSlider" row="1" column="1"> <property name="name"> <cstring>xSlider</cstring> </property> @@ -149,7 +149,7 @@ </widget> </grid> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>previewPanel</cstring> </property> @@ -169,7 +169,7 @@ <tabstop>xSlider</tabstop> <tabstop>ySlider</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kpresenter/imageEffectBase.ui b/kpresenter/imageEffectBase.ui index 2495e5aa..fcdee80c 100644 --- a/kpresenter/imageEffectBase.ui +++ b/kpresenter/imageEffectBase.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>EffectBrowserBase</class> <author>Lukas Tinkl <lukas@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>gbPreview</cstring> </property> @@ -36,7 +36,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_previewLabel</cstring> </property> @@ -48,7 +48,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>200</height> @@ -60,13 +60,13 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -74,7 +74,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -82,7 +82,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -93,7 +93,7 @@ <cstring>m_effectCombo</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Channel Intensity</string> @@ -243,7 +243,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>m_widgetStack</cstring> </property> @@ -255,7 +255,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -266,7 +266,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -274,7 +274,7 @@ <string>Value:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>chanInt_value</cstring> </property> @@ -288,7 +288,7 @@ <number>-100</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -296,7 +296,7 @@ <string>Color component:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Red</string> @@ -336,7 +336,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>130</height> @@ -345,7 +345,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -356,7 +356,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -364,7 +364,7 @@ <string>Value:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -409,7 +409,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>130</height> @@ -418,7 +418,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -429,7 +429,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -445,7 +445,7 @@ <string></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -471,7 +471,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>81</height> @@ -480,7 +480,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -491,7 +491,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -499,7 +499,7 @@ <string>Intensity:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>intensity_value</cstring> </property> @@ -523,7 +523,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>71</height> @@ -532,7 +532,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -543,7 +543,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> @@ -572,7 +572,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>111</height> @@ -581,7 +581,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -592,7 +592,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5_2</cstring> </property> @@ -600,7 +600,7 @@ <string>Value:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>contrast_value</cstring> </property> @@ -621,7 +621,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>71</height> @@ -630,7 +630,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -641,20 +641,20 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel8</cstring> </property> <property name="text"> <string>This effect has no options.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -665,20 +665,20 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel9</cstring> </property> <property name="text"> <string>This effect has no options.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -689,7 +689,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -697,7 +697,7 @@ <string>Value:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>threshold_value</cstring> </property> @@ -718,7 +718,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>111</height> @@ -727,7 +727,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -738,7 +738,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel10</cstring> </property> @@ -767,7 +767,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>121</height> @@ -776,7 +776,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -787,20 +787,20 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel9_2</cstring> </property> <property name="text"> <string>This effect has no options.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -811,20 +811,20 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel9_3</cstring> </property> <property name="text"> <string>This effect has no options.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -835,7 +835,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -867,7 +867,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>101</height> @@ -876,7 +876,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -887,7 +887,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_3</cstring> </property> @@ -895,7 +895,7 @@ <string>Type:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Uniform</string> @@ -946,7 +946,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>101</height> @@ -955,7 +955,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -966,7 +966,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3_2</cstring> </property> @@ -998,7 +998,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>101</height> @@ -1007,7 +1007,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -1018,7 +1018,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3_2_2</cstring> </property> @@ -1050,7 +1050,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>181</height> @@ -1059,7 +1059,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -1070,7 +1070,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3_2_3</cstring> </property> @@ -1102,7 +1102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>181</height> @@ -1111,7 +1111,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -1122,7 +1122,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4_3</cstring> </property> @@ -1130,7 +1130,7 @@ <string>Radius:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>oilPaint_radius</cstring> </property> @@ -1148,7 +1148,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>71</height> @@ -1157,7 +1157,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -1168,7 +1168,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3_2_4</cstring> </property> @@ -1200,7 +1200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>181</height> @@ -1209,7 +1209,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -1220,7 +1220,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4_3_2</cstring> </property> @@ -1228,7 +1228,7 @@ <string>Value:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>spread_value</cstring> </property> @@ -1246,7 +1246,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>183</height> @@ -1255,7 +1255,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -1266,7 +1266,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>shade_color</cstring> </property> @@ -1277,7 +1277,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5_3</cstring> </property> @@ -1296,7 +1296,7 @@ <number>30</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel6_2</cstring> </property> @@ -1325,7 +1325,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>41</height> @@ -1334,7 +1334,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -1345,7 +1345,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel7_2</cstring> </property> @@ -1374,7 +1374,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>81</height> @@ -1383,7 +1383,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -1394,7 +1394,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel9_4</cstring> </property> @@ -1410,7 +1410,7 @@ <number>25</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel10_2</cstring> </property> @@ -1436,7 +1436,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>91</height> @@ -1458,7 +1458,7 @@ <slot>raiseWidget(int)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kpresenter/insertpagedia.ui b/kpresenter/insertpagedia.ui index b3496389..1984d518 100644 --- a/kpresenter/insertpagedia.ui +++ b/kpresenter/insertpagedia.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>InsertPageDia</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>InsertPageDia</cstring> </property> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Before Current Slide</string> @@ -51,7 +51,7 @@ <number>1</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -62,7 +62,7 @@ <cstring>locationCombo</cstring> </property> </widget> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -72,7 +72,7 @@ <property name="title"> <string></string> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> <vbox> <property name="name"> @@ -84,7 +84,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioDefault</cstring> </property> @@ -95,7 +95,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioCurrentDefault</cstring> </property> @@ -103,7 +103,7 @@ <string>Use cu&rrent slide as default</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioDifferent</cstring> </property> @@ -113,7 +113,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -137,14 +137,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>PushButton1</cstring> </property> @@ -155,7 +155,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>PushButton2</cstring> </property> @@ -181,5 +181,5 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kpresenter/kprconverter.pl b/kpresenter/kprconverter.pl index 524b3d8d..60aa3fb3 100644 --- a/kpresenter/kprconverter.pl +++ b/kpresenter/kprconverter.pl @@ -43,9 +43,9 @@ while (<INPUT>) # 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 - $alignment=$1 if(/horzAlign=(\"[0-2]+\")/); - $alignment =~ tr/01/14/; - s/horzAlign=\"[0-2]+\"/align=$alignment/; + $tqalignment=$1 if(/horzAlign=(\"[0-2]+\")/); + $tqalignment =~ tr/01/14/; + s/horzAlign=\"[0-2]+\"/align=$tqalignment/; s/>$/ type=$objType>/; } elsif (/<\/PARAGRAPH>/) diff --git a/kpresenter/marginui.ui b/kpresenter/marginui.ui index 98a283b0..ac7ab85e 100644 --- a/kpresenter/marginui.ui +++ b/kpresenter/marginui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MarginUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MarginUI</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>margins</cstring> </property> @@ -41,15 +41,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>synchronize</cstring> </property> @@ -57,9 +57,9 @@ <string>S&ynchronize changes</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -70,7 +70,7 @@ <cstring>leftInput</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>rightLabel</cstring> </property> @@ -86,7 +86,7 @@ <cstring>rightInput</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>topLabel</cstring> </property> @@ -97,7 +97,7 @@ <cstring>topInput</cstring> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>bottomLabel</cstring> </property> @@ -118,7 +118,7 @@ <cstring>topInput</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>leftLabel</cstring> </property> @@ -163,5 +163,5 @@ <tabstops> <tabstop>synchronize</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kpresenter/penstyle.ui b/kpresenter/penstyle.ui index 6e038785..a945aff4 100644 --- a/kpresenter/penstyle.ui +++ b/kpresenter/penstyle.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>PenStyleUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PenStyleUI</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>arrowGroup</cstring> </property> @@ -44,7 +44,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lineBeginLabel</cstring> </property> @@ -60,7 +60,7 @@ <cstring>lineBeginCombo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lineEndLabel</cstring> </property> @@ -82,7 +82,7 @@ <property name="name"> <cstring>pbPreview</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>80</width> <height>40</height> @@ -100,7 +100,7 @@ <string>Choose the line style. This can range from No Outline, which will not draw any lines, to dotted and plain lines.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>widthLabel</cstring> </property> @@ -111,7 +111,7 @@ <cstring>widthInput</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>styleLabel</cstring> </property> @@ -133,7 +133,7 @@ <string>Set the color of the line. Clicking on the color will bring the standard KDE Select Color dialog.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>colorLabel</cstring> </property> @@ -186,8 +186,8 @@ <tabstop>lineBeginCombo</tabstop> <tabstop>lineEndCombo</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kpresenter/picturepropertyui.ui b/kpresenter/picturepropertyui.ui index 2e74cb2e..471a9d91 100644 --- a/kpresenter/picturepropertyui.ui +++ b/kpresenter/picturepropertyui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>PicturePropertyUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PicturePropertyUI</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>depthGroup</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>depth1</cstring> </property> @@ -46,7 +46,7 @@ <string>&1 bit color mode</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>depth8</cstring> </property> @@ -54,7 +54,7 @@ <string>&8 bit color mode</string> </property> </widget> - <widget class="QRadioButton" row="3" column="0"> + <widget class="TQRadioButton" row="3" column="0"> <property name="name"> <cstring>depth16</cstring> </property> @@ -62,7 +62,7 @@ <string>1&6 bit color mode</string> </property> </widget> - <widget class="QRadioButton" row="4" column="0"> + <widget class="TQRadioButton" row="4" column="0"> <property name="name"> <cstring>depth32</cstring> </property> @@ -70,7 +70,7 @@ <string>&32 bit color mode</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>depth0</cstring> </property> @@ -100,7 +100,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>swapRGB</cstring> </property> @@ -108,7 +108,7 @@ <string>Conv&ert from RGB image to BRG image</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>grayscale</cstring> </property> @@ -116,7 +116,7 @@ <string>Gra&yscale</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>brightnessLabel</cstring> </property> @@ -131,7 +131,7 @@ <property name="name"> <cstring>picturePreview</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>200</height> @@ -173,7 +173,7 @@ <tabstop>grayscale</tabstop> <tabstop>brightnessInput</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kpresenter/piepropertyui.ui b/kpresenter/piepropertyui.ui index a8624c7e..69300a3a 100644 --- a/kpresenter/piepropertyui.ui +++ b/kpresenter/piepropertyui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>PiePropertyUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PiePropertyUI</cstring> </property> @@ -30,7 +30,7 @@ <string>You can choose among three options in the dropdown box: Pie, Arc or Chord.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>typeLabel</cstring> </property> @@ -41,7 +41,7 @@ <cstring>typeCombo</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lengthLabel</cstring> </property> @@ -56,7 +56,7 @@ <property name="name"> <cstring>piePreview</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>200</height> @@ -66,7 +66,7 @@ <string>This displays a preview of your choices.</string> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>angleInput</cstring> </property> @@ -83,7 +83,7 @@ <string>Set here the start position.</string> </property> </widget> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>lengthInput</cstring> </property> @@ -100,7 +100,7 @@ <string>Set the arc length of your pie.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>angleLabel</cstring> </property> @@ -139,7 +139,7 @@ <tabstops> <tabstop>typeCombo</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> </includehints> diff --git a/kpresenter/polygonpropertyui.ui b/kpresenter/polygonpropertyui.ui index e5f4574b..e5b7ef56 100644 --- a/kpresenter/polygonpropertyui.ui +++ b/kpresenter/polygonpropertyui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>PolygonPropertyUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PolygonPropertyUI</cstring> </property> @@ -22,9 +22,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -42,7 +42,7 @@ <property name="name"> <cstring>polygonPreview</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>200</height> @@ -66,7 +66,7 @@ <string>Set here the number of corners of the polygon.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>typebLabel</cstring> </property> @@ -77,7 +77,7 @@ <cstring>typeCombo</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -102,7 +102,7 @@ <string>Increase or decrease the sharpness of the polygon.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -140,7 +140,7 @@ <data format="PNG" length="826">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000030149444154388db59531681b5718c77f0e377c070e3c810a3a70e0041eac51852e0a19e45134830a1d9a4c69a04bc8928e990a693a640e1d0c8642b08742321894c1507991b484c890902bb8701a047760c3bd21701fe4201dde49b6a41a32b8df72dcbbeffdbefffbbfefbd5b1b0c07cce266ebe667ae2006c3c1dada0cdc3be87d6e6c35b0d692a409d9c7ec8b20d65ae29398d19b1114e7e3de4ce98b3f5e10dc0053cf0951b4506496e1b964bf7ce6c585d9054c62d01d617ca48be0596553cf496d8f2c8b01c5f795fc93904e85ec4c01a152857a5d9175d0b2805c872080f18595ccc1499a10a225d4e2fbc2877786fe81253ab6c04c8d106e09db5d43ab0d146e5c64d1a23938fb98a185cea1c33eecfd9eba49eb427dcb201e245365f2b7b2fb5b4a3a31dcb927178afe07d86901df870fefa4842aed6f6b74ba42e52b4014d580e1eb9cbd9d94de7e4aad16d2f9be02d805f0b5e532f927a1ffcacea1777f122a8105b164a7c25faf323a5d9f1f1fd600e1e5bec59e2d4b5c7ef5209d0ad17b8b31864e57c0b3e0815ac3ee33253ab664a770ff5185d1a1cb8d2267d3e58aa1dc7d2508cbe597d0e74fdd269aaaf0f52d414c4ea3e9762c996869e42560d7a72e41c4799a2586e74f95e8d8151481fa86efbe7b3398ac58b1a2b8527589f15451ad303ac2293542ad6648a796278f13a27185e4c4754310facb98c53a79e19a3fdc1426ff28c3d7399d1f7cb25343eb96106cf83c790ce9c4f2eb831855c55485663327992eb6dc8a6259874ed700b0b793323cccb9ffa842b30d6133e3e75fea989ac15a8b16ca76b746b0b92278d919774c5b6d48a78697fb29bbcf52468742a32120909c24e899ce67beed5be2db01e22d1e9485bb620e47f9ee9e606a21bd3f5d3744c7e7c54d55e87443867d8b554515ac5db4620e8e4f62263170fd1cdee90aad7640141992891b0f367c9adfe4049bb07d3b7022bd8c687c0978f46684ee084150b65ac1fcca94591b7a90a496e4c095164fb016a2b192a497795cc0f84817aebe25f7bf70ccc54a575c555c03f78ffa5fc0570d1f0c076bff0232285a09643cc7ce0000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kpresenter/rectpropertyui.ui b/kpresenter/rectpropertyui.ui index 4730712c..4b13a474 100644 --- a/kpresenter/rectpropertyui.ui +++ b/kpresenter/rectpropertyui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>RectPropertyUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>RectPropertyUI</cstring> </property> @@ -22,9 +22,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -33,15 +33,15 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>xRndLabel</cstring> </property> @@ -52,7 +52,7 @@ <cstring>xRndInput</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>yRndLabel</cstring> </property> @@ -63,7 +63,7 @@ <cstring>yRndInput</cstring> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>yRndInput</cstring> </property> @@ -80,7 +80,7 @@ <string>Set the horizontal declination.</string> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>xRndInput</cstring> </property> @@ -99,7 +99,7 @@ </widget> </grid> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>combineButton</cstring> </property> @@ -111,13 +111,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>16</width> <height>32767</height> @@ -142,7 +142,7 @@ <property name="name"> <cstring>rectPreview</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>100</height> @@ -177,5 +177,5 @@ <data format="PNG" length="824">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000002ff49444154388db59531681c4714863f992dde820cb370815b50600f54e8ca0ba43970712a8fb838438a3895634813d238a5ab80e314ae4d0a812060a4226017c27221c8a9da6b8c4fe0e00d28b0571cec82043b85611f78c12966efa4bb8bc085f29a6567df7cef9f7fdeccaec571cc2cbaddee47ae21e2385e5b9b815f1ebcfcd8de6a63ad25cb338af7c52741acb5a4a729a3d723a82ec6bd99d267bf3f23fc1c4cab2442d14a915986e792fdfa59569766573049417784f1b12e8267954dab24b78714450a28beaf941f847c2a14e70a0841035a2d45d641eb027213c210c69756320767794684d6508bef0befde1a860796e4c402333542b4256c0f0cdd1e50b97191458be6e0e27d81563a87c643d8fb2d7793d685d696413cc8a6cae46f65f7d79c7c62b87b4f2e15fd0fb0d302be0fefde4a0d557a5f35e90f84e0334014d590f855c9de4ecee17e4eb319d1ff3a00ec02f8c67299f283307c61e7d06fbf1782d082588a33e1cf1705fd81cf773f3601e1f9bec59e2f4b5c7ef5209f0ac95f16630cfd818067c103b586dd274a726229cee0fe8380d191cb4d1267d3d58aa1de7d258ceae5d7d0a78fdd269a86f0c52d414c49bbe3762c9b686de41560d7a72e41c4795a6486a78f95e4c4151481d686efbe7b3398ac58b1a23868b8c474aaa8068c8e714a8dd06c1af2a9e5d1c38c641c909dba6e08237f19b358a7ac5cf3479bc2e41f257e55d2ffc6a73833746f09e186cfa387904f2cbffc90a2aa9886d0e99464d3c5965b512cebd01f1800f67672e2a392fb0f023a3d883a053ffddcc2340dd65ab452b6074dc2cd15c1cbceb863daed413e353cdfcfd97d92333a12da6d0181ec3443cf753ef3cdd092de0e116ff1a02cdc157338ca9d7b8269461cfee1ba2139b9286e1a427f10110f2d561555b076d18a39383d4d99a4c0cd0b787f20747b214962c8266e3cdcf0e97c59126ec2f6edd089f40a92f115e0d1eb11ba238461dd6a15f32b53666de841965bb203575a3cc15a48c64a965fe57105e3635db8fa96dcffc431172b5d715d7103dc3fea7f015f373c8ee3b57f0135105a0fae7717960000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kpresenter/rotationpropertyui.ui b/kpresenter/rotationpropertyui.ui index 169324fb..08a877cb 100644 --- a/kpresenter/rotationpropertyui.ui +++ b/kpresenter/rotationpropertyui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>RotationPropertyUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>RotationPropertyUI</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QSlider" row="1" column="0"> + <widget class="TQSlider" row="1" column="0"> <property name="name"> <cstring>angleSlider</cstring> </property> @@ -48,15 +48,15 @@ <number>90</number> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> @@ -109,11 +109,11 @@ </spacer> </hbox> </widget> - <widget class="QFrame" row="0" column="1" rowspan="4" colspan="1"> + <widget class="TQFrame" row="0" column="1" rowspan="4" colspan="1"> <property name="name"> <cstring>previewPanel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>160</width> <height>160</height> @@ -136,14 +136,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QFrame" row="0" column="0"> + <widget class="TQFrame" row="0" column="0"> <property name="name"> <cstring>angleFrame</cstring> </property> @@ -158,7 +158,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kpresenter/shadowdialog.ui b/kpresenter/shadowdialog.ui index a50a1a17..733ebbd5 100644 --- a/kpresenter/shadowdialog.ui +++ b/kpresenter/shadowdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ShadowDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ShadowDialogBase</cstring> </property> @@ -28,7 +28,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -42,7 +42,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -56,7 +56,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>colorgroup</cstring> </property> @@ -67,7 +67,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -81,7 +81,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>colorLabel</cstring> </property> @@ -99,7 +99,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -113,7 +113,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>distanceLabel</cstring> </property> @@ -121,7 +121,7 @@ <string>Distance:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>distanceSpinBox</cstring> </property> @@ -130,7 +130,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>directionGroup</cstring> </property> @@ -152,7 +152,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>lButton</cstring> </property> @@ -174,7 +174,7 @@ <number>8</number> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>lbButton</cstring> </property> @@ -196,7 +196,7 @@ <number>7</number> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>bButton</cstring> </property> @@ -218,7 +218,7 @@ <number>6</number> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>rbButton</cstring> </property> @@ -240,7 +240,7 @@ <number>5</number> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>rButton</cstring> </property> @@ -262,7 +262,7 @@ <number>4</number> </property> </widget> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>ltButton</cstring> </property> @@ -284,7 +284,7 @@ <number>1</number> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>rtButton</cstring> </property> @@ -306,7 +306,7 @@ <number>3</number> </property> </widget> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>tButton</cstring> </property> @@ -332,11 +332,11 @@ </widget> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>previewPanel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>160</width> <height>160</height> @@ -365,7 +365,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -389,14 +389,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>okButton</cstring> </property> @@ -410,7 +410,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>applyButton</cstring> </property> @@ -421,7 +421,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -485,14 +485,14 @@ <includes> <include location="local" impldecl="in implementation">kcolorbutton.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected">colorChanged( const QColor & )</slot> <slot access="protected">directionChanged( int )</slot> <slot access="protected">distanceChanged( int )</slot> <slot access="protected">applyClicked()</slot> <slot access="protected">okClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/kpresenter/slidetransitionwidget.ui b/kpresenter/slidetransitionwidget.ui index 65f8cb03..eef5c847 100644 --- a/kpresenter/slidetransitionwidget.ui +++ b/kpresenter/slidetransitionwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SlideTransitionWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SlideTransitionWidget</cstring> </property> @@ -22,15 +22,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout39</cstring> + <cstring>tqlayout39</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>previewPixmap</cstring> </property> @@ -42,7 +42,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>240</width> <height>180</height> @@ -55,7 +55,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>previewButton</cstring> </property> @@ -65,23 +65,23 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>effectCombo</cstring> </property> @@ -94,7 +94,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>effectLabel</cstring> </property> @@ -105,7 +105,7 @@ <cstring>effectCombo</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>speedCombo</cstring> </property> @@ -118,7 +118,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>speedLabel</cstring> </property> @@ -145,15 +145,15 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>soundCheckBox</cstring> </property> @@ -169,7 +169,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="1" column="3"> + <widget class="TQPushButton" row="1" column="3"> <property name="name"> <cstring>stopButton</cstring> </property> @@ -185,7 +185,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>soundLabel</cstring> </property> @@ -196,7 +196,7 @@ <cstring>soundRequester</cstring> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>playButton</cstring> </property> @@ -228,7 +228,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>autoTransitionLayout</cstring> </property> @@ -236,7 +236,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -276,7 +276,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>29</height> @@ -299,7 +299,7 @@ <tabstop>previewButton</tabstop> <tabstop>automaticTransitionInput</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kpresenter/templates/Screenpresentations/BlueBreezePicture.kpt b/kpresenter/templates/Screenpresentations/BlueBreezePicture.kpt Binary files differindex ebc03a66..7da32367 100644 --- a/kpresenter/templates/Screenpresentations/BlueBreezePicture.kpt +++ b/kpresenter/templates/Screenpresentations/BlueBreezePicture.kpt diff --git a/kpresenter/textpropertyui.ui b/kpresenter/textpropertyui.ui index 16ebb341..2e171cff 100644 --- a/kpresenter/textpropertyui.ui +++ b/kpresenter/textpropertyui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>TextPropertyUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>TextPropertyUI</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>protectContent</cstring> </property> @@ -54,7 +54,7 @@ <data format="PNG" length="826">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b00000301494441541895b59531681b5718c77f0e377c070e3c810a3a70e0041eac51852e0a19e45134830a1d9a4c69a04bc8928e990a693a640e1d0c8642b08742321894c1507991b484c890902bb8701a047760c3bd21701fe4201dde49b6a41a32b8df72dcbbeffdbefffbbfefbd5b1b0c07cce266ebe667ae2006c3c1dada0cdc3be87d6e6c35b0d692a409d9c7ec8b20d65ae29398d19b1114e7e3de4ce98b3f5e10dc0053cf0951b4506496e1b964bf7ce6c585d9054c62d01d617ca48be0596553cf496d8f2c8b01c5f795fc93904e85ec4c01a152857a5d9175d0b2805c872080f18595ccc1499a10a225d4e2fbc2877786fe81253ab6c04c8d106e09db5d43ab0d146e5c64d1a23938fb98a185cea1c33eecfd9eba49eb427dcb201e245365f2b7b2fb5b4a3a31dcb927178afe07d86901df870fefa4842aed6f6b74ba42e52b4014d580e1eb9cbd9d94de7e4aad16d2f9be02d805f0b5e532f927a1ffcacea1777f122a8105b164a7c25faf323a5d9f1f1fd600e1e5bec59e2d4b5c7ef5209d0ad17b8b31864e57c0b3e0815ac3ee33253ab664a770ff5185d1a1cb8d2267d3e58aa1dc7d2508cbe597d0e74fdd269aaaf0f52d414c4ea3e9762c996869e42560d7a72e41c4799a2586e74f95e8d8151481fa86efbe7b3398ac58b1a2b8527589f15451ad303ac2293542ad6648a796278f13a27185e4c4754310facb98c53a79e19a3fdc1426ff28c3d7399d1f7cb25343eb96106cf83c790ce9c4f2eb831855c55485663327992eb6dc8a6259874ed700b0b793323cccb9ffa842b30d6133e3e75fea989ac15a8b16ca76b746b0b92278d919774c5b6d48a78697fb29bbcf52468742a32120909c24e899ce67beed5be2db01e22d1e9485bb620e47f9ee9e606a21bd3f5d3744c7e7c54d55e87443867d8b554515ac5db4620e8e4f62263170fd1cdee90aad7640141992891b0f367c9adfe4049bb07d3b7022bd8c687c0978f46684ee084150b65ac1fcca94591b7a90a496e4c095164fb016a2b192a497795cc0f84817aebe25f7bf70ccc54a575c555c03f78ffa5fc0570d1f0c076bff0232285a09283782c80000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpmarginwidget.h</includehint> </includehints> |