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

Automated update from Qt3

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent c740211ffb
commit 9a4765a62e
20 changed files with 914 additions and 200 deletions
Show Stats Download Patch File Download Diff File

5
src/kernel/ntqapplication.h
Unescape View File

@ -352,11 +352,12 @@ private slots:
void postIMEvent( TQObject *receiver, TQIMEvent *event ); void postIMEvent( TQObject *receiver, TQIMEvent *event );
#endif #endif
private: public:
#ifdef QT_THREAD_SUPPORT #ifdef QT_THREAD_SUPPORT
static TQMutex *tqt_mutex; static TQMutex *tqt_mutex;
#endif // QT_THREAD_SUPPORT #endif // QT_THREAD_SUPPORT
private:
int app_argc; int app_argc;
char **app_argv; char **app_argv;
bool quit_now; bool quit_now;
@ -434,6 +435,7 @@ private:
friend class TQDialog; friend class TQDialog;
friend class TQAccelManager; friend class TQAccelManager;
friend class TQEvent; friend class TQEvent;
friend class TQThread;
friend class TQTranslator; friend class TQTranslator;
friend class TQEventLoop; friend class TQEventLoop;
friend Q_EXPORT void tqt_ucm_initialize( TQApplication * ); friend Q_EXPORT void tqt_ucm_initialize( TQApplication * );
@ -457,6 +459,7 @@ public:
static TQThread* guiThread(); static TQThread* guiThread();
#endif #endif
static bool isGuiThread(); static bool isGuiThread();
static void threadTerminationHandler( TQThread * );
}; };
inline int TQApplication::argc() const inline int TQApplication::argc() const

1
src/kernel/ntqobject.h
Unescape View File

@ -46,6 +46,7 @@
#include "ntqwindowdefs.h" #include "ntqwindowdefs.h"
#include "ntqstring.h" #include "ntqstring.h"
#include "ntqevent.h" #include "ntqevent.h"
#include "ntqmutex.h"
#include "ntqnamespace.h" #include "ntqnamespace.h"
#endif // QT_H #endif // QT_H

3
src/kernel/ntqobjectdefs.h
Unescape View File

