Update buildkey for GCC 5

[taken from RedHat Qt3 patches]
(cherry picked from commit 0d96f74958)

bin/qt20fix

@@ -0,0 +1,259 @@
+#!/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";
+}

bin/qtrename140

@@ -116,5 +116,7 @@ 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/;

config.tests/unix/cups.test

@@ -45,7 +45,7 @@ else
 	done
 	if [ -z "$F" ]; then
 	    CUPS=no
-	    [ "$VERBOSE" = "yes" ] && echo "  Could not find CUPS lib anywhere in $LIBDIRS"
+	    [ "VERBOSE" = "yes" ] && echo "  Could not find CUPS lib anywhere in $LIBDIRS"
 	fi
     done
 fi

config.tests/unix/nis.test

@@ -50,7 +50,7 @@ else
 	done
 	if [ -z "$F" ]; then
 	    NIS=no
-	    [ "$VERBOSE" = "yes" ] && echo "  Could not find NIS lib anywhere in $LIBDIRS"
+	    [ "VERBOSE" = "yes" ] && echo "  Could not find NIS lib anywhere in $LIBDIRS"
 	fi
     done
 fi

config.tests/x11/xinput.test

@@ -39,7 +39,7 @@ for LIBDIR in $LIBDIRS; do
 done
 if [ -z "$F" ]; then
     XINPUT=no
-    [ "$VERBOSE" = "yes" ] && echo "  Could not find XInput lib anywhere in $LIBDIRS"
+    [ "VERBOSE" = "yes" ] && echo "  Could not find XInput lib anywhere in $LIBDIRS"
 fi
 
 # check for XInput.h and the IRIX wacom.h

config.tests/x11/xrandr.test

@@ -43,17 +43,19 @@ if [ -z "$F" ]; then
 fi
     
 # check for Xrandr.h and randr.h
+XRANDR_H=
 RANDR_H=
 if [ "$XRANDR" = "yes" ]; then
-    INCS="X11/extensions/Xrandr.h X11/extensions/randr.h"
+    INC="X11/extensions/Xrandr.h"
+    INC2="X11/extensions/randr.h"
     XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[	]*=/ { s/[^=]*=[	 ]*//; s/-I/ /g; p; }' $XCONFIG`
     INCDIRS="$IN_INCDIRS $XDIRS /usr/include /include"
-    for INC in $INCS; do
     F=
     for INCDIR in $INCDIRS; do
-	    if [ -f $INCDIR/$INC ]; then
+	if [ -f $INCDIR/$INC -a -f $INCDIR/$INC2 ]; then
 	    F=yes
-		[ "$INC" = "X11/extensions/randr.h" ] && RANDR_H=$INCDIR/$INC
+	    XRANDR_H=$INCDIR/$INC
+	    RANDR_H=$INCDIR/$INC2
 	    [ "$VERBOSE" = "yes" ] && echo "  Found $INC in $INCDIR"
 	    break
 	fi
@@ -62,9 +64,7 @@ if [ "$XRANDR" = "yes" ]; then
     then
 	XRANDR=no
 	[ "$VERBOSE" = "yes" ] && echo "  Could not find $INC anywhere in $INCDIRS"
-	    break;
     fi
-    done
 fi
 
 # verify that we are using XRandR 1.x >= 1.1

configure

@@ -171,7 +171,7 @@ QT_INSTALL_PLUGINS=
 QT_INSTALL_DATA=
 QT_INSTALL_TRANSLATIONS=
 QT_INSTALL_SYSCONF=
-QT_INSTALL_SHARE=
+
 
 #-------------------------------------------------------------------------------
 # check SQL drivers and styles available in this package
@@ -241,7 +241,7 @@ while [ "$#" -gt 0 ]; do
 	    UNKNOWN_ARG=yes
 	fi
 	;;
-    -prefix|-sysshare|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey)
+    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey)
 	VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
 	shift
 	VAL=$1
@@ -371,9 +371,6 @@ while [ "$#" -gt 0 ]; do
     sysconfdir)
 	QT_INSTALL_SYSCONF="$VAL"
 	;;
-    sysshare)
-	QT_INSTALL_SHARE="$VAL"
-	;;
     qconfig)
 	CFG_QCONFIG="$VAL"
 	;;
@@ -943,8 +940,6 @@ done
 [ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS=$QT_INSTALL_PREFIX/translations
 # default PREFIX/etc/settings
 [ -z "$QT_INSTALL_SYSCONF" ]      && QT_INSTALL_SYSCONF=$QT_INSTALL_PREFIX/etc/settings
-# default PREFIX/share
-[ -z "$QT_INSTALL_SHARE" ]        && QT_INSTALL_SHARE=$QT_INSTALL_PREFIX/share
 
 # generate qconfig.cpp
 [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
@@ -961,7 +956,6 @@ static const char QT_INSTALL_PLUGINS     [267] = "qt_plgpath=$QT_INSTALL_PLUGINS
 static const char QT_INSTALL_DATA        [267] = "qt_datpath=$QT_INSTALL_DATA";
 static const char QT_INSTALL_TRANSLATIONS[267] = "qt_trnpath=$QT_INSTALL_TRANSLATIONS";
 static const char QT_INSTALL_SYSCONF     [267] = "qt_cnfpath=$QT_INSTALL_SYSCONF";
-static const char QT_INSTALL_SHARE       [267] = "qt_shapath=$QT_INSTALL_SHARE";
 
 /* strlen( "qt_xxxpath=" ) == 11 */
 const char *qInstallPath()             { return QT_INSTALL_PREFIX       + 11; }
@@ -973,7 +967,6 @@ const char *qInstallPathPlugins()      { return QT_INSTALL_PLUGINS      + 11; }
 const char *qInstallPathData()         { return QT_INSTALL_DATA         + 11; }
 const char *qInstallPathTranslations() { return QT_INSTALL_TRANSLATIONS + 11; }
 const char *qInstallPathSysconf()      { return QT_INSTALL_SYSCONF      + 11; }
-const char *qInstallPathShare()        { return QT_INSTALL_SHARE        + 11; }
 EOF
 
 # avoid unecessary rebuilds by copying only if qconfig.cpp has changed
@@ -1858,7 +1851,7 @@ if [ "$OPT_HELP" = "yes" ]; then
 
     cat <<EOF
 Usage:  $relconf [-prefix dir] [-buildkey key] [-docdir dir] [-headerdir dir]
-	[-libdir dir] [-bindir dir] [-plugindir dir ] [-datadir dir] [-sysshare dir]
+	[-libdir dir] [-bindir dir] [-plugindir dir ] [-datadir dir]
 	[-translationdir dir] [-sysconfdir dir] [-debug] [-release]
 	[-no-gif] [-qt-gif] [-no-sm] [-sm] [-qt-zlib] [-system-zlib]
 	[-qt-libpng] [-system-libpng]
@@ -1893,8 +1886,6 @@ Installation options:
                           (default PREFIX/translations)
     -sysconfdir dir ...  Settings used by Qt programs will be looked for in dir
                           (default PREFIX/etc/settings)
-    -sysshare dir .....  System shared data will be installed in dir
-                          (default PREFIX/share)
 
  You may use these options to turn on strict plugin loading.
 
@@ -2761,7 +2752,6 @@ QMAKE_VARS="$QMAKE_VARS \"libs.path=${QT_INSTALL_LIBS}\""
 QMAKE_VARS="$QMAKE_VARS \"bins.path=${QT_INSTALL_BINS}\""
 QMAKE_VARS="$QMAKE_VARS \"data.path=${QT_INSTALL_DATA}\""
 QMAKE_VARS="$QMAKE_VARS \"translations.path=${QT_INSTALL_TRANSLATIONS}\""
-QMAKE_VARS="$QMAKE_VARS \"share.path=${QT_INSTALL_SHARE}\""
 
 # turn off exceptions for the compilers that support it
 COMPILER=`echo $PLATFORM | cut -f 2- -d-`
@@ -2828,7 +2818,7 @@ g++*)
     3.*)
 	COMPILER_VERSION="3.*"
 	;;
-    [1-9][0-9]|[1-9][0-9].*|[7-9]|[4-9].*)
+    5.*|4.*)
 	COMPILER_VERSION="4.*"
 	;;
     *)
@@ -2836,17 +2826,6 @@ g++*)
     esac
     [ ! -z "$COMPILER_VERSION" ] && COMPILER="g++-${COMPILER_VERSION}"
     ;;
