kde-cygwin--cvs Mailing List for KDE on Cygwin (Page 4)
Status: Inactive
Brought to you by:
habacker
Menu
▾
▴
kde-cygwin--cvs — List for CVS update notification
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(88) |
Jul
(27) |
Aug
(3) |
Sep
(1) |
Oct
(3) |
Nov
(20) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(23) |
Feb
(25) |
Mar
(9) |
Apr
(88) |
May
(137) |
Jun
(244) |
Jul
(52) |
Aug
(17) |
Sep
(1) |
Oct
(12) |
Nov
(124) |
Dec
(42) |
| 2003 |
Jan
(112) |
Feb
(53) |
Mar
(24) |
Apr
(6) |
May
|
Jun
(63) |
Jul
(64) |
Aug
(151) |
Sep
(5) |
Oct
(87) |
Nov
(58) |
Dec
(13) |
| 2004 |
Jan
(76) |
Feb
(22) |
Mar
(30) |
Apr
(41) |
May
(4) |
Jun
(60) |
Jul
(39) |
Aug
(217) |
Sep
(165) |
Oct
(90) |
Nov
(72) |
Dec
(60) |
| 2005 |
Jan
(153) |
Feb
(110) |
Mar
(76) |
Apr
(237) |
May
(60) |
Jun
(20) |
Jul
(39) |
Aug
(8) |
Sep
(136) |
Oct
(39) |
Nov
|
Dec
|
| 2006 |
Jan
(16) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Christian E. <che...@us...> - 2005-09-30 15:27:09
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/win32-msvc2005 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13083/mkspecs/win32-msvc2005 Added Files: Tag: QT_WIN32_3_3_BRANCH qmake.conf qplatformdefs.h Log Message: --- NEW FILE: qmake.conf --- # # $Id: qmake.conf,v 1.1.1.1.2.2 2005/09/30 15:26:53 chehrlic Exp $ # # qmake configuration for win32-msvc2005 # # Written for Microsoft Visual C++ 8.0 (2005) # MAKEFILE_GENERATOR = MSVC.NET TEMPLATE = app CONFIG += qt warn_on release incremental flat link_prl precompile_header DEFINES += UNICODE WIN32 exists( $(QTDIR)\.qtwinconfig ) { include( $(QTDIR)\.qtwinconfig ) } QMAKE_CC = cl QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d # Warning 4996 is the depricated warning, supress it for now. QMAKE_CFLAGS = -nologo -Zm200 -wd4996 QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 QMAKE_CFLAGS_RELEASE = -O2 QMAKE_CFLAGS_DEBUG = -Zi -Gm QMAKE_CFLAGS_MT = -MD QMAKE_CFLAGS_MT_DBG = -MDd QMAKE_CFLAGS_MT_DLL = -MD QMAKE_CFLAGS_MT_DLLDBG = -MDd QMAKE_CFLAGS_YACC = QMAKE_CFLAGS_STL_ON = -EHsc QMAKE_CFLAGS_STL_OFF = QMAKE_CFLAGS_RTTI_ON = -GR QMAKE_CFLAGS_RTTI_OFF = QMAKE_CFLAGS_EXCEPTIONS_ON = -EHsc QMAKE_CFLAGS_EXCEPTIONS_OFF = QMAKE_CXX = $$QMAKE_CC QMAKE_CXXFLAGS = $$QMAKE_CFLAGS QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189 QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_MT = $$QMAKE_CFLAGS_MT QMAKE_CXXFLAGS_MT_DBG = $$QMAKE_CFLAGS_MT_DBG QMAKE_CXXFLAGS_MT_DLL = $$QMAKE_CFLAGS_MT_DLL QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_STL_ON = $$QMAKE_CFLAGS_STL_ON QMAKE_CXXFLAGS_STL_OFF = $$QMAKE_CFLAGS_STL_OFF QMAKE_CXXFLAGS_RTTI_ON = $$QMAKE_CFLAGS_RTTI_ON QMAKE_CXXFLAGS_RTTI_OFF = $$QMAKE_CFLAGS_RTTI_OFF QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF QMAKE_INCDIR = QMAKE_INCDIR_QT = $(QTDIR)\include QMAKE_LIBDIR_QT = $(QTDIR)\lib QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< QMAKE_RUN_CC_IMP_BATCH = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ @<< QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< QMAKE_LINK = link QMAKE_LFLAGS = /NOLOGO QMAKE_LFLAGS_RELEASE = /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll QMAKE_LFLAGS_DEBUG = /DEBUG QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:CONSOLE /DLL QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:WINDOWS /DLL QMAKE_LFLAGS_QT_DLL = /BASE:0x39D00000 QMAKE_LIBS = QMAKE_LIBS_CONSOLE = QMAKE_LIBS_WINDOWS = kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib delayimp.lib QMAKE_LIBS_QT = qt.lib QMAKE_LIBS_QT_THREAD = qt-mt.lib QMAKE_LIBS_QT_ENTRY = qtmain.lib QMAKE_LIBS_OPENGL = opengl32.lib glu32.lib QMAKE_LFLAGS_OPENGL = /DELAYLOAD:opengl32.dll QMAKE_MOC = $(QTDIR)\bin\moc.exe QMAKE_UIC = $(QTDIR)\bin\uic.exe QMAKE_IDC = $(QTDIR)\bin\idc.exe QMAKE_IDL = midl QMAKE_LIB = lib /NOLOGO QMAKE_RC = rc QMAKE_ZIP = zip -r -9 QMAKE_COPY = copy QMAKE_MOVE = move QMAKE_DEL_FILE = del QMAKE_DEL_DIR = rmdir QMAKE_CHK_DIR_EXISTS = if not exist QMAKE_MKDIR = mkdir VCPROJ_EXTENSION = .vcproj VCSOLUTION_EXTENSION = .sln --- NEW FILE: qplatformdefs.h --- #ifndef QPLATFORMDEFS_H #define QPLATFORMDEFS_H #ifdef UNICODE #ifndef _UNICODE #define _UNICODE #endif #endif // Get Qt defines/settings #include "qglobal.h" #define _POSIX_ #include <limits.h> #undef _POSIX_ #include <tchar.h> #include <io.h> #include <direct.h> #include <stdio.h> #include <fcntl.h> #include <errno.h> #include <sys/stat.h> #include <stdlib.h> #include <windows.h> #define Q_FS_FAT #ifdef QT_LARGEFILE_SUPPORT #define QT_STATBUF struct _stati64 // non-ANSI defs #define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs #define QT_STAT ::_stati64 #define QT_FSTAT ::_fstati64 #else #define QT_STATBUF struct _stat // non-ANSI defs #define QT_STATBUF4TSTAT struct _stat // non-ANSI defs #define QT_STAT ::_stat #define QT_FSTAT ::_fstat #endif #define QT_STAT_REG _S_IFREG #define QT_STAT_DIR _S_IFDIR #define QT_STAT_MASK _S_IFMT #if defined(_S_IFLNK) # define QT_STAT_LNK _S_IFLNK #endif #define QT_FILENO _fileno #define QT_OPEN ::_open #define QT_CLOSE ::_close #ifdef QT_LARGEFILE_SUPPORT #define QT_LSEEK ::_lseeki64 #define QT_TSTAT ::_tstati64 #else #define QT_LSEEK ::_lseek #define QT_TSTAT ::_tstat #endif #define QT_READ ::_read #define QT_WRITE ::_write #define QT_ACCESS ::_access #define QT_GETCWD ::_getcwd #define QT_CHDIR ::_chdir #define QT_MKDIR ::_mkdir #define QT_RMDIR ::_rmdir #define QT_OPEN_RDONLY _O_RDONLY #define QT_OPEN_WRONLY _O_WRONLY #define QT_OPEN_RDWR _O_RDWR #define QT_OPEN_CREAT _O_CREAT #define QT_OPEN_TRUNC _O_TRUNC #define QT_OPEN_APPEND _O_APPEND #if defined(O_TEXT) # define QT_OPEN_TEXT _O_TEXT # define QT_OPEN_BINARY _O_BINARY #endif #define QT_SIGNAL_ARGS int #define QT_VSNPRINTF ::_vsnprintf #define QT_SNPRINTF ::_snprintf # define F_OK 0 # define X_OK 1 # define W_OK 2 # define R_OK 4 typedef int mode_t; #endif // QPLATFORMDEFS_H |
|
From: Christian E. <che...@us...> - 2005-09-30 15:27:09
|
Update of /cvsroot/kde-cygwin/qt-3/src/3rdparty/libmng/doc/rpm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13083/src/3rdparty/libmng/doc/rpm Removed Files: Tag: QT_WIN32_3_3_BRANCH libmng-1.0.2-rhconf.patch Log Message: --- libmng-1.0.2-rhconf.patch DELETED --- |
|
From: Christian E. <che...@us...> - 2005-09-30 15:27:09
|
Update of /cvsroot/kde-cygwin/qt-3/translations In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13083/translations Modified Files: Tag: QT_WIN32_3_3_BRANCH qt_es.qm qt_he.ts Log Message: Index: qt_es.qm =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/translations/qt_es.qm,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 Binary files /tmp/cvsHhth7b and /tmp/cvsZnyW9t differ Index: qt_he.ts =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/translations/qt_he.ts,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- qt_he.ts 9 Apr 2005 10:41:04 -0000 1.1.1.1.2.1 +++ qt_he.ts 30 Sep 2005 15:26:53 -0000 1.1.1.1.2.2 @@ -1,2133 +1,2133 @@ -<!DOCTYPE TS><TS> -<context> - <name>@default</name> - <message> - <source>OK</source> - <translation type="obsolete">××ש×ר</translation> - </message> - <message> - <source>Cancel</source> - <translation type="obsolete">×××××</translation> - </message> [...4235 lines suppressed...] + <translation>×עתק</translation> + </message> + <message> + <source>Paste</source> + <translation>×××ק</translation> + </message> + <message> + <source>Paste special...</source> + <translation>××××§× ×××××ת...</translation> + </message> + <message> + <source>Clear</source> + <translation>× ×§×</translation> + </message> + <message> + <source>Select All</source> + <translation>××ר ×××</translation> + </message> +</context> +</TS> |
|
From: Christian E. <che...@us...> - 2005-09-30 15:27:08
|
Update of /cvsroot/kde-cygwin/qt-3/tools/assistant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13083/tools/assistant Modified Files: Tag: QT_WIN32_3_3_BRANCH finddialog.ui Log Message: Index: finddialog.ui =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/finddialog.ui,v retrieving revision 1.1.1.8 retrieving revision 1.1.1.9 diff -u -r1.1.1.8 -r1.1.1.9 --- finddialog.ui 9 Apr 2005 10:49:13 -0000 1.1.1.8 +++ finddialog.ui 30 Sep 2005 15:26:53 -0000 1.1.1.9 @@ -1,29 +1,29 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>FindDialog</class> -<comment>********************************************************************* -** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. -** -** This file is part of Qt Assistant. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt 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. -** -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** See http://www.trolltech.com/pricing.html or email sa...@tr... for -** information about Qt Commercial License Agreements. -** -** Contact in...@tr... if any conditions of this licensing are -** not clear to you. -** +<comment>********************************************************************* +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. +** +** This file is part of Qt Assistant. +** +** This file may be distributed and/or modified under the terms of the +** GNU General Public License version 2 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. +** +** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition +** licenses may use this file in accordance with the Qt 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. +** +** See http://www.trolltech.com/gpl/ for GPL licensing information. +** See http://www.trolltech.com/pricing.html or email sa...@tr... for +** information about Qt Commercial License Agreements. +** +** Contact in...@tr... if any conditions of this licensing are +** not clear to you. +** *********************************************************************</comment> <widget class="QDialog"> <property name="name"> |
|
From: Christian E. <che...@us...> - 2005-09-30 15:27:08
|
Update of /cvsroot/kde-cygwin/qt-3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13083 Added Files: Tag: QT_WIN32_3_3_BRANCH changes-3.3.5 Removed Files: Tag: QT_WIN32_3_3_BRANCH changes-3.3.4 Log Message: --- NEW FILE: changes-3.3.5 --- Qt 3.3.5 is a bug-fix release. It maintains both forward and backward compatibility (source and binary) with Qt 3.3.4, Qt 3.3.3, Qt 3.3.2, Qt 3.3.1 and Qt 3.3.0. **************************************************************************** * General * **************************************************************************** Platforms --------- - Qt now supports Mac OS X 10.4 (Tiger) Compilers --------- - Added support for VS 2005 - Added support for GCC 4 Windows Installer ----------------- - The environment variables no longer contain invalid paths. - The user is warned if QTDIR is not set and the evaluation edition is already installed, to avoid conflicts between the two packages. - A bug was fixed where a '\0' was appended to the end of a path. - Fixed the dependencies for image formats and styles. Qt Designer ----------- - Fixed a problem with long string literals on certain Visual Studio C++ compilers. - UIC now uses the include hints from the .ui file when generating source files. - The "paste" action is now enabled and disabled correctly. - QWidgetFactory::supportsWidget() now returns true for QSplitter. - Parse files with more than one '.' in the file name correctly. - The project name is now displayed correctly also when the project is created in a root directory. - Fixed a bug where Windows end-of-line terminators would be included in string literals, which broke translation. - Several crashes were fixed related to cutting/copying/pasting menu items. - Fixed some problems with designer generating corrupted pro files. - A crash was fixed for when designer loads a pro file with the same file listed more than once. - The action editor is now closed when there is no main window form. - Stability fixes Qt Linguist ----------- - lupdate now understands strings longer than 16384 characters. - Fixed escaping bugs for string that contain both ampersands and double quotes. Qt Assistant ------------ - When printing, assistant now always uses the Active color group. - Fixed a rendering bug for paragraphs that start with a line break. - Support for setting the documentation root path, allowing documentation files to be moved. - When opening a link in a new window, assistant will now properly scroll to the correct anchor after the window has been shown. - Fixed full text search for documents not listed in the 'ref' attribute of the <section> tag in the current .adp file. - The state of the forward/backward buttons now work properly when the tabs are changed. **************************************************************************** * Library * **************************************************************************** General Fixes ------------- Added security patches for zlib: CAN-2005-1849, CAN-2005-2096 The FreeType library was upgraded from version 2.0.9 to 2.1.9 - Build system Improved build keys for gcc 4 compilers, so plugins no longer need rebuilding after upgrading gcc to a new patch release. - QCanvas Fixed wrong text scaling and cut-off text. Fixed drawing with a brush when double buffering is enabled. - QCommonStyle Fixed the appearance of QSlider after setBackgroundOrigin has been called. Fixed an overflow in calculating the handle position for QScrollBar. - QCString Fixed a crash in qUncompress() if the resulting QByteArray was too large to fit in memory. Fixed potential security problems by using vsnprintf() instead of the less secure vsprintf(). - QDataStream Fixed a data corruption bug when using stream version Qt_3_1 and using operator<<(qint64). - QDateTime Fixed QDateTime::secsTo() when crossing daylight savings hours boundaries. - QDockWindow Undocked windows now remember their size also if the user changes it. - QDom The default constructor for QDocDocument now creates an empty document that can be used to create elements. A warning is now displayed when trying to construct or save an invalid document. Characters that are not allowed in XML are now escaped properly when saving. - QFileDialog Shortcuts now show the icons of what they point to. Entry sorting is now locale-aware, as opposed to sorting based on Unicode order. You can now select files by pressing 'enter' when using QFileDialog::getOpenFileNames(). Fixed a missing repaint in contents preview after selecting a file, then a directory, then the same file again. dirPath() no longer chops off the last directory in a path. - QGVector Fixed a bug that caused a memory leak and data corruption if resize() failed. - QHeader The header text is now rendered correctly next to the icon in reverse layout mode. - QImage Fixed comparison of images with alpha data, but with the alpha channel disabled. - QKeySequence Key sequences that ended with a ',' now work properly. - QLineEdit Fixed the behavior of the delete key on the keypad. Fixed support for transparent line edits. Fixed a crash when opening the context menu in a QTextEdit subclass that returns 0 for createPopupMenu(). - QListBox Fixed a crash when removing the current item while selecting items with a rubberband. - QListView Fixed the behavior of the Home and End keys when QListView contains disabled and hidden items. Fixed a problem with the QListView::...Clicked() signals were emitted also when the root decorated section was not in the left-most column. HTML control characters in QListView's tool tip text are now escaped properly. sortChildren() now also sorts children of items with no siblings. Fixed a missing redraw after removing columns. contentsWidth() now returns the correct value after setContentsWidth() has been called. Fixed a crash after a sequence of deleting and selecting items. Fixed the size of headers with multi-line text. Fixed a lock-up and possible crash caused by an internal state restore on controllers with no children. Fixed keyboard navigation when jumping to entries by pressing the key for the first character in the text of an item. - QLocale Fixed support for NaN, which failed on certain compilers. Passing Q_LLONG to toString() now properly includes the group symbols. Fixed locale detection when locale environment variables are not set. Added workarounds for compiler optimization bugs when parsing doubles. - QLocalFS Fixed a crash when canceling a QUrlOperator transfer before completion. - QMenuData Fixed a crash when closing an MDI application while the menu bar has Alt-focus. - QMessageBox Message boxes now work correctly in right-to-left mode. - QPaintDevice Fixed drawing errors when using bitBlt() on a printer. - QPainter Fixed drawing of rectangles with a negative (or 0) width. - QPopupMenu The height of new columns is now initialized properly when menu items are shown in multiple columns. - QProcess Close socket connections properly when a process is created after creating the socket connection. - QPSPrinter Generate PS font names correctly. - QPushButton Fixed a crash caused by deleting the button while the popup menu is shown. - QRichText Tab stops are now adjusted correctly when printing in high resolution mode. Reduced the number of memory allocations when deleting large blocks of text. Fixed parsing of hexadecimal HTML entities Fixed a bug where the font changed after calling setText() repeatedly. - QScriptEngine Fixed an issue with shaping of Hebrew text, which lead to layout problems in QTextLayout. Fixed rendering of Hebrew text with punctuation. Fixed bugs in Gurmukhi shaping. - QScrollView Fixed the size hint when scrollbars are set to be permanently on. Fixed a drawing error seen on certain graphics drivers when a scroll view spans multiple screens. Fixed a bug where wheel events' horizontal/vertical status were not forwarded to viewportWheelEvent(). Fixed a crash when mouse wheel events were sent to a scroll view with disabled scroll bars. - QSettings Fixed a bug when comparing keys with common prefixes. - QSGIStyle Fixed the size of QComboBox. - QSizeGrip Fixed a bug that caused the window to move when resizing to the minimum size using the size grip. - QSocketDevice Improved error reporting when the connection is unexpectedly closed. Fixed a bug where the socket would be closed if 0 was passed as maxlen to readBlock(). - QString Fixed a lock-up in QString::section(). Let replace() behave as documented when the index is larger than the length of the string. - QTable Fixed positioning of QComboTableItems that span several rows. - QTextCodec Fixed occasional crash in fromUnicode(). Fixed Big5 support to comply with the standards. - QTextEdit Fixed bug in undo/redo history when input methods are used. Fixed a crash caused by inserting text with an input method during a focus change. Fixed the behavior of the delete key on the keypad. Fixed setMaxLogLines() when there are already too many lines. Fixed crash when clearing a QTextEdit when the IME is active. Fixed crash when the text edit is deleted while dragging text. - QTextLayout Fixed layout of lines that are too long and do not contain a possible break point. - QTimeEdit Fixed several issues with stepUp() and stepDown(). - QToolButton Fixed a crash when assigning a tooltip to a tool button which does not have QMainWindow as an ancestor. - QToolTip Fixed an occasional crash. - QTranslator Fixed a bug when calling messages() before tr() when using compressed .qm files. - QUrlOperator Fixed a crash when accessing invalid paths on an FTP server using QFileDialog. Fixed a bug where the source would be removed if the source and destination were the same. - QVariant Fixed a memory leak in clear(). - QWidget Fixed excessive flicker when reparenting a widget that has tool windows. - QWorkspace Fixed flickering when switching between maximized windows. Fixed a lock-up when modal dialogs were created with QWorkspace as parent. Fixed a bug where modeless dialogs with QWorkspace as parent would be drawn with no title bar. - SQL, DB2 driver Compile fixes. Fixed a bug where QSqlCursor::insert() would fail to insert two blob fields at the same time. - SQL, MySQL driver Fixed a crash when using empty database names. - SQL, Oracle driver Fixed truncation of numeric data types to 22 digits. Fixed UTF-8 support by ensuring that there is enough space to store the text. - SQL, ODBC driver Fixed problems with sorting and comparing strings larger than 8192 characters. - SQl, PostgreSQL driver Temporary tables are now only visible for the connection that created them. - SQL, TDS driver Fixed problems with compiling the plugin with later versions of the TDS library. - SVG support Fixed support for SVG viewbox. Added basic support for stroke-dasharray. Platform-Specific Issues ------------------------ Windows: - ActiveQt Unrelated types are no longer converted. The control container is now only reset if the CLSID changes. Fixed a bug where QAxObject::clear() did not reset the metaobject when it was cached. Fixed a memory leak. Fixed a bug that caused flicker when navigating away from a page embedding a control. The VARIANT out-parameters in signals now map to "QVariant &" and not "const QVariant &". Signal parameters of type "bool" are marshalled to the bool slot also when the control sends an integer parameter. - Drag & drop Fixed a bug with sending single-color pixmaps. Fixed a crash caused by reading a drag object after it has been deleted (before the drop event). Dragged pixmaps are now cleaned up before drawn to avoid problems with broken alpha values and resetting masked pixels. - QApplication Fixed a lockup caused by showing a dialog while resizing a window. QWidget::grabKeyboard() now also grabs the menu button. Fixed a bug where mouse events were sent to the wrong widget after calling QEventLoop::processEvents() with ExcludeUserInput. Windows Server 2003 can now also use the Windows XP style. Fixed a memory leak in QEventLoop. - QColor Fixed failed initialization of the Qt colors (e.g., Qt::red) when using the MinGW compiler. - QFile Fixed a bug where a read error was not handled properly. - QFileInfo permission() now uses the correct file name on Windows 9x. - QFontDataBase Added support for scalable fonts. - QFontEngine Fixed a problem with symbol fonts. Fixed support for user defined characters. - QLibrary Fixed the directory separators. Fixed some library loading errors. - QLocale The locale() function now returns the correct ISO name instead of a number. - QNPWidget (NPAPI) Fixed a bug where the widget was not clipped properly by the browser. - QPainter Fixed a bug where QPainter failed to fill ellipses of size 2x2. Fixed a potential lock-up after failed GDI allocations. - QPrinter Rich text tables are now printed correctly when the table spans pages. Fixed text printing errors on page 2 and out caused by the background mode being reset to OPAQUE. - QProcess The directory separators for the current working directory are now converted properly, so that a UNC path can be used on Windows. - QTranslator Fixed an issue with isReadable() on NTFS. - QWindowsXPStyle XP style now works when compiled as a plugin. Fixed menu bar placement. Fixed a bug in setting the background color of QTabWidget. Fixed the position of the size grip in large QSizeGrip widgets. QGroupBox now uses the correct colors. - QWorkspace Fixed bug where hidden windows would be shown after restoring from maximized mode. - qmake The Makefile generator now only searches for the latest version of the Qt library, as opposed to searching all libraries. Dependency checking for pre-compiled headers were fixed. Fixed support for listing .pro files in SUBDIRS in subdir .pro files. Fixed support for multiple -L and -I entries in QMAKE_LIBS. Mac: - Build system When using Xcode, the optimization level is set to 0 in debug mode. Added support for Xcode 2.1 and up. Fixed copying of target files when DESTDIR is set. - Drag & drop Fixed a crash when deleting the drag object before dropping. - QApplication The default font is now only set if the user has not set one. Fixed a problem where popup menus would not go away after releasing the mouse button outside the popup. Added support for dual axis mouse wheels. Fixed a bug in tablet identification. Added support for tablet erasers. Fixed a deadlock in postEvent() when there was contention for a wakeup. Fixed a crash when switching displays at the same time as QApplication is destroyed. Stability fixes. - QColorDialog Fixed modality support. - QFileDialog Let the file dialog remember the previous directory. Fixed keyboard navigation when jumping to entries using the first letter of a file name. Fixed a memory leak. - QFontDatabase Fall back to the "Geneva" font, which is guaranteed to be available, instead of "Helvetica". - QFontEngine Fixed a memory leak. Fixed rendering of glyphs that modify previous glyphs, including Indic text. - QMacStyle Title bars are now shown as deactivated when the window is deactivated. Fixed a bug where buttons in button groups inside a container would look like they were pressed. Fixed a crash caused by drawing onto a non-pixmap background. Fixed the width of QComboBox. Improved drawing of size grips. Improved drawing of sliders, and made QSlider slightly wider by default. - QMenuBar Fixed a lockup caused by menu items ending with an '&'. Menu items with disabled popups are now also disabled. - QMessageBox The resize handle is now shown. - QPainter Fixed double transformation of ellipses with a transformed width or height of 1. - QPixmap Fixed a crash when loading a cursor from an embedded image. The color depth is now set properly when converting a QBitmap. - QPrinter Fixed a crash when using bitBlt() to copy a QBitmap onto a printer. - QProcess Fixed support for launching bundles. - QPushButton Icons are now drawn properly. - QTextBrowser Fixed a bug where a text browser popup triggered by a hyperlink would pop up again when the user clicks inside the first popup. - QToolButton Fixed a painting problem when the button was pressed. - QWidget Menubar popups no longer steal focus from QTextEdit. Fixed collapsing of windows with no title bar decorations. Several window activation bugs have been fixed. Fixed a bug where modal dialogs would be modal to its own children. Fixed tablet support for multiple screens. Fixed a memory leak. X11: - Build system Removed aliasing/redefinitions of the 'which' command to fix failures in the configure script on certain Unix systems. Added some missing flags for the yacc tool on 64-bit Linux. The -fn application command line option, which selects the default application font, works again. Fixed copying of target files when DESTDIR is set. - Drag and drop Fixed a crash in the dragging application when the drop target crashes. Fixed a bug in finding the widget under the cursor while dragging. Some problems were fixed with the internal timestamp in the drop event. - OpenGL Fixed colors when rendering using glColor() onto an 8 bit pixmap. - QApplication Support the F11 and F12 keys on Sun keyboards. - QCanvasView Support multiple shared views of a single canvas on multiple X11 screens. - QClipboard Fixed a rare crash related to cut & paste with the Motif extension. - QFontDatabase Fixed a bug where QFontInfo would return an empty family and point size after trying to select a font that was not installed on the system. - QFontEngine Fixed a bug where scaling italic fonts would sometimes cut overhangs. - QInputContext Fixed a bug that led to a corrupted display in QLineEdit and QTextEdit when using Japanese input methods with very long input selections. - QPainter Fixed a crash when setting a pen on an inactive painter. - QPrinter Fixed printing on Tru64 by removing the -o argument to the lp command. - QScriptEngine Added support for Khmer fonts. Fixed shaping of Telugu text. Fixed a crash when scaling Japanese XLFD fonts by a factor of 1000. Embedded: - QApplication Fixed a memory leak. - VNC driver Fixed a memory leak. - QWidget Fixed a potential crash when reparenting widgets. --- changes-3.3.4 DELETED --- |
Update of /cvsroot/kde-cygwin/qt-3/src/3rdparty/zlib/projects/visualc6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13083/src/3rdparty/zlib/projects/visualc6 Modified Files: Tag: QT_WIN32_3_3_BRANCH README.txt example.dsp minigzip.dsp zlib.dsp zlib.dsw Log Message: Index: README.txt =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/zlib/projects/visualc6/README.txt,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- README.txt 9 Apr 2005 11:20:18 -0000 1.1.1.1.2.1 +++ README.txt 30 Sep 2005 15:26:53 -0000 1.1.1.1.2.2 @@ -1,38 +1,38 @@ -Microsoft Developer Studio Project Files, Format Version 6.00 for zlib. - -Copyright (C) 2000-2004 Simon-Pierre Cadieux. -Copyright (C) 2004 Cosmin Truta. -For conditions of distribution and use, see copyright notice in zlib.h. - - -To use: - -1) On the main menu, select "File | Open Workspace". - Open "zlib.dsw". - -2) Select "Build | Set Active Configuration". - Choose the configuration you wish to build. - -3) Select "Build | Clean". - -4) Select "Build | Build ... (F7)". Ignore warning messages about - not being able to find certain include files (e.g. alloc.h). - -5) If you built one of the sample programs (example or minigzip), - select "Build | Execute ... (Ctrl+F5)". - - -This project builds the zlib binaries as follows: - -* Win32_DLL_Release\zlib1.dll DLL build -* Win32_DLL_Debug\zlib1d.dll DLL build (debug version) -* Win32_DLL_ASM_Release\zlib1.dll DLL build using ASM code -* Win32_DLL_ASM_Debug\zlib1d.dll DLL build using ASM code (debug version) -* Win32_LIB_Release\zlib.lib static build -* Win32_LIB_Debug\zlibd.lib static build (debug version) -* Win32_LIB_ASM_Release\zlib.lib static build using ASM code -* Win32_LIB_ASM_Debug\zlibd.lib static build using ASM code (debug version) - - -For more information regarding the DLL builds, please see the DLL FAQ -in ..\..\win32\DLL_FAQ.txt. +Microsoft Developer Studio Project Files, Format Version 6.00 for zlib. + +Copyright (C) 2000-2004 Simon-Pierre Cadieux. +Copyright (C) 2004 Cosmin Truta. +For conditions of distribution and use, see copyright notice in zlib.h. + + +To use: + +1) On the main menu, select "File | Open Workspace". + Open "zlib.dsw". + +2) Select "Build | Set Active Configuration". + Choose the configuration you wish to build. + +3) Select "Build | Clean". + +4) Select "Build | Build ... (F7)". Ignore warning messages about + not being able to find certain include files (e.g. alloc.h). + +5) If you built one of the sample programs (example or minigzip), + select "Build | Execute ... (Ctrl+F5)". + + +This project builds the zlib binaries as follows: + +* Win32_DLL_Release\zlib1.dll DLL build +* Win32_DLL_Debug\zlib1d.dll DLL build (debug version) +* Win32_DLL_ASM_Release\zlib1.dll DLL build using ASM code +* Win32_DLL_ASM_Debug\zlib1d.dll DLL build using ASM code (debug version) +* Win32_LIB_Release\zlib.lib static build +* Win32_LIB_Debug\zlibd.lib static build (debug version) +* Win32_LIB_ASM_Release\zlib.lib static build using ASM code +* Win32_LIB_ASM_Debug\zlibd.lib static build using ASM code (debug version) + + +For more information regarding the DLL builds, please see the DLL FAQ +in ..\..\win32\DLL_FAQ.txt. Index: example.dsp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/zlib/projects/visualc6/example.dsp,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- example.dsp 9 Apr 2005 11:20:18 -0000 1.1.1.1.2.1 +++ example.dsp 30 Sep 2005 15:26:53 -0000 1.1.1.1.2.2 @@ -1,278 +1,278 @@ -# Microsoft Developer Studio Project File - Name="example" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=example - Win32 LIB Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "example.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "example.mak" CFG="example - Win32 LIB Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "example - Win32 DLL Release" (based on "Win32 (x86) Console Application") -!MESSAGE "example - Win32 DLL Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "example - Win32 DLL ASM Release" (based on "Win32 (x86) Console Application") -!MESSAGE "example - Win32 DLL ASM Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "example - Win32 LIB Release" (based on "Win32 (x86) Console Application") -!MESSAGE "example - Win32 LIB Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "example - Win32 LIB ASM Release" (based on "Win32 (x86) Console Application") -!MESSAGE "example - Win32 LIB ASM Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "example - Win32 DLL Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "example___Win32_DLL_Release" -# PROP BASE Intermediate_Dir "example___Win32_DLL_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Win32_DLL_Release" -# PROP Intermediate_Dir "Win32_DLL_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 zlib1.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_DLL_Release" - -!ELSEIF "$(CFG)" == "example - Win32 DLL Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "example___Win32_DLL_Debug" -# PROP BASE Intermediate_Dir "example___Win32_DLL_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Win32_DLL_Debug" -# PROP Intermediate_Dir "Win32_DLL_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 zlib1d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_DLL_Debug" - -!ELSEIF "$(CFG)" == "example - Win32 DLL ASM Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "example___Win32_DLL_ASM_Release" -# PROP BASE Intermediate_Dir "example___Win32_DLL_ASM_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Win32_DLL_ASM_Release" -# PROP Intermediate_Dir "Win32_DLL_ASM_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 zlib1.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_DLL_ASM_Release" - -!ELSEIF "$(CFG)" == "example - Win32 DLL ASM Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "example___Win32_DLL_ASM_Debug" -# PROP BASE Intermediate_Dir "example___Win32_DLL_ASM_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Win32_DLL_ASM_Debug" -# PROP Intermediate_Dir "Win32_DLL_ASM_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 zlib1d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_DLL_ASM_Debug" - -!ELSEIF "$(CFG)" == "example - Win32 LIB Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "example___Win32_LIB_Release" -# PROP BASE Intermediate_Dir "example___Win32_LIB_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Win32_LIB_Release" -# PROP Intermediate_Dir "Win32_LIB_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 zlib.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_LIB_Release" - -!ELSEIF "$(CFG)" == "example - Win32 LIB Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "example___Win32_LIB_Debug" -# PROP BASE Intermediate_Dir "example___Win32_LIB_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Win32_LIB_Debug" -# PROP Intermediate_Dir "Win32_LIB_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 zlibd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_LIB_Debug" - -!ELSEIF "$(CFG)" == "example - Win32 LIB ASM Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "example___Win32_LIB_ASM_Release" -# PROP BASE Intermediate_Dir "example___Win32_LIB_ASM_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Win32_LIB_ASM_Release" -# PROP Intermediate_Dir "Win32_LIB_ASM_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 zlib.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_LIB_ASM_Release" - -!ELSEIF "$(CFG)" == "example - Win32 LIB ASM Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "example___Win32_LIB_ASM_Debug" -# PROP BASE Intermediate_Dir "example___Win32_LIB_ASM_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Win32_LIB_ASM_Debug" -# PROP Intermediate_Dir "Win32_LIB_ASM_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 zlibd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_LIB_ASM_Debug" - -!ENDIF - -# Begin Target - -# Name "example - Win32 DLL Release" -# Name "example - Win32 DLL Debug" -# Name "example - Win32 DLL ASM Release" -# Name "example - Win32 DLL ASM Debug" -# Name "example - Win32 LIB Release" -# Name "example - Win32 LIB Debug" -# Name "example - Win32 LIB ASM Release" -# Name "example - Win32 LIB ASM Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\example.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\zconf.h -# End Source File -# Begin Source File - -SOURCE=..\..\zlib.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="example" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=example - Win32 LIB Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "example.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "example.mak" CFG="example - Win32 LIB Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "example - Win32 DLL Release" (based on "Win32 (x86) Console Application") +!MESSAGE "example - Win32 DLL Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "example - Win32 DLL ASM Release" (based on "Win32 (x86) Console Application") +!MESSAGE "example - Win32 DLL ASM Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "example - Win32 LIB Release" (based on "Win32 (x86) Console Application") +!MESSAGE "example - Win32 LIB Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "example - Win32 LIB ASM Release" (based on "Win32 (x86) Console Application") +!MESSAGE "example - Win32 LIB ASM Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "example - Win32 DLL Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "example___Win32_DLL_Release" +# PROP BASE Intermediate_Dir "example___Win32_DLL_Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Win32_DLL_Release" +# PROP Intermediate_Dir "Win32_DLL_Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 zlib1.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_DLL_Release" + +!ELSEIF "$(CFG)" == "example - Win32 DLL Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "example___Win32_DLL_Debug" +# PROP BASE Intermediate_Dir "example___Win32_DLL_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Win32_DLL_Debug" +# PROP Intermediate_Dir "Win32_DLL_Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 zlib1d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_DLL_Debug" + +!ELSEIF "$(CFG)" == "example - Win32 DLL ASM Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "example___Win32_DLL_ASM_Release" +# PROP BASE Intermediate_Dir "example___Win32_DLL_ASM_Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Win32_DLL_ASM_Release" +# PROP Intermediate_Dir "Win32_DLL_ASM_Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 zlib1.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_DLL_ASM_Release" + +!ELSEIF "$(CFG)" == "example - Win32 DLL ASM Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "example___Win32_DLL_ASM_Debug" +# PROP BASE Intermediate_Dir "example___Win32_DLL_ASM_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Win32_DLL_ASM_Debug" +# PROP Intermediate_Dir "Win32_DLL_ASM_Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 zlib1d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_DLL_ASM_Debug" + +!ELSEIF "$(CFG)" == "example - Win32 LIB Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "example___Win32_LIB_Release" +# PROP BASE Intermediate_Dir "example___Win32_LIB_Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Win32_LIB_Release" +# PROP Intermediate_Dir "Win32_LIB_Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 zlib.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_LIB_Release" + +!ELSEIF "$(CFG)" == "example - Win32 LIB Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "example___Win32_LIB_Debug" +# PROP BASE Intermediate_Dir "example___Win32_LIB_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Win32_LIB_Debug" +# PROP Intermediate_Dir "Win32_LIB_Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 zlibd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_LIB_Debug" + +!ELSEIF "$(CFG)" == "example - Win32 LIB ASM Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "example___Win32_LIB_ASM_Release" +# PROP BASE Intermediate_Dir "example___Win32_LIB_ASM_Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Win32_LIB_ASM_Release" +# PROP Intermediate_Dir "Win32_LIB_ASM_Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 zlib.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_LIB_ASM_Release" + +!ELSEIF "$(CFG)" == "example - Win32 LIB ASM Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "example___Win32_LIB_ASM_Debug" +# PROP BASE Intermediate_Dir "example___Win32_LIB_ASM_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Win32_LIB_ASM_Debug" +# PROP Intermediate_Dir "Win32_LIB_ASM_Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 zlibd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_LIB_ASM_Debug" + +!ENDIF + +# Begin Target + +# Name "example - Win32 DLL Release" +# Name "example - Win32 DLL Debug" +# Name "example - Win32 DLL ASM Release" +# Name "example - Win32 DLL ASM Debug" +# Name "example - Win32 LIB Release" +# Name "example - Win32 LIB Debug" +# Name "example - Win32 LIB ASM Release" +# Name "example - Win32 LIB ASM Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\example.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\zconf.h +# End Source File +# Begin Source File + +SOURCE=..\..\zlib.h +# End Source File +# End Group +# End Target +# End Project Index: minigzip.dsp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/zlib/projects/visualc6/minigzip.dsp,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- minigzip.dsp 9 Apr 2005 11:20:18 -0000 1.1.1.1.2.1 +++ minigzip.dsp 30 Sep 2005 15:26:53 -0000 1.1.1.1.2.2 @@ -1,278 +1,278 @@ -# Microsoft Developer Studio Project File - Name="minigzip" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=minigzip - Win32 LIB Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "minigzip.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "minigzip.mak" CFG="minigzip - Win32 LIB Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "minigzip - Win32 DLL Release" (based on "Win32 (x86) Console Application") -!MESSAGE "minigzip - Win32 DLL Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "minigzip - Win32 DLL ASM Release" (based on "Win32 (x86) Console Application") -!MESSAGE "minigzip - Win32 DLL ASM Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "minigzip - Win32 LIB Release" (based on "Win32 (x86) Console Application") -!MESSAGE "minigzip - Win32 LIB Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "minigzip - Win32 LIB ASM Release" (based on "Win32 (x86) Console Application") -!MESSAGE "minigzip - Win32 LIB ASM Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "minigzip - Win32 DLL Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "minigzip___Win32_DLL_Release" -# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Win32_DLL_Release" -# PROP Intermediate_Dir "Win32_DLL_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 zlib1.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_DLL_Release" - -!ELSEIF "$(CFG)" == "minigzip - Win32 DLL Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "minigzip___Win32_DLL_Debug" -# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Win32_DLL_Debug" -# PROP Intermediate_Dir "Win32_DLL_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 zlib1d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_DLL_Debug" - -!ELSEIF "$(CFG)" == "minigzip - Win32 DLL ASM Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "minigzip___Win32_DLL_ASM_Release" -# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_ASM_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Win32_DLL_ASM_Release" -# PROP Intermediate_Dir "Win32_DLL_ASM_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 zlib1.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_DLL_ASM_Release" - -!ELSEIF "$(CFG)" == "minigzip - Win32 DLL ASM Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "minigzip___Win32_DLL_ASM_Debug" -# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_ASM_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Win32_DLL_ASM_Debug" -# PROP Intermediate_Dir "Win32_DLL_ASM_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 zlib1d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_DLL_ASM_Debug" - -!ELSEIF "$(CFG)" == "minigzip - Win32 LIB Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "minigzip___Win32_LIB_Release" -# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Win32_LIB_Release" -# PROP Intermediate_Dir "Win32_LIB_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 zlib.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_LIB_Release" - -!ELSEIF "$(CFG)" == "minigzip - Win32 LIB Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "minigzip___Win32_LIB_Debug" -# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Win32_LIB_Debug" -# PROP Intermediate_Dir "Win32_LIB_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 zlibd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_LIB_Debug" - -!ELSEIF "$(CFG)" == "minigzip - Win32 LIB ASM Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "minigzip___Win32_LIB_ASM_Release" -# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_ASM_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Win32_LIB_ASM_Release" -# PROP Intermediate_Dir "Win32_LIB_ASM_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 zlib.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_LIB_ASM_Release" - -!ELSEIF "$(CFG)" == "minigzip - Win32 LIB ASM Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "minigzip___Win32_LIB_ASM_Debug" -# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_ASM_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Win32_LIB_ASM_Debug" -# PROP Intermediate_Dir "Win32_LIB_ASM_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 zlibd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_LIB_ASM_Debug" - -!ENDIF - -# Begin Target - -# Name "minigzip - Win32 DLL Release" -# Name "minigzip - Win32 DLL Debug" -# Name "minigzip - Win32 DLL ASM Release" -# Name "minigzip - Win32 DLL ASM Debug" -# Name "minigzip - Win32 LIB Release" -# Name "minigzip - Win32 LIB Debug" -# Name "minigzip - Win32 LIB ASM Release" -# Name "minigzip - Win32 LIB ASM Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\minigzip.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\zconf.h -# End Source File -# Begin Source File - -SOURCE=..\..\zlib.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="minigzip" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=minigzip - Win32 LIB Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "minigzip.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "minigzip.mak" CFG="minigzip - Win32 LIB Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "minigzip - Win32 DLL Release" (based on "Win32 (x86) Console Application") +!MESSAGE "minigzip - Win32 DLL Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "minigzip - Win32 DLL ASM Release" (based on "Win32 (x86) Console Application") +!MESSAGE "minigzip - Win32 DLL ASM Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "minigzip - Win32 LIB Release" (based on "Win32 (x86) Console Application") +!MESSAGE "minigzip - Win32 LIB Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "minigzip - Win32 LIB ASM Release" (based on "Win32 (x86) Console Application") +!MESSAGE "minigzip - Win32 LIB ASM Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "minigzip - Win32 DLL Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "minigzip___Win32_DLL_Release" +# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Win32_DLL_Release" +# PROP Intermediate_Dir "Win32_DLL_Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 zlib1.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_DLL_Release" + +!ELSEIF "$(CFG)" == "minigzip - Win32 DLL Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "minigzip___Win32_DLL_Debug" +# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Win32_DLL_Debug" +# PROP Intermediate_Dir "Win32_DLL_Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 zlib1d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_DLL_Debug" + +!ELSEIF "$(CFG)" == "minigzip - Win32 DLL ASM Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "minigzip___Win32_DLL_ASM_Release" +# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_ASM_Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Win32_DLL_ASM_Release" +# PROP Intermediate_Dir "Win32_DLL_ASM_Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 zlib1.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_DLL_ASM_Release" + +!ELSEIF "$(CFG)" == "minigzip - Win32 DLL ASM Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "minigzip___Win32_DLL_ASM_Debug" +# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_ASM_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Win32_DLL_ASM_Debug" +# PROP Intermediate_Dir "Win32_DLL_ASM_Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 zlib1d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_DLL_ASM_Debug" + +!ELSEIF "$(CFG)" == "minigzip - Win32 LIB Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "minigzip___Win32_LIB_Release" +# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Win32_LIB_Release" +# PROP Intermediate_Dir "Win32_LIB_Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 zlib.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_LIB_Release" + +!ELSEIF "$(CFG)" == "minigzip - Win32 LIB Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "minigzip___Win32_LIB_Debug" +# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Win32_LIB_Debug" +# PROP Intermediate_Dir "Win32_LIB_Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 zlibd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_LIB_Debug" + +!ELSEIF "$(CFG)" == "minigzip - Win32 LIB ASM Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "minigzip___Win32_LIB_ASM_Release" +# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_ASM_Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Win32_LIB_ASM_Release" +# PROP Intermediate_Dir "Win32_LIB_ASM_Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 zlib.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_LIB_ASM_Release" + +!ELSEIF "$(CFG)" == "minigzip - Win32 LIB ASM Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "minigzip___Win32_LIB_ASM_Debug" +# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_ASM_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Win32_LIB_ASM_Debug" +# PROP Intermediate_Dir "Win32_LIB_ASM_Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 zlibd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_LIB_ASM_Debug" + +!ENDIF + +# Begin Target + +# Name "minigzip - Win32 DLL Release" +# Name "minigzip - Win32 DLL Debug" +# Name "minigzip - Win32 DLL ASM Release" +# Name "minigzip - Win32 DLL ASM Debug" +# Name "minigzip - Win32 LIB Release" +# Name "minigzip - Win32 LIB Debug" +# Name "minigzip - Win32 LIB ASM Release" +# Name "minigzip - Win32 LIB ASM Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\minigzip.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\zconf.h +# End Source File +# Begin Source File + +SOURCE=..\..\zlib.h +# End Source File +# End Group +# End Target +# End Project Index: zlib.dsp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/zlib/projects/visualc6/zlib.dsp,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- zlib.dsp 9 Apr 2005 11:20:18 -0000 1.1.1.1.2.1 +++ zlib.dsp 30 Sep 2005 15:26:53 -0000 1.1.1.1.2.2 @@ -1,609 +1,609 @@ -# Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=zlib - Win32 LIB Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE [...1187 lines suppressed...] +# Begin Custom Build - Assembling... +IntDir=.\Win32_LIB_ASM_Debug +InputPath=..\..\contrib\masmx86\inffas32.asm +InputName=inffas32 + +"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + ml /nologo /c /Cx /coff /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + +# End Custom Build + +!ENDIF + +# End Source File +# End Group +# Begin Source File + +SOURCE=.\README.txt +# End Source File +# End Target +# End Project Index: zlib.dsw =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/zlib/projects/visualc6/zlib.dsw,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- zlib.dsw 9 Apr 2005 11:20:18 -0000 1.1.1.1.2.1 +++ zlib.dsw 30 Sep 2005 15:26:53 -0000 1.1.1.1.2.2 @@ -1,59 +1,59 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "example"=.\example.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - -Project: "minigzip"=.\minigzip.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - -Project: "zlib"=.\zlib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "example"=.\example.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency +}}} + +############################################################################### + +Project: "minigzip"=.\minigzip.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name zlib + End Project Dependency +}}} + +############################################################################### + +Project: "zlib"=.\zlib.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + |
|
From: Christian E. <che...@us...> - 2005-09-30 15:27:08
|
Update of /cvsroot/kde-cygwin/qt-3/src/3rdparty In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13083/src/3rdparty Added Files: Tag: QT_WIN32_3_3_BRANCH Makefile Log Message: --- NEW FILE: Makefile --- PNGMAK=scripts/makefile.linux all: cd zlib; ./configure; make cd libpng; make -f $(PNGMAK) clean: -cd zlib; make clean -cd libpng; make -f $(PNGMAK) clean |
|
From: Christian E. <che...@us...> - 2005-09-30 15:27:08
|
Update of /cvsroot/kde-cygwin/qt-3/extensions/nsplugin/examples/grapher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13083/extensions/nsplugin/examples/grapher Modified Files: Tag: QT_WIN32_3_3_BRANCH grapher.rc Log Message: Index: grapher.rc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/extensions/nsplugin/examples/grapher/grapher.rc,v retrieving revision 1.1.1.5 retrieving revision 1.1.1.6 diff -u -r1.1.1.5 -r1.1.1.6 --- grapher.rc 22 Sep 2005 12:59:05 -0000 1.1.1.5 +++ grapher.rc 30 Sep 2005 15:26:52 -0000 1.1.1.6 @@ -1,36 +1,36 @@ - -1 VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "Trolltech\0" - VALUE "FileDescription", "grapher\0" - VALUE "FileExtents", "g1n\0" - VALUE "FileOpenName", "Graphable data (*.g1n)\0" - VALUE "FileVersion", "1, 0, 0, 1\0" - VALUE "InternalName", "grapher\0" - VALUE "LegalCopyright", "Copyright © 1997 Trolltech AS\0" - VALUE "MIMEType", "application/x-graphable\0" - VALUE "OriginalFilename", "grapher.dll\0" - VALUE "ProductName", "Trolltech grapher\0" - VALUE "ProductVersion", "1, 0, 0, 1\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END + +1 VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "Trolltech\0" + VALUE "FileDescription", "grapher\0" + VALUE "FileExtents", "g1n\0" + VALUE "FileOpenName", "Graphable data (*.g1n)\0" + VALUE "FileVersion", "1, 0, 0, 1\0" + VALUE "InternalName", "grapher\0" + VALUE "LegalCopyright", "Copyright © 1997 Trolltech AS\0" + VALUE "MIMEType", "application/x-graphable\0" + VALUE "OriginalFilename", "grapher.dll\0" + VALUE "ProductName", "Trolltech grapher\0" + VALUE "ProductVersion", "1, 0, 0, 1\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END |
|
From: Christian E. <che...@us...> - 2005-09-30 15:22:49
|
Update of /cvsroot/kde-cygwin/qt-3/doc/man/man1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9971/doc/man/man1 Modified Files: Tag: QT_WIN32_3_3_BRANCH moc.1 Log Message: |
Update of /cvsroot/kde-cygwin/qt-3/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9971/doc Modified Files: Tag: QT_WIN32_3_3_BRANCH i18n.doc indices.doc installation.doc integration.doc layout.doc mac.doc makeqpf.doc Log Message: Index: i18n.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/i18n.doc,v retrieving revision 1.1.1.7 retrieving revision 1.1.1.8 diff -u -r1.1.1.7 -r1.1.1.8 --- i18n.doc 27 Aug 2004 21:24:13 -0000 1.1.1.7 +++ i18n.doc 30 Sep 2005 15:22:33 -0000 1.1.1.8 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Explanation of moc and the meta object system ** -** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** @@ -43,6 +43,8 @@ The internationalization of an application is the process of making the application usable by people in countries other than one's own. +\tableofcontents + In some cases internationalization is simple, for example, making a US application accessible to Australian or British users may require little more than a few spelling corrections. But to make a US @@ -169,7 +171,7 @@ QString, and QChar are just like easier versions of the crude const char* and char from traditional C. -\section2 Use \link QObject::tr() tr()\endlink for all Literal Text +\section2 Use tr() for all Literal Text Wherever your program uses \c{"quoted text"} for text that will be presented to the user, ensure that it is processed by the \l @@ -180,8 +182,8 @@ \code LoginWidget::LoginWidget() { - QLabel *label = new QLabel( tr("Password:"), this ); - ... + QLabel *label = new QLabel( tr("Password:"), this ); + ... } \endcode @@ -196,15 +198,15 @@ \code void some_global_function( LoginWidget *logwid ) { - QLabel *label = new QLabel( - LoginWidget::tr("Password:"), logwid ); + QLabel *label = new QLabel( + LoginWidget::tr("Password:"), logwid ); } void same_global_function( LoginWidget *logwid ) { - QLabel *label = new QLabel( - qApp->translate("LoginWidget", "Password:"), - logwid ); + QLabel *label = new QLabel( + qApp->translate("LoginWidget", "Password:"), + logwid ); } \endcode @@ -218,30 +220,30 @@ \code QString FriendlyConversation::greeting( int greet_type ) { - static const char* greeting_strings[] = { - QT_TR_NOOP( "Hello" ), - QT_TR_NOOP( "Goodbye" ) - }; - return tr( greeting_strings[greet_type] ); + static const char* greeting_strings[] = { + QT_TR_NOOP( "Hello" ), + QT_TR_NOOP( "Goodbye" ) + }; + return tr( greeting_strings[greet_type] ); } \endcode Example of QT_TRANSLATE_NOOP(): \code static const char* greeting_strings[] = { - QT_TRANSLATE_NOOP( "FriendlyConversation", "Hello" ), - QT_TRANSLATE_NOOP( "FriendlyConversation", "Goodbye" ) + QT_TRANSLATE_NOOP( "FriendlyConversation", "Hello" ), + QT_TRANSLATE_NOOP( "FriendlyConversation", "Goodbye" ) }; QString FriendlyConversation::greeting( int greet_type ) { - return tr( greeting_strings[greet_type] ); + return tr( greeting_strings[greet_type] ); } QString global_greeting( int greet_type ) { - return qApp->translate( "FriendlyConversation", - greeting_strings[greet_type] ); + return qApp->translate( "FriendlyConversation", + greeting_strings[greet_type] ); } \endcode @@ -267,7 +269,7 @@ \code QPopupMenu *file = new QPopupMenu( this ); file->insertItem( tr("&Quit"), this, SLOT(quit()), - QKeySequence(tr("Ctrl+Q", "File|Quit")) ); + QKeySequence(tr("Ctrl+Q", "File|Quit")) ); \endcode \section2 Use QString::arg() for Dynamic Text @@ -276,12 +278,12 @@ arguments: \code void FileCopier::showProgress( int done, int total, - const QString& current_file ) + const QString& current_file ) { - label.setText( tr("%1 of %2 files copied.\nCopying: %3") - .arg(done) - .arg(total) - .arg(current_file) ); + label.setText( tr("%1 of %2 files copied.\nCopying: %3") + .arg(done) + .arg(total) + .arg(current_file) ); } \endcode @@ -291,7 +293,7 @@ \code QString s1 = "%1 of %2 files copied. Copying: %3"; QString s2 = "Kopierer nu %3. Av totalt %2 filer er %1 kopiert."; - + qDebug( s1.arg(5).arg(10).arg("somefile.txt").ascii() ); qDebug( s2.arg(5).arg(10).arg("somefile.txt").ascii() ); \endcode @@ -343,15 +345,15 @@ \code HEADERS = funnydialog.h \ - wackywidget.h + wackywidget.h SOURCES = funnydialog.cpp \ - main.cpp \ - wackywidget.cpp + main.cpp \ + wackywidget.cpp FORMS = fancybox.ui TRANSLATIONS = superapp_dk.ts \ - superapp_fi.ts \ - superapp_no.ts \ - superapp_se.ts + superapp_fi.ts \ + superapp_no.ts \ + superapp_se.ts \endcode When you run \e lupdate or \e lrelease, you must give the name of the @@ -394,21 +396,21 @@ \code int main( int argc, char **argv ) { - QApplication app( argc, argv ); + QApplication app( argc, argv ); - // translation file for Qt - QTranslator qt( 0 ); - qt.load( QString( "qt_" ) + QTextCodec::locale(), "." ); - app.installTranslator( &qt ); + // translation file for Qt + QTranslator qt( 0 ); + qt.load( QString( "qt_" ) + QTextCodec::locale(), "." ); + app.installTranslator( &qt ); - // translation file for application strings - QTranslator myapp( 0 ); - myapp.load( QString( "myapp_" ) + QTextCodec::locale(), "." ); - app.installTranslator( &myapp ); + // translation file for application strings + QTranslator myapp( 0 ); + myapp.load( QString( "myapp_" ) + QTextCodec::locale(), "." ); + app.installTranslator( &myapp ); - ... + ... - return app.exec(); + return app.exec(); } \endcode @@ -494,11 +496,11 @@ \code void Clock::setTime(const QTime& t) { - if ( tr("AMPM") == "AMPM" ) { - // 12-hour clock - } else { - // 24-hour clock - } + if ( tr("AMPM") == "AMPM" ) { + // 12-hour clock + } else { + // 24-hour clock + } } \endcode @@ -511,6 +513,29 @@ appropriate for all localities, rather than relying on local puns or stretched metaphors. +\section1 Dynamic Translation + +Some applications, such as Qt Linguist, must be able to support changes +to the user's language settings while they are still running. To make +widgets aware of changes to the system language, implement a public +slot called \c languageChange() in each widget that needs to be notified. +In this slot, you should update the text displayed by widgets using the +\l{QObject::tr()}{tr()} function in the usual way; for example: + +\code +void MyWidget::languageChange() +{ + titleLabel->setText(tr("Document Title")); + ... + okPushButton->setText(tr("&OK")); +} +\endcode + +The default event handler for QWidget subclasses responds to the +\link QEvent::Type LanguageChange\endlink event, and will call this slot +when necessary; other application components can also connect signals +to this slot to force widgets to update themselves. + \section1 System Support Some of the operating systems and windowing systems that Qt runs on @@ -531,7 +556,7 @@ but convert filenames to the local 8-bit encoding, as this is the Unix convention (see QFile::setEncodingFunction() - to explore alternative encodings). + to explore alternative encodings). \i File I/O defaults to the local 8-bit encoding, with Unicode options in QTextStream. \endlist Index: indices.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/indices.doc,v retrieving revision 1.1.1.11 retrieving revision 1.1.1.12 diff -u -r1.1.1.11 -r1.1.1.12 --- indices.doc 9 Apr 2005 10:35:15 -0000 1.1.1.11 +++ indices.doc 30 Sep 2005 15:22:33 -0000 1.1.1.12 @@ -1,803 +1,804 @@ -/**************************************************************************** -** -** -** Miscellaneous index pages -** -** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. -** -** This file is part of the Qt GUI Toolkit. -** -** This file may be distributed under the terms of the Q Public License -** as defined by Trolltech AS of Norway and appearing in the file [...1576 lines suppressed...] + +\title XML + +These classes are relevant to XML users. +*/ + +/*! \defgroup qws + +\title Qt/Embedded + +These classes are relevant to Qt/Embedded users. +*/ + +/*! \defgroup text + +\title Text Related Classes + +These classes are relevant to text processing. See also the +\link xml.html XML classes \endlink. +*/ Index: installation.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/installation.doc,v retrieving revision 1.1.1.5 retrieving revision 1.1.1.6 diff -u -r1.1.1.5 -r1.1.1.6 --- installation.doc 27 Aug 2004 21:24:13 -0000 1.1.1.5 +++ installation.doc 30 Sep 2005 15:22:33 -0000 1.1.1.6 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Installation page ** -** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** Index: integration.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/integration.doc,v retrieving revision 1.1.1.5 retrieving revision 1.1.1.6 diff -u -r1.1.1.5 -r1.1.1.6 --- integration.doc 9 Apr 2005 10:35:15 -0000 1.1.1.5 +++ integration.doc 30 Sep 2005 15:22:33 -0000 1.1.1.6 @@ -1,162 +1,162 @@ -/**************************************************************************** -** -** -** Documentation of Visual Studio Integration Plugin -** -** Copyright (C) 2003 Trolltech AS. All rights reserved. -** -** This file is part of the Qt GUI Toolkit. -** -** This file may be distributed under the terms of the Q Public License -** as defined by Trolltech AS of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt 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. -** -** See http://www.trolltech.com/pricing.html or email sa...@tr... for -** information about Qt Commercial License Agreements. -** See http://www.trolltech.com/qpl/ for QPL licensing information. -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact in...@tr... if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ - -/*! - \page integration.html - - \title About the Visual Studio Integration Plugin - - The Visual Studio Integration Plugin is currently available only to users of - Visual Studio 6, it offers simple ways of doing common tasks when writing a - Qt application. - - \tableofcontents - - \section1 How to install the Visual Studio Integration Plugin - - When you install Qt, the integration plugin should be installed for you, - and ready for use. However, sometimes this does not happen properly, so - you need to manually carry out the following steps. - - \list - \i Ensure that the file '%MSDevDir%\\addins\\qmsdev.dll' exists. - \i Start Visual Studio, if it isn't already running. - \i Select Tools|Customize|Add-ins and Macro Files. - \i Ensure the checkbox to the left of the "QMsDev Developer Studio-Add-In" add-in is checked. - \i Click Close. - \endlist - - Now the integration plugin should be properly installed. If this doesn't - work, then contact Trolltech technical support giving details of - what went wrong. - - \section1 How to uninstall the Visual Studio Integration Plugin - - When you want to uninstall the integration plugin, just carry out the - following steps. - - \list - \i Close down any instances of Visual Studio. - \i Delete the file '%MSDevDir%\\addins\\qmsdev.dll' - \endlist - - \section1 What can the Visual Studio Integration Plugin do? - - The integration plugin adds the following options to Visual Studio: - - \list - \i New Qt Project - \i New Qt Dialog - \i Qt Designer - \i Open Qt Project - \i Write Qt Project - \i Use Qt In Current Project - \i Add MOC - \endlist - - \section2 Using the 'New Qt Project' button - - The 'New Qt Project' button allows you to create a simple Qt project - ready for development. Simply fill in the form and if you select - 'Dialog' or 'Main Window' without MDI support then it will - automatically start up \e{Qt Designer}. When you have finished with - the form in \e{Qt Designer} just save it and it will appear in a - ready made Qt project. - - If you select 'Main Window' with 'MDI Support' then it will simply - give you a code skeleton in a project ready for you to populate with - your own code. - - \section2 Using the 'New Qt Dialog' button - - The 'New Qt Dialog' button works in two ways: You can use it to create a new - dialog for your project; or you can use it to insert an existing - dialog into your project. - - If you want to create a new dialog then all you need to do is specify where - the dialog file should be saved and give it a name. This will start up - \e{Qt Designer} to allow you to design your new dialog, and will add it to - the existing project. - - If you want to add an existing dialog to your project, then just select the - relevant \c .ui file. This will then add it to your existing project and add - the relevant steps to create the generated code. - - \section2 Using the 'Qt Designer' button - - The 'Qt Designer' button simply starts up \e{Qt Designer}, it has no ties to - your existing project so whatever you do with it will not affect your - existing projects. It can also be started up by using the Ctrl+Shift+D key - combination in Visual Studio. - - \section2 Using the 'Open Qt Project' button - - The 'Open Qt Project' button allows you to convert an existing \c - qmake project file into a \c .dsp file which you can insert into - your existing workspace. When you click the 'Open Qt Project' - button, just select an existing \c qmake project file (a \c .pro - file) and then click OK. You will get a message box at the end - which asks you to insert the newly created \c .dsp file into your - existing workspace. - - \section2 Using the 'Write Qt Project' button - - The 'Write Qt Project' button creates a \c qmake project (\c .pro) - file for your current project so that you can easily copy the files - onto another platform and be able to use \c qmake to create a Makefile - on that other platform. All you need to do is make the project you - want to create a \c .pro file for, and click on the button. Just - name your \c qmake project file and click Save. - - \section2 Using the 'Use Qt In Current Project' button - - The 'Use Qt In Current Project' button simply adds in the necessary - information for the current project so that it links against Qt and - sets any other settings needed to use Qt in that project. - - \section2 Using the 'Add MOC' button - - The 'Add MOC' button will add in the custom build step for the selected file - so that it creates any needed MOC files and it will add these generated - files to the project. All you need to do to use it is click on a file that - has \c Q_OBJECT and click the button. - - You only need to use this button if you added a file that has \c - Q_OBJECT in it by hand, you don't need to use this if you used any - of the previously mentioned buttons. It can also be invoked by using - the Ctrl+Shift+M key combination in Visual Studio. - - -*/ +/**************************************************************************** +** $Id$ +** +** Documentation of Visual Studio Integration Plugin +** +** Copyright (C) 2005 Trolltech AS. All rights reserved. +** +** This file is part of the Qt GUI Toolkit. +** +** This file may be distributed under the terms of the Q Public License +** as defined by Trolltech AS of Norway and appearing in the file +** LICENSE.QPL included in the packaging of this file. +** +** This file may be distributed and/or modified under the terms of the +** GNU General Public License version 2 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. +** +** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition +** licenses may use this file in accordance with the Qt 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. +** +** See http://www.trolltech.com/pricing.html or email sa...@tr... for +** information about Qt Commercial License Agreements. +** See http://www.trolltech.com/qpl/ for QPL licensing information. +** See http://www.trolltech.com/gpl/ for GPL licensing information. +** +** Contact in...@tr... if any conditions of this licensing are +** not clear to you. +** +**********************************************************************/ + +/*! + \page integration.html + + \title About the Visual Studio Integration Plugin + + The Visual Studio Integration Plugin is currently available only to users of + Visual Studio 6, it offers simple ways of doing common tasks when writing a + Qt application. + + \tableofcontents + + \section1 How to install the Visual Studio Integration Plugin + + When you install Qt, the integration plugin should be installed for you, + and ready for use. However, sometimes this does not happen properly, so + you need to manually carry out the following steps. + + \list + \i Ensure that the file '%MSDevDir%\\addins\\qmsdev.dll' exists. + \i Start Visual Studio, if it isn't already running. + \i Select Tools|Customize|Add-ins and Macro Files. + \i Ensure the checkbox to the left of the "QMsDev Developer Studio-Add-In" add-in is checked. + \i Click Close. + \endlist + + Now the integration plugin should be properly installed. If this doesn't + work, then contact Trolltech technical support giving details of + what went wrong. + + \section1 How to uninstall the Visual Studio Integration Plugin + + When you want to uninstall the integration plugin, just carry out the + following steps. + + \list + \i Close down any instances of Visual Studio. + \i Delete the file '%MSDevDir%\\addins\\qmsdev.dll' + \endlist + + \section1 What can the Visual Studio Integration Plugin do? + + The integration plugin adds the following options to Visual Studio: + + \list + \i New Qt Project + \i New Qt Dialog + \i Qt Designer + \i Open Qt Project + \i Write Qt Project + \i Use Qt In Current Project + \i Add MOC + \endlist + + \section2 Using the 'New Qt Project' button + + The 'New Qt Project' button allows you to create a simple Qt project + ready for development. Simply fill in the form and if you select + 'Dialog' or 'Main Window' without MDI support then it will + automatically start up \e{Qt Designer}. When you have finished with + the form in \e{Qt Designer} just save it and it will appear in a + ready made Qt project. + + If you select 'Main Window' with 'MDI Support' then it will simply + give you a code skeleton in a project ready for you to populate with + your own code. + + \section2 Using the 'New Qt Dialog' button + + The 'New Qt Dialog' button works in two ways: You can use it to create a new + dialog for your project; or you can use it to insert an existing + dialog into your project. + + If you want to create a new dialog then all you need to do is specify where + the dialog file should be saved and give it a name. This will start up + \e{Qt Designer} to allow you to design your new dialog, and will add it to + the existing project. + + If you want to add an existing dialog to your project, then just select the + relevant \c .ui file. This will then add it to your existing project and add + the relevant steps to create the generated code. + + \section2 Using the 'Qt Designer' button + + The 'Qt Designer' button simply starts up \e{Qt Designer}, it has no ties to + your existing project so whatever you do with it will not affect your + existing projects. It can also be started up by using the Ctrl+Shift+D key + combination in Visual Studio. + + \section2 Using the 'Open Qt Project' button + + The 'Open Qt Project' button allows you to convert an existing \c + qmake project file into a \c .dsp file which you can insert into + your existing workspace. When you click the 'Open Qt Project' + button, just select an existing \c qmake project file (a \c .pro + file) and then click OK. You will get a message box at the end + which asks you to insert the newly created \c .dsp file into your + existing workspace. + + \section2 Using the 'Write Qt Project' button + + The 'Write Qt Project' button creates a \c qmake project (\c .pro) + file for your current project so that you can easily copy the files + onto another platform and be able to use \c qmake to create a Makefile + on that other platform. All you need to do is make the project you + want to create a \c .pro file for, and click on the button. Just + name your \c qmake project file and click Save. + + \section2 Using the 'Use Qt In Current Project' button + + The 'Use Qt In Current Project' button simply adds in the necessary + information for the current project so that it links against Qt and + sets any other settings needed to use Qt in that project. + + \section2 Using the 'Add MOC' button + + The 'Add MOC' button will add in the custom build step for the selected file + so that it creates any needed MOC files and it will add these generated + files to the project. All you need to do to use it is click on a file that + has \c Q_OBJECT and click the button. + + You only need to use this button if you added a file that has \c + Q_OBJECT in it by hand, you don't need to use this if you used any + of the previously mentioned buttons. It can also be invoked by using + the Ctrl+Shift+M key combination in Visual Studio. + + +*/ Index: layout.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/layout.doc,v retrieving revision 1.1.1.7 retrieving revision 1.1.1.8 diff -u -r1.1.1.7 -r1.1.1.8 --- layout.doc 27 Aug 2004 21:24:13 -0000 1.1.1.7 +++ layout.doc 30 Sep 2005 15:22:33 -0000 1.1.1.8 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Explanation of the layout subsystem ** -** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** Index: mac.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/mac.doc,v retrieving revision 1.1.1.8 retrieving revision 1.1.1.9 diff -u -r1.1.1.8 -r1.1.1.9 --- mac.doc 9 Apr 2005 10:35:15 -0000 1.1.1.8 +++ mac.doc 30 Sep 2005 15:22:33 -0000 1.1.1.9 @@ -1,261 +1,267 @@ -/**************************************************************************** -** -** -** Qt/Mac documentation -** -** Copyright (C) 2002-2003 Trolltech AS. All rights reserved. -** -** This file is part of the Qt GUI Toolkit. -** -** This file may be distributed under the terms of the Q Public License -** as defined by Trolltech AS of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt 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. -** -** See http://www.trolltech.com/pricing.html or email sa...@tr... for -** information about Qt Commercial License Agreements. -** See http://www.trolltech.com/qpl/ for QPL licensing information. -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact in...@tr... if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ - -/*! -\page mac-differences.html - -\title Qt/Mac Issues - -This file will outline known issues and possible workarounds for -limitations on Mac OS X with Qt. This list will not always be complete, so -please contact Trolltech support with issues you find to be missing. - -See also the document \link qtmac-as-native.html Qt/Mac is Mac OS X -Native\endlink. - -\tableofcontents - -\section1 GUI Applications - -GUI Applications must be run out of a bundle (something like widgets.app/) -or using the open(1) command. Mac OS X needs this to dispatch events correctly, -as well as gaining access to the menubar. If using GDB you must run with the -full path to the executable. - -\section1 QCursor - -Due to Mac OS X having only 16x16 custom cursors QCursor is limited by this -as well. For now the only workaround to this problem is to use a small -cursor (16x16). - -\section1 Anti-aliased text - -Qt/Mac (starting with 3.0.5) has introduced some support for smooth text as -suggested by Apple's Aqua Style Guildelines. This support is limited to Mac -OS X >10.1.4, when this version is not detected it will fallback to the old -text rendering library. - -\section1 Library Support - -\section2 Bundle-based Libraries - -If you want to incorporate dynamic libraries as part of your Mac OS X -application bundle (the application directory), then you place these into a -directory called Frameworks, a subdirectory of the application bundle. - -The application finds these dynamic libraries if the libraries have an -install name of "@executable_path/../Frameworks/libname.dylib. - -If you use qmake and Makefiles, use the QMAKE_LFFLAGS_SONAME setting: - -\code -QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Frameworks/ -\endcode - -In case of Project Builder, you set the Library targets to have their -install path (in the Build Settings of the target) set to -"@executable_path/.../Frameworks". You also need to add a custom build -setting called "SKIP_INSTALL" and set this to YES. In the Application -target you need to add a Copy Files build phase that will copy the library -product into the applications wrapper's Framework sub-folder. - -Note that DYLD_LIBRARY_PATH environment variables will override these -settings, same with any other default paths such as a lookup of dynamic -libraries inside /usr/lib and similar default locations. - -We still strongly recommend to build static applications where the library -code is incorporated into the Mac OS X binary. However, in case you ship -applications that require plugin support,then you need to use dynamic -libraries as part of your application. - - -\section2 Combining Libraries - -If you want to build a new dynamic library combining the Qt 3.1 dynamic -libraries, you need to introduce the ld -r flag so that relocation information -is stored in the the output file, so that this file could be the subject of -another ld run. This is done by setting the -r flag in the .pro file, and the -LFLAGS settings. - -\section2 Initialization Order - -dyld(1) will call global static initializers in the order in which -they are linked into your application. If a library links against Qt -and references globals in Qt (from global initializers in your own -library) you should be sure to link against Qt before your library, -otherwise the result will be undefined (as Qt's global initializers -have not been called yet). - -\section1 Compiler Settings - -\section2 Compile-time Flags - -If you want to wrap any specific Mac OS X code in a define, use the Q_OS_MACX -flag, as in: - -\code -#if defined(Q_OS_MACX) -// the code used -#endif -\endcode - -Note that when you build under Mac OS X 10.2, then the MACOSX_102 flag is -automatically included in the make builds. - - -\section1 Building and Configuring Qt/Mac - -\section2 Problems building a static configuration - -If a static build fails with the following error messages during the -designer make phase: - -\code -QWidget::sizeHint() const referenced from libqui expected to be defined in @executable_path/../Frameworks/libqt-mt.3.dylib -non-virtual thunk [nv:-40] to QWidget::metric(int) const referenced from libqui - expected to be defined in @executable_path/../Frameworks/libqt-mt.3.dylib -\endcode - -then ensure that your library path does not have libqui libraries or -symbolic links. If you remove these, then the build will continue. - - -\section1 Macintosh Native API Access - -\section2 Accessing the Bundle Path - -The Macintosh application is actually a directory (ending with .app). This -directory has various other sub-directories and sources. In case you want -to place for example the plugin directory inside this bundle, then you need -to find out where the bundle resides on the disk. The following code will -do this: - -\code - CFURLRef pluginRef = CFBundleCopyBundleURL(CFBundleGetMainBundle()); - CFStringRef macPath = CFURLCopyFileSystemPath(pluginRef, - kCFURLPOSIXPathStyle); - const char *pathPtr = CFStringGetCStringPtr(macPath, - CFStringGetSystemEncoding()); - qDebug("Path = %s", pathPtr); - CFRelease(pluginRef); - CFRelease(macPath); -\endcode - -Do not forget to enclosure this in an #if defined(Q_OS_MACX) macro statement. - -\section2 Translating the Application Menu and native dialogs - -You need to do a little extra to get the Application Menu and native dialogs -localized. This is a requirement of Mac OS X and not of Qt. - -First, you must add a localized resource folder inside the Bundle see: - -http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBundles/index.html - -And look for the heading: Adding Localized Resources - -The main thing you need to do is create a file called locversion.plist. -Here is an example one for Norwegian: - -\code -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" -"http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>LprojCompatibleVersion</key> - <string>123</string> - <key>LprojLocale</key> - <string>no</string> - <key>LprojRevisionLevel</key> - <string>1</string> - <key>LprojVersion</key> - <string>123</string> -</dict> -</plist> -\endcode - -Then when you run the application with your preferred language set to Norwegian -you should see menu items like "Avslutt" instead of "Quit" - -\section1 User Interface - -\section2 Right-Mouse Clicks - -If you want to provide right-mouse click support for Mac OS X, use the -QContextMenuEvent class. This will map to a context menu event, in other -words a menu that will display a popup selection. This is the most common -use of right-mouse clicks, and maps to a control-click with the Mac OS X -one-button mouse support. - -\section2 Menubar - -Qt/Mac will automatically detect your menubars for you and turn them -into Mac native menubars. Fitting this into your existing Qt application -will normally be automatic, however, if you have special needs the Qt/Mac -implementation currently selects a menubar by starting at the active window -(ie QApplication::activeWindow()), and applying: - -1) If the window has a QMenuBar then it is used. -2) If the window is a modal then its menubar is used. If no menubar is - specified then a default menubar is used (as documented below) -3) If the window has no parent then the default menubar is used (as documented below). - -The above 3 steps are applied all the way up the parent window chain until -one of the above are satisifed. If all else fails a default menubar will be -created, the default menubar on Qt/Mac is an empty menubar, however you can -create a different default menubar by creating a parentless QMenuBar, the -first one created will thus be designated the default menubar, and will be -used whenever a default menubar is needed. - -\section1 Limitations - -\section2 MenuItems - -\list - -\i QCustomMenuItems are not supported in Mac native menubars, they are supported -in popupmenus that are not in the Mac native menubar. - -\i Items with accelerators that have more than one keystroke -(QKeySequence) will not be honored, and the first key will be used. - -\endlist - -\section2 Unsupported Native Widgets - -Qt/Mac currently has no support for sheets, drawers, or the chooser -(Panther-style tabs). There may be support for these in a future version of Qt. -*/ +/**************************************************************************** +** $Id$ +** +** Qt/Mac documentation +** +** Copyright (C) 2002-2005 Trolltech AS. All rights reserved. +** +** This file is part of the Qt GUI Toolkit. +** +** This file may be distributed under the terms of the Q Public License +** as defined by Trolltech AS of Norway and appearing in the file +** LICENSE.QPL included in the packaging of this file. +** +** This file may be distributed and/or modified under the terms of the +** GNU General Public License version 2 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. +** +** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition +** licenses may use this file in accordance with the Qt 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. +** +** See http://www.trolltech.com/pricing.html or email sa...@tr... for +** information about Qt Commercial License Agreements. +** See http://www.trolltech.com/qpl/ for QPL licensing information. +** See http://www.trolltech.com/gpl/ for GPL licensing information. +** +** Contact in...@tr... if any conditions of this licensing are +** not clear to you. +** +**********************************************************************/ + +/*! +\page mac-differences.html + +\title Qt/Mac Issues + +This file will outline known issues and possible workarounds for +limitations on Mac OS X with Qt. This list will not always be complete, so +please contact Trolltech support with issues you find to be missing. + +See also the document \link qtmac-as-native.html Qt/Mac is Mac OS X +Native\endlink. + +\tableofcontents + +\section1 GUI Applications + +GUI Applications must be run out of a bundle (something like widgets.app/) +or using the open(1) command. Mac OS X needs this to dispatch events correctly, +as well as gaining access to the menubar. If using GDB you must run with the +full path to the executable. + +\section1 QCursor + +Due to Mac OS X having only 16x16 custom cursors QCursor is limited by this +as well. For now the only workaround to this problem is to use a small +cursor (16x16). + +\section1 Anti-aliased text + +Qt/Mac (starting with 3.0.5) has introduced some support for smooth text as +suggested by Apple's Aqua Style Guildelines. This support is limited to Mac +OS X >10.1.4, when this version is not detected it will fallback to the old +text rendering library. + +\section1 Library Support + +\section2 Bundle-based Libraries + +If you want to incorporate dynamic libraries as part of your Mac OS X +application bundle (the application directory), then you place these into a +directory called Frameworks, a subdirectory of the application bundle. + +The application finds these dynamic libraries if the libraries have an +install name of "@executable_path/../Frameworks/libname.dylib. + +If you use qmake and Makefiles, use the QMAKE_LFFLAGS_SONAME setting: + +\code +QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Frameworks/ +\endcode + +In case of Project Builder, you set the Library targets to have their +install path (in the Build Settings of the target) set to +"@executable_path/.../Frameworks". You also need to add a custom build +setting called "SKIP_INSTALL" and set this to YES. In the Application +target you need to add a Copy Files build phase that will copy the library +product into the applications wrapper's Framework sub-folder. + +Note that DYLD_LIBRARY_PATH environment variables will override these +settings, same with any other default paths such as a lookup of dynamic +libraries inside /usr/lib and similar default locations. + +We still strongly recommend to build static applications where the library +code is incorporated into the Mac OS X binary. However, in case you ship +applications that require plugin support,then you need to use dynamic +libraries as part of your application. + + +\section2 Combining Libraries + +If you want to build a new dynamic library combining the Qt 3.1 dynamic +libraries, you need to introduce the ld -r flag so that relocation information +is stored in the the output file, so that this file could be the subject of +another ld run. This is done by setting the -r flag in the .pro file, and the +LFLAGS settings. + +\section2 Initialization Order + +dyld(1) will call global static initializers in the order in which +they are linked into your application. If a library links against Qt +and references globals in Qt (from global initializers in your own +library) you should be sure to link against Qt before your library, +otherwise the result will be undefined (as Qt's global initializers +have not been called yet). + +\section2 Plugin Support + +Note that it is not possible to build Qt plugins using Project Builder +or Xcode. Use \link qmake-manual.book qmake\endlink to configure and +build plugins. + +\section1 Compiler Settings + +\section2 Compile-time Flags + +If you want to wrap any specific Mac OS X code in a define, use the Q_OS_MACX +flag, as in: + +\code +#if defined(Q_OS_MACX) +// the code used +#endif +\endcode + +Note that when you build under Mac OS X 10.2, then the MACOSX_102 flag is +automatically included in the make builds. + + +\section1 Building and Configuring Qt/Mac + +\section2 Problems building a static configuration + +If a static build fails with the following error messages during the +designer make phase: + +\code +QWidget::sizeHint() const referenced from libqui expected to be defined in @executable_path/../Frameworks/libqt-mt.3.dylib +non-virtual thunk [nv:-40] to QWidget::metric(int) const referenced from libqui + expected to be defined in @executable_path/../Frameworks/libqt-mt.3.dylib +\endcode + +then ensure that your library path does not have libqui libraries or +symbolic links. If you remove these, then the build will continue. + + +\section1 Macintosh Native API Access + +\section2 Accessing the Bundle Path + +The Macintosh application is actually a directory (ending with .app). This +directory has various other sub-directories and sources. In case you want +to place for example the plugin directory inside this bundle, then you need +to find out where the bundle resides on the disk. The following code will +do this: + +\code + CFURLRef pluginRef = CFBundleCopyBundleURL(CFBundleGetMainBundle()); + CFStringRef macPath = CFURLCopyFileSystemPath(pluginRef, + kCFURLPOSIXPathStyle); + const char *pathPtr = CFStringGetCStringPtr(macPath, + CFStringGetSystemEncoding()); + qDebug("Path = %s", pathPtr); + CFRelease(pluginRef); + CFRelease(macPath); +\endcode + +Do not forget to enclosure this in an #if defined(Q_OS_MACX) macro statement. + +\section2 Translating the Application Menu and native dialogs + +You need to do a little extra to get the Application Menu and native dialogs +localized. This is a requirement of Mac OS X and not of Qt. + +First, you must add a localized resource folder inside the Bundle see: + +http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBundles/index.html + +And look for the heading: Adding Localized Resources + +The main thing you need to do is create a file called locversion.plist. +Here is an example one for Norwegian: + +\code +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" +"http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>LprojCompatibleVersion</key> + <string>123</string> + <key>LprojLocale</key> + <string>no</string> + <key>LprojRevisionLevel</key> + <string>1</string> + <key>LprojVersion</key> + <string>123</string> +</dict> +</plist> +\endcode + +Then when you run the application with your preferred language set to Norwegian +you should see menu items like "Avslutt" instead of "Quit" + +\section1 User Interface + +\section2 Right-Mouse Clicks + +If you want to provide right-mouse click support for Mac OS X, use the +QContextMenuEvent class. This will map to a context menu event, in other +words a menu that will display a popup selection. This is the most common +use of right-mouse clicks, and maps to a control-click with the Mac OS X +one-button mouse support. + +\section2 Menubar + +Qt/Mac will automatically detect your menubars for you and turn them +into Mac native menubars. Fitting this into your existing Qt application +will normally be automatic, however, if you have special needs the Qt/Mac +implementation currently selects a menubar by starting at the active window +(ie QApplication::activeWindow()), and applying: + +1) If the window has a QMenuBar then it is used. +2) If the window is a modal then its menubar is used. If no menubar is + specified then a default menubar is used (as documented below) +3) If the window has no parent then the default menubar is used (as documented below). + +The above 3 steps are applied all the way up the parent window chain until +one of the above are satisifed. If all else fails a default menubar will be +created, the default menubar on Qt/Mac is an empty menubar, however you can +create a different default menubar by creating a parentless QMenuBar, the +first one created will thus be designated the default menubar, and will be +used whenever a default menubar is needed. + +\section1 Limitations + +\section2 MenuItems + +\list + +\i QCustomMenuItems are not supported in Mac native menubars, they are supported +in popupmenus that are not in the Mac native menubar. + +\i Items with accelerators that have more than one keystroke +(QKeySequence) will not be honored, and the first key will be used. + +\endlist + +\section2 Unsupported Native Widgets + +Qt/Mac currently has no support for sheets, drawers, or the chooser +(Panther-style tabs). There may be support for these in a future version of Qt. +*/ Index: makeqpf.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/makeqpf.doc,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.3 diff -u -r1.1.1.2 -r1.1.1.3 --- makeqpf.doc 1 Oct 2003 07:17:05 -0000 1.1.1.2 +++ makeqpf.doc 30 Sep 2005 15:22:33 -0000 1.1.1.3 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Documentation for QPF fonts ** -** Copyright (C) 2002 Trolltech AS. All rights reserved. +** Copyright (C) 2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** |
Update of /cvsroot/kde-cygwin/qt-3/doc/man/man3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9971/doc/man/man3 Modified Files: Tag: QT_WIN32_3_3_BRANCH QAccel.3qt QAccessible.3qt QAccessibleInterface.3qt QAction.3qt QApplication.3qt QAsciiCache.3qt QAsciiDictIterator.3qt QAssistantClient.3qt QAxAggregated.3qt QAxScriptManager.3qt QAxWidget.3qt QBitArray.3qt QBitmap.3qt QBoxLayout.3qt QButton.3qt QByteArray.3qt QCDEStyle.3qt QCache.3qt QCacheIterator.3qt QCanvasEllipse.3qt QCanvasItem.3qt QCanvasItemList.3qt QCanvasLine.3qt QCanvasPixmapArray.3qt QCanvasPolygon.3qt Log Message: Index: QAccel.3qt =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/man/man3/Attic/QAccel.3qt,v retrieving revision 1.1.1.3 retrieving revision 1.1.1.4 diff -u -r1.1.1.3 -r1.1.1.4 --- QAccel.3qt 29 Jan 2005 11:12:43 -0000 1.1.1.3 +++ QAccel.3qt 30 Sep 2005 15:22:33 -0000 1.1.1.4 @@ -1 +1,324 @@ -.so man3/qaccel.3qt +'\" t +.TH QAccel 3qt "2 September 2005" "Trolltech AS" \" -*- nroff -*- +.\" Copyright 1992-2001 Trolltech AS. All rights reserved. See the +.\" license file included in the distribution for a complete license +.\" statement. +.\" +.ad l +.nh +.SH NAME +QAccel \- Handles keyboard accelerator and shortcut keys +.SH SYNOPSIS +\fC#include <qaccel.h>\fR +.PP +Inherits QObject. +.PP +.SS "Public Members" +.in +1c +.ti -1c +.BI "\fBQAccel\fR ( QWidget * parent, const char * name = 0 )" +.br +.ti -1c +.BI "\fBQAccel\fR ( QWidget * watch, QObject * parent, const char * name = 0 )" +.br +.ti -1c +.BI "\fB~QAccel\fR ()" +.br +.ti -1c +.BI "bool \fBisEnabled\fR () const" +.br +.ti -1c +.BI "void \fBsetEnabled\fR ( bool enable )" +.br +.ti -1c +.BI "uint \fBcount\fR () const" +.br +.ti -1c +.BI "int \fBinsertItem\fR ( const QKeySequence & key, int id = -1 )" +.br +.ti -1c +.BI "void \fBremoveItem\fR ( int id )" +.br +.ti -1c +.BI "void \fBclear\fR ()" +.br +.ti -1c +.BI "QKeySequence \fBkey\fR ( int id )" +.br +.ti -1c +.BI "int \fBfindKey\fR ( const QKeySequence & key ) const" +.br +.ti -1c +.BI "bool \fBisItemEnabled\fR ( int id ) const" +.br +.ti -1c +.BI "void \fBsetItemEnabled\fR ( int id, bool enable )" +.br +.ti -1c +.BI "bool \fBconnectItem\fR ( int id, const QObject * receiver, const char * member )" +.br +.ti -1c +.BI "bool \fBdisconnectItem\fR ( int id, const QObject * receiver, const char * member )" +.br +.ti -1c +.BI "void repairEventFilter () \fI(obsolete)\fR" +.br +.ti -1c +.BI "void \fBsetWhatsThis\fR ( int id, const QString & text )" +.br +.ti -1c +.BI "QString \fBwhatsThis\fR ( int id ) const" +.br +.in -1c +.SS "Signals" +.in +1c +.ti -1c +.BI "void \fBactivated\fR ( int id )" +.br +.ti -1c +.BI "void \fBactivatedAmbiguously\fR ( int id )" +.br +.in -1c +.SS "Static Public Members" +.in +1c +.ti -1c +.BI "QKeySequence \fBshortcutKey\fR ( const QString & str )" +.br +.ti -1c +.BI "QString keyToString ( QKeySequence k ) \fI(obsolete)\fR" +.br +.ti -1c +.BI "QKeySequence stringToKey ( const QString & s ) \fI(obsolete)\fR" +.br +.in -1c +.SS "Protected Members" +.in +1c +.ti -1c +.BI "virtual bool eventFilter ( QObject *, QEvent * ) \fI(obsolete)\fR" +.br +.in -1c +.SH DESCRIPTION +The QAccel class handles keyboard accelerator and shortcut keys. +.PP +A keyboard accelerator triggers an action when a certain key combination is pressed. The accelerator handles all keyboard activity for all the children of one top-level widget, so it is not affected by the keyboard focus. +.PP +In most cases, you will not need to use this class directly. Use the QAction class to create actions with accelerators that can be used in both menus and toolbars. If you're only interested in menus use QMenuData::insertItem() or QMenuData::setAccel() to make accelerators for operations that are also available on menus. Many widgets automatically generate accelerators, such as QButton, QGroupBox, QLabel (with QLabel::setBuddy()), QMenuBar and QTabBar. Example: +.PP +.nf +.br + QPushButton p( "&Exit", parent ); // automatic shortcut ALT+Key_E +.br + QPopupMenu *fileMenu = new fileMenu( parent ); +.br + fileMenu->insertItem( "Undo", parent, SLOT(undo()), CTRL+Key_Z ); +.br +.fi +.PP +A QAccel contains a list of accelerator items that can be manipulated using insertItem(), removeItem(), clear(), key() and findKey(). +.PP +Each accelerator item consists of an identifier and a QKeySequence. A single key sequence consists of a keyboard code combined with modifiers (SHIFT, CTRL, ALT or UNICODE_ACCEL). For example, \fCCTRL + Key_P\fR could be a shortcut for printing a document. The key codes are listed in qnamespace.h. As an alternative, use UNICODE_ACCEL with the unicode code point of the character. For example, \fCUNICODE_ACCEL + 'A'\fR gives the same accelerator as Key_A. +.PP +When an accelerator key is pressed, the accelerator sends out the signal activated() with a number that identifies this particular accelerator item. Accelerator items can also be individually connected, so that two different keys will activate two different slots (see connectItem() and disconnectItem()). +.PP +The activated() signal is \fInot\fR emitted when two or more accelerators match the same key. Instead, the first matching accelerator sends out the activatedAmbiguously() signal. By pressing the key multiple times, users can navigate between all matching accelerators. Some standard controls like QPushButton and QCheckBox connect the activatedAmbiguously() signal to the harmless setFocus() slot, whereas activated() is connected to a slot invoking the button's action. Most controls, like QLabel and QTabBar, treat activated() and activatedAmbiguously() as equivalent. +.PP +Use setEnabled() to enable or disable all the items in an accelerator, or setItemEnabled() to enable or disable individual items. An item is active only when both the QAccel and the item itself are enabled. +.PP +The function setWhatsThis() specifies a help text that appears when the user presses an accelerator key in What's This mode. +.PP +The accelerator will be deleted when \fIparent\fR is deleted, and will consume relevant key events until then. +.PP +Please note that the accelerator +.PP +.nf +.br + accelerator->insertItem( QKeySequence("M") ); +.br +.fi +can be triggered with both the 'M' key, and with Shift+M, unless a second accelerator is defined for the Shift+M combination. +.PP +Example: +.PP +.nf +.br + QAccel *a = new QAccel( myWindow ); // create accels for myWindow +.br + a->connectItem( a->insertItem(Key_P+CTRL), // adds Ctrl+P accelerator +.br + myWindow, // connected to myWindow's +.br + SLOT(printDoc()) ); // printDoc() slot +.br +.fi +.PP +See also QKeyEvent, QWidget::keyPressEvent(), QMenuData::setAccel(), QButton::accel, QLabel::setBuddy(), QKeySequence, GUI Design Handbook: Keyboard Shortcuts, and Miscellaneous Classes. +.SH MEMBER FUNCTION DOCUMENTATION +.SH "QAccel::QAccel ( QWidget * parent, const char * name = 0 )" +Constructs a QAccel object called \fIname\fR, with parent \fIparent\fR. The accelerator operates on \fIparent\fR. +.SH "QAccel::QAccel ( QWidget * watch, QObject * parent, const char * name = 0 )" +Constructs a QAccel object called \fIname\fR, that operates on \fIwatch\fR, and is a child of \fIparent\fR. +.PP +This constructor is not needed for normal application programming. +.SH "QAccel::~QAccel ()" +Destroys the accelerator object and frees all allocated resources. +.SH "void QAccel::activated ( int id )\fC [signal]\fR" +This signal is emitted when an accelerator key is pressed. \fIid\fR is a number that identifies this particular accelerator item. +.PP +See also activatedAmbiguously(). +.SH "void QAccel::activatedAmbiguously ( int id )\fC [signal]\fR" +This signal is emitted when an accelerator key is pressed. \fIid\fR is a number that identifies this particular accelerator item. +.PP +See also activated(). +.SH "void QAccel::clear ()" +Removes all accelerator items. +.SH "bool QAccel::connectItem ( int id, const QObject * receiver, const char * member )" +Connects the accelerator item \fIid\fR to the slot \fImember\fR of \fIreceiver\fR. +.PP +.nf +.br + a->connectItem( 201, mainView, SLOT(quit()) ); +.br +.fi +.PP +Of course, you can also send a signal as \fImember\fR. +.PP +Normally accelerators are connected to slots which then receive the \fCactivated(int id)\fR signal with the id of the accelerator item that was activated. If you choose to connect a specific accelerator item using this function, the activated() signal is emitted if the associated key sequence is pressed but no \fCactivated(int id)\fR signal is emitted. +.PP +See also disconnectItem(). +.PP +Example: t14/gamebrd.cpp. +.SH "uint QAccel::count () const" +Returns the number of accelerator items in this accelerator. +.SH "bool QAccel::disconnectItem ( int id, const QObject * receiver, const char * member )" +Disconnects an accelerator item with id \fIid\fR from the function called \fImember\fR in the \fIreceiver\fR object. +.PP +See also connectItem(). +.SH "bool QAccel::eventFilter ( QObject *, QEvent * )\fC [virtual protected]\fR" +\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. serves no purpose anymore +.PP +Reimplemented from QObject. +.SH "int QAccel::findKey ( const QKeySequence & key ) const" +Returns the identifier of the accelerator item with the key code \fIkey\fR, or -1 if the item cannot be found. +.SH "int QAccel::insertItem ( const QKeySequence & key, int id = -1 )" +Inserts an accelerator item and returns the item's identifier. +.PP +\fIkey\fR is a key code and an optional combination of SHIFT, CTRL and ALT. \fIid\fR is the accelerator item id. +.PP +If \fIid\fR is negative, then the item will be assigned a unique negative identifier less than -1. +.PP +.nf +.br + QAccel *a = new QAccel( myWindow ); // create accels for myWindow +.br + a->insertItem( CTRL + Key_P, 200 ); // Ctrl+P, e.g. to print document +.br + a->insertItem( ALT + Key_X, 201 ); // Alt+X, e.g. to quit +.br + a->insertItem( UNICODE_ACCEL + 'q', 202 ); // Unicode 'q', e.g. to quit +.br + a->insertItem( Key_D ); // gets a unique negative id < -1 +.br + a->insertItem( CTRL + SHIFT + Key_P ); // gets a unique negative id < -1 +.br +.fi +.PP +Example: t14/gamebrd.cpp. +.SH "bool QAccel::isEnabled () const" +Returns TRUE if the accelerator is enabled; otherwise returns FALSE. +.PP +See also setEnabled() and isItemEnabled(). +.SH "bool QAccel::isItemEnabled ( int id ) const" +Returns TRUE if the accelerator item with the identifier \fIid\fR is enabled. Returns FALSE if the item is disabled or cannot be found. +.PP +See also setItemEnabled() and isEnabled(). +.SH "QKeySequence QAccel::key ( int id )" +Returns the key sequence of the accelerator item with identifier \fIid\fR, or an invalid key sequence (0) if the id cannot be found. +.SH "QString QAccel::keyToString ( QKeySequence k )\fC [static]\fR" +\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. +.PP +Creates an accelerator string for the key \fIk\fR. For instance CTRL+Key_O gives "Ctrl+O". The "Ctrl" etc. are translated (using QObject::tr()) in the "QAccel" context. +.PP +The function is superfluous. Cast the QKeySequence \fIk\fR to a QString for the same effect. +.SH "void QAccel::removeItem ( int id )" +Removes the accelerator item with the identifier \fIid\fR. +.SH "void QAccel::repairEventFilter ()" +\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. serves no purpose anymore +.SH "void QAccel::setEnabled ( bool enable )" +Enables the accelerator if \fIenable\fR is TRUE, or disables it if \fIenable\fR is FALSE. +.PP +Individual keys can also be enabled or disabled using setItemEnabled(). To work, a key must be an enabled item in an enabled QAccel. +.PP +See also isEnabled() and setItemEnabled(). +.SH "void QAccel::setItemEnabled ( int id, bool enable )" +Enables the accelerator item with the identifier \fIid\fR if \fIenable\fR is TRUE, and disables item \fIid\fR if \fIenable\fR is FALSE. +.PP +To work, an item must be enabled and be in an enabled QAccel. +.PP +See also isItemEnabled() and isEnabled(). +.SH "void QAccel::setWhatsThis ( int id, const QString & text )" +Sets a What's This help text for the accelerator item \fIid\fR to \fItext\fR. +.PP +The text will be shown when the application is in What's This mode and the user hits the accelerator key. +.PP +To set What's This help on a menu item (with or without an accelerator key), use QMenuData::setWhatsThis(). +.PP +See also whatsThis(), QWhatsThis::inWhatsThisMode(), QMenuData::setWhatsThis(), and QAction::whatsThis. +.SH "QKeySequence QAccel::shortcutKey ( const QString & str )\fC [static]\fR" +Returns the shortcut key sequence for \fIstr\fR, or an invalid key sequence (0) if \fIstr\fR has no shortcut sequence. +.PP +For example, shortcutKey("E&xit") returns ALT+Key_X, shortcutKey("&Quit") returns ALT+Key_Q and shortcutKey("Quit") returns 0. (In code that does not inherit the Qt namespace class, you must write e.g. Qt::ALT+Qt::Key_Q.) +.PP +We provide a list of common accelerators in English. At the time of writing, Microsoft and Open Group do not appear to have issued equivalent recommendations for other languages. +.SH "QKeySequence QAccel::stringToKey ( const QString & s )\fC [static]\fR" +\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. +.PP +Returns an accelerator code for the string \fIs\fR. For example" Ctrl+O" gives CTRL+UNICODE_ACCEL+'O'. The strings "Ctrl"," Shift", "Alt" are recognized, as well as their translated equivalents in the "QAccel" context (using QObject::tr()). Returns 0 if \fIs\fR is not recognized. +.PP +This function is typically used with tr(), so that accelerator keys can be replaced in translations: +.PP +.nf +.br + QPopupMenu *file = new QPopupMenu( this ); +.br + file->insertItem( p1, tr("&Open..."), this, SLOT(open()), +.br + QAccel::stringToKey(tr("Ctrl+O", "File|Open")) ); +.br +.fi +.PP +Notice the \fC"File|Open"\fR translator comment. It is by no means necessary, but it provides some context for the human translator. +.PP +The function is superfluous. Construct a QKeySequence from the string \fIs\fR for the same effect. +.PP +See also QObject::tr() and Internationalization with Qt. +.PP +Example: i18n/mywidget.cpp. +.SH "QString QAccel::whatsThis ( int id ) const" +Returns the What's This help text for the specified item \fIid\fR or QString::null if no text has been specified. +.PP +See also setWhatsThis(). + +.SH "SEE ALSO" +.BR http://doc.trolltech.com/qaccel.html +.BR http://www.trolltech.com/faq/tech.html +.SH COPYRIGHT +Copyright 1992-2001 Trolltech AS, http://www.trolltech.com. See the +license file included in the distribution for a complete license +statement. +.SH AUTHOR +Generated automatically from the source code. +.SH BUGS +If you find a bug in Qt, please report it as described in +.BR http://doc.trolltech.com/bughowto.html . +Good bug reports help us to help you. Thank you. +.P +The definitive Qt documentation is provided in HTML format; it is +located at $QTDIR/doc/html and can be read using Qt Assistant or with +a web browser. This man page is provided as a convenience for those +users who prefer man pages, although this format is not officially +supported by Trolltech. +.P +If you find errors in this manual page, please report them to +.BR qt...@tr... . +Please include the name of the manual page (qaccel.3qt) and the Qt +version (3.3.5). Index: QAccessible.3qt =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/man/man3/Attic/QAccessible.3qt,v retrieving revision 1.1.1.3 retrieving revision 1.1.1.4 diff -u -r1.1.1.3 -r1.1.1.4 --- QAccessible.3qt 29 Jan 2005 11:12:43 -0000 1.1.1.3 +++ QAccessible.3qt 30 Sep 2005 15:22:33 -0000 1.1.1.4 @@ -1 +1,399 @@ -.so man3/qaccessible.3qt +'\" t +.TH QAccessible 3qt "2 September 2005" "Trolltech AS" \" -*- nroff -*- +.\" Copyright 1992-2001 Trolltech AS. All rights reserved. See the +.\" license file included in the distribution for a complete license +.\" statement. +.\" +.ad l +.nh +.SH NAME +QAccessible \- Enums and static functions relating to accessibility +.SH SYNOPSIS +\fC#include <qaccessible.h>\fR +.PP +Inherited by QAccessibleInterface. +.PP +.SS "Public Members" +.in +1c +.ti -1c +.BI "enum \fBEvent\fR { SoundPlayed = 0x0001, Alert = 0x0002, ForegroundChanged = 0x0003, MenuStart = 0x0004, MenuEnd = 0x0005, PopupMenuStart = 0x0006, PopupMenuEnd = 0x0007, ContextHelpStart = 0x000C, ContextHelpEnd = 0x000D, DragDropStart = 0x000E, DragDropEnd = 0x000F, DialogStart = 0x0010, DialogEnd = 0x0011, ScrollingStart = 0x0012, ScrollingEnd = 0x0013, MenuCommand = 0x0018, ObjectCreated = 0x8000, ObjectDestroyed = 0x8001, ObjectShow = 0x8002, ObjectHide = 0x8003, ObjectReorder = 0x8004, Focus = 0x8005, Selection = 0x8006, SelectionAdd = 0x8007, SelectionRemove = 0x8008, SelectionWithin = 0x8009, StateChanged = 0x800A, LocationChanged = 0x800B, NameChanged = 0x800C, DescriptionChanged = 0x800D, ValueChanged = 0x800E, ParentChanged = 0x800F, HelpChanged = 0x80A0, DefaultActionChanged = 0x80B0, AcceleratorChanged = 0x80C0 }" +.br +.ti -1c +.BI "enum \fBState\fR { Normal = 0x00000000, Unavailable = 0x00000001, Selected = 0x00000002, Focused = 0x00000004, Pressed = 0x00000008, Checked = 0x00000010, Mixed = 0x00000020, ReadOnly = 0x00000040, HotTracked = 0x00000080, Default = 0x00000100, Expanded = 0x00000200, Collapsed = 0x00000400, Busy = 0x00000800, Floating = 0x00001000, Marqueed = 0x00002000, Animated = 0x00004000, Invisible = 0x00008000, Offscreen = 0x00010000, Sizeable = 0x00020000, Moveable = 0x00040000, SelfVoicing = 0x00080000, Focusable = 0x00100000, Selectable = 0x00200000, Linked = 0x00400000, Traversed = 0x00800000, MultiSelectable = 0x01000000, ExtSelectable = 0x02000000, AlertLow = 0x04000000, AlertMedium = 0x08000000, AlertHigh = 0x10000000, Protected = 0x20000000, Valid = 0x3fffffff }" +.br +.ti -1c +.BI "enum \fBRole\fR { NoRole = 0x00000000, TitleBar = 0x00000001, MenuBar = 0x00000002, ScrollBar = 0x00000003, Grip = 0x00000004, Sound = 0x00000005, Cursor = 0x00000006, Caret = 0x00000007, AlertMessage = 0x00000008, Window = 0x00000009, Client = 0x0000000A, PopupMenu = 0x0000000B, MenuItem = 0x0000000C, ToolTip = 0x0000000D, Application = 0x0000000E, Document = 0x0000000F, Pane = 0x00000010, Chart = 0x00000011, Dialog = 0x00000012, Border = 0x00000013, Grouping = 0x00000014, Separator = 0x00000015, ToolBar = 0x00000016, StatusBar = 0x00000017, Table = 0x00000018, ColumnHeader = 0x00000019, RowHeader = 0x0000001A, Column = 0x0000001B, Row = 0x0000001C, Cell = 0x0000001D, Link = 0x0000001E, HelpBalloon = 0x0000001F, Character = 0x00000020, List = 0x00000021, ListItem = 0x00000022, Outline = 0x00000023, OutlineItem = 0x00000024, PageTab = 0x00000025, PropertyPage = 0x00000026, Indicator = 0x00000027, Graphic = 0x00000028, StaticText = 0x00000029, EditableText = 0x0000002A, PushButton = 0x0000002B, CheckBox = 0x0000002C, RadioButton = 0x0000002D, ComboBox = 0x0000002E, DropLest = 0x0000002F, ProgressBar = 0x00000030, Dial = 0x00000031, HotkeyField = 0x00000032, Slider = 0x00000033, SpinBox = 0x00000034, Diagram = 0x00000035, Animation = 0x00000036, Equation = 0x00000037, ButtonDropDown = 0x00000038, ButtonMenu = 0x00000039, ButtonDropGrid = 0x0000003A, Whitespace = 0x0000003B, PageTabList = 0x0000003C, Clock = 0x0000003D }" +.br +.ti -1c +.BI "enum \fBNavDirection\fR { NavUp = 0x00000001, NavDown = 0x00000002, NavLeft = 0x00000003, NavRight = 0x00000004, NavNext = 0x00000005, NavPrevious = 0x00000006, NavFirstChild = 0x00000007, NavLastChild = 0x00000008, NavFocusChild = 0x00000009 }" +.br +.ti -1c +.BI "enum \fBText\fR { Name = 0, Description, Value, Help, Accelerator, DefaultAction }" +.br +.in -1c +.SS "Static Public Members" +.in +1c +.ti -1c +.BI "QRESULT \fBqueryAccessibleInterface\fR ( QObject * object, QAccessibleInterface ** iface )" +.br +.ti -1c +.BI "void \fBupdateAccessibility\fR ( QObject * object, int control, Event reason )" +.br +.ti -1c +.BI "bool \fBisActive\fR ()" +.br +.in -1c +.SH DESCRIPTION +The QAccessible class provides enums and static functions relating to accessibility. +.PP +Accessibility clients use implementations of the QAccessibleInterface to read the information an accessible object exposes, or to call functions to manipulate the accessible object. +.PP +See the plugin documentation for more details about how to redistribute Qt plugins. +.PP +See also Miscellaneous Classes. +.SS "Member Type Documentation" +.SH "QAccessible::Event" +This enum type defines event types when the state of the accessible object has changed. The event types are: +.TP +\fCQAccessible::SoundPlayed\fR +.TP +\fCQAccessible::Alert\fR +.TP +\fCQAccessible::ForegroundChanged\fR +.TP +\fCQAccessible::MenuStart\fR +.TP +\fCQAccessible::MenuEnd\fR +.TP +\fCQAccessible::PopupMenuStart\fR +.TP +\fCQAccessible::PopupMenuEnd\fR +.TP +\fCQAccessible::ContextHelpStart\fR +.TP +\fCQAccessible::ContextHelpEnd\fR +.TP +\fCQAccessible::DragDropStart\fR +.TP +\fCQAccessible::DragDropEnd\fR +.TP +\fCQAccessible::DialogStart\fR +.TP +\fCQAccessible::DialogEnd\fR +.TP +\fCQAccessible::ScrollingStart\fR +.TP +\fCQAccessible::ScrollingEnd\fR +.TP +\fCQAccessible::ObjectCreated\fR +.TP +\fCQAccessible::ObjectDestroyed\fR +.TP +\fCQAccessible::ObjectShow\fR +.TP +\fCQAccessible::ObjectHide\fR +.TP +\fCQAccessible::ObjectReorder\fR +.TP +\fCQAccessible::Focus\fR +.TP +\fCQAccessible::Selection\fR +.TP +\fCQAccessible::SelectionAdd\fR +.TP +\fCQAccessible::SelectionRemove\fR +.TP +\fCQAccessible::SelectionWithin\fR +.TP +\fCQAccessible::StateChanged\fR +.TP +\fCQAccessible::LocationChanged\fR +.TP +\fCQAccessible::NameChanged\fR +.TP +\fCQAccessible::DescriptionChanged\fR +.TP +\fCQAccessible::ValueChanged\fR +.TP +\fCQAccessible::ParentChanged\fR +.TP +\fCQAccessible::HelpChanged\fR +.TP +\fCQAccessible::DefaultActionChanged\fR +.TP +\fCQAccessible::AcceleratorChanged\fR +.TP +\fCQAccessible::MenuCommand\fR +.SH "QAccessible::NavDirection" +This enum specifies which item to move to when navigating. +.TP +\fCQAccessible::NavUp\fR - sibling above +.TP +\fCQAccessible::NavDown\fR - sibling below +.TP +\fCQAccessible::NavLeft\fR - left sibling +.TP +\fCQAccessible::NavRight\fR - right sibling +.TP +\fCQAccessible::NavNext\fR - next sibling +.TP +\fCQAccessible::NavPrevious\fR - previous sibling +.TP +\fCQAccessible::NavFirstChild\fR - first child +.TP +\fCQAccessible::NavLastChild\fR - last child +.TP +\fCQAccessible::NavFocusChild\fR - child with focus +.SH "QAccessible::Role" +This enum defines a number of roles an accessible object can have. The roles are: +.TP +\fCQAccessible::NoRole\fR +.TP +\fCQAccessible::TitleBar\fR +.TP +\fCQAccessible::MenuBar\fR +.TP +\fCQAccessible::ScrollBar\fR +.TP +\fCQAccessible::Grip\fR +.TP +\fCQAccessible::Sound\fR +.TP +\fCQAccessible::Cursor\fR +.TP +\fCQAccessible::Caret\fR +.TP +\fCQAccessible::AlertMessage\fR +.TP +\fCQAccessible::Window\fR +.TP +\fCQAccessible::Client\fR +.TP +\fCQAccessible::PopupMenu\fR +.TP +\fCQAccessible::MenuItem\fR +.TP +\fCQAccessible::ToolTip\fR +.TP +\fCQAccessible::Application\fR +.TP +\fCQAccessible::Document\fR +.TP +\fCQAccessible::Pane\fR +.TP +\fCQAccessible::Chart\fR +.TP +\fCQAccessible::Dialog\fR +.TP +\fCQAccessible::Border\fR +.TP +\fCQAccessible::Grouping\fR +.TP +\fCQAccessible::Separator\fR +.TP +\fCQAccessible::ToolBar\fR +.TP +\fCQAccessible::StatusBar\fR +.TP +\fCQAccessible::Table\fR +.TP +\fCQAccessible::ColumnHeader\fR +.TP +\fCQAccessible::RowHeader\fR +.TP +\fCQAccessible::Column\fR +.TP +\fCQAccessible::Row\fR +.TP +\fCQAccessible::Cell\fR +.TP +\fCQAccessible::Link\fR +.TP +\fCQAccessible::HelpBalloon\fR +.TP +\fCQAccessible::Character\fR +.TP +\fCQAccessible::List\fR +.TP +\fCQAccessible::ListItem\fR +.TP +\fCQAccessible::Outline\fR +.TP +\fCQAccessible::OutlineItem\fR +.TP +\fCQAccessible::PageTab\fR +.TP +\fCQAccessible::PropertyPage\fR +.TP +\fCQAccessible::Indicator\fR +.TP +\fCQAccessible::Graphic\fR +.TP +\fCQAccessible::StaticText\fR +.TP +\fCQAccessible::EditableText\fR +.TP +\fCQAccessible::PushButton\fR +.TP +\fCQAccessible::CheckBox\fR +.TP +\fCQAccessible::RadioButton\fR +.TP +\fCQAccessible::ComboBox\fR +.TP +\fCQAccessible::DropLest\fR +.TP +\fCQAccessible::ProgressBar\fR +.TP +\fCQAccessible::Dial\fR +.TP +\fCQAccessible::HotkeyField\fR +.TP +\fCQAccessible::Slider\fR +.TP +\fCQAccessible::SpinBox\fR +.TP +\fCQAccessible::Diagram\fR +.TP +\fCQAccessible::Animation\fR +.TP +\fCQAccessible::Equation\fR +.TP +\fCQAccessible::ButtonDropDown\fR +.TP +\fCQAccessible::ButtonMenu\fR +.TP +\fCQAccessible::ButtonDropGrid\fR +.TP +\fCQAccessible::Whitespace\fR +.TP +\fCQAccessible::PageTabList\fR +.TP +\fCQAccessible::Clock\fR +.SH "QAccessible::State" +This enum type defines bitflags that can be combined to indicate the state of the accessible object. The values are: +.TP +\fCQAccessible::Normal\fR +.TP +\fCQAccessible::Unavailable\fR +.TP +\fCQAccessible::Selected\fR +.TP +\fCQAccessible::Focused\fR +.TP +\fCQAccessible::Pressed\fR +.TP +\fCQAccessible::Checked\fR +.TP +\fCQAccessible::Mixed\fR +.TP +\fCQAccessible::ReadOnly\fR +.TP +\fCQAccessible::HotTracked\fR +.TP +\fCQAccessible::Default\fR +.TP +\fCQAccessible::Expanded\fR +.TP +\fCQAccessible::Collapsed\fR +.TP +\fCQAccessible::Busy\fR +.TP +\fCQAccessible::Floating\fR +.TP +\fCQAccessible::Marqueed\fR +.TP +\fCQAccessible::Animated\fR +.TP +\fCQAccessible::Invisible\fR +.TP +\fCQAccessible::Offscreen\fR +.TP +\fCQAccessible::Sizeable\fR +.TP +\fCQAccessible::Moveable\fR +.TP +\fCQAccessible::SelfVoicing\fR +.TP +\fCQAccessible::Focusable\fR +.TP +\fCQAccessible::Selectable\fR +.TP +\fCQAccessible::Linked\fR +.TP +\fCQAccessible::Traversed\fR +.TP +\fCQAccessible::MultiSelectable\fR +.TP +\fCQAccessible::ExtSelectable\fR +.TP +\fCQAccessible::AlertLow\fR +.TP +\fCQAccessible::AlertMedium\fR +.TP +\fCQAccessible::AlertHigh\fR +.TP +\fCQAccessible::Protected\fR +.TP +\fCQAccessible::Valid\fR +.SH "QAccessible::Text" +This enum specifies string information that an accessible object returns. +.TP +\fCQAccessible::Name\fR - The name of the object +.TP +\fCQAccessible::Description\fR - A short text describing the object +.TP +\fCQAccessible::Value\fR - The value of the object +.TP +\fCQAccessible::Help\fR - A longer text giving information about how to use the object +.TP +\fCQAccessible::DefaultAction\fR - The default method to interact with the object +.TP +\fCQAccessible::Accelerator\fR - The keyboard shortcut that executes the default action +.SH MEMBER FUNCTION DOCUMENTATION +.SH "bool QAccessible::isActive ()\fC [static]\fR" +Returns TRUE if an accessibility implementation has been requested, during the runtime of the application, otherwise returns FALSE. +.PP +Use this function to prevent potentially expensive notifications via updateAccessibility(). +.SH "QRESULT QAccessible::queryAccessibleInterface ( QObject * object, QAccessibleInterface ** iface )\fC [static]\fR" +Sets \fIiface\fR to point to the implementation of the QAccessibleInterface for \fIobject\fR, and returns \fCQS_OK\fR if successfull, or sets \fIiface\fR to 0 and returns \fCQE_NOCOMPONENT\fR if no accessibility implementation for \fIobject\fR exists. +.PP +The function uses the classname of \fIobject\fR to find a suitable implementation. If no implementation for the object's class is available the function tries to find an implementation for the object's parent class. +.PP +This function is called to answer an accessibility client's request for object information. You should never need to call this function yourself. +.SH "void QAccessible::updateAccessibility ( QObject * object, int control, Event reason )\fC [static]\fR" +Notifies accessibility clients about a change in \fIobject\fR's accessibility information. +.PP +\fIreason\fR specifies the cause of the change, for example, ValueChange when the position of a slider has been changed. \fIcontrol\fR is the ID of the child element that has changed. When \fIcontrol\fR is 0, the object itself has changed. +.PP +Call this function whenever the state of your accessible object or one of it's sub-elements has been changed either programmatically (e.g. by calling QLabel::setText()) or by user interaction. +.PP +If there are no accessibility tools listening to this event, the +performance penalty for calling this function is minor, but if determining +the parameters of the call is expensive you can use isActive() to +avoid unnecessary performance penalties if no client is listening. + +.SH "SEE ALSO" +.BR http://doc.trolltech.com/qaccessible.html +.BR http://www.trolltech.com/faq/tech.html +.SH COPYRIGHT +Copyright 1992-2001 Trolltech AS, http://www.trolltech.com. See the +license file included in the distribution for a complete license +statement. +.SH AUTHOR +Generated automatically from the source code. +.SH BUGS +If you find a bug in Qt, please report it as described in +.BR http://doc.trolltech.com/bughowto.html . +Good bug reports help us to help you. Thank you. +.P +The definitive Qt documentation is provided in HTML format; it is +located at $QTDIR/doc/html and can be read using Qt Assistant or with +a web browser. This man page is provided as a convenience for those +users who prefer man pages, although this format is not officially +supported by Trolltech. +.P +If you find errors in this manual page, please report them to +.BR qt...@tr... . +Please include the name of the manual page (qaccessible.3qt) and the Qt +version (3.3.5). Index: QAccessibleInterface.3qt =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/man/man3/Attic/QAccessibleInterface.3qt,v retrieving revision 1.1.1.3 retrieving revision 1.1.1.4 diff -u -r1.1.1.3 -r1.1.1.4 --- QAccessibleInterface.3qt 29 Jan 2005 11:12:43 -0000 1.1.1.3 +++ QAccessibleInterface.3qt 30 Sep 2005 15:22:33 -0000 1.1.1.4 @@ -1 +1,178 @@ -.so man3/qaccessibleinterface.3qt +'\" t +.TH QAccessibleInterface 3qt "2 September 2005" "Trolltech AS" \" -*- nroff -*- +.\" Copyright 1992-2001 Trolltech AS. All rights reserved. See the +.\" license file included in the distribution for a complete license +.\" statement. +.\" +.ad l +.nh +.SH NAME +QAccessibleInterface \- Defines an interface that exposes information about accessible objects +.SH SYNOPSIS +\fC#include <qaccessible.h>\fR +.PP +Inherits QAccessible. +.PP +Inherited by QAccessibleObject. +.PP +.SS "Public Members" +.in +1c +.ti -1c +.BI "virtual bool \fBisValid\fR () const = 0" +.br +.ti -1c +.BI "virtual int \fBchildCount\fR () const = 0" +.br +.ti -1c +.BI "virtual QRESULT \fBqueryChild\fR ( int control, QAccessibleInterface ** iface ) const = 0" +.br +.ti -1c +.BI "virtual QRESULT \fBqueryParent\fR ( QAccessibleInterface ** iface ) const = 0" +.br +.ti -1c +.BI "virtual int \fBcontrolAt\fR ( int x, int y ) const = 0" +.br +.ti -1c +.BI "virtual QRect \fBrect\fR ( int control ) const = 0" +.br +.ti -1c +.BI "virtual int \fBnavigate\fR ( NavDirection direction, int startControl ) const = 0" +.br +.ti -1c +.BI "virtual QString \fBtext\fR ( Text t, int control ) const = 0" +.br +.ti -1c +.BI "virtual void \fBsetText\fR ( Text t, int control, const QString & text ) = 0" +.br +.ti -1c +.BI "virtual Role \fBrole\fR ( int control ) const = 0" +.br +.ti -1c +.BI "virtual State \fBstate\fR ( int control ) const = 0" +.br +.ti -1c +.BI "virtual QMemArray<int> \fBselection\fR () const = 0" +.br +.ti -1c +.BI "virtual bool \fBdoDefaultAction\fR ( int control ) = 0" +.br +.ti -1c +.BI "virtual bool \fBsetFocus\fR ( int control ) = 0" +.br +.ti -1c +.BI "virtual bool \fBsetSelected\fR ( int control, bool on, bool extend ) = 0" +.br +.ti -1c +.BI "virtual void \fBclearSelection\fR () = 0" +.br +.in -1c +.SH DESCRIPTION +The QAccessibleInterface class defines an interface that exposes information about accessible objects. +.PP +See also Miscellaneous Classes. +.SH MEMBER FUNCTION DOCUMENTATION +.SH "int QAccessibleInterface::childCount () const\fC [pure virtual]\fR" +Returns the number of children that belong to this object. A child can provide accessibility information on it's own (e.g. a child widget), or be a sub-element of this accessible object. +.PP +All objects provide this information. +.PP +See also queryChild(). +.SH "void QAccessibleInterface::clearSelection ()\fC [pure virtual]\fR" +Removes any selection from the object. +.PP +See also setSelected(). +.SH "int QAccessibleInterface::controlAt ( int x, int y ) const\fC [pure virtual]\fR" +Returns the ID of the child that contains the screen coordinates (\fIx\fR, \fIy\fR). This function returns 0 if the point is positioned on the object itself. If the tested point is outside the boundaries of the object this function returns -1. +.PP +All visual objects provide this information. +.SH "bool QAccessibleInterface::doDefaultAction ( int control )\fC [pure virtual]\fR" +Calling this function performs the default action of the child object specified by \fIcontrol\fR, or the default action of the object itself if \fIcontrol\fR is 0. +.SH "bool QAccessibleInterface::isValid () const\fC [pure virtual]\fR" +Returns TRUE if all the data necessary to use this interface implementation is valid (e.g. all pointers are non-null), otherwise returns FALSE. +.SH "int QAccessibleInterface::navigate ( NavDirection direction, int startControl ) const\fC [pure virtual]\fR" +This function traverses to another object, or to a sub-element of the current object. \fIdirection\fR specifies in which direction to navigate, and \fIstartControl\fR specifies the start point of the navigation, which is either 0 if the navigation starts at the object itself, or an ID of one of the object's sub-elements. +.PP +The function returns the ID of the sub-element located in the \fIdirection\fR specified. If there is nothing in the navigated \fIdirection\fR, this function returns -1. +.PP +All objects support navigation. +.SH "QRESULT QAccessibleInterface::queryChild ( int control, QAccessibleInterface ** iface ) const\fC [pure virtual]\fR" +Sets \fIiface\fR to point to the implementation of the QAccessibleInterface for the child specified with \fIcontrol\fR. If the child doesn't provide accessibility information on it's own, the value of \fIiface\fR is set to 0. For those elements, this object is responsible for exposing the child's properties. +.PP +All objects provide this information. +.PP +See also childCount() and queryParent(). +.SH "QRESULT QAccessibleInterface::queryParent ( QAccessibleInterface ** iface ) const\fC [pure virtual]\fR" +Sets \fIiface\fR to point to the implementation of the QAccessibleInterface for the parent object, or to 0 if there is no such implementation or object. +.PP +All objects provide this information. +.PP +See also queryChild(). +.SH "QRect QAccessibleInterface::rect ( int control ) const\fC [pure virtual]\fR" +Returns the location of the child specified with \fIcontrol\fR in screen coordinates. This function returns the location of the object itself if \fIcontrol\fR is 0. +.PP +All visual objects provide this information. +.SH "Role QAccessibleInterface::role ( int control ) const\fC [pure virtual]\fR" +Returns the role of the object if \fIcontrol\fR is 0, or the role of the object's sub-element with ID \fIcontrol\fR. The role of an object is usually static. All accessible objects have a role. +.PP +See also text(), state(), and selection(). +.SH "QMemArray<int> QAccessibleInterface::selection () const\fC [pure virtual]\fR" +Returns the list of all the element IDs that are selected. +.PP +See also text(), role(), and state(). +.SH "bool QAccessibleInterface::setFocus ( int control )\fC [pure virtual]\fR" +Gives the focus to the child object specified by \fIcontrol\fR, or to the object itself if \fIcontrol\fR is 0. +.PP +Returns TRUE if the focus could be set; otherwise returns FALSE. +.SH "bool QAccessibleInterface::setSelected ( int control, bool on, bool extend )\fC [pure virtual]\fR" +Sets the selection of the child object with ID \fIcontrol\fR to \fIon\fR. If \fIextend\fR is TRUE, all child elements between the focused item and the specified child object have their selection set to \fIon\fR. +.PP +Returns TRUE if the selection could be set; otherwise returns FALSE. +.PP +See also setFocus() and clearSelection(). +.SH "void QAccessibleInterface::setText ( Text t, int control, const QString & text )\fC [pure virtual]\fR" +Sets the text property \fIt\fR of the child object \fIcontrol\fR to \fItext\fR. If \fIcontrol\fR is 0, the text property of the object itself is set. +.SH "State QAccessibleInterface::state ( int control ) const\fC [pure virtual]\fR" +Returns the current state of the object if \fIcontrol\fR is 0, or the state of the object's sub-element element with ID \fIcontrol\fR. All objects have a state. +.PP +See also text(), role(), and selection(). +.SH "QString QAccessibleInterface::text ( Text t, int control ) const\fC [pure virtual]\fR" +Returns a string property \fIt\fR of the child object specified by \fIcontrol\fR, or the string property of the object itself if \fIcontrol\fR is 0. +.PP +The \fIName\fR is a string used by clients to identify, find or announce an accessible object for the user. All objects must have a name that is unique within their container. +.PP +An accessible object's \fIDescription\fR provides textual information about an object's visual appearance. The description is primarily used to provide greater context for low-vision or blind users, but is also used for context searching or other applications. Not all objects have a description. An "OK" button would not need a description, but a toolbutton that shows a picture of a smiley would. +.PP +The \fIValue\fR of an accessible object represents visual information contained by the object, e.g. the text in a line edit. Usually, the value can be modified by the user. Not all objects have a value, e.g. static text labels don't, and some objects have a state that already is the value, e.g. toggle buttons. +.PP +The \fIHelp\fR text provides information about the function and usage of an accessible object. Not all objects provide this information. +.PP +An accessible object's \fIDefaultAction\fR describes the object's primary method of manipulation, and should be a verb or a short phrase, e.g. "Press" for a button. +.PP +The accelerator is a keyboard shortcut that activates the default action of the object. A keyboard shortcut is the underlined character in the text of a menu, menu item or control, and is either the character itself, or a combination of this character and a modifier key like ALT, CTRL or SHIFT. Command controls like tool buttons also have shortcut keys and usually display them in their tooltip. +.PP +See also role(), state(), and selection(). + +.SH "SEE ALSO" +.BR http://doc.trolltech.com/qaccessibleinterface.html +.BR http://www.trolltech.com/faq/tech.html +.SH COPYRIGHT +Copyright 1992-2001 Trolltech AS, http://www.trolltech.com. See the +license file included in the distribution for a complete license +statement. +.SH AUTHOR +Generated automatically from the source code. +.SH BUGS +If you find a bug in Qt, please report it as described in +.BR http://doc.trolltech.com/bughowto.html . +Good bug reports help us to help you. Thank you. +.P +The definitive Qt documentation is provided in HTML format; it is +located at $QTDIR/doc/html and can be read using Qt Assistant or with +a web browser. This man page is provided as a convenience for those +users who prefer man pages, although this format is not officially +supported by Trolltech. +.P +If you find errors in this manual page, please report them to +.BR qt...@tr... . +Please include the name of the manual page (qaccessibleinterface.3qt) and the Qt +version (3.3.5). Index: QAction.3qt =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/man/man3/Attic/QAction.3qt,v retrieving revision 1.1.1.3 retrieving revision 1.1.1.4 diff -u -r1.1.1.3 -r1.1.1.4 --- QAction.3qt 29 Jan 2005 11:12:43 -0000 1.1.1.3 +++ QAction.3qt 30 Sep 2005 15:22:33 -0000 1.1.1.4 @@ -1 +1,536 @@ -.so man3/qaction.3qt +'\" t +.TH QAction 3qt "2 September 2005" "Trolltech AS" \" -*- nroff -*- +.\" Copyright 1992-2001 Trolltech AS. All rights reserved. See the +.\" license file included in the distribution for a complete license +.\" statement. +.\" +.ad l +.nh +.SH NAME +QAction \- Abstract user interface action that can appear both in menus and tool bars +.SH SYNOPSIS +\fC#include <qaction.h>\fR +.PP +Inherits QObject. +.PP +Inherited by QActionGroup. +.PP +.SS "Public Members" +.in +1c +.ti -1c +.BI "\fBQAction\fR ( QObject * parent, const char * name = 0 )" +.br +.ti -1c +.BI "\fBQAction\fR ( const QString & menuText, QKeySequence accel, QObject * parent, const char * name = 0 )" +.br +.ti -1c +.BI "\fBQAction\fR ( const QIconSet & icon, const QString & menuText, QKeySequence accel, QObject * parent, const char * name = 0 )" +.br +.ti -1c +.BI "QAction ( const QString & text, const QIconSet & icon, const QString & menuText, QKeySequence accel, QObject * parent, const char * name = 0, bool toggle = FALSE ) \fI(obsolete)\fR" +.br +.ti -1c +.BI "QAction ( const QString & text, const QString & menuText, QKeySequence accel, QObject * parent, const char * name = 0, bool toggle = FALSE ) \fI(obsolete)\fR" +.br +.ti -1c +.BI "QAction ( QObject * parent, const char * name, bool toggle ) \fI(obsolete)\fR" +.br +.ti -1c +.BI "\fB~QAction\fR ()" +.br +.ti -1c +.BI "virtual void \fBsetIconSet\fR ( const QIconSet & )" +.br +.ti -1c +.BI "QIconSet \fBiconSet\fR () const" +.br +.ti -1c +.BI "virtual void \fBsetText\fR ( const QString & )" +.br +.ti -1c +.BI "QString \fBtext\fR () const" +.br +.ti -1c +.BI "virtual void \fBsetMenuText\fR ( const QString & )" +.br +.ti -1c +.BI "QString \fBmenuText\fR () const" +.br +.ti -1c +.BI "virtual void \fBsetToolTip\fR ( const QString & )" +.br +.ti -1c +.BI "QString \fBtoolTip\fR () const" +.br +.ti -1c +.BI "virtual void \fBsetStatusTip\fR ( const QString & )" +.br +.ti -1c +.BI "QString \fBstatusTip\fR () const" +.br +.ti -1c +.BI "virtual void \fBsetWhatsThis\fR ( const QString & )" +.br +.ti -1c +.BI "QString \fBwhatsThis\fR () const" +.br +.ti -1c +.BI "virtual void \fBsetAccel\fR ( const QKeySequence & key )" +.br +.ti -1c +.BI "QKeySequence \fBaccel\fR () const" +.br +.ti -1c +.BI "virtual void \fBsetToggleAction\fR ( bool )" +.br +.ti -1c +.BI "bool \fBisToggleAction\fR () const" +.br +.ti -1c +.BI "bool \fBisOn\fR () const" +.br +.ti -1c +.BI "bool \fBisEnabled\fR () const" +.br +.ti -1c +.BI "bool \fBisVisible\fR () const" +.br +.ti -1c +.BI "virtual bool \fBaddTo\fR ( QWidget * w )" +.br +.ti -1c +.BI "virtual bool \fBremoveFrom\fR ( QWidget * w )" +.br +.in -1c +.SS "Public Slots" +.in +1c +.ti -1c +.BI "void \fBactivate\fR ()" +.br +.ti -1c +.BI "void \fBtoggle\fR ()" +.br +.ti -1c +.BI "virtual void \fBsetOn\fR ( bool )" +.br +.ti -1c +.BI "virtual void \fBsetEnabled\fR ( bool )" +.br +.ti -1c +.BI "void \fBsetDisabled\fR ( bool disable )" +.br +.ti -1c +.BI "void \fBsetVisible\fR ( bool )" +.br +.in -1c +.SS "Signals" +.in +1c +.ti -1c +.BI "void \fBactivated\fR ()" +.br +.ti -1c +.BI "void \fBtoggled\fR ( bool on )" +.br +.in -1c +.SS "Properties" +.in +1c +.ti -1c +.BI "QKeySequence \fBaccel\fR - the action's accelerator key" +.br +.ti -1c +.BI "bool \fBenabled\fR - whether the action is enabled" +.br +.ti -1c +.BI "QIconSet \fBiconSet\fR - the action's icon" +.br +.ti -1c +.BI "QString \fBmenuText\fR - the action's menu text" +.br +.ti -1c +.BI "bool \fBon\fR - whether a toggle action is on" +.br +.ti -1c +.BI "QString \fBstatusTip\fR - the action's status tip" +.br +.ti -1c +.BI "QString \fBtext\fR - the action's descriptive text" +.br +.ti -1c +.BI "bool \fBtoggleAction\fR - whether the action is a toggle action" +.br +.ti -1c +.BI "QString \fBtoolTip\fR - the action's tool tip" +.br +.ti -1c +.BI "bool \fBvisible\fR - whether the action can be seen (e.g. in menus and " "toolbars" ")" +.br +.ti -1c +.BI "QString \fBwhatsThis\fR - the action's ""What's This?"" help text" +.br +.in -1c +.SS "Protected Members" +.in +1c +.ti -1c +.BI "virtual void \fBaddedTo\fR ( QWidget * actionWidget, QWidget * container )" +.br +.ti -1c +.BI "virtual void \fBaddedTo\fR ( int index, QPopupMenu * menu )" +.br +.in -1c +.SH DESCRIPTION +The QAction class provides an abstract user interface action that can appear both in menus and tool bars. +.PP +In GUI applications many commands can be invoked via a menu option, a toolbar button and a keyboard accelerator. Since the same action must be performed regardless of how the action was invoked, and since the menu and toolbar should be kept in sync, it is useful to represent a command as an \fIaction\fR. An action can be added to a menu and a toolbar and will automatically keep them in sync. For example, if the user presses a Bold toolbar button the Bold menu item will automatically be checked. +.PP +A QAction may contain an icon, a menu text, an accelerator, a status text, a whats this text and a tool tip. Most of these can be set in the constructor. They can also be set independently with setIconSet(), setText(), setMenuText(), setToolTip(), setStatusTip(), setWhatsThis() and setAccel(). +.PP +An action may be a toggle action e.g. a Bold toolbar button, or a command action, e.g. 'Open File' to invoke an open file dialog. Toggle actions emit the toggled() signal when their state changes. Both command and toggle actions emit the activated() signal when they are invoked. Use setToggleAction() to set an action's toggled status. To see if an action is a toggle action use isToggleAction(). A toggle action may be "on", isOn() returns TRUE, or "off", isOn() returns FALSE. +.PP +Actions are added to widgets (menus or toolbars) using addTo(), and removed using removeFrom(). +.PP +Once a QAction has been created it should be added to the relevant menu and toolbar and then connected to the slot which will perform the action. For example: +.PP +.nf +.br + fileOpenAction = new QAction( QPixmap( fileopen ), "&Open...", +.br + CTRL+Key_O, this, "open" ); +.br + connect( fileOpenAction, SIGNAL( activated() ) , this, SLOT( choose() ) ); +.fi +.PP +We create a "File Save" action with a menu text of "&Save" and \fICtrl+S\fR as the keyboard accelerator. We connect the fileSaveAction's activated() signal to our own save() slot. Note that at this point there is no menu or toolbar action, we'll add them next: +.PP +.nf +.br + QToolBar * fileTools = new QToolBar( this, "file operations" ); +.fi +.PP +.nf +.br + fileSaveAction->addTo( fileTools ); +.fi +.PP +.nf +.br + QPopupMenu * file = new QPopupMenu( this ); +.br + menuBar()->insertItem( "&File", file ); +.fi +.PP +.nf +.br + fileSaveAction->addTo( file ); +.fi +.PP +We create a toolbar and add our fileSaveAction to it. Similarly we create a menu, add a top-level menu item, and add our fileSaveAction. +.PP +We recommend that actions are created as children of the window that they are used in. In most cases actions will be children of the application's main window. +.PP +To prevent recursion, don't create an action as a child of a widget that the action is later added to. +.PP +See also Main Window and Related Classes and Basic Widgets. +.SH MEMBER FUNCTION DOCUMENTATION +.SH "QAction::QAction ( QObject * parent, const char * name = 0 )" +Constructs an action called \fIname\fR with parent \fIparent\fR. +.PP +If \fIparent\fR is a QActionGroup, the new action inserts itself into \fIparent\fR. +.PP +For accelerators and status tips to work, \fIparent\fR must either be a widget, or an action group whose parent is a widget. +.PP +\fBWarning:\fR To prevent recursion, don't create an action as a child of a widget that the action is later added to. +.SH "QAction::QAction ( const QString & menuText, QKeySequence accel, QObject * parent, const char * name = 0 )" +This constructor results in an icon-less action with the the menu text \fImenuText\fR and keyboard accelerator \fIaccel\fR. It is a child of \fIparent\fR and called \fIname\fR. +.PP +If \fIparent\fR is a QActionGroup, the action automatically becomes a member of it. +.PP +For accelerators and status tips to work, \fIparent\fR must either be a widget, or an action group whose parent is a widget. +.PP +The action uses a stripped version of \fImenuText\fR (e.g. "&Menu Option..." becomes "Menu Option") as descriptive text for toolbuttons. You can override this by setting a specific description with setText(). The same text and \fIaccel\fR will be used for tool tips and status tips unless you provide text for these using setToolTip() and setStatusTip(). +.PP +Call setToggleAction(TRUE) to make the action a toggle action. +.PP +\fBWarning:\fR To prevent recursion, don't create an action as a child of a widget that the action is later added to. +.SH "QAction::QAction ( const QIconSet & icon, const QString & menuText, QKeySequence accel, QObject * parent, const char * name = 0 )" +This constructor creates an action with the following properties: the icon or iconset \fIicon\fR, the menu text \fImenuText\fR and keyboard accelerator \fIaccel\fR. It is a child of \fIparent\fR and called \fIname\fR. +.PP +If \fIparent\fR is a QActionGroup, the action automatically becomes a member of it. +.PP +For accelerators and status tips to work, \fIparent\fR must either be a widget, or an action group whose parent is a widget. +.PP +The action uses a stripped version of \fImenuText\fR (e.g. "&Menu Option..." becomes "Menu Option") as descriptive text for toolbuttons. You can override this by setting a specific description with setText(). The same text and \fIaccel\fR will be used for tool tips and status tips unless you provide text for these using setToolTip() and setStatusTip(). +.PP +Call setToggleAction(TRUE) to make the action a toggle action. +.PP +\fBWarning:\fR To prevent recursion, don't create an action as a child of a widget that the action is later added to. +.SH "QAction::QAction ( const QString & text, const QIconSet & icon, const QString & menuText, QKeySequence accel, QObject * parent, const char * name = 0, bool toggle = FALSE )" +\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. +.PP +This constructor creates an action with the following properties: the description \fItext\fR, the icon or iconset \fIicon\fR, the menu text \fImenuText\fR and keyboard accelerator \fIaccel\fR. It is a child of \fIparent\fR and called \fIname\fR. If \fItoggle\fR is TRUE the action will be a toggle action, otherwise it will be a command action. +.PP +If \fIparent\fR is a QActionGroup, the action automatically becomes a member of it. +.PP +For accelerators and status tips to work, \fIparent\fR must either be a widget, or an action group whose parent is a widget. +.PP +The \fItext\fR and \fIaccel\fR will be used for tool tips and status tips unless you provide specific text for these using setToolTip() and setStatusTip(). +.SH "QAction::QAction ( const QString & text, const QString & menuText, QKeySequence accel, QObject * parent, const char * name = 0, bool toggle = FALSE )" +\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. +.PP +This constructor results in an icon-less action with the description \fItext\fR, the menu text \fImenuText\fR and the keyboard accelerator \fIaccel\fR. Its parent is \fIparent\fR and it is called \fIname\fR. If \fItoggle\fR is TRUE the action will be a toggle action, otherwise it will be a command action. +.PP +The action automatically becomes a member of \fIparent\fR if \fIparent\fR is a QActionGroup. +.PP +For accelerators and status tips to work, \fIparent\fR must either be a widget, or an action group whose parent is a widget. +.PP +The \fItext\fR and \fIaccel\fR will be used for tool tips and status tips unless you provide specific text for these using setToolTip() and setStatusTip(). +.SH "QAction::QAction ( QObject * parent, const char * name, bool toggle )" +\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code. +.PP +Constructs an action called \fIname\fR with parent \fIparent\fR. +.PP +If \fItoggle\fR is TRUE the action will be a toggle action, otherwise it will be a command action. +.PP +If \fIparent\fR is a QActionGroup, the new action inserts itself into \fIparent\fR. +.PP +For accelerators and status tips to work, \fIparent\fR must either be a widget, or an action group whose parent is a widget. +.SH "QAction::~QAction ()" +Destroys the object and frees allocated resources. +.SH "QKeySequence QAction::accel () const" +Returns the action's accelerator key. See the "accel" property for details. +.SH "void QAction::activate ()\fC [slot]\fR" +Activates the action and executes all connected slots. This only works for actions that are not toggle action. +.PP +See also toggle(). +.SH "void QAction::activated ()\fC [signal]\fR" +This signal is emitted when an action is activated by the user, e.g. when the user clicks a menu option or a toolbar button or presses an action's accelerator key combination. +.PP +Connect to this signal for command actions. Connect to the toggled() signal for toggle actions. +.PP +Examples: +.)l action/application.cpp, chart/chartform.cpp, and themes/themes.cpp. +.SH "bool QAction::addTo ( QWidget * w )\fC [virtual]\fR" +Adds this action to widget \fIw\fR. +.PP +Currently actions may be added to QToolBar and QPopupMenu widgets. +.PP +An action added to a tool bar is automatically displayed as a tool button; an action added to a pop up menu appears as a menu option. +.PP +addTo() returns TRUE if the action was added successfully and FALSE otherwise. (If \fIw\fR is not a QToolBar or QPopupMenu the action will not be added and FALSE will be returned.) +.PP +See also removeFrom(). +.PP +Examples: +.)l action/application.cpp, action/toggleaction/toggleaction.cpp, and chart/chartform.cpp. +.PP +Reimplemented in QActionGroup. +.SH "void QAction::addedTo ( QWidget * actionWidget, QWidget * container )\fC [virtual protected]\fR" +This function is called from the addTo() function when it has created a widget (\fIactionWidget\fR) for the action in the \fIcontainer\fR. +.SH "void QAction::addedTo ( int index, QPopupMenu * menu )\fC [virtual protected]\fR" +This is an overloaded member function, provided for convenience. It behaves essentially like the above function. +.PP +This function is called from the addTo() function when it has created a menu item at the index position \fIindex\fR in the popup menu \fImenu\fR. +.SH "QIconSet QAction::iconSet () const" +Returns the action's icon. See the "iconSet" property for details. +.SH "bool QAction::isEnabled () const" +Returns TRUE if the action is enabled; otherwise returns FALSE. See the "enabled" property for details. +.SH "bool QAction::isOn () const" +Returns TRUE if a toggle action is on; otherwise returns FALSE. See the "on" property for details. +.SH "bool QAction::isToggleAction () const" +Returns TRUE if the action is a toggle action; otherwise returns FALSE. See the "toggleAction" property for details. +.SH "bool QAction::isVisible () const" +Returns TRUE if the action can be seen (e.g. in menus and toolbars); otherwise returns FALSE. See the "visible" property for details. +.SH "QString QAction::menuText () const" +Returns the action's menu text. See the "menuText" property for details. +.SH "bool QAction::removeFrom ( QWidget * w )\fC [virtual]\fR" +Removes the action from widget \fIw\fR. +.PP +Returns TRUE if the action was removed successfully; otherwise returns FALSE. +.PP +See also addTo(). +.SH "void QAction::setAccel ( const QKeySequence & key )\fC [virtual]\fR" +Sets the action's accelerator key to \fIkey\fR. See the "accel" property for details. +.SH "void QAction::setDisabled ( bool disable )\fC [slot]\fR" +Disables the action if \fIdisable\fR is TRUE; otherwise enables the action. +.PP +See the enabled documentation for more information. +.SH "void QAction::setEnabled ( bool )\fC [virtual slot]\fR" +Sets whether the action is enabled. See the "enabled" property for details. +.SH "void QAction::setIconSet ( const QIconSet & )\fC [virtual]\fR" +Sets the action's icon. See the "iconSet" property for details. +.SH "void QAction::setMenuText ( const QString & )\fC [virtual]\fR" +Sets the action's menu text. See the "menuText" property for details. +.SH "void QAction::setOn ( bool )\fC [virtual slot]\fR" +Sets whether a toggle action is on. See the "on" property for details. +.SH "void QAction::setStatusTip ( const QString & )\fC [virtual]\fR" +Sets the action's status tip. See the "statusTip" property for details. +.SH "void QAction::setText ( const QString & )\fC [virtual]\fR" +Sets the action's descriptive text. See the "text" property for details. +.SH "void QAction::setToggleAction ( bool )\fC [virtual]\fR" +Sets whether the action is a toggle action. See the "toggleAction" property for details. +.SH "void QAction::setToolTip ( const QString & )\fC [virtual]\fR" +Sets the action's tool tip. See the "toolTip" property for details. +.SH "void QAction::setVisible ( bool )\fC [slot]\fR" +Sets whether the action can be seen (e.g. in menus and toolbars). See the "visible" property for details. +.SH "void QAction::setWhatsThis ( const QString & )\fC [virtual]\fR" +Sets the action's "What's This?" help text. See the "whatsThis" property for details. +.SH "QString QAction::statusTip () const" +Returns the action's status tip. See the "statusTip" property for details. +.SH "QString QAction::text () const" +Returns the action's descriptive text. See the "text" property for details. +.SH "void QAction::toggle ()\fC [slot]\fR" +Toggles the state of a toggle action. +.PP +See also on, activate(), toggled(), and toggleAction. +.SH "void QAction::toggled ( bool on )\fC [signal]\fR" +This signal is emitted when a toggle action changes state; command actions and QActionGroups don't emit toggled(). +.PP +The \fIon\fR argument denotes the new state: If \fIon\fR is TRUE the toggle action is switched on, and if \fIon\fR is FALSE the toggle action is switched off. +.PP +To trigger a user command depending on whether a toggle action has been switched on or off connect it to a slot that takes a bool to indicate the state, e.g. +.PP +.nf +.br + QMainWindow * window = new QMainWindow; +.fi +.PP +.nf +.br + QAction * labelonoffaction = new QAction( window, "labelonoff" ); +.fi +.PP +.nf +.br + QObject::connect( labelonoffaction, SIGNAL( toggled( bool ) ), +.br + window, SLOT( setUsesTextLabel( bool ) ) ); +.fi +.PP +See also activated(), toggleAction, and on. +.PP +Example: action/toggleaction/toggleaction.cpp. +.SH "QString QAction::toolTip () const" +Returns the action's tool tip. See the "toolTip" property for details. +.SH "QString QAction::whatsThis () const" +Returns the action's "What's This?" help text. See the "whatsThis" property for details. +.SS "Property Documentation" +.SH "QKeySequence accel" +This property holds the action's accelerator key. +.PP +The keycodes can be found in Qt::Key and Qt::Modifier. There is no default accelerator key. +.PP +Set this property's value with setAccel() and get this property's value with accel(). +.SH "bool enabled" +This property holds whether the action is enabled. +.PP +Disabled actions can't be chosen by the user. They don't disappear from the menu/tool bar but are displayed in a way which indicates that they are unavailable, e.g. they might be displayed grayed out. +.PP +What's this? help on disabled actions is still available provided the QAction::whatsThis property is set. +.PP +Set this property's value with setEnabled() and get this property's value with isEnabled(). +.SH "QIconSet iconSet" +This property holds the action's icon. +.PP +The icon is used as the tool button icon and in the menu to the left of t... [truncated message content] |
Update of /cvsroot/kde-cygwin/qt-3/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5599/doc Modified Files: Tag: QT_WIN32_3_3_BRANCH 3rdparty.doc Makefile aboutqt.doc accel.doc annotated.doc application-walkthrough.doc canvas.doc changes.doc charinput-qws.doc classchart.doc classes.doc collect.doc commercialeditions.doc coordsys.doc credits.doc customstyles.doc datastreamformat.doc debug.doc distributingqt.doc dnd.doc editions.doc embclasses.doc embporting.doc envvars.doc faq.doc features.doc focus.doc framebuffer-howto.doc freeeditions.doc functions.doc headers.doc hierarchy.doc how-to-learn-qt.doc Log Message: Index: 3rdparty.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/3rdparty.doc,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.3 diff -u -r1.1.1.2 -r1.1.1.3 --- 3rdparty.doc 27 Aug 2004 21:24:13 -0000 1.1.1.2 +++ 3rdparty.doc 30 Sep 2005 15:11:17 -0000 1.1.1.3 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Discussion of different licenses used in Qt. ** -** Copyright (C) 2003 Trolltech AS. All rights reserved. +** Copyright (C) 2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** Index: aboutqt.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/aboutqt.doc,v retrieving revision 1.1.1.4 retrieving revision 1.1.1.5 diff -u -r1.1.1.4 -r1.1.1.5 --- aboutqt.doc 9 Apr 2005 10:14:12 -0000 1.1.1.4 +++ aboutqt.doc 30 Sep 2005 15:11:18 -0000 1.1.1.5 @@ -1,57 +1,57 @@ -/*! -\page aboutqt.html - -\title About Qt - -Qt is a multiplatform C++ GUI toolkit created and maintained by\link -troll.html Trolltech\endlink. It provides application developers with -all the functionality needed to build applications with -state-of-the-art graphical user interfaces. Qt is fully -object-oriented, easily extensible, and allows true component -programming. Read the \link -http://www.trolltech.com/products/qt/whitepaper.html -Whitepaper\endlink for a comprehensive technical overview. - -Since its commercial introduction in early 1996, Qt has formed the -basis of many thousands of successful applications worldwide. Qt is -also the basis of the popular \link http://www.kde.org/ KDE \endlink -Linux desktop environment, a standard component of all major Linux -distributions. See our \link http://www.trolltech.com/success/ -Customer Success Stories\endlink for some examples of commercial Qt -development. - - -Qt is supported on the following platforms: -\list - \i <b>MS/Windows</b> -- 95, 98, NT 4.0, ME, 2000, and XP - \i <b>Unix/X11</b> -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, - IBM AIX, SGI IRIX and a wide range of others - \i <b>Macintosh</b> -- Mac OS X - \i <b>Embedded</b> -- Linux platforms with framebuffer support. -\endlist - -Qt is released in different editions: -\list -\i The \link commercialeditions.html <b>Qt Enterprise -Edition\endlink</b> and the \link commercialeditions.html <b>Qt -Professional Edition\endlink</b> provide for commercial software -development. They permit traditional commercial software distribution -and include free upgrades and Technical Support. For the latest -prices, see the Trolltech web site, \link -http://www.trolltech.com/pricing.html Pricing and Availability\endlink -page, or contact \link mailto:sa...@tr... -s...@tr...\endlink. The Enterprise Edition offers additional -\link modules.html modules \endlink compared to the Professional -Edition. -\endlist - -\list -\i The \link opensourceedition.html <b>Qt Open Source Edition\endlink</b> is -available for Unix/X11, Macintosh and Embedded Linux. The Open Source Edition -is for the development of \e {Free and Open -Source software} only. It is provided free of charge under the terms -of both the \link license.html Q Public License\endlink and the \link -gpl.html GNU General Public License\endlink. -\endlist - -*/ +/*! +\page aboutqt.html + +\title About Qt + +Qt is a multiplatform C++ GUI toolkit created and maintained by\link +troll.html Trolltech\endlink. It provides application developers with +all the functionality needed to build applications with +state-of-the-art graphical user interfaces. Qt is fully +object-oriented, easily extensible, and allows true component +programming. Read the \link +http://www.trolltech.com/products/qt/whitepaper.html +Whitepaper\endlink for a comprehensive technical overview. + +Since its commercial introduction in early 1996, Qt has formed the +basis of many thousands of successful applications worldwide. Qt is +also the basis of the popular \link http://www.kde.org/ KDE \endlink +Linux desktop environment, a standard component of all major Linux +distributions. See our \link http://www.trolltech.com/success/ +Customer Success Stories\endlink for some examples of commercial Qt +development. + + +Qt is supported on the following platforms: +\list + \i <b>MS/Windows</b> -- 95, 98, NT 4.0, ME, 2000, and XP + \i <b>Unix/X11</b> -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, + IBM AIX, SGI IRIX and a wide range of others + \i <b>Macintosh</b> -- Mac OS X + \i <b>Embedded</b> -- Linux platforms with framebuffer support. +\endlist + +Qt is released in different editions: +\list +\i The \link commercialeditions.html <b>Qt Enterprise +Edition\endlink</b> and the \link commercialeditions.html <b>Qt +Professional Edition\endlink</b> provide for commercial software +development. They permit traditional commercial software distribution +and include free upgrades and Technical Support. For the latest +prices, see the Trolltech web site, \link +http://www.trolltech.com/pricing.html Pricing and Availability\endlink +page, or contact \link mailto:sa...@tr... +s...@tr...\endlink. The Enterprise Edition offers additional +\link modules.html modules \endlink compared to the Professional +Edition. +\endlist + +\list +\i The \link opensourceedition.html <b>Qt Open Source Edition\endlink</b> is +available for Unix/X11, Macintosh and Embedded Linux. The Open Source Edition +is for the development of \e {Free and Open +Source software} only. It is provided free of charge under the terms +of both the \link license.html Q Public License\endlink and the \link +gpl.html GNU General Public License\endlink. +\endlist + +*/ Index: accel.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/accel.doc,v retrieving revision 1.1.1.6 retrieving revision 1.1.1.7 diff -u -r1.1.1.6 -r1.1.1.7 --- accel.doc 1 Oct 2003 07:17:05 -0000 1.1.1.6 +++ accel.doc 30 Sep 2005 15:11:18 -0000 1.1.1.7 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Help with writing Qt/Embedded accelerated drivers ** -** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** Index: annotated.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/annotated.doc,v retrieving revision 1.1.1.6 retrieving revision 1.1.1.7 diff -u -r1.1.1.6 -r1.1.1.7 --- annotated.doc 1 Oct 2003 07:17:05 -0000 1.1.1.6 +++ annotated.doc 30 Sep 2005 15:11:18 -0000 1.1.1.7 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Documentation for class overview ** -** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** Index: application-walkthrough.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/application-walkthrough.doc,v retrieving revision 1.1.1.6 retrieving revision 1.1.1.7 diff -u -r1.1.1.6 -r1.1.1.7 --- application-walkthrough.doc 1 Oct 2003 07:17:05 -0000 1.1.1.6 +++ application-walkthrough.doc 30 Sep 2005 15:11:18 -0000 1.1.1.7 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Application example documentation ** -** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** Index: canvas.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/canvas.doc,v retrieving revision 1.1.1.6 retrieving revision 1.1.1.7 diff -u -r1.1.1.6 -r1.1.1.7 --- canvas.doc 1 Oct 2003 07:17:05 -0000 1.1.1.6 +++ canvas.doc 30 Sep 2005 15:11:18 -0000 1.1.1.7 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Documentation for the canvas module ** -** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** Index: changes.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/changes.doc,v retrieving revision 1.1.1.6 retrieving revision 1.1.1.7 diff -u -r1.1.1.6 -r1.1.1.7 --- changes.doc 1 Oct 2003 07:17:05 -0000 1.1.1.6 +++ changes.doc 30 Sep 2005 15:11:18 -0000 1.1.1.7 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Change documentation ** -** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** Index: charinput-qws.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/charinput-qws.doc,v retrieving revision 1.1.1.6 retrieving revision 1.1.1.7 diff -u -r1.1.1.6 -r1.1.1.7 --- charinput-qws.doc 1 Oct 2003 07:17:05 -0000 1.1.1.6 +++ charinput-qws.doc 30 Sep 2005 15:11:18 -0000 1.1.1.7 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Documentation of character input ** -** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** Index: classchart.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/classchart.doc,v retrieving revision 1.1.1.5 retrieving revision 1.1.1.6 diff -u -r1.1.1.5 -r1.1.1.6 --- classchart.doc 27 Aug 2004 21:24:13 -0000 1.1.1.5 +++ classchart.doc 30 Sep 2005 15:11:18 -0000 1.1.1.6 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Graphical representation of classes ** -** Copyright (C) 2001-2002 Trolltech AS. All rights reserved. +** Copyright (C) 2001-2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** Index: classes.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/classes.doc,v retrieving revision 1.1.1.6 retrieving revision 1.1.1.7 diff -u -r1.1.1.6 -r1.1.1.7 --- classes.doc 1 Oct 2003 07:17:05 -0000 1.1.1.6 +++ classes.doc 30 Sep 2005 15:11:18 -0000 1.1.1.7 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Documentation for class overview ** -** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** Index: collect.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/collect.doc,v retrieving revision 1.1.1.6 retrieving revision 1.1.1.7 diff -u -r1.1.1.6 -r1.1.1.7 --- collect.doc 1 Oct 2003 07:17:05 -0000 1.1.1.6 +++ collect.doc 30 Sep 2005 15:11:18 -0000 1.1.1.7 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Qt collection classes documentation ** -** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** Index: commercialeditions.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/commercialeditions.doc,v retrieving revision 1.1.1.5 retrieving revision 1.1.1.6 diff -u -r1.1.1.5 -r1.1.1.6 --- commercialeditions.doc 9 Apr 2005 10:14:12 -0000 1.1.1.5 +++ commercialeditions.doc 30 Sep 2005 15:11:18 -0000 1.1.1.6 @@ -1,167 +1,167 @@ -/**************************************************************************** -** -** -** Documentation on the commercial editions -** -** Copyright (C) 2003 Trolltech AS. All rights reserved. -** -** This file is part of the Qt GUI Toolkit. -** -** This file may be distributed under the terms of the Q Public License -** as defined by Trolltech AS of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt 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. -** -** See http://www.trolltech.com/pricing.html or email sa...@tr... for -** information about Qt Commercial License Agreements. -** See http://www.trolltech.com/qpl/ for QPL licensing information. -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact in...@tr... if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ - -/*! \page commercialeditions.html - -\title Qt Commercial Editions - -The Qt Professional and Enterprise Editions are the commercial -versions of \link aboutqt.html Qt\endlink. - -You may only write commercial, proprietary and non-free software if -you have purchased the Professional Edition or the Enterprise -Edition. -\footnote -If you want to develop free/open source software for -release using a recognized open source license you can use the -\link opensourceedition.html Qt Open Source Edition\endlink. -\endfootnote -The purchase of a Qt commercial edition includes technical support and -upgrades. Qt for Microsoft Windows is only available in the -Professional and Enterprise Editions. - -Qt is supported on the following platforms: -\list - \i <b>MS/Windows</b> -- 95, 98, NT 4.0, ME, 2000, and XP - \i <b>Unix/X11</b> -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, - IBM AIX, SGI IRIX and a wide range of others - \i <b>Macintosh</b> -- Mac OS X - \i <b>\link http://www.trolltech.com/products/embedded/index.html -Qt/Embedded\endlink</b> -- Linux platforms with framebuffer support. -\endlist - -On Trolltech's web site, you can find \link -http://www.trolltech.com/products/qt/licensing.html licensing -information\endlink and \link -http://www.trolltech.com/products/qt/pricing.html price lists\endlink for -Qt Professional Edition, Qt Enterprise Edition, and other Trolltech -products. - -To purchase, please visit the -<a href="https://webshop.trolltech.com/cgi-bin/index.cgi">Trolltech -webshop</a>. In the webshop, you can generate a Purchase Order, order -a Quote, or purchase directly using credit card. - -For further information and assistance, please contact Trolltech sales: - -Email: \link mailto:sa...@tr... sa...@tr...\endlink - -Phone, US office (for North America): <strong>(+1) 650-813-1676</strong> - -Phone, Norway office (for others): <strong>+47 2160 4800</strong> - -<table border="1" cellpadding="5" cellspacing="0" width="100%"> - <tr> - <td bgcolor="#a1c410"><b><a name="Chart"></a>Professional/Enterprise Comparison Chart</b></td> - <td width="100" align="center" bgcolor="#a1c410"><b>Professional</b></td> - <td width="100" align="center" bgcolor="#a1c410"><b>Enterprise</b></td> - </tr> - <tr> - <td><b><a href=index.html">Qt Base Modules (Tools, Kernel, - Widgets, Dialogs)</a></b><br> - The platform-independent Qt GUI toolkit and utility classes</td> - <td width="100" align="center"><b>X</b></td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="designer-manual.html"><b>Qt Designer</b></a><br> - Visual Qt GUI builder</td> - <td width="100" align="center"><b>X</b></td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="iconview.html"><b>Iconview module</b></a><br> - Visualization of sets of pixmaps with user interaction.</td> - <td width="100" align="center"><b>X</b></td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="workspace.html"><b>Workspace module</b></a><b><br> - </b>Multiple Document Interface (MDI) support</td> - <td width="100" align="center"><b>X</b></td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="opengl.html"><b>OpenGL 3D Graphics module</b></a><b><br> - </b>Integration of Qt with OpenGL</td> - <td width="100" align="center"><br> - </td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="network.html"><b>Network module</b></a><b><br> - </b>Platform-independent classes for sockets, TCP, FTP and asynchronous DNS lookup.</td> - <td width="100" align="center"><br> - </td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="canvas.html"><b>Canvas module</b></a><br> - Optimized 2D graphics area for visualization, diagrams, etc.</td> - <td width="100" align="center"><br> - </td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="table.html"><b>Table module</b></a><br> - Flexible and editable table / spreadsheet</td> - <td width="100" align="center"><br> - </td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="xml.html"><b>XML module</b></a><br> - Well-formed XML parser with SAX interface and DOM Level 1.</td> - <td width="100" align="center"><br> - </td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="activeqt.html"><b>ActiveQt extension</b></a><br> - Support for building and hosting ActiveX controls on Windows.</td> - <td width="100" align="center"><br> - </td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="motif-extension.html"><b>QMotif extension</b></a><br> - Motif co-existence and migration support.</td> - <td width="100" align="center"><br> - </td> - <td width="100" align="center"><b>X</b></td> - </tr> -</table> - -*/ +/**************************************************************************** +** $Id$ +** +** Documentation on the commercial editions +** +** Copyright (C) 2005 Trolltech AS. All rights reserved. +** +** This file is part of the Qt GUI Toolkit. +** +** This file may be distributed under the terms of the Q Public License +** as defined by Trolltech AS of Norway and appearing in the file +** LICENSE.QPL included in the packaging of this file. +** +** This file may be distributed and/or modified under the terms of the +** GNU General Public License version 2 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. +** +** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition +** licenses may use this file in accordance with the Qt 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. +** +** See http://www.trolltech.com/pricing.html or email sa...@tr... for +** information about Qt Commercial License Agreements. +** See http://www.trolltech.com/qpl/ for QPL licensing information. +** See http://www.trolltech.com/gpl/ for GPL licensing information. +** +** Contact in...@tr... if any conditions of this licensing are +** not clear to you. +** +**********************************************************************/ + +/*! \page commercialeditions.html + +\title Qt Commercial Editions + +The Qt Professional and Enterprise Editions are the commercial +versions of \link aboutqt.html Qt\endlink. + +You may only write commercial, proprietary and non-free software if +you have purchased the Professional Edition or the Enterprise +Edition. +\footnote +If you want to develop free/open source software for +release using a recognized open source license you can use the +\link opensourceedition.html Qt Open Source Edition\endlink. +\endfootnote +The purchase of a Qt commercial edition includes technical support and +upgrades. Qt for Microsoft Windows is only available in the +Professional and Enterprise Editions. + +Qt is supported on the following platforms: +\list + \i <b>MS/Windows</b> -- 95, 98, NT 4.0, ME, 2000, and XP + \i <b>Unix/X11</b> -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, + IBM AIX, SGI IRIX and a wide range of others + \i <b>Macintosh</b> -- Mac OS X + \i <b>\link http://www.trolltech.com/products/embedded/index.html +Qt/Embedded\endlink</b> -- Linux platforms with framebuffer support. +\endlist + +On Trolltech's web site, you can find \link +http://www.trolltech.com/products/qt/licensing.html licensing +information\endlink and \link +http://www.trolltech.com/products/qt/pricing.html price lists\endlink for +Qt Professional Edition, Qt Enterprise Edition, and other Trolltech +products. + +To purchase, please visit the +<a href="https://webshop.trolltech.com/cgi-bin/index.cgi">Trolltech +webshop</a>. In the webshop, you can generate a Purchase Order, order +a Quote, or purchase directly using credit card. + +For further information and assistance, please contact Trolltech sales: + +Email: \link mailto:sa...@tr... sa...@tr...\endlink + +Phone, US office (for North America): <strong>(+1) 650-813-1676</strong> + +Phone, Norway office (for others): <strong>+47 2160 4800</strong> + +<table border="1" cellpadding="5" cellspacing="0" width="100%"> + <tr> + <td bgcolor="#a1c410"><b><a name="Chart"></a>Professional/Enterprise Comparison Chart</b></td> + <td width="100" align="center" bgcolor="#a1c410"><b>Professional</b></td> + <td width="100" align="center" bgcolor="#a1c410"><b>Enterprise</b></td> + </tr> + <tr> + <td><b><a href=index.html">Qt Base Modules (Tools, Kernel, + Widgets, Dialogs)</a></b><br> + The platform-independent Qt GUI toolkit and utility classes</td> + <td width="100" align="center"><b>X</b></td> + <td width="100" align="center"><b>X</b></td> + </tr> + <tr> + <td><a href="designer-manual.html"><b>Qt Designer</b></a><br> + Visual Qt GUI builder</td> + <td width="100" align="center"><b>X</b></td> + <td width="100" align="center"><b>X</b></td> + </tr> + <tr> + <td><a href="iconview.html"><b>Iconview module</b></a><br> + Visualization of sets of pixmaps with user interaction.</td> + <td width="100" align="center"><b>X</b></td> + <td width="100" align="center"><b>X</b></td> + </tr> + <tr> + <td><a href="workspace.html"><b>Workspace module</b></a><b><br> + </b>Multiple Document Interface (MDI) support</td> + <td width="100" align="center"><b>X</b></td> + <td width="100" align="center"><b>X</b></td> + </tr> + <tr> + <td><a href="opengl.html"><b>OpenGL 3D Graphics module</b></a><b><br> + </b>Integration of Qt with OpenGL</td> + <td width="100" align="center"><br> + </td> + <td width="100" align="center"><b>X</b></td> + </tr> + <tr> + <td><a href="network.html"><b>Network module</b></a><b><br> + </b>Platform-independent classes for sockets, TCP, FTP and asynchronous DNS lookup.</td> + <td width="100" align="center"><br> + </td> + <td width="100" align="center"><b>X</b></td> + </tr> + <tr> + <td><a href="canvas.html"><b>Canvas module</b></a><br> + Optimized 2D graphics area for visualization, diagrams, etc.</td> + <td width="100" align="center"><br> + </td> + <td width="100" align="center"><b>X</b></td> + </tr> + <tr> + <td><a href="table.html"><b>Table module</b></a><br> + Flexible and editable table / spreadsheet</td> + <td width="100" align="center"><br> + </td> + <td width="100" align="center"><b>X</b></td> + </tr> + <tr> + <td><a href="xml.html"><b>XML module</b></a><br> + Well-formed XML parser with SAX interface and DOM Level 1.</td> + <td width="100" align="center"><br> + </td> + <td width="100" align="center"><b>X</b></td> + </tr> + <tr> + <td><a href="activeqt.html"><b>ActiveQt extension</b></a><br> + Support for building and hosting ActiveX controls on Windows.</td> + <td width="100" align="center"><br> + </td> + <td width="100" align="center"><b>X</b></td> + </tr> + <tr> + <td><a href="motif-extension.html"><b>QMotif extension</b></a><br> + Motif co-existence and migration support.</td> + <td width="100" align="center"><br> + </td> + <td width="100" align="center"><b>X</b></td> + </tr> +</table> + +*/ Index: coordsys.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/coordsys.doc,v retrieving revision 1.1.1.7 retrieving revision 1.1.1.8 diff -u -r1.1.1.7 -r1.1.1.8 --- coordsys.doc 27 Aug 2004 21:24:13 -0000 1.1.1.7 +++ coordsys.doc 30 Sep 2005 15:11:18 -0000 1.1.1.8 @@ -1,9 +1,9 @@ /**************************************************************************** -** +** $Id$ ** ** Qt Coordinate System Documentation ** -** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. ** ** This file is part of the Qt GUI Toolkit. ** Index: credits.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/credits.doc,v retrieving revision 1.1.1.11 retrieving revision 1.1.1.12 diff -u -r1.1.1.11 -r1.1.1.12 --- credits.doc 9 Apr 2005 10:14:12 -0000 1.1.1.11 +++ credits.doc 30 Sep 2005 15:11:18 -0000 1.1.1.12 @@ -1,323 +1,323 @@ -/**************************************************************************** -** -** -** Credits file - all the qt-bugs stuff -** -** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. -** -** This file is part of the Qt GUI Toolkit. -** -** This file may be distributed under the terms of the Q Public License -** as defined by Trolltech AS of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt 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. -** -** See http://www.trolltech.com/pricing.html or email sa...@tr... for -** information about Qt Commercial License Agreements. -** See http://www.trolltech.com/qpl/ for QPL licensing information. -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact in...@tr... if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ - -/*! -\page credits.html - -\title Thanks! - -<p>The following (and probably many others) have provided bug reports, -suggestions, patches, beta testing, or done us other favors. We thank -you all: - -<blockquote> - -Adam P. Jenkins <ajenkins <i>at</i> cs.umass.edu><br> -Ahmed Metwally <ametwaly <i>at</i> auc-cs28.eun.eg><br> -Aidas Kasparas <kaspar <i>at</i> soften.ktu.lt><br> -Alejandro Aguilar Sierra <asierra <i>at</i> servidor.unam.mx><br> -Alex <steeper <i>at</i> dial.pipex.com><br> -Alex Kambis <kambis <i>at</i> eos913c.gsfc.nasa.gov><br> -Alexander Kozlov <alex <i>at</i> hale.appl.sci-nnov.ru><br> -Alexander Sanda <alex <i>at</i> darkstar.ping.at><br> -Amos Leffler <leffler <i>at</i> netaxs.com><br> -Anders Hanson <andhan <i>at</i> lls.se><br> -Andreas Schlempp <schlempp <i>at</i> egd.igd.fhg.de><br> -Andrew Bell <abell <i>at</i> vsys.com><br> -Andrew Gillham <gillhaa <i>at</i> ghost.whirlpool.com><br> -Andrew J. Robinson <robinson <i>at</i> eclipse.net><br> -Andrew Pavlomanolakos <app <i>at</i> novanet.net.au><br> -Andrew R. Tefft <teffta <i>at</i> crypt.erie.ge.com><br> -Andrew Vajoczki <vajoczki <i>at</i> interlog.com><br> -André Johansen <Andre.Johansen <i>at</i> funcom.no><br> -Andy Brice <andyb <i>at</i> suntail.net><br> -Andy Shaw <andy <i>at</i> east.no><br> -Anton Keyter <ant <i>at</i> intekom.co.za><br> -Arabeyes Project (http://www.arabeyes.org) <doc <i>at</i> arabeyes <i>dot</i> org><br> -Arnt Gulbrandsen <arnt <i>at</i> gulbrandsen.priv.no><br> -Ashley Winters <jql <i>at</i> accessone.com><br> -Aubrey Soper <azdak <i>at</i> ix.netcom.com><br> -Axel Schwenke <schwenke <i>at</i> HTWM.DE><br> -Ben Bergen <ben <i>at</i> gmg.com><br> -Bernard Leach <B.Leach <i>at</i> compsoc.cs.latrobe.edu.au><br> -Bernd Johannes Wuebben <wuebben <i>at</i> math.cornell.edu><br> -Bernd S. Brentrup <bsb <i>at</i> uni-muenster.de><br> -Bert Haverkamp <b.r.j.haverkamp <i>at</i> et.tudelft.nl><br> -Bjorn Reese <breese <i>at</i> dit.ou.dk><br> -Brian Beattie <beattie <i>at</i> drcpdx.stt3.com><br> -Brian P. Theodore <theodore <i>at</i> std.saic.com><br> -Brian White <bcwhite <i>at</i> verisim.com><br> -Bryan Scattergood <bryan <i>at</i> fsel.com><br> -Carsten Steckel <carsten <i>at</i> cs.newcastle.edu.au><br> -Chao-Hsin, Lin <linchao <i>at</i> charlie.cns.iit.edu><br> -Chip Salzenberg <chip <i>at</i> atlantic.net><br> -Chris Zwilling <crzwlng <i>at</i> cloudnet.com><br> -Christian Czezatke <e9025461 <i>at</i> student.tuwien.ac.at><br> -Christopher Andrew Spiking <cas <i>at</i> Cs.Nott.AC.UK><br> -Clarence Dang <dangs <i>at</i> kde.org><br> -Christopher J. White <cjwhite <i>at</i> rgit.wustl.edu><br> -Claus Werner <lzu96cw <i>at</i> reading.ac.uk><br> -Cloyce D. Spradling <cloyce <i>at</i> austin.ibm.com><br> -Colin Paul Adams <colin <i>at</i> colina.demon.co.uk><br> -Cristiano Verondini <cverond <i>at</i> deis219.deis.unibo.it><br> -Damyan Pepper <damyanp <i>at</i> cogs.susx.ac.uk><br> -Dan Nickerson <nickersond <i>at</i> uthscsa.edu><br> -Daniel Brahneborg <basic <i>at</i> well.com><br> -Daniel Gruner <dgruner <i>at</i> tikva.chem.utoronto.ca><br> -Daniel J Mitchell <dan <i>at</i> rebellion.co.uk><br> -Danilo Fiorenzano <danilo <i>at</i> terranet.ab.ca><br> -Dante Profeta <profeta <i>at</i> neomedia.it><br> -Darryl Ruggles <001654r <i>at</i> dragon.acadiau.ca><br> -Dave <dave <i>at</i> stellacore.com><br> -Dave Steffen <steffend <i>at</i> glitch.physics.colostate.edu><br> -Dean Hall <dwhall <i>at</i> deskstation.com><br> -Denis Y. Pershin <dyp <i>at</i> isis.nsu.ru><br> -Diedrich Vorberg <Diedrich_Vorberg <i>at</i> cp.prima.ruhr.de><br> -Dietmar Schaefer <dietmar <i>at</i> cs.newcastle.edu.au><br> -Dimitri Papadopoulos <dpo <i>at</i> club-internet.fr><br> -Dirk Mueller <mueller <i>at</i> kde.org><br> -Dirk Schwartmann <dirk.schwartmann <i>at</i> dlr.de><br> -Dominik Jergus <djergus <i>at</i> ics.uci.edu><br> -Don Sanders <sanders <i>at</i> kde.org><br> -Donald A. Seielstad <donald <i>at</i> gromit.scs.uiuc.edu><br> -Donna J. Armijo <donna <i>at</i> KachinaTech.COM><br> -Doug Boreland <dborel <i>at</i> amex-trs.com><br> -Douglas Lenz <dlenz <i>at</i> spedsoft.com><br> -Dr Mek Buhl Nielsen <m.b.nielsen <i>at</i> bham.ac.uk><br> -Dr Willem A. Schreuder <Willem.Schreuder <i>at</i> prinmath.com><br> -E. Kevin Hall <hall <i>at</i> boston.sgi.com><br> -Ed Mackey <emackey <i>at</i> Early.com><br> -Edmund Taylor <etaylor <i>at</i> interaccess.com><br> -Eric Bos <Eric.Bos <i>at</i> adelaide.maptek.com.au><br> -Eric Brunson <brunson <i>at</i> brunson.com><br> -Eric Jansen <jansen <i>at</i> photon.com><br> -Erik Norell <erik <i>at</i> Astrakan.HGS.SE><br> -Erik Thiele <erik <i>at</i> unterland.de><br> -Ernie Pasveer <erniep <i>at</i> vsl.com><br> -F R Ball <frb <i>at</i> umr.edu><br> -Fergal Mc Carthy <fergal <i>at</i> ilo.dec.com><br> -Frank Gockel <gockel <i>at</i> etecs4.uni-duisburg.de><br> -Frank Roscher <frank <i>at</i> chemnitz.abs-rz.de><br> -Fredrik Markström <fredrik <i>at</i> zod.campus.luth.se><br> -Fredrik Nehr <fredrik_nehr <i>at</i> ivab.se><br> -FrenzelBhv <i>at</i> aol.com<br> -Frugal <frugal <i>at</i> wardrobe.demon.co.uk><br> -Frugal the Curious <Chris.Ward <i>at</i> softcare.co.uk><br> -Fujimoto Koji <kochan <i>at</i> mbox.kyoto-inet.or.jp><br> -Gabor V. Gulyas <gabor <i>at</i> robiomat.com><br> -Gary E. Sherman <sherman <i>at</i> mrcc.com><br> -Geoff Carpenter <GCC <i>at</i> watson.ibm.com><br> -Geoffrey Higginson <ghiggins <i>at</i> gulf.uvic.ca><br> -Georg Filios <Georg.Filios <i>at</i> post.rwth-aachen.de><br> -George Simunovich <george <i>at</i> cia-g.com><br> -Giovanni Carapelli <gcarapel <i>at</i> mbox.vol.it><br> -Greg Tomalesky <tomalesk <i>at</i> yrkpa.kias.com><br> -Gregg Jensen <gwj <i>at</i> stl.nexen.com><br> -Gustav "Gurre" Kalvesten <a94guska <i>at</i> ida.his.se><br> -Hal DeVore <hdevore <i>at</i> crow.bmc.com><br> -Hans Flaechsig <hans <i>at</i> hannes.owl.de><br> -Hans Schlenker <schlenkh <i>at</i> informatik.uni-muenchen.de><br> -Hardo Mueller <hardo <i>at</i> ipb.uni-bonn.de><br> -Heiko Gerdau <heiko.gerdau <i>at</i> t-online.de><br> -Henty Waker <henty <i>at</i> foxbat.sur.uct.ac.za><br> -Hrafnkell Eiriksson <hkelle <i>at</i> mmedia.is><br> -Ildefonso Junquero Martin-Arroyo <junquero <i>at</i> sainsel.es><br> -Ingo Stapel <ingo.stapel <i>at</i> tu-clausthal.de><br> -J. Solomon Kostelnik <roz <i>at</i> one.net><br> -Jae Cho <cs184-dc <i>at</i> ute.CS.Berkeley.EDU><br> -James McIninch <james <i>at</i> amber.biology.gatech.edu><br> -Jan Aarsaether <jaa <i>at</i> metis.no><br> -Jaromir Dolecek <dolecek <i>at</i> ics.muni.cz><br> -Jasmin Blanchette <jasminb <i>at</i> corel.com><br> -Jason Evans <evans911 <i>at</i> cs.uidaho.edu><br> -Jay Painter <jay <i>at</i> a42.com><br> -Jean-Philippe Langlois <jpl <i>at</i> iname.com><br> -Jeff Harris <jharris <i>at</i> cis.ohio-state.edu><br> -Jeff Largent <jlargent <i>at</i> iu.net><br> -Jeffrey Vetter <vetter <i>at</i> lanl.gov><br> -Jeremy Wohl <jeremy <i>at</i> godzilli.cs.sunysb.edu><br> -Jesper K. Pedersen <blackie <i>at</i>klaralvdalens-datakonsult.se><br> -Jim Lauchlan <jim.lauchlan <i>at</i> gecm.com><br> -Joachim Backes <backes <i>at</i> rhrk.uni-kl.de><br> -Jochen Römmler <jochen <i>at</i> concept.de><br> -Jochen Scharrlach <jscharrl <i>at</i> BA-Stuttgart.De><br> -Joe Croft <jcroft <i>at</i> swbell.net><br> -Joel Lindholm <wizball <i>at</i> kewl.campus.luth.se><br> -John H. Reppy <jhr <i>at</i> research.att.com><br> -John Huertas - Jourda <octarine <i>at</i> gte.net><br> -John Ouellette <ouellet <i>at</i> beluga.phys.UVic.CA><br> -John Vidar Larring <larring <i>at</i> weatherone.tv><br> -Jon Brumfitt <jbrumfit <i>at</i> astro.estec.esa.nl><br> -Jose Castro <jocastro <i>at</i> erols.com><br> -Julian Enticknap <Julian.Enticknap <i>at</i> UK.Sun.COM><br> -Jussi-Pekka Sairanen <jussi-pekka.sairanen <i>at</i> research.nokia.com><br> -Kalle Dalheimer <kalle <i>at</i> dalheimer.hh.eunet.de><br> -Karl Robillard <karl <i>at</i> skygames.com><br> -Keith Brown <ksbrown <i>at</i> ix.netcom.com><br> -Keith Dowsett <kdowsett <i>at</i> rpms.ac.uk><br> -Ken Hollis <khollis <i>at</i> northwest.com><br> -Kirill Konyagin <kirill <i>at</i> asplinux.ru><br> -Klaus Ebner <klaus <i>at</i> gaspode.ndh.com><br> -Klaus-Georg Adams <Klaus-Georg.Adams <i>at</i> chemie.uni-karlsruhe.de><br> -Klaus Schmidinger <Klaus.Schmidinger <i>at</i> cadsoft.de><br> -Kristof Depraetere <Kristof.Depraetere <i>at</i> rug.ac.be><br> -Kristian Freed <d00freed <i>at</i> dtek.chalmers.se><br> -Kurt L Anderson <kurt+ <i>at</i> osu.edu><br> -Larry Lee <lclee <i>at</i> primenet.com><br> -Lars Knoll <knoll <i>at</i> mpi-hd.mpg.de><br> -M. G. Berberich <berberic <i>at</i> fmi.uni-passau.de><br> -Maas-Maarten Zeeman <mzeeman <i>at</i> cs.vu.nl><br> -Magnus Persson <mpersson <i>at</i> eritel.se><br> -Mario Weilguni <mweilguni <i>at</i> arctica.sime.com><br> -Marius Storm-Olsen <marius <i>at</i> storm-olsen.com><br> -Mariya <muha <i>at</i> iclub.nsu.ru><br> -Mark Summerfield <summer <i>at</i> perlpress.com><br> -Markku Hihnala <mah <i>at</i> ee.oulu.fi><br> -Marko Macek <Marko.Macek <i>at</i> snet.fer.uni-lj.si><br> -Martin Baehr <mbaehr <i>at</i> email.archlab.tuwien.ac.at><br> -Martin Mueller <mm <i>at</i> lunetix.de><br> -Martin van Velsen <vvelsen <i>at</i> ronix.ptf.hro.nl><br> -Matthias Ettrich <ettrich <i>at</i> fisher.informatik.uni-tuebingen.de><br> -Matthias Suencksen <msuencks <i>at</i> techfak.uni-bielefeld.de><br> -Mattias Engdegård <f91-men <i>at</i> nada.kth.se><br> -Michael Doppler <m.doppler <i>at</i> icosderve.com><br> -Michael Figley <figley <i>at</i> ibmoto.com><br> -Michael George <george <i>at</i> quark.im4u.net><br> -Michael Graff <explorer <i>at</i> flame.org><br> -Michael H. Price II <price <i>at</i> ERC.MsState.Edu><br> -Michael Harnois <mharnois <i>at</i> sbt.net><br> -Michael Hohmuth <hohmuth <i>at</i> inf.tu-dresden.de><br> -Michael Leodolter <michael <i>at</i> lab1.psy.univie.ac.at><br> -Michael Roth <mroth <i>at</i> nessie.de><br> -Michael Schwendt <Michael_Schwendt <i>at</i> public.uni-hamburg.de><br> -Michal Polak <mpolak <i>at</i> fi.muni.cz><br> -Mikael Bourges-Sevenier <bourges <i>at</i> int-evry.fr><br> -Mike Fearn <hp003 <i>at</i> dra.hmg.gb><br> -Mike Perik <mikep <i>at</i> crt.com><br> -Mike Sharkey <msharkey <i>at</i> softarc.com><br> -Miroslav Flidr <flidr <i>at</i> kky.zcu.cz><br> -Miyata Shigeru <miyata <i>at</i> kusm.kyoto-u.ac.jp><br> -Myron Uecker <muecker <i>at</i> csd.net><br> -Neal Sanche <neal <i>at</i> nsdev.org><br> -Ngok Yuk Yau <zzy <i>at</i> compuserve.com><br> -Niclas Anderberg <agony <i>at</i> sparta.lu.se><br> -Oliver Eiden <o.eiden <i>at</i> pop.ruhr.de><br> -Oliver Elphick <olly <i>at</i> lfix.co.uk><br> -Olivier Verloove <overloov <i>at</i> ulb.ac.be><br> -Osku Salerma <osku <i>at</i> iki.fi><br> -P. J. Leonard <eespjl <i>at</i> ee.bath.ac.uk><br> -Paolo Galatola <paolo <i>at</i> iris.polito.it><br> -Pat Dowler <dowler <i>at</i> pt1B1106.FSH.UVic.CA><br> -Patrice Trognon <trognon <i>at</i> apogee-com.fr><br> -Patrick Voigt <Patrick.Voigt <i>at</i> Informatik.TU-Chemnitz.DE><br> -Paul Bucheit <ptb <i>at</i> k2.cwru.edu><br> -Paul Curtis <plc <i>at</i> rowley.co.uk><br> -Paul Kendall <paul <i>at</i> kcbbs.gen.nz><br> -Paul Marquis <pmarquis <i>at</i> iddptm.iddis.com><br> -Peter Bender <bender <i>at</i> iib.bauwesen.th-darmstadt.de><br> -Peter Klotz <p.klotz <i>at</i> icoserve.com><br> -Peter Pletcher <peter <i>at</i> delilah><br> -Pierre Rocque <rocque <i>at</i> CRHSC.Umontreal.CA><br> -Pohorecki Wladyslaw <pohorecki <i>at</i> novell.ftj.agh.edu.pl><br> -R.S. Mallozzi, <mallozzi <i>at</i> bowie.msfc.nasa.gov><br> -Ralf Stanke <ralf <i>at</i> mcshh.hanse.de><br> -Reginald Stadlbauer <reggie <i>at</i> kde.org><br> -Richard D. Jackson <rjackson <i>at</i> bga.com><br> -Richard Keech <rkeech <i>at</i> colesmyer.com.au><br> -Richard Moore <moorer <i>at</i> cs.man.ac.uk><br> -Rick Brohl <rbrohl <i>at</i> uswest.com><br> -Robert Anderson <Robert.E.Anderson <i>at</i> unh.edu><br> -Robert Cimrman <cimrman <i>at</i> marius.univ-mrs.fr><br> -Roberto Alsina <ralsina <i>at</i> ultra7.unl.edu.ar><br> -Rohlfs Reiner <Reiner.Rohlfs <i>at</i> obs.unige.ch><br> -Salman Sheikh <salman <i>at</i> vdragon.gsfc.nasa.gov><br> -Sandro Sigala <ssigala <i>at</i> globalnet.it><br> -Scott Coppen <scoppen <i>at</i> emerald.tufts.edu><br> -Sean Echevarria <sean <i>at</i> beatnik.com><br> -Sean Vyain <svyain <i>at</i> mail.tds.net><br> -Sirtaj Singh Kang <ssk <i>at</i> physics.unimelb.EDU.AU><br> -Sivan Toledo<br> -Stefan Cronert <d93-scr <i>at</i> nada.kth.se><br> -Stefan Taferner <taf <i>at</i> porsche.co.at><br> -Steffen Hansen <stefh <i>at</i> dit.ou.dk><br> -Stephan Pfab <pfab <i>at</i> mathematik.uni-ulm.de><br> -Stephane Zermatten <szermat <i>at</i> ibm.net><br> -Sven Fischer <sven <i>at</i> comnets.rwth-aachen.de><br> -Sven Riedel <lynx <i>at</i> heim8.tu-clausthal.de><br> -Terje Dalen <terje <i>at</i> norcontrol.no><br> -Thomas Lineal <thomas <i>at</i> ricci.allcon.com><br> -Thomas Rath <rath <i>at</i> mac-info-link.de><br> -Thorsten Ende <the <i>at</i> is-bremen.de><br> -Tiaan Wessels <tiaan <i>at</i> inetsys.alt.za><br> -Tim D. Gilman <tdgilman <i>at</i> best.com><br> -Tom Houlder <thoulder <i>at</i> icor.fr><br> -Tony Albrecht <Tony.Albrecht <i>at</i> adelaide.maptek.com.au><br> -Torgeir Hovden <hovden <i>at</i> akkurat.idt.ntnu.no><br> -Trond Hellem Bø <s638 <i>at</i> ii.uib.no><br> -Trond Solli <Trond.Solli <i>at</i> marintek.sintef.no><br> -Ulf Stelbe <ust <i>at</i> egd.igd.fhg.de><br> -Ulrich Hertlein <uhe <i>at</i> cs.tu-berlin.de><br> -Ulrich Ring <ur <i>at</i> daveg.com><br> -Uwe Thiem <uwe <i>at</i> uwix.alt.na><br> -Vadim Zaliva <lord <i>at</i> crocodile.org><br> -Val Gough <val <i>at</i> stellacore.com><br> -Vilhelm Sjöberg <ville <i>at</i> swipnet.se><br> -Vlad Karpinsky <vlad <i>at</i> crocodile.org><br> -Volker Hilsheimer <vohi <i>at</i> gmx.de><br> -Volker Poplawski <volkerp <i>at</i> stepnet.de><br> -Warwick Allison <warwick <i>at</i> it.uq.edu.au><br> -Xiaojian Li <lixj <i>at</i> monte.rutgers.edu><br> -Ximenes <ximenes <i>at</i> netset.com><br> -Y. N. Lo <ynlo <i>at</i> netcom.ca><br> -Zyklon <zyk <i>at</i> dds.nl><br> -atsushi konno <jibe <i>at</i> ppp.bekkoame.or.jp><br> -berry <i>at</i> hxi.com<br> -boris passek <boris <i>at</i> ice.fb12.TU-Berlin.DE><br> -fidaire <fidaire <i>at</i> bip.fr><br> -joeh <i>at</i> sugar-river.net<br> -rinsch <i>at</i> aea.ruhr-uni-bochum.de<br> -tsutsui <i>at</i> kekvax.kek.jp<br> -vandevod <i>at</i> cs.rpi.edu<br> -vinckeg <i>at</i> sebb.bel.alcatel.be<br> -yleffler <i>at</i> ucis.vill.edu<br> - -</blockquote> - -<p>We hope there are not too many omissions from the list. Any -omissions are <b>bugs</b> and should be reported to -<a href="mailto:qt...@tr...">qt...@tr...</a> -like other bugs in the Qt code or documentation. - -*/ +/**************************************************************************** +** $Id$ +** +** Credits file - all the qt-bugs stuff +** +** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** +** This file is part of the Qt GUI Toolkit. +** +** This file may be distributed under the terms of the Q Public License +** as defined by Trolltech AS of Norway and appearing in the file +** LICENSE.QPL included in the packaging of this file. +** +** This file may be distributed and/or modified under the terms of the +** GNU General Public License version 2 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. +** +** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition +** licenses may use this file in accordance with the Qt 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. +** +** See http://www.trolltech.com/pricing.html or email sa...@tr... for +** information about Qt Commercial License Agreements. +** See http://www.trolltech.com/qpl/ for QPL licensing information. +** See http://www.trolltech.com/gpl/ for GPL licensing information. +** +** Contact in...@tr... if any conditions of this licensing are +** not clear to you. +** +**********************************************************************/ + +/*! +\page credits.html + +\title Thanks! + +<p>The following (and probably many others) have provided bug reports, +suggestions, patches, beta testing, or done us other favors. We thank +you all: + +<blockquote> + +Adam P. Jenkins <ajenkins <i>at</i> cs.umass.edu><br> +Ahmed Metwally <ametwaly <i>at</i> auc-cs28.eun.eg><br> +Aidas Kasparas <kaspar <i>at</i> soften.ktu.lt><br> +Alejandro Aguilar Sierra <asierra <i>at</i> servidor.unam.mx><br> +Alex <steeper <i>at</i> dial.pipex.com><br> +Alex Kambis <kambis <i>at</i> eos913c.gsfc.nasa.gov><br> +Alexander Kozlov <alex <i>at</i> hale.appl.sci-nnov.ru><br> +Alexander Sanda <alex <i>at</i> darkstar.ping.at><br> +Amos Leffler <leffler <i>at</i> netaxs.com><br> +Anders Hanson <andhan <i>at</i> lls.se><br> +Andreas Schlempp <schlempp <i>at</i> egd.igd.fhg.de><br> +Andrew Bell <abell <i>at</i> vsys.com><br> +Andrew Gillham <gillhaa <i>at</i> ghost.whirlpool.com><br> +Andrew J. Robinson <robinson <i>at</i> eclipse.net><br> +Andrew Pavlomanolakos <app <i>at</i> novanet.net.au><br> +Andrew R. Tefft <teffta <i>at</i> crypt.erie.ge.com><br> +Andrew Vajoczki <vajoczki <i>at</i> interlog.com><br> +André Johansen <Andre.Johansen <i>at</i> funcom.no><br> +Andy Brice <andyb <i>at</i> suntail.net><br> +Andy Shaw <andy <i>at</i> east.no><br> +Anton Keyter <ant <i>at</i> intekom.co.za><br> +Arabeyes Project (http://www.arabeyes.org) <doc <i>at</i> arabeyes <i>dot</i> org><br> +Arnt Gulbrandsen <arnt <i>at</i> gulbrandsen.priv.no><br> +Ashley Winters <jql <i>at</i> accessone.com><br> +Aubrey Soper <azdak <i>at</i> ix.netcom.com><br> +Axel Schwenke <schwenke <i>at</i> HTWM.DE><br> +Ben Bergen <ben <i>at</i> gmg.com><br> +Bernard Leach <B.Leach <i>at</i> compsoc.cs.latrobe.edu.au><br> +Bernd Johannes Wuebben <wuebben <i>at</i> math.cornell.edu><br> +Bernd S. Brentrup <bsb <i>at</i> uni-muenster.de><br> +Bert Haverkamp <b.r.j.haverkamp <i>at</i> et.tudelft.nl><br> +Bjorn Reese <breese <i>at</i> dit.ou.dk><br> +Brian Beattie <beattie <i>at</i> drcpdx.stt3.com><br> +Brian P. Theodore <theodore <i>at</i> std.saic.com><br> +Brian White <bcwhite <i>at</i> verisim.com><br> +Bryan Scattergood <bryan <i>at</i> fsel.com><br> +Carsten Steckel <carsten <i>at</i> cs.newcastle.edu.au><br> +Chao-Hsin, Lin <linchao <i>at</i> charlie.cns.iit.edu><br> +Chip Salzenberg <chip <i>at</i> atlantic.net><br> +Chris Zwilling <crzwlng <i>at</i> cloudnet.com><br> +Christian Czezatke <e9025461 <i>at</i> student.tuwien.ac.at><br> +Christopher Andrew Spiking <cas <i>at</i> Cs.Nott.AC.UK><br> +Christopher J. White <cjwhite <i>at</i> rgit.wustl.edu><br> +Clarence Dang <dang <i>at</i> kde.org><br> +Claus Werner <lzu96cw <i>at</i> reading.ac.uk><br> +Cloyce D. Spradling <cloyce <i>at</i> austin.ibm.com><br> +Colin Paul Adams <colin <i>at</i> colina.demon.co.uk><br> +Cristiano Verondini <cverond <i>at</i> deis219.deis.unibo.it><br> +Damyan Pepper <damyanp <i>at</i> cogs.susx.ac.uk><br> +Dan Nickerson <nickersond <i>at</i> uthscsa.edu><br> +Daniel Brahneborg <basic <i>at</i> well.com><br> +Daniel Gruner <dgruner <i>at</i> tikva.chem.utoronto.ca><br> +Daniel J Mitchell <dan <i>at</i> rebellion.co.uk><br> +Danilo Fiorenzano <danilo <i>at</i> terranet.ab.ca><br> +Dante Profeta <profeta <i>at</i> neomedia.it><br> +Darryl Ruggles <001654r <i>at</i> dragon.acadiau.ca><br> +Dave <dave <i>at</i> stellacore.com><br> +Dave Steffen <steffend <i>at</i> glitch.physics.colostate.edu><br> +Dean Hall <dwhall <i>at</i> deskstation.com><br> +Denis Y. Pershin <dyp <i>at</i> isis.nsu.ru><br> +Diedrich Vorberg <Diedrich_Vorberg <i>at</i> cp.prima.ruhr.de><br> +Dietmar Schaefer <dietmar <i>at</i> cs.newcastle.edu.au><br> +Dimitri Papadopoulos <dpo <i>at</i> club-internet.fr><br> +Dirk Mueller <mueller <i>at</i> kde.org><br> +Dirk Schwartmann <dirk.schwartmann <i>at</i> dlr.de><br> +Dominik Jergus <djergus <i>at</i> ics.uci.edu><br> +Don Sanders <sanders <i>at</i> kde.org><br> +Donald A. Seielstad <donald <i>at</i> gromit.scs.uiuc.edu><br> +Donna J. Armijo <donna <i>at</i> KachinaTech.COM><br> +Doug Boreland <dborel <i>at</i> amex-trs.com><br> +Douglas Lenz <dlenz <i>at</i> spedsoft.com><br> +Dr Mek Buhl Nielsen <m.b.nielsen <i>at</i> bham.ac.uk><br> +Dr Willem A. Schreuder <Willem.Schreuder <i>at</i> prinmath.com><br> +E. Kevin Hall <hall <i>at</i> boston.sgi.com><br> +Ed Mackey <emackey <i>at</i> Early.com><br> +Edmund Taylor <etaylor <i>at</i> interaccess.com><br> +Eric Bos <Eric.Bos <i>at</i> adelaide.maptek.com.au><br> +Eric Brunson <brunson <i>at</i> brunson.com><br> +Eric Jansen <jansen <i>at</i> photon.com><br> +Erik Norell <erik <i>at</i> Astrakan.HGS.SE><br> +Erik Thiele <erik <i>at</i> unterland.de><br> +Ernie Pasveer <erniep <i>at</i> vsl.com><br> +F R Ball <frb <i>at</i> umr.edu><br> +Fergal Mc Carthy <fergal <i>at</i> ilo.dec.com><br> +Frank Gockel <gockel <i>at</i> etecs4.uni-duisburg.de><br> +Frank Roscher <frank <i>at</i> chemnitz.abs-rz.de><br> +Fredrik Markström <fredrik <i>at</i> zod.campus.luth.se><br> +Fredrik Nehr <fredrik_nehr <i>at</i> ivab.se><br> +FrenzelBhv <i>at</i> aol.com<br> +Frugal <frugal <i>at</i> wardrobe.demon.co.uk><br> +Frugal the Curious <Chris.Ward <i>at</i> softcare.co.uk><br> +Fujimoto Koji <kochan <i>at</i> mbox.kyoto-inet.or.jp><br> +Gabor V. Gulyas <gabor <i>at</i> robiomat.com><br> +Gary E. Sherman <sherman <i>at</i> mrcc.com><br> +Geoff Carpenter <GCC <i>at</i> watson.ibm.com><br> +Geoffrey Higginson <ghiggins <i>at</i> gulf.uvic.ca><br> +Georg Filios <Georg.Filios <i>at</i> post.rwth-aachen.de><br> +George Simunovich <george <i>at</i> cia-g.com><br> +Giovanni Carapelli <gcarapel <i>at</i> mbox.vol.it><br> +Greg Tomalesky <tomalesk <i>at</i> yrkpa.kias.com><br> +Gregg Jensen <gwj <i>at</i> stl.nexen.com><br> +Gustav "Gurre" Kalvesten <a94guska <i>at</i> ida.his.se><br> +Hal DeVore <hdevore <i>at</i> crow.bmc.com><br> +Hans Flaechsig <hans <i>at</i> hannes.owl.de><br> +Hans Schlenker <schlenkh <i>at</i> informatik.uni-muenchen.de><br> +Hardo Mueller <hardo <i>at</i> ipb.uni-bonn.de><br> +Heiko Gerdau <heiko.gerdau <i>at</i> t-online.de><br> +Henty Waker <henty <i>at</i> foxbat.sur.uct.ac.za><br> +Hrafnkell Eiriksson <hkelle <i>at</i> mmedia.is><br> +Ildefonso Junquero Martin-Arroyo <junquero <i>at</i> sainsel.es><br> +Ingo Stapel <ingo.stapel <i>at</i> tu-clausthal.de><br> +J. Solomon Kostelnik <roz <i>at</i> one.net><br> +Jae Cho <cs184-dc <i>at</i> ute.CS.Berkeley.EDU><br> +James McIninch <james <i>at</i> amber.biology.gatech.edu><br> +Jan Aarsaether <jaa <i>at</i> metis.no><br> +Jaromir Dolecek <dolecek <i>at</i> ics.muni.cz><br> +Jasmin Blanchette <jasminb <i>at</i> corel.com><br> +Jason Evans <evans911 <i>at</i> cs.uidaho.edu><br> +Jay Painter <jay <i>at</i> a42.com><br> +Jean-Philippe Langlois <jpl <i>at</i> iname.com><br> +Jeff Harris <jharris <i>at</i> cis.ohio-state.edu><br> +Jeff Largent <jlargent <i>at</i> iu.net><br> +Jeffrey Vetter <vetter <i>at</i> lanl.gov><br> +Jeremy Wohl <jeremy <i>at</i> godzilli.cs.sunysb.edu><br> +Jesper K. Pedersen <blackie <i>at</i>klaralvdalens-datakonsult.se><br> +Jim Lauchlan <jim.lauchlan <i>at</i> gecm.com><br> +Joachim Backes <backes <i>at</i> rhrk.uni-kl.de><br> +Jochen Römmler <jochen <i>at</i> concept.de><br> +Jochen Scharrlach <jscharrl <i>at</i> BA-Stuttgart.De><br> +Joe Croft <jcroft <i>at</i> swbell.net><br> +Joel Lindholm <wizball <i>at</i> kewl.campus.luth.se><br> +John H. Reppy <jhr <i>at</i> research.att.com><br> +John Huertas - Jourda <octarine <i>at</i> gte.net><br> +John Ouellette <ouellet <i>at</i> beluga.phys.UVic.CA><br> +John Vidar Larring <larring <i>at</i> weatherone.tv><br> +Jon Brumfitt <jbrumfit <i>at</i> astro.estec.esa.nl><br> +Jose Castro <jocastro <i>at</i> erols.com><br> +Julian Enticknap <Julian.Enticknap <i>at</i> UK.Sun.COM><br> +Jussi-Pekka Sairanen <jussi-pekka.sairanen <i>at</i> research.nokia.com><br> +Kalle Dalheimer <kalle <i>at</i> dalheimer.hh.eunet.de><br> +Karl Robillard <karl <i>at</i> skygames.com><br> +Keith Brown <ksbrown <i>at</i> ix.netcom.com><br> +Keith Dowsett <kdowsett <i>at</i> rpms.ac.uk><br> +Ken Hollis <khollis <i>at</i> northwest.com><br> +Kirill Konyagin <kirill <i>at</i> asplinux.ru><br> +Klaus Ebner <klaus <i>at</i> gaspode.ndh.com><br> +Klaus-Georg Adams <Klaus-Georg.Adams <i>at</i> chemie.uni-karlsruhe.de><br> +Klaus Schmidinger <Klaus.Schmidinger <i>at</i> cadsoft.de><br> +Kristof Depraetere <Kristof.Depraetere <i>at</i> rug.ac.be><br> +Kristian Freed <d00freed <i>at</i> dtek.chalmers.se><br> +Kurt L Anderson <kurt+ <i>at</i> osu.edu><br> +Larry Lee <lclee <i>at</i> primenet.com><br> +Lars Knoll <knoll <i>at</i> mpi-hd.mpg.de><br> +M. G. Berberich <berberic <i>at</i> fmi.uni-passau.de><br> +Maas-Maarten Zeeman <mzeeman <i>at</i> cs.vu.nl><br> +Magnus Persson <mpersson <i>at</i> eritel.se><br> +Mario Weilguni <mweilguni <i>at</i> arctica.sime.com><br> +Marius Storm-Olsen <marius <i>at</i> storm-olsen.com><br> +Mariya <muha <i>at</i> iclub.nsu.ru><br> +Mark Summerfield <summer <i>at</i> perlpress.com><br> +Markku Hihnala <mah <i>at</i> ee.oulu.fi><br> +Marko Macek <Marko.Macek <i>at</i> snet.fer.uni-lj.si><br> +Martin Baehr <mbaehr <i>at</i> email.archlab.tuwien.ac.at><br> +Martin Mueller <mm <i>at</i> lunetix.de><br> +Martin van Velsen <vvelsen <i>at</i> ronix.ptf.hro.nl><br> +Matthias Ettrich <ettrich <i>at</i> fisher.informatik.uni-tuebingen.de><br> +Matthias Suencksen <msuencks <i>at</i> techfak.uni-bielefeld.de><br> +Mattias Engdegård <f91-men <i>at</i> nada.kth.se><br> +Michael Doppler <m.doppler <i>at</i> icoserve.com><br> +Michael Figley <figley <i>at</i> ibmoto.com><br> +Michael George <george <i>at</i> quark.im4u.net><br> +Michael Graff <explorer <i>at</i> flame.org><br> +Michael H. Price II <price <i>at</i> ERC.MsState.Edu><br> +Michael Harnois <mharnois <i>at</i> sbt.net><br> +Michael Hohmuth <hohmuth <i>at</i> inf.tu-dresden.de><br> +Michael Leodolter <michael <i>at</i> lab1.psy.univie.ac.at><br> +Michael Roth <mroth <i>at</i> nessie.de><br> +Michael Schwendt <Michael_Schwendt <i>at</i> public.uni-hamburg.de><br> +Michal Polak <mpolak <i>at</i> fi.muni.cz><br> +Mikael Bourges-Sevenier <bourges <i>at</i> int-evry.fr><br> +Mike Fearn <hp003 <i>at</i> dra.hmg.gb><br> +Mike Perik <mikep <i>at</i> crt.com><br> +Mike Sharkey <msharkey <i>at</i> softarc.com><br> +Miroslav Flidr <flidr <i>at</i> kky.zcu.cz><br> +Miyata Shigeru <miyata <i>at</i> kusm.kyoto-u.ac.jp><br> +Myron Uecker <muecker <i>at</i> csd.net><br> +Neal Sanche <neal <i>at</i> nsdev.org><br> +Ngok Yuk Yau <zzy <i>at</i> compuserve.com><br> +Niclas Anderberg <agony <i>at</i> sparta.lu.se><br> +Oliver Eiden <o.eiden <i>at</i> pop.ruhr.de><br> +Oliver Elphick <olly <i>at</i> lfix.co.uk><br> +Olivier Verloove <overloov <i>at</i> ulb.ac.be><br> +Osku Salerma <osku <i>at</i> iki.fi><br> +P. J. Leonard <eespjl <i>at</i> ee.bath.ac.uk><br> +Paolo Galatola <paolo <i>at</i> iris.polito.it><br> +Pat Dowler <dowler <i>at</i> pt1B1106.FSH.UVic.CA><br> +Patrice Trognon <trognon <i>at</i> apogee-com.fr><br> +Patrick Voigt <Patrick.Voigt <i>at</i> Informatik.TU-Chemnitz.DE><br> +Paul Bucheit <ptb <i>at</i> k2.cwru.edu><br> +Paul Curtis <plc <i>at</i> rowley.co.uk><br> +Paul Kendall <paul <i>at</i> kcbbs.gen.nz><br> +Paul Marquis <pmarquis <i>at</i> iddptm.iddis.com><br> +Peter Bender <bender <i>at</i> iib.bauwesen.th-darmstadt.de><br> +Peter Klotz <p.klotz <i>at</i> icoserve.com><br> +Peter Pletcher <peter <i>at</i> delilah><br> +Pierre Rocque <rocque <i>at</i> CRHSC.Umontreal.CA><br> +Pohorecki Wladyslaw <pohorecki <i>at</i> novell.ftj.agh.edu.pl><br> +R.S. Mallozzi, <mallozzi <i>at</i> bowie.msfc.nasa.gov><br> +Ralf Stanke <ralf <i>at</i> mcshh.hanse.de><br> +Reginald Stadlbauer <reggie <i>at</i> kde.org><br> +Richard D. Jackson <rjackson <i>at</i> bga.com><br> +Richard Keech <rkeech <i>at</i> colesmyer.com.au><br> +Richard Moore <moorer <i>at</i> cs.man.ac.uk><br> +Rick Brohl <rbrohl <i>at</i> uswest.com><br> +Robert Anderson <Robert.E.Anderson <i>at</i> unh.edu><br> +Robert Cimrman <cimrman <i>at</i> marius.univ-mrs.fr><br> +Roberto Alsina <ralsina <i>at</i> ultra7.unl.edu.ar><br> +Rohlfs Reiner <Reiner.Rohlfs <i>at</i> obs.unige.ch><br> +Salman Sheikh <salman <i>at</i> vdragon.gsfc.nasa.gov><br> +Sandro Sigala <ssigala <i>at</i> globalnet.it><br> +Scott Coppen <scoppen <i>at</i> emerald.tufts.edu><br> +Sean Echevarria <sean <i>at</i> beatnik.com><br> +Sean Vyain <svyain <i>at</i> mail.tds.net><br> +Sirtaj Singh Kang <ssk <i>at</i> physics.unimelb.EDU.AU><br> +Sivan Toledo<br> +Stefan Cronert <d93-scr <i>at</i> nada.kth.se><br> +Stefan Taferner <taf <i>at</i> porsche.co.at><br> +Steffen Hansen <stefh <i>at</i> dit.ou.dk><br> +Stephan Pfab <pfab <i>at</i> mathematik.uni-ulm.de><br> +Stephane Zermatten <szermat <i>at</i> ibm.net><br> +Sven Fischer <sven <i>at</i> comnets.rwth-aachen.de><br> +Sven Riedel <lynx <i>at</i> heim8.tu-clausthal.de><br> +Terje Dalen <terje <i>at</i> ... [truncated message content] |
|
From: Christian E. <che...@us...> - 2005-09-23 13:25:02
|
Update of /cvsroot/kde-cygwin/qt-3/src/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13856/src/kernel Modified Files: Tag: QT_WIN32_3_3_BRANCH qscriptengine_win.cpp Log Message: Index: qscriptengine_win.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/Attic/qscriptengine_win.cpp,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- qscriptengine_win.cpp 24 Sep 2004 13:07:02 -0000 1.1.2.5 +++ qscriptengine_win.cpp 23 Sep 2005 13:24:52 -0000 1.1.2.6 @@ -40,36 +40,6 @@ // ------------------------------------------------------------------------------------------------------------------ // #### stil missing: identify invalid character combinations -static void hebrew_shape( int script, const QString &string, int from, int len, - QTextEngine *engine, QScriptItem *si ) -{ - assert( script == QFont::Hebrew ); - -#ifndef QT_NO_XFTFREETYPE - - QOpenType *openType = si->fontEngine->openType(); - - if ( openType && openType->supportsScript( script ) ) { - convertToCMap( string.unicode() + from, len, engine, si ); - heuristicSetGlyphAttributes( string, from, len, engine, si ); - openType->init( engine->glyphs( si ), engine->glyphAttributes( si ), si->num_glyphs, - engine->logClusters( si ), len ); - - openType->applyGSUBFeature( FT_MAKE_TAG( 'c', 'c', 'm', 'p' ) ); - // Uniscribe also defines dlig for Hebrew, but we leave this out for now, as it's mostly - // ligatures one does not want in modern Hebrew (as lam-alef ligatures). - - openType->applyGPOSFeatures(); - si->num_glyphs = 0; - openType->appendTo( engine, si ); - - return ; - } -#endif - basic_shape( script, string, from, len, engine, si ); -} - -// #### stil missing: identify invalid character combinations static void syriac_shape( int script, const QString &string, int from, int len, QTextEngine *engine, QScriptItem *si ) { |
|
From: Christian E. <che...@us...> - 2005-09-23 11:16:27
|
Update of /cvsroot/kde-cygwin/qt-3/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19338/src Modified Files: Tag: QT_WIN32_3_3_BRANCH qt.pro Log Message: Index: qt.pro =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/qt.pro,v retrieving revision 1.1.1.19 retrieving revision 1.1.1.20 diff -u -r1.1.1.19 -r1.1.1.20 --- qt.pro 22 Sep 2005 12:53:40 -0000 1.1.1.19 +++ qt.pro 23 Sep 2005 11:16:18 -0000 1.1.1.20 @@ -2,7 +2,7 @@ TEMPLATE = lib TARGET = qt embedded:TARGET = qte -VERSION = 3.3.5 +VERSION = 3 DESTDIR = $$QMAKE_LIBDIR_QT DLLDESTDIR = ../bin @@ -100,7 +100,7 @@ WORKSPACE_H = $$WORKSPACE_CPP XML_H = $$XML_CPP STYLES_H = $$STYLES_CPP - !embedded:!mac:CONFIG += x11 x11inc + !embedded:!mac:!win32:CONFIG += x11 x11inc } aix-g++ { @@ -152,7 +152,23 @@ include($$TABLE_CPP/qt_table.pri) include($$XML_CPP/qt_xml.pri) include($$OPENGL_CPP/qt_opengl.pri) -include($$SQL_CPP/qt_sql.pri) + +qt-sql-lib: { + TARGETDEPS=qt_sql + mytarget.target = qt_sql + mytarget.commands = cd sql && $(MAKE) + win32 { + LIBS += qt_sql.lib + QMAKE_EXTRA_WIN_TARGETS = mytarget + } + unix { + LIBS += -lqt_sql + QMAKE_EXTRA_UNIX_TARGETS = mytarget + } +} +else { + include($$SQL_CPP/qt_sql.pri) +} include($$KERNEL_CPP/qt_gfx.pri) include($$TOOLS_CPP/qt_tools.pri) include($$CODECS_CPP/qt_codecs.pri) |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:33
|
Update of /cvsroot/kde-cygwin/qt-3/examples/demo/dnd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/examples/demo/dnd Modified Files: styledbutton.cpp styledbutton.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: styledbutton.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/examples/demo/dnd/styledbutton.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- styledbutton.cpp 22 Sep 2005 12:59:09 -0000 1.1.1.4 +++ styledbutton.cpp 23 Sep 2005 09:40:27 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of Qt Designer. ** Index: styledbutton.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/examples/demo/dnd/styledbutton.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- styledbutton.h 22 Sep 2005 12:59:13 -0000 1.1.1.2 +++ styledbutton.h 23 Sep 2005 09:40:27 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of Qt Designer. ** |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:33
|
Update of /cvsroot/kde-cygwin/qt-3/src/sql/drivers/ibase In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/src/sql/drivers/ibase Modified Files: qsql_ibase.cpp qsql_ibase.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qsql_ibase.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/drivers/ibase/qsql_ibase.cpp,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qsql_ibase.cpp 22 Sep 2005 12:53:49 -0000 1.1.1.7 +++ qsql_ibase.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -2,7 +2,7 @@ ** ** Implementation of Interbase driver classes. ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2004 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** EDITIONS: FREE, ENTERPRISE Index: qsql_ibase.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/drivers/ibase/qsql_ibase.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qsql_ibase.h 22 Sep 2005 12:53:49 -0000 1.1.1.4 +++ qsql_ibase.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 030911 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** |
Update of /cvsroot/kde-cygwin/qt-3/src/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/src/kernel Modified Files: qeventloop.cpp qeventloop.h qeventloop_p.h qeventloop_unix.cpp qeventloop_x11.cpp qfontengine_p.h qfontengine_x11.cpp qgplugin.cpp qgplugin.h qimageformatinterface_p.h qimageformatplugin.h qinputcontext_p.h qlock.cpp qlock_p.h qobjectcleanuphandler.h qprinter_p.h qscriptengine.cpp qscriptengine_p.h qscriptengine_x11.cpp qsharedmemory_p.cpp qsharedmemory_p.h qt_kernel.pri qt_x11_p.h qtextengine.cpp qtextengine_p.h qtextengine_unix.cpp qtextlayout.cpp qtextlayout_p.h qthread.cpp qvfbhdr.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qeventloop.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qeventloop.cpp,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qeventloop.cpp 22 Sep 2005 12:55:17 -0000 1.1.1.7 +++ qeventloop.cpp 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** Implementation of QEventLoop class ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qeventloop.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qeventloop.h,v retrieving revision 1.1.1.8 retrieving revision 1.2 diff -u -r1.1.1.8 -r1.2 --- qeventloop.h 22 Sep 2005 12:55:13 -0000 1.1.1.8 +++ qeventloop.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** Declaration of QEventLoop class ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qeventloop_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qeventloop_p.h,v retrieving revision 1.1.1.12 retrieving revision 1.2 diff -u -r1.1.1.12 -r1.2 --- qeventloop_p.h 22 Sep 2005 12:55:17 -0000 1.1.1.12 +++ qeventloop_p.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of QEventLoop class ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** @@ -85,7 +85,7 @@ }; #endif // Q_OS_UNIX -#if defined(Q_WS_WIN) +#if defined(Q_WS_WIN) && !defined(Q_CYGWIN_WIN) struct QSockNot { QSocketNotifier *obj; int fd; @@ -134,7 +134,7 @@ QSockNotType sn_vec[3]; #endif -#ifdef Q_WS_WIN +#if defined(Q_WS_WIN) && !defined(Q_CYGWIN_WIN) // pending socket notifiers list QPtrList<QSockNot> sn_pending_list; #endif // Q_WS_WIN Index: qeventloop_unix.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qeventloop_unix.cpp,v retrieving revision 1.1.1.12 retrieving revision 1.2 diff -u -r1.1.1.12 -r1.2 --- qeventloop_unix.cpp 22 Sep 2005 12:55:17 -0000 1.1.1.12 +++ qeventloop_unix.cpp 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** Implementation of QEventLoop class ** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qeventloop_x11.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qeventloop_x11.cpp,v retrieving revision 1.1.1.12 retrieving revision 1.2 diff -u -r1.1.1.12 -r1.2 --- qeventloop_x11.cpp 22 Sep 2005 12:55:12 -0000 1.1.1.12 +++ qeventloop_x11.cpp 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** Implementation of QEventLoop class ** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2004 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** @@ -316,7 +316,7 @@ FD_ZERO(&fdset); FD_SET(sn->fd, &fdset); - int ret = -1; + int ret; do { switch (type) { case 0: // read Index: qfontengine_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qfontengine_p.h,v retrieving revision 1.1.1.8 retrieving revision 1.2 diff -u -r1.1.1.8 -r1.2 --- qfontengine_p.h 22 Sep 2005 12:55:09 -0000 1.1.1.8 +++ qfontengine_p.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ??? ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qfontengine_x11.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qfontengine_x11.cpp,v retrieving revision 1.1.1.8 retrieving revision 1.2 diff -u -r1.1.1.8 -r1.2 --- qfontengine_x11.cpp 22 Sep 2005 12:55:32 -0000 1.1.1.8 +++ qfontengine_x11.cpp 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ??? ** -** Copyright (C) 2003-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2003-2004 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** @@ -37,16 +37,13 @@ // #define FONTENGINE_DEBUG -#include <qwidget.h> #include <qcstring.h> #include <qtextcodec.h> #include "qbitmap.h" #include "qfontdatabase.h" #include "qpaintdevice.h" -#include "qpaintdevicemetrics.h" #include "qpainter.h" -#include "qimage.h" #include "qt_x11_p.h" @@ -82,115 +79,6 @@ } } - -inline static void qSafeXDestroyImage( XImage *x ) -{ - if ( x->data ) { - free( x->data ); - x->data = 0; - } - XDestroyImage( x ); -} - -extern bool qt_xForm_helper( const QWMatrix &trueMat, int xoffset, - int type, int depth, - uchar *dptr, int dbpl, int p_inc, int dHeight, - uchar *sptr, int sbpl, int sWidth, int sHeight - ); - -static QBitmap transform(Display *dpy, const QBitmap &source, int xoff, int yoff, int w, int h, const QWMatrix &matrix) -{ - int ws = source.width(); - int hs = source.height(); - - bool invertible; - QWMatrix mat = matrix.invert( &invertible ); // invert matrix - - if (!invertible ) - return QBitmap(); - mat.translate(xoff, yoff); - - XImage *xi = XGetImage(dpy, source.handle(), 0, 0, ws, hs, AllPlanes, XYPixmap); - - if ( !xi ) - return QBitmap(); - - int sbpl = xi->bytes_per_line; - uchar *sptr = (uchar *)xi->data; - - int dbpl = (w+7)/8; - int dbytes = dbpl*h; - - uchar *dptr = (uchar *)malloc( dbytes ); // create buffer for bits - memset( dptr, 0, dbytes ); - - int type = xi->bitmap_bit_order == MSBFirst ? QT_XFORM_TYPE_MSBFIRST : QT_XFORM_TYPE_LSBFIRST; - int xbpl, p_inc; - xbpl = (w+7)/8; - p_inc = dbpl - xbpl; - - bool ok = qt_xForm_helper( mat, xi->xoffset, type, 1, dptr, xbpl, p_inc, h, sptr, sbpl, ws, hs ); - qSafeXDestroyImage(xi); - QBitmap bm; - if (ok) { - bm = QBitmap( w, h, dptr, QImage::systemBitOrder() != QImage::BigEndian ); - } else { -#if defined(QT_CHECK_RANGE) - qWarning( "QFontEngineXft::tranform: xform failed"); -#endif - } - - free( dptr ); - return bm; -} - - -static void drawScaled(int x, int y, const QTextEngine *engine, const QScriptItem *si, int textFlags, - Display *dpy, GC gc, QPaintDevice *pdev, QFontEngine *fe, const QWMatrix &xmat) -{ - // font doesn't support transformations, need to do it by hand - int w = si->width, h = si->ascent + si->descent + 1; - if ( w == 0 || h == 0 ) - return; - - w += h; // add some pixels to width because of italic correction - QBitmap bm( w, h, TRUE ); // create bitmap - QPainter paint; - paint.begin( &bm ); // draw text in bitmap - fe->draw( &paint, 0, si->ascent, engine, si, textFlags ); - paint.end(); - - QRect pdevRect; - if (pdev->devType() == QInternal::Widget) - pdevRect = ((QWidget *)pdev)->rect(); - else if (pdev->devType() == QInternal::Pixmap) - pdevRect = ((QPixmap *)pdev)->rect(); - else - return; - - - QRect br = xmat.mapRect(QRect(x, y - si->ascent, w, h)); - QRect br2 = br & pdevRect; - if (br2.width() <= 0 || br2.height() <= 0) - return; - QWMatrix mat = QPixmap::trueMatrix( xmat, w, h ); - QBitmap wx_bm = ::transform(dpy, bm, br2.x() - br.x(), br2.y() - br.y(), br2.width(), br2.height(), mat); - if ( wx_bm.isNull() ) - return; - - x = br2.x(); - y = br2.y(); - - Qt::HANDLE hd = pdev->handle(); - XSetFillStyle( dpy, gc, FillStippled ); - XSetStipple( dpy, gc, wx_bm.handle() ); - XSetTSOrigin( dpy, gc, x, y ); - XFillRectangle( dpy, hd, gc, x, y, wx_bm.width(), wx_bm.height() ); - XSetTSOrigin( dpy, gc, 0, 0 ); - XSetFillStyle( dpy, gc, FillSolid ); -} - - QFontEngine::~QFontEngine() { } @@ -645,8 +533,38 @@ } if ( degenerate || xlfd_transformations == XlfdTrUnsupported ) { // XServer or font don't support server side transformations, need to do it by hand - drawScaled(x, y, engine, si, textFlags, dpy, p->gc, p->device(), this, p->xmat); - return; + int w = qRound(si->width/_scale), h = qRound((si->ascent + si->descent + 1)/_scale); + QWMatrix mat1 = p->xmat; + mat1.scale(_scale, _scale); + if (w == 0 || h == 0) + return; + float tmp = _scale; + _scale = 1; + QWMatrix mat2 = QPixmap::trueMatrix(mat1, w, h); + QBitmap bm(w, h, TRUE); // create bitmap + QPainter paint; + paint.begin( &bm ); // draw text in bitmap + draw( &paint, 0, qRound(si->ascent/tmp), engine, si, textFlags ); + paint.end(); + _scale = tmp; + QBitmap wx_bm( bm.xForm(mat2) ); // transform bitmap + if ( wx_bm.isNull() ) + return; + + double fx=x, fy=y - si->ascent, nfx, nfy; + p->xmat.map( fx,fy, &nfx,&nfy ); + double tfx=0, tfy=0, dx, dy; + mat2.map( tfx, tfy, &dx, &dy ); // compute position of bitmap + x = qRound(nfx-dx); + y = qRound(nfy-dy); + + XSetFillStyle( dpy, gc, FillStippled ); + XSetStipple( dpy, gc, wx_bm.handle() ); + XSetTSOrigin( dpy, gc, x, y ); + XFillRectangle( dpy, hd, gc, x, y, wx_bm.width(), wx_bm.height() ); + XSetTSOrigin( dpy, gc, 0, 0 ); + XSetFillStyle( dpy, gc, FillSolid ); + return; } transform = TRUE; } else if ( p->txop == QPainter::TxTranslate ) { @@ -1059,7 +977,7 @@ // merge member data with the above for ( i = 0; i < 0x200; ++i ) { if ( glyphIndices[i] != 0 || glyphs[i] == 0 ) continue; - glyphIndices[i] = glyphs[i] >= 0x2100 ? glyphs[i] : hi | glyphs[i]; + glyphIndices[i] = hi | glyphs[i]; glyphAdvances[i] = advances[i]; } if (!euroIndex && glyphs[0x200]) { @@ -1158,6 +1076,7 @@ } } + *nglyphs = len; return NoError; } @@ -1170,22 +1089,16 @@ glyph_t *glyphs = engine->glyphs( si ); advance_t *advances = engine->advances( si ); int which = glyphs[0] >> 8; - if (which > 0x20) - which = 0; int start = 0; int end, i; for ( end = 0; end < si->num_glyphs; ++end ) { - int e = glyphs[end] >> 8; - if (e > 0x20) - e = 0; + const int e = glyphs[end] >> 8; if ( e == which ) continue; // set the high byte to zero - if (which != 0) { - for ( i = start; i < end; ++i ) - glyphs[i] = glyphs[i] & 0xff; - } + for ( i = start; i < end; ++i ) + glyphs[i] = glyphs[i] & 0xff; // draw the text QScriptItem si2 = *si; @@ -1194,11 +1107,11 @@ _engines[which]->draw( p, x, y, engine, &si2, textFlags ); // reset the high byte for all glyphs and advance to the next sub-string - const int hi = which << 8; - for ( i = start; i < end; ++i ) { - glyphs[i] = hi | glyphs[i]; - x += advances[i]; - } + const int hi = which << 8; + for ( i = start; i < end; ++i ) { + glyphs[i] = hi | glyphs[i]; + x += advances[i]; + } // change engine start = end; @@ -1206,10 +1119,9 @@ } // set the high byte to zero - if (which != 0) { - for ( i = start; i < end; ++i ) - glyphs[i] = glyphs[i] & 0xff; - } + for ( i = start; i < end; ++i ) + glyphs[i] = glyphs[i] & 0xff; + // draw the text QScriptItem si2 = *si; si2.glyph_data_offset = si->glyph_data_offset + start; @@ -1217,11 +1129,9 @@ _engines[which]->draw( p, x, y, engine, &si2, textFlags ); // reset the high byte for all glyphs - if (which != 0) { - const int hi = which << 8; - for ( i = start; i < end; ++i ) - glyphs[i] = hi | glyphs[i]; - } + const int hi = which << 8; + for ( i = start; i < end; ++i ) + glyphs[i] = hi | glyphs[i]; } glyph_metrics_t QFontEngineLatinXLFD::boundingBox( const glyph_t *glyphs_const, @@ -1235,22 +1145,16 @@ glyph_t *glyphs = (glyph_t *) glyphs_const; int which = glyphs[0] >> 8; - if (which > 0x20) - which = 0; int start = 0; int end, i; for ( end = 0; end < numGlyphs; ++end ) { - int e = glyphs[end] >> 8; - if (e > 0x20) - e = 0; + const int e = glyphs[end] >> 8; if ( e == which ) continue; // set the high byte to zero - if (which != 0) { - for ( i = start; i < end; ++i ) - glyphs[i] = glyphs[i] & 0xff; - } + for ( i = start; i < end; ++i ) + glyphs[i] = glyphs[i] & 0xff; // merge the bounding box for this run const glyph_metrics_t gm = @@ -1268,11 +1172,9 @@ overall.yoff += gm.yoff; // reset the high byte for all glyphs - if (which != 0) { - const int hi = which << 8; - for ( i = start; i < end; ++i ) - glyphs[i] = hi | glyphs[i]; - } + const int hi = which << 8; + for ( i = start; i < end; ++i ) + glyphs[i] = hi | glyphs[i]; // change engine start = end; @@ -1280,10 +1182,8 @@ } // set the high byte to zero - if (which != 0) { - for ( i = start; i < end; ++i ) - glyphs[i] = glyphs[i] & 0xff; - } + for ( i = start; i < end; ++i ) + glyphs[i] = glyphs[i] & 0xff; // merge the bounding box for this run const glyph_metrics_t gm = @@ -1301,22 +1201,18 @@ overall.yoff += gm.yoff; // reset the high byte for all glyphs - if (which != 0) { - const int hi = which << 8; - for ( i = start; i < end; ++i ) - glyphs[i] = hi | glyphs[i]; - } + const int hi = which << 8; + for ( i = start; i < end; ++i ) + glyphs[i] = hi | glyphs[i]; return overall; } glyph_metrics_t QFontEngineLatinXLFD::boundingBox( glyph_t glyph ) { - int engine = glyph >> 8; - if (engine > 0x20) - engine = 0; + const int engine = glyph >> 8; Q_ASSERT( engine < _count ); - return _engines[engine]->boundingBox( engine > 0 ? glyph & 0xff : glyph ); + return _engines[engine]->boundingBox( glyph & 0xff ); } int QFontEngineLatinXLFD::ascent() const @@ -1722,6 +1618,7 @@ #endif // QT_XFT2 } + //#define FONTENGINE_DEBUG void QFontEngineXft::draw( QPainter *p, int x, int y, const QTextEngine *engine, const QScriptItem *si, int textFlags ) { @@ -1736,13 +1633,47 @@ XftFont *fnt = _font; bool transform = FALSE; if ( p->txop >= QPainter::TxScale || p->rop != Qt::CopyROP) { - bool can_scale = (_face->face_flags & FT_FACE_FLAG_SCALABLE) && p->rop == Qt::CopyROP; - double size = (p->m11()*p->m22() - p->m12()*p->m21())*_scale*_scale*fontDef.pixelSize*fontDef.pixelSize; - if (size > 256*256) - can_scale = FALSE; - if (!can_scale) { + if (!(_face->face_flags & FT_FACE_FLAG_SCALABLE) || p->rop != Qt::CopyROP) { + Qt::HANDLE hd = p->device()->handle(); + GC gc = p->gc; + // font doesn't support transformations, need to do it by hand - drawScaled(x, y, engine, si, textFlags, dpy, p->gc, p->device(), this, p->xmat); + QRect bbox( 0, 0, si->width, si->ascent + si->descent + 1 ); + int w=bbox.width(), h=bbox.height(); + int aw = w, ah = h; + int tx=-bbox.x(), ty=-bbox.y(); // text position + QWMatrix mat1 = p->xmat; + if ( aw == 0 || ah == 0 ) + return; + double rx = (double)w / (double)aw; + double ry = (double)h / (double)ah; + QWMatrix mat2 = QPixmap::trueMatrix( QWMatrix( rx, 0, 0, ry, 0, 0 )*mat1, aw, ah ); + QBitmap *wx_bm; + { // no such cached bitmap + QBitmap bm( aw, ah, TRUE ); // create bitmap + QPainter paint; + paint.begin( &bm ); // draw text in bitmap + draw( &paint, 0, si->ascent, engine, si, textFlags ); + paint.end(); + wx_bm = new QBitmap( bm.xForm(mat2) ); // transform bitmap + if ( wx_bm->isNull() ) { + delete wx_bm; // nothing to draw + return; + } + } + double fx=x, fy=y - si->ascent, nfx, nfy; + mat1.map( fx,fy, &nfx,&nfy ); + double tfx=tx, tfy=ty, dx, dy; + mat2.map( tfx, tfy, &dx, &dy ); // compute position of bitmap + x = qRound(nfx-dx); + y = qRound(nfy-dy); + XSetFillStyle( dpy, gc, FillStippled ); + XSetStipple( dpy, gc, wx_bm->handle() ); + XSetTSOrigin( dpy, gc, x, y ); + XFillRectangle( dpy, hd, gc, x, y, wx_bm->width(), wx_bm->height() ); + XSetTSOrigin( dpy, gc, 0, 0 ); + XSetFillStyle( dpy, gc, FillSolid ); + delete wx_bm; return; } Index: qgplugin.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qgplugin.cpp,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qgplugin.cpp 22 Sep 2005 12:55:25 -0000 1.1.1.7 +++ qgplugin.cpp 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ... ** -** Copyright (C) 2001-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2001-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qgplugin.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qgplugin.h,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qgplugin.h 22 Sep 2005 12:55:35 -0000 1.1.1.7 +++ qgplugin.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ... ** -** Copyright (C) 2001-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2001-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qimageformatinterface_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qimageformatinterface_p.h,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qimageformatinterface_p.h 22 Sep 2005 12:55:33 -0000 1.1.1.7 +++ qimageformatinterface_p.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ... ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qimageformatplugin.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qimageformatplugin.h,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qimageformatplugin.h 22 Sep 2005 12:54:59 -0000 1.1.1.7 +++ qimageformatplugin.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of ??? ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qinputcontext_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qinputcontext_p.h,v retrieving revision 1.1.1.8 retrieving revision 1.2 diff -u -r1.1.1.8 -r1.2 --- qinputcontext_p.h 22 Sep 2005 12:55:18 -0000 1.1.1.8 +++ qinputcontext_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of ??? ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qlock.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qlock.cpp,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qlock.cpp 22 Sep 2005 12:55:30 -0000 1.1.1.7 +++ qlock.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of QLock class. This manages interprocess locking ** ** Created : 20000406 ** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qlock_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qlock_p.h,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qlock_p.h 22 Sep 2005 12:55:30 -0000 1.1.1.7 +++ qlock_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of QLock class. This manages interprocess locking ** ** Created : 20000406 ** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qobjectcleanuphandler.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qobjectcleanuphandler.h,v retrieving revision 1.1.1.8 retrieving revision 1.2 diff -u -r1.1.1.8 -r1.2 --- qobjectcleanuphandler.h 22 Sep 2005 12:55:19 -0000 1.1.1.8 +++ qobjectcleanuphandler.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of ??? ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qprinter_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qprinter_p.h,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qprinter_p.h 22 Sep 2005 12:55:18 -0000 1.1.1.5 +++ qprinter_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,11 +1,11 @@ /********************************************************************** -** $Id$ +** ** ** Definition of QPrinter class ** ** Created : 940927 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qscriptengine.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qscriptengine.cpp,v retrieving revision 1.1.1.8 retrieving revision 1.2 diff -u -r1.1.1.8 -r1.2 --- qscriptengine.cpp 22 Sep 2005 12:55:05 -0000 1.1.1.8 +++ qscriptengine.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,7 +1,7 @@ /**************************************************************************** -** $Id$ +** ** -** Copyright (C) 2003-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2003-2004 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** @@ -222,7 +222,7 @@ // set the glyph attributes heuristically. Assumes a 1 to 1 relationship between chars ang glyphs // and no reordering. // also computes logClusters heuristically -static void heuristicSetGlyphAttributes( const QChar *uc, int len, +static void heuristicSetGlyphAttributes( const QString &string, int from, int len, QTextEngine *engine, QScriptItem *si ) { // ### zeroWidth and justification are missing here!!!!! @@ -236,6 +236,8 @@ advance_t *advances = engine->advances( si ); // honour the logClusters array if it exists. + const QChar *uc = string.unicode() + from; + for ( int i = 0; i < si->num_glyphs; i++ ) logClusters[i] = i; @@ -297,13 +299,6 @@ } } -static void heuristicSetGlyphAttributes( const QString &string, int from, int len, - QTextEngine *engine, QScriptItem *si ) -{ - heuristicSetGlyphAttributes(string.unicode() + from, len, engine, si); -} - - static void convertToCMap( const QChar *chars, int len, QTextEngine *engine, QScriptItem *si ) { glyph_t *glyphs = engine->glyphs( si ); @@ -380,171 +375,12 @@ } #endif - - // -------------------------------------------------------------------------------------------------------------------------------------------- // // Middle eastern languages // // -------------------------------------------------------------------------------------------------------------------------------------------- -/* Hebrew shaping. In the non opentype case we try to use the - presentation forms specified for Hebrew. Especially for the - ligatures with Dagesh this gives much better results than we could - achieve manually. -*/ -static void hebrew_shape(int script, const QString &string, int from, int len, - QTextEngine *engine, QScriptItem *si) -{ - assert(script == QFont::Hebrew); - - if (len == 0) - return; - -#if defined( Q_WS_X11) && !defined( QT_NO_XFTFREETYPE ) - QOpenType *openType = si->fontEngine->openType(); - - if ( openType && openType->supportsScript( script ) ) { - convertToCMap( string.unicode() + from, len, engine, si ); - heuristicSetGlyphAttributes( string, from, len, engine, si ); - openType->init(engine->glyphs(si), engine->glyphAttributes(si), si->num_glyphs, - engine->logClusters(si), len); - - openType->applyGSUBFeature(FT_MAKE_TAG( 'c', 'c', 'm', 'p' )); - // Uniscribe also defines dlig for Hebrew, but we leave this out for now, as it's mostly - // ligatures one does not want in modern Hebrew (as lam-alef ligatures). - - openType->applyGPOSFeatures(); - si->num_glyphs = 0; - openType->appendTo(engine, si); - - return; - } -#endif - - enum { - Dagesh = 0x5bc, - ShinDot = 0x5c1, - SinDot = 0x5c2, - Patah = 0x5b7, - Qamats = 0x5b8, - Holam = 0x5b9, - Rafe = 0x5bf - }; - unsigned short chars[512]; - QChar *shapedChars = len > 256 ? (QChar *)::malloc(2*len * sizeof(QChar)) : (QChar *)chars; - - GlyphAttributes *glyphAttributes = engine->glyphAttributes( si ); - unsigned short *logClusters = engine->logClusters( si ); - - const QChar *uc = string.unicode() + from; - - *shapedChars = *uc; - logClusters[0] = 0; - int slen = 1; - int cluster_start = 0; - for (int i = 1; i < len; ++i) { - ushort base = shapedChars[slen-1].unicode(); - ushort shaped = 0; - bool invalid = FALSE; - if (uc[i].unicode() == Dagesh) { - if (base >= 0x5d0 - && base <= 0x5ea - && base != 0x5d7 - && base != 0x5dd - && base != 0x5df - && base != 0x5e2 - && base != 0x5e5) { - shaped = base - 0x5d0 + 0xfb30; - } else if (base == 0xfb2a || base == 0xfb2b /* Shin with Shin or Sin dot */) { - shaped = base + 2; - } else { - invalid = TRUE; - } - } else if (uc[i].unicode() == ShinDot) { - if (base == 0x05e9) - shaped = 0xfb2a; - else if (base == 0xfb49) - shaped = 0xfb2c; - else - invalid = TRUE; - } else if (uc[i].unicode() == SinDot) { - if (base == 0x05e9) - shaped = 0xfb2b; - else if (base == 0xfb49) - shaped = 0xfb2d; - else - invalid = TRUE; - } else if (uc[i].unicode() == Patah) { - if (base == 0x5d0) - shaped = 0xfb2e; - } else if (uc[i].unicode() == Qamats) { - if (base == 0x5d0) - shaped = 0xfb2f; - } else if (uc[i].unicode() == Holam) { - if (base == 0x5d5) - shaped = 0xfb4b; - } else if (uc[i].unicode() == Rafe) { - if (base == 0x5d1) - shaped = 0xfb4c; - else if (base == 0x5db) - shaped = 0xfb4d; - else if (base == 0x5e4) - shaped = 0xfb4e; - } - - if (invalid) { - shapedChars[slen] = 0x25cc; - glyphAttributes[slen].clusterStart = TRUE; - glyphAttributes[slen].mark = FALSE; - glyphAttributes[slen].combiningClass = 0; - cluster_start = slen; - ++slen; - } - if (shaped) { - if (si->fontEngine->canRender((QChar *)&shaped, 1)) { - shapedChars[slen-1] = QChar(shaped); - } else - shaped = 0; - } - if (!shaped) { - shapedChars[slen] = uc[i]; - if (::category(uc[i]) != QChar::Mark_NonSpacing) { - glyphAttributes[slen].clusterStart = TRUE; - glyphAttributes[slen].mark = FALSE; - glyphAttributes[slen].combiningClass = 0; - cluster_start = slen; - } else { - glyphAttributes[slen].clusterStart = FALSE; - glyphAttributes[slen].mark = TRUE; - glyphAttributes[slen].combiningClass = ::combiningClass(uc[i]); - } - ++slen; - } - logClusters[i] = cluster_start; - si->hasPositioning = TRUE; - } - - convertToCMap(shapedChars, slen, engine, si); - - glyphAttributes = engine->glyphAttributes( si ); - advance_t *advances = engine->advances( si ); - { - for (int i = 0; i < slen; ++i) { - if (glyphAttributes[i].mark) - advances[i] = 0; - } - } - - if ( !engine->widthOnly ) { - q_heuristicPosition( engine, si ); - } - - if (len > 256) - ::free(shapedChars); -} - - /* Arabic shaping obeys a number of rules according to the joining classes (see Unicode book, section on arabic). Index: qscriptengine_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qscriptengine_p.h,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qscriptengine_p.h 22 Sep 2005 12:55:08 -0000 1.1.1.5 +++ qscriptengine_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ??? ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qscriptengine_x11.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/qscriptengine_x11.cpp,v retrieving revision 1.1.1.8 retrieving revision 1.2 diff -u -r1.1.1.8 -r1.2 --- qscriptengine_x11.cpp 22 Sep 2005 12:55:20 -0000 1.1.1.8 +++ qscriptengine_x11.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** Continuation of middle eastern languages ** -** Copyright (C) 2003-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2003-2004 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** @@ -39,6 +39,34 @@ // // ------------------------------------------------------------------------------------------------------------------ +// #### stil missing: identify invalid character combinations +static void hebrew_shape(int script, const QString &string, int from, int len, + QTextEngine *engine, QScriptItem *si) +{ + assert(script == QFont::Hebrew); + +#ifndef QT_NO_XFTFREETYPE + QOpenType *openType = si->fontEngine->openType(); + + if ( openType && openType->supportsScript( script ) ) { + convertToCMap( string.unicode() + from, len, engine, si ); + heuristicSetGlyphAttributes( string, from, len, engine, si ); + openType->init(engine->glyphs(si), engine->glyphAttributes(si), si->num_glyphs, + engine->logClusters(si), len); + + openType->applyGSUBFeature(FT_MAKE_TAG( 'c', 'c', 'm', 'p' )); + // Uniscribe also defines dlig for Hebrew, but we leave this out for now, as it's mostly + // ligatures one does not want in modern Hebrew (as lam-alef ligatures). + + openType->applyGPOSFeatures(); + si->num_glyphs = 0; + openType->appendTo(engine, si); + + return; + } +#endif + basic_shape( script, string, from, len, engine, si ); +} // #### stil missing: identify invalid character combinations static void syriac_shape( int script, const QString &string, int from, int len, @@ -628,7 +656,7 @@ Below, None, None, None, None, Below, None, None, - None, Below, None, None, + None, None, None, None, Below, None, Post, Pre, Post, Below, Below, None, @@ -1299,8 +1327,7 @@ // If the base consonant is not the last one, Uniscribe // moves the halant from the base consonant to the last // one. - if ( lastConsonant > base && uc[base+1] == halant - && (script != QFont::Telugu || lastConsonant == len - 1 || uc[lastConsonant+1] != halant)) { + if ( lastConsonant > base && uc[base+1] == halant ) { IDEBUG(" moving halant from %d to %d!", base+1, lastConsonant); for (i = base+1; i < lastConsonant; i++) uc[i] = uc[i+1]; @@ -2179,321 +2206,215 @@ // // -------------------------------------------------------------------------------------------------------------------------------------------- -// Vocabulary -// Base -> A consonant or an independent vowel in its full (not subscript) form. It is the -// center of the syllable, it can be surrounded by coeng (subscript) consonants, vowels, -// split vowels, signs... but there is only one base in a syllable, it has to be coded as -// the first character of the syllable. -// split vowel --> vowel that has two parts placed separately (e.g. Before and after the consonant). -// Khmer language has five of them. Khmer split vowels either have one part before the -// base and one after the base or they have a part before the base and a part above the base. -// The first part of all Khmer split vowels is the same character, identical to -// the glyph of Khmer dependent vowel SRA EI -// coeng --> modifier used in Khmer to construct coeng (subscript) consonants -// Differently than indian languages, the coeng modifies the consonant that follows it, -// not the one preceding it Each consonant has two forms, the base form and the subscript form -// the base form is the normal one (using the consonants code-point), the subscript form is -// displayed when the combination coeng + consonant is encountered. -// Consonant of type 1 -> A consonant which has subscript for that only occupies space under a base consonant -// Consonant of type 2.-> Its subscript form occupies space under and before the base (only one, RO) -// Consonant of Type 3 -> Its subscript form occupies space under and after the base (KHO, CHHO, THHO, BA, YO, SA) -// Consonant shifter -> Khmer has to series of consonants. The same dependent vowel has different sounds -// if it is attached to a consonant of the first series or a consonant of the second series -// Most consonants have an equivalent in the other series, but some of theme exist only in -// one series (for example SA). If we want to use the consonant SA with a vowel sound that -// can only be done with a vowel sound that corresponds to a vowel accompanying a consonant -// of the other series, then we need to use a consonant shifter: TRIISAP or MUSIKATOAN -// x17C9 y x17CA. TRIISAP changes a first series consonant to second series sound and -// MUSIKATOAN a second series consonant to have a first series vowel sound. -// Consonant shifter are both normally supercript marks, but, when they are followed by a -// superscript, they change shape and take the form of subscript dependent vowel SRA U. -// If they are in the same syllable as a coeng consonant, Unicode 3.0 says that they -// should be typed before the coeng. Unicode 4.0 breaks the standard and says that it should -// be placed after the coeng consonant. -// Dependent vowel -> In khmer dependent vowels can be placed above, below, before or after the base -// Each vowel has its own position. Only one vowel per syllable is allowed. -// Signs -> Khmer has above signs and post signs. Only one above sign and/or one post sign are -// Allowed in a syllable. -// -// -// order is important here! This order must be the same that is found in each horizontal -// line in the statetable for Khmer (see khmerStateTable) . -// -enum KhmerCharClassValues { - CC_RESERVED = 0, - CC_CONSONANT = 1, // Consonant of type 1 or independent vowel - CC_CONSONANT2 = 2, // Consonant of type 2 - CC_CONSONANT3 = 3, // Consonant of type 3 - CC_ZERO_WIDTH_NJ_MARK = 4, // Zero Width non joiner character (0x200C) - CC_CONSONANT_SHIFTER = 5, - CC_ROBAT = 6, // Khmer special diacritic accent -treated differently in state table - CC_COENG = 7, // Subscript consonant combining character - CC_DEPENDENT_VOWEL = 8, - CC_SIGN_ABOVE = 9, - CC_SIGN_AFTER = 10, - CC_ZERO_WIDTH_J_MARK = 11, // Zero width joiner character - CC_COUNT = 12 // This is the number of character classes -}; - - -enum KhmerCharClassFlags { - CF_CLASS_MASK = 0x0000FFFF, - - CF_CONSONANT = 0x01000000, // flag to speed up comparing - CF_SPLIT_VOWEL = 0x02000000, // flag for a split vowel -> the first part is added in front of the syllable - CF_DOTTED_CIRCLE = 0x04000000, // add a dotted circle if a character with this flag is the first in a syllable - CF_COENG = 0x08000000, // flag to speed up comparing - CF_SHIFTER = 0x10000000, // flag to speed up comparing - CF_ABOVE_VOWEL = 0x20000000, // flag to speed up comparing - - // position flags - CF_POS_BEFORE = 0x00080000, - CF_POS_BELOW = 0x00040000, - CF_POS_ABOVE = 0x00020000, - CF_POS_AFTER = 0x00010000, - CF_POS_MASK = 0x000f0000 -}; - +enum KhmerForm { + Khmer_Cons, // Consonant + Khmer_IndV, // Independent Vowel + Khmer_Coeng, // COENG + Khmer_PreV, // Pre dependent Vowel + Khmer_BlwV, // Below dependent Vowel + Khmer_Shift, // Regshift + Khmer_AbvV, // Above dependent Vowel + Khmer_AbvS, // Above Sign + Khmer_PstV, // Post dependent Vowel + Khmer_PstS, // Post sign + Khmer_Other +}; + + +static const unsigned char khmerForm[0x54] = { + Khmer_Cons, Khmer_Cons, Khmer_Cons, Khmer_Cons, + Khmer_Cons, Khmer_Cons, Khmer_Cons, Khmer_Cons, + Khmer_Cons, Khmer_Cons, Khmer_Cons, Khmer_Cons, + Khmer_Cons, Khmer_Cons, Khmer_Cons, Khmer_Cons, + + Khmer_Cons, Khmer_Cons, Khmer_Cons, Khmer_Cons, + Khmer_Cons, Khmer_Cons, Khmer_Cons, Khmer_Cons, + Khmer_Cons, Khmer_Cons, Khmer_Cons, Khmer_Cons, + Khmer_Cons, Khmer_Cons, Khmer_Cons, Khmer_Cons, + + Khmer_Cons, Khmer_Cons, Khmer_Cons, Khmer_IndV, + Khmer_IndV, Khmer_IndV, Khmer_IndV, Khmer_IndV, + Khmer_IndV, Khmer_IndV, Khmer_IndV, Khmer_IndV, + Khmer_IndV, Khmer_IndV, Khmer_IndV, Khmer_IndV, + + Khmer_IndV, Khmer_IndV, Khmer_IndV, Khmer_IndV, + // #### the following two might not be independent vowels. + Khmer_IndV, Khmer_IndV, Khmer_PstV, Khmer_AbvV, + Khmer_AbvV, Khmer_AbvV, Khmer_AbvV, Khmer_BlwV, + Khmer_BlwV, Khmer_BlwV, Khmer_AbvV, Khmer_PstV, + + Khmer_PstV, Khmer_PreV, Khmer_PreV, Khmer_PreV, + Khmer_PstV, Khmer_PstV, Khmer_AbvS, Khmer_PstS, + Khmer_PstS, Khmer_Shift, Khmer_Shift, Khmer_AbvS, + Khmer_AbvS, Khmer_AbvS, Khmer_AbvS, Khmer_AbvS, + + Khmer_AbvS, Khmer_AbvS, Khmer_Coeng, Khmer_AbvS, +}; + +// see Uniscribe specs for details. A lot of the needed information can be found +// in the 3.2 annex, see http://www.unicode.org/reports/tr28/ +// +// syllable analysis needs to respect these: type one has to come before type 2 +// which has to come before type 3. type 2 can appear only once. +// +// We use 0xff to encode that this is a split vowel. +static const unsigned char khmerSubscriptType[0x54] = { + 1, 1, 1, 3, + 1, 1, 1, 1, + 3, 1, 1, 1, + 1, 3, 1, 1, + + 1, 1, 1, 1, + 3, 1, 1, 1, + 1, 3, 2, 1, + 1, 1, 3, 3, + + 1, 1, 1, 1, + 1, 1, 1, 1, + 1, 1, 1, 1, + 1, 1, 1, 1, + + 1, 1, 1, 1, + 1, 1, 1, 1, + 1, 1, 1, 1, + 1, 1, 0xff, 0xff, + + 0xff, 1, 1, 1, + 0xff, 0xff, 1, 1, + 1, 1, 1, 1, + 1, 1, 1, 1, + + 1, 1, 1, 1 +}; + +static inline KhmerForm khmer_form(const QChar &uc) { + if (uc.unicode() < 0x1780 || uc.unicode() > 0x17d3) + return Khmer_Other; + return (KhmerForm) khmerForm[uc.unicode()-0x1780]; +} -// Characters that get refered to by name -enum KhmerChar { - C_SIGN_ZWNJ = 0x200C, - C_SIGN_ZWJ = 0x200D, - C_DOTTED_CIRCLE = 0x25CC, - C_RO = 0x179A, - C_VOWEL_AA = 0x17B6, - C_SIGN_NIKAHIT = 0x17C6, - C_VOWEL_E = 0x17C1, - C_COENG = 0x17D2 -}; +static inline unsigned char khmer_subscript_type(const QChar &uc) { + return khmerSubscriptType[uc.unicode()-0x1780]; +} +// #define KHMER_DEBUG +#ifdef KHMER_DEBUG +#define KHDEBUG qDebug +#else +#define KHDEBUG if(0) qDebug +#endif -// simple classes, they are used in the statetable (in this file) to control the length of a syllable -// they are also used to know where a character should be placed (location in reference to the base character) -// and also to know if a character, when independently displayed, should be displayed with a dotted-circle to -// indicate error in syllable construction +// Khmer syllables are of the form: +// Cons + {COENG + (Cons | IndV)} + [PreV | BlwV] + [Shift] + [AbvV] + {AbvS} + [PstV] + [PstS] +// IndV +// Number // -enum { - _xx = CC_RESERVED, - _sa = CC_SIGN_ABOVE | CF_DOTTED_CIRCLE | CF_POS_ABOVE, - _sp = CC_SIGN_AFTER | CF_DOTTED_CIRCLE| CF_POS_AFTER, - _c1 = CC_CONSONANT | CF_CONSONANT, - _c2 = CC_CONSONANT2 | CF_CONSONANT, - _c3 = CC_CONSONANT3 | CF_CONSONANT, - _rb = CC_ROBAT | CF_POS_ABOVE | CF_DOTTED_CIRCLE, - _cs = CC_CONSONANT_SHIFTER | CF_DOTTED_CIRCLE | CF_SHIFTER, - _dl = CC_DEPENDENT_VOWEL | CF_POS_BEFORE | CF_DOTTED_CIRCLE, - _db = CC_DEPENDENT_VOWEL | CF_POS_BELOW | CF_DOTTED_CIRCLE, - _da = CC_DEPENDENT_VOWEL | CF_POS_ABOVE | CF_DOTTED_CIRCLE | CF_ABOVE_VOWEL, - _dr = CC_DEPENDENT_VOWEL | CF_POS_AFTER | CF_DOTTED_CIRCLE, - _co = CC_COENG | CF_COENG | CF_DOTTED_CIRCLE, - - // split vowel - _va = _da | CF_SPLIT_VOWEL, - _vr = _dr | CF_SPLIT_VOWEL -}; - +// {...} == 0-2 occurences -// Character class: a character class value -// ORed with character class flags. -// -typedef unsigned long KhmerCharClass; +// According to the Unicode 3.0 standard, the syllable is as follows: +// Cons ( Coeng (Cons|IndV) )* Shift? DepV? +// The above definitions disagree to a certain degree. Most probably the form mentioned by Uniscribe is the shaped form. -// Character class tables -// _xx character does not combine into syllable, such as numbers, puntuation marks, non-Khmer signs... -// _sa Sign placed above the base -// _sp Sign placed after the base -// _c1 Consonant of type 1 or independent vowel (independent vowels behave as type 1 consonants) -// _c2 Consonant of type 2 (only RO) -// _c3 Consonant of type 3 -// _rb Khmer sign robat u17CC. combining mark for subscript consonants -// _cd Consonant-shifter -// _dl Dependent vowel placed before the base (left of the base) -// _db Dependent vowel placed below the base -// _da Dependent vowel placed above the base -// _dr Dependent vowel placed behind the base (right of the base) -// _co Khmer combining mark COENG u17D2, combines with the consonant or independent vowel following -// it to create a subscript consonant or independent vowel -// _va Khmer split vowel in wich the first part is before the base and the second one above the base -// _vr Khmer split vowel in wich the first part is before the base and the second one behind (right of) the base -// -static const KhmerCharClass khmerCharClasses[] = { - _c1, _c1, _c1, _c3, _c1, _c1, _c1, _c1, _c3, _c1, _c1, _c1, _c1, _c3, _c1, _c1, // 1780 - 178F - _c1, _c1, _c1, _c1, _c3, _c1, _c1, _c1, _c1, _c3, _c2, _c1, _c1, _c1, _c3, _c3, // 1790 - 179F - _c1, _c3, _c1, _c1, _c1, _c1, _c1, _c1, _c1, _c1, _c1, _c1, _c1, _c1, _c1, _c1, // 17A0 - 17AF - _c1, _c1, _c1, _c1, _dr, _dr, _dr, _da, _da, _da, _da, _db, _db, _db, _va, _vr, // 17B0 - 17BF - _vr, _dl, _dl, _dl, _vr, _vr, _sa, _sp, _sp, _cs, _cs, _sa, _rb, _sa, _sa, _sa, // 17C0 - 17CF - _sa, _sa, _co, _sa, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _xx, _sa, _xx, _xx // 17D0 - 17DF -}; - -// this enum must reflect the range of khmerCharClasses -enum KhmerCharClassesRange { - KhmerFirstChar = 0x1780, - KhmerLastChar = 0x17df -}; - -// Below we define how a character in the input string is either in the khmerCharClasses table -// (in which case we get its type back), a ZWJ or ZWNJ (two characters that may appear -// within the syllable, but are not in the table) we also get their type back, or an unknown object -// in which case we get _xx (CC_RESERVED) back -// -static inline KhmerCharClass getKhmerCharClass(const QChar &uc) +static int khmer_nextSyllableBoundary(const QString &s, int start, int end, bool *invalid) { - if (uc.unicode() == C_SIGN_ZWJ) { - return CC_ZERO_WIDTH_J_MARK; - } - - if (uc.unicode() == C_SIGN_ZWNJ) { - return CC_ZERO_WIDTH_NJ_MARK; - } + const QChar *uc = s.unicode() + start; - if (uc.unicode() < KhmerFirstChar || uc.unicode() > KhmerLastChar) { - return CC_RESERVED; - } + int pos = 0; + unsigned int coengCount = 0; + unsigned int abvSCount = 0; + unsigned int subscriptType = 1; - return khmerCharClasses[uc.unicode() - KhmerFirstChar]; -} + KhmerForm state = khmer_form(*uc); + KHDEBUG("state[%d]=%d (uc=%4x)", pos, state, uc[pos].unicode() ); + pos++; -// The stateTable is used to calculate the end (the length) of a well -// formed Khmer Syllable. -// -// Each horizontal line is ordered exactly the same way as the values in KhmerClassTable -// CharClassValues. This coincidence of values allows the follow up of the table. -// -// Each line corresponds to a state, which does not necessarily need to be a type -// of component... for example, state 2 is a base, with is always a first character -// in the syllable, but the state could be produced a consonant of any type when -// it is the first character that is analysed (in ground state). -// -// Differentiating 3 types of consonants is necessary in order to -// forbid the use of certain combinations, such as having a second -// coeng after a coeng RO, -// The inexistent possibility of having a type 3 after another type 3 is permitted, -// eliminating it would very much complicate the table, and it does not create typing -// problems, as the case above. -// -// The table is quite complex, in order to limit the number of coeng consonants -// to 2 (by means of the table). -// -// There a peculiarity, as far as Unicode is concerned: -// - The consonant-shifter is considered in two possible different -// locations, the one considered in Unicode 3.0 and the one considered in -// Unicode 4.0. (there is a backwards compatibility problem in this standard). -// -// -// xx independent character, such as a number, punctuation sign or non-khmer char -// -// c1 Khmer consonant of type 1 or an independent vowel -// that is, a letter in which the subscript for is only under the -// base, not taking any space to the right or to the left -// -// c2 Khmer consonant of type 2, the coeng form takes space under -// and to the left of the base (only RO is of this type) -// -// c3 Khmer consonant of type 3. Its subscript form takes space under -// and to the right of the base. -// -// cs Khmer consonant shifter -// -// rb Khmer robat -// -// co coeng character (u17D2) -// -// dv dependent vowel (including split vowels, they are treated in the same way). -// even if dv is not defined above, the component that is really tested for is -// KhmerClassTable::CC_DEPENDENT_VOWEL, which is common to all dependent vowels -// -// zwj Zero Width joiner -// -// zwnj Zero width non joiner -// -// sa above sign -// -// sp post sign -// -// there are lines with equal content but for an easier understanding -// (and maybe change in the future) we did not join them -// -static const signed char khmerStateTable[][CC_COUNT] = -{ - // xx c1 c2 c3 zwnj cs rb co dv sa sp zwj - { 1, 2, 2, 2, 1, 1, 1, 6, 1, 1, 1, 2}, // 0 - ground state - {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, // 1 - exit state (or sign to the right of the syllable) - {-1, -1, -1, -1, 3, 4, 5, 6, 16, 17, 1, -1}, // 2 - Base consonant - {-1, -1, -1, -1, -1, 4, -1, -1, 16, -1, -1, -1}, // 3 - First ZWNJ before a register shifter It can only be followed by a shifter or a vowel - {-1, -1, -1, -1, 15, -1, -1, 6, 16, 17, 1, 14}, // 4 - First register shifter - {-1, -1, -1, -1, -1, -1, -1, -1, 20, -1, 1, -1}, // 5 - Robat - {-1, 7, 8, 9, -1, -1, -1, -1, -1, -1, -1, -1}, // 6 - First Coeng - {-1, -1, -1, -1, 12, 13, -1, 10, 16, 17, 1, 14}, // 7 - First consonant of type 1 after coeng - {-1, -1, -1, -1, 12, 13, -1, -1, 16, 17, 1, 14}, // 8 - First consonant of type 2 after coeng - {-1, -1, -1, -1, 12, 13, -1, 10, 16, 17, 1, 14}, // 9 - First consonant or type 3 after ceong - {-1, 11, 11, 11, -1, -1, -1, -1, -1, -1, -1, -1}, // 10 - Second Coeng (no register shifter before) - {-1, -1, -1, -1, 15, -1, -1, -1, 16, 17, 1, 14}, // 11 - Second coeng consonant (or ind. vowel) no register shifter before - {-1, -1, 1, -1, -1, 13, -1, -1, 16, -1, -1, -1}, // 12 - Second ZWNJ before a register shifter - {-1, -1, -1, -1, 15, -1, -1, -1, 16, 17, 1, 14}, // 13 - Second register shifter - {-1, -1, -1, -1, -1, -1, -1, -1, 16, -1, -1, -1}, // 14 - ZWJ before vowel - {-1, -1, -1, -1, -1, -1, -1, -1, 16, -1, -1, -1}, // 15 - ZWNJ before vowel - {-1, -1, -1, -1, -1, -1, -1, -1, -1, 17, 1, 18}, // 16 - dependent vowel - {-1, -1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 18}, // 17 - sign above - {-1, -1, -1, -1, -1, -1, -1, 19, -1, -1, -1, -1}, // 18 - ZWJ after vowel - {-1, 1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1}, // 19 - Third coeng - {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1}, // 20 - dependent vowel after a Robat -}; + if (state != Khmer_Cons && state != Khmer_IndV) { + if (state != Khmer_Other) + *invalid = TRUE; + goto finish; + } + while ( pos < end - start ) { + KhmerForm newState = khmer_form(uc[pos]); + switch( newState ) { + case Khmer_Coeng: + if (coengCount > 1 || (state != Khmer_Cons && state != Khmer_IndV)) + goto finish; + ++coengCount; + break; + case Khmer_Cons: + case Khmer_IndV: { + unsigned int t = khmer_subscript_type(uc[pos]); + if (state != Khmer_Coeng || t < subscriptType) + goto finish; + subscriptType = t; + // only one consonant of type 2 can be present + if (t == 2) + t = 3; + break; + } + case Khmer_PstS: + if (state == Khmer_PstV) + break; + case Khmer_PstV: + case Khmer_AbvS: + if (newState == Khmer_AbvS) { + if (abvSCount > 1) + goto finish; + ++abvSCount; + } + if (state == Khmer_AbvS || state == Khmer_AbvV) + break; + // fall through + case Khmer_AbvV: + if (state == Khmer_Shift) + break; + // fall through + case Khmer_Shift: + if (state == Khmer_PreV || state == Khmer_BlwV) + break; + // fall through + case Khmer_PreV: + case Khmer_BlwV: + if (state != Khmer_Cons && state != Khmer_IndV) + goto finish; + break; + case Khmer_Other: + goto finish; + } + state = newState; + pos++; + } -// #define KHMER_DEBUG -#ifdef KHMER_DEBUG -#define KHDEBUG qDebug -#else -#define KHDEBUG if(0) qDebug -#endif +finish: + // makse sure we don't have an invalid Coeng at the end + if (state == Khmer_Coeng && pos > 1) + --pos; -// Given an input string of characters and a location in which to start looking -// calculate, using the state table, which one is the last character of the syllable -// that starts in the starting position. -// -static inline int khmer_nextSyllableBoundary(const QString &s, int start, int end, bool *invalid) -{ *invalid = FALSE; - const QChar *uc = s.unicode() + start; - int state = 0; - int pos = start; - - while (pos < end) { - KhmerCharClass charClass = getKhmerCharClass(*uc); - if (pos == start) { - *invalid = (charClass > 0) && ! (charClass & CF_CONSONANT); - } - state = khmerStateTable[state][charClass & CF_CLASS_MASK]; - - KHDEBUG("state[%d]=%d class=%8lx (uc=%4x)", pos - start, state, - charClass, uc->unicode() ); - - if (state < 0) { - break; - } - ++uc; - ++pos; - } - return pos; + return start+pos; } - static void khmer_shape_syllable( const QString &string, int from, int syllableLength, - QTextEngine *engine, QScriptItem *si, QOpenType *openType ) + QTextEngine *engine, QScriptItem *si, QOpenType *openType, bool invalid ) { + enum { + Coeng = 0x17d2, + VowelSignE = 0x17c1 + }; + // according to the specs this is the max length one can get // ### the real value should be smaller assert(syllableLength < 13); KHDEBUG("syllable from %d len %d, str='%s'", from, syllableLength, string.mid(from,syllableLength).utf8().data()); + int len = syllableLength; - int len = 0; - int syllableEnd = from + syllableLength; + int i; unsigned short reordered[16]; GlyphAttributes glyphAttributes[16]; unsigned char properties[16]; @@ -2505,163 +2426,86 @@ }; memset(properties, 0, 16*sizeof(unsigned char)); - int i; + if ( invalid ) { + *reordered = 0x25cc; + memcpy( reordered+1, string.unicode() + from, len*sizeof(unsigned short) ); + len++; + } else { + memcpy( reordered, string.unicode() + from, len*sizeof(unsigned short) ); + } + #ifdef KHMER_DEBUG qDebug("original:"); - for (i = from; i < syllableEnd; i++) { - qDebug(" %d: %4x", i, string[i].unicode()); + for (i = 0; i < len; i++) { + qDebug(" %d: %4x", i, reordered[i]); } #endif - // write a pre vowel or the pre part of a split vowel first - // and look out for coeng + ro. RO is the only vowel of type 2, and - // therefore the only one that requires saving space before the base. - // - int coengRo = -1; // There is no Coeng Ro, if found this value will change - for (i = from; i < syllableEnd; i += 1) { - KhmerCharClass charClass = getKhmerCharClass(string[i]); - - // if a split vowel, write the pre part. In Khmer the pre part - // is the same for all split vowels, same glyph as pre vowel C_VOWEL_E - if (charClass & CF_SPLIT_VOWEL) { - reordered[len] = C_VOWEL_E; - properties[len] = PreForm; - ++len; - break; // there can be only one vowel - } - // if a vowel with pos before write it out - if (charClass & CF_POS_BEFORE) { - reordered[len] = string[i].unicode(); - properties[len] = PreForm; - ++len; - break; // there can be only one vowel - } - // look for coeng + ro and remember position - // works because coeng + ro is always in front of a vowel (if there is a vowel) - // and because CC_CONSONANT2 is enough to identify it, as it is the only consonant - // with this flag - if ( (charClass & CF_COENG) && (i + 1 < syllableEnd) && - ( (getKhmerCharClass(string[i + 1]) & CF_CLASS_MASK) == CC_CONSONANT2) ) { - coengRo = i; - } - } - - // write coeng + ro if found - if (coengRo > -1) { - reordered[len] = C_COENG; - properties[len] = PreForm; - ++len; - reordered[len] = C_RO; - properties[len] = PreForm; - ++len; - } - - // shall we add a dotted circle? - // If in the position in which the base should be (first char in the string) there is - // a character that has the Dotted circle flag (a character that cannot be a base) - // then write a dotted circle - if (getKhmerCharClass(string[from]) & CF_DOTTED_CIRCLE) { - reordered[len] = C_DOTTED_CIRCLE; - ++len; - } - - // copy what is left to the output, skipping before vowels and - // coeng Ro if they are present - for (i = from; i < syllableEnd; i += 1) { - QChar uc = string[i]; - KhmerCharClass charClass = getKhmerCharClass(uc); - - // skip a before vowel, it was already processed - if (charClass & CF_POS_BEFORE) { - ... [truncated message content] |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:32
|
Update of /cvsroot/kde-cygwin/qt-3/src/sql/drivers/cache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/src/sql/drivers/cache Modified Files: qsqlcachedresult.cpp qsqlcachedresult.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qsqlcachedresult.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/drivers/cache/qsqlcachedresult.cpp,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- qsqlcachedresult.cpp 22 Sep 2005 12:53:48 -0000 1.1.1.2 +++ qsqlcachedresult.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -3,7 +3,7 @@ ** Implementation of cached Qt SQL result classes ** ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlcachedresult.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/drivers/cache/qsqlcachedresult.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qsqlcachedresult.h 22 Sep 2005 12:53:48 -0000 1.1.1.4 +++ qsqlcachedresult.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -2,7 +2,7 @@ ** ** Definition of shared Qt SQL module classes ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:32
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/aix-xlc-64 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/aix-xlc-64 Modified Files: qmake.conf Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qmake.conf =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/aix-xlc-64/qmake.conf,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qmake.conf 22 Sep 2005 12:58:56 -0000 1.1.1.7 +++ qmake.conf 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,5 +1,5 @@ # -# $Id$ +# # # qmake configuration for aix-xlc # |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:32
|
Update of /cvsroot/kde-cygwin/qt-3/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/tools Modified Files: tools.pro Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: tools.pro =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/tools.pro,v retrieving revision 1.1.1.9 retrieving revision 1.2 diff -u -r1.1.1.9 -r1.2 --- tools.pro 22 Sep 2005 12:57:34 -0000 1.1.1.9 +++ tools.pro 23 Sep 2005 09:40:30 -0000 1.2 @@ -7,6 +7,7 @@ assistant \ linguist unix:SUBDIRS += qtconfig + win32:SUBDIRS += qtconfig } CONFIG+=ordered |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:32
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/reliant-cds-64 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/reliant-cds-64 Modified Files: qmake.conf Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qmake.conf =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/reliant-cds-64/qmake.conf,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qmake.conf 22 Sep 2005 12:58:57 -0000 1.1.1.6 +++ qmake.conf 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,5 +1,5 @@ # -# $Id$ +# # # qmake configuration for reliant-cds-64 # |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:32
|
Update of /cvsroot/kde-cygwin/qt-3/examples/network/archivesearch In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/examples/network/archivesearch Modified Files: archivedialog.ui.h main.cpp Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: archivedialog.ui.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/examples/network/archivesearch/archivedialog.ui.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- archivedialog.ui.h 22 Sep 2005 12:59:53 -0000 1.1.1.2 +++ archivedialog.ui.h 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,7 +1,7 @@ /**************************************************************************** -** $Id$ +** ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. ** ** This file is part of an example program for Qt. This example ** program may be used, distributed and modified without limitation. Index: main.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/examples/network/archivesearch/main.cpp,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- main.cpp 22 Sep 2005 12:59:53 -0000 1.1.1.2 +++ main.cpp 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,7 +1,7 @@ /**************************************************************************** -** $Id$ +** ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. ** ** This file is part of an example program for Qt. This example ** program may be used, distributed and modified without limitation. |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:32
|
Update of /cvsroot/kde-cygwin/qt-3/plugins/src/sqldrivers/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/plugins/src/sqldrivers/mysql Modified Files: main.cpp Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: main.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/plugins/src/sqldrivers/mysql/main.cpp,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- main.cpp 22 Sep 2005 13:00:41 -0000 1.1.1.3 +++ main.cpp 23 Sep 2005 09:40:29 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 001103 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:32
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/lynxos-g++ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/lynxos-g++ Modified Files: qmake.conf Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qmake.conf =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/lynxos-g++/qmake.conf,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- qmake.conf 22 Sep 2005 12:58:56 -0000 1.1.1.2 +++ qmake.conf 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,5 +1,5 @@ # -# $Id$ +# # # qmake configuration for lynxos-g++ # |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:31
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/linux-kylix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/linux-kylix Modified Files: qmake.conf Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qmake.conf =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/linux-kylix/qmake.conf,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- qmake.conf 22 Sep 2005 12:58:56 -0000 1.1.1.2 +++ qmake.conf 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,5 +1,5 @@ # -# $Id$ +# # # qmake configuration for linux-kylix # |
4 messages has been excluded from this view by a project administrator.
