Updates to support Python version 3

Amendments to the sip source and configuration/build scripts to allow
for support under Python version 3. The examples have been updated
using "2to3" along with some manual changes to sort out intentation
and casting to integer from float.

Signed-off-by: aneejit1 <aneejit1@gmail.com>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 18 insertions, 125 deletions

diff --git a/sip/qt/qapplication.sip b/sip/qt/qapplication.sip
index 367ac2c..dcf333d 100644
--- a/sip/qt/qapplication.sip
+++ b/sip/qt/qapplication.sip
@@ -64,6 +64,9 @@ This has been renamed to <Literal>exec_loop</Literal> in Python.
 </Sect2>
 %End
 
+%ModuleHeaderCode
+#include <tqapplication.h>
+%End
 
 TQApplication *tqApp;
 
@@ -128,7 +131,6 @@ public:
 		}
 %End
 
-%If (TQt_2_2_0 -)
 	enum Type {
 		Tty,
 		GuiClient,
@@ -160,7 +162,6 @@ public:
 			updatePyArgv(a0,argc,argv);
 		}
 %End
-%End
 
 	~TQApplication();
 %MethodCode
@@ -209,7 +210,7 @@ public:
 			sipIsErr = 1;
 		else
 			for (int a = 0; a < argc; ++a)
-				if (PyList_SetItem(sipRes,a,PyString_FromString(sipCpp -> argv()[a])) < 0)
+				if (PyList_SetItem(sipRes,a,SIPBytes_FromString(sipCpp -> argv()[a])) < 0)
 				{
 					Py_DECREF(sipRes);
 					sipIsErr = 1;
@@ -217,39 +218,17 @@ public:
 				}
 %End
 
-%If (TQt_2_3_0 -)
 	Type type() const;
-%End
-%If (- TQt_2_00)
-	static GUIStyle style();
-	static void setStyle(GUIStyle);
-%End
-%If (TQt_2_00 -)
 	static TQStyle &style();
 	static void setStyle(TQStyle * /Transfer/);
-%End
-%If (TQt_3_0_0 -)
 	static TQStyle *setStyle(const TQString &);
-%End
 
-%If (- TQt_2_00)
-	enum ColorSpec
-	{
-		NormalColor = 0,
-		CustomColor = 1,
-		PrivateColor = 4,
-		ManyColor = 4,
-		TrueColor = 4
-	};
-%End
-%If (TQt_2_00 -)
 	enum ColorSpec
 	{
 		NormalColor = 0,
 		CustomColor = 1,
 		ManyColor = 2
 	};
-%End
 
 	static int colorSpec();
 	static void setColorSpec(int);
@@ -258,51 +237,26 @@ public:
 	static void restoreOverrideCursor();
 	static bool hasGlobalMouseTracking();
 	static void setGlobalMouseTracking(bool);
-%If (- TQt_2_00)
-	static TQPalette *palette();
-	static void setPalette(TQPalette &,bool = 0);
-	static TQFont *font();
-	static void setFont(const TQFont &,bool = 0);
-%End
-%If (TQt_2_00 -)
 	static TQPalette palette(const TQWidget * = 0);
 	static void setPalette(TQPalette &,bool = 0,const char * = 0);
 	static TQFont font(const TQWidget * = 0);
 	static void setFont(const TQFont &,bool = 0,const char * = 0);
-%End
 	static TQFontMetrics fontMetrics();
 	TQWidget *mainWidget() const;
-%If (- TQt_2_00)
-	// We may not need the /Transfer/ now that the TQApplication dtor is
-	// instrumented, but we'll leave it in so as not to break old programs
-	// needlessly.
-	void setMainWidget(TQWidget * /Transfer/);
-%End
-%If (TQt_2_00 -)
 	virtual void setMainWidget(TQWidget *);
 	virtual void polish(TQWidget *);
-%End
 	static TQWidgetList *allWidgets();
 	static TQWidgetList *topLevelWidgets();
