[PyKDE] PyQt and Python 2.1b1

[Phil Thompson]

Attached is a diff against PyQt v2.3 to get PyQt working with Python
2.1b1. (I plan to release 2.4pre1 later in the week which will also
include support for Qt 2.3.0b1.)

The problem turned out to be a long standing "how on Earth did that stay
hidden for so long" bug that Python 2.1b1 just happened to trigger.

Phil
-------------- next part --------------
diff -ruN qt.orig/sipqtQFontDialog.cpp qt/sipqtQFontDialog.cpp
--- qt.orig/sipqtQFontDialog.cpp	Sun Feb  4 00:06:19 2001
+++ qt/sipqtQFontDialog.cpp	Sun Mar  4 13:46:44 2001
@@ -1,6 +1,6 @@
 // C++ class wrapper code.
 //
-// Generated by SIP v2.3 on Sun Feb  4 00:06:19 2001
+// Generated by SIP v2.3cvs on Sun Mar  4 13:46:44 2001
 //
 // Terms and Conditions
 // 
@@ -2282,7 +2282,7 @@
 		PyObject *a1obj = NULL;
 		const char *a2 = 0;
 
-		if (sipParseArgs(&sipArgsParsed,sipArgs,"I|Is",sipCanConvertTo_QFont,&a0obj,sipCanConvertTo_QWidget,&a1obj,&a2))
+		if (sipParseArgs(&sipArgsParsed,sipArgs,"-I|Is",sipCanConvertTo_QFont,&a0obj,sipCanConvertTo_QWidget,&a1obj,&a2))
 		{
 			bool ok;
 			PyObject *font, *resobj;
@@ -2314,7 +2314,7 @@
 		PyObject *a0obj = NULL;
 		const char *a1 = 0;
 
-		if (sipParseArgs(&sipArgsParsed,sipArgs,"|Is",sipCanConvertTo_QWidget,&a0obj,&a1))
+		if (sipParseArgs(&sipArgsParsed,sipArgs,"-|Is",sipCanConvertTo_QWidget,&a0obj,&a1))
 		{
 			bool ok;
 			PyObject *font, *resobj;
diff -ruN qt.orig/sipqtQInputDialog.cpp qt/sipqtQInputDialog.cpp
--- qt.orig/sipqtQInputDialog.cpp	Sun Feb  4 00:06:15 2001
+++ qt/sipqtQInputDialog.cpp	Sun Mar  4 13:46:39 2001
@@ -1,6 +1,6 @@
 // C++ class wrapper code.
 //
-// Generated by SIP v2.3 on Sun Feb  4 00:06:15 2001
+// Generated by SIP v2.3cvs on Sun Mar  4 13:46:39 2001
 //
 // Terms and Conditions
 // 
@@ -1660,7 +1660,7 @@
 		PyObject *a3obj = NULL;
 		const char *a4 = 0;
  
-		if (sipParseArgs(&sipArgsParsed,sipArgs,"II|IIs",sipCanConvertTo_QString,&a0obj,sipCanConvertTo_QString,&a1obj,sipCanConvertTo_QString,&a2obj,sipCanConvertTo_QWidget,&a3obj,&a4))
+		if (sipParseArgs(&sipArgsParsed,sipArgs,"-II|IIs",sipCanConvertTo_QString,&a0obj,sipCanConvertTo_QString,&a1obj,sipCanConvertTo_QString,&a2obj,sipCanConvertTo_QWidget,&a3obj,&a4))
 		{
 			bool ok;
 			PyObject *valobj, *res;
@@ -1725,7 +1725,7 @@
 		QWidget *a6 = NULL;
 		const char *a7 = 0;
  
-		if (sipParseArgs(&sipArgsParsed,sipArgs,"II|iiiiIs",sipCanConvertTo_QString,&a0obj,sipCanConvertTo_QString,&a1obj,&a2,&a3,&a4,&a5,sipCanConvertTo_QWidget,&a6obj,&a7))
+		if (sipParseArgs(&sipArgsParsed,sipArgs,"-II|iiiiIs",sipCanConvertTo_QString,&a0obj,sipCanConvertTo_QString,&a1obj,&a2,&a3,&a4,&a5,sipCanConvertTo_QWidget,&a6obj,&a7))
 		{
 			bool ok;
 			int iserr = 0;
@@ -1778,7 +1778,7 @@
 		QWidget *a6 = NULL;
 		const char *a7 = 0;
  
-		if (sipParseArgs(&sipArgsParsed,sipArgs,"II|dddiIs",sipCanConvertTo_QString,&a0obj,sipCanConvertTo_QString,&a1obj,&a2,&a3,&a4,&a5,sipCanConvertTo_QWidget,&a6obj,&a7))
+		if (sipParseArgs(&sipArgsParsed,sipArgs,"-II|dddiIs",sipCanConvertTo_QString,&a0obj,sipCanConvertTo_QString,&a1obj,&a2,&a3,&a4,&a5,sipCanConvertTo_QWidget,&a6obj,&a7))
 		{
 			bool ok;
 			int iserr = 0;
@@ -1831,7 +1831,7 @@
 		PyObject *a5obj = NULL;
 		const char *a6 = 0;
  
-		if (sipParseArgs(&sipArgsParsed,sipArgs,"III|iiIs",sipCanConvertTo_QString,&a0obj,sipCanConvertTo_QString,&a1obj,sipCanConvertTo_QStringList,&a2obj,&a3,&a4,sipCanConvertTo_QWidget,&a5obj,&a6))
+		if (sipParseArgs(&sipArgsParsed,sipArgs,"-III|iiIs",sipCanConvertTo_QString,&a0obj,sipCanConvertTo_QString,&a1obj,sipCanConvertTo_QStringList,&a2obj,&a3,&a4,sipCanConvertTo_QWidget,&a5obj,&a6))
 		{
 			bool ok;
 			PyObject *valobj, *res;
diff -ruN qt.orig/sipqtQObject.cpp qt/sipqtQObject.cpp
--- qt.orig/sipqtQObject.cpp	Sun Feb  4 00:06:29 2001
+++ qt/sipqtQObject.cpp	Sun Mar  4 13:46:55 2001
@@ -1,6 +1,6 @@
 // C++ class wrapper code.
 //
-// Generated by SIP v2.3 on Sun Feb  4 00:06:28 2001
+// Generated by SIP v2.3cvs on Sun Mar  4 13:46:55 2001
 //
 // Terms and Conditions
 // 
@@ -3537,7 +3537,7 @@
 		PyObject *rxSelf;
 		char *slot;
 
-		if (sipParseArgs(&sipArgsParsed,sipArgs,"RGRS",&txSelf,&sig,&rxSelf,&slot))
+		if (sipParseArgs(&sipArgsParsed,sipArgs,"-RGRS",&txSelf,&sig,&rxSelf,&slot))
 			return sipConnectRx(txSelf,sig,rxSelf,slot);
 #line 3543 "sipqtQObject.cpp"
 	}
@@ -3548,7 +3548,7 @@
 		char *sig;
 		PyObject *rxSelf;
 
-		if (sipParseArgs(&sipArgsParsed,sipArgs,"RGF",&txSelf,&sig,&rxSelf))
+		if (sipParseArgs(&sipArgsParsed,sipArgs,"-RGF",&txSelf,&sig,&rxSelf))
 			return sipConnectRx(txSelf,sig,rxSelf,NULL);
 #line 3554 "sipqtQObject.cpp"
 	}
@@ -3571,7 +3571,7 @@
 		PyObject *rxSelf;
 		char *slot;
 
-		if (sipParseArgs(&sipArgsParsed,sipArgs,"RGRS",&txSelf,&sig,&rxSelf,&slot))
+		if (sipParseArgs(&sipArgsParsed,sipArgs,"-RGRS",&txSelf,&sig,&rxSelf,&slot))
 			return sipDisconnectRx(txSelf,sig,rxSelf,slot);
 #line 3577 "sipqtQObject.cpp"
 	}
@@ -3582,7 +3582,7 @@
 		char *sig;
 		PyObject *rxSelf;
 
-		if (sipParseArgs(&sipArgsParsed,sipArgs,"RGF",&txSelf,&sig,&rxSelf))
+		if (sipParseArgs(&sipArgsParsed,sipArgs,"-RGF",&txSelf,&sig,&rxSelf))
 			return sipDisconnectRx(txSelf,sig,rxSelf,NULL);
 #line 3588 "sipqtQObject.cpp"
 	}
@@ -4984,7 +4984,7 @@
 		PyObject *rxSelf;
 		char *slot;
 
-		if (sipParseArgs(&sipArgsParsed,sipArgs,"RGRS",&txSelf,&sig,&rxSelf,&slot))
+		if (sipParseArgs(&sipArgsParsed,sipArgs,"-RGRS",&txSelf,&sig,&rxSelf,&slot))
 			return sipConnectRx(txSelf,sig,rxSelf,slot);
 #line 4990 "sipqtQObject.cpp"
 	}
@@ -4995,7 +4995,7 @@
 		char *sig;
 		PyObject *rxSelf;
 
-		if (sipParseArgs(&sipArgsParsed,sipArgs,"RGF",&txSelf,&sig,&rxSelf))
+		if (sipParseArgs(&sipArgsParsed,sipArgs,"-RGF",&txSelf,&sig,&rxSelf))
 			return sipConnectRx(txSelf,sig,rxSelf,NULL);
 #line 5001 "sipqtQObject.cpp"
 	}
@@ -5018,7 +5018,7 @@
 		PyObject *rxSelf;
 		char *slot;
 
-		if (sipParseArgs(&sipArgsParsed,sipArgs,"RGRS",&txSelf,&sig,&rxSelf,&slot))
+		if (sipParseArgs(&sipArgsParsed,sipArgs,"-RGRS",&txSelf,&sig,&rxSelf,&slot))
 			return sipDisconnectRx(txSelf,sig,rxSelf,slot);
 #line 5024 "sipqtQObject.cpp"
 	}
@@ -5029,7 +5029,7 @@
 		char *sig;
 		PyObject *rxSelf;
 
-		if (sipParseArgs(&sipArgsParsed,sipArgs,"RGF",&txSelf,&sig,&rxSelf))
+		if (sipParseArgs(&sipArgsParsed,sipArgs,"-RGF",&txSelf,&sig,&rxSelf))
 			return sipDisconnectRx(txSelf,sig,rxSelf,NULL);
 #line 5035 "sipqtQObject.cpp"
 	}