diff options
Diffstat (limited to 'kdevdesigner/designer/metadatabase.cpp')
-rw-r--r-- | kdevdesigner/designer/metadatabase.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp index 5f8ce367..fec4a368 100644 --- a/kdevdesigner/designer/metadatabase.cpp +++ b/kdevdesigner/designer/metadatabase.cpp @@ -42,7 +42,7 @@ #include <tqapplication.h> #include <tqobject.h> -#include <tqlayout.h> +#include <layout.h> #include <tqptrdict.h> #include <tqobjectlist.h> #include <tqstrlist.h> @@ -54,7 +54,7 @@ #include <tqdatetime.h> #include <tqfile.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <stdlib.h> @@ -167,14 +167,14 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo if ( doUpdate && ( property == "hAlign" || property == "vAlign" || property == "wordwrap" ) ) { doUpdate = FALSE; - setPropertyChanged( o, "tqalignment", changed || + setPropertyChanged( o, "alignment", changed || isPropertyChanged( o, "hAlign" ) || isPropertyChanged( o, "vAlign" ) || isPropertyChanged( o, "wordwrap" ) ); doUpdate = TRUE; } - if ( doUpdate && property == "tqalignment" ) { + if ( doUpdate && property == "alignment" ) { doUpdate = FALSE; setPropertyChanged( o, "hAlign", changed ); setPropertyChanged( o, "vAlign", changed ); @@ -303,16 +303,16 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing ) } r->spacing = spacing; - TQLayout * tqlayout = 0; - WidgetFactory::layoutType( (TQWidget*)o, tqlayout ); - if ( tqlayout ) { + TQLayout * layout = 0; + WidgetFactory::layoutType( (TQWidget*)o, layout ); + if ( layout ) { int spadef = 6; if ( MainWindow::self->formWindow() ) spadef = MainWindow::self->formWindow()->layoutDefaultSpacing(); if ( spacing == -1 ) - tqlayout->setSpacing( spadef ); + layout->setSpacing( spadef ); else - tqlayout->setSpacing( spacing ); + layout->setSpacing( spacing ); } } @@ -346,8 +346,8 @@ void MetaDataBase::setMargin( TQObject *o, int margin ) } r->margin = margin; - TQLayout * tqlayout = 0; - WidgetFactory::layoutType( (TQWidget*)o, tqlayout ); + TQLayout * layout = 0; + WidgetFactory::layoutType( (TQWidget*)o, layout ); bool isInnerLayout = TRUE; @@ -358,18 +358,18 @@ void MetaDataBase::setMargin( TQObject *o, int margin ) isInnerLayout = FALSE; - if ( tqlayout ) { + if ( layout ) { int mardef = 11; if ( MainWindow::self->formWindow() ) mardef = MainWindow::self->formWindow()->layoutDefaultMargin(); if ( margin == -1 ) { if ( isInnerLayout ) - tqlayout->setMargin( 1 ); + layout->setMargin( 1 ); else - tqlayout->setMargin( TQMAX( 1, mardef ) ); + layout->setMargin( TQMAX( 1, mardef ) ); } else - tqlayout->setMargin( TQMAX( 1, margin ) ); + layout->setMargin( TQMAX( 1, margin ) ); } } @@ -648,12 +648,12 @@ void MetaDataBase::doConnections( TQObject *o ) delete l; } TQString s = "2""%1"; - s = s.tqarg( conn.signal.data() ); + s = s.arg( conn.signal.data() ); TQString s2 = "1""%1"; - s2 = s2.tqarg( conn.slot.data() ); + s2 = s2.arg( conn.slot.data() ); - TQStrList signalList = sender->tqmetaObject()->signalNames( TRUE ); - TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE ); + TQStrList signalList = sender->metaObject()->signalNames( TRUE ); + TQStrList slotList = receiver->metaObject()->slotNames( TRUE ); // avoid warnings if ( signalList.find( conn.signal ) == -1 || @@ -675,13 +675,13 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom } if ( !onlyCustom ) { - TQStrList slotList = o->tqmetaObject()->slotNames( TRUE ); + TQStrList slotList = o->metaObject()->slotNames( TRUE ); if ( slotList.find( slot ) != -1 ) return TRUE; if ( ::tqqt_cast<FormWindow*>(o) ) { o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); - slotList = o->tqmetaObject()->slotNames( TRUE ); + slotList = o->metaObject()->slotNames( TRUE ); if ( slotList.find( slot ) != -1 ) return TRUE; } @@ -905,13 +905,13 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl } if ( !onlyCustom ) { - TQStrList functionList = o->tqmetaObject()->slotNames( TRUE ); + TQStrList functionList = o->metaObject()->slotNames( TRUE ); if ( functionList.find( function ) != -1 ) return TRUE; if ( ::tqqt_cast<FormWindow*>(o) ) { o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); - functionList = o->tqmetaObject()->slotNames( TRUE ); + functionList = o->metaObject()->slotNames( TRUE ); if ( functionList.find( function ) != -1 ) return TRUE; } @@ -1276,7 +1276,7 @@ MetaDataBase::CustomWidget::CustomWidget() className = "MyCustomWidget"; includeFile = "mywidget.h"; includePolicy = Local; - tqsizeHint = TQSize( -1, -1 ); + sizeHint = TQSize( -1, -1 ); pixmap = new TQPixmap( BarIcon( "designer_customwidget.png", KDevDesignerPartFactory::instance() ) ); id = -1; sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); @@ -1288,7 +1288,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w ) className = w.className; includeFile = w.includeFile; includePolicy = w.includePolicy; - tqsizeHint = w.tqsizeHint; + sizeHint = w.sizeHint; if ( w.pixmap ) pixmap = new TQPixmap( *w.pixmap ); else @@ -1339,7 +1339,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW className = w.className; includeFile = w.includeFile; includePolicy = w.includePolicy; - tqsizeHint = w.tqsizeHint; + sizeHint = w.sizeHint; if ( w.pixmap ) pixmap = new TQPixmap( *w.pixmap ); else @@ -1354,7 +1354,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const { - TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( TRUE ); + TQStrList sigList = TQWidget::staticMetaObject()->signalNames( TRUE ); if ( sigList.find( signal ) != -1 ) return TRUE; for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) { @@ -1366,7 +1366,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const { - TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( TRUE ); + TQStrList slotList = TQWidget::staticMetaObject()->slotNames( TRUE ); if ( slotList.find( normalizeFunction( slot ) ) != -1 ) return TRUE; @@ -1379,7 +1379,7 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const { - TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( TRUE ); + TQStrList propList = TQWidget::staticMetaObject()->propertyNames( TRUE ); if ( propList.find( prop ) != -1 ) return TRUE; |