Remove documentation for QWS classes and Qt/Embedded

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

13 files changed, 38 insertions, 468 deletions

diff --git a/src/tools/ntqfeatures.h b/src/tools/ntqfeatures.h
index 66fc95fcf..acfa7db03 100644
--- a/src/tools/ntqfeatures.h
+++ b/src/tools/ntqfeatures.h
@@ -26,9 +26,6 @@
 // Dialogs
 //#define TQT_NO_DIALOG
 
-// TQDirectPainter
-//#define TQT_NO_DIRECTPAINTER
-
 // Special widget effects (fading, scrolling)
 //#define TQT_NO_EFFECTS
 
@@ -59,75 +56,6 @@
 // Palettes
 //#define TQT_NO_PALETTE
 
-// Alpha-blended cursor
-//#define TQT_NO_QWS_ALPHA_CURSOR
-
-// 1-bit monochrome
-//#define TQT_NO_QWS_DEPTH_1
-
-// 15 or 16-bit color
-//#define TQT_NO_QWS_DEPTH_16
-
-// 24-bit color
-//#define TQT_NO_QWS_DEPTH_24
-
-// 32-bit color
-//#define TQT_NO_QWS_DEPTH_32
-
-// 4-bit grayscale
-//#define TQT_NO_QWS_DEPTH_4
-
-// 8-bit color
-//#define TQT_NO_QWS_DEPTH_8
-
-// 8-bit grayscale
-//#define TQT_NO_QWS_DEPTH_8GRAYSCALE
-
-// Favour code size over graphics speed
-//#define TQT_NO_QWS_GFX_SPEED
-
-// Console keyboard
-//#define TQT_NO_QWS_KEYBOARD
-
-// Linux framebuffer
-//#define TQT_NO_QWS_LINUXFB
-
-// Mach64 acceleration
-//#define TQT_NO_QWS_MACH64
-
-// Window Manager
-//#define TQT_NO_QWS_MANAGER
-
-// Matrox MGA acceleration
-//#define TQT_NO_QWS_MATROX
-
-// Autodetecting mouse driver
-//#define TQT_NO_QWS_MOUSE_AUTO
-
-// Non-autodetecting mouse driver
-//#define TQT_NO_QWS_MOUSE_MANUAL
-
-// TQt/Embedded window system properties.
-//#define TQT_NO_QWS_PROPERTIES
-
-// Repeater display
-//#define TQT_NO_QWS_REPEATER
-
-// Saving of fonts
-//#define TQT_NO_QWS_SAVEFONTS
-
-// Shadow frame buffer
-//#define TQT_NO_QWS_SHADOWFB
-
-// Virtual frame buffer
-//#define TQT_NO_QWS_VFB
-
-// 4-bit VGA
-//#define TQT_NO_QWS_VGA_16
-
-// Voodoo3 acceleration
-//#define TQT_NO_QWS_VOODOO3
-
 // Range-control widgets
 //#define TQT_NO_RANGECONTROL
 
@@ -172,11 +100,6 @@
 #define TQT_NO_CODECS
 #endif
 
-// TQCop IPC
-#if !defined(TQT_NO_COP) && (defined(TQT_NO_DATASTREAM))
-#define TQT_NO_COP
-#endif
-
 // TQFontDatabase
 #if !defined(TQT_NO_FONTDATABASE) && (defined(TQT_NO_STRINGLIST))
 #define TQT_NO_FONTDATABASE
@@ -212,61 +135,6 @@
 #define TQT_NO_QUUID_STRING
 #endif
 