-clang)
-    # Clang
-    QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"`
-    COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null | sed 's,^[^0-9]*,,g'`
-    case "$COMPILER_VERSION" in
-    *)
-	# Consider clang as compatible with g++-4.x and therefore the same build-key is used
-	COMPILER="g++-4.*"
-	;;
-    esac
-    ;;
 *)
     #
     ;;

doc/html/desktop-example.html

@@ -95,7 +95,7 @@ void poly()
     int head = 0;
     int tail = -maxcurves + 2;
     <a href="qpointarray.html">QPointArray</a> *a = new <a href="qpointarray.html">QPointArray</a>[ maxcurves ];
-    QPointArray *p;
+    register QPointArray *p;
 <a name="x1760"></a>    <a href="qrect.html">QRect</a> r = d-&gt;<a href="qwidget.html#rect">rect</a>();                        // desktop rectangle
 
     int i;

doc/html/index

@@ -63,6 +63,7 @@
 "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
@@ -118,6 +119,7 @@
 "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

doc/html/porting.html

@@ -217,9 +217,12 @@ previously disabled, please check these macro variables:
 <li> <tt>CHECK_NULL</tt> becomes <tt>QT_CHECK_NULL</tt>
 <li> <tt>CHECK_MATH</tt> becomes <tt>QT_CHECK_MATH</tt>
 </ul>
-<p> The name of some debugging macro functions has been changed:
+<p> The name of some debugging macro functions has been changed as well
+but source compatibility should not be affected if the macro variable
+<tt>QT_CLEAN_NAMESPACE</tt> is not defined:
 <p> <ul>
 <li> <tt>ASSERT</tt> becomes <tt>Q_ASSERT</tt>
+<li> <tt>CHECK_PTR</tt> becomes <tt>Q_CHECK_PTR</tt>
 </ul>
 <p> For the record, undocumented macro variables that are not part of the API
 have been changed:

doc/html/porting2.html

@@ -0,0 +1,965 @@
+<!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&nbsp;Classes</font></a>
+ | <a href="mainclasses.html">
+<font color="#004faf">Main&nbsp;Classes</font></a>
+ | <a href="annotated.html">
+<font color="#004faf">Annotated</font></a>
+ | <a href="groups.html">
+<font color="#004faf">Grouped&nbsp;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 &amp;, int &amp;)</pre>
+ 
+<li><pre> QIntValidator::validate(QString &amp;, int &amp;)</pre>
+ 
+<li><pre> QValidator::fixup(QString &amp;)</pre>
+ 
+<li><pre> QSlider::paintSlider(QPainter *, const <a href="qrect.html">QRect</a> &amp;)</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
+'&#92;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>&amp; )
+</pre>
+ 
+if you use string, like this:
+<pre>
+    void myclass::dostuffwithtext( const string&amp; 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>&amp; 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>&amp;)</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&lt;&lt;(QTextStream&amp;, QChar&amp;)</pre>
+  does not skip whitespace.
+<pre> operator&lt;&lt;(QTextStream&amp;, char&amp;)</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> &amp; )</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 &copy; 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>

doc/html/qcstring-h.html

@@ -117,6 +117,20 @@ Q_EXPORT int qstricmp( const char *, const char * );
 
 Q_EXPORT int qstrnicmp( const char *, const char *, uint len );
 
+#ifndef QT_CLEAN_NAMESPACE
+Q_EXPORT inline uint cstrlen( const char *str )
+{ return (uint)strlen(str); }
+
+Q_EXPORT inline char *cstrcpy( char *dst, const char *src )
+{ return strcpy(dst,src); }
+
+Q_EXPORT inline int cstrcmp( const char *str1, const char *str2 )
+{ return strcmp(str1,str2); }
+
+Q_EXPORT inline int cstrncmp( const char *str1, const char *str2, uint len )
+{ return strncmp(str1,str2,len); }
+#endif
+
 
 // qChecksum: Internet checksum
 

doc/html/qcursor-h.html

@@ -158,6 +158,19 @@ private:
 };
 
 
+#if !defined(QT_CLEAN_NAMESPACE)
+// CursorShape is defined in X11/X.h
+#ifdef CursorShape
+#define X_CursorShape CursorShape
+#undef CursorShape
+#endif
+typedef Qt::CursorShape QCursorShape;
+#ifdef X_CursorShape
+#define CursorShape X_CursorShape
+#endif
+#endif
+
+
 /*****************************************************************************
   QCursor stream functions
  *****************************************************************************/

doc/html/qglobal-h.html

@@ -734,6 +734,16 @@ inline int qRound( double d )
 // Size-dependent types (architechture-dependent byte order)
 //
 
+#if !defined(QT_CLEAN_NAMESPACE)
+// source compatibility with Qt 1.x
+typedef signed char		INT8;		// 8 bit signed
+typedef unsigned char		UINT8;		// 8 bit unsigned
+typedef short			INT16;		// 16 bit signed
+typedef unsigned short		UINT16;		// 16 bit unsigned
+typedef int			INT32;		// 32 bit signed
+typedef unsigned int		UINT32;		// 32 bit unsigned
+#endif
+
 typedef signed char		Q_INT8;		// 8 bit signed
 typedef unsigned char		Q_UINT8;	// 8 bit unsigned
 typedef short			Q_INT16;	// 16 bit signed
@@ -813,6 +823,9 @@ class QDataStream;
 #ifndef QT_MODULE_DIALOGS
 # define QT_NO_DIALOG
 #endif
+#ifndef QT_MODULE_ICONVIEW
+# define QT_NO_ICONVIEW
+#endif
 #ifndef QT_MODULE_WORKSPACE
 # define QT_NO_WORKSPACE
 #endif
@@ -1010,6 +1023,28 @@ Q_EXPORT void qFatal( const char *, ... )	// print fatal message and exit
 
 Q_EXPORT void qSystemWarning( const char *, int code = -1 );
 
+#if !defined(QT_CLEAN_NAMESPACE) 		// compatibility with Qt 1
+
+Q_EXPORT void debug( const char *, ... )	// print debug message
+#if defined(Q_CC_GNU) && !defined(__INSURE__)
+    __attribute__ ((format (printf, 1, 2)))
+#endif
+;
+
+Q_EXPORT void warning( const char *, ... )	// print warning message
+#if defined(Q_CC_GNU) && !defined(__INSURE__)
+    __attribute__ ((format (printf, 1, 2)))
+#endif
+;
+
+Q_EXPORT void fatal( const char *, ... )	// print fatal message and exit
+#if defined(Q_CC_GNU) && !defined(__INSURE__)
+    __attribute__ ((format (printf, 1, 2)))
+#endif
+;
+
+#endif // QT_CLEAN_NAMESPACE
+
 
 #if !defined(Q_ASSERT)
 #  if defined(QT_CHECK_STATE)
@@ -1040,6 +1075,12 @@ Q_EXPORT bool qt_check_pointer( bool c, const char *, int );
 #  define Q_CHECK_PTR(p)
 #endif
 
+#if !defined(QT_NO_COMPAT)			// compatibility with Qt 2
+#  if !defined(CHECK_PTR)
+#    define CHECK_PTR(x) Q_CHECK_PTR(x)
+#  endif
+#endif // QT_NO_COMPAT
+
 enum QtMsgType { QtDebugMsg, QtWarningMsg, QtFatalMsg };
 
 typedef void (*QtMsgHandler)(QtMsgType, const char *);

doc/html/qiconview-h.html

@@ -91,6 +91,12 @@ body { background: #ffffff; color: black; }
 
 #ifndef QT_NO_ICONVIEW
 
+#if !defined( QT_MODULE_ICONVIEW ) || defined( QT_INTERNAL_ICONVIEW )
+#define QM_EXPORT_ICONVIEW
+#else
+#define QM_EXPORT_ICONVIEW Q_EXPORT
+#endif
+
 class QIconView;
 class QPainter;
 class QMimeSource;
@@ -108,7 +114,7 @@ class QIconDragPrivate;
 
 #ifndef QT_NO_DRAGANDDROP
 
-class Q_EXPORT QIconDragItem
+class QM_EXPORT_ICONVIEW QIconDragItem
 {
 public:
     QIconDragItem();
@@ -122,7 +128,7 @@ private:
 
 };
 
-class Q_EXPORT QIconDrag : public QDragObject
+class QM_EXPORT_ICONVIEW QIconDrag : public QDragObject
 {
     Q_OBJECT
 public:
@@ -152,7 +158,7 @@ private:
 class QIconViewToolTip;
 class QIconViewItemPrivate;
 
-class Q_EXPORT QIconViewItem : public Qt
+class QM_EXPORT_ICONVIEW QIconViewItem : public Qt
 {
     friend class QIconView;
     friend class QIconViewToolTip;
@@ -295,7 +301,7 @@ private:
 
 class QIconViewPrivate;          /* don't touch */
 
-class Q_EXPORT QIconView : public QScrollView
+class QM_EXPORT_ICONVIEW QIconView : public QScrollView
 {
     friend class QIconViewItem;
     friend class QIconViewPrivate;
@@ -522,7 +528,12 @@ private:
 	DirLeft,
 	DirRight
     };
-    QIconViewItem* findItem(Direction dir, const QIconViewItem *fromItem) const;
+    QIconViewItem* findItem( Direction dir,
+			     const QPoint &relativeTo,
+			     const QRect &searchRect ) const;
+    bool neighbourItem( Direction dir,
+			const QPoint &relativeTo,
+			const QIconViewItem *item ) const;
     QBitmap mask( QPixmap *pix ) const;
 
     QIconViewPrivate *d;

doc/html/qnamespace-h.html

@@ -652,11 +652,6 @@ public:
 	Key_LaunchD  = 0x10af,
 	Key_LaunchE  = 0x10b0,
 	Key_LaunchF  = 0x10b1,
-	Key_MonBrightnessUp        = 0x010b2,
-	Key_MonBrightnessDown      = 0x010b3,
-	Key_KeyboardLightOnOff     = 0x010b4,
-	Key_KeyboardBrightnessUp   = 0x010b5,
-	Key_KeyboardBrightnessDown = 0x010b6,
 
 	Key_MediaLast = 0x1fff,
 

doc/html/qptrlist-h.html

@@ -139,7 +139,6 @@ public:
     uint  containsRef( const type *d ) const
 					{ return QGList::containsRef((QPtrCollection::Item)d); }
     bool replace( uint i, const type *d ) { return QGList::replaceAt( i, (QPtrCollection::Item)d ); }
-    type *operator[]( uint i )		{ return (type *)QGList::at(i); }
     type *at( uint i )			{ return (type *)QGList::at(i); }
     int	  at() const			{ return QGList::at(); }
     type *current()  const		{ return (type *)QGList::get(); }

doc/html/qt.dcf

@@ -9858,6 +9858,9 @@
 <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>
@@ -10074,6 +10077,9 @@
 <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>

doc/html/qwidget.html

@@ -1177,7 +1177,7 @@ See the <a href="qwidget.html#geometry-prop">"geometry"</a> property for details
 <h3 class=fn>void <a name="grabKeyboard"></a>QWidget::grabKeyboard ()
 </h3>
 Grabs the keyboard input.
-<p> This widget receives all keyboard events until <a href="#releaseKeyboard">releaseKeyboard</a>()
+<p> This widget reveives all keyboard events until <a href="#releaseKeyboard">releaseKeyboard</a>()
 is called; other widgets get no keyboard events at all. Mouse
 events are not affected. Use <a href="#grabMouse">grabMouse</a>() if you want to grab that.
 <p> The focus widget is not affected, except that it doesn't receive

doc/html/qwindowdefs-h.html

@@ -224,6 +224,12 @@ typedef void (*QtCleanUpFunction)();
 Q_EXPORT void qAddPostRoutine( QtCleanUpFunction );
 Q_EXPORT void qRemovePostRoutine( QtCleanUpFunction );
 
+#if !defined(QT_CLEAN_NAMESPACE)
+// source compatibility with Qt 2.x
+typedef QtCleanUpFunction Q_CleanUpFunction;
+#endif
+
+
 #endif // QWINDOWDEFS_H
 </pre>
 <!-- eof -->

doc/html/removed20.html

@@ -0,0 +1,379 @@
+<!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&nbsp;Classes</font></a>
+ | <a href="mainclasses.html">
+<font color="#004faf">Main&nbsp;Classes</font></a>
+ | <a href="annotated.html">
+<font color="#004faf">Annotated</font></a>
+ | <a href="groups.html">
+<font color="#004faf">Grouped&nbsp;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 &copy; 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>

doc/html/titleindex

@@ -74,6 +74,7 @@ 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
@@ -145,6 +146,7 @@ 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

doc/man/README

@@ -44,5 +44,6 @@ Debian distribution
   man1/mergetr.1
   man1/msg2qm.1
   man1/qembed.1
+  man1/qt20fix.1
   man1/qtconfig.1
   man1/qvfb.1

doc/man/man1/linguist.1

@@ -2,7 +2,7 @@
 .SH "NAME"
 linguist \- Translation tool for Qt.
 
-.SH "SYNOPSIS"
+.SH "SYNPOSIS"
 .B linguist
 [
 .I TRANSLATION

doc/man/man1/lrelease.1

@@ -98,4 +98,4 @@ lrelease gnomovision_*.ts
 .SH "SEE ALSO"
 .BR lupdate (1)
 and
-.BR https://trinitydesktop.org/docs/qt3/i18n.html
+.BR http://doc.trolltech.com/i18n.html

doc/man/man1/lupdate.1

@@ -104,4 +104,4 @@ lupdate *.cpp *.h *.ui -ts gnomovision_dk.ts
 .SH "SEE ALSO"
 .BR lrelease (1)
 and
-.BR https://trinitydesktop.org/docs/qt3/i18n.html
+.BR http://doc.trolltech.com/i18n.html

doc/man/man1/makeqpf.1

@@ -10,24 +10,17 @@ that assists producing QPF files from TTF and BDF files.
 
 
 .SH "SYNTAX"
-.LP
-makeqpf [ \fI\-A\fP ] [ \fI\-f spec\-file \fP] [ \fIfont ... \fP]
-
-\-A
-  Render and save all fonts in fontdir
+qembed [ \fIgeneral\-files\fP ] <[ \fI\-\-images image\-files \fP]>
 .br 
-\-f spec\-file
-  File of lines:
-    fontname character-ranges
-  eg.
-    smoothtimes 0\-ff,20a0\-20af
-.br
-font
-  Font to render and save
+
+general\-files 
+  These files can be any type of file. 
+\-\-images image\-files 
+  These files must be in image formats supported by Qt. 
 
 .SH "FILES"
 .LP 
-\fI$(QTDIR)/lib/fonts/fontdir\fP 
+\fI$(QTDIR)/etc/fonts/fontdir\fP 
 .SH "AUTHORS"
 .LP 
 TrollTech <http://www.trolltech.com/>

doc/man/man1/moc.1

@@ -34,7 +34,7 @@ when required, so you will not need to use the
 directly.
 .PP
 In brief, the meta object system is a structure used by Qt (see
-.BR https://trinitydesktop.org/docs/qt3/ ")"
+.BR http://doc.trolltech.com ")"
 for component programming and run time type information.  It adds
 properties and inheritance information to (some) classes and
 provides a new type of communication between those instances of those
@@ -446,4 +446,4 @@ public:
 .SH "SEE ALSO"
 .BR http://www.trolltech.com ", "
 .BR "C++ ARM, section r.11.3" " (for the answer to the quiz), and"
-.BR https://trinitydesktop.org/docs/qt3/ " (for complete Qt documentation)."
+.BR http://doc.trolltech.com " (for complete Qt documentation)."

doc/man/man1/qt20fix.1

@@ -0,0 +1,32 @@
+.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/>

doc/man/man1/uic.1

@@ -131,6 +131,6 @@ doesn't care, so you can use .C, .cc, .CC, .cxx or even .c++ if
 you prefer.)
 .PP
 .SH "SEE ALSO"
-.BR https://trinitydesktop.org/docs/qt3/ " "
+.BR http://www.trolltech.com/ " "
 .SH AUTHOR
 Trolltech ASA <info@trolltech.com>

doc/porting3.doc

@@ -165,10 +165,13 @@ previously disabled, please check these macro variables:
 \i \c CHECK_MATH becomes \c QT_CHECK_MATH
 \endlist
 
-The name of some debugging macro functions has been changed:
+The name of some debugging macro functions has been changed as well
+but source compatibility should not be affected if the macro variable
+\c QT_CLEAN_NAMESPACE is not defined:
 
 \list
 \i \c ASSERT becomes \c Q_ASSERT
+\i \c CHECK_PTR becomes \c Q_CHECK_PTR
 \endlist
 
 For the record, undocumented macro variables that are not part of the API

examples/demo/demo.pro

@@ -3,6 +3,7 @@ TARGET		= demo
 
 CONFIG		+= qt warn_off release
 unix:LIBS	+= -lm
+DEFINES		+= QT_INTERNAL_ICONVIEW
 DEFINES		+= QT_INTERNAL_WORKSPACE
 DEFINES		+= QT_INTERNAL_CANVAS
 INCLUDEPATH	+= .

examples/demo/opengl/fbm.c

@@ -106,7 +106,7 @@ float noise3(float vec[3])
 {
     int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
     float rx0, rx1, ry0, ry1, rz0, rz1, *q, sy, sz, a, b, c, d, t, u, v;
-    int i, j;
+    register int i, j;
 
     if (start) {
 	start = 0;

examples/demo/opengl/glinfo_x11.cpp

@@ -7,6 +7,8 @@
 **
 *****************************************************************************/
 
+#define QT_CLEAN_NAMESPACE // avoid clashes with Xmd.h
+
 #include <qstringlist.h>
 #include <qgl.h>
 #include "glinfo.h"

examples/desktop/desktop.cpp

@@ -53,7 +53,7 @@ void poly()
     int head = 0;
     int tail = -maxcurves + 2;
     QPointArray *a = new QPointArray[ maxcurves ];
-    QPointArray *p;
+    register QPointArray *p;
     QRect r = d->rect();			// desktop rectangle
 
     int i;

examples/i18n/i18n.pro

@@ -9,10 +9,10 @@ REQUIRES	= full-config
 HEADERS		= mywidget.h
 SOURCES		= main.cpp \
 		  mywidget.cpp
-TRANSLATIONS	= mywidget.ts \
-		  mywidget_cs.ts \
+TRANSLATIONS	= mywidget_cs.ts \
 		  mywidget_de.ts \
 		  mywidget_el.ts \
+		  mywidget_en.ts \
 		  mywidget_eo.ts \
 		  mywidget_fr.ts \
 		  mywidget_it.ts \

examples/i18n/mywidget_ar.ts

@@ -1,71 +1,73 @@
 <!DOCTYPE TS><TS>
-<!-- Translation achieved by Arabeyes Project (http://www.arabeyes.org) -->
-<!-- Translator(s): -->
-<!-- Youcef Rabah Rahal <rahal@arabeyes.org> -->
 <context>
     <name>MyWidget</name>
+    <message>
+        <source>E&amp;xit...</source>
+        <translation type="obsolete">&amp;Esci...</translation>
+    </message>
     <message>
         <source>First</source>
-        <translation>الأوّل</translation>
+        <translation>Ø£Ù^Ù?</translation>
     </message>
     <message>
         <source>Internationalization Example</source>
-        <translation>مثال عن التّدويل</translation>
+        <translation>Ù?ثاÙ? اÙ?تدÙ^ÙSÙ?</translation>
     </message>
     <message>
         <source>Isometric</source>
-        <translation>متساوي المقاييس</translation>
+        <translation>Ù?تÙ?اثÙ?</translation>
     </message>
     <message>
         <source>Language: English</source>
-        <translation>اللّغة: عربية</translation>
+        <translation>اÙ?Ù?غة: اÙ?عربÙSØ©</translation>
     </message>
     <message>
         <source>Oblique</source>
-        <translation>مائل</translation>
+        <translation>Ù?صÙ?ت</translation>
     </message>
     <message>
         <source>Perspective</source>
-        <translation>منظور</translation>
+        <translation>Ù?Ù?ظÙ^ر</translation>
     </message>
     <message>
         <source>Second</source>
-        <translation>الثّاني</translation>
+        <translation type="unfinished">ثاÙ?Ù?</translation>
     </message>
     <message>
         <source>The Main Window</source>
-        <translation>النّافذة الرّئيسية</translation>
+        <translation type="unfinished">اÙ?Ù?اÙ?ذة اÙ?رئÙSسÙSØ©</translation>
     </message>
     <message>
         <source>Third</source>
-        <translation>الثّالث</translation>
+        <translation type="unfinished">ثاÙ?Ø«</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>منظر</translation>
+        <translation type="unfinished">Ù?رئÙ?</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>&amp;خروج</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ctrl+Q</source>
-        <translation>تحكّم+Q</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;ملفّ</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QVDialog</name>
     <message>
         <source>OK</source>
-        <translation>موافقة</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>إلغاء</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
+

include/q1xcompatibility.h

@@ -0,0 +1 @@
+../src/kernel/q1xcompatibility.h

include/qiconview.h

@@ -1 +1 @@
-../src/widgets/qiconview.h
+../src/iconview/qiconview.h

include/qpaintd.h

@@ -0,0 +1 @@
+../src/compat/qpaintd.h

include/qpaintdc.h

@@ -0,0 +1 @@
+../src/compat/qpaintdc.h

include/qpaintdevicedefs.h

@@ -0,0 +1 @@
+../src/kernel/qpaintdevicedefs.h

mkspecs/cygwin-g++/qplatformdefs.h

@@ -5,8 +5,22 @@
 
 #include "qglobal.h"
 
-#ifndef _DEFAULT_SOURCE
-#  define _DEFAULT_SOURCE
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>

mkspecs/freebsd-clang/qmake.conf

@@ -1,81 +0,0 @@
-#
-#
-# qmake configuration for freebsd-clang
-#
-
-MAKEFILE_GENERATOR	= UNIX
-TEMPLATE		= app
-CONFIG			+= qt warn_on release thread link_prl
-
-QMAKE_CC		= clang
-QMAKE_LEX		= flex
-QMAKE_LEXFLAGS		=
-QMAKE_YACC		= yacc
-QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -pipe -fvisibility=hidden -fvisibility-inlines-hidden
-QMAKE_CFLAGS_DEPS	= -M
-QMAKE_CFLAGS_WARN_ON	= -Wall -W
-QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
-QMAKE_CFLAGS_DEBUG	= -g
-QMAKE_CFLAGS_SHLIB	= -fPIC
-QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD	= -pthread -D_THREAD_SAFE
-
-QMAKE_CXX		= clang++
-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
-
-# Addon software goes into /usr/local on the BSDs, by default we will look there
-QMAKE_INCDIR		= /usr/local/include
-QMAKE_LIBDIR		= /usr/local/lib
-QMAKE_INCDIR_X11	= /usr/X11R6/include
-QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-QMAKE_INCDIR_QT		= $(QTDIR)/include
-QMAKE_LIBDIR_QT		= $(QTDIR)/lib
-QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-QMAKE_LINK		= clang++
-QMAKE_LINK_SHLIB	= clang++
-QMAKE_LFLAGS		=
-QMAKE_LFLAGS_RELEASE	=
-QMAKE_LFLAGS_DEBUG	=
-QMAKE_LFLAGS_SHLIB	= -shared
-QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME	= -Wl,-soname,
-QMAKE_LFLAGS_THREAD	= -pthread
-QMAKE_RPATH		= -Wl,-rpath,
-
-QMAKE_LIBS		=
-QMAKE_LIBS_DYNLOAD	=
-QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
-QMAKE_LIBS_QT		= -lqt
-QMAKE_LIBS_QT_THREAD	= -lqt-mt
-QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
-QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
-QMAKE_LIBS_THREAD	=
-
-QMAKE_MOC		= $(QTDIR)/bin/moc
-QMAKE_UIC		= $(QTDIR)/bin/uic
-
-QMAKE_AR		= ar cqs
-QMAKE_RANLIB		=
-
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p

mkspecs/freebsd-clang/qplatformdefs.h

@@ -1,103 +0,0 @@
-#ifndef QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#ifdef QT_THREAD_SUPPORT
-#include <pthread.h>
-#endif
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-// DNS header files are not fully covered by X/Open specifications.
-// In particular nothing is said about res_* :/
-// On BSDs header files <netinet/in.h> and <arpa/nameser.h> are not
-// included by <resolv.h>. Note that <arpa/nameser.h> must be included
-// before <resolv.h>.
-#include <netinet/in.h>
-#define class c_class // FreeeBSD 3.x
-#include <arpa/nameser.h>
-#undef class
-#include <resolv.h>
-
-
-#if !defined(QT_NO_COMPAT)
-#define QT_STATBUF		struct stat
-#define QT_STATBUF4TSTAT	struct stat
-#define QT_STAT			::stat
-#define QT_FSTAT		::fstat
-#define QT_STAT_REG		S_IFREG
-#define QT_STAT_DIR		S_IFDIR
-#define QT_STAT_MASK		S_IFMT
-#define QT_STAT_LNK		S_IFLNK
-#define QT_FILENO		fileno
-#define QT_OPEN			::open
-#define QT_CLOSE		::close
-#define QT_LSEEK		::lseek
-#define QT_READ			::read
-#define QT_WRITE		::write
-#define QT_ACCESS		::access
-#define QT_GETCWD		::getcwd
-#define QT_CHDIR		::chdir
-#define QT_MKDIR		::mkdir
-#define QT_RMDIR		::rmdir
-#define QT_OPEN_RDONLY		O_RDONLY
-#define QT_OPEN_WRONLY		O_WRONLY
-#define QT_OPEN_RDWR		O_RDWR
-#define QT_OPEN_CREAT		O_CREAT
-#define QT_OPEN_TRUNC		O_TRUNC
-#define QT_OPEN_APPEND		O_APPEND
-#endif
-
-#define QT_SIGNAL_RETTYPE	void
-#define QT_SIGNAL_ARGS		int
-#define QT_SIGNAL_IGNORE	SIG_IGN
-
-#if !defined(__DragonFly__) && __FreeBSD_version < 400000
-// FreeBSD 1.0 - 3.5.1
-#  define QT_SOCKLEN_T		int
-#else
-// FreeBSD 4.0 - 5.0
-#  define QT_SOCKLEN_T		socklen_t
-#endif
-
-#define QT_SNPRINTF		::snprintf
-#define QT_VSNPRINTF		::vsnprintf
-
-// Older FreeBSD versions may still use the a.out format instead of ELF.
-// From the FreeBSD man pages:
-// 	In previous implementations, it was necessary to prepend an
-// 	underscore to all external symbols in order to gain symbol
-// 	compatibility with object code compiled from the C language.
-// 	This is still the case when using the (obsolete) -aout option to
-// 	the C language compiler.
-#ifndef __ELF__
-#define QT_AOUT_UNDERSCORE
-#endif
-
-
-#endif // QPLATFORMDEFS_H

mkspecs/freebsd-g++/qmake.conf

@@ -12,7 +12,7 @@ QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -pipe -fvisibility=hidden -fvisibility-inlines-hidden
+QMAKE_CFLAGS		= -pipe
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w

mkspecs/hurd-g++/qplatformdefs.h

@@ -5,8 +5,22 @@
 
 #include "qglobal.h"
 
-#ifndef _DEFAULT_SOURCE
-#  define _DEFAULT_SOURCE
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
 #endif
 
 

mkspecs/linux-clang/qmake.conf

@@ -1,89 +0,0 @@
-#
-#
-# qmake configuration for linux-clang
-#
-
-MAKEFILE_GENERATOR	= UNIX
-TEMPLATE		= app
-CONFIG			+= qt warn_on release incremental link_prl thread
-QMAKE_INCREMENTAL_STYLE = sublib
-
-QMAKE_CC		= clang
-QMAKE_LEX		= flex
-QMAKE_LEXFLAGS		=
-QMAKE_YACC		= yacc
-QMAKE_YACCFLAGS		= -d
-QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
-QMAKE_YACC_HEADER       = $base.tab.h
-QMAKE_YACC_SOURCE       = $base.tab.c
-QMAKE_CFLAGS		= -pipe -g -fvisibility=hidden -fvisibility-inlines-hidden
-QMAKE_CFLAGS_DEPS	= -M
-QMAKE_CFLAGS_WARN_ON	= -Wall -W
-QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
-QMAKE_CFLAGS_DEBUG	= -O0
-QMAKE_CFLAGS_SHLIB	= -fPIC
-QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD	= -D_REENTRANT
-
-QMAKE_CXX		= clang++
-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR		=
-QMAKE_LIBDIR		=
-QMAKE_INCDIR_X11	= /usr/X11R6/include
-QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-QMAKE_INCDIR_QT		= $(QTDIR)/include
-QMAKE_LIBDIR_QT		= $(QTDIR)/lib
-QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-
-QMAKE_LINK		= clang++
-QMAKE_LINK_SHLIB	= clang++
-QMAKE_LFLAGS		= -luuid
-QMAKE_LFLAGS_RELEASE	=
-QMAKE_LFLAGS_DEBUG	=
-QMAKE_LFLAGS_SHLIB	= -shared
-QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME	= -Wl,-soname,
-QMAKE_LFLAGS_THREAD	=
-QMAKE_RPATH		= -Wl,-rpath,
-
-QMAKE_LIBS		= -luuid
-QMAKE_LIBS_DYNLOAD	= -ldl
-QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
-QMAKE_LIBS_NIS		= -lnsl
-QMAKE_LIBS_QT		= -lqt
-QMAKE_LIBS_QT_THREAD	= -lqt-mt
-QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
-QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
-QMAKE_LIBS_THREAD	= -lpthread
-
-QMAKE_MOC		= $(QTDIR)/bin/moc
-QMAKE_UIC		= $(QTDIR)/bin/uic
-
-QMAKE_AR		= ar cqs
-QMAKE_RANLIB		=
-
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE         = $(COPY)
-QMAKE_COPY_DIR          = $(COPY) -r
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_STRIP             =
-QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p

mkspecs/linux-clang/qplatformdefs.h

@@ -1,89 +0,0 @@
-#ifndef QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-#ifndef _DEFAULT_SOURCE
-#  define _DEFAULT_SOURCE
-#endif
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#ifdef QT_THREAD_SUPPORT
-#include <pthread.h>
-#endif
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-// DNS header files are not fully covered by X/Open specifications.
-// In particular nothing is said about res_* :/
-// Header files <netinet/in.h> and <arpa/nameser.h> are not included
-// by <resolv.h> on older versions of the GNU C library. Note that
-// <arpa/nameser.h> must be included before <resolv.h>.
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-
-
-#if !defined(QT_NO_COMPAT)
-#define QT_STATBUF		struct stat
-#define QT_STATBUF4TSTAT	struct stat
-#define QT_STAT			::stat
-#define QT_FSTAT		::fstat
-#define QT_STAT_REG		S_IFREG
-#define QT_STAT_DIR		S_IFDIR
-#define QT_STAT_MASK		S_IFMT
-#define QT_STAT_LNK		S_IFLNK
-#define QT_FILENO		fileno
-#define QT_OPEN			::open
-#define QT_CLOSE		::close
-#define QT_LSEEK		::lseek
-#define QT_READ			::read
-#define QT_WRITE		::write
-#define QT_ACCESS		::access
-#define QT_GETCWD		::getcwd
-#define QT_CHDIR		::chdir
-#define QT_MKDIR		::mkdir
-#define QT_RMDIR		::rmdir
-#define QT_OPEN_RDONLY		O_RDONLY
-#define QT_OPEN_WRONLY		O_WRONLY
-#define QT_OPEN_RDWR		O_RDWR
-#define QT_OPEN_CREAT		O_CREAT
-#define QT_OPEN_TRUNC		O_TRUNC
-#define QT_OPEN_APPEND		O_APPEND
-#endif
-
-#define QT_SIGNAL_RETTYPE	void
-#define QT_SIGNAL_ARGS		int
-#define QT_SIGNAL_IGNORE	SIG_IGN
-
-#define QT_SOCKLEN_T		socklen_t
-
-#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
-#define QT_SNPRINTF		::snprintf
-#define QT_VSNPRINTF		::vsnprintf
-#endif
-
-#define QT_MITSHM
-
-#endif // QPLATFORMDEFS_H

mkspecs/linux-cxx/qplatformdefs.h

@@ -5,8 +5,22 @@
 
 #include "qglobal.h"
 
-#ifndef _DEFAULT_SOURCE
-#  define _DEFAULT_SOURCE
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>
@@ -77,7 +91,11 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
+#else
+#define QT_SOCKLEN_T		int
+#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-ecc-64/qplatformdefs.h

@@ -5,8 +5,22 @@
 
 #include "qglobal.h"
 
-#ifndef _DEFAULT_SOURCE
-#  define _DEFAULT_SOURCE
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>
@@ -77,7 +91,11 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
+#else
+#define QT_SOCKLEN_T		int
+#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-g++-32/qplatformdefs.h

@@ -1,5 +1,26 @@
-#ifndef _DEFAULT_SOURCE
-#  define _DEFAULT_SOURCE
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>
@@ -70,7 +91,11 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
+#else
+#define QT_SOCKLEN_T		int
+#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-g++-64/qplatformdefs.h

@@ -5,8 +5,22 @@
 
 #include "qglobal.h"
 
-#ifndef _DEFAULT_SOURCE
-#  define _DEFAULT_SOURCE
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>
@@ -77,7 +91,11 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
+#else
+#define QT_SOCKLEN_T		int
+#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-g++-sparc/qplatformdefs.h

@@ -5,8 +5,22 @@
 
 #include "qglobal.h"
 
-#ifndef _DEFAULT_SOURCE
-#  define _DEFAULT_SOURCE
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>
@@ -77,7 +91,11 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
+#else
+#define QT_SOCKLEN_T		int
+#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-g++/qplatformdefs.h

@@ -5,8 +5,22 @@
 
 #include "qglobal.h"
 
-#ifndef _DEFAULT_SOURCE
-#  define _DEFAULT_SOURCE
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>
@@ -77,7 +91,11 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
+#else
+#define QT_SOCKLEN_T		int
+#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-icc/qplatformdefs.h

@@ -5,8 +5,22 @@
 
 #include "qglobal.h"
 
-#ifndef _DEFAULT_SOURCE
-#  define _DEFAULT_SOURCE
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>
@@ -77,7 +91,11 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
+#else
+#define QT_SOCKLEN_T		int
+#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-kcc/qplatformdefs.h

@@ -5,8 +5,22 @@
 
 #include "qglobal.h"
 
-#ifndef _DEFAULT_SOURCE
-#  define _DEFAULT_SOURCE
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>
@@ -80,7 +94,11 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
+#else
+#define QT_SOCKLEN_T		int
+#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-kylix/qplatformdefs.h

@@ -5,8 +5,22 @@
 
 #include "qglobal.h"
 
-#ifndef _DEFAULT_SOURCE
-#  define _DEFAULT_SOURCE
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>
@@ -77,7 +91,11 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
+#else
+#define QT_SOCKLEN_T		int
+#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/linux-pgcc/qplatformdefs.h

@@ -5,8 +5,22 @@
 
 #include "qglobal.h"
 
-#ifndef _DEFAULT_SOURCE
-#  define _DEFAULT_SOURCE
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// DNS system header files are a mess!
+// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
+// 'u_char' and includes <sys/types.h>.  Now the problem is that
+// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
+// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
+#ifndef _BSD_SOURCE
+#  define _BSD_SOURCE
+#endif
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>
@@ -77,7 +91,11 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
+#else
+#define QT_SOCKLEN_T		int
+#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/lynxos-g++/qplatformdefs.h

@@ -76,7 +76,11 @@
 #define QT_SIGNAL_ARGS		int
 #define QT_SIGNAL_IGNORE	SIG_IGN
 
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
 #define QT_SOCKLEN_T		socklen_t
+#else
+#define QT_SOCKLEN_T		int
+#endif
 
 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 #define QT_SNPRINTF		::snprintf

mkspecs/netbsd-g++/qmake.conf

@@ -12,7 +12,7 @@ QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -pipe -fvisibility=hidden -fvisibility-inlines-hidden
+QMAKE_CFLAGS		= -pipe
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w
@@ -35,12 +35,12 @@ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		= /usr/local/include
 QMAKE_LIBDIR		= /usr/local/lib
-QMAKE_INCDIR_X11	= /usr/X11R7/include
-QMAKE_LIBDIR_X11	= /usr/X11R7/lib
+QMAKE_INCDIR_X11	= /usr/X11R6/include
+QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 QMAKE_INCDIR_QT		= $(QTDIR)/include
 QMAKE_LIBDIR_QT		= $(QTDIR)/lib
-QMAKE_INCDIR_OPENGL	= /usr/X11R7/include
-QMAKE_LIBDIR_OPENGL	= /usr/X11R7/lib
+QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++

mkspecs/openbsd-g++/qmake.conf

@@ -12,7 +12,7 @@ QMAKE_LEX		= flex
 QMAKE_LEXFLAGS		= 
 QMAKE_YACC		= yacc
 QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -pipe -fvisibility=hidden -fvisibility-inlines-hidden
+QMAKE_CFLAGS		= -pipe
 QMAKE_CFLAGS_DEPS	= -M
 QMAKE_CFLAGS_WARN_ON	= -Wall -W
 QMAKE_CFLAGS_WARN_OFF	= -w

plugins/src/imageformats/jpeg/main.cpp

@@ -1,3 +1,6 @@
+#ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE
+#endif
 #include <qimageformatplugin.h>
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN

plugins/src/imageformats/mng/main.cpp

@@ -1,3 +1,7 @@
+#ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE
+#endif
+
 #include <qimageformatplugin.h>
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN

plugins/src/imageformats/png/main.cpp

@@ -1,3 +1,6 @@
+#ifndef QT_CLEAN_NAMESPACE
+#define QT_CLEAN_NAMESPACE
+#endif
 #include <qimageformatplugin.h>
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN

plugins/src/inputmethods/imsw-multi/imsw-multi.pro

@@ -3,7 +3,7 @@ TARGET   = qimsw-multi
 DESTDIR  = ../../../inputmethods
 
 INCLUDEPATH += .
-CONFIG      += qt warn_on plugin
+CONFIG      += qt warn_on debug plugin
 target.path += $$plugins.path/inputmethods
 INSTALLS    += target
 

plugins/src/inputmethods/imsw-none/imsw-none.pro

@@ -3,7 +3,7 @@ TARGET   = qimsw-none
 DESTDIR  = ../../../inputmethods
 
 INCLUDEPATH += .
-CONFIG      += qt warn_on plugin
+CONFIG      += qt warn_on debug plugin
 target.path += $$plugins.path/inputmethods
 INSTALLS    += target
 

plugins/src/inputmethods/simple/simple.pro

@@ -3,7 +3,7 @@ TARGET = qsimple
 DESTDIR  = ../../../inputmethods
 
 INCLUDEPATH += .
-CONFIG      += qt warn_on plugin
+CONFIG      += qt warn_on debug plugin
 target.path += $$plugins.path/inputmethods
 INSTALLS    += target
 

plugins/src/inputmethods/xim/xim.pro

@@ -3,7 +3,7 @@ TARGET = qxim
 DESTDIR  = ../../../inputmethods
 
 INCLUDEPATH += .
-CONFIG      += qt warn_on plugin
+CONFIG      += qt warn_on debug plugin
 target.path += $$plugins.path/inputmethods
 INSTALLS    += target
 DEFINES     += QT_NO_XINERAMA

qmake/generators/makefile.cpp

@@ -1183,7 +1183,7 @@ MakefileGenerator::init()
 	Option::fixPathToTargetOS(imgfile);
 	if(!project->isEmpty("UI_DIR") || !project->isEmpty("UI_SOURCES_DIR")) {
 	    if(imgfile.find(Option::dir_sep) != -1)
-		imgfile = imgfile.mid(imgfile.findRev(Option::dir_sep) + 1);
+		imgfile = imgfile.right(imgfile.findRev(Option::dir_sep) + 1);
 	    imgfile.prepend( (project->isEmpty("UI_DIR") ? project->first("UI_SOURCES_DIR") :
 			    project->first("UI_DIR")) );
 	    v["QMAKE_IMAGE_COLLECTION"] = QStringList(imgfile);
@@ -1433,7 +1433,7 @@ MakefileGenerator::write()
 	QString prl = var("TARGET");
 	int slsh = prl.findRev(Option::dir_sep);
 	if(slsh != -1)
-	    prl = prl.right(prl.length() - slsh - 1);
+	    prl = prl.right(prl.length() - slsh);
 	int dot = prl.find('.');
 	if(dot != -1)
 	    prl = prl.left(dot);
@@ -2142,9 +2142,10 @@ QString MakefileGenerator::build_args()
 bool
 MakefileGenerator::writeHeader(QTextStream &t)
 {
+    time_t foo = time(NULL);
     t << "#############################################################################" << endl;
     t << "# Makefile for building: " << var("TARGET") << endl;
-    t << "# Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ")" << endl;
+    t << "# Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: " << ctime(&foo);
     t << "# Project:  " << fileFixify(project->projectFile()) << endl;
     t << "# Template: " << var("TEMPLATE") << endl;
     t << "# Command: " << build_args() << endl;

qmake/generators/projectgenerator.cpp

@@ -345,7 +345,7 @@ bool
 ProjectGenerator::writeMakefile(QTextStream &t)
 {
     t << "######################################################################" << endl;
-    t << "# Automatically generated by qmake (" << qmake_version() << ") " << endl;
+    t << "# Automatically generated by qmake (" << qmake_version() << ") " << QDateTime::currentDateTime().toString() << endl;
     t << "######################################################################" << endl << endl;
     QStringList::Iterator it;
     for(it = Option::before_user_vars.begin(); it != Option::before_user_vars.end(); ++it)

qmake/generators/unix/unixmake.cpp

@@ -343,7 +343,7 @@ UnixMakefileGenerator::init()
 		if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") {
 		    libtool_flags += " --mode=link";
 		    if(project->isActiveConfig("staticlib")) {
-			comp_flags += " -static";
+			libtool_flags += " -static";
 		    } else {
 			if(!project->isEmpty("QMAKE_LIB_FLAG")) {
 			    int maj = project->first("VER_MAJ").toInt();
@@ -352,16 +352,18 @@ UnixMakefileGenerator::init()
 			    comp_flags += " -version-info " + QString::number(10*maj + min) +
 					  ":" + QString::number(pat) + ":0";
 			    if(libtoolify[i] != "QMAKE_AR_CMD") {
-				QString rpath = project->first("target.path");
-				if(rpath.right(1) != Option::dir_sep) {
-				    rpath += Option::dir_sep;
+				QString rpath = Option::output_dir;
+				if(!project->isEmpty("DESTDIR")) {
+				    rpath = project->first("DESTDIR");
+				    if(QDir::isRelativePath(rpath))
+					rpath.prepend(Option::output_dir + Option::dir_sep);
 				}
 				comp_flags += " -rpath " + Option::fixPathToTargetOS(rpath, FALSE);
 			    }
 			}
 		    }
 		    if(project->isActiveConfig("plugin"))
-			comp_flags += " -module";
+			libtool_flags += " -module";
 		} else {
 		    libtool_flags += " --mode=compile";
 		}
@@ -761,7 +763,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
 	    QString src_lt = var("QMAKE_ORIG_TARGET");
 	    int slsh = src_lt.findRev(Option::dir_sep);
 	    if(slsh != -1)
-		src_lt = src_lt.right(src_lt.length() - slsh - 1);
+		src_lt = src_lt.right(src_lt.length() - slsh);
 	    int dot = src_lt.find('.');
 	    if(dot != -1)
 		src_lt = src_lt.left(dot);
@@ -784,7 +786,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
 	    QString src_pc = var("QMAKE_ORIG_TARGET");
 	    int slsh = src_pc.findRev(Option::dir_sep);
 	    if(slsh != -1)
-		src_pc = src_pc.right(src_pc.length() - slsh - 1);
+		src_pc = src_pc.right(src_pc.length() - slsh);
 	    int dot = src_pc.find('.');
 	    if(dot != -1)
 		src_pc = src_pc.left(dot);

qmake/generators/unix/unixmake2.cpp

@@ -1386,6 +1386,20 @@ void UnixMakefileGenerator::init2()
 	    if(!project->isActiveConfig("compile_libtool"))
 		project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_SONAME"];
 	}
+	QString destdir = project->first("DESTDIR");
+	if ( !destdir.isEmpty() && !project->variables()["QMAKE_RPATH"].isEmpty() ) {
+	    QString rpath_destdir = destdir;
+	    if(QDir::isRelativePath(rpath_destdir)) {
+		QFileInfo fi(Option::fixPathToLocalOS(rpath_destdir));
+		if(fi.convertToAbs())  //strange, shouldn't really happen
+		    rpath_destdir = Option::fixPathToTargetOS(rpath_destdir, FALSE);
+		else
+		    rpath_destdir = fi.filePath();
+	    } else {
+		rpath_destdir = Option::fixPathToTargetOS(rpath_destdir, FALSE);
+	    }
+	    project->variables()["QMAKE_LFLAGS"] += project->first("QMAKE_RPATH") + rpath_destdir;
+	}
     }
     QStringList &quc = project->variables()["QMAKE_EXTRA_UNIX_COMPILERS"];
     for(QStringList::Iterator it = quc.begin(); it != quc.end(); ++it) {
@@ -1414,7 +1428,7 @@ UnixMakefileGenerator::libtoolFileName()
     QString ret = var("TARGET");
     int slsh = ret.findRev(Option::dir_sep);
     if(slsh != -1)
-	ret = ret.right(ret.length() - slsh - 1);
+	ret = ret.right(ret.length() - slsh);
     int dot = ret.find('.');
     if(dot != -1)
 	ret = ret.left(dot);
@@ -1438,8 +1452,9 @@ UnixMakefileGenerator::writeLibtoolFile()
 
     QTextStream t(&ft);
     t << "# " << lname << " - a libtool library file\n";
+    time_t now = time(NULL);
     t << "# Generated by qmake/libtool (" << qmake_version() << ") (Qt "
-      << QT_VERSION_STR << ")\n";
+      << QT_VERSION_STR << ") on: " << ctime(&now) << "\n";
 
     t << "# The name that we can dlopen(3).\n"
       << "dlname='" << var(project->isActiveConfig("plugin") ? "TARGET" : "TARGET_x")
@@ -1451,17 +1466,13 @@ UnixMakefileGenerator::writeLibtoolFile()
 	t << var("TARGET");
     } else {
     	if (project->isEmpty("QMAKE_HPUX_SHLIB"))
-	    t << var("TARGET_x.y.z") << " " << var("TARGET_x.y") << " ";
+	    t << var("TARGET_x.y.z") << " ";
     	t << var("TARGET_x") << " " << var("TARGET_");
     }
     t << "'\n\n";
 
     t << "# The name of the static archive.\n"
-      << "old_library='";
-    if(project->isActiveConfig("staticlib")) {
-	t << lname.left(lname.length()-Option::libtool_ext.length()) << ".a";
-    }
-    t << "'\n\n";
+      << "old_library='" << lname.left(lname.length()-Option::libtool_ext.length()) << ".a'\n\n";
 
     t << "# Libraries that this one depends upon.\n";
     QStringList libs;
@@ -1502,7 +1513,7 @@ UnixMakefileGenerator::pkgConfigFileName()
     QString ret = var("TARGET");
     int slsh = ret.findRev(Option::dir_sep);
     if(slsh != -1)
-	ret = ret.right(ret.length() - slsh - 1);
+	ret = ret.right(ret.length() - slsh);
     if(ret.startsWith("lib"))
 	ret = ret.mid(3);
     int dot = ret.find('.');
@@ -1547,37 +1558,22 @@ UnixMakefileGenerator::writePkgConfigFile()     // ### does make sense only for
     QTextStream t(&ft);
 
     QString prefix = pkgConfigPrefix();
-	QString libDir = qInstallPathLibs();
+    QString libDir = project->first("QMAKE_PKGCONFIG_LIBDIR");
     if(libDir.isEmpty())
-	{
 	libDir = prefix + "/lib";
-	}
-	QString includeDir = qInstallPathHeaders();
+    QString includeDir = project->first("QMAKE_PKGCONFIG_INCDIR");
     if(includeDir.isEmpty())
-	{
 	includeDir = prefix + "/include";
-	}
-	QString pluginsDir = qInstallPathPlugins();
+    QString pluginsDir = project->first("QMAKE_PKGCONFIG_PLUGINS");
     if(pluginsDir.isEmpty())
-	{
 	pluginsDir = prefix + "/plugins";
-	}
-	QString translationsDir = qInstallPathTranslations();
-	if (translationsDir.isEmpty())
-	{
-		translationsDir = prefix + "/translations";
-	}
 
-	t << "prefix=" << prefix << endl
-	  << "exec_prefix=${prefix}" << endl
-	  << "libdir=" << pkgConfigFixPath(libDir) << endl
-	  << "includedir=" << pkgConfigFixPath(includeDir) << endl
+    t << "prefix=" << prefix << endl;
+    t << "exec_prefix=${prefix}\n"
+      << "libdir=" << pkgConfigFixPath(libDir) << "\n"
+      << "includedir=" << pkgConfigFixPath(includeDir) << endl;
     // non-standard entry. Provides path for plugins
-	  << "pluginsdir=" << pkgConfigFixPath(pluginsDir) << endl
-	  // non-standard entry. Provides path for translations
-	  << "translationsdir=" << pkgConfigFixPath(translationsDir) << endl
-	  << endl;
-
+    t << "pluginsdir=" << pkgConfigFixPath(pluginsDir) << endl;
     // non-standard entry. Provides useful info normally only
     // contained in the internal .qmake.cache file
     t << varGlue("CONFIG", "qt_config=", " ", "") << endl << endl;

qmake/project.cpp

@@ -724,7 +724,7 @@ QMakeProject::isActiveConfig(const QString &x, bool regex, QMap<QString, QString
 	static char *buffer = NULL;
 	if(!buffer)
 	    buffer = (char *)malloc(1024);
-	int l = readlink(Option::mkfile::qmakespec, buffer, 1023);
+	int l = readlink(Option::mkfile::qmakespec, buffer, 1024);
 	if(l != -1) {
 	    buffer[l] = '\0';
 	    QString r = buffer;

src/3rdparty/libmng/config.guess

@@ -861,7 +861,15 @@ EOF
 	int main (argc, argv) int argc; char *argv[]; {
 #endif
 #ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
     printf ("%s-pc-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+# endif
 #else
   printf ("%s-pc-linux-gnuaout\n", argv[1]);
 #endif

src/3rdparty/libpng/pngconf.h

@@ -246,8 +246,30 @@
 #endif
 
 #ifdef PNG_SETJMP_SUPPORTED
+/* This is an attempt to force a single setjmp behaviour on Linux.  If
+ * the X config stuff didn't define _BSD_SOURCE we wouldn't need this.
+ */
+
+#  ifdef __linux__
+#    ifdef _BSD_SOURCE
+#      define PNG_SAVE_BSD_SOURCE
+#      undef _BSD_SOURCE
+#    endif
+#    ifdef _SETJMP_H
+      __png.h__ already includes setjmp.h;
+      __dont__ include it again.;
+#    endif
+#  endif /* __linux__ */
+
    /* include setjmp.h for error handling */
 #  include <setjmp.h>
+
+#  ifdef __linux__
+#    ifdef PNG_SAVE_BSD_SOURCE
+#      define _BSD_SOURCE
+#      undef PNG_SAVE_BSD_SOURCE
+#    endif
+#  endif /* __linux__ */
 #endif /* PNG_SETJMP_SUPPORTED */
 
 #ifdef BSD

src/3rdparty/libpng/pnggccrd.c

@@ -694,16 +694,16 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
             else /* mmx _not supported - Use modified C routine */
 #endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
             {
-               png_uint_32 i;
+               register png_uint_32 i;
                png_uint_32 initial_val = png_pass_start[png_ptr->pass];
                  /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
-               int stride = png_pass_inc[png_ptr->pass];
+               register int stride = png_pass_inc[png_ptr->pass];
                  /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
-               int rep_bytes = png_pass_width[png_ptr->pass];
+               register int rep_bytes = png_pass_width[png_ptr->pass];
                  /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
                png_uint_32 len = png_ptr->width &~7;  /* reduce to mult. of 8 */
                int diff = (int) (png_ptr->width & 7); /* amount lost */
-               png_uint_32 final_val = len;  /* GRR bugfix */
+               register png_uint_32 final_val = len;  /* GRR bugfix */
 
                srcptr = png_ptr->row_buf + 1 + initial_val;
                dstptr = row + initial_val;
@@ -848,16 +848,16 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
             else /* mmx _not supported - Use modified C routine */
 #endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
             {
-               png_uint_32 i;
+               register png_uint_32 i;
                png_uint_32 initial_val = BPP2 * png_pass_start[png_ptr->pass];
                  /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
-               int stride = BPP2 * png_pass_inc[png_ptr->pass];
+               register int stride = BPP2 * png_pass_inc[png_ptr->pass];
                  /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
-               int rep_bytes = BPP2 * png_pass_width[png_ptr->pass];
+               register int rep_bytes = BPP2 * png_pass_width[png_ptr->pass];
                  /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
                png_uint_32 len = png_ptr->width &~7;  /* reduce to mult. of 8 */
                int diff = (int) (png_ptr->width & 7); /* amount lost */
-               png_uint_32 final_val = BPP2 * len;   /* GRR bugfix */
+               register png_uint_32 final_val = BPP2 * len;   /* GRR bugfix */
 
                srcptr = png_ptr->row_buf + 1 + initial_val;
                dstptr = row + initial_val;
@@ -1016,16 +1016,16 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
             else /* mmx _not supported - Use modified C routine */
 #endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
             {
-               png_uint_32 i;
+               register png_uint_32 i;
                png_uint_32 initial_val = BPP3 * png_pass_start[png_ptr->pass];
                  /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
-               int stride = BPP3 * png_pass_inc[png_ptr->pass];
+               register int stride = BPP3 * png_pass_inc[png_ptr->pass];
                  /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
-               int rep_bytes = BPP3 * png_pass_width[png_ptr->pass];
+               register int rep_bytes = BPP3 * png_pass_width[png_ptr->pass];
                  /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
                png_uint_32 len = png_ptr->width &~7;  /* reduce to mult. of 8 */
                int diff = (int) (png_ptr->width & 7); /* amount lost */
-               png_uint_32 final_val = BPP3 * len;   /* GRR bugfix */
+               register png_uint_32 final_val = BPP3 * len;   /* GRR bugfix */
 
                srcptr = png_ptr->row_buf + 1 + initial_val;
                dstptr = row + initial_val;
@@ -1191,16 +1191,16 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
             else /* mmx _not supported - Use modified C routine */
 #endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
             {
-               png_uint_32 i;
+               register png_uint_32 i;
                png_uint_32 initial_val = BPP4 * png_pass_start[png_ptr->pass];
                  /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
-               int stride = BPP4 * png_pass_inc[png_ptr->pass];
+               register int stride = BPP4 * png_pass_inc[png_ptr->pass];
                  /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
-               int rep_bytes = BPP4 * png_pass_width[png_ptr->pass];
+               register int rep_bytes = BPP4 * png_pass_width[png_ptr->pass];
                  /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
                png_uint_32 len = png_ptr->width &~7;  /* reduce to mult. of 8 */
                int diff = (int) (png_ptr->width & 7); /* amount lost */
-               png_uint_32 final_val = BPP4 * len;   /* GRR bugfix */
+               register png_uint_32 final_val = BPP4 * len;   /* GRR bugfix */
 
                srcptr = png_ptr->row_buf + 1 + initial_val;
                dstptr = row + initial_val;
@@ -1383,16 +1383,16 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
             else /* mmx _not supported - Use modified C routine */
 #endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
             {
-               png_uint_32 i;
+               register png_uint_32 i;
                png_uint_32 initial_val = BPP6 * png_pass_start[png_ptr->pass];
                  /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
-               int stride = BPP6 * png_pass_inc[png_ptr->pass];
+               register int stride = BPP6 * png_pass_inc[png_ptr->pass];
                  /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
-               int rep_bytes = BPP6 * png_pass_width[png_ptr->pass];
+               register int rep_bytes = BPP6 * png_pass_width[png_ptr->pass];
                  /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
                png_uint_32 len = png_ptr->width &~7;  /* reduce to mult. of 8 */
                int diff = (int) (png_ptr->width & 7); /* amount lost */
-               png_uint_32 final_val = BPP6 * len;   /* GRR bugfix */
+               register png_uint_32 final_val = BPP6 * len;   /* GRR bugfix */
 
                srcptr = png_ptr->row_buf + 1 + initial_val;
                dstptr = row + initial_val;
@@ -1424,16 +1424,16 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
          {
             png_bytep srcptr;
             png_bytep dstptr;
-            png_uint_32 i;
+            register png_uint_32 i;
             png_uint_32 initial_val = BPP8 * png_pass_start[png_ptr->pass];
               /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
-            int stride = BPP8 * png_pass_inc[png_ptr->pass];
+            register int stride = BPP8 * png_pass_inc[png_ptr->pass];
               /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
-            int rep_bytes = BPP8 * png_pass_width[png_ptr->pass];
+            register int rep_bytes = BPP8 * png_pass_width[png_ptr->pass];
               /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
             png_uint_32 len = png_ptr->width &~7;  /* reduce to mult. of 8 */
             int diff = (int) (png_ptr->width & 7); /* amount lost */
-            png_uint_32 final_val = BPP8 * len;   /* GRR bugfix */
+            register png_uint_32 final_val = BPP8 * len;   /* GRR bugfix */
 
             srcptr = png_ptr->row_buf + 1 + initial_val;
             dstptr = row + initial_val;

src/3rdparty/libpng/pngvcrd.c

@@ -375,10 +375,10 @@ end8:
             }
             else /* mmx not supported - use modified C routine */
             {
-               unsigned int incr1, initial_val, final_val;
+               register unsigned int incr1, initial_val, final_val;
                png_size_t pixel_bytes;
                png_uint_32 i;
-               int disp = png_pass_inc[png_ptr->pass];
+               register int disp = png_pass_inc[png_ptr->pass];
                int offset_table[7] = {0, 4, 0, 2, 0, 1, 0};
 
                pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
@@ -487,10 +487,10 @@ end16:
             }
             else /* mmx not supported - use modified C routine */
             {
-               unsigned int incr1, initial_val, final_val;
+               register unsigned int incr1, initial_val, final_val;
                png_size_t pixel_bytes;
                png_uint_32 i;
-               int disp = png_pass_inc[png_ptr->pass];
+               register int disp = png_pass_inc[png_ptr->pass];
                int offset_table[7] = {0, 4, 0, 2, 0, 1, 0};
 
                pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
@@ -618,10 +618,10 @@ end24:
             }
             else /* mmx not supported - use modified C routine */
             {
-               unsigned int incr1, initial_val, final_val;
+               register unsigned int incr1, initial_val, final_val;
                png_size_t pixel_bytes;
                png_uint_32 i;
-               int disp = png_pass_inc[png_ptr->pass];
+               register int disp = png_pass_inc[png_ptr->pass];
                int offset_table[7] = {0, 4, 0, 2, 0, 1, 0};
 
                pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
@@ -758,10 +758,10 @@ end32:
             }
             else /* mmx _not supported - Use modified C routine */
             {
-               unsigned int incr1, initial_val, final_val;
+               register unsigned int incr1, initial_val, final_val;
                png_size_t pixel_bytes;
                png_uint_32 i;
-               int disp = png_pass_inc[png_ptr->pass];
+               register int disp = png_pass_inc[png_ptr->pass];
                int offset_table[7] = {0, 4, 0, 2, 0, 1, 0};
 
                pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
@@ -916,10 +916,10 @@ end48:
             }
             else /* mmx _not supported - Use modified C routine */
             {
-               unsigned int incr1, initial_val, final_val;
+               register unsigned int incr1, initial_val, final_val;
                png_size_t pixel_bytes;
                png_uint_32 i;
-               int disp = png_pass_inc[png_ptr->pass];
+               register int disp = png_pass_inc[png_ptr->pass];
                int offset_table[7] = {0, 4, 0, 2, 0, 1, 0};
 
                pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
@@ -947,8 +947,8 @@ end48:
             png_size_t pixel_bytes;
             int offset_table[7] = {0, 4, 0, 2, 0, 1, 0};
             unsigned int i;
-            int disp = png_pass_inc[png_ptr->pass];  // get the offset
-            unsigned int incr1, initial_val, final_val;
+            register int disp = png_pass_inc[png_ptr->pass];  // get the offset
+            register unsigned int incr1, initial_val, final_val;
 
             pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
             sptr = png_ptr->row_buf + 1 + offset_table[png_ptr->pass]*

src/3rdparty/sqlite/printf.c

@@ -360,8 +360,8 @@ static int vxprintf(
         }
         bufpt = &buf[etBUFSIZE-1];
         {
-          char *cset;      /* Use registers for speed */
-          int base;
+          register char *cset;      /* Use registers for speed */
+          register int base;
           cset = infop->charset;
           base = infop->base;
           do{                                           /* Convert to ascii */
@@ -602,7 +602,7 @@ static int vxprintf(
     ** the output.
     */
     if( !flag_leftjustify ){
-      int nspace;
+      register int nspace;
       nspace = width-length;
       if( nspace>0 ){
         count += nspace;
@@ -618,7 +618,7 @@ static int vxprintf(
       count += length;
     }
     if( flag_leftjustify ){
-      int nspace;
+      register int nspace;
       nspace = width-length;
       if( nspace>0 ){
         count += nspace;

src/3rdparty/sqlite/util.c

@@ -500,14 +500,14 @@ int sqliteHashNoCase(const char *z, int n){
 ** there is no consistency, we will define our own.
 */
 int sqliteStrICmp(const char *zLeft, const char *zRight){
-  unsigned char *a, *b;
+  register unsigned char *a, *b;
   a = (unsigned char *)zLeft;
   b = (unsigned char *)zRight;
   while( *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
   return *a - *b;
 }
 int sqliteStrNICmp(const char *zLeft, const char *zRight, int N){
-  unsigned char *a, *b;
+  register unsigned char *a, *b;
   a = (unsigned char *)zLeft;
   b = (unsigned char *)zRight;
   while( N-- > 0 && *a!=0 && UpperToLower[*a]==UpperToLower[*b]){ a++; b++; }
@@ -941,7 +941,7 @@ static int sqlite_utf8_to_int(const unsigned char *z){
 */
 int 
 sqliteGlobCompare(const unsigned char *zPattern, const unsigned char *zString){
-  int c;
+  register int c;
   int invert;
   int seen;
   int c2;
@@ -1030,7 +1030,7 @@ sqliteGlobCompare(const unsigned char *zPattern, const unsigned char *zString){
 */
 int 
 sqliteLikeCompare(const unsigned char *zPattern, const unsigned char *zString){
-  int c;
+  register int c;
   int c2;
 
   while( (c = UpperToLower[*zPattern])!=0 ){

src/3rdparty/zlib/crc32.c

@@ -260,8 +260,8 @@ local unsigned long crc32_little(crc, buf, len)
     const unsigned char FAR *buf;
     unsigned len;
 {
-    u4 c;
-    const u4 FAR *buf4;
+    register u4 c;
+    register const u4 FAR *buf4;
 
     c = (u4)crc;
     c = ~c;
@@ -300,8 +300,8 @@ local unsigned long crc32_big(crc, buf, len)
     const unsigned char FAR *buf;
     unsigned len;
 {
-    u4 c;
-    const u4 FAR *buf4;
+    register u4 c;
+    register const u4 FAR *buf4;
 
     c = REV((u4)crc);
     c = ~c;

src/3rdparty/zlib/deflate.c

@@ -862,9 +862,9 @@ local uInt longest_match(s, cur_match)
     IPos cur_match;                             /* current match */
 {
     unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    Bytef *scan = s->window + s->strstart; /* current string */
-    Bytef *match;                       /* matched string */
-    int len;                           /* length of current match */
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
     int best_len = s->prev_length;              /* best match length so far */
     int nice_match = s->nice_match;             /* stop if match long enough */
     IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
@@ -879,13 +879,13 @@ local uInt longest_match(s, cur_match)
     /* Compare two bytes at a time. Note: this is not always beneficial.
      * Try with and without -DUNALIGNED_OK to check.
      */
-    Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-    ush scan_start = *(ushf*)scan;
-    ush scan_end   = *(ushf*)(scan+best_len-1);
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+    register ush scan_start = *(ushf*)scan;
+    register ush scan_end   = *(ushf*)(scan+best_len-1);
 #else
-    Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    Byte scan_end1  = scan[best_len-1];
-    Byte scan_end   = scan[best_len];
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+    register Byte scan_end1  = scan[best_len-1];
+    register Byte scan_end   = scan[best_len];
 #endif
 
     /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
@@ -1004,10 +1004,10 @@ local uInt longest_match_fast(s, cur_match)
     deflate_state *s;
     IPos cur_match;                             /* current match */
 {
-    Bytef *scan = s->window + s->strstart; /* current string */
-    Bytef *match;                       /* matched string */
-    int len;                           /* length of current match */
-    Bytef *strend = s->window + s->strstart + MAX_MATCH;
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
 
     /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
      * It is easy to get rid of this optimization if necessary.
@@ -1094,8 +1094,8 @@ local void check_match(s, start, match, length)
 local void fill_window(s)
     deflate_state *s;
 {
-    unsigned n, m;
-    Posf *p;
+    register unsigned n, m;
+    register Posf *p;
     unsigned more;    /* Amount of free space at the end of the window. */
     uInt wsize = s->w_size;
 

src/3rdparty/zlib/trees.c

@@ -1143,7 +1143,7 @@ local unsigned bi_reverse(code, len)
     unsigned code; /* the value to invert */
     int len;       /* its bit length */
 {
-    unsigned res = 0;
+    register unsigned res = 0;
     do {
         res |= code & 1;
         code >>= 1, res <<= 1;

src/compat/qpaintd.h

@@ -0,0 +1,25 @@
+/****************************************************************************
+**
+** 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

src/compat/qpaintdc.h

@@ -0,0 +1,25 @@
+/****************************************************************************
+**
+** 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

src/dialogs/qmessagebox.cpp

@@ -603,7 +603,7 @@ void QMessageBox::init( int button0, int button1, int button2 )
 	    "Linux, and all major commercial Unix variants."
 	    "<br>Qt is also available for embedded devices.</p>"
 	    "<p>Qt is a Trolltech product. "
-	    "See <tt>https://trinitydesktop.org/docs/qt3/</tt> "
+	    "See <tt>http://www.trolltech.com/qt/</tt> "
 	    "for more information.</p>"
 	    ).arg( QT_VERSION_STR );
 #endif

src/iconview/qiconview.cpp

@@ -166,7 +166,7 @@ static QPixmap *get_qiv_buffer_pixmap( const QSize &s )
 
 #ifndef QT_NO_DRAGANDDROP
 
-class Q_EXPORT QIconDragData
+class QM_EXPORT_ICONVIEW QIconDragData
 {
 public:
     QIconDragData();
@@ -184,7 +184,7 @@ public:
     bool operator==( const QIconDragData &i ) const;
 };
 
-class Q_EXPORT QIconDragDataItem
+class QM_EXPORT_ICONVIEW QIconDragDataItem
 {
 public:
     QIconDragDataItem() {}
@@ -287,8 +287,74 @@ public:
     struct SortableItem {
 	QIconViewItem *item;
     };
+
+public:
+
+    /* finds the containers that intersect with \a searchRect in the direction \a dir relative to \a relativeTo */
+    QPtrList<ItemContainer>* findContainers(
+	QIconView:: Direction dir,
+	const QPoint &relativeTo,
+	const QRect &searchRect ) const;
+    //    friend int cmpIconViewItems( const void *n1, const void *n2 );
 };
 
+
+QPtrList<QIconViewPrivate::ItemContainer>* QIconViewPrivate::findContainers(
+	QIconView:: Direction dir,
+	const QPoint &relativeTo,
+	const QRect &searchRect ) const
+{
+
+    QPtrList<QIconViewPrivate::ItemContainer>* list =
+	new QPtrList<QIconViewPrivate::ItemContainer>();
+
+    if ( arrangement == QIconView::LeftToRight ) {
+	if ( dir == QIconView::DirLeft || dir == QIconView::DirRight ) {
+	    ItemContainer *c = firstContainer;
+	    for ( ; c; c = c->n )
+		if ( c->rect.intersects( searchRect ) )
+		    list->append( c );
+	} else {
+	    if ( dir == QIconView::DirDown ) {
+		ItemContainer *c = firstContainer;
+		for ( ; c; c = c->n )
+		    if ( c->rect.intersects( searchRect ) &&
+			 c->rect.bottom() >= relativeTo.y() )
+			list->append( c );
+	    } else {
+		ItemContainer *c = lastContainer;
+		for ( ; c; c = c->p )
+		    if ( c->rect.intersects( searchRect ) &&
+			 c->rect.top() <= relativeTo.y() )
+			list->append( c );
+	    }
+	}
+    } else {
+	if ( dir == QIconView::DirUp || dir == QIconView::DirDown ) {
+	    ItemContainer *c = firstContainer;
+	    for ( ; c; c = c->n )
+		if ( c->rect.intersects( searchRect ) )
+		    list->append( c );
+	} else {
+	    if ( dir == QIconView::DirRight ) {
+		ItemContainer *c = firstContainer;
+		for ( ; c; c = c->n )
+		    if ( c->rect.intersects( searchRect ) &&
+			 c->rect.right() >= relativeTo.x() )
+			list->append( c );
+	    } else {
+		ItemContainer *c = lastContainer;
+		for ( ; c; c = c->p )
+		    if ( c->rect.intersects( searchRect ) &&
+			 c->rect.left() <= relativeTo.x() )
+			list->append( c );
+	    }
+	}
+    }
+    return list;
+}
+
+
 #if defined(Q_C_CALLBACKS)
 extern "C" {
 #endif
@@ -3872,7 +3938,6 @@ void QIconView::selectAll( bool select )
 	        rr = rr.unite( item->rect() );
 	        changed = TRUE;
 	    }
-	}
 	    else {
 	        if ( FALSE != item->isSelected() ) {
 	            item->setSelected( FALSE, TRUE );
@@ -3880,6 +3945,7 @@ void QIconView::selectAll( bool select )
 	        }
 	    }
 	}
+    }
     viewport()->setUpdatesEnabled( ue );
     // we call updateContents not repaintContents because of possible previous updateContents
     QScrollView::updateContents( rr );
@@ -3906,16 +3972,8 @@ void QIconView::invertSelection()
     bool b = signalsBlocked();
     blockSignals( TRUE );
     QIconViewItem *item = d->firstItem;
-    for ( ; item; item = item->next ) {
-        if (item->isVisible()) {
+    for ( ; item; item = item->next )
 	item->setSelected( !item->isSelected(), TRUE );
-        }
-        else {
-            if ( FALSE != item->isSelected() ) {
-                item->setSelected( FALSE, TRUE );
-            }
-        }
-    }
     blockSignals( b );
     emit selectionChanged();
 }
@@ -5048,7 +5106,6 @@ void QIconView::keyPressEvent( QKeyEvent *e )
 	}
     } break;
 #endif
-
     case Key_Home: {
 	d->currInputString = QString::null;
 	if ( !d->firstItem )
@@ -5093,7 +5150,6 @@ void QIconView::keyPressEvent( QKeyEvent *e )
 			      e->state() & ControlButton, TRUE );
 	}
     } break;
-    
     case Key_End: {
 	d->currInputString = QString::null;
 	if ( !d->lastItem )
@@ -5137,26 +5193,21 @@ void QIconView::keyPressEvent( QKeyEvent *e )
  			      e->state() & ControlButton, TRUE );
 	}
     } break;
-    
-    case Key_Space: {
-	d->currInputString = QString::null;
-	if ( d->selectionMode == Single)
-	    break;
-
-	d->currentItem->setSelected( !d->currentItem->isSelected(), TRUE );
-    } break;
-    
-    case Key_Enter: 
-    case Key_Return:
-	d->currInputString = QString::null;
-	emit returnPressed( d->currentItem );
-	break;
-	
     case Key_Right: {
 	d->currInputString = QString::null;
+	QIconViewItem *item;
 	selectCurrent = FALSE;
 	Direction dir = DirRight;
-	QIconViewItem *item = findItem(dir, d->currentItem);
+
+	QRect r( 0, d->currentItem->y(), contentsWidth(), d->currentItem->height() );
+	item = findItem( dir, d->currentItem->rect().center(), r );
+
+	// search the row below from the right
+	while ( !item && r.y() < contentsHeight() ) {
+	    r.moveBy(0, d->currentItem->height() );
+	    item = findItem( dir, QPoint( 0, r.center().y() ), r );
+	}
+
 	if ( item ) {
 	    QIconViewItem *old = d->currentItem;
 	    setCurrentItem( item );
@@ -5164,12 +5215,21 @@ void QIconView::keyPressEvent( QKeyEvent *e )
 	    handleItemChange( old, e->state() & ShiftButton, e->state() & ControlButton );
 	}
     } break;
-    
     case Key_Left: {
 	d->currInputString = QString::null;
+	QIconViewItem *item;
 	selectCurrent = FALSE;
 	Direction dir = DirLeft;
-	QIconViewItem *item = findItem(dir, d->currentItem);
+
+	QRect r( 0, d->currentItem->y(), contentsWidth(), d->currentItem->height() );
+	item = findItem( dir, d->currentItem->rect().center(), r );
+
+	// search the row above from the left
+	while ( !item && r.y() >= 0 ) {
+	    r.moveBy(0, - d->currentItem->height() );
+	    item = findItem( dir, QPoint( contentsWidth(), r.center().y() ), r );
+	}
+
 	if ( item ) {
 	    QIconViewItem *old = d->currentItem;
 	    setCurrentItem( item );
@@ -5177,33 +5237,58 @@ void QIconView::keyPressEvent( QKeyEvent *e )
 	    handleItemChange( old, e->state() & ShiftButton, e->state() & ControlButton );
 	}
     } break;
+    case Key_Space: {
+	d->currInputString = QString::null;
+	if ( d->selectionMode == Single)
+	    break;
 
+	d->currentItem->setSelected( !d->currentItem->isSelected(), TRUE );
+    } break;
+    case Key_Enter: case Key_Return:
+	d->currInputString = QString::null;
+	emit returnPressed( d->currentItem );
+	break;
     case Key_Down: {
 	d->currInputString = QString::null;
+	QIconViewItem *item;
 	selectCurrent = FALSE;
 	Direction dir = DirDown;
-	QIconViewItem *item = findItem(dir, d->currentItem);
-	if (item) {
-	    QIconViewItem *old=d->currentItem;
-	    setCurrentItem(item);
-	    ensureItemVisible(item);
-	    handleItemChange(old, e->state() & ShiftButton, e->state() & ControlButton );
+
+	QRect r( d->currentItem->x(), 0, d->currentItem->width(), contentsHeight() );
+	item = findItem( dir, d->currentItem->rect().center(), r );
+
+	// finding the closest item below and to the right
+	while ( !item && r.x() < contentsWidth() ) {
+	    r.moveBy( r.width() , 0 );
+	    item = findItem( dir, QPoint( r.center().x(), 0 ), r );
 	}
-    } break;
 
+
+	QIconViewItem *i = d->currentItem;
+	setCurrentItem( item );
+	item = i;
+	handleItemChange( item, e->state() & ShiftButton, e->state() & ControlButton );
+    } break;
     case Key_Up: {
 	d->currInputString = QString::null;
+	QIconViewItem *item;
 	selectCurrent = FALSE;
 	Direction dir = DirUp;
-	QIconViewItem *item = findItem(dir, d->currentItem);
-	if (item) {
-	    QIconViewItem *old=d->currentItem;
-	    setCurrentItem(item);
-	    ensureItemVisible(item);
-	    handleItemChange(old, e->state() & ShiftButton, e->state() & ControlButton );
+
+	QRect r( d->currentItem->x(), 0, d->currentItem->width(), contentsHeight() );
+	item = findItem( dir, d->currentItem->rect().center(), r );
+
+	// finding the closest item above and to the left
+	while ( !item && r.x() >= 0 ) {
+	    r.moveBy(- r.width(), 0 );
+	    item = findItem( dir, QPoint(r.center().x(), contentsHeight() ), r );
 	}
-    } break;
 
+	QIconViewItem *i = d->currentItem;
+	setCurrentItem( item );
+	item = i;
+	handleItemChange( item, e->state() & ShiftButton, e->state() & ControlButton );
+    } break;
     case Key_Next: {
 	d->currInputString = QString::null;
 	selectCurrent = FALSE;
@@ -5226,7 +5311,6 @@ void QIconView::keyPressEvent( QKeyEvent *e )
 	    handleItemChange( item, e->state() & ShiftButton, e->state() & ControlButton );
 	}
     } break;
-    
     case Key_Prior: {
 	d->currInputString = QString::null;
 	selectCurrent = FALSE;
@@ -5249,7 +5333,6 @@ void QIconView::keyPressEvent( QKeyEvent *e )
 	    handleItemChange( item, e->state() & ShiftButton, e->state() & ControlButton );
 	}
     } break;
-    
     default:
 	if ( !e->text().isEmpty() && e->text()[ 0 ].isPrint() ) {
 	    selectCurrent = FALSE;
@@ -5320,193 +5403,79 @@ void QIconView::keyPressEvent( QKeyEvent *e )
 }
 
 /*
-  Finds the closest item in the direction \a dir starting from the specified \a fromItem.
-  If the arrangement is LeftToRight (icon view mode): use (center, top) as item reference
-  If the arrangement is TopToBottom (multicolumn view mode): use (left, top) as item reference
-  This is to allow for smooth scrolling when using the keyboard arrow keys.
+  Finds the closest item in the Direction \a dir relative from the point \a relativeTo
+  which intersects with the searchRect.
+
+  The function choses the closest item with its center in the searchRect.
 */
-QIconViewItem* QIconView::findItem(Direction dir, const QIconViewItem *fromItem) const
+QIconViewItem* QIconView::findItem( Direction dir,
+				    const QPoint &relativeTo,
+				    const QRect &searchRect ) const
 {
-    QIconViewItem *closestItem=NULL;
-    int distPri=0, distSec=0;
-    int itemDistancePri=0, itemDistanceSec=0;
-
-    QPoint pos=fromItem->rect().topLeft();
-    if (d->arrangement == LeftToRight) {
-        pos.setX(fromItem->rect().center().x());
-    }
-
-    QRect searchRect;
-    switch (dir) {
-        case DirDown:
-            searchRect.setCoords(pos.x(), 0, contentsWidth(), contentsHeight());
-            break;
-    
-        case DirUp:
-            searchRect.setCoords(0, 0, pos.x(), contentsHeight());
-            break;
-    
-        case DirRight:
-            searchRect.setCoords(0, pos.y(), contentsWidth(), contentsHeight());
-            break;
-    
-        case DirLeft:
-            searchRect.setCoords(0, 0, contentsWidth(), pos.y());
-            break;
-    }
-    
-    for (QIconViewPrivate::ItemContainer *c=d->firstContainer; c; c=c->n) {
-        if (c->rect.intersects(searchRect)) {
-            QPtrList<QIconViewItem> &list = c->items;
-            for (QIconViewItem *item=list.first(); item; item=list.next()) {
-                if (item != fromItem) {
-                    bool itemOK = true;
-                    const QRect &ir = item->rect();
-                    // DirDown/DirUp   : primary distance X, secondary distance Y
-                    // DirLeft/DirRight: primary distance Y, secondary distance X
-                    if (d->arrangement == LeftToRight) {
-                        // Left to right arrangement (icon view mode): use (center, top) as item reference
-                        switch (dir) {
-                            case DirDown:
-                                if (ir.center().x() > pos.x()) {
-                                    distPri = ir.center().x()-pos.x();
-                                    distSec = ir.top();
-                                    }
-                                else if (ir.center().x() == pos.x() && ir.top() > pos.y()) {
-                                    distPri = 0;
-                                    distSec = ir.top()-pos.y();
-                                    }
-                                else {
-                                    itemOK = false;
-                                    }
-                                break;
-                            
-                            case DirUp:
-                                if (ir.center().x() < pos.x()) {
-                                    distPri = pos.x()-ir.center().x();
-                                    distSec = contentsHeight()-ir.top();
+    QIconViewItem *item;
+    QIconViewItem *centerMatch = 0;
+    int centerMatchML = 0;
+
+    // gets list of containers with potential items
+    QPtrList<QIconViewPrivate::ItemContainer>* cList =
+	d->findContainers( dir, relativeTo, searchRect);
+
+    cList->first();
+    while ( cList->current() && !centerMatch ) {
+	QPtrList<QIconViewItem> &list = (cList->current())->items;
+	for ( item = list.first(); item; item = list.next() ) {
+	    if ( neighbourItem( dir, relativeTo, item ) &&
+		 searchRect.contains( item->rect().center() ) &&
+		 item != currentItem() ) {
+ 		int ml = (relativeTo - item->rect().center()).manhattanLength();
+		if ( centerMatch ) {
+		    if ( ml < centerMatchML ) {
+			centerMatch = item;
+			centerMatchML = ml;
 		    }
-                                else if (ir.center().x() == pos.x() && ir.top() < pos.y()) {
-                                    distPri = 0;
-                                    distSec = pos.y()-ir.top();
+		} else {
+		    centerMatch = item;
+		    centerMatchML = ml;
 		}
-                                else {
-                                    itemOK = false;
 	    }
-                                break;
-                            
-                            case DirRight:
-                                if (ir.top() > pos.y()) {
-                                    distPri = ir.top()-pos.y();
-                                    distSec = ir.center().x();
 	}
-                                else if (ir.top() == pos.y() && ir.center().x() > pos.x()) {
-                                    distPri = 0;
-                                    distSec = ir.center().x()-pos.x();
+	cList->next();
     }
-                                else {
-                                    itemOK = false;
+    delete cList;
+    return centerMatch;
 }
-                                break;
 
-                            case DirLeft:
-                                if (ir.top() < pos.y()) {
-                                    distPri = pos.y()-ir.top();
-                                    distSec = contentsWidth()-ir.center().x();
-                                    }
-                                else if (ir.top() == pos.y() && ir.center().x() < pos.x()) {
-                                    distPri = 0;
-                                    distSec = pos.x()-ir.center().x();
-                                    }
-                                else {
-                                    itemOK = false;
-                                    }
-                                break;
 
-                            default:
-                                itemOK = false;
-                                break;
-                        }	
-                    }
-                    else {
-                        // Top to bottom arrangement (multicolumn view mode): use (left, top) as item reference
+/*
+  Returns TRUE if the items orientation compared to
+  the point \a relativeTo is correct.
+*/
+bool QIconView::neighbourItem( Direction dir,
+			       const QPoint &relativeTo,
+			       const QIconViewItem *item ) const
+{
     switch ( dir ) {
-                            case DirDown:
-                                if (ir.left() > pos.x()) {
-                                    distPri = ir.left()-pos.x();
-                                    distSec = ir.top();
-                                    }
-                                else if (ir.left() == pos.x() && ir.top() > pos.y()) {
-                                    distPri = 0;
-                                    distSec = ir.top()-pos.y();
-                                    }
-                                else {
-                                    itemOK = false;
-                                    }
-                                break;
-                            
     case DirUp:
-                                if (ir.left() < pos.x()) {
-                                    distPri = pos.x()-ir.left();
-                                    distSec = contentsHeight()-ir.top();
-                                    }
-                                else if (ir.left() == pos.x() && ir.top() < pos.y()) {
-                                    distPri = 0;
-                                    distSec = pos.y()-ir.top();
-                                    }
-                                else {
-                                    itemOK = false;
-                                    }
+	if ( item->rect().center().y() < relativeTo.y() )
+	    return TRUE;
 	break;
-                            
-                            case DirRight:
-                                if (ir.top() > pos.y()) {
-                                    distPri = ir.top()-pos.y();
-                                    distSec = ir.left();
-                                    }
-                                else if (ir.top() == pos.y() && ir.left() > pos.x()) {
-                                    distPri = 0;
-                                    distSec = ir.left()-pos.x();
-                                    }
-                                else {
-                                    itemOK = false;
-                                    }
+    case DirDown:
+	if ( item->rect().center().y() > relativeTo.y() )
+	    return TRUE;
 	break;
-                            
     case DirLeft:
-                                if (ir.top() < pos.y()) {
-                                    distPri = pos.y()-ir.top();
-                                    distSec = contentsWidth()-ir.left();
-                                    }
-                                else if (ir.top() == pos.y() && ir.left() < pos.x()) {
-                                    distPri = 0;
-                                    distSec = pos.x()-ir.left();
-                                    }
-                                else {
-                                    itemOK = false;
-                                    }
+	if ( item->rect().center().x() < relativeTo.x() )
+	    return TRUE;
+	break;
+    case DirRight:
+	if ( item->rect().center().x() > relativeTo.x() )
+	    return TRUE;
 	break;
-                                
     default:
-                                itemOK = false;
+	// nothing
 	break;
     }
-                    }
-                        
-                    if (itemOK) {
-                        if (!closestItem ||
-                            ((distPri < itemDistancePri) ||
-                            (distPri == itemDistancePri && distSec < itemDistanceSec))) {
-                            closestItem = item;
-                            itemDistancePri = distPri;
-                            itemDistanceSec = distSec;
-                        } 
-                    }
-                }
-            }
-        }
-    }
-    return closestItem;
+    return FALSE;
 }
 
 /*!

src/iconview/qiconview.h

@@ -55,6 +55,12 @@
 
 #ifndef QT_NO_ICONVIEW
 
+#if !defined( QT_MODULE_ICONVIEW ) || defined( QT_INTERNAL_ICONVIEW )
+#define QM_EXPORT_ICONVIEW
+#else
+#define QM_EXPORT_ICONVIEW Q_EXPORT
+#endif
+
 class QIconView;
 class QPainter;
 class QMimeSource;
@@ -72,7 +78,7 @@ class QIconDragPrivate;
 
 #ifndef QT_NO_DRAGANDDROP
 
-class Q_EXPORT QIconDragItem
+class QM_EXPORT_ICONVIEW QIconDragItem
 {
 public:
     QIconDragItem();
@@ -86,7 +92,7 @@ private:
 
 };
 
-class Q_EXPORT QIconDrag : public QDragObject
+class QM_EXPORT_ICONVIEW QIconDrag : public QDragObject
 {
     Q_OBJECT
 public:
@@ -116,7 +122,7 @@ private:
 class QIconViewToolTip;
 class QIconViewItemPrivate;
 
-class Q_EXPORT QIconViewItem : public Qt
+class QM_EXPORT_ICONVIEW QIconViewItem : public Qt
 {
     friend class QIconView;
     friend class QIconViewToolTip;
@@ -263,7 +269,7 @@ private:
 
 class QIconViewPrivate;          /* don't touch */
 
-class Q_EXPORT QIconView : public QScrollView
+class QM_EXPORT_ICONVIEW QIconView : public QScrollView
 {
     friend class QIconViewItem;
     friend class QIconViewPrivate;
@@ -491,7 +497,12 @@ private:
 	DirLeft,
 	DirRight
     };
-    QIconViewItem* findItem(Direction dir, const QIconViewItem *fromItem) const;
+    QIconViewItem* findItem( Direction dir,
+			     const QPoint &relativeTo,
+			     const QRect &searchRect ) const;
+    bool neighbourItem( Direction dir,
+			const QPoint &relativeTo,
+			const QIconViewItem *item ) const;
     QBitmap mask( QPixmap *pix ) const;
     int visibleWidthSB() const;
     int visibleHeightSB() const;

src/iconview/qt_iconview.pri

@@ -0,0 +1,6 @@
+# Qt iconview module
+
+iconview {
+	HEADERS += $$ICONVIEW_H/qiconview.h
+	SOURCES += $$ICONVIEW_CPP/qiconview.cpp
+}

src/kernel/q1xcompatibility.h

@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** 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

src/kernel/qaccel.cpp

@@ -549,7 +549,7 @@ QAccelPrivate::~QAccelPrivate()
 
 static QAccelItem *find_id( QAccelList &list, int id )
 {
-    QAccelItem *item = list.first();
+    register QAccelItem *item = list.first();
     while ( item && item->id != id )
 	item = list.next();
     return item;
@@ -557,7 +557,7 @@ static QAccelItem *find_id( QAccelList &list, int id )
 
 static QAccelItem *find_key( QAccelList &list, const QKeySequence &key )
 {
-    QAccelItem *item = list.first();
+    register QAccelItem *item = list.first();
     while ( item && !( item->key == key ) )
 	item = list.next();
     return item;

src/kernel/qapplication.cpp

@@ -1421,7 +1421,7 @@ QStyle& QApplication::style()
     if ( is_app_running && !is_app_closing && (*app_pal != app_pal_copy) ) {
 	QEvent e( QEvent::ApplicationPaletteChange );
 	QWidgetIntDictIt it( *((QWidgetIntDict*)QWidget::mapper) );
-	QWidget *w;
+	register QWidget *w;
 	while ( (w=it.current()) ) {		// for all widgets...
 	    ++it;
 	    sendEvent( w, &e );
@@ -1467,7 +1467,7 @@ void QApplication::setStyle( QStyle *style )
     if (old) {
 	if ( is_app_running && !is_app_closing ) {
 	    QWidgetIntDictIt it( *((QWidgetIntDict*)QWidget::mapper) );
-	    QWidget *w;
+	    register QWidget *w;
 	    while ( (w=it.current()) ) {		// for all widgets...
 		++it;
 		if ( !w->testWFlags(WType_Desktop) &&	// except desktop
@@ -1494,7 +1494,7 @@ void QApplication::setStyle( QStyle *style )
     if (old) {
 	if ( is_app_running && !is_app_closing ) {
 	    QWidgetIntDictIt it( *((QWidgetIntDict*)QWidget::mapper) );
-	    QWidget *w;
+	    register QWidget *w;
 	    while ( (w=it.current()) ) {		// for all widgets...
 		++it;
 		if ( !w->testWFlags(WType_Desktop) ) {	// except desktop
@@ -2080,7 +2080,7 @@ void QApplication::setPalette( const QPalette &palette, bool informWidgets,
 	if ( !oldpal || ( *oldpal != pal ) ) {
 	    QEvent e( QEvent::ApplicationPaletteChange );
 	    QWidgetIntDictIt it( *((QWidgetIntDict*)QWidget::mapper) );
-	    QWidget *w;
+	    register QWidget *w;
 	    while ( (w=it.current()) ) {		// for all widgets...
 		++it;
 		if ( all || (!className && w->isTopLevel() ) || w->inherits(className) ) // matching class
@@ -2170,7 +2170,7 @@ void QApplication::setFont( const QFont &font, bool informWidgets,
     if ( informWidgets && is_app_running && !is_app_closing ) {
 	QEvent e( QEvent::ApplicationFontChange );
 	QWidgetIntDictIt it( *((QWidgetIntDict*)QWidget::mapper) );
-	QWidget *w;
+	register QWidget *w;
 	while ( (w=it.current()) ) {		// for all widgets...
 	    ++it;
 	    if ( all || (!className && w->isTopLevel() ) || w->inherits(className) ) // matching class
@@ -2780,7 +2780,7 @@ bool QApplication::internalNotify( QObject *receiver, QEvent * e)
 {
     if ( eventFilters ) {
 	QObjectListIt it( *eventFilters );
-	QObject *obj;
+	register QObject *obj;
 	while ( (obj=it.current()) != 0 ) {	// send to all filters
 	    ++it;				//   until one returns TRUE
 	    if ( obj->eventFilter(receiver,e) )

src/kernel/qapplication_x11.cpp

@@ -44,6 +44,9 @@
 // provide a proper alternative for others. See also the exports in
 // qapplication_win.cpp which suggest a unification.
 
+// ### needed for solaris-g++ in beta5
+#define QT_CLEAN_NAMESPACE
+
 #include "qplatformdefs.h"
 
 // POSIX Large File Support redefines open -> open64
@@ -2894,7 +2897,7 @@ void QApplication::setOverrideCursor( const QCursor &cursor, bool replace )
     cursorStack->append( app_cursor );
 
     QWidgetIntDictIt it( *((QWidgetIntDict*)QWidget::mapper) );
-    QWidget *w;
+    register QWidget *w;
     while ( (w=it.current()) ) {		// for all widgets that have
 	if ( w->testWState( WState_OwnCursor ) )
 	    qt_x11_enforce_cursor( w );
@@ -2922,7 +2925,7 @@ void QApplication::restoreOverrideCursor()
     app_cursor = cursorStack->last();
     if ( QWidget::mapper != 0 && !closingDown() ) {
 	QWidgetIntDictIt it( *((QWidgetIntDict*)QWidget::mapper) );
-	QWidget *w;
+	register QWidget *w;
 	while ( (w=it.current()) ) {		// set back to original cursors
 	    if ( w->testWState( WState_OwnCursor ) )
 		qt_x11_enforce_cursor( w );
@@ -2986,7 +2989,7 @@ void QApplication::setGlobalMouseTracking( bool enable )
     }
     if ( tellAllWidgets ) {
 	QWidgetIntDictIt it( *((QWidgetIntDict*)QWidget::mapper) );
-	QWidget *w;
+	register QWidget *w;
 	while ( (w=it.current()) ) {
 	    if ( app_tracking > 0 ) {		// switch on
 		if ( !w->testWState(WState_MouseTracking) ) {
@@ -4818,11 +4821,6 @@ bool QETWidget::translatePropertyEvent(const XEvent *event)
 #define XF86XK_LaunchD		0x1008FF4D
 #define XF86XK_LaunchE		0x1008FF4E
 #define XF86XK_LaunchF		0x1008FF4F
-#define XF86XK_MonBrightnessUp   0x1008FF02  /* Monitor/panel brightness */
-#define XF86XK_MonBrightnessDown 0x1008FF03  /* Monitor/panel brightness */
-#define XF86XK_KbdLightOnOff     0x1008FF04  /* Keyboards may be lit     */
-#define XF86XK_KbdBrightnessUp   0x1008FF05  /* Keyboards may be lit     */
-#define XF86XK_KbdBrightnessDown 0x1008FF06  /* Keyboards may be lit     */
 // end of XF86keysyms.h
 
 
@@ -5021,11 +5019,6 @@ static const KeySym KeyTbl[] = {		// keyboard mapping table
     XF86XK_LaunchB,	Qt::Key_LaunchD,
     XF86XK_LaunchC,	Qt::Key_LaunchE,
     XF86XK_LaunchD,	Qt::Key_LaunchF,
-    XF86XK_MonBrightnessUp,	Qt::Key_MonBrightnessUp,
-    XF86XK_MonBrightnessDown,	Qt::Key_MonBrightnessDown,
-    XF86XK_KbdLightOnOff,	Qt::Key_KeyboardLightOnOff,
-    XF86XK_KbdBrightnessUp,	Qt::Key_KeyboardBrightnessUp,
-    XF86XK_KbdBrightnessDown,	Qt::Key_KeyboardBrightnessDown,
 
     0,			0
 };