diff options
Diffstat (limited to 'src')
71 files changed, 75 insertions, 2423 deletions
diff --git a/src/codecs/tqtextcodec.cpp b/src/codecs/tqtextcodec.cpp index cf7c6b93..0609ae29 100644 --- a/src/codecs/tqtextcodec.cpp +++ b/src/codecs/tqtextcodec.cpp @@ -1686,16 +1686,9 @@ private: void buildReverseMap(); int forwardIndex; -#ifndef TQ_WS_QWS TQMemArray<unsigned char> *reverseMap; -#endif }; -#ifdef TQ_WS_QWS -static const TQSimpleTextCodec * reverseOwner = 0; -static TQMemArray<unsigned char> * reverseMap = 0; -#endif - #define LAST_MIB 2004 static const struct { @@ -2264,54 +2257,17 @@ static const struct { TQSimpleTextCodec::TQSimpleTextCodec( int i ) : TQTextCodec(), forwardIndex( i ) { -#ifndef TQ_WS_QWS reverseMap = 0; -#endif } TQSimpleTextCodec::~TQSimpleTextCodec() { -#ifndef TQ_WS_QWS delete reverseMap; -#else - if ( reverseOwner == this ) { - delete reverseMap; - reverseMap = 0; - reverseOwner = 0; - } -#endif } void TQSimpleTextCodec::buildReverseMap() { -#ifdef TQ_WS_QWS - if ( reverseOwner != this ) { - int m = 0; - int i = 0; - while( i < 128 ) { - if ( unicodevalues[forwardIndex].values[i] > m && - unicodevalues[forwardIndex].values[i] < 0xfffd ) - m = unicodevalues[forwardIndex].values[i]; - i++; - } - m++; - if ( !reverseMap ) - reverseMap = new TQMemArray<unsigned char>( m ); - if ( m > (int)(reverseMap->size()) ) - reverseMap->resize( m ); - for( i = 0; i < 128 && i < m; i++ ) - (*reverseMap)[i] = (char)i; - for( ;i < m; i++ ) - (*reverseMap)[i] = 0; - for( i=128; i<256; i++ ) { - int u = unicodevalues[forwardIndex].values[i-128]; - if ( u < m ) - (*reverseMap)[u] = (char)(unsigned char)(i); - } - reverseOwner = this; - } -#else if ( !reverseMap ) { TQMemArray<unsigned char> **map = &((TQSimpleTextCodec *)this)->reverseMap; int m = 0; @@ -2334,7 +2290,6 @@ void TQSimpleTextCodec::buildReverseMap() (**map)[u] = (char)(unsigned char)(i); } } -#endif } TQString TQSimpleTextCodec::toUnicode(const char* chars, int len) const @@ -2367,11 +2322,7 @@ TQString TQSimpleTextCodec::toUnicode(const char* chars, int len) const TQCString TQSimpleTextCodec::fromUnicode(const TQString& uc, int& len ) const { -#ifdef TQ_WS_QWS - if ( this != reverseOwner ) -#else if ( !reverseMap ) -#endif ((TQSimpleTextCodec *)this)->buildReverseMap(); if ( len <0 || len > (int)uc.length() ) @@ -2397,11 +2348,7 @@ TQCString TQSimpleTextCodec::fromUnicode(const TQString& uc, int& len ) const void TQSimpleTextCodec::fromUnicode( const TQChar *in, unsigned short *out, int length ) const { -#ifdef TQ_WS_QWS - if ( this != reverseOwner ) -#else if ( !reverseMap ) -#endif ((TQSimpleTextCodec *)this)->buildReverseMap(); unsigned char* rmp = reverseMap->data(); @@ -2416,11 +2363,7 @@ void TQSimpleTextCodec::fromUnicode( const TQChar *in, unsigned short *out, int unsigned short TQSimpleTextCodec::characterFromUnicode(const TQString &str, int pos) const { -#ifdef TQ_WS_QWS - if ( this != reverseOwner ) -#else if ( !reverseMap ) -#endif ((TQSimpleTextCodec *)this)->buildReverseMap(); unsigned short u = str[pos].unicode(); @@ -2431,11 +2374,7 @@ unsigned short TQSimpleTextCodec::characterFromUnicode(const TQString &str, int bool TQSimpleTextCodec::canEncode( TQChar ch ) const { -#ifdef TQ_WS_QWS - if ( this != reverseOwner ) -#else if ( !reverseMap ) -#endif ((TQSimpleTextCodec *)this)->buildReverseMap(); unsigned short u = ch.unicode(); diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp index eba00741..e0bbae0c 100644 --- a/src/dialogs/qmessagebox.cpp +++ b/src/dialogs/qmessagebox.cpp @@ -593,10 +593,8 @@ void TQMessageBox::init( int button0, int button1, int button2 ) "application development.</p>" "<p>TQt provides single-source " "portability across MS Windows, Mac OS X, " - "Linux, and all major commercial Unix variants." - "<br>TQt is also available for embedded devices.</p>" - "<p>TQt is a Trolltech product. " - "See <tt>https://trinitydesktop.org/docs/qt3/</tt> " + "Linux, and all major commercial Unix variants.</p>" + "<p>See <tt>https://trinitydesktop.org/docs/qt3/</tt> " "for more information.</p>" ).arg( TQT_VERSION_STR ); diff --git a/src/embedded/qgfxdriverinterface_p.h b/src/embedded/qgfxdriverinterface_p.h deleted file mode 100644 index 55a3c0b2..00000000 --- a/src/embedded/qgfxdriverinterface_p.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Definition of TQt/Embedded Graphics Driver Interface -** -** Created : 20020211 -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the kernel module of the TQt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** Licensees holding valid TQt Commercial licenses may use this file in -** accordance with the TQt Commercial License Agreement provided with -** the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef TQGFXDRIVERINTERFACE_P_H -#define TQGFXDRIVERINTERFACE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the TQt API. This header file may -// change from version to version without notice, or even be -// removed. -// -// We mean it. -// -// - -#ifndef QT_H -#include <private/qcom_p.h> -#endif // QT_H - -#ifndef TQT_NO_COMPONENT - -// {449EC6C6-DF3E-43E3-9E57-354A3D05AB34} -#ifndef IID_QGfxDriver -#define IID_QGfxDriver TQUuid( 0x449ec6c6, 0xdf3e, 0x43e3, 0x9e, 0x57, 0x35, 0x4a, 0x3d, 0x05, 0xab, 0x34) -#endif - -class TQScreen; - -struct TQ_EXPORT TQGfxDriverInterface : public TQFeatureListInterface -{ - virtual TQScreen* create( const TQString& driver, int displayId ) = 0; -}; - -#endif // TQT_NO_COMPONENT - -#endif // TQGFXDRIVERINTERFACE_P_H diff --git a/src/embedded/qkbddriverinterface_p.h b/src/embedded/qkbddriverinterface_p.h deleted file mode 100644 index 9ab7f0c6..00000000 --- a/src/embedded/qkbddriverinterface_p.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Definition of TQt/Embedded Keyboard Driver Interface -** -** Created : 20020218 -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the kernel module of the TQt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** Licensees holding valid TQt Commercial licenses may use this file in -** accordance with the TQt Commercial License Agreement provided with -** the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef TQKBDDRIVERINTERFACE_P_H -#define TQKBDDRIVERINTERFACE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the TQt API. This header file may -// change from version to version without notice, or even be -// removed. -// -// We mean it. -// -// - -#ifndef QT_H -#include <private/qcom_p.h> -#endif // QT_H - -#ifndef TQT_NO_COMPONENT - -// {C7C838EA-FC3E-4905-92AD-F479E81F1D02} -#ifndef IID_QKbdDriver -#define IID_QKbdDriver TQUuid( 0xc7c838ea, 0xfc3e, 0x4905, 0x92, 0xad, 0xf4, 0x79, 0xe8, 0x1f, 0x1d, 0x02) -#endif - -class TQWSKeyboardHandler; - -struct TQ_EXPORT TQKbdDriverInterface : public TQFeatureListInterface -{ - virtual TQWSKeyboardHandler* create( const TQString& driver, const TQString& device ) = 0; -}; - -#endif // TQT_NO_COMPONENT - -#endif // TQKBDDRIVERINTERFACE_P_H diff --git a/src/embedded/qmousedriverinterface_p.h b/src/embedded/qmousedriverinterface_p.h deleted file mode 100644 index b07cdcde..00000000 --- a/src/embedded/qmousedriverinterface_p.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Definition of TQt/Embedded Mouse Driver Interface -** -** Created : 20020220 -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the kernel module of the TQt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** Licensees holding valid TQt Commercial licenses may use this file in -** accordance with the TQt Commercial License Agreement provided with -** the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef TQMOUSEDRIVERINTERFACE_P_H -#define TQMOUSEDRIVERINTERFACE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the TQt API. This header file may -// change from version to version without notice, or even be -// removed. -// -// We mean it. -// -// - -#ifndef QT_H -#include <private/qcom_p.h> -#endif // QT_H - -#ifndef TQT_NO_COMPONENT - -// {4367CF5A-F7CE-407B-8BB6-DF19AEDA2EBB} -#ifndef IID_QMouseDriver -#define IID_QMouseDriver TQUuid( 0x4367cf5a, 0xf7ce, 0x407b, 0x8b, 0xb6, 0xdf, 0x19, 0xae, 0xda, 0x2e, 0xbb) -#endif - -class TQWSMouseHandler; - -struct TQ_EXPORT TQMouseDriverInterface : public TQFeatureListInterface -{ - virtual TQWSMouseHandler* create( const TQString& driver, const TQString &device ) = 0; -}; - -#endif // TQT_NO_COMPONENT - -#endif // TQMOUSEDRIVERINTERFACE_P_H diff --git a/src/embedded/qt_embedded.pri b/src/embedded/qt_embedded.pri deleted file mode 100644 index 018b2070..00000000 --- a/src/embedded/qt_embedded.pri +++ /dev/null @@ -1,192 +0,0 @@ -# Qt/Embedded Drivers - -embedded { - EMBEDDED_P = embedded - - HEADERS += $$EMBEDDED_P/qgfxdriverinterface_p.h \ - $$EMBEDDED_H/qgfxdriverplugin_qws.h \ - $$EMBEDDED_H/qgfxdriverfactory_qws.h \ - $$EMBEDDED_H/qkbd_qws.h \ - $$EMBEDDED_P/qkbddriverinterface_p.h \ - $$EMBEDDED_H/qkbddriverplugin_qws.h \ - $$EMBEDDED_H/qkbddriverfactory_qws.h \ - $$EMBEDDED_H/qmouse_qws.h \ - $$EMBEDDED_P/qmousedriverinterface_p.h \ - $$EMBEDDED_H/qmousedriverplugin_qws.h \ - $$EMBEDDED_H/qmousedriverfactory_qws.h - - SOURCES += $$EMBEDDED_CPP/qgfxdriverplugin_qws.cpp \ - $$EMBEDDED_CPP/qgfxdriverfactory_qws.cpp \ - $$EMBEDDED_CPP/qkbd_qws.cpp \ - $$EMBEDDED_CPP/qkbddriverplugin_qws.cpp \ - $$EMBEDDED_CPP/qkbddriverfactory_qws.cpp \ - $$EMBEDDED_CPP/qmouse_qws.cpp \ - $$EMBEDDED_CPP/qmousedriverplugin_qws.cpp \ - $$EMBEDDED_CPP/qmousedriverfactory_qws.cpp - -# -# Graphics drivers -# - linux-* { - HEADERS += $$EMBEDDED_H/qgfxlinuxfb_qws.h - SOURCES += $$EMBEDDED_CPP/qgfxlinuxfb_qws.cpp - } - else:DEFINES += TQT_NO_QWS_LINUXFB - - contains( gfx-drivers, tqvfb ) { - HEADERS += $$EMBEDDED_H/qgfxvfb_qws.h - SOURCES += $$EMBEDDED_CPP/qgfxvfb_qws.cpp - } - else:DEFINES += TQT_NO_QWS_VFB - - contains( gfx-drivers, vnc ) { - HEADERS += $$EMBEDDED_H/qgfxvnc_qws.h - SOURCES += $$EMBEDDED_CPP/qgfxvnc_qws.cpp - } - else:DEFINES += TQT_NO_QWS_VNC - - !contains( DEFINES, TQT_NO_QWS_LINUXFB):contains( gfx-drivers, vga16 ) { - HEADERS += $$EMBEDDED_H/qgfxvga16_qws.h - SOURCES += $$EMBEDDED_CPP/qgfxvga16_qws.cpp - } - else:DEFINES += TQT_NO_QWS_VGA16 - - contains( gfx-drivers, transformed ) { - HEADERS += $$EMBEDDED_H/qgfxtransformed_qws.h - SOURCES += $$EMBEDDED_CPP/qgfxtransformed_qws.cpp - } - else:DEFINES += TQT_NO_QWS_TRANSFORMED - - contains( gfx-drivers, snap ) { - exists( $(SCITECH)/include/snap/graphics.h) { - HEADERS += $$EMBEDDED_H/qgfxsnap_qws.h - SOURCES += $$EMBEDDED_CPP/qgfxsnap_qws.cpp - INCLUDEPATH += $(SCITECH)/include - debug:LIBS += -L$(SCITECH)/lib/debug/linux/gcc/x86/so -lpm - else:LIBS += -L$(SCITECH)/lib/release/linux/gcc/x86/so -lpm - } - else { - message("SciTech SNAP SDK is not properly set up! Please make sure the SCITECH") - message("environment variable is pointing to the SciTech SNAP SDK.") - error("Please fix and re-build the makefiles.") - } - } - else:DEFINES += TQT_NO_QWS_SNAP - - contains( gfx-drivers, mach64 ) { - HEADERS += $$EMBEDDED_H/qgfxmach64_qws.h \ - $$EMBEDDED_H/qgfxmach64defs_qws.h - SOURCES += $$EMBEDDED_CPP/qgfxmach64_qws.cpp - } - else:DEFINES += TQT_NO_QWS_MACH64 - - contains( gfx-drivers, voodoo ) { - HEADERS += $$EMBEDDED_H/qgfxvoodoo_qws.h \ - $$EMBEDDED_H/qgfxvoodoodefs_qws.h - SOURCES += $$EMBEDDED_CPP/qgfxvoodoo_qws.cpp - } - else:DEFINES += TQT_NO_QWS_VOODOO3 - - contains( gfx-drivers, matrox ) { - HEADERS += $$EMBEDDED_H/qgfxmatrox_qws.h \ - $$EMBEDDED_H/qgfxmatroxdefs_qws.h - SOURCES += $$EMBEDDED_CPP/qgfxmatrox_qws.cpp - } - else:DEFINES += TQT_NO_QWS_MATROX - - contains( gfx-drivers, shadowfb ) { - HEADERS += $$EMBEDDED_H/qgfxshadow_qws.h - SOURCES += $$EMBEDDED_CPP/qgfxshadow_qws.cpp - } - else:DEFINES += TQT_NO_QWS_SHADOWFB - - contains( gfx-drivers, repeater ) { - HEADERS += $$EMBEDDED_H/qgfxrepeater_qws.h - SOURCES += $$EMBEDDED_CPP/qgfxrepeater_qws.cpp - } - else:DEFINES += TQT_NO_QWS_REPEATER - -# -# Keyboard drivers -# - - contains( kbd-drivers, sl5000 ) { - HEADERS +=$$EMBEDDED_H/qkbdsl5000_qws.h - SOURCES +=$$EMBEDDED_CPP/qkbdsl5000_qws.cpp - !contains( kbd-drivers, tty ) { - kbd-drivers += tty - } - } - else:DEFINES += TQT_NO_QWS_KBD_SL5000 - - contains( kbd-drivers, tty ) { - HEADERS +=$$EMBEDDED_H/qkbdtty_qws.h - SOURCES +=$$EMBEDDED_CPP/qkbdtty_qws.cpp - !contains( kbd-drivers, pc101 ) { - kbd-drivers += pc101 - } - } - else:DEFINES += TQT_NO_QWS_KBD_TTY - - contains( kbd-drivers, usb ) { - HEADERS +=$$EMBEDDED_H/qkbdusb_qws.h - SOURCES +=$$EMBEDDED_CPP/qkbdusb_qws.cpp - !contains( kbd-drivers, pc101 ) { - kbd-drivers += pc101 - } - } - else:DEFINES += TQT_NO_QWS_KBD_USB - - contains( kbd-drivers, pc101 ) { - HEADERS +=$$EMBEDDED_H/qkbdpc101_qws.h - SOURCES +=$$EMBEDDED_CPP/qkbdpc101_qws.cpp - } - else:DEFINES += TQT_NO_QWS_KBD_PC101 - - contains( kbd-drivers, yopy ) { - HEADERS +=$$EMBEDDED_H/qkbdyopy_qws.h - SOURCES +=$$EMBEDDED_CPP/qkbdyopy_qws.cpp - } - else:DEFINES += TQT_NO_QWS_KBD_YOPY - - contains( kbd-drivers, vr41xx ) { - HEADERS +=$$EMBEDDED_H/qkbdvr41xx_qws.h - SOURCES +=$$EMBEDDED_CPP/qkbdvr41xx_qws.cpp - } - else:DEFINES += TQT_NO_QWS_KBD_VR41 - -# -# Mouse drivers -# - - contains( mouse-drivers, pc ) { - HEADERS +=$$EMBEDDED_H/qmousepc_qws.h - SOURCES +=$$EMBEDDED_CPP/qmousepc_qws.cpp - } - else:DEFINES += TQT_NO_QWS_MOUSE_PC - - contains( mouse-drivers, bus ) { - HEADERS +=$$EMBEDDED_H/qmousebus_qws.h - SOURCES +=$$EMBEDDED_CPP/qmousebus_qws.cpp - } - else:DEFINES += TQT_NO_QWS_MOUSE_BUS - - contains( mouse-drivers, linuxtp ) { - HEADERS +=$$EMBEDDED_H/qmouselinuxtp_qws.h - SOURCES +=$$EMBEDDED_CPP/qmouselinuxtp_qws.cpp - } - else:DEFINES += TQT_NO_QWS_MOUSE_LINUXTP - - contains( mouse-drivers, vr41xx ) { - HEADERS +=$$EMBEDDED_H/qmousevr41xx_qws.h - SOURCES +=$$EMBEDDED_CPP/qmousevr41xx_qws.cpp - } - else:DEFINES += TQT_NO_QWS_MOUSE_VR41 - - contains( mouse-drivers, yopy ) { - HEADERS +=$$EMBEDDED_H/qmouseyopy_qws.h - SOURCES +=$$EMBEDDED_CPP/qmouseyopy_qws.cpp - } - else:DEFINES += TQT_NO_QWS_MOUSE_YOPY -} - diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h index a475fb99..9f4c7938 100644 --- a/src/kernel/ntqapplication.h +++ b/src/kernel/ntqapplication.h @@ -57,9 +57,6 @@ class TQEventLoop; #if defined(TQ_WS_X11) class TQIMEvent; #endif -#if defined(TQ_WS_QWS) -class TQWSDecoration; -#endif #ifdef TQT_THREAD_SUPPORT class TQMutex; @@ -247,20 +244,6 @@ public: virtual int x11ClientMessage( TQWidget*, XEvent*, bool passive_only); int x11ProcessEvent( XEvent* ); #endif -#if defined(TQ_WS_QWS) - virtual bool qwsEventFilter( TQWSEvent * ); - int qwsProcessEvent( TQWSEvent* ); - void qwsSetCustomColors( TQRgb *colortable, int start, int numColors ); -/*! - \internal - Returns true if the process is GUI server -*/ - bool qwsIsGUIServer(); -#ifndef TQT_NO_QWS_MANAGER - static TQWSDecoration &qwsDecoration(); - static void qwsSetDecoration( TQWSDecoration *); -#endif -#endif #if defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN) static WindowsVersion winVersion(); @@ -314,11 +297,6 @@ public slots: void closeAllWindows(); void aboutTQt(); -#if defined(TQ_WS_QWS) -protected: - void setArgs(int, char **); -#endif - protected: bool event(TQEvent *); @@ -328,10 +306,6 @@ private: void init_precmdline(); void process_cmdline( int* argcptr, char ** argv ); bool internalNotify( TQObject *, TQEvent * ); -#if defined(TQ_WS_QWS) - static TQWidget *findChildWidget( const TQWidget *p, const TQPoint &pos ); - static TQWidget *findWidget( const TQObjectList&, const TQPoint &, bool rec ); -#endif #if defined(TQ_WS_MAC) bool do_mouse_down(Point *, bool *); @@ -445,9 +419,6 @@ private: #if defined(TQ_WS_WIN) friend bool qt_sendSpontaneousEvent( TQObject*, TQEvent* ); #endif -#if defined(TQ_WS_QWS) - friend class TQInputContext; -#endif private: // Disabled copy constructor and operator= #if defined(TQ_DISABLE_COPY) TQApplication( const TQApplication & ); @@ -475,14 +446,6 @@ inline char **TQApplication::argv() const return app_argv; } -#if defined(TQ_WS_QWS) -inline void TQApplication::setArgs(int c, char **v) -{ - app_argc = c; - app_argv = v; -} -#endif - #ifndef TQT_NO_CURSOR inline TQCursor *TQApplication::overrideCursor() { diff --git a/src/kernel/ntqcursor.h b/src/kernel/ntqcursor.h index d67ed55e..1e9b183f 100644 --- a/src/kernel/ntqcursor.h +++ b/src/kernel/ntqcursor.h @@ -96,8 +96,6 @@ public: TQCursor( HANDLE ); #elif defined(TQ_WS_MAC) HANDLE handle() const; -#elif defined(TQ_WS_QWS) - HANDLE handle() const; #endif static TQPoint pos(); diff --git a/src/kernel/ntqdesktopwidget.h b/src/kernel/ntqdesktopwidget.h index a017b8ac..20126770 100644 --- a/src/kernel/ntqdesktopwidget.h +++ b/src/kernel/ntqdesktopwidget.h @@ -95,9 +95,6 @@ private: #endif friend class TQApplication; -#ifdef TQ_WS_QWS - friend class TQWSDisplay; -#endif }; #endif //TQDESKTOPWIDGET_H diff --git a/src/kernel/ntqfont.h b/src/kernel/ntqfont.h index 08297a18..441b57dd 100644 --- a/src/kernel/ntqfont.h +++ b/src/kernel/ntqfont.h @@ -191,14 +191,7 @@ public: #endif //TQT_NO_STRINGLIST static void initialize(); static void cleanup(); -#ifndef TQ_WS_QWS static void cacheStatistics(); -#endif - -#if defined(TQ_WS_QWS) - void qwsRenderToDisk(bool all=TRUE); -#endif - // a copy of this lives in qunicodetables.cpp, as we can't include // ntqfont.h it in tools/. Do not modify without changing the script diff --git a/src/kernel/ntqfontdatabase.h b/src/kernel/ntqfontdatabase.h index 06807d02..aa279bfd 100644 --- a/src/kernel/ntqfontdatabase.h +++ b/src/kernel/ntqfontdatabase.h @@ -58,10 +58,6 @@ struct TQtFontFamily; struct TQtFontFoundry; struct TQFontDef; class TQFontEngine; -#ifdef TQ_WS_QWS -class TQDiskFont; -#endif - class TQFontDatabasePrivate; class TQ_EXPORT TQFontDatabase @@ -92,10 +88,6 @@ public: static TQString scriptName(TQFont::Script); static TQString scriptSample(TQFont::Script); -#ifdef TQ_WS_QWS - static void qwsAddDiskFont( TQDiskFont *qdf ); -#endif - // For source compatibility with < 3.0 #ifndef TQT_NO_COMPAT diff --git a/src/kernel/ntqfontmetrics.h b/src/kernel/ntqfontmetrics.h index a182a598..88713255 100644 --- a/src/kernel/ntqfontmetrics.h +++ b/src/kernel/ntqfontmetrics.h @@ -46,10 +46,6 @@ #include "ntqrect.h" #endif // QT_H -#ifdef TQ_WS_QWS -class TQFontEngine; -#endif - class TQTextCodec; class TQTextParag; diff --git a/src/kernel/ntqmovie.h b/src/kernel/ntqmovie.h index 9c8d3bf0..8e92ec6d 100644 --- a/src/kernel/ntqmovie.h +++ b/src/kernel/ntqmovie.h @@ -96,11 +96,6 @@ public: void connectUpdate(TQObject* receiver, const char *member); void disconnectUpdate(TQObject* receiver, const char *member=0); -#ifdef TQ_WS_QWS - // Temporary hack - void setDisplayWidget(TQWidget * w); -#endif - enum Status { SourceEmpty=-2, UnrecognizedFormat=-1, Paused=1, diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h index 052fea17..c0c34533 100644 --- a/src/kernel/ntqnamespace.h +++ b/src/kernel/ntqnamespace.h @@ -427,9 +427,8 @@ public: Key_Direction_L = 0x1059, Key_Direction_R = 0x1060, - // International input method support (X keycode - 0xEE00, the - // definition follows TQt/Embedded 2.3.7) Only interesting if - // you are writing your own input method + // International input method support (X keycode - 0xEE00). + // Only interesting if you are writing your own input method // International & multi-key character composition Key_Multi_key = 0x1120, // Multi-key character compose @@ -1013,8 +1012,6 @@ public: typedef void *HANDLE; #elif defined(TQ_WS_X11) typedef unsigned long HANDLE; -#elif defined(TQ_WS_QWS) - typedef void * HANDLE; #endif }; diff --git a/src/kernel/ntqpaintdevice.h b/src/kernel/ntqpaintdevice.h index 8ce90f06..2b9cd421 100644 --- a/src/kernel/ntqpaintdevice.h +++ b/src/kernel/ntqpaintdevice.h @@ -46,11 +46,6 @@ #include "ntqrect.h" #endif // QT_H -#if defined(TQ_WS_QWS) -class TQWSDisplay; -class TQGfx; -#endif - class TQIODevice; class TQString; class TQTextItem; @@ -102,8 +97,6 @@ public: virtual TQt::HANDLE x11RenderHandle() const; #elif defined(TQ_WS_MAC) virtual TQt::HANDLE handle() const; -#elif defined(TQ_WS_QWS) - virtual TQt::HANDLE handle() const; #endif #if defined(TQ_WS_X11) @@ -146,13 +139,6 @@ public: static void x11SetAppDpiY( int, int ); #endif -#if defined(TQ_WS_QWS) - static TQWSDisplay *qwsDisplay(); - virtual unsigned char * scanLine(int) const; - virtual int bytesPerLine() const; - virtual TQGfx * graphicsContext(bool clip_children=TRUE) const; -#endif - enum PDevCmd { PdcNOP = 0, // <void> PdcDrawPoint = 1, // point @@ -230,8 +216,6 @@ protected: CGContextRef ctx; #endif void * hd; -#elif defined(TQ_WS_QWS) - TQt::HANDLE hd; #endif virtual bool cmd( int, TQPainter *, TQPDevCmdParam * ); diff --git a/src/kernel/ntqpainter.h b/src/kernel/ntqpainter.h index 77e3d183..fb73ada5 100644 --- a/src/kernel/ntqpainter.h +++ b/src/kernel/ntqpainter.h @@ -53,7 +53,6 @@ #include "ntqwmatrix.h" #endif // QT_H -class TQGfx; class TQTextCodec; class TQTextParag; class TQPaintDevice; @@ -63,10 +62,6 @@ class TQMacSavedPortInfo; #endif class TQPainterPrivate; -#if defined(TQ_WS_QWS) -class TQScreen; -#endif - class TQ_EXPORT TQPainter : public TQt { public: @@ -82,13 +77,6 @@ public: bool end(); TQPaintDevice *device() const; -#ifdef TQ_WS_QWS - TQGfx * internalGfx(); -#ifdef QT_QWS_EXPERIMENTAL_SCREENPAINTER - bool begin(TQScreen *screen); -#endif -#endif - static void redirect( TQPaintDevice *pdev, TQPaintDevice *replacement ); static TQPaintDevice *redirect( TQPaintDevice *pdev ); @@ -410,10 +398,6 @@ protected: friend const TQRegion &qt_mac_update_painter(TQPainter *, bool); friend class TQFontEngineMac; friend class TQMacPainter; -#elif defined(TQ_WS_QWS) - friend class TQFontEngine; - TQGfx * gfx; - friend void qwsUpdateActivePainters(); #endif friend class TQFontMetrics; friend class TQFontInfo; @@ -711,11 +695,4 @@ inline TQRect TQPainter::boundingRect( int x, int y, int w, int h, int tf, return boundingRect( r, tf, str, len, i ); } -#if defined(TQ_WS_QWS) -inline TQGfx * TQPainter::internalGfx() -{ - return gfx; -} -#endif - #endif // TQPAINTER_H diff --git a/src/kernel/ntqpixmap.h b/src/kernel/ntqpixmap.h index 340e5b7f..0e0e14c4 100644 --- a/src/kernel/ntqpixmap.h +++ b/src/kernel/ntqpixmap.h @@ -48,7 +48,6 @@ #include "ntqnamespace.h" #endif // QT_H -class TQGfx; class TQPixmapPrivate; #if defined(TQ_WS_WIN) @@ -164,13 +163,7 @@ public: void freeCell( bool = FALSE ); #endif -#if defined(TQ_WS_QWS) - virtual TQGfx * graphicsContext(bool clip_children=TRUE) const; - virtual unsigned char * scanLine(int) const; - virtual int bytesPerLine() const; - TQRgb * clut() const; - int numCols() const; -#elif defined(TQ_WS_X11) +#if defined(TQ_WS_X11) static int x11SetDefaultScreen( int screen ); void x11SetScreen( int screen ); #endif @@ -218,13 +211,6 @@ protected: #elif defined(TQ_WS_MAC) ColorTable *clut; TQPixmap *alphapm; -#elif defined(TQ_WS_QWS) - int id; // ### should use TQPaintDevice::hd, since it is there - TQRgb * clut; - int numcols; - int rw; - int rh; - bool hasAlpha; #endif Optimization optim; #if defined(TQ_WS_WIN) diff --git a/src/kernel/ntqprinter.h b/src/kernel/ntqprinter.h index 90070c11..5ec2e179 100644 --- a/src/kernel/ntqprinter.h +++ b/src/kernel/ntqprinter.h @@ -171,7 +171,7 @@ protected: #endif private: -#if defined(TQ_WS_X11) || defined(TQ_WS_QWS) +#if defined(TQ_WS_X11) TQPaintDevice *pdrv; int pid; #endif diff --git a/src/kernel/ntqregion.h b/src/kernel/ntqregion.h index 8de535fa..8ab8966a 100644 --- a/src/kernel/ntqregion.h +++ b/src/kernel/ntqregion.h @@ -102,9 +102,6 @@ public: Region handle() const { if(!data->rgn) updateX11Region(); return data->rgn; } #elif defined(TQ_WS_MAC) RgnHandle handle(bool require_rgn=FALSE) const; -#elif defined(TQ_WS_QWS) - // TQGfx_QWS needs this for region drawing - void * handle() const { return data->rgn; } #endif #ifndef TQT_NO_DATASTREAM @@ -135,8 +132,6 @@ private: uint is_rect:1; TQRect rect; RgnHandle rgn; -#elif defined(TQ_WS_QWS) - void * rgn; #endif bool is_null; } *data; diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h index 46dd439d..5afa96e1 100644 --- a/src/kernel/ntqt.h +++ b/src/kernel/ntqt.h @@ -256,7 +256,6 @@ #include <tqdatatable.h> #include <ntqvbox.h> #include <ntqvbuttongroup.h> -#include <ntqvfbhdr.h> #include <ntqvgroupbox.h> #include <ntqthread.h> #include <ntqwhatsthis.h> @@ -276,14 +275,11 @@ #if defined( QT_MOC_CPP ) || defined( QT_H_CPP ) || defined( Q_OS_MACX ) #include <private/qcom_p.h> #include <private/qucom_p.h> -#include "private/qgfxdriverinterface_p.h" #include "private/qcom_p.h" #include "private/tqimageformatinterface_p.h" #include "private/qisciicodec_p.h" -#include "private/qkbddriverinterface_p.h" #include "private/qlayoutengine_p.h" #include "private/qcomlibrary_p.h" -#include "private/qmousedriverinterface_p.h" #include "private/qeffects_p.h" #include "private/qgpluginmanager_p.h" #include "private/qinternal_p.h" @@ -324,48 +320,6 @@ #include <qwindowsxpstyle.h> #endif -#ifdef TQ_WS_QWS -#include <private/tqtextengine_p.h> -#include "qfontmanager_qws.h" -#include <qfontfactorybdf_qws.h> -#include <qgfxvoodoodefs_qws.h> -#include <qgfxmatroxdefs_qws.h> -#include <qgfxdriverplugin_qws.h> -#include <qkbddriverfactory_qws.h> -#include <qkbddriverplugin_qws.h> -#include <qmousedriverfactory_qws.h> -#include <qmousedriverplugin_qws.h> -#include <qcopchannel_qws.h> -#include <qdirectpainter_qws.h> -#include "qmemorymanager_qws.h" -#include <qmouse_qws.h> -#include <qfontfactoryttf_qws.h> -#ifndef Q_OS_MAC -# include <qsoundqss_qws.h> -#endif -#include "qgfx_qws.h" -#include <qgfxdriverfactory_qws.h> -#include "qwsdisplay_qws.h" -#include "qwssocket_qws.h" -#include "qwsdecoration_qws.h" -#include "qwsutils_qws.h" -#include <qwscursor_qws.h> -#include "qwsmanager_qws.h" -#include "qwsdefaultdecoration_qws.h" -#include <qgfxraster_qws.h> -#include "qwscommand_qws.h" -#include <qwshydrodecoration_qws.h> -#include <qwskde2decoration_qws.h> -#include <qwskdedecoration_qws.h> -#include <qwsbeosdecoration_qws.h> -#include "qwsproperty_qws.h" -#include <qwsregionmanager_qws.h> -#include "qwsevent_qws.h" -#include <qwindowsystem_qws.h> -#include <qwswindowsdecoration_qws.h> -#endif // TQ_WS_QWS - - #ifdef TQ_WS_WCE #include <qpocketpcstyle_wce.h> #endif // TQ_WS_WCE diff --git a/src/kernel/ntqvfbhdr.h b/src/kernel/ntqvfbhdr.h deleted file mode 100644 index 300ace8b..00000000 --- a/src/kernel/ntqvfbhdr.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** TQt/Embedded virtual framebuffer -** -** Created : 20000605 -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the kernel module of the TQt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** Licensees holding valid TQt Commercial licenses may use this file in -** accordance with the TQt Commercial License Agreement provided with -** the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef TQVFBHDR_H -#define TQVFBHDR_H - -#ifndef QT_H -#include "ntqcolor.h" -#include "ntqrect.h" -#endif // QT_H - -#define QT_VFB_MOUSE_PIPE "/tmp/.qtvfb_mouse-%1" -#define QT_VFB_KEYBOARD_PIPE "/tmp/.qtvfb_keyboard-%1" - -struct TQVFbHeader -{ - int width; - int height; - int depth; - int linestep; - int dataoffset; - TQRect update; - bool dirty; - int numcols; - TQRgb clut[256]; -}; - -struct TQVFbKeyData -{ - unsigned int unicode; - unsigned int modifiers; - bool press; - bool repeat; -}; - -#endif diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h index 543df7d4..812bf6f6 100644 --- a/src/kernel/ntqwindowdefs.h +++ b/src/kernel/ntqwindowdefs.h @@ -158,14 +158,6 @@ TQ_EXPORT const char *tqAppClass(); // get application class #endif // TQ_WS_X11 -#if defined(TQ_WS_QWS) - -typedef unsigned long WId; -struct TQWSEvent; -class TQGfx; - -#endif // TQ_WS_QWS - class TQApplication; #if defined(NEEDS_QMAIN) diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index 5ba5f5b2..c6bde72a 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -197,7 +197,6 @@ hasPendingEvents(), notify(), macEventFilter(), - qwsEventFilter(), x11EventFilter(), x11ProcessEvent(), winEventFilter(). @@ -214,7 +213,6 @@ \i colorSpec(), setColorSpec(), - qwsSetCustomColors(). \row \i Text handling @@ -909,10 +907,6 @@ TQApplication::TQApplication( int &argc, char **argv, bool GUIenabled, bool SMen /*! Constructs an application object with \a argc command line arguments in \a argv. - - For TQt/Embedded, passing \c TQApplication::GuiServer for \a type - makes this application the server (equivalent to running with the - -qws option). */ TQApplication::TQApplication( int &argc, char **argv, Type type ) { @@ -1418,8 +1412,6 @@ TQStyle& TQApplication::style() style = "Motif"; // default style for X11 #elif defined(TQ_WS_MAC) style = "Macintosh"; // default style for all Mac's -#elif defined(TQ_WS_QWS) - style = "Compact"; // default style for small devices #endif } app_style = TQStyleFactory::create( style ); @@ -4840,7 +4832,7 @@ void MyApplication::commitData( TQSessionManager& sm ) { Stubbed session management support *****************************************************************************/ #ifndef TQT_NO_SESSIONMANAGER -#if defined( TQT_NO_SM_SUPPORT ) || defined( TQ_WS_WIN ) || defined( TQ_WS_MAC ) || defined( TQ_WS_QWS ) +#if defined( TQT_NO_SM_SUPPORT ) || defined( TQ_WS_WIN ) || defined( TQ_WS_MAC ) class TQSessionManagerData { diff --git a/src/kernel/qclipboard.cpp b/src/kernel/qclipboard.cpp index 0008f9a3..e7768f6b 100644 --- a/src/kernel/qclipboard.cpp +++ b/src/kernel/qclipboard.cpp @@ -209,7 +209,6 @@ TQClipboard::~TQClipboard() *****************************************************************************/ #ifndef TQT_NO_MIMECLIPBOARD -// text handling is done directly in qclipboard_qws, for now /*! \overload diff --git a/src/kernel/qeventloop_glib_p.h b/src/kernel/qeventloop_glib_p.h index f3711b62..cc7a3874 100644 --- a/src/kernel/qeventloop_glib_p.h +++ b/src/kernel/qeventloop_glib_p.h @@ -18,10 +18,6 @@ ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition -** licenses for TQt/Embedded may use this file in accordance with the -** TQt Embedded Commercial License Agreement provided with the Software. -** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** diff --git a/src/kernel/qeventloop_unix_glib.cpp b/src/kernel/qeventloop_unix_glib.cpp index d86ba14f..e65d49bb 100644 --- a/src/kernel/qeventloop_unix_glib.cpp +++ b/src/kernel/qeventloop_unix_glib.cpp @@ -22,10 +22,6 @@ ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition -** licenses for Unix/X11 or for TQt/Embedded may use this file in accordance -** with the TQt Commercial License Agreement provided with the Software. -** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp index 387f75df..1ad9ccf9 100644 --- a/src/kernel/qfont.cpp +++ b/src/kernel/qfont.cpp @@ -1691,17 +1691,13 @@ bool TQFont::fromString(const TQString &descrip) return TRUE; } -#if !defined( TQ_WS_QWS ) /*! \internal Internal function that dumps font cache statistics. */ void TQFont::cacheStatistics() { - - } -#endif // !TQ_WS_QWS @@ -2170,7 +2166,7 @@ bool TQFontMetrics::inFont(TQChar ch) const \sa rightBearing(), minLeftBearing(), width() */ -#if !defined(TQ_WS_WIN) && !defined(TQ_WS_QWS) +#if !defined(TQ_WS_WIN) int TQFontMetrics::leftBearing(TQChar ch) const { TQFont::Script script; @@ -2204,7 +2200,7 @@ int TQFontMetrics::leftBearing(TQChar ch) const \sa leftBearing(), minRightBearing(), width() */ -#if !defined(TQ_WS_WIN) && !defined(TQ_WS_QWS) +#if !defined(TQ_WS_WIN) int TQFontMetrics::rightBearing(TQChar ch) const { TQFont::Script script; @@ -2227,7 +2223,6 @@ int TQFontMetrics::rightBearing(TQChar ch) const #endif // !TQ_WS_WIN -#ifndef TQ_WS_QWS /*! Returns the width in pixels of the first \a len characters of \a str. If \a len is negative (the default), the entire string is @@ -2292,7 +2287,6 @@ int TQFontMetrics::width( const TQString &str, int len ) const #endif return width; } -#endif /*! \fn int TQFontMetrics::width( TQChar ch ) const @@ -2339,7 +2333,6 @@ int TQFontMetrics::width( const TQString &str, int len ) const account. */ -#ifndef TQ_WS_QWS /*! Returns the bounding rectangle of the first \a len characters of \a str, which is the set of pixels the text would cover if drawn @@ -2371,7 +2364,6 @@ TQRect TQFontMetrics::boundingRect( const TQString &str, int len ) const glyph_metrics_t gm = layout.boundingBox( 0, len ); return TQRect( gm.x, gm.y, gm.width, gm.height ); } -#endif /*! Returns the rectangle that is covered by ink if the character @@ -2986,41 +2978,6 @@ TQFontCache::~TQFontCache() instance = 0; } -#ifdef TQ_WS_QWS -void TQFontCache::clear() -{ - { - EngineDataCache::Iterator it = engineDataCache.begin(), - end = engineDataCache.end(); - while ( it != end ) { - TQFontEngineData *data = it.data(); - if ( data->engine ) - data->engine->deref(); - data->engine = 0; - ++it; - } - } - - EngineCache::Iterator it = engineCache.begin(), - end = engineCache.end(); - while ( it != end ) { - if ( it.data().data->count == 0 ) { - if ( --it.data().data->cache_count == 0 ) { - FC_DEBUG("TQFontCache::~TQFontCache: deleting engine %p key=(%d / %d %d %d %d %d)", - it.data().data, it.key().script, it.key().def.pointSize, - it.key().def.pixelSize, it.key().def.weight, it.key().def.italic, - it.key().def.fixedPitch); - delete it.data().data; - } - } else { - FC_DEBUG("TQFontCache::~TQFontCache: engine = %p still has refcount %d", - it.data().data, it.data().data->count); - } - ++it; - } -} -#endif - TQFontEngineData *TQFontCache::findEngineData( const Key &key ) const { EngineDataCache::ConstIterator it = engineDataCache.find( key ), @@ -3107,7 +3064,7 @@ void TQFontCache::decreaseCost( uint cost ) cost, total_cost, max_cost ); } -#if defined(TQ_WS_WIN ) || defined (TQ_WS_QWS) +#if defined(TQ_WS_WIN ) void TQFontCache::cleanupPrinterFonts() { FC_DEBUG( "TQFontCache::cleanupPrinterFonts" ); diff --git a/src/kernel/qfontdata_p.h b/src/kernel/qfontdata_p.h index 991b6177..1aae9b76 100644 --- a/src/kernel/qfontdata_p.h +++ b/src/kernel/qfontdata_p.h @@ -201,9 +201,6 @@ public: TQFontCache(); ~TQFontCache(); -#ifdef TQ_WS_QWS - void clear(); -#endif // universal key structure. TQFontEngineDatas and TQFontEngines are cached using // the same keys struct Key { @@ -259,7 +256,7 @@ public: TQFontEngine *findEngine( const Key &key ); void insertEngine( const Key &key, TQFontEngine *engine ); -#if defined(TQ_WS_WIN) || defined(TQ_WS_QWS) +#if defined(TQ_WS_WIN) void cleanupPrinterFonts(); #endif diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp index 152b6f25..41aa2543 100644 --- a/src/kernel/qfontdatabase.cpp +++ b/src/kernel/qfontdatabase.cpp @@ -334,7 +334,7 @@ struct TQtFontFamily #ifdef TQ_WS_WIN scriptCheck( FALSE ), #endif -#if defined(Q_OS_MAC) && !defined(TQWS) +#if defined(Q_OS_MAC) fixedPitchComputed(FALSE), #endif fullyLoaded( FALSE ), @@ -357,7 +357,7 @@ struct TQtFontFamily #ifdef TQ_WS_WIN bool scriptCheck : 1; #endif -#if defined(Q_OS_MAC) && !defined(TQWS) +#if defined(Q_OS_MAC) bool fixedPitchComputed : 1; #endif bool fullyLoaded : 1; @@ -654,8 +654,6 @@ static TQFontDatabasePrivate *db=0; # include "qfontdatabase_mac.cpp" #elif defined( TQ_WS_WIN ) # include "qfontdatabase_win.cpp" -#elif defined( TQ_WS_QWS ) -# include "qfontdatabase_qws.cpp" #endif static TQtFontStyle *bestStyle(TQtFontFoundry *foundry, const TQtFontStyle::Key &styleKey) @@ -1578,7 +1576,7 @@ bool TQFontDatabase::isFixedPitch(const TQString &family, load( familyName ); TQtFontFamily *f = d->family( familyName ); -#if defined(Q_OS_MAC) && !defined(TQWS) +#if defined(Q_OS_MAC) if (f) { if (!f->fixedPitchComputed) { TQFontMetrics fm(familyName); diff --git a/src/kernel/qfontengine_p.h b/src/kernel/qfontengine_p.h index 9e3c3126..7d0db28c 100644 --- a/src/kernel/qfontengine_p.h +++ b/src/kernel/qfontengine_p.h @@ -80,9 +80,6 @@ public: // Apple MacOS types Mac, - - // Trolltech TQWS types - TQWS }; TQFontEngine() { @@ -162,71 +159,6 @@ public: TransformedFont *transformed_fonts; #endif }; -#elif defined( TQ_WS_QWS ) -class TQGfx; - -class TQFontEngine : public TQShared -{ -public: - TQFontEngine( const TQFontDef&, const TQPaintDevice * = 0 ); - ~TQFontEngine(); - /*TQMemoryManager::FontID*/ void *handle() const; - - enum Type { - // X11 types - Box, - XLFD, - Xft, - - // MS Windows types - Win, - Uniscribe, - - // Apple MacOS types - Mac, - - // Trolltech TQWS types - Qws - }; - - enum TextFlags { - Underline = 0x01, - Overline = 0x02, - StrikeOut = 0x04 - }; - - enum Error { - NoError, - OutOfMemory - }; - /* returns 0 as glyph index for non existant glyphs */ - Error stringToCMap( const TQChar *str, int len, glyph_t *glyphs, advance_t *advances, int *nglyphs, bool mirrored ) const; - - void draw( TQPainter *p, int x, int y, const TQTextEngine *engine, const TQScriptItem *si, int textFlags ); - - glyph_metrics_t boundingBox( const glyph_t *glyphs, - const advance_t *advances, const qoffset_t *offsets, int numGlyphs ); - glyph_metrics_t boundingBox( glyph_t glyph ); - - int ascent() const; - int descent() const; - int leading() const; - int maxCharWidth() const; - int minLeftBearing() const; - int minRightBearing() const; - int underlinePosition() const; - int lineThickness() const; - - Type type() { return Qws; } - - bool canRender( const TQChar *string, int len ); - inline const char *name() const { return 0; } - TQFontDef fontDef; - /*TQMemoryManager::FontID*/ void *id; - int cache_cost; - int cache_count; - int scale; -}; #endif // WIN || X11 || MAC diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp index 7f9760c4..d9621b99 100644 --- a/src/kernel/qinputcontext.cpp +++ b/src/kernel/qinputcontext.cpp @@ -520,8 +520,6 @@ void TQInputContext::sendIMEventInternal( TQEvent::Type type, #if defined(TQ_WS_X11) receiver = d->composingWidget; -#elif defined(TQ_WS_QWS) - // just a placeholder #endif if ( ! receiver ) return; @@ -702,10 +700,6 @@ void TQInputContext::setMicroFocus( int x, int y, int w, int h, TQFont *f ) TQEvent::MouseButtonRelease or \c TQEvent::MouseButtonDblClick or \c TQEvent::MouseButtonMove. Refer \a button and \a state to determine what operation has performed. - - The method interface is imported from - TQWSInputMethod::mouseHandler() of TQt/Embedded 2.3.7 and extended - for desktop system. */ void TQInputContext::mouseHandler( int x, TQEvent::Type type, TQt::ButtonState button, @@ -828,8 +822,7 @@ TQPtrList<TQInputContextMenu> *TQInputContext::menus() text widgets to add the submenus to its own context menu. If you want to insert the submenus in more flexible way, use TQInputContext::menus() manually. \a popup is not restricted to - context menu of a text widget. For example, the owner may be a - input method menu of TQtopia taskbar in TQt/Embedded platform. + context menu of a text widget. \sa menus(), TQInputContextMenu::Action */ diff --git a/src/kernel/qinputcontext_p.h b/src/kernel/qinputcontext_p.h index 88cff048..98466003 100644 --- a/src/kernel/qinputcontext_p.h +++ b/src/kernel/qinputcontext_p.h @@ -70,10 +70,6 @@ class TQString; #include "qt_windows.h" #endif -#ifdef TQ_WS_QWS -class TQWSIMEvent; -#endif - class TQInputContext { public: @@ -98,14 +94,6 @@ public: TQMemArray<bool> selectedChars; #endif // TQ_WS_X11 -#ifdef TQ_WS_QWS - static void translateIMEvent( TQWSIMEvent *, TQWidget * ); - static void reset(); -private: - static TQWidget* focusWidget; - static TQString* composition; -#endif //TQ_WS_QWS - #ifdef TQ_WS_WIN static void init(); static void shutdown(); diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp index 87cf5694..389c7236 100644 --- a/src/kernel/qinternal.cpp +++ b/src/kernel/qinternal.cpp @@ -74,8 +74,8 @@ bool TQSharedDoubleBuffer::dblbufr = TRUE; */ static const int hardLimitWidth = -1; static const int hardLimitHeight = -1; -#if defined( TQ_WS_QWS ) || defined( TQ_WS_MAC9 ) -// Small in TQt/Embedded / Mac9 - 5K on 32bpp +#if defined( TQ_WS_MAC9 ) +// Small in Mac9 - 5K on 32bpp static const int sharedLimitWidth = 64; static const int sharedLimitHeight = 20; #else diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp index 8a8ac86b..add0df9e 100644 --- a/src/kernel/qkeysequence.cpp +++ b/src/kernel/qkeysequence.cpp @@ -474,7 +474,7 @@ int TQKeySequence::decodeString( const TQString& str ) TQString TQKeySequence::encodeString( int key ) { TQString s; -#if defined(Q_OS_MAC) && !defined(TQWS) +#if defined(Q_OS_MAC) // On MAC the order is Meta, Alt, Shift, Control. if ( (key & META) == META ) s += TQMAC_META; diff --git a/src/kernel/qlock.cpp b/src/kernel/qlock.cpp deleted file mode 100644 index 948e7602..00000000 --- a/src/kernel/qlock.cpp +++ /dev/null @@ -1,298 +0,0 @@ -/**************************************************************************** -** -** Definition of TQLock class. This manages interprocess locking -** -** Created : 20000406 -** -** Copyright (C) 2000-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the kernel module of the TQt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** Licensees holding valid TQt Commercial licenses may use this file in -** accordance with the TQt Commercial License Agreement provided with -** the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#include "qlock_p.h" - -#ifndef TQT_NO_QWS_MULTIPROCESS - -#include <unistd.h> -#include <sys/types.h> -#if defined(Q_OS_MACX) -#define Q_NO_SEMAPHORE -#include <sys/stat.h> -#include <sys/file.h> -#else -#define _WANT_SEMUN -#include <sys/sem.h> -#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \ - || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_BSDI) -/* union semun is defined by including <sys/sem.h> */ -#else -/* according to X/OPEN we have to define it ourselves */ -union semun { - int val; /* value for SETVAL */ - struct semid_ds *buf; /* buffer for IPC_STAT, IPC_SET */ - unsigned short *array; /* array for GETALL, SETALL */ -}; -#endif -#endif -#include <sys/ipc.h> -#include <string.h> -#include <errno.h> - -#define MAX_LOCKS 200 // maximum simultaneous read locks - -class TQLockData -{ -public: -#ifdef Q_NO_SEMAPHORE - TQCString file; -#endif - int id; - int count; - bool owned; -}; - -#endif - -/*! - \class TQLock qlock_p.h - \brief The TQLock class is a wrapper for a System V shared semaphore. - - \ingroup qws - \ingroup io - - \internal - - It is used by TQt/Embedded for synchronizing access to the graphics - card and shared memory region between processes. -*/ - -/*! - \enum TQLock::Type - - \value Read - \value Write -*/ - -/*! - \fn TQLock::TQLock( const TQString &filename, char id, bool create ) - - Creates a lock. \a filename is the file path of the Unix-domain - socket the TQt/Embedded client is using. \a id is the name of the - particular lock to be created on that socket. If \a create is TRUE - the lock is to be created (as the TQt/Embedded server does); if \a - create is FALSE the lock should exist already (as the TQt/Embedded - client expects). -*/ - -TQLock::TQLock( const TQString &filename, char id, bool create ) -{ -#ifndef TQT_NO_QWS_MULTIPROCESS - data = new TQLockData; - data->count = 0; -#ifdef Q_NO_SEMAPHORE - data->file = TQString(filename+id).local8Bit(); - for(int x = 0; x < 2; x++) { - data->id = open(data->file, O_RDWR | (x ? O_CREAT : 0), S_IRWXU); - if(data->id != -1 || !create) { - data->owned = x; - break; - } - } -#else - key_t semkey = ftok(filename, id); - data->id = semget(semkey,0,0); - data->owned = create; - if ( create ) { - semun arg; arg.val = 0; - if ( data->id != -1 ) - semctl(data->id,0,IPC_RMID,arg); - data->id = semget(semkey,1,IPC_CREAT|0600); - arg.val = MAX_LOCKS; - semctl(data->id,0,SETVAL,arg); - } -#endif - if ( data->id == -1 ) { - tqWarning( "Cannot %s semaphore %s \'%c\'", - create ? "create" : "get", filename.latin1(), id ); - tqDebug("Error %d %s\n",errno,strerror(errno)); - } -#endif -} - -/*! - \fn TQLock::~TQLock() - - Destroys a lock -*/ - -TQLock::~TQLock() -{ -#ifndef TQT_NO_QWS_MULTIPROCESS - if ( locked() ) - unlock(); -#ifdef Q_NO_SEMAPHORE - if(isValid()) { - close(data->id); - if( data->owned ) - unlink( data->file ); - } -#else - if(data->owned) { - semun arg; arg.val = 0; - semctl( data->id, 0, IPC_RMID, arg ); - } -#endif - delete data; -#endif -} - -/*! - \fn bool TQLock::isValid() const - - Returns TRUE if the lock constructor was succesful; returns FALSE if - the lock could not be created or was not available to connect to. -*/ - -bool TQLock::isValid() const -{ -#ifndef TQT_NO_QWS_MULTIPROCESS - return (data->id != -1); -#else - return TRUE; -#endif -} - -/*! - Locks the semaphore with a lock of type \a t. Locks can either be - \c Read or \c Write. If a lock is \c Read, attempts by other - processes to obtain \c Read locks will succeed, and \c Write - attempts will block until the lock is unlocked. If locked as \c - Write, all attempts to lock by other processes will block until - the lock is unlocked. Locks are stacked: i.e. a given TQLock can be - locked multiple times by the same process without blocking, and - will only be unlocked after a corresponding number of unlock() - calls. -*/ - -void TQLock::lock( Type t ) -{ -#ifndef TQT_NO_QWS_MULTIPROCESS - if ( !data->count ) { -#ifdef Q_NO_SEMAPHORE - int op = LOCK_SH; - if(t == Write) - op = LOCK_EX; - for( int rv=1; rv; ) { - rv = flock(data->id, op); - if (rv == -1 && errno != EINTR) - tqDebug("Semop lock failure %s",strerror(errno)); - } -#else - sembuf sops; - sops.sem_num = 0; - sops.sem_flg = SEM_UNDO; - - if ( t == Write ) { - sops.sem_op = -MAX_LOCKS; - type = Write; - } else { - sops.sem_op = -1; - type = Read; - } - - int rv; - do { - rv = semop(data->id,&sops,1); - if (rv == -1 && errno != EINTR) - tqDebug("Semop lock failure %s",strerror(errno)); - } while ( rv == -1 && errno == EINTR ); -#endif - } - data->count++; -#endif -} - -/*! - \fn void TQLock::unlock() - - Unlocks the semaphore. If other processes were blocking waiting to - lock() the semaphore, one of them will wake up and succeed in - lock()ing. -*/ - -void TQLock::unlock() -{ -#ifndef TQT_NO_QWS_MULTIPROCESS - if( data->count ) { - data->count--; - if( !data->count ) { -#ifdef Q_NO_SEMAPHORE - for( int rv=1; rv; ) { - rv = flock(data->id, LOCK_UN); - if (rv == -1 && errno != EINTR) - tqDebug("Semop lock failure %s",strerror(errno)); - } -#else - sembuf sops; - sops.sem_num = 0; - sops.sem_op = 1; - sops.sem_flg = SEM_UNDO; - if ( type == Write ) - sops.sem_op = MAX_LOCKS; - - int rv; - do { - rv = semop(data->id,&sops,1); - if (rv == -1 && errno != EINTR) - tqDebug("Semop unlock failure %s",strerror(errno)); - } while ( rv == -1 && errno == EINTR ); -#endif - } - } else { - tqDebug("Unlock without corresponding lock"); - } -#endif -} - -/*! - \fn bool TQLock::locked() const - - Returns TRUE if the lock is currently held by the current process; - otherwise returns FALSE. -*/ - -bool TQLock::locked() const -{ -#ifndef TQT_NO_QWS_MULTIPROCESS - return (data->count > 0); -#else - return FALSE; -#endif -} diff --git a/src/kernel/qlock_p.h b/src/kernel/qlock_p.h deleted file mode 100644 index 53d0ddbf..00000000 --- a/src/kernel/qlock_p.h +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** -** Definition of TQLock class. This manages interprocess locking -** -** Created : 20000406 -** -** Copyright (C) 2000-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the kernel module of the TQt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** Licensees holding valid TQt Commercial licenses may use this file in -** accordance with the TQt Commercial License Agreement provided with -** the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef TQLOCK_P_H -#define TQLOCK_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the TQt API. This header file may -// change from version to version without notice, or even be -// removed. -// -// We mean it. -// -// - -#ifndef QT_H -#include "tqstring.h" -#endif // QT_H - -class TQLockData; - -class TQLock -{ -public: - TQLock( const TQString &filename, char id, bool create = FALSE ); - ~TQLock(); - - enum Type { Read, Write }; - - bool isValid() const; - void lock( Type type ); - void unlock(); - bool locked() const; - -private: - Type type; - TQLockData *data; -}; - - -// Nice class for ensuring the lock is released. -// Just create one on the stack and the lock is automatically released -// when TQLockHolder is destructed. -class TQLockHolder -{ -public: - TQLockHolder( TQLock *l, TQLock::Type type ) : qlock(l) { - qlock->lock( type ); - } - ~TQLockHolder() { if ( locked() ) qlock->unlock(); } - - void lock( TQLock::Type type ) { qlock->lock( type ); } - void unlock() { qlock->unlock(); } - bool locked() const { return qlock->locked(); } - -private: - TQLock *qlock; -}; - -#endif - diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp index cccfff43..d52f662a 100644 --- a/src/kernel/qmovie.cpp +++ b/src/kernel/qmovie.cpp @@ -52,10 +52,6 @@ #ifndef TQT_NO_MOVIE -#ifdef TQ_WS_QWS -#include "qgfx_qws.h" -#endif - #include "ntqasyncio.h" #include "ntqasyncimageio.h" @@ -396,28 +392,6 @@ void TQMoviePrivate::updatePixmapFromImage(const TQPoint& off, copyBlt( &mypixmap, area.left(), area.top(), &lines, off.x(), off.y(), area.width(), area.height() ); } - -#ifdef TQ_WS_QWS - if(display_widget) { - TQGfx * mygfx=display_widget->graphicsContext(); - if(mygfx) { - double xscale,yscale; - xscale=display_widget->width(); - yscale=display_widget->height(); - xscale=xscale/((double)mypixmap.width()); - yscale=yscale/((double)mypixmap.height()); - double xh,yh; - xh=xscale*((double)area.left()); - yh=yscale*((double)area.top()); - mygfx->setSource(&mypixmap); - mygfx->setAlphaType(TQGfx::IgnoreAlpha); - mygfx->stretchBlt(0,0,display_widget->width(), - display_widget->height(),mypixmap.width(), - mypixmap.height()); - delete mygfx; - } - } -#endif } void TQMoviePrivate::showChanges() @@ -679,16 +653,6 @@ void TQMovie::pushData(const uchar* data, int length) d->receive(data,length); } -#ifdef TQ_WS_QWS // ##### Temporary performance experiment -/*! - \internal -*/ -void TQMovie::setDisplayWidget(TQWidget * w) -{ - d->display_widget=w; -} -#endif - /*! Constructs a TQMovie that reads an image sequence from the given data source, \a src. The source must be allocated dynamically, diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp index 82840cc2..47d2af11 100644 --- a/src/kernel/qpainter.cpp +++ b/src/kernel/qpainter.cpp @@ -51,9 +51,6 @@ #include "qrichtext_p.h" #include "ntqregexp.h" #include "ntqcleanuphandler.h" -#ifdef TQ_WS_QWS -#include "qgfx_qws.h" -#endif #include <string.h> #include "tqtextlayout_p.h" @@ -243,12 +240,6 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack; */ /*! - \fn TQGfx * TQPainter::internalGfx() - - \internal -*/ - -/*! \enum TQPainter::CoordinateMode \value CoordDevice \value CoordPainter @@ -325,8 +316,6 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack; \value NorROP dst = NOT (src OR dst) By far the most useful ones are \c CopyROP and \c XorROP. - - On TQt/Embedded, only \c CopyROP, \c XorROP, and \c NotROP are supported. */ /*! @@ -2253,7 +2242,7 @@ TQRegion TQPainter::clipRegion( CoordinateMode m ) const */ -#if !defined(TQ_WS_X11) && !defined(TQ_WS_QWS) && !defined(TQ_WS_MAC) +#if !defined(TQ_WS_X11) && !defined(TQ_WS_MAC) // The doc and X implementation of this functions is in qpainter_x11.cpp void TQPainter::drawWinFocusRect( int, int, int, int, bool, const TQColor & ) @@ -2343,9 +2332,6 @@ void TQPainter::drawPixmap( const TQRect &r, const TQPixmap &pm ) #if defined(TQ_WS_WIN) if ( !pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ) || !hdc ) return; -#elif defined(TQ_WS_QWS) - pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ); - return; #elif defined(TQ_WS_MAC) if ( !pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ) || !pdev->handle()) return; @@ -2417,41 +2403,6 @@ void TQPainter::drawImage( int x, int y, const TQImage & image, int sx, int sy, int sw, int sh, int conversionFlags ) { -#ifdef TQ_WS_QWS - //### Hackish -# ifndef TQT_NO_TRANSFORMATIONS - if ( !image.isNull() && gfx && - (txop==TxNone||txop==TxTranslate) && !testf(ExtDev) ) -# else - if ( !image.isNull() && gfx && !testf(ExtDev) ) -# endif - { - if(sw<0) - sw=image.width(); - if(sh<0) - sh=image.height(); - - TQImage image2 = qt_screen->mapToDevice( image ); - - // This is a bit dubious - if(image2.depth()==1) { - image2.setNumColors( 2 ); - image2.setColor( 0, tqRgb(255,255,255) ); - image2.setColor( 1, tqRgb(0,0,0) ); - } - if ( image2.hasAlphaBuffer() ) - gfx->setAlphaType(TQGfx::InlineAlpha); - else - gfx->setAlphaType(TQGfx::IgnoreAlpha); - gfx->setSource(&image2); - if ( testf(VxF|WxF) ) { - map( x, y, &x, &y ); - } - gfx->blt(x,y,sw,sh,sx,sy); - return; - } -#endif - if ( !isActive() || image.isNull() ) return; @@ -2491,9 +2442,6 @@ void TQPainter::drawImage( int x, int y, const TQImage & image, #if defined(TQ_WS_WIN) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !hdc ) return; -#elif defined (TQ_WS_QWS) - pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ); - return; #elif defined(TQ_WS_MAC) if(!pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !pdev->handle() ) return; @@ -2550,9 +2498,6 @@ void TQPainter::drawImage( const TQRect &r, const TQImage &i ) #if defined(TQ_WS_WIN) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !hdc ) return; -#elif defined(TQ_WS_QWS) - pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ); - return; #elif defined(TQ_WS_MAC) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !pdev->handle() ) return; @@ -2791,9 +2736,6 @@ void TQPainter::drawText( const TQRect &r, int tf, this, param) || !hdc ) return; // TQPrinter wants PdcDrawText2 -#elif defined(TQ_WS_QWS) - pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param); - return; #elif defined(TQ_WS_MAC) if ( !pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param) || !pdev->handle()) @@ -3045,7 +2987,7 @@ void qt_format_text( const TQFont& font, const TQRect &_r, textFlags |= TQt::Underline; cUlChar++; } -#if defined(TQ_WS_X11) || defined(TQ_WS_QWS) +#if defined(TQ_WS_X11) if ( painter->bg_mode == TQt::OpaqueMode ) { int h = ti.ascent() + ti.descent() + 1; if (ti.y() + h < height) diff --git a/src/kernel/qprinter_unix.cpp b/src/kernel/qprinter_unix.cpp index 3fed326c..c5d61382 100644 --- a/src/kernel/qprinter_unix.cpp +++ b/src/kernel/qprinter_unix.cpp @@ -126,11 +126,7 @@ TQPrinter::TQPrinter( PrinterMode m ) paper_source = OnlyOne; switch ( m ) { case ScreenResolution: -#ifdef TQ_WS_QWS - res = 72; -#else res = TQPaintDevice::x11AppDpiY(); -#endif break; case Compatible: case PrinterResolution: diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp index 22acd983..943cefff 100644 --- a/src/kernel/qpsprinter.cpp +++ b/src/kernel/qpsprinter.cpp @@ -95,7 +95,7 @@ #endif #endif -#if defined( TQ_WS_X11 ) || defined (TQ_WS_QWS) +#if defined( TQ_WS_X11 ) #include "qfontdata_p.h" #include "qfontengine_p.h" #include "tqtextlayout_p.h" @@ -2439,9 +2439,6 @@ void TQPSPrinterFontTTF::drawText( TQTextStream &stream, const TQPoint &p, TQTex // This helps us get arabic for XLFD fonts working. In that case we have a Unicode // cmap (== 0), and the glyphs array contains the shaped string. bool useGlyphAsUnicode = (type == TQFontEngine::XLFD && si.fontEngine->cmap() == 0); -#else // TQ_WS_QWS - const bool glyphIndices = FALSE; - const bool useGlyphAsUnicode = TRUE; #endif stream << "<"; if ( si.analysis.bidiLevel % 2 ) { @@ -4916,7 +4913,6 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate enum { NONE, PFB, PFA, TTF } type = NONE; TQFontEngine *engine = f.d->engineForScript( (TQFont::Script) script ); - // ### implement similar code for TQWS and WIN xfontname = makePSFontName( engine ); #if defined( TQ_WS_X11 ) @@ -6165,11 +6161,7 @@ void TQPSPrinterPrivate::flushPage( bool last ) if ( buffer && // ( last || pagesInBuffer++ > -1 || // ( pagesInBuffer > 4 && buffer->size() > 262144 ) ) ) -#ifdef TQ_WS_QWS - (last || buffer->size() > 2000000) // embedded is usually limited in memory -#else (last || buffer->size() > 50000000) -#endif ) { // tqDebug("emiting header at page %d", pageCount ); emitHeader( last ); diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp index 7662a168..30d0fe9c 100644 --- a/src/kernel/qregion_x11.cpp +++ b/src/kernel/qregion_x11.cpp @@ -2803,8 +2803,6 @@ TQMemArray<TQRect> TQRegion::rects() const <li> The rectangles must be sorted ascendingly by Y as the major sort key and X as the minor sort key. </ul> - \internal - Only some platforms have that restriction (TQWS and X11). */ void TQRegion::setRects( const TQRect *rects, int num ) { diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp index 1d962642..2e7103ae 100644 --- a/src/kernel/qrichtext.cpp +++ b/src/kernel/qrichtext.cpp @@ -102,8 +102,6 @@ static inline int scale( int value, TQPainter *painter ) ReleaseDC( 0, hdc ); #elif defined (TQ_WS_MAC) value = value * metrics.logicalDpiY() / 75; // ##### FIXME -#elif defined (TQ_WS_QWS) - value = value * metrics.logicalDpiY() / 75; #endif } return value; diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp index 5e18dad5..0dd19f3c 100644 --- a/src/kernel/qscriptengine.cpp +++ b/src/kernel/qscriptengine.cpp @@ -1619,6 +1619,4 @@ static bool arabic_shape(TQShaperItem *item) # include "qscriptengine_win.cpp" #elif defined(TQ_WS_MAC) # include "qscriptengine_mac.cpp" -#elif defined(TQ_WS_QWS) -# include "qscriptengine_qws.cpp" #endif diff --git a/src/kernel/qsharedmemory_p.cpp b/src/kernel/qsharedmemory_p.cpp deleted file mode 100644 index 9a5fa38b..00000000 --- a/src/kernel/qsharedmemory_p.cpp +++ /dev/null @@ -1,169 +0,0 @@ -/**************************************************************************** -** -** Provides a standardised interface to shared memory -** -** Created : 020124 -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the kernel module of the TQt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** Licensees holding valid TQt Commercial licenses may use this file in -** accordance with the TQt Commercial License Agreement provided with -** the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#include "qsharedmemory_p.h" - -#if !defined(QT_QWS_NO_SHM) - -#if defined(QT_POSIX_QSHM) -#include <fcntl.h> -#include <sys/mman.h> - -TQSharedMemory::TQSharedMemory (int size, TQString filename, char c ) -{ - shmSize = size; - shmFile = filename; - character = c; - shmFile.append(c); -} - -bool TQSharedMemory::create () -{ - shmFD = shm_open (shmFile.latin1 (), O_RDWR | O_EXCL | O_CREAT, 0666); - if (shmFD == -1) - return FALSE; - else if (ftruncate (shmFD, shmSize) == -1) - { - close (shmFD); - return FALSE; - } - - return TRUE; -} - -void TQSharedMemory::destroy () -{ - shm_unlink (shmFile.latin1 ()); -} - -bool TQSharedMemory::attach () -{ - shmBase = mmap (0, shmSize, PROT_READ | PROT_WRITE, MAP_SHARED, shmFD, 0); - - if (shmBase == MAP_FAILED) - return FALSE; - - close (shmFD); - return TRUE; -} - -void TQSharedMemory::detach () -{ - munmap (shmBase, shmSize); -} - -void TQSharedMemory::setPermissions (mode_t mode) -{ - mprotect (shmBase, shmSize, mode); // Provide defines to make prot work properly -} - -int TQSharedMemory::size() -{ - struct stat buf; - int rc = fstat (shmFD, &buf); - if (rc != -1) - return buf.st_size; - else - return rc; -} - -#else // Assume SysV for backwards compat -#include <sys/shm.h> - -TQSharedMemory::TQSharedMemory (int size, TQString filename, char c ) -{ - shmSize = size; - shmFile = filename; - character = c; - key = ftok (shmFile.latin1 (), c); - idInitted = FALSE; - shmId = -1; -} - -bool TQSharedMemory::create () -{ - shmId = shmget (key, shmSize, IPC_CREAT | 0666); - if (shmId == -1) - return FALSE; - else - return TRUE; -} - -void TQSharedMemory::destroy () -{ - if (shmId != -1) { - struct shmid_ds shm; - shmctl (shmId, IPC_RMID, &shm); - } -} - -bool TQSharedMemory::attach () -{ - if (shmId == -1) - shmId = shmget (key, shmSize, 0); - - shmBase = shmat (shmId, 0, 0); - if ((int) shmBase == -1 || shmBase == 0) - return FALSE; - else - return TRUE; -} - -void TQSharedMemory::detach () -{ - shmdt (shmBase); -} - -void TQSharedMemory::setPermissions (mode_t mode) -{ - struct shmid_ds shm; - shmctl (shmId, IPC_STAT, &shm); - shm.shm_perm.mode = mode; - shmctl (shmId, IPC_SET, &shm); -} - -int TQSharedMemory::size () -{ - struct shmid_ds shm; - shmctl (shmId, IPC_STAT, &shm); - return shm.shm_segsz; -} - -#endif - -#endif diff --git a/src/kernel/qsharedmemory_p.h b/src/kernel/qsharedmemory_p.h deleted file mode 100644 index 94945093..00000000 --- a/src/kernel/qsharedmemory_p.h +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** -** -** Includes system files for shared memory -** -** Created : 020124 -** -** Copyright (C) 2005-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the kernel module of the TQt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** Licensees holding valid TQt Commercial licenses may use this file in -** accordance with the TQt Commercial License Agreement provided with -** the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef TQSHAREDMEMORY_P_H -#define TQSHAREDMEMORY_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the TQt API. It exists for the convenience -// of qapplication_qws.cpp and qgfxvnc_qws.cpp. This header file may -// change from version to version without notice, or even be removed. -// -// We mean it. -// -// - -#ifndef QT_H -#include "tqstring.h" -#endif // QT_H - -#if !defined (QT_QWS_NO_SHM) - -#include <sys/types.h> -#include <sys/ipc.h> - -class TQSharedMemory { -public: - TQSharedMemory(){}; - TQSharedMemory(int, TQString, char c = 'Q'); - ~TQSharedMemory(){}; - - bool create(); - void destroy(); - - bool attach(); - void detach(); - - void setPermissions(mode_t mode); - int size(); - void * base() { return shmBase; }; - -private: - void *shmBase; - int shmSize; - TQString shmFile; - char character; -#if defined(QT_POSIX_QSHM) - int shmFD; -#else - int shmId; - key_t key; - int idInitted; -#endif -}; - -#endif - -#endif diff --git a/src/kernel/qsound.cpp b/src/kernel/qsound.cpp index adfdf84e..3141fc2b 100644 --- a/src/kernel/qsound.cpp +++ b/src/kernel/qsound.cpp @@ -134,9 +134,6 @@ public: http://quicktime.apple.com QuickTime\endlink) for sound, this means all QuickTime formats are supported by TQt/Mac. - On TQt/Embedded, a built-in mixing sound server is used, which - accesses \c /dev/dsp directly. Only the WAVE format is supported. - The availability of sound can be tested with TQSound::isAvailable(). */ diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri index d2249813..c812e584 100644 --- a/src/kernel/qt_kernel.pri +++ b/src/kernel/qt_kernel.pri @@ -161,7 +161,6 @@ kernel { !x11:mac { exists(qsound_mac.cpp):SOURCES += $$KERNEL_CPP/qsound_mac.cpp - else:SOURCES += $$KERNEL_CPP/qsound_qws.cpp } !embedded:!x11:mac { SOURCES += $$KERNEL_CPP/qapplication_mac.cpp \ @@ -270,9 +269,6 @@ kernel { unix:HEADERS += $$KERNEL_P/qpsprinter_p.h \ $$KERNEL_H/ntqfontdatabase.h - embedded:SOURCES += $$KERNEL_CPP/qsharedmemory_p.cpp \ - $$KERNEL_CPP/qfontengine_qws.cpp - accessibility { HEADERS += $$KERNEL_H/ntqaccessible.h SOURCES += $$KERNEL_CPP/qaccessible.cpp diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp index d31168c7..46002b8f 100644 --- a/src/kernel/tqimage.cpp +++ b/src/kernel/tqimage.cpp @@ -59,12 +59,8 @@ #include <ctype.h> #include <stdlib.h> -#ifdef TQ_WS_QWS -#include "qgfx_qws.h" -#endif - -// 16bpp images on supported on TQt/Embedded -#if !defined( TQ_WS_QWS ) && !defined(TQT_NO_IMAGE_16_BIT) +// 16bpp images on supported +#if !defined(TQT_NO_IMAGE_16_BIT) #define TQT_NO_IMAGE_16_BIT #endif @@ -143,12 +139,8 @@ *p = tqRgb(255,255,0); \endcode - On TQt/Embedded, scanlines are aligned to the pixel depth and may - be padded to any degree, while on all other platforms, the - scanlines are 32-bit aligned for all depths. The constructor + The scanlines are 32-bit aligned for all depths. The constructor taking a \c{uchar*} argument always expects 32-bit aligned data. - On TQt/Embedded, an additional constructor allows the number of - bytes-per-line to be specified. TQImage supports a variety of methods for getting information about the image, for example, colorTable(), allGray(), isGrayscale(), @@ -510,57 +502,6 @@ TQImage::TQImage( uchar* yourdata, int w, int h, int depth, data->bitordr = bitOrder; } -#ifdef TQ_WS_QWS - -/*! - Constructs an image that uses an existing memory buffer. The - buffer must remain valid for the life of the TQImage. The image - does not delete the buffer at destruction. The buffer is passed as - \a yourdata. The image's width is \a w and its height is \a h. The - color depth is \a depth. \a bpl specifies the number of bytes per - line. - - If \a colortable is 0, a color table sufficient for \a numColors - will be allocated (and destructed later). - - The endianness is specified by \a bitOrder. - - \warning This constructor is only available on TQt/Embedded. -*/ -TQImage::TQImage( uchar* yourdata, int w, int h, int depth, - int bpl, TQRgb* colortable, int numColors, - Endian bitOrder ) -{ - init(); - if ( !yourdata || w <= 0 || h <= 0 || depth <= 0 || numColors < 0 - || INT_MAX / sizeof(uchar *) < uint(h) - || INT_MAX / uint(bpl) < uint(h) - ) - return; // invalid parameter(s) - data->w = w; - data->h = h; - data->d = depth; - data->ncols = numColors; - data->nbytes = bpl * h; - if ( colortable || !numColors ) { - data->ctbl = colortable; - data->ctbl_mine = FALSE; - } else { - // calloc since we realloc, etc. later (ick) - data->ctbl = (TQRgb*)calloc( numColors*sizeof(TQRgb), numColors ); - TQ_CHECK_PTR(data->ctbl); - data->ctbl_mine = TRUE; - } - uchar** jt = (uchar**)malloc(h*sizeof(uchar*)); - TQ_CHECK_PTR(jt); - for (int j=0; j<h; j++) { - jt[j] = yourdata+j*bpl; - } - data->bits = jt; - data->bitordr = bitOrder; -} -#endif // TQ_WS_QWS - /*! Destroys the image and cleans up. */ @@ -666,15 +607,7 @@ TQImage TQImage::copy() const } else { TQImage image; image.create( width(), height(), depth(), numColors(), bitOrder() ); -#ifdef TQ_WS_QWS - // TQt/Embedded can create images with non-default bpl - // make sure we don't crash. - if ( image.numBytes() != numBytes() ) - for ( int i = 0; i < height(); i++ ) - memcpy( image.scanLine(i), scanLine(i), image.bytesPerLine() ); - else -#endif - memcpy( image.bits(), bits(), numBytes() ); + memcpy( image.bits(), bits(), numBytes() ); memcpy( image.colorTable(), colorTable(), numColors() * sizeof(TQRgb) ); image.setAlphaBuffer( hasAlphaBuffer() ); image.data->dpmx = dotsPerMeterX(); @@ -816,7 +749,7 @@ TQImage TQImage::copy(int x, int y, int w, int h, int conversion_flags) const The image depth is the number of bits used to encode a single pixel, also called bits per pixel (bpp) or bit planes of an image. - The supported depths are 1, 8, 16 (TQt/Embedded only) and 32. + The supported depths are 1, 8 and 32. \sa convertDepth() */ @@ -826,8 +759,8 @@ TQImage TQImage::copy(int x, int y, int w, int h, int conversion_flags) const Returns the size of the color table for the image. - Notice that numColors() returns 0 for 16-bpp (TQt/Embedded only) - and 32-bpp images because these images do not use color tables, + Notice that numColors() returns 0 for + 32-bpp images because these images do not use color tables, but instead encode pixel values as RGB triplets. \sa setNumColors() colorTable() @@ -924,9 +857,6 @@ TQImage TQImage::copy(int x, int y, int w, int h, int conversion_flags) const \link ::tqGreen() tqGreen()\endlink and \link ::tqBlue() tqBlue()\endlink, etc. (ntqcolor.h) to access the pixels. - \warning If you are accessing 16-bpp image data, you must handle - endianness yourself. (TQt/Embedded only) - \sa bytesPerLine() bits() jumpTable() */ @@ -1278,15 +1208,9 @@ bool TQImage::create( int width, int height, int depth, int numColors, setNumColors( 0 ); return FALSE; } -// TQt/Embedded doesn't waste memory on unnecessary padding. -#ifdef TQ_WS_QWS - const int bpl = (width*depth+7)/8; // bytes per scanline - const int pad = 0; -#else const int bpl = ((width*depth+31)/32)*4; // bytes per scanline // #### WWA: shouldn't this be (width*depth+7)/8: const int pad = bpl - (width*depth)/8; // pad with zeros -#endif if ( INT_MAX / uint(bpl) < uint(height) || bpl < 0 || INT_MAX / sizeof(uchar *) < uint(height) ) { // sanity check for potential overflow @@ -2115,7 +2039,7 @@ static bool convert_32_to_16( const TQImage *src, TQImage *dst ) Converts the depth (bpp) of the image to \a depth and returns the converted image. The original image is not changed. - The \a depth argument must be 1, 8, 16 (TQt/Embedded only) or 32. + The \a depth argument must be 1, 8 or 32. Returns \c *this if \a depth is equal to the image depth, or a \link isNull() null\endlink image if this image cannot be @@ -2386,7 +2310,7 @@ bool isGray(TQRgb c) (i.e. their red, green and blue components are equal); otherwise returns FALSE. - This function is slow for large 16-bit (TQt/Embedded only) and 32-bit images. + This function is slow for large 32-bit images. \sa isGrayscale() */ @@ -2419,7 +2343,7 @@ bool TQImage::allGray() const } /*! - For 16-bit (TQt/Embedded only) and 32-bit images, this function is + For 32-bit images, this function is equivalent to allGray(). For 8-bpp images, this function returns TRUE if color(i) is @@ -4745,26 +4669,12 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image ) d->at( startpos + offset ); // start of image data int bpl = image.bytesPerLine(); -#ifdef TQ_WS_QWS - // - // Guess the number of bytes-per-line if we don't know how much - // image data is in the file (bogus image ?). - // - int bmpbpl = bi.biSizeImage > 0 ? - bi.biSizeImage / bi.biHeight : - (d->size() - offset) / bi.biHeight; - int pad = bmpbpl-bpl; -#endif uchar **line = image.jumpTable(); if ( nbits == 1 ) { // 1 bit BMP image while ( --h >= 0 ) { if ( d->readBlock((char*)line[h],bpl) != bpl ) break; -#ifdef TQ_WS_QWS - if ( pad > 0 ) - d->at(d->at()+pad); -#endif } if ( ncols == 2 && tqGray(image.color(0)) < tqGray(image.color(1)) ) swapPixel01( &image ); // pixel 0 is white! @@ -4911,10 +4821,6 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image ) while ( --h >= 0 ) { if ( d->readBlock((char *)line[h],bpl) != bpl ) break; -#ifdef TQ_WS_QWS - if ( pad > 0 ) - d->at(d->at()+pad); -#endif } } } @@ -4989,12 +4895,6 @@ bool qt_write_dib( TQDataStream& s, TQImage image ) } else if ( image.depth() == 32 ) { bpl_bmp = ((image.width()*24+31)/32)*4; nbits = 24; -#ifdef TQ_WS_QWS - } else if ( image.depth() == 1 || image.depth() == 8 ) { - // TQt/E doesn't word align. - bpl_bmp = ((image.width()*image.depth()+31)/32)*4; - nbits = image.depth(); -#endif } else { bpl_bmp = bpl; nbits = image.depth(); @@ -5035,16 +4935,8 @@ bool qt_write_dib( TQDataStream& s, TQImage image ) int y; if ( nbits == 1 || nbits == 8 ) { // direct output -#ifdef TQ_WS_QWS - // TQt/E doesn't word align. - int pad = bpl_bmp - bpl; - char padding[4]; -#endif for ( y=image.height()-1; y>=0; y-- ) { d->writeBlock( (char*)image.scanLine(y), bpl ); -#ifdef TQ_WS_QWS - d->writeBlock( padding, pad ); -#endif } return TRUE; } @@ -6499,33 +6391,3 @@ void TQImage::setText(const char* key, const char* lang, const TQString& s) } #endif // TQT_NO_IMAGE_TEXT - -#ifdef TQ_WS_QWS -/*! - \internal -*/ -TQGfx * TQImage::graphicsContext() -{ - TQGfx * ret=0; - if(depth()) { - int w = qt_screen->mapToDevice( TQSize(width(),height()) ).width(); - int h = qt_screen->mapToDevice( TQSize(width(),height()) ).height(); - ret=TQGfx::createGfx(depth(),bits(),w,h,bytesPerLine()); - } else { - tqDebug("Trying to create image for null depth"); - return 0; - } - if(depth()<=8) { - TQRgb * tmp=colorTable(); - int nc=numColors(); - if(tmp==0) { - static TQRgb table[2] = { tqRgb(255,255,255), tqRgb(0,0,0) }; - tmp=table; - nc=2; - } - ret->setClut(tmp,nc); - } - return ret; -} - -#endif diff --git a/src/kernel/tqimage.h b/src/kernel/tqimage.h index ae5b69ff..b65b1de4 100644 --- a/src/kernel/tqimage.h +++ b/src/kernel/tqimage.h @@ -83,11 +83,6 @@ public: TQImage( uchar* data, int w, int h, int depth, TQRgb* colortable, int numColors, Endian bitOrder ); -#ifdef TQ_WS_QWS - TQImage( uchar* data, int w, int h, int depth, int pbl, - TQRgb* colortable, int numColors, - Endian bitOrder ); -#endif TQImage( const TQImage & ); ~TQImage(); @@ -129,10 +124,6 @@ public: int numBytes() const; int bytesPerLine() const; -#ifdef TQ_WS_QWS - TQGfx * graphicsContext(); -#endif - bool create( int width, int height, int depth, int numColors=0, Endian bitOrder=IgnoreEndian ); bool create( const TQSize&, int depth, int numColors=0, diff --git a/src/kernel/tqtextengine.cpp b/src/kernel/tqtextengine.cpp index b66fb7d9..9b1ff2e1 100644 --- a/src/kernel/tqtextengine.cpp +++ b/src/kernel/tqtextengine.cpp @@ -875,7 +875,7 @@ static void calcLineBreaks(const TQString &str, TQCharAttributes *charAttributes } } -#if defined( TQ_WS_X11 ) || defined ( TQ_WS_QWS ) +#if defined( TQ_WS_X11 ) # include "tqtextengine_unix.cpp" #elif defined( TQ_WS_WIN ) # include "tqtextengine_win.cpp" diff --git a/src/kernel/tqtextengine_p.h b/src/kernel/tqtextengine_p.h index 774302a0..7d641e98 100644 --- a/src/kernel/tqtextengine_p.h +++ b/src/kernel/tqtextengine_p.h @@ -86,7 +86,7 @@ struct glyph_metrics_t int yoff; }; -#if defined( TQ_WS_X11 ) || defined ( TQ_WS_QWS ) +#if defined( TQ_WS_X11 ) typedef unsigned short glyph_t; struct qoffset_t { diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp index f4f1a8b1..8dfda823 100644 --- a/src/kernel/tqwidget.cpp +++ b/src/kernel/tqwidget.cpp @@ -66,9 +66,6 @@ #include "qt_windows.h" #include "qinputcontext_p.h" #endif -#if defined(TQ_WS_QWS) -#include "qwsmanager_qws.h" -#endif #include "qfontdata_p.h" @@ -455,7 +452,7 @@ in the file qapp_xxx.cpp. *****************************************************************************/ -#if defined(TQ_WS_QWS) || defined(Q_OS_TEMP) +#if defined(Q_OS_TEMP) static const int WDictSize = 163; // plenty for small devices #else static const int WDictSize = 1123; // plenty for 5 big complex windows @@ -908,8 +905,6 @@ TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f, NFlags n ) own_palette = 0; sizehint_forced = 0; is_closing = 0; - in_show = 0; - in_show_maximized = 0; im_enabled = FALSE; #ifndef TQT_NO_LAYOUT lay_out = 0; @@ -1159,10 +1154,6 @@ void TQWidget::createTLExtra() x->ussize = 0; #endif x->savedFlags = 0; -#if defined(TQ_WS_QWS) && !defined(TQT_NO_QWS_MANAGER) - x->decor_allocated_region = TQRegion(); - x->qwsManager = 0; -#endif createTLSysExtra(); } } @@ -1221,9 +1212,6 @@ void TQWidget::deleteExtra() delete extra->topextra->icon; #endif delete extra->topextra->focusData; -#if defined(TQ_WS_QWS) && !defined(TQT_NO_QWS_MANAGER) - delete extra->topextra->qwsManager; -#endif delete extra->topextra; } delete extra; @@ -3992,8 +3980,6 @@ void TQWidget::show() return; } - in_show = TRUE; // set qws recursion watch - TQApplication::sendPostedEvents( this, TQEvent::ChildInserted ); uint state = isTopLevel() ? windowState() : 0; @@ -4085,8 +4071,6 @@ void TQWidget::show() #if defined(QT_ACCESSIBILITY_SUPPORT) TQAccessible::updateAccessibility( this, 0, TQAccessible::ObjectShow ); #endif - - in_show = FALSE; // reset qws recursion watch } /*! \fn void TQWidget::iconify() @@ -4923,12 +4907,6 @@ bool TQWidget::event( TQEvent *e ) case TQEvent::ApplicationPaletteChange: if ( !own_palette && !isDesktop() ) unsetPalette(); -# if defined(TQ_WS_QWS) && !defined (TQT_NO_QWS_MANAGER) - if ( isTopLevel() && topData()->qwsManager ) { - TQRegion r( topData()->qwsManager->region() ); - TQApplication::postEvent(topData()->qwsManager, new TQPaintEvent(r, FALSE) ); - } -# endif break; #endif @@ -5632,27 +5610,6 @@ bool TQWidget::x11Event( XEvent * ) } #endif -#if defined(TQ_WS_QWS) - -/*! - This special event handler can be reimplemented in a subclass to - receive native TQt/Embedded events. - - In your reimplementation of this function, if you want to stop the - event being handled by TQt, return TRUE. If you return FALSE, this - native event is passed back to TQt, which translates the event into - a TQt event and sends it to the widget. - - \warning This function is not portable. - - \sa TQApplication::qwsEventFilter() -*/ -bool TQWidget::qwsEvent( TQWSEvent * ) -{ - return FALSE; -} - -#endif /*! \property TQWidget::autoMask diff --git a/src/kernel/tqwidget.h b/src/kernel/tqwidget.h index d328dd95..a83c90a9 100644 --- a/src/kernel/tqwidget.h +++ b/src/kernel/tqwidget.h @@ -61,7 +61,6 @@ struct TQWExtra; struct TQTLWExtra; class TQFocusData; class TQCursor; -class TQWSRegionManager; class TQStyle; class TQStyleControlElementData; @@ -336,9 +335,6 @@ public: bool isUpdatesEnabled() const; -#if 0 //def TQ_WS_QWS - void repaintUnclipped( const TQRegion &, bool erase = TRUE ); -#endif public slots: virtual void setUpdatesEnabled( bool enable ); void update(); @@ -466,9 +462,6 @@ public: TQWidget *childAt( int x, int y, bool includeThis = FALSE ) const; TQWidget *childAt( const TQPoint &, bool includeThis = FALSE ) const; -#if defined(TQ_WS_QWS) - virtual TQGfx * graphicsContext(bool clip_children=TRUE) const; -#endif #if defined(TQ_WS_MAC) TQRegion clippedRegion(bool do_children=TRUE); uint clippedSerial(bool do_children=TRUE); @@ -537,11 +530,6 @@ protected: #if defined(TQ_WS_X11) virtual bool x11Event( XEvent * ); #endif -#if defined(TQ_WS_QWS) - virtual bool qwsEvent( TQWSEvent * ); - virtual unsigned char *scanLine( int ) const; - virtual int bytesPerLine() const; -#endif virtual void updateMask(); @@ -683,8 +671,6 @@ private: uint own_palette :1; uint sizehint_forced :1; uint is_closing :1; - uint in_show : 1; - uint in_show_maximized : 1; uint fstrut_dirty : 1; uint im_enabled : 1; TQRect crect; @@ -700,36 +686,6 @@ private: TQInputContext *ic; // Input Context #endif TQWExtra *extra; -#if defined(TQ_WS_QWS) - TQRegion req_region; // Requested region - mutable TQRegion paintable_region; // Paintable region - mutable bool paintable_region_dirty;// needs to be recalculated - mutable TQRegion alloc_region; // Allocated region - mutable bool alloc_region_dirty; // needs to be recalculated - mutable int overlapping_children; // Handle overlapping children - - int alloc_region_index; - int alloc_region_revision; - - void updateOverlappingChildren() const; - void setChildrenAllocatedDirty(); - void setChildrenAllocatedDirty( const TQRegion &r, const TQWidget *dirty=0 ); - bool isAllocatedRegionDirty() const; - void updateRequestedRegion( const TQPoint &gpos ); - TQRegion requestedRegion() const; - TQRegion allocatedRegion() const; - TQRegion paintableRegion() const; - - void updateGraphicsContext( TQGfx *qgfx_qws, bool clip_children ) const; -#ifndef TQT_NO_CURSOR - void updateCursor( const TQRegion &r ) const; -#endif - - // used to accumulate dirty region when children moved/resized. - TQRegion dirtyChildren; - bool isSettingGeometry; - friend class TQWSManager; -#endif static int instanceCounter; // Current number of widget instances static int maxInstances; // Maximum number of widget instances @@ -983,7 +939,6 @@ inline bool TQWidget::isInputMethodEnabled() const // - top-level widgets have extra extra data to reduce cost further class TQFocusData; -class TQWSManager; #if defined(TQ_WS_WIN) class TQOleDropTarget; #endif @@ -1028,10 +983,6 @@ struct TQ_EXPORT TQTLWExtra { uint is_moved: 1; uint resizer : 4; #endif -#if defined(TQ_WS_QWS) && !defined ( TQT_NO_QWS_MANAGER ) - TQRegion decor_allocated_region; // decoration allocated region - TQWSManager *qwsManager; -#endif #if defined(TQ_WS_WIN) HICON winIcon; // internal Windows icon #endif @@ -1077,7 +1028,7 @@ struct TQ_EXPORT TQWExtra { uint children_use_dnd : 1; uint compress_events : 1; #endif -#if defined(TQ_WS_QWS) || defined(TQ_WS_MAC) +#if defined(TQ_WS_MAC) TQRegion mask; // widget mask #endif char bg_mode; // background mode diff --git a/src/kernel/tqwidget_p.h b/src/kernel/tqwidget_p.h index 3f8d6823..7dff862e 100644 --- a/src/kernel/tqwidget_p.h +++ b/src/kernel/tqwidget_p.h @@ -57,7 +57,7 @@ #ifndef QT_H #endif // QT_H -#if defined (TQ_WS_X11) || defined (TQ_WS_QWS) +#if defined (TQ_WS_X11) extern int qt_widget_tlw_gravity; #endif diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp index b5da887d..756f3ec0 100644 --- a/src/network/qftp.cpp +++ b/src/network/qftp.cpp @@ -515,14 +515,12 @@ bool TQFtpDTP::parseDir( const TQString &buffer, const TQString &userName, TQUrl void TQFtpDTP::socketConnected() { -#if !defined (TQ_WS_QWS) // Use a large send buffer to reduce the number // of writeBlocks when download and uploading files. // The actual size used here (128k) is default on most // Unixes. socket.socketDevice()->setSendBufferSize(128 * 1024); socket.socketDevice()->setReceiveBufferSize(128 * 1024); -#endif bytesDone = 0; #if defined(TQFTPDTP_DEBUG) @@ -1,7 +1,6 @@ # TQt project file TEMPLATE = lib TARGET = qt -embedded:TARGET = qte VERSION = 3.5 DESTDIR = $$QMAKE_LIBDIR_TQT DLLDESTDIR = ../bin @@ -39,7 +38,6 @@ WORKSPACE_CPP = workspace INPUTMETHOD_CPP = inputmethod XML_CPP = xml STYLES_CPP = styles -EMBEDDED_CPP = embedded win32 { contains(QT_PRODUCT,qt-internal) { @@ -100,7 +98,7 @@ unix { INPUTMETHOD_H = $$INPUTMETHOD_CPP XML_H = $$XML_CPP STYLES_H = $$STYLES_CPP - !embedded:!mac:CONFIG += x11 x11inc + !mac:CONFIG += x11 x11inc } aix-g++ { @@ -108,19 +106,13 @@ aix-g++ { QMAKE_CXXFLAGS += -mminimal-toc } -embedded { - EMBEDDED_H = $$EMBEDDED_CPP -} - DEPENDPATH += ;$$NETWORK_H;$$KERNEL_H;$$WIDGETS_H;$$INPUTMETHOD_H;$$SQL_H;$$TABLE_H;$$DIALOGS_H; DEPENDPATH += $$OPENGL_H;$$TOOLS_H;$$CODECS_H;$$WORKSPACE_H;$$XML_H; DEPENDPATH += $$CANVAS_H;$$STYLES_H -embedded:DEPENDPATH += ;$$EMBEDDED_H thread { !win32-borland:TARGET = tqt-mt win32-borland:TARGET = qtmt - embedded:TARGET = qte-mt DEFINES += TQT_THREAD_SUPPORT } @@ -139,7 +131,6 @@ include($$KERNEL_CPP/qt_compat.pri) x11:include($$KERNEL_CPP/qt_x11.pri) mac:include($$KERNEL_CPP/qt_mac.pri) win32:include($$KERNEL_CPP/qt_win.pri) -embedded:include($$KERNEL_CPP/qt_qws.pri) #modules include($$KERNEL_CPP/qt_kernel.pri) @@ -157,7 +148,6 @@ include($$KERNEL_CPP/qt_gfx.pri) include($$TOOLS_CPP/qt_tools.pri) include($$CODECS_CPP/qt_codecs.pri) include($$STYLES_CPP/qt_styles.pri) -embedded:include($$EMBEDDED_CPP/qt_embedded.pri) # qconfig.cpp exists($$QT_BUILD_TREE/src/tools/qconfig.cpp) { diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp index a63a3392..31f6dd0b 100644 --- a/src/table/qtable.cpp +++ b/src/table/qtable.cpp @@ -159,11 +159,6 @@ private: }; -#ifdef _WS_QWS_ -# define NO_LINE_WIDGET -#endif - - struct TQTablePrivate { diff --git a/src/tools/ntqfeatures.h b/src/tools/ntqfeatures.h index 66fc95fc..acfa7db0 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 f83da9d7..2d449fd9 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 1f169fe1..d2f8321c 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 17416abf..93bc436e 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 7d5305e6..2d98d14e 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 f89fb8d1..d7d08b79 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 b8e08532..6751ce41 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 aed39e46..0a203605 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 84b26a6b..21d433d7 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 0714dbb8..d7716a1a 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 ebec8188..250e5623 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 3ffd743d..75318492 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 fff59c61..dbf17940 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 } diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp index c4549968..0048f566 100644 --- a/src/widgets/qmainwindow.cpp +++ b/src/widgets/qmainwindow.cpp @@ -1537,7 +1537,6 @@ TQSize TQMainWindow::sizeHint() const TQMainWindow* that = (TQMainWindow*) this; // Workaround: because d->tll get's deleted in // totalSizeHint->polish->sendPostedEvents->childEvent->triggerLayout - // [eg. canvas example on TQt/Embedded] TQApplication::sendPostedEvents( that, TQEvent::ChildInserted ); if ( !that->d->tll ) that->setUpLayout(); |