Replaced various '#define' with actual strings - part 5

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/34/head
Michele Calgaro 6 months ago
parent 33b2598a0e
commit 0ac52a652e
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -596,12 +596,12 @@ TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet )
Resource resource( this ); Resource resource( this );
resource.setWidget( fw ); resource.setWidget( fw );
TQValueList<Resource::Image> images; TQValueList<Resource::Image> images;
resource.save( TQT_TQIODEVICE(&buffer) ); resource.save( &buffer );
buffer.close(); buffer.close();
buffer.open( IO_ReadOnly ); buffer.open( IO_ReadOnly );
TQWidget *w = TQWidgetFactory::create( TQT_TQIODEVICE(&buffer) ); TQWidget *w = TQWidgetFactory::create( &buffer );
if ( w ) { if ( w ) {
previewedForm = w; previewedForm = w;
if ( palet ) { if ( palet ) {

@ -319,7 +319,7 @@ bool Resource::load( FormFile *ff, Project *defProject )
TQFile f( ff->absFileName() ); TQFile f( ff->absFileName() );
f.open( IO_ReadOnly | IO_Translate ); f.open( IO_ReadOnly | IO_Translate );
bool b = load( ff, TQT_TQIODEVICE(&f), defProject ); bool b = load( ff, &f, defProject );
f.close(); f.close();
return b; return b;
@ -695,7 +695,7 @@ bool Resource::save( const TQString& filename, bool formCodeOnly )
TQFile f( filename ); TQFile f( filename );
if ( !f.open( IO_WriteOnly | IO_Translate ) ) if ( !f.open( IO_WriteOnly | IO_Translate ) )
return FALSE; return FALSE;
bool b = save( TQT_TQIODEVICE(&f) ); bool b = save( &f );
f.close(); f.close();
return b; return b;
} }

@ -295,7 +295,7 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector,
return 0; return 0;
qwf_currFileName = uiFile; qwf_currFileName = uiFile;
TQWidget *w = TQWidgetFactory::create( TQT_TQIODEVICE(&f), connector, parent, name ); TQWidget *w = TQWidgetFactory::create( &f, connector, parent, name );
if ( !qwf_forms ) if ( !qwf_forms )
qwf_forms = new TQMap<TQWidget*, TQString>; qwf_forms = new TQMap<TQWidget*, TQString>;
qwf_forms->insert( w, uiFile ); qwf_forms->insert( w, uiFile );

@ -417,7 +417,7 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName)
TQFile configIn(dirName+"/configure.in"); TQFile configIn(dirName+"/configure.in");
TQFile configAc(dirName+"/configure.ac"); TQFile configAc(dirName+"/configure.ac");
if (configInIn.open(IO_ReadOnly)){ if (configInIn.open(IO_ReadOnly)){
cstream.setDevice(TQT_TQIODEVICE(&configInIn)); cstream.setDevice(&configInIn);
while (!cstream.atEnd()) { while (!cstream.atEnd()) {
TQString line = cstream.readLine(); TQString line = cstream.readLine();
if ( ac_init.search(line) >= 0){ if ( ac_init.search(line) >= 0){
@ -437,11 +437,11 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName)
} }
if (configIn.open(IO_ReadOnly)){ if (configIn.open(IO_ReadOnly)){
cstream.setDevice(TQT_TQIODEVICE(&configIn)); cstream.setDevice(&configIn);
} }
else{ else{
if (configAc.open(IO_ReadOnly)){ if (configAc.open(IO_ReadOnly)){
cstream.setDevice(TQT_TQIODEVICE(&configAc)); cstream.setDevice(&configAc);
} }
else{ else{
return; return;

Loading…
Cancel
Save