diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6518ee3b44..d2b94a1c30 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-08 16:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/common/hbver.c
+    ! Fixed determining the patch level of MSVC compiler on
+      or above version 2005.
+      Adapted fix from xhb / Andi Jahja.
+
+  * contrib/hbqt/hbqt_slots.cpp
+    * Little renaming.
+
 2009-12-08 15:34 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/hbqt_slots.cpp
     * Further formatting and some variables renamed.
diff --git a/harbour/contrib/hbqt/hbqt_slots.cpp b/harbour/contrib/hbqt/hbqt_slots.cpp
index ef6bdf8d68..38d184b344 100644
--- a/harbour/contrib/hbqt/hbqt_slots.cpp
+++ b/harbour/contrib/hbqt/hbqt_slots.cpp
@@ -146,12 +146,12 @@ Slots::~Slots()
    listBlock.clear();
 }
 
-static void hbqt_SlotsExec( QObject * object, const char * event )
+static void hbqt_SlotsExec( QObject * object, const char * pszEvent )
 {
    if( object )
    {
       Slots * t_slots = qt_getEventSlots();
-      int i = object->property( event ).toInt();
+      int i = object->property( pszEvent ).toInt();
       if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
       {
          PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
@@ -162,12 +162,12 @@ static void hbqt_SlotsExec( QObject * object, const char * event )
    }
 }
 
-static void hbqt_SlotsExecBool( QObject * object, const char* event, bool bBool )
+static void hbqt_SlotsExecBool( QObject * object, const char * pszEvent, bool bBool )
 {
    if( object )
    {
       Slots * t_slots = qt_getEventSlots();
-      int i = object->property( event ).toInt();
+      int i = object->property( pszEvent ).toInt();
       if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
       {
          PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
@@ -180,12 +180,12 @@ static void hbqt_SlotsExecBool( QObject * object, const char* event, bool bBool
    }
 }
 
-static void hbqt_SlotsExecInt( QObject * object, const char * event, int iValue )
+static void hbqt_SlotsExecInt( QObject * object, const char * pszEvent, int iValue )
 {
    if( object )
    {
       Slots * t_slots = qt_getEventSlots();
-      int i = object->property( event ).toInt();
+      int i = object->property( pszEvent ).toInt();
       if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
       {
          PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
@@ -198,12 +198,12 @@ static void hbqt_SlotsExecInt( QObject * object, const char * event, int iValue
    }
 }
 
-static void hbqt_SlotsExecIntInt( QObject * object, const char * event, int iValue1, int iValue2 )
+static void hbqt_SlotsExecIntInt( QObject * object, const char * pszEvent, int iValue1, int iValue2 )
 {
    if( object )
    {
       Slots * t_slots = qt_getEventSlots();
-      int i = object->property( event ).toInt();
+      int i = object->property( pszEvent ).toInt();
       if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
       {
          PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
@@ -218,12 +218,12 @@ static void hbqt_SlotsExecIntInt( QObject * object, const char * event, int iVal
    }
 }
 
-static void hbqt_SlotsExecIntIntInt( QObject * object, const char * event, int iValue1, int iValue2, int iValue3 )
+static void hbqt_SlotsExecIntIntInt( QObject * object, const char * pszEvent, int iValue1, int iValue2, int iValue3 )
 {
    if( object )
    {
       Slots * t_slots = qt_getEventSlots();
-      int i = object->property( event ).toInt();
+      int i = object->property( pszEvent ).toInt();
       if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
       {
          PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
@@ -240,12 +240,12 @@ static void hbqt_SlotsExecIntIntInt( QObject * object, const char * event, int i
    }
 }
 
-static void hbqt_SlotsExecIntIntIntInt( QObject * object, const char * event, int iValue1, int iValue2, int iValue3, int iValue4 )
+static void hbqt_SlotsExecIntIntIntInt( QObject * object, const char * pszEvent, int iValue1, int iValue2, int iValue3, int iValue4 )
 {
    if( object )
    {
       Slots * t_slots = qt_getEventSlots();
-      int i = object->property( event ).toInt();
+      int i = object->property( pszEvent ).toInt();
       if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
       {
          PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
@@ -264,12 +264,12 @@ static void hbqt_SlotsExecIntIntIntInt( QObject * object, const char * event, in
    }
 }
 
-static void hbqt_SlotsExecString( QObject * object, const char * event, const QString & string )
+static void hbqt_SlotsExecString( QObject * object, const char * pszEvent, const QString & string )
 {
    if( object )
    {
       Slots * t_slots = qt_getEventSlots();
-      int i = object->property( event ).toInt();
+      int i = object->property( pszEvent ).toInt();
       if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
       {
          PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
@@ -282,12 +282,12 @@ static void hbqt_SlotsExecString( QObject * object, const char * event, const QS
    }
 }
 
-static void hbqt_SlotsExecModel( QObject * object, const char * event, const QModelIndex & index )
+static void hbqt_SlotsExecModel( QObject * object, const char * pszEvent, const QModelIndex & index )
 {
    if( object )
    {
       Slots * t_slots = qt_getEventSlots();
-      int i = object->property( event ).toInt();
+      int i = object->property( pszEvent ).toInt();
       if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
       {
          PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
@@ -301,12 +301,12 @@ static void hbqt_SlotsExecModel( QObject * object, const char * event, const QMo
    }
 }
 
-static void hbqt_SlotsExecTextCharFormat( QObject * object, const char * event, const QTextCharFormat & f )
+static void hbqt_SlotsExecTextCharFormat( QObject * object, const char * pszEvent, const QTextCharFormat & f )
 {
    if( object )
    {
       Slots * t_slots = qt_getEventSlots();
-      int i = object->property( event ).toInt();
+      int i = object->property( pszEvent ).toInt();
       if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
       {
          PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
@@ -320,12 +320,12 @@ static void hbqt_SlotsExecTextCharFormat( QObject * object, const char * event,
    }
 }
 
-static void hbqt_SlotsExecFont( QObject * object, const char * event, const QFont & font )
+static void hbqt_SlotsExecFont( QObject * object, const char * pszEvent, const QFont & font )
 {
    if( object )
    {
       Slots * t_slots = qt_getEventSlots();
-      int i = object->property( event ).toInt();
+      int i = object->property( pszEvent ).toInt();
       if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
       {
          PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
@@ -339,12 +339,12 @@ static void hbqt_SlotsExecFont( QObject * object, const char * event, const QFon
    }
 }
 
-static void hbqt_SlotsExecStringList( QObject * object, const char * event, const QStringList & stringList )
+static void hbqt_SlotsExecStringList( QObject * object, const char * pszEvent, const QStringList & stringList )
 {
    if( object )
    {
       Slots * t_slots = qt_getEventSlots();
-      int i = object->property( event ).toInt();
+      int i = object->property( pszEvent ).toInt();
       if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
       {
          PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
@@ -358,12 +358,12 @@ static void hbqt_SlotsExecStringList( QObject * object, const char * event, cons
    }
 }
 
-static void hbqt_SlotsExecPointer( QObject * object, const char * event, void * p1 )
+static void hbqt_SlotsExecPointer( QObject * object, const char * pszEvent, void * p1 )
 {
    if( object )
    {
       Slots * t_slots = qt_getEventSlots();
-      int i = object->property( event ).toInt();
+      int i = object->property( pszEvent ).toInt();
       if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
       {
          PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
@@ -376,12 +376,12 @@ static void hbqt_SlotsExecPointer( QObject * object, const char * event, void *
    }
 }
 
-static void hbqt_SlotsExecPointerInt( QObject * object, const char * event, void * p1, int iInt )
+static void hbqt_SlotsExecPointerInt( QObject * object, const char * pszEvent, void * p1, int iInt )
 {
    if( object )
    {
       Slots * t_slots = qt_getEventSlots();
-      int i = object->property( event ).toInt();
+      int i = object->property( pszEvent ).toInt();
       if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
       {
          PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
@@ -396,12 +396,12 @@ static void hbqt_SlotsExecPointerInt( QObject * object, const char * event, void
    }
 }
 
-static void hbqt_SlotsExecPointerPointer( QObject * object, const char * event, void * p1, void * p2 )
+static void hbqt_SlotsExecPointerPointer( QObject * object, const char * pszEvent, void * p1, void * p2 )
 {
    if( object )
    {
       Slots * t_slots = qt_getEventSlots();
-      int i = object->property( event ).toInt();
+      int i = object->property( pszEvent ).toInt();
       if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
       {
          PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
diff --git a/harbour/src/common/hbver.c b/harbour/src/common/hbver.c
index 0a4745c594..854dd17755 100644
--- a/harbour/src/common/hbver.c
+++ b/harbour/src/common/hbver.c
@@ -532,7 +532,11 @@ char * hb_verCompiler( void )
    iVerMinor = _MSC_VER % 100;
 
    #if defined( _MSC_FULL_VER )
-      iVerPatch = _MSC_FULL_VER - ( _MSC_VER * 10000 );
+      #if ( _MSC_VER >= 1400 )
+         iVerPatch = _MSC_FULL_VER - ( _MSC_VER * 100000 );
+      #else
+         iVerPatch = _MSC_FULL_VER - ( _MSC_VER * 10000 );
+      #endif
    #else
       iVerPatch = 0;
    #endif