From d0ce5ac81d9eca6f8455bec094095611c417eb5b Mon Sep 17 00:00:00 2001
From: Pritpal Bedi <bedipritpal@hotmail.com>
Date: Mon, 4 Jan 2010 16:36:06 +0000
Subject: [PATCH] 2010-01-04 08:33 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbide/resources/selectionlist.ui     ! A little less-height
 window.

  * contrib/hbide/ideeditor.prg
  * contrib/hbxbp/xbpmenubar.prg
  * contrib/hbxbp/xbpprintdialog.prg
  * contrib/hbxbp/xbpwindow.prg
    % Fixed calls to removed Qt functions.
---
 harbour/ChangeLog                                | 10 ++++++++++
 harbour/contrib/hbide/ideeditor.prg              |  3 ++-
 harbour/contrib/hbide/resources/selectionlist.ui |  9 +--------
 harbour/contrib/hbxbp/xbpmenubar.prg             |  4 ++--
 harbour/contrib/hbxbp/xbpprintdialog.prg         |  2 +-
 harbour/contrib/hbxbp/xbpwindow.prg              |  2 +-
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2b943762cd..a144cd67a5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-04 08:33 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * contrib/hbide/resources/selectionlist.ui
+    ! A little less-height window.
+
+  * contrib/hbide/ideeditor.prg
+  * contrib/hbxbp/xbpmenubar.prg
+  * contrib/hbxbp/xbpprintdialog.prg
+  * contrib/hbxbp/xbpwindow.prg
+    % Fixed calls to removed Qt functions.
+
 2010-01-04 15:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbide/idethemes.prg
   * contrib/hbide/ideeditor.prg
diff --git a/harbour/contrib/hbide/ideeditor.prg b/harbour/contrib/hbide/ideeditor.prg
index 9349b6957e..d7508365ad 100644
--- a/harbour/contrib/hbide/ideeditor.prg
+++ b/harbour/contrib/hbide/ideeditor.prg
@@ -424,7 +424,7 @@ METHOD IdeEditor:setTabImage()
 METHOD IdeEditor:showPPO( cFile )
    LOCAL qEdit, qHiliter
 
-   IF hb_FileExists( cFile )
+   IF file( cFile )
       qEdit := QPlainTextEdit():new()
       qEdit:setPlainText( hb_memoRead( cFile ) )
       qEdit:setLineWrapMode( QTextEdit_NoWrap )
@@ -475,3 +475,4 @@ METHOD IdeEditor:applyTheme( cTheme )
    RETURN Self
 
 /*----------------------------------------------------------------------*/
+
diff --git a/harbour/contrib/hbide/resources/selectionlist.ui b/harbour/contrib/hbide/resources/selectionlist.ui
index f847ac0385..06bf9ea61d 100644
--- a/harbour/contrib/hbide/resources/selectionlist.ui
+++ b/harbour/contrib/hbide/resources/selectionlist.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>221</width>
-    <height>300</height>
+    <height>188</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,13 +16,6 @@
   <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="QLabel" name="labelDesc">
-       <property name="text">
-        <string>Select an Option</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_2">
        <item>
diff --git a/harbour/contrib/hbxbp/xbpmenubar.prg b/harbour/contrib/hbxbp/xbpmenubar.prg
index 5ccbdd4073..a5cbe842de 100644
--- a/harbour/contrib/hbxbp/xbpmenubar.prg
+++ b/harbour/contrib/hbxbp/xbpmenubar.prg
@@ -278,8 +278,8 @@ METHOD xbpMenuBar:delItem( nItemIndex )
          //::aMenuItems[ nItemIndex, 4 ]:destroy()
       ELSE
          oAction := ::aMenuItems[ nItemIndex, 5 ]
-         QT_DISCONNECT_SIGNAL( oAction:pPtr, "triggered(bool)" )
-         QT_DISCONNECT_SIGNAL( oAction:pPtr, "hovered()"       )
+         Qt_Events_disConnect( ::pEvents, oAction, "triggered(bool)" )
+         Qt_Slots_disConnect( ::pSlots, oAction, "hovered()" )
          oAction:pPtr := 0
       ENDIF
       ADEL( ::aMenuItems, nItemIndex )
diff --git a/harbour/contrib/hbxbp/xbpprintdialog.prg b/harbour/contrib/hbxbp/xbpprintdialog.prg
index 0ac5e06bc6..fb511847b8 100644
--- a/harbour/contrib/hbxbp/xbpprintdialog.prg
+++ b/harbour/contrib/hbxbp/xbpprintdialog.prg
@@ -122,7 +122,7 @@ METHOD XbpPrintDialog:create( oParent, oOwner )
 METHOD XbpPrintDialog:destroy()
 
    IF len( ::aConnections ) > 0
-      aeval( ::aConnections, {|e_| Qt_DisConnect_Signal( e_[ 1 ], e_[ 2 ] ), e_[ 1 ] := NIL, e_[ 2 ] := NIL } )
+      aeval( ::aConnections, {|e_| Qt_Slots_DisConnect( ::pSlots, e_[ 1 ], e_[ 2 ] ), e_[ 1 ] := NIL, e_[ 2 ] := NIL } )
       ::aConnections := {}
    ENDIF
 
diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg
index 1e3ae4aab8..7e69decd35 100644
--- a/harbour/contrib/hbxbp/xbpwindow.prg
+++ b/harbour/contrib/hbxbp/xbpwindow.prg
@@ -497,7 +497,7 @@ METHOD XbpWindow:destroy()
          ::xDummy := Qt_Events_DisConnect( ::pEvents, e_[ 1 ], e_[ 2 ] )
       NEXT
       ::aEConnections := {}
-      ::oWidget:removeEventFilter( QT_GetEventFilter() )
+      ::oWidget:removeEventFilter( ::pEvents )
    ENDIF
 
    IF Len( ::aChildren ) > 0