diff options
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/tqeventloop_glib_p.h | 5 | ||||
| -rw-r--r-- | src/kernel/tqeventloop_p.h | 5 | ||||
| -rw-r--r-- | src/kernel/tqprinter_unix.cpp | 2 | ||||
| -rw-r--r-- | src/kernel/tqstyle.cpp | 6 | ||||
| -rw-r--r-- | src/kernel/tqt_x11_p.h | 6 |
5 files changed, 3 insertions, 21 deletions
diff --git a/src/kernel/tqeventloop_glib_p.h b/src/kernel/tqeventloop_glib_p.h index 45c6a1bfc..9fb8ab507 100644 --- a/src/kernel/tqeventloop_glib_p.h +++ b/src/kernel/tqeventloop_glib_p.h @@ -49,11 +49,6 @@ #include "qplatformdefs.h" #endif // QT_H -// SCO OpenServer redefines raise -> kill -#if defined(raise) -# undef raise -#endif - #include "tqeventloop.h" #include "tqwindowdefs.h" diff --git a/src/kernel/tqeventloop_p.h b/src/kernel/tqeventloop_p.h index 46e5fae9e..395d90a85 100644 --- a/src/kernel/tqeventloop_p.h +++ b/src/kernel/tqeventloop_p.h @@ -57,11 +57,6 @@ #include "qplatformdefs.h" #endif // QT_H -// SCO OpenServer redefines raise -> kill -#if defined(raise) -# undef raise -#endif - #include "tqwindowdefs.h" class TQSocketNotifier; diff --git a/src/kernel/tqprinter_unix.cpp b/src/kernel/tqprinter_unix.cpp index e53dc5ff6..e5bacff9c 100644 --- a/src/kernel/tqprinter_unix.cpp +++ b/src/kernel/tqprinter_unix.cpp @@ -412,7 +412,6 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) uint i; for (i = 0; i < lphack.size(); ++i) lpargs[i+1] = (char *)lphack[i].ascii(); -#ifndef Q_OS_OSF if (psToStr[page_size]) { lpargs[++i] = (char *)"-o"; lpargs[++i] = (char *)psToStr[page_size]; @@ -421,7 +420,6 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) media += psToStr[page_size]; lpargs[++i] = (char *)media.ascii(); } -#endif lpargs[++i] = 0; char **lprargs = new char *[lprhack.size()+1]; lprargs[0] = (char *)"lpr"; diff --git a/src/kernel/tqstyle.cpp b/src/kernel/tqstyle.cpp index 27a4ce33c..7b21783b0 100644 --- a/src/kernel/tqstyle.cpp +++ b/src/kernel/tqstyle.cpp @@ -1033,7 +1033,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, \value PE_ScrollBarAddLine scrollbar line increase indicator (i.e. scroll down); see also TQScrollBar. \value PE_ScrollBarSubLine scrollbar line decrease indicator (i.e. scroll up). - \value PE_ScrollBarAddPage scolllbar page increase indicator (i.e. page down). + \value PE_ScrollBarAddPage scrollbar page increase indicator (i.e. page down). \value PE_ScrollBarSubPage scrollbar page decrease indicator (i.e. page up). \value PE_ScrollBarSlider scrollbar slider \value PE_ScrollBarFirst scrollbar first line indicator (i.e. home). @@ -1986,7 +1986,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, value. If TRUE, when clicking a scrollbar SubControl, holding the mouse button down and moving the pointer outside the SubControl, the scrollbar continues to scroll. If FALSE, the - scollbar stops scrolling when the pointer leaves the + scrollbar stops scrolling when the pointer leaves the SubControl. \value SH_TabBar_Alignment the alignment for tabs in a @@ -2063,7 +2063,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, cause a listview expansion to be selected. \value SH_TabBar_PreferNoArrows whether a tabbar should suggest a size - to prevent scoll arrows. + to prevent scroll arrows. \value SH_ComboBox_Popup allows popups as a combobox dropdown menu. diff --git a/src/kernel/tqt_x11_p.h b/src/kernel/tqt_x11_p.h index 5d807238a..05bbf80b5 100644 --- a/src/kernel/tqt_x11_p.h +++ b/src/kernel/tqt_x11_p.h @@ -198,9 +198,6 @@ typedef char *XPointer; #if defined(X11R4) // X11R4 does not have XIM #define TQT_NO_XIM -#elif defined(Q_OS_OSF) && (XlibSpecificationRelease < 6) -// broken in Xlib up to OSF/1 3.2 -#define TQT_NO_XIM #elif defined(Q_OS_AIX) // broken in Xlib up to what version of AIX? #define TQT_NO_XIM @@ -211,9 +208,6 @@ typedef char *XPointer; #elif defined(Q_OS_HPUX) && defined(__LP64__) // XCreateIC broken when compiling 64-bit ELF on HP-UX 11.0 #define TQT_NO_XIM -#elif defined(Q_OS_SCO) -// ### suggested by user... -// ### #define TQT_NO_XIM #endif // TQT_NO_XIM |