-// The "BeOS" style
-#if !defined(TQT_NO_QWS_BEOS_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER))
-#define TQT_NO_QWS_BEOS_WM_STYLE
-#endif
-
-// Visible cursor
-#if !defined(TQT_NO_QWS_CURSOR) && (defined(TQT_NO_CURSOR))
-#define TQT_NO_QWS_CURSOR
-#endif
-
-// 32-bit color, BGR order
-#if !defined(TQT_NO_QWS_DEPTH_32_BGR) && (defined(TQT_NO_QWS_DEPTH_32))
-#define TQT_NO_QWS_DEPTH_32_BGR
-#endif
-
-// The "Hydro" style
-#if !defined(TQT_NO_QWS_HYDRO_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER))
-#define TQT_NO_QWS_HYDRO_WM_STYLE
-#endif
-
-// Keyboard for SHARP Zaurus SL5xxx devices
-#if !defined(TQT_NO_QWS_KBD_SHARP) && (defined(TQT_NO_QWS_KEYBOARD))
-#define TQT_NO_QWS_KBD_SHARP
-#endif
-
-// The "KDE2" style
-#if !defined(TQT_NO_QWS_KDE2_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER))
-#define TQT_NO_QWS_KDE2_WM_STYLE
-#endif
-
-// The "KDE" style
-#if !defined(TQT_NO_QWS_KDE_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER))
-#define TQT_NO_QWS_KDE_WM_STYLE
-#endif
-
-// Multi-process architecture
-#if !defined(TQT_NO_QWS_MULTIPROCESS) && (defined(TQT_NO_NETWORK))
-#define TQT_NO_QWS_MULTIPROCESS
-#endif
-
-// Transformed frame buffer
-#if !defined(TQT_NO_QWS_TRANSFORMED) && (defined(TQT_NO_QWS_LINUXFB))
-#define TQT_NO_QWS_TRANSFORMED
-#endif
-
-// Remote frame buffer (VNC)
-#if !defined(TQT_NO_QWS_VNC) && (defined(TQT_NO_NETWORK))
-#define TQT_NO_QWS_VNC
-#endif
-
-// The "Windows" style
-#if !defined(TQT_NO_QWS_WINDOWS_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER))
-#define TQT_NO_QWS_WINDOWS_WM_STYLE
-#endif
-
 // Regular expression anchors
 #if !defined(TQT_NO_REGEXP_ANCHOR_ALT) && (defined(TQT_NO_REGEXP))
 #define TQT_NO_REGEXP_ANCHOR_ALT
@@ -342,11 +210,6 @@
 #define TQT_NO_ASYNC_IMAGE_IO
 #endif
 
-// BDF font files
-#if !defined(TQT_NO_BDF) && (defined(TQT_NO_TEXTSTREAM) || defined(TQT_NO_STRINGLIST))
-#define TQT_NO_BDF
-#endif
-
 // TQDir
 #if !defined(TQT_NO_DIR) && (defined(TQT_NO_STRINGLIST) || defined(TQT_NO_REGEXP))
 #define TQT_NO_DIR
@@ -623,7 +486,7 @@
 #endif
 
 // Cut and paste
-#if !defined(TQT_NO_CLIPBOARD) && (defined(TQT_NO_QWS_PROPERTIES) || defined(TQT_NO_MIME))
+#if !defined(TQT_NO_CLIPBOARD) && defined(TQT_NO_MIME)
 #define TQT_NO_CLIPBOARD
 #endif
 
@@ -692,11 +555,6 @@
 #define TQT_NO_HBUTTONGROUP
 #endif
 
-// Server to play sound
-#if !defined(TQT_NO_QWS_SOUNDSERVER) && (defined(TQT_NO_SOUND) || defined(TQT_NO_DIR) || defined(TQT_NO_DNS))
-#define TQT_NO_QWS_SOUNDSERVER
-#endif
-
 // TQHeader
 #if !defined(TQT_NO_HEADER) && (defined(TQT_NO_STYLE) || defined(TQT_NO_ICONSET))
 #define TQT_NO_HEADER
@@ -748,7 +606,7 @@
 #endif
 
 // Drag and drop
-#if !defined(TQT_NO_DRAGANDDROP) && (defined(TQT_NO_MIME) || defined(TQT_NO_QWS_PROPERTIES) || defined(TQT_NO_IMAGEIO_XPM))
+#if !defined(TQT_NO_DRAGANDDROP) && (defined(TQT_NO_MIME) || defined(TQT_NO_IMAGEIO_XPM))
 #define TQT_NO_DRAGANDDROP
 #endif
 
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index f83da9d79..2d449fd9c 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -292,10 +292,7 @@
 /* can we just compare the structures? */
 #    define TQ_FULL_TEMPLATE_INSTANTIATION_MEMCMP
 /* these are not useful to our customers */
-#    define QT_QWS_NO_SHM
-#    define TQT_NO_QWS_MULTIPROCESS
 #    define TQT_NO_SQL
-#    define TQT_NO_QWS_CURSOR
 #  endif
 
 #elif defined(__GNUC__)
@@ -556,7 +553,6 @@
 
      MACX	- Mac OS X
      MAC9	- Mac OS 9
-     TQWS	- TQt/Embedded
      WIN32	- Windows
      X11	- X Window System
      PM		- unsupported
@@ -579,10 +575,7 @@
 #  define TQ_WS_PM
 #  error "TQt does not work with OS/2 Presentation Manager or Workplace Shell"
 #elif defined(Q_OS_UNIX)
