diff options
| -rw-r--r-- | kommander/editor/resource.cpp | 12 | ||||
| -rw-r--r-- | kommander/executor/instance.cpp | 2 | ||||
| -rw-r--r-- | kommander/factory/kommanderfactory.cpp | 2 | ||||
| -rw-r--r-- | quanta/parsers/dtd/dtdparser.cpp | 2 | ||||
| -rw-r--r-- | quanta/src/document.cpp | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp index 8a4da33b..b369118e 100644 --- a/kommander/editor/resource.cpp +++ b/kommander/editor/resource.cpp @@ -166,7 +166,7 @@ bool Resource::load( FormFile *ff ) TQFile f( ff->absFileName() ); f.open( IO_ReadOnly ); - bool b = load( ff, TQT_TQIODEVICE(&f) ); + bool b = load( ff, &f ); f.close(); return b; @@ -413,7 +413,7 @@ bool Resource::save( const TQString& filename, bool formCodeOnly ) TQFile f( filename ); if ( !f.open( IO_WriteOnly | IO_Translate ) ) return false; - bool b = save( TQT_TQIODEVICE(&f) ); + bool b = save( &f ); f.close(); return b; } @@ -1099,9 +1099,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant num = value.toInt(); if ( w && w->inherits( "TQLayout" ) ) { if ( name == "spacing" ) - num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(w) ) ) ); + num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( w ) ) ); else if ( name == "margin" ) - num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(w) ) ) ); + num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( w ) ) ); } ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl; break; @@ -1117,9 +1117,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant unum = value.toUInt(); if ( w && w->inherits( "TQLayout" ) ) { if ( name == "spacing" ) - num = MetaDataBase::spacing( WidgetFactory::layoutParent( TQT_TQLAYOUT(w) ) ); + num = MetaDataBase::spacing( WidgetFactory::layoutParent( w ) ); else if ( name == "margin" ) - num = MetaDataBase::margin( WidgetFactory::layoutParent( TQT_TQLAYOUT(w) ) ); + num = MetaDataBase::margin( WidgetFactory::layoutParent( w ) ); } ts << makeIndent( indent ) << "<number>" << TQString::number( unum ) << "</number>" << endl; break; diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp index 6dbb1a10..43cf6c13 100644 --- a/kommander/executor/instance.cpp +++ b/kommander/executor/instance.cpp @@ -106,7 +106,7 @@ bool Instance::build(const KURL& fname) { TQFile inputFile; inputFile.open(IO_ReadOnly, stdin); - m_instance = KommanderFactory::create(TQT_TQIODEVICE(&inputFile)); + m_instance = KommanderFactory::create(&inputFile); } // check if build was successful diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 250f32ac..386fca7b 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -131,7 +131,7 @@ TQWidget *KommanderFactory::create( const TQString &uiFile, TQObject *connector, if (!qwf_currFileName) qwf_currFileName = new TQString(); *qwf_currFileName = uiFile; - TQWidget *w = KommanderFactory::create( TQT_TQIODEVICE(&f), connector, parent, name ); + TQWidget *w = KommanderFactory::create( &f, connector, parent, name ); if ( !qwf_forms ) qwf_forms = new TQMap<TQWidget*, TQString>; qwf_forms->insert( w, uiFile ); diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp index 4f1b9d14..e2511b18 100644 --- a/quanta/parsers/dtd/dtdparser.cpp +++ b/quanta/parsers/dtd/dtdparser.cpp @@ -142,7 +142,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) TQFile file( DTD::dirName + "entities.tag" ); if ( file.open( IO_WriteOnly ) ) { - DTD::entityStream.setDevice(TQT_TQIODEVICE(&file)); + DTD::entityStream.setDevice(&file); DTD::entityStream.setEncoding(TQTextStream::UnicodeUTF8); DTD::entityStream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl; DTD::entityStream << "<!DOCTYPE TAGS>" << endl diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index a659d9cf..6ca6e6ab 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -2236,7 +2236,7 @@ void Document::checkDirtyStatus() const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); m_md5sum = context.hexDigest(); f.close(); } @@ -2252,7 +2252,7 @@ void Document::checkDirtyStatus() const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); md5sum = context.hexDigest(); kdDebug(24000) << "MD5 sum of current doc: " << m_md5sum << endl; kdDebug(24000) << "MD5 sum of doc on disc : " << md5sum << endl; @@ -2323,7 +2323,7 @@ bool Document::saveAs(const KURL& url) const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); m_md5sum = context.hexDigest(); f.close(); } @@ -3181,7 +3181,7 @@ bool Document::openURL(const KURL& url) const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); m_md5sum = context.hexDigest(); f.close(); } |