diff options
Diffstat (limited to 'kommander/editor/resource.cpp')
-rw-r--r-- | kommander/editor/resource.cpp | 507 |
1 files changed, 254 insertions, 253 deletions
diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp index d1c93cea..02cd1eec 100644 --- a/kommander/editor/resource.cpp +++ b/kommander/editor/resource.cpp @@ -1,7 +1,7 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -27,11 +27,11 @@ #include "tqdom.h" #include "widgetdatabase.h" #include "widgetfactory.h" -#include "layout.h" +#include "tqlayout.h" #include "domtool.h" #include "command.h" #include "pixmapchooser.h" -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL #include "database.h" #endif #include "actiondnd.h" @@ -68,7 +68,7 @@ #include <tqregexp.h> #include <zlib.h> #include <tqdatetime.h> -#ifndef QT_NO_TABLE +#ifndef TQT_NO_TABLE #include <tqtable.h> #endif @@ -84,12 +84,12 @@ static TQString makeIndent( int indent ) static TQString entitize( const TQString &s, bool attribute = false ) { TQString s2 = s; - s2 = s2.replace( TQRegExp( "&" ), "&" ); - s2 = s2.replace( TQRegExp( ">" ), ">" ); - s2 = s2.replace( TQRegExp( "<" ), "<" ); + s2 = s2.tqreplace( TQRegExp( "&" ), "&" ); + s2 = s2.tqreplace( TQRegExp( ">" ), ">" ); + s2 = s2.tqreplace( TQRegExp( "<" ), "<" ); if ( attribute ) { - s2 = s2.replace( TQRegExp( "\"" ), """ ); - s2 = s2.replace( TQRegExp( "'" ), "'" ); + s2 = s2.tqreplace( TQRegExp( "\"" ), """ ); + s2 = s2.tqreplace( TQRegExp( "'" ), "'" ); } return s2; } @@ -166,7 +166,7 @@ bool Resource::load( FormFile *ff ) TQFile f( ff->absFileName() ); f.open( IO_ReadOnly ); - bool b = load( ff, &f ); + bool b = load( ff, TQT_TQIODEVICE(&f) ); f.close(); return b; @@ -181,7 +181,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) TQString content = stream.read(); if (content.startsWith("#!")) { - content = content.mid(content.find('\n')); + content = content.mid(content.tqfind('\n')); } if ( !doc.setContent( content) ) { // qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); @@ -195,7 +195,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) formwindow->setProject( MainWindow::self->currProject() ); #endif formwindow->setMainWindow( mainwindow ); - MetaDataBase::addEntry( formwindow ); + MetaDataBase::addEntry( TQT_TQOBJECT(formwindow) ); #ifndef KOMMANDER if (!langIface) { @@ -290,9 +290,9 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) metaInfo.license = e.firstChild().toText().data(); } else if ( e.tagName() == "exportmacro" ) { exportMacro = e.firstChild().toText().data(); - } else if ( e.tagName() == "layoutdefaults" ) { - formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->layoutDefaultSpacing() ) ).toInt() ); - formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->layoutDefaultMargin() ) ).toInt() ); + } else if ( e.tagName() == "tqlayoutdefaults" ) { + formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->tqlayoutDefaultSpacing() ) ).toInt() ); + formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->tqlayoutDefaultMargin() ) ).toInt() ); } e = e.nextSibling().toElement(); @@ -303,13 +303,13 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) if ( !customWidgets.isNull() ) loadCustomWidgets( customWidgets, this ); -#if defined (QT_NON_COMMERCIAL) +#if defined (TQT_NON_COMMERCIAL) bool previewMode = MainWindow::self->isPreviewing(); TQWidget *w = (TQWidget*)createObject( widget, !previewMode ? (TQWidget*)formwindow : MainWindow::self); if ( !w ) return false; if ( previewMode ) - w->reparent( MainWindow::self, Qt::WType_TopLevel, w->pos(), true ); + w->reparent( MainWindow::self, TQt::WType_TopLevel, w->pos(), true ); #else if ( !createObject( widget, formwindow) ) return false; @@ -364,11 +364,11 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) if ( slot.returnType.isEmpty() ) slot.returnType = "void"; slot.slot = n.firstChild().toText().data(); - if ( !MetaDataBase::hasSlot( formwindow, slot.slot, true ) ) - MetaDataBase::addSlot( formwindow, slot.slot, slot.specifier, + if ( !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), slot.slot, true ) ) + MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), slot.slot, slot.specifier, slot.access, slot.language, slot.returnType ); else - MetaDataBase::changeSlotAttributes( formwindow, slot.slot, + MetaDataBase::changeSlotAttributes( TQT_TQOBJECT(formwindow), slot.slot, slot.specifier, slot.access, slot.language, slot.returnType ); } @@ -386,11 +386,11 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) loadTabOrder( tabOrder ); if ( formwindow ) { - MetaDataBase::setIncludes( formwindow, metaIncludes ); - MetaDataBase::setForwards( formwindow, metaForwards ); - MetaDataBase::setSignalList( formwindow, metaSignals ); - MetaDataBase::setMetaInfo( formwindow, metaInfo ); - MetaDataBase::setExportMacro( formwindow->mainContainer(), exportMacro ); + MetaDataBase::setIncludes( TQT_TQOBJECT(formwindow), metaIncludes ); + MetaDataBase::setForwards( TQT_TQOBJECT(formwindow), metaForwards ); + MetaDataBase::setSignalList( TQT_TQOBJECT(formwindow), metaSignals ); + MetaDataBase::setMetaInfo( TQT_TQOBJECT(formwindow), metaInfo ); + MetaDataBase::setExportMacro( TQT_TQOBJECT(formwindow->mainContainer()), exportMacro ); } @@ -400,14 +400,14 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) } if ( formwindow ) { - formwindow->killAccels( formwindow ); - if ( formwindow->layout() ) - formwindow->layout()->activate(); + formwindow->killAccels( TQT_TQOBJECT(formwindow) ); + if ( formwindow->tqlayout() ) + formwindow->tqlayout()->activate(); if ( hadGeometry ) - formwindow->resize( formwindow->size().expandedTo( formwindow->minimumSize(). - expandedTo( formwindow->minimumSizeHint() ) ) ); + formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize(). + expandedTo( formwindow->tqminimumSizeHint() ) ) ); else - formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) ); + formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) ); } return true; @@ -422,7 +422,7 @@ bool Resource::save( const TQString& filename, bool formCodeOnly ) TQFile f( filename ); if ( !f.open( IO_WriteOnly | IO_Translate ) ) return false; - bool b = save( &f ); + bool b = save( TQT_TQIODEVICE(&f) ); f.close(); return b; } @@ -439,7 +439,7 @@ bool Resource::save( TQIODevice* dev ) ts << formwindow->mainContainer()->property("shebang").toString() << endl; ts << "<!DOCTYPE UI><UI version=\"3.0\" stdsetdef=\"1\">" << endl; saveMetaInfoBefore( ts, 0 ); - saveObject( formwindow->mainContainer(), 0, ts, 0 ); + saveObject( TQT_TQOBJECT(formwindow->mainContainer()), 0, ts, 0 ); if ( formwindow->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { saveMenuBar( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); saveToolBars( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); @@ -450,7 +450,7 @@ bool Resource::save( TQIODevice* dev ) saveActions( formwindow->actionList(), ts, 0 ); if ( !images.isEmpty() ) saveImageCollection( ts, 0 ); - if ( !MetaDataBase::connections( formwindow ).isEmpty() || !MetaDataBase::slotList( formwindow ).isEmpty() ) + if ( !MetaDataBase::connections( TQT_TQOBJECT(formwindow) ).isEmpty() || !MetaDataBase::slotList( TQT_TQOBJECT(formwindow) ).isEmpty() ) saveConnections( ts, 0 ); saveTabOrder( ts, 0 ); saveMetaInfoAfter( ts, 0 ); @@ -463,7 +463,7 @@ bool Resource::save( TQIODevice* dev ) TQString Resource::copy() { if ( !formwindow ) - return TQString::null; + return TQString(); copying = true; TQString s; @@ -473,17 +473,17 @@ TQString Resource::copy() TQWidgetList widgets = formwindow->selectedWidgets(); TQWidgetList tmp( widgets ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - TQWidget *p = w->parentWidget(); + TQWidget *p = w->tqparentWidget(); bool save = true; while ( p ) { - if ( tmp.findRef( p ) != -1 ) { + if ( tmp.tqfindRef( p ) != -1 ) { save = false; break; } - p = p->parentWidget(); + p = p->tqparentWidget(); } if ( save ) - saveObject( w, 0, ts, 0 ); + saveObject( TQT_TQOBJECT(w), 0, ts, 0 ); } if ( !MetaDataBase::customWidgets()->isEmpty() && !usedCustomWidgets.isEmpty() ) saveCustomWidgets( ts, 0 ); @@ -495,7 +495,7 @@ TQString Resource::copy() } -void Resource::paste( const TQString &cb, TQWidget *parent ) +void Resource::paste( const TQString &cb, TQWidget *tqparent ) { if ( !formwindow ) return; @@ -533,33 +533,33 @@ void Resource::paste( const TQString &cb, TQWidget *parent ) formwindow->clearSelection( false ); while ( !firstWidget.isNull() ) { if ( firstWidget.tagName() == "widget" ) { - TQWidget *w = (TQWidget*)createObject( firstWidget, parent, 0 ); + TQWidget *w = (TQWidget*)createObject( firstWidget, tqparent, 0 ); if ( !w ) continue; widgets.append( w ); int x = w->x() + formwindow->grid().x(); int y = w->y() + formwindow->grid().y(); - if ( w->x() + w->width() > parent->width() ) - x = QMAX( 0, parent->width() - w->width() ); - if ( w->y() + w->height() > parent->height() ) - y = QMAX( 0, parent->height() - w->height() ); + if ( w->x() + w->width() > tqparent->width() ) + x = TQMAX( 0, tqparent->width() - w->width() ); + if ( w->y() + w->height() > tqparent->height() ) + y = TQMAX( 0, tqparent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); - formwindow->selectWidget( w ); + formwindow->selectWidget( TQT_TQOBJECT(w) ); } else if ( firstWidget.tagName() == "spacer" ) { - TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal ); + TQWidget *w = createSpacer( firstWidget, tqparent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal ); if ( !w ) continue; widgets.append( w ); int x = w->x() + formwindow->grid().x(); int y = w->y() + formwindow->grid().y(); - if ( w->x() + w->width() > parent->width() ) - x = QMAX( 0, parent->width() - w->width() ); - if ( w->y() + w->height() > parent->height() ) - y = QMAX( 0, parent->height() - w->height() ); + if ( w->x() + w->width() > tqparent->width() ) + x = TQMAX( 0, tqparent->width() - w->width() ); + if ( w->y() + w->height() > tqparent->height() ) + y = TQMAX( 0, tqparent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); - formwindow->selectWidget( w ); + formwindow->selectWidget( TQT_TQOBJECT(w) ); } firstWidget = firstWidget.nextSibling().toElement(); } @@ -571,7 +571,7 @@ void Resource::paste( const TQString &cb, TQWidget *parent ) formwindow->commandHistory()->addCommand( cmd ); } -void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStream &ts, int indent ) +void Resource::saveObject( TQObject *obj, TQDesignerGridLayout* grid, TQTextStream &ts, int indent ) { if ( obj && obj->isWidgetType() && ( (TQWidget*)obj )->isHidden() && !(obj->isA("ScriptObject")) ) return; @@ -580,12 +580,12 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea const char* className = WidgetFactory::classNameOf( obj ); if ( obj->isA( "CustomWidget" ) ) usedCustomWidgets << TQString( className ); - if ( obj != formwindow && !formwindow->widgets()->find( (TQWidget*)obj ) ) + if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->tqfind( (TQWidget*)obj ) ) return; // we don't know anything about this thing TQString attributes; if ( grid ) { - QDesignerGridLayout::Item item = grid->items[ (TQWidget*)obj ]; + TQDesignerGridLayout::Item item = grid->items[ (TQWidget*)obj ]; attributes += TQString(" row=\"") + TQString::number(item.row) + "\""; attributes += TQString(" column=\"") + TQString::number(item.column) + "\""; if ( item.rowspan * item.colspan != 1 ) { @@ -601,7 +601,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea } else { closeTag = makeIndent( indent ) + "</widget>\n"; if ( qstrcmp( className, "KmdrMainWindow" ) == 0 ) { - ts << makeIndent( indent ) << "<widget class=\"QMainWindow\"" << attributes << ">" << endl; + ts << makeIndent( indent ) << "<widget class=\"TQMainWindow\"" << attributes << ">" << endl; } else { ts << makeIndent( indent ) << "<widget class=\"" << className << "\"" << attributes << ">" << endl; } @@ -619,7 +619,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea TQTabWidget* tw = (TQTabWidget*) obj; TQObjectList* tmpl = tw->queryList( TQWIDGETSTACK_OBJECT_NAME_STRING ); TQWidgetStack *ws = (TQWidgetStack*)tmpl->first(); - TQTabBar *tb = ( (QDesignerTabWidget*)obj )->tabBar(); + TQTabBar *tb = ( (TQDesignerTabWidget*)obj )->tabBar(); for ( int i = 0; i < tb->count(); ++i ) { TQTab *t = tb->tabAt( i ); if ( !t ) @@ -627,9 +627,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea TQWidget *w = ws->widget( t->identifier() ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) == -1 ) + if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) == -1 ) continue; // we don't know this widget - ts << makeIndent( indent ) << "<widget class=\"QWidget\">" << endl; + ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; ts << makeIndent( indent ) << "<property name=\"name\">" << endl; indent++; @@ -642,21 +642,21 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( t->text() ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( w, ts, indent ); + saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } delete tmpl; } else - if ( ::qt_cast<TQToolBox*>(obj) ) { + if ( ::tqqt_cast<TQToolBox*>(obj) ) { TQToolBox* tb = (TQToolBox*)obj; for ( int i = 0; i < tb->count(); ++i ) { TQWidget *w = tb->item( i ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 ) + if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 ) continue; // we don't know this widget - ts << makeIndent( indent ) << "<widget class=\"QWidget\">" << endl; + ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; ts << makeIndent( indent ) << "<property name=\"name\">" << endl; indent++; @@ -665,7 +665,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "</property>" << endl; ts << makeIndent( indent ) << "<property name=\"backgroundMode\">" << endl; indent++; - saveEnumProperty( w, "backgroundMode", TQVariant::Invalid, ts, indent ); + saveEnumProperty( TQT_TQOBJECT(w), "backgroundMode", TQVariant::Invalid, ts, indent ); indent--; ts << makeIndent( indent ) << "</property>" << endl; ts << makeIndent( indent ) << "<attribute name=\"label\">" << endl; @@ -673,7 +673,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( tb->itemLabel( tb->indexOf(w) ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( w, ts, indent ); + saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } @@ -683,9 +683,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea TQWidget *w = wiz->page( i ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) == -1 ) + if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) == -1 ) continue; // we don't know this widget - ts << makeIndent( indent ) << "<widget class=\"QWidget\">" << endl; + ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; ts << makeIndent( indent ) << "<property name=\"name\">" << endl; indent++; @@ -698,12 +698,12 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( wiz->title( w ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( w, ts, indent ); + saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } } else if ( obj->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { - saveChildrenOf( ( (TQMainWindow*)obj )->centralWidget(), ts, indent ); + saveChildrenOf( TQT_TQOBJECT(( (TQMainWindow*)obj )->centralWidget()), ts, indent ); } else { saveChildrenOf( obj, ts, indent ); } @@ -778,11 +778,11 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) } saveItem( lv->firstChild(), ts, indent - 1 ); } -#ifndef QT_NO_TABLE +#ifndef TQT_NO_TABLE else if ( obj->inherits( TQTABLE_OBJECT_NAME_STRING ) ) { TQTable *table = (TQTable*)obj; int i; - TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table ); + TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table) ); bool isDataTable = table->inherits( TQDATATABLE_OBJECT_NAME_STRING ); for ( i = 0; i < table->horizontalHeader()->count(); ++i ) { if ( !table->horizontalHeader()->label( i ).isNull() && @@ -801,7 +801,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) if ( table->inherits( TQDATATABLE_OBJECT_NAME_STRING ) && !columnFields.isEmpty() ) { ts << makeIndent( indent ) << "<property name=\"field\">" << endl; indent++; - ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.find( l[ 0 ] ) ) << "</string>" << endl; + ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.tqfind( l[ 0 ] ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</property>" << endl; } @@ -865,11 +865,11 @@ void Resource::savePixmap( const TQPixmap &p, TQTextStream &ts, int indent, cons ts << makeIndent( indent ) << "<" + tagname + ">" << saveInCollection( p ) << "</" + tagname + ">" << endl; #ifndef KOMMANDER else if ( formwindow && formwindow->savePixmapInProject() ) - ts << makeIndent( indent ) << "<" + tagname + ">" << MetaDataBase::pixmapKey( formwindow, p.serialNumber() ) + ts << makeIndent( indent ) << "<" + tagname + ">" << MetaDataBase::pixmapKey( TQT_TQOBJECT(formwindow), p.serialNumber() ) << "</" + tagname + ">" << endl; #endif else - ts << makeIndent( indent ) << "<" + tagname + ">" << MetaDataBase::pixmapArgument( formwindow, p.serialNumber() ) + ts << makeIndent( indent ) << "<" + tagname + ">" << MetaDataBase::pixmapArgument( TQT_TQOBJECT(formwindow), p.serialNumber() ) << "</" + tagname + ">" << endl; } @@ -881,7 +881,7 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname* TQImage img = loadFromCollection( arg ); TQPixmap pix; pix.convertFromImage( img ); - MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg ); + MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); return pix; } #ifndef KOMMANDER @@ -895,11 +895,11 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname* { TQPixmap pix; pix = PixmapChooser::loadPixmap( "image.xpm" ); - MetaDataBase::setPixmapKey( formwindow, pix.serialNumber(), arg ); + MetaDataBase::setPixmapKey( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); return pix; } TQPixmap pix = PixmapChooser::loadPixmap( "image.xpm" ); - MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg ); + MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); return pix; } @@ -929,19 +929,19 @@ void Resource::saveItem( const TQStringList &text, const TQPtrList<TQPixmap> &pi void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) { - const TQObjectList *l = obj->children(); - if ( !l ) - return; // no children to save + const TQObjectList l = obj->childrenListObject(); + if ( l.isEmpty() ) + return; // no tqchildren to save TQString closeTag; - // if the widget has a layout we pretend that all widget's childs are childs of the layout - makes the structure nicer - TQLayout *layout = 0; - QDesignerGridLayout* grid = 0; + // if the widget has a tqlayout we pretend that all widget's childs are childs of the tqlayout - makes the structure nicer + TQLayout *tqlayout = 0; + TQDesignerGridLayout* grid = 0; if ( !obj->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) && obj->isWidgetType() && - WidgetFactory::layoutType( (TQWidget*)obj, layout ) != WidgetFactory::NoLayout ) { - WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, layout ); + WidgetFactory::tqlayoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) { + WidgetFactory::LayoutType lay = WidgetFactory::tqlayoutType( (TQWidget*)obj, tqlayout ); switch ( lay ) { case WidgetFactory::HBox: closeTag = makeIndent( indent ) + "</hbox>"; @@ -957,19 +957,19 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) closeTag = makeIndent( indent ) + "</grid>"; ts << makeIndent( indent ) << "<grid>" << endl; ++indent; - grid = (QDesignerGridLayout*) layout; + grid = (TQDesignerGridLayout*) tqlayout; break; default: break; } - // save properties of layout + // save properties of tqlayout if ( lay != WidgetFactory::NoLayout ) - saveObjectProperties( layout, ts, indent ); + saveObjectProperties( TQT_TQOBJECT(tqlayout), ts, indent ); } - for ( TQPtrListIterator<TQObject> it ( *l ); it.current(); ++it ) + for ( TQPtrListIterator<TQObject> it ( l ); it.current(); ++it ) saveObject( it.current(), grid, ts, indent ); if ( !closeTag.isEmpty() ) { indent--; @@ -984,43 +984,43 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) changed = MetaDataBase::changedProperties( w ); if ( w->isWidgetType() ) { if ( w->inherits( "Spacer" ) ) { - if ( !changed.contains( "sizeHint" ) ) - changed << "sizeHint"; - if ( !changed.contains( "geometry" ) ) + if ( !changed.tqcontains( "tqsizeHint" ) ) + changed << "tqsizeHint"; + if ( !changed.tqcontains( "geometry" ) ) changed << "geometry"; } } else if ( w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { // #### should be cleaner (RS) changed << "margin" << "spacing"; } - if ( w == formwindow->mainContainer() ) { - if ( changed.findIndex( "geometry" ) == -1 ) + if ( TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) { + if ( changed.tqfindIndex( "geometry" ) == -1 ) changed << "geometry"; - if ( changed.findIndex( "caption" ) == -1 ) + if ( changed.tqfindIndex( "caption" ) == -1 ) changed << "caption"; } if ( changed.isEmpty() ) return; - bool inLayout = w != formwindow->mainContainer() && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() && - WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; + bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->tqparentWidget() && + WidgetFactory::tqlayoutType( ( (TQWidget*)w )->tqparentWidget() ) != WidgetFactory::NoLayout; - TQStrList lst = w->metaObject()->propertyNames( !w->inherits( "Spacer" ) ); + TQStrList lst = w->tqmetaObject()->propertyNames( !w->inherits( "Spacer" ) ); for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { - if ( changed.find( TQString::fromLatin1( it.current() ) ) == changed.end() ) + if ( changed.tqfind( TQString::tqfromLatin1( it.current() ) ) == changed.end() ) continue; - if ( saved.find( TQString::fromLatin1( it.current() ) ) != saved.end() ) + if ( saved.tqfind( TQString::tqfromLatin1( it.current() ) ) != saved.end() ) continue; - saved << TQString::fromLatin1( it.current() ); - const TQMetaProperty* p = w->metaObject()-> - property( w->metaObject()->findProperty( it.current(), true ), true ); + saved << TQString::tqfromLatin1( it.current() ); + const TQMetaProperty* p = w->tqmetaObject()-> + property( w->tqmetaObject()->tqfindProperty( it.current(), true ), true ); if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) ) continue; if ( w->inherits( TQLABEL_OBJECT_NAME_STRING ) && qstrcmp( p->name(), "pixmap" ) == 0 && ( !( (TQLabel*)w )->pixmap() || ( (TQLabel*)w )->pixmap()->isNull() ) ) continue; - if ( w->inherits( "QDesignerMenuBar" ) && + if ( w->inherits( "TQDesignerMenuBar" ) && ( qstrcmp( p->name(), "itemName" ) == 0 || qstrcmp( p->name(), "itemNumber" ) == 0 || qstrcmp( p->name(), "itemText" ) == 0 ) ) continue; @@ -1066,7 +1066,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true ); + const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, true ), true ); TQStrList l( p->valueToKeys( w->property( name ).toInt() ) ); TQString v; for ( uint i = 0; i < l.count(); ++i ) { @@ -1079,18 +1079,18 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true ); + const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, true ), true ); ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl; } void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant &value, TQVariant::Type t, TQTextStream &ts, int indent ) { - if ( name == "hAlign" || name =="vAlign" || name == "wordwrap" || name == "layoutMargin" || name =="layoutSpacing" ) + if ( name == "hAlign" || name =="vAlign" || name == "wordwrap" || name == "tqlayoutMargin" || name =="tqlayoutSpacing" ) return; int num, unum; double dob; TQString comment; - if ( w && formwindow->widgets()->find( (TQWidget*)w ) ) + if ( w && formwindow->widgets()->tqfind( (TQWidget*)w ) ) comment = MetaDataBase::propertyComment( w, name ); switch ( t ) { case TQVariant::String: @@ -1108,9 +1108,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant num = value.toInt(); if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { if ( name == "spacing" ) - num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ); + num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); else if ( name == "margin" ) - num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ); + num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); } ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl; break; @@ -1126,9 +1126,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant unum = value.toUInt(); if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { if ( name == "spacing" ) - num = MetaDataBase::spacing( WidgetFactory::layoutParent( (TQLayout*)w ) ); + num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); else if ( name == "margin" ) - num = MetaDataBase::margin( WidgetFactory::layoutParent( (TQLayout*)w ) ); + num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); } ts << makeIndent( indent ) << "<number>" << TQString::number( unum ) << "</number>" << endl; break; @@ -1172,9 +1172,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant case TQVariant::Font: { TQVariant v( value ); ts << makeIndent( indent ) << "<font>" << endl; - TQFont f( qApp->font() ); - if ( w && w->isWidgetType() && ((TQWidget*)w)->parentWidget() ) - f = ((TQWidget*)w)->parentWidget()->font(); + TQFont f( tqApp->font() ); + if ( w && w->isWidgetType() && ((TQWidget*)w)->tqparentWidget() ) + f = ((TQWidget*)w)->tqparentWidget()->font(); TQFont f2( v.toFont() ); indent++; if ( f.family() != f2.family() ) @@ -1240,7 +1240,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant ts << makeIndent( indent ) << "</palette>" << endl; } break; case TQVariant::Cursor: - ts << makeIndent( indent ) << "<cursor>" << value.toCursor().shape() << "</cursor>" << endl; + ts << makeIndent( indent ) << "<cursor>" << value.toCursor().tqshape() << "</cursor>" << endl; break; case TQVariant::StringList: { TQStringList lst = value.toStringList(); @@ -1303,7 +1303,7 @@ void Resource::saveColorGroup( TQTextStream &ts, int indent, const TQColorGroup saveColor( ts, indent, cg.color( (TQColorGroup::ColorRole)r ) ); indent--; ts << makeIndent( indent ) << "</color>" << endl; - TQPixmap* pm = cg.brush( (TQColorGroup::ColorRole)r ).pixmap(); + TQPixmap* pm = cg.tqbrush( (TQColorGroup::ColorRole)r ).pixmap(); if ( pm && !pm->isNull() ) savePixmap( *pm, ts, indent ); } @@ -1316,7 +1316,7 @@ void Resource::saveColor( TQTextStream &ts, int indent, const TQColor &c ) ts << makeIndent( indent ) << "<blue>" << TQString::number( c.blue() ) << "</blue>" << endl; } -TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout ) +TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout ) { lastItem = 0; TQDomElement n = e.firstChild().toElement(); @@ -1335,7 +1335,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ); if ( !className.isNull() ) { - obj = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, false ); + obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, 0, false )); if ( !obj ) return 0; if ( !mainContainerSet ) { @@ -1346,16 +1346,16 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay w = (TQWidget*)obj; if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) w = ( (TQMainWindow*)w )->centralWidget(); - if ( layout ) { - switch ( WidgetFactory::layoutType( layout ) ) { + if ( tqlayout ) { + switch ( WidgetFactory::tqlayoutType( tqlayout ) ) { case WidgetFactory::HBox: - ( (TQHBoxLayout*)layout )->addWidget( w ); + ( (TQHBoxLayout*)tqlayout )->addWidget( w ); break; case WidgetFactory::VBox: - ( (TQVBoxLayout*)layout )->addWidget( w ); + ( (TQVBoxLayout*)tqlayout )->addWidget( w ); break; case WidgetFactory::Grid: - ( (QDesignerGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1, + ( (TQDesignerGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1, col, col + colspan - 1 ); break; default: @@ -1365,13 +1365,13 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay if ( !toplevel ) toplevel = w; - layout = 0; + tqlayout = 0; if ( w && formwindow ) { - if ( !parent || ( !parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) + if ( !tqparent || ( !tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) formwindow->insertWidget( w, pasting ); - else if ( parent && ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) || parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) - MetaDataBase::addEntry( w ); + else if ( tqparent && ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) || tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) + MetaDataBase::addEntry( TQT_TQOBJECT(w) ); if (w->inherits("Dialog")) dynamic_cast<Dialog*>(w)->setUseInternalParser(false); } @@ -1379,22 +1379,22 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay while ( !n.isNull() ) { if ( n.tagName() == "spacer" ) { - createSpacer( n, w, layout, Qt::Horizontal ); + createSpacer( n, w, tqlayout, Qt::Horizontal ); } else if ( n.tagName() == "widget" ) { - createObject( n, w, layout ); + createObject( n, w, tqlayout ); } else if ( n.tagName() == "hbox" ) { - layout = WidgetFactory::createLayout( w, layout, WidgetFactory::HBox ); - obj = layout; + tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::HBox ); + obj = TQT_TQOBJECT(tqlayout); n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "grid" ) { - layout = WidgetFactory::createLayout( w, layout, WidgetFactory::Grid ); - obj = layout; + tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::Grid ); + obj = TQT_TQOBJECT(tqlayout); n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "vbox" ) { - layout = WidgetFactory::createLayout( w, layout, WidgetFactory::VBox ); - obj = layout; + tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::VBox ); + obj = TQT_TQOBJECT(tqlayout); n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "property" && obj ) { @@ -1402,16 +1402,16 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay } else if ( n.tagName() == "attribute" && w ) { TQString attrib = n.attribute( "name" ); TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); - if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { + if ( tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { if ( attrib == "title" ) - ( (TQTabWidget*)parent )->insertTab( w, v.toString() ); + ( (TQTabWidget*)tqparent )->insertTab( w, v.toString() ); } else - if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { + if ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) { if ( attrib == "label" ) - ( (TQToolBox*)parent )->addItem( w, v.toString() ); - } else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { + ( (TQToolBox*)tqparent )->addItem( w, v.toString() ); + } else if ( tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { if ( attrib == "title" ) - ( (TQWizard*)parent )->addPage( w, v.toString() ); + ( (TQWizard*)tqparent )->addPage( w, v.toString() ); } } else if ( n.tagName() == "item" ) { createItem( n, w ); @@ -1428,7 +1428,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay n = n.nextSibling().toElement(); } - return w; + return TQT_TQOBJECT(w); } void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) @@ -1469,7 +1469,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) if ( !resizeable ) lv->header()->setResizeEnabled( resizeable, i ); } -#ifndef QT_NO_TABLE +#ifndef TQT_NO_TABLE else if ( widget->inherits( TQTABLE_OBJECT_NAME_STRING ) ) { TQTable *table = (TQTable*)widget; bool isRow; @@ -1483,7 +1483,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) bool hasPixmap = false; TQString txt; TQString field; - TQMap<TQString, TQString> fieldMap = MetaDataBase::columnFields( table ); + TQMap<TQString, TQString> fieldMap = MetaDataBase::columnFields( TQT_TQOBJECT(table) ); while ( !n.isNull() ) { if ( n.tagName() == "property" ) { TQString attrib = n.attribute( "name" ); @@ -1508,7 +1508,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) h->setLabel( i, txt ); if ( !isRow && !field.isEmpty() ) fieldMap.insert( txt, field ); - MetaDataBase::setColumnFields( table, fieldMap ); + MetaDataBase::setColumnFields( TQT_TQOBJECT(table), fieldMap ); } #endif } @@ -1534,7 +1534,7 @@ void Resource::loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bo void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i ) { - if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) ) + if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) ) return; if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { @@ -1605,7 +1605,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } } -TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o ) +TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o ) { TQDomElement n = e.firstChild().toElement(); int row = e.attribute( "row" ).toInt(); @@ -1618,23 +1618,23 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay colspan = 1; Spacer *spacer = (Spacer*) WidgetFactory::create( WidgetDatabase::idFromClassName("Spacer"), - parent, "spacer", false); + tqparent, "spacer", false); spacer->setOrientation( o ); spacer->setInteraciveMode( false ); while ( !n.isNull() ) { if ( n.tagName() == "property" ) - setObjectProperty( spacer, n.attribute( "name" ), n.firstChild().toElement() ); + setObjectProperty( TQT_TQOBJECT(spacer), n.attribute( "name" ), n.firstChild().toElement() ); n = n.nextSibling().toElement(); } spacer->setInteraciveMode( true ); if ( formwindow ) formwindow->insertWidget( spacer, pasting ); - if ( layout ) { - if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) - ( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() ); + if ( tqlayout ) { + if ( tqlayout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) + ( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->tqalignment() ); else - ( (QDesignerGridLayout*)layout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, - spacer->alignment() ); + ( (TQDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, + spacer->tqalignment() ); } return spacer; } @@ -1644,9 +1644,9 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay */ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e ) { - const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true ); + const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->tqfindProperty( prop, true ), true ); - if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {// no layouts in metadatabase... (RS) + if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {// no tqlayouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { MetaDataBase::CustomWidget *cw = ( (CustomWidget*)obj )->customWidget(); if ( cw && !cw->hasProperty( prop.latin1() ) && !p && prop != "toolTip" && prop != "whatsThis" ) @@ -1657,9 +1657,9 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD TQVariant defVarient; if ( e.tagName() == "font" ) { - TQFont f( qApp->font() ); - if ( obj->isWidgetType() && ( (TQWidget*)obj )->parentWidget() ) - f = ( (TQWidget*)obj )->parentWidget()->font(); + TQFont f( tqApp->font() ); + if ( obj->isWidgetType() && ( (TQWidget*)obj )->tqparentWidget() ) + f = ( (TQWidget*)obj )->tqparentWidget()->font(); defVarient = TQVariant( f ); } @@ -1688,7 +1688,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( !p ) { MetaDataBase::setFakeProperty( obj, prop, v ); if ( obj->isWidgetType() ) { - if ( prop == "database" && obj != toplevel ) { + if ( prop == "database" && TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(toplevel) ) { TQStringList lst = MetaDataBase::fakeProperty( obj, "database" ).toStringList(); if ( lst.count() > 2 ) dbControls.insert( obj->name(), lst[ 2 ] ); @@ -1743,11 +1743,11 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD } if ( prop == "geometry" ) { - if ( obj == toplevel ) { + if ( TQT_BASE_OBJECT(obj) == toplevel ) { hadGeometry = true; toplevel->resize( v.toRect().size() ); return; - } else if ( obj == formwindow->mainContainer() ) { + } else if ( TQT_BASE_OBJECT(obj) == formwindow->mainContainer() ) { hadGeometry = true; formwindow->resize( v.toRect().size() ); return; @@ -1756,11 +1756,11 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { if ( prop == "spacing" ) { - MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toInt() ); + MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)obj ) )), v.toInt() ); return; } if ( prop == "margin" ) { - MetaDataBase::setMargin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toInt() ); + MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)obj ) )), v.toInt() ); return; } } @@ -1768,10 +1768,10 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( prop == "name" ) { if ( pasting ) { TQString s = v.toString(); - formwindow->unify( (TQWidget*)obj, s, true ); + formwindow->unify( TQT_TQOBJECT(obj), s, true ); obj->setName( s ); return; - } else if ( formwindow && obj == formwindow->mainContainer() ) { + } else if ( formwindow && TQT_BASE_OBJECT(obj) == formwindow->mainContainer() ) { formwindow->setName( v.toCString() ); } } @@ -1916,17 +1916,17 @@ void Resource::saveConnections( TQTextStream &ts, int indent ) { ts << makeIndent( indent ) << "<connections>" << endl; indent++; - TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( formwindow ); + TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( TQT_TQOBJECT(formwindow) ); TQValueList<MetaDataBase::Connection>::Iterator it = connections.begin(); for ( ; it != connections.end(); ++it ) { MetaDataBase::Connection conn = *it; - if ( ( knownNames.findIndex( TQString( conn.sender->name() ) ) == -1 && + if ( ( knownNames.tqfindIndex( TQString( conn.sender->name() ) ) == -1 && qstrcmp( conn.sender->name(), "this" ) != 0 ) || - ( knownNames.findIndex( TQString( conn.receiver->name() ) ) == -1 && + ( knownNames.tqfindIndex( TQString( conn.receiver->name() ) ) == -1 && qstrcmp( conn.receiver->name(), "this" ) != 0 ) ) continue; - if ( formwindow->isMainContainer( (TQWidget*)(*it).receiver ) && - !MetaDataBase::hasSlot( formwindow, MetaDataBase::normalizeSlot( (*it).slot ).latin1() ) ) + if ( formwindow->isMainContainer( TQT_TQOBJECT((*it).receiver) ) && + !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), MetaDataBase::normalizeSlot( (*it).slot ).latin1() ) ) continue; if ( conn.sender->inherits( "CustomWidget" ) ) { @@ -1995,7 +1995,7 @@ void Resource::loadConnections( const TQDomElement &e ) conn.sender = 0; TQString name = n2.firstChild().toText().data(); if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { - conn.sender = toplevel; + conn.sender = TQT_TQOBJECT(toplevel); } else { if ( name == "this" ) name = toplevel->name(); @@ -2013,7 +2013,7 @@ void Resource::loadConnections( const TQDomElement &e ) } else if ( n2.tagName() == "receiver" ) { TQString name = n2.firstChild().toText().data(); if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { - conn.receiver = toplevel; + conn.receiver = TQT_TQOBJECT(toplevel); } else { TQObjectList *l = toplevel->queryList( 0, name, false ); if ( l ) { @@ -2028,10 +2028,10 @@ void Resource::loadConnections( const TQDomElement &e ) n2 = n2.nextSibling().toElement(); } if ( formwindow ) { - if ( conn.sender == formwindow ) - conn.sender = formwindow->mainContainer(); - if ( conn.receiver == formwindow ) - conn.receiver = formwindow->mainContainer(); + if ( TQT_BASE_OBJECT(conn.sender) == TQT_BASE_OBJECT(formwindow) ) + conn.sender = TQT_TQOBJECT(formwindow->mainContainer()); + if ( TQT_BASE_OBJECT(conn.receiver) == TQT_BASE_OBJECT(formwindow) ) + conn.receiver = TQT_TQOBJECT(formwindow->mainContainer()); } if ( conn.sender && conn.receiver ) { #ifndef KOMMANDER @@ -2044,7 +2044,7 @@ void Resource::loadConnections( const TQDomElement &e ) TQStringList::split( ',', conn.slot ), false ); } #else - MetaDataBase::addConnection( formwindow ? formwindow : toplevel, + MetaDataBase::addConnection( formwindow ? TQT_TQOBJECT(formwindow) : TQT_TQOBJECT(toplevel), conn.sender, conn.signal, conn.receiver, conn.slot ); #endif } @@ -2061,11 +2061,11 @@ void Resource::loadConnections( const TQDomElement &e ) if ( slot.returnType.isEmpty() ) slot.returnType = "void"; slot.slot = n.firstChild().toText().data(); - if ( !MetaDataBase::hasSlot( formwindow, slot.slot, true ) ) - MetaDataBase::addSlot( formwindow, slot.slot, slot.specifier, + if ( !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), slot.slot, true ) ) + MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), slot.slot, slot.specifier, slot.access, slot.language, slot.returnType ); else - MetaDataBase::changeSlotAttributes( formwindow, slot.slot, + MetaDataBase::changeSlotAttributes( TQT_TQOBJECT(formwindow), slot.slot, slot.specifier, slot.access, slot.language, slot.returnType ); } @@ -2080,7 +2080,7 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent ) TQPtrList<MetaDataBase::CustomWidget> *lst = MetaDataBase::customWidgets(); for ( MetaDataBase::CustomWidget *w = lst->first(); w; w = lst->next() ) { - if ( usedCustomWidgets.findIndex( w->className ) == -1 ) + if ( usedCustomWidgets.tqfindIndex( w->className ) == -1 ) continue; ts << makeIndent( indent ) << "<customwidget>" << endl; indent++; @@ -2090,8 +2090,8 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent ) << "\">" << w->includeFile << "</header>" << endl; ts << makeIndent( indent ) << "<sizehint>" << endl; indent++; - ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl; - ts << makeIndent( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl; + ts << makeIndent( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl; + ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl; indent--; ts << makeIndent( indent ) << "</sizehint>" << endl; ts << makeIndent( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl; @@ -2147,9 +2147,9 @@ void Resource::loadCustomWidgets( const TQDomElement &e, Resource *r ) TQDomElement n3 = n2.firstChild().toElement(); while ( !n3.isNull() ) { if ( n3.tagName() == "width" ) - w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() ); + w->tqsizeHint.setWidth( n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "height" ) - w->sizeHint.setHeight( n3.firstChild().toText().data().toInt() ); + w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } } else if ( n2.tagName() == "sizepolicy" ) { @@ -2214,7 +2214,7 @@ void Resource::saveTabOrder( TQTextStream &ts, int indent ) indent++; for ( TQWidget *w = l.first(); w; w = l.next() ) { - if ( w->testWState( Qt::WState_ForceHide ) || knownNames.findIndex( w->name() ) == -1 ) + if ( w->testWState( TQt::WState_ForceHide ) || knownNames.tqfindIndex( w->name() ) == -1 ) continue; ts << makeIndent( indent ) << "<tabstop>" << w->name() << "</tabstop>" << endl; } @@ -2254,7 +2254,7 @@ void Resource::loadTabOrder( const TQDomElement &e ) void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent ) { - MetaDataBase::MetaInfo info = MetaDataBase::metaInfo(formwindow); + MetaDataBase::MetaInfo info = MetaDataBase::metaInfo(TQT_TQOBJECT(formwindow)); TQString cn = formwindow->name(); ts << makeIndent(indent) << "<class>" << entitize(cn) << "</class>" << endl; if (!info.comment.isEmpty()) @@ -2269,8 +2269,8 @@ void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent ) void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) { - MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( formwindow ); - TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formwindow ); + MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formwindow) ); TQString extensionInclude; bool needExtensionInclude = false; if ( !includes.isEmpty() || needExtensionInclude ) { @@ -2291,7 +2291,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) ts << makeIndent( indent ) << "</includes>" << endl; } - TQStringList forwards = MetaDataBase::forwards( formwindow ); + TQStringList forwards = MetaDataBase::forwards( TQT_TQOBJECT(formwindow) ); if ( !forwards.isEmpty() ) { ts << makeIndent( indent ) << "<forwards>" << endl; indent++; @@ -2300,7 +2300,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</forwards>" << endl; } - TQStringList sigs = MetaDataBase::signalList( formwindow ); + TQStringList sigs = MetaDataBase::signalList( TQT_TQOBJECT(formwindow) ); if ( !sigs.isEmpty() ) { ts << makeIndent( indent ) << "<signals>" << endl; indent++; @@ -2309,7 +2309,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</signals>" << endl; - TQValueList<MetaDataBase::Slot> slotList = MetaDataBase::slotList( formwindow ); + TQValueList<MetaDataBase::Slot> slotList = MetaDataBase::slotList( TQT_TQOBJECT(formwindow) ); if ( !slotList.isEmpty() ) { ts << makeIndent( indent ) << "<slots>" << endl; indent++; @@ -2339,11 +2339,11 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) ; else ts << makeIndent( indent ) << "<pixmapfunction>" << formwindow->pixmapLoaderFunction() << "</pixmapfunction>" << endl; - if ( !( exportMacro = MetaDataBase::exportMacro( formwindow->mainContainer() ) ).isEmpty() ) + if ( !( exportMacro = MetaDataBase::exportMacro( TQT_TQOBJECT(formwindow->mainContainer()) ) ).isEmpty() ) ts << makeIndent( indent ) << "<exportmacro>" << exportMacro << "</exportmacro>" << endl; if ( formwindow ) - ts << makeIndent( indent ) << "<layoutdefaults spacing=\"" << formwindow->layoutDefaultSpacing() - << "\" margin=\"" << formwindow->layoutDefaultMargin() << "\"/>" << endl; + ts << makeIndent( indent ) << "<tqlayoutdefaults spacing=\"" << formwindow->tqlayoutDefaultSpacing() + << "\" margin=\"" << formwindow->tqlayoutDefaultMargin() << "\"/>" << endl; } TQColorGroup Resource::loadColorGroup( const TQDomElement &e ) @@ -2367,9 +2367,10 @@ TQColorGroup Resource::loadColorGroup( const TQDomElement &e ) void Resource::saveChildActions( TQAction *a, TQTextStream &ts, int indent ) { - if ( !a->children() ) + TQObjectList clo = a->childrenListObject(); + if ( clo.isEmpty() ) return; - TQObjectListIt it( *a->children() ); + TQObjectListIt it( clo ); while ( it.current() ) { TQObject *o = it.current(); ++it; @@ -2428,12 +2429,12 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts ts << makeIndent( indent ) << "</actions>" << endl; } -void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) +void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e ) { TQDomElement n = e; TQAction *a = 0; if ( n.tagName() == "action" ) { - a = new QDesignerAction( parent ); + a = new TQDesignerAction( tqparent ); MetaDataBase::addEntry( a ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { @@ -2449,10 +2450,10 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) ) formwindow->actionList().append( a ); } else if ( n.tagName() == "actiongroup" ) { - a = new QDesignerActionGroup( parent ); + a = new TQDesignerActionGroup( tqparent ); MetaDataBase::addEntry( a ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { @@ -2471,7 +2472,7 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e ) } n2 = n2.nextSibling().toElement(); } - if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) ) + if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) ) formwindow->actionList().append( a ); } } @@ -2481,9 +2482,9 @@ void Resource::loadActions( const TQDomElement &e ) TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" ) { - loadChildAction( formwindow, n ); + loadChildAction( TQT_TQOBJECT(formwindow), n ); } else if ( n.tagName() == "actiongroup" ) { - loadChildAction( formwindow, n ); + loadChildAction( TQT_TQOBJECT(formwindow), n ); } n = n.nextSibling().toElement(); } @@ -2495,8 +2496,8 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) indent++; TQPtrList<TQToolBar> tbList; - for ( int i = 0; i <= (int)Qt::DockMinimized; ++i ) { - tbList = mw->toolBars( (Qt::Dock)i ); + for ( int i = 0; i <= (int)TQt::DockMinimized; ++i ) { + tbList = mw->toolBars( (TQt::Dock)i ); if ( tbList.isEmpty() ) continue; for ( TQToolBar *tb = tbList.first(); tb; tb = tbList.next() ) { @@ -2504,23 +2505,23 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) continue; ts << makeIndent( indent ) << "<toolbar dock=\"" << i << "\">" << endl; indent++; - saveObjectProperties( tb, ts, indent ); - TQPtrList<TQAction> actionList = ( (QDesignerToolBar*)tb )->insertedActions(); + saveObjectProperties( TQT_TQOBJECT(tb), ts, indent ); + TQPtrList<TQAction> actionList = ( (TQDesignerToolBar*)tb )->insertedActions(); for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { - if ( a->inherits( "QSeparatorAction" ) ) { + if ( a->inherits( "TQSeparatorAction" ) ) { ts << makeIndent( indent ) << "<separator/>" << endl; } else { - if ( a->inherits( "QDesignerAction" ) && !( (QDesignerAction*)a )->supportsMenu() ) { - TQWidget *w = ( (QDesignerAction*)a )->widget(); + if ( a->inherits( "TQDesignerAction" ) && !( (TQDesignerAction*)a )->supportsMenu() ) { + TQWidget *w = ( (TQDesignerAction*)a )->widget(); ts << makeIndent( indent ) << "<widget class=\"" - << WidgetFactory::classNameOf( w ) << "\">" << endl; + << WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) << "\">" << endl; indent++; - saveObjectProperties( w, ts, indent ); - const char *className = WidgetFactory::classNameOf( w ); + saveObjectProperties( TQT_TQOBJECT(w), ts, indent ); + const char *className = WidgetFactory::classNameOf( TQT_TQOBJECT(w) ); if ( w->isA( "CustomWidget" ) ) usedCustomWidgets << TQString( className ); - if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) - saveItems( w, ts, indent ); + if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) + saveItems( TQT_TQOBJECT(w), ts, indent ); indent--; ts << makeIndent( indent ) << "</widget>" << endl; } else { @@ -2542,18 +2543,18 @@ void Resource::saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ) return; ts << makeIndent( indent ) << "<menubar>" << endl; indent++; - saveObjectProperties( mw->menuBar(), ts, indent ); + saveObjectProperties( TQT_TQOBJECT(mw->menuBar()), ts, indent ); for ( int i = 0; i < (int)mw->menuBar()->count(); ++i ) { ts << makeIndent( indent ) << "<item text=\"" << entitize( mw->menuBar()->text( mw->menuBar()->idAt( i ) ) ) - << "\" name=\"" << entitize( mw->menuBar()->findItem( mw->menuBar()->idAt( i ) )->popup()->name() ) << "\">" << endl; + << "\" name=\"" << entitize( mw->menuBar()->tqfindItem( mw->menuBar()->idAt( i ) )->popup()->name() ) << "\">" << endl; indent++; - TQMenuItem *m = mw->menuBar()->findItem( mw->menuBar()->idAt( i ) ); + TQMenuItem *m = mw->menuBar()->tqfindItem( mw->menuBar()->idAt( i ) ); if ( !m ) continue; - TQPtrList<TQAction> actionList = ( (QDesignerPopupMenu*)m->popup() )->insertedActions(); + TQPtrList<TQAction> actionList = ( (TQDesignerPopupMenu*)m->popup() )->insertedActions(); for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { - if ( a->inherits( "QSeparatorAction" ) ) + if ( a->inherits( "TQSeparatorAction" ) ) ts << makeIndent( indent ) << "<separator/>" << endl; else ts << makeIndent( indent ) << "<action name=\"" << a->name() << "\"/>" << endl; @@ -2569,11 +2570,11 @@ void Resource::loadToolBars( const TQDomElement &e ) { TQDomElement n = e.firstChild().toElement(); TQMainWindow *mw = ( (TQMainWindow*)formwindow->mainContainer() ); - QDesignerToolBar *tb = 0; + TQDesignerToolBar *tb = 0; while ( !n.isNull() ) { if ( n.tagName() == "toolbar" ) { - Qt::Dock dock = (Qt::Dock)n.attribute( "dock" ).toInt(); - tb = new QDesignerToolBar( mw, dock ); + TQt::Dock dock = (TQt::Dock)n.attribute( "dock" ).toInt(); + tb = new TQDesignerToolBar( mw, dock ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { @@ -2583,17 +2584,17 @@ void Resource::loadToolBars( const TQDomElement &e ) tb->addAction( a ); } } else if ( n2.tagName() == "separator" ) { - TQAction *a = new QSeparatorAction( 0 ); + TQAction *a = new TQSeparatorAction( 0 ); a->addTo( tb ); tb->addAction( a ); } else if ( n2.tagName() == "widget" ) { TQWidget *w = (TQWidget*)createObject( n2, tb ); - QDesignerAction *a = new QDesignerAction( w, tb ); + TQDesignerAction *a = new TQDesignerAction( w, TQT_TQOBJECT(tb) ); a->addTo( tb ); tb->addAction( a ); tb->installEventFilters( w ); } else if ( n2.tagName() == "property" ) { - setObjectProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() ); + setObjectProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() ); } n2 = n2.nextSibling().toElement(); } @@ -2606,10 +2607,10 @@ void Resource::loadMenuBar( const TQDomElement &e ) { TQDomElement n = e.firstChild().toElement(); TQMainWindow *mw = ( (TQMainWindow*)formwindow->mainContainer() ); - QDesignerMenuBar *mb = new QDesignerMenuBar( mw ); + TQDesignerMenuBar *mb = new TQDesignerMenuBar( mw ); while ( !n.isNull() ) { if ( n.tagName() == "item" ) { - QDesignerPopupMenu *popup = new QDesignerPopupMenu( mw ); + TQDesignerPopupMenu *popup = new TQDesignerPopupMenu( mw ); popup->setName( n.attribute( "name" ) ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { @@ -2620,7 +2621,7 @@ void Resource::loadMenuBar( const TQDomElement &e ) popup->addAction( a ); } } else if ( n2.tagName() == "separator" ) { - TQAction *a = new QSeparatorAction( 0 ); + TQAction *a = new TQSeparatorAction( 0 ); a->addTo( popup ); popup->addAction( a ); } @@ -2628,7 +2629,7 @@ void Resource::loadMenuBar( const TQDomElement &e ) } mb->insertItem( n.attribute( "text" ), popup ); } else if ( n.tagName() == "property" ) { - setObjectProperty( mb, n.attribute( "name" ), n.firstChild().toElement() ); + setObjectProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() ); } n = n.nextSibling().toElement(); } @@ -2667,11 +2668,11 @@ void Resource::saveFormCode() for ( ; sit != slotList.end(); ++sit ) { MetaDataBase::Slot slot = *sit; TQMap<TQString, TQString>::Iterator it = - functionBodies.find( MetaDataBase::normalizeSlot( (*sit).slot ) ); + functionBodies.tqfind( MetaDataBase::normalizeSlot( (*sit).slot ) ); LanguageInterface::Function func; func.name = slot.slot; func.body = *it; - func.comments = MetaDataBase::functionComments( formwindow, func.name ); + func.comments = MetaDataBase::functionComments( TQT_TQOBJECT(formwindow), func.name ); func.returnType = slot.returnType; funcs.append( func ); } @@ -2699,14 +2700,14 @@ void Resource::saveFormCode() static TQString make_function_pretty( const TQString &s ) { TQString res = s; - if ( res.find( ")" ) - res.find( "(" ) == 1 ) + if ( res.tqfind( ")" ) - res.tqfind( "(" ) == 1 ) return res; - res.replace( TQRegExp( "[(]" ), "( " ); - res.replace( TQRegExp( "[)]" ), " )" ); - res.replace( TQRegExp( "&" ), " &" ); - res.replace( TQRegExp( "[*]" ), " *" ); - res.replace( TQRegExp( "," ), ", " ); - res.replace( TQRegExp( ":" ), " : " ); + res.tqreplace( TQRegExp( "[(]" ), "( " ); + res.tqreplace( TQRegExp( "[)]" ), " )" ); + res.tqreplace( TQRegExp( "&" ), " &" ); + res.tqreplace( TQRegExp( "[*]" ), " *" ); + res.tqreplace( TQRegExp( "," ), ", " ); + res.tqreplace( TQRegExp( ":" ), " : " ); res = res.simplifyWhiteSpace(); return res; } @@ -2724,7 +2725,7 @@ void Resource::loadFunctions( const TQDomElement &e ) } n = n.nextSibling().toElement(); } - MetaDataBase::setFunctionBodies( formwindow, bodies, TQString::null, TQString::null ); + MetaDataBase::setFunctionBodies( TQT_TQOBJECT(formwindow), bodies, TQString(), TQString() ); if ( !bodies.isEmpty() ) { LanguageInterface *iface = langIface; if ( !iface ) @@ -2739,14 +2740,14 @@ void Resource::loadFunctions( const TQDomElement &e ) #endif continue; TQString sl( (*it).slot ); - TQString comments = MetaDataBase::functionComments( formwindow, sl ); + TQString comments = MetaDataBase::functionComments( TQT_TQOBJECT(formwindow), sl ); if ( !comments.isEmpty() ) code += comments + "\n"; code += iface->createFunctionStart( formwindow->name(), make_function_pretty( sl ), ( (*it).returnType.isEmpty() ? TQString( "void" ) : (*it).returnType ) ); - TQMap<TQString, TQString>::Iterator bit = bodies.find( MetaDataBase::normalizeSlot( (*it).slot ) ); + TQMap<TQString, TQString>::Iterator bit = bodies.tqfind( MetaDataBase::normalizeSlot( (*it).slot ) ); if ( bit != bodies.end() ) code += "\n" + *bit + "\n\n"; else @@ -2820,25 +2821,25 @@ void Resource::loadExtraSource() for ( TQValueList<LanguageInterface::Function>::Iterator fit = functions.begin(); fit != functions.end(); ++fit ) { - if ( MetaDataBase::hasSlot( formwindow, (*fit).name.latin1() ) ) - MetaDataBase::changeSlot( formwindow, (*fit).name.latin1(), (*fit).name.latin1() ); + if ( MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), (*fit).name.latin1() ) ) + MetaDataBase::changeSlot( TQT_TQOBJECT(formwindow), (*fit).name.latin1(), (*fit).name.latin1() ); else - MetaDataBase::addSlot( formwindow, (*fit).name.latin1(), "virtual", "public", lang, (*fit).returnType ); - MetaDataBase::setFunctionComments( formwindow, (*fit).name, (*fit).comments ); + MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), (*fit).name.latin1(), "virtual", "public", lang, (*fit).returnType ); + MetaDataBase::setFunctionComments( TQT_TQOBJECT(formwindow), (*fit).name, (*fit).comments ); bodies.insert( MetaDataBase::normalizeSlot( (*fit).name ), (*fit).body ); } - MetaDataBase::setFunctionBodies( formwindow, bodies, TQString::null, TQString::null ); + MetaDataBase::setFunctionBodies( TQT_TQOBJECT(formwindow), bodies, TQString(), TQString() ); TQStringList v = MetaDataBase::variables( formwindow ); TQStringList::Iterator vit; for ( vit = vars.begin(); vit != vars.end(); ++vit ) v << *vit; - MetaDataBase::setVariables( formwindow, v ); + MetaDataBase::setVariables( TQT_TQOBJECT(formwindow), v ); TQStringList f = MetaDataBase::forwards( formwindow ); for ( vit = forwards.begin(); vit != forwards.end(); ++vit ) f << *vit; - MetaDataBase::setForwards( formwindow, f ); + MetaDataBase::setForwards( TQT_TQOBJECT(formwindow), f ); TQValueList<MetaDataBase::Include> incls = MetaDataBase::includes( formwindow ); for ( vit = includesImpl.begin(); vit != includesImpl.end(); ++vit ) { @@ -2853,6 +2854,6 @@ void Resource::loadExtraSource() inc.location = "in declaration"; incls << inc; } - MetaDataBase::setIncludes( formwindow, incls ); + MetaDataBase::setIncludes( TQT_TQOBJECT(formwindow), incls ); } #endif |