Removed unnecessary code

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8ccbd4fc02)

build.py

@@ -229,8 +229,6 @@ def moduleChecks(maindir):
     tryModule(maindir,"tqtnetwork", "tqsocket.h", "TQSocket()")
     tryModule(maindir,"tqttable", "tqtable.h", "TQTable()")
     tryModule(maindir,"tqtxml", "tqdom.h", "TQDomImplementation()")
-
-    if config.tqt_version >= 0x030000:
     tryModule(maindir,"tqtsql", "tqsql.h", "TQSql()")
 
     # We need a different Makefile for the tqtgl module.
@@ -244,7 +242,6 @@ def moduleChecks(maindir):
     config.create_makefile("tqttest.pro")
 
     # Check for the tqui library.
-    if config.tqt_version >= 0x030000:
     if sys.platform == "win32":
         tquilib = r"$(TQTDIR)\lib\tqui.lib"
     else:
@@ -327,7 +324,7 @@ int main(int argc,char **argv)
     fprintf(fp,"-x TQt_THREAD_SUPPORT\\n");
 #endif
 
-#if (defined(Q_OS_WIN32) || defined(Q_OS_WIN64)) && TQT_VERSION >= 0x030000
+#if (defined(Q_OS_WIN32) || defined(Q_OS_WIN64))
     if (tqWinVersion() != TQt::WV_XP)
         fprintf(fp,"-x TQt_STYLE_WINDOWSXP\\n");
 #endif
@@ -525,11 +522,6 @@ def main(argv):
     if config.tqt_version == 0:
             sip_tqt_config.error("SIP-TQt has been built with TQt support disabled.\n")
 
-    # Early versions of TQt for the Mac didn't include everything.  Rather than
-    # maintain these in the future we just mandate a later version.
-    if sys.platform == "darwin" and config.tqt_version < 0x030100:
-            sip_tqt_config.error("PyTQt for MacOS/X requires TQt v3.1.0 or later.\n")
-
     # Check the installation directory is valid and add it as a patch.
     if not os.access(modDir,os.F_OK):
         sip_tqt_config.error("The %s PyTQt destination directory does not seem to exist. Use the -d argument to set the correct directory." % (modDir))
@@ -576,7 +568,6 @@ def main(argv):
     # Link in the tqassistantclient library for TQt v3.1+.
     tqaclib = ""
 
-    if config.tqt_version >= 0x030100:
     if sys.platform == "win32":
         tqaclib = r"$(TQTDIR)\lib\tqassistantclient.lib"
     else:
@@ -585,14 +576,12 @@ def main(argv):
     config.patches["@PYTQT_TQASSISTANTCLIENT_LIB@"] = tqaclib
 
     # Check for TQScintilla.
-    if config.tqt_version >= 0x030000:
     checkTQScintilla()
 
     # Create a build directory that we can compile test programs.
     maindir = mkTempBuildDir()
 
     # Check what additional modules to build.
-    if config.tqt_version >= 0x020000:
     moduleChecks(maindir)
 
     # Work out the platform and TQt version tags to pass to SIP-TQt to generate the
@@ -685,7 +674,6 @@ def main(argv):
     # See which version of pyuic to build.
     config.patches["@PYTQT_BINDIR@"] = sip_tqt_config.escape(binDir)
 
-    if config.tqt_version >= 0x030000:
     sip_tqt_config.inform("Creating Makefile for pytquic3.")
     subdirs.append("pytquic3")
     olddir = sip_tqt_config.push_dir("pytquic3")
@@ -693,8 +681,7 @@ def main(argv):
     config.create_makefile("pytquic.pro", [])
     sip_tqt_config.pop_dir(olddir)
 
-    # Build pylupdate if TQt v3.0 or later.
-    if config.tqt_version >= 0x030000:
+    # Build pylupdate.
     sip_tqt_config.inform("Creating Makefile for pytqlupdate3.")
     subdirs.append("pytqlupdate3")
     olddir = sip_tqt_config.push_dir("pytqlupdate3")

configure.py

