Drop Borland compiler specific code

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

8 files changed, 2 insertions, 61 deletions

diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index 36c144e99..23ada8035 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -77,8 +77,6 @@ tools {
 		  $$TOOLS_CPP/tqthreadstorage_win.cpp \
 		  $$TOOLS_CPP/tqcriticalsection_p.cpp
 
-	win32-borland:SOURCES += $$TOOLS_CPP/tqwinexport.cpp
-
 	wince-* {
 		SOURCES -= $$TOOLS_CPP/tqdir_win.cpp \
 			   $$TOOLS_CPP/tqfile_win.cpp \
diff --git a/src/tools/tqcom_p.h b/src/tools/tqcom_p.h
index 9ff7ece64..1c8319610 100644
--- a/src/tools/tqcom_p.h
+++ b/src/tools/tqcom_p.h
@@ -312,22 +312,12 @@ public:		   \
 #endif // Q_CREATE_INSTANCE
 
 #    ifdef TQ_WS_WIN
-#	ifdef Q_CC_BOR
-#	    define Q_EXPORT_COMPONENT() \
-	        Q_UCM_VERIFICATION_DATA \
-		TQ_EXTERN_C __declspec(dllexport) \
-                const char * __stdcall qt_ucm_query_verification_data() \
-                { return qt_ucm_verification_data; } \
-		TQ_EXTERN_C TQ_EXPORT __declspec(dllexport) TQUnknownInterface* \
-                __stdcall ucm_instantiate()
-#	else
 #	    define Q_EXPORT_COMPONENT() \
 	        Q_UCM_VERIFICATION_DATA \
 		TQ_EXTERN_C __declspec(dllexport) \
                 const char *qt_ucm_query_verification_data() \
                 { return qt_ucm_verification_data; } \
 		TQ_EXTERN_C TQ_EXPORT __declspec(dllexport) TQUnknownInterface* ucm_instantiate()
-#	endif
 #    else
 #	define Q_EXPORT_COMPONENT() \
 	    Q_UCM_VERIFICATION_DATA \
diff --git a/src/tools/tqcomlibrary.cpp b/src/tools/tqcomlibrary.cpp
index a387c9611..b13c58b9d 100644
--- a/src/tools/tqcomlibrary.cpp
+++ b/src/tools/tqcomlibrary.cpp
@@ -439,11 +439,7 @@ void TQComLibrary::createInstanceInternal()
 		return;
 	}
 
-#  ifdef Q_CC_BOR
-	typedef const char * __stdcall (*UCMQueryVerificationDataProc)();
-#  else
 	typedef const char * (*UCMQueryVerificationDataProc)();
-#  endif
 	UCMQueryVerificationDataProc ucmQueryVerificationdataProc;
 	ucmQueryVerificationdataProc =
 	    (UCMQueryVerificationDataProc) resolve( "qt_ucm_query_verification_data" );
@@ -490,11 +486,7 @@ void TQComLibrary::createInstanceInternal()
 	    return;
     }
 
-#ifdef Q_CC_BOR
-    typedef TQUnknownInterface* __stdcall (*UCMInstanceProc)();
-#else
     typedef TQUnknownInterface* (*UCMInstanceProc)();
-#endif
     UCMInstanceProc ucmInstanceProc;
     ucmInstanceProc = (UCMInstanceProc) resolve( "ucm_instantiate" );
 #if defined(QT_DEBUG_COMPONENT)
diff --git a/src/tools/tqgarray.cpp b/src/tools/tqgarray.cpp
index 1eb1a05c2..a3e9dc42f 100644
--- a/src/tools/tqgarray.cpp
+++ b/src/tools/tqgarray.cpp
@@ -39,10 +39,7 @@
 **********************************************************************/
 
 #include "tqglobal.h"
-#if defined(Q_CC_BOR)
-    // needed for qsort() because of a std namespace problem on Borland
-#   include "qplatformdefs.h"
-#elif defined(TQ_WS_WIN)
+#if defined(TQ_WS_WIN)
     // needed for bsearch on some platforms
 #   include "qt_windows.h"
 #endif
diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h
index e00cf68a9..3de27202c 100644
--- a/src/tools/tqglobal.h
+++ b/src/tools/tqglobal.h
@@ -199,7 +199,6 @@
      MPW	- MPW C++
      MWERKS	- Metrowerks CodeWarrior
      MSVC	- Microsoft Visual C/C++, Intel C++ for Windows
-     BOR	- Borland/Turbo C++
      WAT	- Watcom C++
      GNU	- GNU C++
      COMEAU	- Comeau C++
@@ -266,14 +265,6 @@
 #    define Q_NO_USING_KEYWORD /* ### check "using" status */
 #  endif
 
