tcl.git - Tcl is a high-level, general-purpose, interpreted, dynamic programming language. It was designed with the goal of being very simple but powerful.

Tcl is a high-level, general-purpose, interpreted, dynamic programming language. It was designed with the goal of being very simple but powerful.

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix constraints so can test with tclsh as well as tcltest [Bug 736431]	dkf	2004-06-24	1	-2/+4

*	Convert conditional testing into constraints	dkf	2004-05-19	1	-54/+37

*	* tests/async.test: Added several tests that demonstrate Tcl	dgp	2003-07-24	1	-1/+78

*	* tests/*.test: Changed all occurances of "namespace import	ericm	2000-04-10	1	-2/+2

*	Modified the tests to use the package tcltest	jenn	1999-06-26	1	-2/+3

*	merged tcl 8.1 branch back into the main trunk	stanton	1999-04-16	1	-3/+22

*	Replaced SCCS strings, fixed binary filescore_8_0_3	stanton	1998-09-14	1	-1/+1

*	Initial revision	rjohnson	1998-03-26	1	-0/+248

return false;

+ // Find first waiting timer not already active

+ QTimerInfo *t = 0;

+ for (QTimerInfoList::const_iterator it = constBegin(); it != constEnd(); ++it) {

+ if (!(*it)->inTimerEvent) {

+ t = *it;

+ break;

+ }

+ if (!t)

+ return false;

- QTimerInfo *t = first(); // first waiting timer

if (currentTime < t->timeout) {

// time to wait

tm = t->timeout - currentTime;

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 543422c..1501351 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp

@@ -897,7 +897,8 @@ QObjectPrivate::Connection::~Connection()

\relates QObject

Returns the given \a object cast to type T if the object is of type

- T (or of a subclass); otherwise returns 0.

+ T (or of a subclass); otherwise returns 0. If \a object is 0 then

+ it will also return 0.

The class T must inherit (directly or indirectly) QObject and be

declared with the \l Q_OBJECT macro.

diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 5ba9898..38fa216 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp

@@ -149,6 +149,9 @@ static int numerusHelper(int n, const uchar *rules, int rulesSize)

leftOperand %= 10;

} else if (opcode & Q_MOD_100) {

leftOperand %= 100;

+ } else if (opcode & Q_LEAD_1000) {

+ while (leftOperand >= 1000)

+ leftOperand /= 1000;

}

int op = opcode & Q_OP_MASK;

diff --git a/src/corelib/kernel/qtranslator_p.h b/src/corelib/kernel/qtranslator_p.h
index 77ec8f5..a7d58c5 100644
--- a/src/corelib/kernel/qtranslator_p.h
+++ b/src/corelib/kernel/qtranslator_p.h

@@ -62,6 +62,7 @@ enum {

Q_NOT = 0x08,

Q_MOD_10 = 0x10,

Q_MOD_100 = 0x20,

+ Q_LEAD_1000 = 0x40,

Q_AND = 0xFD,

Q_OR = 0xFE,

diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp