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

2010-01-11 08:20 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* contrib/hbide/ideprojmanager.prg
    ! Fixed bug reported by Marco Bra

  * contrib/hbqt/hbqt_destruct.cpp
  * contrib/hbqt/hbqt_hbqmainwindow.cpp
  * contrib/hbqt/qtgui/QMainWindow.cpp
  * contrib/hbqt/qth/QMainWindow.qth
    % Moved hbqt_QMainWindow_save(rest)Settings() from 
      hbqt_destruct.cpp to QMainWindow.cpp.
This commit is contained in:
Pritpal Bedi
2010-01-12 16:24:50 +00:00
parent 51934abb5c
commit bd9a97a63c
6 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -17,6 +17,17 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-11 08:20 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbide/ideprojmanager.prg
! Fixed bug reported by Marco Bra
* contrib/hbqt/hbqt_destruct.cpp
* contrib/hbqt/hbqt_hbqmainwindow.cpp
* contrib/hbqt/qtgui/QMainWindow.cpp
* contrib/hbqt/qth/QMainWindow.qth
% Moved hbqt_QMainWindow_save(rest)Settings() from
hbqt_destruct.cpp to QMainWindow.cpp.
2010-01-12 16:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/common/hbstr.c
* Formatting.

7
harbour/contrib/hbide/ideprojmanager.prg
View File

@@ -99,7 +99,7 @@ CLASS IdeProject
DATA outputName INIT hb_dirBase() + "projects"
DATA launchParams INIT ""
DATA launchProgram INIT ""
DATA hbpFlags INIT ""
DATA hbpFlags INIT {}
DATA sources INIT {}
DATA metaData INIT {}
DATA dotHbp INIT ""
@@ -933,7 +933,10 @@ METHOD IdeProjManager:buildProject( cProject, lLaunch, lRebuild, lPPO, lViaQt )
aadd( aHbp, "# User Supplied Flags" )
aadd( aHbp, " " )
aeval( ::oProject:hbpFlags, {|e| aadd( aHbp, e ) } )
IF !empty( ::oProject:hbpFlags )
aeval( ::oProject:hbpFlags, {|e| aadd( aHbp, e ) } )
ENDIF
aadd( aHbp, " " )
aadd( aHbp, "# hbIDE Supplied Flags" )
aadd( aHbp, " " )

16
harbour/contrib/hbqt/hbqt_destruct.cpp
View File

@@ -60,8 +60,6 @@
#if QT_VERSION >= 0x040500
#include <QTextCodec>
#include <QSettings>
#include <QMainWindow>
static int s_iObjectReleaseMethod = HBQT_RELEASE_WITH_DELETE_LATER;
@@ -135,20 +133,6 @@ HB_FUNC( HBQT_SETCODECFORCSTRINGS )
QTextCodec::setCodecForCStrings( codec );
}
HB_FUNC( HBQT_QMAINWINDOW_SAVESETTINGS )
{
QSettings qSet( hbqt_par_QString( 1 ), QSettings::IniFormat );
qSet.setValue( hbqt_par_QString( 2 ), hbqt_par_QMainWindow( 3 )->saveState() );
}
HB_FUNC( HBQT_QMAINWINDOW_RESTSETTINGS )
{
QSettings qSet( hbqt_par_QString( 1 ), QSettings::IniFormat );
hbqt_par_QMainWindow( 3 )->restoreState( qSet.value( hbqt_par_QString( 2 ) ).toByteArray() );
}
/*----------------------------------------------------------------------*/
#endif // #if QT_VERSION >= 0x040500

1
harbour/contrib/hbqt/hbqt_hbqmainwindow.cpp
View File

@@ -85,6 +85,7 @@ HBQMainWindow::~HBQMainWindow( void )
if( block )
{
HB_TRACE( HB_TR_DEBUG, ( "HBQMainWindow::~HBQMainWindow: MID" ) );
hb_itemRelease( block );
block = NULL;
}

17
harbour/contrib/hbqt/qtgui/QMainWindow.cpp
View File

@@ -83,6 +83,7 @@
#include <QtCore/QPointer>
#include <QtGui/QMainWindow>
#include <QtCore/QSettings>
/*
@@ -90,6 +91,20 @@
* ~QMainWindow ()
*/
HB_FUNC( HBQT_QMAINWINDOW_SAVESETTINGS )
{
QSettings qSet( hbqt_par_QString( 1 ), QSettings::IniFormat );
qSet.setValue( hbqt_par_QString( 2 ), hbqt_par_QMainWindow( 3 )->saveState() );
}
HB_FUNC( HBQT_QMAINWINDOW_RESTSETTINGS )
{
QSettings qSet( hbqt_par_QString( 1 ), QSettings::IniFormat );
hbqt_par_QMainWindow( 3 )->restoreState( qSet.value( hbqt_par_QString( 2 ) ).toByteArray() );
}
typedef struct
{
void * ph;
@@ -143,7 +158,7 @@ void * hbqt_gcAllocate_QMainWindow( void * pObj )
p->func = hbqt_gcRelease_QMainWindow;
new( & p->pq ) QPointer< QMainWindow >( ( QMainWindow * ) pObj );
HB_TRACE( HB_TR_DEBUG, ( " new_QMainWindow %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
return( p );
return p;
}
HB_FUNC( QT_QMAINWINDOW )

15
harbour/contrib/hbqt/qth/QMainWindow.qth
View File

@@ -61,6 +61,7 @@ New = pParent, nFlags
<CODE>
#include <QtGui/QMainWindow>
#include <QtCore/QSettings>
/*
@@ -71,6 +72,20 @@ HB_FUNC( QT_QMAINWINDOW )
{
hb_retptr( ( QMainWindow* ) new QMainWindow( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
}
HB_FUNC( HBQT_QMAINWINDOW_SAVESETTINGS )
{
QSettings qSet( hbqt_par_QString( 1 ), QSettings::IniFormat );
qSet.setValue( hbqt_par_QString( 2 ), hbqt_par_QMainWindow( 3 )->saveState() );
}
HB_FUNC( HBQT_QMAINWINDOW_RESTSETTINGS )
{
QSettings qSet( hbqt_par_QString( 1 ), QSettings::IniFormat );
hbqt_par_QMainWindow( 3 )->restoreState( qSet.value( hbqt_par_QString( 2 ) ).toByteArray() );
}
</CODE>
<ENUMS>