TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename additional members for tqt3

Browse Source
pull/16/head
Timothy Pearson 13 years ago
parent 20cb25189f
commit ce5d3d7fd5
16 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File

2
dcop/dcopclient.cpp
Unescape View File

@ -1536,7 +1536,7 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
if ( slot != -1 ) { if ( slot != -1 ) {
replyType = "void"; replyType = "void";
TQUObject uo[ 1 ]; TQUObject uo[ 1 ];
o->qt_invoke( slot, uo ); o->tqt_invoke( slot, uo );
return true; return true;
} }
} }

2
interfaces/khexedit/byteseditinterface.h
Unescape View File

@ -159,7 +159,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
if( !t ) if( !t )
return 0; return 0;
return static_cast<KHE::BytesEditInterface*>( t->qt_cast("KHE::BytesEditInterface") ); return static_cast<KHE::BytesEditInterface*>( t->tqt_cast("KHE::BytesEditInterface") );
} }
/** tries to create an instance of a hexedit widget for arrays of chars (char[]) /** tries to create an instance of a hexedit widget for arrays of chars (char[])

8
kabc/plugins/ldapkio/resourceldapkio.cpp
Unescape View File

@ -44,8 +44,8 @@
using namespace KABC; using namespace KABC;
// Hack from Netaccess // Hack from Netaccess
void qt_enter_modal( TQWidget *widget ); void tqt_enter_modal( TQWidget *widget );
void qt_leave_modal( TQWidget *widget ); void tqt_leave_modal( TQWidget *widget );
class ResourceLDAPKIO::ResourceLDAPKIOPrivate class ResourceLDAPKIO::ResourceLDAPKIOPrivate
{ {
@ -124,9 +124,9 @@ void ResourceLDAPKIO::enter_loop()
{ {
TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal));
dummy.setFocusPolicy( TQ_NoFocus ); dummy.setFocusPolicy( TQ_NoFocus );
qt_enter_modal(&dummy); tqt_enter_modal(&dummy);
tqApp->enter_loop(); tqApp->enter_loop();
qt_leave_modal(&dummy); tqt_leave_modal(&dummy);
} }
void ResourceLDAPKIO::entries( KIO::Job*, const KIO::UDSEntryList & list ) void ResourceLDAPKIO::entries( KIO::Job*, const KIO::UDSEntryList & list )

2
khtml/khtml_ext.cpp
Unescape View File

@ -320,7 +320,7 @@ void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method )
return; return;
TQUObject o[ 1 ]; TQUObject o[ 1 ];
m_extensionProxy->qt_invoke( slot, o ); m_extensionProxy->tqt_invoke( slot, o );
} }
void KHTMLPartBrowserExtension::updateEditActions() void KHTMLPartBrowserExtension::updateEditActions()

2
khtml/khtml_part.cpp
Unescape View File

@ -6663,7 +6663,7 @@ void KHTMLPart::slotPrintFrame()
int idx = mo->findSlot( "print()", true ); int idx = mo->findSlot( "print()", true );
if ( idx >= 0 ) { if ( idx >= 0 ) {
TQUObject o[ 1 ]; TQUObject o[ 1 ];
ext->qt_invoke( idx, o ); ext->tqt_invoke( idx, o );
} }
} }

16
kio/kfile/kpropertiesdialog.cpp
Unescape View File

@ -1307,8 +1307,8 @@ bool KFilePropsPlugin::supports( KFileItemList /*_items*/ )
} }
// Don't do this at home // Don't do this at home
void qt_enter_modal( TQWidget *widget ); void tqt_enter_modal( TQWidget *widget );
void qt_leave_modal( TQWidget *widget ); void tqt_leave_modal( TQWidget *widget );
void KFilePropsPlugin::applyChanges() void KFilePropsPlugin::applyChanges()
{ {
@ -1363,9 +1363,9 @@ void KFilePropsPlugin::applyChanges()
TQT_SLOT( slotFileRenamed( KIO::Job *, const KURL &, const KURL & ) ) ); TQT_SLOT( slotFileRenamed( KIO::Job *, const KURL &, const KURL & ) ) );
// wait for job // wait for job
TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
qt_enter_modal(&dummy); tqt_enter_modal(&dummy);
tqApp->enter_loop(); tqApp->enter_loop();
qt_leave_modal(&dummy); tqt_leave_modal(&dummy);
return; return;
} }
properties->updateUrl(properties->kurl()); properties->updateUrl(properties->kurl());
@ -2519,9 +2519,9 @@ void KFilePermissionsPropsPlugin::applyChanges()
TQT_SLOT( slotChmodResult( KIO::Job * ) ) ); TQT_SLOT( slotChmodResult( KIO::Job * ) ) );
// Wait for job // Wait for job
TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
qt_enter_modal(&dummy); tqt_enter_modal(&dummy);
tqApp->enter_loop(); tqApp->enter_loop();
qt_leave_modal(&dummy); tqt_leave_modal(&dummy);
} }
if (dirs.count() > 0) { if (dirs.count() > 0) {
job = KIO::chmod( dirs, orDirPermissions, ~andDirPermissions, job = KIO::chmod( dirs, orDirPermissions, ~andDirPermissions,
@ -2535,9 +2535,9 @@ void KFilePermissionsPropsPlugin::applyChanges()
TQT_SLOT( slotChmodResult( KIO::Job * ) ) ); TQT_SLOT( slotChmodResult( KIO::Job * ) ) );
// Wait for job // Wait for job
TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
qt_enter_modal(&dummy); tqt_enter_modal(&dummy);
tqApp->enter_loop(); tqApp->enter_loop();
qt_leave_modal(&dummy); tqt_leave_modal(&dummy);
} }
} }

