summaryrefslogtreecommitdiffstats
path: root/lib/kofficecore
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kofficecore')
-rw-r--r--lib/kofficecore/KoDocument.cpp4
-rw-r--r--lib/kofficecore/KoFilter.cpp2
-rw-r--r--lib/kofficecore/KoOasisStore.cpp8
-rw-r--r--lib/kofficecore/KoOasisStyles.cpp16
-rw-r--r--lib/kofficecore/KoPictureBase.cpp2
-rw-r--r--lib/kofficecore/KoPictureShared.cpp12
-rw-r--r--lib/kofficecore/KoPictureWmf.cpp2
7 files changed, 23 insertions, 23 deletions
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 4c3854fe..99bd8459 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -978,7 +978,7 @@ bool KoDocument::saveNativeFormat( const TQString & file )
TQFile f( file );
if ( f.open( IO_WriteOnly | IO_Translate ) )
{
- bool success = saveToStream( TQT_TQIODEVICE(&f) );
+ bool success = saveToStream( &f );
f.close();
return success;
}
@@ -1727,7 +1727,7 @@ bool KoDocument::loadNativeFormat( const TQString & file )
bool res;
if ( doc.setContent( &in, true, &errorMsg, &errorLine, &errorColumn ) )
{
- res = loadXML( TQT_TQIODEVICE(&in), doc );
+ res = loadXML( &in, doc );
if ( res )
res = completeLoading( 0L );
}
diff --git a/lib/kofficecore/KoFilter.cpp b/lib/kofficecore/KoFilter.cpp
index 68953b40..2ded98fa 100644
--- a/lib/kofficecore/KoFilter.cpp
+++ b/lib/kofficecore/KoFilter.cpp
@@ -71,7 +71,7 @@ int KoEmbeddingFilter::embedPart( const TQCString& from, TQCString& to,
KTempFile tempIn;
tempIn.setAutoDelete( true );
- savePartContents( TQT_TQIODEVICE(tempIn.file()) );
+ savePartContents( tempIn.file() );
tempIn.file()->close();
KoFilterManager *manager = new KoFilterManager( tempIn.name(), from, m_chain );
diff --git a/lib/kofficecore/KoOasisStore.cpp b/lib/kofficecore/KoOasisStore.cpp
index c170297e..235d5f76 100644
--- a/lib/kofficecore/KoOasisStore.cpp
+++ b/lib/kofficecore/KoOasisStore.cpp
@@ -78,7 +78,7 @@ KoXmlWriter* KoOasisStore::bodyWriter()
Q_ASSERT( !m_contentTmpFile );
m_contentTmpFile = new KTempFile;
m_contentTmpFile->setAutoDelete( true );
- m_bodyWriter = new KoXmlWriter( TQT_TQIODEVICE(m_contentTmpFile->file()), 1 );
+ m_bodyWriter = new KoXmlWriter( m_contentTmpFile->file(), 1 );
}
return m_bodyWriter;
}
@@ -92,7 +92,7 @@ bool KoOasisStore::closeContentWriter()
// copy over the contents from the tempfile to the real one
TQFile* tmpFile = m_contentTmpFile->file();
tmpFile->close();
- m_contentWriter->addCompleteElement( TQT_TQIODEVICE(tmpFile) );
+ m_contentWriter->addCompleteElement( tmpFile );
m_contentTmpFile->close();
delete m_contentTmpFile; m_contentTmpFile = 0;
@@ -113,7 +113,7 @@ KoXmlWriter* KoOasisStore::manifestWriter( const char* mimeType )
// the pointer to the buffer is already stored in the KoXmlWriter, no need to store it here as well
TQBuffer *manifestBuffer = new TQBuffer;
manifestBuffer->open( IO_WriteOnly );
- m_manifestWriter = new KoXmlWriter( TQT_TQIODEVICE(manifestBuffer) );
+ m_manifestWriter = new KoXmlWriter( manifestBuffer );
m_manifestWriter->startDocument( "manifest:manifest" );
m_manifestWriter->startElement( "manifest:manifest" );
m_manifestWriter->addAttribute( "xmlns:manifest", KoXmlNS::manifest );
@@ -126,7 +126,7 @@ bool KoOasisStore::closeManifestWriter()
{
m_manifestWriter->endElement();
m_manifestWriter->endDocument();
- TQBuffer* buffer = TQT_TQBUFFER( static_cast<TQIODevice*>(m_manifestWriter->device()) );
+ TQBuffer* buffer = static_cast<TQBuffer*>(m_manifestWriter->device());
delete m_manifestWriter; m_manifestWriter = 0;
bool ok = false;
if ( m_store->open( "META-INF/manifest.xml" ) )
diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp
index a5d34c0b..db003c3e 100644
--- a/lib/kofficecore/KoOasisStyles.cpp
+++ b/lib/kofficecore/KoOasisStyles.cpp
@@ -664,7 +664,7 @@ TQString KoOasisStyles::saveOasisTimeStyle( KoGenStyles &mainStyles, const TQStr
KoGenStyle currentStyle( KoGenStyle::STYLE_NUMERIC_TIME );
TQBuffer buffer;
buffer.open( IO_WriteOnly );
- KoXmlWriter elementWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level
+ KoXmlWriter elementWriter( &buffer ); // TODO pass indentation level
TQString text;
if ( klocaleFormat )
{
@@ -819,7 +819,7 @@ TQString KoOasisStyles::saveOasisDateStyle( KoGenStyles &mainStyles, const TQStr
KoGenStyle currentStyle( KoGenStyle::STYLE_NUMERIC_DATE );
TQBuffer buffer;
buffer.open( IO_WriteOnly );
- KoXmlWriter elementWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level
+ KoXmlWriter elementWriter( &buffer ); // TODO pass indentation level
TQString text;
if ( klocaleFormat )
{
@@ -993,7 +993,7 @@ TQString KoOasisStyles::saveOasisFractionStyle( KoGenStyles &mainStyles, const T
KoGenStyle currentStyle( KoGenStyle::STYLE_NUMERIC_FRACTION );
TQBuffer buffer;
buffer.open( IO_WriteOnly );
- KoXmlWriter elementWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level
+ KoXmlWriter elementWriter( &buffer ); // TODO pass indentation level
TQString text;
int integer = 0;
int numerator = 0;
@@ -1057,7 +1057,7 @@ TQString KoOasisStyles::saveOasisNumberStyle( KoGenStyles &mainStyles, const TQS
KoGenStyle currentStyle( KoGenStyle::STYLE_NUMERIC_NUMBER );
TQBuffer buffer;
buffer.open( IO_WriteOnly );
- KoXmlWriter elementWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level
+ KoXmlWriter elementWriter( &buffer ); // TODO pass indentation level
TQString text;
int decimalplaces = 0;
int integerdigits = 0;
@@ -1106,7 +1106,7 @@ TQString KoOasisStyles::saveOasisPercentageStyle( KoGenStyles &mainStyles, const
KoGenStyle currentStyle( KoGenStyle::STYLE_NUMERIC_PERCENTAGE );
TQBuffer buffer;
buffer.open( IO_WriteOnly );
- KoXmlWriter elementWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level
+ KoXmlWriter elementWriter( &buffer ); // TODO pass indentation level
TQString text;
int decimalplaces = 0;
int integerdigits = 0;
@@ -1160,7 +1160,7 @@ TQString KoOasisStyles::saveOasisScientificStyle( KoGenStyles &mainStyles, const
int decimalplace = 0;
int integerdigits = 0;
int exponentdigits = 0;
- KoXmlWriter elementWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level
+ KoXmlWriter elementWriter( &buffer ); // TODO pass indentation level
TQString text;
bool beforeSeparator = true;
bool exponential = false;
@@ -1236,7 +1236,7 @@ TQString KoOasisStyles::saveOasisCurrencyStyle( KoGenStyles &mainStyles,
KoGenStyle currentStyle( KoGenStyle::STYLE_NUMERIC_CURRENCY );
TQBuffer buffer;
buffer.open( IO_WriteOnly );
- KoXmlWriter elementWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level
+ KoXmlWriter elementWriter( &buffer ); // TODO pass indentation level
TQString text;
int decimalplaces = 0;
int integerdigits = 0;
@@ -1292,7 +1292,7 @@ TQString KoOasisStyles::saveOasisTextStyle( KoGenStyles &mainStyles, const TQStr
KoGenStyle currentStyle( KoGenStyle::STYLE_NUMERIC_TEXT );
TQBuffer buffer;
buffer.open( IO_WriteOnly );
- KoXmlWriter elementWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level
+ KoXmlWriter elementWriter( &buffer ); // TODO pass indentation level
TQString text;
do
{
diff --git a/lib/kofficecore/KoPictureBase.cpp b/lib/kofficecore/KoPictureBase.cpp
index 101c946c..33437070 100644
--- a/lib/kofficecore/KoPictureBase.cpp
+++ b/lib/kofficecore/KoPictureBase.cpp
@@ -95,7 +95,7 @@ bool KoPictureBase::saveAsBase64( KoXmlWriter& writer ) const
{
TQBuffer buffer;
buffer.open(IO_ReadWrite);
- if ( !save( TQT_TQIODEVICE(&buffer) ) )
+ if ( !save( &buffer ) )
return false;
TQCString encoded = KCodecs::base64Encode( buffer.buffer() );
writer.addTextNode( encoded );
diff --git a/lib/kofficecore/KoPictureShared.cpp b/lib/kofficecore/KoPictureShared.cpp
index 57d95f65..996df9ed 100644
--- a/lib/kofficecore/KoPictureShared.cpp
+++ b/lib/kofficecore/KoPictureShared.cpp
@@ -208,7 +208,7 @@ bool KoPictureShared::identifyAndLoad( TQByteArray array )
TQBuffer buffer(array);
buffer.open(IO_ReadOnly);
- const bool flag = loadCompressed( TQT_TQIODEVICE(&buffer), "application/x-gzip", "tmp" );
+ const bool flag = loadCompressed( &buffer, "application/x-gzip", "tmp" );
buffer.close();
return flag;
}
@@ -217,7 +217,7 @@ bool KoPictureShared::identifyAndLoad( TQByteArray array )
// BZip2
TQBuffer buffer(array);
buffer.open(IO_ReadOnly);
- const bool flag = loadCompressed( TQT_TQIODEVICE(&buffer), "application/x-bzip2", "tmp" );
+ const bool flag = loadCompressed( &buffer, "application/x-bzip2", "tmp" );
buffer.close();
return flag;
}
@@ -252,7 +252,7 @@ bool KoPictureShared::identifyAndLoad( TQByteArray array )
return false;
}
- imageIO.setIODevice(TQT_TQIODEVICE(&buf));
+ imageIO.setIODevice(&buf);
imageIO.setFormat("PNG");
if (!imageIO.write())
@@ -309,7 +309,7 @@ bool KoPictureShared::loadXpm(TQIODevice* io)
m_base=new KoPictureImage();
TQBuffer buffer(array);
- bool check = m_base->load(TQT_TQIODEVICE(&buffer),"xpm");
+ bool check = m_base->load(&buffer,"xpm");
setExtension("xpm");
return check;
}
@@ -441,13 +441,13 @@ bool KoPictureShared::loadFromFile(const TQString& fileName)
{
kdDebug(30003) << "File with no extension!" << endl;
// As we have no extension, consider it like a temporary file
- flag = loadTmp( TQT_TQIODEVICE(&file) );
+ flag = loadTmp( &file );
}
else
{
const TQString extension( fileName.mid( pos+1 ) );
// ### TODO: check if the extension if gz or bz2 and find the previous extension
- flag = load( TQT_TQIODEVICE(&file), extension );
+ flag = load( &file, extension );
}
file.close();
return flag;
diff --git a/lib/kofficecore/KoPictureWmf.cpp b/lib/kofficecore/KoPictureWmf.cpp
index 96d10817..3f2d0a7e 100644
--- a/lib/kofficecore/KoPictureWmf.cpp
+++ b/lib/kofficecore/KoPictureWmf.cpp
@@ -97,7 +97,7 @@ bool KoPictureWmf::loadData(const TQByteArray& array, const TQString& /* extensi
}
m_originalSize = wmf.boundingRect().size();
// draw wmf file with relative coordinate
- wmf.play(*TQT_TQPAINTDEVICE(&m_clipart), true);
+ wmf.play(m_clipart, true);
return true;
}
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-12 16:32:44 +0000