diff options
Diffstat (limited to 'kommander/editor/metadatabase.cpp')
-rw-r--r-- | kommander/editor/metadatabase.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp index 23e97618..5c2d6681 100644 --- a/kommander/editor/metadatabase.cpp +++ b/kommander/editor/metadatabase.cpp @@ -48,7 +48,7 @@ class MetaDataBaseRecord public: TQObject *object; TQStringList changedProperties; - TQMap<TQString,TQVariant> fakeProperties; + TQStringVariantMap fakeProperties; TQMap<TQString, TQString> propertyComments; int spacing, margin; TQValueList<MetaDataBase::Connection> connections; @@ -237,14 +237,14 @@ TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property) o, o->name(), o->className() ); return TQVariant(); } - TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.find( property ); + TQStringVariantMap::Iterator it = r->fakeProperties.find( property ); if ( it != r->fakeProperties.end() ) return r->fakeProperties[property]; return WidgetFactory::defaultValue( o, property ); } -TQMap<TQString,TQVariant>* MetaDataBase::fakeProperties( TQObject* o ) +TQStringVariantMap* MetaDataBase::fakeProperties( TQObject* o ) { setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); @@ -280,9 +280,9 @@ int MetaDataBase::spacing( TQObject *o ) if ( !o ) return -1; setupDataBase(); - if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) - o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); - MetaDataBaseRecord *r = db->find( TQT_TQOBJECT(o) ); + if ( o->inherits( "TQMainWindow" ) ) + o = ( (TQMainWindow*)o )->centralWidget(); + MetaDataBaseRecord *r = db->find( o ); if ( !r || !o->isWidgetType() ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -318,8 +318,8 @@ int MetaDataBase::margin( TQObject *o ) if ( !o ) return -1; setupDataBase(); - if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) - o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); + if ( o->inherits( "TQMainWindow" ) ) + o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", @@ -477,7 +477,7 @@ void MetaDataBase::doConnections( TQObject *o ) slotList.find( conn.slot ) == -1 ) continue; - TQObject::connect( sender, s, receiver, s2 ); + TQObject::connect( sender, s.utf8(), receiver, s2.utf8() ); } } @@ -652,7 +652,7 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom return true; if ( o->inherits( "FormWindow" ) ) { - o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); + o = ( (FormWindow*)o )->mainContainer(); slotList = o->metaObject()->slotNames( true ); if ( slotList.find( slot ) != -1 ) return true; @@ -1019,7 +1019,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const { TQStrList slotList = TQWidget::staticMetaObject()->slotNames( true ); - if ( slotList.find( normalizeSlot( slot ) ) != -1 ) + if ( slotList.find( normalizeSlot(slot).utf8() ) != -1 ) return true; for ( TQValueList<MetaDataBase::Slot>::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) { |