summaryrefslogtreecommitdiffstats
path: root/src/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/ntqgplugin.h6
-rw-r--r--src/kernel/qcolor_p.cpp5
-rw-r--r--src/kernel/qmngio.cpp7
-rw-r--r--src/kernel/qobject.cpp9
-rw-r--r--src/kernel/qrichtext.cpp2
5 files changed, 2 insertions, 27 deletions
diff --git a/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h
index 1b7431458..828d83e33 100644
--- a/src/kernel/ntqgplugin.h
+++ b/src/kernel/ntqgplugin.h
@@ -93,11 +93,7 @@
return i->iface(); \
}
-#if defined(TQ_WS_WIN) && defined(Q_CC_BOR)
-# define Q_STDCALL __stdcall
-#else
-# define Q_STDCALL
-#endif
+#define Q_STDCALL
#define TQ_EXPORT_PLUGIN(PLUGIN) \
Q_PLUGIN_VERIFICATION_DATA \
diff --git a/src/kernel/qcolor_p.cpp b/src/kernel/qcolor_p.cpp
index e7e33c9cb..46cbd8739 100644
--- a/src/kernel/qcolor_p.cpp
+++ b/src/kernel/qcolor_p.cpp
@@ -40,11 +40,6 @@
**********************************************************************/
#include "ntqglobal.h"
-#if defined(Q_CC_BOR)
-// needed for qsort() because of a std namespace problem on Borland
-#include "qplatformdefs.h"
-#endif
-
#include "ntqcolor.h"
#ifndef TQT_NO_COLORNAMES
diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp
index fad1aa9b3..8f612d6c7 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/qmngio.cpp
@@ -47,13 +47,6 @@
#include "ntqiodevice.h"
#include "ntqmngio.h"
-// Define XMD_H prohibits the included headers of libmng.h to typedef INT32.
-// This is needed for Borland with STL support, since in that case, INT32 is
-// already defined by some Borland header.
-#define XMD_H
-#if defined(Q_OS_UNIXWARE)
-# define HAVE_BOOLEAN // libjpeg under Unixware seems to need this
-#endif
#include <libmng.h>
#include <stdlib.h>
diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp
index 79b337f28..b7869c646 100644
--- a/src/kernel/qobject.cpp
+++ b/src/kernel/qobject.cpp
@@ -418,16 +418,7 @@ static inline bool isIdentChar( char x )
static inline bool isSpace( char x )
{
-#if defined(Q_CC_BOR)
- /*
- Borland C++ 4.5 has a weird isspace() bug.
- isspace() usually works, but not here.
- This implementation is sufficient for our internal use: rmWS()
- */
- return (uchar) x <= 32;
-#else
return isspace( (uchar) x );
-#endif
}
static TQCString qt_rmWS( const char *s )
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index ecc304071..4609a340b 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -2259,7 +2259,7 @@ TQString TQTextDocument::plainText() const
TQTextParagraph *p = fParag;
while ( p ) {
if ( !p->mightHaveCustomItems ) {
- const TQTextString *ts = p->string(); // workaround VC++ and Borland
+ const TQTextString *ts = p->string();
s = ts->toString(); // with FALSE we don't fix spaces (nbsp)
} else {
for ( int i = 0; i < p->length() - 1; ++i ) {