diff options
| -rw-r--r-- | filters/kspread/dbase/status.html | 1 | ||||
| -rw-r--r-- | kchart/kdchart/KDChartAxesPainter.cpp | 2 | ||||
| -rw-r--r-- | kchart/kdchart/KDChartParams.h | 2 | ||||
| -rw-r--r-- | kexi/3rdparty/kexisql/src/os.h | 4 | ||||
| -rw-r--r-- | kexi/3rdparty/kexisql3/src/os.h | 2 | ||||
| -rw-r--r-- | kexi/3rdparty/kexisql3/src/sqlite3.h | 2 | ||||
| -rw-r--r-- | kexi/3rdparty/kexisql3/src/sqliteInt.h | 2 | ||||
| -rw-r--r-- | kexi/kexidb/parser/sqlscanner.cpp | 9 | ||||
| -rw-r--r-- | kivio/kiviopart/kiviosdk/kivio_wrap.cpp | 5 |
9 files changed, 8 insertions, 21 deletions
diff --git a/filters/kspread/dbase/status.html b/filters/kspread/dbase/status.html index 561cf26e..ebc13fa0 100644 --- a/filters/kspread/dbase/status.html +++ b/filters/kspread/dbase/status.html @@ -74,7 +74,6 @@ <tr BGCOLOR="#CCCCFF"> <td VALIGN=TOP><b><font size="+1">Links</font></b></td> <td> - <a href="http://community.borland.com/article/0,1410,15838,00.html">http://community.borland.com/article/0,1410,15838,00.html</a><br> <a href="http://www.apptools.com/dbase/faq/qformt.htm">dBASE DBF file format</a><br> <a href="http://www.geocities.com/SiliconValley/Pines/2563/xbase.htm">XBase file format description</a><br> diff --git a/kchart/kdchart/KDChartAxesPainter.cpp b/kchart/kdchart/KDChartAxesPainter.cpp index b07195bf..e3fc9384 100644 --- a/kchart/kdchart/KDChartAxesPainter.cpp +++ b/kchart/kdchart/KDChartAxesPainter.cpp @@ -2990,7 +2990,7 @@ void KDChartAxesPainter::calculateLabelTexts( nHigh = log10( TQABS( nHigh ) ); //tqDebug("[L-0] nLow: %f, nHigh: %f", nLow, nHigh ); - double intPart=0.0; // initialization necessary for Borland C++ + double intPart; double fractPart = modf( nLow, &intPart ); //tqDebug(" intPart: %f\nfractPart: %f", intPart, fractPart ); if( 0.0 > nLow && 0.0 != fractPart ) diff --git a/kchart/kdchart/KDChartParams.h b/kchart/kdchart/KDChartParams.h index a87fba68..f44c887d 100644 --- a/kchart/kdchart/KDChartParams.h +++ b/kchart/kdchart/KDChartParams.h @@ -703,7 +703,7 @@ public slots: static int roundVal( double d ) { double fr; - double i=0.0; // initialization necessary for Borland C++ + double i; fr = modf( d, &i ); int ret = static_cast < int > ( i ); if( 0.49999 <= fabs( fr ) ) diff --git a/kexi/3rdparty/kexisql/src/os.h b/kexi/3rdparty/kexisql/src/os.h index d1395841..d11198c9 100644 --- a/kexi/3rdparty/kexisql/src/os.h +++ b/kexi/3rdparty/kexisql/src/os.h @@ -71,7 +71,7 @@ # define OS_MAC 1 # define OS_WIN 0 # define OS_UNIX 0 -# elif defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__) +# elif defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) # define OS_MAC 0 # define OS_WIN 1 # define OS_UNIX 0 @@ -127,7 +127,7 @@ HANDLE h; /* Handle for accessing the file */ int locked; /* 0: unlocked, <0: write lock, >0: read lock */ }; -# if defined(_MSC_VER) || defined(__BORLANDC__) +# if defined(_MSC_VER) typedef __int64 off_t; # else # if !defined(_CYGWIN_TYPES_H) diff --git a/kexi/3rdparty/kexisql3/src/os.h b/kexi/3rdparty/kexisql3/src/os.h index ebbd7541..95d7c60e 100644 --- a/kexi/3rdparty/kexisql3/src/os.h +++ b/kexi/3rdparty/kexisql3/src/os.h @@ -26,7 +26,7 @@ #if !defined(OS_UNIX) && !defined(OS_TEST) && !defined(OS_OTHER) # define OS_OTHER 0 # ifndef OS_WIN -# if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__) +# if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) # define OS_WIN 1 # define OS_UNIX 0 # else diff --git a/kexi/3rdparty/kexisql3/src/sqlite3.h b/kexi/3rdparty/kexisql3/src/sqlite3.h index 414c6cac..c16da53b 100644 --- a/kexi/3rdparty/kexisql3/src/sqlite3.h +++ b/kexi/3rdparty/kexisql3/src/sqlite3.h @@ -78,7 +78,7 @@ typedef struct sqlite3 sqlite3; ** to do a typedef that for 64-bit integers that depends on what compiler ** is being used. */ -#if defined(_MSC_VER) || defined(__BORLANDC__) +#if defined(_MSC_VER) typedef __int64 sqlite_int64; typedef unsigned __int64 sqlite_uint64; #else diff --git a/kexi/3rdparty/kexisql3/src/sqliteInt.h b/kexi/3rdparty/kexisql3/src/sqliteInt.h index 796653e7..f2f4efc5 100644 --- a/kexi/3rdparty/kexisql3/src/sqliteInt.h +++ b/kexi/3rdparty/kexisql3/src/sqliteInt.h @@ -167,7 +167,7 @@ ** cc '-DUINTPTR_TYPE=long long int' ... */ #ifndef UINT64_TYPE -# if defined(_MSC_VER) || defined(__BORLANDC__) +# if defined(_MSC_VER) # define UINT64_TYPE unsigned __int64 # else # define UINT64_TYPE unsigned long long int diff --git a/kexi/kexidb/parser/sqlscanner.cpp b/kexi/kexidb/parser/sqlscanner.cpp index f653a6eb..50dd67e7 100644 --- a/kexi/kexidb/parser/sqlscanner.cpp +++ b/kexi/kexidb/parser/sqlscanner.cpp @@ -43,15 +43,6 @@ #endif /* __STDC__ */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include <io.h> -#include <stdlib.h> -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else diff --git a/kivio/kiviopart/kiviosdk/kivio_wrap.cpp b/kivio/kiviopart/kiviosdk/kivio_wrap.cpp index 4fa790e2..102c0604 100644 --- a/kivio/kiviopart/kiviosdk/kivio_wrap.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_wrap.cpp @@ -50,10 +50,7 @@ extern "C" { # define SWIGEXPORT(a) __declspec(dllexport) a # endif # else -# if defined(__BORLANDC__) -# define SWIGEXPORT(a) a _export -# else -# define SWIGEXPORT(a) a +# define SWIGEXPORT(a) a # endif #endif #else |