diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-02 06:46:49 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-02 06:46:49 +0000 |
commit | b5fb39eb73302856329affac603779129a545abd (patch) | |
tree | d07172449a51f48bbc62681653f71aa1287abd7d /khtml | |
parent | 1c4e273a42588ec915cb94f7b1ceeed2468c9f07 (diff) | |
download | tdelibs-b5fb39eb73302856329affac603779129a545abd.tar.gz tdelibs-b5fb39eb73302856329affac603779129a545abd.zip |
Change most kdelibs inherits() functions to use the new object name define system
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1226839 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml')
-rw-r--r-- | khtml/html/html_formimpl.cpp | 2 | ||||
-rw-r--r-- | khtml/khtml_ext.cpp | 16 | ||||
-rw-r--r-- | khtml/khtml_part.cpp | 4 | ||||
-rw-r--r-- | khtml/rendering/render_frames.cpp | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index 0d3affbc3..d025f428e 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -964,7 +964,7 @@ class FocusHandleWidget : public TQWidget { public: void focusNextPrev(bool n) { - if (!focusNextPrevChild(n) && inherits("QTextEdit")) + if (!focusNextPrevChild(n) && inherits(TQTEXTEDIT_OBJECT_NAME_STRING)) TQWidget::focusNextPrevChild(n); } }; diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp index 2e1ee3350..e802177d1 100644 --- a/khtml/khtml_ext.cpp +++ b/khtml/khtml_ext.cpp @@ -115,7 +115,7 @@ void KHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget ) connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( updateEditActions() ) ); - if ( m_editableFormWidget->inherits( "QLineEdit" ) || m_editableFormWidget->inherits( "QTextEdit" ) ) + if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) connect( m_editableFormWidget, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( updateEditActions() ) ); @@ -140,7 +140,7 @@ void KHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ ) if ( oldWidget ) { - if ( oldWidget->inherits( "QLineEdit" ) || oldWidget->inherits( "QTextEdit" ) ) + if ( oldWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || oldWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) disconnect( oldWidget, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( updateEditActions() ) ); } @@ -201,9 +201,9 @@ void KHTMLPartBrowserExtension::cut() if ( !m_editableFormWidget ) return; - if ( m_editableFormWidget->inherits( "QLineEdit" ) ) + if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->cut(); - else if ( m_editableFormWidget->inherits( "QTextEdit" ) ) + else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->cut(); } @@ -254,9 +254,9 @@ void KHTMLPartBrowserExtension::copy() } else { - if ( m_editableFormWidget->inherits( "QLineEdit" ) ) + if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->copy(); - else if ( m_editableFormWidget->inherits( "QTextEdit" ) ) + else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->copy(); } } @@ -304,9 +304,9 @@ void KHTMLPartBrowserExtension::paste() if ( !m_editableFormWidget ) return; - if ( m_editableFormWidget->inherits( "QLineEdit" ) ) + if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->paste(); - else if ( m_editableFormWidget->inherits( "QTextEdit" ) ) + else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->paste(); } diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index 3bc21ade0..64f0ea247 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -6871,7 +6871,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part ) return; } // kdDebug(6050) << "KHTMLPart::slotActiveFrameChanged d->m_activeFrame=" << d->m_activeFrame << endl; - if ( d->m_activeFrame && d->m_activeFrame->widget() && d->m_activeFrame->widget()->inherits( "QFrame" ) ) + if ( d->m_activeFrame && d->m_activeFrame->widget() && d->m_activeFrame->widget()->inherits( TQFRAME_OBJECT_NAME_STRING ) ) { TQFrame *frame = static_cast<TQFrame *>( d->m_activeFrame->widget() ); if (frame->frameStyle() != TQFrame::NoFrame) @@ -6899,7 +6899,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part ) d->m_activeFrame = part; - if ( d->m_activeFrame && d->m_activeFrame->widget()->inherits( "QFrame" ) ) + if ( d->m_activeFrame && d->m_activeFrame->widget()->inherits( TQFRAME_OBJECT_NAME_STRING ) ) { TQFrame *frame = static_cast<TQFrame *>( d->m_activeFrame->widget() ); if (frame->frameStyle() != TQFrame::NoFrame) diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp index 08f26b8bd..47a433293 100644 --- a/khtml/rendering/render_frames.cpp +++ b/khtml/rendering/render_frames.cpp @@ -674,7 +674,7 @@ RenderFrame::RenderFrame( DOM::HTMLFrameElementImpl *frame ) void RenderFrame::slotViewCleared() { - if(m_widget->inherits("QScrollView")) { + if(m_widget->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING)) { #ifdef DEBUG_LAYOUT kdDebug(6031) << "frame is a scrollview!" << endl; #endif @@ -989,7 +989,7 @@ void RenderPartObject::layout( ) void RenderPartObject::slotViewCleared() { - if(m_widget->inherits("QScrollView") ) { + if(m_widget->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) ) { #ifdef DEBUG_LAYOUT kdDebug(6031) << "iframe is a scrollview!" << endl; #endif |