Remove support for earlier Qt/TQt versions

Conditional code in the .sip files linked to specific older versions has
been removed. Since the versions of TQt and python-tqt are running in
parallel, the support for older versions was clutter that would never
actually be used now.

Signed-off-by: aneejit1 <aneejit1@gmail.com>

9 files changed, 0 insertions, 222 deletions

diff --git a/sip/qtnetwork/qdns.sip b/sip/qtnetwork/qdns.sip
index 79d1d23..7d9c436 100644
--- a/sip/qtnetwork/qdns.sip
+++ b/sip/qtnetwork/qdns.sip
@@ -30,7 +30,6 @@
 
 
 %If (TQt_DNS)
-%If (TQt_2_2_0 -)
 
 class TQDns : TQObject
 {
@@ -271,4 +270,3 @@ signals:
 };
 
 %End
-%End
diff --git a/sip/qtnetwork/qftp.sip b/sip/qtnetwork/qftp.sip
index 94aed30..9edb2c4 100644
--- a/sip/qtnetwork/qftp.sip
+++ b/sip/qtnetwork/qftp.sip
@@ -37,7 +37,6 @@ This takes a single <Literal>maxlen</Literal> parameter.  The
 
 
 %If (TQt_NETWORKPROTOCOL_FTP)
-%If (TQt_2_2_0 -)
 
 class TQFtp : TQNetworkProtocol
 {
@@ -47,19 +46,11 @@ class TQFtp : TQNetworkProtocol
 
 public:
 	TQFtp();
-%If (TQt_3_1_0 -)
 	TQFtp(TQObject * /TransferThis/,const char * = 0);
-%End
 	virtual ~TQFtp();
 
-%If (TQt_3_0_0 -)
 	int supportedOperations() const;
-%End
-%If (- TQt_3_0_0)
-	virtual int supportedOperations() const;
-%End
 
-%If (TQt_3_1_0 -)
 	enum State {
 		Unconnected,
 		HostLookup,
@@ -149,15 +140,11 @@ public:
 
 	Error error() const;
 	TQString errorString() const;
-%End
 
 public slots:
-%If (TQt_3_1_0 -)
 	void abort();
-%End
 
 signals:
-%If (TQt_3_1_0 -)
 	void stateChanged(int);
 	void listInfo(const TQUrlInfo &);
 	void readyRead();
@@ -167,7 +154,6 @@ signals:
 	void commandStarted(int);
 	void commandFinished(int,bool);
 	void done(bool);
-%End
 
 protected:
 	void parseDir(const TQString &,TQUrlInfo &);
@@ -183,4 +169,3 @@ private:
 };
 
 %End
-%End
diff --git a/sip/qtnetwork/qhostaddress.sip b/sip/qtnetwork/qhostaddress.sip
index 0e825d6..6e1cc91 100644
--- a/sip/qtnetwork/qhostaddress.sip
+++ b/sip/qtnetwork/qhostaddress.sip
@@ -57,8 +57,6 @@ Not yet implemented.
 %End
 
 
-%If (TQt_2_2_0 -)
-
 class TQHostAddress
 {
 %TypeHeaderCode
@@ -69,11 +67,9 @@ public:
 	TQHostAddress();
 	TQHostAddress(TQ_UINT32);
 //	TQHostAddress(TQ_UINT8 *);
-%If (TQt_3_3_0 -)
 	//TQHostAddress(const Q_IPV6ADDR &);
 	// This isn't mentioned in the documentation.
 	//TQHostAddress(const TQString &);
-%End
 	TQHostAddress(const TQHostAddress &);
 
 	void setAddress(TQ_UINT32);
@@ -82,18 +78,12 @@ public:
 	bool isIp4Addr() const;
 	TQ_UINT32 ip4Addr() const;
 
-%If (TQt_3_3_0 -)
 	bool isIPv4Address() const;
 	TQ_UINT32 toIPv4Address() const;
 	bool isIPv6Address() const;
 	//Q_IPV6ADDR toIPv6Address() const;
-%End
 
 	TQString	toString() const;
 
-%If (TQt_3_2_0 -)
 	bool isNull() const;
-%End
 };
-
-%End
diff --git a/sip/qtnetwork/qhttp.sip b/sip/qtnetwork/qhttp.sip
index 4762c30..9bb69b6 100644
--- a/sip/qtnetwork/qhttp.sip
+++ b/sip/qtnetwork/qhttp.sip
@@ -56,7 +56,6 @@ This takes a single <Literal>maxlen</Literal> parameter.  The
 
 
 %If (TQt_NETWORKPROTOCOL_HTTP)
-%If (TQt_3_1_0 -)
 
 class TQHttpHeader
 {
@@ -147,10 +146,6 @@ protected:
 	bool parseLine(const TQString &,int);
 };
 
-%End
-
-
-%If (TQt_3_0_0 -)
 
 class TQHttp : TQNetworkProtocol
 {
@@ -160,16 +155,13 @@ class TQHttp : TQNetworkProtocol
 
 public:
 	TQHttp();
-%If (TQt_3_1_0 -)
 	TQHttp(TQObject * /TransferThis/,const char * = 0);
 	TQHttp(const TQString &,TQ_UINT16 = 80,TQObject * /TransferThis/ = 0,
 	      const char * = 0);
 	virtual ~TQHttp();
-%End
 
 	int supportedOperations() const;
 
-%If (TQt_3_1_0 -)
 	enum State {
 		Unconnected,
 		HostLookup,
@@ -246,15 +238,11 @@ public:
 
 	Error error() const;
 	TQString errorString() const;
-%End
 
 public slots:
-%If (TQt_3_1_0 -)
 	void abort();
-%End
 
 signals:
-%If (TQt_3_1_0 -)
 	void stateChanged(int);
 	void responseHeaderReceived(const TQHttpResponseHeader &);
 	void readyRead(const TQHttpResponseHeader &);
@@ -264,16 +252,12 @@ signals:
 	void requestStarted(int);
 	void requestFinished(int,bool);
 	void done(bool);
-%End
 
 protected:
 	void operationGet(TQNetworkOperation *);
 	void operationPut(TQNetworkOperation *);
 
-%If (TQt_3_1_0 -)
 	void timerEvent(TQTimerEvent *);
-%End
 };
 
 %End
-%End
diff --git a/sip/qtnetwork/qlocalfs.sip b/sip/qtnetwork/qlocalfs.sip
index 47f9e50..f33d6e0 100644
--- a/sip/qtnetwork/qlocalfs.sip
+++ b/sip/qtnetwork/qlocalfs.sip
@@ -30,7 +30,6 @@
 
 
 %If (TQt_NETWORKPROTOCOL)
-%If (TQt_2_1_0 -)
 
 class TQLocalFs : TQNetworkProtocol
 {
@@ -53,4 +52,3 @@ protected:
 };
 
 %End
-%End
diff --git a/sip/qtnetwork/qnetwork.sip b/sip/qtnetwork/qnetwork.sip
index 62d067e..b0a6af3 100644
--- a/sip/qtnetwork/qnetwork.sip
+++ b/sip/qtnetwork/qnetwork.sip
@@ -21,7 +21,6 @@
 
 
 %If (TQt_NETWORKPROTOCOL)
-%If (TQt_2_2_0 -)
 
 %ModuleHeaderCode
 #include <tqglobal.h>
@@ -31,4 +30,3 @@
 void tqInitNetworkProtocols();
 
 %End
-%End
diff --git a/sip/qtnetwork/qserversocket.sip b/sip/qtnetwork/qserversocket.sip
index 403d424..4cbcdce 100644
--- a/sip/qtnetwork/qserversocket.sip
+++ b/sip/qtnetwork/qserversocket.sip
@@ -29,8 +29,6 @@
 %End
  
  
-%If (TQt_2_2_0 -)
-
 class TQServerSocket : TQObject
 {
 %TypeHeaderCode
@@ -38,18 +36,10 @@ class TQServerSocket : TQObject
 %End
 
 public:
-%If (- TQt_3_0_0)
-	TQServerSocket(TQ_UINT16,int = 0,TQObject * /TransferThis/ = 0,
-		      const char * = 0);
-	TQServerSocket(const TQHostAddress &,TQ_UINT16,int = 0,
-		      TQObject * /TransferThis/ = 0,const char * = 0);
-%End
-%If (TQt_3_0_0 -)
 	TQServerSocket(TQ_UINT16,int = 1,TQObject * /TransferThis/ = 0,
 		      const char * = 0);
 	TQServerSocket(const TQHostAddress &,TQ_UINT16,int = 1,
 		      TQObject * /TransferThis/ = 0,const char * = 0);
-%End
 	TQServerSocket(TQObject * /TransferThis/ = 0,const char * = 0);
 
 	bool ok() const;
@@ -66,5 +56,3 @@ public:
 protected:
 	TQSocketDevice *socketDevice();
 };
-
-%End
diff --git a/sip/qtnetwork/qsocket.sip b/sip/qtnetwork/qsocket.sip
index b97f243..a31fa73 100644
--- a/sip/qtnetwork/qsocket.sip
+++ b/sip/qtnetwork/qsocket.sip
@@ -57,8 +57,6 @@ as a parameter.
 %End
  
 
-%If (TQt_2_2_0 -)
-
 class TQSocket : TQObject, TQIODevice
 {
 %TypeHeaderCode
@@ -78,12 +76,7 @@ public:
 		Idle,
 		HostLookup,
 		Connecting,
-%If (TQt_3_0_0 -)
 		Connected,
-%End
-%If (- TQt_3_0_0)
-		Listening,
-%End
 		Closing,
 		Connection
 	};
@@ -98,11 +91,7 @@ public:
 		{sipName_TQSocket,	&sipClass_TQSocket,		-1, 2},
 		{sipName_TQFtp,		&sipClass_TQFtp,			-1, 3},
 		{sipName_TQLocalFs,	&sipClass_TQLocalFs,		-1, 4},
-#if TQT_VERSION >= 0x030000
 		{sipName_TQHttp,		&sipClass_TQHttp,		-1, 5},
-#else
-		{NULL,			NULL,				-1, 5},
-#endif
 		{sipName_TQDns,		&sipClass_TQDns,			-1, -1},
 	};
 
@@ -130,10 +119,8 @@ public:
 	int socket() const;
 	virtual void setSocket(int);
 
-%If (TQt_3_0_0 -)
 	TQSocketDevice *socketDevice();
 	virtual void setSocketDevice(TQSocketDevice *);
-%End
 
 %If (TQt_DNS)
 	virtual void connectToHost(const TQString &,TQ_UINT16) /ReleaseGIL/;
@@ -143,103 +130,17 @@ public:
 	bool open(int) /ReleaseGIL/;
 	void close() /ReleaseGIL/;
 	void flush() /ReleaseGIL/;
-%If (TQt_3_0_0 -)
 	Offset size() const;
 	Offset at() const;
 	bool at(Offset);
-%End
-%If (- TQt_3_0_0)
-	uint size() const;
-	int at() const;
-	bool at(int);
-%End
 	bool atEnd() const;
 
-%If (TQt_3_0_0 -)
 	TQ_ULONG bytesAvailable() const;
 	TQ_ULONG waitForMore(int) const /ReleaseGIL/;
 	//TQ_ULONG waitForMore(int,bool *) const /ReleaseGIL/;
 	TQ_ULONG bytesToWrite() const;
-%End
-%If (- TQt_3_0_0)
-	int bytesAvailable() const;
-	int waitForMore(int) const /ReleaseGIL/;
-	int bytesToWrite() const;
-%End
-%If (TQt_3_1_0 -)
 	void clearPendingData();
-%End
-
-%If (- TQt_3_0_0)
-	SIP_PYOBJECT readBlock(uint) /ReleaseGIL/ [int (char *,uint)];
-%MethodCode
-		char *buf;
- 
-		if ((buf = (char *)sipMalloc(a0)) == NULL)
-			sipIsErr = 1;
-		else
-		{
-			int actlen;
- 
-			Py_BEGIN_ALLOW_THREADS
-			actlen = sipSelfWasArg ? sipCpp->TQSocket::readBlock(buf, a0) : sipCpp->readBlock(buf, a0);
-			Py_END_ALLOW_THREADS
-
-			if (actlen < 0)
-			{
-				sipFree((void *)buf);
- 
-				Py_INCREF(Py_None);
-				sipRes = Py_None;
-			}
-			else
-			{ 
-				sipRes = SIPBytes_FromStringAndSize(buf,actlen);
- 
-				sipFree((void *)buf);
-
-				if (sipRes == NULL)
-					sipIsErr = 1;
-			}
-		}
-%End
-
-	int writeBlock(const char * /Array/,uint /ArraySize/) /ReleaseGIL/;
-
-	SIP_PYOBJECT readLine(uint) /ReleaseGIL/ [int (char *,uint)];
-%MethodCode
-		char *buf;
- 
-		if ((buf = (char *)sipMalloc(a0)) == NULL)
-			sipIsErr = 1;
-		else
-		{
-			int actlen;
- 
-			Py_BEGIN_ALLOW_THREADS
-			actlen = sipCpp -> readLine(buf,a0);
-			Py_END_ALLOW_THREADS
 
-			if (actlen < 0)
-			{
-				sipFree((void *)buf);
- 
-				Py_INCREF(Py_None);
-				sipRes = Py_None;
-			}
-			else
-			{ 
-				sipRes = SIPBytes_FromStringAndSize(buf,actlen);
- 
-				sipFree((void *)buf);
- 
-				if (sipRes == NULL)
-					sipIsErr = 1;
-			}
-		}
-%End
-%End
-%If (TQt_3_0_0 -)
 	SIP_PYOBJECT readBlock(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)];
 %MethodCode
 		char *buf;
