diff options
Diffstat (limited to 'karbon/karbon_view.cc')
| -rw-r--r-- | karbon/karbon_view.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc index 33340690..f76dd156 100644 --- a/karbon/karbon_view.cc +++ b/karbon/karbon_view.cc @@ -22,7 +22,7 @@ #include <tqdragobject.h> #include <tqiconset.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqpopupmenu.h> #include <tqpaintdevicemetrics.h> #include <tqpainter.h> @@ -119,20 +119,20 @@ KarbonView::KarbonView( KarbonPart* p, TQWidget* parent, const char* name ) setClientBuilder( this ); if( !p->isReadWrite() ) - setXMLFile( TQString::tqfromLatin1( "karbon_readonly.rc" ) ); + setXMLFile( TQString::fromLatin1( "karbon_readonly.rc" ) ); else - setXMLFile( TQString::tqfromLatin1( "karbon.rc" ) ); + setXMLFile( TQString::fromLatin1( "karbon.rc" ) ); m_dcop = 0L; dcopObject(); // build it // set up status bar message m_status = new KStatusBarLabel( TQString(), 0, statusBar() ); - m_status->tqsetAlignment( AlignLeft | AlignVCenter ); + m_status->setAlignment( AlignLeft | AlignVCenter ); m_status->setMinimumWidth( 300 ); addStatusBarItem( m_status, 1 ); m_cursorCoords = new KStatusBarLabel( TQString(), 0, statusBar() ); - m_cursorCoords->tqsetAlignment( AlignLeft | AlignVCenter ); + m_cursorCoords->setAlignment( AlignLeft | AlignVCenter ); m_cursorCoords->setMinimumWidth( 50 ); addStatusBarItem( m_cursorCoords, 0 ); m_smallPreview = new VSmallPreview( this, name ); @@ -462,7 +462,7 @@ KarbonView::fileImportGraphic() else { KoFilterManager man( part() ); - KoFilter::ConversiontqStatus status; + KoFilter::ConversionStatus status; TQString importedFile = man.import( fname, status ); part()->mergeNativeFormat( importedFile ); if( !importedFile.isEmpty() ) @@ -494,7 +494,7 @@ KarbonView::addSelectionToClipboard() const KarbonDrag* kd = new KarbonDrag(); kd->setObjectList( part()->document().selection()->objects() ); - TQApplication::tqclipboard()->setData( kd ); + TQApplication::clipboard()->setData( kd ); } void @@ -503,7 +503,7 @@ KarbonView::editPaste() KarbonDrag kd; VObjectList objects; - if( !kd.decode( TQApplication::tqclipboard()->data(), objects, part()->document() ) ) + if( !kd.decode( TQApplication::clipboard()->data(), objects, part()->document() ) ) return; // Paste with a small offset. @@ -769,7 +769,7 @@ KarbonView::viewModeChanged() void KarbonView::setZoomAt( double zoom, const KoPoint &p ) { - TQString zoomText = TQString( "%1%" ).tqarg( zoom * 100.0, 0, 'f', 2 ); + TQString zoomText = TQString( "%1%" ).arg( zoom * 100.0, 0, 'f', 2 ); TQStringList stl = m_zoomAction->items(); if( stl.first() == "25%" ) { @@ -1171,7 +1171,7 @@ KarbonView::mouseEvent( TQMouseEvent* event, const KoPoint &p ) xy.setX(KoUnit::toUserValue(xy.x(), part()->unit())); xy.setY(KoUnit::toUserValue(xy.y(), part()->unit())); - m_cursorCoords->setText( TQString( "%1, %2" ).tqarg(KGlobal::_locale->formatNumber(xy.x(), 2)).tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)) ); + m_cursorCoords->setText( TQString( "%1, %2" ).arg(KGlobal::_locale->formatNumber(xy.x(), 2)).arg(KGlobal::_locale->formatNumber(xy.y(), 2)) ); if( toolController() ) return toolController()->mouseEvent( event, p ); @@ -1310,11 +1310,11 @@ void KarbonView::pageLayout() { KoHeadFoot hf; - KoPageLayout tqlayout = part()->pageLayout(); + KoPageLayout layout = part()->pageLayout(); KoUnit::Unit unit = part()->unit(); - if( KoPageLayoutDia::pageLayout( tqlayout, hf, FORMAT_AND_BORDERS | DISABLE_UNIT, unit ) ) + if( KoPageLayoutDia::pageLayout( layout, hf, FORMAT_AND_BORDERS | DISABLE_UNIT, unit ) ) { - part()->setPageLayout( tqlayout, unit ); + part()->setPageLayout( layout, unit ); m_horizRuler->setUnit( unit ); m_vertRuler->setUnit( unit ); m_canvas->resizeContents( int( ( part()->pageLayout().ptWidth + 300 ) * zoom() ), @@ -1444,9 +1444,9 @@ KarbonView::repaintAll( const KoRect &r ) } void -KarbonView::repaintAll( bool tqrepaint ) +KarbonView::repaintAll( bool repaint ) { - m_canvas->repaintAll( tqrepaint ); + m_canvas->repaintAll( repaint ); } void KarbonView::setPos( const KoPoint& p ) |