diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c94638514b..c4b325e28a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,39 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-03 12:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbct/hbct.hbp + + contrib/hbct/ctextern.prg + + Added extern puller .prg (suggested by Przemek) + This fixes dynamic loading of hbct dynamic lib. + We need a system which keeps these files updated for + every contribs. + + * contrib/hbct/video.c + ! Fixed to always define functions (not just in dos targets) + ! Fixed warnings that came up along the way. + ! Fixed to return compatible type on non-dos. + + * contrib/hbct/ctextern.ch + + Updated with current function list. + + * contrib/make.hbs + ! Fixed to propagate make options also to "contained" + projects. Currently these are the HBQT subprojects + referenced from hbqt.hbp container project file. + Before f.e. clean option was not effective on these + projects. + + * contrib/hbqt/utils/hbqtgen.prg + * contrib/hbqt/qtgui/g/hbqtgui_extern.ch + * contrib/hbqt/qtwebkit/g/hbqtwebkit_extern.ch + * contrib/hbqt/qtcore/g/hbqtcore_extern.ch + * contrib/hbqt/qtnetwork/g/hbqtnetwork_extern.ch + * contrib/hbqt/qscintilla/g/hbqscintilla_extern.ch + * contrib/hbqt/qtdesigner/g/hbqtdesigner_extern.ch + * Use EXTERNAL instead of REQUEST to be in sync with rest + of files in Harbour. + 2010-08-03 11:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Fixed to clean map file when -map option is used. @@ -1313,6 +1346,7 @@ Called from CHARADD(0) Called from MAIN(7) --- + [SOLVED] 2010-07-30 16:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg diff --git a/harbour/contrib/hbct/ctextern.ch b/harbour/contrib/hbct/ctextern.ch index d44af4e058..99c2a517f7 100644 --- a/harbour/contrib/hbct/ctextern.ch +++ b/harbour/contrib/hbct/ctextern.ch @@ -54,10 +54,12 @@ #ifndef HB_CTEXTERN_CH_ #define HB_CTEXTERN_CH_ +EXTERNAL _HB_CTDSPTIME EXTERNAL ACOS EXTERNAL ADDASCII EXTERNAL ADDMONTH EXTERNAL AFTERATNUM +EXTERNAL ALLOFREE EXTERNAL ASCIISUM EXTERNAL ASCPOS EXTERNAL ASIN @@ -90,6 +92,7 @@ EXTERNAL CHARONE EXTERNAL CHARONLY EXTERNAL CHAROR EXTERNAL CHARPACK +EXTERNAL CHARPIX EXTERNAL CHARRELA EXTERNAL CHARRELREP EXTERNAL CHARREM @@ -116,6 +119,43 @@ EXTERNAL CLWIN EXTERNAL COLORREPL EXTERNAL COLORTON EXTERNAL COLORWIN +EXTERNAL COM_BREAK +EXTERNAL COM_CLOSE +EXTERNAL COM_COUNT +EXTERNAL COM_CRC +EXTERNAL COM_CTS +EXTERNAL COM_DCD +EXTERNAL COM_DEVNAME +EXTERNAL COM_DOSCON +EXTERNAL COM_DSR +EXTERNAL COM_DTR +EXTERNAL COM_ERRCHR +EXTERNAL COM_EVENT +EXTERNAL COM_FLUSH +EXTERNAL COM_GETIO +EXTERNAL COM_GETIRQ +EXTERNAL COM_HARD +EXTERNAL COM_INIT +EXTERNAL COM_KEY +EXTERNAL COM_LSR +EXTERNAL COM_MCR +EXTERNAL COM_MSR +EXTERNAL COM_NUM +EXTERNAL COM_OPEN +EXTERNAL COM_READ +EXTERNAL COM_REMOTE +EXTERNAL COM_RING +EXTERNAL COM_RTS +EXTERNAL COM_SCOUNT +EXTERNAL COM_SEND +EXTERNAL COM_SETIO +EXTERNAL COM_SETIRQ +EXTERNAL COM_SFLUSH +EXTERNAL COM_SKEY +EXTERNAL COM_SMODE +EXTERNAL COM_SOFT +EXTERNAL COM_SOFT_R +EXTERNAL COM_SOFT_S EXTERNAL COMPLEMENT EXTERNAL COS EXTERNAL COSH @@ -124,13 +164,6 @@ EXTERNAL COUNTGETS EXTERNAL COUNTLEFT EXTERNAL COUNTRIGHT EXTERNAL CRYPT -EXTERNAL CSETARGERR -EXTERNAL CSETATMUPA -EXTERNAL CSETCENT -EXTERNAL CSETCURS -EXTERNAL CSETKEY -EXTERNAL CSETREF -EXTERNAL CSETSAFETY EXTERNAL CTCEXIT EXTERNAL CTCINIT EXTERNAL CTEXIT @@ -141,7 +174,15 @@ EXTERNAL CTOF EXTERNAL CTOMONTH EXTERNAL CTON EXTERNAL CTWINIT +EXTERNAL CTWLASTKEY EXTERNAL CURRENTGET +EXTERNAL CSETARGERR +EXTERNAL CSETATMUPA +EXTERNAL CSETCENT +EXTERNAL CSETCURS +EXTERNAL CSETKEY +EXTERNAL CSETREF +EXTERNAL CSETSAFETY EXTERNAL DAYSINMONTH EXTERNAL DAYSTOMONTH EXTERNAL DBFSIZE @@ -152,6 +193,7 @@ EXTERNAL DMY EXTERNAL DOSPARAM EXTERNAL DOY EXTERNAL DRIVETYPE +EXTERNAL DSETKBIOS EXTERNAL DTOR EXTERNAL ENHANCED EXTERNAL EOM @@ -190,11 +232,14 @@ EXTERNAL GETFLDCOL EXTERNAL GETFLDROW EXTERNAL GETFLDVAR EXTERNAL GETINPUT +EXTERNAL GETKXLAT EXTERNAL GETPREC EXTERNAL GETSECRET -EXTERNAL GETVOLINFO -EXTERNAL _HB_CTDSPTIME +EXTERNAL HBCT_MAXCOL +EXTERNAL HBCT_MAXROW EXTERNAL INFINITY +EXTERNAL INTNEG +EXTERNAL INTPOS EXTERNAL INVERTATTR EXTERNAL INVERTWIN EXTERNAL ISBIT @@ -217,6 +262,13 @@ EXTERNAL MANTISSA EXTERNAL MAXLINE EXTERNAL MDY EXTERNAL MILLISEC +EXTERNAL NETCANCEL +EXTERNAL NETDISK +EXTERNAL NETPRINTER +EXTERNAL NETREDIR +EXTERNAL NETRMTNAME +EXTERNAL NETWORK +EXTERNAL NNETWORK EXTERNAL NTOC EXTERNAL NTOCDOW EXTERNAL NTOCMONTH @@ -255,6 +307,8 @@ EXTERNAL PRINTSEND EXTERNAL PRINTSTAT EXTERNAL PV EXTERNAL QUARTER +EXTERNAL RAND +EXTERNAL RANDOM EXTERNAL RANGEREM EXTERNAL RANGEREPL EXTERNAL RATE @@ -293,8 +347,11 @@ EXTERNAL SETDATE EXTERNAL SETFATTR EXTERNAL SETFCREATE EXTERNAL SETFDATI +EXTERNAL SETFONT +EXTERNAL SETKXLAT EXTERNAL SETLASTKEY EXTERNAL SETPREC +EXTERNAL SETRC EXTERNAL SETTIME EXTERNAL SHOWTIME EXTERNAL SIGN @@ -309,6 +366,7 @@ EXTERNAL TABEXPAND EXTERNAL TABPACK EXTERNAL TAN EXTERNAL TANH +EXTERNAL TEMPFILE EXTERNAL TIMETOSEC EXTERNAL TIMEVALID EXTERNAL TOKEN @@ -325,6 +383,8 @@ EXTERNAL TRUENAME EXTERNAL UNSELECTED EXTERNAL UNTEXTWIN EXTERNAL VALPOS +EXTERNAL VGAPALETTE +EXTERNAL VIDEOTYPE EXTERNAL VOLSERIAL EXTERNAL VOLUME EXTERNAL WACLOSE @@ -340,8 +400,10 @@ EXTERNAL WFLASTCOL EXTERNAL WFLASTROW EXTERNAL WFORMAT EXTERNAL WFROW +EXTERNAL WHIDE EXTERNAL WLASTCOL EXTERNAL WLASTROW +EXTERNAL WLEVEL EXTERNAL WMODE EXTERNAL WMOVE EXTERNAL WNUM @@ -357,10 +419,13 @@ EXTERNAL WROW EXTERNAL WSELECT EXTERNAL WSETMOVE EXTERNAL WSETSHADOW +EXTERNAL WSHADOW +EXTERNAL WSHOW EXTERNAL WSTEP +EXTERNAL XMOBLOCK +EXTERNAL XMOCHECK EXTERNAL XTOC - -EXTERNAL HBCT_MAXROW -EXTERNAL HBCT_MAXCOL +EXTERNAL ZEROINSERT +EXTERNAL ZEROREMOVE #endif /* HB_CTEXTERN_CH_ */ diff --git a/harbour/contrib/hbct/ctextern.prg b/harbour/contrib/hbct/ctextern.prg new file mode 100644 index 0000000000..83c631aded --- /dev/null +++ b/harbour/contrib/hbct/ctextern.prg @@ -0,0 +1,54 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * extern puller + * + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * 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 + * 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. + * + */ + +ANNOUNCE __HBCT_EXTERN__ +#include "ctextern.ch" diff --git a/harbour/contrib/hbct/hbct.hbp b/harbour/contrib/hbct/hbct.hbp index 5245bde6b6..d190711764 100644 --- a/harbour/contrib/hbct/hbct.hbp +++ b/harbour/contrib/hbct/hbct.hbp @@ -107,6 +107,7 @@ wordtoch.c ct.prg ctdummy.prg +ctextern.prg ctmisc.prg ctrand.prg cttime.prg diff --git a/harbour/contrib/hbct/video.c b/harbour/contrib/hbct/video.c index d55f44136b..1b2773ee42 100644 --- a/harbour/contrib/hbct/video.c +++ b/harbour/contrib/hbct/video.c @@ -60,26 +60,28 @@ #include "hbapigt.h" #if defined( HB_OS_DOS ) - # if defined( __DJGPP__ ) # include # include # include # include # endif +#endif /* HB_OS_DOS */ # include "ctvideo.ch" HB_FUNC( CHARPIX ) { -# ifdef __DJGPP__ +#if defined( __DJGPP__ ) hb_retni( _farpeekw( _dos_ds, 0x485 ) ); -# endif +#else + hb_retni( 0 ); +#endif } HB_FUNC( VGAPALETTE ) { - const char *color_string; + const char * color_string; char red, green, blue; int attr; @@ -109,7 +111,7 @@ HB_FUNC( VGAPALETTE ) green = hb_parni( 3 ); blue = hb_parni( 4 ); -# ifdef __DJGPP__ +#if defined( __DJGPP__ ) { __dpmi_regs r; int iflag; @@ -135,14 +137,19 @@ HB_FUNC( VGAPALETTE ) __dpmi_get_and_enable_virtual_interrupt_state(); } hb_retl( HB_TRUE ); -# else - hb_retl( HB_FALSE ); -# endif +#else + { + HB_SYMBOL_UNUSED( blue ); + HB_SYMBOL_UNUSED( green ); + HB_SYMBOL_UNUSED( red ); + hb_retl( HB_FALSE ); + } +#endif } HB_FUNC( VIDEOTYPE ) { -# if defined( __DJGPP__ ) +#if defined( __DJGPP__ ) __dpmi_regs r; r.h.ah = 0x12; /* Alternate Select */ @@ -163,12 +170,12 @@ HB_FUNC( VIDEOTYPE ) else hb_retni( VCARD_EGA ); } -# endif +#endif } HB_FUNC( SETFONT ) { - const char *font = hb_parcx( 1 ); + const char * font = hb_parcx( 1 ); unsigned len = ( unsigned ) hb_parclen( 1 ); int area = hb_parni( 2 ); int offset = 0; @@ -184,7 +191,7 @@ HB_FUNC( SETFONT ) if( HB_ISLOG( 3 ) && hb_parl( 3 ) && count != 0 ) height = len / count; -# ifdef __DJGPP__ +#if defined( __DJGPP__ ) { __dpmi_regs r; @@ -199,12 +206,13 @@ HB_FUNC( SETFONT ) __dpmi_int( 0x10, &r ); hb_retni( 0 ); } -# else +#else { HB_SYMBOL_UNUSED( font ); + HB_SYMBOL_UNUSED( height ); + HB_SYMBOL_UNUSED( offset ); + HB_SYMBOL_UNUSED( area ); hb_retni( -2 ); } -# endif +#endif } - -#endif /* HB_OS_DOS */ diff --git a/harbour/contrib/hbqt/qscintilla/g/hbqscintilla_extern.ch b/harbour/contrib/hbqt/qscintilla/g/hbqscintilla_extern.ch index 9cc1d94bfc..78c9fdc7e8 100644 --- a/harbour/contrib/hbqt/qscintilla/g/hbqscintilla_extern.ch +++ b/harbour/contrib/hbqt/qscintilla/g/hbqscintilla_extern.ch @@ -11,17 +11,17 @@ #ifndef __HBQSCINTILLA_EXTERN_CH #define __HBQSCINTILLA_EXTERN_CH -REQUEST HBQsciScintilla -REQUEST QsciAbstractAPIs -REQUEST QsciAPIs -REQUEST QsciCommand -REQUEST QsciCommandSet -REQUEST QsciDocument -REQUEST QsciLexer -REQUEST QsciLexerCPP -REQUEST QsciLexerFlagship -REQUEST QsciScintilla -REQUEST QsciStyle -REQUEST QsciStyledText +EXTERNAL HBQsciScintilla +EXTERNAL QsciAbstractAPIs +EXTERNAL QsciAPIs +EXTERNAL QsciCommand +EXTERNAL QsciCommandSet +EXTERNAL QsciDocument +EXTERNAL QsciLexer +EXTERNAL QsciLexerCPP +EXTERNAL QsciLexerFlagship +EXTERNAL QsciScintilla +EXTERNAL QsciStyle +EXTERNAL QsciStyledText #endif /* __HBQSCINTILLA_EXTERN_CH */ diff --git a/harbour/contrib/hbqt/qtcore/g/hbqtcore_extern.ch b/harbour/contrib/hbqt/qtcore/g/hbqtcore_extern.ch index ee90b3399a..9163280cd1 100644 --- a/harbour/contrib/hbqt/qtcore/g/hbqtcore_extern.ch +++ b/harbour/contrib/hbqt/qtcore/g/hbqtcore_extern.ch @@ -11,56 +11,56 @@ #ifndef __HBQTCORE_EXTERN_CH #define __HBQTCORE_EXTERN_CH -REQUEST HBEvents -REQUEST HBSlots -REQUEST QAbstractItemModel -REQUEST QAbstractListModel -REQUEST QAbstractTableModel -REQUEST QBitArray -REQUEST QBuffer -REQUEST QByteArray -REQUEST QChar -REQUEST QCoreApplication -REQUEST QDataStream -REQUEST QDate -REQUEST QDateTime -REQUEST QDir -REQUEST QEvent -REQUEST QEventLoop -REQUEST QFile -REQUEST QFileInfo -REQUEST QIODevice -REQUEST QLatin1Char -REQUEST QLatin1String -REQUEST QLine -REQUEST QLineF -REQUEST QList -REQUEST QLocale -REQUEST QMimeData -REQUEST QModelIndex -REQUEST QObject -REQUEST QPoint -REQUEST QPointF -REQUEST QProcess -REQUEST QRect -REQUEST QRectF -REQUEST QRegExp -REQUEST QResource -REQUEST QSettings -REQUEST QSignalMapper -REQUEST QSize -REQUEST QSizeF -REQUEST QStringList -REQUEST QTextBoundaryFinder -REQUEST QTextCodec -REQUEST QTextDecoder -REQUEST QTextEncoder -REQUEST QTextStream -REQUEST QThread -REQUEST QTime -REQUEST QTimer -REQUEST QTranslator -REQUEST QUrl -REQUEST QVariant +EXTERNAL HBEvents +EXTERNAL HBSlots +EXTERNAL QAbstractItemModel +EXTERNAL QAbstractListModel +EXTERNAL QAbstractTableModel +EXTERNAL QBitArray +EXTERNAL QBuffer +EXTERNAL QByteArray +EXTERNAL QChar +EXTERNAL QCoreApplication +EXTERNAL QDataStream +EXTERNAL QDate +EXTERNAL QDateTime +EXTERNAL QDir +EXTERNAL QEvent +EXTERNAL QEventLoop +EXTERNAL QFile +EXTERNAL QFileInfo +EXTERNAL QIODevice +EXTERNAL QLatin1Char +EXTERNAL QLatin1String +EXTERNAL QLine +EXTERNAL QLineF +EXTERNAL QList +EXTERNAL QLocale +EXTERNAL QMimeData +EXTERNAL QModelIndex +EXTERNAL QObject +EXTERNAL QPoint +EXTERNAL QPointF +EXTERNAL QProcess +EXTERNAL QRect +EXTERNAL QRectF +EXTERNAL QRegExp +EXTERNAL QResource +EXTERNAL QSettings +EXTERNAL QSignalMapper +EXTERNAL QSize +EXTERNAL QSizeF +EXTERNAL QStringList +EXTERNAL QTextBoundaryFinder +EXTERNAL QTextCodec +EXTERNAL QTextDecoder +EXTERNAL QTextEncoder +EXTERNAL QTextStream +EXTERNAL QThread +EXTERNAL QTime +EXTERNAL QTimer +EXTERNAL QTranslator +EXTERNAL QUrl +EXTERNAL QVariant #endif /* __HBQTCORE_EXTERN_CH */ diff --git a/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner_extern.ch b/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner_extern.ch index 087b2f1806..0280468a0c 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner_extern.ch +++ b/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner_extern.ch @@ -11,13 +11,13 @@ #ifndef __HBQTDESIGNER_EXTERN_CH #define __HBQTDESIGNER_EXTERN_CH -REQUEST QDesignerActionEditorInterface -REQUEST QDesignerFormEditorInterface -REQUEST QDesignerFormWindowCursorInterface -REQUEST QDesignerFormWindowInterface -REQUEST QDesignerFormWindowManagerInterface -REQUEST QDesignerObjectInspectorInterface -REQUEST QDesignerPropertyEditorInterface -REQUEST QDesignerWidgetBoxInterface +EXTERNAL QDesignerActionEditorInterface +EXTERNAL QDesignerFormEditorInterface +EXTERNAL QDesignerFormWindowCursorInterface +EXTERNAL QDesignerFormWindowInterface +EXTERNAL QDesignerFormWindowManagerInterface +EXTERNAL QDesignerObjectInspectorInterface +EXTERNAL QDesignerPropertyEditorInterface +EXTERNAL QDesignerWidgetBoxInterface #endif /* __HBQTDESIGNER_EXTERN_CH */ diff --git a/harbour/contrib/hbqt/qtgui/g/hbqtgui_extern.ch b/harbour/contrib/hbqt/qtgui/g/hbqtgui_extern.ch index 6ae9f77fe5..89ff399ca5 100644 --- a/harbour/contrib/hbqt/qtgui/g/hbqtgui_extern.ch +++ b/harbour/contrib/hbqt/qtgui/g/hbqtgui_extern.ch @@ -11,229 +11,229 @@ #ifndef __HBQTGUI_EXTERN_CH #define __HBQTGUI_EXTERN_CH -REQUEST HBQAbstractItemModel -REQUEST HBQMainWindow -REQUEST HBQPlainTextEdit -REQUEST HBQSyntaxHighlighter -REQUEST HBQTableView -REQUEST HBQTextBlockUserData -REQUEST QAbstractButton -REQUEST QAbstractItemDelegate -REQUEST QAbstractItemView -REQUEST QAbstractPrintDialog -REQUEST QAbstractProxyModel -REQUEST QAbstractScrollArea -REQUEST QAbstractSlider -REQUEST QAbstractSpinBox -REQUEST QAbstractTextDocumentLayout -REQUEST QAction -REQUEST QActionGroup -REQUEST QApplication -REQUEST QBitmap -REQUEST QBoxLayout -REQUEST QBrush -REQUEST QButtonGroup -REQUEST QCalendarWidget -REQUEST QCheckBox -REQUEST QClipboard -REQUEST QColor -REQUEST QColorDialog -REQUEST QComboBox -REQUEST QCommandLinkButton -REQUEST QCommonStyle -REQUEST QCompleter -REQUEST QConicalGradient -REQUEST QContextMenuEvent -REQUEST QCursor -REQUEST QDateEdit -REQUEST QDateTimeEdit -REQUEST QDesktopWidget -REQUEST QDial -REQUEST QDialog -REQUEST QDirModel -REQUEST QDockWidget -REQUEST QDoubleSpinBox -REQUEST QDragEnterEvent -REQUEST QDragLeaveEvent -REQUEST QDragMoveEvent -REQUEST QDropEvent -REQUEST QErrorMessage -REQUEST QFileDialog -REQUEST QFileIconProvider -REQUEST QFileSystemModel -REQUEST QFocusEvent -REQUEST QFocusFrame -REQUEST QFont -REQUEST QFontComboBox -REQUEST QFontDatabase -REQUEST QFontDialog -REQUEST QFontInfo -REQUEST QFontMetrics -REQUEST QFontMetricsF -REQUEST QFormLayout -REQUEST QFrame -REQUEST QGradient -REQUEST QGridLayout -REQUEST QGroupBox -REQUEST QHBoxLayout -REQUEST QHeaderView -REQUEST QHelpEvent -REQUEST QHideEvent -REQUEST QIcon -REQUEST QImage -REQUEST QImageReader -REQUEST QImageWriter -REQUEST QInputDialog -REQUEST QInputEvent -REQUEST QInputMethodEvent -REQUEST QItemDelegate -REQUEST QItemEditorCreatorBase -REQUEST QItemEditorFactory -REQUEST QItemSelection -REQUEST QItemSelectionModel -REQUEST QKeyEvent -REQUEST QKeySequence -REQUEST QLabel -REQUEST QLayout -REQUEST QLayoutItem -REQUEST QLCDNumber -REQUEST QLinearGradient -REQUEST QLineEdit -REQUEST QListView -REQUEST QListWidget -REQUEST QListWidgetItem -REQUEST QMainWindow -REQUEST QMatrix -REQUEST QMdiArea -REQUEST QMdiSubWindow -REQUEST QMenu -REQUEST QMenuBar -REQUEST QMessageBox -REQUEST QMouseEvent -REQUEST QMoveEvent -REQUEST QMovie -REQUEST QPageSetupDialog -REQUEST QPaintDevice -REQUEST QPaintEngine -REQUEST QPainter -REQUEST QPainterPath -REQUEST QPaintEvent -REQUEST QPalette -REQUEST QPen -REQUEST QPicture -REQUEST QPixmap -REQUEST QPlainTextDocumentLayout -REQUEST QPlainTextEdit -REQUEST QPolygon -REQUEST QPolygonF -REQUEST QPrintDialog -REQUEST QPrintEngine -REQUEST QPrinter -REQUEST QPrintPreviewDialog -REQUEST QProgressBar -REQUEST QProgressDialog -REQUEST QPushButton -REQUEST QRadialGradient -REQUEST QRadioButton -REQUEST QRegion -REQUEST QResizeEvent -REQUEST QScrollArea -REQUEST QScrollBar -REQUEST QSessionManager -REQUEST QShowEvent -REQUEST QSizeGrip -REQUEST QSizePolicy -REQUEST QSlider -REQUEST QSound -REQUEST QSpacerItem -REQUEST QSpinBox -REQUEST QSplashScreen -REQUEST QSplitter -REQUEST QStackedWidget -REQUEST QStandardItem -REQUEST QStandardItemModel -REQUEST QStatusBar -REQUEST QStringListModel -REQUEST QStyle -REQUEST QStyledItemDelegate -REQUEST QStyleFactory -REQUEST QStyleHintReturn -REQUEST QStyleHintReturnMask -REQUEST QStyleHintReturnVariant -REQUEST QStyleOption -REQUEST QStyleOptionButton -REQUEST QStyleOptionComboBox -REQUEST QStyleOptionComplex -REQUEST QStyleOptionDockWidget -REQUEST QStyleOptionFocusRect -REQUEST QStyleOptionFrame -REQUEST QStyleOptionGroupBox -REQUEST QStyleOptionHeader -REQUEST QStyleOptionMenuItem -REQUEST QStyleOptionProgressBar -REQUEST QStyleOptionSizeGrip -REQUEST QStyleOptionSlider -REQUEST QStyleOptionSpinBox -REQUEST QStyleOptionTab -REQUEST QStyleOptionTabBarBase -REQUEST QStyleOptionTabWidgetFrame -REQUEST QStyleOptionTitleBar -REQUEST QStyleOptionToolBar -REQUEST QStyleOptionToolBox -REQUEST QStyleOptionToolButton -REQUEST QStyleOptionViewItem -REQUEST QStylePainter -REQUEST QSyntaxHighlighter -REQUEST QSystemTrayIcon -REQUEST QTabBar -REQUEST QTableView -REQUEST QTableWidget -REQUEST QTableWidgetItem -REQUEST QTableWidgetSelectionRange -REQUEST QTabWidget -REQUEST QTextBlock -REQUEST QTextBlockFormat -REQUEST QTextBlockGroup -REQUEST QTextBrowser -REQUEST QTextCharFormat -REQUEST QTextCursor -REQUEST QTextDocument -REQUEST QTextDocumentFragment -REQUEST QTextDocumentWriter -REQUEST QTextEdit -REQUEST QTextFormat -REQUEST QTextFragment -REQUEST QTextFrame -REQUEST QTextFrameFormat -REQUEST QTextImageFormat -REQUEST QTextInlineObject -REQUEST QTextItem -REQUEST QTextLayout -REQUEST QTextLength -REQUEST QTextLine -REQUEST QTextList -REQUEST QTextListFormat -REQUEST QTextObject -REQUEST QTextOption -REQUEST QTextTableFormat -REQUEST QTimeEdit -REQUEST QToolBar -REQUEST QToolBox -REQUEST QToolButton -REQUEST QTransform -REQUEST QTreeView -REQUEST QTreeWidget -REQUEST QTreeWidgetItem -REQUEST QValidator -REQUEST QVBoxLayout -REQUEST QWheelEvent -REQUEST QWidget -REQUEST QWidgetAction -REQUEST QWidgetItem -REQUEST QWindowsStyle -REQUEST QWindowStateChangeEvent -REQUEST QWizard -REQUEST QWizardPage -REQUEST QUiLoader +EXTERNAL HBQAbstractItemModel +EXTERNAL HBQMainWindow +EXTERNAL HBQPlainTextEdit +EXTERNAL HBQSyntaxHighlighter +EXTERNAL HBQTableView +EXTERNAL HBQTextBlockUserData +EXTERNAL QAbstractButton +EXTERNAL QAbstractItemDelegate +EXTERNAL QAbstractItemView +EXTERNAL QAbstractPrintDialog +EXTERNAL QAbstractProxyModel +EXTERNAL QAbstractScrollArea +EXTERNAL QAbstractSlider +EXTERNAL QAbstractSpinBox +EXTERNAL QAbstractTextDocumentLayout +EXTERNAL QAction +EXTERNAL QActionGroup +EXTERNAL QApplication +EXTERNAL QBitmap +EXTERNAL QBoxLayout +EXTERNAL QBrush +EXTERNAL QButtonGroup +EXTERNAL QCalendarWidget +EXTERNAL QCheckBox +EXTERNAL QClipboard +EXTERNAL QColor +EXTERNAL QColorDialog +EXTERNAL QComboBox +EXTERNAL QCommandLinkButton +EXTERNAL QCommonStyle +EXTERNAL QCompleter +EXTERNAL QConicalGradient +EXTERNAL QContextMenuEvent +EXTERNAL QCursor +EXTERNAL QDateEdit +EXTERNAL QDateTimeEdit +EXTERNAL QDesktopWidget +EXTERNAL QDial +EXTERNAL QDialog +EXTERNAL QDirModel +EXTERNAL QDockWidget +EXTERNAL QDoubleSpinBox +EXTERNAL QDragEnterEvent +EXTERNAL QDragLeaveEvent +EXTERNAL QDragMoveEvent +EXTERNAL QDropEvent +EXTERNAL QErrorMessage +EXTERNAL QFileDialog +EXTERNAL QFileIconProvider +EXTERNAL QFileSystemModel +EXTERNAL QFocusEvent +EXTERNAL QFocusFrame +EXTERNAL QFont +EXTERNAL QFontComboBox +EXTERNAL QFontDatabase +EXTERNAL QFontDialog +EXTERNAL QFontInfo +EXTERNAL QFontMetrics +EXTERNAL QFontMetricsF +EXTERNAL QFormLayout +EXTERNAL QFrame +EXTERNAL QGradient +EXTERNAL QGridLayout +EXTERNAL QGroupBox +EXTERNAL QHBoxLayout +EXTERNAL QHeaderView +EXTERNAL QHelpEvent +EXTERNAL QHideEvent +EXTERNAL QIcon +EXTERNAL QImage +EXTERNAL QImageReader +EXTERNAL QImageWriter +EXTERNAL QInputDialog +EXTERNAL QInputEvent +EXTERNAL QInputMethodEvent +EXTERNAL QItemDelegate +EXTERNAL QItemEditorCreatorBase +EXTERNAL QItemEditorFactory +EXTERNAL QItemSelection +EXTERNAL QItemSelectionModel +EXTERNAL QKeyEvent +EXTERNAL QKeySequence +EXTERNAL QLabel +EXTERNAL QLayout +EXTERNAL QLayoutItem +EXTERNAL QLCDNumber +EXTERNAL QLinearGradient +EXTERNAL QLineEdit +EXTERNAL QListView +EXTERNAL QListWidget +EXTERNAL QListWidgetItem +EXTERNAL QMainWindow +EXTERNAL QMatrix +EXTERNAL QMdiArea +EXTERNAL QMdiSubWindow +EXTERNAL QMenu +EXTERNAL QMenuBar +EXTERNAL QMessageBox +EXTERNAL QMouseEvent +EXTERNAL QMoveEvent +EXTERNAL QMovie +EXTERNAL QPageSetupDialog +EXTERNAL QPaintDevice +EXTERNAL QPaintEngine +EXTERNAL QPainter +EXTERNAL QPainterPath +EXTERNAL QPaintEvent +EXTERNAL QPalette +EXTERNAL QPen +EXTERNAL QPicture +EXTERNAL QPixmap +EXTERNAL QPlainTextDocumentLayout +EXTERNAL QPlainTextEdit +EXTERNAL QPolygon +EXTERNAL QPolygonF +EXTERNAL QPrintDialog +EXTERNAL QPrintEngine +EXTERNAL QPrinter +EXTERNAL QPrintPreviewDialog +EXTERNAL QProgressBar +EXTERNAL QProgressDialog +EXTERNAL QPushButton +EXTERNAL QRadialGradient +EXTERNAL QRadioButton +EXTERNAL QRegion +EXTERNAL QResizeEvent +EXTERNAL QScrollArea +EXTERNAL QScrollBar +EXTERNAL QSessionManager +EXTERNAL QShowEvent +EXTERNAL QSizeGrip +EXTERNAL QSizePolicy +EXTERNAL QSlider +EXTERNAL QSound +EXTERNAL QSpacerItem +EXTERNAL QSpinBox +EXTERNAL QSplashScreen +EXTERNAL QSplitter +EXTERNAL QStackedWidget +EXTERNAL QStandardItem +EXTERNAL QStandardItemModel +EXTERNAL QStatusBar +EXTERNAL QStringListModel +EXTERNAL QStyle +EXTERNAL QStyledItemDelegate +EXTERNAL QStyleFactory +EXTERNAL QStyleHintReturn +EXTERNAL QStyleHintReturnMask +EXTERNAL QStyleHintReturnVariant +EXTERNAL QStyleOption +EXTERNAL QStyleOptionButton +EXTERNAL QStyleOptionComboBox +EXTERNAL QStyleOptionComplex +EXTERNAL QStyleOptionDockWidget +EXTERNAL QStyleOptionFocusRect +EXTERNAL QStyleOptionFrame +EXTERNAL QStyleOptionGroupBox +EXTERNAL QStyleOptionHeader +EXTERNAL QStyleOptionMenuItem +EXTERNAL QStyleOptionProgressBar +EXTERNAL QStyleOptionSizeGrip +EXTERNAL QStyleOptionSlider +EXTERNAL QStyleOptionSpinBox +EXTERNAL QStyleOptionTab +EXTERNAL QStyleOptionTabBarBase +EXTERNAL QStyleOptionTabWidgetFrame +EXTERNAL QStyleOptionTitleBar +EXTERNAL QStyleOptionToolBar +EXTERNAL QStyleOptionToolBox +EXTERNAL QStyleOptionToolButton +EXTERNAL QStyleOptionViewItem +EXTERNAL QStylePainter +EXTERNAL QSyntaxHighlighter +EXTERNAL QSystemTrayIcon +EXTERNAL QTabBar +EXTERNAL QTableView +EXTERNAL QTableWidget +EXTERNAL QTableWidgetItem +EXTERNAL QTableWidgetSelectionRange +EXTERNAL QTabWidget +EXTERNAL QTextBlock +EXTERNAL QTextBlockFormat +EXTERNAL QTextBlockGroup +EXTERNAL QTextBrowser +EXTERNAL QTextCharFormat +EXTERNAL QTextCursor +EXTERNAL QTextDocument +EXTERNAL QTextDocumentFragment +EXTERNAL QTextDocumentWriter +EXTERNAL QTextEdit +EXTERNAL QTextFormat +EXTERNAL QTextFragment +EXTERNAL QTextFrame +EXTERNAL QTextFrameFormat +EXTERNAL QTextImageFormat +EXTERNAL QTextInlineObject +EXTERNAL QTextItem +EXTERNAL QTextLayout +EXTERNAL QTextLength +EXTERNAL QTextLine +EXTERNAL QTextList +EXTERNAL QTextListFormat +EXTERNAL QTextObject +EXTERNAL QTextOption +EXTERNAL QTextTableFormat +EXTERNAL QTimeEdit +EXTERNAL QToolBar +EXTERNAL QToolBox +EXTERNAL QToolButton +EXTERNAL QTransform +EXTERNAL QTreeView +EXTERNAL QTreeWidget +EXTERNAL QTreeWidgetItem +EXTERNAL QValidator +EXTERNAL QVBoxLayout +EXTERNAL QWheelEvent +EXTERNAL QWidget +EXTERNAL QWidgetAction +EXTERNAL QWidgetItem +EXTERNAL QWindowsStyle +EXTERNAL QWindowStateChangeEvent +EXTERNAL QWizard +EXTERNAL QWizardPage +EXTERNAL QUiLoader #endif /* __HBQTGUI_EXTERN_CH */ diff --git a/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork_extern.ch b/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork_extern.ch index e6be4de0cc..4763dcfc7a 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork_extern.ch +++ b/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork_extern.ch @@ -11,11 +11,11 @@ #ifndef __HBQTNETWORK_EXTERN_CH #define __HBQTNETWORK_EXTERN_CH -REQUEST QFtp -REQUEST QHttp -REQUEST QHttpHeader -REQUEST QHttpRequestHeader -REQUEST QHttpResponseHeader -REQUEST QNetworkRequest +EXTERNAL QFtp +EXTERNAL QHttp +EXTERNAL QHttpHeader +EXTERNAL QHttpRequestHeader +EXTERNAL QHttpResponseHeader +EXTERNAL QNetworkRequest #endif /* __HBQTNETWORK_EXTERN_CH */ diff --git a/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit_extern.ch b/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit_extern.ch index f65fb82409..e2db75dac0 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit_extern.ch +++ b/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit_extern.ch @@ -11,15 +11,15 @@ #ifndef __HBQTWEBKIT_EXTERN_CH #define __HBQTWEBKIT_EXTERN_CH -REQUEST QWebFrame -REQUEST QWebHistory -REQUEST QWebHistoryInterface -REQUEST QWebHistoryItem -REQUEST QWebHitTestResult -REQUEST QWebPage -REQUEST QWebPluginFactory -REQUEST QWebSecurityOrigin -REQUEST QWebSettings -REQUEST QWebView +EXTERNAL QWebFrame +EXTERNAL QWebHistory +EXTERNAL QWebHistoryInterface +EXTERNAL QWebHistoryItem +EXTERNAL QWebHitTestResult +EXTERNAL QWebPage +EXTERNAL QWebPluginFactory +EXTERNAL QWebSecurityOrigin +EXTERNAL QWebSettings +EXTERNAL QWebView #endif /* __HBQTWEBKIT_EXTERN_CH */ diff --git a/harbour/contrib/hbqt/utils/hbqtgen.prg b/harbour/contrib/hbqt/utils/hbqtgen.prg index f90deb2d8f..f98a8a40cc 100644 --- a/harbour/contrib/hbqt/utils/hbqtgen.prg +++ b/harbour/contrib/hbqt/utils/hbqtgen.prg @@ -1843,7 +1843,7 @@ STATIC FUNCTION Build_HeaderFile( cpp_, cPathOut, cProFile ) aadd( txt_, "#define __HB" + Upper( cName ) + "_EXTERN_CH" ) aadd( txt_, "" ) FOR EACH s IN cpp_ - aadd( txt_, "REQUEST " + s ) + aadd( txt_, "EXTERNAL " + s ) NEXT aadd( txt_, "" ) diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs index 0710c197c7..14a70124a5 100755 --- a/harbour/contrib/make.hbs +++ b/harbour/contrib/make.hbs @@ -384,7 +384,7 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption IF hb_FileExists( s_cBase + s_cHome + cProject ) AddProject( hProjectList, cProject ) call_hbmk2_hbinfo( s_cBase + s_cHome + cProject, hProjectList[ cProject ] ) - hProjectList[ cProject ][ "lOrphan" ] := NIL + hProjectList[ cProject ][ "lFromContainer" ] := NIL ENDIF ENDIF NEXT @@ -422,7 +422,7 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption IF cProject $ hProjectList cProjectPath := s_cBase + s_cHome + cProject - lPrimary := cProject $ hProjectReqList + lPrimary := cProject $ hProjectReqList .OR. "lFromContainer" $ hProjectList[ cProject ] call_hbmk2( cProjectPath, iif( lPrimary, cOptions + cOptionsUser, " -inc" ), .F. ) @@ -432,10 +432,8 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption ENDIF /* Compile documentation */ - IF lInstall - IF lPrimary .OR. "lOrphan" $ hProjectList[ cProject ] - mk_hbd( FNameDirGet( PathSepToSelf( cProjectPath ) ) ) - ENDIF + IF lInstall .AND. lPrimary + mk_hbd( FNameDirGet( PathSepToSelf( cProjectPath ) ) ) ENDIF ENDIF NEXT