From 0ac52a652e631e24ac4989414b2c27b7b55ec239 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 3 Dec 2023 00:49:24 +0900 Subject: Replaced various '#define' with actual strings - part 5 Signed-off-by: Michele Calgaro --- kdevdesigner/designer/mainwindow.cpp | 4 ++-- kdevdesigner/designer/resource.cpp | 4 ++-- kdevdesigner/uilib/qwidgetfactory.cpp | 2 +- parts/appwizard/importdlg.cpp | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index 8c4f1d73..af4c4b78 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -596,12 +596,12 @@ TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet ) Resource resource( this ); resource.setWidget( fw ); TQValueList images; - resource.save( TQT_TQIODEVICE(&buffer) ); + resource.save( &buffer ); buffer.close(); buffer.open( IO_ReadOnly ); - TQWidget *w = TQWidgetFactory::create( TQT_TQIODEVICE(&buffer) ); + TQWidget *w = TQWidgetFactory::create( &buffer ); if ( w ) { previewedForm = w; if ( palet ) { diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp index 192e4ffc..48da59b4 100644 --- a/kdevdesigner/designer/resource.cpp +++ b/kdevdesigner/designer/resource.cpp @@ -319,7 +319,7 @@ bool Resource::load( FormFile *ff, Project *defProject ) TQFile f( ff->absFileName() ); f.open( IO_ReadOnly | IO_Translate ); - bool b = load( ff, TQT_TQIODEVICE(&f), defProject ); + bool b = load( ff, &f, defProject ); f.close(); return b; @@ -695,7 +695,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; } diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp index 25f436f2..a79687a8 100644 --- a/kdevdesigner/uilib/qwidgetfactory.cpp +++ b/kdevdesigner/uilib/qwidgetfactory.cpp @@ -295,7 +295,7 @@ TQWidget *TQWidgetFactory::create( const TQString &uiFile, TQObject *connector, return 0; qwf_currFileName = uiFile; - TQWidget *w = TQWidgetFactory::create( TQT_TQIODEVICE(&f), connector, parent, name ); + TQWidget *w = TQWidgetFactory::create( &f, connector, parent, name ); if ( !qwf_forms ) qwf_forms = new TQMap; qwf_forms->insert( w, uiFile ); diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index cbe5bec2..975b9e1f 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -417,7 +417,7 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName) TQFile configIn(dirName+"/configure.in"); TQFile configAc(dirName+"/configure.ac"); if (configInIn.open(IO_ReadOnly)){ - cstream.setDevice(TQT_TQIODEVICE(&configInIn)); + cstream.setDevice(&configInIn); while (!cstream.atEnd()) { TQString line = cstream.readLine(); if ( ac_init.search(line) >= 0){ @@ -437,11 +437,11 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName) } if (configIn.open(IO_ReadOnly)){ - cstream.setDevice(TQT_TQIODEVICE(&configIn)); + cstream.setDevice(&configIn); } else{ if (configAc.open(IO_ReadOnly)){ - cstream.setDevice(TQT_TQIODEVICE(&configAc)); + cstream.setDevice(&configAc); } else{ return; -- cgit v1.2.1