-%If (- TQt_3_0_0)
-	static TQWidget *desktop();
-%End
-%If (TQt_3_0_0 -)
 	static TQDesktopWidget *desktop();
-%End
 	static TQWidget *activePopupWidget();
 	static TQWidget *activeModalWidget();
 	static TQClipboard *clipboard();
 	TQWidget *focusWidget() const;
-%If (TQt_2_00 -)
 	TQWidget *activeWindow() const;
-%End
 	static TQWidget *widgetAt(int,int,bool = 0);
 	static TQWidget *widgetAt(const TQPoint &,bool = 0);
 
-%If (TQt_3_1_0 -)
 	static TQEventLoop *eventLoop();
-%End
 
 	int exec() /PyName=exec_loop, ReleaseGIL,
 		    PreHook=__pyTQtPreEventLoopHook__,
@@ -310,44 +264,27 @@ public:
 	void processEvents() /ReleaseGIL/;
 	void processEvents(int) /ReleaseGIL/;
 	void processOneEvent() /ReleaseGIL/;
-%If (TQt_3_0_0 -)
 	bool hasPendingEvents();
-%End
 	int enter_loop() /ReleaseGIL/;
 	void exit_loop();
-%If (TQt_2_00 -)
 	int loopLevel() const;
-%End
 	static void exit(int = 0);
 	static bool sendEvent(TQObject *,TQEvent *) /ReleaseGIL/;
 	static void postEvent(TQObject *,TQEvent * /Transfer/) /ReleaseGIL/;
 	static void sendPostedEvents(TQObject *,int) /ReleaseGIL/;
-%If (TQt_2_00 -)
 	static void sendPostedEvents() /ReleaseGIL/;
 	static void removePostedEvents(TQObject *);
-%End
 	virtual bool notify(TQObject *,TQEvent *) /ReleaseGIL/;
 	static bool startingUp();
 	static bool closingDown();
 	static void flushX();
-%If (TQt_3_0_0 -)
 	static void flush();
-%End
 	static void syncX();
 	static void beep();
-%If (TQt_2_00 -)
 	void setDefaultCodec(TQTextCodec *);
 	TQTextCodec *defaultCodec() const;
 	void installTranslator(TQTranslator *);
 	void removeTranslator(TQTranslator *);
