diff options
Diffstat (limited to 'konqueror')
| -rw-r--r-- | konqueror/konq_actions.cpp | 2 | ||||
| -rw-r--r-- | konqueror/konq_mainwindow.cpp | 2 | ||||
| -rw-r--r-- | konqueror/konq_view.cpp | 6 | ||||
| -rw-r--r-- | konqueror/listview/konq_listviewwidget.cpp | 4 | ||||
| -rw-r--r-- | konqueror/sidebar/sidebar_widget.cpp | 8 |
5 files changed, 11 insertions, 11 deletions
diff --git a/konqueror/konq_actions.cpp b/konqueror/konq_actions.cpp index 934c326f7..d87a73971 100644 --- a/konqueror/konq_actions.cpp +++ b/konqueror/konq_actions.cpp @@ -94,7 +94,7 @@ int KonqBidiHistoryAction::plug( TQWidget *widget, int index ) return -1; // Go menu - if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) + if ( widget->inherits("TQPopupMenu") ) { m_goMenu = (TQPopupMenu*)widget; // Forward signal (to main view) diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp index 766a43c61..c8746e8da 100644 --- a/konqueror/konq_mainwindow.cpp +++ b/konqueror/konq_mainwindow.cpp @@ -1062,7 +1062,7 @@ TQObject *KonqMainWindow::lastFrame( KonqView *view ) TQObject *nextFrame, *viewFrame; nextFrame = TQT_TQOBJECT(view->frame()); viewFrame = 0; - while ( nextFrame != 0 && ! nextFrame->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) { + while ( nextFrame != 0 && ! nextFrame->inherits( "TQWidgetStack" ) ) { viewFrame = nextFrame; nextFrame = nextFrame->parent(); } diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp index 3a970018b..9f7bef4d8 100644 --- a/konqueror/konq_view.cpp +++ b/konqueror/konq_view.cpp @@ -472,7 +472,7 @@ void KonqView::connectPart( ) m_pPart->widget()->installEventFilter( this ); - if (m_bBackRightClick && m_pPart->widget()->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) ) + if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") ) { (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this ); } @@ -1220,7 +1220,7 @@ void KonqView::reparseConfiguration() bool b = KonqSettings::backRightClick(); if ( m_bBackRightClick != b ) { - if (m_bBackRightClick && m_pPart->widget()->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) ) + if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") ) { (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this ); } @@ -1265,7 +1265,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) KURL::List lstDragURLs; bool ok = KURLDrag::decode( ev, lstDragURLs ); - TQObjectList *children = m_pPart->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *children = m_pPart->widget()->queryList( "TQWidget" ); if ( ok && !lstDragURLs.first().url().contains( "javascript:", false ) && // ### this looks like a hack to me diff --git a/konqueror/listview/konq_listviewwidget.cpp b/konqueror/listview/konq_listviewwidget.cpp index e1cfa9bb2..d5fd6ac2c 100644 --- a/konqueror/listview/konq_listviewwidget.cpp +++ b/konqueror/listview/konq_listviewwidget.cpp @@ -237,9 +237,9 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) lstColumns << column; const TQString type = (*extraFieldsIt).type; // ## TODO use when sorting TQVariant::Type t = TQVariant::Invalid; - if ( type.lower() == TQString(TQSTRING_OBJECT_NAME_STRING).lower() ) + if ( type.lower() == TQString("TQString").lower() ) t = TQVariant::String; - else if ( type.lower() == TQString(TQDATETIME_OBJECT_NAME_STRING).lower() ) + else if ( type.lower() == TQString("TQDateTime").lower() ) t = TQVariant::DateTime; else kdWarning() << "Unsupported ExtraType '" << type << "'" << endl; diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 8eefa7c34..a6d172e41 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -1224,20 +1224,20 @@ void Sidebar_Widget::connectModule(TQObject *mod) connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); } - if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { + if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const TQPoint &, const KURL&, const TQString &, mode_t))); } - if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const " TQPOINT_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { + if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint &,const KURL&,const TQString&,mode_t)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t)),this, TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t))); } - if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) { + if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); } @@ -1247,7 +1247,7 @@ void Sidebar_Widget::connectModule(TQObject *mod) this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } - if (mod->metaObject()->findSignal("submitFormRequest(const char*,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) { + if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) { connect(mod, TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, |