From a21c1c9b1dca09b9ab3a56d60e6f4c7a253689f8 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 24 Feb 2011 07:08:32 +0000 Subject: 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/kdepim@1222475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkdepim/designerfields.cpp | 58 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'libkdepim/designerfields.cpp') diff --git a/libkdepim/designerfields.cpp b/libkdepim/designerfields.cpp index 5569c258..bb5b8c25 100644 --- a/libkdepim/designerfields.cpp +++ b/libkdepim/designerfields.cpp @@ -63,16 +63,16 @@ void DesignerFields::initGUI( const TQString &uiFile ) tqlayout->addWidget( wdg ); - TQObjectList *list = wdg->queryList( "TQWidget" ); + TQObjectList *list = wdg->queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *list ); TQStringList allowedTypes; - allowedTypes << "TQLineEdit" - << "TQTextEdit" - << "TQSpinBox" - << "TQCheckBox" - << "TQComboBox" - << "QDateTimeEdit" + allowedTypes << TQLINEEDIT_OBJECT_NAME_STRING + << TQTEXTEDIT_OBJECT_NAME_STRING + << TQSPINBOX_OBJECT_NAME_STRING + << TQCHECKBOX_OBJECT_NAME_STRING + << TQCOMBOBOX_OBJECT_NAME_STRING + << TQDATETIMEEDIT_OBJECT_NAME_STRING << "KLineEdit" << "KDateTimeWidget" << "KDatePicker"; @@ -87,19 +87,19 @@ void DesignerFields::initGUI( const TQString &uiFile ) if ( !name.isEmpty() ) mWidgets.insert( name, widget ); - if ( it.current()->inherits( "TQLineEdit" ) ) + if ( it.current()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) connect( it.current(), TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) ); - else if ( it.current()->inherits( "TQSpinBox" ) ) + else if ( it.current()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) connect( it.current(), TQT_SIGNAL( valueChanged( int ) ), TQT_SIGNAL( modified() ) ); - else if ( it.current()->inherits( "TQCheckBox" ) ) + else if ( it.current()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) connect( it.current(), TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( modified() ) ); - else if ( it.current()->inherits( "TQComboBox" ) ) + else if ( it.current()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) connect( it.current(), TQT_SIGNAL( activated( const TQString& ) ), TQT_SIGNAL( modified() ) ); - else if ( it.current()->inherits( "QDateTimeEdit" ) ) + else if ( it.current()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) connect( it.current(), TQT_SIGNAL( valueChanged( const TQDateTime& ) ), TQT_SIGNAL( modified() ) ); else if ( it.current()->inherits( "KDateTimeWidget" ) ) @@ -108,7 +108,7 @@ void DesignerFields::initGUI( const TQString &uiFile ) else if ( it.current()->inherits( "KDatePicker" ) ) connect( it.current(), TQT_SIGNAL( dateChanged( TQDate ) ), TQT_SIGNAL( modified() ) ); - else if ( it.current()->inherits( "TQTextEdit" ) ) + else if ( it.current()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) connect( it.current(), TQT_SIGNAL( textChanged() ), TQT_SIGNAL( modified() ) ); @@ -143,13 +143,13 @@ void DesignerFields::load( DesignerFields::Storage *storage ) TQMap::ConstIterator widIt; for ( widIt = mWidgets.begin(); widIt != mWidgets.end(); ++widIt ) { TQString value; - if ( widIt.data()->inherits( "TQLineEdit" ) ) { + if ( widIt.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) { TQLineEdit *wdg = static_cast( widIt.data() ); wdg->setText( TQString::null ); - } else if ( widIt.data()->inherits( "TQSpinBox" ) ) { + } else if ( widIt.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) { TQSpinBox *wdg = static_cast( widIt.data() ); wdg->setValue( wdg->minValue() ); - } else if ( widIt.data()->inherits( "TQCheckBox" ) ) { + } else if ( widIt.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) { TQCheckBox *wdg = static_cast( widIt.data() ); wdg->setChecked( false ); } else if ( widIt.data()->inherits( "QDateTimeEdit" ) ) { @@ -161,10 +161,10 @@ void DesignerFields::load( DesignerFields::Storage *storage ) } else if ( widIt.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast( widIt.data() ); wdg->setDate( TQDate::tqcurrentDate() ); - } else if ( widIt.data()->inherits( "TQComboBox" ) ) { + } else if ( widIt.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { TQComboBox *wdg = static_cast( widIt.data() ); wdg->setCurrentItem( 0 ); - } else if ( widIt.data()->inherits( "TQTextEdit" ) ) { + } else if ( widIt.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) { TQTextEdit *wdg = static_cast( widIt.data() ); wdg->setText( TQString::null ); } @@ -176,16 +176,16 @@ void DesignerFields::load( DesignerFields::Storage *storage ) TQMap::ConstIterator it = mWidgets.find( *it2 ); if ( it != mWidgets.end() ) { - if ( it.data()->inherits( "TQLineEdit" ) ) { + if ( it.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) { TQLineEdit *wdg = static_cast( it.data() ); wdg->setText( value ); - } else if ( it.data()->inherits( "TQSpinBox" ) ) { + } else if ( it.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) { TQSpinBox *wdg = static_cast( it.data() ); wdg->setValue( value.toInt() ); - } else if ( it.data()->inherits( "TQCheckBox" ) ) { + } else if ( it.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) { TQCheckBox *wdg = static_cast( it.data() ); wdg->setChecked( value == "true" || value == "1" ); - } else if ( it.data()->inherits( "QDateTimeEdit" ) ) { + } else if ( it.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { QDateTimeEdit *wdg = static_cast( it.data() ); wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) ); } else if ( it.data()->inherits( "KDateTimeWidget" ) ) { @@ -194,10 +194,10 @@ void DesignerFields::load( DesignerFields::Storage *storage ) } else if ( it.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast( it.data() ); wdg->setDate( TQDate::fromString( value, Qt::ISODate ) ); - } else if ( it.data()->inherits( "TQComboBox" ) ) { + } else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { TQComboBox *wdg = static_cast( it.data() ); wdg->setCurrentText( value ); - } else if ( it.data()->inherits( "TQTextEdit" ) ) { + } else if ( it.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) { TQTextEdit *wdg = static_cast( it.data() ); wdg->setText( value ); } @@ -210,13 +210,13 @@ void DesignerFields::save( DesignerFields::Storage *storage ) TQMap::Iterator it; for ( it = mWidgets.begin(); it != mWidgets.end(); ++it ) { TQString value; - if ( it.data()->inherits( "TQLineEdit" ) ) { + if ( it.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) { TQLineEdit *wdg = static_cast( it.data() ); value = wdg->text(); - } else if ( it.data()->inherits( "TQSpinBox" ) ) { + } else if ( it.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) { TQSpinBox *wdg = static_cast( it.data() ); value = TQString::number( wdg->value() ); - } else if ( it.data()->inherits( "TQCheckBox" ) ) { + } else if ( it.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) { TQCheckBox *wdg = static_cast( it.data() ); value = ( wdg->isChecked() ? "true" : "false" ); } else if ( it.data()->inherits( "QDateTimeEdit" ) ) { @@ -228,10 +228,10 @@ void DesignerFields::save( DesignerFields::Storage *storage ) } else if ( it.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast( it.data() ); value = wdg->date().toString( Qt::ISODate ); - } else if ( it.data()->inherits( "TQComboBox" ) ) { + } else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { TQComboBox *wdg = static_cast( it.data() ); value = wdg->currentText(); - } else if ( it.data()->inherits( "TQTextEdit" ) ) { + } else if ( it.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) { TQTextEdit *wdg = static_cast( it.data() ); value = wdg->text(); } -- cgit v1.2.3