-#  if defined(TQWS)
-#    define TQ_WS_QWS
-#    define TQT_NO_QWS_IM
-#  elif defined(Q_OS_MACX)
+#  if defined(Q_OS_MACX)
 #    define TQ_WS_MACX
 #  else
 #    define TQ_WS_X11
@@ -596,7 +589,7 @@
 #  define TQ_WS_WIN
 #endif
 
-#if (defined(TQ_WS_MAC9) || defined(TQ_WS_MACX)) && !defined(TQ_WS_QWS) && !defined(TQ_WS_X11)
+#if (defined(TQ_WS_MAC9) || defined(TQ_WS_MACX)) && !defined(TQ_WS_X11)
 #  define TQ_WS_MAC
 #endif
 
@@ -814,10 +807,6 @@ class TQString;
 #  endif
 #endif
 
-#if !defined(TQ_WS_QWS) && !defined(TQT_NO_COP)
-#  define TQT_NO_COP
-#endif
-
 #ifndef QT_H
 #include "ntqfeatures.h"
 #endif /* QT_H */
diff --git a/src/tools/qconfig-large.h b/src/tools/qconfig-large.h
index 1f169fe14..d2f8321ce 100644
--- a/src/tools/qconfig-large.h
+++ b/src/tools/qconfig-large.h
@@ -8,8 +8,6 @@
 #define TQT_NO_IMAGEIO_PPM
 #define TQT_NO_ASYNC_IO
 #define TQT_NO_ASYNC_IMAGE_IO
-/* #define TQT_NO_FREETYPE */
-#define TQT_NO_BDF
 //#define TQT_NO_FONTDATABASE
 #define TQT_NO_TRANSLATION
 #define TQT_NO_DRAGANDDROP
diff --git a/src/tools/qconfig-medium.h b/src/tools/qconfig-medium.h
index 17416abf4..93bc436e6 100644
--- a/src/tools/qconfig-medium.h
+++ b/src/tools/qconfig-medium.h
@@ -9,8 +9,6 @@
 /* #define TQT_NO_IMAGEIO_PNG */
 #define TQT_NO_ASYNC_IO
 #define TQT_NO_ASYNC_IMAGE_IO
-/* #define TQT_NO_FREETYPE */
-#define TQT_NO_BDF
 //#define TQT_NO_FONTDATABASE
 #define TQT_NO_TRANSLATION
 #define TQT_NO_DRAGANDDROP
@@ -53,7 +51,6 @@
 
 /* #define TQT_NO_TEXTSTREAM */
 #define TQT_NO_DATASTREAM
-#define TQT_NO_QWS_SAVEFONTS
 
 #define TQT_NO_SESSIONMANAGER
 
@@ -61,9 +58,6 @@
 /* #define TQT_NO_DIALOG */
 
 #define TQT_NO_EFFECTS
-#define TQT_NO_COP
-
-#define TQT_NO_QWS_PROPERTIES
 
 /* #define TQT_NO_RANGECONTROL */
 /* #define TQT_NO_SPLITTER */
@@ -99,8 +93,3 @@
 #define TQT_NO_WIZARD
 #define TQT_NO_EFFECTS
 
-/* #define TQT_NO_QWS_HYDRO_WM_STYLE */
-#define TQT_NO_QWS_BEOS_WM_STYLE
-#define TQT_NO_QWS_KDE2_WM_STYLE
-#define TQT_NO_QWS_KDE_WM_STYLE
-/* #define TQT_NO_QWS_WINDOWS_WM_STYLE */
diff --git a/src/tools/qconfig-minimal.h b/src/tools/qconfig-minimal.h
index 7d5305e69..2d98d14ea 100644
--- a/src/tools/qconfig-minimal.h
+++ b/src/tools/qconfig-minimal.h
@@ -18,16 +18,12 @@
 /* #define TQT_NO_IMAGEIO_PNG //done by configure -no-png */
 #define TQT_NO_ASYNC_IO
 #define TQT_NO_ASYNC_IMAGE_IO
-/* //#define TQT_NO_FREETYPE //done by configure -no-freetype */
-#define TQT_NO_BDF
 //#define TQT_NO_FONTDATABASE
 #define TQT_NO_TRANSLATION
 #define TQT_NO_MIME
 #define TQT_NO_SOUND
 /* #define TQT_NO_PROPERTIES */
-#define TQT_NO_QWS_CURSOR
 #define TQT_NO_CURSOR
