From 2242eb95a7bcd686207e2043340fed5ccc8b7609 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Mar 2012 21:15:28 -0600 Subject: [PATCH] Rename additional members for tqt3 --- kate/app/kateconsole.cpp | 2 +- kate/app/katedocmanageriface.cpp | 8 ++++---- kate/app/katemdi.cpp | 2 +- kate/app/kateviewmanager.cpp | 2 +- kate/app/kateviewspacecontainer.cpp | 4 ++-- kate/app/kwritemain.cpp | 4 ++-- kate/interfaces/plugin.cpp | 2 +- kate/interfaces/pluginconfiginterface.cpp | 2 +- .../pluginconfiginterfaceextension.cpp | 2 +- kate/interfaces/toolviewmanager.cpp | 6 +++--- kcontrol/componentchooser/componentchooser.cpp | 16 ++++++++-------- kfind/kftabdlg.cpp | 2 +- klipper/configdialog.cpp | 2 +- konqueror/konq_view.cc | 8 ++++---- konqueror/sidebar/konqsidebarplugin.cpp | 2 +- konqueror/sidebar/sidebar_widget.cpp | 2 +- .../trees/dirtree_module/dirtree_module.cpp | 2 +- nsplugins/viewer/qxteventloop.cpp | 4 ++-- tdm/kfrontend/themer/tdmitem.cpp | 2 +- tdm/kfrontend/themer/tdmitem.h | 2 +- tdm/kfrontend/themer/tdmthemer.cpp | 2 +- 21 files changed, 39 insertions(+), 39 deletions(-) diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp index 1e7dcb3ef..b70de5905 100644 --- a/kate/app/kateconsole.cpp +++ b/kate/app/kateconsole.cpp @@ -115,7 +115,7 @@ void KateConsole::sendInput( const TQString& text ) if (!m_part) return; - TerminalInterface *t = static_cast( m_part->qt_cast( "TerminalInterface" ) ); + TerminalInterface *t = static_cast( m_part->tqt_cast( "TerminalInterface" ) ); if (!t) return; diff --git a/kate/app/katedocmanageriface.cpp b/kate/app/katedocmanageriface.cpp index 5ef01a1df..034c5aa03 100644 --- a/kate/app/katedocmanageriface.cpp +++ b/kate/app/katedocmanageriface.cpp @@ -35,7 +35,7 @@ DCOPRef KateDocManagerDCOPIface::document (uint n) if (!doc) return DCOPRef (); - DCOPObject *obj = static_cast(doc->qt_cast("DCOPObject")); + DCOPObject *obj = static_cast(doc->tqt_cast("DCOPObject")); if (!obj) return DCOPRef (); @@ -50,7 +50,7 @@ DCOPRef KateDocManagerDCOPIface::activeDocument () if (!doc) return DCOPRef (); - DCOPObject *obj = static_cast(doc->qt_cast("DCOPObject")); + DCOPObject *obj = static_cast(doc->tqt_cast("DCOPObject")); if (!obj) return DCOPRef (); @@ -75,7 +75,7 @@ DCOPRef KateDocManagerDCOPIface::documentWithID (uint id) if (!doc) return DCOPRef (); - DCOPObject *obj = static_cast(doc->qt_cast("DCOPObject")); + DCOPObject *obj = static_cast(doc->tqt_cast("DCOPObject")); if (!obj) return DCOPRef (); @@ -90,7 +90,7 @@ DCOPRef KateDocManagerDCOPIface::openURL (KURL url, TQString encoding) if (!doc) return DCOPRef (); - DCOPObject *obj = static_cast(doc->qt_cast("DCOPObject")); + DCOPObject *obj = static_cast(doc->tqt_cast("DCOPObject")); if (!obj) return DCOPRef (); diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 1991816af..948dc089e 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -256,7 +256,7 @@ bool ToolView::visible () const void ToolView::childEvent ( TQChildEvent *ev ) { // set the widget to be focus proxy if possible - if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->qt_cast(TQWIDGET_OBJECT_NAME_STRING)) { + if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqt_cast(TQWIDGET_OBJECT_NAME_STRING)) { setFocusProxy (::tqqt_cast(TQT_TQOBJECT(ev->child()))); } diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp index 75cc4b15c..d77ad0c3e 100644 --- a/kate/app/kateviewmanager.cpp +++ b/kate/app/kateviewmanager.cpp @@ -168,7 +168,7 @@ void KateViewManager::updateViewSpaceActions () } void KateViewManager::tabChanged(TQWidget* widget) { - KateViewSpaceContainer *container=static_cast(widget->qt_cast("KateViewSpaceContainer")); + KateViewSpaceContainer *container=static_cast(widget->tqt_cast("KateViewSpaceContainer")); Q_ASSERT(container); m_currentContainer=container; diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp index 76db12a07..a7a063244 100644 --- a/kate/app/kateviewspacecontainer.cpp +++ b/kate/app/kateviewspacecontainer.cpp @@ -450,7 +450,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, TQValueList psizes; if ( ! isFirstTime ) - if ( TQSplitter *ps = static_cast(vs->parentWidget()->qt_cast(TQSPLITTER_OBJECT_NAME_STRING)) ) + if ( TQSplitter *ps = static_cast(vs->parentWidget()->tqt_cast(TQSPLITTER_OBJECT_NAME_STRING)) ) psizes = ps->sizes(); Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal; @@ -471,7 +471,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, s->moveToFirst( vsNew ); if (!isFirstTime) - if (TQSplitter *ps = static_cast(s->parentWidget()->qt_cast(TQSPLITTER_OBJECT_NAME_STRING)) ) + if (TQSplitter *ps = static_cast(s->parentWidget()->tqt_cast(TQSPLITTER_OBJECT_NAME_STRING)) ) ps->setSizes( psizes ); s->show(); diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 2b37d7faa..b956b4bcc 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -107,8 +107,8 @@ KWrite::KWrite (KTextEditor::Document *doc) guiFactory()->addClient( m_view ); // install a working kate part popup dialog thingy - if (static_cast(m_view->qt_cast("Kate::View"))) - static_cast(m_view->qt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) ); + if (static_cast(m_view->tqt_cast("Kate::View"))) + static_cast(m_view->tqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) ); // init with more usefull size, stolen from konq :) if (!initialGeometrySet()) diff --git a/kate/interfaces/plugin.cpp b/kate/interfaces/plugin.cpp index 849b12a1e..b57d4bac0 100644 --- a/kate/interfaces/plugin.cpp +++ b/kate/interfaces/plugin.cpp @@ -99,7 +99,7 @@ PluginViewInterface *pluginViewInterface (Plugin *plugin) if (!plugin) return 0; - return static_cast(plugin->qt_cast("Kate::PluginViewInterface")); + return static_cast(plugin->tqt_cast("Kate::PluginViewInterface")); } } diff --git a/kate/interfaces/pluginconfiginterface.cpp b/kate/interfaces/pluginconfiginterface.cpp index 594b73e5d..ab6c7d736 100644 --- a/kate/interfaces/pluginconfiginterface.cpp +++ b/kate/interfaces/pluginconfiginterface.cpp @@ -59,5 +59,5 @@ PluginConfigInterface *Kate::pluginConfigInterface (Plugin *plugin) if (!plugin) return 0; - return static_cast(plugin->qt_cast("Kate::PluginConfigInterface")); + return static_cast(plugin->tqt_cast("Kate::PluginConfigInterface")); } diff --git a/kate/interfaces/pluginconfiginterfaceextension.cpp b/kate/interfaces/pluginconfiginterfaceextension.cpp index 53c22122b..68b7b8ec1 100644 --- a/kate/interfaces/pluginconfiginterfaceextension.cpp +++ b/kate/interfaces/pluginconfiginterfaceextension.cpp @@ -64,5 +64,5 @@ PluginConfigInterfaceExtension *Kate::pluginConfigInterfaceExtension (Plugin *pl if (!plugin) return 0; - return static_cast(plugin->qt_cast("Kate::PluginConfigInterfaceExtension")); + return static_cast(plugin->tqt_cast("Kate::PluginConfigInterfaceExtension")); } diff --git a/kate/interfaces/toolviewmanager.cpp b/kate/interfaces/toolviewmanager.cpp index 848ec5fa2..1447cde84 100644 --- a/kate/interfaces/toolviewmanager.cpp +++ b/kate/interfaces/toolviewmanager.cpp @@ -60,7 +60,7 @@ TQWidget *ToolViewManager::createToolView (const TQString &identifier, ToolViewM bool ToolViewManager::moveToolView (TQWidget *widget, ToolViewManager::Position pos) { - if (!widget || !widget->qt_cast("KateMDI::ToolView")) + if (!widget || !widget->tqt_cast("KateMDI::ToolView")) return false; return d->toolViewMan->moveToolView (static_cast(widget), (KMultiTabBar::KMultiTabBarPosition)pos); @@ -68,7 +68,7 @@ bool ToolViewManager::moveToolView (TQWidget *widget, ToolViewManager::Position bool ToolViewManager::showToolView(TQWidget *widget) { - if (!widget || !widget->qt_cast("KateMDI::ToolView")) + if (!widget || !widget->tqt_cast("KateMDI::ToolView")) return false; return d->toolViewMan->showToolView (static_cast(widget)); @@ -76,7 +76,7 @@ bool ToolViewManager::showToolView(TQWidget *widget) bool ToolViewManager::hideToolView(TQWidget *widget) { - if (!widget || !widget->qt_cast("KateMDI::ToolView")) + if (!widget || !widget->tqt_cast("KateMDI::ToolView")) return false; return d->toolViewMan->hideToolView (static_cast(widget)); diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index 6bd1c16cd..f67065c24 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/kcontrol/componentchooser/componentchooser.cpp @@ -417,7 +417,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { TQWidget *newConfigWidget = 0; if (cfgType.isEmpty() || (cfgType=="component")) { - if (!(configWidget && configWidget->qt_cast("CfgComponent"))) + if (!(configWidget && configWidget->tqt_cast("CfgComponent"))) { CfgComponent* cfgcomp = new CfgComponent(configContainer); cfgcomp->ChooserDocu->setText(i18n("Choose from the list below which component should be used by default for the %1 service.").arg(it->text())); @@ -430,7 +430,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { } else if (cfgType=="internal_email") { - if (!(configWidget && configWidget->qt_cast("CfgEmailClient"))) + if (!(configWidget && configWidget->tqt_cast("CfgEmailClient"))) { newConfigWidget = new CfgEmailClient(configContainer); } @@ -438,7 +438,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { } else if (cfgType=="internal_terminal") { - if (!(configWidget && configWidget->qt_cast("CfgTerminalEmulator"))) + if (!(configWidget && configWidget->tqt_cast("CfgTerminalEmulator"))) { newConfigWidget = new CfgTerminalEmulator(configContainer); } @@ -446,7 +446,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { } else if (cfgType=="internal_browser") { - if (!(configWidget && configWidget->qt_cast("CfgBrowser"))) + if (!(configWidget && configWidget->tqt_cast("CfgBrowser"))) { newConfigWidget = new CfgBrowser(configContainer); } @@ -465,7 +465,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { } if (configWidget) - static_cast(configWidget->qt_cast("CfgPlugin"))->load(&cfg); + static_cast(configWidget->tqt_cast("CfgPlugin"))->load(&cfg); emitChanged(false); latestEditedService=static_cast(it)->File; @@ -487,7 +487,7 @@ void ComponentChooser::load() { if( configWidget ) { CfgPlugin * plugin = static_cast( - configWidget->qt_cast( "CfgPlugin" ) ); + configWidget->tqt_cast( "CfgPlugin" ) ); if( plugin ) { KSimpleConfig cfg(latestEditedService); @@ -500,7 +500,7 @@ void ComponentChooser::save() { if( configWidget ) { CfgPlugin * plugin = static_cast( - configWidget->qt_cast( "CfgPlugin" ) ); + configWidget->tqt_cast( "CfgPlugin" ) ); if( plugin ) { KSimpleConfig cfg(latestEditedService); @@ -512,7 +512,7 @@ void ComponentChooser::save() { void ComponentChooser::restoreDefault() { if (configWidget) { - static_cast(configWidget->qt_cast("CfgPlugin"))->defaults(); + static_cast(configWidget->tqt_cast("CfgPlugin"))->defaults(); emitChanged(true); } diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp index 6f7977e41..2d0a0692d 100644 --- a/kfind/kftabdlg.cpp +++ b/kfind/kftabdlg.cpp @@ -498,7 +498,7 @@ void KfindTabWidget::slotEditRegExp() if ( ! regExpDialog ) regExpDialog = KParts::ComponentFactory::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); - KRegExpEditorInterface *iface = static_cast( regExpDialog->qt_cast( "KRegExpEditorInterface" ) ); + KRegExpEditorInterface *iface = static_cast( regExpDialog->tqt_cast( "KRegExpEditorInterface" ) ); if ( !iface ) return; diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 7428a4ed3..d48f45b9c 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -204,7 +204,7 @@ void ListView::rename( TQListViewItem* item, int c ) if ( gui ) { if ( ! _regExpEditor ) _regExpEditor = KParts::ComponentFactory::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); - KRegExpEditorInterface *iface = static_cast( _regExpEditor->qt_cast( "KRegExpEditorInterface" ) ); + KRegExpEditorInterface *iface = static_cast( _regExpEditor->tqt_cast( "KRegExpEditorInterface" ) ); assert( iface ); iface->setRegExp( item->text( 0 ) ); diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index 8037b3927..88fdf0147 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -1082,7 +1082,7 @@ bool KonqView::callExtensionMethod( const char *methodName ) return false; TQUObject o[ 1 ]; - obj->qt_invoke( id, o ); + obj->tqt_invoke( id, o ); return true; } @@ -1099,7 +1099,7 @@ bool KonqView::callExtensionBoolMethod( const char *methodName, bool value ) static_TQUType_bool.set( o + 1, value ); - obj->qt_invoke( id, o ); + obj->tqt_invoke( id, o ); return true; } @@ -1116,7 +1116,7 @@ bool KonqView::callExtensionStringMethod( const char *methodName, TQString value static_TQUType_TQString.set( o + 1, value ); - obj->qt_invoke( id, o ); + obj->tqt_invoke( id, o ); return true; } @@ -1133,7 +1133,7 @@ bool KonqView::callExtensionURLMethod( const char *methodName, const KURL& value static_TQUType_ptr.set( o + 1, &value ); - obj->qt_invoke( id, o ); + obj->tqt_invoke( id, o ); return true; } diff --git a/konqueror/sidebar/konqsidebarplugin.cpp b/konqueror/sidebar/konqsidebarplugin.cpp index 75e762d35..52cfc11f9 100644 --- a/konqueror/sidebar/konqsidebarplugin.cpp +++ b/konqueror/sidebar/konqsidebarplugin.cpp @@ -52,7 +52,7 @@ void KonqSidebarPlugin::handlePreviewOnMouseOver(const KFileItem& /*items*/) {} bool KonqSidebarPlugin::universalMode() { if (!parent()) return false; - KonqSidebarIface *ksi=static_cast(parent()->qt_cast("KonqSidebarIface")); + KonqSidebarIface *ksi=static_cast(parent()->tqt_cast("KonqSidebarIface")); if (!ksi) return false; kdDebug()<<"calling KonqSidebarIface->universalMode()"<universalMode(); diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 056671cab..2d46aecd6 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -680,7 +680,7 @@ void Sidebar_Widget::stdAction(const char *handlestd) return; kdDebug() << "Action slot was found, it will be called now" << endl; TQUObject o[ 1 ]; - mod->module->qt_invoke( id, o ); + mod->module->tqt_invoke( id, o ); return; } diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index 315bfbc15..0c242a9b3 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -38,7 +38,7 @@ KonqSidebarDirTreeModule::KonqSidebarDirTreeModule( KonqSidebarTree * parentTree KonqSidebarPlugin * plugin = parentTree->part(); // KonqSidebarPlugin::universalMode() is protected :-| if ( plugin->parent() ) { - KonqSidebarIface * ksi = static_cast( plugin->parent()->qt_cast( "KonqSidebarIface" ) ); + KonqSidebarIface * ksi = static_cast( plugin->parent()->tqt_cast( "KonqSidebarIface" ) ); universalMode = ksi ? ksi->universalMode() : false; } */ diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp index 0ae7c7367..2c79bc6ec 100644 --- a/nsplugins/viewer/qxteventloop.cpp +++ b/nsplugins/viewer/qxteventloop.cpp @@ -148,7 +148,7 @@ void QXtEventLoopPrivate::unhook() appContext = ownContext = 0; } -extern bool qt_try_modal( TQWidget *, XEvent * ); // defined in qapplication_x11.cpp +extern bool tqt_try_modal( TQWidget *, XEvent * ); // defined in qapplication_x11.cpp Boolean qmotif_event_dispatcher( XEvent *event ) { TQApplication::sendPostedEvents(); @@ -206,7 +206,7 @@ Boolean qmotif_event_dispatcher( XEvent *event ) return True; if ( qMotif && TQApplication::activeModalWidget() ) { - if ( !qt_try_modal(qMotif, event) ) + if ( !tqt_try_modal(qMotif, event) ) return True; } diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp index 8cf126b66..fb695462c 100644 --- a/tdm/kfrontend/themer/tdmitem.cpp +++ b/tdm/kfrontend/themer/tdmitem.cpp @@ -649,7 +649,7 @@ KdmItem::parentWidget() const if (!this->parent()) return 0; - if (parent()->qt_cast(TQWIDGET_OBJECT_NAME_STRING)) + if (parent()->tqt_cast(TQWIDGET_OBJECT_NAME_STRING)) return (TQWidget*)parent(); return ((KdmItem*)parent())->parentWidget(); } diff --git a/tdm/kfrontend/themer/tdmitem.h b/tdm/kfrontend/themer/tdmitem.h index 27158a7fd..be7fa65d3 100644 --- a/tdm/kfrontend/themer/tdmitem.h +++ b/tdm/kfrontend/themer/tdmitem.h @@ -147,7 +147,7 @@ public: TQString baseDir() const { if (basedir.isEmpty() && parent()) - return static_cast( parent()->qt_cast( "KdmItem" ) )->baseDir(); + return static_cast( parent()->tqt_cast( "KdmItem" ) )->baseDir(); return basedir; } diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp index d2dc77935..da7580272 100644 --- a/tdm/kfrontend/themer/tdmthemer.cpp +++ b/tdm/kfrontend/themer/tdmthemer.cpp @@ -378,7 +378,7 @@ KdmThemer::slotActivated( const TQString &id ) return; item->widget()->setFocus(); - TQLineEdit *le = (TQLineEdit*)item->widget()->qt_cast(TQLINEEDIT_OBJECT_NAME_STRING); + TQLineEdit *le = (TQLineEdit*)item->widget()->tqt_cast(TQLINEEDIT_OBJECT_NAME_STRING); if (le) le->selectAll(); }