@@ -308,7 +209,6 @@ public:
 			}
 		}
 %End
-%End
 
 	int getch() /ReleaseGIL/;
 	int putch(int) /ReleaseGIL/;
@@ -322,10 +222,8 @@ public:
 	TQHostAddress address() const;
 	TQHostAddress peerAddress() const;
 
-%If (TQt_3_2_0 -)
 	void setReadBufferSize(TQ_ULONG);
 	TQ_ULONG readBufferSize() const;
-%End
 
 signals:
 	void hostFound();
@@ -337,12 +235,7 @@ signals:
 	void error(int);
 
 protected:
-%If (- TQt_3_0_0)
-	TQSocketDevice *socketDevice();
-%End
 
 private:
 	TQSocket(const TQSocket &);
 };
-
-%End
diff --git a/sip/qtnetwork/qsocketdevice.sip b/sip/qtnetwork/qsocketdevice.sip
index bbaa008..12d6b67 100644
--- a/sip/qtnetwork/qsocketdevice.sip
+++ b/sip/qtnetwork/qsocketdevice.sip
@@ -46,8 +46,6 @@ as a parameter.
 %End
 
 
-%If (TQt_2_2_0 -)
-
 class TQSocketDevice : TQIODevice
 {
 %TypeHeaderCode
@@ -60,25 +58,19 @@ public:
 		Datagram
 	};
 