8
kio/kio/netaccess.cpp
Unescape View File

@ -487,16 +487,16 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray*
} }
// If a troll sees this, he kills me // If a troll sees this, he kills me
void qt_enter_modal( TQWidget *widget ); void tqt_enter_modal( TQWidget *widget );
void qt_leave_modal( TQWidget *widget ); void tqt_leave_modal( TQWidget *widget );
void NetAccess::enter_loop() void NetAccess::enter_loop()
{ {
TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal));
dummy.setFocusPolicy( TQ_NoFocus ); dummy.setFocusPolicy( TQ_NoFocus );
qt_enter_modal(&dummy); tqt_enter_modal(&dummy);
tqApp->enter_loop(); tqApp->enter_loop();
qt_leave_modal(&dummy); tqt_leave_modal(&dummy);
} }
void NetAccess::slotResult( KIO::Job * job ) void NetAccess::slotResult( KIO::Job * job )

2
kparts/browserinterface.cpp
Unescape View File

@ -52,7 +52,7 @@ void BrowserInterface::callMethod( const char *name, const TQVariant &argument )
default: return; default: return;
} }
qt_invoke( slot, o ); tqt_invoke( slot, o );
} }
#include "browserinterface.moc" #include "browserinterface.moc"

8
kparts/part.cpp
Unescape View File

@ -679,8 +679,8 @@ void ReadWritePart::slotUploadFinished( KIO::Job * )
} }
// Trolls: Nothing to see here, please step away. // Trolls: Nothing to see here, please step away.
void qt_enter_modal( TQWidget *widget ); void tqt_enter_modal( TQWidget *widget );
void qt_leave_modal( TQWidget *widget ); void tqt_leave_modal( TQWidget *widget );
bool ReadWritePart::waitSaveComplete() bool ReadWritePart::waitSaveComplete()
{ {
@ -691,9 +691,9 @@ bool ReadWritePart::waitSaveComplete()
TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal));
dummy.setFocusPolicy( TQ_NoFocus ); dummy.setFocusPolicy( TQ_NoFocus );
qt_enter_modal(&dummy); tqt_enter_modal(&dummy);
tqApp->enter_loop(); tqApp->enter_loop();
qt_leave_modal(&dummy); tqt_leave_modal(&dummy);
d->m_waitForSave = false; d->m_waitForSave = false;

4
tdecore/kaccel.cpp
Unescape View File

