diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ebd68909b8..4df1f9c69e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,15 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-09-29 23:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/qtcore/hbqt_misc.prg
+    % Optimized HbQtObjectHandler:connect() and HbQtObjectHandler:disconnect()
+    ! Type in error msg text in hbqt_error()
+    % Deleted unnecessary headers.
+
+  * contrib/hbpre.hbm
+    * Turned off -trace by default. You can now turn on with HB_BUILD_VERBOSE=yes
+
 2010-09-30 00:35 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * harbour/contrib/rddsdd/sqlmix.c
     ! fixed typo in last commit
diff --git a/harbour/contrib/hbpre.hbm b/harbour/contrib/hbpre.hbm
index 6540898c6c..ff38576acf 100644
--- a/harbour/contrib/hbpre.hbm
+++ b/harbour/contrib/hbpre.hbm
@@ -8,7 +8,7 @@
 
 {HB_BUILD_VERBOSE}-quiet-
 {HB_BUILD_VERBOSE}-info
-{!(HB_BUILD_VERBOSE='no')}-trace
+{HB_BUILD_VERBOSE}-trace
 
 {!HB_BUILD_DEBUG}-l
 
diff --git a/harbour/contrib/hbqt/qtcore/hbqt_misc.prg b/harbour/contrib/hbqt/qtcore/hbqt_misc.prg
index 9874fb1094..0c0d6c7c97 100644
--- a/harbour/contrib/hbqt/qtcore/hbqt_misc.prg
+++ b/harbour/contrib/hbqt/qtcore/hbqt_misc.prg
@@ -51,9 +51,7 @@
 /*----------------------------------------------------------------------*/
 
 #include "hbclass.ch"
-#include "common.ch"
 #include "error.ch"
-#include "hbtrace.ch"
 
 /*----------------------------------------------------------------------*/
 
@@ -71,7 +69,7 @@ CLASS HbQtObjectHandler
 
    ERROR HANDLER onError()
 
-   ENDCLASS
+ENDCLASS
 
 /*----------------------------------------------------------------------*/
 
@@ -112,45 +110,54 @@ METHOD HbQtObjectHandler:onError()
 
    Eval( ErrorBlock(), oError )
 
-   RETURN nil
+   RETURN NIL
 
 /*----------------------------------------------------------------------*/
 
 METHOD HbQtObjectHandler:connect( cnEvent, bBlock )
-   LOCAL cType := valtype( cnEvent )
 
-   IF cType == "C"
-      IF empty( ::pSlots )
+   SWITCH ValType( cnEvent )
+   CASE "C"
+
+      IF Empty( ::pSlots )
          ::pSlots := Qt_Slots_New()
       ENDIF
       RETURN Qt_Slots_Connect( ::pSlots, ::pPtr, cnEvent, bBlock )
 
-   ELSEIF cType == "N"
-      IF empty( ::pEvents )
+   CASE "N"
+
+      IF Empty( ::pEvents )
          ::pEvents := Qt_Events_New()
          ::installEventFilter( ::pEvents )
       ENDIF
       RETURN Qt_Events_Connect( ::pEvents, ::pPtr, cnEvent, bBlock )
 
-   ENDIF
-   RETURN .f.
+   ENDSWITCH
+
+   RETURN .F.
 
 /*----------------------------------------------------------------------*/
 
 METHOD HbQtObjectHandler:disconnect( cnEvent )
-   LOCAL cType := valtype( cnEvent )
-   IF cType == "C"
-      IF ! empty( ::pSlots )
+
+   SWITCH ValType( cnEvent )
+   CASE "C"
+
+      IF ! Empty( ::pSlots )
          RETURN Qt_Slots_DisConnect( ::pSlots, ::pPtr, cnEvent )
       ENDIF
+      EXIT
 
-   ELSEIF cType == "N"
-      IF ! empty( ::pEvents )
+   CASE "N"
+
+      IF ! Empty( ::pEvents )
          RETURN Qt_Events_DisConnect( ::pEvents, ::pPtr, cnEvent )
       ENDIF
+      EXIT
 
-   ENDIF
-   RETURN .f.
+   ENDSWITCH
+
+   RETURN .F.
 
 /*----------------------------------------------------------------------*/
 
@@ -165,7 +172,7 @@ FUNCTION hbqt_error()
    oError:canDefault  := .F.
    oError:Args        := hb_AParams()
    oError:operation   := ProcName()
-   oError:Description := "Incorrect parameters type"
+   oError:Description := "Incorrect parameter type"
 
    RETURN Eval( ErrorBlock(), oError )