fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-04-17 23:02 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* contrib/hbqt/hbqt_hbslots.cpp
    % Slots disconnecting QTableWidget were improper, detected 
      through Linux.

  * contrib/hbqt/THbQtUI.prg
    ! More cleanup.

  * contrib/hbide/hbide.prg
  * contrib/hbide/ideactions.prg
  * contrib/hbide/ideharbourhelp.prg
  * contrib/hbide/idemisc.prg
  * contrib/hbide/idesaveload.prg
    ! Fixed some artifacts relevant to Linux.
This commit is contained in:
Pritpal Bedi
2010-04-18 06:08:21 +00:00
parent e1c5c7a39e
commit 20e61f78a3
8 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -17,6 +17,21 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-04-17 23:02 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbqt/hbqt_hbslots.cpp
% Slots disconnecting QTableWidget were improper, detected
through Linux.
* contrib/hbqt/THbQtUI.prg
! More cleanup.
* contrib/hbide/hbide.prg
* contrib/hbide/ideactions.prg
* contrib/hbide/ideharbourhelp.prg
* contrib/hbide/idemisc.prg
* contrib/hbide/idesaveload.prg
! Fixed some artifacts relevant to Linux.
2010-04-17 22:18 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbqt/THbQtUI.prg

4
harbour/contrib/hbide/hbide.prg
View File

@@ -558,7 +558,7 @@ HB_TRACE( HB_TR_ALWAYS, "HbIde:create( cProjIni )", "#Params=" )
HB_TRACE( HB_TR_ALWAYS, "======================================================" )
HB_TRACE( HB_TR_ALWAYS, "Before ::oDlg:destroy()", memory( 1001 ) )
HB_TRACE( HB_TR_ALWAYS, " " )
#if 1
::oTM:destroy()
::oSK:destroy()
::oSC:destroy()
@@ -579,7 +579,7 @@ HB_TRACE( HB_TR_ALWAYS, "HbIde:create( cProjIni )", "#Params=" )
::oFont := NIL
qSplash := NIL
#endif
HB_TRACE( HB_TR_ALWAYS, " " )
HB_TRACE( HB_TR_ALWAYS, "After ::oDlg:destroy()", memory( 1001 ) )
HB_TRACE( HB_TR_ALWAYS, "======================================================" )

6
harbour/contrib/hbide/ideactions.prg
View File

@@ -744,15 +744,15 @@ STATIC FUNCTION mnuNormalizeItem( cCaption )
* 02/01/2010 - 23:23:22 - vailtom
*/
FUNCTION hbide_mnuAddFileToMRU( oIde, cFileName, nType )
LOCAL nPos
LOCAL nPos, cFileNormal
IF nType != INI_RECENTPROJECTS .AND. nType != INI_RECENTFILES
RETURN nil
ENDIF
cFileName := hbide_pathNormalized( cFileName )
cFileNormal := hbide_pathNormalized( cFileName )
IF ( nPos := aScan( oIde:aIni[ nType ], {|f| hbide_pathNormalized( f ) == cFileName } ) ) > 0
IF ( nPos := aScan( oIde:aIni[ nType ], {|f| hbide_pathNormalized( f ) == cFileNormal } ) ) > 0
hb_aDel( oIde:aIni[ nType ], nPos, .T. )
ENDIF

11
harbour/contrib/hbide/ideharbourhelp.prg
View File