@ -116,14 +116,14 @@ KAccelEventHandler::KAccelEventHandler()
} }
#ifdef Q_WS_X11 #ifdef Q_WS_X11
bool qt_try_modal( TQWidget *, XEvent * ); bool tqt_try_modal( TQWidget *, XEvent * );
bool KAccelEventHandler::x11Event( XEvent* pEvent ) bool KAccelEventHandler::x11Event( XEvent* pEvent )
{ {
if( TQWidget::keyboardGrabber() || !kapp->focusWidget() ) if( TQWidget::keyboardGrabber() || !kapp->focusWidget() )
return false; return false;
if ( !qt_try_modal(kapp->focusWidget(), pEvent) ) if ( !tqt_try_modal(kapp->focusWidget(), pEvent) )
return false; return false;
if( pEvent->type == XKeyPress ) { if( pEvent->type == XKeyPress ) {

6
tdecore/kaccelmanager.cpp
Unescape View File

@ -321,7 +321,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
if (dynamic_cast<TQComboBox*>(w) || dynamic_cast<TQLineEdit*>(w) || if (dynamic_cast<TQComboBox*>(w) || dynamic_cast<TQLineEdit*>(w) ||
dynamic_cast<TQTextEdit*>(w) || dynamic_cast<TQTextView*>(w) || dynamic_cast<TQTextEdit*>(w) || dynamic_cast<TQTextView*>(w) ||
dynamic_cast<TQSpinBox*>(w) || static_cast<KMultiTabBar*>(w->qt_cast("KMultiTabBar"))) dynamic_cast<TQSpinBox*>(w) || static_cast<KMultiTabBar*>(w->tqt_cast("KMultiTabBar")))
return; return;
// now treat 'ordinary' widgets // now treat 'ordinary' widgets
@ -345,7 +345,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
if (tprop != -1) { if (tprop != -1) {
const TQMetaProperty* p = w->metaObject()->property( tprop, true ); const TQMetaProperty* p = w->metaObject()->property( tprop, true );
if ( p && p->isValid() ) if ( p && p->isValid() )
w->qt_property( tprop, 1, &variant ); w->tqt_property( tprop, 1, &variant );
else else
tprop = -1; tprop = -1;
} }
@ -355,7 +355,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
if (tprop != -1) { if (tprop != -1) {
const TQMetaProperty* p = w->metaObject()->property( tprop, true ); const TQMetaProperty* p = w->metaObject()->property( tprop, true );
if ( p && p->isValid() ) if ( p && p->isValid() )
w->qt_property( tprop, 1, &variant ); w->tqt_property( tprop, 1, &variant );
} }
} }

2
tdecore/kapplication.cpp
Unescape View File

@ -2220,7 +2220,7 @@ void KApplication::invokeEditSlot( const char *slot )
if( idx < 0 ) if( idx < 0 )
return; return;
object->qt_invoke( idx, 0 ); object->tqt_invoke( idx, 0 );
} }
void KApplication::addKipcEventMask(int id) void KApplication::addKipcEventMask(int id)

6
tdecore/kglobalaccel_win.cpp
Unescape View File

@ -315,7 +315,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
if( slot_id >= 0 ) { if( slot_id >= 0 ) {
QUObject o[2]; QUObject o[2];
static_QUType_int.set(o+1,n); 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() ) ) { } else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) {
int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); 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+1,pAction->name());
static_QUType_QString.set(o+2,pAction->label()); static_QUType_QString.set(o+2,pAction->label());
static_QUType_ptr.set(o+3,&seq); 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 { } else {
int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
if( slot_id >= 0 ) if( slot_id >= 0 )
const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 ); const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, 0 );
} }
} }

6
tdecore/kglobalaccel_x11.cpp
Unescape View File

@ -411,7 +411,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
if( slot_id >= 0 ) { if( slot_id >= 0 ) {
TQUObject o[2]; TQUObject o[2];
static_TQUType_int.set(o+1,n); 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() ) ) { } else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) {
int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); 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+1,pAction->name());
static_TQUType_TQString.set(o+2,pAction->label()); static_TQUType_TQString.set(o+2,pAction->label());
static_TQUType_ptr.set(o+3,&seq); 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 { } else {
int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
if( slot_id >= 0 ) if( slot_id >= 0 )
const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 ); const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, 0 );
} }
} }

4
tdeui/kdockwidget.cpp
Unescape View File

@ -1860,8 +1860,8 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
} }
w = p; w = p;
} }
if ( qt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; if ( tqt_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), "KDockTabGroup", "_dock_tab" ) ) return 0L;
if (tqt_dynamic_cast<KDockContainer*>(w)) return 0L; if (tqt_dynamic_cast<KDockContainer*>(w)) return 0L;
if (!childDockWidgetList) return 0L; if (!childDockWidgetList) return 0L;

6
win/dummy.cpp
Unescape View File

@ -20,15 +20,15 @@
#include <tqwidget.h> #include <tqwidget.h>
/** /**
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). by default, then we can't use it in NetAccess::enter_loop() (kio).
Empty implementation created as a workaround. 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 )
{ {
} }

Write Preview
Loading…
Cancel
Save