@@ -207,7 +207,6 @@ class ConfigurePyTQt3(ConfigureBase):
         check_module("tqtxml", "tqdom.h", "TQDomImplementation()")
         check_module("tqtgl", "tqgl.h", "TQGLWidget()", opengl=1)
 
-        if tqt_version >= 0x030000:
         check_module("tqtui", "tqwidgetfactory.h", "TQWidgetFactory()", lib="tqui")
 
         if tqt_edition in ("enterprise", "free"):
@@ -224,7 +223,6 @@ class ConfigurePyTQt3(ConfigureBase):
 
         tqtmod_lib = None
 
-        if tqt_version >= 0x030100:
         sip_tqt_config.inform("Checking to see if the TQAssistantClient class is available...")
 
         if check_class("tqassistantclient.h", "TQAssistantClient(\"foo\")", lib="tqassistantclient"):
@@ -290,7 +288,6 @@ class ConfigurePyTQt3(ConfigureBase):
     def tools(self):
         tool_dirs = []
 
-        if tqt_version >= 0x030000:
         # The Professional Edition needs special handling.
         prof = (tqt_edition == "professional")
 
@@ -320,8 +317,6 @@ class ConfigurePyTQt3(ConfigureBase):
         if prof or "tqtxml" not in pytqt_modules:
             makefile.extra_defines.append("TQT_MODULE_XML")
 
-            if tqt_version < 0x030100:
-                makefile.extra_include_dirs.append(tqt_dir + "/src/3rdparty/zlib")
         makefile.extra_include_dirs.append(os.path.join(src_dir, "pytquic3"))
         
         if not os.access("pytquic3", os.F_OK):
@@ -386,10 +381,7 @@ def inform_user():
     sip_tqt_config.inform("The TQt header files are in %s." % tqt_incdir)
     sip_tqt_config.inform("The %s TQt library is in %s." % (opt_tqtlib, tqt_libdir))
 
-    if tqt_version >= 0x020000:
     sip_tqt_config.inform("pyuic will be installed in %s." % opt_pytqtbindir)
-
-    if tqt_version >= 0x030000:
     sip_tqt_config.inform("pylupdate will be installed in %s." % opt_pytqtbindir)
 
     if opt_vendorcheck:
@@ -700,7 +692,7 @@ int main(int argc,char **argv)
     fprintf(fp,"-x TQt_THREAD_SUPPORT\\n");
 #endif
 
-#if !defined(Q_WS_WIN) || TQT_VERSION < 0x030000 || defined(TQT_NO_STYLE_WINDOWSXP)
+#if !defined(Q_WS_WIN) || defined(TQT_NO_STYLE_WINDOWSXP)
     fprintf(fp,"-x TQt_STYLE_WINDOWSXP\\n");
 #endif
 
@@ -1112,24 +1104,9 @@ def check_tqt_installation(macros):
 
     tqt_version, ignore = sip_tqt_config.read_version(tqglobal, "TQt", "TQT_VERSION")
 
-    # Early versions of TQt for the Mac didn't include everything.  Rather than
-    # maintain these in the future we just mandate a later version.
-    if sys.platform == "darwin" and tqt_version < 0x030100:
-        sip_tqt_config.error("PyTQt for MacOS/X requires TQt v3.1.0 or later.")
-
-    # The way SIP-TQt v4.2 and later handle connections between signals and Python
-    # slots only works with TQt v3 and later.  Therefore TQt v2 and earlier needs
-    # SIP-TQt v3.
-    if tqt_version < 0x030000:
-        sip_tqt_config.error("TQt v2.x and earlier require SIP-TQt v3.x.")
-
-    if tqt_version >= 0x040000:
-        sip_tqt_config.error("TQt v4.x requires PyTQt v5.x.")
-
     # Try and work out which edition it is.
     global tqt_edition
 
-    if tqt_version >= 0x030000:
     if opt_tqconfigdir:
         tqconfigdir = opt_tqconfigdir
     else:
@@ -1158,10 +1135,6 @@ def check_tqt_installation(macros):
 
     if not tqt_edition:
         sip_tqt_config.error("The TQt edition could not be determined by parsing %s." % tqconfig)