@@ -252,9 +252,6 @@ METHOD IdeHarbourHelp:destroy()
METHOD IdeHarbourHelp:clear()
LOCAL a_
::disconnect( ::oUI:q_treeDoc , "itemSelectionChanged()" )
::disconnect( ::oUI:q_treeCategory, "itemSelectionChanged()" )
::aHistory := {}
::aFuncByFile := {}
@@ -409,6 +406,9 @@ METHOD IdeHarbourHelp:installSignals()
::oUI:signal( "editIndex" , "returnPressed()" , {| | ::execEvent( editIndex_returnPressed ) } )
::oUI:signal( "listIndex" , "itemDoubleClicked(QLWItem)", {|p| ::execEvent( listIndex_ItemDoubleClicked, p ) } )
::oUI:signal( "treeDoc" , "itemSelectionChanged()" , {| | ::execEvent( treeDoc_itemSelectionChanged ) } )
::oUI:signal( "treeCategory" , "itemSelectionChanged()" , {| | ::execEvent( treeCategory_itemSelectionChanged ) } )
RETURN Self
/*----------------------------------------------------------------------*/
@@ -595,10 +595,7 @@ METHOD IdeHarbourHelp:refreshDocTree()
/* Clean Environment */
::clear()
//
::connect( ::oUI:q_treeDoc , "itemSelectionChanged()" , {| | ::execEvent( treeDoc_itemSelectionChanged ) } )
::connect( ::oUI:q_treeCategory, "itemSelectionChanged()" , {| | ::execEvent( treeCategory_itemSelectionChanged ) } )
//
::aNodes := {}
::aFuncByFile := {}
::aHistory := {}

2
harbour/contrib/hbide/idemisc.prg
View File

@@ -604,7 +604,7 @@ FUNCTION hbide_isValidText( cSourceFile )
hb_fNameSplit( cSourceFile, , , @cExt )
RETURN ( lower( cExt ) $ ".c,.cpp,.prg,.h,.ch,.txt,.log,.ini,.env,.ppo," + ;
".cc,.hbc,.hbp,.hbm,.xml,.bat,.sh,.rc,.ui,.uic,.bak,.fmg" )
".cc,.hbc,.hbp,.hbm,.xml,.bat,.sh,.rc,.ui,.uic,.bak,.fmg,.qth,.qtp" )
/*----------------------------------------------------------------------*/

10
harbour/contrib/hbide/idesaveload.prg
View File