-#define TQT_NO_QWS_GFX_SPEED
 #define TQT_NO_NETWORK
 #define TQT_NO_COLORNAMES
 #define TQT_NO_TRANSFORMATIONS
@@ -39,14 +35,11 @@
 #define TQT_NO_IMAGE_SMOOTHSCALE
 #define TQT_NO_IMAGE_TEXT
 #define TQT_NO_DIR
-#define TQT_NO_QWS_MANAGER
 #define TQT_NO_TEXTSTREAM
 #define TQT_NO_DATASTREAM
-#define TQT_NO_QWS_SAVEFONTS
 //#define TQT_NO_STRINGLIST
 #define TQT_NO_TEMPLATE_VARIANT
 #define TQT_NO_SESSIONMANAGER
-#define TQT_NO_QWS_KEYBOARD
 #define TQT_NO_SYNTAXHIGHLIGHTER
 
 #define TQT_NO_ACCEL
@@ -56,7 +49,6 @@
 
 #define TQT_NO_STYLE
 #define TQT_NO_EFFECTS
-#define TQT_NO_COP
 
 #define TQT_NO_SQL
 
@@ -79,9 +71,6 @@
 #define TQT_NO_WHEELEVENT
 #define TQT_NO_BEZIER
 
-#define TQT_NO_QWS_MOUSE_AUTO
-/* #define TQT_NO_QWS_MOUSE_MANUAL */
-
 #define TQT_NO_IMAGE_DITHER_TO_1
 #define TQT_NO_IMAGE_HEURISTIC_MASK
 #define TQT_NO_IMAGE_MIRROR
@@ -92,5 +81,3 @@
 
 #define TQT_NO_DATESTRING
 #define TQT_NO_WMATRIX
-
-#define TQT_NO_DIRECTPAINTER
diff --git a/src/tools/qconfig-small.h b/src/tools/qconfig-small.h
index f89fb8d1c..d7d08b795 100644
--- a/src/tools/qconfig-small.h
+++ b/src/tools/qconfig-small.h
@@ -14,8 +14,6 @@
 /* #define TQT_NO_IMAGEIO_PNG //done by configure -no-png */
 #define TQT_NO_ASYNC_IO
 #define TQT_NO_ASYNC_IMAGE_IO
-/* #define TQT_NO_FREETYPE //done by configure -no-freetype */
-#define TQT_NO_BDF
 //#define TQT_NO_FONTDATABASE
 #define TQT_NO_TRANSLATION
 #define TQT_NO_MIME
@@ -23,7 +21,6 @@
 #define TQT_NO_PROPERTIES
 #define TQT_NO_SYNTAXHIGHLIGHTER
 
-#define TQT_NO_QWS_GFX_SPEED
 #define TQT_NO_NETWORK /* ?????????????? */
 #define TQT_NO_COLORNAMES
 #define TQT_NO_TRANSFORMATIONS
@@ -37,7 +34,6 @@
 
 #define TQT_NO_TEXTSTREAM
 #define TQT_NO_DATASTREAM
-#define TQT_NO_QWS_SAVEFONTS
 //#define TQT_NO_STRINGLIST
 #define TQT_NO_SESSIONMANAGER
 
@@ -47,9 +43,6 @@
 /* #define TQT_NO_STYLE //will require substantial work... */
 
 #define TQT_NO_EFFECTS
-#define TQT_NO_COP
-
-#define TQT_NO_QWS_PROPERTIES
 
 #define TQT_NO_RANGECONTROL
 #define TQT_NO_SPLITTER
@@ -70,13 +63,6 @@
 #define TQT_NO_PROGRESSBAR
 
 
-#define TQT_NO_QWS_HYDRO_WM_STYLE
-#define TQT_NO_QWS_BEOS_WM_STYLE
-#define TQT_NO_QWS_KDE2_WM_STYLE
-#define TQT_NO_QWS_KDE_WM_STYLE
-#define TQT_NO_QWS_WINDOWS_WM_STYLE
-
-
 /* other widgets that could be removed: */
 /*
 #define TQT_NO_MENUDATA
@@ -87,6 +73,4 @@
 /*
 #define TQT_NO_CURSOR
 #define TQT_NO_LAYOUT
-#define TQT_NO_QWS_MANAGER
-#define TQT_NO_QWS_KEYBOARD
 */
diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt
index b8e085325..6751ce41d 100644
--- a/src/tools/qfeatures.txt
+++ b/src/tools/qfeatures.txt
@@ -390,12 +390,6 @@ Requires:
 Name: Playing sounds
 SeeAlso: ???
 
