diff options
| -rwxr-xr-x | bin/qt20fix | 259 | ||||
| -rwxr-xr-x | bin/qtrename140 | 2 | ||||
| -rw-r--r-- | doc/html/index | 2 | ||||
| -rw-r--r-- | doc/html/porting2.html | 965 | ||||
| -rw-r--r-- | doc/html/qt.dcf | 6 | ||||
| -rw-r--r-- | doc/html/removed20.html | 379 | ||||
| -rw-r--r-- | doc/html/titleindex | 2 | ||||
| -rw-r--r-- | doc/man/README | 1 | ||||
| -rw-r--r-- | doc/man/man1/qt20fix.1 | 32 | ||||
| -rw-r--r-- | doc/porting2.doc | 1441 | ||||
| l--------- | include/q1xcompatibility.h | 1 | ||||
| l--------- | include/qpaintd.h | 1 | ||||
| l--------- | include/qpaintdevicedefs.h | 1 | ||||
| -rw-r--r-- | src/compat/qpaintd.h | 25 | ||||
| -rw-r--r-- | src/compat/qpaintdc.h | 25 | ||||
| -rw-r--r-- | src/kernel/q1xcompatibility.h | 49 | ||||
| -rw-r--r-- | src/kernel/qpaintdevicedefs.h | 48 | ||||
| -rw-r--r-- | src/kernel/qt_kernel.pri | 1 |
18 files changed, 0 insertions, 3240 deletions
diff --git a/bin/qt20fix b/bin/qt20fix deleted file mode 100755 index d7cba30..0000000 --- a/bin/qt20fix +++ /dev/null @@ -1,259 +0,0 @@ -#!/usr/bin/perl -w -# -# in sh/bash/zsh: -# make 2>&1 | .../qt/bin/qt20fix -# in csh/tcsh -# make |& .../qt/bin/qt20fix -# -# repeat as long as qt20fix says to. if your make supports the -k -# flag, that speeds up the process a bit. -# -# qt20fix tends to fix a bit over half of the remaining problems in -# each run. -# -# if you don't use gcc, you will need to change parseline. -# - - -# this function must accept one line, which is presumed to be an error -# message, and return an array of three strings: the file name, the -# line number and the variable that is undefined. -# -# it may also return an empty list, if the line isn't an error message. -# -# the function is called on each line in turn and only once on each -# line, so it's possible to save state. -# - -sub parseline{ - my( $line ) = @_; - - chomp $line; - - if ( $line =~ m%^([-a-zA-Z0-9_\./]+\.[a-zA-Z]+):(\d+):\s*\`(.+)\' undeclared% ) { - @r = ($1,$2,$3); - $r[0] = $currentdir . $r[0] if ( defined($currentdir) && - $r[0] =~ m%^[^/]% ); - return @r; - } elsif ( $line =~ m%^([-a-zA-Z0-9_\./]+\.[a-zA-Z]+):(\d+):\s*\`(.+)\' was not declared% ) { - @r = ($1,$2,$3); - $r[0] = $currentdir . $r[0] if ( defined($currentdir) && - $r[0] =~ m%^[^/]% ); - return @r; - } elsif ( $line =~ m%^g?make\[(\d+)\]: Entering directory \`(.*)\'% ) { - # make[1]: Entering directory `/home/agulbra/2x/src/ui' - my( $l, $c ) = ( $1, $2 ); - $c =~ s-/?$-/-; - $dirs[$l] = $c; - $currentdir = $c; - print "$line\n"; - } elsif ( $line =~ m%make\[(\d+)\]: Leaving directory \`.*\'$% ) { - # make[1]: Leaving directory `/home/agulbra/2x/src/ui' - $currentdir = defined( $dirs[$1 - 1] ) ? $dirs[$1 - 1] : ""; - print "$line\n"; - } elsif ( $line =~ m%^\S+:(?:\d+:)?\s+\S% ) { - # other compiler message - skip it - } else { - print "$line\n"; - } - - return (); -} - - -# -# this is the big array of globals and their replacements. add stuff -# at will. -# - -%globals = -( - "Event_None" => "QEvent::None", - "Event_Timer" => "QEvent::Timer", - "Event_MouseButtonPress" => "QEvent::MouseButtonPress", - "Event_MouseButtonRelease" => "QEvent::MouseButtonRelease", - "Event_MouseButtonDblClick" => "QEvent::MouseButtonDblClick", - "Event_MouseMove" => "QEvent::MouseMove", - "Event_KeyPress" => "QEvent::KeyPress", - "Event_KeyRelease" => "QEvent::KeyRelease", - "Event_FocusIn" => "QEvent::FocusIn", - "Event_FocusOut" => "QEvent::FocusOut", - "Event_Enter" => "QEvent::Enter", - "Event_Leave" => "QEvent::Leave", - "Event_Paint" => "QEvent::Paint", - "Event_Move" => "QEvent::Move", - "Event_Resize" => "QEvent::Resize", - "Event_Create" => "QEvent::Create", - "Event_Destroy" => "QEvent::Destroy", - "Event_Show" => "QEvent::Show", - "Event_Hide" => "QEvent::Hide", - "Event_Close" => "QEvent::Close", - "Event_Quit" => "QEvent::Quit", - "Event_Accel" => "QEvent::Accel", - "Event_Clipboard" => "QEvent::Clipboard", - "Event_SockAct" => "QEvent::SockAct", - "Event_DragEnter" => "QEvent::DragEnter", - "Event_DragMove" => "QEvent::DragMove", - "Event_DragLeave" => "QEvent::DragLeave", - "Event_Drop" => "QEvent::Drop", - "Event_DragResponse" => "QEvent::DragResponse", - "Event_ChildInserted" => "QEvent::ChildInserted", - "Event_ChildRemoved" => "QEvent::ChildRemoved", - "Event_LayoutHint" => "QEvent::LayoutHint", - "Event_User" => "QEvent::User", - - "color0" => "Qt::color0", - "color1" => "Qt::color1", - "black" => "Qt::black", - "white" => "Qt::white", - "darkGray" => "Qt::darkGray", - "gray" => "Qt::gray", - "lightGray" => "Qt::lightGray", - "red" => "Qt::red", - "green" => "Qt::green", - "blue" => "Qt::blue", - "cyan" => "Qt::cyan", - "magenta" => "Qt::magenta", - "yellow" => "Qt::yellow", - "darkRed" => "Qt::darkRed", - "darkGreen" => "Qt::darkGreen", - "darkBlue" => "Qt::darkBlue", - "darkCyan" => "Qt::darkCyan", - "darkMagenta" => "Qt::darkMagenta", - "darkYellow" => "Qt::darkYellow", - - "AlignLeft" => "Qt::AlignLeft", - "AlignRight" => "Qt::AlignRight", - "AlignHCenter" => "Qt::AlignHCenter", - "AlignTop" => "Qt::AlignTop", - "AlignBottom" => "Qt::AlignBottom", - "AlignVCenter" => "Qt::AlignVCenter", - "AlignCenter" => "Qt::AlignCenter", - "SingleLine" => "Qt::SingleLine", - "DontClip" => "Qt::DontClip", - "ExpandTabs" => "Qt::ExpandTabs", - "ShowPrefix" => "Qt::ShowPrefix", - "WordBreak" => "Qt::WordBreak", - "DontPrint" => "Qt::DontPrint", - - "TransparentMode" => "Qt::TransparentMode", - "OpaqueMode" => "Qt::OpaqueMode", - - "PixelUnit" => "Qt::PixelUnit", - "LoMetricUnit" => "Qt::LoMetricUnit", - "HiMetricUnit" => "Qt::HiMetricUnit", - "LoEnglishUnit" => "Qt::LoEnglishUnit", - "HiEnglishUnit" => "Qt::HiEnglishUnit", - "TwipsUnit" => "Qt::TwipsUnit", - - "WindowsStyle" => "Qt::WindowsStyle", - "MotifStyle" => "Qt::MotifStyle", - - "Horizontal" => "Qt::Horizontal", - "Vertical" => "Qt::Vertical", - - "PenStyle" => "Qt::PenStyle", - "NoPen" => "Qt::NoPen", - "SolidLine" => "Qt::SolidLine", - "DashLine" => "Qt::DashLine", - "DotLine" => "Qt::DotLine", - "DashDotLine" => "Qt::DashDotLine", - "DashDotDotLine" => "Qt::DashDotDotLine", - - "BrushStyle" => "Qt::BrushStyle", - "NoBrush" => "Qt::NoBrush", - "SolidPattern" => "Qt::SolidPattern", - "Dense1Pattern" => "Qt::Dense1Pattern", - "Dense2Pattern" => "Qt::Dense2Pattern", - "Dense3Pattern" => "Qt::Dense3Pattern", - "Dense4Pattern" => "Qt::Dense4Pattern", - "Dense5Pattern" => "Qt::Dense5Pattern", - "Dense6Pattern" => "Qt::Dense6Pattern", - "Dense7Pattern" => "Qt::Dense7Pattern", - "HorPattern" => "Qt::HorPattern", - "VerPattern" => "Qt::VerPattern", - "CrossPattern" => "Qt::CrossPattern", - "BDiagPattern" => "Qt::BDiagPattern", - "FDiagPattern" => "Qt::FDiagPattern", - "DiagCrossPattern" => "Qt::DiagCrossPattern", - "CustomPattern" => "Qt::CustomPattern", - - "arrowCursor" => "Qt::arrowCursor", - "upArrowCursor" => "Qt::upArrowCursor", - "crossCursor" => "Qt::crossCursor", - "waitCursor" => "Qt::waitCursor", - "ibeamCursor" => "Qt::ibeamCursor", - "sizeVerCursor" => "Qt::sizeVerCursor", - "sizeHorCursor" => "Qt::sizeHorCursor", - "sizeBDiagCursor" => "Qt::sizeBDiagCursor", - "sizeFDiagCursor" => "Qt::sizeFDiagCursor", - "sizeAllCursor" => "Qt::sizeAllCursor", - "blankCursor" => "Qt::blankCursor", - "splitVCursor" => "Qt::splitVCursor", - "splitHCursor" => "Qt::splitHCursor", - "pointingHandCursor" => "Qt::pointingHandCursor" -); - -if ( defined( $ENV{"QTDIR"} ) && - open( I, "< ". $ENV{"QTDIR"} . "/src/kernel/q1xcompatibility.h" ) ) { - while( <I> ) { - if ( /\#define\s+([a-zA-Z0-9_]+)\s+(\S+)/ ) { - if ( !defined( $globals{$1} ) ) { - $globals{$1} = $2; - } elsif ( $globals{$1} ne $2 ) { - #print "conflict: $1 is mapped to $2 and $globals{$1}\n"; - } - } - } - close I; -} - -# -# do the do -# - -while( <STDIN> ) { - @r = parseline($_); - next unless @r; - ($file, $line, $variable) = @r; - if ( defined( $variable ) && defined($globals{$variable}) ) { - if ( !defined($lastfile) || ($file ne $lastfile) ) { - $lastfile = undef if ( !$changes ); - if ( defined( $lastfile ) ) { - open( O, "> $lastfile" ) || - die "cannot write to $lastfile, stopped"; - print "qt20fix: writing $lastfile (changes: $changes)\n"; - print O @currentfile; - close O; - } - open( I, "< $file" ) || die "cannot read $file, stopped"; - @currentfile = <I>; - close I; - $lastfile = $file; - $changes = 0; - } - next unless ( defined( $currentfile[$line-1] ) ); - next unless ( $currentfile[$line-1] =~ /\b$variable\b/ ); - if ( $currentfile[$line-1] =~ s/([^a-zA-Z0-9])::$variable\b/$1$globals{$variable}/ || - $currentfile[$line-1] =~ s/([^a-zA-Z0-9:])$variable\b/$1$globals{$variable}/ ) { - print "$file:$line:replaced \`$variable\' with \`$globals{$variable}\'\n"; - $changes++; - $totalchanges++ - } - } elsif ( defined( $variable ) ) { - print "$file:$line: unknown undefined variable $variable\n"; - } -} - -if ( defined( $changes) && $changes > 0 && defined( $lastfile ) ) { - open( O, "> $lastfile" ) || - die "cannot write to $lastfile, stopped"; - print "qt20fix: writing $lastfile (changes: $changes)\n"; - print O @currentfile; - close O; -} - - -if ( defined( $totalchanges) && $totalchanges > 0 ) { - print "qt20fix: total changes: $totalchanges\nqt20fix: rerun recommended\n"; -} diff --git a/bin/qtrename140 b/bin/qtrename140 index 73c463f..1160cb2 100755 --- a/bin/qtrename140 +++ b/bin/qtrename140 @@ -116,7 +116,5 @@ s/\bqobjdefs\./qobjectdefs./g if /#include/; s/\bQOBJDEFS_H\b/QOBJECTDEFS_H/g if /#if/; s/\bqpaintd\./qpaintdevice./g if /#include/; s/\bQPAINTD_H\b/QPAINTDEVICE_H/g if /#if/; -s/\bqpaintdc\./qpaintdevicedefs./g if /#include/; -s/\bQPAINTDC_H\b/QPAINTDEVICEDEFS_H/g if /#if/; s/\bqwindefs\./qwindowdefs./g if /#include/; s/\bQWINDEFS_H\b/QWINDOWDEFS_H/g if /#if/; diff --git a/doc/html/index b/doc/html/index index cc7ca30..f051e5d 100644 --- a/doc/html/index +++ b/doc/html/index @@ -63,7 +63,6 @@ "Font Displayer" qfd-example.html "Fonts in Qt/Embedded" emb-fonts.html "Format of the QDataStream Operators" datastreamformat.html -"Functions removed in Qt 2.0" removed20.html "GNU General Public License" gpl.html "Getting Started" motif-walkthrough-1.html "Grapher Plugin" grapher-nsplugin-example.html @@ -119,7 +118,6 @@ "Pictures of Most Qt Widgets" pictures.html "Play Tetrix!" qaxserver-demo-tetrax.html "Popup Widgets" popup-example.html -"Porting to Qt 2.x" porting2.html "Porting to Qt 3.x" porting.html "Porting your applications to Qt/Embedded" emb-porting.html "Preparing to Migrate the User Interface" motif-walkthrough-2.html diff --git a/doc/html/porting2.html b/doc/html/porting2.html deleted file mode 100644 index cfa84fd..0000000 --- a/doc/html/porting2.html +++ /dev/null @@ -1,965 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/doc/porting2.doc:36 --> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Porting to Qt 2.x</title> -<style type="text/css"><!-- -fn { margin-left: 1cm; text-indent: -1cm; } -a:link { color: #004faf; text-decoration: none } -a:visited { color: #672967; text-decoration: none } -body { background: #ffffff; color: black; } ---></style> -</head> -<body> - -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr bgcolor="#E5E5E5"> -<td valign=center> - <a href="index.html"> -<font color="#004faf">Home</font></a> - | <a href="classes.html"> -<font color="#004faf">All Classes</font></a> - | <a href="mainclasses.html"> -<font color="#004faf">Main Classes</font></a> - | <a href="annotated.html"> -<font color="#004faf">Annotated</font></a> - | <a href="groups.html"> -<font color="#004faf">Grouped Classes</font></a> - | <a href="functions.html"> -<font color="#004faf">Functions</font></a> -</td> -<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>Porting to Qt 2.x</h1> - - - -<p> <p> -You're probably looking at this page because you want to port -your application from Qt 1.x to Qt 2.x, but to be sure, let's -review the good reasons to do this: -<ul> -<li>To get access to all the new Qt 2.x features like the rich text -HTML subset for formatted labels, tooltips, online help etc. -and the much easier to use layout classes and widgets. -<li>To make your application truly international, with support -for Unicode and translations for the languages of the world. -<li>To allow your application to fit into the new look of the -Unix desktop with configurable, very powerful "themes". The -extended style system also integrates Qt applications better -on MS-Windows desktops. Qt will automatically chose the right -colors and fonts and obey global system setting changes. -<li>To stay up-to-date with the version of Qt that gets all the -new features and bug-fixes. -<li>To get more speed and smoother widgets display with all the -new anti-flicker changes in Qt. -<li>Most of all though, you want to port to Qt 2.x -so that your Wheel Mouse works! -</ul> -<p> <p> -The Qt 2.x series is not binary compatible with the 1.x series. -This means programs compiled for Qt 1.x must be recompiled to work -with Qt 2.x. Qt 2.x is also not completely <em>source</em> compatible -with 1.x, however all points of incompatibility cause -compiler errors (rather than mysterious results), or produce run-time -messages. The result is that Qt 2.x includes many additional features, -discards obsolete functionality that is easily converted to use the new -features, and that porting an application from Qt 1.x to Qt 2.x is -a simple task well worth the amount of effort required. -<p> To port code using Qt 1.x to use Qt 2.x: -<p> <ul> -<li> Briefly read the porting notes below to get an idea of what to expect. -<li> Be sure your code compiles and runs well on all your target platforms with Qt 1.x. -<li> Recompile with Qt 2.x. For each error, search below for related -identifiers (eg. function names, class names) - this documented is -structured to mention all relevant identifiers to facilitate such -searching, even if that makes it a little verbose. -<li> If you get stuck, ask on the qt-interest mailing list, or -Trolltech Technical Support if you're a Professional Edition -licensee. -</ul> -<p> Many very major projects, such as <a href="http://www.kde.org/">KDE</a> -have been port, so there is plenty of expertise in the collective conscious -that is the Qt Developer Community! -</p> -<p> <hr> -<p> <h2 align=center>The Porting Notes</h2> -<p> <ul> -<li><b><a href="#Namespace">Namespace</a></b> -<li><b><a href="#Virtual">Virtual Functions</a></b> -<li><b><a href="#Collection">Collection classes</a></b> -<li><b><a href="#DefaultParent">No Default 0 Parent Widget</a></b> -<li><b><a href="#DebugVsRelease">Debug vs. Release</a></b> -<li><b><a href="#QApplication">QApplication</a></b> -<li><b><a href="#QClipboard">QClipboard</a></b> -<li><b><a href="#QColor">QColor</a></b> -<li><b><a href="#QDataStream">QDataStream</a></b> -<li><b><a href="#QDialog">QDialog</a></b> -<li><b><a href="#QDropSite">QDropSite</a></b> -<li><b><a href="#QEvent">QEvent</a></b> -<li><b><a href="#QFile">QFile</a></b> -<li><b><a href="#QFontMetrics">QFontMetrics</a></b> -<li><b><a href="#QIODevice">QIODevice</a></b> -<li><b><a href="#QLabel">QLabel</a></b> -<li><b><a href="#QLayout">QLayout</a></b> -<li><b><a href="#QListView">QListView</a></b> -<li><b><a href="#QMenuData">QMenuData</a></b> -<li><b><a href="#QMenuData">QPopupMenu</a></b> -<li><b><a href="#QMultiLineEdit">QMultiLineEdit</a></b> -<li><b><a href="#QPainter">QPainter</a></b> -<li><b><a href="#QPicture">QPicture</a></b> -<li><b><a href="#QPoint">QPoint, <a href="qpointarray.html">QPointArray</a>, <a href="qsize.html">QSize</a> and <a href="qrect.html">QRect</a></a></b> -<li><b><a href="#QPixmap">QPixmap</a></b> -<li><b><a href="#QRgb">QRgb</a></b> -<li><b><a href="#QScrollView">QScrollView</a></b> -<li><b><a href="#QStrList">QStrList</a></b> -<li><b><a href="#QString">QString</a></b> -<li><b><a href="#QTextStream">QTextStream</a></b> -<li><b><a href="#QUriDrag">QUriDrag / QUrlDrag</a></b> -<li><b><a href="#QValidator">QComboBox</a></b> -<li><b><a href="#QValidator">QLineEdit</a></b> -<li><b><a href="#QValidator">QSpinBox</a></b> -<li><b><a href="#QValidator">QValidator</a></b> -<li><b><a href="#QWidget">QWidget</a></b> -<li><b><a href="#QWindow">QWindow</a></b> -</ul> -<p> <hr> -<p> <h3><a name="Namespace">Namespace</a></h3> -<p> <p> Qt 2.x is namespace-clean, unlike 1.x. Qt now uses very few -global identifiers. Identifiers like <code>red, blue, LeftButton, -AlignRight, Key_Up, Key_Down, NoBrush</code> etc. are now part of a -special class <code>Qt</code> (defined in qnamespace.h), -which is inherited by -most Qt classes. Member functions of classes that inherit from <a href="qwidget.html">QWidget</a>, -etc. are totally unaffected, but code that is -<em>not</em> in functions of classes inherited from <code>Qt</code>, -you must qualify these identifiers like this: <code>Qt::red, -Qt::LeftButton, Qt::AlignRight</code>, etc. -<p> <p>The <code>qt/bin/qt20fix</code> script helps to fix the code that -needs adaption, though most code does not need changing. -<p> Compiling with -DQT1COMPATIBILITY will help you get going with Qt 2.x -- it allows all the old "dirty namespace" identifiers from Qt 1.x to -continue working. Without it, you'll get compile errors that can -easily be fixed by searching this page for the clean identifiers. -<p> <h3><a name="DefaultParent">No Default 0 Parent Widget</a></h3> -<p> In Qt 1.x, all widget constructors were defined with a default value -of 0 for the parent widget. However, only the main window of the -application should be created with a 0 parent, all other widgets -should have parents. Having the 0 default made it too simple to create -bugs by forgetting to specify the parent of non-mainwindow -widgets. Such widgets would typically never be deleted (causing memory -leaks), and they would become top-level widgets, confusing the window -managers. Therefore, in Qt 2.x the 0 default parent has been removed -for the widget classes that are not likely to be used as main windows. -<p> Note also that programs no longer need (or should) use 0 parent just -to indicate that a widget should be top-level. See -<pre> QWidget::isTopLevel() </pre> - for details. See also the notes about -<a href="#QMenuData">QPopupMenu</a> and <a href="#QDialog">QDialog</a> -below. -<p> <h3><a name="Virtual">Virtual Functions</a></h3> -<p> <p> Some virtual functions have changed signature in Qt 2.x. -If you override them in derived classes, you must change the signature -of your functions accordingly. -<p> <!-- warwick can check for additions to this with his qt-2-report --> -<ul> -<li><pre> QWidget::setStyle(GUIStyle)</pre> - -<li><pre> QListView::addColumn(const char *, int)</pre> - -<li><pre> QListView::setColumnText(int, const char *)</pre> - -<li><pre> QListViewItem::setText(int, const char *)</pre> - -<li><pre> QMultiLineEdit::insertLine(const char *, int)</pre> - -<li><pre> QMultiLineEdit::insertAt(const char *, int, int, bool)</pre> - -<li><pre> QSpinBox::setPrefix(const char *)</pre> - -<li><pre> QSpinBox::setSuffix(const char *)</pre> - -<li><pre> QToolButton::setTextLabel(const char *, bool)</pre> - -<li><pre> QDoubleValidator::validate(QString &, int &)</pre> - -<li><pre> QIntValidator::validate(QString &, int &)</pre> - -<li><pre> QValidator::fixup(QString &)</pre> - -<li><pre> QSlider::paintSlider(QPainter *, const <a href="qrect.html">QRect</a> &)</pre> - -</ul> -<p> This is one class of changes that are -not detected by the compiler, -so you should mechanically search for each of -these function names in your header files, eg. -<p> <pre> -egrep -w 'setStyle|addColumn|setColumnText|setText...' *.h -</pre> - -<p> Of course, you'll get a few false positives (eg. if you have a setText -function that is not in a subclass of <a href="qlistviewitem.html">QListViewItem</a>). -<p> <h3><a name="Collection">Collection classes</a></h3> -<p> <p> The <a href="collection.html#collection-classes">collection classes</a> include generic -classes such as QGDict, QGList, and -the subclasses such as <a href="qdict.html">QDict</a> and QList. -<p> <p> The macro-based Qt collection classes are obsolete; use the -template-based classes instead. Simply remove includes of qgeneric.h and -replace e.g. Q_DECLARE(<a href="qcache.html">QCache</a>,QPixmap) with QCache<QPixmap>. -<p> <p> The GCI global typedef is replaced by QCollection::Item. Only if you -make your own subclasses of the undocumented generic collection classes -will you have GCI in your code. -This change has been made to avoid collisions with other namespaces. -<p> <p> The GCF global typedef is removed (it was not used in Qt). -<p> <h3><a name="DebugVsRelease">Debug vs. Release</a></h3> -<p> <p>The Q_ASSERT macro is now a null expression if the QT_CHECK_STATE flag -is not set (i.e. if the QT_NO_CHECK flag is defined). -<p> <p>The debug() function now outputs nothing if Qt was compiled with -the QT_NO_DEBUG macro defined. -<p> <h3><a name="QString">QString</a></h3> -<p> <a href="qstring.html">QString</a> has undergone major changes internally, and although it is highly -backward compatible, it is worth studying in detail when porting to Qt 2.x. -The Qt 1.x QString class has been renamed to <a href="qcstring.html">QCString</a> in Qt 2.x, though if -you use that you will incur a performance penalty since all Qt functions -that took const char* now take const QString&. -<p> <p> -To take full advantage of the new <a href="i18n.html#internationalization">Internationalization</a> -functionality in Qt 2.x, the following steps are required: -<p> <ul> -<li> Start converting all uses of "const char*" in parameters to -"const QString&" - this can often be done mechanically, eg. -using Perl. Convert usage of char[] for temporary string -building to QString (much software already uses QString for -this purpose as it offers many more facilities). -<p> If you find that you are mixing usage of QCString, QString, -and <a href="qbytearray.html">QByteArray</a>, this causes lots of unnecessary copying and -might indicate that the true nature of the data you are -dealing with is uncertain. If the data is NUL-terminated -8-bit data, use QCString; if it is unterminated (ie. -contains NULs) 8-bit data, use QByteArray; if it is text, -use <a href="qstring.html">QString</a>. -</p> -<li> Put a breakpoint in <pre> QString::latin1()</pre> - -to catch places where -Unicode information is being converted to ASCII (loosing -information if your user in not using Latin1). Qt has -a small number of calls to this - ignore those. As a stricter -alternative, compile your code with QT_NO_ASCII_CAST defined, -which hides the automatic conversion of QString to const char*, -so you can catch problems at compile time. -</p> -<li> See the Qt <a href="i18n.html">Internationalization page</a> -for information about the full process of internationalizing -your software. -</ul> -<p> <p> -Points to note about the new QString are: -<p> <dl compact> -<dt><b>Unicode</b></dt> -<dd> -Qt now uses Unicode throughout. -data() now returns a <em>const</em> reference to an ASCII version -of the string - you cannot directly access the -string as an array of bytes, because it isn't one. Often, latin1() is -what you want rather than data(), or just leave it to convert to -const char* automatically. data() is only used now to aide porting to Qt 2.x, -and ideally you'll only need latin1() or implicit conversion when interfacing -to facilities that do not have Unicode support. -<p> <dt><b>Automatic-expanding</b></dt> -<dd> -A big advantage of the new <a href="qstring.html">QString</a> is that it automatically expands -when you write to an indexed position. -<p> <dt><b>QChar and <a href="qcharref.html">QCharRef</a></b></dt> -<dd> -<a href="qchar.html">QChar</a> are the Unicode characters that make up a QString. A QCharRef is -a temporary reference to a QChar in a QString that when assigned to -ensures that the <a href="shclass.html#implicit-sharing">implicit sharing</a> semantics of the QString are maintained. -You are unlikely to use QCharRef in your own code - but so that you -understand compiler error messages, just know that <tt>mystring[123]</tt> -is a QCharRef whenever <tt>mystring</tt> is not a constant string. A QCharRef -has basically the same functionality as a QChar, except it is more restricted -in what you can assign to it and cast it to (to avoid programming errors). -<p> <dt><b>Use QString</b></dt> -<dd> -Try to always use QString. If you <em>must</em>, use <a href="qcstring.html">QCString</a> which is the -old implementation from Qt 1.x. -<p> <dt><b>Unicode vs. ASCII</b></dt> -<dd> -Every conversion to and from ASCII is wasted time, so try to use <a href="qstring.html">QString</a> -as much as possible rather than const char*. This also ensures you have -full 16-bit support. -<p> <dt><b>Convertion to ASCII</b></dt> -<dd> -The return value from operator const char*() is transient - don't expect -it to remain valid while you make deep function calls. -It is valid for as long as you don't modify or destroy the QString. -<p> <dt><b>QString is simpler</b></dt> -<dd> -Expect your code to become simpler with the new QString, especially -places where you have used a char* to wander over the string rather -than using indexes into the string. -<p> <dt><b>Some hacks don't work</b></dt> -<dd> -This hack: -use_sub_string( &my_string[index] ) -should be replaced by: -use_sub_string( my_string.mid(index) ) -<p> <dt><b>QString(const char*, int) is removed</b></dt> -<dd> -The QString constructor taking a const char* and an integer is removed. -Use of this constructor was error-prone, since the length included the -'\0' terminator. Use <a href="qstring.html#left">QString::left</a>(int) or <a href="qstring.html#fromLatin1">QString::fromLatin1</a>( const char*, -int ) -- in both cases the int parameter signifies the number of characters. -<p> <dt><b>QString(int) is private</b></dt> -<dd> -The <a href="qstring.html">QString</a> constructor taking an integer is now private. This function -is not meaningful anymore, since QString does all space allocation -automatically. 99% of cases can simple be changed to use the -default constructor, QString(). -<p> -In Qt 1.x the constructor was used in two ways: accidentally, -by attempting to convert a char to a QString (the char converts to int!) - -giving strange bugs, and as a way to make a QString big enough prior to -calling <pre> QString::sprintf()</pre> - . In Qt 2.x, the accidental bug case is -prevented (you will get a compilation error) and QString::sprintf has -been made safe - you no longer need to pre-allocate space (though for -other reasons, sprintf is still a poor choice - eg. it doesn't pass Unicode). -The only remaining common case is conversion of 0 (NULL) to QString, which -would usually give expected results in Qt 1.x. For Qt 2.x the correct -syntax is to use <a href="qstring.html#QString-null">QString::null</a>, though note that -the default constructor, QString(), creates a null string too. -Assignment of 0 to a <a href="qstring.html">QString</a> is ambiguous - assign -QString::null; you'll mainly find these in code that has been converted -from const char* types to QString. -This also prevents a common error case from Qt 1.x - in -that version, mystr = 'X' would <em>not</em> produce the expected -results and was always a programming error; in Qt 2.x, it works - making -a single-character string. -<p> <p> -Also see <a href="#QStrList">QStrList</a>. -<p> <dt><b>Signals and Slots</b></dt> -<dd> -Many signal/slots have changed from const char* to QString. You will -get run-time errors when you try to <pre> QObject::connect()</pre> - -to the old -signals and slots, usually with a message indicating the const QString& -replacement signal/slot. -<p> <dt><b>Optimize with Q2HELPER</b></dt> -<dd> -In qt/src/tools/qstring.cpp there is a Q2HELPER - define it for some -extra debugging/optimizing features (don't leave it it - it kills performance). -You'll get an extra function, qt_qstring_stats(), which will print a -summary of how much your application is doing Unicode and ASCII -back-and-forth conversions. -<p> <dt><b>QString::detach() is obsolete and removed</b></dt> -<dd> -Since <a href="qstring.html">QString</a> is now always shared, this function does nothing. -Remove calls to QString::detach(). -<p> <dt><b>QString::resize(int size) is obsolete and removed</b></dt> -<dd> -Code using this to truncate a string should use -<a href="qstring.html#truncate">truncate(size-1)</a>. -Code using qstr.resize(0) should use qstr = QString::null. -Code calling resize(n) prior to using -<a href="qstring.html#operator[]">operator[]</a> up to n just remove -the resize(n) completely. -<p> <dt><b>QString::size() is obsolete and removed</b></dt> -<dd> -Calls to this function must be replaced by -<a href="qstring.html#length">length()</a>+1. -<p> <dt><b>QString::setStr(const char*) is removed</b></dt> -<dd>Try to understand why you were using this. -If you just meant assignment, use that. Otherwise, -you are probably using QString as an array of bytes, in which case use -<a href="qbytearray.html">QByteArray</a> or <a href="qcstring.html">QCString</a> instead. -<p> <dt><b>QString is not an array of bytes</b></dt> -<dd> -Code that uses <a href="qstring.html">QString</a> as an array of bytes should use QByteArray -or a char[], <em>then</em> convert that to a QString if needed. -<p> <dt><b>"string = 0"</b></dt> -<dd> -Assigning 0 to a QString should be assigning the null string, -ie. string = QString::null. -<p> <dt><b>System functions</b></dt> -<dd> -You may find yourself needing latin1() for passing to the operating system -or other libraries, and be tempted to use QCString to save the conversion, -but you are better off using Unicode throughout, then when the operating -system supports Unicode, you'll be prepared. Some Unix operating systems -are now beginning to have basic Unicode support, and Qt will be tracking -these improvements as they become more widespread. -<p> <dt><b>Bugs removed</b></dt> -<dd> -toShort() returns 0 (and sets *ok to false) on error. -toUInt() now works for big valid unsigned integers. -insert() now works into the same string. -<p> <dt><b>NULL pointers</b></dt> -<dd> -When converting "const char*" usage to QString in order to make your -application fully Unicode-aware, use QString::null for the null value -where you would have used 0 with char pointers. -<p> <dt><b>QString is not null terminated</b></dt> -<dd> -This means that inserting a 0-character -in the middle of the string does <em>not</em> change the length(). ie. -<pre> - <a href="qstring.html">QString</a> s = "fred"; - s[1] = '\0'; - // s.<a href="qstring.html#length">length</a>() == 4 - // s == "f\0ed" - // s.<a href="qstring.html#latin1">latin1</a>() == "f" - s[1] = 'r'; - // s == "fred" - // s.<a href="qstring.html#latin1">latin1</a>() == "fred" - </pre> - -Especially look out for this type of code: -<pre> - <a href="qstring.html">QString</a> s(2); - s[0] = '?'; - s[1] = 0; - </pre> - -This creates a string 2 characters long. -To find these problems while converting, you might like to -add <a href="qapplication.html#Q_ASSERT">Q_ASSERT</a>(strlen(d->ascii)==d->len) inside -<pre> QString::latin1()</pre> - . -<p> <dt><b>QString or Standard C++ string?</b></dt> -<dd> -<p> -The Standard C++ Library string is not Unicode. Nor is wstring defined -to be so (for the small number of platforms where it is defined at all). -This is the same mistake made over and over -in the history of C - only when non-8-bit characters are <em>the norm</em> -do programmers find them usable. Though it is possible to convert between -string and <a href="qstring.html">QString</a>, it is less efficient than using QString throughout. -For example, when using: -<pre> - QLabel::<a href="qlabel.html#setText">setText</a>( const <a href="qstring.html">QString</a>& ) -</pre> - -if you use string, like this: -<pre> - void myclass::dostuffwithtext( const string& str ) - { - mylabel.setText( QString(str.c_str()) ); - } -</pre> - -that will create a (ASCII only) copy of str, stored in mylabel. -But this: -<pre> - void myclass::dostuffwithtext( const <a href="qstring.html">QString</a>& str ) - { - mylabel.setText( str ); - } -</pre> - -will make an <a href="shclass.html#implicitly-shared">implicitly shared</a> reference to str in the <a href="qlabel.html">QLabel</a> - no copying -at all. This function might be 10 nested function calls away from something -like this: -<pre> - void toplevelclass::initializationstuff() - { - doStuff( tr("Okay") ); - } -</pre> - -At this point, in Qt 2.x, the tr() does a very fast dictionary lookup -through memory-mapped message files, returning some Unicode <a href="qstring.html">QString</a> for -the appropriate language (the default being to just make a QString out -of the text, of course - you're not <em>forced</em> to use any of these -features), and that <em>same</em> memory mapped Unicode will be passed -though the system. All occurrences of the translation of "Okay" can -potentially be shared. -<p> </dl> -<p> <h3><a name="QApplication">QApplication</a></h3> -<p> In the function <pre> QApplication::setColorSpec()</pre> - , -PrivateColor and TrueColor are obsolete. Use ManyColor instead. -<p> <h3><a name="QColor">QColor</a></h3> -<p> <p> -All colors -(color0, -color1, -black, -white, -darkGray, -gray, -lightGray, -red, -green, -blue, -cyan, -magenta, -yellow, -darkRed, -darkGreen, -darkBlue, -darkCyan, -darkMagenta, -and -darkYellow) -are in the Qt namespace. -In members of classes that inherit the Qt namespace-class (eg. <a href="qwidget.html">QWidget</a> -subclasses), you can use the unqualified names as before, but in global -functions (eg. main()), you need to qualify them: Qt::red, Qt::white, etc. -See also the <a href="#QRgb">QRgb</a> section below. -<p> <h3><a name="QRgb">QRgb</a></h3> -<p> In QRgb (a typedef of long), the order of the RGB channels has changed to -be in the more efficient order (for typical contemporary hardware). If your -code made assumptions about the order, you will get blue where you expect -red and vice versa (you'll not notice the problem if you use shades of -gray, green, or magenta). You should port your code to use the -creator function <a href="qcolor.html#qRgb">qRgb</a>(int r,int g,int b) and the -access functions <a href="qcolor.html#qRed">qRed</a>(QRgb), <a href="qcolor.html#qBlue">qBlue</a>(QRgb), and <a href="qcolor.html#qGreen">qGreen</a>(QRgb). -If you are using the alpha channel, it hasn't moved, but you should use -the functions <a href="qcolor.html#qRgba">qRgba</a>(int,int,int,int) and <a href="qcolor.html#qAlpha">qAlpha</a>(QRgb). Note also that -<a href="qcolor.html#pixel">QColor::pixel</a>() does <i>not</i> return a QRgb (it never did on all platforms, -but your code may have assumed so on your platform) - this may also produce -strange color results - use <a href="qcolor.html#rgb">QColor::rgb</a>() if you want a QRgb. -<p> <h3><a name="QDataStream">QDataStream</a></h3> -<p> <p>The QDatastream serialization format of most Qt classes is changed -in Qt 2.x. Use <pre> QDataStream::setVersion( 1 )</pre> - to get a -datastream object that can read and write Qt 1.x format data streams. -<p> <p>If you want to write Qt 1.x format datastreams, note the following -compatibility issues: -<ul> -<li>QString: Qt 1.x has no Unicode support, so strings will be -serialized by writing the classic C string returned by <pre> - QString::<a href="qstring.html#latin1">latin1</a>().</pre> - -<li><a href="#QPoint">QPoint & al.</a>: Coordinates will be -truncated to the Qt 1.x 16 bit format. -</ul> -<p> <h3><a name="QWidget">QWidget</a></h3> -<p> <h4>QWidget::recreate()</h4> -<p> -This function is now called <a href="qwidget.html#reparent">reparent()</a>. -<p> <h4>QWidget::setAcceptFocus(bool)</h4> -<p> -This function is removed. -Calls like QWidget::setAcceptFocus(TRUE) should be replaced by -<pre> QWidget::setFocusPolicy(StrongFocus)</pre> - , and -calls like QWidget::setAcceptFocus(FALSE) should be replaced by -<pre> QWidget::setFocusPolicy(NoFocus)</pre> - . -Additional policies are TabFocus and ClickFocus. -<p> <h4>QWidget::paintEvent()</h4> -<p> -paintEvent(0) is not permitted - subclasses need not check for -a null event, and might crash. -Never pass 0 as the argument to paintEvent(). You probably -just want repaint() or update() instead. -<p> -When processing a paintEvent, painting is only permitted within -the update region specified in the event. Any painting outside will be -clipped away. This shouldn't break any code (it was always like this -on MS-Windows) but makes many explicit calls to -<a href="qpainter.html#setClipRegion">QPainter::setClipRegion</a>() superfluous. Apart from the improved -consistency, the change is likely to reduce flicker and to make Qt -event slightly faster. -<p> <h3><a name="QIODevice">QIODevice</a></h3> -<p> -The protected member QIODevice::index is renamed to QIODevice::ioIndex -to avoid warnings and to allow compilation with bad C libraries that -#define index to strchr. If you have made a subclass of <a href="qiodevice.html">QIODevice</a>, -check every occurrence of the string "index" in the implementation, since -a compiler will not always catch cases like <pre>(uint)index</pre> - -that need to be changed. -<p> <h3><a name="QLabel">QLabel</a></h3> -<p> <h4><pre> QLabel::setMargin()</pre> - </h4> -<p> -<pre> QLabel::setMargin()</pre> - and<pre> QLabel::margin()</pre> - -have been renamed to <pre> QLabel::setIndent()</pre> - and -<pre> QLabel::indent()</pre> - , respectively. This was done to avoid -collision with <a href="qframe.html#setMargin">QFrame::setMargin</a>(), which is now virtual. -<p> <h4><pre> QLabel::setMovie()</pre> - </h4> -<p> -Previously, setting a movie on a label cleared the value of text(). -Now it doesn't. If you somehow used <tt>QLabel::text()</tt> -to detect if a -movie was set, you might have trouble. This is unlikely. -<p> <h3><a name="QDialog">QDialog</a></h3> -<p> <p> The semantics of the parent pointer changed for modeless dialogs: -In Qt-2.x, dialogs are always top level windows. The parent, however, -takes the ownership of the dialog, i.e. it will delete the dialog at -destruction if it has not been explicitly deleted -already. Furthermore, the window system will be able to tell that both -the dialog and the parent belong together. Some X11 window managers -will for instance provide a common taskbar entry in that case. -<p> <p> -If the dialog belongs to a top level main window -of your application, pass this main window as parent to the dialog's -constructor. Old code (with 0 pointer) will still run. Old code that -included QDialogs as child widgets will no longer work (it never really did). -If you think you might be doing this, put a breakpoint in -<a href="qdialog.html#QDialog">QDialog::QDialog</a>() conditional on parent not being 0. -<p> <h3><a name="QStrList">QStrList</a></h3> -<p> Many methods that took a <a href="qstrlist.html">QStrList</a> can now instead take a <a href="qstringlist.html">QStringList</a>, -which is a real list of <a href="qstring.html">QString</a> values. -<p> To use QStringList rather than QStrList, change loops that look like this: -<pre> - <a href="qstrlist.html">QStrList</a> list = ...; - const char* s; - for ( s = list.<a href="qptrlist.html#first">first</a>(); s; s = list.<a href="qptrlist.html#next">next</a>() ) { - process(s); - } -</pre> - -to be like this: -<pre> - <a href="qstringlist.html">QStringList</a> list = ...; - QStringList::ConstIterator i; - for ( i = list.<a href="qvaluelist.html#begin">begin</a>(); i != list.<a href="qvaluelist.html#end">end</a>(); ++i ) { - process(*i); - } -</pre> - -<p> In general, the QStrList functions are less efficient, building a temporary QStringList. -<p> The following functions now use QStringList rather than QStrList -for return types/parameters. -<p> <ul> -<li><tt>void <a href="qfiledialog.html#setFilters">QFileDialog::setFilters</a>(const <a href="qstrlist.html">QStrList</a>&)</tt> -becomes <tt>void QFileDialog::setFilters(const <a href="qstringlist.html">QStringList</a>&)</tt> -<li><tt>QStrList <a href="qfiledialog.html#getOpenFileNames">QFileDialog::getOpenFileNames</a>(...)</tt> -becomes <tt>QStringList QFileDialog::getOpenFileNames(...)</tt> -<li><tt>bool QUrlDrag::decodeLocalFiles(<a href="qmimesource.html">QMimeSource</a>*, QStrList&)</tt> -becomes <tt>bool <a href="quridrag.html#decodeLocalFiles">QUriDrag::decodeLocalFiles</a>(QMimeSource*, QStringList&)</tt> -<li><tt>const QStrList *QDir::entryList(...) const</tt> -becomes <tt>QStringList <a href="qdir.html#entryList">QDir::entryList</a>(...) const</tt> -(note that the return type is no longer a pointer). You may also -choose to use encodedEntryList(). -</ul> -<p> The following functions are added: -<ul> -<li><tt>QComboBox::insertStringList(const QStringList &, int index=-1)</tt> -<li><tt>QListBox::insertStringList(const QStringList &,int index=-1)</tt> -</ul> -<p> The rarely used static function <tt>void -QFont::listSubstitutions(<a href="qstrlist.html">QStrList</a>*)</tt> is replaced by <tt>QStringList -<a href="qfont.html#substitutions">QFont::substitutions</a>()</tt>. -<p> <h3><a name="QLayout">QLayout</a></h3> -<p> <p> Calling resize(0,0) or resize(1,1) will no longer work magically. -Remove all such calls. The default size of top level widgets will be their -<a href="qwidget.html#sizeHint">sizeHint()</a>. -<p> <p> The default implementation of <a href="qwidget.html#sizeHint">QWidget::sizeHint</a>() will no longer -return just an invalid size; if the widget has a layout, it will return -the layout's preferred size. -<p> <p> The special maximum MaximumHeight/Width is now QWIDGETSIZE_MAX, -not QCOORD_MAX. -<p> <p> <a href="qboxlayout.html#addWidget">QBoxLayout::addWidget()</a> -now interprets the <em>alignment</em> parameter more aggressively. A -non-default alignment now indicates that the widget should not grow to -fill the available space, but should be sized according to sizeHint(). -If a widget is too small, set the alignment to 0. (Zero indicates no -alignment, and is the default.) -<p> <p> The class QGManager is removed. Subclasses of <a href="qlayout.html">QLayout</a> need to be rewritten -to use the new, much simpler <a href="qlayout.html">QLayout API</a>. -<p> <p> For typical layouts, all use of -<a href="qwidget.html#setMinimumSize">setMinimumSize()</a> -and -<a href="qwidget.html#setFixedSize">setFixedSize()</a> -can be removed. -<a href="qlayout.html#activate">activate()</a> is no longer necessary. -<p> <p> -You might like to look at the <a href="qgrid.html">QGrid</a>, <a href="qvbox.html">QVBox</a>, and <a href="qhbox.html">QHBox</a> widgets - they offer -a simple way to build nested widget structures. -<p> <h3><a name="QListView">QListView</a></h3> -<p> <p>In Qt 1.x mouse events to the viewport where redirected to the -event handlers for the listview; in Qt 2.x, this functionality is -in <a href="qscrollview.html">QScrollView</a> where mouse (and other position-oriented) events are -redirected to viewportMousePressEvent() etc, which in turn translate -the event to the coordinate system of the contents and call -contentsMousePressEvent() etc, thus providing events in the most -convenient coordinate system. If you overrode QListView::MouseButtonPress(), -<a href="qwidget.html#mouseDoubleClickEvent">QListView::mouseDoubleClickEvent</a>(), <a href="qwidget.html#mouseMoveEvent">QListView::mouseMoveEvent</a>(), or -<a href="qwidget.html#mouseReleaseEvent">QListView::mouseReleaseEvent</a>() you must instead override -viewportMousePressEvent(), -viewportMouseDoubleClickEvent(), viewportMouseMoveEvent(), or -viewportMouseReleaseEvent() respectively. New code will usually override -contentsMousePressEvent() etc. -<p> <p>The signal <a href="qlistview.html#selectionChanged">QListView::selectionChanged</a>(<a href="qlistviewitem.html">QListViewItem</a> *) can now be -emitted with a null pointer as parameter. Programs that use the -argument without checking for 0, may crash. -<p> <h3><a name="QMultiLineEdit">QMultiLineEdit</a></h3> -<p> <p> -The protected function -<pre> QMultiLineEdit::textWidth(QString*)</pre> - -changed to -<pre> QMultiLineEdit::textWidth(const <a href="qstring.html">QString</a>&)</pre> - . -This is unlikely to be a problem, and you'll get a compile error -if you called it. -<p> <h3><a name="QClipboard">QClipboard</a></h3> -<p> <p> -<pre> QClipboard::pixmap()</pre> - now returns a <a href="qpixmap.html">QPixmap</a>, not a QPixmap*. -The pixmap -will be <a href="qpixmap.html#isNull">null</a> if no pixmap is on the -clipboard. <a href="qclipboard.html">QClipboard</a> now offers powerful MIME-based types on the -clipboard, just like drag-and-drop (in fact, you can reuse most of your -drag-and-drop code with clipboard operations). -<p> <h3><a name="QDropSite">QDropSite</a></h3> -<p> <P> -QDropSite is obsolete. If you simply passed <tt>this</tt>, just remove -the inheritance of QDropSite and call -<a href="qwidget.html#setAcceptDrops">setAcceptDrops(TRUE)</a> in the class -constructor. -If you passed something other than <tt>this</tt>, -your code will not work. A common case is passing -the -<a href="qscrollview.html#viewport">viewport()</a> of a <a href="qlistview.html">QListView</a>, -in which case, -override the -<a href="qscrollview.html#contentsDragMoveEvent">contentsDragMoveEvent()</a>, -etc. -functions rather than QListView's dragMoveEvent() etc. For other -cases, you will need to use an event filter to act on the drag/drop events -of another widget (as is the usual way to intercept foreign events). -<p> <h3><a name="QScrollView">QScrollView</a></h3> -<p> The parameters in the signal -<a href="qscrollview.html#contentsMoving">contentsMoving(int,int)</a> -are now positive rather than negative values, coinciding with -<a href="qscrollview.html#setContentsPos">setContentsPos()</a>. Search for -connections you make to this signal, and either change the slot they are -connected to such that it also expects positive rather than negative -values, or introduce an intermediate slot and signal that negates them. -<p> If you used drag and drop with <a href="qscrollview.html">QScrollView</a>, you may experience the problem -described for <a href="#QDropSite">QDropSite</a>. -<p> <h3><a name="QTextStream">QTextStream</a></h3> -<p> <p> -<pre> operator<<(QTextStream&, QChar&)</pre> - does not skip whitespace. -<pre> operator<<(QTextStream&, char&)</pre> - does, -as was the case with Qt 1.x. This is for backward compatibility. -<p> <h3><a name="QUriDrag">QUriDrag</a></h3> -<p> The class QUrlDrag is renamed to <a href="quridrag.html">QUriDrag</a>, and the API has been -broadened to include additional conversion routines, including -conversions to Unicode filenames (see the class documentation -for details). Note that in Qt 1.x -the QUrlDrag class used the non-standard MIME type "url/url", -while QUriDrag uses the standardized "text/uri-list" type. Other -identifiers affected by the Url to Uri change are -QUrlDrag::setUrls() and QUrlDrag::urlToLocalFile(). -<p> <h3><a name="QPainter">QPainter</a></h3> -<p> <p> The GrayText painter flag has been removed. Use -<a href="qpainter.html#setPen">setPen( palette().disabled().foreground() )</a> -instead. -<p> <p> The RasterOp enum -(CopyROP, -OrROP, -XorROP, -NotAndROP, -EraseROP, -NotCopyROP, -NotOrROP, -NotXorROP, -AndROP, NotEraseROP, -NotROP, -ClearROP, -SetROP, -NopROP, -AndNotROP, -OrNotROP, -NandROP, -NorROP, LastROP) -is now part of the Qt namespace class, so if you -use it outside a member function, you'll need to prefix with Qt::. -<p> <h3><a name="QPicture">QPicture</a></h3> -<p> <p>The binary storage format of <a href="qpicture.html">QPicture</a> is changed, but the Qt 2.x -QPicture class can both read and write Qt 1.x format QPictures. No -special handling is required for reading; QPicture will automatically -detect the version number. In order to write a Qt 1.x format QPicture, -set the formatVersion parameter to 1 in the QPicture constructor. -<p> <p>For writing Qt 1.x format QPictures, the compatibility issues of <a -href="#QDataStream">QDataStream</a> applies. -<p> <p>It is safe to try to read a QPicture file generated with Qt 2.x -(without formatVersion set to 1) with a program compiled with Qt -1.x. The program will not crash, it will just issue the warning -"QPicture::play: Incompatible version 2.x" and refuse to load the -picture. -<p> <h3><a name="QPoint">QPoint, <a href="qpointarray.html">QPointArray</a>, <a href="qsize.html">QSize</a> and <a href="qrect.html">QRect</a></a></h3> -<p> <p>The basic coordinate datatype in these classes, QCOORD, is now 32 -bit (int) instead of a 16 bit (short). The const values QCOORD_MIN and -QCOORD_MAX have changed accordingly. -<p> <p>QPointArray is now actually, not only seemingly, a QArray of <a href="qpoint.html">QPoint</a> -objects. The semi-internal workaround classes QPointData and QPointVal -are removed since they are no longer needed; QPoint is used directly -instead. The function <pre> QPointArray::shortPoints()</pre> - -provides the point array converted to short (16bit) coordinates for -use with external functions that demand that format. -<p> <h3><a name="QImage">QImage</a></h3> -<p> <a href="qimage.html">QImage</a> uses QRgb for the colors - see <a href="#QRgb">the changes to that</a>. -<p> <h3><a name="QPixmap">QPixmap</a></h3> -<p> <pre> QPixmap::convertToImage()</pre> - with bitmaps now guarantees that color0 pixels -become color(0) in the resulting QImage. If you worked around the lack of -this, you may be able to simplify your code. If you made assumptions -about the previous undefined behavior, the symptom will be inverted -bitmaps (eg. "inside-out" masks). -<p> <p> -<pre> QPixmap::optimize(TRUE)</pre> - -is replaced by -<pre> QPixmap::setOptimization(QPixmap::NormalOptim)</pre> - -or -<pre> QPixmap::setOptimization(QPixmap::BestOptim)</pre> - -- see the documentation -to choose which is best for your application. NormalOptim is most like -the Qt 1.x "TRUE" optimization. -<p> <h3><a name="QMenuData">QMenuData / <a href="qpopupmenu.html">QPopupMenu</a></a></h3> -<p> In Qt 1.x, new menu items were assigned either an application-wide -unique identifier or an identifier equal to the index of the item, depending on the -<a href="qmenudata.html#insertItem">insertItem(...)</a> function used. -In Qt 2.x this confusing -situation has been cleaned up: generated identifiers are always -unique across the entire application. -<p> If your code depends on generated ids -being equal to the item's index, a quick fix is to use -<pre> QMenuData::indexOf(int id)</pre> - -in the handling function instead. You may alternatively pass -<pre> QMenuData::count()</pre> - -as identifier when you insert the items. -<p> Furthermore, QPopupMenus can (and should!) be created with a parent -widget now, for example the main window that is used to display the -popup. This way, the popup will automatically be destroyed together -with its main window. Otherwise you'll have to take care of the -ownership manually. -<p> QPopupMenus are also reusable in 2.x. They may occur in different -locations within one menu structure or be used as both a menubar -drop-down and as a context popup-menu. This should make it possible to -significantly simplify many applications. -<p> Last but not least, <a href="qpopupmenu.html">QPopupMenu</a> no longer inherits QTableView. Instead, -it directly inherits <a href="qframe.html">QFrame</a>. -<p> <h3><a name="QValidator">QValidator (<a href="qlineedit.html">QLineEdit</a>, <a href="qcombobox.html">QComboBox</a>, <a href="qspinbox.html">QSpinBox</a>) </a></h3> -<p> <pre> QValidator::validate(...)</pre> - -and -<pre> QValidator::fixup( <a href="qstring.html">QString</a> & )</pre> - -are now const -functions. If your subclass reimplements validate() as a -non-const function, -you will get a compile error (validate was pure virtual). -<p> In QLineEdit, QComboBox, and QSpinBox, -setValidator(...) now takes a const pointer to a <a href="qvalidator.html">QValidator</a>, and -validator() returns a const pointer. This change highlights the fact -that the widgets do not take the ownership of the validator (a validator is -a <a href="qobject.html">QObject</a> on its own, with its own parent - you can easily set the same validator -object on many different widgets), so changing the state of -such an object or deleting it is very likely a bug. -<p> <h3><a name="QFile">QFile, <a href="qfileinfo.html">QFileInfo</a>, <a href="qdir.html">QDir</a></a></h3> -<p> File and directory names are now always Unicode strings (ie. <a href="qstring.html">QString</a>). If you used QString -in the past for the simplicity it offers, you'll probably have little consequence. However, -if you pass filenames to system functions rather than using Qt functions (eg. if you use the -Unix <tt>unlink()</tt> function rather than <tt>QFile::remove()</tt>, your code will probably -only work for Latin1 locales (eg. Western Europe, the U.S.). To ensure your code will support -filenames in other locales, either use the Qt functions, or convert the filenames via -<pre> QFile::encodeFilename()</pre> - and <pre> QFile::decodeFilename()</pre> - - but do it -<em>just</em> as you call the system function - code that mixes encoded and unencoded filenames -is very error prone. See the comments in QString, such as regarding QT_NO_ASCII_CAST that -can help find potential problems. -<p> <h3><a name="QFontMetrics">QFontMetrics</a></h3> -<p> boundingRect(char) is replaced by -boundingRect(<a href="qchar.html">QChar</a>), but since -char auto-converts to QChar, you're not likely to run into problems -with this. -<p> <h3><a name="QWindow">QWindow</a></h3> -<p> This class (which was just <a href="qwidget.html">QWidget</a> under a different name) has been -removed. If you used it, do a global search-and-replace of the word -"QWindow" with "QWidget". -<p> <h3><a name="QEvent">QEvent</a></h3> -<p> <p> The global #define macros in qevent.h have been replaced by an -enum in <a href="qevent.html">QEvent</a>. Use e.g. QEvent::Paint instead of Event_Paint. Same -for all of: -Event_None, -Event_Timer, -Event_MouseButtonPress, -Event_MouseButtonRelease, -Event_MouseButtonDblClick, -Event_MouseMove, -Event_KeyPress, -Event_KeyRelease, -Event_FocusIn, -Event_FocusOut, -Event_Enter, -Event_Leave, -Event_Paint, -Event_Move, -Event_Resize, -Event_Create, -Event_Destroy, -Event_Show, -Event_Hide, -Event_Close, -Event_Quit, -Event_Accel, -Event_Clipboard, -Event_SockAct, -Event_DragEnter, -Event_DragMove, -Event_DragLeave, -Event_Drop, -Event_DragResponse, -Event_ChildInserted, -Event_ChildRemoved, -Event_LayoutHint, -Event_ActivateControl, -Event_DeactivateControl, -and -Event_User. -<p> <p> The Q_*_EVENT macros in qevent.h have been deleted. Use an -explicit cast instead. The macros were: -Q_TIMER_EVENT, -Q_MOUSE_EVENT, -Q_KEY_EVENT, -Q_FOCUS_EVENT, -Q_PAINT_EVENT, -Q_MOVE_EVENT, -Q_RESIZE_EVENT, -Q_CLOSE_EVENT, -Q_SHOW_EVENT, -Q_HIDE_EVENT, -and -Q_CUSTOM_EVENT. -<p> <p> QChildEvents are now sent for all QObjects, not just QWidgets. -You may need to add extra checking if you use a <a href="qchildevent.html">QChildEvent</a> without -much testing of its values. -<p> <h3>All the removed functions</h3> -<p> All <a href="removed20.html">these functions</a> have been removed in -Qt 2.x. Most are simply cases where "const char*" has changed to -"const <a href="qstring.html">QString</a>&", or when an enumeration type has moved into the Qt:: -namespace (which, technically, is a new name, but your code will -compile just the same anyway). This list is provided for completeness. -<p> -<!-- eof --> -<p><address><hr><div align=center> -<table width=100% cellspacing=0 border=0><tr> -<td>Copyright © 2007 -<a href="troll.html">Trolltech</a><td align=center><a href="trademarks.html">Trademarks</a> -<td align=right><div align=right>Qt 3.3.8</div> -</table></div></address></body> -</html> diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf index 0882ceb..27a00d4 100644 --- a/doc/html/qt.dcf +++ b/doc/html/qt.dcf @@ -9858,9 +9858,6 @@ <section ref="datastreamformat.html" title="Format of the QDataStream Operators"> <keyword ref="datastreamformat.html">Format of the QDataStream Operators</keyword> </section> -<section ref="removed20.html" title="Functions removed in Qt 2.0"> - <keyword ref="removed20.html">Functions removed in Qt 2.0</keyword> -</section> <section ref="motif-walkthrough-1.html" title="Getting Started"> <keyword ref="motif-walkthrough-1.html">Getting Started</keyword> </section> @@ -10077,9 +10074,6 @@ <section ref="popup-example.html" title="Popup Widgets"> <keyword ref="popup-example.html">Popup Widgets</keyword> </section> -<section ref="porting2.html" title="Porting to Qt 2.x"> - <keyword ref="porting2.html">Porting to Qt 2.x</keyword> -</section> <section ref="porting.html" title="Porting to Qt 3.x"> <keyword ref="porting.html">Porting to Qt 3.x</keyword> </section> diff --git a/doc/html/removed20.html b/doc/html/removed20.html deleted file mode 100644 index 1649f02..0000000 --- a/doc/html/removed20.html +++ /dev/null @@ -1,379 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/doc/porting2.doc:1096 --> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Functions removed in Qt 2.0</title> -<style type="text/css"><!-- -fn { margin-left: 1cm; text-indent: -1cm; } -a:link { color: #004faf; text-decoration: none } -a:visited { color: #672967; text-decoration: none } -body { background: #ffffff; color: black; } ---></style> -</head> -<body> - -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr bgcolor="#E5E5E5"> -<td valign=center> - <a href="index.html"> -<font color="#004faf">Home</font></a> - | <a href="classes.html"> -<font color="#004faf">All Classes</font></a> - | <a href="mainclasses.html"> -<font color="#004faf">Main Classes</font></a> - | <a href="annotated.html"> -<font color="#004faf">Annotated</font></a> - | <a href="groups.html"> -<font color="#004faf">Grouped Classes</font></a> - | <a href="functions.html"> -<font color="#004faf">Functions</font></a> -</td> -<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>Functions removed in Qt 2.0</h1> - - -<p> <pre> - -<a href="qfiledialog.html#fileHighlighted">QFileDialog::fileHighlighted</a>(const char *) -<a href="qfiledialog.html#fileSelected">QFileDialog::fileSelected</a>(const char *) -<a href="qfiledialog.html#dirEntered">QFileDialog::dirEntered</a>(const char *) -QFileDialog::updatePathBox(const char *) -<a href="qobject.html#name">QObject::name</a>(void) const -<a href="qfiledialog.html#getOpenFileName">QFileDialog::getOpenFileName</a>(const char *, const char *, <a href="qwidget.html">QWidget</a> *, const char *) -<a href="qfiledialog.html#getSaveFileName">QFileDialog::getSaveFileName</a>(const char *, const char *, QWidget *, const char *) -<a href="qfiledialog.html#getExistingDirectory">QFileDialog::getExistingDirectory</a>(const char *, QWidget *, const char *) -<a href="qfiledialog.html#getOpenFileNames">QFileDialog::getOpenFileNames</a>(const char *, const char *, QWidget *, const char *) -<a href="qfiledialog.html#setSelection">QFileDialog::setSelection</a>(const char *) -<a href="qfiledialog.html#setDir">QFileDialog::setDir</a>(const char *) -<a href="qmessagebox.html#setText">QMessageBox::setText</a>(const char *) -<a href="qmessagebox.html#setButtonText">QMessageBox::setButtonText</a>(const char *) -QMessageBox::setButtonText(int, const char *) -<a href="qwidget.html#setStyle">QMessageBox::setStyle</a>(GUIStyle) -<a href="qmessagebox.html#standardIcon">QMessageBox::standardIcon</a>(QMessageBox::Icon, GUIStyle) -<a href="qmessagebox.html#information">QMessageBox::information</a>(<a href="qwidget.html">QWidget</a> *, const char *, const char *, const char *, const char *, const char *, int, int) -QMessageBox::information(QWidget *, const char *, const char *, int, int, int) -<a href="qmessagebox.html#warning">QMessageBox::warning</a>(QWidget *, const char *, const char *, const char *, const char *, const char *, int, int) -QMessageBox::warning(QWidget *, const char *, const char *, int, int, int) -<a href="qmessagebox.html#critical">QMessageBox::critical</a>(QWidget *, const char *, const char *, const char *, const char *, const char *, int, int) -QMessageBox::critical(QWidget *, const char *, const char *, int, int, int) -<a href="qmessagebox.html#about">QMessageBox::about</a>(QWidget *, const char *, const char *) -<a href="qmessagebox.html#aboutQt">QMessageBox::aboutQt</a>(QWidget *, const char *) -<a href="qmessagebox.html#message">QMessageBox::message</a>(const char *, const char *, const char *, QWidget *, const char *) -<a href="qmessagebox.html#buttonText">QMessageBox::buttonText</a>(void) const -<a href="qmessagebox.html#query">QMessageBox::query</a>(const char *, const char *, const char *, const char *, <a href="qwidget.html">QWidget</a> *, const char *) -<a href="qprogressdialog.html#setLabelText">QProgressDialog::setLabelText</a>(const char *) -<a href="qprogressdialog.html#setCancelButtonText">QProgressDialog::setCancelButtonText</a>(const char *) -<a href="qwidget.html#styleChange">QProgressDialog::styleChange</a>(GUIStyle) -QProgressDialog::init(QWidget *, const char *, const char *, int) -<a href="qtabdialog.html#addTab">QTabDialog::addTab</a>(QWidget *, const char *) -<a href="qtabdialog.html#isTabEnabled">QTabDialog::isTabEnabled</a>(const char *) const -<a href="qtabdialog.html#setTabEnabled">QTabDialog::setTabEnabled</a>(const char *, bool) -<a href="qtabdialog.html#setDefaultButton">QTabDialog::setDefaultButton</a>(const char *) -<a href="qtabdialog.html#setCancelButton">QTabDialog::setCancelButton</a>(const char *) -<a href="qtabdialog.html#setApplyButton">QTabDialog::setApplyButton</a>(const char *) -QTabDialog::setOKButton(const char *) -QTabDialog::setOkButton(const char *) -<a href="qwidget.html#styleChange">QTabDialog::styleChange</a>(GUIStyle) -<a href="qtabdialog.html#selected">QTabDialog::selected</a>(const char *) -<a href="qobject.html#name">QObject::name</a>(void) const -<a href="qapplication.html#setStyle">QApplication::setStyle</a>(GUIStyle) -<a href="qapplication.html#palette">QApplication::palette</a>(void) -<a href="qapplication.html#setPalette">QApplication::setPalette</a>(const <a href="qpalette.html">QPalette</a> &, bool) -<a href="qapplication.html#font">QApplication::font</a>(void) -<a href="qapplication.html#setFont">QApplication::setFont</a>(const <a href="qfont.html">QFont</a> &, bool) -<a href="qbrush.html#setStyle">QBrush::setStyle</a>(BrushStyle) -QBrush::init(const <a href="qcolor.html">QColor</a> &, BrushStyle) -QObject::name(void) const -<a href="qclipboard.html#data">QClipboard::data</a>(const char *) const -<a href="qclipboard.html#setData">QClipboard::setData</a>(const char *, void *) -<a href="qclipboard.html#setText">QClipboard::setText</a>(const char *) -QUrlDrag::decodeLocalFiles(<a href="qdropevent.html">QDropEvent</a> *, <a href="qstrlist.html">QStrList</a> &) -QObject::name(void) const -<a href="qstoreddrag.html#setEncodedData">QStoredDrag::setEncodedData</a>(QArrayT<char> const &) -<a href="qtextdrag.html#setText">QTextDrag::setText</a>(const char *) -<a href="qimagedrag.html#canDecode">QImageDrag::canDecode</a>(<a href="qdragmoveevent.html">QDragMoveEvent</a> *) -<a href="qtextdrag.html#canDecode">QTextDrag::canDecode</a>(QDragMoveEvent *) -QUrlDrag::canDecode(QDragMoveEvent *) -<a href="qimagedrag.html#decode">QImageDrag::decode</a>(QDropEvent *, <a href="qimage.html">QImage</a> &) -QImageDrag::decode(QDropEvent *, <a href="qpixmap.html">QPixmap</a> &) -<a href="qtextdrag.html#decode">QTextDrag::decode</a>(QDropEvent *, <a href="qstring.html">QString</a> &) -QUrlDrag::decode(QDropEvent *, QStrList &) -<a href="qdropevent.html#format">QDragMoveEvent::format</a>(int) -<a href="qdropevent.html#provides">QDragMoveEvent::provides</a>(const char *) -<a href="qdropevent.html#data">QDragMoveEvent::data</a>(const char *) -<a href="qdropevent.html#data">QDropEvent::data</a>(const char *) -QEvent::peErrMsg(void) -<a href="qfont.html#substitute">QFont::substitute</a>(const char *) -<a href="qfont.html#insertSubstitution">QFont::insertSubstitution</a>(const char *, const char *) -<a href="qfont.html#removeSubstitution">QFont::removeSubstitution</a>(const char *) -QFont::load(unsigned int) const -<a href="qfont.html#setFamily">QFont::setFamily</a>(const char *) -<a href="qfont.html#bold">QFont::bold</a>(void) const -<a href="qfont.html#setBold">QFont::setBold</a>(bool) -<a href="qfont.html#handle">QFont::handle</a>(unsigned int) const -QFont::bold(void) const -QFontInfo::font(void) const -QFontInfo::reset(const <a href="qwidget.html">QWidget</a> *) -QFontInfo::type(void) const -<a href="qfontmetrics.html#inFont">QFontMetrics::inFont</a>(char) const -<a href="qfontmetrics.html#leftBearing">QFontMetrics::leftBearing</a>(char) const -<a href="qfontmetrics.html#rightBearing">QFontMetrics::rightBearing</a>(char) const -<a href="qfontmetrics.html#width">QFontMetrics::width</a>(char) const -QFontMetrics::width(const char *, int) const -<a href="qfontmetrics.html#boundingRect">QFontMetrics::boundingRect</a>(char) const -QFontMetrics::boundingRect(const char *, int) const -QFontMetrics::boundingRect(int, int, int, int, int, const char *, int, int, int *, char **) const -<a href="qfontmetrics.html#size">QFontMetrics::size</a>(int, const char *, int, int, int *, char **) const -QFontMetrics::font(void) const -QFontMetrics::reset(const QWidget *) -QFontMetrics::type(void) const -<a href="qobject.html#name">QObject::name</a>(void) const -QGManager::setBorder(int) -QGManager::newSerChain(QGManager::Direction) -QGManager::newParChain(QGManager::Direction) -QGManager::add(QChain *, QChain *, int) -QGManager::addWidget(QChain *, <a href="qwidget.html">QWidget</a> *, int) -QGManager::addSpacing(QChain *, int, int, int) -QGManager::addBranch(QChain *, QChain *, int, int) -QGManager::setStretch(QChain *, int) -QGManager::activate(void) -QGManager::unFreeze(void) -QGManager::xChain(void) -QGManager::yChain(void) -QGManager::setMenuBar(QWidget *) -QGManager::mainWidget(void) -QGManager::remove(QWidget *) -QGManager::setName(QChain *, const char *) -QGManager::eventFilter(<a href="qobject.html">QObject</a> *, <a href="qevent.html">QEvent</a> *) -QGManager::resizeHandle(QWidget *, const <a href="qsize.html">QSize</a> &) -QGManager::resizeAll(void) -<a href="qiconset.html#setPixmap">QIconSet::setPixmap</a>(const char *, QIconSet::Size, QIconSet::Mode) -<a href="qimage.html#imageFormat">QImage::imageFormat</a>(const char *) -<a href="qimageio.html#imageFormat">QImageIO::imageFormat</a>(const char *) -<a href="qimage.html#load">QImage::load</a>(const char *, const char *) -<a href="qimage.html#loadFromData">QImage::loadFromData</a>(QArrayT<char>, const char *) -<a href="qimage.html#save">QImage::save</a>(const char *, const char *) const -<a href="qimageio.html#setFileName">QImageIO::setFileName</a>(const char *) -<a href="qimageio.html#setDescription">QImageIO::setDescription</a>(const char *) -QBoxLayout::addB(<a href="qlayout.html">QLayout</a> *, int) -<a href="qobject.html#name">QObject::name</a>(void) const -QLayout::basicManager(void) -QLayout::verChain(QLayout *) -QLayout::horChain(QLayout *) -QObject::name(void) const -<a href="qobject.html#tr">QObject::tr</a>(const char *) const -<a href="qpaintdevice.html#x11Screen">QPaintDevice::x11Screen</a>(voidQPaintDevice::x11Depth(voidQPaintDevice::x11Cells(voidQPaintDevice::x11Colormap(voidQPaintDevice::x11DefaultColormap(void) <a href="qpaintdevice.html#x11Visual">QPaintDevice::x11Visual</a>(voidQPaintDevice::x11DefaultVisual(void) -<a href="qpainter.html#translate">QPainter::translate</a>(float, float) -<a href="qpainter.html#scale">QPainter::scale</a>(float, float) -<a href="qpainter.html#shear">QPainter::shear</a>(float, float) -<a href="qpainter.html#rotate">QPainter::rotate</a>(float) -<a href="qpainter.html#drawText">QPainter::drawText</a>(const <a href="qpoint.html">QPoint</a> &, const char *, int) -QPainter::drawText(const <a href="qrect.html">QRect</a> &, int, const char *, int, QRect *, char **) -QPainter::drawText(int, int, const char *, int) -QPainter::drawText(int, int, int, int, int, const char *, int, QRect *, char **) -<a href="qpainter.html#boundingRect">QPainter::boundingRect</a>(int, int, int, int, int, const char *, int, char **) -QPainter::testf(unsigned short) const -QPainter::setf(unsigned short) -QPainter::setf(unsigned short, bool) -QPainter::clearf(unsigned short) -<a href="qpainter.html#setPen">QPainter::setPen</a>(PenStyle) -<a href="qpainter.html#setBrush">QPainter::setBrush</a>(BrushStyle) -<a href="qpainter.html#setBackgroundMode">QPainter::setBackgroundMode</a>(BGMode) -<a href="qpen.html#setStyle">QPen::setStyle</a>(PenStyle) -QPen::init(const <a href="qcolor.html">QColor</a> &, unsigned int, PenStyle) -<a href="qpicture.html#load">QPicture::load</a>(const char *) -<a href="qpicture.html#save">QPicture::save</a>(const char *) -QPixmap::isOptimized(void) const -QPixmap::optimize(bool) -QPixmap::isGloballyOptimized(void) -QPixmap::optimizeGlobally(bool) -<a href="qpixmap.html#imageFormat">QPixmap::imageFormat</a>(const char *) -<a href="qpixmap.html#load">QPixmap::load</a>(const char *, const char *, QPixmap::ColorMode) -QPixmap::load(const char *, const char *, int) -<a href="qpixmap.html#loadFromData">QPixmap::loadFromData</a>(QArrayT<char>, const char *, int) -<a href="qpixmap.html#save">QPixmap::save</a>(const char *, const char *) const -<a href="qpixmapcache.html#find">QPixmapCache::find</a>(const char *) -QPixmapCache::find(const char *, <a href="qpixmap.html">QPixmap</a> &) -<a href="qpixmapcache.html#insert">QPixmapCache::insert</a>(const char *, QPixmap *) -QPixmapCache::insert(const char *, const QPixmap &) -<a href="qprinter.html#setPrinterName">QPrinter::setPrinterName</a>(const char *) -<a href="qprinter.html#setOutputFileName">QPrinter::setOutputFileName</a>(const char *) -<a href="qprinter.html#setPrintProgram">QPrinter::setPrintProgram</a>(const char *) -<a href="qprinter.html#setDocName">QPrinter::setDocName</a>(const char *) -<a href="qprinter.html#setCreator">QPrinter::setCreator</a>(const char *) -<a href="qrect.html#setX">QRect::setX</a>(int) -<a href="qrect.html#setY">QRect::setY</a>(int) -QRegion::exec(QArrayT<char> const &) -<a href="qobject.html#name">QObject::name</a>(void) const -QObject::name(void) const -<a href="qsignalmapper.html#setMapping">QSignalMapper::setMapping</a>(const <a href="qobject.html">QObject</a> *, const char *) -<a href="qsignalmapper.html#mapped">QSignalMapper::mapped</a>(const char *) -QObject::name(void) const -QObject::name(void) const -<a href="qwidget.html#setCaption">QWidget::setCaption</a>(const char *) -<a href="qwidget.html#setIconText">QWidget::setIconText</a>(const char *) -<a href="qwidget.html#drawText">QWidget::drawText</a>(const <a href="qpoint.html">QPoint</a> &, const char *) -QWidget::drawText(int, int, const char *) -QWidget::acceptFocus(void) const -QWidget::setAcceptFocus(bool) -<a href="qwidget.html#create">QWidget::create</a>(unsigned int) -QWidget::create(void) -QWidget::internalMove(int, int) -QWidget::internalResize(int, int) -QWidget::internalSetGeometry(int, int, int, int) -QWidget::deferMove(const QPoint &) -QWidget::deferResize(const <a href="qsize.html">QSize</a> &) -QWidget::cancelMove(voidQWidget::cancelResize(voidQWidget::sendDeferredEvents(voidQWidget::setBackgroundColorFromMode(voidQObject::name(void) const <a href="qwidget.html#setMask">QWidget::setMask</a>(QBitmapQWMatrix::setMatrix(float, float, float, float, float, float) -<a href="qwmatrix.html#map">QWMatrix::map</a>(float, float, float *, float *) const -<a href="qwmatrix.html#translate">QWMatrix::translate</a>(float, float) -<a href="qwmatrix.html#scale">QWMatrix::scale</a>(float, float) -<a href="qwmatrix.html#shear">QWMatrix::shear</a>(float, float) -<a href="qwmatrix.html#rotate">QWMatrix::rotate</a>(float) -<a href="qbuffer.html#setBuffer">QBuffer::setBuffer</a>(QArrayT<char>) -<a href="qdir.html#entryList">QDir::entryList</a>(const char *, int, int) const -<a href="qdir.html#entryInfoList">QDir::entryInfoList</a>(const char *, int, int) const -<a href="qdir.html#mkdir">QDir::mkdir</a>(const char *, bool) const -<a href="qdir.html#rmdir">QDir::rmdir</a>(const char *, bool) const -<a href="qdir.html#exists">QDir::exists</a>(const char *, bool) -<a href="qdir.html#remove">QDir::remove</a>(const char *, bool) -<a href="qdir.html#rename">QDir::rename</a>(const char *, const char *, bool) -<a href="qdir.html#setCurrent">QDir::setCurrent</a>(const char *) -<a href="qdir.html#match">QDir::match</a>(const char *, const char *) -<a href="qdir.html#cleanDirPath">QDir::cleanDirPath</a>(const char *) -<a href="qdir.html#isRelativePath">QDir::isRelativePath</a>(const char *) -<a href="qdir.html#setPath">QDir::setPath</a>(const char *) -<a href="qdir.html#filePath">QDir::filePath</a>(const char *, bool) const -<a href="qdir.html#absFilePath">QDir::absFilePath</a>(const char *, bool) const -<a href="qdir.html#convertSeparators">QDir::convertSeparators</a>(const char *) -<a href="qdir.html#cd">QDir::cd</a>(const char *, bool) -<a href="qdir.html#setNameFilter">QDir::setNameFilter</a>(const char *) -<a href="qfile.html#setName">QFile::setName</a>(const char *) -<a href="qfile.html#exists">QFile::exists</a>(const char *) -<a href="qfile.html#remove">QFile::remove</a>(const char *) -<a href="qfileinfo.html#setFile">QFileInfo::setFile</a>(const <a href="qdir.html">QDir</a> &, const char *) -QFileInfo::setFile(const char *) -QFile::exists(const char *) -<a href="qfileinfo.html#extension">QFileInfo::extension</a>(void) const -<a href="qregexp.html#match">QRegExp::match</a>(const char *, int, int *) const -QRegExp::matchstr(unsigned short *, char *, char *) const -QString::resize(unsigned int) -<a href="qstring.html#fill">QString::fill</a>(char, int) -<a href="qstring.html#find">QString::find</a>(const char *, int, bool) const -<a href="qstring.html#findRev">QString::findRev</a>(const char *, int, bool) const -<a href="qstring.html#leftJustify">QString::leftJustify</a>(unsigned int, char, bool) const -<a href="qstring.html#rightJustify">QString::rightJustify</a>(unsigned int, char, bool) const -<a href="qstring.html#insert">QString::insert</a>(unsigned int, const char *) -<a href="qstring.html#append">QString::append</a>(const char *) -<a href="qstring.html#prepend">QString::prepend</a>(const char *) -<a href="qstring.html#replace">QString::replace</a>(const <a href="qregexp.html">QRegExp</a> &, const char *) -QString::replace(unsigned int, unsigned int, const char *) -QString::setStr(const char *) -<a href="qstring.html#setNum">QString::setNum</a>(int) -QString::setNum(unsigned long) -<a href="qstring.html#setExpand">QString::setExpand</a>(unsigned int, char) -<a href="qbutton.html#setText">QButton::setText</a>(const char *) -<a href="qcombobox.html#setEditText">QComboBox::setEditText</a>(const char *) -<a href="qcombobox.html#activated">QComboBox::activated</a>(const char *) -<a href="qcombobox.html#highlighted">QComboBox::highlighted</a>(const char *) -<a href="qcombobox.html#insertItem">QComboBox::insertItem</a>(const char *, int) -<a href="qcombobox.html#changeItem">QComboBox::changeItem</a>(const char *, int) -<a href="qwidget.html#setStyle">QComboBox::setStyle</a>(GUIStyle) -<a href="qcombobox.html#setValidator">QComboBox::setValidator</a>(<a href="qvalidator.html">QValidator</a> *) -<a href="qgroupbox.html#setTitle">QGroupBox::setTitle</a>(const char *) -QHeader::moveAround(int, int) -<a href="qheader.html#addLabel">QHeader::addLabel</a>(const char *, int) -<a href="qheader.html#setLabel">QHeader::setLabel</a>(int, const char *, int) -<a href="qheader.html#setOrientation">QHeader::setOrientation</a>(QHeader::Orientation) -<a href="qwidget.html#resizeEvent">QHeader::resizeEvent</a>(<a href="qresizeevent.html">QResizeEvent</a> *QHeader::paintCell(<a href="qpainter.html">QPainter</a> *, int, intQHeader::setupPainter(QPainter *QHeader::cellHeight(intQHeader::cellWidth(int) <a href="qlabel.html#setText">QLabel::setText</a>(const char *QLCDNumber::display(const char *) -<a href="qframe.html#resizeEvent">QLCDNumber::resizeEvent</a>(QResizeEvent *) -QLCDNumber::internalDisplay(const char *) -QLCDNumber::drawString(const char *, QPainter &, <a href="qbitarray.html">QBitArray</a> *, bool) -QLCDNumber::drawDigit(const <a href="qpoint.html">QPoint</a> &, QPainter &, int, char, char) -QLCDNumber::drawSegment(const QPoint &, char, QPainter &, int, bool) -<a href="qwidget.html#event">QLineEdit::event</a>(<a href="qevent.html">QEvent</a> *) -<a href="qlineedit.html#setValidator">QLineEdit::setValidator</a>(<a href="qvalidator.html">QValidator</a> *) -<a href="qlineedit.html#validateAndSet">QLineEdit::validateAndSet</a>(const char *, int, int, int) -<a href="qlineedit.html#setText">QLineEdit::setText</a>(const char *) -<a href="qlineedit.html#insert">QLineEdit::insert</a>(const char *) -<a href="qlineedit.html#textChanged">QLineEdit::textChanged</a>(const char *) -<a href="qlistbox.html#insertItem">QListBox::insertItem</a>(const char *, int) -<a href="qlistbox.html#inSort">QListBox::inSort</a>(const char *) -<a href="qlistbox.html#changeItem">QListBox::changeItem</a>(const char *, int) -<a href="qlistbox.html#maxItemWidth">QListBox::maxItemWidth</a>(void) -<a href="qlistbox.html#highlighted">QListBox::highlighted</a>(const char *) -<a href="qlistboxitem.html#setText">QListBoxItem::setText</a>(const char *) -<a href="qlistbox.html#selected">QListBox::selected</a>(const char *) -<a href="qlistviewitem.html#isExpandable">QListViewItem::isExpandable</a>(void) -<a href="qwidget.html#setStyle">QListView::setStyle</a>(GUIStyle) -<a href="qmainwindow.html#addToolBar">QMainWindow::addToolBar</a>(<a href="qtoolbar.html">QToolBar</a> *, const char *, QMainWindow::ToolBarDock, bool) -<a href="qmenudata.html#insertItem">QMenuData::insertItem</a>(const <a href="qpixmap.html">QPixmap</a> &, const <a href="qobject.html">QObject</a> *, const char *, int) -QMenuData::insertItem(const QPixmap &, const char *, <a href="qpopupmenu.html">QPopupMenu</a> *, int, int) -QMenuData::insertItem(const QPixmap &, const char *, const QObject *, const char *, int) -QMenuData::insertItem(const QPixmap &, const char *, const QObject *, const char *, int, int, int) -QMenuData::insertItem(const QPixmap &, const char *, int, int) -QMenuData::insertItem(const char *, QPopupMenu *, int, int) -QMenuData::insertItem(const char *, const QObject *, const char *, int) -QMenuData::insertItem(const char *, const QObject *, const char *, int, int, int) -QMenuData::insertItem(const char *, int, int) -<a href="qmenudata.html#changeItem">QMenuData::changeItem</a>(const QPixmap &, const char *, int) -QMenuData::changeItem(const char *, int) -QMenuData::insertAny(const char *, const QPixmap *, QPopupMenu *, int, int) -QMenuItem::setText(const char *) -QMultiLineEdit::textWidth(<a href="qstring.html">QString</a> *) -QMultiLineEdit::repaintAll(void) -QMultiLineEdit::repaintDelayed(void) -<a href="qtextedit.html#setText">QMultiLineEdit::setText</a>(const char *) -<a href="qtextedit.html#append">QMultiLineEdit::append</a>(const char *) -QPopupMenu::itemAtPos(const <a href="qpoint.html">QPoint</a> &) -QPopupMenu::actSig(int) -<a href="qwidget.html#mouseReleaseEvent">QRadioButton::mouseReleaseEvent</a>(<a href="qmouseevent.html">QMouseEvent</a> *) -<a href="qwidget.html#keyPressEvent">QRadioButton::keyPressEvent</a>(<a href="qkeyevent.html">QKeyEvent</a> *) -QRangeControl::adjustValue(void) -<a href="qscrollbar.html#setOrientation">QScrollBar::setOrientation</a>(QScrollBar::Orientation) -<a href="qscrollview.html#horizontalScrollBar">QScrollView::horizontalScrollBar</a>(void) -<a href="qscrollview.html#verticalScrollBar">QScrollView::verticalScrollBar</a>(void) -<a href="qscrollview.html#viewport">QScrollView::viewport</a>(void) -<a href="qslider.html#setOrientation">QSlider::setOrientation</a>(QSlider::Orientation) -<a href="qspinbox.html#setSpecialValueText">QSpinBox::setSpecialValueText</a>(const char *) -<a href="qspinbox.html#setValidator">QSpinBox::setValidator</a>(<a href="qvalidator.html">QValidator</a> *) -<a href="qspinbox.html#valueChanged">QSpinBox::valueChanged</a>(const char *) -<a href="qwidget.html#paletteChange">QSpinBox::paletteChange</a>(const <a href="qpalette.html">QPalette</a> &) -<a href="qwidget.html#enabledChange">QSpinBox::enabledChange</a>(bool) -<a href="qwidget.html#fontChange">QSpinBox::fontChange</a>(const <a href="qfont.html">QFont</a> &) -<a href="qwidget.html#styleChange">QSpinBox::styleChange</a>(GUIStyle) -<a href="qsplitter.html#setOrientation">QSplitter::setOrientation</a>(QSplitter::Orientation) -<a href="qwidget.html#event">QSplitter::event</a>(<a href="qevent.html">QEvent</a> *) -QSplitter::childInsertEvent(<a href="qchildevent.html">QChildEvent</a> *) -QSplitter::childRemoveEvent(QChildEvent *) -<a href="qsplitter.html#moveSplitter">QSplitter::moveSplitter</a>(short) -<a href="qsplitter.html#adjustPos">QSplitter::adjustPos</a>(int) -QSplitter::splitterWidget(void) -QSplitter::startMoving(void) -QSplitter::moveTo(<a href="qpoint.html">QPoint</a>) -QSplitter::stopMoving(void) -QSplitter::newpos(void) const -<a href="qstatusbar.html#message">QStatusBar::message</a>(const char *) -QStatusBar::message(const char *, int) -<a href="qobject.html#name">QObject::name</a>(void) const -<a href="qtooltipgroup.html#showTip">QToolTipGroup::showTip</a>(const char *) -<a href="qtooltip.html#add">QToolTip::add</a>(<a href="qwidget.html">QWidget</a> *, const <a href="qrect.html">QRect</a> &, const char *) -QToolTip::add(QWidget *, const QRect &, const char *, <a href="qtooltipgroup.html">QToolTipGroup</a> *, const char *) -QToolTip::add(QWidget *, const char *) -QToolTip::add(QWidget *, const char *, QToolTipGroup *, const char *) -<a href="qtooltip.html#tip">QToolTip::tip</a>(const QRect &, const char *) -QToolTip::tip(const QRect &, const char *, const char *) -QObject::name(void) const -<a href="qwhatsthis.html#add">QWhatsThis::add</a>(QWidget *, const <a href="qpixmap.html">QPixmap</a> &, const char *, const char *, bool) -QWhatsThis::add(QWidget *, const char *, bool) -<a href="qwhatsthis.html#textFor">QWhatsThis::textFor</a>(QWidget *) -<a href="qwidget.html#event">QWidgetStack::event</a>(<a href="qevent.html">QEvent</a> *) - -</pre><p> -<!-- eof --> -<p><address><hr><div align=center> -<table width=100% cellspacing=0 border=0><tr> -<td>Copyright © 2007 -<a href="troll.html">Trolltech</a><td align=center><a href="trademarks.html">Trademarks</a> -<td align=right><div align=right>Qt 3.3.8</div> -</table></div></address></body> -</html> diff --git a/doc/html/titleindex b/doc/html/titleindex index 28a1f3a..c2e4627 100644 --- a/doc/html/titleindex +++ b/doc/html/titleindex @@ -74,7 +74,6 @@ File Handling | tutorial2-07.html Font Displayer | qfd-example.html Fonts in Qt/Embedded | emb-fonts.html Format of the QDataStream Operators | datastreamformat.html -Functions removed in Qt 2.0 | removed20.html GNU General Public License | gpl.html Getting Started | motif-walkthrough-1.html Grapher Plugin | grapher-nsplugin-example.html @@ -146,7 +145,6 @@ Pictures of Most Qt Widgets | pictures.html Play Tetrix! | qaxserver-demo-tetrax.html Plugins | plugins.html Popup Widgets | popup-example.html -Porting to Qt 2.x | porting2.html Porting to Qt 3.x | porting.html Porting your applications to Qt/Embedded | emb-porting.html Preparing to Migrate the User Interface | motif-walkthrough-2.html diff --git a/doc/man/README b/doc/man/README index de4ddcd..40d7892 100644 --- a/doc/man/README +++ b/doc/man/README @@ -44,6 +44,5 @@ Debian distribution man1/mergetr.1 man1/msg2qm.1 man1/qembed.1 - man1/qt20fix.1 man1/qtconfig.1 man1/qvfb.1 diff --git a/doc/man/man1/qt20fix.1 b/doc/man/man1/qt20fix.1 deleted file mode 100644 index 352921b..0000000 --- a/doc/man/man1/qt20fix.1 +++ /dev/null @@ -1,32 +0,0 @@ -.TH "qt20fix" "1" "3.0.3" "Troll Tech AS, Norway." "" -.SH "NAME" -.LP -qt20fix \- Helps clean namespace when porting an app from Qt1 to Qt2 -.SH "SYNTAX" -.LP -qt20fix myapp.cpp - -.SH "DESCRIPTION" -.LP -Qt 2.x is namespace\-clean, unlike 1.x. Qt now uses very -few global identifiers. Identifiers like red, blue, -LeftButton, AlignRight, Key_Up, Key_Down, NoBrush etc. -are now part of a special class Qt (defined in -qnamespace.h), which is inherited by most Qt classes. -Member functions of classes that inherit from QWidget, -etc. are totally unaffected, but code that is not in -functions of classes inherited from Qt, you must qualify -these identifiers like this: Qt::red, Qt::LeftButton, -Qt::AlignRight, etc. - -The qt/bin/qt20fix script helps to fix the code that -needs adaption, though most code does not need changing. - -Compiling with \-DQT1COMPATIBILITY will help you get going -with Qt 2.x \- it allows all the old "dirty namespace" -identifiers from Qt 1.x to continue working. Without it, -you'll get compile errors that can easily be fixed by -searching this page for the clean identifiers. -.SH "AUTHORS" -.LP -TrollTech <http://www.trolltech.com/> diff --git a/doc/porting2.doc b/doc/porting2.doc deleted file mode 100644 index 1877446..0000000 --- a/doc/porting2.doc +++ /dev/null @@ -1,1441 +0,0 @@ -/**************************************************************************** -** -** Help with porting from Qt 1.x to Qt 2.x -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the Qt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free Qt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.QPL -** included in the packaging of this file. Licensees holding valid Qt -** Commercial 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 WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -/*! -\page porting2.html - -\title Porting to Qt 2.x - -<p> -You're probably looking at this page because you want to port -your application from Qt 1.x to Qt 2.x, but to be sure, let's -review the good reasons to do this: -<ul> - <li>To get access to all the new Qt 2.x features like the rich text - HTML subset for formatted labels, tooltips, online help etc. - and the much easier to use layout classes and widgets. - <li>To make your application truly international, with support - for Unicode and translations for the languages of the world. - <li>To allow your application to fit into the new look of the - Unix desktop with configurable, very powerful "themes". The - extended style system also integrates Qt applications better - on MS-Windows desktops. Qt will automatically chose the right - colors and fonts and obey global system setting changes. - <li>To stay up-to-date with the version of Qt that gets all the - new features and bug-fixes. - <li>To get more speed and smoother widgets display with all the - new anti-flicker changes in Qt. - <li>Most of all though, you want to port to Qt 2.x - so that your Wheel Mouse works! -</ul> - -<p> -The Qt 2.x series is not binary compatible with the 1.x series. -This means programs compiled for Qt 1.x must be recompiled to work -with Qt 2.x. Qt 2.x is also not completely <em>source</em> compatible -with 1.x, however all points of incompatibility cause -compiler errors (rather than mysterious results), or produce run-time -messages. The result is that Qt 2.x includes many additional features, -discards obsolete functionality that is easily converted to use the new -features, and that porting an application from Qt 1.x to Qt 2.x is -a simple task well worth the amount of effort required. - - -To port code using Qt 1.x to use Qt 2.x: - -<ul> - <li> Briefly read the porting notes below to get an idea of what to expect. - <li> Be sure your code compiles and runs well on all your target platforms with Qt 1.x. - <li> Recompile with Qt 2.x. For each error, search below for related - identifiers (eg. function names, class names) - this documented is - structured to mention all relevant identifiers to facilitate such - searching, even if that makes it a little verbose. - <li> If you get stuck, ask on the qt-interest mailing list, or - Trolltech Technical Support if you're a Professional Edition - licensee. -</ul> - - -Many very major projects, such as <a href="http://www.kde.org/">KDE</a> -have been port, so there is plenty of expertise in the collective conscious -that is the Qt Developer Community! -</p> - - -<hr> - -<h2 align=center>The Porting Notes</h2> - -<ul> - <li><b><a href="#Namespace">Namespace</a></b> - <li><b><a href="#Virtual">Virtual Functions</a></b> - <li><b><a href="#Collection">Collection classes</a></b> - <li><b><a href="#DefaultParent">No Default 0 Parent Widget</a></b> - <li><b><a href="#DebugVsRelease">Debug vs. Release</a></b> - - <li><b><a href="#QApplication">QApplication</a></b> - <li><b><a href="#QClipboard">QClipboard</a></b> - <li><b><a href="#QColor">QColor</a></b> - <li><b><a href="#QDataStream">QDataStream</a></b> - <li><b><a href="#QDialog">QDialog</a></b> - <li><b><a href="#QDropSite">QDropSite</a></b> - <li><b><a href="#QEvent">QEvent</a></b> - <li><b><a href="#QFile">QFile</a></b> - <li><b><a href="#QFontMetrics">QFontMetrics</a></b> - <li><b><a href="#QIODevice">QIODevice</a></b> - <li><b><a href="#QLabel">QLabel</a></b> - <li><b><a href="#QLayout">QLayout</a></b> - <li><b><a href="#QListView">QListView</a></b> - <li><b><a href="#QMenuData">QMenuData</a></b> - <li><b><a href="#QMenuData">QPopupMenu</a></b> - <li><b><a href="#QMultiLineEdit">QMultiLineEdit</a></b> - <li><b><a href="#QPainter">QPainter</a></b> - <li><b><a href="#QPicture">QPicture</a></b> - <li><b><a href="#QPoint">QPoint, QPointArray, QSize and QRect</a></b> - <li><b><a href="#QPixmap">QPixmap</a></b> - <li><b><a href="#QRgb">QRgb</a></b> - <li><b><a href="#QScrollView">QScrollView</a></b> - <li><b><a href="#QStrList">QStrList</a></b> - <li><b><a href="#QString">QString</a></b> - <li><b><a href="#QTextStream">QTextStream</a></b> - <li><b><a href="#QUriDrag">QUriDrag / QUrlDrag</a></b> - <li><b><a href="#QValidator">QComboBox</a></b> - <li><b><a href="#QValidator">QLineEdit</a></b> - <li><b><a href="#QValidator">QSpinBox</a></b> - <li><b><a href="#QValidator">QValidator</a></b> - <li><b><a href="#QWidget">QWidget</a></b> - <li><b><a href="#QWindow">QWindow</a></b> -</ul> - -<hr> - -<h3><a name="Namespace">Namespace</a></h3> - -<p> Qt 2.x is namespace-clean, unlike 1.x. Qt now uses very few -global identifiers. Identifiers like <code>red, blue, LeftButton, -AlignRight, Key_Up, Key_Down, NoBrush</code> etc. are now part of a -special class <code>Qt</code> (defined in qnamespace.h), -which is inherited by -most Qt classes. Member functions of classes that inherit from QWidget, -etc. are totally unaffected, but code that is -<em>not</em> in functions of classes inherited from <code>Qt</code>, -you must qualify these identifiers like this: <code>Qt::red, -Qt::LeftButton, Qt::AlignRight</code>, etc. - -<p>The <code>qt/bin/qt20fix</code> script helps to fix the code that -needs adaption, though most code does not need changing. - -Compiling with -DQT1COMPATIBILITY will help you get going with Qt 2.x -- it allows all the old "dirty namespace" identifiers from Qt 1.x to -continue working. Without it, you'll get compile errors that can -easily be fixed by searching this page for the clean identifiers. - -<h3><a name="DefaultParent">No Default 0 Parent Widget</a></h3> - -In Qt 1.x, all widget constructors were defined with a default value -of 0 for the parent widget. However, only the main window of the -application should be created with a 0 parent, all other widgets -should have parents. Having the 0 default made it too simple to create -bugs by forgetting to specify the parent of non-mainwindow -widgets. Such widgets would typically never be deleted (causing memory -leaks), and they would become top-level widgets, confusing the window -managers. Therefore, in Qt 2.x the 0 default parent has been removed -for the widget classes that are not likely to be used as main windows. - -Note also that programs no longer need (or should) use 0 parent just -to indicate that a widget should be top-level. See -\code QWidget::isTopLevel() \endcode for details. See also the notes about -<a href="#QMenuData">QPopupMenu</a> and <a href="#QDialog">QDialog</a> -below. - -<h3><a name="Virtual">Virtual Functions</a></h3> - -<p> Some virtual functions have changed signature in Qt 2.x. -If you override them in derived classes, you must change the signature -of your functions accordingly. - -<!-- warwick can check for additions to this with his qt-2-report --> -<ul> - <li>\code QWidget::setStyle(GUIStyle)\endcode - <li>\code QListView::addColumn(const char *, int)\endcode - <li>\code QListView::setColumnText(int, const char *)\endcode - <li>\code QListViewItem::setText(int, const char *)\endcode - <li>\code QMultiLineEdit::insertLine(const char *, int)\endcode - <li>\code QMultiLineEdit::insertAt(const char *, int, int, bool)\endcode - <li>\code QSpinBox::setPrefix(const char *)\endcode - <li>\code QSpinBox::setSuffix(const char *)\endcode - <li>\code QToolButton::setTextLabel(const char *, bool)\endcode - <li>\code QDoubleValidator::validate(QString &, int &)\endcode - <li>\code QIntValidator::validate(QString &, int &)\endcode - <li>\code QValidator::fixup(QString &)\endcode - <li>\code QSlider::paintSlider(QPainter *, const QRect &)\endcode -</ul> - -This is one class of changes that are -not detected by the compiler, -so you should mechanically search for each of -these function names in your header files, eg. - -\code -egrep -w 'setStyle|addColumn|setColumnText|setText...' *.h -\endcode - -Of course, you'll get a few false positives (eg. if you have a setText -function that is not in a subclass of QListViewItem). - - -<h3><a name="Collection">Collection classes</a></h3> - -<p> The collection classes include generic -classes such as QGDict, QGList, and -the subclasses such as QDict and QList. - -<p> The macro-based Qt collection classes are obsolete; use the -template-based classes instead. Simply remove includes of qgeneric.h and -replace e.g. Q_DECLARE(QCache,QPixmap) with QCache<QPixmap>. - -<p> The GCI global typedef is replaced by QCollection::Item. Only if you -make your own subclasses of the undocumented generic collection classes -will you have GCI in your code. -This change has been made to avoid collisions with other namespaces. - -<p> The GCF global typedef is removed (it was not used in Qt). - - - -<h3><a name="DebugVsRelease">Debug vs. Release</a></h3> - -<p>The Q_ASSERT macro is now a null expression if the QT_CHECK_STATE flag -is not set (i.e. if the QT_NO_CHECK flag is defined). - -<p>The debug() function now outputs nothing if Qt was compiled with -the QT_NO_DEBUG macro defined. - - -<h3><a name="QString">QString</a></h3> - -QString has undergone major changes internally, and although it is highly -backward compatible, it is worth studying in detail when porting to Qt 2.x. -The Qt 1.x QString class has been renamed to QCString in Qt 2.x, though if -you use that you will incur a performance penalty since all Qt functions -that took const char* now take const QString&. - -<p> -To take full advantage of the new Internationalization -functionality in Qt 2.x, the following steps are required: - - <ul> - <li> Start converting all uses of "const char*" in parameters to - "const QString&" - this can often be done mechanically, eg. - using Perl. Convert usage of char[] for temporary string - building to QString (much software already uses QString for - this purpose as it offers many more facilities). - - If you find that you are mixing usage of QCString, QString, - and QByteArray, this causes lots of unnecessary copying and - might indicate that the true nature of the data you are - dealing with is uncertain. If the data is NUL-terminated - 8-bit data, use QCString; if it is unterminated (ie. - contains NULs) 8-bit data, use QByteArray; if it is text, - use QString. - </p> - - <li> Put a breakpoint in \code QString::latin1()\endcode - to catch places where - Unicode information is being converted to ASCII (loosing - information if your user in not using Latin1). Qt has - a small number of calls to this - ignore those. As a stricter - alternative, compile your code with QT_NO_ASCII_CAST defined, - which hides the automatic conversion of QString to const char*, - so you can catch problems at compile time. - </p> - - <li> See the Qt \link i18n.html Internationalization page\endlink - for information about the full process of internationalizing - your software. - </ul> - -<p> -Points to note about the new QString are: - -<dl compact> -<dt><b>Unicode</b></dt> -<dd> - Qt now uses Unicode throughout. - data() now returns a <em>const</em> reference to an ASCII version - of the string - you cannot directly access the - string as an array of bytes, because it isn't one. Often, latin1() is - what you want rather than data(), or just leave it to convert to - const char* automatically. data() is only used now to aide porting to Qt 2.x, - and ideally you'll only need latin1() or implicit conversion when interfacing - to facilities that do not have Unicode support. - -<dt><b>Automatic-expanding</b></dt> -<dd> -A big advantage of the new QString is that it automatically expands -when you write to an indexed position. - -<dt><b>QChar and QCharRef</b></dt> -<dd> -QChar are the Unicode characters that make up a QString. A QCharRef is -a temporary reference to a QChar in a QString that when assigned to -ensures that the implicit sharing semantics of the QString are maintained. -You are unlikely to use QCharRef in your own code - but so that you -understand compiler error messages, just know that <tt>mystring[123]</tt> -is a QCharRef whenever <tt>mystring</tt> is not a constant string. A QCharRef -has basically the same functionality as a QChar, except it is more restricted -in what you can assign to it and cast it to (to avoid programming errors). - -<dt><b>Use QString</b></dt> -<dd> -Try to always use QString. If you <em>must</em>, use QCString which is the -old implementation from Qt 1.x. - -<dt><b>Unicode vs. ASCII</b></dt> -<dd> -Every conversion to and from ASCII is wasted time, so try to use QString - as much as possible rather than const char*. This also ensures you have - full 16-bit support. - -<dt><b>Convertion to ASCII</b></dt> -<dd> -The return value from operator const char*() is transient - don't expect - it to remain valid while you make deep function calls. - It is valid for as long as you don't modify or destroy the QString. - -<dt><b>QString is simpler</b></dt> -<dd> -Expect your code to become simpler with the new QString, especially - places where you have used a char* to wander over the string rather - than using indexes into the string. - -<dt><b>Some hacks don't work</b></dt> -<dd> -This hack: - use_sub_string( &my_string[index] ) - should be replaced by: - use_sub_string( my_string.mid(index) ) - -<dt><b>QString(const char*, int) is removed</b></dt> -<dd> -The QString constructor taking a const char* and an integer is removed. -Use of this constructor was error-prone, since the length included the -'\0' terminator. Use QString::left(int) or QString::fromLatin1( const char*, -int ) -- in both cases the int parameter signifies the number of characters. - -<dt><b>QString(int) is private</b></dt> -<dd> -The QString constructor taking an integer is now private. This function -is not meaningful anymore, since QString does all space allocation -automatically. 99% of cases can simple be changed to use the -default constructor, QString(). -<p> -In Qt 1.x the constructor was used in two ways: accidentally, -by attempting to convert a char to a QString (the char converts to int!) - -giving strange bugs, and as a way to make a QString big enough prior to -calling \code QString::sprintf()\endcode. In Qt 2.x, the accidental bug case is -prevented (you will get a compilation error) and QString::sprintf has -been made safe - you no longer need to pre-allocate space (though for -other reasons, sprintf is still a poor choice - eg. it doesn't pass Unicode). -The only remaining common case is conversion of 0 (NULL) to QString, which -would usually give expected results in Qt 1.x. For Qt 2.x the correct -syntax is to use QString::null, though note that -the default constructor, QString(), creates a null string too. -Assignment of 0 to a QString is ambiguous - assign -QString::null; you'll mainly find these in code that has been converted -from const char* types to QString. -This also prevents a common error case from Qt 1.x - in -that version, mystr = 'X' would <em>not</em> produce the expected -results and was always a programming error; in Qt 2.x, it works - making -a single-character string. - -<p> -Also see <a href="#QStrList">QStrList</a>. - -<dt><b>Signals and Slots</b></dt> -<dd> -Many signal/slots have changed from const char* to QString. You will - get run-time errors when you try to \code QObject::connect()\endcode - to the old - signals and slots, usually with a message indicating the const QString& - replacement signal/slot. - -<dt><b>Optimize with Q2HELPER</b></dt> -<dd> -In qt/src/tools/qstring.cpp there is a Q2HELPER - define it for some -extra debugging/optimizing features (don't leave it it - it kills performance). -You'll get an extra function, qt_qstring_stats(), which will print a -summary of how much your application is doing Unicode and ASCII -back-and-forth conversions. - -<dt><b>QString::detach() is obsolete and removed</b></dt> -<dd> -Since QString is now always shared, this function does nothing. -Remove calls to QString::detach(). - -<dt><b>QString::resize(int size) is obsolete and removed</b></dt> -<dd> -Code using this to truncate a string should use - \link QString::truncate() truncate(size-1)\endlink. -Code using qstr.resize(0) should use qstr = QString::null. -Code calling resize(n) prior to using - \link QString::operator[]() operator[]\endlink up to n just remove -the resize(n) completely. - -<dt><b>QString::size() is obsolete and removed</b></dt> -<dd> -Calls to this function must be replaced by -\link QString::length() length()\endlink+1. - -<dt><b>QString::setStr(const char*) is removed</b></dt> -<dd>Try to understand why you were using this. -If you just meant assignment, use that. Otherwise, -you are probably using QString as an array of bytes, in which case use -QByteArray or QCString instead. - -<dt><b>QString is not an array of bytes</b></dt> -<dd> -Code that uses QString as an array of bytes should use QByteArray -or a char[], <em>then</em> convert that to a QString if needed. - -<dt><b>"string = 0"</b></dt> -<dd> -Assigning 0 to a QString should be assigning the null string, -ie. string = QString::null. - -<dt><b>System functions</b></dt> -<dd> -You may find yourself needing latin1() for passing to the operating system - or other libraries, and be tempted to use QCString to save the conversion, - but you are better off using Unicode throughout, then when the operating - system supports Unicode, you'll be prepared. Some Unix operating systems - are now beginning to have basic Unicode support, and Qt will be tracking - these improvements as they become more widespread. - -<dt><b>Bugs removed</b></dt> -<dd> -toShort() returns 0 (and sets *ok to false) on error. -toUInt() now works for big valid unsigned integers. -insert() now works into the same string. - -<dt><b>NULL pointers</b></dt> -<dd> -When converting "const char*" usage to QString in order to make your - application fully Unicode-aware, use QString::null for the null value - where you would have used 0 with char pointers. - -<dt><b>QString is not null terminated</b></dt> -<dd> -This means that inserting a 0-character - in the middle of the string does <em>not</em> change the length(). ie. - \code - QString s = "fred"; - s[1] = '\0'; - // s.length() == 4 - // s == "f\0ed" - // s.latin1() == "f" - s[1] = 'r'; - // s == "fred" - // s.latin1() == "fred" - \endcode - Especially look out for this type of code: - \code - QString s(2); - s[0] = '?'; - s[1] = 0; - \endcode - This creates a string 2 characters long. - To find these problems while converting, you might like to - add Q_ASSERT(strlen(d->ascii)==d->len) inside - \code QString::latin1()\endcode. - -<dt><b>QString or Standard C++ string?</b></dt> -<dd> -<p> -The Standard C++ Library string is not Unicode. Nor is wstring defined -to be so (for the small number of platforms where it is defined at all). -This is the same mistake made over and over -in the history of C - only when non-8-bit characters are <em>the norm</em> -do programmers find them usable. Though it is possible to convert between -string and QString, it is less efficient than using QString throughout. -For example, when using: -\code - QLabel::setText( const QString& ) -\endcode -if you use string, like this: -\code - void myclass::dostuffwithtext( const string& str ) - { - mylabel.setText( QString(str.c_str()) ); - } -\endcode -that will create a (ASCII only) copy of str, stored in mylabel. -But this: -\code - void myclass::dostuffwithtext( const QString& str ) - { - mylabel.setText( str ); - } -\endcode -will make an implicitly shared reference to str in the QLabel - no copying -at all. This function might be 10 nested function calls away from something -like this: -\code - void toplevelclass::initializationstuff() - { - doStuff( tr("Okay") ); - } -\endcode -At this point, in Qt 2.x, the tr() does a very fast dictionary lookup -through memory-mapped message files, returning some Unicode QString for -the appropriate language (the default being to just make a QString out -of the text, of course - you're not <em>forced</em> to use any of these -features), and that <em>same</em> memory mapped Unicode will be passed -though the system. All occurrences of the translation of "Okay" can -potentially be shared. - -</dl> - - - -<h3><a name="QApplication">QApplication</a></h3> - -In the function \code QApplication::setColorSpec()\endcode, -PrivateColor and TrueColor are obsolete. Use ManyColor instead. - - -<h3><a name="QColor">QColor</a></h3> - -<p> -All colors -(color0, -color1, -black, -white, -darkGray, -gray, -lightGray, -red, -green, -blue, -cyan, -magenta, -yellow, -darkRed, -darkGreen, -darkBlue, -darkCyan, -darkMagenta, -and -darkYellow) -are in the Qt namespace. -In members of classes that inherit the Qt namespace-class (eg. QWidget -subclasses), you can use the unqualified names as before, but in global -functions (eg. main()), you need to qualify them: Qt::red, Qt::white, etc. -See also the <a href="#QRgb">QRgb</a> section below. - -<h3><a name="QRgb">QRgb</a></h3> - -In QRgb (a typedef of long), the order of the RGB channels has changed to -be in the more efficient order (for typical contemporary hardware). If your -code made assumptions about the order, you will get blue where you expect -red and vice versa (you'll not notice the problem if you use shades of -gray, green, or magenta). You should port your code to use the -creator function qRgb(int r,int g,int b) and the -access functions qRed(QRgb), qBlue(QRgb), and qGreen(QRgb). -If you are using the alpha channel, it hasn't moved, but you should use -the functions qRgba(int,int,int,int) and qAlpha(QRgb). Note also that -QColor::pixel() does <i>not</i> return a QRgb (it never did on all platforms, -but your code may have assumed so on your platform) - this may also produce -strange color results - use QColor::rgb() if you want a QRgb. - - -<h3><a name="QDataStream">QDataStream</a></h3> - -<p>The QDatastream serialization format of most Qt classes is changed -in Qt 2.x. Use \code QDataStream::setVersion( 1 )\endcode to get a -datastream object that can read and write Qt 1.x format data streams. - -<p>If you want to write Qt 1.x format datastreams, note the following -compatibility issues: - <ul> - <li>QString: Qt 1.x has no Unicode support, so strings will be - serialized by writing the classic C string returned by \code - QString::latin1().\endcode - <li><a href="#QPoint">QPoint & al.</a>: Coordinates will be - truncated to the Qt 1.x 16 bit format. - </ul> - -<h3><a name="QWidget">QWidget</a></h3> - -<h4>QWidget::recreate()</h4> -<p> -This function is now called \link QWidget::reparent() reparent()\endlink. - -<h4>QWidget::setAcceptFocus(bool)</h4> -<p> -This function is removed. -Calls like QWidget::setAcceptFocus(TRUE) should be replaced by - \code QWidget::setFocusPolicy(StrongFocus)\endcode, and -calls like QWidget::setAcceptFocus(FALSE) should be replaced by - \code QWidget::setFocusPolicy(NoFocus)\endcode. -Additional policies are TabFocus and ClickFocus. - - -<h4>QWidget::paintEvent()</h4> -<p> -paintEvent(0) is not permitted - subclasses need not check for -a null event, and might crash. -Never pass 0 as the argument to paintEvent(). You probably -just want repaint() or update() instead. -<p> -When processing a paintEvent, painting is only permitted within -the update region specified in the event. Any painting outside will be -clipped away. This shouldn't break any code (it was always like this -on MS-Windows) but makes many explicit calls to -QPainter::setClipRegion() superfluous. Apart from the improved -consistency, the change is likely to reduce flicker and to make Qt -event slightly faster. - -<h3><a name="QIODevice">QIODevice</a></h3> -<p> -The protected member QIODevice::index is renamed to QIODevice::ioIndex -to avoid warnings and to allow compilation with bad C libraries that -#define index to strchr. If you have made a subclass of QIODevice, -check every occurrence of the string "index" in the implementation, since -a compiler will not always catch cases like \code(uint)index\endcode -that need to be changed. - -<h3><a name="QLabel">QLabel</a></h3> - -<h4>\code QLabel::setMargin()\endcode</h4> -<p> -\code QLabel::setMargin()\endcode and\code QLabel::margin()\endcode -have been renamed to \code QLabel::setIndent()\endcode and -\code QLabel::indent()\endcode, respectively. This was done to avoid -collision with QFrame::setMargin(), which is now virtual. - -<h4>\code QLabel::setMovie()\endcode</h4> -<p> -Previously, setting a movie on a label cleared the value of text(). -Now it doesn't. If you somehow used <tt>QLabel::text()</tt> -to detect if a -movie was set, you might have trouble. This is unlikely. - - -<h3><a name="QDialog">QDialog</a></h3> - -<p> The semantics of the parent pointer changed for modeless dialogs: -In Qt-2.x, dialogs are always top level windows. The parent, however, -takes the ownership of the dialog, i.e. it will delete the dialog at -destruction if it has not been explicitly deleted -already. Furthermore, the window system will be able to tell that both -the dialog and the parent belong together. Some X11 window managers -will for instance provide a common taskbar entry in that case. - -<p> -If the dialog belongs to a top level main window -of your application, pass this main window as parent to the dialog's -constructor. Old code (with 0 pointer) will still run. Old code that -included QDialogs as child widgets will no longer work (it never really did). -If you think you might be doing this, put a breakpoint in -QDialog::QDialog() conditional on parent not being 0. - - -<h3><a name="QStrList">QStrList</a></h3> - -Many methods that took a QStrList can now instead take a QStringList, -which is a real list of QString values. - -To use QStringList rather than QStrList, change loops that look like this: -\code - QStrList list = ...; - const char* s; - for ( s = list.first(); s; s = list.next() ) { - process(s); - } -\endcode -to be like this: -\code - QStringList list = ...; - QStringList::ConstIterator i; - for ( i = list.begin(); i != list.end(); ++i ) { - process(*i); - } -\endcode - -In general, the QStrList functions are less efficient, building a temporary QStringList. - -The following functions now use QStringList rather than QStrList -for return types/parameters. - -<ul> - <li><tt>void QFileDialog::setFilters(const QStrList&)</tt> - becomes <tt>void QFileDialog::setFilters(const QStringList&)</tt> - <li><tt>QStrList QFileDialog::getOpenFileNames(...)</tt> - becomes <tt>QStringList QFileDialog::getOpenFileNames(...)</tt> - <li><tt>bool QUrlDrag::decodeLocalFiles(QMimeSource*, QStrList&)</tt> - becomes <tt>bool QUriDrag::decodeLocalFiles(QMimeSource*, QStringList&)</tt> - <li><tt>const QStrList *QDir::entryList(...) const</tt> - becomes <tt>QStringList QDir::entryList(...) const</tt> - (note that the return type is no longer a pointer). You may also - choose to use encodedEntryList(). -</ul> - -The following functions are added: -<ul> - <li><tt>QComboBox::insertStringList(const QStringList &, int index=-1)</tt> - <li><tt>QListBox::insertStringList(const QStringList &,int index=-1)</tt> -</ul> - -The rarely used static function <tt>void -QFont::listSubstitutions(QStrList*)</tt> is replaced by <tt>QStringList -QFont::substitutions()</tt>. - - -<h3><a name="QLayout">QLayout</a></h3> - -<p> Calling resize(0,0) or resize(1,1) will no longer work magically. -Remove all such calls. The default size of top level widgets will be their -\link QWidget::sizeHint() sizeHint()\endlink. - -<p> The default implementation of QWidget::sizeHint() will no longer -return just an invalid size; if the widget has a layout, it will return -the layout's preferred size. - -<p> The special maximum MaximumHeight/Width is now QWIDGETSIZE_MAX, -not QCOORD_MAX. - -<p> \link QBoxLayout::addWidget() QBoxLayout::addWidget()\endlink -now interprets the \e alignment parameter more aggressively. A -non-default alignment now indicates that the widget should not grow to -fill the available space, but should be sized according to sizeHint(). -If a widget is too small, set the alignment to 0. (Zero indicates no -alignment, and is the default.) - -<p> The class QGManager is removed. Subclasses of QLayout need to be rewritten -to use the new, much simpler \link QLayout QLayout API\endlink. - -<p> For typical layouts, all use of -\link QWidget::setMinimumSize() setMinimumSize()\endlink -and -\link QWidget::setFixedSize() setFixedSize()\endlink -can be removed. -\link QLayout::activate() activate()\endlink is no longer necessary. - -<p> -You might like to look at the QGrid, QVBox, and QHBox widgets - they offer -a simple way to build nested widget structures. - - -<h3><a name="QListView">QListView</a></h3> - -<p>In Qt 1.x mouse events to the viewport where redirected to the -event handlers for the listview; in Qt 2.x, this functionality is -in QScrollView where mouse (and other position-oriented) events are -redirected to viewportMousePressEvent() etc, which in turn translate -the event to the coordinate system of the contents and call -contentsMousePressEvent() etc, thus providing events in the most -convenient coordinate system. If you overrode QListView::MouseButtonPress(), -QListView::mouseDoubleClickEvent(), QListView::mouseMoveEvent(), or -QListView::mouseReleaseEvent() you must instead override -viewportMousePressEvent(), -viewportMouseDoubleClickEvent(), viewportMouseMoveEvent(), or -viewportMouseReleaseEvent() respectively. New code will usually override -contentsMousePressEvent() etc. - -<p>The signal QListView::selectionChanged(QListViewItem *) can now be -emitted with a null pointer as parameter. Programs that use the -argument without checking for 0, may crash. - -<h3><a name="QMultiLineEdit">QMultiLineEdit</a></h3> - -<p> -The protected function -\code QMultiLineEdit::textWidth(QString*)\endcode -changed to -\code QMultiLineEdit::textWidth(const QString&)\endcode. -This is unlikely to be a problem, and you'll get a compile error -if you called it. - - -<h3><a name="QClipboard">QClipboard</a></h3> - -<p> -\code QClipboard::pixmap()\endcode now returns a QPixmap, not a QPixmap*. -The pixmap -will be \link QPixmap::isNull() null\endlink if no pixmap is on the -clipboard. QClipboard now offers powerful MIME-based types on the -clipboard, just like drag-and-drop (in fact, you can reuse most of your -drag-and-drop code with clipboard operations). - - -<h3><a name="QDropSite">QDropSite</a></h3> - -<P> -QDropSite is obsolete. If you simply passed <tt>this</tt>, just remove -the inheritance of QDropSite and call -\link QWidget::setAcceptDrops() setAcceptDrops(TRUE)\endlink in the class -constructor. -If you passed something other than <tt>this</tt>, -your code will not work. A common case is passing -the -\link QScrollView::viewport() viewport()\endlink of a QListView, -in which case, -override the -\link QScrollView::contentsDragMoveEvent() contentsDragMoveEvent()\endlink, -etc. -functions rather than QListView's dragMoveEvent() etc. For other -cases, you will need to use an event filter to act on the drag/drop events -of another widget (as is the usual way to intercept foreign events). - - -<h3><a name="QScrollView">QScrollView</a></h3> - -The parameters in the signal -\link QScrollView::contentsMoving() contentsMoving(int,int)\endlink -are now positive rather than negative values, coinciding with -\link QScrollView::setContentsPos() setContentsPos()\endlink. Search for -connections you make to this signal, and either change the slot they are -connected to such that it also expects positive rather than negative -values, or introduce an intermediate slot and signal that negates them. - -If you used drag and drop with QScrollView, you may experience the problem -described for <a href="#QDropSite">QDropSite</a>. - - -<h3><a name="QTextStream">QTextStream</a></h3> - -<p> -\code operator<<(QTextStream&, QChar&)\endcode does not skip whitespace. -\code operator<<(QTextStream&, char&)\endcode does, - as was the case with Qt 1.x. This is for backward compatibility. - -<h3><a name="QUriDrag">QUriDrag</a></h3> - -The class QUrlDrag is renamed to QUriDrag, and the API has been -broadened to include additional conversion routines, including -conversions to Unicode filenames (see the class documentation -for details). Note that in Qt 1.x -the QUrlDrag class used the non-standard MIME type "url/url", -while QUriDrag uses the standardized "text/uri-list" type. Other -identifiers affected by the Url to Uri change are -QUrlDrag::setUrls() and QUrlDrag::urlToLocalFile(). - -<h3><a name="QPainter">QPainter</a></h3> - -<p> The GrayText painter flag has been removed. Use -\link QPainter::setPen() setPen( palette().disabled().foreground() )\endlink -instead. - - -<p> The RasterOp enum -(CopyROP, - OrROP, - XorROP, - NotAndROP, - EraseROP, - NotCopyROP, - NotOrROP, - NotXorROP, - AndROP, NotEraseROP, - NotROP, - ClearROP, - SetROP, - NopROP, - AndNotROP, - OrNotROP, - NandROP, - NorROP, LastROP) -is now part of the Qt namespace class, so if you -use it outside a member function, you'll need to prefix with Qt::. - - -<h3><a name="QPicture">QPicture</a></h3> - -<p>The binary storage format of QPicture is changed, but the Qt 2.x -QPicture class can both read and write Qt 1.x format QPictures. No -special handling is required for reading; QPicture will automatically -detect the version number. In order to write a Qt 1.x format QPicture, -set the formatVersion parameter to 1 in the QPicture constructor. - -<p>For writing Qt 1.x format QPictures, the compatibility issues of <a -href="#QDataStream">QDataStream</a> applies. - -<p>It is safe to try to read a QPicture file generated with Qt 2.x -(without formatVersion set to 1) with a program compiled with Qt -1.x. The program will not crash, it will just issue the warning -"QPicture::play: Incompatible version 2.x" and refuse to load the -picture. - - - -<h3><a name="QPoint">QPoint, QPointArray, QSize and QRect</a></h3> - -<p>The basic coordinate datatype in these classes, QCOORD, is now 32 -bit (int) instead of a 16 bit (short). The const values QCOORD_MIN and -QCOORD_MAX have changed accordingly. - -<p>QPointArray is now actually, not only seemingly, a QArray of QPoint -objects. The semi-internal workaround classes QPointData and QPointVal -are removed since they are no longer needed; QPoint is used directly -instead. The function \code QPointArray::shortPoints()\endcode -provides the point array converted to short (16bit) coordinates for -use with external functions that demand that format. - - -<h3><a name="QImage">QImage</a></h3> - -QImage uses QRgb for the colors - see <a href="#QRgb">the changes to that</a>. - - -<h3><a name="QPixmap">QPixmap</a></h3> - -\code QPixmap::convertToImage()\endcode with bitmaps now guarantees that color0 pixels -become color(0) in the resulting QImage. If you worked around the lack of -this, you may be able to simplify your code. If you made assumptions -about the previous undefined behavior, the symptom will be inverted -bitmaps (eg. "inside-out" masks). - -<p> -\code QPixmap::optimize(TRUE)\endcode -is replaced by -\code QPixmap::setOptimization(QPixmap::NormalOptim)\endcode -or -\code QPixmap::setOptimization(QPixmap::BestOptim)\endcode -- see the documentation -to choose which is best for your application. NormalOptim is most like -the Qt 1.x "TRUE" optimization. - - -<h3><a name="QMenuData">QMenuData / QPopupMenu</a></h3> - -In Qt 1.x, new menu items were assigned either an application-wide -unique identifier or an identifier equal to the index of the item, depending on the -\link QMenuData::insertItem() insertItem(...)\endlink function used. -In Qt 2.x this confusing -situation has been cleaned up: generated identifiers are always -unique across the entire application. - -If your code depends on generated ids -being equal to the item's index, a quick fix is to use -\code QMenuData::indexOf(int id)\endcode -in the handling function instead. You may alternatively pass -\code QMenuData::count()\endcode -as identifier when you insert the items. - -Furthermore, QPopupMenus can (and should!) be created with a parent -widget now, for example the main window that is used to display the -popup. This way, the popup will automatically be destroyed together -with its main window. Otherwise you'll have to take care of the -ownership manually. - -QPopupMenus are also reusable in 2.x. They may occur in different -locations within one menu structure or be used as both a menubar -drop-down and as a context popup-menu. This should make it possible to -significantly simplify many applications. - -Last but not least, QPopupMenu no longer inherits QTableView. Instead, -it directly inherits QFrame. - -<h3><a name="QValidator">QValidator (QLineEdit, QComboBox, QSpinBox) </a></h3> - -\code QValidator::validate(...)\endcode -and -\code QValidator::fixup( QString & )\endcode -are now const -functions. If your subclass reimplements validate() as a -non-const function, -you will get a compile error (validate was pure virtual). - -In QLineEdit, QComboBox, and QSpinBox, -setValidator(...) now takes a const pointer to a QValidator, and -validator() returns a const pointer. This change highlights the fact -that the widgets do not take the ownership of the validator (a validator is -a QObject on its own, with its own parent - you can easily set the same validator -object on many different widgets), so changing the state of -such an object or deleting it is very likely a bug. - - -<h3><a name="QFile">QFile, QFileInfo, QDir</a></h3> - -File and directory names are now always Unicode strings (ie. QString). If you used QString -in the past for the simplicity it offers, you'll probably have little consequence. However, -if you pass filenames to system functions rather than using Qt functions (eg. if you use the -Unix <tt>unlink()</tt> function rather than <tt>QFile::remove()</tt>, your code will probably -only work for Latin1 locales (eg. Western Europe, the U.S.). To ensure your code will support -filenames in other locales, either use the Qt functions, or convert the filenames via -\code QFile::encodeFilename()\endcode and \code QFile::decodeFilename()\endcode - but do it -\e just as you call the system function - code that mixes encoded and unencoded filenames -is very error prone. See the comments in QString, such as regarding QT_NO_ASCII_CAST that -can help find potential problems. - - -<h3><a name="QFontMetrics">QFontMetrics</a></h3> - -boundingRect(char) is replaced by -boundingRect(QChar), but since -char auto-converts to QChar, you're not likely to run into problems -with this. - - -<h3><a name="QWindow">QWindow</a></h3> - -This class (which was just QWidget under a different name) has been -removed. If you used it, do a global search-and-replace of the word -"QWindow" with "QWidget". - - -<h3><a name="QEvent">QEvent</a></h3> - -<p> The global #define macros in qevent.h have been replaced by an -enum in QEvent. Use e.g. QEvent::Paint instead of Event_Paint. Same -for all of: -Event_None, -Event_Timer, -Event_MouseButtonPress, -Event_MouseButtonRelease, -Event_MouseButtonDblClick, -Event_MouseMove, -Event_KeyPress, -Event_KeyRelease, -Event_FocusIn, -Event_FocusOut, -Event_Enter, -Event_Leave, -Event_Paint, -Event_Move, -Event_Resize, -Event_Create, -Event_Destroy, -Event_Show, -Event_Hide, -Event_Close, -Event_Quit, -Event_Accel, -Event_Clipboard, -Event_SockAct, -Event_DragEnter, -Event_DragMove, -Event_DragLeave, -Event_Drop, -Event_DragResponse, -Event_ChildInserted, -Event_ChildRemoved, -Event_LayoutHint, -Event_ActivateControl, -Event_DeactivateControl, -and -Event_User. - -<p> The Q_*_EVENT macros in qevent.h have been deleted. Use an -explicit cast instead. The macros were: -Q_TIMER_EVENT, -Q_MOUSE_EVENT, -Q_KEY_EVENT, -Q_FOCUS_EVENT, -Q_PAINT_EVENT, -Q_MOVE_EVENT, -Q_RESIZE_EVENT, -Q_CLOSE_EVENT, -Q_SHOW_EVENT, -Q_HIDE_EVENT, -and -Q_CUSTOM_EVENT. - -<p> QChildEvents are now sent for all QObjects, not just QWidgets. -You may need to add extra checking if you use a QChildEvent without -much testing of its values. - -<h3>All the removed functions</h3> - -All <a href="removed20.html">these functions</a> have been removed in -Qt 2.x. Most are simply cases where "const char*" has changed to -"const QString&", or when an enumeration type has moved into the Qt:: -namespace (which, technically, is a new name, but your code will -compile just the same anyway). This list is provided for completeness. - -*/ - -// I split this to work around limitations in perl's regexp parser. --Arnt - -// warwick can regenerate this with his qt-2-report - -/*! \page removed20.html - -\title Functions removed in Qt 2.0 - -<pre> - -QFileDialog::fileHighlighted(const char *) -QFileDialog::fileSelected(const char *) -QFileDialog::dirEntered(const char *) -QFileDialog::updatePathBox(const char *) -QObject::name(void) const -QFileDialog::getOpenFileName(const char *, const char *, QWidget *, const char *) -QFileDialog::getSaveFileName(const char *, const char *, QWidget *, const char *) -QFileDialog::getExistingDirectory(const char *, QWidget *, const char *) -QFileDialog::getOpenFileNames(const char *, const char *, QWidget *, const char *) -QFileDialog::setSelection(const char *) -QFileDialog::setDir(const char *) -QMessageBox::setText(const char *) -QMessageBox::setButtonText(const char *) -QMessageBox::setButtonText(int, const char *) -QMessageBox::setStyle(GUIStyle) -QMessageBox::standardIcon(QMessageBox::Icon, GUIStyle) -QMessageBox::information(QWidget *, const char *, const char *, const char *, const char *, const char *, int, int) -QMessageBox::information(QWidget *, const char *, const char *, int, int, int) -QMessageBox::warning(QWidget *, const char *, const char *, const char *, const char *, const char *, int, int) -QMessageBox::warning(QWidget *, const char *, const char *, int, int, int) -QMessageBox::critical(QWidget *, const char *, const char *, const char *, const char *, const char *, int, int) -QMessageBox::critical(QWidget *, const char *, const char *, int, int, int) -QMessageBox::about(QWidget *, const char *, const char *) -QMessageBox::aboutQt(QWidget *, const char *) -QMessageBox::message(const char *, const char *, const char *, QWidget *, const char *) -QMessageBox::buttonText(void) const -QMessageBox::query(const char *, const char *, const char *, const char *, QWidget *, const char *) -QProgressDialog::setLabelText(const char *) -QProgressDialog::setCancelButtonText(const char *) -QProgressDialog::styleChange(GUIStyle) -QProgressDialog::init(QWidget *, const char *, const char *, int) -QTabDialog::addTab(QWidget *, const char *) -QTabDialog::isTabEnabled(const char *) const -QTabDialog::setTabEnabled(const char *, bool) -QTabDialog::setDefaultButton(const char *) -QTabDialog::setCancelButton(const char *) -QTabDialog::setApplyButton(const char *) -QTabDialog::setOKButton(const char *) -QTabDialog::setOkButton(const char *) -QTabDialog::styleChange(GUIStyle) -QTabDialog::selected(const char *) -QObject::name(void) const -QApplication::setStyle(GUIStyle) -QApplication::palette(void) -QApplication::setPalette(const QPalette &, bool) -QApplication::font(void) -QApplication::setFont(const QFont &, bool) -QBrush::setStyle(BrushStyle) -QBrush::init(const QColor &, BrushStyle) -QObject::name(void) const -QClipboard::data(const char *) const -QClipboard::setData(const char *, void *) -QClipboard::setText(const char *) -QUrlDrag::decodeLocalFiles(QDropEvent *, QStrList &) -QObject::name(void) const -QStoredDrag::setEncodedData(QArrayT<char> const &) -QTextDrag::setText(const char *) -QImageDrag::canDecode(QDragMoveEvent *) -QTextDrag::canDecode(QDragMoveEvent *) -QUrlDrag::canDecode(QDragMoveEvent *) -QImageDrag::decode(QDropEvent *, QImage &) -QImageDrag::decode(QDropEvent *, QPixmap &) -QTextDrag::decode(QDropEvent *, QString &) -QUrlDrag::decode(QDropEvent *, QStrList &) -QDragMoveEvent::format(int) -QDragMoveEvent::provides(const char *) -QDragMoveEvent::data(const char *) -QDropEvent::data(const char *) -QEvent::peErrMsg(void) -QFont::substitute(const char *) -QFont::insertSubstitution(const char *, const char *) -QFont::removeSubstitution(const char *) -QFont::load(unsigned int) const -QFont::setFamily(const char *) -QFont::bold(void) const -QFont::setBold(bool) -QFont::handle(unsigned int) const -QFont::bold(void) const -QFontInfo::font(void) const -QFontInfo::reset(const QWidget *) -QFontInfo::type(void) const -QFontMetrics::inFont(char) const -QFontMetrics::leftBearing(char) const -QFontMetrics::rightBearing(char) const -QFontMetrics::width(char) const -QFontMetrics::width(const char *, int) const -QFontMetrics::boundingRect(char) const -QFontMetrics::boundingRect(const char *, int) const -QFontMetrics::boundingRect(int, int, int, int, int, const char *, int, int, int *, char **) const -QFontMetrics::size(int, const char *, int, int, int *, char **) const -QFontMetrics::font(void) const -QFontMetrics::reset(const QWidget *) -QFontMetrics::type(void) const -QObject::name(void) const -QGManager::setBorder(int) -QGManager::newSerChain(QGManager::Direction) -QGManager::newParChain(QGManager::Direction) -QGManager::add(QChain *, QChain *, int) -QGManager::addWidget(QChain *, QWidget *, int) -QGManager::addSpacing(QChain *, int, int, int) -QGManager::addBranch(QChain *, QChain *, int, int) -QGManager::setStretch(QChain *, int) -QGManager::activate(void) -QGManager::unFreeze(void) -QGManager::xChain(void) -QGManager::yChain(void) -QGManager::setMenuBar(QWidget *) -QGManager::mainWidget(void) -QGManager::remove(QWidget *) -QGManager::setName(QChain *, const char *) -QGManager::eventFilter(QObject *, QEvent *) -QGManager::resizeHandle(QWidget *, const QSize &) -QGManager::resizeAll(void) -QIconSet::setPixmap(const char *, QIconSet::Size, QIconSet::Mode) -QImage::imageFormat(const char *) -QImageIO::imageFormat(const char *) -QImage::load(const char *, const char *) -QImage::loadFromData(QArrayT<char>, const char *) -QImage::save(const char *, const char *) const -QImageIO::setFileName(const char *) -QImageIO::setDescription(const char *) -QBoxLayout::addB(QLayout *, int) -QObject::name(void) const -QLayout::basicManager(void) -QLayout::verChain(QLayout *) -QLayout::horChain(QLayout *) -QObject::name(void) const -QObject::tr(const char *) const -QPaintDevice::x11Screen(voidQPaintDevice::x11Depth(voidQPaintDevice::x11Cells(voidQPaintDevice::x11Colormap(voidQPaintDevice::x11DefaultColormap(void) QPaintDevice::x11Visual(voidQPaintDevice::x11DefaultVisual(void) -QPainter::translate(float, float) -QPainter::scale(float, float) -QPainter::shear(float, float) -QPainter::rotate(float) -QPainter::drawText(const QPoint &, const char *, int) -QPainter::drawText(const QRect &, int, const char *, int, QRect *, char **) -QPainter::drawText(int, int, const char *, int) -QPainter::drawText(int, int, int, int, int, const char *, int, QRect *, char **) -QPainter::boundingRect(int, int, int, int, int, const char *, int, char **) -QPainter::testf(unsigned short) const -QPainter::setf(unsigned short) -QPainter::setf(unsigned short, bool) -QPainter::clearf(unsigned short) -QPainter::setPen(PenStyle) -QPainter::setBrush(BrushStyle) -QPainter::setBackgroundMode(BGMode) -QPen::setStyle(PenStyle) -QPen::init(const QColor &, unsigned int, PenStyle) -QPicture::load(const char *) -QPicture::save(const char *) -QPixmap::isOptimized(void) const -QPixmap::optimize(bool) -QPixmap::isGloballyOptimized(void) -QPixmap::optimizeGlobally(bool) -QPixmap::imageFormat(const char *) -QPixmap::load(const char *, const char *, QPixmap::ColorMode) -QPixmap::load(const char *, const char *, int) -QPixmap::loadFromData(QArrayT<char>, const char *, int) -QPixmap::save(const char *, const char *) const -QPixmapCache::find(const char *) -QPixmapCache::find(const char *, QPixmap &) -QPixmapCache::insert(const char *, QPixmap *) -QPixmapCache::insert(const char *, const QPixmap &) -QPrinter::setPrinterName(const char *) -QPrinter::setOutputFileName(const char *) -QPrinter::setPrintProgram(const char *) -QPrinter::setDocName(const char *) -QPrinter::setCreator(const char *) -QRect::setX(int) -QRect::setY(int) -QRegion::exec(QArrayT<char> const &) -QObject::name(void) const -QObject::name(void) const -QSignalMapper::setMapping(const QObject *, const char *) -QSignalMapper::mapped(const char *) -QObject::name(void) const -QObject::name(void) const -QWidget::setCaption(const char *) -QWidget::setIconText(const char *) -QWidget::drawText(const QPoint &, const char *) -QWidget::drawText(int, int, const char *) -QWidget::acceptFocus(void) const -QWidget::setAcceptFocus(bool) -QWidget::create(unsigned int) -QWidget::create(void) -QWidget::internalMove(int, int) -QWidget::internalResize(int, int) -QWidget::internalSetGeometry(int, int, int, int) -QWidget::deferMove(const QPoint &) -QWidget::deferResize(const QSize &) -QWidget::cancelMove(voidQWidget::cancelResize(voidQWidget::sendDeferredEvents(voidQWidget::setBackgroundColorFromMode(voidQObject::name(void) const QWidget::setMask(QBitmapQWMatrix::setMatrix(float, float, float, float, float, float) -QWMatrix::map(float, float, float *, float *) const -QWMatrix::translate(float, float) -QWMatrix::scale(float, float) -QWMatrix::shear(float, float) -QWMatrix::rotate(float) -QBuffer::setBuffer(QArrayT<char>) -QDir::entryList(const char *, int, int) const -QDir::entryInfoList(const char *, int, int) const -QDir::mkdir(const char *, bool) const -QDir::rmdir(const char *, bool) const -QDir::exists(const char *, bool) -QDir::remove(const char *, bool) -QDir::rename(const char *, const char *, bool) -QDir::setCurrent(const char *) -QDir::match(const char *, const char *) -QDir::cleanDirPath(const char *) -QDir::isRelativePath(const char *) -QDir::setPath(const char *) -QDir::filePath(const char *, bool) const -QDir::absFilePath(const char *, bool) const -QDir::convertSeparators(const char *) -QDir::cd(const char *, bool) -QDir::setNameFilter(const char *) -QFile::setName(const char *) -QFile::exists(const char *) -QFile::remove(const char *) -QFileInfo::setFile(const QDir &, const char *) -QFileInfo::setFile(const char *) -QFile::exists(const char *) -QFileInfo::extension(void) const -QRegExp::match(const char *, int, int *) const -QRegExp::matchstr(unsigned short *, char *, char *) const -QString::resize(unsigned int) -QString::fill(char, int) -QString::find(const char *, int, bool) const -QString::findRev(const char *, int, bool) const -QString::leftJustify(unsigned int, char, bool) const -QString::rightJustify(unsigned int, char, bool) const -QString::insert(unsigned int, const char *) -QString::append(const char *) -QString::prepend(const char *) -QString::replace(const QRegExp &, const char *) -QString::replace(unsigned int, unsigned int, const char *) -QString::setStr(const char *) -QString::setNum(int) -QString::setNum(unsigned long) -QString::setExpand(unsigned int, char) -QButton::setText(const char *) -QComboBox::setEditText(const char *) -QComboBox::activated(const char *) -QComboBox::highlighted(const char *) -QComboBox::insertItem(const char *, int) -QComboBox::changeItem(const char *, int) -QComboBox::setStyle(GUIStyle) -QComboBox::setValidator(QValidator *) -QGroupBox::setTitle(const char *) -QHeader::moveAround(int, int) -QHeader::addLabel(const char *, int) -QHeader::setLabel(int, const char *, int) -QHeader::setOrientation(QHeader::Orientation) -QHeader::resizeEvent(QResizeEvent *QHeader::paintCell(QPainter *, int, intQHeader::setupPainter(QPainter *QHeader::cellHeight(intQHeader::cellWidth(int) QLabel::setText(const char *QLCDNumber::display(const char *) -QLCDNumber::resizeEvent(QResizeEvent *) -QLCDNumber::internalDisplay(const char *) -QLCDNumber::drawString(const char *, QPainter &, QBitArray *, bool) -QLCDNumber::drawDigit(const QPoint &, QPainter &, int, char, char) -QLCDNumber::drawSegment(const QPoint &, char, QPainter &, int, bool) -QLineEdit::event(QEvent *) -QLineEdit::setValidator(QValidator *) -QLineEdit::validateAndSet(const char *, int, int, int) -QLineEdit::setText(const char *) -QLineEdit::insert(const char *) -QLineEdit::textChanged(const char *) -QListBox::insertItem(const char *, int) -QListBox::inSort(const char *) -QListBox::changeItem(const char *, int) -QListBox::maxItemWidth(void) -QListBox::highlighted(const char *) -QListBoxItem::setText(const char *) -QListBox::selected(const char *) -QListViewItem::isExpandable(void) -QListView::setStyle(GUIStyle) -QMainWindow::addToolBar(QToolBar *, const char *, QMainWindow::ToolBarDock, bool) -QMenuData::insertItem(const QPixmap &, const QObject *, const char *, int) -QMenuData::insertItem(const QPixmap &, const char *, QPopupMenu *, int, int) -QMenuData::insertItem(const QPixmap &, const char *, const QObject *, const char *, int) -QMenuData::insertItem(const QPixmap &, const char *, const QObject *, const char *, int, int, int) -QMenuData::insertItem(const QPixmap &, const char *, int, int) -QMenuData::insertItem(const char *, QPopupMenu *, int, int) -QMenuData::insertItem(const char *, const QObject *, const char *, int) -QMenuData::insertItem(const char *, const QObject *, const char *, int, int, int) -QMenuData::insertItem(const char *, int, int) -QMenuData::changeItem(const QPixmap &, const char *, int) -QMenuData::changeItem(const char *, int) -QMenuData::insertAny(const char *, const QPixmap *, QPopupMenu *, int, int) -QMenuItem::setText(const char *) -QMultiLineEdit::textWidth(QString *) -QMultiLineEdit::repaintAll(void) -QMultiLineEdit::repaintDelayed(void) -QMultiLineEdit::setText(const char *) -QMultiLineEdit::append(const char *) -QPopupMenu::itemAtPos(const QPoint &) -QPopupMenu::actSig(int) -QRadioButton::mouseReleaseEvent(QMouseEvent *) -QRadioButton::keyPressEvent(QKeyEvent *) -QRangeControl::adjustValue(void) -QScrollBar::setOrientation(QScrollBar::Orientation) -QScrollView::horizontalScrollBar(void) -QScrollView::verticalScrollBar(void) -QScrollView::viewport(void) -QSlider::setOrientation(QSlider::Orientation) -QSpinBox::setSpecialValueText(const char *) -QSpinBox::setValidator(QValidator *) -QSpinBox::valueChanged(const char *) -QSpinBox::paletteChange(const QPalette &) -QSpinBox::enabledChange(bool) -QSpinBox::fontChange(const QFont &) -QSpinBox::styleChange(GUIStyle) -QSplitter::setOrientation(QSplitter::Orientation) -QSplitter::event(QEvent *) -QSplitter::childInsertEvent(QChildEvent *) -QSplitter::childRemoveEvent(QChildEvent *) -QSplitter::moveSplitter(short) -QSplitter::adjustPos(int) -QSplitter::splitterWidget(void) -QSplitter::startMoving(void) -QSplitter::moveTo(QPoint) -QSplitter::stopMoving(void) -QSplitter::newpos(void) const -QStatusBar::message(const char *) -QStatusBar::message(const char *, int) -QObject::name(void) const -QToolTipGroup::showTip(const char *) -QToolTip::add(QWidget *, const QRect &, const char *) -QToolTip::add(QWidget *, const QRect &, const char *, QToolTipGroup *, const char *) -QToolTip::add(QWidget *, const char *) -QToolTip::add(QWidget *, const char *, QToolTipGroup *, const char *) -QToolTip::tip(const QRect &, const char *) -QToolTip::tip(const QRect &, const char *, const char *) -QObject::name(void) const -QWhatsThis::add(QWidget *, const QPixmap &, const char *, const char *, bool) -QWhatsThis::add(QWidget *, const char *, bool) -QWhatsThis::textFor(QWidget *) -QWidgetStack::event(QEvent *) - -</pre> - -*/ diff --git a/include/q1xcompatibility.h b/include/q1xcompatibility.h deleted file mode 120000 index 1e32c94..0000000 --- a/include/q1xcompatibility.h +++ /dev/null @@ -1 +0,0 @@ -../src/kernel/q1xcompatibility.h
\ No newline at end of file diff --git a/include/qpaintd.h b/include/qpaintd.h deleted file mode 120000 index d1a6987..0000000 --- a/include/qpaintd.h +++ /dev/null @@ -1 +0,0 @@ -../src/compat/qpaintd.h
\ No newline at end of file diff --git a/include/qpaintdevicedefs.h b/include/qpaintdevicedefs.h deleted file mode 120000 index 6992fe9..0000000 --- a/include/qpaintdevicedefs.h +++ /dev/null @@ -1 +0,0 @@ -../src/kernel/qpaintdevicedefs.h
\ No newline at end of file diff --git a/src/compat/qpaintd.h b/src/compat/qpaintd.h deleted file mode 100644 index 9ec7362..0000000 --- a/src/compat/qpaintd.h +++ /dev/null @@ -1,25 +0,0 @@ -/**************************************************************************** -** -** Compatibility file - should only be included by legacy code. -** It #includes the file which obsoletes this one. -** -** Copyright (C) 1998-2008 Trolltech ASA. 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 ASA of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. -** -** Licensees holding valid Qt Professional Edition licenses may use this -** file in accordance with the Qt Professional Edition License Agreement -** provided with the Qt Professional Edition. -** -** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about the Professional Edition licensing, or see -** http://www.trolltech.com/qpl/ for QPL licensing information. -** -*****************************************************************************/ -#ifndef QPAINTD_H -#define QPAINTD_H -#include "qpaintdevice.h" -#endif diff --git a/src/compat/qpaintdc.h b/src/compat/qpaintdc.h deleted file mode 100644 index 60babce..0000000 --- a/src/compat/qpaintdc.h +++ /dev/null @@ -1,25 +0,0 @@ -/**************************************************************************** -** -** Compatibility file - should only be included by legacy code. -** It #includes the file which obsoletes this one. -** -** Copyright (C) 1998-2008 Trolltech ASA. 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 ASA of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. -** -** Licensees holding valid Qt Professional Edition licenses may use this -** file in accordance with the Qt Professional Edition License Agreement -** provided with the Qt Professional Edition. -** -** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about the Professional Edition licensing, or see -** http://www.trolltech.com/qpl/ for QPL licensing information. -** -*****************************************************************************/ -#ifndef QPAINTDC_H -#define QPAINTDC_H -#include "qpaintdevicedefs.h" -#endif diff --git a/src/kernel/q1xcompatibility.h b/src/kernel/q1xcompatibility.h deleted file mode 100644 index c28f33d..0000000 --- a/src/kernel/q1xcompatibility.h +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Various macros etc. to ease porting from Qt 1.x to 2.0. THIS FILE -** WILL CHANGE OR DISAPPEAR IN THE NEXT VERSION OF Qt. -** -** Created : 980824 -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the kernel module of the Qt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free Qt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.QPL -** included in the packaging of this file. Licensees holding valid Qt -** Commercial 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 WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef Q1XCOMPATIBILITY_H -#define Q1XCOMPATIBILITY_H - -#error "Compatibility with Qt 1.x is no longer guaranteed. Please" -#error "update your code (for example using qt20fix script). We" -#error "apologize for any inconvenience." - -#endif // Q1XCOMPATIBILITY_H diff --git a/src/kernel/qpaintdevicedefs.h b/src/kernel/qpaintdevicedefs.h deleted file mode 100644 index 63027dc..0000000 --- a/src/kernel/qpaintdevicedefs.h +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Definition of QPaintDevice constants and flags -** -** Created : 940721 -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the kernel module of the Qt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free Qt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.QPL -** included in the packaging of this file. Licensees holding valid Qt -** Commercial 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 WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef QPAINTDEVICEDEFS_H -#define QPAINTDEVICEDEFS_H - -#error "this file is gone. the #defines it contained are in" -#error "q1xcompatibility.h; the functionality is in QPaintDevice" -#error "and QPaintDeviceMetrics." - -#endif // QPAINTDEVICEDEFS_H diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri index 1b81a35..a106923 100644 --- a/src/kernel/qt_kernel.pri +++ b/src/kernel/qt_kernel.pri @@ -51,7 +51,6 @@ kernel { $$KERNEL_H/qobjectdict.h \ $$KERNEL_H/qobjectlist.h \ $$KERNEL_H/qpaintdevice.h \ - $$KERNEL_H/qpaintdevicedefs.h \ $$KERNEL_H/qpainter.h \ $$KERNEL_P/qpainter_p.h \ $$KERNEL_H/qpalette.h \ |