@@ -147,14 +147,14 @@ HB_TRACE( HB_TR_ALWAYS, "hbide_saveINI( oIde )", 0, oIde:nRunMode, oIde:cProjIni
qVScr := QScrollBar():configure( oEdit:qEdit:verticalScrollBar() )
qCursor := QTextCursor():configure( oEdit:qEdit:textCursor() )
aadd( txt_, "file_" + hb_ntos( ++nn ) + "=" + hbide_pathNormalized( oEdit:sourceFile ) + "," + ;
aadd( txt_, "file_" + hb_ntos( ++nn ) + "=" + hbide_pathNormalized( oEdit:sourceFile, .f. ) + "," + ;
hb_ntos( qCursor:position() ) + "," + ;
hb_ntos( qHScr:value() ) + "," + ;
hb_ntos( qVScr:value() ) + "," + ;
oEdit:cTheme + "," + ;
oEdit:cView + "," )
ELSE
aadd( txt_, "file_" + hb_ntos( ++nn ) + "=" + hbide_pathNormalized( oEdit:sourceFile ) + "," + ;
aadd( txt_, "file_" + hb_ntos( ++nn ) + "=" + hbide_pathNormalized( oEdit:sourceFile, .f. ) + "," + ;
hb_ntos( oEdit:nPos ) + "," + ;
hb_ntos( oEdit:nHPos ) + "," + ;
hb_ntos( oEdit:nVPos ) + "," + ;
@@ -184,21 +184,21 @@ HB_TRACE( HB_TR_ALWAYS, "hbide_saveINI( oIde )", 0, oIde:nRunMode, oIde:cProjIni
aadd( txt_, "[RECENTFILES]" )
aadd( txt_, " " )
FOR n := 1 TO len( oIde:aIni[ INI_RECENTFILES ] )
aadd( txt_, "recentfile_" + hb_ntos( n ) + "=" + hbide_pathNormalized( oIde:aIni[ INI_RECENTFILES, n ] ) )
aadd( txt_, "recentfile_" + hb_ntos( n ) + "=" + hbide_pathNormalized( oIde:aIni[ INI_RECENTFILES, n ], .f. ) )
NEXT
aadd( txt_, " " )
aadd( txt_, "[RECENTPROJECTS]" )
aadd( txt_, " " )
FOR n := 1 TO len( oIde:aIni[ INI_RECENTPROJECTS ] )
aadd( txt_, "recentproject_" + hb_ntos( n ) + "=" + hbide_pathNormalized( oIde:aIni[ INI_RECENTPROJECTS, n ] ) )
aadd( txt_, "recentproject_" + hb_ntos( n ) + "=" + hbide_pathNormalized( oIde:aIni[ INI_RECENTPROJECTS, n ], .f. ) )
NEXT
aadd( txt_, " " )
aadd( txt_, "[FOLDERS]" )
aadd( txt_, " " )
FOR n := 1 TO len( oIde:aIni[ INI_FOLDERS ] )
aadd( txt_, "folder_" + hb_ntos( n ) + "=" + hbide_pathNormalized( oIde:aIni[ INI_FOLDERS, n ] ) )
aadd( txt_, "folder_" + hb_ntos( n ) + "=" + hbide_pathNormalized( oIde:aIni[ INI_FOLDERS, n ], .f. ) )
NEXT
aadd( txt_, " " )

10
harbour/contrib/hbqt/THbQtUI.prg
View File

@@ -166,15 +166,9 @@ METHOD HbQtUI:destroy()
ENDIF
ENDIF
NEXT
#if 0
::qObj[ ::cMainWidgetName ] := NIL
::widgets[ 1, 2 ] := NIL
::aEvents := NIL
::qObj := NIL
::widgets := {}
#endif
::oWidget:close()
::oWidget := NIL
::oWidget := NIL
RETURN i

12
harbour/contrib/hbqt/hbqt_hbslots.cpp
View File

@@ -281,12 +281,12 @@ static bool disconnect_signal( QObject * object, const char * signal )
if( signal == ( QString ) "itemSelectionChanged()" ) return object->disconnect( SIGNAL( itemSelectionChanged() ) );
/* QTableWidget */
if( signal == ( QString ) "currentItemChanged(QTblWItem)" ) return object->disconnect( SIGNAL( currentItemChanged( QTableWidgetItem *, QTableWidgetItem * ) ) );
if( signal == ( QString ) "itemActivated(QTblWItem)" ) return object->disconnect( SIGNAL( itemActivated( QTableWidgetItem *, int ) ) );
if( signal == ( QString ) "itemChanged(QTblWItem)" ) return object->disconnect( SIGNAL( itemChanged( QTableWidgetItem *, int ) ) );
if( signal == ( QString ) "itemClicked(QTblWItem)" ) return object->disconnect( SIGNAL( itemClicked( QTableWidgetItem *, int ) ) );
if( signal == ( QString ) "itemDoubleClicked(QTblWItem)" ) return object->disconnect( SIGNAL( itemDoubleClicked( QTableWidgetItem *, int ) ) );
if( signal == ( QString ) "itemEntered(QTblWItem)" ) return object->disconnect( SIGNAL( itemEntered( QTableWidgetItem *, int ) ) );
if( signal == ( QString ) "itemPressed(QTblWItem)" ) return object->disconnect( SIGNAL( itemPressed( QTableWidgetItem *, int ) ) );
if( signal == ( QString ) "itemActivated(QTblWItem)" ) return object->disconnect( SIGNAL( itemActivated( QTableWidgetItem * ) ) );
if( signal == ( QString ) "itemChanged(QTblWItem)" ) return object->disconnect( SIGNAL( itemChanged( QTableWidgetItem * ) ) );
if( signal == ( QString ) "itemClicked(QTblWItem)" ) return object->disconnect( SIGNAL( itemClicked( QTableWidgetItem * ) ) );
if( signal == ( QString ) "itemDoubleClicked(QTblWItem)" ) return object->disconnect( SIGNAL( itemDoubleClicked( QTableWidgetItem * ) ) );
if( signal == ( QString ) "itemEntered(QTblWItem)" ) return object->disconnect( SIGNAL( itemEntered( QTableWidgetItem * ) ) );
if( signal == ( QString ) "itemPressed(QTblWItem)" ) return object->disconnect( SIGNAL( itemPressed( QTableWidgetItem * ) ) );
/* */
if( signal == ( QString ) "iconChanged()" ) return object->disconnect( SIGNAL( iconChanged() ) );
if( signal == ( QString ) "titleChanged(QString)" ) return object->disconnect( SIGNAL( titleChanged( const QString & ) ) );