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

2009-04-20 17:24 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/contrib/hbqt/hbqt.h
    ! fixed QT directory names in #include directives for case sensitive
      file systems

  * harbour/source/vm/cmdarg.c
    ! fixed HB_CMDLINE() to work with linear not square cost.
This commit is contained in:
Przemyslaw Czerpak
2009-04-20 15:17:14 +00:00
parent f2a1e1fd1c
commit 23b984aeb3
3 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -8,6 +8,14 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-04-20 17:24 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/hbqt/hbqt.h
! fixed QT directory names in #include directives for case sensitive
file systems
* harbour/source/vm/cmdarg.c
! fixed HB_CMDLINE() to work with linear not square cost.
2009-04-20 16:30 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.hbm
+ Added -km option.

12
harbour/contrib/hbqt/hbqt.h
View File

@@ -56,12 +56,12 @@
#ifndef __HBQT_H
#define __HBQT_H
#include <qt/qglobal.h>
#include <qtgui/QTextDocumentFragment>
#include <qtgui/QTextDocument>
#include <qtgui/QTextDocumentWriter>
#include <qtgui/QTextBlock>
#include <qtgui/QTextCursor>
#include <Qt/qglobal.h>
#include <QtGui/QTextDocumentFragment>
#include <QtGui/QTextDocument>
/* #include <QtGui/QTextDocumentWriter> */
#include <QtGui/QTextBlock>
#include <QtGui/QTextCursor>
#if QT_VERSION >= 0x040500

42
harbour/source/vm/cmdarg.c
View File

@@ -441,33 +441,35 @@ HB_FUNC( HB_ARGV )
HB_FUNC( HB_CMDLINE )
{
char * pszBuffer;
BOOL fFree;
int nLen;
int nPos;
int argc = hb_cmdargARGC();
char** argv = hb_cmdargARGV();
int argc = hb_cmdargARGC();
char * pszBuffer, * ptr;
ULONG ulLen;
int iArg;
if( argc )
ulLen = 0;
for( iArg = 1; iArg < argc; iArg++ )
ulLen += ( ULONG ) strlen( argv[ iArg ] ) + 1;
if( ulLen )
{
nLen = 1;
for( nPos = 1; nPos < argc; nPos++ )
nLen += ( int ) strlen( argv[ nPos ] ) + 1;
pszBuffer = ( char * ) hb_xgrab( nLen + 1 );
pszBuffer[ 0 ] = '\0';
for( nPos = 1; nPos < argc; nPos++ )
ptr = pszBuffer = ( char * ) hb_xgrab( ulLen );
for( iArg = 1; iArg < argc; iArg++ )
{
hb_strncat( pszBuffer, argv[ nPos ], nLen );
hb_strncat( pszBuffer, " ", nLen );
ulLen = ( ULONG ) strlen( argv[ iArg ] );
memcpy( ptr, argv[ iArg ], ulLen );
ptr += ulLen;
*ptr++ = ' ';
}
*--ptr = '\0';
/* Convert from OS codepage */
hb_retc_buffer( ( char * ) hb_osDecode( ( BYTE * ) pszBuffer, &fFree ) );
if( fFree )
hb_xfree( pszBuffer );
{
BOOL fFree;
hb_retc_buffer( ( char * ) hb_osDecode( ( BYTE * ) pszBuffer, &fFree ) );
if( fFree )
hb_xfree( pszBuffer );
}
}
else
hb_retc_null();