-Feature: QWS_SOUNDSERVER
-Section: Qt/Embedded-specific
-Requires: SOUND DIR DNS
-Name: Server to play sound
-SeeAlso: ???
-
 Feature: PROPERTIES
 Section: Kernel
 Requires: VARIANT STRINGLIST ICONSET
@@ -444,225 +438,15 @@ Requires: STRINGLIST REGEXP
 Name: External process invocation.
 SeeAlso: ???
 
-Feature: QWS_MULTIPROCESS
-Section: Qt/Embedded-specific
-Requires: NETWORK
-Name: Multi-process architecture
-SeeAlso: ???
-
-Feature: COP
-Section: Networking
-Requires: DATASTREAM
-Name: QCop IPC
-SeeAlso: ???
-
-Feature: QWS_KEYBOARD
-Section: Qt/Embedded-specific
-Requires:
-Name: Console keyboard
-SeeAlso: ???
-
-Feature: QWS_KBD_SL5000
-Section: Qt/Embedded-specific
-Requires: QWS_KEYBOARD
-Name: Keyboard for SHARP Zaurus SL5xxx devices
-SeeAlso: ???
-
-Feature: QWS_CURSOR
-Section: Qt/Embedded-specific
-Requires: CURSOR
-Name: Visible cursor
-SeeAlso: ???
-
-Feature: QWS_ALPHA_CURSOR
-Section: Qt/Embedded-specific
-Requires:
-Name: Alpha-blended cursor
-SeeAlso: ???
-
-Feature: QWS_MACH64
-Section: Qt/Embedded-specific
-Requires:
-Name: Mach64 acceleration
-SeeAlso: ???
-
-Feature: QWS_VOODOO3
-Section: Qt/Embedded-specific
-Requires:
-Name: Voodoo3 acceleration
-SeeAlso: ???
-
-Feature: QWS_MATROX
-Section: Qt/Embedded-specific
-Requires:
-Name: Matrox MGA acceleration
-SeeAlso: ???
-
-Feature: QWS_REPEATER
-Section: Qt/Embedded-specific
-Requires:
-Name: Repeater display
-SeeAlso: ???
-
-Feature: QWS_VFB
-Section: Qt/Embedded-specific
-Requires:
-Name: Virtual frame buffer
-SeeAlso: ???
-
-Feature: QWS_TRANSFORMED
-Section: Qt/Embedded-specific
-Requires: QWS_LINUXFB
-Name: Transformed frame buffer
-SeeAlso: ???
-
-Feature: QWS_LINUXFB
-Section: Qt/Embedded-specific
-Requires:
-Name: Linux framebuffer
-SeeAlso: ???
-
-Feature: QWS_VNC
-Section: Qt/Embedded-specific
-Requires: NETWORK
-Name: Remote frame buffer (VNC)
-SeeAlso: ???
-
-Feature: QWS_SHADOWFB
-Section: Qt/Embedded-specific
-Requires: 
-Name: Shadow frame buffer
-SeeAlso: ???
-
-Feature: QWS_DEPTH_1
-Section: Qt/Embedded-specific
-Requires:
-Name: 1-bit monochrome
-SeeAlso: ???
-
-Feature: QWS_DEPTH_4
-Section: Qt/Embedded-specific
-Requires:
-Name: 4-bit grayscale
-SeeAlso: ???
-
-Feature: QWS_VGA_16
-Section: Qt/Embedded-specific
-Requires:
-Name: 4-bit VGA
-SeeAlso: ???
-
-Feature: QWS_DEPTH_8GRAYSCALE
-Section: Qt/Embedded-specific
-Requires:
-Name: 8-bit grayscale
-SeeAlso: ???
-
-Feature: QWS_DEPTH_8
-Section: Qt/Embedded-specific
-Requires:
-Name: 8-bit color
-SeeAlso: ???
-
-Feature: QWS_DEPTH_16
-Section: Qt/Embedded-specific
-Requires:
-Name: 15 or 16-bit color
-SeeAlso: ???
-
-Feature: QWS_DEPTH_24
-Section: Qt/Embedded-specific
-Requires:
-Name: 24-bit color
-SeeAlso: ???
-
-Feature: QWS_DEPTH_32
-Section: Qt/Embedded-specific
-Requires:
-Name: 32-bit color
-SeeAlso: ???
-
-Feature: QWS_DEPTH_32_BGR
-Section: Qt/Embedded-specific
-Requires: QWS_DEPTH_32
-Name: 32-bit color, BGR order
-SeeAlso: ???
-
-Feature: QWS_MANAGER
-Section: Qt/Embedded-specific
-Requires:
-Name: Window Manager
-SeeAlso: ???
-
-Feature: QWS_KDE2_WM_STYLE
-Section: Qt/Embedded-specific
-Requires: QWS_MANAGER
-Name: The "KDE2" style
-SeeAlso: ???
-
-Feature: QWS_HYDRO_WM_STYLE
-Section: Qt/Embedded-specific
-Requires: QWS_MANAGER
-Name: The "Hydro" style
-SeeAlso: ???
-
-Feature: QWS_BEOS_WM_STYLE
-Section: Qt/Embedded-specific
-Requires: QWS_MANAGER
-Name: The "BeOS" style
-SeeAlso: ???
-
-Feature: QWS_KDE_WM_STYLE
-Section: Qt/Embedded-specific
-Requires: QWS_MANAGER
-Name: The "KDE" style
-SeeAlso: ???
-
-Feature: QWS_WINDOWS_WM_STYLE
-Section: Qt/Embedded-specific
-Requires: QWS_MANAGER
-Name: The "Windows" style
-SeeAlso: ???
-
-Feature: QWS_MOUSE_AUTO
-Section: Qt/Embedded-specific
-Requires:
-Name: Autodetecting mouse driver
-SeeAlso: ???
-
-Feature: QWS_MOUSE_MANUAL
-Section: Qt/Embedded-specific
-Requires:
-Name: Non-autodetecting mouse driver
-SeeAlso: ???
-
-Feature: QWS_SAVEFONTS
-Section: Qt/Embedded-specific
-Requires:
-Name: Saving of fonts
-SeeAlso: ???
-
-Feature: QWS_GFX_SPEED
-Section: Qt/Embedded-specific
-Requires:
-Name: Favour code size over graphics speed
-SeeAlso: ???
-
-Feature: QWS_PROPERTIES
-Section: Qt/Embedded-specific
-Requires:
-Name: Qt/Embedded window system properties.
-SeeAlso: ???
-
 Feature: CLIPBOARD
 Section: Kernel