-%If (TQt_3_3_0 -)
 	enum Protocol {
 		IPv4,
 		IPv6,
 		Unknown
 	};
-%End
 
 	TQSocketDevice(Type = Stream);
-%If (TQt_3_3_0 -)
 	TQSocketDevice(Type,Protocol,int);
-%End
 	TQSocketDevice(int,Type);
 
 	bool isValid() const;
 	Type type() const;
-%If (TQt_3_3_0 -)
 	Protocol protocol() const;
-%End
 
 	int socket() const;
 	virtual void setSocket(int,Type);
@@ -87,16 +79,9 @@ public:
 	void close();
 	void flush() /ReleaseGIL/;
 
-%If (- TQt_3_0_0)
-	uint size() const;
-	int at() const;
-	bool at(int);
-%End
-%If (TQt_3_0_0 -)
 	Offset size() const;
 	Offset at() const;
 	bool at(Offset);
-%End
 	bool atEnd() const;
 
 	bool blocking() const;
@@ -116,47 +101,9 @@ public:
 	virtual bool listen(int);
 	virtual int accept();
 
-%If (- TQt_3_0_0)
-	int bytesAvailable() const;
-	int waitForMore(int) const /ReleaseGIL/;
-%End
-%If (TQt_3_0_0 -)
 	TQ_LONG bytesAvailable() const;
 	TQ_LONG waitForMore(int) const /ReleaseGIL/;