-    elif tqt_version == 0x020300 and sys.platform == "win32":
-        # See if we have the TQt v2 non-commercial version.
-        if os.access(os.path.join(tqt_libdir, "tqt-mt230nc.lib"), os.F_OK):
-            tqt_edition = "non-commercial"
 
     if sys.platform == "win32":
         # Work out how TQt was built on Windows.

examples/biff.py

@@ -4,11 +4,6 @@ import os, sys, string
 from PyTQt.tqt import *
 
 
-if TQT_VERSION < 0x030100:
-    print("This example requires TQt v3.1.0 or later.")
-    sys.exit(1)
-
-
 FALSE = 0
 TRUE  = 1
 

pytqlupdate3/fetchtr.cpp

@@ -44,9 +44,6 @@
 
 static const char MagicComment[] = "TRANSLATOR ";
 
-static TQMap<TQCString, int> needs_Q_OBJECT;
-static TQMap<TQCString, int> lacks_Q_OBJECT;
-
 /*
   The first part of this source file is the python tokenizer.  We skip
   most of python; the only tokens that interest us are defined here.

pytquic3/embed.cpp

@@ -32,7 +32,7 @@
 // on embedded, we do not compress image data. Rationale: by mapping
 // the ready-only data directly into memory we are both faster and
 // more memory efficient
-#if (TQT_VERSION < 0x030100 || defined(Q_WS_QWS)) && !defined(TQT_NO_IMAGE_COLLECTION_COMPRESSION)
+#if defined(Q_WS_QWS) && !defined(TQT_NO_IMAGE_COLLECTION_COMPRESSION)
 #define TQT_NO_IMAGE_COLLECTION_COMPRESSION
 #endif
 

pytquic3/form.cpp

@@ -30,13 +30,8 @@
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 
-#if TQT_VERSION < 0x030100
-#include <zlib.h>
-#endif
-
 static TQByteArray unzipXPM( TQString data, ulong& length )
 {
-#if TQT_VERSION >= 0x030100
     const int lengthOffset = 4;
     int baSize = data.length() / 2 + lengthOffset;
     uchar *ba = new uchar[ baSize ];
@@ -64,41 +59,6 @@ static TQByteArray unzipXPM( TQString data, ulong& length )
     TQByteArray baunzip = tqUncompress( ba, baSize );
     delete[] ba;
     return baunzip;
-#else
-    uchar *ba = new uchar[ data.length() / 2 ];
-    for ( int i = 0; i < (int)data.length() / 2; ++i ) {
-	char h = data[ 2 * i ].latin1();
-	char l = data[ 2 * i  + 1 ].latin1();
-	uchar r = 0;
-	if ( h <= '9' )
-	    r += h - '0';
-	else
-	    r += h - 'a' + 10;
-	r = r << 4;
-	if ( l <= '9' )
-	    r += l - '0';
-	else
-	    r += l - 'a' + 10;
-	ba[ i ] = r;
-    }
-    // I'm not sure this makes sense. Why couldn't the compressed data be
-    // less than 20% of the original data? Maybe it's enough to trust the
-    // `length' passed as an argument. Quoting the zlib header:
-    // 		Upon entry, destLen is the total size of the destination
-    // 		buffer, which must be large enough to hold the entire
-    // 		uncompressed data. (The size of the uncompressed data must
-    // 		have been saved previously by the compressor and transmitted
-    // 		to the decompressor by some mechanism outside the scope of
-    // 		this compression library.)
-    // Which is the role of `length'. On the other hand this could prevent
-    // crashes in some cases of slightly corrupt UIC files.
-    if ( length <  data.length() * 5 )
-	length = data.length() * 5;
-    TQByteArray baunzip( length );
-    ::uncompress( (uchar*) baunzip.data(), &length, ba, data.length()/2 );
-    delete[] ba;
-    return baunzip;
-#endif
 }
 
 
@@ -395,25 +355,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 	}
 	out << endl;
     } else if ( externPixmaps ) {
-#if TQT_VERSION >= 0x030100
 	pixmapLoaderFunction = "TQPixmap.fromMimeSource";
-#else
-	out << indent << "def uic_load_pixmap_" << objName << "(name):" << endl;
-	++indent;
-	out << indent << "pix = TQPixmap()" << endl;
-	out << indent << "m = TQMimeSourceFactory.defaultFactory().data(name)" << endl;
-	out << endl;
-	out << indent << "if m:" << endl;
-	++indent;
-	out << indent << "TQImageDrag.decode(m,pix)" << endl;
-	--indent;
-	out << endl;
-	out << indent << "return pix" << endl;
-	--indent;
-	out << endl;
-	out << endl;
-	pixmapLoaderFunction = "uic_load_pixmap_" + objName;
-#endif
     }
 
 

pytquic3/uic.cpp

@@ -80,7 +80,6 @@ bool Uic::toBool( const TQString& s )
 
 TQString Uic::fixString( const TQString &str, bool encode )
 {
-#if TQT_VERSION >= 0x030100
     TQString s;
     if ( !encode ) {
 	s = str;
@@ -105,12 +104,6 @@ TQString Uic::fixString( const TQString &str, bool encode )
 	    }
 	}
     }
-#else
-    TQString s( str );
-    s.replace( TQRegExp( "\\\\" ), "\\\\" );
-    s.replace( TQRegExp( "\"" ), "\\\"" );
-    s.replace( TQRegExp( "\r?\n" ), "\\n\"\n\"" );
-#endif
     return "\"" + s + "\"";
 }
 
@@ -182,9 +175,7 @@ Uic::Uic( const TQString &fn, const char *outputFn, TQTextStream &outStream,
     pixmapLoaderFunction = getPixmapLoaderFunction( doc.firstChild().toElement() );
     nameOfClass = getFormClassName( doc.firstChild().toElement() );
 
-#if TQT_VERSION >= 0x030300
     uiFileVersion = doc.firstChild().toElement().attribute("version");
-#endif
     stdsetdef = toBool( doc.firstChild().toElement().attribute("stdsetdef") );
 
     if ( doc.firstChild().isNull() || doc.firstChild().firstChild().isNull() )
@@ -402,10 +393,8 @@ void Uic::createActionImpl( const TQDomElement &n, const TQString &parent )
 	else
 	    continue;
 	bool subActionsDone = FALSE;
-#if TQT_VERSION >= 0x030300
 	bool hasMenuText = FALSE;
 	TQString actionText;
-#endif
 	for ( TQDomElement n2 = ae.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) {
 	    if ( n2.tagName() == "property" ) {
 		bool stdset = stdsetdef;
@@ -424,12 +413,10 @@ void Uic::createActionImpl( const TQDomElement &n, const TQString &parent )
 		else
 		    call += "setProperty(\"" + prop + "\",TQVariant(" + value + "))";
 
-#if TQT_VERSION >= 0x030300
 		if (prop == "menuText")
 		    hasMenuText = TRUE;
 		else if (prop == "text")
 		    actionText = value;
-#endif
 
                 if ( n2.firstChild().toElement().tagName() == "string" ) {
                     trout << trindent << call << endl;
@@ -441,11 +428,9 @@ void Uic::createActionImpl( const TQDomElement &n, const TQString &parent )
 		subActionsDone = TRUE;
 	    }
 	}
-#if TQT_VERSION >= 0x030300
 	// workaround for loading pre-3.3 files expecting bogus TQAction behavior
 	if (!hasMenuText && !actionText.isEmpty() && uiFileVersion < "3.3")
 	    trout << indent << "self." << objName << ".setMenuText(" << actionText << ")" << endl;
-#endif
     }
 }
 

pytquic3/uic.h

@@ -143,9 +143,7 @@ private:
     uint stdsetdef : 1;
     uint externPixmaps : 1;
 
-#if TQT_VERSION >= 0x030300
     TQString uiFileVersion;
-#endif
     TQString nameOfClass;
     TQStringList namespaces;
     TQString bareNameOfClass;