From 4ddfca384ced9ad654213aef9dc2c3973720b980 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 24 Feb 2011 07:08:32 +0000 Subject: [PATCH] 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/kdemultimedia@1222475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- arts/builder/qttableview.cpp | 4 ++-- juk/tageditor.cpp | 2 +- kmix/mdwslider.cpp | 6 +++--- noatun/modules/metatag/edit.cpp | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp index 1a283ed0..dee8cb99 100644 --- a/arts/builder/qttableview.cpp +++ b/arts/builder/qttableview.cpp @@ -1391,7 +1391,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) TQRect r = viewR; r.setLeft( xPos ); r.setBottom( yPos(e); - if(watched->inherits("TQSpinBox") && e->type() == TQEvent::KeyRelease && ke->state() == 0) + if(watched->inherits(TQSPINBOX_OBJECT_NAME_STRING) && e->type() == TQEvent::KeyRelease && ke->state() == 0) slotDataChanged(); return false; diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp index 9062c408..81d51668 100644 --- a/kmix/mdwslider.cpp +++ b/kmix/mdwslider.cpp @@ -471,7 +471,7 @@ MDWSlider::setStereoLinked(bool value) ***********************************************************/ int firstSliderValue = 0; bool firstSliderValueValid = false; - if (slider->isA("TQSlider") ) { + if (slider->isA(TQSLIDER_OBJECT_NAME_STRING) ) { TQSlider *sld = static_cast(slider); firstSliderValue = sld->value(); firstSliderValueValid = true; @@ -494,7 +494,7 @@ MDWSlider::setStereoLinked(bool value) if ( firstSliderValueValid ) { // Remark: firstSlider== 0 could happen, if the static_cast above fails. // It's a safety measure, if we got other Slider types in the future. - if (slider->isA("TQSlider") ) { + if (slider->isA(TQSLIDER_OBJECT_NAME_STRING) ) { TQSlider *sld = static_cast(slider); sld->setValue( firstSliderValue ); } @@ -539,7 +539,7 @@ MDWSlider::setTicks( bool ticks ) slider = m_sliders.first(); - if ( slider->inherits( "TQSlider" ) ) + if ( slider->inherits( TQSLIDER_OBJECT_NAME_STRING ) ) { if( ticks ) if( isStereoLinked() ) diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp index beb0fd0d..83c53c1f 100644 --- a/noatun/modules/metatag/edit.cpp +++ b/noatun/modules/metatag/edit.cpp @@ -122,11 +122,11 @@ void Editor::saveControl(KFileMetaInfo& meta_info, const MetaWidget &meta_widget if (!meta_widget.widget->isEnabled()) return; - if (meta_widget.widget->inherits("TQSpinBox")) + if (meta_widget.widget->inherits(TQSPINBOX_OBJECT_NAME_STRING)) value = static_cast(meta_widget.widget)->value(); - else if (meta_widget.widget->inherits("TQComboBox")) + else if (meta_widget.widget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) value = static_cast(meta_widget.widget)->currentText(); - else if (meta_widget.widget->inherits("TQLineEdit")) + else if (meta_widget.widget->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) value = static_cast(meta_widget.widget)->text(); TQString group = keyGroup(meta_info, meta_widget.key); @@ -204,7 +204,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe box->setValidator(validator); // Is it an integer validator - if (validator->inherits("TQIntValidator")) { + if (validator->inherits(TQINTVALIDATOR_OBJECT_NAME_STRING)) { TQIntValidator *int_validator = static_cast(validator); // FIXME: Why the -hell- doesn't TQSpinBox::setValidator() do this??