Drop Borland compiler specific code

Signed-off-by: Michele Calgaro <[email protected]>

5 files changed, 3 insertions, 34 deletions

diff --git a/doc/html/designer-manual-6.html b/doc/html/designer-manual-6.html
index 2ab181dcb..503dcd9dd 100644
--- a/doc/html/designer-manual-6.html
+++ b/doc/html/designer-manual-6.html
@@ -40,7 +40,7 @@ body { background: #ffffff; color: black; }
 <pre>
 SOURCES += main.cpp
 </pre>
-<p>You can then use <tt>qmake</tt> to generate the Makefile. (For example <tt>qmake -o Makefile myproject.pro</tt>.) Running <tt>make</tt> (Linux, Unix or Borland compilers), or <tt>nmake</tt> (Visual C++), will then call <tt>tquic</tt>, <tt>tqmoc</tt> and your compiler as necessary to build your application.</p>
+<p>You can then use <tt>qmake</tt> to generate the Makefile. (For example <tt>qmake -o Makefile myproject.pro</tt>.) Running <tt>make</tt> (Linux or Unix compilers), or <tt>nmake</tt> (Visual C++), will then call <tt>tquic</tt>, <tt>tqmoc</tt> and your compiler as necessary to build your application.</p>
 <!-- index Errors!Undefined reference --><!-- index Undefined references, Error --><!-- index qmake!HEADERS --><!-- index qmake!SOURCES --><p>If you use <em>TQt Designer</em> to create your main window and dialogs, but also add other C++ files, or if you subclass any of your forms you will need to add these files to the<!-- index .pro --> <tt>.pro</tt> file so that they are compiled with the rest of your application's source files. Each<!-- index .h --> <tt>.h</tt> file that you create separately from <em>TQt Designer</em> should be added to the <tt>HEADERS</tt> line, and each<!-- index .cpp --> <tt>.cpp</tt> file should be added to the <tt>SOURCES</tt> line, just as we've done for<!-- index main.cpp --> <tt>main.cpp</tt>. If you get undefined reference errors it is worth checking that you've added the names of all your header and implementation files to the<!-- index .pro --> <tt>.pro</tt> file.</p>
 <h4><a name="1-2"></a>Subclassing a Form</h4>
 <!-- index Subclassing --><p>When subclassing a form it is helpful to use a naming convention to help us identify which files are generated from <em>TQt Designer</em>'s<!-- index .ui --> <tt>.ui</tt> files and which are hand coded.</p>
diff --git a/doc/html/qmake-manual-2.html b/doc/html/qmake-manual-2.html
index 1053b10aa..cb1126dba 100644
--- a/doc/html/qmake-manual-2.html
+++ b/doc/html/qmake-manual-2.html
@@ -37,7 +37,7 @@ body { background: #ffffff; color: black; }
 <p>Before building TQt manually the following environment variables must be set:</p>
 <ul><li><p>QMAKESPEC <br> This must be set to the platform and compiler combination that you are using on your system. <br> For example, if you are using Windows and Microsoft Visual Studio, you would set this environment variable to <em>win32-msvc</em>. If you are using Solaris and g++, you would set this environment variable to <em>solaris-g++</em>.</p>
 <p>The following is a list of environment variables available to choose from when setting QMAKESPEC:</p>
-<p>aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc unixware7-g++ aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++ win32-borland aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ win32-g++ bsdi-g++ hpux-o64 linux-icc qnx-g++ tru64-cxx win32-msvc dgux-g++ hurd-g++ linux-kcc reliant-64 tru64-g++ win32-watc freebsd-g++ irix-64 macx-pbuilder reliant-cds ultrix-g++ win32-visa hpux-acc irix-g++ macx-g++ sco-g++ unixware-g hpux-acc irix-n32 solaris-64 unixware7-cc</p>
+<p>aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc unixware7-g++ aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++ aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ win32-g++ bsdi-g++ hpux-o64 linux-icc qnx-g++ tru64-cxx win32-msvc dgux-g++ hurd-g++ linux-kcc reliant-64 tru64-g++ win32-watc freebsd-g++ irix-64 macx-pbuilder reliant-cds ultrix-g++ win32-visa hpux-acc irix-g++ macx-g++ sco-g++ unixware-g hpux-acc irix-n32 solaris-64 unixware7-cc</p>
 <li><p>TQTDIR <br> This must be set to where TQt is (or will be) installed. For example, <em>c:\qt</em> and <em>\local\qt</em></p>
 </ul><p>Once the environment variables are set go into the qmake directory, <em>$TQTDIR/qmake</em>, e.g. <em>C:\qt\qmake</em>. Now run <em>make</em> or <em>nmake</em> depending on your compiler.</p>
 <p>When the make has completed, <em>qmake</em> is ready for use.</p>
diff --git a/doc/html/qmake-manual-8.html b/doc/html/qmake-manual-8.html
index 89fff355e..8081044c4 100644
--- a/doc/html/qmake-manual-8.html
+++ b/doc/html/qmake-manual-8.html
@@ -452,9 +452,6 @@ app {
 <p>This variable contains all the libraries needed to link against if OpenGL support is turned on. The value of this variable is typically handled by <em>qmake</em> or <a href="qmake-manual-8.html#QMAKESPEC">qmake.conf</a> and rarely needs to be modified.</p>
 <h5><a name="4-2-73"></a>QMAKE_LIBS_QT_THREAD</h5>
 <p>This variable contains all the libraries needed to link against if thread support is turned on. The value of this variable is typically handled by <em>qmake</em> or <a href="qmake-manual-8.html#QMAKESPEC">qmake.conf</a> and rarely needs to be modified.</p>
-<h5><a name="4-2-74"></a>QMAKE_LIBS_RT</h5>
-<p><em>This is used with Borland compilers only</em></p>
-<p>This variable contains the runtime library needed to link against when building an application. The value of this variable is typically handled by <em>qmake</em> or <a href="qmake-manual-8.html#QMAKESPEC">qmake.conf</a> and rarely needs to be modified.</p>
 <h5><a name="4-2-75"></a>QMAKE_LIBS_RTMT</h5>
 <p><em>This is used with Borland compilers only</em></p>
 <p>This variable contains the runtime library needed to link against when building a multi-threaded application. The value of this variable is typically handled by <em>qmake</em> or <a href="qmake-manual-8.html#QMAKESPEC">qmake.conf</a> and rarely needs to be modified.</p>
diff --git a/doc/html/tqcanvas-h.html b/doc/html/tqcanvas-h.html
index 75b11b2c5..b456dff40 100644
--- a/doc/html/tqcanvas-h.html
+++ b/doc/html/tqcanvas-h.html
@@ -110,7 +110,7 @@ class TQCanvasItem;
 class TQCanvasView;
 class TQCanvasPixmap;
 
-#if defined(Q_TEMPLATEDLL) &amp;&amp; ( !defined(Q_CC_BOR) || !defined(QT_MAKEDLL) || defined(Q_EXPORT_TEMPLATES) )
+#if defined(Q_TEMPLATEDLL) &amp;&amp; ( !defined(QT_MAKEDLL) || defined(Q_EXPORT_TEMPLATES) )
 // MOC_SKIP_BEGIN
 TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQValueListIterator&lt; TQCanvasItem* &gt;;
 TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQValueList&lt; TQCanvasItem* &gt;;
diff --git a/doc/html/tqglobal-h.html b/doc/html/tqglobal-h.html
index a6dade0be..18cf07aa6 100644
--- a/doc/html/tqglobal-h.html
+++ b/doc/html/tqglobal-h.html
@@ -232,7 +232,6 @@ body { background: #ffffff; color: black; }
      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++
@@ -299,14 +298,6 @@ body { background: #ffffff; color: black; }
 #    define Q_NO_USING_KEYWORD /* ### check "using" status */
 #  endif
 
-#elif defined(__BORLANDC__) || defined(__TURBOC__)
-#  define Q_CC_BOR
-#  if __BORLANDC__ &lt; 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)
@@ -870,17 +861,6 @@ class TQDataStream;
 #    endif
 #    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
 #  endif
-#elif defined(Q_OS_LINUX) &amp;&amp; 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
 #else
 #  undef QT_MAKEDLL		/* ignore these for other platforms */
 #  undef QT_DLL
@@ -1090,14 +1070,6 @@ TQ_EXPORT const char *tqInstallPathSysconf();
 #    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