--- a/src/gui/widgets/qabstractspinbox.cpp	Tue Feb 02 00:43:10 2010 +0200
+++ b/src/gui/widgets/qabstractspinbox.cpp	Fri Apr 16 15:50:13 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -66,7 +66,7 @@
 #endif
 
 #if defined(Q_OS_SYMBIAN)
-#include <W32STD.H>
+#include <w32std.h>
 #include <private/qt_s60_p.h>
 #endif
 
@@ -1180,7 +1180,7 @@
     TTimeIntervalMicroSeconds32 time;
     S60->wsSession().GetKeyboardRepeatRate(initialTime, time);
     ret = time.Int() / 1000; // msecs
-#elif defined(Q_OS_WIN) and !defined(Q_OS_WINCE)
+#elif defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
     DWORD time;
     if (SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &time, 0) != FALSE)
         ret = static_cast<int>(1000 / static_cast<int>(time)); // msecs