-%End
-
-%If (- TQt_3_0_0)
-	SIP_PYOBJECT readBlock(uint) /ReleaseGIL/ [int (char *,uint)];
-%MethodCode
-		char *buf;
-
-		if ((buf = (char *)sipMalloc(a0)) == NULL)
-			sipIsErr = 1;
-		else
-		{
-			int actlen;
-
-			Py_BEGIN_ALLOW_THREADS
-			actlen = sipSelfWasArg ? sipCpp->TQSocketDevice::readBlock(buf, a0) : sipCpp->readBlock(buf, a0);
-			Py_END_ALLOW_THREADS
-
-			if (actlen < 0)
-			{
-				Py_INCREF(Py_None);
-				sipRes = Py_None;
-			}
-			else if ((sipRes = SIPBytes_FromStringAndSize(buf,actlen)) == NULL)
-				sipIsErr = 1;
-
-			sipFree((void *)buf);
-		}
-%End
 
-	int writeBlock(const char * /Array/,uint /ArraySize/) /ReleaseGIL/;
-	virtual int writeBlock(const char * /Array/,uint /ArraySize/,
-			       const TQHostAddress &,TQ_UINT16) /ReleaseGIL/;
-%End
-%If (TQt_3_0_0 -)
 	SIP_PYOBJECT readBlock(TQ_ULONG) /ReleaseGIL/ [TQ_LONG (char *,TQ_ULONG)];
 %MethodCode
 		char *buf;
@@ -188,7 +135,6 @@ public:
 			  TQ_ULONG /ArraySize/) /ReleaseGIL/;
 	virtual TQ_LONG writeBlock(const char * /Array/,TQ_ULONG /ArraySize/,
 				  const TQHostAddress &,TQ_UINT16) /ReleaseGIL/;
-%End
 
 	int getch();
 	int putch(int);
@@ -220,5 +166,3 @@ protected:
 private:
 	TQSocketDevice(const TQSocketDevice &);
 };
-
-%End