-Requires: QWS_PROPERTIES MIME
+Requires: MIME
 Name: Cut and paste
 SeeAlso: ???
 
 Feature: DRAGANDDROP
 Section: Kernel
-Requires: MIME QWS_PROPERTIES IMAGEIO_XPM
+Requires: MIME IMAGEIO_XPM
 Name: Drag and drop
 SeeAlso: ???
 
@@ -714,12 +498,6 @@ Requires: STRINGLIST
 Name: Image file text strings
 SeeAlso: ???
 
-Feature: IMAGE_16_BIT
-Section: Qt/Embedded-specific
-Requires: IMAGE_TRUECOLOR
-Name: 16-bit TQImage
-SeeAlso: ???
-
 Feature: CURSOR
 Section: Kernel
 Requires:
@@ -1294,13 +1072,6 @@ Name: TQWidgetPlugin
 SeeAlso: ???
 
 
-Feature: DIRECTPAINTER
-Section: Painting
-Requires:
-Name: QDirectPainter
-SeeAlso: ???
-
-
 Feature: DIALOGBUTTONS
 Section: Widgets
 Requires: LAYOUT STYLE PUSHBUTTON
diff --git a/src/tools/qfileinfo_unix.cpp b/src/tools/qfileinfo_unix.cpp
index aed39e468..0a2036053 100644
--- a/src/tools/qfileinfo_unix.cpp
+++ b/src/tools/qfileinfo_unix.cpp
@@ -45,7 +45,7 @@
 #include "ntqdir.h"
 
 #include <limits.h>
-#if !defined(TQWS) && defined(Q_OS_MAC)
+#if defined(Q_OS_MAC)
 # include <qt_mac.h>
 #endif
 #if defined(Q_OS_HURD)
@@ -104,7 +104,7 @@ bool TQFileInfo::isSymLink() const
 	doStat();
     if(symLink)
         return TRUE;
