diff options
Diffstat (limited to 'kpresenter/KPrView.cpp')
| -rw-r--r-- | kpresenter/KPrView.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index a2781ca1..af3905ba 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -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 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; + 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; prt.setPageSize( static_cast<KPrinter::PageSize>( KoPageFormat::printerPageSize( pageFormat ) ) ); if ( m_pKPresenterDoc->pageLayout().orientation == PG_LANDSCAPE || pageFormat == PG_SCREEN ) @@ -620,7 +620,7 @@ void KPrView::editPaste() if ( !m_canvas->currentTextObjectView() ) { m_canvas->setToolEditMode( TEM_MOUSE ); deSelectAllObjects(); - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); if ( data->provides( "text/uri-list" ) ) { m_pKPresenterDoc->pastePage( data, currPg ); @@ -5360,7 +5360,7 @@ KoTextZoomHandler *KPrView::zoomHandler() const void KPrView::slotViewFormattingChars() { m_pKPresenterDoc->setViewFormattingChars(actionViewFormattingChars->isChecked()); - m_pKPresenterDoc->tqlayout(); // Due to the different formatting when this option is activated + m_pKPresenterDoc->layout(); // Due to the different formatting when this option is activated m_pKPresenterDoc->repaint(false); } @@ -5964,7 +5964,7 @@ void KPrView::duplicateObj() m_canvas->copyObjs(); m_canvas->setToolEditMode( TEM_MOUSE ); deSelectAllObjects(); - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); TQCString clip_str = KoStoreDrag::mimeType("application/x-kpresenter"); if ( data->provides( clip_str ) ) { |