diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 27ca8e047c..2894a18154 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,84 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-02 14:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/qtcore/hbqtcore.hbc + - contrib/hbqt/hbqt.h + + contrib/hbqt/qtcore/hbqt.h + * Moved hbqt.h inside hbqtcore. + + * contrib/hbqt/hbqt.ch + * contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h + ! Moved HBQT_AIM* constants to local file. + + * contrib/hbqt/hbqt.ch + % Cleaned embedded HB_BITOR() calls. + + - contrib/hbqt/hbqscintilla/hbqscintilla.qtp + + contrib/hbqt/utils/qscintilla.qtp + * Moved .qtp next to others. + + * contrib/hbqt/hbqscintilla/hbqscintilla.hbp + + contrib/hbqt/hbqscintilla/hbqscintilla.hbc + + contrib/hbqt/hbqscintilla/hbqscintilla.hbm + + contrib/hbqt/hbqscintilla/hbqscintillas.hbp + - contrib/hbqt/hbqscintilla/* + - contrib/hbqt/hbqscintilla/hbqt_local.h + + contrib/hbqt/hbqscintilla/g + + contrib/hbqt/hbqscintilla/g/* + + contrib/hbqt/hbqscintilla/g/filelist.hbm + * contrib/hbqt/hbqscintilla/doc/en/* + * Moved hbqscintilla files to match new layout. + + Added new hbmk2 make files. Updated existing one. + * Regenerated. + + Added TODOs to make files. + + Added hbqtcore and hbqtgui as dependencies. + + * contrib/hbqt/gtqtc/gtqtc.cpp + * contrib/hbqt/gtqtc/gtqtc.hbc + ! Some tweaks to at least make it build. Probably this + project should be deleted. + + * contrib/hbqt/hbqscintilla/hbqt_hbqsciscintilla.cpp + % Deleted unnecessary headers. + + * contrib/hbqt/hbqscintilla/hbqt_hbqsciscintilla.h + ! Fixed QT header references. + ! Added EOL @ EOF. + + * contrib/hbqt/hbqscintilla/hbqscintilla.ch + * Formatting. + + * contrib/hbqt/hbqscintilla/qth/HBQsciScintilla.qth + * contrib/hbqt/hbqscintilla/qth/QsciAbstractAPIs.qth + * contrib/hbqt/hbqscintilla/qth/QsciAPIs.qth + * contrib/hbqt/hbqscintilla/qth/QsciCommand.qth + * contrib/hbqt/hbqscintilla/qth/QsciCommandSet.qth + * contrib/hbqt/hbqscintilla/qth/QsciDocument.qth + * contrib/hbqt/hbqscintilla/qth/QsciLexer.qth + * contrib/hbqt/hbqscintilla/qth/QsciLexerCPP.qth + * contrib/hbqt/hbqscintilla/qth/QsciLexerFlagship.qth + * contrib/hbqt/hbqscintilla/qth/QsciScintilla.qth + * contrib/hbqt/hbqscintilla/qth/QsciStyle.qth + * contrib/hbqt/hbqscintilla/qth/QsciStyledText.qth + * Deleted manual headers which are now automatic. + + * utils/hbmk2/hbmk2.prg + * utils/hbmk2/hbmk2.hu_HU.po + * utils/hbmk2/hbmk2.pt_BR.po + - Deleted -head=partial header parsing method. + The new default is -head=full. Partial didn't + give much performance increase, while having + the risks to miss a header. + + * contrib/hbqt/qtgui/hbqtgui.hbm + * contrib/hbqt/qtgui/hbqtgui.hbp + * contrib/hbqt/qtgui/hbqtguis.hbp + * contrib/hbqt/qtcore/hbqtcore.hbm + * contrib/hbqt/qtcore/hbqtcore.hbp + * contrib/hbqt/qtcore/hbqtcores.hbp + % Removed some redundancy. + 2010-08-02 13:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/utils/hbqtgen.prg + Added to automatically generate HBQT_TYPE_* constants. diff --git a/harbour/contrib/hbqt/gtqtc/gtqtc.cpp b/harbour/contrib/hbqt/gtqtc/gtqtc.cpp index 56b77c95a5..16a3acb02a 100644 --- a/harbour/contrib/hbqt/gtqtc/gtqtc.cpp +++ b/harbour/contrib/hbqt/gtqtc/gtqtc.cpp @@ -1001,6 +1001,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) break; case HB_GTI_BOXCP: +#if 0 pInfo->pResult = hb_itemPutC( pInfo->pResult, pWVT->boxCDP ? pWVT->boxCDP->id : NULL ); if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING ) @@ -1009,6 +1010,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) if( cdpBox ) pWVT->boxCDP = cdpBox; } +#endif break; case HB_GTI_ICONFILE: diff --git a/harbour/contrib/hbqt/gtqtc/gtqtc.hbc b/harbour/contrib/hbqt/gtqtc/gtqtc.hbc index fcc7458e88..4fd60d459e 100644 --- a/harbour/contrib/hbqt/gtqtc/gtqtc.hbc +++ b/harbour/contrib/hbqt/gtqtc/gtqtc.hbc @@ -2,18 +2,9 @@ # $Id$ # -{allwin|os2}libpaths=${HB_WITH_QT}\..\lib - -{!HB_QT_STATIC&(allwin|os2)}libs=QtCore4 QtGui4 -{!HB_QT_STATIC&linux}libs=QtCore QtGui -{!HB_QT_STATIC&darwin}libs=/Library/Frameworks/QtCore.framework/QtCore -{!HB_QT_STATIC&darwin}libs=/Library/Frameworks/QtGui.framework/QtGui -{HB_QT_STATIC}libs=QtCore QtGui -{allgcc}libs=supc++ - -{win|os2}hbcppmm=yes - -gui=yes +../hbqt_common.hbc +../hbqtcore.hbc +../hbqtgui.hbc {!HB_QT_STATIC}gt=${hb_name} {HB_QT_STATIC}gt=${hb_name}s diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciabstractapis.txt b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciabstractapis.txt index a67b44e799..a38dce29bc 100644 --- a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciabstractapis.txt +++ b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciabstractapis.txt @@ -1,56 +1,54 @@ /* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi + * $Id$ */ /* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QsciAbstractAPIs() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qsciabstractapis.html - $ONELINER$ - Creates a new QsciAbstractAPIs object. - $INHERITS$ - - $SYNTAX$ - QsciAbstractAPIs():new( ... ) - QsciAbstractAPIs():from( pPtr_OR_oObj_of_type_QsciAbstractAPIs ) - QsciAbstractAPIs():configure( pPtr_OR_oObj_of_type_QsciAbstractAPIs ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QsciAbstractAPIs - $METHODS$ - :lexer() -> pQsciLexer - :updateAutoCompletionList( pContext, pList ) -> NIL - :autoCompletionSelected( cSelection ) -> NIL - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQsciAbstractAPIs.prg - C++ Wrappers : contrib/hbqt/QsciAbstractAPIs.cpp - Library : hb - $SEEALSO$ - - $END$ + * $TEMPLATE$ + * Class + * $NAME$ + * QsciAbstractAPIs() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qsciabstractapis.html + * $ONELINER$ + * Creates a new QsciAbstractAPIs object. + * $INHERITS$ + * + * $SYNTAX$ + * QsciAbstractAPIs():new( ... ) + * QsciAbstractAPIs():from( pPtr_OR_oObj_of_type_QsciAbstractAPIs ) + * QsciAbstractAPIs():configure( pPtr_OR_oObj_of_type_QsciAbstractAPIs ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QsciAbstractAPIs + * $METHODS$ + * :lexer() -> pQsciLexer + * :updateAutoCompletionList( pContext, pList ) -> NIL + * :autoCompletionSelected( cSelection ) -> NIL + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qscintilla/TQsciAbstractAPIs.prg + * C++ wrappers : contrib/hbqt/qscintilla/QsciAbstractAPIs.cpp + * Library : hbqscintilla + * $SEEALSO$ + * + * $END$ */ diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciapis.txt b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciapis.txt index f25b546373..e953dc676e 100644 --- a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciapis.txt +++ b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciapis.txt @@ -1,67 +1,65 @@ /* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi + * $Id$ */ /* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QsciAPIs() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qsciapis.html - $ONELINER$ - Creates a new QsciAPIs object. - $INHERITS$ - QsciAbstractAPIs - $SYNTAX$ - QsciAPIs():new( ... ) - QsciAPIs():from( pPtr_OR_oObj_of_type_QsciAPIs ) - QsciAPIs():configure( pPtr_OR_oObj_of_type_QsciAPIs ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QsciAPIs - $METHODS$ - :add( cEntry ) -> NIL - :clear() -> NIL - :load( cFname ) -> lBool - :remove( cEntry ) -> NIL - :prepare() -> NIL - :cancelPreparation() -> NIL - :defaultPreparedName() -> cQString - :isPrepared( cFname ) -> lBool - :loadPrepared( cFname ) -> lBool - :savePrepared( cFname ) -> lBool - :updateAutoCompletionList( pContext, pList ) -> NIL - :autoCompletionSelected( cSel ) -> NIL - :event( pE ) -> lBool - :installedAPIFiles() -> pQStringList - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQsciAPIs.prg - C++ Wrappers : contrib/hbqt/QsciAPIs.cpp - Library : hb - $SEEALSO$ - QsciAbstractAPIs - $END$ + * $TEMPLATE$ + * Class + * $NAME$ + * QsciAPIs() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qsciapis.html + * $ONELINER$ + * Creates a new QsciAPIs object. + * $INHERITS$ + * QsciAbstractAPIs + * $SYNTAX$ + * QsciAPIs():new( ... ) + * QsciAPIs():from( pPtr_OR_oObj_of_type_QsciAPIs ) + * QsciAPIs():configure( pPtr_OR_oObj_of_type_QsciAPIs ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QsciAPIs + * $METHODS$ + * :add( cEntry ) -> NIL + * :clear() -> NIL + * :load( cFname ) -> lBool + * :remove( cEntry ) -> NIL + * :prepare() -> NIL + * :cancelPreparation() -> NIL + * :defaultPreparedName() -> cQString + * :isPrepared( cFname ) -> lBool + * :loadPrepared( cFname ) -> lBool + * :savePrepared( cFname ) -> lBool + * :updateAutoCompletionList( pContext, pList ) -> NIL + * :autoCompletionSelected( cSel ) -> NIL + * :event( pE ) -> lBool + * :installedAPIFiles() -> pQStringList + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qscintilla/TQsciAPIs.prg + * C++ wrappers : contrib/hbqt/qscintilla/QsciAPIs.cpp + * Library : hbqscintilla + * $SEEALSO$ + * QsciAbstractAPIs + * $END$ */ diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscicommand.txt b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscicommand.txt index 9129a148e5..4b6175e03f 100644 --- a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscicommand.txt +++ b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscicommand.txt @@ -1,59 +1,57 @@ /* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi + * $Id$ */ /* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QsciCommand() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qscicommand.html - $ONELINER$ - Creates a new QsciCommand object. - $INHERITS$ - - $SYNTAX$ - QsciCommand():new( ... ) - QsciCommand():from( pPtr_OR_oObj_of_type_QsciCommand ) - QsciCommand():configure( pPtr_OR_oObj_of_type_QsciCommand ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QsciCommand - $METHODS$ - :setKey( nKey ) -> NIL - :setAlternateKey( nAltkey ) -> NIL - :key() -> nInt - :alternateKey() -> nInt - :description() -> cQString - :validKey( nKey ) -> lBool - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQsciCommand.prg - C++ Wrappers : contrib/hbqt/QsciCommand.cpp - Library : hb - $SEEALSO$ - - $END$ + * $TEMPLATE$ + * Class + * $NAME$ + * QsciCommand() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qscicommand.html + * $ONELINER$ + * Creates a new QsciCommand object. + * $INHERITS$ + * + * $SYNTAX$ + * QsciCommand():new( ... ) + * QsciCommand():from( pPtr_OR_oObj_of_type_QsciCommand ) + * QsciCommand():configure( pPtr_OR_oObj_of_type_QsciCommand ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QsciCommand + * $METHODS$ + * :setKey( nKey ) -> NIL + * :setAlternateKey( nAltkey ) -> NIL + * :key() -> nInt + * :alternateKey() -> nInt + * :description() -> cQString + * :validKey( nKey ) -> lBool + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qscintilla/TQsciCommand.prg + * C++ wrappers : contrib/hbqt/qscintilla/QsciCommand.cpp + * Library : hbqscintilla + * $SEEALSO$ + * + * $END$ */ diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscicommandset.txt b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscicommandset.txt index 88e23190c7..e80cbce9e9 100644 --- a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscicommandset.txt +++ b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscicommandset.txt @@ -1,57 +1,56 @@ /* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi + * $Id$ */ /* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QsciCommandSet() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qscicommandset.html - $ONELINER$ - Creates a new QsciCommandSet object. - $INHERITS$ - - $SYNTAX$ - QsciCommandSet():new( ... ) - QsciCommandSet():from( pPtr_OR_oObj_of_type_QsciCommandSet ) - QsciCommandSet():configure( pPtr_OR_oObj_of_type_QsciCommandSet ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QsciCommandSet - $METHODS$ - :readSettings( pQs, pPrefix ) -> lBool - :writeSettings( pQs, pPrefix ) -> lBool - :clearKeys() -> NIL - :clearAlternateKeys() -> NIL - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQsciCommandSet.prg - C++ Wrappers : contrib/hbqt/QsciCommandSet.cpp - Library : hb - $SEEALSO$ - - $END$ + * $TEMPLATE$ + * Class + * $NAME$ + * QsciCommandSet() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qscicommandset.html + * $ONELINER$ + * Creates a new QsciCommandSet object. + * $INHERITS$ + * + * $SYNTAX$ + * QsciCommandSet():new( ... ) + * QsciCommandSet():from( pPtr_OR_oObj_of_type_QsciCommandSet ) + * QsciCommandSet():configure( pPtr_OR_oObj_of_type_QsciCommandSet ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QsciCommandSet + * $METHODS$ + * :readSettings( pQs, pPrefix ) -> lBool + * :writeSettings( pQs, pPrefix ) -> lBool + * :commands() -> pQList< QsciCommand * > & + * :clearKeys() -> NIL + * :clearAlternateKeys() -> NIL + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qscintilla/TQsciCommandSet.prg + * C++ wrappers : contrib/hbqt/qscintilla/QsciCommandSet.cpp + * Library : hbqscintilla + * $SEEALSO$ + * + * $END$ */ diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexer.txt b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexer.txt index a1cd237a77..458263ad93 100644 --- a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexer.txt +++ b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexer.txt @@ -1,97 +1,95 @@ /* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi + * $Id$ */ /* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QsciLexer() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qscilexer.html - $ONELINER$ - Creates a new QsciLexer object. - $INHERITS$ - - $SYNTAX$ - QsciLexer():new( ... ) - QsciLexer():from( pPtr_OR_oObj_of_type_QsciLexer ) - QsciLexer():configure( pPtr_OR_oObj_of_type_QsciLexer ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QsciLexer - $METHODS$ - :language() -> cChar - :lexer() -> cChar - :lexerId() -> nInt - :apis() -> pQsciAbstractAPIs - :autoCompletionFillups() -> cChar - :autoCompletionWordSeparators() -> pQStringList - :autoIndentStyle() -> nInt - :blockEnd( @nStyle ) -> cChar - :blockLookback() -> nInt - :blockStart( @nStyle ) -> cChar - :blockStartKeyword( @nStyle ) -> cChar - :braceStyle() -> nInt - :caseSensitive() -> lBool - :color( nStyle ) -> pQColor - :eolFill( nStyle ) -> lBool - :font( nStyle ) -> pQFont - :indentationGuideView() -> nInt - :keywords( nSet ) -> cChar - :defaultStyle() -> nInt - :description( nStyle ) -> cQString - :paper( nStyle ) -> pQColor - :defaultColor() -> pQColor - :defaultColor_1( nStyle ) -> pQColor - :defaultEolFill( nStyle ) -> lBool - :defaultFont() -> pQFont - :defaultFont_1( nStyle ) -> pQFont - :defaultPaper() -> pQColor - :defaultPaper_1( nStyle ) -> pQColor - :editor() -> pQsciScintilla - :setEditor( pEditor ) -> NIL - :readSettings( pQs, pPrefix ) -> lBool - :refreshProperties() -> NIL - :styleBitsNeeded() -> nInt - :wordCharacters() -> cChar - :writeSettings( pQs, pPrefix ) -> lBool - :setAPIs( pApis ) -> NIL - :setDefaultColor( pC ) -> NIL - :setDefaultFont( pF ) -> NIL - :setDefaultPaper( pC ) -> NIL - :setAutoIndentStyle( nAutoindentstyle ) -> NIL - :setColor( pC, nStyle ) -> NIL - :setEolFill( lEoffill, nStyle ) -> NIL - :setFont( pF, nStyle ) -> NIL - :setPaper( pC, nStyle ) -> NIL - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQsciLexer.prg - C++ Wrappers : contrib/hbqt/QsciLexer.cpp - Library : hb - $SEEALSO$ - - $END$ + * $TEMPLATE$ + * Class + * $NAME$ + * QsciLexer() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qscilexer.html + * $ONELINER$ + * Creates a new QsciLexer object. + * $INHERITS$ + * + * $SYNTAX$ + * QsciLexer():new( ... ) + * QsciLexer():from( pPtr_OR_oObj_of_type_QsciLexer ) + * QsciLexer():configure( pPtr_OR_oObj_of_type_QsciLexer ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QsciLexer + * $METHODS$ + * :language() -> cChar + * :lexer() -> cChar + * :lexerId() -> nInt + * :apis() -> pQsciAbstractAPIs + * :autoCompletionFillups() -> cChar + * :autoCompletionWordSeparators() -> pQStringList + * :autoIndentStyle() -> nInt + * :blockEnd( @nStyle ) -> cChar + * :blockLookback() -> nInt + * :blockStart( @nStyle ) -> cChar + * :blockStartKeyword( @nStyle ) -> cChar + * :braceStyle() -> nInt + * :caseSensitive() -> lBool + * :color( nStyle ) -> pQColor + * :eolFill( nStyle ) -> lBool + * :font( nStyle ) -> pQFont + * :indentationGuideView() -> nInt + * :keywords( nSet ) -> cChar + * :defaultStyle() -> nInt + * :description( nStyle ) -> cQString + * :paper( nStyle ) -> pQColor + * :defaultColor() -> pQColor + * :defaultColor_1( nStyle ) -> pQColor + * :defaultEolFill( nStyle ) -> lBool + * :defaultFont() -> pQFont + * :defaultFont_1( nStyle ) -> pQFont + * :defaultPaper() -> pQColor + * :defaultPaper_1( nStyle ) -> pQColor + * :editor() -> pQsciScintilla + * :setEditor( pEditor ) -> NIL + * :readSettings( pQs, pPrefix ) -> lBool + * :refreshProperties() -> NIL + * :styleBitsNeeded() -> nInt + * :wordCharacters() -> cChar + * :writeSettings( pQs, pPrefix ) -> lBool + * :setAPIs( pApis ) -> NIL + * :setDefaultColor( pC ) -> NIL + * :setDefaultFont( pF ) -> NIL + * :setDefaultPaper( pC ) -> NIL + * :setAutoIndentStyle( nAutoindentstyle ) -> NIL + * :setColor( pC, nStyle ) -> NIL + * :setEolFill( lEoffill, nStyle ) -> NIL + * :setFont( pF, nStyle ) -> NIL + * :setPaper( pC, nStyle ) -> NIL + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qscintilla/TQsciLexer.prg + * C++ wrappers : contrib/hbqt/qscintilla/QsciLexer.cpp + * Library : hbqscintilla + * $SEEALSO$ + * + * $END$ */ diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexercpp.txt b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexercpp.txt index e00b70ecb8..a870a97a32 100644 --- a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexercpp.txt +++ b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexercpp.txt @@ -1,80 +1,78 @@ /* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi + * $Id$ */ /* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QsciLexerCPP() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qscilexercpp.html - $ONELINER$ - Creates a new QsciLexerCPP object. - $INHERITS$ - QsciLexer - $SYNTAX$ - QsciLexerCPP():new( ... ) - QsciLexerCPP():from( pPtr_OR_oObj_of_type_QsciLexerCPP ) - QsciLexerCPP():configure( pPtr_OR_oObj_of_type_QsciLexerCPP ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QsciLexerCPP - $METHODS$ - :language() -> cChar - :lexer() -> cChar - :autoCompletionWordSeparators() -> pQStringList - :blockEnd( @nStyle ) -> cChar - :blockStart( @nStyle ) -> cChar - :blockStartKeyword( @nStyle ) -> cChar - :braceStyle() -> nInt - :wordCharacters() -> cChar - :defaultColor( nStyle ) -> pQColor - :defaultEolFill( nStyle ) -> lBool - :defaultFont( nStyle ) -> pQFont - :defaultPaper( nStyle ) -> pQColor - :keywords( nSet ) -> cChar - :description( nStyle ) -> cQString - :refreshProperties() -> NIL - :foldAtElse() -> lBool - :foldComments() -> lBool - :foldCompact() -> lBool - :foldPreprocessor() -> lBool - :stylePreprocessor() -> lBool - :setDollarsAllowed( lAllowed ) -> NIL - :dollarsAllowed() -> lBool - :setFoldAtElse( lFold ) -> NIL - :setFoldComments( lFold ) -> NIL - :setFoldCompact( lFold ) -> NIL - :setFoldPreprocessor( lFold ) -> NIL - :setStylePreprocessor( lStyle ) -> NIL - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQsciLexerCPP.prg - C++ Wrappers : contrib/hbqt/QsciLexerCPP.cpp - Library : hb - $SEEALSO$ - QsciLexer - $END$ + * $TEMPLATE$ + * Class + * $NAME$ + * QsciLexerCPP() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qscilexercpp.html + * $ONELINER$ + * Creates a new QsciLexerCPP object. + * $INHERITS$ + * QsciLexer + * $SYNTAX$ + * QsciLexerCPP():new( ... ) + * QsciLexerCPP():from( pPtr_OR_oObj_of_type_QsciLexerCPP ) + * QsciLexerCPP():configure( pPtr_OR_oObj_of_type_QsciLexerCPP ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QsciLexerCPP + * $METHODS$ + * :language() -> cChar + * :lexer() -> cChar + * :autoCompletionWordSeparators() -> pQStringList + * :blockEnd( @nStyle ) -> cChar + * :blockStart( @nStyle ) -> cChar + * :blockStartKeyword( @nStyle ) -> cChar + * :braceStyle() -> nInt + * :wordCharacters() -> cChar + * :defaultColor( nStyle ) -> pQColor + * :defaultEolFill( nStyle ) -> lBool + * :defaultFont( nStyle ) -> pQFont + * :defaultPaper( nStyle ) -> pQColor + * :keywords( nSet ) -> cChar + * :description( nStyle ) -> cQString + * :refreshProperties() -> NIL + * :foldAtElse() -> lBool + * :foldComments() -> lBool + * :foldCompact() -> lBool + * :foldPreprocessor() -> lBool + * :stylePreprocessor() -> lBool + * :setDollarsAllowed( lAllowed ) -> NIL + * :dollarsAllowed() -> lBool + * :setFoldAtElse( lFold ) -> NIL + * :setFoldComments( lFold ) -> NIL + * :setFoldCompact( lFold ) -> NIL + * :setFoldPreprocessor( lFold ) -> NIL + * :setStylePreprocessor( lStyle ) -> NIL + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qscintilla/TQsciLexerCPP.prg + * C++ wrappers : contrib/hbqt/qscintilla/QsciLexerCPP.cpp + * Library : hbqscintilla + * $SEEALSO$ + * QsciLexer + * $END$ */ diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexerflagship.txt b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexerflagship.txt index 408f3409e5..3de6966a99 100644 --- a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexerflagship.txt +++ b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexerflagship.txt @@ -1,80 +1,78 @@ /* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi + * $Id$ */ /* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QsciLexerFlagship() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qscilexerflagship.html - $ONELINER$ - Creates a new QsciLexerFlagship object. - $INHERITS$ - QsciLexer - $SYNTAX$ - QsciLexerFlagship():new( ... ) - QsciLexerFlagship():from( pPtr_OR_oObj_of_type_QsciLexerFlagship ) - QsciLexerFlagship():configure( pPtr_OR_oObj_of_type_QsciLexerFlagship ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QsciLexerFlagship - $METHODS$ - :language() -> cChar - :lexer() -> cChar - :autoCompletionWordSeparators() -> pQStringList - :blockEnd( @nStyle ) -> cChar - :blockStart( @nStyle ) -> cChar - :blockStartKeyword( @nStyle ) -> cChar - :braceStyle() -> nInt - :wordCharacters() -> cChar - :defaultColor( nStyle ) -> pQColor - :defaultEolFill( nStyle ) -> lBool - :defaultFont( nStyle ) -> pQFont - :defaultPaper( nStyle ) -> pQColor - :keywords( nSet ) -> cChar - :description( nStyle ) -> cQString - :refreshProperties() -> NIL - :foldAtElse() -> lBool - :foldComments() -> lBool - :foldCompact() -> lBool - :foldPreprocessor() -> lBool - :stylePreprocessor() -> lBool - :setDollarsAllowed( lAllowed ) -> NIL - :dollarsAllowed() -> lBool - :setFoldAtElse( lFold ) -> NIL - :setFoldComments( lFold ) -> NIL - :setFoldCompact( lFold ) -> NIL - :setFoldPreprocessor( lFold ) -> NIL - :setStylePreprocessor( lStyle ) -> NIL - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQsciLexerFlagship.prg - C++ Wrappers : contrib/hbqt/QsciLexerFlagship.cpp - Library : hb - $SEEALSO$ - QsciLexer - $END$ + * $TEMPLATE$ + * Class + * $NAME$ + * QsciLexerFlagship() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qscilexerflagship.html + * $ONELINER$ + * Creates a new QsciLexerFlagship object. + * $INHERITS$ + * QsciLexer + * $SYNTAX$ + * QsciLexerFlagship():new( ... ) + * QsciLexerFlagship():from( pPtr_OR_oObj_of_type_QsciLexerFlagship ) + * QsciLexerFlagship():configure( pPtr_OR_oObj_of_type_QsciLexerFlagship ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QsciLexerFlagship + * $METHODS$ + * :language() -> cChar + * :lexer() -> cChar + * :autoCompletionWordSeparators() -> pQStringList + * :blockEnd( @nStyle ) -> cChar + * :blockStart( @nStyle ) -> cChar + * :blockStartKeyword( @nStyle ) -> cChar + * :braceStyle() -> nInt + * :wordCharacters() -> cChar + * :defaultColor( nStyle ) -> pQColor + * :defaultEolFill( nStyle ) -> lBool + * :defaultFont( nStyle ) -> pQFont + * :defaultPaper( nStyle ) -> pQColor + * :keywords( nSet ) -> cChar + * :description( nStyle ) -> cQString + * :refreshProperties() -> NIL + * :foldAtElse() -> lBool + * :foldComments() -> lBool + * :foldCompact() -> lBool + * :foldPreprocessor() -> lBool + * :stylePreprocessor() -> lBool + * :setDollarsAllowed( lAllowed ) -> NIL + * :dollarsAllowed() -> lBool + * :setFoldAtElse( lFold ) -> NIL + * :setFoldComments( lFold ) -> NIL + * :setFoldCompact( lFold ) -> NIL + * :setFoldPreprocessor( lFold ) -> NIL + * :setStylePreprocessor( lStyle ) -> NIL + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qscintilla/TQsciLexerFlagship.prg + * C++ wrappers : contrib/hbqt/qscintilla/QsciLexerFlagship.cpp + * Library : hbqscintilla + * $SEEALSO$ + * QsciLexer + * $END$ */ diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciscintilla.txt b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciscintilla.txt index 390b565161..c5a0d6427d 100644 --- a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciscintilla.txt +++ b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciscintilla.txt @@ -1,248 +1,246 @@ /* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi + * $Id$ */ /* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QsciScintilla() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qsciscintilla.html - $ONELINER$ - Creates a new QsciScintilla object. - $INHERITS$ - - $SYNTAX$ - QsciScintilla():new( ... ) - QsciScintilla():from( pPtr_OR_oObj_of_type_QsciScintilla ) - QsciScintilla():configure( pPtr_OR_oObj_of_type_QsciScintilla ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QsciScintilla - $METHODS$ - :annotate( nLine, cText, nStyle ) -> NIL - :annotate_1( nLine, cText, pStyle ) -> NIL - :annotate_2( nLine, pText ) -> NIL - :annotation( nLine ) -> cQString - :annotationDisplay() -> nAnnotationDisplay - :clearAnnotations( nLine ) -> NIL - :autoCompletionCaseSensitivity() -> lBool - :autoCompletionFillupsEnabled() -> lBool - :autoCompletionReplaceWord() -> lBool - :autoCompletionShowSingle() -> lBool - :autoCompletionSource() -> nAutoCompletionSource - :autoCompletionThreshold() -> nInt - :autoIndent() -> lBool - :backspaceUnindents() -> lBool - :beginUndoAction() -> NIL - :braceMatching() -> nBraceMatch - :callTipsStyle() -> nCallTipsStyle - :callTipsVisible() -> nInt - :cancelList() -> NIL - :caseSensitive() -> lBool - :clearFolds() -> NIL - :clearRegisteredImages() -> NIL - :color() -> pQColor - :convertEols( nMode ) -> NIL - :document() -> pQsciDocument - :endUndoAction() -> NIL - :edgeColor() -> pQColor - :edgeColumn() -> nInt - :edgeMode() -> nEdgeMode - :setFont( pF ) -> NIL - :eolMode() -> nEolMode - :eolVisibility() -> lBool - :findFirst( cExpr, lRe, lCs, lWo, lWrap, lForward, nLine, nIndex, lShow ) -> lBool - :findNext() -> lBool - :firstVisibleLine() -> nInt - :folding() -> nFoldStyle - :getCursorPosition( @nLine, @nIndex ) -> NIL - :getSelection( @nLineFrom, @nIndexFrom, @nLineTo, @nIndexTo ) -> NIL - :hasSelectedText() -> lBool - :indentation( nLine ) -> nInt - :indentationGuides() -> lBool - :indentationsUseTabs() -> lBool - :indentationWidth() -> nInt - :isCallTipActive() -> lBool - :isListActive() -> lBool - :isModified() -> lBool - :isReadOnly() -> lBool - :isRedoAvailable() -> lBool - :isUndoAvailable() -> lBool - :isUtf8() -> lBool - :isWordCharacter( cCh ) -> lBool - :lineAt( pPos ) -> nInt - :lineIndexFromPosition( nPosition, @nLine, @nIndex ) -> NIL - :lineLength( nLine ) -> nInt - :lines() -> nInt - :length() -> nInt - :lexer() -> pQsciLexer - :marginLineNumbers( nMargin ) -> lBool - :marginMarkerMask( nMargin ) -> nInt - :marginSensitivity( nMargin ) -> lBool - :marginType( nMargin ) -> nMarginType - :marginWidth( nMargin ) -> nInt - :markerDefine( nSym, nMnr ) -> nInt - :markerDefine_1( cCh, nMnr ) -> nInt - :markerDefine_2( pPm, nMnr ) -> nInt - :markerAdd( nLinenr, nMnr ) -> nInt - :markersAtLine( nLinenr ) -> nUnsigned - :markerDelete( nLinenr, nMnr ) -> NIL - :markerDeleteAll( nMnr ) -> NIL - :markerDeleteHandle( nMhandle ) -> NIL - :markerLine( nMhandle ) -> nInt - :markerFindNext( nLinenr, nMask ) -> nInt - :markerFindPrevious( nLinenr, nMask ) -> nInt - :paper() -> pQColor - :positionFromLineIndex( nLine, nIndex ) -> nInt - :read( pIo ) -> lBool - :recolor( nStart, nEnd ) -> NIL - :registerImage( nId, pPm ) -> NIL - :replace( cReplaceStr ) -> NIL - :resetFoldMarginColors() -> NIL - :setFoldMarginColors( pFore, pBack ) -> NIL - :setAnnotationDisplay( nDisplay ) -> NIL - :setAutoCompletionFillupsEnabled( lEnabled ) -> NIL - :setAutoCompletionFillups( pFillups ) -> NIL - :setAutoCompletionWordSeparators( pSeparators ) -> NIL - :setCallTipsBackgroundColor( pCol ) -> NIL - :setCallTipsForegroundColor( pCol ) -> NIL - :setCallTipsHighlightColor( pCol ) -> NIL - :setCallTipsStyle( nStyle ) -> NIL - :setCallTipsVisible( nNr ) -> NIL - :setDocument( pDocument ) -> NIL - :setEdgeColor( pCol ) -> NIL - :setEdgeColumn( nColnr ) -> NIL - :setEdgeMode( nMode ) -> NIL - :setMarginText( nLine, cText, nStyle ) -> NIL - :setMarginText_1( nLine, cText, pStyle ) -> NIL - :setMarginText_2( nLine, pText ) -> NIL - :setMarginType( nMargin, nType ) -> NIL - :clearMarginText( nLine ) -> NIL - :setMarkerBackgroundColor( pCol, nMnr ) -> NIL - :setMarkerForegroundColor( pCol, nMnr ) -> NIL - :setMatchedBraceBackgroundColor( pCol ) -> NIL - :setMatchedBraceForegroundColor( pCol ) -> NIL - :setUnmatchedBraceBackgroundColor( pCol ) -> NIL - :setUnmatchedBraceForegroundColor( pCol ) -> NIL - :setWrapVisualFlags( nEflag, nSflag, nSindent ) -> NIL - :selectedText() -> cQString - :selectionToEol() -> lBool - :setSelectionToEol( lFilled ) -> NIL - :showUserList( nId, pList ) -> NIL - :standardCommands() -> pQsciCommandSet - :tabIndents() -> lBool - :tabWidth() -> nInt - :text() -> cQString - :text_1( nLine ) -> cQString - :textHeight( nLinenr ) -> nInt - :whitespaceVisibility() -> nWhitespaceVisibility - :wordAtPoint( pPoint ) -> cQString - :wordCharacters() -> cChar - :wrapMode() -> nWrapMode - :write( pIo ) -> lBool - :append( cText ) -> NIL - :autoCompleteFromAll() -> NIL - :autoCompleteFromAPIs() -> NIL - :autoCompleteFromDocument() -> NIL - :callTip() -> NIL - :clear() -> NIL - :copy() -> NIL - :cut() -> NIL - :ensureCursorVisible() -> NIL - :ensureLineVisible( nLine ) -> NIL - :foldAll( lChildren ) -> NIL - :foldLine( nLine ) -> NIL - :indent( nLine ) -> NIL - :insert( cText ) -> NIL - :insertAt( cText, nLine, nIndex ) -> NIL - :moveToMatchingBrace() -> NIL - :paste() -> NIL - :redo() -> NIL - :removeSelectedText() -> NIL - :resetSelectionBackgroundColor() -> NIL - :resetSelectionForegroundColor() -> NIL - :selectAll( lSelect ) -> NIL - :selectToMatchingBrace() -> NIL - :setAutoCompletionCaseSensitivity( lCs ) -> NIL - :setAutoCompletionReplaceWord( lReplace ) -> NIL - :setAutoCompletionShowSingle( lSingle ) -> NIL - :setAutoCompletionSource( nSource ) -> NIL - :setAutoCompletionThreshold( nThresh ) -> NIL - :setAutoIndent( lAutoindent ) -> NIL - :setBraceMatching( nBm ) -> NIL - :setBackspaceUnindents( lUnindent ) -> NIL - :setCaretForegroundColor( pCol ) -> NIL - :setCaretLineBackgroundColor( pCol ) -> NIL - :setCaretLineVisible( lEnable ) -> NIL - :setCaretWidth( nWidth ) -> NIL - :setColor( pC ) -> NIL - :setCursorPosition( nLine, nIndex ) -> NIL - :setEolMode( nMode ) -> NIL - :setEolVisibility( lVisible ) -> NIL - :setFolding( nFold, nMargin ) -> NIL - :setIndentation( nLine, nIndentation ) -> NIL - :setIndentationGuides( lEnable ) -> NIL - :setIndentationGuidesBackgroundColor( pCol ) -> NIL - :setIndentationGuidesForegroundColor( pCol ) -> NIL - :setIndentationsUseTabs( lTabs ) -> NIL - :setIndentationWidth( nWidth ) -> NIL - :setLexer( pLexer ) -> NIL - :setMarginsBackgroundColor( pCol ) -> NIL - :setMarginsFont( pF ) -> NIL - :setMarginsForegroundColor( pCol ) -> NIL - :setMarginLineNumbers( nMargin, lLnrs ) -> NIL - :setMarginMarkerMask( nMargin, nMask ) -> NIL - :setMarginSensitivity( nMargin, lSens ) -> NIL - :setMarginWidth( nMargin, nWidth ) -> NIL - :setMarginWidth_1( nMargin, cS ) -> NIL - :setModified( lM ) -> NIL - :setPaper( pC ) -> NIL - :setReadOnly( lRo ) -> NIL - :setSelection( nLineFrom, nIndexFrom, nLineTo, nIndexTo ) -> NIL - :setSelectionBackgroundColor( pCol ) -> NIL - :setSelectionForegroundColor( pCol ) -> NIL - :setTabIndents( lIndent ) -> NIL - :setTabWidth( nWidth ) -> NIL - :setText( cText ) -> NIL - :setUtf8( lCp ) -> NIL - :setWhitespaceVisibility( nMode ) -> NIL - :setWrapMode( nMode ) -> NIL - :undo() -> NIL - :unindent( nLine ) -> NIL - :zoomIn( nRange ) -> NIL - :zoomIn_1() -> NIL - :zoomOut( nRange ) -> NIL - :zoomOut_1() -> NIL - :zoomTo( nSize ) -> NIL - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQsciScintilla.prg - C++ Wrappers : contrib/hbqt/QsciScintilla.cpp - Library : hb - $SEEALSO$ - - $END$ + * $TEMPLATE$ + * Class + * $NAME$ + * QsciScintilla() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qsciscintilla.html + * $ONELINER$ + * Creates a new QsciScintilla object. + * $INHERITS$ + * + * $SYNTAX$ + * QsciScintilla():new( ... ) + * QsciScintilla():from( pPtr_OR_oObj_of_type_QsciScintilla ) + * QsciScintilla():configure( pPtr_OR_oObj_of_type_QsciScintilla ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QsciScintilla + * $METHODS$ + * :annotate( nLine, cText, nStyle ) -> NIL + * :annotate_1( nLine, cText, pStyle ) -> NIL + * :annotate_2( nLine, pText ) -> NIL + * :annotation( nLine ) -> cQString + * :annotationDisplay() -> nAnnotationDisplay + * :clearAnnotations( nLine ) -> NIL + * :autoCompletionCaseSensitivity() -> lBool + * :autoCompletionFillupsEnabled() -> lBool + * :autoCompletionReplaceWord() -> lBool + * :autoCompletionShowSingle() -> lBool + * :autoCompletionSource() -> nAutoCompletionSource + * :autoCompletionThreshold() -> nInt + * :autoIndent() -> lBool + * :backspaceUnindents() -> lBool + * :beginUndoAction() -> NIL + * :braceMatching() -> nBraceMatch + * :callTipsStyle() -> nCallTipsStyle + * :callTipsVisible() -> nInt + * :cancelList() -> NIL + * :caseSensitive() -> lBool + * :clearFolds() -> NIL + * :clearRegisteredImages() -> NIL + * :color() -> pQColor + * :convertEols( nMode ) -> NIL + * :document() -> pQsciDocument + * :endUndoAction() -> NIL + * :edgeColor() -> pQColor + * :edgeColumn() -> nInt + * :edgeMode() -> nEdgeMode + * :setFont( pF ) -> NIL + * :eolMode() -> nEolMode + * :eolVisibility() -> lBool + * :findFirst( cExpr, lRe, lCs, lWo, lWrap, lForward, nLine, nIndex, lShow ) -> lBool + * :findNext() -> lBool + * :firstVisibleLine() -> nInt + * :folding() -> nFoldStyle + * :getCursorPosition( @nLine, @nIndex ) -> NIL + * :getSelection( @nLineFrom, @nIndexFrom, @nLineTo, @nIndexTo ) -> NIL + * :hasSelectedText() -> lBool + * :indentation( nLine ) -> nInt + * :indentationGuides() -> lBool + * :indentationsUseTabs() -> lBool + * :indentationWidth() -> nInt + * :isCallTipActive() -> lBool + * :isListActive() -> lBool + * :isModified() -> lBool + * :isReadOnly() -> lBool + * :isRedoAvailable() -> lBool + * :isUndoAvailable() -> lBool + * :isUtf8() -> lBool + * :isWordCharacter( cCh ) -> lBool + * :lineAt( pPos ) -> nInt + * :lineIndexFromPosition( nPosition, @nLine, @nIndex ) -> NIL + * :lineLength( nLine ) -> nInt + * :lines() -> nInt + * :length() -> nInt + * :lexer() -> pQsciLexer + * :marginLineNumbers( nMargin ) -> lBool + * :marginMarkerMask( nMargin ) -> nInt + * :marginSensitivity( nMargin ) -> lBool + * :marginType( nMargin ) -> nMarginType + * :marginWidth( nMargin ) -> nInt + * :markerDefine( nSym, nMnr ) -> nInt + * :markerDefine_1( cCh, nMnr ) -> nInt + * :markerDefine_2( pPm, nMnr ) -> nInt + * :markerAdd( nLinenr, nMnr ) -> nInt + * :markersAtLine( nLinenr ) -> nUnsigned + * :markerDelete( nLinenr, nMnr ) -> NIL + * :markerDeleteAll( nMnr ) -> NIL + * :markerDeleteHandle( nMhandle ) -> NIL + * :markerLine( nMhandle ) -> nInt + * :markerFindNext( nLinenr, nMask ) -> nInt + * :markerFindPrevious( nLinenr, nMask ) -> nInt + * :paper() -> pQColor + * :positionFromLineIndex( nLine, nIndex ) -> nInt + * :read( pIo ) -> lBool + * :recolor( nStart, nEnd ) -> NIL + * :registerImage( nId, pPm ) -> NIL + * :replace( cReplaceStr ) -> NIL + * :resetFoldMarginColors() -> NIL + * :setFoldMarginColors( pFore, pBack ) -> NIL + * :setAnnotationDisplay( nDisplay ) -> NIL + * :setAutoCompletionFillupsEnabled( lEnabled ) -> NIL + * :setAutoCompletionFillups( pFillups ) -> NIL + * :setAutoCompletionWordSeparators( pSeparators ) -> NIL + * :setCallTipsBackgroundColor( pCol ) -> NIL + * :setCallTipsForegroundColor( pCol ) -> NIL + * :setCallTipsHighlightColor( pCol ) -> NIL + * :setCallTipsStyle( nStyle ) -> NIL + * :setCallTipsVisible( nNr ) -> NIL + * :setDocument( pDocument ) -> NIL + * :setEdgeColor( pCol ) -> NIL + * :setEdgeColumn( nColnr ) -> NIL + * :setEdgeMode( nMode ) -> NIL + * :setMarginText( nLine, cText, nStyle ) -> NIL + * :setMarginText_1( nLine, cText, pStyle ) -> NIL + * :setMarginText_2( nLine, pText ) -> NIL + * :setMarginType( nMargin, nType ) -> NIL + * :clearMarginText( nLine ) -> NIL + * :setMarkerBackgroundColor( pCol, nMnr ) -> NIL + * :setMarkerForegroundColor( pCol, nMnr ) -> NIL + * :setMatchedBraceBackgroundColor( pCol ) -> NIL + * :setMatchedBraceForegroundColor( pCol ) -> NIL + * :setUnmatchedBraceBackgroundColor( pCol ) -> NIL + * :setUnmatchedBraceForegroundColor( pCol ) -> NIL + * :setWrapVisualFlags( nEflag, nSflag, nSindent ) -> NIL + * :selectedText() -> cQString + * :selectionToEol() -> lBool + * :setSelectionToEol( lFilled ) -> NIL + * :showUserList( nId, pList ) -> NIL + * :standardCommands() -> pQsciCommandSet + * :tabIndents() -> lBool + * :tabWidth() -> nInt + * :text() -> cQString + * :text_1( nLine ) -> cQString + * :textHeight( nLinenr ) -> nInt + * :whitespaceVisibility() -> nWhitespaceVisibility + * :wordAtPoint( pPoint ) -> cQString + * :wordCharacters() -> cChar + * :wrapMode() -> nWrapMode + * :write( pIo ) -> lBool + * :append( cText ) -> NIL + * :autoCompleteFromAll() -> NIL + * :autoCompleteFromAPIs() -> NIL + * :autoCompleteFromDocument() -> NIL + * :callTip() -> NIL + * :clear() -> NIL + * :copy() -> NIL + * :cut() -> NIL + * :ensureCursorVisible() -> NIL + * :ensureLineVisible( nLine ) -> NIL + * :foldAll( lChildren ) -> NIL + * :foldLine( nLine ) -> NIL + * :indent( nLine ) -> NIL + * :insert( cText ) -> NIL + * :insertAt( cText, nLine, nIndex ) -> NIL + * :moveToMatchingBrace() -> NIL + * :paste() -> NIL + * :redo() -> NIL + * :removeSelectedText() -> NIL + * :resetSelectionBackgroundColor() -> NIL + * :resetSelectionForegroundColor() -> NIL + * :selectAll( lSelect ) -> NIL + * :selectToMatchingBrace() -> NIL + * :setAutoCompletionCaseSensitivity( lCs ) -> NIL + * :setAutoCompletionReplaceWord( lReplace ) -> NIL + * :setAutoCompletionShowSingle( lSingle ) -> NIL + * :setAutoCompletionSource( nSource ) -> NIL + * :setAutoCompletionThreshold( nThresh ) -> NIL + * :setAutoIndent( lAutoindent ) -> NIL + * :setBraceMatching( nBm ) -> NIL + * :setBackspaceUnindents( lUnindent ) -> NIL + * :setCaretForegroundColor( pCol ) -> NIL + * :setCaretLineBackgroundColor( pCol ) -> NIL + * :setCaretLineVisible( lEnable ) -> NIL + * :setCaretWidth( nWidth ) -> NIL + * :setColor( pC ) -> NIL + * :setCursorPosition( nLine, nIndex ) -> NIL + * :setEolMode( nMode ) -> NIL + * :setEolVisibility( lVisible ) -> NIL + * :setFolding( nFold, nMargin ) -> NIL + * :setIndentation( nLine, nIndentation ) -> NIL + * :setIndentationGuides( lEnable ) -> NIL + * :setIndentationGuidesBackgroundColor( pCol ) -> NIL + * :setIndentationGuidesForegroundColor( pCol ) -> NIL + * :setIndentationsUseTabs( lTabs ) -> NIL + * :setIndentationWidth( nWidth ) -> NIL + * :setLexer( pLexer ) -> NIL + * :setMarginsBackgroundColor( pCol ) -> NIL + * :setMarginsFont( pF ) -> NIL + * :setMarginsForegroundColor( pCol ) -> NIL + * :setMarginLineNumbers( nMargin, lLnrs ) -> NIL + * :setMarginMarkerMask( nMargin, nMask ) -> NIL + * :setMarginSensitivity( nMargin, lSens ) -> NIL + * :setMarginWidth( nMargin, nWidth ) -> NIL + * :setMarginWidth_1( nMargin, cS ) -> NIL + * :setModified( lM ) -> NIL + * :setPaper( pC ) -> NIL + * :setReadOnly( lRo ) -> NIL + * :setSelection( nLineFrom, nIndexFrom, nLineTo, nIndexTo ) -> NIL + * :setSelectionBackgroundColor( pCol ) -> NIL + * :setSelectionForegroundColor( pCol ) -> NIL + * :setTabIndents( lIndent ) -> NIL + * :setTabWidth( nWidth ) -> NIL + * :setText( cText ) -> NIL + * :setUtf8( lCp ) -> NIL + * :setWhitespaceVisibility( nMode ) -> NIL + * :setWrapMode( nMode ) -> NIL + * :undo() -> NIL + * :unindent( nLine ) -> NIL + * :zoomIn( nRange ) -> NIL + * :zoomIn_1() -> NIL + * :zoomOut( nRange ) -> NIL + * :zoomOut_1() -> NIL + * :zoomTo( nSize ) -> NIL + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qscintilla/TQsciScintilla.prg + * C++ wrappers : contrib/hbqt/qscintilla/QsciScintilla.cpp + * Library : hbqscintilla + * $SEEALSO$ + * + * $END$ */ diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscistyle.txt b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscistyle.txt index e687f7092d..7205a68979 100644 --- a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscistyle.txt +++ b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscistyle.txt @@ -1,73 +1,71 @@ /* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi + * $Id$ */ /* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QsciStyle() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qscistyle.html - $ONELINER$ - Creates a new QsciStyle object. - $INHERITS$ - - $SYNTAX$ - QsciStyle():new( ... ) - QsciStyle():from( pPtr_OR_oObj_of_type_QsciStyle ) - QsciStyle():configure( pPtr_OR_oObj_of_type_QsciStyle ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QsciStyle - $METHODS$ - :style() -> nInt - :setDescription( cDescription ) -> NIL - :description() -> cQString - :setColor( pColor ) -> NIL - :color() -> pQColor - :setPaper( pPaper ) -> NIL - :paper() -> pQColor - :setFont( pFont ) -> NIL - :font() -> pQFont - :setEolFill( lFill ) -> NIL - :eolFill() -> lBool - :setTextCase( nText_case ) -> NIL - :textCase() -> nTextCase - :setVisible( lVisible ) -> NIL - :visible() -> lBool - :setChangeable( lChangeable ) -> NIL - :changeable() -> lBool - :setHotspot( lHotspot ) -> NIL - :hotspot() -> lBool - :refresh() -> NIL - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQsciStyle.prg - C++ Wrappers : contrib/hbqt/QsciStyle.cpp - Library : hb - $SEEALSO$ - - $END$ + * $TEMPLATE$ + * Class + * $NAME$ + * QsciStyle() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qscistyle.html + * $ONELINER$ + * Creates a new QsciStyle object. + * $INHERITS$ + * + * $SYNTAX$ + * QsciStyle():new( ... ) + * QsciStyle():from( pPtr_OR_oObj_of_type_QsciStyle ) + * QsciStyle():configure( pPtr_OR_oObj_of_type_QsciStyle ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QsciStyle + * $METHODS$ + * :style() -> nInt + * :setDescription( cDescription ) -> NIL + * :description() -> cQString + * :setColor( pColor ) -> NIL + * :color() -> pQColor + * :setPaper( pPaper ) -> NIL + * :paper() -> pQColor + * :setFont( pFont ) -> NIL + * :font() -> pQFont + * :setEolFill( lFill ) -> NIL + * :eolFill() -> lBool + * :setTextCase( nText_case ) -> NIL + * :textCase() -> nTextCase + * :setVisible( lVisible ) -> NIL + * :visible() -> lBool + * :setChangeable( lChangeable ) -> NIL + * :changeable() -> lBool + * :setHotspot( lHotspot ) -> NIL + * :hotspot() -> lBool + * :refresh() -> NIL + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qscintilla/TQsciStyle.prg + * C++ wrappers : contrib/hbqt/qscintilla/QsciStyle.cpp + * Library : hbqscintilla + * $SEEALSO$ + * + * $END$ */ diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscistyledtext.txt b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscistyledtext.txt index 85f5c4278b..7678548075 100644 --- a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscistyledtext.txt +++ b/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscistyledtext.txt @@ -1,55 +1,53 @@ /* - * hbQTgen v1.0 - Harbour Callable Wrappers Generator for Qt v4.5.3+ - * Please do not modify this document as it is subject to change in future. - * Pritpal Bedi + * $Id$ */ /* $DOC$ - $TEMPLATE$ - Class - $NAME$ - QsciStyledText() - $CATEGORY$ - Harbour Bindings for Qt - $SUBCATEGORY$ - GUI - $EXTERNALLINK$ - http://doc.trolltech.com/4.5/qscistyledtext.html - $ONELINER$ - Creates a new QsciStyledText object. - $INHERITS$ - - $SYNTAX$ - QsciStyledText():new( ... ) - QsciStyledText():from( pPtr_OR_oObj_of_type_QsciStyledText ) - QsciStyledText():configure( pPtr_OR_oObj_of_type_QsciStyledText ) - $ARGUMENTS$ - - $RETURNS$ - An instance of the object of type QsciStyledText - $METHODS$ - :text() -> cQString - :style() -> nInt - - $DESCRIPTION$ - - $EXAMPLES$ - - $TESTS$ - - $STATUS$ - R - $COMPLIANCE$ - Not Clipper Compatible - $PLATFORMS$ - Windows, Linux, MacOS, OS2 - $VERSION$ - 4.5.3 - $FILES$ - Prg Source : contrib/hbqt/TQsciStyledText.prg - C++ Wrappers : contrib/hbqt/QsciStyledText.cpp - Library : hb - $SEEALSO$ - - $END$ + * $TEMPLATE$ + * Class + * $NAME$ + * QsciStyledText() + * $CATEGORY$ + * Harbour Bindings for Qt + * $SUBCATEGORY$ + * GUI + * $EXTERNALLINK$ + * http://doc.trolltech.com/4.5/qscistyledtext.html + * $ONELINER$ + * Creates a new QsciStyledText object. + * $INHERITS$ + * + * $SYNTAX$ + * QsciStyledText():new( ... ) + * QsciStyledText():from( pPtr_OR_oObj_of_type_QsciStyledText ) + * QsciStyledText():configure( pPtr_OR_oObj_of_type_QsciStyledText ) + * $ARGUMENTS$ + * + * $RETURNS$ + * An instance of the object of type QsciStyledText + * $METHODS$ + * :text() -> cQString + * :style() -> nInt + * + * $DESCRIPTION$ + * + * $EXAMPLES$ + * + * $TESTS$ + * + * $STATUS$ + * R + * $COMPLIANCE$ + * Not Clipper compatible + * $PLATFORMS$ + * Windows, Linux, Mac OS X, OS/2 + * $VERSION$ + * 4.5 or upper + * $FILES$ + * Harbour source: contrib/hbqt/qscintilla/TQsciStyledText.prg + * C++ wrappers : contrib/hbqt/qscintilla/QsciStyledText.cpp + * Library : hbqscintilla + * $SEEALSO$ + * + * $END$ */ diff --git a/harbour/contrib/hbqt/hbqscintilla/HBQsciScintilla.cpp b/harbour/contrib/hbqt/hbqscintilla/g/HBQsciScintilla.cpp similarity index 97% rename from harbour/contrib/hbqt/hbqscintilla/HBQsciScintilla.cpp rename to harbour/contrib/hbqt/hbqscintilla/g/HBQsciScintilla.cpp index 67c8e7e48b..c0f9556426 100644 --- a/harbour/contrib/hbqt/hbqscintilla/HBQsciScintilla.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/g/HBQsciScintilla.cpp @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,7 +59,8 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqtcore.h" +#include "hbqscintilla.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -69,8 +70,6 @@ #include "hbqt_hbqsciscintilla.h" -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* @@ -82,6 +81,7 @@ typedef struct QPointer< HBQsciScintilla > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_HBQsciScintilla; QT_G_FUNC( hbqt_gcRelease_HBQsciScintilla ) @@ -128,6 +128,7 @@ void * hbqt_gcAllocate_HBQsciScintilla( void * pObj, bool bNew ) new( & p->ph ) QPointer< HBQsciScintilla >( ( HBQsciScintilla * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_HBQsciScintilla; + p->type = HBQT_TYPE_HBQsciScintilla; if( bNew ) { diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciAPIs.cpp b/harbour/contrib/hbqt/hbqscintilla/g/QsciAPIs.cpp similarity index 98% rename from harbour/contrib/hbqt/hbqscintilla/QsciAPIs.cpp rename to harbour/contrib/hbqt/hbqscintilla/g/QsciAPIs.cpp index 485e793e58..7304245603 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciAPIs.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/g/QsciAPIs.cpp @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,7 +59,8 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqtcore.h" +#include "hbqscintilla.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -77,8 +78,6 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* @@ -92,6 +91,7 @@ typedef struct QPointer< QsciAPIs > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QsciAPIs; QT_G_FUNC( hbqt_gcRelease_QsciAPIs ) @@ -138,6 +138,7 @@ void * hbqt_gcAllocate_QsciAPIs( void * pObj, bool bNew ) new( & p->ph ) QPointer< QsciAPIs >( ( QsciAPIs * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QsciAPIs; + p->type = HBQT_TYPE_QsciAPIs; if( bNew ) { diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciAbstractAPIs.cpp b/harbour/contrib/hbqt/hbqscintilla/g/QsciAbstractAPIs.cpp similarity index 97% rename from harbour/contrib/hbqt/hbqscintilla/QsciAbstractAPIs.cpp rename to harbour/contrib/hbqt/hbqscintilla/g/QsciAbstractAPIs.cpp index 4e92465c52..98be8857e8 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciAbstractAPIs.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/g/QsciAbstractAPIs.cpp @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,7 +59,8 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqtcore.h" +#include "hbqscintilla.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -77,8 +78,6 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* @@ -92,6 +91,7 @@ typedef struct QPointer< QsciAbstractAPIs > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QsciAbstractAPIs; QT_G_FUNC( hbqt_gcRelease_QsciAbstractAPIs ) @@ -112,6 +112,7 @@ void * hbqt_gcAllocate_QsciAbstractAPIs( void * pObj, bool bNew ) new( & p->ph ) QPointer< QsciAbstractAPIs >( ( QsciAbstractAPIs * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QsciAbstractAPIs; + p->type = HBQT_TYPE_QsciAbstractAPIs; if( bNew ) { diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciCommand.cpp b/harbour/contrib/hbqt/hbqscintilla/g/QsciCommand.cpp similarity index 97% rename from harbour/contrib/hbqt/hbqscintilla/QsciCommand.cpp rename to harbour/contrib/hbqt/hbqscintilla/g/QsciCommand.cpp index f8b6ca50d6..ed5a5e0d46 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciCommand.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/g/QsciCommand.cpp @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,7 +59,8 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqtcore.h" +#include "hbqscintilla.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -68,8 +69,6 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* @@ -82,6 +81,7 @@ typedef struct QsciCommand * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QsciCommand; QT_G_FUNC( hbqt_gcRelease_QsciCommand ) @@ -102,6 +102,7 @@ void * hbqt_gcAllocate_QsciCommand( void * pObj, bool bNew ) p->ph = ( QsciCommand * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QsciCommand; + p->type = HBQT_TYPE_QsciCommand; if( bNew ) { diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciCommandSet.cpp b/harbour/contrib/hbqt/hbqscintilla/g/QsciCommandSet.cpp similarity index 90% rename from harbour/contrib/hbqt/hbqscintilla/QsciCommandSet.cpp rename to harbour/contrib/hbqt/hbqscintilla/g/QsciCommandSet.cpp index 5a969f3e5e..36080fd1a1 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciCommandSet.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/g/QsciCommandSet.cpp @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,26 +59,16 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqtcore.h" +#include "hbqscintilla.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ -/* - * Constructed[ 4/5 [ 80.00% ] ] - * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * QList< QsciCommand * > & commands () - */ - #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* @@ -91,6 +81,7 @@ typedef struct QsciCommandSet * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QsciCommandSet; QT_G_FUNC( hbqt_gcRelease_QsciCommandSet ) @@ -111,6 +102,7 @@ void * hbqt_gcAllocate_QsciCommandSet( void * pObj, bool bNew ) p->ph = ( QsciCommandSet * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QsciCommandSet; + p->type = HBQT_TYPE_QsciCommandSet; if( bNew ) { @@ -156,6 +148,20 @@ HB_FUNC( QT_QSCICOMMANDSET_WRITESETTINGS ) } } +/* + * QList< QsciCommand * > & commands () + */ +HB_FUNC( QT_QSCICOMMANDSET_COMMANDS ) +{ + QsciCommandSet * p = hbqt_par_QsciCommandSet( 1 ); + if( p ) + hb_retptrGC( hbqt_gcAllocate_QList( new QList< QsciCommand * > &( ( p )->commands() ), true ) ); + else + { + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCICOMMANDSET_COMMANDS FP=hb_retptrGC( hbqt_gcAllocate_QList( new QList< QsciCommand * > &( ( p )->commands() ), true ) ); p is NULL" ) ); + } +} + /* * void clearKeys () */ diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciDocument.cpp b/harbour/contrib/hbqt/hbqscintilla/g/QsciDocument.cpp similarity index 97% rename from harbour/contrib/hbqt/hbqscintilla/QsciDocument.cpp rename to harbour/contrib/hbqt/hbqscintilla/g/QsciDocument.cpp index 79432cddd8..c0e2a4bbca 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciDocument.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/g/QsciDocument.cpp @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,7 +59,8 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqtcore.h" +#include "hbqscintilla.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -68,8 +69,6 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* @@ -83,6 +82,7 @@ typedef struct QsciDocument * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QsciDocument; QT_G_FUNC( hbqt_gcRelease_QsciDocument ) @@ -118,6 +118,7 @@ void * hbqt_gcAllocate_QsciDocument( void * pObj, bool bNew ) p->ph = ( QsciDocument * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QsciDocument; + p->type = HBQT_TYPE_QsciDocument; if( bNew ) { diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciLexer.cpp b/harbour/contrib/hbqt/hbqscintilla/g/QsciLexer.cpp similarity index 96% rename from harbour/contrib/hbqt/hbqscintilla/QsciLexer.cpp rename to harbour/contrib/hbqt/hbqscintilla/g/QsciLexer.cpp index b0c98b2d68..69ae667b13 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciLexer.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/g/QsciLexer.cpp @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,7 +59,8 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqtcore.h" +#include "hbqscintilla.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -68,8 +69,6 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* @@ -83,6 +82,7 @@ typedef struct QPointer< QsciLexer > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QsciLexer; QT_G_FUNC( hbqt_gcRelease_QsciLexer ) @@ -103,6 +103,7 @@ void * hbqt_gcAllocate_QsciLexer( void * pObj, bool bNew ) new( & p->ph ) QPointer< QsciLexer >( ( QsciLexer * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QsciLexer; + p->type = HBQT_TYPE_QsciLexer; if( bNew ) { @@ -699,10 +700,10 @@ HB_FUNC( QT_QSCILEXER_SETCOLOR ) { QsciLexer * p = hbqt_par_QsciLexer( 1 ); if( p ) - ( p )->setColor( *hbqt_par_QColor( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); + ( p )->setColor( *hbqt_par_QColor( 2 ), hb_parnidef( 3, -1 ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCILEXER_SETCOLOR FP=( p )->setColor( *hbqt_par_QColor( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCILEXER_SETCOLOR FP=( p )->setColor( *hbqt_par_QColor( 2 ), hb_parnidef( 3, -1 ) ); p is NULL" ) ); } } @@ -713,10 +714,10 @@ HB_FUNC( QT_QSCILEXER_SETEOLFILL ) { QsciLexer * p = hbqt_par_QsciLexer( 1 ); if( p ) - ( p )->setEolFill( hb_parl( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); + ( p )->setEolFill( hb_parl( 2 ), hb_parnidef( 3, -1 ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCILEXER_SETEOLFILL FP=( p )->setEolFill( hb_parl( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCILEXER_SETEOLFILL FP=( p )->setEolFill( hb_parl( 2 ), hb_parnidef( 3, -1 ) ); p is NULL" ) ); } } @@ -727,10 +728,10 @@ HB_FUNC( QT_QSCILEXER_SETFONT ) { QsciLexer * p = hbqt_par_QsciLexer( 1 ); if( p ) - ( p )->setFont( *hbqt_par_QFont( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); + ( p )->setFont( *hbqt_par_QFont( 2 ), hb_parnidef( 3, -1 ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCILEXER_SETFONT FP=( p )->setFont( *hbqt_par_QFont( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCILEXER_SETFONT FP=( p )->setFont( *hbqt_par_QFont( 2 ), hb_parnidef( 3, -1 ) ); p is NULL" ) ); } } @@ -741,10 +742,10 @@ HB_FUNC( QT_QSCILEXER_SETPAPER ) { QsciLexer * p = hbqt_par_QsciLexer( 1 ); if( p ) - ( p )->setPaper( *hbqt_par_QColor( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); + ( p )->setPaper( *hbqt_par_QColor( 2 ), hb_parnidef( 3, -1 ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCILEXER_SETPAPER FP=( p )->setPaper( *hbqt_par_QColor( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCILEXER_SETPAPER FP=( p )->setPaper( *hbqt_par_QColor( 2 ), hb_parnidef( 3, -1 ) ); p is NULL" ) ); } } diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciLexerCPP.cpp b/harbour/contrib/hbqt/hbqscintilla/g/QsciLexerCPP.cpp similarity index 99% rename from harbour/contrib/hbqt/hbqscintilla/QsciLexerCPP.cpp rename to harbour/contrib/hbqt/hbqscintilla/g/QsciLexerCPP.cpp index cdd15e282f..77f6578e82 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciLexerCPP.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/g/QsciLexerCPP.cpp @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,7 +59,8 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqtcore.h" +#include "hbqscintilla.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -80,8 +81,6 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* @@ -95,6 +94,7 @@ typedef struct QPointer< QsciLexerCPP > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QsciLexerCPP; QT_G_FUNC( hbqt_gcRelease_QsciLexerCPP ) @@ -141,6 +141,7 @@ void * hbqt_gcAllocate_QsciLexerCPP( void * pObj, bool bNew ) new( & p->ph ) QPointer< QsciLexerCPP >( ( QsciLexerCPP * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QsciLexerCPP; + p->type = HBQT_TYPE_QsciLexerCPP; if( bNew ) { diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciLexerFlagship.cpp b/harbour/contrib/hbqt/hbqscintilla/g/QsciLexerFlagship.cpp similarity index 99% rename from harbour/contrib/hbqt/hbqscintilla/QsciLexerFlagship.cpp rename to harbour/contrib/hbqt/hbqscintilla/g/QsciLexerFlagship.cpp index 9fbcc2d348..d23ee6fa43 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciLexerFlagship.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/g/QsciLexerFlagship.cpp @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,7 +59,8 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqtcore.h" +#include "hbqscintilla.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -80,8 +81,6 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* @@ -95,6 +94,7 @@ typedef struct QPointer< QsciLexerFlagship > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QsciLexerFlagship; QT_G_FUNC( hbqt_gcRelease_QsciLexerFlagship ) @@ -141,6 +141,7 @@ void * hbqt_gcAllocate_QsciLexerFlagship( void * pObj, bool bNew ) new( & p->ph ) QPointer< QsciLexerFlagship >( ( QsciLexerFlagship * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QsciLexerFlagship; + p->type = HBQT_TYPE_QsciLexerFlagship; if( bNew ) { diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciScintilla.cpp b/harbour/contrib/hbqt/hbqscintilla/g/QsciScintilla.cpp similarity index 97% rename from harbour/contrib/hbqt/hbqscintilla/QsciScintilla.cpp rename to harbour/contrib/hbqt/hbqscintilla/g/QsciScintilla.cpp index 070b7f95ee..24643518bd 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciScintilla.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/g/QsciScintilla.cpp @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,7 +59,8 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqtcore.h" +#include "hbqscintilla.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -115,8 +116,6 @@ #include "qsciscintilla.h" -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* @@ -129,6 +128,7 @@ typedef struct QPointer< QsciScintilla > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QsciScintilla; QT_G_FUNC( hbqt_gcRelease_QsciScintilla ) @@ -175,6 +175,7 @@ void * hbqt_gcAllocate_QsciScintilla( void * pObj, bool bNew ) new( & p->ph ) QPointer< QsciScintilla >( ( QsciScintilla * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QsciScintilla; + p->type = HBQT_TYPE_QsciScintilla; if( bNew ) { @@ -280,10 +281,10 @@ HB_FUNC( QT_QSCISCINTILLA_CLEARANNOTATIONS ) { QsciScintilla * p = hbqt_par_QsciScintilla( 1 ); if( p ) - ( p )->clearAnnotations( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ); + ( p )->clearAnnotations( hb_parnidef( 2, -1 ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_CLEARANNOTATIONS FP=( p )->clearAnnotations( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_CLEARANNOTATIONS FP=( p )->clearAnnotations( hb_parnidef( 2, -1 ) ); p is NULL" ) ); } } @@ -658,10 +659,10 @@ HB_FUNC( QT_QSCISCINTILLA_FINDFIRST ) { QsciScintilla * p = hbqt_par_QsciScintilla( 1 ); if( p ) - hb_retl( ( p )->findFirst( QsciScintilla::tr( hb_parc( 2 ) ), hb_parl( 3 ), hb_parl( 4 ), hb_parl( 5 ), hb_parl( 6 ), hb_parl( 7 ), ( HB_ISNUM( 8 ) ? hb_parni( 8 ) : -1 ), ( HB_ISNUM( 9 ) ? hb_parni( 9 ) : -1 ), hb_parl( 10 ) ) ); + hb_retl( ( p )->findFirst( QsciScintilla::tr( hb_parc( 2 ) ), hb_parl( 3 ), hb_parl( 4 ), hb_parl( 5 ), hb_parl( 6 ), hb_parl( 7 ), hb_parnidef( 8, -1 ), hb_parnidef( 9, -1 ), hb_parl( 10 ) ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_FINDFIRST FP=hb_retl( ( p )->findFirst( QsciScintilla::tr( hb_parc( 2 ) ), hb_parl( 3 ), hb_parl( 4 ), hb_parl( 5 ), hb_parl( 6 ), hb_parl( 7 ), ( HB_ISNUM( 8 ) ? hb_parni( 8 ) : -1 ), ( HB_ISNUM( 9 ) ? hb_parni( 9 ) : -1 ), hb_parl( 10 ) ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_FINDFIRST FP=hb_retl( ( p )->findFirst( QsciScintilla::tr( hb_parc( 2 ) ), hb_parl( 3 ), hb_parl( 4 ), hb_parl( 5 ), hb_parl( 6 ), hb_parl( 7 ), hb_parnidef( 8, -1 ), hb_parnidef( 9, -1 ), hb_parl( 10 ) ) ); p is NULL" ) ); } } @@ -1100,10 +1101,10 @@ HB_FUNC( QT_QSCISCINTILLA_MARKERDEFINE ) { QsciScintilla * p = hbqt_par_QsciScintilla( 1 ); if( p ) - hb_retni( ( p )->markerDefine( ( QsciScintilla::MarkerSymbol ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ); + hb_retni( ( p )->markerDefine( ( QsciScintilla::MarkerSymbol ) hb_parni( 2 ), hb_parnidef( 3, -1 ) ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_MARKERDEFINE FP=hb_retni( ( p )->markerDefine( ( QsciScintilla::MarkerSymbol ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_MARKERDEFINE FP=hb_retni( ( p )->markerDefine( ( QsciScintilla::MarkerSymbol ) hb_parni( 2 ), hb_parnidef( 3, -1 ) ) ); p is NULL" ) ); } } @@ -1114,10 +1115,10 @@ HB_FUNC( QT_QSCISCINTILLA_MARKERDEFINE_1 ) { QsciScintilla * p = hbqt_par_QsciScintilla( 1 ); if( p ) - hb_retni( ( p )->markerDefine( ( char ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ); + hb_retni( ( p )->markerDefine( ( char ) hb_parni( 2 ), hb_parnidef( 3, -1 ) ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_MARKERDEFINE_1 FP=hb_retni( ( p )->markerDefine( ( char ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_MARKERDEFINE_1 FP=hb_retni( ( p )->markerDefine( ( char ) hb_parni( 2 ), hb_parnidef( 3, -1 ) ) ); p is NULL" ) ); } } @@ -1128,10 +1129,10 @@ HB_FUNC( QT_QSCISCINTILLA_MARKERDEFINE_2 ) { QsciScintilla * p = hbqt_par_QsciScintilla( 1 ); if( p ) - hb_retni( ( p )->markerDefine( *hbqt_par_QPixmap( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ); + hb_retni( ( p )->markerDefine( *hbqt_par_QPixmap( 2 ), hb_parnidef( 3, -1 ) ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_MARKERDEFINE_2 FP=hb_retni( ( p )->markerDefine( *hbqt_par_QPixmap( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_MARKERDEFINE_2 FP=hb_retni( ( p )->markerDefine( *hbqt_par_QPixmap( 2 ), hb_parnidef( 3, -1 ) ) ); p is NULL" ) ); } } @@ -1170,10 +1171,10 @@ HB_FUNC( QT_QSCISCINTILLA_MARKERDELETE ) { QsciScintilla * p = hbqt_par_QsciScintilla( 1 ); if( p ) - ( p )->markerDelete( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); + ( p )->markerDelete( hb_parni( 2 ), hb_parnidef( 3, -1 ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_MARKERDELETE FP=( p )->markerDelete( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_MARKERDELETE FP=( p )->markerDelete( hb_parni( 2 ), hb_parnidef( 3, -1 ) ); p is NULL" ) ); } } @@ -1184,10 +1185,10 @@ HB_FUNC( QT_QSCISCINTILLA_MARKERDELETEALL ) { QsciScintilla * p = hbqt_par_QsciScintilla( 1 ); if( p ) - ( p )->markerDeleteAll( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ); + ( p )->markerDeleteAll( hb_parnidef( 2, -1 ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_MARKERDELETEALL FP=( p )->markerDeleteAll( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_MARKERDELETEALL FP=( p )->markerDeleteAll( hb_parnidef( 2, -1 ) ); p is NULL" ) ); } } @@ -1296,10 +1297,10 @@ HB_FUNC( QT_QSCISCINTILLA_RECOLOR ) { QsciScintilla * p = hbqt_par_QsciScintilla( 1 ); if( p ) - ( p )->recolor( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); + ( p )->recolor( hb_parni( 2 ), hb_parnidef( 3, -1 ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_RECOLOR FP=( p )->recolor( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_RECOLOR FP=( p )->recolor( hb_parni( 2 ), hb_parnidef( 3, -1 ) ); p is NULL" ) ); } } @@ -1604,10 +1605,10 @@ HB_FUNC( QT_QSCISCINTILLA_CLEARMARGINTEXT ) { QsciScintilla * p = hbqt_par_QsciScintilla( 1 ); if( p ) - ( p )->clearMarginText( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ); + ( p )->clearMarginText( hb_parnidef( 2, -1 ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_CLEARMARGINTEXT FP=( p )->clearMarginText( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_CLEARMARGINTEXT FP=( p )->clearMarginText( hb_parnidef( 2, -1 ) ); p is NULL" ) ); } } @@ -1618,10 +1619,10 @@ HB_FUNC( QT_QSCISCINTILLA_SETMARKERBACKGROUNDCOLOR ) { QsciScintilla * p = hbqt_par_QsciScintilla( 1 ); if( p ) - ( p )->setMarkerBackgroundColor( *hbqt_par_QColor( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); + ( p )->setMarkerBackgroundColor( *hbqt_par_QColor( 2 ), hb_parnidef( 3, -1 ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_SETMARKERBACKGROUNDCOLOR FP=( p )->setMarkerBackgroundColor( *hbqt_par_QColor( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_SETMARKERBACKGROUNDCOLOR FP=( p )->setMarkerBackgroundColor( *hbqt_par_QColor( 2 ), hb_parnidef( 3, -1 ) ); p is NULL" ) ); } } @@ -1632,10 +1633,10 @@ HB_FUNC( QT_QSCISCINTILLA_SETMARKERFOREGROUNDCOLOR ) { QsciScintilla * p = hbqt_par_QsciScintilla( 1 ); if( p ) - ( p )->setMarkerForegroundColor( *hbqt_par_QColor( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); + ( p )->setMarkerForegroundColor( *hbqt_par_QColor( 2 ), hb_parnidef( 3, -1 ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_SETMARKERFOREGROUNDCOLOR FP=( p )->setMarkerForegroundColor( *hbqt_par_QColor( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_SETMARKERFOREGROUNDCOLOR FP=( p )->setMarkerForegroundColor( *hbqt_par_QColor( 2 ), hb_parnidef( 3, -1 ) ); p is NULL" ) ); } } @@ -2472,10 +2473,10 @@ HB_FUNC( QT_QSCISCINTILLA_SETFOLDING ) { QsciScintilla * p = hbqt_par_QsciScintilla( 1 ); if( p ) - ( p )->setFolding( ( QsciScintilla::FoldStyle ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 2 ) ); + ( p )->setFolding( ( QsciScintilla::FoldStyle ) hb_parni( 2 ), hb_parnidef( 3, 2 ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_SETFOLDING FP=( p )->setFolding( ( QsciScintilla::FoldStyle ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 2 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSCISCINTILLA_SETFOLDING FP=( p )->setFolding( ( QsciScintilla::FoldStyle ) hb_parni( 2 ), hb_parnidef( 3, 2 ) ); p is NULL" ) ); } } diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciStyle.cpp b/harbour/contrib/hbqt/hbqscintilla/g/QsciStyle.cpp similarity index 98% rename from harbour/contrib/hbqt/hbqscintilla/QsciStyle.cpp rename to harbour/contrib/hbqt/hbqscintilla/g/QsciStyle.cpp index 1f71a58f21..fabe12e488 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciStyle.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/g/QsciStyle.cpp @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,7 +59,8 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqtcore.h" +#include "hbqscintilla.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -72,8 +73,6 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* * QsciStyle (int style=-1) @@ -86,6 +85,7 @@ typedef struct QPointer< QsciStyle > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QsciStyle; QT_G_FUNC( hbqt_gcRelease_QsciStyle ) @@ -132,6 +132,7 @@ void * hbqt_gcAllocate_QsciStyle( void * pObj, bool bNew ) new( & p->ph ) QPointer< QsciStyle >( ( QsciStyle * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QsciStyle; + p->type = HBQT_TYPE_QsciStyle; if( bNew ) { diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciStyledText.cpp b/harbour/contrib/hbqt/hbqscintilla/g/QsciStyledText.cpp similarity index 97% rename from harbour/contrib/hbqt/hbqscintilla/QsciStyledText.cpp rename to harbour/contrib/hbqt/hbqscintilla/g/QsciStyledText.cpp index b675a01bb2..1e0c977a42 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciStyledText.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/g/QsciStyledText.cpp @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,7 +59,8 @@ */ /*----------------------------------------------------------------------*/ -#include "../hbqt.h" +#include "hbqtcore.h" +#include "hbqscintilla.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -68,8 +69,6 @@ #include #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* @@ -83,6 +82,7 @@ typedef struct QsciStyledText * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QsciStyledText; QT_G_FUNC( hbqt_gcRelease_QsciStyledText ) @@ -118,6 +118,7 @@ void * hbqt_gcAllocate_QsciStyledText( void * pObj, bool bNew ) p->ph = ( QsciStyledText * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QsciStyledText; + p->type = HBQT_TYPE_QsciStyledText; if( bNew ) { diff --git a/harbour/contrib/hbqt/hbqscintilla/THBQsciScintilla.prg b/harbour/contrib/hbqt/hbqscintilla/g/THBQsciScintilla.prg similarity index 98% rename from harbour/contrib/hbqt/hbqscintilla/THBQsciScintilla.prg rename to harbour/contrib/hbqt/hbqscintilla/g/THBQsciScintilla.prg index 630c8f0fae..26462b608d 100644 --- a/harbour/contrib/hbqt/hbqscintilla/THBQsciScintilla.prg +++ b/harbour/contrib/hbqt/hbqscintilla/g/THBQsciScintilla.prg @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/harbour/contrib/hbqt/hbqscintilla/TQsciAPIs.prg b/harbour/contrib/hbqt/hbqscintilla/g/TQsciAPIs.prg similarity index 99% rename from harbour/contrib/hbqt/hbqscintilla/TQsciAPIs.prg rename to harbour/contrib/hbqt/hbqscintilla/g/TQsciAPIs.prg index cc6ede97fa..ebf1a8663f 100644 --- a/harbour/contrib/hbqt/hbqscintilla/TQsciAPIs.prg +++ b/harbour/contrib/hbqt/hbqscintilla/g/TQsciAPIs.prg @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/harbour/contrib/hbqt/hbqscintilla/TQsciAbstractAPIs.prg b/harbour/contrib/hbqt/hbqscintilla/g/TQsciAbstractAPIs.prg similarity index 98% rename from harbour/contrib/hbqt/hbqscintilla/TQsciAbstractAPIs.prg rename to harbour/contrib/hbqt/hbqscintilla/g/TQsciAbstractAPIs.prg index 95b5bf8fc8..00c1c8a29b 100644 --- a/harbour/contrib/hbqt/hbqscintilla/TQsciAbstractAPIs.prg +++ b/harbour/contrib/hbqt/hbqscintilla/g/TQsciAbstractAPIs.prg @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/harbour/contrib/hbqt/hbqscintilla/TQsciCommand.prg b/harbour/contrib/hbqt/hbqscintilla/g/TQsciCommand.prg similarity index 98% rename from harbour/contrib/hbqt/hbqscintilla/TQsciCommand.prg rename to harbour/contrib/hbqt/hbqscintilla/g/TQsciCommand.prg index a4f55eaa99..4564f95a81 100644 --- a/harbour/contrib/hbqt/hbqscintilla/TQsciCommand.prg +++ b/harbour/contrib/hbqt/hbqscintilla/g/TQsciCommand.prg @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/harbour/contrib/hbqt/hbqscintilla/TQsciCommandSet.prg b/harbour/contrib/hbqt/hbqscintilla/g/TQsciCommandSet.prg similarity index 96% rename from harbour/contrib/hbqt/hbqscintilla/TQsciCommandSet.prg rename to harbour/contrib/hbqt/hbqscintilla/g/TQsciCommandSet.prg index 99faa69a2c..7a960fd5f9 100644 --- a/harbour/contrib/hbqt/hbqscintilla/TQsciCommandSet.prg +++ b/harbour/contrib/hbqt/hbqscintilla/g/TQsciCommandSet.prg @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -69,6 +69,7 @@ CREATE CLASS QsciCommandSet INHERIT HbQtObjectHandler METHOD readSettings( pQs, pPrefix ) METHOD writeSettings( pQs, pPrefix ) + METHOD commands() METHOD clearKeys() METHOD clearAlternateKeys() @@ -92,6 +93,10 @@ METHOD QsciCommandSet:writeSettings( pQs, pPrefix ) RETURN Qt_QsciCommandSet_writeSettings( ::pPtr, hbqt_ptr( pQs ), hbqt_ptr( pPrefix ) ) +METHOD QsciCommandSet:commands() + RETURN Qt_QsciCommandSet_commands( ::pPtr ) + + METHOD QsciCommandSet:clearKeys() RETURN Qt_QsciCommandSet_clearKeys( ::pPtr ) diff --git a/harbour/contrib/hbqt/hbqscintilla/TQsciDocument.prg b/harbour/contrib/hbqt/hbqscintilla/g/TQsciDocument.prg similarity index 98% rename from harbour/contrib/hbqt/hbqscintilla/TQsciDocument.prg rename to harbour/contrib/hbqt/hbqscintilla/g/TQsciDocument.prg index 3cd45a935e..949b575552 100644 --- a/harbour/contrib/hbqt/hbqscintilla/TQsciDocument.prg +++ b/harbour/contrib/hbqt/hbqscintilla/g/TQsciDocument.prg @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/harbour/contrib/hbqt/hbqscintilla/TQsciLexer.prg b/harbour/contrib/hbqt/hbqscintilla/g/TQsciLexer.prg similarity index 99% rename from harbour/contrib/hbqt/hbqscintilla/TQsciLexer.prg rename to harbour/contrib/hbqt/hbqscintilla/g/TQsciLexer.prg index 6cc88199ea..fca2d7e2ec 100644 --- a/harbour/contrib/hbqt/hbqscintilla/TQsciLexer.prg +++ b/harbour/contrib/hbqt/hbqscintilla/g/TQsciLexer.prg @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/harbour/contrib/hbqt/hbqscintilla/TQsciLexerCPP.prg b/harbour/contrib/hbqt/hbqscintilla/g/TQsciLexerCPP.prg similarity index 99% rename from harbour/contrib/hbqt/hbqscintilla/TQsciLexerCPP.prg rename to harbour/contrib/hbqt/hbqscintilla/g/TQsciLexerCPP.prg index a8a03444fc..02148793a3 100644 --- a/harbour/contrib/hbqt/hbqscintilla/TQsciLexerCPP.prg +++ b/harbour/contrib/hbqt/hbqscintilla/g/TQsciLexerCPP.prg @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/harbour/contrib/hbqt/hbqscintilla/TQsciLexerFlagship.prg b/harbour/contrib/hbqt/hbqscintilla/g/TQsciLexerFlagship.prg similarity index 99% rename from harbour/contrib/hbqt/hbqscintilla/TQsciLexerFlagship.prg rename to harbour/contrib/hbqt/hbqscintilla/g/TQsciLexerFlagship.prg index 43bb38b316..1b11cc8d44 100644 --- a/harbour/contrib/hbqt/hbqscintilla/TQsciLexerFlagship.prg +++ b/harbour/contrib/hbqt/hbqscintilla/g/TQsciLexerFlagship.prg @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/harbour/contrib/hbqt/hbqscintilla/TQsciScintilla.prg b/harbour/contrib/hbqt/hbqscintilla/g/TQsciScintilla.prg similarity index 99% rename from harbour/contrib/hbqt/hbqscintilla/TQsciScintilla.prg rename to harbour/contrib/hbqt/hbqscintilla/g/TQsciScintilla.prg index 84359d7121..70e264936e 100644 --- a/harbour/contrib/hbqt/hbqscintilla/TQsciScintilla.prg +++ b/harbour/contrib/hbqt/hbqscintilla/g/TQsciScintilla.prg @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/harbour/contrib/hbqt/hbqscintilla/TQsciStyle.prg b/harbour/contrib/hbqt/hbqscintilla/g/TQsciStyle.prg similarity index 99% rename from harbour/contrib/hbqt/hbqscintilla/TQsciStyle.prg rename to harbour/contrib/hbqt/hbqscintilla/g/TQsciStyle.prg index 49f783c463..244b1fcd8e 100644 --- a/harbour/contrib/hbqt/hbqscintilla/TQsciStyle.prg +++ b/harbour/contrib/hbqt/hbqscintilla/g/TQsciStyle.prg @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/harbour/contrib/hbqt/hbqscintilla/TQsciStyledText.prg b/harbour/contrib/hbqt/hbqscintilla/g/TQsciStyledText.prg similarity index 98% rename from harbour/contrib/hbqt/hbqscintilla/TQsciStyledText.prg rename to harbour/contrib/hbqt/hbqscintilla/g/TQsciStyledText.prg index 73ff986a3f..7b035c16a9 100644 --- a/harbour/contrib/hbqt/hbqscintilla/TQsciStyledText.prg +++ b/harbour/contrib/hbqt/hbqscintilla/g/TQsciStyledText.prg @@ -15,7 +15,7 @@ * Copyright 2009-2010 Pritpal Bedi * * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org + * www - http://harbour-project.org * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/harbour/contrib/hbqt/hbqscintilla/g/filelist.hbm b/harbour/contrib/hbqt/hbqscintilla/g/filelist.hbm new file mode 100644 index 0000000000..aee9d8e345 --- /dev/null +++ b/harbour/contrib/hbqt/hbqscintilla/g/filelist.hbm @@ -0,0 +1,35 @@ +# +# $Id$ +# + +# -------------------------------------------------------------------- +# WARNING: Automatically generated source file. DO NOT EDIT! +# Instead, edit corresponding .qth file, +# or the generator tool itself, and run regenarate. +# -------------------------------------------------------------------- + +HBQsciScintilla.cpp +QsciAbstractAPIs.cpp +QsciAPIs.cpp +QsciCommand.cpp +QsciCommandSet.cpp +QsciDocument.cpp +QsciLexer.cpp +QsciLexerCPP.cpp +QsciLexerFlagship.cpp +QsciScintilla.cpp +QsciStyle.cpp +QsciStyledText.cpp + +THBQsciScintilla.prg +TQsciAbstractAPIs.prg +TQsciAPIs.prg +TQsciCommand.prg +TQsciCommandSet.prg +TQsciDocument.prg +TQsciLexer.prg +TQsciLexerCPP.prg +TQsciLexerFlagship.prg +TQsciScintilla.prg +TQsciStyle.prg +TQsciStyledText.prg diff --git a/harbour/contrib/hbqt/hbqscintilla/g/hbqscintilla.h b/harbour/contrib/hbqt/hbqscintilla/g/hbqscintilla.h new file mode 100644 index 0000000000..dddebf807c --- /dev/null +++ b/harbour/contrib/hbqt/hbqscintilla/g/hbqscintilla.h @@ -0,0 +1,70 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +#ifndef __HBQSCINTILLA_H +#define __HBQSCINTILLA_H + +#include "hbqt.h" + +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_HBQsciScintilla ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QsciAbstractAPIs ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QsciAPIs ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QsciCommand ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QsciCommandSet ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QsciDocument ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QsciLexer ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QsciLexerCPP ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QsciLexerFlagship ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QsciScintilla ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QsciStyle ); +extern HB_EXPORT QT_G_FUNC( hbqt_gcRelease_QsciStyledText ); + +extern HB_EXPORT void * hbqt_gcAllocate_HBQsciScintilla( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QsciAbstractAPIs( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QsciAPIs( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QsciCommand( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QsciCommandSet( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QsciDocument( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QsciLexer( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QsciLexerCPP( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QsciLexerFlagship( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QsciScintilla( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QsciStyle( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QsciStyledText( void * pObj, bool bNew ); + +#define hbqt_par_HBQsciScintilla( n ) ( ( HBQsciScintilla * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciAbstractAPIs( n ) ( ( QsciAbstractAPIs * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciAPIs( n ) ( ( QsciAPIs * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciCommand( n ) ( ( QsciCommand * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciCommandSet( n ) ( ( QsciCommandSet * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciDocument( n ) ( ( QsciDocument * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciLexer( n ) ( ( QsciLexer * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciLexerCPP( n ) ( ( QsciLexerCPP * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciLexerFlagship( n ) ( ( QsciLexerFlagship * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciScintilla( n ) ( ( QsciScintilla * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciStyle( n ) ( ( QsciStyle * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciStyledText( n ) ( ( QsciStyledText * ) hbqt_gcpointer( n ) ) + +#define HBQT_TYPE_QSCINTILLA_BASE 14000 + +#define HBQT_TYPE_HBQsciScintilla ( HBQT_TYPE_QSCINTILLA_BASE + 1 ) +#define HBQT_TYPE_QsciAbstractAPIs ( HBQT_TYPE_QSCINTILLA_BASE + 2 ) +#define HBQT_TYPE_QsciAPIs ( HBQT_TYPE_QSCINTILLA_BASE + 3 ) +#define HBQT_TYPE_QsciCommand ( HBQT_TYPE_QSCINTILLA_BASE + 4 ) +#define HBQT_TYPE_QsciCommandSet ( HBQT_TYPE_QSCINTILLA_BASE + 5 ) +#define HBQT_TYPE_QsciDocument ( HBQT_TYPE_QSCINTILLA_BASE + 6 ) +#define HBQT_TYPE_QsciLexer ( HBQT_TYPE_QSCINTILLA_BASE + 7 ) +#define HBQT_TYPE_QsciLexerCPP ( HBQT_TYPE_QSCINTILLA_BASE + 8 ) +#define HBQT_TYPE_QsciLexerFlagship ( HBQT_TYPE_QSCINTILLA_BASE + 9 ) +#define HBQT_TYPE_QsciScintilla ( HBQT_TYPE_QSCINTILLA_BASE + 10 ) +#define HBQT_TYPE_QsciStyle ( HBQT_TYPE_QSCINTILLA_BASE + 11 ) +#define HBQT_TYPE_QsciStyledText ( HBQT_TYPE_QSCINTILLA_BASE + 12 ) + +#endif /* __HBQSCINTILLA_H */ diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.ch b/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.ch index b8829bc3d0..6b8020334e 100644 --- a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.ch +++ b/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.ch @@ -66,6 +66,7 @@ /*----------------------------------------------------------------------*/ #ifndef _QSCINTILLA_CH +#define _QSCINTILLA_CH #define INVALID_POSITION -1 #define SCI_START 2000 @@ -949,5 +950,4 @@ #define SCE_FS_STRINGEOL_C 31 #define SCE_FS_BRACE 32 - #define _QSCINTILLA_CH -#endif \ No newline at end of file +#endif diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbc b/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbc new file mode 100644 index 0000000000..a5d446bd6e --- /dev/null +++ b/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbc @@ -0,0 +1,25 @@ +# +# $Id$ +# + +# --------------------------------------------------------------- +# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) +# See COPYING for licensing terms. +# --------------------------------------------------------------- + +libs=../qtcore/hbqtcore.hbc +libs=../qtgui/hbqtgui.hbc + +incpaths=g + +# TODO: dependency detection +-incpath=${HB_WITH_QSCINTILLA}/qt + +# TODO: lib name of dependency +{!HB_STATIC_QT&!hbdyn}libs=hbqscintilla${__HB_DYN__} +{!HB_STATIC_QT&(allwin|os2)}libs=QScintilla_XXXXXX +{!HB_STATIC_QT&linux}libs=QScintilla_XXXXXX +{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QScintilla_XXXXXX.framework/QScintilla_XXXXXX +{HB_STATIC_QT&allwin&!hbdyn}libs=hbqscintillas${__HB_DYN__} +{HB_STATIC_QT&linux}libs=hbqscintilla +{HB_STATIC_QT&(allwin|linux)}libs=QScintilla_XXXXXX diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbm b/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbm new file mode 100644 index 0000000000..9fa2418869 --- /dev/null +++ b/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbm @@ -0,0 +1,12 @@ +# +# $Id$ +# + +-i. +-ig + +../qtcore/hbqtcore.hbc +../qtgui/hbqtgui.hbc + +hbqt_hbqsciscintilla.cpp +hbqt_hbqsciscintilla.h diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp b/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp index dbf1571709..ec12fafb1b 100644 --- a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp +++ b/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp @@ -4,32 +4,7 @@ ../hbqt_common.hbm --incpath=${HB_WITH_QSCINTILLA}/qt +g/filelist.hbm +hbqscintilla.hbm -hbqt_hbqsciscintilla.h -hbqt_hbqsciscintilla.cpp - -HBQsciScintilla.cpp -QsciScintilla.cpp -QsciLexer.cpp -QsciLexerCPP.cpp -QsciLexerFlagship.cpp -QsciAbstractAPIs.cpp -QsciAPIs.cpp -QsciDocument.cpp -QsciStyledText.cpp -QsciCommand.cpp -QsciCommandSet.cpp - -THBQsciScintilla.prg -TQsciScintilla.prg -TQsciLexer.prg -TQsciLexerCPP.prg -TQsciLexerFlagship.prg -TQsciAbstractAPIs.prg -TQsciAPIs.prg -TQsciDocument.prg -TQsciStyle.prg -TQsciStyledText.prg -TQsciCommand.prg -TQsciCommandSet.prg +hbqscintillas.hbp diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqscintillas.hbp b/harbour/contrib/hbqt/hbqscintilla/hbqscintillas.hbp new file mode 100644 index 0000000000..25220ab3cb --- /dev/null +++ b/harbour/contrib/hbqt/hbqscintilla/hbqscintillas.hbp @@ -0,0 +1,8 @@ +# +# $Id$ +# + +../hbqt_commons.hbm + +g/filelist.hbm +hbqscintilla.hbm diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqt_garbage.h b/harbour/contrib/hbqt/hbqscintilla/hbqt_garbage.h deleted file mode 100644 index a5113cb97b..0000000000 --- a/harbour/contrib/hbqt/hbqscintilla/hbqt_garbage.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * $Id$ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -extern QT_G_FUNC( hbqt_gcRelease_HBQsciScintilla ); -extern QT_G_FUNC( hbqt_gcRelease_QsciAbstractAPIs ); -extern QT_G_FUNC( hbqt_gcRelease_QsciAPIs ); -extern QT_G_FUNC( hbqt_gcRelease_QsciCommand ); -extern QT_G_FUNC( hbqt_gcRelease_QsciCommandSet ); -extern QT_G_FUNC( hbqt_gcRelease_QsciDocument ); -extern QT_G_FUNC( hbqt_gcRelease_QsciLexer ); -extern QT_G_FUNC( hbqt_gcRelease_QsciLexerCPP ); -extern QT_G_FUNC( hbqt_gcRelease_QsciLexerFlagship ); -extern QT_G_FUNC( hbqt_gcRelease_QsciScintilla ); -extern QT_G_FUNC( hbqt_gcRelease_QsciStyle ); -extern QT_G_FUNC( hbqt_gcRelease_QsciStyledText ); - -extern void * hbqt_gcAllocate_HBQsciScintilla( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QsciAbstractAPIs( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QsciAPIs( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QsciCommand( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QsciCommandSet( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QsciDocument( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QsciLexer( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QsciLexerCPP( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QsciLexerFlagship( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QsciScintilla( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QsciStyle( void * pObj, bool bNew ); -extern void * hbqt_gcAllocate_QsciStyledText( void * pObj, bool bNew ); - diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqt_hbqsciscintilla.cpp b/harbour/contrib/hbqt/hbqscintilla/hbqt_hbqsciscintilla.cpp index 0643dd8c2e..c1668be331 100644 --- a/harbour/contrib/hbqt/hbqscintilla/hbqt_hbqsciscintilla.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/hbqt_hbqsciscintilla.cpp @@ -54,10 +54,6 @@ #include "hbqt.h" -#include "hbapiitm.h" -#include "hbthread.h" -#include "hbvm.h" - #if QT_VERSION >= 0x040500 #include "hbqt_hbqsciscintilla.h" diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqt_hbqsciscintilla.h b/harbour/contrib/hbqt/hbqscintilla/hbqt_hbqsciscintilla.h index 8d1e25eaa3..4545611074 100644 --- a/harbour/contrib/hbqt/hbqscintilla/hbqt_hbqsciscintilla.h +++ b/harbour/contrib/hbqt/hbqscintilla/hbqt_hbqsciscintilla.h @@ -51,12 +51,12 @@ */ #ifndef HBQT_HBQSCISCINTILLA_H - #define HBQT_HBQSCISCINTILLA_H +#define HBQT_HBQSCISCINTILLA_H #include "hbapiitm.h" -#include -#include +#include +#include #include @@ -86,4 +86,4 @@ protected: }; /*----------------------------------------------------------------------*/ -#endif \ No newline at end of file +#endif diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqt_local.h b/harbour/contrib/hbqt/hbqscintilla/hbqt_local.h deleted file mode 100644 index bf88981f7f..0000000000 --- a/harbour/contrib/hbqt/hbqscintilla/hbqt_local.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * QT wrapper main header - * - * Copyright 2010 Pritpal Bedi - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ -/*----------------------------------------------------------------------*/ - - -#ifndef __HBQT_LOCAL_H -#define __HBQT_LOCAL_H - -#define hbqt_par_HBQsciScintilla( n ) ( ( HBQsciScintilla * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciScintilla( n ) ( ( QsciScintilla * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciLexer( n ) ( ( QsciLexer * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciLexerCPP( n ) ( ( QsciLexerCPP * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciLexerFlagship( n ) ( ( QsciLexerFlagship * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciAbstractAPIs( n ) ( ( QsciAbstractAPIs * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciAPIs( n ) ( ( QsciAPIs * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciDocument( n ) ( ( QsciDocument * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciStyle( n ) ( ( QsciStyle * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciStyledText( n ) ( ( QsciStyledText * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciCommand( n ) ( ( QsciCommand * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciCommandSet( n ) ( ( QsciCommandSet * ) hbqt_gcpointer( n ) ) - -#endif /* __HBQT_LOCAL_H */ diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/HBQsciScintilla.qth b/harbour/contrib/hbqt/hbqscintilla/qth/HBQsciScintilla.qth index 7e6cb7ac98..92cf94363a 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/HBQsciScintilla.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/HBQsciScintilla.qth @@ -65,8 +65,6 @@ Folder = qscintilla #include "hbqt_hbqsciscintilla.h" -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* @@ -92,4 +90,3 @@ HB_FUNC( QT_HBQSCISCINTILLA ) - diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciAPIs.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciAPIs.qth index a64d9de4b1..fbd0a15b0f 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciAPIs.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciAPIs.qth @@ -55,10 +55,10 @@ ; -QObject = +QObject = Inherits = QsciAbstractAPIs -Type = -New = +Type = +New = Folder = hbqscintilla @@ -70,14 +70,12 @@ Folder = hbqscintilla #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* - * QsciAPIs (QsciLexer *lexer) - * virtual ~QsciAPIs () - * + * QsciAPIs (QsciLexer *lexer) + * virtual ~QsciAPIs () + * */ HB_FUNC( QT_QSCIAPIS ) { @@ -89,28 +87,28 @@ HB_FUNC( QT_QSCIAPIS ) -void add (const QString &entry) -void clear () -bool load (const QString &fname) -void remove (const QString &entry) -void prepare () -void cancelPreparation () -QString defaultPreparedName () const -bool isPrepared (const QString &fname=QString()) const -bool loadPrepared (const QString &fname=QString()) -bool savePrepared (const QString &fname=QString()) const -virtual void updateAutoCompletionList (const QStringList &context, QStringList &list) -virtual void autoCompletionSelected (const QString &sel) -virtual QStringList callTips (const QStringList &context, int commas, QsciScintilla::CallTipsStyle style, QList< int > &shifts) -virtual bool event (QEvent *e) -QStringList installedAPIFiles () const +void add (const QString &entry) +void clear () +bool load (const QString &fname) +void remove (const QString &entry) +void prepare () +void cancelPreparation () +QString defaultPreparedName () const +bool isPrepared (const QString &fname=QString()) const +bool loadPrepared (const QString &fname=QString()) +bool savePrepared (const QString &fname=QString()) const +virtual void updateAutoCompletionList (const QStringList &context, QStringList &list) +virtual void autoCompletionSelected (const QString &sel) +virtual QStringList callTips (const QStringList &context, int commas, QsciScintilla::CallTipsStyle style, QList< int > &shifts) +virtual bool event (QEvent *e) +QStringList installedAPIFiles () const -void apiPreparationCancelled () -void apiPreparationStarted () -void apiPreparationFinished () +void apiPreparationCancelled () +void apiPreparationStarted () +void apiPreparationFinished () diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciAbstractAPIs.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciAbstractAPIs.qth index 03f6b529cc..225febffc4 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciAbstractAPIs.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciAbstractAPIs.qth @@ -55,10 +55,10 @@ ; -QObject = -Inherits = -Type = -New = +QObject = +Inherits = +Type = +New = Folder = hbqscintilla @@ -70,14 +70,12 @@ Folder = hbqscintilla #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* - * QsciAbstractAPIs (QsciLexer *lexer) - * virtual ~QsciAbstractAPIs () - * + * QsciAbstractAPIs (QsciLexer *lexer) + * virtual ~QsciAbstractAPIs () + * */ HB_FUNC( QT_QSCIABSTRACTAPIS ) { @@ -89,10 +87,10 @@ HB_FUNC( QT_QSCIABSTRACTAPIS ) -QsciLexer * lexer () const -virtual void updateAutoCompletionList (const QStringList &context, QStringList &list)=0 -virtual void autoCompletionSelected (const QString &selection) -virtual QStringList callTips (const QStringList &context, int commas, QsciScintilla::CallTipsStyle style, QList< int > &shifts)=0 +QsciLexer * lexer () const +virtual void updateAutoCompletionList (const QStringList &context, QStringList &list)=0 +virtual void autoCompletionSelected (const QString &selection) +virtual QStringList callTips (const QStringList &context, int commas, QsciScintilla::CallTipsStyle style, QList< int > &shifts)=0 diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommand.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommand.qth index acf4b536fe..dbfeb48085 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommand.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommand.qth @@ -56,9 +56,9 @@ QObject = no -Inherits = -Type = -New = +Inherits = +Type = +New = Folder = hbqscintilla @@ -70,13 +70,11 @@ Folder = hbqscintilla #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* - * - * + * + * */ HB_FUNC( QT_QSCICOMMAND ) { @@ -88,12 +86,12 @@ HB_FUNC( QT_QSCICOMMAND ) -void setKey (int key) -void setAlternateKey (int altkey) -int key () const -int alternateKey () const -QString description () const -bool validKey (int key) +void setKey (int key) +void setAlternateKey (int altkey) +int key () const +int alternateKey () const +QString description () const +bool validKey (int key) diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommandSet.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommandSet.qth index 6f7a724cd8..bca8d92e1d 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommandSet.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommandSet.qth @@ -56,9 +56,9 @@ QObject = no -Inherits = -Type = -New = +Inherits = +Type = +New = Folder = hbqscintilla @@ -70,13 +70,11 @@ Folder = hbqscintilla #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* - * - * + * + * */ HB_FUNC( QT_QSCICOMMANDSET ) { @@ -88,11 +86,11 @@ HB_FUNC( QT_QSCICOMMANDSET ) -bool readSettings (QSettings &qs, const char *prefix="/Scintilla") -bool writeSettings (QSettings &qs, const char *prefix="/Scintilla") -QList< QsciCommand * > & commands () -void clearKeys () -void clearAlternateKeys () +bool readSettings (QSettings &qs, const char *prefix="/Scintilla") +bool writeSettings (QSettings &qs, const char *prefix="/Scintilla") +QList< QsciCommand * > & commands () +void clearKeys () +void clearAlternateKeys () diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciDocument.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciDocument.qth index 09d59e4740..89e7cdd35e 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciDocument.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciDocument.qth @@ -56,9 +56,9 @@ QObject = no -Inherits = -Type = -New = +Inherits = +Type = +New = Folder = hbqscintilla @@ -70,14 +70,12 @@ Folder = hbqscintilla #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* - * QsciDocument () - * QsciDocument (const QsciDocument &) - * + * QsciDocument () + * QsciDocument (const QsciDocument &) + * */ HB_FUNC( QT_QSCIDOCUMENT ) { diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexer.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexer.qth index 11fe971bfc..3fded7932b 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexer.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexer.qth @@ -55,10 +55,10 @@ ; -QObject = -Inherits = -Type = -New = +QObject = +Inherits = +Type = +New = Folder = hbqscintilla Destructor = no @@ -71,14 +71,12 @@ Destructor = no #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* - * QsciLexer (QObject *parent=0) - * virtual ~QsciLexer () - * + * QsciLexer (QObject *parent=0) + * virtual ~QsciLexer () + * */ HB_FUNC( QT_QSCILEXER ) { @@ -90,61 +88,61 @@ HB_FUNC( QT_QSCILEXER ) -virtual const char * language () const =0 -virtual const char * lexer () const -virtual int lexerId () const -QsciAbstractAPIs * apis () const -virtual const char * autoCompletionFillups () const -virtual QStringList autoCompletionWordSeparators () const -int autoIndentStyle () -virtual const char * blockEnd (int *style=0) const -virtual int blockLookback () const -virtual const char * blockStart (int *style=0) const -virtual const char * blockStartKeyword (int *style=0) const -virtual int braceStyle () const -virtual bool caseSensitive () const -virtual QColor color (int style) const -virtual bool eolFill (int style) const -virtual QFont font (int style) const -virtual int indentationGuideView () const -virtual const char * keywords (int set) const -virtual int defaultStyle () const -virtual QString description (int style) const =0 -virtual QColor paper (int style) const -QColor defaultColor () const -virtual QColor defaultColor (int style) const -virtual bool defaultEolFill (int style) const -QFont defaultFont () const -virtual QFont defaultFont (int style) const -QColor defaultPaper () const -virtual QColor defaultPaper (int style) const -QsciScintilla * editor () const -virtual void setEditor (QsciScintilla *editor) -bool readSettings (QSettings &qs, const char *prefix="/Scintilla") -virtual void refreshProperties () -virtual int styleBitsNeeded () const -virtual const char * wordCharacters () const -bool writeSettings (QSettings &qs, const char *prefix="/Scintilla") const +virtual const char * language () const =0 +virtual const char * lexer () const +virtual int lexerId () const +QsciAbstractAPIs * apis () const +virtual const char * autoCompletionFillups () const +virtual QStringList autoCompletionWordSeparators () const +int autoIndentStyle () +virtual const char * blockEnd (int *style=0) const +virtual int blockLookback () const +virtual const char * blockStart (int *style=0) const +virtual const char * blockStartKeyword (int *style=0) const +virtual int braceStyle () const +virtual bool caseSensitive () const +virtual QColor color (int style) const +virtual bool eolFill (int style) const +virtual QFont font (int style) const +virtual int indentationGuideView () const +virtual const char * keywords (int set) const +virtual int defaultStyle () const +virtual QString description (int style) const =0 +virtual QColor paper (int style) const +QColor defaultColor () const +virtual QColor defaultColor (int style) const +virtual bool defaultEolFill (int style) const +QFont defaultFont () const +virtual QFont defaultFont (int style) const +QColor defaultPaper () const +virtual QColor defaultPaper (int style) const +QsciScintilla * editor () const +virtual void setEditor (QsciScintilla *editor) +bool readSettings (QSettings &qs, const char *prefix="/Scintilla") +virtual void refreshProperties () +virtual int styleBitsNeeded () const +virtual const char * wordCharacters () const +bool writeSettings (QSettings &qs, const char *prefix="/Scintilla") const -void setAPIs (QsciAbstractAPIs *apis) -void setDefaultColor (const QColor &c) -void setDefaultFont (const QFont &f) -void setDefaultPaper (const QColor &c) +void setAPIs (QsciAbstractAPIs *apis) +void setDefaultColor (const QColor &c) +void setDefaultFont (const QFont &f) +void setDefaultPaper (const QColor &c) -virtual void setAutoIndentStyle (int autoindentstyle) -virtual void setColor (const QColor &c, int style=-1) -virtual void setEolFill (bool eoffill, int style=-1) -virtual void setFont (const QFont &f, int style=-1) -virtual void setPaper (const QColor &c, int style=-1) +virtual void setAutoIndentStyle (int autoindentstyle) +virtual void setColor (const QColor &c, int style=-1) +virtual void setEolFill (bool eoffill, int style=-1) +virtual void setFont (const QFont &f, int style=-1) +virtual void setPaper (const QColor &c, int style=-1) -void colorChanged (const QColor &c, int style) -void eolFillChanged (bool eolfilled, int style) -void fontChanged (const QFont &f, int style) -void paperChanged (const QColor &c, int style) -void propertyChanged (const char *prop, const char *val) +void colorChanged (const QColor &c, int style) +void eolFillChanged (bool eolfilled, int style) +void fontChanged (const QFont &f, int style) +void paperChanged (const QColor &c, int style) +void propertyChanged (const char *prop, const char *val) diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerCPP.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerCPP.qth index 690a46b251..b6fb2a480b 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerCPP.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerCPP.qth @@ -55,10 +55,10 @@ ; -QObject = +QObject = Inherits = QsciLexer -Type = -New = +Type = +New = Folder = hbqscintilla @@ -70,14 +70,12 @@ Folder = hbqscintilla #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* - * QsciLexerCPP (QObject *parent=0, bool caseInsensitiveKeywords=false) - * virtual ~QsciLexerCPP () - * + * QsciLexerCPP (QObject *parent=0, bool caseInsensitiveKeywords=false) + * virtual ~QsciLexerCPP () + * */ HB_FUNC( QT_QSCILEXERCPP ) { @@ -101,48 +99,48 @@ HB_FUNC( QT_QSCILEXERCPP ) -enum { - Default = 0, Comment = 1, CommentLine = 2, - CommentDoc = 3, Number = 4, Keyword = 5, - DoubleQuotedString = 6, SingleQuotedString = 7, UUID = 8, - PreProcessor = 9, Operator = 10, Identifier = 11, - UnclosedString = 12, VerbatimString = 13, Regex = 14, - CommentLineDoc = 15, KeywordSet2 = 16, CommentDocKeyword = 17, - CommentDocKeywordError = 18, GlobalClass = 19 -} +enum { + Default = 0, Comment = 1, CommentLine = 2, + CommentDoc = 3, Number = 4, Keyword = 5, + DoubleQuotedString = 6, SingleQuotedString = 7, UUID = 8, + PreProcessor = 9, Operator = 10, Identifier = 11, + UnclosedString = 12, VerbatimString = 13, Regex = 14, + CommentLineDoc = 15, KeywordSet2 = 16, CommentDocKeyword = 17, + CommentDocKeywordError = 18, GlobalClass = 19 +} -const char * language () const -const char * lexer () const -QStringList autoCompletionWordSeparators () const -const char * blockEnd (int *style=0) const -const char * blockStart (int *style=0) const -const char * blockStartKeyword (int *style=0) const -int braceStyle () const -const char * wordCharacters () const -QColor defaultColor (int style) const -bool defaultEolFill (int style) const -QFont defaultFont (int style) const -QColor defaultPaper (int style) const -const char * keywords (int set) const -QString description (int style) const -void refreshProperties () -bool foldAtElse () const -bool foldComments () const -bool foldCompact () const -bool foldPreprocessor () const -bool stylePreprocessor () const -void setDollarsAllowed (bool allowed) -bool dollarsAllowed () const +const char * language () const +const char * lexer () const +QStringList autoCompletionWordSeparators () const +const char * blockEnd (int *style=0) const +const char * blockStart (int *style=0) const +const char * blockStartKeyword (int *style=0) const +int braceStyle () const +const char * wordCharacters () const +QColor defaultColor (int style) const +bool defaultEolFill (int style) const +QFont defaultFont (int style) const +QColor defaultPaper (int style) const +const char * keywords (int set) const +QString description (int style) const +void refreshProperties () +bool foldAtElse () const +bool foldComments () const +bool foldCompact () const +bool foldPreprocessor () const +bool stylePreprocessor () const +void setDollarsAllowed (bool allowed) +bool dollarsAllowed () const -virtual void setFoldAtElse (bool fold) -virtual void setFoldComments (bool fold) -virtual void setFoldCompact (bool fold) -virtual void setFoldPreprocessor (bool fold) -virtual void setStylePreprocessor (bool style) +virtual void setFoldAtElse (bool fold) +virtual void setFoldComments (bool fold) +virtual void setFoldCompact (bool fold) +virtual void setFoldPreprocessor (bool fold) +virtual void setStylePreprocessor (bool style) diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerFlagship.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerFlagship.qth index 8a2f40370d..be51601aab 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerFlagship.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerFlagship.qth @@ -55,10 +55,10 @@ ; -QObject = +QObject = Inherits = QsciLexer -Type = -New = +Type = +New = Folder = hbqscintilla @@ -70,14 +70,12 @@ Folder = hbqscintilla #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* - * QsciLexerFlagship (QObject *parent=0, bool caseInsensitiveKeywords=false) - * virtual ~QsciLexerFlagship () - * + * QsciLexerFlagship (QObject *parent=0, bool caseInsensitiveKeywords=false) + * virtual ~QsciLexerFlagship () + * */ HB_FUNC( QT_QSCILEXERFLAGSHIP ) { @@ -101,48 +99,48 @@ HB_FUNC( QT_QSCILEXERFLAGSHIP ) -enum { - Default = 0, Comment = 1, CommentLine = 2, - CommentDoc = 3, Number = 4, Keyword = 5, - DoubleQuotedString = 6, SingleQuotedString = 7, UUID = 8, - PreProcessor = 9, Operator = 10, Identifier = 11, - UnclosedString = 12, VerbatimString = 13, Regex = 14, - CommentLineDoc = 15, KeywordSet2 = 16, CommentDocKeyword = 17, - CommentDocKeywordError = 18, GlobalClass = 19 -} +enum { + Default = 0, Comment = 1, CommentLine = 2, + CommentDoc = 3, Number = 4, Keyword = 5, + DoubleQuotedString = 6, SingleQuotedString = 7, UUID = 8, + PreProcessor = 9, Operator = 10, Identifier = 11, + UnclosedString = 12, VerbatimString = 13, Regex = 14, + CommentLineDoc = 15, KeywordSet2 = 16, CommentDocKeyword = 17, + CommentDocKeywordError = 18, GlobalClass = 19 +} -const char * language () const -const char * lexer () const -QStringList autoCompletionWordSeparators () const -const char * blockEnd (int *style=0) const -const char * blockStart (int *style=0) const -const char * blockStartKeyword (int *style=0) const -int braceStyle () const -const char * wordCharacters () const -QColor defaultColor (int style) const -bool defaultEolFill (int style) const -QFont defaultFont (int style) const -QColor defaultPaper (int style) const -const char * keywords (int set) const -QString description (int style) const -void refreshProperties () -bool foldAtElse () const -bool foldComments () const -bool foldCompact () const -bool foldPreprocessor () const -bool stylePreprocessor () const -void setDollarsAllowed (bool allowed) -bool dollarsAllowed () const +const char * language () const +const char * lexer () const +QStringList autoCompletionWordSeparators () const +const char * blockEnd (int *style=0) const +const char * blockStart (int *style=0) const +const char * blockStartKeyword (int *style=0) const +int braceStyle () const +const char * wordCharacters () const +QColor defaultColor (int style) const +bool defaultEolFill (int style) const +QFont defaultFont (int style) const +QColor defaultPaper (int style) const +const char * keywords (int set) const +QString description (int style) const +void refreshProperties () +bool foldAtElse () const +bool foldComments () const +bool foldCompact () const +bool foldPreprocessor () const +bool stylePreprocessor () const +void setDollarsAllowed (bool allowed) +bool dollarsAllowed () const -virtual void setFoldAtElse (bool fold) -virtual void setFoldComments (bool fold) -virtual void setFoldCompact (bool fold) -virtual void setFoldPreprocessor (bool fold) -virtual void setStylePreprocessor (bool style) +virtual void setFoldAtElse (bool fold) +virtual void setFoldComments (bool fold) +virtual void setFoldCompact (bool fold) +virtual void setFoldPreprocessor (bool fold) +virtual void setStylePreprocessor (bool style) diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciScintilla.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciScintilla.qth index 893dbf8663..4551e39a11 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciScintilla.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciScintilla.qth @@ -65,13 +65,11 @@ Folder = hbqscintilla #include "qsciscintilla.h" -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* - * QsciScintilla (QWidget *parent=0) - * virtual ~QsciScintilla () + * QsciScintilla (QWidget *parent=0) + * virtual ~QsciScintilla () */ HB_FUNC( QT_QSCISCINTILLA ) { @@ -124,221 +122,220 @@ enum WrapVisualFlag { WrapFlagNone, WrapFlagByText, WrapFlagByBorder } -# virtual QStringList apiContext (int pos, int &context_start, int &last_word_start) -void annotate (int line, const QString &text, int style) -void annotate (int line, const QString &text, const QsciStyle &style) -void annotate (int line, const QsciStyledText &text) -void annotate (int line, const QList< QsciStyledText > &text) -QString annotation (int line) const -AnnotationDisplay annotationDisplay () const -void clearAnnotations (int line=-1) -bool autoCompletionCaseSensitivity () const -bool autoCompletionFillupsEnabled () const -bool autoCompletionReplaceWord () const -bool autoCompletionShowSingle () const -AutoCompletionSource autoCompletionSource () const -int autoCompletionThreshold () const -bool autoIndent () const -bool backspaceUnindents () const -void beginUndoAction () -BraceMatch braceMatching () const -CallTipsStyle callTipsStyle () const -int callTipsVisible () const -void cancelList () -bool caseSensitive () const -void clearFolds () -void clearRegisteredImages () -QColor color () const -void convertEols (EolMode mode) -QsciDocument document () const -void endUndoAction () -QColor edgeColor () const -int edgeColumn () const -EdgeMode edgeMode () const -void setFont (const QFont &f) -EolMode eolMode () const -bool eolVisibility () const -virtual bool findFirst (const QString &expr, bool re, bool cs, bool wo, bool wrap, bool forward=true, int line=-1, int index=-1, bool show=true) -virtual bool findNext () -int firstVisibleLine () const -FoldStyle folding () const -void getCursorPosition (int *line, int *index) const -void getSelection (int *lineFrom, int *indexFrom, int *lineTo, int *indexTo) const -bool hasSelectedText () const -int indentation (int line) const -bool indentationGuides () const -bool indentationsUseTabs () const -int indentationWidth () const -bool isCallTipActive () const -bool isListActive () const -bool isModified () const -bool isReadOnly () const -bool isRedoAvailable () const -bool isUndoAvailable () const -bool isUtf8 () const -bool isWordCharacter (char ch) const -int lineAt (const QPoint &pos) const -void lineIndexFromPosition (int position, int *line, int *index) const -int lineLength (int line) const -int lines () const -int length () const -QsciLexer * lexer () const -bool marginLineNumbers (int margin) const -int marginMarkerMask (int margin) const -bool marginSensitivity (int margin) const -MarginType marginType (int margin) const -int marginWidth (int margin) const -int markerDefine (MarkerSymbol sym, int mnr=-1) -int markerDefine (char ch, int mnr=-1) -int markerDefine (const QPixmap &pm, int mnr=-1) -int markerAdd (int linenr, int mnr) -unsigned markersAtLine (int linenr) const -void markerDelete (int linenr, int mnr=-1) -void markerDeleteAll (int mnr=-1) -void markerDeleteHandle (int mhandle) -int markerLine (int mhandle) const -int markerFindNext (int linenr, unsigned mask) const -int markerFindPrevious (int linenr, unsigned mask) const -QColor paper () const -int positionFromLineIndex (int line, int index) const -bool read (QIODevice *io) -virtual void recolor (int start=0, int end=-1) -void registerImage (int id, const QPixmap &pm) -virtual void replace (const QString &replaceStr) -void resetFoldMarginColors () -void setFoldMarginColors (const QColor &fore, const QColor &back) -void setAnnotationDisplay (AnnotationDisplay display) -void setAutoCompletionFillupsEnabled (bool enabled) -void setAutoCompletionFillups (const char *fillups) -void setAutoCompletionWordSeparators (const QStringList &separators) -void setCallTipsBackgroundColor (const QColor &col) -void setCallTipsForegroundColor (const QColor &col) -void setCallTipsHighlightColor (const QColor &col) -void setCallTipsStyle (CallTipsStyle style) -void setCallTipsVisible (int nr) -void setDocument (const QsciDocument &document) -void setEdgeColor (const QColor &col) -void setEdgeColumn (int colnr) -void setEdgeMode (EdgeMode mode) -void setMarginText (int line, const QString &text, int style) -void setMarginText (int line, const QString &text, const QsciStyle &style) -void setMarginText (int line, const QsciStyledText &text) -void setMarginText (int line, const QList< QsciStyledText > &text) -void setMarginType (int margin, MarginType type) -void clearMarginText (int line=-1) -void setMarkerBackgroundColor (const QColor &col, int mnr=-1) -void setMarkerForegroundColor (const QColor &col, int mnr=-1) -void setMatchedBraceBackgroundColor (const QColor &col) -void setMatchedBraceForegroundColor (const QColor &col) -void setUnmatchedBraceBackgroundColor (const QColor &col) -void setUnmatchedBraceForegroundColor (const QColor &col) -void setWrapVisualFlags (WrapVisualFlag eflag, WrapVisualFlag sflag=WrapFlagNone, int sindent=0) -QString selectedText () const -bool selectionToEol () const -void setSelectionToEol (bool filled) -void showUserList (int id, const QStringList &list) -QsciCommandSet * standardCommands () const -bool tabIndents () const -int tabWidth () const -QString text () const -QString text (int line) const -int textHeight (int linenr) const -WhitespaceVisibility whitespaceVisibility () const -QString wordAtPoint (const QPoint &point) const -const char * wordCharacters () const -WrapMode wrapMode () const -bool write (QIODevice *io) const +# virtual QStringList apiContext (int pos, int &context_start, int &last_word_start) +void annotate (int line, const QString &text, int style) +void annotate (int line, const QString &text, const QsciStyle &style) +void annotate (int line, const QsciStyledText &text) +void annotate (int line, const QList< QsciStyledText > &text) +QString annotation (int line) const +AnnotationDisplay annotationDisplay () const +void clearAnnotations (int line=-1) +bool autoCompletionCaseSensitivity () const +bool autoCompletionFillupsEnabled () const +bool autoCompletionReplaceWord () const +bool autoCompletionShowSingle () const +AutoCompletionSource autoCompletionSource () const +int autoCompletionThreshold () const +bool autoIndent () const +bool backspaceUnindents () const +void beginUndoAction () +BraceMatch braceMatching () const +CallTipsStyle callTipsStyle () const +int callTipsVisible () const +void cancelList () +bool caseSensitive () const +void clearFolds () +void clearRegisteredImages () +QColor color () const +void convertEols (EolMode mode) +QsciDocument document () const +void endUndoAction () +QColor edgeColor () const +int edgeColumn () const +EdgeMode edgeMode () const +void setFont (const QFont &f) +EolMode eolMode () const +bool eolVisibility () const +virtual bool findFirst (const QString &expr, bool re, bool cs, bool wo, bool wrap, bool forward=true, int line=-1, int index=-1, bool show=true) +virtual bool findNext () +int firstVisibleLine () const +FoldStyle folding () const +void getCursorPosition (int *line, int *index) const +void getSelection (int *lineFrom, int *indexFrom, int *lineTo, int *indexTo) const +bool hasSelectedText () const +int indentation (int line) const +bool indentationGuides () const +bool indentationsUseTabs () const +int indentationWidth () const +bool isCallTipActive () const +bool isListActive () const +bool isModified () const +bool isReadOnly () const +bool isRedoAvailable () const +bool isUndoAvailable () const +bool isUtf8 () const +bool isWordCharacter (char ch) const +int lineAt (const QPoint &pos) const +void lineIndexFromPosition (int position, int *line, int *index) const +int lineLength (int line) const +int lines () const +int length () const +QsciLexer * lexer () const +bool marginLineNumbers (int margin) const +int marginMarkerMask (int margin) const +bool marginSensitivity (int margin) const +MarginType marginType (int margin) const +int marginWidth (int margin) const +int markerDefine (MarkerSymbol sym, int mnr=-1) +int markerDefine (char ch, int mnr=-1) +int markerDefine (const QPixmap &pm, int mnr=-1) +int markerAdd (int linenr, int mnr) +unsigned markersAtLine (int linenr) const +void markerDelete (int linenr, int mnr=-1) +void markerDeleteAll (int mnr=-1) +void markerDeleteHandle (int mhandle) +int markerLine (int mhandle) const +int markerFindNext (int linenr, unsigned mask) const +int markerFindPrevious (int linenr, unsigned mask) const +QColor paper () const +int positionFromLineIndex (int line, int index) const +bool read (QIODevice *io) +virtual void recolor (int start=0, int end=-1) +void registerImage (int id, const QPixmap &pm) +virtual void replace (const QString &replaceStr) +void resetFoldMarginColors () +void setFoldMarginColors (const QColor &fore, const QColor &back) +void setAnnotationDisplay (AnnotationDisplay display) +void setAutoCompletionFillupsEnabled (bool enabled) +void setAutoCompletionFillups (const char *fillups) +void setAutoCompletionWordSeparators (const QStringList &separators) +void setCallTipsBackgroundColor (const QColor &col) +void setCallTipsForegroundColor (const QColor &col) +void setCallTipsHighlightColor (const QColor &col) +void setCallTipsStyle (CallTipsStyle style) +void setCallTipsVisible (int nr) +void setDocument (const QsciDocument &document) +void setEdgeColor (const QColor &col) +void setEdgeColumn (int colnr) +void setEdgeMode (EdgeMode mode) +void setMarginText (int line, const QString &text, int style) +void setMarginText (int line, const QString &text, const QsciStyle &style) +void setMarginText (int line, const QsciStyledText &text) +void setMarginText (int line, const QList< QsciStyledText > &text) +void setMarginType (int margin, MarginType type) +void clearMarginText (int line=-1) +void setMarkerBackgroundColor (const QColor &col, int mnr=-1) +void setMarkerForegroundColor (const QColor &col, int mnr=-1) +void setMatchedBraceBackgroundColor (const QColor &col) +void setMatchedBraceForegroundColor (const QColor &col) +void setUnmatchedBraceBackgroundColor (const QColor &col) +void setUnmatchedBraceForegroundColor (const QColor &col) +void setWrapVisualFlags (WrapVisualFlag eflag, WrapVisualFlag sflag=WrapFlagNone, int sindent=0) +QString selectedText () const +bool selectionToEol () const +void setSelectionToEol (bool filled) +void showUserList (int id, const QStringList &list) +QsciCommandSet * standardCommands () const +bool tabIndents () const +int tabWidth () const +QString text () const +QString text (int line) const +int textHeight (int linenr) const +WhitespaceVisibility whitespaceVisibility () const +QString wordAtPoint (const QPoint &point) const +const char * wordCharacters () const +WrapMode wrapMode () const +bool write (QIODevice *io) const -virtual void append (const QString &text) -virtual void autoCompleteFromAll () -virtual void autoCompleteFromAPIs () -virtual void autoCompleteFromDocument () -virtual void callTip () -virtual void clear () -virtual void copy () -virtual void cut () -virtual void ensureCursorVisible () -virtual void ensureLineVisible (int line) -virtual void foldAll (bool children=false) -virtual void foldLine (int line) -virtual void indent (int line) -virtual void insert (const QString &text) -virtual void insertAt (const QString &text, int line, int index) -virtual void moveToMatchingBrace () -virtual void paste () -virtual void redo () -virtual void removeSelectedText () -virtual void resetSelectionBackgroundColor () -virtual void resetSelectionForegroundColor () -virtual void selectAll (bool select=true) -virtual void selectToMatchingBrace () -virtual void setAutoCompletionCaseSensitivity (bool cs) -virtual void setAutoCompletionReplaceWord (bool replace) -virtual void setAutoCompletionShowSingle (bool single) -virtual void setAutoCompletionSource (AutoCompletionSource source) -virtual void setAutoCompletionThreshold (int thresh) -virtual void setAutoIndent (bool autoindent) -virtual void setBraceMatching (BraceMatch bm) -virtual void setBackspaceUnindents (bool unindent) -virtual void setCaretForegroundColor (const QColor &col) -virtual void setCaretLineBackgroundColor (const QColor &col) -virtual void setCaretLineVisible (bool enable) -virtual void setCaretWidth (int width) -virtual void setColor (const QColor &c) -virtual void setCursorPosition (int line, int index) -virtual void setEolMode (EolMode mode) -virtual void setEolVisibility (bool visible) -virtual void setFolding (FoldStyle fold, int margin=2) -virtual void setIndentation (int line, int indentation) -virtual void setIndentationGuides (bool enable) -virtual void setIndentationGuidesBackgroundColor (const QColor &col) -virtual void setIndentationGuidesForegroundColor (const QColor &col) -virtual void setIndentationsUseTabs (bool tabs) -virtual void setIndentationWidth (int width) -virtual void setLexer (QsciLexer *lexer=0) -virtual void setMarginsBackgroundColor (const QColor &col) -virtual void setMarginsFont (const QFont &f) -virtual void setMarginsForegroundColor (const QColor &col) -virtual void setMarginLineNumbers (int margin, bool lnrs) -virtual void setMarginMarkerMask (int margin, int mask) -virtual void setMarginSensitivity (int margin, bool sens) -virtual void setMarginWidth (int margin, int width) -virtual void setMarginWidth (int margin, const QString &s) -virtual void setModified (bool m) -virtual void setPaper (const QColor &c) -virtual void setReadOnly (bool ro) -virtual void setSelection (int lineFrom, int indexFrom, int lineTo, int indexTo) -virtual void setSelectionBackgroundColor (const QColor &col) -virtual void setSelectionForegroundColor (const QColor &col) -virtual void setTabIndents (bool indent) -virtual void setTabWidth (int width) -virtual void setText (const QString &text) -virtual void setUtf8 (bool cp) -virtual void setWhitespaceVisibility (WhitespaceVisibility mode) -virtual void setWrapMode (WrapMode mode) -virtual void undo () -virtual void unindent (int line) -virtual void zoomIn (int range) -virtual void zoomIn () -virtual void zoomOut (int range) -virtual void zoomOut () -virtual void zoomTo (int size) +virtual void append (const QString &text) +virtual void autoCompleteFromAll () +virtual void autoCompleteFromAPIs () +virtual void autoCompleteFromDocument () +virtual void callTip () +virtual void clear () +virtual void copy () +virtual void cut () +virtual void ensureCursorVisible () +virtual void ensureLineVisible (int line) +virtual void foldAll (bool children=false) +virtual void foldLine (int line) +virtual void indent (int line) +virtual void insert (const QString &text) +virtual void insertAt (const QString &text, int line, int index) +virtual void moveToMatchingBrace () +virtual void paste () +virtual void redo () +virtual void removeSelectedText () +virtual void resetSelectionBackgroundColor () +virtual void resetSelectionForegroundColor () +virtual void selectAll (bool select=true) +virtual void selectToMatchingBrace () +virtual void setAutoCompletionCaseSensitivity (bool cs) +virtual void setAutoCompletionReplaceWord (bool replace) +virtual void setAutoCompletionShowSingle (bool single) +virtual void setAutoCompletionSource (AutoCompletionSource source) +virtual void setAutoCompletionThreshold (int thresh) +virtual void setAutoIndent (bool autoindent) +virtual void setBraceMatching (BraceMatch bm) +virtual void setBackspaceUnindents (bool unindent) +virtual void setCaretForegroundColor (const QColor &col) +virtual void setCaretLineBackgroundColor (const QColor &col) +virtual void setCaretLineVisible (bool enable) +virtual void setCaretWidth (int width) +virtual void setColor (const QColor &c) +virtual void setCursorPosition (int line, int index) +virtual void setEolMode (EolMode mode) +virtual void setEolVisibility (bool visible) +virtual void setFolding (FoldStyle fold, int margin=2) +virtual void setIndentation (int line, int indentation) +virtual void setIndentationGuides (bool enable) +virtual void setIndentationGuidesBackgroundColor (const QColor &col) +virtual void setIndentationGuidesForegroundColor (const QColor &col) +virtual void setIndentationsUseTabs (bool tabs) +virtual void setIndentationWidth (int width) +virtual void setLexer (QsciLexer *lexer=0) +virtual void setMarginsBackgroundColor (const QColor &col) +virtual void setMarginsFont (const QFont &f) +virtual void setMarginsForegroundColor (const QColor &col) +virtual void setMarginLineNumbers (int margin, bool lnrs) +virtual void setMarginMarkerMask (int margin, int mask) +virtual void setMarginSensitivity (int margin, bool sens) +virtual void setMarginWidth (int margin, int width) +virtual void setMarginWidth (int margin, const QString &s) +virtual void setModified (bool m) +virtual void setPaper (const QColor &c) +virtual void setReadOnly (bool ro) +virtual void setSelection (int lineFrom, int indexFrom, int lineTo, int indexTo) +virtual void setSelectionBackgroundColor (const QColor &col) +virtual void setSelectionForegroundColor (const QColor &col) +virtual void setTabIndents (bool indent) +virtual void setTabWidth (int width) +virtual void setText (const QString &text) +virtual void setUtf8 (bool cp) +virtual void setWhitespaceVisibility (WhitespaceVisibility mode) +virtual void setWrapMode (WrapMode mode) +virtual void undo () +virtual void unindent (int line) +virtual void zoomIn (int range) +virtual void zoomIn () +virtual void zoomOut (int range) +virtual void zoomOut () +virtual void zoomTo (int size) -void cursorPositionChanged (int line, int pos) -void copyAvailable (bool yes) -void linesChanged () -void marginClicked (int margin, int line, Qt::KeyboardModifiers state) -void modificationAttempted () -void modificationChanged (bool m) -void selectionChanged () -void textChanged () -void userListActivated (int id, const QString &string) +void cursorPositionChanged (int line, int pos) +void copyAvailable (bool yes) +void linesChanged () +void marginClicked (int margin, int line, Qt::KeyboardModifiers state) +void modificationAttempted () +void modificationChanged (bool m) +void selectionChanged () +void textChanged () +void userListActivated (int id, const QString &string) - diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyle.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyle.qth index 3aeadeec62..58f4471897 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyle.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyle.qth @@ -55,10 +55,10 @@ ; -QObject = -Inherits = -Type = -New = +QObject = +Inherits = +Type = +New = Folder = hbqscintilla @@ -70,13 +70,11 @@ Folder = hbqscintilla #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* - * QsciStyle (int style=-1) - * QsciStyle (int style, const QString &description, const QColor &color, const QColor &paper, const QFont &font, bool eol_fill=false) - * + * QsciStyle (int style=-1) + * QsciStyle (int style, const QString &description, const QColor &color, const QColor &paper, const QFont &font, bool eol_fill=false) + * */ HB_FUNC( QT_QSCISTYLE ) { @@ -96,30 +94,30 @@ HB_FUNC( QT_QSCISTYLE ) -enum TextCase { OriginalCase = 0, UpperCase = 1, LowerCase = 2 } +enum TextCase { OriginalCase = 0, UpperCase = 1, LowerCase = 2 } -int style () const -void setDescription (const QString &description) -QString description () const -void setColor (const QColor &color) -QColor color () const -void setPaper (const QColor &paper) -QColor paper () const -void setFont (const QFont &font) -QFont font () const -void setEolFill (bool fill) -bool eolFill () const -void setTextCase (TextCase text_case) -TextCase textCase () const -void setVisible (bool visible) -bool visible () const -void setChangeable (bool changeable) -bool changeable () const -void setHotspot (bool hotspot) -bool hotspot () const -void refresh () +int style () const +void setDescription (const QString &description) +QString description () const +void setColor (const QColor &color) +QColor color () const +void setPaper (const QColor &paper) +QColor paper () const +void setFont (const QFont &font) +QFont font () const +void setEolFill (bool fill) +bool eolFill () const +void setTextCase (TextCase text_case) +TextCase textCase () const +void setVisible (bool visible) +bool visible () const +void setChangeable (bool changeable) +bool changeable () const +void setHotspot (bool hotspot) +bool hotspot () const +void refresh () diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyledText.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyledText.qth index 3cb6d57fa2..0fc2b8c962 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyledText.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyledText.qth @@ -56,9 +56,9 @@ QObject = no -Inherits = -Type = -New = +Inherits = +Type = +New = Folder = hbqscintilla @@ -70,14 +70,12 @@ Folder = hbqscintilla #include -#include "hbqt_garbage.h" -#include "hbqt_local.h" /* - * QsciStyledText (const QString &text, int style) - * QsciStyledText (const QString &text, const QsciStyle &style) - * + * QsciStyledText (const QString &text, int style) + * QsciStyledText (const QString &text, const QsciStyle &style) + * */ HB_FUNC( QT_QSCISTYLEDTEXT ) { @@ -96,8 +94,8 @@ HB_FUNC( QT_QSCISTYLEDTEXT ) -const QString & text () const -int style () const +const QString & text () const +int style () const diff --git a/harbour/contrib/hbqt/hbqt.ch b/harbour/contrib/hbqt/hbqt.ch index 25b16c5d56..22eec94c13 100644 --- a/harbour/contrib/hbqt/hbqt.ch +++ b/harbour/contrib/hbqt/hbqt.ch @@ -514,7 +514,7 @@ // #define Qt_TabFocus 0x1 // the widget accepts focus by tabbing. #define Qt_ClickFocus 0x2 // the widget accepts focus by clicking. -#define Qt_StrongFocus hb_bitOR( hb_bitOR( Qt_TabFocus, Qt_ClickFocus ), 0x8 ) // the widget accepts focus by both tabbing and clicking. On Mac OS X this will also be indicate that the widget accepts tab focus when in 'Text/List focus mode'. +#define Qt_StrongFocus hb_bitOR( Qt_TabFocus, Qt_ClickFocus, 0x8 ) // the widget accepts focus by both tabbing and clicking. On Mac OS X this will also be indicate that the widget accepts tab focus when in 'Text/List focus mode'. #define Qt_WheelFocus hb_bitOR( Qt_StrongFocus, 0x4 ) // like #define Qt_StrongFocus plus the widget accepts focus by using the mouse wheel. #define Qt_NoFocus 0 // the widget does not accept focus. @@ -1167,8 +1167,8 @@ #define Qt_LinksAccessibleByMouse 4 // Links can be highlighted and activated with the mouse. #define Qt_LinksAccessibleByKeyboard 8 // Links can be focused using tab and activated with enter. #define Qt_TextEditable 16 // The text is fully editable. -#define Qt_TextEditorInteraction hb_bitOR( hb_bitOR( Qt_TextSelectableByMouse, Qt_TextSelectableByKeyboard ), Qt_TextEditable ) // The default for a text editor. -#define Qt_TextBrowserInteraction hb_bitOR( hb_bitOR( Qt_TextSelectableByMouse, Qt_LinksAccessibleByMouse ), Qt_LinksAccessibleByKeyboard ) // The default for QTextBrowser. +#define Qt_TextEditorInteraction hb_bitOR( Qt_TextSelectableByMouse, Qt_TextSelectableByKeyboard, Qt_TextEditable ) // The default for a text editor. +#define Qt_TextBrowserInteraction hb_bitOR( Qt_TextSelectableByMouse, Qt_LinksAccessibleByMouse, Qt_LinksAccessibleByKeyboard ) // The default for QTextBrowser. // The TextInteractionFlags type is a typedef for QFlags. It stores an OR combination of TextInteractionFlag values. // enum #define Qt_TimeSpec @@ -2112,9 +2112,9 @@ #define QSizePolicy_Minimum QSizePolicy_GrowFlag // The sizeHint() is minimal, and sufficient. The widget can be expanded, but there is no advantage to it being larger (e.g. the horizontal direction of a push button). It cannot be smaller than the size provided by sizeHint(). #define QSizePolicy_Maximum QSizePolicy_ShrinkFlag // The sizeHint() is a maximum. The widget can be shrunk any amount without detriment if other widgets need the space (e.g. a separator line). It cannot be larger than the size provided by sizeHint(). #define QSizePolicy_Preferred hb_bitOR( QSizePolicy_GrowFlag, QSizePolicy_ShrinkFlag ) // The sizeHint() is best, but the widget can be shrunk and still be useful. The widget can be expanded, but there is no advantage to it being larger than sizeHint() (the default QWidget policy). -#define QSizePolicy_Expanding hb_bitOR( hb_bitOR( QSizePolicy_GrowFlag, QSizePolicy_ShrinkFlag ), QSizePolicy_ExpandFlag ) // The sizeHint() is a sensible size, but the widget can be shrunk and still be useful. The widget can make use of extra space, so it should get as much space as possible (e.g. the horizontal direction of a horizontal slider). +#define QSizePolicy_Expanding hb_bitOR( QSizePolicy_GrowFlag, QSizePolicy_ShrinkFlag, QSizePolicy_ExpandFlag ) // The sizeHint() is a sensible size, but the widget can be shrunk and still be useful. The widget can make use of extra space, so it should get as much space as possible (e.g. the horizontal direction of a horizontal slider). #define QSizePolicy_MinimumExpanding hb_bitOR( QSizePolicy_GrowFlag, QSizePolicy_ExpandFlag ) // The sizeHint() is minimal, and sufficient. The widget can make use of extra space, so it should get as much space as possible (e.g. the horizontal direction of a horizontal slider). -#define QSizePolicy_Ignored hb_bitOR( hb_bitOR( QSizePolicy_ShrinkFlag, QSizePolicy_GrowFlag ), QSizePolicy_IgnoreFlag ) // The sizeHint() is ignored. The widget will get as much space as possible. +#define QSizePolicy_Ignored hb_bitOR( QSizePolicy_ShrinkFlag, QSizePolicy_GrowFlag, QSizePolicy_IgnoreFlag ) // The sizeHint() is ignored. The widget will get as much space as possible. // enum QSizePolicy::PolicyFlag // These flags are combined together to form the various Policy values: diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/qtcore/hbqt.h similarity index 90% rename from harbour/contrib/hbqt/hbqt.h rename to harbour/contrib/hbqt/qtcore/hbqt.h index 839dc02b19..57f9fd0da2 100644 --- a/harbour/contrib/hbqt/hbqt.h +++ b/harbour/contrib/hbqt/qtcore/hbqt.h @@ -86,7 +86,6 @@ HB_GARBAGE_FUNC( Q_release ); extern HB_EXPORT void * hbqt_gcpointer( int iParam ); extern HB_EXPORT const HB_GC_FUNCS * hbqt_gcFuncs( void ); - extern HB_EXPORT void * hbqt_pPtrFromObj( int iParam ); extern HB_EXPORT void * hbqt_pPtrFromItem( PHB_ITEM pObj ); @@ -96,17 +95,4 @@ extern HB_EXPORT void * hbqt_pPtrFromItem( PHB_ITEM pObj ); #define hbqt_par_Bool( n ) ( hb_parl( n ) ) #define hbqt_par_char( n ) ( hb_parcx( n ) ) -/* - * DEFINES HBQt CODEBLOCKs - * - * Format: - * HBQT_(Qt class initials)_(Qt overloaded member) - */ - -#define HBQT_QAIM_data 1001 -#define HBQT_QAIM_flags 1003 -#define HBQT_QAIM_headerData 2001 -#define HBQT_QAIM_rowCount 3001 -#define HBQT_QAIM_columnCount 3002 - #endif /* __HBQT_H */ diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc index 2a0a165ea2..fb1e0697c4 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc @@ -9,6 +9,7 @@ libs=../hbqt_common.hbc +incpaths=. incpaths=g # TOFIX: QtGui is needed by hbqt_hbslots.cpp. This dependency should be removed. diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm index 7165f44c93..6a4b242f0e 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm @@ -2,6 +2,9 @@ # $Id$ # +-i. +-ig + hbqt_base.cpp hbqt_destruct.cpp hbqt_hbevents.cpp diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbp b/harbour/contrib/hbqt/qtcore/hbqtcore.hbp index 6702231fb4..a536dce6ea 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbp +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbp @@ -7,7 +7,4 @@ g/filelist.hbm hbqtcore.hbm --i. --ig - hbqtcores.hbp diff --git a/harbour/contrib/hbqt/qtcore/hbqtcores.hbp b/harbour/contrib/hbqt/qtcore/hbqtcores.hbp index 40b960f8ec..8e91f6fc52 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcores.hbp +++ b/harbour/contrib/hbqt/qtcore/hbqtcores.hbp @@ -6,6 +6,3 @@ g/filelist.hbm hbqtcore.hbm - --i. --ig diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h b/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h index 30da1bee31..04f1c902db 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h +++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h @@ -57,6 +57,19 @@ #include "hbqtcore.h" #include "hbqtgui.h" +/* + * DEFINES HBQt CODEBLOCKs + * + * Format: + * HBQT_(Qt class initials)_(Qt overloaded member) + */ + +#define HBQT_QAIM_data 1001 +#define HBQT_QAIM_flags 1003 +#define HBQT_QAIM_headerData 2001 +#define HBQT_QAIM_rowCount 3001 +#define HBQT_QAIM_columnCount 3002 + /*----------------------------------------------------------------------*/ #include diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm index 135bf38a90..44fe391c85 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm @@ -2,6 +2,11 @@ # $Id$ # +-i. +-ig + +../qtcore/hbqtcore.hbc + hbqt_hbqabstractitemmodel.cpp hbqt_hbqmainwindow.cpp hbqt_hbqplaintextedit.cpp diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbp b/harbour/contrib/hbqt/qtgui/hbqtgui.hbp index 41952fa159..f2605da265 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbp +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbp @@ -7,9 +7,4 @@ g/filelist.hbm hbqtgui.hbm --i. --ig - -../qtcore/hbqtcore.hbc - hbqtguis.hbp diff --git a/harbour/contrib/hbqt/qtgui/hbqtguis.hbp b/harbour/contrib/hbqt/qtgui/hbqtguis.hbp index 0ed49cec58..3339f2b84d 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtguis.hbp +++ b/harbour/contrib/hbqt/qtgui/hbqtguis.hbp @@ -6,8 +6,3 @@ g/filelist.hbm hbqtgui.hbm - --i. --ig - -../qtcore/hbqtcore.hbc diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.qtp b/harbour/contrib/hbqt/utils/qscintilla.qtp similarity index 63% rename from harbour/contrib/hbqt/hbqscintilla/hbqscintilla.qtp rename to harbour/contrib/hbqt/utils/qscintilla.qtp index 71176409de..56656ca9dd 100644 --- a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.qtp +++ b/harbour/contrib/hbqt/utils/qscintilla.qtp @@ -2,17 +2,9 @@ ; $Id$ ; -; -; Harbour Source Wrapper Generator's Project File for QT v4.5 -; -; Pritpal Bedi -; - --I=qth - --O= - --D=doc +-I=../hbqscintilla/qth +-O=../hbqscintilla/g +-D=../hbqscintilla/doc HBQsciScintilla.qth diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po index 5fddbb51a5..69c4043c26 100644 --- a/harbour/utils/hbmk2/hbmk2.hu_HU.po +++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po @@ -379,8 +379,8 @@ msgstr "K #: hbmk2.prg:7941 #, c-format -msgid "control source header parsing (in incremental build mode)\\n can be: native (uses compiler to extract dependencies), full (uses simple text parser on the whole file), partial (default, uses simple text parser on 1st 16KB chunk of the file), off" -msgstr "finomhangolja a forrásállományok automatikus fejléc detektálást (lépcsőzetes üzemmódban)\\n lehet: native, full, partial (default), off" +msgid "control source header parsing (in incremental build mode)\\n can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), off" +msgstr "finomhangolja a forrásállományok automatikus fejléc detektálást (lépcsőzetes üzemmódban)\\n lehet: native, full (default), off" #: hbmk2.prg:7850 #, c-format @@ -1009,5 +1009,5 @@ msgstr "c #: hbmk2.prg:7959 #, c-format -msgid ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], skip=, stop=, echo=\nLines starting with '#' char are ignored" -msgstr ".hbc opciók (külön sorokba írandók): libs=[], hbcs=[<.hbc nevek>], gt=[gtnév], syslibs=[], prgflags=[Harbour opciók], cflags=[C fordító opciók], resflags=[erőforrás fordító kapcsolók], ldflags=[szerkesztő kapcsolók], libpaths=[útvonalak], sources=[forrás fájlok], incpaths=[útvonalak], instfiles=[fájlok], instpaths=[útvonalak], autohbcs=[<.ch>:<.hbc>], plugins=[plugin-ek], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], skip=, stop=, echo=\\n'#' karakterrel kezdődő sorokat figyelmen kívül hagyja" +msgid ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native], skip=[yes|no], skip=, stop=, echo=\nLines starting with '#' char are ignored" +msgstr ".hbc opciók (külön sorokba írandók): libs=[], hbcs=[<.hbc nevek>], gt=[gtnév], syslibs=[], prgflags=[Harbour opciók], cflags=[C fordító opciók], resflags=[erőforrás fordító kapcsolók], ldflags=[szerkesztő kapcsolók], libpaths=[útvonalak], sources=[forrás fájlok], incpaths=[útvonalak], instfiles=[fájlok], instpaths=[útvonalak], autohbcs=[<.ch>:<.hbc>], plugins=[plugin-ek], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native], skip=[yes|no], skip=, stop=, echo=\\n'#' karakterrel kezdődő sorokat figyelmen kívül hagyja" diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 4f20000519..170c87b728 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -163,9 +163,8 @@ REQUEST hbmk_KEYW #define _COMPR_MAX 3 #define _HEAD_OFF 0 -#define _HEAD_PARTIAL 1 -#define _HEAD_FULL 2 -#define _HEAD_NATIVE 3 +#define _HEAD_FULL 1 +#define _HEAD_NATIVE 2 #define _COMPDET_bBlock 1 #define _COMPDET_cCOMP 2 @@ -858,7 +857,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) hbmk[ _HBMK_lGUI ] := .F. hbmk[ _HBMK_lMT ] := .F. hbmk[ _HBMK_lDEBUG ] := .F. - hbmk[ _HBMK_nHEAD ] := _HEAD_PARTIAL + hbmk[ _HBMK_nHEAD ] := _HEAD_FULL hbmk[ _HBMK_lREBUILD ] := .F. hbmk[ _HBMK_lCLEAN ] := .F. hbmk[ _HBMK_lTRACE ] := .F. @@ -2015,7 +2014,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) CASE SubStr( cParamL, 7 ) == "off" ; hbmk[ _HBMK_nHEAD ] := _HEAD_OFF CASE SubStr( cParamL, 7 ) == "full" ; hbmk[ _HBMK_nHEAD ] := _HEAD_FULL CASE SubStr( cParamL, 7 ) == "native" ; hbmk[ _HBMK_nHEAD ] := _HEAD_NATIVE - OTHERWISE ; hbmk[ _HBMK_nHEAD ] := _HEAD_PARTIAL + OTHERWISE ; hbmk[ _HBMK_nHEAD ] := _HEAD_FULL ENDCASE CASE cParamL == "-head-" .OR. ; @@ -6326,7 +6325,6 @@ STATIC FUNCTION SetupForGT( cGT_New, /* @ */ cGT, /* @ */ lGUI ) STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, lSystemHeader, tTimeParent, lCMode, cBin_CompC, /* @ */ headstate, nNestingLevel ) LOCAL cFile - LOCAL fhnd LOCAL tTimeSelf LOCAL tTimeDependency LOCAL tmp @@ -6595,17 +6593,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, lSystemHeader, tT .prg, .c and .res sources. Please try to keep it simple, as speed and maintainability is also important. [vszakats] */ - IF hbmk[ _HBMK_nHEAD ] == _HEAD_FULL - cFile := MemoRead( cFileName ) - ELSE - IF ( fhnd := FOpen( cFileName, FO_READ + FO_SHARED ) ) == F_ERROR - RETURN .F. - ENDIF - cFile := Space( Min( 16384, FSeek( fhnd, 0, FS_END ) ) ) - FSeek( fhnd, 0, FS_SET ) - FRead( fhnd, @cFile, Len( cFile ) ) - FClose( fhnd ) - ENDIF + cFile := MemoRead( cFileName ) /* NOTE: http://en.wikipedia.org/wiki/PCRE @@ -8750,7 +8738,6 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel ) CASE Lower( cLine ) == "off" ; hbmk[ _HBMK_nHEAD ] := _HEAD_OFF CASE Lower( cLine ) == "full" ; hbmk[ _HBMK_nHEAD ] := _HEAD_FULL CASE Lower( cLine ) == "native" ; hbmk[ _HBMK_nHEAD ] := _HEAD_NATIVE - CASE Lower( cLine ) == "partial" ; hbmk[ _HBMK_nHEAD ] := _HEAD_PARTIAL ENDCASE CASE Lower( Left( cLine, Len( "run=" ) ) ) == "run=" ; cLine := SubStr( cLine, Len( "run=" ) + 1 ) @@ -11073,7 +11060,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) { "-3rd=" , I_( "options/flags reserved for 3rd party tools, always ignored by hbmk2 itself" ) },; { "-jobs=" , I_( "start n compilation threads (multiprocess platforms only)" ) },; { "-inc" , I_( "enable incremental build mode" ) },; - { "-[no]head[=]" , I_( "control source header parsing (in incremental build mode)\n can be: native (uses compiler to extract dependencies), full (uses simple text parser on the whole file), partial (default, uses simple text parser on 1st 16KB chunk of the file), off" ) },; + { "-[no]head[=]" , I_( "control source header parsing (in incremental build mode)\n can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), off" ) },; { "-rebuild" , I_( "rebuild all (in incremental build mode)" ) },; { "-clean" , I_( "clean (in incremental build mode)" ) },; { "-workdir=" , hb_StrFormat( I_( "working directory\n(default: %1$s/plat/comp in incremental mode, OS temp directory otherwise)" ), _WORKDIR_BASE_ ) },; @@ -11148,7 +11135,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) I_( "Regular Harbour compiler options are also accepted.\n(see them with -harbourhelp option)" ),; hb_StrFormat( I_( "%1$s option file in hbmk2 directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, /etc/harbour, /etc are checked (in that order) before the hbmk2 directory." ), _HBMK_AUTOHBC_NAME ),; hb_StrFormat( I_( "%1$s make script in current directory is always processed if it exists." ), _HBMK_AUTOHBM_NAME ),; - I_( ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=, stop=, echo=\nLines starting with '#' char are ignored" ),; + I_( ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native], skip=, stop=, echo=\nLines starting with '#' char are ignored" ),; I_( "Platform filters are accepted in each .hbc line and with several options.\nFilter format: {[!][|||]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allwin|allmsvc|allgcc|allmingw|allicc|allpocc|unix}, {x86|x86_64|ia64|arm|mips|sh}, {debug|nodebug|gui|std|mt|st|shared|static|unicode|ascii|xhb}" ),; I_( "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, instfiles=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." ),; I_( 'Options accepting macros also support command substitution. Enclose command inside ``, and, if the command contains space, also enclose in double quotes. F.e. "-cflag=`wx-config --cflags`", or ldflags={unix&gcc}"`wx-config --libs`".' ),; diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po index d2946b9414..928215129e 100644 --- a/harbour/utils/hbmk2/hbmk2.pt_BR.po +++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po @@ -512,9 +512,9 @@ msgstr "Op #: hbmk2.prg:7960 #, c-format -msgid ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], skip=, stop=, echo=\nLines starting with '#' char are ignored" +msgid ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native], skip=[yes|no], skip=, stop=, echo=\nLines starting with '#' char are ignored" msgstr "" -"As opçőes em um arquivo .hbc devem estar em linhas separadas e săo: libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[flags do Harbour], cflags=[flags do compilador C], resflags=[flags do compilador de recursos], ldflags=[flags do linkeditor], libpaths=[paths], sources=[módulos fontes], incpaths=[paths], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=\\n" +"As opçőes em um arquivo .hbc devem estar em linhas separadas e săo: libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[flags do Harbour], cflags=[flags do compilador C], resflags=[flags do compilador de recursos], ldflags=[flags do linkeditor], libpaths=[paths], sources=[módulos fontes], incpaths=[paths], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native], skip=[yes|no], echo=\\n" "Linhas iniciadas com '#' săo interpretadas como comentários e serăo ignoradas" #: hbmk2.prg:7942 @@ -575,10 +575,10 @@ msgstr "seta o #: hbmk2.prg:7942 #, c-format msgid "" -"control source header parsing (in incremental build mode)\\n can be: native (uses compiler to extract dependencies), full (uses simple text parser on the whole file), partial (default, uses simple text parser on 1st 16KB chunk of the file), off" +"control source header parsing (in incremental build mode)\\n can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), off" msgstr "" "controla a análise de cabeçalhos (no modo de compilaçăo incremental)\\n" -" pode ser: native, full, partial (padrăo), off" +" pode ser: native, full (padrăo), off" #: hbmk2.prg:7942 #, c-format