-#if !defined(TQWS) && defined(Q_OS_MAC)
+#if defined(Q_OS_MAC)
     {
         FSRef fref;
         if(FSPathMakeRef((const UInt8 *)TQFile::encodeName(fn).data(), &fref, NULL) == noErr) {
@@ -167,7 +167,7 @@ TQString TQFileInfo::readLink() const
     }
 #endif /* !PATH_MAX */
 #endif /* Q_OS_UNIX && !Q_OS_OS2EMX */
-#if !defined(TQWS) && defined(Q_OS_MAC)
+#if defined(Q_OS_MAC)
     {
         FSRef fref;
         if(FSPathMakeRef((const UInt8 *)TQFile::encodeName(fn).data(), &fref, NULL) == noErr) {
diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp
index 84b26a6bc..21d433d71 100644
--- a/src/tools/qglobal.cpp
+++ b/src/tools/qglobal.cpp
@@ -165,7 +165,7 @@ bool tqSysInfo( int *wordSize, bool *bigEndian )
     return TRUE;
 }
 
-#if !defined(TQWS) && defined(Q_OS_MAC)
+#if defined(Q_OS_MAC)
 
 #include "qt_mac.h"
 
@@ -861,8 +861,8 @@ TQtMsgHandler qInstallMsgHandler( TQtMsgHandler h )
 
 /*
     Dijkstra's bisection algorithm to find the square root as an integer.
-    Deliberately not exported as part of the TQt API, but used in both
-    qsimplerichtext.cpp and qgfxraster_qws.cpp
+    Deliberately not exported as part of the TQt API, but used in
+    qsimplerichtext.cpp
 */
 unsigned int qt_int_sqrt( unsigned int n )
 {
diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp
index 0714dbb88..d7716a1a7 100644
--- a/src/tools/qlocale.cpp
+++ b/src/tools/qlocale.cpp
@@ -62,7 +62,7 @@
 #    include <fenv.h>
 #endif
 
-#if !defined( TQWS ) && defined( Q_OS_MAC )
+#if defined( Q_OS_MAC )
 #   include <Carbon/Carbon.h>
 #endif
 
@@ -1849,7 +1849,7 @@ const char* TQLocalePrivate::systemLocaleName()
     static TQCString lang;
     lang = getenv( "LANG" );
 
-#if !defined( TQWS ) && defined( Q_OS_MAC )
+#if defined( Q_OS_MAC )
     if ( !lang.isEmpty() )
         return lang;
 
diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp
index ebec81889..250e5623d 100644
--- a/src/tools/qsettings.cpp
+++ b/src/tools/qsettings.cpp
@@ -462,7 +462,7 @@ void TQSettingsHeading::parseLine(TQTextStream &stream)
 TQSettingsPrivate::TQSettingsPrivate( TQSettings::Format format )
     : groupDirty( TRUE ), modified(FALSE), globalScope(TRUE)
 {
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( format != TQSettings::Ini )
 	return;
 #else
@@ -809,7 +809,7 @@ static TQString groupKey( const TQString &group, const TQString &key )
 */
 void TQSettings::insertSearchPath( System s, const TQString &path)
 {
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd ) {
 	d->sysInsertSearchPath( s, path );
 	return;
@@ -832,12 +832,12 @@ void TQSettings::insertSearchPath( System s, const TQString &path)
 	return;
     }
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd && s != Unix ) {
 #else
     if ( s != Unix ) {
 #endif
-#if !defined(TQWS) && defined(Q_OS_MAC)
+#if defined(Q_OS_MAC)
 	if(s != Mac) //mac is respected on the mac as well
 #endif
 	    return;
@@ -878,12 +878,12 @@ void TQSettings::removeSearchPath( System s, const TQString &path)
 	return;
     }
 #endif
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd && s != Unix ) {
 #else
     if ( s != Unix ) {
 #endif
-#if !defined(TQWS) && defined(Q_OS_MAC)
+#if defined(Q_OS_MAC)
 	if(s != Mac) //mac is respected on the mac as well
 #endif
 	    return;
@@ -907,7 +907,7 @@ TQSettings::TQSettings()
     d = new TQSettingsPrivate( Native );
     TQ_CHECK_PTR(d);
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     d->sysd = 0;
     d->sysInit();
 #endif
@@ -927,7 +927,7 @@ TQSettings::TQSettings( Format format )
     d = new TQSettingsPrivate( format );
     TQ_CHECK_PTR(d);
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     d->sysd = 0;
     if ( format == Native )
 	d->sysInit();
@@ -945,7 +945,7 @@ TQSettings::~TQSettings()
 {
     sync();
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd )
 	d->sysClear();
 #endif
@@ -960,7 +960,7 @@ TQSettings::~TQSettings()
 */
 bool TQSettings::sync()
 {
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd )
 	return d->sysSync();
 #endif
@@ -1127,7 +1127,7 @@ bool TQSettings::readBoolEntry(const TQString &key, bool def, bool *ok )
 	return def;
     }
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd )
 	return d->sysReadBoolEntry( grp_key, def, ok );
 #endif
@@ -1179,7 +1179,7 @@ double TQSettings::readDoubleEntry(const TQString &key, double def, bool *ok )
 	return def;
     }
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd )
 	return d->sysReadDoubleEntry( grp_key, def, ok );
 #endif
@@ -1224,7 +1224,7 @@ int TQSettings::readNumEntry(const TQString &key, int def, bool *ok )
 	return def;
     }
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd )
 	return d->sysReadNumEntry( grp_key, def, ok );
 #endif
