From 31af8fa045de34407fbe0beda3ad65afaf0080d2 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 27 Oct 2024 13:06:53 +0900 Subject: Drop Borland compiler specific code Signed-off-by: Michele Calgaro --- doc/tdevelop/setup.docbook | 3 +-- languages/cpp/main.cpp | 14 -------------- lib/antlr/antlr/config.h | 9 --------- lib/antlr/src/String.cpp | 6 ------ lib/astyle/ASFormatter.cpp | 2 +- parts/doxygen/config.cpp | 15 +-------------- 6 files changed, 3 insertions(+), 46 deletions(-) diff --git a/doc/tdevelop/setup.docbook b/doc/tdevelop/setup.docbook index 0c078a3b..6f217c27 100644 --- a/doc/tdevelop/setup.docbook +++ b/doc/tdevelop/setup.docbook @@ -344,8 +344,7 @@ A typical example of this user interface mode is KDEStudio, our friend C++-IDE i Toplevel window mode All editor, browser and tool views will be toplevel windows (directly on desktop). -The main widget contains the menu, toolbars and statusbar only. -A typical example of this user interface mode is Borland Delphi 6.0. +The main widget contains the menu, toolbars and statusbar only. diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp index 7ec48cfa..f790861e 100644 --- a/languages/cpp/main.cpp +++ b/languages/cpp/main.cpp @@ -132,20 +132,6 @@ public: } } - else if ( qmakespec == "win32-borland" ) - { - TQString incl = getenv( "INCLUDE" ); - TQStringList includePaths = TQStringList::split( ';', incl ); - TQStringList::Iterator it = includePaths.begin(); - while ( it != includePaths.end() ) - { - addIncludePath( ( *it ).stripWhiteSpace() ); - ++it; - } - // ### I am sure there are more standard include paths on - // ### windows. I will fix that soon - // ### Also do the compiler specific defines on windows - } } private: diff --git a/lib/antlr/antlr/config.h b/lib/antlr/antlr/config.h index 4d3456ec..200463b8 100644 --- a/lib/antlr/antlr/config.h +++ b/lib/antlr/antlr/config.h @@ -265,15 +265,6 @@ #endif /*}}}*/ /*****************************************************************************/ -#ifdef __BORLANDC__ -# if __BORLANDC__ >= 560 -# include -# include -# define ANTLR_CCTYPE_NEEDS_STD -# else -# error "sorry, compiler is too old - consider an update." -# endif -#endif // Redefine these for backwards compatability.. #undef ANTLR_BEGIN_NAMESPACE diff --git a/lib/antlr/src/String.cpp b/lib/antlr/src/String.cpp index 6d8b43cf..39b09ab1 100644 --- a/lib/antlr/src/String.cpp +++ b/lib/antlr/src/String.cpp @@ -19,12 +19,6 @@ namespace antlr { #endif -// wh: hack for Borland C++ 5.6 -#if __BORLANDC__ - using std::sprintf; -#endif - - // RK: should be using snprintf actually... (or stringstream) ANTLR_C_USING(sprintf) diff --git a/lib/astyle/ASFormatter.cpp b/lib/astyle/ASFormatter.cpp index eb418760..bf88affd 100644 --- a/lib/astyle/ASFormatter.cpp +++ b/lib/astyle/ASFormatter.cpp @@ -1652,7 +1652,7 @@ void ASFormatter::adjustComments(void) if (formattedLine.find_last_not_of(' ') < len - adjust - 1 && formattedLine[len-1] != '\t') // don't adjust a tab formattedLine.resize(len - adjust); - // the following are commented out to avoid a Borland compiler warning + // the following are commented out to avoid compiler warning //else // adjust = 0; TRcomment(-adjust); // trace macro diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp index 4299c300..953d183d 100644 --- a/parts/doxygen/config.cpp +++ b/parts/doxygen/config.cpp @@ -71,15 +71,6 @@ bool portable_fileSystemIsCaseSensitive() #endif /* __STDC__ */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include -#include -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else @@ -2956,13 +2947,9 @@ void Config::check() #undef PUTENV #undef SEP -#if defined(_WIN32) && (__BORLANDC__ < 0x0550) -#define PUTENV _putenv -#define SEP ";" -#else #define PUTENV putenv #define SEP ":" -#endif + // check TQHP creation requirements if (Config_getBool("GENERATE_TQHP")) { -- cgit v1.2.1