-#elif defined(__BORLANDC__) || defined(__TURBOC__)
-#  define Q_CC_BOR
-#  if __BORLANDC__ < 0x502
-#    define Q_NO_BOOL_TYPE
-#    define Q_NO_EXPLICIT_KEYWORD
-#  endif
-#  define Q_NO_USING_KEYWORD /* ### check "using" status */
-
 #elif defined(__WATCOMC__)
 #  define Q_CC_WAT
 #  if defined(Q_OS_QNX4)
@@ -841,17 +832,6 @@ class TQString;
 #    endif
 #    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
 #  endif
-#elif defined(Q_OS_LINUX) && defined(Q_CC_BOR)
-#  if defined(QT_SHARED)	/* create a TQt shared library */
-#    define TQ_EXPORT  __declspec(dllexport)
-#    define Q_TEMPLATEDLL
-#    define Q_TEMPLATE_EXTERN
-#    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
-#  else
-#    define Q_TEMPLATEDLL
-#    define Q_TEMPLATE_EXTERN
-#    undef  TQ_DISABLE_COPY 	/* avoid unresolved externals */
-#  endif
 #elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
 #    define TQ_EXPORT __attribute__((visibility("default")))
 #    undef QT_MAKEDLL		/* ignore these for other platforms */
@@ -1072,14 +1052,6 @@ TQ_EXPORT const char *tqInstallPathShare();
 #    pragma warning(disable: 4355) // 'this' : used in base member initializer list
 #    pragma warning(disable: 4231) // nonstandard extension used : 'extern' before template explicit instantiation
 #    pragma warning(disable: 4710) // function not inlined
-#  elif defined(Q_CC_BOR)
-#    pragma option -w-inl
-#    pragma option -w-aus
-#    pragma warn -inl
-#    pragma warn -pia
-#    pragma warn -ccc
-#    pragma warn -rch
-#    pragma warn -sig
 #  endif
 #endif
 
diff --git a/src/tools/tqgvector.cpp b/src/tools/tqgvector.cpp
index 001b777a4..9ee7034df 100644
--- a/src/tools/tqgvector.cpp
+++ b/src/tools/tqgvector.cpp
@@ -39,10 +39,6 @@
 **********************************************************************/
 
 #include "tqglobal.h"
-#if defined(Q_CC_BOR)
-// needed for qsort() because of a std namespace problem on Borland
-#include "qplatformdefs.h"
-#endif
 
 #define	 TQGVECTOR_CPP
 #include "tqgvector.h"
diff --git a/src/tools/tqlocale.cpp b/src/tools/tqlocale.cpp
index 77f3cae19..60cfc1bb0 100644
--- a/src/tools/tqlocale.cpp
+++ b/src/tools/tqlocale.cpp
@@ -5684,7 +5684,6 @@ static char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, cha
     // Some values of the floating-point control word can cause _qdtoa to crash with an underflow.
     // We set a safe value here.
 #ifdef Q_OS_WIN
-#ifndef Q_CC_BOR
     unsigned int oldbits = _control87(0, 0);
 #ifndef _M_X64 //x64 does not support precition control
     _control87(0x9001F, 0xFFFFF);
@@ -5692,7 +5691,6 @@ static char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, cha
     _control87(0x9001F, _MCW_DN|_MCW_EM|_MCW_RC);
 #endif //_M_X64
 #endif
-#endif
 
 #ifdef Q_OS_LINUX
     fenv_t envp;
@@ -5702,7 +5700,6 @@ static char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, cha
     char *s = _qdtoa(d, mode, ndigits, decpt, sign, rve, resultp);
 
 #ifdef Q_OS_WIN
-#ifndef Q_CC_BOR
     _clear87();
 #ifndef _M_X64
     _control87(oldbits, 0xFFFFF);
@@ -5710,7 +5707,6 @@ static char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, cha
     _control87(oldbits, _MCW_DN|_MCW_EM|_MCW_RC);
 #endif //_M_X64
 #endif
-#endif
 
 #ifdef Q_OS_LINUX
     fesetenv(&envp);
diff --git a/src/tools/tqwinexport.h b/src/tools/tqwinexport.h
index 2f4c41f13..2b56b294b 100644
--- a/src/tools/tqwinexport.h
+++ b/src/tools/tqwinexport.h
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#if defined(Q_TEMPLATEDLL) && ( !defined(Q_CC_BOR) || !defined(QT_MAKEDLL) || defined(Q_EXPORT_TEMPLATES) )
+#if defined(Q_TEMPLATEDLL) && ( !defined(QT_MAKEDLL) || defined(Q_EXPORT_TEMPLATES) )
 // MOC_SKIP_BEGIN
 
 #if defined(Q_DEFINED_QASCIIDICT) && defined(Q_DEFINED_QCONNECTION_LIST) && !defined(Q_EXPORTED_QASCIIDICT_TEMPLATES)