From 22b4af026826a592d189d80cd94ceb0073beacca Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 3 Nov 2010 12:07:48 +0000 Subject: [PATCH] 2010-11-03 13:07 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/utils/hbqtgen.prg % Deleted need for Harbour headers. Except hbclass.ch. To convert this to script, OOP code must be converted to regular one. * contrib/hbqt/utils/qtcore.qtp * contrib/hbqt/utils/qtnetwork.qtp * contrib/hbqt/utils/qscintilla.qtp * contrib/hbqt/utils/qtuitools.qtp * contrib/hbqt/utils/qtdesigner.qtp * contrib/hbqt/utils/qtgui.qtp * contrib/hbqt/utils/qtwebkit.qtp * Changed to use hbmk2 style comments. --- harbour/ChangeLog | 15 +++++++++++ harbour/contrib/hbqt/utils/hbqtgen.prg | 32 ++++++++++++++--------- harbour/contrib/hbqt/utils/qscintilla.qtp | 6 ++--- harbour/contrib/hbqt/utils/qtcore.qtp | 8 +++--- harbour/contrib/hbqt/utils/qtdesigner.qtp | 6 ++--- harbour/contrib/hbqt/utils/qtgui.qtp | 10 +++---- harbour/contrib/hbqt/utils/qtnetwork.qtp | 6 ++--- harbour/contrib/hbqt/utils/qtuitools.qtp | 6 ++--- harbour/contrib/hbqt/utils/qtwebkit.qtp | 6 ++--- 9 files changed, 58 insertions(+), 37 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7974fd25ba..1d1c5ba0ce 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,21 @@ The license applies to all entries newer than 2009-04-28. */ +2010-11-03 13:07 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/utils/hbqtgen.prg + % Deleted need for Harbour headers. Except hbclass.ch. + To convert this to script, OOP code must be converted + to regular one. + + * contrib/hbqt/utils/qtcore.qtp + * contrib/hbqt/utils/qtnetwork.qtp + * contrib/hbqt/utils/qscintilla.qtp + * contrib/hbqt/utils/qtuitools.qtp + * contrib/hbqt/utils/qtdesigner.qtp + * contrib/hbqt/utils/qtgui.qtp + * contrib/hbqt/utils/qtwebkit.qtp + * Changed to use hbmk2 style comments. + 2010-11-03 12:32 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/hbqt_all.hbp - Disable whole container for dos platform, as it seems diff --git a/harbour/contrib/hbqt/utils/hbqtgen.prg b/harbour/contrib/hbqt/utils/hbqtgen.prg index 65486a9c74..ea2e8a4efd 100644 --- a/harbour/contrib/hbqt/utils/hbqtgen.prg +++ b/harbour/contrib/hbqt/utils/hbqtgen.prg @@ -52,9 +52,6 @@ /*----------------------------------------------------------------------*/ #include "hbclass.ch" -#include "common.ch" -#include "fileio.ch" -#include "hbtrace.ch" #define _EOL chr( 10 ) @@ -116,7 +113,7 @@ CREATE CLASS HbQtGenerator METHOD process() METHOD manageProject( cProFile ) METHOD genSource( cProFile, cPathIn, cPathOut, cPathDoc, cProject ) - METHOD buildMakeFile( cPathOut, cProFile ) + METHOD buildMakeFile( cPathOut ) METHOD buildHeaderFile( cpp_, cPathOut, cProFile ) ENDCLASS @@ -302,7 +299,7 @@ METHOD HbQtGenerator:manageProject( cProFile ) NEXT IF !empty( ::cpp_ ) - ::buildMakefile( cPOut, cProFile ) + ::buildMakefile( cPOut ) ::buildHeaderFile( ::cpp_, cPOut, cProFile ) ENDIF @@ -405,7 +402,7 @@ METHOD HbQtGenerator:buildHeaderFile( cpp_, cPathOut, cProFile ) /*----------------------------------------------------------------------*/ -METHOD HbQtGenerator:buildMakeFile( cPathOut, cProFile ) +METHOD HbQtGenerator:buildMakeFile( cPathOut ) LOCAL cFile := iif( empty( cPathOut ), "", cPathOut + hb_ps() ) LOCAL s LOCAL hdr_:= {} @@ -1264,9 +1261,15 @@ STATIC FUNCTION hbide_addReturnMethod( txt_, oM, cWidget, nInd, nCount, lClubbed HB_SYMBOL_UNUSED( lClubbed ) - DEFAULT lInIf TO .f. - DEFAULT nTySame TO 0 - DEFAULT nArgToCheck TO oM:nArgs + IF lInIf == NIL + lInIf := .F. + ENDIF + IF nTySame == NIL + nTySame := 0 + ENDIF + IF nArgToCheck == NIL + nArgToCheck := oM:nArgs + ENDIF cPreFix := "" @@ -1286,11 +1289,11 @@ STATIC FUNCTION hbide_addReturnMethod( txt_, oM, cWidget, nInd, nCount, lClubbed ENDIF IF nTySame > 0 .AND. lInIf - HB_TRACE( HB_TR_DEBUG, oM:nArgQCast, oM:nArgs ) + // HB_TRACE( HB_TR_DEBUG, oM:nArgQCast, oM:nArgs ) IF oM:nArgQCast == 0 aadd( txt_, sp + "// " + "RETURN " + cFun + cPostFix ) - HB_TRACE( HB_TR_DEBUG, "// RETURN " + cFun + cPostFix ) /* needed to refine the engine further */ + // HB_TRACE( HB_TR_DEBUG, "// RETURN " + cFun + cPostFix ) /* needed to refine the engine further */ IF nTySame > 1 .AND. nCount == nTySame aadd( txt_, sp + "ENDSWITCH" ) ENDIF @@ -1314,7 +1317,7 @@ STATIC FUNCTION hbide_addReturnMethod( txt_, oM, cWidget, nInd, nCount, lClubbed ELSE IF nCount > 1 aadd( txt_, sp + "// " + "RETURN " + cFun + cPostFix ) - HB_TRACE( HB_TR_DEBUG, "// RETURN " + cFun + cPostFix ) /* needed to refine the engine further */ + // HB_TRACE( HB_TR_DEBUG, "// RETURN " + cFun + cPostFix ) /* needed to refine the engine further */ ELSE IF "..." $ cFun aadd( txt_, sp + cPrefix + "RETURN " + cFun + cPostFix ) @@ -2156,7 +2159,10 @@ STATIC FUNCTION Get_Command_1( cWgt, cCmn ) STATIC FUNCTION Get_Command( cWgt, cCmn, lNew ) - DEFAULT lNew TO .T. + IF lNew == NIL + lNew := .T. + ENDIF + IF lNew RETURN "hb_retptrGC( hbqt_gcAllocate_" + cWgt + "( new " + cWgt + "( " + cCmn + " ), true ) )" ELSE diff --git a/harbour/contrib/hbqt/utils/qscintilla.qtp b/harbour/contrib/hbqt/utils/qscintilla.qtp index 907ccb1ed5..59cb9082a1 100644 --- a/harbour/contrib/hbqt/utils/qscintilla.qtp +++ b/harbour/contrib/hbqt/utils/qscintilla.qtp @@ -1,6 +1,6 @@ -; -; $Id$ -; +# +# $Id$ +# -I=../qscintilla/qth -O=../qscintilla/g diff --git a/harbour/contrib/hbqt/utils/qtcore.qtp b/harbour/contrib/hbqt/utils/qtcore.qtp index 37930b1329..683fc28c08 100644 --- a/harbour/contrib/hbqt/utils/qtcore.qtp +++ b/harbour/contrib/hbqt/utils/qtcore.qtp @@ -1,6 +1,6 @@ -; -; $Id$ -; +# +# $Id$ +# -I=../qtcore/qth -O=../qtcore/g @@ -10,7 +10,7 @@ HBQEvents.qth HBQSlots.qth HBQString.qth -; QAbstractEventDispatcher.qth +# QAbstractEventDispatcher.qth QAbstractItemModel.qth QAbstractListModel.qth QAbstractTableModel.qth diff --git a/harbour/contrib/hbqt/utils/qtdesigner.qtp b/harbour/contrib/hbqt/utils/qtdesigner.qtp index 5f094a9952..538e1c6fde 100644 --- a/harbour/contrib/hbqt/utils/qtdesigner.qtp +++ b/harbour/contrib/hbqt/utils/qtdesigner.qtp @@ -1,6 +1,6 @@ -; -; $Id$ -; +# +# $Id$ +# -I=../qtdesigner/qth -O=../qtdesigner/g diff --git a/harbour/contrib/hbqt/utils/qtgui.qtp b/harbour/contrib/hbqt/utils/qtgui.qtp index aa592c29f3..1700b1af16 100644 --- a/harbour/contrib/hbqt/utils/qtgui.qtp +++ b/harbour/contrib/hbqt/utils/qtgui.qtp @@ -1,6 +1,6 @@ -; -; $Id$ -; +# +# $Id$ +# -I=../qtgui/qth -O=../qtgui/g @@ -112,13 +112,13 @@ QIcon.qth QImage.qth QImageReader.qth QImageWriter.qth -; QInputContext.qth # Disabled because of OS/2 +# QInputContext.qth # Disabled because of OS/2 QInputDialog.qth QInputEvent.qth QInputMethodEvent.qth QIntValidator.qth QItemDelegate.qth -; QItemEditorCreator.qth +# QItemEditorCreator.qth QItemEditorCreatorBase.qth QItemEditorFactory.qth QItemSelection.qth diff --git a/harbour/contrib/hbqt/utils/qtnetwork.qtp b/harbour/contrib/hbqt/utils/qtnetwork.qtp index 796f33d3a7..2171b9d6d7 100644 --- a/harbour/contrib/hbqt/utils/qtnetwork.qtp +++ b/harbour/contrib/hbqt/utils/qtnetwork.qtp @@ -1,6 +1,6 @@ -; -; $Id$ -; +# +# $Id$ +# -I=../qtnetwork/qth -O=../qtnetwork/g diff --git a/harbour/contrib/hbqt/utils/qtuitools.qtp b/harbour/contrib/hbqt/utils/qtuitools.qtp index fdb094cd55..639cbc4d69 100644 --- a/harbour/contrib/hbqt/utils/qtuitools.qtp +++ b/harbour/contrib/hbqt/utils/qtuitools.qtp @@ -1,6 +1,6 @@ -; -; $Id$ -; +# +# $Id$ +# -I=../qtuitools/qth -O=../qtuitools/g diff --git a/harbour/contrib/hbqt/utils/qtwebkit.qtp b/harbour/contrib/hbqt/utils/qtwebkit.qtp index 8d10dcafe9..1105604c70 100644 --- a/harbour/contrib/hbqt/utils/qtwebkit.qtp +++ b/harbour/contrib/hbqt/utils/qtwebkit.qtp @@ -1,6 +1,6 @@ -; -; $Id$ -; +# +# $Id$ +# -I=../qtwebkit/qth -O=../qtwebkit/g