@@ -1270,7 +1270,7 @@ TQString TQSettings::readEntry(const TQString &key, const TQString &def, bool *o
 	return def;
     }
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd )
 	return d->sysReadEntry( grp_key, def, ok );
 #endif
@@ -1349,7 +1349,7 @@ bool TQSettings::writeEntry(const TQString &key, bool value)
 	return FALSE;
     }
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd )
 	return d->sysWriteEntry( grp_key, value );
 #endif
@@ -1380,7 +1380,7 @@ bool TQSettings::writeEntry(const TQString &key, double value)
 	return FALSE;
     }
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd )
 	return d->sysWriteEntry( grp_key, value );
 #endif
@@ -1410,7 +1410,7 @@ bool TQSettings::writeEntry(const TQString &key, int value)
 	return FALSE;
     }
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd )
 	return d->sysWriteEntry( grp_key, value );
 #endif
@@ -1463,7 +1463,7 @@ bool TQSettings::writeEntry(const TQString &key, const TQString &value)
 	return FALSE;
     }
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd )
 	return d->sysWriteEntry( grp_key, value );
 #endif
@@ -1526,7 +1526,7 @@ bool TQSettings::removeEntry(const TQString &key)
 	return FALSE;
     }
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd )
 	return d->sysRemoveEntry( grp_key );
 #endif
@@ -1606,7 +1606,7 @@ TQStringList TQSettings::entryList(const TQString &key) const
 	return TQStringList();
     }
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd )
 	return d->sysEntryList( grp_key );
 #endif
@@ -1714,7 +1714,7 @@ TQStringList TQSettings::subkeyList(const TQString &key) const
 	return TQStringList();
     }
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd )
 	return d->sysSubkeyList( grp_key );
 #endif
@@ -1809,7 +1809,7 @@ TQDateTime TQSettings::lastModificationTime( const TQString &key )
 	return TQDateTime();
     }
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     if ( d->sysd )
 	return TQDateTime();
 #endif
@@ -2041,7 +2041,7 @@ void TQSettings::setPath( const TQString &domain, const TQString &product, Scope
 #if defined(TQ_WS_WIN)
     actualSearchPath = "/" + domain.mid( 0, lastDot ) + "/" + product;
     insertSearchPath( Windows, actualSearchPath );
-#elif !defined(TQWS) && defined(Q_OS_MAC)
+#elif defined(Q_OS_MAC)
     if(lastDot != -1) {
 	TQString topLevelDomain = domain.right( domain.length() - lastDot - 1 ) + ".";
 	if ( !topLevelDomain.isEmpty() )
diff --git a/src/tools/qsettings_p.h b/src/tools/qsettings_p.h
index 3ffd743d7..75318492d 100644
--- a/src/tools/qsettings_p.h
+++ b/src/tools/qsettings_p.h
@@ -108,7 +108,7 @@ public:
     bool modified :1;
     bool globalScope :1;
 
-#if !defined(TQWS) && (defined(TQ_WS_WIN) || defined(Q_OS_MAC))
+#if defined(TQ_WS_WIN) || defined(Q_OS_MAC)
     // system dependent implementations to use the 
     // system specific setting database (ie. registry on Windows)
 
diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp
index fff59c613..dbf179404 100644
--- a/src/tools/tqstring.cpp
+++ b/src/tools/tqstring.cpp
@@ -6276,9 +6276,6 @@ TQCString TQString::local8Bit() const
     *d->cString = isNull() ? TQCString("") : qt_winTQString2MB( *this );
     return *d->cString;
 #endif
-#ifdef TQ_WS_QWS
-    return utf8(); // ### if there is any 8 bit format supported?
-#endif
 #endif
 }
 
@@ -6325,9 +6322,6 @@ TQString TQString::fromLocal8Bit( const char* local8Bit, int len )
     }
     return qt_winMB2TQString( local8Bit );
 #endif
-#ifdef TQ_WS_QWS
-    return fromUtf8(local8Bit,len);
-#endif
 #endif // TQT_NO_TEXTCODEC
 }