summaryrefslogtreecommitdiffstats
path: root/src/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/tqcolor_p.cpp5
-rw-r--r--src/kernel/tqgplugin.h6
-rw-r--r--src/kernel/tqmngio.cpp7
-rw-r--r--src/kernel/tqobject.cpp9
-rw-r--r--src/kernel/tqrichtext.cpp2
5 files changed, 2 insertions, 27 deletions
diff --git a/src/kernel/tqcolor_p.cpp b/src/kernel/tqcolor_p.cpp
index d1462f43f..5db0e21be 100644
--- a/src/kernel/tqcolor_p.cpp
+++ b/src/kernel/tqcolor_p.cpp
@@ -40,11 +40,6 @@
**********************************************************************/
#include "tqglobal.h"
-#if defined(Q_CC_BOR)
-// needed for qsort() because of a std namespace problem on Borland
-#include "qplatformdefs.h"
-#endif
-
#include "tqcolor.h"
#ifndef TQT_NO_COLORNAMES
diff --git a/src/kernel/tqgplugin.h b/src/kernel/tqgplugin.h
index 30e350cd2..d962278c0 100644
--- a/src/kernel/tqgplugin.h
+++ b/src/kernel/tqgplugin.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/tqmngio.cpp b/src/kernel/tqmngio.cpp
index 0f257ae88..737cab55c 100644
--- a/src/kernel/tqmngio.cpp
+++ b/src/kernel/tqmngio.cpp
@@ -47,13 +47,6 @@
#include "tqiodevice.h"
#include "tqmngio.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/tqobject.cpp b/src/kernel/tqobject.cpp
index e37cf1481..5b2d3fd68 100644
--- a/src/kernel/tqobject.cpp
+++ b/src/kernel/tqobject.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/tqrichtext.cpp b/src/kernel/tqrichtext.cpp
index 57b091721..3585e470d 100644
--- a/src/kernel/tqrichtext.cpp
+++ b/src/kernel/tqrichtext.cpp
@@ -2257,7 +2257,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 ) {