diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-03 00:49:31 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-04 00:28:32 +0900 |
| commit | 10ff449a14f1c053295e0b7cfd678bebc11ca880 (patch) | |
| tree | 2ea00d5a47a6ba272486621e87243db3350bcb1a /kommander | |
| parent | d72f4843816818bdb27e7faae86e68d51d624267 (diff) | |
| download | tdewebdev-10ff449a14f1c053295e0b7cfd678bebc11ca880.tar.gz tdewebdev-10ff449a14f1c053295e0b7cfd678bebc11ca880.zip | |
Replaced various '#define' with actual strings - part 5
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kommander')
| -rw-r--r-- | kommander/editor/resource.cpp | 12 | ||||
| -rw-r--r-- | kommander/executor/instance.cpp | 2 | ||||
| -rw-r--r-- | kommander/factory/kommanderfactory.cpp | 2 |
3 files changed, 8 insertions, 8 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 ); |