diff options
Diffstat (limited to 'kommander/factory/kommanderfactory.cpp')
-rw-r--r-- | kommander/factory/kommanderfactory.cpp | 82 |
1 files changed, 39 insertions, 43 deletions
diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 6fa28221..f3cbb0e1 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -25,10 +25,6 @@ #include "kommanderfactory.h" #include <kommanderplugin.h> -#ifdef TQT_NO_SQL -#define TQT_NO_SQL -#endif // TQT_NO_SQL - #include <tqfeatures.h> #include "config.h" #ifndef TQT_NO_SQL @@ -135,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 ); @@ -292,8 +288,8 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg } for ( TQMap<TQString, TQString>::Iterator it = widgetFactory->buddies.begin(); it != widgetFactory->buddies.end(); ++it ) { - TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key(), "TQLabel" ); - TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( *it, "TQWidget" ); + TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key().utf8(), "TQLabel" ); + TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( (*it).utf8(), "TQWidget" ); if ( label && buddy ) label->setBuddy( buddy ); } @@ -521,7 +517,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge // hide layout widgets w = parent; } else { - obj = TQT_TQOBJECT(KommanderFactory::createWidget( className, parent, 0 )); + obj = KommanderFactory::createWidget( className, parent, 0 ); if ( !obj ) { return 0; @@ -567,7 +563,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge layout = createLayout( 0, 0, KommanderFactory::HBox ); else layout = createLayout( w, layout, KommanderFactory::HBox ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); @@ -578,7 +574,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge layout = createLayout( 0, 0, KommanderFactory::Grid ); else layout = createLayout( w, layout, KommanderFactory::Grid ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); @@ -589,7 +585,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge layout = createLayout( 0, 0, KommanderFactory::VBox ); else layout = createLayout( w, layout, KommanderFactory::VBox ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); @@ -640,7 +636,7 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* layout, L if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) { TQGroupBox *gb = (TQGroupBox*)widget; - gb->setColumnLayout( 0, Qt::Vertical ); + gb->setColumnLayout( 0, TQt::Vertical ); gb->layout()->setMargin( 0 ); gb->layout()->setSpacing( 0 ); TQLayout *l; @@ -728,7 +724,7 @@ KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *layout ) co void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const TQDomElement &e ) { - const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true ); + const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop.latin1(), true ), true ); TQVariant defVariant; if ( e.tagName() == "font" ) { @@ -820,24 +816,24 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T v = TQPalette( p ); } else if ( e.tagName() == "enum" && p && p->isEnumType() ) { TQString key( v.toString() ); - v = TQVariant( p->keyToValue( key ) ); + v = TQVariant( p->keyToValue( key.utf8() ) ); } else if ( e.tagName() == "set" && p && p->isSetType() ) { TQString keys( v.toString() ); TQStringList lst = TQStringList::split( '|', keys ); TQStrList l; for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) - l.append( *it ); + l.append( (*it).utf8() ); v = TQVariant( p->keysToValue( l ) ); } if ( prop == "geometry" ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) { + if ( obj == toplevel ) { toplevel->resize( v.toRect().size() ); return; } } - obj->setProperty( prop, v ); + obj->setProperty( prop.latin1(), v ); } void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) @@ -848,7 +844,7 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) int rowspan = e.attribute( "rowspan" ).toInt(); int colspan = e.attribute( "colspan" ).toInt(); - Qt::Orientation orient = Qt::Horizontal; + TQt::Orientation orient = TQt::Horizontal; int w = 0, h = 0; TQSizePolicy::SizeType sizeType = TQSizePolicy::Preferred; while ( !n.isNull() ) { @@ -856,9 +852,9 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) TQString prop = n.attribute( "name" ); if ( prop == "orientation" ) { if ( n.firstChild().firstChild().toText().data() == "Horizontal" ) - orient = Qt::Horizontal; + orient = TQt::Horizontal; else - orient = Qt::Vertical; + orient = TQt::Vertical; } else if ( prop == "sizeType" ) { if ( n.firstChild().firstChild().toText().data() == "Fixed" ) sizeType = TQSizePolicy::Fixed; @@ -884,14 +880,14 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) rowspan = 1; if ( colspan < 1 ) colspan = 1; - TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum, - orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum ); + TQSpacerItem *item = new TQSpacerItem( w, h, orient == TQt::Horizontal ? sizeType : TQSizePolicy::Minimum, + orient == TQt::Vertical ? sizeType : TQSizePolicy::Minimum ); if ( layout ) { if ( layout->inherits( "TQBoxLayout" ) ) ( (TQBoxLayout*)layout )->addItem( item ); else ( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1, - orient == Qt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter ); + orient == TQt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter ); } } @@ -924,7 +920,7 @@ static TQImage loadImageData( TQDomElement &n2 ) ::uncompress( (uchar*) baunzip.data(), &len, (uchar*) ba, data.length()/2 ); img.loadFromData( (const uchar*)baunzip.data(), len, "XPM" ); } else { - img.loadFromData( (const uchar*)ba, data.length() / 2, format ); + img.loadFromData( (const uchar*)ba, data.length() / 2, format.utf8() ); } delete [] ba; @@ -1025,12 +1021,12 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect while ( !n2.isNull() ) { if ( n2.tagName() == "sender" ) { TQString name = n2.firstChild().toText().data(); - if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { - conn.sender = TQT_TQOBJECT(toplevel); + if ( name == "this" || name == toplevel->name() ) { + conn.sender = toplevel; } else { if ( name == "this" ) name = toplevel->name(); - TQObjectList *l = toplevel->queryList( 0, name, false ); + TQObjectList *l = toplevel->queryList( 0, name.utf8(), false ); if ( l ) { if ( l->first() ) conn.sender = l->first(); @@ -1040,13 +1036,13 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect if ( !conn.sender ) conn.sender = findAction( name ); } else if ( n2.tagName() == "signal" ) { - conn.signal = n2.firstChild().toText().data(); + conn.signal = n2.firstChild().toText().data().utf8(); } else if ( n2.tagName() == "receiver" ) { TQString name = n2.firstChild().toText().data(); - if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { - conn.receiver = TQT_TQOBJECT(toplevel); + if ( name == "this" || name == toplevel->name() ) { + conn.receiver = toplevel; } else { - TQObjectList *l = toplevel->queryList( 0, name, false ); + TQObjectList *l = toplevel->queryList( 0, name.utf8(), false ); if ( l ) { if ( l->first() ) conn.receiver = l->first(); @@ -1054,7 +1050,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect } } } else if ( n2.tagName() == "slot" ) { - conn.slot = n2.firstChild().toText().data(); + conn.slot = n2.firstChild().toText().data().utf8(); } n2 = n2.nextSibling().toElement(); } @@ -1065,7 +1061,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect TQObject *sender = 0, *receiver = 0; TQObjectList *l = toplevel->queryList( 0, conn.sender->name(), false ); if ( qstrcmp( conn.sender->name(), toplevel->name() ) == 0 ) { - sender = TQT_TQOBJECT(toplevel); + sender = toplevel; } else { if ( !l || !l->first() ) { delete l; @@ -1079,7 +1075,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect sender = findAction( conn.sender->name() ); if ( qstrcmp( conn.receiver->name(), toplevel->name() ) == 0 ) { - receiver = TQT_TQOBJECT(toplevel); + receiver = toplevel; } else { l = toplevel->queryList( 0, conn.receiver->name(), false ); if ( !l || !l->first() ) { @@ -1101,7 +1097,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect TQStrList slotList = receiver->metaObject()->slotNames( true ); // if this is a connection to a custom slot and we have a connector, try this as receiver - if ( slotList.find( conn.slot ) == -1 && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel) && connector ) { + if ( slotList.find( conn.slot ) == -1 && receiver == toplevel && connector ) { slotList = connector->metaObject()->slotNames( true ); receiver = connector; } @@ -1112,7 +1108,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect n = n.nextSibling().toElement(); continue; } - TQObject::connect( sender, s, receiver, s2 ); + TQObject::connect( sender, s.utf8(), receiver, s2.utf8() ); } else { EventFunction ef = eventMap[ conn.sender ]; ef.events.append( conn.signal ); @@ -1134,7 +1130,7 @@ void KommanderFactory::loadTabOrder( const TQDomElement &e ) while ( !n.isNull() ) { if ( n.tagName() == "tabstop" ) { TQString name = n.firstChild().toText().data(); - TQObjectList *l = toplevel->queryList( 0, name, false ); + TQObjectList *l = toplevel->queryList( 0, name.utf8(), false ); if ( l ) { if ( l->first() ) { TQWidget *w = (TQWidget*)l->first(); @@ -1390,9 +1386,9 @@ void KommanderFactory::loadActions( const TQDomElement &e ) TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" ) { - loadChildAction( TQT_TQOBJECT(toplevel), n ); + loadChildAction( toplevel, n ); } else if ( n.tagName() == "actiongroup" ) { - loadChildAction( TQT_TQOBJECT(toplevel), n ); + loadChildAction( toplevel, n ); } n = n.nextSibling().toElement(); } @@ -1408,7 +1404,7 @@ void KommanderFactory::loadToolBars( const TQDomElement &e ) TQt::Dock dock = (TQt::Dock)n.attribute( "dock" ).toInt(); tb = new TQToolBar( TQString(), mw, dock ); tb->setLabel( n.attribute( "label" ) ); - tb->setName( n.attribute( "name" ) ); + tb->setName( n.attribute( "name" ).utf8() ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { @@ -1420,7 +1416,7 @@ void KommanderFactory::loadToolBars( const TQDomElement &e ) } else if ( n2.tagName() == "widget" ) { (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", "TQWidget" ) ); } else if ( n2.tagName() == "property" ) { - setProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() ); + setProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() ); } n2 = n2.nextSibling().toElement(); } @@ -1437,7 +1433,7 @@ void KommanderFactory::loadMenuBar( const TQDomElement &e ) while ( !n.isNull() ) { if ( n.tagName() == "item" ) { TQPopupMenu *popup = new TQPopupMenu( mw ); - popup->setName( n.attribute( "name" ) ); + popup->setName( n.attribute( "name" ).utf8() ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { @@ -1451,7 +1447,7 @@ void KommanderFactory::loadMenuBar( const TQDomElement &e ) } mb->insertItem( translate( n.attribute( "text" ) ), popup ); } else if ( n.tagName() == "property" ) { - setProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() ); + setProperty( mb, n.attribute( "name" ), n.firstChild().toElement() ); } n = n.nextSibling().toElement(); } |