diff options
Diffstat (limited to 'kpresenter/KPrView.cpp')
| -rw-r--r-- | kpresenter/KPrView.cpp | 1590 |
1 files changed, 795 insertions, 795 deletions
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; |