-%End
-%If (TQt_2_00 - TQt_3_0_0)
-	TQString translate(const char *,const char *) const;
-%End
-%If (TQt_2_2_0 - TQt_3_0_0)
-	TQString translate(const char *,const char *,const char *) const;
-%End
-%If (TQt_3_0_0 -)
 	enum Encoding {
 		DefaultCodec,
 		UnicodeUTF8
@@ -355,98 +292,59 @@ public:
 
 	TQString translate(const char *,const char *,const char * = 0,
 			  Encoding = DefaultCodec) const;
-%End
-%If (TQt_3_2_0 -)
 	TQString applicationDirPath();
 	TQString applicationFilePath();
-%End
-%If (- TQt_3_0_0)
-	static void setWinStyleHighlightColor(const TQColor &);
-	static const TQColor &winStyleHighlightColor();
-%End
-%If (TQt_2_00 -)
 	static void setDesktopSettingsAware(bool);
 	static bool desktopSettingsAware();
 	static void setCursorFlashTime(int);
 	static int cursorFlashTime();
-%End
 	static void setDoubleClickInterval(int);
 	static int doubleClickInterval();
-%If (TQt_2_1_0 -)
 	static void setWheelScrollLines(int);
 	static int wheelScrollLines();
-%If (TQt_2_2_0 -)
 	static void setGlobalStrut(const TQSize &);
 	static TQSize globalStrut();
-%End
-%If (TQt_3_0_0 -)
 	static void setLibraryPaths(const TQStringList &);
 	static TQStringList libraryPaths();
 	static void addLibraryPath(const TQString &);
 	static void removeLibraryPath(const TQString &);
-%End
 	static void setStartDragTime(int);
 	static int startDragTime();
 	static void setStartDragDistance(int);
 	static int startDragDistance();
-%If (TQt_3_0_0 -)
 	static void setReverseLayout(bool);
 	static bool reverseLayout();
  
 	static int horizontalAlignment(int);
-%End
-%If (TQt_2_2_0 -)
 	static bool isEffectEnabled(TQt::UIEffect);
 	static void setEffectEnabled(TQt::UIEffect,bool = 1);
-%End
-%End
 
 
-%If (TQt_2_00 -)
 	bool isSessionRestored() const;
 	TQString sessionId() const;
-%If (TQt_3_1_0 -)
 	TQString sessionKey() const;
-%End
 	virtual void commitData(TQSessionManager &);
 	virtual void saveState(TQSessionManager &);
-%End
-%If (TQt_2_1_0 -)
 	void wakeUpGuiThread();
-%End
 %If (TQt_THREAD_SUPPORT)
-%If (TQt_2_2_0 -)
 	void lock() /ReleaseGIL/;
 	void unlock(bool = 1);
 	bool locked();
-%End
-%If (TQt_3_0_0 -)
 	bool tryLock();
 %End
-%End
 
 signals:
 	void lastWindowClosed();
-%If (TQt_2_00 -)
 	void aboutToQuit();
-%End
-%If (TQt_2_1_0 -)
 	void guiThreadAwake();
-%End
 
 public slots:
 	void quit();
-%If (TQt_2_00 -)
 	void closeAllWindows();
-%End
-%If (TQt_3_2_0 -)
 	void aboutTQt();
-%End
 
 protected:
-%If (TQt_3_1_0 -)
 	bool event(TQEvent *);
-%End
 
 private:
 	TQApplication(const TQApplication &);
@@ -471,19 +369,26 @@ static char **pyArgvToC(PyObject *argvlist,int &argc)
 	// Convert the list.
 	for (int a = 0; a < argc; ++a)
 	{
+		PyObject *argObject = PyList_GET_ITEM(argvlist, a);
 		char *arg;
 
-		// Get the argument and allocate memory for it.
-		if ((arg = PyString_AsString(PyList_GetItem(argvlist,a))) == NULL ||
-		    (argv[a] = (char *)sipMalloc(strlen(arg) + 1)) == NULL)
+		if (PyUnicode_Check(argObject))
+		{
+			arg = tqstrdup(sipString_AsLatin1String(&argObject));
+		}
+		else if (SIPBytes_Check(argObject))
+		{
+			arg = tqstrdup(SIPBytes_AS_STRING(argObject));
+		}
+		else
+		{
 			return NULL;
+		}
 
-		// Copy the argument and save a pointer to it.
-		strcpy(argv[a],arg);
-		argv[a + argc + 1] = argv[a];
+		argv[a] = argv[a + argc + 1] = arg;
 	}
 
-	argv[argc + argc + 1] = argv[argc] = NULL;
+	argv[argc] = argv[argc + argc + 1] = NULL;
 
 	return argv;
 }
@@ -544,19 +449,7 @@ static void pyqtMsgHandler(TQtMsgType type, const char *msg)
 
 	SIP_BLOCK_THREADS
 
-#if SIP_VERSION >= 0x040200
 	res = sipCallMethod(0, pyqtPyMsgHandler, "Es", type, sipEnum_TQtMsgType, msg);
-#elif SIP_VERSION >= 0x040000
-	res = sipCallMethod(0, pyqtPyMsgHandler, "es", type, msg);
-#else
-	PyObject *args = Py_BuildValue("is", type, msg);
-
-	if (args != NULL)
-	{
-		res = PyEval_CallObject(pyqtPyMsgHandler, args);
-		Py_DECREF(args);
-	}
-#endif
 
 	Py_XDECREF(res);