summaryrefslogtreecommitdiffstats
path: root/kpresenter
diff options
context:
space:
mode:
Diffstat (limited to 'kpresenter')
-rw-r--r--kpresenter/KPrBackground.cpp2
-rw-r--r--kpresenter/KPrCanvas.cpp10
-rw-r--r--kpresenter/KPrCommand.cpp2
-rw-r--r--kpresenter/KPrDocument.cpp8
-rw-r--r--kpresenter/KPrPage.cpp8
-rw-r--r--kpresenter/KPrPixmapObject.cpp2
-rw-r--r--kpresenter/KPrSlideTransitionDia.cpp2
-rw-r--r--kpresenter/KPrTextObject.cpp2
-rw-r--r--kpresenter/KPrTransEffectDia.cpp2
-rw-r--r--kpresenter/KPrView.cpp4
10 files changed, 21 insertions, 21 deletions
diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp
index f446ed703..1f8281acf 100644
--- a/kpresenter/KPrBackground.cpp
+++ b/kpresenter/KPrBackground.cpp
@@ -452,7 +452,7 @@ void KPrBackGround::load( const TQDomElement &element )
TQByteArray rawData=_data.utf8(); // XPM is normally ASCII, therefore UTF-8
rawData[rawData.size()-1]=char(10); // Replace the NULL character by a LINE FEED
TQBuffer buffer(rawData);
- backPicture.loadXpm(TQT_TQIODEVICE(&buffer));
+ backPicture.loadXpm(&buffer);
}
#if 0
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index 245d83f26..05c9923bb 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -291,7 +291,7 @@ void KPrCanvas::paintEvent( TQPaintEvent* paintEvent )
{
//kdDebug(33001) << "KPrCanvas::paintEvent" << endl;
TQPainter bufPainter;
- bufPainter.begin( TQT_TQPAINTDEVICE(&buffer), this ); // double-buffering - (the buffer is as big as the widget)
+ bufPainter.begin( &buffer, this ); // double-buffering - (the buffer is as big as the widget)
bufPainter.translate( -diffx(), -diffy() );
bufPainter.setBrushOrigin( -diffx(), -diffy() );
@@ -3107,7 +3107,7 @@ bool KPrCanvas::pNext( bool gotoNextPage )
if ( m_pageEffect )
finishPageEffect();
- m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(this), _pix2, _pageEffect, page->getPageEffectSpeed() );
+ m_pageEffect = new KPrPageEffects( this, _pix2, _pageEffect, page->getPageEffectSpeed() );
if ( m_pageEffect->doEffect() )
{
delete m_pageEffect;
@@ -3438,7 +3438,7 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted )
}
//TODO add global presentation speed
- m_effectHandler = new KPrEffectHandler( m_step, goingBack, TQT_TQPAINTDEVICE(this), &screen_orig, allObjects, m_view, 1 );
+ m_effectHandler = new KPrEffectHandler( m_step, goingBack, this, &screen_orig, allObjects, m_view, 1 );
if ( m_effectHandler->doEffect() )
{
delete m_effectHandler;
@@ -4141,7 +4141,7 @@ void KPrCanvas::copyOasisObjs()
TQDragObject* dragObject = kd;
TQByteArray arr;
TQBuffer buffer(arr);
- KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Write, "application/vnd.oasis.opendocument.presentation" );
+ KoStore* store = KoStore::createStore( &buffer, KoStore::Write, "application/vnd.oasis.opendocument.presentation" );
delete store;
kd->setEncodedData( arr );
@@ -4163,7 +4163,7 @@ void KPrCanvas::copyObjs()
TQDragObject* dragObject = kd;
TQByteArray arr;
TQBuffer buffer(arr);
- KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Write, "application/x-kpresenter" );
+ KoStore* store = KoStore::createStore( &buffer, KoStore::Write, "application/x-kpresenter" );
m_activePage->getAllEmbeddedObjectSelected(embeddedObjectsActivePage );
diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp
index b5558afa8..ff59aa82e 100644
--- a/kpresenter/KPrCommand.cpp
+++ b/kpresenter/KPrCommand.cpp
@@ -1895,7 +1895,7 @@ KoTextCursor * KPrOasisPasteTextCommand::execute( KoTextCursor *c )
c->setIndex( m_idx );
TQBuffer buffer( m_data );
- KoStore * store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read );
+ KoStore * store = KoStore::createStore( &buffer, KoStore::Read );
if ( store->bad() || !store->hasFile( "content.xml" ) )
{
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index 913cff97d..ed6a32f66 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -1019,14 +1019,14 @@ bool KPrDocument::saveOasis( KoStore* store, KoXmlWriter* manifestWriter )
KTempFile contentTmpFile;
contentTmpFile.setAutoDelete( true );
TQFile* tmpFile = contentTmpFile.file();
- KoXmlWriter contentTmpWriter( TQT_TQIODEVICE(tmpFile), 1 );
+ KoXmlWriter contentTmpWriter( tmpFile, 1 );
//For sticky objects
KTempFile stickyTmpFile;
stickyTmpFile.setAutoDelete( true );
TQFile* masterStyles = stickyTmpFile.file();
- KoXmlWriter stickyTmpWriter( TQT_TQIODEVICE(masterStyles), 1 );
+ KoXmlWriter stickyTmpWriter( masterStyles, 1 );
contentTmpWriter.startElement( "office:body" );
@@ -1083,7 +1083,7 @@ bool KPrDocument::saveOasis( KoStore* store, KoXmlWriter* manifestWriter )
// And now we can copy over the contents from the tempfile to the real one
tmpFile->close();
- contentWriter->addCompleteElement( TQT_TQIODEVICE(tmpFile) );
+ contentWriter->addCompleteElement( tmpFile );
contentTmpFile.close();
contentWriter->endElement(); // root element
@@ -1552,7 +1552,7 @@ void KPrDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyl
if ( masterStyles )
{
stylesWriter->startElement( "office:master-styles" );
- stylesWriter->addCompleteElement( TQT_TQIODEVICE(masterStyles) );
+ stylesWriter->addCompleteElement( masterStyles );
stylesWriter->endElement();
}
}
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp
index 57627b99c..1e915d408 100644
--- a/kpresenter/KPrPage.cpp
+++ b/kpresenter/KPrPage.cpp
@@ -130,7 +130,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC
KTempFile animationTmpFile;
animationTmpFile.setAutoDelete( true );
TQFile* tmpFile = animationTmpFile.file();
- KoXmlWriter animationTmpWriter( TQT_TQIODEVICE(tmpFile) );
+ KoXmlWriter animationTmpWriter( tmpFile );
lstMap listObjectAnimation;
TQPtrListIterator<KPrObject> it( m_objectList );
for ( ; it.current() ; ++it )
@@ -228,7 +228,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC
}
animationTmpWriter.endElement();//close "presentation:animations"
tmpFile->close();
- xmlWriter.addCompleteElement( TQT_TQIODEVICE(tmpFile) );
+ xmlWriter.addCompleteElement( tmpFile );
}
else
@@ -626,7 +626,7 @@ TQString KPrPage::saveOasisPageStyle( KoStore *, KoGenStyles& mainStyles ) const
{
TQBuffer buffer;
buffer.open( IO_WriteOnly );
- KoXmlWriter elementWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level
+ KoXmlWriter elementWriter( &buffer ); // TODO pass indentation level
elementWriter.startElement( "presentation:sound" );
elementWriter.addAttribute( "xlink:href", m_soundFileName );
elementWriter.addAttribute( "xlink:type", "simple" );
@@ -1006,7 +1006,7 @@ void KPrPage::pasteObjs( const TQByteArray & data,int nbCopy, double angle,
if ( !data.size() )
return;
TQBuffer buffer( data );
- KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read );
+ KoStore* store = KoStore::createStore( &buffer, KoStore::Read );
int nbNewObject = -1 ;
KMacroCommand *macro = 0L;
if ( !store->bad() )
diff --git a/kpresenter/KPrPixmapObject.cpp b/kpresenter/KPrPixmapObject.cpp
index 09dcb7895..155fe47c7 100644
--- a/kpresenter/KPrPixmapObject.cpp
+++ b/kpresenter/KPrPixmapObject.cpp
@@ -435,7 +435,7 @@ double KPrPixmapObject::load(const TQDomElement &element)
TQByteArray rawData=_data.utf8(); // XPM is normally ASCII, therefore UTF-8
rawData[rawData.size()-1]=char(10); // Replace the NULL character by a LINE FEED
TQBuffer buffer(rawData); // ### TODO: open?
- image.loadXpm(TQT_TQIODEVICE(&buffer));
+ image.loadXpm(&buffer);
}
}
}
diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp
index c8076af2d..fe8a132ab 100644
--- a/kpresenter/KPrSlideTransitionDia.cpp
+++ b/kpresenter/KPrSlideTransitionDia.cpp
@@ -200,7 +200,7 @@ void KPrSlideTransitionDia::preview()
m_dialog->previewPixmap->repaint();
}
- m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(m_dialog->previewPixmap), m_target, effect, effectSpeed );
+ m_pageEffect = new KPrPageEffects( m_dialog->previewPixmap, m_target, effect, effectSpeed );
if ( m_pageEffect->doEffect() )
{
delete m_pageEffect;
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index 874e781bc..6a7f44404 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -2368,7 +2368,7 @@ TQDragObject * KPrTextView::newDrag( TQWidget * parent )
{
TQBuffer buffer;
const TQCString mimeType = "application/vnd.oasis.opendocument.text";
- KoStore * store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Write, mimeType );
+ KoStore * store = KoStore::createStore( &buffer, KoStore::Write, mimeType );
Q_ASSERT( store );
Q_ASSERT( !store->bad() );
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index 7d5c4eaed..d409f6206 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -108,7 +108,7 @@ void KPrEffectPreview::run( PageEffect effect, EffectSpeed speed )
TQLabel::repaint();
}
- m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(this), m_target, effect, speed );
+ m_pageEffect = new KPrPageEffects( this, m_target, effect, speed );
if ( m_pageEffect->doEffect() )
{
delete m_pageEffect;
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index dc7464323..88d54ad66 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -822,7 +822,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture)
TQFile file( url.path() );
if ( file.open( IO_ReadWrite ) )
{
- picture.save( TQT_TQIODEVICE(&file) );
+ picture.save( &file );
file.close();
}
else
@@ -841,7 +841,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture)
TQFile file( tempFile.name() );
if ( file.open( IO_ReadWrite ) )
{
- picture.save( TQT_TQIODEVICE(&file) );
+ picture.save( &file );
file.close();
if ( !TDEIO::NetAccess::upload( tempFile.name(), url, this ) )
{