diff options
Diffstat (limited to 'kpresenter/KPrView.cpp')
-rw-r--r-- | kpresenter/KPrView.cpp | 168 |
1 files changed, 84 insertions, 84 deletions
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 9958ac13..a86caa80 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -26,12 +26,12 @@ #include <tqpopupmenu.h> #include <tqcursor.h> #include <tqfileinfo.h> -#include <textstream.h> +#include <tqtextstream.h> #include <assert.h> #include <tqtoolbutton.h> #include <tqtooltip.h> #include <tqdir.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqradiobutton.h> #include <tqdragobject.h> #include <tqfile.h> @@ -410,23 +410,23 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) if ( sb ) // No statusbar in e.g. konqueror { m_sbPageLabel = new KStatusBarLabel( TQString(), 0, sb ); - m_sbPageLabel->setAlignment( AlignLeft | AlignVCenter ); + 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( TQString(), 0, sb ); - m_sbObjectLabel->setAlignment( AlignLeft | AlignVCenter ); + m_sbObjectLabel->tqsetAlignment( AlignLeft | AlignVCenter ); addStatusBarItem( m_sbObjectLabel, 1 ); m_sbZoomLabel = new KStatusBarLabel( ' ' + TQString::number( m_pKPresenterDoc->zoomHandler()->zoom() ) + "% ", 0, sb ); - m_sbZoomLabel->setAlignment( AlignHCenter | AlignVCenter ); + 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", TQString::number(layout.ptTop) ); - prt.setOption( "kde-margin-bottom", TQString::number(layout.ptBottom) ); - prt.setOption( "kde-margin-left", TQString::number(layout.ptLeft) ); - prt.setOption( "kde-margin-right", TQString::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 ) @@ -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(TQDateTime::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(); - TQMimeSource *data = TQApplication::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,7 +644,7 @@ 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); @@ -846,7 +846,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture) 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 TQString& 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") ); } } @@ -1274,7 +1274,7 @@ void KPrView::extraShadow() if ( !shadowDia ) { shadowDia = new KPrShadowDialogImpl( this ); - shadowDia->resize( shadowDia->minimumSize() ); + shadowDia->resize( shadowDia->tqminimumSize() ); connect( shadowDia, TQT_SIGNAL( apply() ), TQT_TQOBJECT(this), TQT_SLOT( shadowOk() ) ); } @@ -1509,7 +1509,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) KProcess proc; proc << xdgScreenSaver; proc << "suspend"; - proc << TQString::number( topLevelWidget()->winId() ); + proc << TQString::number( tqtopLevelWidget()->winId() ); kdDebug() << k_funcinfo << proc.args() << endl; proc.start( KProcess::DontCare ); } else { @@ -1580,7 +1580,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) if ( !kPresenterDoc()->spManualSwitch() ) { m_autoPresStop = false; - m_pKPresenterDoc->repaint( false ); + m_pKPresenterDoc->tqrepaint( false ); if ( ! m_autoPresTimerConnected ) { connect( &m_autoPresTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( doAutomaticScreenPres() ) ); @@ -1633,7 +1633,7 @@ void KPrView::screenStop() KProcess proc; proc << xdgScreenSaver; proc << "resume"; - proc << TQString::number( topLevelWidget()->winId() ); + proc << TQString::number( tqtopLevelWidget()->winId() ); kdDebug() << k_funcinfo << proc.args() << endl; proc.start( KProcess::DontCare ); } else { @@ -1856,7 +1856,7 @@ void KPrView::slotApplyFont() void KPrView::slotCounterStyleSelected() { - TQString actionName = TQString::fromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + TQString actionName = TQString::tqfromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); if ( actionName.startsWith( "counterstyle_" ) ) { TQString styleStr = actionName.mid(13); @@ -2175,7 +2175,7 @@ void KPrView::createGUI() // setup page pageBase = new PageBase( splitterVertical, this ); - pageBase->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + pageBase->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); m_canvas=new KPrCanvas( pageBase, "Canvas", this ); @@ -2414,7 +2414,7 @@ void KPrView::setupActions() actionToolsZoom->setExclusiveGroup( "tools" ); actionToolsShapePopup = new KActionMenu( i18n( "&Shape" ), "rectangle", - actionCollection(), "tools_shapepopup" ); + actionCollection(), "tools_tqshapepopup" ); actionToolsShapePopup->setDelayed(true); connect(actionToolsShapePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsShapePopup())); @@ -2597,7 +2597,7 @@ void KPrView::setupActions() // This approach allows to edit toolbars and extract separate actions from this menu KToggleAction* act = new KToggleAction( styleIt.current()->name(), /*TODO icon,*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ), - actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() ); + 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 ) { @@ -3096,19 +3096,19 @@ void KPrView::setupActions() actionAlignVerticalTop = new KToggleAction( i18n( "Align Top" ), 0, 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, TQT_TQOBJECT(this), TQT_SLOT( alignVerticalBottom() ), actionCollection(), "align_bottom" ); - actionAlignVerticalBottom->setExclusiveGroup( "vertical_alignment" ); + actionAlignVerticalBottom->setExclusiveGroup( "vertical_tqalignment" ); actionAlignVerticalCenter = new KToggleAction( i18n( "Align Middle" ), 0, TQT_TQOBJECT(this), TQT_SLOT( alignVerticalCenter() ), actionCollection(), "align_center" ); - actionAlignVerticalCenter->setExclusiveGroup( "vertical_alignment" ); + actionAlignVerticalCenter->setExclusiveGroup( "vertical_tqalignment" ); actionSavePicture= new KAction( i18n("Save Picture..."), 0, @@ -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 ) @@ -3552,8 +3552,8 @@ void PageBase::resizeEvent( TQResizeEvent *e ) 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 ); @@ -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); @@ -3778,8 +3778,8 @@ 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 ); @@ -3847,7 +3847,7 @@ void KPrView::skipToPage( int num ) //(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 ); } @@ -4102,7 +4102,7 @@ void KPrView::updatePageInfo() { if (m_sbPageLabel) m_sbPageLabel->setText( TQString(" ") + - i18n("Slide %1/%2").arg(getCurrPgNum()).arg(m_pKPresenterDoc->getPageNums())+ + i18n("Slide %1/%2").tqarg(getCurrPgNum()).tqarg(m_pKPresenterDoc->getPageNums())+ TQString(" ") ); } @@ -4120,13 +4120,13 @@ void KPrView::updateObjectStatusBarItem() 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) ); @@ -4206,7 +4206,7 @@ void KPrView::setEditMaster( bool editMaster ) if ( sidebar ) sidebar->setViewMasterPage( m_editMaster ); updateNoteBarText(); - m_canvas->repaint( false ); + m_canvas->tqrepaint( false ); } } @@ -4675,7 +4675,7 @@ void KPrView::spellCheckerMisspelling( const TQString &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 TQString &old, int pos, const TQString &corr ) @@ -4694,7 +4694,7 @@ void KPrView::spellCheckerCorrected( const TQString &old, int pos, const TQStrin 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 ); @@ -4881,7 +4881,7 @@ void KPrView::refreshCustomMenu() if ( !lst.contains( varName) ) { lst.append( varName ); - TQCString name = TQString("custom-action_%1").arg(i).latin1(); + TQCString name = TQString("custom-action_%1").tqarg(i).latin1(); act = new KAction( varName, shortCuts[varName], TQT_TQOBJECT(this), TQT_SLOT( insertCustomVariable() ), actionCollection(), name ); @@ -4896,7 +4896,7 @@ void KPrView::refreshCustomMenu() actionInsertCustom->popupMenu()->insertSeparator(); act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(), - TQString("custom-action_%1").arg(i).latin1() ); + TQString("custom-action_%1").tqarg(i).latin1() ); act->setGroup( "custom-variable-action" ); actionInsertCustom->insert( act ); @@ -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(); } } } @@ -5244,22 +5244,22 @@ void KPrView::changeZoomMenu( int zoom ) qHeapSort( list ); for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it) - lst.append( i18n("%1%").arg(*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 ); } @@ -5267,7 +5267,7 @@ void KPrView::changeZoomMenu( int zoom ) void KPrView::showZoom( int zoom ) { TQStringList list = actionViewZoom->items(); - TQString zoomStr( i18n("%1%").arg( zoom ) ); + TQString zoomStr( i18n("%1%").tqarg( zoom ) ); int pos = list.findIndex(zoomStr); if( pos == -1) { @@ -5315,7 +5315,7 @@ void KPrView::viewZoom( const TQString &s ) } m_canvas->setFocus(); - m_canvas->repaint(); + m_canvas->tqrepaint(); } void KPrView::setZoomRect( const KoRect & rect ) @@ -5331,7 +5331,7 @@ void KPrView::setZoomRect( const KoRect & rect ) 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 ) @@ -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 ) @@ -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(); } } } @@ -5889,7 +5889,7 @@ void KPrView::slotObjectEditChanged() KoParagCounter counter; if(paragLayout->counter) counter = *(paragLayout->counter); - int align = paragLayout->alignment; + int align = paragLayout->tqalignment; if ( align == TQt::AlignAuto ) align = TQt::AlignLeft; // ## seems hard to detect RTL here alignChanged( align ); @@ -5964,11 +5964,11 @@ void KPrView::duplicateObj() m_canvas->copyObjs(); m_canvas->setToolEditMode( TEM_MOUSE ); deSelectAllObjects(); - TQMimeSource *data = TQApplication::clipboard()->data(); + 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(); @@ -6224,7 +6224,7 @@ void KPrView::updateRulerInProtectContentMode() getHRuler()->changeFlags(KoRuler::F_INDENTS | KoRuler::F_TABS); else getHRuler()->changeFlags(0); - getHRuler()->repaint(); + getHRuler()->tqrepaint(); } } |