Fix a number of runtime object identification problems which led to an even larger array of minor glitches

NOTE: kdevelop and kdewebdev still need to be fully repaired


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1222475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent e41eabc5fc
commit 9cbbf05386

@ -214,7 +214,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
if ( !imageCollection.isNull() ) if ( !imageCollection.isNull() )
widgetFactory->loadImageCollection( imageCollection ); widgetFactory->loadImageCollection( imageCollection );
widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", "TQWidget") ); widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) );
TQWidget *w = widgetFactory->toplevel; TQWidget *w = widgetFactory->toplevel;
if ( !w ) { if ( !w ) {
delete widgetFactory; delete widgetFactory;
@ -263,7 +263,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
} }
for ( TQMap<TQString, TQStringList>::Iterator it = widgetFactory->dbTables.begin(); it != widgetFactory->dbTables.end(); ++it ) { for ( TQMap<TQString, TQStringList>::Iterator it = widgetFactory->dbTables.begin(); it != widgetFactory->dbTables.end(); ++it ) {
TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), "TQDataTable" ); TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), TQDATATABLE_OBJECT_NAME_STRING );
if ( !table ) if ( !table )
continue; continue;
if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != widgetFactory->noDatabaseWidgets.end() ) if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != widgetFactory->noDatabaseWidgets.end() )
@ -289,8 +289,8 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
} }
for ( TQMap<TQString, TQString>::Iterator it = widgetFactory->buddies.begin(); it != widgetFactory->buddies.end(); ++it ) { for ( TQMap<TQString, TQString>::Iterator it = widgetFactory->buddies.begin(); it != widgetFactory->buddies.end(); ++it ) {
TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key(), "TQLabel" ); TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key(), TQLABEL_OBJECT_NAME_STRING );
TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( *it, "TQWidget" ); TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( *it, TQWIDGET_OBJECT_NAME_STRING );
if ( label && buddy ) if ( label && buddy )
label->setBuddy( buddy ); label->setBuddy( buddy );
} }
@ -312,7 +312,7 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi
TQString className = literalClassName; TQString className = literalClassName;
// create widgets we know // create widgets we know
if (className == "TQPushButton") if (className == TQPUSHBUTTON_OBJECT_NAME_STRING)
return new TQPushButton(parent, name); return new TQPushButton(parent, name);
else if (className == "TQToolButton") else if (className == "TQToolButton")
return new TQToolButton(parent, name); return new TQToolButton(parent, name);

Loading…
Cancel
Save