From ce5d3d7fd554b9832a69350cffa8d79c5002753e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Mar 2012 21:17:28 -0600 Subject: [PATCH] Rename additional members for tqt3 --- dcop/dcopclient.cpp | 2 +- interfaces/khexedit/byteseditinterface.h | 2 +- kabc/plugins/ldapkio/resourceldapkio.cpp | 8 ++++---- khtml/khtml_ext.cpp | 2 +- khtml/khtml_part.cpp | 2 +- kio/kfile/kpropertiesdialog.cpp | 16 ++++++++-------- kio/kio/netaccess.cpp | 8 ++++---- kparts/browserinterface.cpp | 2 +- kparts/part.cpp | 8 ++++---- tdecore/kaccel.cpp | 4 ++-- tdecore/kaccelmanager.cpp | 6 +++--- tdecore/kapplication.cpp | 2 +- tdecore/kglobalaccel_win.cpp | 6 +++--- tdecore/kglobalaccel_x11.cpp | 6 +++--- tdeui/kdockwidget.cpp | 4 ++-- win/dummy.cpp | 6 +++--- 16 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp index 9913913f7..92fccde82 100644 --- a/dcop/dcopclient.cpp +++ b/dcop/dcopclient.cpp @@ -1536,7 +1536,7 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const if ( slot != -1 ) { replyType = "void"; TQUObject uo[ 1 ]; - o->qt_invoke( slot, uo ); + o->tqt_invoke( slot, uo ); return true; } } diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h index 3bff35095..ae23721ae 100644 --- a/interfaces/khexedit/byteseditinterface.h +++ b/interfaces/khexedit/byteseditinterface.h @@ -159,7 +159,7 @@ inline BytesEditInterface *bytesEditInterface( T *t ) if( !t ) return 0; - return static_cast( t->qt_cast("KHE::BytesEditInterface") ); + return static_cast( t->tqt_cast("KHE::BytesEditInterface") ); } /** tries to create an instance of a hexedit widget for arrays of chars (char[]) diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp index 0385f541c..f4b4f83b8 100644 --- a/kabc/plugins/ldapkio/resourceldapkio.cpp +++ b/kabc/plugins/ldapkio/resourceldapkio.cpp @@ -44,8 +44,8 @@ using namespace KABC; // Hack from Netaccess -void qt_enter_modal( TQWidget *widget ); -void qt_leave_modal( TQWidget *widget ); +void tqt_enter_modal( TQWidget *widget ); +void tqt_leave_modal( TQWidget *widget ); class ResourceLDAPKIO::ResourceLDAPKIOPrivate { @@ -124,9 +124,9 @@ void ResourceLDAPKIO::enter_loop() { TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); dummy.setFocusPolicy( TQ_NoFocus ); - qt_enter_modal(&dummy); + tqt_enter_modal(&dummy); tqApp->enter_loop(); - qt_leave_modal(&dummy); + tqt_leave_modal(&dummy); } void ResourceLDAPKIO::entries( KIO::Job*, const KIO::UDSEntryList & list ) diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp index 556836e07..3f94dcd17 100644 --- a/khtml/khtml_ext.cpp +++ b/khtml/khtml_ext.cpp @@ -320,7 +320,7 @@ void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method ) return; TQUObject o[ 1 ]; - m_extensionProxy->qt_invoke( slot, o ); + m_extensionProxy->tqt_invoke( slot, o ); } void KHTMLPartBrowserExtension::updateEditActions() diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index be62001dd..3fec96803 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -6663,7 +6663,7 @@ void KHTMLPart::slotPrintFrame() int idx = mo->findSlot( "print()", true ); if ( idx >= 0 ) { TQUObject o[ 1 ]; - ext->qt_invoke( idx, o ); + ext->tqt_invoke( idx, o ); } } diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index ac485eb93..29537bc2b 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -1307,8 +1307,8 @@ bool KFilePropsPlugin::supports( KFileItemList /*_items*/ ) } // Don't do this at home -void qt_enter_modal( TQWidget *widget ); -void qt_leave_modal( TQWidget *widget ); +void tqt_enter_modal( TQWidget *widget ); +void tqt_leave_modal( TQWidget *widget ); void KFilePropsPlugin::applyChanges() { @@ -1363,9 +1363,9 @@ void KFilePropsPlugin::applyChanges() TQT_SLOT( slotFileRenamed( KIO::Job *, const KURL &, const KURL & ) ) ); // wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); - qt_enter_modal(&dummy); + tqt_enter_modal(&dummy); tqApp->enter_loop(); - qt_leave_modal(&dummy); + tqt_leave_modal(&dummy); return; } properties->updateUrl(properties->kurl()); @@ -2519,9 +2519,9 @@ void KFilePermissionsPropsPlugin::applyChanges() TQT_SLOT( slotChmodResult( KIO::Job * ) ) ); // Wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); - qt_enter_modal(&dummy); + tqt_enter_modal(&dummy); tqApp->enter_loop(); - qt_leave_modal(&dummy); + tqt_leave_modal(&dummy); } if (dirs.count() > 0) { job = KIO::chmod( dirs, orDirPermissions, ~andDirPermissions, @@ -2535,9 +2535,9 @@ void KFilePermissionsPropsPlugin::applyChanges() TQT_SLOT( slotChmodResult( KIO::Job * ) ) ); // Wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); - qt_enter_modal(&dummy); + tqt_enter_modal(&dummy); tqApp->enter_loop(); - qt_leave_modal(&dummy); + tqt_leave_modal(&dummy); } } diff --git a/kio/kio/netaccess.cpp b/kio/kio/netaccess.cpp index e6c3d655b..a7ddb3987 100644 --- a/kio/kio/netaccess.cpp +++ b/kio/kio/netaccess.cpp @@ -487,16 +487,16 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray* } // If a troll sees this, he kills me -void qt_enter_modal( TQWidget *widget ); -void qt_leave_modal( TQWidget *widget ); +void tqt_enter_modal( TQWidget *widget ); +void tqt_leave_modal( TQWidget *widget ); void NetAccess::enter_loop() { TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); dummy.setFocusPolicy( TQ_NoFocus ); - qt_enter_modal(&dummy); + tqt_enter_modal(&dummy); tqApp->enter_loop(); - qt_leave_modal(&dummy); + tqt_leave_modal(&dummy); } void NetAccess::slotResult( KIO::Job * job ) diff --git a/kparts/browserinterface.cpp b/kparts/browserinterface.cpp index ae66dd6c0..e02ae34cc 100644 --- a/kparts/browserinterface.cpp +++ b/kparts/browserinterface.cpp @@ -52,7 +52,7 @@ void BrowserInterface::callMethod( const char *name, const TQVariant &argument ) default: return; } - qt_invoke( slot, o ); + tqt_invoke( slot, o ); } #include "browserinterface.moc" diff --git a/kparts/part.cpp b/kparts/part.cpp index 61e9ac42a..a76fce282 100644 --- a/kparts/part.cpp +++ b/kparts/part.cpp @@ -679,8 +679,8 @@ void ReadWritePart::slotUploadFinished( KIO::Job * ) } // Trolls: Nothing to see here, please step away. -void qt_enter_modal( TQWidget *widget ); -void qt_leave_modal( TQWidget *widget ); +void tqt_enter_modal( TQWidget *widget ); +void tqt_leave_modal( TQWidget *widget ); bool ReadWritePart::waitSaveComplete() { @@ -691,9 +691,9 @@ bool ReadWritePart::waitSaveComplete() TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); dummy.setFocusPolicy( TQ_NoFocus ); - qt_enter_modal(&dummy); + tqt_enter_modal(&dummy); tqApp->enter_loop(); - qt_leave_modal(&dummy); + tqt_leave_modal(&dummy); d->m_waitForSave = false; diff --git a/tdecore/kaccel.cpp b/tdecore/kaccel.cpp index 660cc4c29..52175e2eb 100644 --- a/tdecore/kaccel.cpp +++ b/tdecore/kaccel.cpp @@ -116,14 +116,14 @@ KAccelEventHandler::KAccelEventHandler() } #ifdef Q_WS_X11 -bool qt_try_modal( TQWidget *, XEvent * ); +bool tqt_try_modal( TQWidget *, XEvent * ); bool KAccelEventHandler::x11Event( XEvent* pEvent ) { if( TQWidget::keyboardGrabber() || !kapp->focusWidget() ) return false; - if ( !qt_try_modal(kapp->focusWidget(), pEvent) ) + if ( !tqt_try_modal(kapp->focusWidget(), pEvent) ) return false; if( pEvent->type == XKeyPress ) { diff --git a/tdecore/kaccelmanager.cpp b/tdecore/kaccelmanager.cpp index d9f0b5cda..d4387e652 100644 --- a/tdecore/kaccelmanager.cpp +++ b/tdecore/kaccelmanager.cpp @@ -321,7 +321,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) if (dynamic_cast(w) || dynamic_cast(w) || dynamic_cast(w) || dynamic_cast(w) || - dynamic_cast(w) || static_cast(w->qt_cast("KMultiTabBar"))) + dynamic_cast(w) || static_cast(w->tqt_cast("KMultiTabBar"))) return; // now treat 'ordinary' widgets @@ -345,7 +345,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) if (tprop != -1) { const TQMetaProperty* p = w->metaObject()->property( tprop, true ); if ( p && p->isValid() ) - w->qt_property( tprop, 1, &variant ); + w->tqt_property( tprop, 1, &variant ); else tprop = -1; } @@ -355,7 +355,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) if (tprop != -1) { const TQMetaProperty* p = w->metaObject()->property( tprop, true ); if ( p && p->isValid() ) - w->qt_property( tprop, 1, &variant ); + w->tqt_property( tprop, 1, &variant ); } } diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index e7995d8b2..438a07a53 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -2220,7 +2220,7 @@ void KApplication::invokeEditSlot( const char *slot ) if( idx < 0 ) return; - object->qt_invoke( idx, 0 ); + object->tqt_invoke( idx, 0 ); } void KApplication::addKipcEventMask(int id) diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp index a6c80bc1a..42175c5ba 100644 --- a/tdecore/kglobalaccel_win.cpp +++ b/tdecore/kglobalaccel_win.cpp @@ -315,7 +315,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s if( slot_id >= 0 ) { QUObject o[2]; static_QUType_int.set(o+1,n); - const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); + const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o ); } } else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) { int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); @@ -324,12 +324,12 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s static_QUType_QString.set(o+1,pAction->name()); static_QUType_QString.set(o+2,pAction->label()); static_QUType_ptr.set(o+3,&seq); - const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); + const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o ); } } else { int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) - const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 ); + const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, 0 ); } } diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp index dd40792dd..4f73c4ffd 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/kglobalaccel_x11.cpp @@ -411,7 +411,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s if( slot_id >= 0 ) { TQUObject o[2]; static_TQUType_int.set(o+1,n); - const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); + const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o ); } } else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) { int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); @@ -420,12 +420,12 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s static_TQUType_TQString.set(o+1,pAction->name()); static_TQUType_TQString.set(o+2,pAction->label()); static_TQUType_ptr.set(o+3,&seq); - const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); + const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o ); } } else { int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) - const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 ); + const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, 0 ); } } diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index 258dd72d0..7f40ae3a6 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -1860,8 +1860,8 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) } w = p; } - if ( qt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; - if ( qt_find_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; + if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; + if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; if (tqt_dynamic_cast(w)) return 0L; if (!childDockWidgetList) return 0L; diff --git a/win/dummy.cpp b/win/dummy.cpp index 189927567..21b26172d 100644 --- a/win/dummy.cpp +++ b/win/dummy.cpp @@ -20,15 +20,15 @@ #include /** - qt_enter_modal() and qt_enter_modal() from qapplication_win.cpp are not exported + tqt_enter_modal() and tqt_enter_modal() from qapplication_win.cpp are not exported by default, then we can't use it in NetAccess::enter_loop() (kio). Empty implementation created as a workaround. */ -KDEWIN32_EXPORT void qt_enter_modal( TQWidget *widget ) +KDEWIN32_EXPORT void tqt_enter_modal( TQWidget *widget ) { } -KDEWIN32_EXPORT void qt_leave_modal( TQWidget *widget ) +KDEWIN32_EXPORT void tqt_leave_modal( TQWidget *widget ) { }