@ -157,6 +157,7 @@ class TQMetaObject;
class TQSignal; class TQSignal;
class TQConnection; class TQConnection;
class TQEvent; class TQEvent;
class TQMutex;
struct TQMetaData; struct TQMetaData;
class TQConnectionList; class TQConnectionList;
class TQConnectionListIt; class TQConnectionListIt;
@ -165,6 +166,8 @@ class TQObjectList;
class TQObjectListIt; class TQObjectListIt;
class TQMemberDict; class TQMemberDict;
extern TQMutex *tqt_sharedMetaObjectMutex;
Q_EXPORT void *tqt_find_obj_child( TQObject *, const char *, const char * ); Q_EXPORT void *tqt_find_obj_child( TQObject *, const char *, const char * );
#define Q_CHILD(parent,type,name) \ #define Q_CHILD(parent,type,name) \
((type*)tqt_find_obj_child(parent,#type,name)) ((type*)tqt_find_obj_child(parent,#type,name))

36
src/kernel/ntqstyle.h
Unescape View File

@ -59,30 +59,24 @@ class TQTab;
class TQListViewItem; class TQListViewItem;
class TQCheckListItem; class TQCheckListItem;
class TQStyleOption { class Q_EXPORT TQStyleOption {
public: public:
enum StyleOptionDefault { Default }; enum StyleOptionDefault { Default };
TQStyleOption(StyleOptionDefault=Default) : def(TRUE), tb(NULL), cli(NULL), tbh(NULL) {} TQStyleOption(StyleOptionDefault=Default);
TQStyleOption(int in1);
// Note: we don't use default arguments since that is unnecessary TQStyleOption(int in1, int in2);
// initialization. TQStyleOption(int in1, int in2, int in3, int in4);
TQStyleOption(int in1) : TQStyleOption(TQMenuItem* m);
def(FALSE), tb(NULL), i1(in1), cli(NULL), tbh(NULL) {} TQStyleOption(TQMenuItem* m, int in1);
TQStyleOption(int in1, int in2) : TQStyleOption(TQMenuItem* m, int in1, int in2);
def(FALSE), tb(NULL), i1(in1), i2(in2), cli(NULL), tbh(NULL) {} TQStyleOption(const TQColor& c);
TQStyleOption(int in1, int in2, int in3, int in4) : TQStyleOption(TQTab* t);
def(FALSE), tb(NULL), i1(in1), i2(in2), i3(in3), i4(in4), cli(NULL), tbh(NULL) {} TQStyleOption(TQListViewItem* i);
TQStyleOption(TQMenuItem* m) : def(FALSE), mi(m), tb(NULL), cli(NULL), tbh(NULL) {} TQStyleOption(TQCheckListItem* i);
TQStyleOption(TQMenuItem* m, int in1) : def(FALSE), mi(m), tb(NULL), i1(in1), cli(NULL), tbh(NULL) {} TQStyleOption(TQt::ArrowType a);
TQStyleOption(TQMenuItem* m, int in1, int in2) : def(FALSE), mi(m), tb(NULL), i1(in1), i2(in2), cli(NULL), tbh(NULL) {} TQStyleOption(const TQRect& r);
TQStyleOption(const TQColor& c) : def(FALSE), tb(NULL), cl(&c), cli(NULL), tbh(NULL) {} TQStyleOption(TQWidget *w);
TQStyleOption(TQTab* t) : def(FALSE), tb(t), cli(NULL), tbh(NULL) {}
TQStyleOption(TQListViewItem* i) : def(FALSE), tb(NULL), li(i), cli(NULL), tbh(NULL) {}
TQStyleOption(TQCheckListItem* i) : def(FALSE), tb(NULL), cli(i), tbh(NULL) {}
TQStyleOption(TQt::ArrowType a) : def(FALSE), tb(NULL), i1((int)a), cli(NULL), tbh(NULL) {}
TQStyleOption(const TQRect& r) : def(FALSE), tb(NULL), i1(r.x()), i2(r.y()), i3(r.width()), i4(r.height()), cli(NULL), tbh(NULL) {}
TQStyleOption(TQWidget *w) : def(FALSE), tb(NULL), cli(NULL), p1((void*)w), tbh(NULL) {}
bool isDefault() const { return def; } bool isDefault() const { return def; }

8
src/kernel/ntqthread.h
Unescape View File

@ -108,6 +108,14 @@ public:
bool finished() const; bool finished() const;
bool running() const; bool running() const;
enum CleanupType {
CleanupNone,
CleanupMergeObjects
};
CleanupType cleanupType();
void setCleanupType(CleanupType);
protected: protected:
virtual void run() = 0; virtual void run() = 0;

142
src/kernel/qapplication.cpp
Unescape View File

@ -377,8 +377,13 @@ int TQApplication::composedUnicode = 0;
#ifdef QT_THREAD_SUPPORT #ifdef QT_THREAD_SUPPORT
TQMutex *TQApplication::tqt_mutex = 0; TQMutex *TQApplication::tqt_mutex = 0;
static TQMutex *postevent_mutex = 0; TQMutex *tqt_sharedStringMutex = 0;
static TQt::HANDLE tqt_application_thread_id = 0; Q_EXPORT TQMutex * tqt_sharedMetaObjectMutex = 0;
#ifdef QT_USE_GLIBMAINLOOP
TQMutex *tqt_timerListMutex = 0;
#endif // QT_USE_GLIBMAINLOOP
static TQMutex *postevent_mutex = 0;
static TQt::HANDLE tqt_application_thread_id = 0;
Q_EXPORT TQt::HANDLE tqt_get_application_thread_id() Q_EXPORT TQt::HANDLE tqt_get_application_thread_id()
{ {
return tqt_application_thread_id; return tqt_application_thread_id;
@ -600,6 +605,10 @@ static TQPostEventList *globalPostedEvents = 0; // list of posted events
uint qGlobalPostedEventsCount() uint qGlobalPostedEventsCount()
{ {
#ifdef QT_THREAD_SUPPORT
TQMutexLocker locker( postevent_mutex );
#endif // QT_THREAD_SUPPORT
if (!globalPostedEvents) { if (!globalPostedEvents) {
return 0; return 0;
} }
@ -1015,6 +1024,11 @@ void TQApplication::initialize( int argc, char **argv )
{ {
#ifdef QT_THREAD_SUPPORT #ifdef QT_THREAD_SUPPORT
tqt_mutex = new TQMutex( TRUE ); tqt_mutex = new TQMutex( TRUE );
tqt_sharedStringMutex = new TQMutex( TRUE );
tqt_sharedMetaObjectMutex = new TQMutex( TRUE );
#ifdef QT_USE_GLIBMAINLOOP
tqt_timerListMutex = new TQMutex( TRUE );
#endif // QT_USE_GLIBMAINLOOP
postevent_mutex = new TQMutex( TRUE ); postevent_mutex = new TQMutex( TRUE );
tqt_application_thread_id = TQThread::currentThread(); tqt_application_thread_id = TQThread::currentThread();
#endif // QT_THREAD_SUPPORT #endif // QT_THREAD_SUPPORT
@ -1184,6 +1198,17 @@ TQApplication::~TQApplication()
session_key = 0; session_key = 0;
#endif //QT_NO_SESSIONMANAGER #endif //QT_NO_SESSIONMANAGER
#ifdef QT_THREAD_SUPPORT
delete tqt_sharedMetaObjectMutex;
tqt_sharedMetaObjectMutex = 0;
delete tqt_sharedStringMutex;
tqt_sharedStringMutex = 0;
#ifdef QT_USE_GLIBMAINLOOP
delete tqt_timerListMutex;
tqt_timerListMutex = 0;
#endif // QT_USE_GLIBMAINLOOP
#endif // QT_THREAD_SUPPORT
tqt_explicit_app_style = FALSE; tqt_explicit_app_style = FALSE;
tqt_app_has_font = FALSE; tqt_app_has_font = FALSE;
app_tracking = 0; app_tracking = 0;
@ -2425,35 +2450,40 @@ bool TQApplication::notify( TQObject *receiver, TQEvent *e )
return FALSE; return FALSE;
} }
if ( e->type() == TQEvent::ChildRemoved && receiver->postedEvents && globalPostedEvents) { if ( receiver && (e->type() == TQEvent::Destroy) ) {
return TRUE;
}
if ( e->type() == TQEvent::ChildRemoved && receiver->postedEvents) {
#ifdef QT_THREAD_SUPPORT #ifdef QT_THREAD_SUPPORT
TQMutexLocker locker( postevent_mutex ); TQMutexLocker locker( postevent_mutex );
#endif // QT_THREAD_SUPPORT #endif // QT_THREAD_SUPPORT
// the TQObject destructor calls TQObject::removeChild, which calls if (globalPostedEvents) {
// TQApplication::sendEvent() directly. this can happen while the event // the TQObject destructor calls TQObject::removeChild, which calls
// loop is in the middle of posting events, and when we get here, we may // TQApplication::sendEvent() directly. this can happen while the event
// not have any more posted events for this object. // loop is in the middle of posting events, and when we get here, we may
if ( receiver->postedEvents ) { // not have any more posted events for this object.
// if this is a child remove event and the child insert if ( receiver->postedEvents ) {
// hasn't been dispatched yet, kill that insert // if this is a child remove event and the child insert
TQPostEventList * l = receiver->postedEvents; // hasn't been dispatched yet, kill that insert
TQObject * c = ((TQChildEvent*)e)->child(); TQPostEventList * l = receiver->postedEvents;
TQPostEvent * pe; TQObject * c = ((TQChildEvent*)e)->child();
l->first(); TQPostEvent * pe;
while( ( pe = l->current()) != 0 ) { l->first();
if ( pe->event && pe->receiver == receiver && while( ( pe = l->current()) != 0 ) {
pe->event->type() == TQEvent::ChildInserted && if ( pe->event && pe->receiver == receiver &&
((TQChildEvent*)pe->event)->child() == c ) { pe->event->type() == TQEvent::ChildInserted &&
pe->event->posted = FALSE; ((TQChildEvent*)pe->event)->child() == c ) {
delete pe->event; pe->event->posted = FALSE;
pe->event = 0; delete pe->event;
l->remove(); pe->event = 0;
continue; l->remove();
continue;
}
l->next();
}
} }
l->next();
}
} }
} }
@ -3545,8 +3575,9 @@ void TQApplication::removePostedEvents( TQObject *receiver )
void TQApplication::removePostedEvents( TQObject *receiver, int event_type ) void TQApplication::removePostedEvents( TQObject *receiver, int event_type )
{ {
if ( !receiver ) if ( !receiver ) {
return; return;
}
#ifdef QT_THREAD_SUPPORT #ifdef QT_THREAD_SUPPORT
TQMutexLocker locker( postevent_mutex ); TQMutexLocker locker( postevent_mutex );
@ -3556,8 +3587,9 @@ void TQApplication::removePostedEvents( TQObject *receiver, int event_type )
// happen while the event loop is in the middle of posting events, // happen while the event loop is in the middle of posting events,
// and when we get here, we may not have any more posted events // and when we get here, we may not have any more posted events
// for this object. // for this object.
if ( !receiver->postedEvents ) if ( !receiver->postedEvents ) {
return; return;
}
// iterate over the object-specifc list and delete the events. // iterate over the object-specifc list and delete the events.
// leave the TQPostEvent objects; they'll be deleted by // leave the TQPostEvent objects; they'll be deleted by
@ -3596,8 +3628,13 @@ void TQApplication::removePostedEvents( TQObject *receiver, int event_type )
void TQApplication::removePostedEvent( TQEvent * event ) void TQApplication::removePostedEvent( TQEvent * event )
{ {
if ( !event || !event->posted ) if ( !event || !event->posted ) {
return; return;
}
#ifdef QT_THREAD_SUPPORT
TQMutexLocker locker( postevent_mutex );
#endif // QT_THREAD_SUPPORT
if ( !globalPostedEvents ) { if ( !globalPostedEvents ) {
#if defined(QT_DEBUG) #if defined(QT_DEBUG)
@ -3607,10 +3644,6 @@ void TQApplication::removePostedEvent( TQEvent * event )
#endif #endif
} }
#ifdef QT_THREAD_SUPPORT
TQMutexLocker locker( postevent_mutex );
#endif // QT_THREAD_SUPPORT
TQPostEventListIt it( *globalPostedEvents ); TQPostEventListIt it( *globalPostedEvents );
TQPostEvent * pe; TQPostEvent * pe;
while( (pe = it.current()) != 0 ) { while( (pe = it.current()) != 0 ) {
@ -3696,6 +3729,51 @@ void TQApplication::removePostedEvent( TQEvent * event )
} }
} }
void tqThreadTerminationHandlerRecursive( TQObject* object, TQThread* originThread, TQThread* destinationThread ) {
#ifdef QT_THREAD_SUPPORT
TQThread* objectThread = object->contextThreadObject();
if (objectThread != destinationThread) {
TQThread::CleanupType cleanupType = objectThread->cleanupType();
if (cleanupType == TQThread::CleanupMergeObjects) {
object->moveToThread(destinationThread);
}
else if (cleanupType == TQThread::CleanupNone) {
// Do nothing
#if defined(QT_DEBUG)
tqDebug( "TQApplication::threadTerminationHandler: object %p still owned by thread %p at thread termination!", object, objectThread);
#endif // QT_DEBUG
}
else {
// Do nothing
#if defined(QT_DEBUG)
tqDebug( "TQApplication::threadTerminationHandler: invalid thread termination cleanup type %d specified", cleanupType);
#endif // QT_DEBUG
}
}
TQObjectList children = object->childrenListObject();
TQObject *childObject;
for ( childObject = children.first(); childObject; childObject = children.next() ) {
tqThreadTerminationHandlerRecursive(childObject, originThread, destinationThread);
}
#endif // QT_THREAD_SUPPORT
}
/*!\internal
Migrates all objects from the specified thread in preparation
for thread destruction.
*/
void TQApplication::threadTerminationHandler( TQThread *originThread ) {
#ifdef QT_THREAD_SUPPORT
TQMutexLocker locker( tqt_mutex );
TQThread* destinationThread = guiThread();
const TQObjectList* objects = TQObject::objectTrees();
for ( TQObjectListIt objectit( *objects ) ; *objectit; ++objectit ) {
tqThreadTerminationHandlerRecursive((*objectit), originThread, destinationThread);
}
#endif // QT_THREAD_SUPPORT
}
/*!\internal /*!\internal
Sets the active window in reaction to a system event. Call this Sets the active window in reaction to a system event. Call this

82
src/kernel/qeventloop_unix_glib.cpp
Unescape View File

@ -55,6 +55,12 @@
#include <glib.h> #include <glib.h>
#ifdef QT_THREAD_SUPPORT
#ifdef QT_USE_GLIBMAINLOOP
extern TQMutex *tqt_timerListMutex;
#endif // QT_USE_GLIBMAINLOOP
#endif // QT_THREAD_SUPPORT
/***************************************************************************** /*****************************************************************************
Timer handling; UNIX has no application timer support so we'll have to Timer handling; UNIX has no application timer support so we'll have to
make our own from scratch. make our own from scratch.
@ -102,9 +108,6 @@ typedef TQPtrList<TimerInfo> TimerList; // list of TimerInfo structs
static TQBitArray *timerBitVec; // timer bit vector static TQBitArray *timerBitVec; // timer bit vector
static TimerList *timerList = 0; // timer list static TimerList *timerList = 0; // timer list
#if defined(QT_THREAD_SUPPORT)
static TQMutex *timerListMutex = 0; // timer list mutex
#endif
static void initTimers(); static void initTimers();
void cleanupTimers(); void cleanupTimers();
@ -184,7 +187,7 @@ static int allocTimerId() // find avail timer identifier
static void insertTimer( const TimerInfo *ti ) // insert timer info into list static void insertTimer( const TimerInfo *ti ) // insert timer info into list
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
timerListMutex->lock(); tqt_timerListMutex->lock();
#endif #endif
TimerInfo *t = timerList->first(); TimerInfo *t = timerList->first();
int index = 0; int index = 0;
@ -207,7 +210,7 @@ static void insertTimer( const TimerInfo *ti ) // insert timer info into list
} }
#endif #endif
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
timerListMutex->unlock(); tqt_timerListMutex->unlock();
#endif #endif
} }
@ -233,7 +236,7 @@ static inline void getTime( timeval &t ) // get time of day
static void repairTimer( const timeval &time ) // repair broken timer static void repairTimer( const timeval &time ) // repair broken timer
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
timerListMutex->lock(); tqt_timerListMutex->lock();
#endif #endif
timeval diff = watchtime - time; timeval diff = watchtime - time;
register TimerInfo *t = timerList->first(); register TimerInfo *t = timerList->first();
@ -242,7 +245,7 @@ static void repairTimer( const timeval &time ) // repair broken timer
t = timerList->next(); t = timerList->next();
} }
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
timerListMutex->unlock(); tqt_timerListMutex->unlock();
#endif #endif
} }
@ -260,7 +263,7 @@ static void repairTimer( const timeval &time ) // repair broken timer
timeval *qt_wait_timer() timeval *qt_wait_timer()
{ {
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
if (timerListMutex) timerListMutex->lock(); tqt_timerListMutex->lock();
#endif #endif
static timeval tm; static timeval tm;
bool first = TRUE; bool first = TRUE;
@ -286,19 +289,19 @@ timeval *qt_wait_timer()
tm = *qt_wait_timer_max; tm = *qt_wait_timer_max;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
if (timerListMutex) timerListMutex->unlock(); tqt_timerListMutex->unlock();
#endif #endif
return &tm; return &tm;
} }
if ( qt_wait_timer_max ) { if ( qt_wait_timer_max ) {
tm = *qt_wait_timer_max; tm = *qt_wait_timer_max;
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
if (timerListMutex) timerListMutex->unlock(); tqt_timerListMutex->unlock();
#endif #endif
return &tm; return &tm;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
if (timerListMutex) timerListMutex->unlock(); tqt_timerListMutex->unlock();
#endif #endif
return 0; // no timers return 0; // no timers
} }
@ -314,7 +317,7 @@ static void initTimers() // initialize timers
} }
timerList = new TimerList; timerList = new TimerList;
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
timerListMutex = new TQMutex(true); tqt_timerListMutex = new TQMutex(true);
#endif #endif
TQ_CHECK_PTR( timerList ); TQ_CHECK_PTR( timerList );
timerList->setAutoDelete( TRUE ); timerList->setAutoDelete( TRUE );
@ -328,20 +331,25 @@ void cleanupTimers()
timerList = 0; timerList = 0;
delete timerBitVec; delete timerBitVec;
timerBitVec = 0; timerBitVec = 0;
#if defined(QT_THREAD_SUPPORT)
delete timerListMutex;
timerListMutex = 0;
#endif
} }
// Main timer functions for starting and killing timers // Main timer functions for starting and killing timers
int qStartTimer( int interval, TQObject *obj ) int qStartTimer( int interval, TQObject *obj )
{ {
#if defined(QT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->lock();
#endif
if ( !timerList ) { // initialize timer data if ( !timerList ) { // initialize timer data
initTimers(); initTimers();
#if defined(QT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->lock();
#endif
} }
int id = allocTimerId(); // get free timer id int id = allocTimerId(); // get free timer id
if ( (id <= 0) || (id > (int)timerBitVec->size()) || (!obj) ) { // cannot create timer if ( (id <= 0) || (id > (int)timerBitVec->size()) || (!obj) ) { // cannot create timer
#if defined(QT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif
return 0; return 0;
} }
timerBitVec->setBit( id-1 ); // set timer active timerBitVec->setBit( id-1 ); // set timer active
@ -355,18 +363,24 @@ int qStartTimer( int interval, TQObject *obj )
t->timeout = currentTime + t->interval; t->timeout = currentTime + t->interval;
t->obj = obj; t->obj = obj;
insertTimer( t ); // put timer in list insertTimer( t ); // put timer in list
#if defined(QT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif
return id; return id;
} }
bool qKillTimer( int id ) bool qKillTimer( int id )
{ {
#if defined(QT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->lock();
#endif
register TimerInfo *t; register TimerInfo *t;
if ( (!timerList) || (id <= 0) || (id > (int)timerBitVec->size()) || (!timerBitVec->testBit( id-1 )) ) { if ( (!timerList) || (id <= 0) || (id > (int)timerBitVec->size()) || (!timerBitVec->testBit( id-1 )) ) {
return FALSE; // not init'd or invalid timer
}
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
timerListMutex->lock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return FALSE; // not init'd or invalid timer
}
t = timerList->first(); t = timerList->first();
while ( t && t->id != id ) { // find timer info in list while ( t && t->id != id ) { // find timer info in list
t = timerList->next(); t = timerList->next();
@ -376,13 +390,13 @@ bool qKillTimer( int id )
timerBitVec->clearBit( id-1 ); // set timer inactive timerBitVec->clearBit( id-1 ); // set timer inactive
ret = timerList->remove(); ret = timerList->remove();
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return ret; return ret;
} }
else { // id not found else { // id not found
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return FALSE; return FALSE;
} }
@ -390,13 +404,16 @@ bool qKillTimer( int id )
bool qKillTimer( TQObject *obj ) bool qKillTimer( TQObject *obj )
{ {
#if defined(QT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->lock();
#endif
register TimerInfo *t; register TimerInfo *t;
if ( !timerList ) { // not initialized if ( !timerList ) { // not initialized
return FALSE;
}
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
timerListMutex->lock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return FALSE;
}
t = timerList->first(); t = timerList->first();
while ( t ) { // check all timers while ( t ) { // check all timers
if ( t->obj == obj ) { // object found if ( t->obj == obj ) { // object found
@ -409,7 +426,7 @@ bool qKillTimer( TQObject *obj )
} }
} }
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return TRUE; return TRUE;
} }
@ -615,12 +632,15 @@ int TQEventLoop::timeToWait() const
int TQEventLoop::activateTimers() int TQEventLoop::activateTimers()
{ {
#if defined(QT_THREAD_SUPPORT)
if (tqt_timerListMutex) tqt_timerListMutex->lock();
#endif
if ( !timerList || !timerList->count() ) { // no timers if ( !timerList || !timerList->count() ) { // no timers
return 0;
}
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
timerListMutex->lock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return 0;
}
bool first = TRUE; bool first = TRUE;
timeval currentTime; timeval currentTime;
int n_act = 0, maxCount = timerList->count(); int n_act = 0, maxCount = timerList->count();
@ -663,7 +683,7 @@ int TQEventLoop::activateTimers()
n_act++; n_act++;
} }
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
TQTimerEvent e( t->id ); TQTimerEvent e( t->id );
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
@ -678,14 +698,14 @@ int TQEventLoop::activateTimers()
TQApplication::sendEvent( t->obj, &e ); // send event TQApplication::sendEvent( t->obj, &e ); // send event
#endif // defined(QT_THREAD_SUPPORT) #endif // defined(QT_THREAD_SUPPORT)
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
timerListMutex->lock(); if (tqt_timerListMutex) tqt_timerListMutex->lock();
#endif #endif
if ( timerList->findRef( begin ) == -1 ) { if ( timerList->findRef( begin ) == -1 ) {
begin = 0; begin = 0;
} }
} }
#if defined(QT_THREAD_SUPPORT) #if defined(QT_THREAD_SUPPORT)
timerListMutex->unlock(); if (tqt_timerListMutex) tqt_timerListMutex->unlock();
#endif #endif
return n_act; return n_act;
} }

4
src/kernel/qeventloop_x11_glib.cpp
Unescape View File

@ -629,6 +629,10 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) {
bool TQEventLoop::hasPendingEvents() const bool TQEventLoop::hasPendingEvents() const
{ {
#ifdef QT_THREAD_SUPPORT
TQMutexLocker locker( TQApplication::tqt_mutex );
#endif // QT_THREAD_SUPPORT
extern uint qGlobalPostedEventsCount(); // from qapplication.cpp extern uint qGlobalPostedEventsCount(); // from qapplication.cpp
return ( qGlobalPostedEventsCount() || ( (tqt_is_gui_used && TQApplication::isGuiThread()) ? XPending( TQPaintDevice::x11AppDisplay() ) : 0)); return ( qGlobalPostedEventsCount() || ( (tqt_is_gui_used && TQApplication::isGuiThread()) ? XPending( TQPaintDevice::x11AppDisplay() ) : 0));
} }

199
src/kernel/qobject.cpp
Unescape View File

@ -73,6 +73,8 @@ public:
} }
#endif #endif
TQThread* ownThread; TQThread* ownThread;
TQMutex* senderObjectListMutex;
TQMutex* childObjectListMutex;
bool disableThreadPostedEvents; bool disableThreadPostedEvents;
}; };
@ -83,6 +85,10 @@ void TQObject::moveToThread_helper(TQThread *targetThread)
TQEvent e(TQEvent::ThreadChange); TQEvent e(TQEvent::ThreadChange);
TQApplication::sendEvent(this, &e); TQApplication::sendEvent(this, &e);
#ifdef QT_THREAD_SUPPORT
TQMutexLocker locker( d->childObjectListMutex );
#endif // QT_THREAD_SUPPORT
if (childObjects) { if (childObjects) {
TQObject *child; TQObject *child;
TQObjectListIt it(*childObjects); TQObjectListIt it(*childObjects);
@ -97,12 +103,16 @@ void TQObject::setThreadObject_helper(TQThread *targetThread)
{ {
d->ownThread = targetThread; d->ownThread = targetThread;
#ifdef QT_THREAD_SUPPORT
TQMutexLocker locker( d->childObjectListMutex );
#endif // QT_THREAD_SUPPORT
if (childObjects) { if (childObjects) {
TQObject *child; TQObject *child;
TQObjectListIt it(*childObjects); TQObjectListIt it(*childObjects);
while ( (child=it.current()) ) { while ( (child=it.current()) ) {
++it; ++it;
child->moveToThread_helper(targetThread); child->setThreadObject_helper(targetThread);
} }
} }
} }
@ -123,7 +133,9 @@ void TQObject::setThreadObject_helper(TQThread *targetThread)
*/ */
void TQObject::moveToThread(TQThread *targetThread) void TQObject::moveToThread(TQThread *targetThread)
{ {
#ifdef QT_THREAD_SUPPORT
TQMutexLocker locker( TQApplication::tqt_mutex ); TQMutexLocker locker( TQApplication::tqt_mutex );
#endif // QT_THREAD_SUPPORT
if (parentObj) { if (parentObj) {
#if defined(QT_DEBUG) #if defined(QT_DEBUG)
@ -179,11 +191,23 @@ void TQObject::disableThreadPostedEvents(bool disable) {
class TQSenderObjectList : public TQObjectList, public TQShared class TQSenderObjectList : public TQObjectList, public TQShared
{ {
public: public:
TQSenderObjectList() : currentSender( 0 ) { } TQSenderObjectList();
TQObject *currentSender; ~TQSenderObjectList();
public:
TQObject *currentSender;
TQMutex *listMutex;
}; };
TQSenderObjectList::TQSenderObjectList() : currentSender( 0 ) {
listMutex = new TQMutex( TRUE );
}
TQSenderObjectList::~TQSenderObjectList() {
delete listMutex;
}
class Q_EXPORT TQMetaCallEvent : public TQEvent class Q_EXPORT TQMetaCallEvent : public TQEvent
{ {
public: public:
@ -369,8 +393,9 @@ bool qKillTimer( TQObject *obj );
static void removeObjFromList( TQObjectList *objList, const TQObject *obj, static void removeObjFromList( TQObjectList *objList, const TQObject *obj,
bool single=FALSE ) bool single=FALSE )
{ {
if ( !objList ) if ( !objList ) {
return; return;
}
int index = objList->findRef( obj ); int index = objList->findRef( obj );
while ( index >= 0 ) { while ( index >= 0 ) {
objList->remove(); objList->remove();
@ -585,20 +610,25 @@ TQObject::TQObject( TQObject *parent, const char *name )
postedEvents( 0 ), // no events posted postedEvents( 0 ), // no events posted
d( 0 ) d( 0 )
{ {
if ( !metaObj ) // will create object dict if ( !d ) {
d = new TQObjectPrivate(0);
}
d->ownThread = TQThread::currentThreadObject();
d->senderObjectListMutex = new TQMutex( TRUE );
d->childObjectListMutex = new TQMutex( TRUE );
if ( !metaObj ) { // will create object dict
(void) staticMetaObject(); (void) staticMetaObject();
}
if ( parent ) { // add object to parent if ( parent ) { // add object to parent
parent->insertChild( this ); parent->insertChild( this );
} else { }
else {
insert_tree( this ); insert_tree( this );
isTree = TRUE; isTree = TRUE;
} }
if ( !d )
d = new TQObjectPrivate(0);
d->ownThread = TQThread::currentThreadObject();
} }
@ -630,10 +660,15 @@ TQObject::~TQObject()
#endif #endif
return; return;
} }
if (tqApp) {
TQEvent destroyEvent(TQEvent::Destroy);
tqApp->notify(this, &destroyEvent);
}
wasDeleted = 1; wasDeleted = 1;
blockSig = 0; // unblock signals to keep TQGuardedPtr happy blockSig = 0; // unblock signals to keep TQGuardedPtr happy
emit destroyed( this ); emit destroyed( this );
emit destroyed(); emit destroyed();
if ( objname ) { if ( objname ) {
delete [] (char*)objname; delete [] (char*)objname;
} }
@ -669,8 +704,9 @@ TQObject::~TQObject()
TQConnectionListIt cit(*clist); TQConnectionListIt cit(*clist);
while( (c=cit.current()) ) { // for each connected slot... while( (c=cit.current()) ) { // for each connected slot...
++cit; ++cit;
if ( (obj=c->object()) ) if ( (obj=c->object()) ) {
removeObjFromList( obj->senderObjects, this ); removeObjFromList( obj->senderObjects, this );
}
} }
} }
delete connections; delete connections;
@ -691,6 +727,11 @@ TQObject::~TQObject()
delete childObjects; delete childObjects;
} }
#ifdef QT_THREAD_SUPPORT
delete d->childObjectListMutex;
delete d->senderObjectListMutex;
#endif // QT_THREAD_SUPPORT
delete d; delete d;
} }
@ -985,11 +1026,17 @@ bool TQObject::event( TQEvent *e )
TQSenderObjectList* sol; TQSenderObjectList* sol;
TQObject* oldSender = 0; TQObject* oldSender = 0;
sol = senderObjects; sol = senderObjects;
#ifdef QT_THREAD_SUPPORT
sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT
if ( sol ) { if ( sol ) {
oldSender = sol->currentSender; oldSender = sol->currentSender;
sol->ref(); sol->ref();
sol->currentSender = metaEvent->sender(); sol->currentSender = metaEvent->sender();
} }
#ifdef QT_THREAD_SUPPORT
sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT
TQUObject *o = metaEvent->data(); TQUObject *o = metaEvent->data();
if (metaEvent->type() == TQMetaCallEvent::MetaCallEmit) { if (metaEvent->type() == TQMetaCallEvent::MetaCallEmit) {
tqt_emit( metaEvent->id(), o ); tqt_emit( metaEvent->id(), o );
@ -997,12 +1044,20 @@ bool TQObject::event( TQEvent *e )
if (metaEvent->type() == TQMetaCallEvent::MetaCallInvoke) { if (metaEvent->type() == TQMetaCallEvent::MetaCallInvoke) {
tqt_invoke( metaEvent->id(), o ); tqt_invoke( metaEvent->id(), o );
} }
#ifdef QT_THREAD_SUPPORT
sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT
if (sol ) { if (sol ) {
sol->currentSender = oldSender; sol->currentSender = oldSender;
if ( sol->deref() ) { if ( sol->deref() ) {
sol->listMutex->unlock();
delete sol; delete sol;
sol = NULL;
} }
} }
#ifdef QT_THREAD_SUPPORT
if (sol) sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT
} }
else { else {
tqWarning("TQObject: Ignoring metacall event from non-owning thread"); tqWarning("TQObject: Ignoring metacall event from non-owning thread");
@ -1509,6 +1564,10 @@ TQConnectionList *TQObject::receivers( int signal ) const
void TQObject::insertChild( TQObject *obj ) void TQObject::insertChild( TQObject *obj )
{ {
#ifdef QT_THREAD_SUPPORT
TQMutexLocker locker( d->childObjectListMutex );
#endif // QT_THREAD_SUPPORT
if ( obj->isTree ) { if ( obj->isTree ) {
remove_tree( obj ); remove_tree( obj );
obj->isTree = FALSE; obj->isTree = FALSE;
@ -1551,6 +1610,10 @@ void TQObject::insertChild( TQObject *obj )
void TQObject::removeChild( TQObject *obj ) void TQObject::removeChild( TQObject *obj )
{ {
#ifdef QT_THREAD_SUPPORT
TQMutexLocker locker( d->childObjectListMutex );
#endif // QT_THREAD_SUPPORT
if ( childObjects && childObjects->removeRef(obj) ) { if ( childObjects && childObjects->removeRef(obj) ) {
obj->parentObj = 0; obj->parentObj = 0;
if ( !obj->wasDeleted ) { if ( !obj->wasDeleted ) {
@ -2135,9 +2198,25 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const
TQConnection *c = new TQConnection( r, member_index, rm ? rm->name : "qt_invoke", membcode ); TQConnection *c = new TQConnection( r, member_index, rm ? rm->name : "qt_invoke", membcode );
TQ_CHECK_PTR( c ); TQ_CHECK_PTR( c );
clist->append( c ); clist->append( c );
if ( !r->senderObjects ) // create list of senders if ( !r->senderObjects ) { // create list of senders
#ifdef QT_THREAD_SUPPORT
r->d->senderObjectListMutex->lock();
#endif // QT_THREAD_SUPPORT
r->senderObjects = new TQSenderObjectList; r->senderObjects = new TQSenderObjectList;
#ifdef QT_THREAD_SUPPORT
r->senderObjects->listMutex->lock();
r->d->senderObjectListMutex->unlock();
#endif // QT_THREAD_SUPPORT
}
else {
#ifdef QT_THREAD_SUPPORT
r->senderObjects->listMutex->lock();
#endif // QT_THREAD_SUPPORT
}
r->senderObjects->append( s ); // add sender to list r->senderObjects->append( s ); // add sender to list
#ifdef QT_THREAD_SUPPORT
r->senderObjects->listMutex->unlock();
#endif // QT_THREAD_SUPPORT
} }
@ -2343,13 +2422,25 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index,
c = clist->first(); c = clist->first();
while ( c ) { // for all receivers... while ( c ) { // for all receivers...
if ( r == 0 ) { // remove all receivers if ( r == 0 ) { // remove all receivers
#ifdef QT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock();
#endif // QT_THREAD_SUPPORT
removeObjFromList( c->object()->senderObjects, s ); removeObjFromList( c->object()->senderObjects, s );
#ifdef QT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock();
#endif // QT_THREAD_SUPPORT
success = TRUE; success = TRUE;
c = clist->next(); c = clist->next();
} else if ( r == c->object() && } else if ( r == c->object() &&
( (member_index == -1) || ( (member_index == -1) ||
((member_index == c->member()) && (c->memberType() == membcode)) ) ) { ((member_index == c->member()) && (c->memberType() == membcode)) ) ) {
#ifdef QT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock();
#endif // QT_THREAD_SUPPORT
removeObjFromList( c->object()->senderObjects, s, TRUE ); removeObjFromList( c->object()->senderObjects, s, TRUE );
#ifdef QT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock();
#endif // QT_THREAD_SUPPORT
success = TRUE; success = TRUE;
clist->remove(); clist->remove();
c = clist->current(); c = clist->current();
@ -2368,13 +2459,25 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index,
c = clist->first(); c = clist->first();
while ( c ) { // for all receivers... while ( c ) { // for all receivers...
if ( r == 0 ) { // remove all receivers if ( r == 0 ) { // remove all receivers
#ifdef QT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock();
#endif // QT_THREAD_SUPPORT
removeObjFromList( c->object()->senderObjects, s, TRUE ); removeObjFromList( c->object()->senderObjects, s, TRUE );
#ifdef QT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock();
#endif // QT_THREAD_SUPPORT
success = TRUE; success = TRUE;
c = clist->next(); c = clist->next();
} else if ( r == c->object() && } else if ( r == c->object() &&
( (member_index == -1) || ( (member_index == -1) ||
((member_index == c->member()) && (c->memberType() == membcode)) ) ) { ((member_index == c->member()) && (c->memberType() == membcode)) ) ) {
#ifdef QT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->lock();
#endif // QT_THREAD_SUPPORT
removeObjFromList( c->object()->senderObjects, s, TRUE ); removeObjFromList( c->object()->senderObjects, s, TRUE );
#ifdef QT_THREAD_SUPPORT
if (c->object()->senderObjects) c->object()->senderObjects->listMutex->unlock();
#endif // QT_THREAD_SUPPORT
success = TRUE; success = TRUE;
clist->remove(); clist->remove();
c = clist->current(); c = clist->current();
@ -2382,8 +2485,9 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index,
c = clist->next(); c = clist->next();
} }
} }
if ( r == 0 ) // disconnect all receivers if ( r == 0 ) { // disconnect all receivers
s->connections->insert( signal_index, 0 ); s->connections->insert( signal_index, 0 );
}
} }
return success; return success;
} }
@ -2578,11 +2682,13 @@ void TQObject::activate_signal( int signal )
} }
#endif #endif
if ( !connections || signalsBlocked() || signal < 0 ) if ( !connections || signalsBlocked() || signal < 0 ) {
return; return;
}
TQConnectionList *clist = connections->at( signal ); TQConnectionList *clist = connections->at( signal );
if ( !clist ) if ( !clist ) {
return; return;
}
TQUObject o[1]; TQUObject o[1];
o[0].isLastObject = true; o[0].isLastObject = true;
activate_signal( clist, o ); activate_signal( clist, o );
@ -2592,12 +2698,14 @@ void TQObject::activate_signal( int signal )
void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
{ {
if ( !clist ) if ( !clist ) {
return; return;
}
#ifndef QT_NO_PRELIMINARY_SIGNAL_SPY #ifndef QT_NO_PRELIMINARY_SIGNAL_SPY
if ( tqt_preliminary_signal_spy ) if ( tqt_preliminary_signal_spy ) {
qt_spy_signal( this, connections->findRef( clist), o ); qt_spy_signal( this, connections->findRef( clist), o );
}
#endif #endif
const TQThread *currentThread = TQThread::currentThreadObject(); const TQThread *currentThread = TQThread::currentThreadObject();
@ -2610,6 +2718,9 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
c = clist->first(); c = clist->first();
object = c->object(); object = c->object();
sol = object->senderObjects; sol = object->senderObjects;
#ifdef QT_THREAD_SUPPORT
sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT
if ( sol ) { if ( sol ) {
oldSender = sol->currentSender; oldSender = sol->currentSender;
sol->ref(); sol->ref();
@ -2617,7 +2728,13 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
} }
if ( c->memberType() == TQSIGNAL_CODE ) { if ( c->memberType() == TQSIGNAL_CODE ) {
if ((d->disableThreadPostedEvents) || (object->d->ownThread == currentThread)) { if ((d->disableThreadPostedEvents) || (object->d->ownThread == currentThread)) {
#ifdef QT_THREAD_SUPPORT
sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT
object->tqt_emit( c->member(), o ); object->tqt_emit( c->member(), o );
#ifdef QT_THREAD_SUPPORT
sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT
} }
else { else {
if (object->d->ownThread && !object->d->ownThread->finished()) { if (object->d->ownThread && !object->d->ownThread->finished()) {
@ -2627,7 +2744,13 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
} }
else { else {
if ((d->disableThreadPostedEvents) || (object->d->ownThread == currentThread)) { if ((d->disableThreadPostedEvents) || (object->d->ownThread == currentThread)) {
#ifdef QT_THREAD_SUPPORT
sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT
object->tqt_invoke( c->member(), o ); object->tqt_invoke( c->member(), o );
#ifdef QT_THREAD_SUPPORT
sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT
} }
else { else {
if (object->d->ownThread && !object->d->ownThread->finished()) { if (object->d->ownThread && !object->d->ownThread->finished()) {
@ -2637,9 +2760,15 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
} }
if ( sol ) { if ( sol ) {
sol->currentSender = oldSender; sol->currentSender = oldSender;
if ( sol->deref() ) if ( sol->deref() ) {
sol->listMutex->unlock();
delete sol; delete sol;
sol = NULL;
}
} }
#ifdef QT_THREAD_SUPPORT
if (sol) sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT
} else { } else {
TQConnection *cd = 0; TQConnection *cd = 0;
TQConnectionListIt it(*clist); TQConnectionListIt it(*clist);
@ -2650,6 +2779,9 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
cd = c; cd = c;
object = c->object(); object = c->object();
sol = object->senderObjects; sol = object->senderObjects;
#ifdef QT_THREAD_SUPPORT
sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT
if ( sol ) { if ( sol ) {
oldSender = sol->currentSender; oldSender = sol->currentSender;
sol->ref(); sol->ref();
@ -2657,7 +2789,13 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
} }
if ( c->memberType() == TQSIGNAL_CODE ) { if ( c->memberType() == TQSIGNAL_CODE ) {
if ((d->disableThreadPostedEvents) || (object->d->ownThread == currentThread)) { if ((d->disableThreadPostedEvents) || (object->d->ownThread == currentThread)) {
#ifdef QT_THREAD_SUPPORT
sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT
object->tqt_emit( c->member(), o ); object->tqt_emit( c->member(), o );
#ifdef QT_THREAD_SUPPORT
sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT
} }
else { else {
if (object->d->ownThread && !object->d->ownThread->finished()) { if (object->d->ownThread && !object->d->ownThread->finished()) {
@ -2667,7 +2805,13 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
} }
else { else {
if ((d->disableThreadPostedEvents) || (object->d->ownThread == currentThread)) { if ((d->disableThreadPostedEvents) || (object->d->ownThread == currentThread)) {
#ifdef QT_THREAD_SUPPORT
sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT
object->tqt_invoke( c->member(), o ); object->tqt_invoke( c->member(), o );
#ifdef QT_THREAD_SUPPORT
sol->listMutex->lock();
#endif // QT_THREAD_SUPPORT
} }
else { else {
if (object->d->ownThread && !object->d->ownThread->finished()) { if (object->d->ownThread && !object->d->ownThread->finished()) {
@ -2677,9 +2821,15 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
} }
if (sol ) { if (sol ) {
sol->currentSender = oldSender; sol->currentSender = oldSender;
if ( sol->deref() ) if ( sol->deref() ) {
sol->listMutex->unlock();
delete sol; delete sol;
sol = NULL;
}
} }
#ifdef QT_THREAD_SUPPORT
if (sol) sol->listMutex->unlock();
#endif // QT_THREAD_SUPPORT
} }
} }
} }
@ -2818,6 +2968,10 @@ void TQObject::dumpObjectTree()
void TQObject::dumpObjectInfo() void TQObject::dumpObjectInfo()
{ {
#ifdef QT_THREAD_SUPPORT
TQMutexLocker locker( d->senderObjectListMutex );
#endif // QT_THREAD_SUPPORT
#if defined(QT_DEBUG) #if defined(QT_DEBUG)
tqDebug( "OBJECT %s::%s", className(), name( "unnamed" ) ); tqDebug( "OBJECT %s::%s", className(), name( "unnamed" ) );
int n = 0; int n = 0;
@ -2852,8 +3006,9 @@ void TQObject::dumpObjectInfo()
sender = senderObjects->next(); sender = senderObjects->next();
} }
} }
if ( n == 0 ) if ( n == 0 ) {
tqDebug( "\t<None>" ); tqDebug( "\t<None>" );
}
#endif #endif
} }

188
src/kernel/qstyle.cpp
Unescape View File

@ -62,6 +62,194 @@ public:
} }
}; };
TQStyleOption::TQStyleOption(StyleOptionDefault) :
def(TRUE),
tb(NULL),
i1(-1),
i2(-1),
i3(-1),
i4(-1),
i5(-1),
cli(NULL),
tbh(NULL) {
//
}
TQStyleOption::TQStyleOption(int in1) :
def(FALSE),
tb(NULL),
i1(in1),
i2(-1),
i3(-1),
i4(-1),
i5(-1),
cli(NULL),
tbh(NULL) {
//
}
TQStyleOption::TQStyleOption(int in1, int in2) :
def(FALSE),
tb(NULL),
i1(in1),
i2(in2),
i3(-1),
i4(-1),
i5(-1),
cli(NULL),
tbh(NULL) {
//
}
TQStyleOption::TQStyleOption(int in1, int in2, int in3, int in4) :
def(FALSE),
tb(NULL),
i1(in1),
i2(in2),
i3(in3),
i4(in4),
i5(-1),
cli(NULL),
tbh(NULL) {
//
}
TQStyleOption::TQStyleOption(TQMenuItem* m) :
def(FALSE),
mi(m),
tb(NULL),
i1(-1),
i2(-1),
i3(-1),
i4(-1),
i5(-1),
cli(NULL),
tbh(NULL) {
//
}
TQStyleOption::TQStyleOption(TQMenuItem* m, int in1) :
def(FALSE),
mi(m),
tb(NULL),
i1(in1),
i2(-1),
i3(-1),
i4(-1),
i5(-1),
cli(NULL),
tbh(NULL) {
//
}
TQStyleOption::TQStyleOption(TQMenuItem* m, int in1, int in2) :
def(FALSE),
mi(m),
tb(NULL),
i1(in1),
i2(in2),
i3(-1),
i4(-1),
i5(-1),
cli(NULL),
tbh(NULL) {
//
}
TQStyleOption::TQStyleOption(const TQColor& c) :
def(FALSE),
tb(NULL),
cl(&c),
i1(-1),
i2(-1),
i3(-1),
i4(-1),
i5(-1),
cli(NULL),
tbh(NULL) {
//
}
TQStyleOption::TQStyleOption(TQTab* t) :
def(FALSE),
tb(t),
i1(-1),
i2(-1),
i3(-1),
i4(-1),
i5(-1),
cli(NULL),
tbh(NULL) {
//
}
TQStyleOption::TQStyleOption(TQListViewItem* i) :
def(FALSE),
tb(NULL),
li(i),
i1(-1),
i2(-1),
i3(-1),
i4(-1),
i5(-1),
cli(NULL),
tbh(NULL) {
//
}
TQStyleOption::TQStyleOption(TQCheckListItem* i) :
def(FALSE),
tb(NULL),
i1(-1),
i2(-1),
i3(-1),
i4(-1),
i5(-1),
cli(i),
tbh(NULL) {
//
}
TQStyleOption::TQStyleOption(TQt::ArrowType a) :
def(FALSE),
tb(NULL),
i1((int)a),
i2(-1),
i3(-1),
i4(-1),
i5(-1),
cli(NULL),
tbh(NULL) {
//
}
TQStyleOption::TQStyleOption(const TQRect& r) :
def(FALSE),
tb(NULL),
i1(r.x()),
i2(r.y()),
i3(r.width()),
i4(r.height()),
i5(-1),
cli(NULL),
tbh(NULL) {
//
}
TQStyleOption::TQStyleOption(TQWidget *w) :
def(FALSE),
tb(NULL),
i1(-1),
i2(-1),
i3(-1),
i4(-1),
i5(-1),
cli(NULL),
p1((void*)w),
tbh(NULL) {
//
}
/*! /*!
\class TQStyleOption ntqstyle.h \class TQStyleOption ntqstyle.h
\brief The TQStyleOption class specifies optional parameters for TQStyle functions. \brief The TQStyleOption class specifies optional parameters for TQStyle functions.

4
src/kernel/qthread.cpp
Unescape View File

@ -132,6 +132,10 @@
TQThread::TQThread() TQThread::TQThread()
{ {
#ifdef QT_THREAD_SUPPORT
TQMutexLocker locker( TQApplication::tqt_mutex );
#endif // QT_THREAD_SUPPORT
d = new TQThreadInstance; d = new TQThreadInstance;
d->init(0); d->init(0);
} }

40
src/kernel/qthread_unix.cpp
Unescape View File

@ -47,6 +47,7 @@ typedef pthread_mutex_t Q_MUTEX_T;
#include <private/qmutex_p.h> #include <private/qmutex_p.h>
#include <private/qmutexpool_p.h> #include <private/qmutexpool_p.h>
#include <ntqthreadstorage.h> #include <ntqthreadstorage.h>
#include <ntqapplication.h>
#include <errno.h> #include <errno.h>
#include <sched.h> #include <sched.h>
@ -109,6 +110,7 @@ void TQThreadInstance::init(unsigned int stackSize)
thread_id = 0; thread_id = 0;
eventLoop = 0; eventLoop = 0;
cleanupType = TQThread::CleanupMergeObjects;
// threads have not been initialized yet, do it now // threads have not been initialized yet, do it now
if (! qt_thread_mutexpool) TQThread::initialize(); if (! qt_thread_mutexpool) TQThread::initialize();
@ -150,6 +152,8 @@ void TQThreadInstance::finish( void * )
return; return;
} }
TQApplication::threadTerminationHandler((TQThread*)d->args[0]);
TQMutexLocker locker( d->mutex() ); TQMutexLocker locker( d->mutex() );
d->running = FALSE; d->running = FALSE;
d->finished = TRUE; d->finished = TRUE;
@ -179,7 +183,6 @@ void TQThreadInstance::terminate()
pthread_cancel( thread_id ); pthread_cancel( thread_id );
} }
/************************************************************************** /**************************************************************************
** TQThread ** TQThread
*************************************************************************/ *************************************************************************/
@ -398,6 +401,9 @@ void TQThread::start(Priority priority)
d->args[0] = this; d->args[0] = this;
d->args[1] = d; d->args[1] = d;
#if defined(QT_USE_GLIBMAINLOOP) #if defined(QT_USE_GLIBMAINLOOP)
// The correct thread_id is set in TQThreadInstance::start using the value of d->args[1]
d->thread_id = NULL;
// Legacy glib versions require this threading system initialization call // Legacy glib versions require this threading system initialization call
g_thread_init(NULL); g_thread_init(NULL);
@ -408,8 +414,6 @@ void TQThread::start(Priority priority)
else { else {
ret = -1; ret = -1;
} }
// The correct thread_id is set in TQThreadInstance::start using the value of d->args[1]
d->thread_id = NULL;
#else // QT_USE_GLIBMAINLOOP #else // QT_USE_GLIBMAINLOOP
ret = pthread_create( &d->thread_id, &attr, (TQtThreadCallback)TQThreadInstance::start, d->args ); ret = pthread_create( &d->thread_id, &attr, (TQtThreadCallback)TQThreadInstance::start, d->args );
#if defined (Q_OS_HPUX) #if defined (Q_OS_HPUX)
@ -495,6 +499,36 @@ bool TQThread::wait( unsigned long time )
return (ret == 0); return (ret == 0);
} }
/*!
Returns the current cleanup behaviour of the thread.
\sa setCleanupType
\sa CleanupType
*/
TQThread::CleanupType TQThread::cleanupType() {
return (TQThread::CleanupType)d->cleanupType;
}
/*!
Sets the current cleanup behaviour of the thread. The default,
TQThread::CleanupMergeObjects, will merge any objects owned by this thread
with the main GUI thread when this thread is terminated.
If faster thread termination performance is desired, TQThread::CleanupNone
may be specified instead. However, this is not recommended as any objects
owned by this thread on termination can then cause events to become "stuck"
in the global event queue, leading to high CPU usage and other undesirable
behavior. You have been warned!
\sa cleanupType
\sa CleanupType
*/
void TQThread::setCleanupType(CleanupType type) {
d->cleanupType = type;
}
/*! /*!
Returns a pointer to the currently executing TQThread. If the Returns a pointer to the currently executing TQThread. If the
current thread was not started using the TQThread API, this current thread was not started using the TQThread API, this

5
src/moc/moc.y
Unescape View File

@ -2986,7 +2986,9 @@ void generateClass() // generate C++ source code for a class
// Generate staticMetaObject member function // Generate staticMetaObject member function
// //
fprintf( out, "TQMetaObject* %s::staticMetaObject()\n{\n", (const char*)qualifiedClassName() ); fprintf( out, "TQMetaObject* %s::staticMetaObject()\n{\n", (const char*)qualifiedClassName() );
fprintf( out, " if ( metaObj )\n\treturn metaObj;\n" ); fprintf( out, " if ( metaObj ) {\n\treturn metaObj;\n}\n" );
fprintf( out, "#ifdef QT_THREAD_SUPPORT\n if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->lock();\n" );
fprintf( out, " if ( metaObj ) {\n\tif (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n }\n#endif // QT_THREAD_SUPPORT\n" );
if ( isTQObject ) if ( isTQObject )
fprintf( out, " TQMetaObject* parentObject = staticTQtMetaObject();\n" ); fprintf( out, " TQMetaObject* parentObject = staticTQtMetaObject();\n" );
else if ( !g->superClassName.isEmpty() ) else if ( !g->superClassName.isEmpty() )
@ -3056,6 +3058,7 @@ void generateClass() // generate C++ source code for a class
// Setup cleanup handler and return meta object // Setup cleanup handler and return meta object
// //
fprintf( out, " cleanUp_%s.setMetaObject( metaObj );\n", cleanup.data() ); fprintf( out, " cleanUp_%s.setMetaObject( metaObj );\n", cleanup.data() );
fprintf( out, "#ifdef QT_THREAD_SUPPORT\n if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n#endif // QT_THREAD_SUPPORT\n" );
fprintf( out, " return metaObj;\n}\n" ); fprintf( out, " return metaObj;\n}\n" );
// //

5
src/moc/moc_yacc.cpp
Unescape View File

@ -5812,7 +5812,9 @@ void generateClass() // generate C++ source code for a class
// Generate staticMetaObject member function // Generate staticMetaObject member function
// //
fprintf( out, "TQMetaObject* %s::staticMetaObject()\n{\n", (const char*)qualifiedClassName() ); fprintf( out, "TQMetaObject* %s::staticMetaObject()\n{\n", (const char*)qualifiedClassName() );
fprintf( out, " if ( metaObj )\n\treturn metaObj;\n" ); fprintf( out, " if ( metaObj ) {\n\treturn metaObj;\n}\n" );
fprintf( out, "#ifdef QT_THREAD_SUPPORT\n if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->lock();\n" );
fprintf( out, " if ( metaObj ) {\n\tif (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n\treturn metaObj;\n }\n#endif // QT_THREAD_SUPPORT\n" );
if ( isTQObject ) if ( isTQObject )
fprintf( out, " TQMetaObject* parentObject = staticTQtMetaObject();\n" ); fprintf( out, " TQMetaObject* parentObject = staticTQtMetaObject();\n" );
else if ( !g->superClassName.isEmpty() ) else if ( !g->superClassName.isEmpty() )
@ -5882,6 +5884,7 @@ void generateClass() // generate C++ source code for a class
// Setup cleanup handler and return meta object // Setup cleanup handler and return meta object
// //
fprintf( out, " cleanUp_%s.setMetaObject( metaObj );\n", cleanup.data() ); fprintf( out, " cleanUp_%s.setMetaObject( metaObj );\n", cleanup.data() );
fprintf( out, "#ifdef QT_THREAD_SUPPORT\n if (tqt_sharedMetaObjectMutex) tqt_sharedMetaObjectMutex->unlock();\n#endif // QT_THREAD_SUPPORT\n" );
fprintf( out, " return metaObj;\n}\n" ); fprintf( out, " return metaObj;\n}\n" );
// //

13
src/styles/qcommonstyle.cpp
Unescape View File

@ -42,6 +42,7 @@
#ifndef QT_NO_STYLE #ifndef QT_NO_STYLE
#include "ntqmutex.h"
#include "ntqmenubar.h" #include "ntqmenubar.h"
#include "ntqapplication.h" #include "ntqapplication.h"
#include "ntqpainter.h" #include "ntqpainter.h"
@ -2782,6 +2783,9 @@ int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &c
ret = TQMAX( TQFontMetrics(ceData.font).lineSpacing(), 18 ); ret = TQMAX( TQFontMetrics(ceData.font).lineSpacing(), 18 );
} }
} }
else {
ret = 0;
}
break; } break; }
case PM_ScrollBarSliderMin: case PM_ScrollBarSliderMin:
ret = 9; ret = 9;
@ -2853,12 +2857,15 @@ int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &c
int thickness = pixelMetric( PM_SliderControlThickness, ceData, elementFlags, widget ); int thickness = pixelMetric( PM_SliderControlThickness, ceData, elementFlags, widget );
int ticks = ceData.tickMarkSetting; int ticks = ceData.tickMarkSetting;
if ( ticks == TQSlider::Both ) if ( ticks == TQSlider::Both ) {
ret = (space - thickness) / 2; ret = (space - thickness) / 2;
else if ( ticks == TQSlider::Above ) }
else if ( ticks == TQSlider::Above ) {
ret = space - thickness; ret = space - thickness;
else }
else {
ret = 0; ret = 0;
}
break; break;
} }

1
src/tools/ntqshared.h
Unescape View File

@ -45,7 +45,6 @@
#include "ntqglobal.h" #include "ntqglobal.h"
#endif // QT_H #endif // QT_H
struct Q_EXPORT TQShared struct Q_EXPORT TQShared
{ {
TQShared() : count( 1 ) { } TQShared() : count( 1 ) { }

46
src/tools/ntqstring.h
Unescape View File

@ -71,6 +71,7 @@
class TQRegExp; class TQRegExp;
class TQString; class TQString;
class TQCharRef; class TQCharRef;
class TQMutex;
template <class T> class TQDeepCopy; template <class T> class TQDeepCopy;
class Q_EXPORT TQChar { class Q_EXPORT TQChar {
@ -359,22 +360,14 @@ inline bool operator>( TQChar c1, TQChar c2 ) { return !(c2>=c1); }
// internal // internal
struct Q_EXPORT TQStringData : public TQShared { struct Q_EXPORT TQStringData : public TQShared {
TQStringData() : TQStringData();
TQShared(), unicode(0), ascii(0), len(0), issimpletext(TRUE), maxl(0), islatin1(FALSE), security_unpaged(FALSE) { ref(); } TQStringData(TQChar *u, uint l, uint m);
TQStringData(TQChar *u, uint l, uint m) :
TQShared(), unicode(u), ascii(0), len(l), issimpletext(FALSE), maxl(m), islatin1(FALSE), security_unpaged(FALSE) { }
~TQStringData(); ~TQStringData();
void deleteSelf(); void deleteSelf();
TQChar *unicode; TQChar *unicode;
char *ascii; char *ascii;
void setDirty() { void setDirty();
if ( ascii ) {
delete [] ascii;
ascii = 0;
}
issimpletext = FALSE;
}
#ifdef Q_OS_MAC9 #ifdef Q_OS_MAC9
uint len; uint len;
#else #else
@ -390,6 +383,8 @@ struct Q_EXPORT TQStringData : public TQShared {
bool security_unpaged : 1; bool security_unpaged : 1;
TQMutex* mutex;
private: private:
#if defined(TQ_DISABLE_COPY) #if defined(TQ_DISABLE_COPY)
TQStringData( const TQStringData& ); TQStringData( const TQStringData& );
@ -646,13 +641,7 @@ public:
TQChar constref(uint i) const TQChar constref(uint i) const
{ return at(i); } { return at(i); }
TQChar& ref(uint i) TQChar& ref(uint i);
{ // Optimized for easy-inlining by simple compilers.
if ( d->count != 1 || i >= d->len )
subat( i );
d->setDirty();
return d->unicode[i];
}
const TQChar* unicode() const { return d->unicode; } const TQChar* unicode() const { return d->unicode; }
const char* ascii() const; const char* ascii() const;
@ -747,7 +736,7 @@ private:
friend class TQConstString; friend class TQConstString;
friend class TQTextStream; friend class TQTextStream;
TQString( TQStringData* dd, bool /* dummy */ ) : d(dd) { } TQString( TQStringData* dd, bool /* dummy */ );
// needed for TQDeepCopy // needed for TQDeepCopy
void detach(); void detach();
@ -839,25 +828,6 @@ Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & );
TQString inline functions TQString inline functions
*****************************************************************************/ *****************************************************************************/
// These two move code into makeSharedNull() and deletesData()
// to improve cache-coherence (and reduce code bloat), while
// keeping the common cases fast.
//
// No safe way to pre-init shared_null on ALL compilers/linkers.
inline TQString::TQString() :
d(shared_null ? shared_null : makeSharedNull())
{
d->ref();
}
//
inline TQString::~TQString()
{
if ( d->deref() ) {
if ( d != shared_null )
d->deleteSelf();
}
}
// needed for TQDeepCopy // needed for TQDeepCopy
inline void TQString::detach() inline void TQString::detach()
{ real_detach(); } { real_detach(); }

329
src/tools/qstring.cpp
Unescape View File

@ -87,6 +87,12 @@
#define ULLONG_MAX TQ_UINT64_C(18446744073709551615) #define ULLONG_MAX TQ_UINT64_C(18446744073709551615)
#endif #endif
#ifdef QT_THREAD_SUPPORT
#include "ntqmutex.h"
#endif // QT_THREAD_SUPPORT
extern TQMutex *tqt_sharedStringMutex;
static int ucstrcmp( const TQString &as, const TQString &bs ) static int ucstrcmp( const TQString &as, const TQString &bs )
{ {
const TQChar *a = as.unicode(); const TQChar *a = as.unicode();
@ -1033,12 +1039,54 @@ static inline bool format(TQChar::Decomposition tag, TQString & str,
} // format() } // format()
#endif #endif
TQStringData::TQStringData() : TQShared(),
unicode(0),
ascii(0),
len(0),
issimpletext(TRUE),
maxl(0),
islatin1(FALSE),
security_unpaged(FALSE) {
#ifdef QT_THREAD_SUPPORT
mutex = new TQMutex( TRUE );
mutex->lock();
#endif // QT_THREAD_SUPPORT
ref();
#ifdef QT_THREAD_SUPPORT
mutex->unlock();
#endif // QT_THREAD_SUPPORT
}
TQStringData::TQStringData(TQChar *u, uint l, uint m) : TQShared(),
unicode(u),
ascii(0),
len(l),
issimpletext(FALSE),
maxl(m),
islatin1(FALSE),
security_unpaged(FALSE) {
#ifdef QT_THREAD_SUPPORT
mutex = new TQMutex( TRUE );
#endif // QT_THREAD_SUPPORT
}
TQStringData::~TQStringData() { TQStringData::~TQStringData() {
if ( unicode ) delete[] ((char*)unicode); if ( unicode ) delete[] ((char*)unicode);
if ( ascii && security_unpaged ) { if ( ascii && security_unpaged ) {
munlock(ascii, LINUX_MEMLOCK_LIMIT_BYTES); munlock(ascii, LINUX_MEMLOCK_LIMIT_BYTES);
} }
if ( ascii ) delete[] ascii; if ( ascii ) delete[] ascii;
#ifdef QT_THREAD_SUPPORT
if ( mutex ) delete mutex;
#endif // QT_THREAD_SUPPORT
}
void TQStringData::setDirty() {
if ( ascii ) {
delete [] ascii;
ascii = 0;
}
issimpletext = FALSE;
} }
/* /*
@ -1194,27 +1242,30 @@ TQChar* TQString::latin1ToUnicode( const char *str, uint* len, uint maxlen )
return result; return result;
} }
static TQChar* internalLatin1ToUnicode( const char *str, uint* len, static TQChar* internalLatin1ToUnicode( const char *str, uint* len, uint maxlen = (uint)-1 )
uint maxlen = (uint)-1 )
{ {
TQChar* result = 0; TQChar* result = 0;
uint l = 0; uint l = 0;
if ( str ) { if ( str ) {
if ( maxlen != (uint)-1 ) { if ( maxlen != (uint)-1 ) {
while ( l < maxlen && str[l] ) while ( l < maxlen && str[l] ) {
l++; l++;
} else { }
}
else {
// Faster? // Faster?
l = int(strlen( str )); l = int(strlen( str ));
} }
TQChar *uc = QT_ALLOC_QCHAR_VEC( l ); TQChar *uc = QT_ALLOC_QCHAR_VEC( l );
result = uc; result = uc;
uint i = l; uint i = l;
while ( i-- ) while ( i-- ) {
*uc++ = *str++; *uc++ = *str++;
}
} }
if ( len ) if ( len ) {
*len = l; *len = l;
}
return result; return result;
} }
@ -1395,11 +1446,26 @@ QT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0);
TQStringData* TQString::makeSharedNull() TQStringData* TQString::makeSharedNull()
{ {
#ifdef QT_THREAD_SUPPORT
if (tqt_sharedStringMutex) tqt_sharedStringMutex->lock();
#endif // QT_THREAD_SUPPORT
if (TQString::shared_null) {
#ifdef QT_THREAD_SUPPORT
if (tqt_sharedStringMutex) tqt_sharedStringMutex->unlock();
#endif // QT_THREAD_SUPPORT
return TQString::shared_null;
}
TQString::shared_null = new TQStringData; TQString::shared_null = new TQStringData;
#if defined( Q_OS_MAC ) || defined(Q_OS_SOLARIS) || defined(Q_OS_HPUX) || defined(Q_OS_AIX) #if defined( Q_OS_MAC ) || defined(Q_OS_SOLARIS) || defined(Q_OS_HPUX) || defined(Q_OS_AIX)
TQString *that = const_cast<TQString *>(&TQString::null); TQString *that = const_cast<TQString *>(&TQString::null);
that->d = TQString::shared_null; that->d = TQString::shared_null;
#endif #endif
#ifdef QT_THREAD_SUPPORT
if (tqt_sharedStringMutex) tqt_sharedStringMutex->unlock();
#endif // QT_THREAD_SUPPORT
return TQString::shared_null; return TQString::shared_null;
} }
@ -1412,6 +1478,24 @@ TQStringData* TQString::makeSharedNull()
\sa isNull() \sa isNull()
*/ */
// FIXME
// Original Qt3 code stated that there is
// "No safe way to pre-init shared_null on ALL compilers/linkers"
// Is this still true?
TQString::TQString() :
d(0)
{
d = shared_null ? shared_null : makeSharedNull();
#ifdef QT_THREAD_SUPPORT
d->mutex->lock();
#endif // QT_THREAD_SUPPORT
d->ref();
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
}
/*! /*!
Constructs a string of length one, containing the character \a ch. Constructs a string of length one, containing the character \a ch.
*/ */
@ -1428,7 +1512,15 @@ TQString::TQString( TQChar ch )
TQString::TQString( const TQString &s ) : TQString::TQString( const TQString &s ) :
d(s.d) d(s.d)
{ {
#ifdef QT_THREAD_SUPPORT
d->mutex->lock();
#endif // QT_THREAD_SUPPORT
d->ref(); d->ref();
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
} }
/*! /*!
@ -1451,7 +1543,13 @@ TQString::TQString( int size, bool /*dummy*/ )
d = new TQStringData( uc, 0, l ); d = new TQStringData( uc, 0, l );
} else { } else {
d = shared_null ? shared_null : (shared_null=new TQStringData); d = shared_null ? shared_null : (shared_null=new TQStringData);
#ifdef QT_THREAD_SUPPORT
d->mutex->lock();
#endif // QT_THREAD_SUPPORT
d->ref(); d->ref();
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
} }
} }
@ -1493,11 +1591,19 @@ TQString::TQString( const TQChar* unicode, uint length )
{ {
if ( !unicode && !length ) { if ( !unicode && !length ) {
d = shared_null ? shared_null : makeSharedNull(); d = shared_null ? shared_null : makeSharedNull();
#ifdef QT_THREAD_SUPPORT
d->mutex->lock();
#endif // QT_THREAD_SUPPORT
d->ref(); d->ref();
} else { #ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
}
else {
TQChar* uc = QT_ALLOC_QCHAR_VEC( length ); TQChar* uc = QT_ALLOC_QCHAR_VEC( length );
if ( unicode ) if ( unicode ) {
memcpy(uc, unicode, length*sizeof(TQChar)); memcpy(uc, unicode, length*sizeof(TQChar));
}
d = new TQStringData(uc,unicode ? length : 0,length); d = new TQStringData(uc,unicode ? length : 0,length);
} }
} }
@ -1556,6 +1662,10 @@ TQString::TQString( const std::string &str )
} }
#endif #endif
TQString::TQString( TQStringData* dd, bool /* dummy */ ) {
d = dd;
}
/*! /*!
\fn TQString::~TQString() \fn TQString::~TQString()
@ -1563,6 +1673,31 @@ TQString::TQString( const std::string &str )
last reference to the string. last reference to the string.
*/ */
TQString::~TQString()
{
#ifdef QT_THREAD_SUPPORT
d->mutex->lock();
#endif // QT_THREAD_SUPPORT
if ( d->deref() ) {
if ( d != shared_null ) {
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
d->deleteSelf();
}
else {
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
}
}
else {
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
}
}
/*! /*!
Deallocates any space reserved solely by this TQString. Deallocates any space reserved solely by this TQString.
@ -1580,11 +1715,25 @@ void TQString::real_detach()
void TQString::deref() void TQString::deref()
{ {
if ( d && d->deref() ) { if ( d ) {
if ( d != shared_null ) #ifdef QT_THREAD_SUPPORT
delete d; d->mutex->lock();
d = 0; #endif // QT_THREAD_SUPPORT
} if ( d->deref() ) {
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
if ( d != shared_null ) {
delete d;
}
d = 0;
}
else {
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
}
}
} }
void TQStringData::deleteSelf() void TQStringData::deleteSelf()
@ -1624,9 +1773,16 @@ void TQStringData::deleteSelf()
*/ */
TQString &TQString::operator=( const TQString &s ) TQString &TQString::operator=( const TQString &s )
{ {
#ifdef QT_THREAD_SUPPORT
s.d->mutex->lock();
#endif // QT_THREAD_SUPPORT
s.d->ref(); s.d->ref();
#ifdef QT_THREAD_SUPPORT
s.d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
deref(); deref();
d = s.d; d = s.d;
return *this; return *this;
} }
@ -1730,6 +1886,10 @@ void TQString::truncate( uint newLen )
*/ */
void TQString::setLength( uint newLen ) void TQString::setLength( uint newLen )
{ {
#ifdef QT_THREAD_SUPPORT
d->mutex->lock();
#endif // QT_THREAD_SUPPORT
if ( d->count != 1 || newLen > d->maxl || if ( d->count != 1 || newLen > d->maxl ||
( newLen * 4 < d->maxl && d->maxl > 4 ) ) { ( newLen * 4 < d->maxl && d->maxl > 4 ) ) {
// detach, grow or shrink // detach, grow or shrink
@ -1739,12 +1899,24 @@ void TQString::setLength( uint newLen )
uint len = TQMIN( d->len, newLen ); uint len = TQMIN( d->len, newLen );
memcpy( nd, d->unicode, sizeof(TQChar) * len ); memcpy( nd, d->unicode, sizeof(TQChar) * len );
bool unpaged = d->security_unpaged; bool unpaged = d->security_unpaged;
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
deref(); deref();
d = new TQStringData( nd, newLen, newMax ); d = new TQStringData( nd, newLen, newMax );
setSecurityUnPaged(unpaged); setSecurityUnPaged(unpaged);
} }
} else { else {
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
}
}
else {
d->len = newLen; d->len = newLen;
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
d->setDirty(); d->setDirty();
} }
} }
@ -1830,10 +2002,21 @@ void TQString::squeeze()
*/ */
void TQString::grow( uint newLen ) void TQString::grow( uint newLen )
{ {
#ifdef QT_THREAD_SUPPORT
d->mutex->lock();
#endif // QT_THREAD_SUPPORT
if ( d->count != 1 || newLen > d->maxl ) { if ( d->count != 1 || newLen > d->maxl ) {
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
setLength( newLen ); setLength( newLen );
} else { }
else {
d->len = newLen; d->len = newLen;
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
d->setDirty(); d->setDirty();
} }
} }
@ -5868,13 +6051,15 @@ static TQChar *addOne(TQChar *qch, TQString &str)
*/ */
TQString TQString::fromUtf8( const char* utf8, int len ) TQString TQString::fromUtf8( const char* utf8, int len )
{ {
if ( !utf8 ) if ( !utf8 ) {
return TQString::null; return TQString::null;
}
int slen = 0; int slen = 0;
if (len >= 0) { if (len >= 0) {
while (slen < len && utf8[slen]) while (slen < len && utf8[slen]) {
slen++; slen++;
}
} else { } else {
slen = int(strlen(utf8)); slen = int(strlen(utf8));
} }
@ -6012,10 +6197,13 @@ TQString TQString::fromLatin1( const char* chars, int len )
{ {
uint l; uint l;
TQChar *uc; TQChar *uc;
if ( len < 0 ) if ( len < 0 ) {
len = -1; len = -1;
}
uc = internalLatin1ToUnicode( chars, &l, len ); uc = internalLatin1ToUnicode( chars, &l, len );
return TQString( new TQStringData(uc, l, l), TRUE ); TQString ret( new TQStringData(uc, l, l), TRUE );
return ret;
} }
/*! /*!
@ -6178,7 +6366,8 @@ TQString TQString::fromUcs2( const unsigned short *str )
length++; length++;
TQChar* uc = QT_ALLOC_QCHAR_VEC( length ); TQChar* uc = QT_ALLOC_QCHAR_VEC( length );
memcpy( uc, str, length*sizeof(TQChar) ); memcpy( uc, str, length*sizeof(TQChar) );
return TQString( new TQStringData( uc, length, length ), TRUE ); TQString ret( new TQStringData( uc, length, length ), TRUE );
return ret;
} }
} }
@ -6225,6 +6414,25 @@ TQString TQString::fromUcs2( const unsigned short *str )
\sa constref() \sa constref()
*/ */
TQChar& TQString::ref(uint i) {
#ifdef QT_THREAD_SUPPORT
d->mutex->lock();
#endif // QT_THREAD_SUPPORT
if ( (d->count != 1) || (i >= d->len) ) {
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
subat( i );
}
else {
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
}
d->setDirty();
return d->unicode[i];
}
/*! /*!
\fn TQChar TQString::operator[]( int ) const \fn TQChar TQString::operator[]( int ) const
@ -6300,27 +6508,48 @@ void TQString::subat( uint i )
TQString& TQString::setUnicode( const TQChar *unicode, uint len ) TQString& TQString::setUnicode( const TQChar *unicode, uint len )
{ {
if ( len == 0 ) { // set to null string if ( len == 0 ) { // set to null string
if ( d != shared_null ) { // beware of nullstring being set to nullstring if ( d != shared_null ) { // beware of nullstring being set to nullstring
deref(); deref();
d = shared_null ? shared_null : makeSharedNull(); d = shared_null ? shared_null : makeSharedNull();
d->ref(); #ifdef QT_THREAD_SUPPORT
d->mutex->lock();
#endif // QT_THREAD_SUPPORT
d->ref();
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
}
} }
} else if ( d->count != 1 || len > d->maxl || else {
( len * 4 < d->maxl && d->maxl > 4 ) ) { #ifdef QT_THREAD_SUPPORT
// detach, grown or shrink d->mutex->lock();
uint newMax = computeNewMax( len ); #endif // QT_THREAD_SUPPORT
TQChar* nd = QT_ALLOC_QCHAR_VEC( newMax ); if ( d->count != 1 || len > d->maxl || ( len * 4 < d->maxl && d->maxl > 4 ) ) {
if ( unicode ) // detach, grown or shrink
memcpy( nd, unicode, sizeof(TQChar)*len ); uint newMax = computeNewMax( len );
deref(); TQChar* nd = QT_ALLOC_QCHAR_VEC( newMax );
d = new TQStringData( nd, len, newMax ); if ( unicode ) {
} else { memcpy( nd, unicode, sizeof(TQChar)*len );
d->len = len; }
d->setDirty(); #ifdef QT_THREAD_SUPPORT
if ( unicode ) d->mutex->unlock();
memcpy( d->unicode, unicode, sizeof(TQChar)*len ); #endif // QT_THREAD_SUPPORT
} deref();
d = new TQStringData( nd, len, newMax );
}
else {
d->len = len;
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
d->setDirty();
if ( unicode ) {
memcpy( d->unicode, unicode, sizeof(TQChar)*len );
}
}
}
return *this; return *this;
} }
@ -7024,15 +7253,23 @@ TQConstString::TQConstString( const TQChar* unicode, uint length ) :
*/ */
TQConstString::~TQConstString() TQConstString::~TQConstString()
{ {
#ifdef QT_THREAD_SUPPORT
d->mutex->lock();
#endif // QT_THREAD_SUPPORT
if ( d->count > 1 ) { if ( d->count > 1 ) {
TQChar* cp = QT_ALLOC_QCHAR_VEC( d->len ); TQChar* cp = QT_ALLOC_QCHAR_VEC( d->len );
memcpy( cp, d->unicode, d->len*sizeof(TQChar) ); memcpy( cp, d->unicode, d->len*sizeof(TQChar) );
d->unicode = cp; d->unicode = cp;
} else { }
else {
d->unicode = 0; d->unicode = 0;
} }
// The original d->unicode is now unlinked. // The original d->unicode is now unlinked.
#ifdef QT_THREAD_SUPPORT
d->mutex->unlock();
#endif // QT_THREAD_SUPPORT
} }
/*! /*!

1
src/tools/qthreadinstance_p.h
Unescape View File

@ -101,6 +101,7 @@ public:
#endif // Q_OS_WIN32 #endif // Q_OS_WIN32
TQEventLoop* eventLoop; TQEventLoop* eventLoop;
int cleanupType;
}; };
#endif // QT_THREAD_SUPPORT #endif // QT_THREAD_SUPPORT

2
tutorial/t15/main.cpp
Unescape View File

@ -33,6 +33,8 @@ void WorkerObject::run()
eventLoop->processEvents(TQEventLoop::AllEvents); eventLoop->processEvents(TQEventLoop::AllEvents);
} }
delete t;
eventLoop->exit(0); eventLoop->exit(0);
} }

Write Preview
Loading…
Cancel
Save