summaryrefslogtreecommitdiffstats
path: root/tdehtml
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-07-12 11:09:49 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-07-13 10:04:24 +0900
commit707310036113d2d0ae9da1cc7f85d0e642bf9686 (patch)
treeafa9b616af366f63e0418df74b2287299d8572a3 /tdehtml
parent08eacf589a6ee0358c49f177fca34a29e0515164 (diff)
downloadtdelibs-707310036113d2d0ae9da1cc7f85d0e642bf9686.tar.gz
tdelibs-707310036113d2d0ae9da1cc7f85d0e642bf9686.zip
Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 36c049e135b0cec7cf97b41888860186813df5f0)
Diffstat (limited to 'tdehtml')
-rw-r--r--tdehtml/html/html_formimpl.cpp2
-rw-r--r--tdehtml/rendering/render_frames.cpp4
-rw-r--r--tdehtml/tdehtml_ext.cpp16
-rw-r--r--tdehtml/tdehtml_part.cpp4
-rw-r--r--tdehtml/tdehtmlview.cpp2
5 files changed, 14 insertions, 14 deletions
diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index 5dc44ad04..af9008dd3 100644
--- a/tdehtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -964,7 +964,7 @@ class FocusHandleWidget : public TQWidget
{
public:
void focusNextPrev(bool n) {
- if (!focusNextPrevChild(n) && inherits(TQTEXTEDIT_OBJECT_NAME_STRING))
+ if (!focusNextPrevChild(n) && inherits("TQTextEdit"))
TQWidget::focusNextPrevChild(n);
}
};
diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp
index 68c66495a..5ec96aad4 100644
--- a/tdehtml/rendering/render_frames.cpp
+++ b/tdehtml/rendering/render_frames.cpp
@@ -674,7 +674,7 @@ RenderFrame::RenderFrame( DOM::HTMLFrameElementImpl *frame )
void RenderFrame::slotViewCleared()
{
- if(m_widget->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING)) {
+ if(m_widget->inherits("TQScrollView")) {
#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(TQSCROLLVIEW_OBJECT_NAME_STRING) ) {
+ if(m_widget->inherits("TQScrollView") ) {
#ifdef DEBUG_LAYOUT
kdDebug(6031) << "iframe is a scrollview!" << endl;
#endif
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index e90f5db4f..03b38a75d 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -114,7 +114,7 @@ void TDEHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget )
connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
this, TQT_SLOT( updateEditActions() ) );
- if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
+ if ( m_editableFormWidget->inherits( "TQLineEdit" ) || m_editableFormWidget->inherits( "TQTextEdit" ) )
connect( m_editableFormWidget, TQT_SIGNAL( selectionChanged() ),
this, TQT_SLOT( updateEditActions() ) );
@@ -139,7 +139,7 @@ void TDEHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ )
if ( oldWidget )
{
- if ( oldWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || oldWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
+ if ( oldWidget->inherits( "TQLineEdit" ) || oldWidget->inherits( "TQTextEdit" ) )
disconnect( oldWidget, TQT_SIGNAL( selectionChanged() ),
this, TQT_SLOT( updateEditActions() ) );
}
@@ -200,9 +200,9 @@ void TDEHTMLPartBrowserExtension::cut()
if ( !m_editableFormWidget )
return;
- if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) )
+ if ( m_editableFormWidget->inherits( "TQLineEdit" ) )
static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->cut();
- else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
+ else if ( m_editableFormWidget->inherits( "TQTextEdit" ) )
static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->cut();
}
@@ -253,9 +253,9 @@ void TDEHTMLPartBrowserExtension::copy()
}
else
{
- if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) )
+ if ( m_editableFormWidget->inherits( "TQLineEdit" ) )
static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->copy();
- else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
+ else if ( m_editableFormWidget->inherits( "TQTextEdit" ) )
static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->copy();
}
}
@@ -303,9 +303,9 @@ void TDEHTMLPartBrowserExtension::paste()
if ( !m_editableFormWidget )
return;
- if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) )
+ if ( m_editableFormWidget->inherits( "TQLineEdit" ) )
static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->paste();
- else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
+ else if ( m_editableFormWidget->inherits( "TQTextEdit" ) )
static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->paste();
}
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index b822212ac..769c83a9f 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -6876,7 +6876,7 @@ void TDEHTMLPart::slotActiveFrameChanged( KParts::Part *part )
return;
}
// kdDebug(6050) << "TDEHTMLPart::slotActiveFrameChanged d->m_activeFrame=" << d->m_activeFrame << endl;
- if ( d->m_activeFrame && d->m_activeFrame->widget() && d->m_activeFrame->widget()->inherits( TQFRAME_OBJECT_NAME_STRING ) )
+ if ( d->m_activeFrame && d->m_activeFrame->widget() && d->m_activeFrame->widget()->inherits( "TQFrame" ) )
{
TQFrame *frame = static_cast<TQFrame *>( d->m_activeFrame->widget() );
if (frame->frameStyle() != TQFrame::NoFrame)
@@ -6904,7 +6904,7 @@ void TDEHTMLPart::slotActiveFrameChanged( KParts::Part *part )
d->m_activeFrame = part;
- if ( d->m_activeFrame && d->m_activeFrame->widget()->inherits( TQFRAME_OBJECT_NAME_STRING ) )
+ if ( d->m_activeFrame && d->m_activeFrame->widget()->inherits( "TQFrame" ) )
{
TQFrame *frame = static_cast<TQFrame *>( d->m_activeFrame->widget() );
if (frame->frameStyle() != TQFrame::NoFrame)
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 92119267e..06485d976 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -897,7 +897,7 @@ void TDEHTMLView::layout()
void TDEHTMLView::closeChildDialogs()
{
- TQObjectList *dlgs = queryList(TQDIALOG_OBJECT_NAME_STRING);
+ TQObjectList *dlgs = queryList("TQDialog");
for (TQObject *dlg = dlgs->first(); dlg; dlg = dlgs->next())
{
KDialogBase* dlgbase = dynamic_cast<KDialogBase *>( dlg );