diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 79f7ecd07e..1cc483e5b8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,47 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-06 11:59 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * harbour/contrib/hbqt/Makefile_gen + + + harbour/contrib/hbqt/hbqt_qabstractitemmodel.cpp + * harbour/contrib/hbqt/hbqt_qradialgradient.cpp + * harbour/contrib/hbqt/hbqt_qstyleditemdelegate.cpp + * harbour/contrib/hbqt/hbqt_qstyleoption.cpp + * harbour/contrib/hbqt/hbqt_qtextinlineobject.cpp + + harbour/contrib/hbqt/hbqt_qtextobject.cpp + + * harbour/contrib/hbqt/hbqt.h + + * harbour/contrib/hbqt/generator/hbqtgen.prg + + * harbour/contrib/hbqt/tests/demoqt.prg + + + harbour/contrib/hbqt/TQAbstractItemModel.prg + + harbour/contrib/hbqt/TQTextObject.prg + + + harbour/contrib/hbqt/qth/QAbstractItemModel.qth + * harbour/contrib/hbqt/qth/QRadialGradient.qth + * harbour/contrib/hbqt/qth/QStyledItemDelegate.qth + * harbour/contrib/hbqt/qth/QStyleOption.qth + * harbour/contrib/hbqt/qth/QTextInlineObject.qth + + harbour/contrib/hbqt/qth/QTextObject.qth + + * harbour/contrib/hbqt/generator/qt45.qtp + + ! Added two classes and synchronized others. + All cross references are resolved and now hbqt.lib is self contained. + + /* + Basic components to develop GUI platform is over. + + Please submit any code you have developed based on hbqt.lib + so that enthusiasm about it could be generated. Don't be shy about + the quality of the code, many are there to set it right. + + Now onwards I will be concentrating on Xbase++ Parts implementation. + */ + 2009-06-06 10:33 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/hbqt/Makefile_gen diff --git a/harbour/contrib/hbqt/Makefile_gen b/harbour/contrib/hbqt/Makefile_gen index 9e62f92293..82723b882a 100644 --- a/harbour/contrib/hbqt/Makefile_gen +++ b/harbour/contrib/hbqt/Makefile_gen @@ -5,6 +5,7 @@ CPP_SOURCES=\ hbqt_qabstractbutton.cpp \ + hbqt_qabstractitemmodel.cpp \ hbqt_qabstractitemview.cpp \ hbqt_qabstractprintdialog.cpp \ hbqt_qabstractscrollarea.cpp \ @@ -129,11 +130,13 @@ CPP_SOURCES=\ hbqt_qstyleoptionspinbox.cpp \ hbqt_qstyleoptiontab.cpp \ hbqt_qstyleoptiontabbarbase.cpp \ + hbqt_qstyleoptiontabwidgetframe.cpp \ hbqt_qstyleoptiontitlebar.cpp \ hbqt_qstyleoptiontoolbar.cpp \ hbqt_qstyleoptiontoolbox.cpp \ hbqt_qstyleoptiontoolbutton.cpp \ hbqt_qstyleoptionviewitem.cpp \ + hbqt_qstylepainter.cpp \ hbqt_qtabbar.cpp \ hbqt_qtableview.cpp \ hbqt_qtablewidget.cpp \ @@ -163,6 +166,7 @@ CPP_SOURCES=\ hbqt_qtextlayout.cpp \ hbqt_qtextlength.cpp \ hbqt_qtextline.cpp \ + hbqt_qtextobject.cpp \ hbqt_qtextstream.cpp \ hbqt_qtimeedit.cpp \ hbqt_qtimer.cpp \ @@ -197,6 +201,7 @@ C_HEADERS=\ PRG_SOURCES=\ TQAbstractButton.prg \ + TQAbstractItemModel.prg \ TQAbstractItemView.prg \ TQAbstractPrintDialog.prg \ TQAbstractScrollArea.prg \ @@ -319,11 +324,13 @@ PRG_SOURCES=\ TQStyleOptionSpinBox.prg \ TQStyleOptionTab.prg \ TQStyleOptionTabBarBase.prg \ + TQStyleOptionTabWidgetFrame.prg \ TQStyleOptionTitleBar.prg \ TQStyleOptionToolBar.prg \ TQStyleOptionToolBox.prg \ TQStyleOptionToolButton.prg \ TQStyleOptionViewItem.prg \ + TQStylePainter.prg \ TQTabBar.prg \ TQTableView.prg \ TQTableWidget.prg \ @@ -353,6 +360,7 @@ PRG_SOURCES=\ TQTextLayout.prg \ TQTextLength.prg \ TQTextLine.prg \ + TQTextObject.prg \ TQTextStream.prg \ TQTimeEdit.prg \ TQTimer.prg \ diff --git a/harbour/contrib/hbqt/TQAbstractItemModel.prg b/harbour/contrib/hbqt/TQAbstractItemModel.prg new file mode 100644 index 0000000000..5e5c7debac --- /dev/null +++ b/harbour/contrib/hbqt/TQAbstractItemModel.prg @@ -0,0 +1,113 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009 Marcos Antonio Gambeta + * Copyright 2009 Pritpal Bedi + * www - http://www.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. + * + */ +/*----------------------------------------------------------------------*/ + + +#include "hbclass.ch" + + +CREATE CLASS QAbstractItemModel INHERIT QObject + + VAR pParent + VAR pPtr + + METHOD New() + + METHOD buddy( pIndex ) INLINE Qt_QAbstractItemModel_buddy( ::pPtr, pIndex ) + METHOD canFetchMore( pParent ) INLINE Qt_QAbstractItemModel_canFetchMore( ::pPtr, pParent ) + METHOD columnCount( pParent ) INLINE Qt_QAbstractItemModel_columnCount( ::pPtr, pParent ) + METHOD data( pIndex, nRole ) INLINE Qt_QAbstractItemModel_data( ::pPtr, pIndex, nRole ) + METHOD dropMimeData( pData, nAction, nRow, nColumn, pParent ) INLINE Qt_QAbstractItemModel_dropMimeData( ::pPtr, pData, nAction, nRow, nColumn, pParent ) + METHOD fetchMore( pParent ) INLINE Qt_QAbstractItemModel_fetchMore( ::pPtr, pParent ) + METHOD flags( pIndex ) INLINE Qt_QAbstractItemModel_flags( ::pPtr, pIndex ) + METHOD hasChildren( pParent ) INLINE Qt_QAbstractItemModel_hasChildren( ::pPtr, pParent ) + METHOD hasIndex( nRow, nColumn, pParent ) INLINE Qt_QAbstractItemModel_hasIndex( ::pPtr, nRow, nColumn, pParent ) + METHOD headerData( nSection, nOrientation, nRole ) INLINE Qt_QAbstractItemModel_headerData( ::pPtr, nSection, nOrientation, nRole ) + METHOD index( nRow, nColumn, pParent ) INLINE Qt_QAbstractItemModel_index( ::pPtr, nRow, nColumn, pParent ) + METHOD insertColumn( nColumn, pParent ) INLINE Qt_QAbstractItemModel_insertColumn( ::pPtr, nColumn, pParent ) + METHOD insertColumns( nColumn, nCount, pParent ) INLINE Qt_QAbstractItemModel_insertColumns( ::pPtr, nColumn, nCount, pParent ) + METHOD insertRow( nRow, pParent ) INLINE Qt_QAbstractItemModel_insertRow( ::pPtr, nRow, pParent ) + METHOD insertRows( nRow, nCount, pParent ) INLINE Qt_QAbstractItemModel_insertRows( ::pPtr, nRow, nCount, pParent ) + METHOD mimeData( pIndexes ) INLINE Qt_QAbstractItemModel_mimeData( ::pPtr, pIndexes ) + METHOD mimeTypes() INLINE Qt_QAbstractItemModel_mimeTypes( ::pPtr ) + METHOD parent( pIndex ) INLINE Qt_QAbstractItemModel_parent( ::pPtr, pIndex ) + METHOD removeColumn( nColumn, pParent ) INLINE Qt_QAbstractItemModel_removeColumn( ::pPtr, nColumn, pParent ) + METHOD removeColumns( nColumn, nCount, pParent ) INLINE Qt_QAbstractItemModel_removeColumns( ::pPtr, nColumn, nCount, pParent ) + METHOD removeRow( nRow, pParent ) INLINE Qt_QAbstractItemModel_removeRow( ::pPtr, nRow, pParent ) + METHOD removeRows( nRow, nCount, pParent ) INLINE Qt_QAbstractItemModel_removeRows( ::pPtr, nRow, nCount, pParent ) + METHOD rowCount( pParent ) INLINE Qt_QAbstractItemModel_rowCount( ::pPtr, pParent ) + METHOD setData( pIndex, pValue, nRole ) INLINE Qt_QAbstractItemModel_setData( ::pPtr, pIndex, pValue, nRole ) + METHOD setHeaderData( nSection, nOrientation, pValue, nRole ) INLINE Qt_QAbstractItemModel_setHeaderData( ::pPtr, nSection, nOrientation, pValue, nRole ) + METHOD setSupportedDragActions( nActions ) INLINE Qt_QAbstractItemModel_setSupportedDragActions( ::pPtr, nActions ) + METHOD sibling( nRow, nColumn, pIndex ) INLINE Qt_QAbstractItemModel_sibling( ::pPtr, nRow, nColumn, pIndex ) + METHOD sort( nColumn, nOrder ) INLINE Qt_QAbstractItemModel_sort( ::pPtr, nColumn, nOrder ) + METHOD span( pIndex ) INLINE Qt_QAbstractItemModel_span( ::pPtr, pIndex ) + METHOD supportedDragActions() INLINE Qt_QAbstractItemModel_supportedDragActions( ::pPtr ) + METHOD supportedDropActions() INLINE Qt_QAbstractItemModel_supportedDropActions( ::pPtr ) + METHOD revert() INLINE Qt_QAbstractItemModel_revert( ::pPtr ) + METHOD submit() INLINE Qt_QAbstractItemModel_submit( ::pPtr ) + + ENDCLASS + +/*----------------------------------------------------------------------*/ + +METHOD New( pParent ) CLASS QAbstractItemModel + + ::pParent := pParent + + ::pPtr := Qt_QAbstractItemModel( pParent ) + + RETURN Self + +/*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/TQTextObject.prg b/harbour/contrib/hbqt/TQTextObject.prg new file mode 100644 index 0000000000..ff9aee9f16 --- /dev/null +++ b/harbour/contrib/hbqt/TQTextObject.prg @@ -0,0 +1,84 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009 Marcos Antonio Gambeta + * Copyright 2009 Pritpal Bedi + * www - http://www.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. + * + */ +/*----------------------------------------------------------------------*/ + + +#include "hbclass.ch" + + +CREATE CLASS QTextObject INHERIT QObject + + VAR pParent + VAR pPtr + + METHOD New() + + METHOD document() INLINE Qt_QTextObject_document( ::pPtr ) + METHOD format() INLINE Qt_QTextObject_format( ::pPtr ) + METHOD formatIndex() INLINE Qt_QTextObject_formatIndex( ::pPtr ) + METHOD objectIndex() INLINE Qt_QTextObject_objectIndex( ::pPtr ) + + ENDCLASS + +/*----------------------------------------------------------------------*/ + +METHOD New( pParent ) CLASS QTextObject + + ::pParent := pParent + + ::pPtr := Qt_QTextObject( pParent ) + + RETURN Self + +/*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg index 6ddd95e594..947cf08585 100644 --- a/harbour/contrib/hbqt/generator/hbqtgen.prg +++ b/harbour/contrib/hbqt/generator/hbqtgen.prg @@ -1671,6 +1671,8 @@ STATIC FUNCTION Build_HBQT_H( cPathOut ) aadd( txt_, "#define hbqt_par_QStyleOptionToolButton( n ) ( ( QStyleOptionToolButton* ) hb_parptr( n ) ) " ) aadd( txt_, "#define hbqt_par_QStyleOptionViewItem( n ) ( ( QStyleOptionViewItem* ) hb_parptr( n ) ) " ) aadd( txt_, "#define hbqt_par_QStylePainter( n ) ( ( QStylePainter* ) hb_parptr( n ) ) " ) + aadd( txt_, "#define hbqt_par_QTextObject( n ) ( ( QTextObject* ) hb_parptr( n ) ) " ) + aadd( txt_, "#define hbqt_par_QModelIndexList( n ) ( ( QModelIndexList* ) hb_parptr( n ) ) " ) aadd( txt_, " " ) aadd( txt_, "#define hbqt_par_QString( n ) ( ( QString ) hb_parc( n ) ) " ) aadd( txt_, "#define hbqt_par_QRgb( n ) ( hb_parnint( n ) ) " ) @@ -2627,71 +2629,185 @@ STATIC FUNCTION Build_Demo() aadd( txt_, 'STATIC FUNCTION Dummies() ' ) aadd( txt_, ' LOCAL oSome ' ) aadd( txt_, ' ' ) + aadd( txt_, ' oSome := QAbstractButton():new() ' ) + aadd( txt_, ' oSome := QAbstractItemView():new() ' ) + aadd( txt_, ' oSome := QAbstractPrintDialog():new() ' ) + aadd( txt_, ' oSome := QAbstractScrollArea():new() ' ) + aadd( txt_, ' oSome := QAbstractSlider():new() ' ) + aadd( txt_, ' oSome := QAbstractSpinBox():new() ' ) aadd( txt_, ' oSome := QAction():new() ' ) + aadd( txt_, ' //oSome := QApplication():new() ' ) + aadd( txt_, ' oSome := QBitmap():new() ' ) aadd( txt_, ' oSome := QBoxLayout():new() ' ) + aadd( txt_, ' oSome := QBrush():new() ' ) aadd( txt_, ' oSome := QCalendarWidget():new() ' ) aadd( txt_, ' oSome := QCheckBox():new() ' ) + aadd( txt_, ' oSome := QClipboard():new() ' ) + aadd( txt_, ' oSome := QColor():new() ' ) aadd( txt_, ' oSome := QColorDialog():new() ' ) aadd( txt_, ' oSome := QComboBox():new() ' ) aadd( txt_, ' oSome := QCommandLinkButton():new() ' ) + aadd( txt_, ' oSome := QCommonStyle():new() ' ) + aadd( txt_, ' oSome := QConicalGradient():new() ' ) + aadd( txt_, ' //oSome := QCoreApplication():new() ' ) aadd( txt_, ' oSome := QDateEdit():new() ' ) aadd( txt_, ' oSome := QDateTimeEdit():new() ' ) + aadd( txt_, ' oSome := QDesktopWidget():new() ' ) aadd( txt_, ' oSome := QDial():new() ' ) aadd( txt_, ' oSome := QDialog():new() ' ) + aadd( txt_, ' oSome := QDir():new() ' ) + aadd( txt_, ' oSome := QDockWidget():new() ' ) aadd( txt_, ' oSome := QDoubleSpinBox():new() ' ) aadd( txt_, ' oSome := QErrorMessage():new() ' ) + aadd( txt_, ' oSome := QEvent():new() ' ) + aadd( txt_, ' oSome := QEventLoop():new() ' ) aadd( txt_, ' oSome := QFileDialog():new() ' ) aadd( txt_, ' oSome := QFocusFrame():new() ' ) + aadd( txt_, ' oSome := QFont():new() ' ) aadd( txt_, ' oSome := QFontComboBox():new() ' ) aadd( txt_, ' oSome := QFontDialog():new() ' ) + aadd( txt_, ' oSome := QFontInfo():new() ' ) aadd( txt_, ' oSome := QFormLayout():new() ' ) aadd( txt_, ' oSome := QFrame():new() ' ) + aadd( txt_, ' oSome := QFtp():new() ' ) + aadd( txt_, ' oSome := QGradient():new() ' ) + aadd( txt_, ' oSome := QGridLayout():new() ' ) aadd( txt_, ' oSome := QGroupBox():new() ' ) aadd( txt_, ' oSome := QHBoxLayout():new() ' ) + aadd( txt_, ' oSome := QHeaderView():new() ' ) + aadd( txt_, ' oSome := QHttp():new() ' ) + aadd( txt_, ' oSome := QIcon():new() ' ) + aadd( txt_, ' oSome := QImage():new() ' ) + aadd( txt_, ' oSome := QImageReader():new() ' ) + aadd( txt_, ' oSome := QImageWriter():new() ' ) aadd( txt_, ' oSome := QInputDialog():new() ' ) + aadd( txt_, ' oSome := QInputEvent():new() ' ) aadd( txt_, ' oSome := QLabel():new() ' ) aadd( txt_, ' oSome := QLayout():new() ' ) aadd( txt_, ' oSome := QLayoutItem():new() ' ) aadd( txt_, ' oSome := QLCDNumber():new() ' ) + aadd( txt_, ' oSome := QLine():new() ' ) + aadd( txt_, ' oSome := QLinearGradient():new() ' ) aadd( txt_, ' oSome := QLineEdit():new() ' ) aadd( txt_, ' oSome := QListView():new() ' ) + aadd( txt_, ' oSome := QListWidget():new() ' ) + aadd( txt_, ' oSome := QListWidgetItem():new() ' ) aadd( txt_, ' oSome := QMainWindow():new() ' ) aadd( txt_, ' oSome := QMenu():new() ' ) aadd( txt_, ' oSome := QMenuBar():new() ' ) aadd( txt_, ' oSome := QMessageBox():new() ' ) aadd( txt_, ' oSome := QObject():new() ' ) - aadd( txt_, ' oSome := QPageSetupDialog():new() ' ) aadd( txt_, ' oSome := QPaintDevice():new() ' ) + aadd( txt_, ' oSome := QPageSetupDialog():new() ' ) aadd( txt_, ' oSome := QPainter():new() ' ) + aadd( txt_, ' oSome := QPaintEvent():new() ' ) + aadd( txt_, ' oSome := QPalette():new() ' ) + aadd( txt_, ' oSome := QPen():new() ' ) + aadd( txt_, ' oSome := QPicture():new() ' ) + aadd( txt_, ' oSome := QPixmap():new() ' ) + aadd( txt_, ' oSome := QPoint():new() ' ) + aadd( txt_, ' oSome := QPointF():new() ' ) aadd( txt_, ' oSome := QPrintDialog():new() ' ) aadd( txt_, ' oSome := QPrintPreviewDialog():new() ' ) aadd( txt_, ' oSome := QProgressBar():new() ' ) - aadd( txt_, ' oSome := QProgressDialog():New() ' ) + aadd( txt_, ' oSome := QProgressDialog():new() ' ) aadd( txt_, ' oSome := QPushButton():new() ' ) + aadd( txt_, ' oSome := QRadialGradient():new() ' ) + aadd( txt_, ' oSome := QRect():new() ' ) + aadd( txt_, ' oSome := QRectF():new() ' ) aadd( txt_, ' oSome := QRadioButton():new() ' ) + aadd( txt_, ' oSome := QRegion():new() ' ) + aadd( txt_, ' oSome := QResource():new() ' ) aadd( txt_, ' oSome := QScrollArea():new() ' ) aadd( txt_, ' oSome := QScrollBar():new() ' ) + aadd( txt_, ' oSome := QSignalMapper():new() ' ) + aadd( txt_, ' oSome := QSize():new() ' ) + aadd( txt_, ' oSome := QSizeF():new() ' ) aadd( txt_, ' oSome := QSizeGrip():new() ' ) + aadd( txt_, ' oSome := QSizePolicy():new() ' ) aadd( txt_, ' oSome := QSlider():new() ' ) + aadd( txt_, ' oSome := QSound():new() ' ) aadd( txt_, ' oSome := QSpinBox():new() ' ) + aadd( txt_, ' oSome := QSplashScreen():new() ' ) aadd( txt_, ' oSome := QSplitter():new() ' ) + aadd( txt_, ' oSome := QStandardItem():new() ' ) + aadd( txt_, ' oSome := QStandardItemModel():new() ' ) + aadd( txt_, ' oSome := QStatusBar():new() ' ) + aadd( txt_, ' oSome := QStyle():new() ' ) + aadd( txt_, ' oSome := QStyledItemDelegate():new() ' ) + aadd( txt_, ' oSome := QStyleHintReturn():new() ' ) + aadd( txt_, ' oSome := QStyleHintReturnMask():new() ' ) + aadd( txt_, ' oSome := QStyleHintReturnVariant():new() ' ) + aadd( txt_, ' oSome := QStyleOption():new() ' ) + aadd( txt_, ' oSome := QStyleOptionButton():new() ' ) + aadd( txt_, ' oSome := QStyleOptionComboBox():new() ' ) + aadd( txt_, ' oSome := QStyleOptionComplex():new() ' ) + aadd( txt_, ' oSome := QStyleOptionDockWidget():new() ' ) + aadd( txt_, ' oSome := QStyleOptionFocusRect():new() ' ) + aadd( txt_, ' oSome := QStyleOptionFrame():new() ' ) + aadd( txt_, ' oSome := QStyleOptionGroupBox():new() ' ) + aadd( txt_, ' oSome := QStyleOptionHeader():new() ' ) + aadd( txt_, ' oSome := QStyleOptionMenuItem():new() ' ) + aadd( txt_, ' oSome := QStyleOptionProgressBar():new() ' ) + aadd( txt_, ' oSome := QStyleOptionSizeGrip():new() ' ) + aadd( txt_, ' oSome := QStyleOptionSlider():new() ' ) + aadd( txt_, ' oSome := QStyleOptionSpinBox():new() ' ) + aadd( txt_, ' oSome := QStyleOptionTab():new() ' ) + aadd( txt_, ' oSome := QStyleOptionTabBarBase():new() ' ) + aadd( txt_, ' oSome := QStyleOptionTabWidgetFrame():new() ' ) + aadd( txt_, ' oSome := QStyleOptionTitleBar():new() ' ) + aadd( txt_, ' oSome := QStyleOptionToolBar():new() ' ) + aadd( txt_, ' oSome := QStyleOptionToolBox():new() ' ) + aadd( txt_, ' oSome := QStyleOptionToolButton():new() ' ) + aadd( txt_, ' oSome := QStyleOptionViewItem():new() ' ) + aadd( txt_, ' oSome := QStylePainter():new() ' ) aadd( txt_, ' oSome := QTabBar():new() ' ) aadd( txt_, ' oSome := QTableView():new() ' ) aadd( txt_, ' oSome := QTableWidget():new() ' ) aadd( txt_, ' oSome := QTableWidgetItem():new() ' ) aadd( txt_, ' oSome := QTabWidget():new() ' ) + aadd( txt_, ' oSome := QTextBlock():new() ' ) + aadd( txt_, ' oSome := QTextBlockFormat():new() ' ) + aadd( txt_, ' oSome := QTextBlockGroup():new() ' ) + aadd( txt_, ' oSome := QTextBrowser():new() ' ) + aadd( txt_, ' oSome := QTextBoundaryFinder():new() ' ) + aadd( txt_, ' oSome := QTextCharFormat():new() ' ) + aadd( txt_, ' oSome := QTextCodec():new() ' ) + aadd( txt_, ' oSome := QTextCursor():new() ' ) + aadd( txt_, ' oSome := QTextDecoder():new() ' ) + aadd( txt_, ' oSome := QTextDocument():new() ' ) + aadd( txt_, ' oSome := QTextDocumentFragment():new() ' ) + aadd( txt_, ' oSome := QTextDocumentWriter():new() ' ) aadd( txt_, ' oSome := QTextEdit():new() ' ) + aadd( txt_, ' oSome := QTextEncoder():new() ' ) + aadd( txt_, ' oSome := QTextFormat():new() ' ) + aadd( txt_, ' oSome := QTextFragment():new() ' ) + aadd( txt_, ' oSome := QTextFrame():new() ' ) + aadd( txt_, ' oSome := QTextFrameFormat():new() ' ) + aadd( txt_, ' oSome := QTextImageFormat():new() ' ) + aadd( txt_, ' oSome := QTextInlineObject():new() ' ) + aadd( txt_, ' oSome := QTextItem():new() ' ) + aadd( txt_, ' oSome := QTextLayout():new() ' ) + aadd( txt_, ' oSome := QTextLength():new() ' ) + aadd( txt_, ' oSome := QTextLine():new() ' ) + aadd( txt_, ' oSome := QTextObject():new() ' ) + aadd( txt_, ' oSome := QTextStream():new() ' ) aadd( txt_, ' oSome := QTimeEdit():new() ' ) + aadd( txt_, ' oSome := QTimer():new() ' ) aadd( txt_, ' oSome := QToolBar():new() ' ) aadd( txt_, ' oSome := QToolBox():new() ' ) aadd( txt_, ' oSome := QToolButton():new() ' ) aadd( txt_, ' oSome := QTreeView():new() ' ) aadd( txt_, ' oSome := QTreeWidget():new() ' ) aadd( txt_, ' oSome := QTreeWidgetItem():new() ' ) + aadd( txt_, ' oSome := QUrl():new() ' ) + aadd( txt_, ' oSome := QVariant():new() ' ) aadd( txt_, ' oSome := QVBoxLayout():new() ' ) aadd( txt_, ' oSome := QWebPage():new() ' ) - aadd( txt_, ' oSome := QWebView():new() ' ) aadd( txt_, ' oSome := QWidget():new() ' ) + aadd( txt_, ' oSome := QWebView():new() ' ) + aadd( txt_, ' oSome := QWindowsStyle():new() ' ) + aadd( txt_, ' oSome := QWindowsXPStyle():new() ' ) aadd( txt_, ' oSome := QWizard():new() ' ) aadd( txt_, ' ' ) aadd( txt_, ' RETURN nil ' ) diff --git a/harbour/contrib/hbqt/generator/qt45.qtp b/harbour/contrib/hbqt/generator/qt45.qtp index f8b399f373..0008305fa8 100644 --- a/harbour/contrib/hbqt/generator/qt45.qtp +++ b/harbour/contrib/hbqt/generator/qt45.qtp @@ -12,6 +12,7 @@ QAbstractButton.qth +QAbstractItemModel.qth QAbstractItemView.qth QAbstractPrintDialog.qth QAbstractScrollArea.qth @@ -139,13 +140,13 @@ QStyleOptionSlider.qth QStyleOptionSpinBox.qth QStyleOptionTab.qth QStyleOptionTabBarBase.qth -QStyleOptionWidgetFrame.qth +QStyleOptionTabWidgetFrame.qth QStyleOptionTitleBar.qth QStyleOptionToolBar.qth QStyleOptionToolBox.qth QStyleOptionToolButton.qth QStyleOptionViewItem.qth -QStyleOptionPainter.qth +QStylePainter.qth QTabBar.qth QTableView.qth @@ -176,6 +177,7 @@ QTextItem.qth QTextLayout.qth QTextLength.qth QTextLine.qth +QTextObject.qth QTextStream.qth QTimeEdit.qth diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/hbqt.h index 3427a36101..48ebf70108 100644 --- a/harbour/contrib/hbqt/hbqt.h +++ b/harbour/contrib/hbqt/hbqt.h @@ -304,6 +304,8 @@ #define hbqt_par_QStyleOptionToolButton( n ) ( ( QStyleOptionToolButton* ) hb_parptr( n ) ) #define hbqt_par_QStyleOptionViewItem( n ) ( ( QStyleOptionViewItem* ) hb_parptr( n ) ) #define hbqt_par_QStylePainter( n ) ( ( QStylePainter* ) hb_parptr( n ) ) +#define hbqt_par_QTextObject( n ) ( ( QTextObject* ) hb_parptr( n ) ) +#define hbqt_par_QModelIndexList( n ) ( ( QModelIndexList* ) hb_parptr( n ) ) #define hbqt_par_QString( n ) ( ( QString ) hb_parc( n ) ) #define hbqt_par_QRgb( n ) ( hb_parnint( n ) ) diff --git a/harbour/contrib/hbqt/hbqt_qabstractitemmodel.cpp b/harbour/contrib/hbqt/hbqt_qabstractitemmodel.cpp new file mode 100644 index 0000000000..1023010007 --- /dev/null +++ b/harbour/contrib/hbqt/hbqt_qabstractitemmodel.cpp @@ -0,0 +1,353 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009 Marcos Antonio Gambeta + * Copyright 2009 Pritpal Bedi + * www - http://www.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. + * + */ +/*----------------------------------------------------------------------*/ + +#include "hbapi.h" +#include "hbqt.h" + +/*----------------------------------------------------------------------*/ +#if QT_VERSION >= 0x040500 +/*----------------------------------------------------------------------*/ + +/* + * Constructed[ 33/35 [ 94.29% ] ] + * + * *** Unconvered Prototypes *** + * ----------------------------- + * + * virtual QMap itemData ( const QModelIndex & index ) const + * virtual bool setItemData ( const QModelIndex & index, const QMap & roles ) + */ + + +#include + + +/* + * QAbstractItemModel ( QObject * parent = 0 ) + * virtual ~QAbstractItemModel () + */ +HB_FUNC( QT_QABSTRACTITEMMODEL ) +{ + //hb_retptr( ( QAbstractItemModel* ) new QAbstractItemModel( hbqt_par_QObject( 1 ) ) ); +} + +/* + * virtual QModelIndex buddy ( const QModelIndex & index ) const + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_BUDDY ) +{ + hb_retptr( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->buddy( *hbqt_par_QModelIndex( 2 ) ) ) ); +} + +/* + * virtual bool canFetchMore ( const QModelIndex & parent ) const + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_CANFETCHMORE ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->canFetchMore( *hbqt_par_QModelIndex( 2 ) ) ); +} + +/* + * virtual int columnCount ( const QModelIndex & parent = QModelIndex() ) const = 0 + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_COLUMNCOUNT ) +{ + hb_retni( hbqt_par_QAbstractItemModel( 1 )->columnCount( *hbqt_par_QModelIndex( 2 ) ) ); +} + +/* + * virtual QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const = 0 + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_DATA ) +{ + hb_retptr( new QVariant( hbqt_par_QAbstractItemModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ) ); +} + +/* + * virtual bool dropMimeData ( const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent ) + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_DROPMIMEDATA ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->dropMimeData( hbqt_par_QMimeData( 2 ), ( Qt::DropAction ) hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), *hbqt_par_QModelIndex( 6 ) ) ); +} + +/* + * virtual void fetchMore ( const QModelIndex & parent ) + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_FETCHMORE ) +{ + hbqt_par_QAbstractItemModel( 1 )->fetchMore( *hbqt_par_QModelIndex( 2 ) ); +} + +/* + * virtual Qt::ItemFlags flags ( const QModelIndex & index ) const + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_FLAGS ) +{ + hb_retni( ( Qt::ItemFlags ) hbqt_par_QAbstractItemModel( 1 )->flags( *hbqt_par_QModelIndex( 2 ) ) ); +} + +/* + * virtual bool hasChildren ( const QModelIndex & parent = QModelIndex() ) const + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_HASCHILDREN ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->hasChildren( *hbqt_par_QModelIndex( 2 ) ) ); +} + +/* + * bool hasIndex ( int row, int column, const QModelIndex & parent = QModelIndex() ) const + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_HASINDEX ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->hasIndex( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ); +} + +/* + * virtual QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_HEADERDATA ) +{ + hb_retptr( new QVariant( hbqt_par_QAbstractItemModel( 1 )->headerData( hb_parni( 2 ), ( Qt::Orientation ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::DisplayRole ) ) ) ); +} + +/* + * virtual QModelIndex index ( int row, int column, const QModelIndex & parent = QModelIndex() ) const = 0 + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_INDEX ) +{ + hb_retptr( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ) ); +} + +/* + * bool insertColumn ( int column, const QModelIndex & parent = QModelIndex() ) + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_INSERTCOLUMN ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->insertColumn( hb_parni( 2 ), *hbqt_par_QModelIndex( 3 ) ) ); +} + +/* + * virtual bool insertColumns ( int column, int count, const QModelIndex & parent = QModelIndex() ) + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_INSERTCOLUMNS ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->insertColumns( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ); +} + +/* + * bool insertRow ( int row, const QModelIndex & parent = QModelIndex() ) + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_INSERTROW ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->insertRow( hb_parni( 2 ), *hbqt_par_QModelIndex( 3 ) ) ); +} + +/* + * virtual bool insertRows ( int row, int count, const QModelIndex & parent = QModelIndex() ) + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_INSERTROWS ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->insertRows( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ); +} + +/* + * virtual QMimeData * mimeData ( const QModelIndexList & indexes ) const + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_MIMEDATA ) +{ + hb_retptr( ( QMimeData* ) hbqt_par_QAbstractItemModel( 1 )->mimeData( *hbqt_par_QModelIndexList( 2 ) ) ); +} + +/* + * virtual QStringList mimeTypes () const + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_MIMETYPES ) +{ + hb_retptr( new QStringList( hbqt_par_QAbstractItemModel( 1 )->mimeTypes() ) ); +} + +/* + * virtual QModelIndex parent ( const QModelIndex & index ) const = 0 + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_PARENT ) +{ + hb_retptr( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ) ); +} + +/* + * bool removeColumn ( int column, const QModelIndex & parent = QModelIndex() ) + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_REMOVECOLUMN ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->removeColumn( hb_parni( 2 ), *hbqt_par_QModelIndex( 3 ) ) ); +} + +/* + * virtual bool removeColumns ( int column, int count, const QModelIndex & parent = QModelIndex() ) + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_REMOVECOLUMNS ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->removeColumns( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ); +} + +/* + * bool removeRow ( int row, const QModelIndex & parent = QModelIndex() ) + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_REMOVEROW ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->removeRow( hb_parni( 2 ), *hbqt_par_QModelIndex( 3 ) ) ); +} + +/* + * virtual bool removeRows ( int row, int count, const QModelIndex & parent = QModelIndex() ) + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_REMOVEROWS ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->removeRows( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ); +} + +/* + * virtual int rowCount ( const QModelIndex & parent = QModelIndex() ) const = 0 + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_ROWCOUNT ) +{ + hb_retni( hbqt_par_QAbstractItemModel( 1 )->rowCount( *hbqt_par_QModelIndex( 2 ) ) ); +} + +/* + * virtual bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole ) + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_SETDATA ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->setData( *hbqt_par_QModelIndex( 2 ), *hbqt_par_QVariant( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::EditRole ) ) ); +} + +/* + * virtual bool setHeaderData ( int section, Qt::Orientation orientation, const QVariant & value, int role = Qt::EditRole ) + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_SETHEADERDATA ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->setHeaderData( hb_parni( 2 ), ( Qt::Orientation ) hb_parni( 3 ), *hbqt_par_QVariant( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : Qt::EditRole ) ) ); +} + +/* + * void setSupportedDragActions ( Qt::DropActions actions ) + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_SETSUPPORTEDDRAGACTIONS ) +{ + hbqt_par_QAbstractItemModel( 1 )->setSupportedDragActions( ( Qt::DropActions ) hb_parni( 2 ) ); +} + +/* + * QModelIndex sibling ( int row, int column, const QModelIndex & index ) const + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_SIBLING ) +{ + hb_retptr( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ) ); +} + +/* + * virtual void sort ( int column, Qt::SortOrder order = Qt::AscendingOrder ) + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_SORT ) +{ + hbqt_par_QAbstractItemModel( 1 )->sort( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::SortOrder ) hb_parni( 3 ) : ( Qt::SortOrder ) Qt::AscendingOrder ) ); +} + +/* + * virtual QSize span ( const QModelIndex & index ) const + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_SPAN ) +{ + hb_retptr( new QSize( hbqt_par_QAbstractItemModel( 1 )->span( *hbqt_par_QModelIndex( 2 ) ) ) ); +} + +/* + * Qt::DropActions supportedDragActions () const + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_SUPPORTEDDRAGACTIONS ) +{ + hb_retni( ( Qt::DropActions ) hbqt_par_QAbstractItemModel( 1 )->supportedDragActions() ); +} + +/* + * virtual Qt::DropActions supportedDropActions () const + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_SUPPORTEDDROPACTIONS ) +{ + hb_retni( ( Qt::DropActions ) hbqt_par_QAbstractItemModel( 1 )->supportedDropActions() ); +} + +/* + * virtual void revert () + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_REVERT ) +{ + hbqt_par_QAbstractItemModel( 1 )->revert(); +} + +/* + * virtual bool submit () + */ +HB_FUNC( QT_QABSTRACTITEMMODEL_SUBMIT ) +{ + hb_retl( hbqt_par_QAbstractItemModel( 1 )->submit() ); +} + + +/*----------------------------------------------------------------------*/ +#endif /* #if QT_VERSION >= 0x040500 */ +/*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/hbqt_qradialgradient.cpp b/harbour/contrib/hbqt/hbqt_qradialgradient.cpp index 84d1e77b3b..07458d909c 100644 --- a/harbour/contrib/hbqt/hbqt_qradialgradient.cpp +++ b/harbour/contrib/hbqt/hbqt_qradialgradient.cpp @@ -70,7 +70,7 @@ * QRadialGradient ( const QPointF & center, qreal radius ) * QRadialGradient ( qreal cx, qreal cy, qreal radius ) */ -HB_FUNC( QT_RADIALGRADIENT ) +HB_FUNC( QT_QRADIALGRADIENT ) { hb_retptr( ( QRadialGradient* ) new QRadialGradient() ); } diff --git a/harbour/contrib/hbqt/hbqt_qstyleditemdelegate.cpp b/harbour/contrib/hbqt/hbqt_qstyleditemdelegate.cpp index 14b5caa001..a508d9af1b 100644 --- a/harbour/contrib/hbqt/hbqt_qstyleditemdelegate.cpp +++ b/harbour/contrib/hbqt/hbqt_qstyleditemdelegate.cpp @@ -67,7 +67,7 @@ * QStyledItemDelegate ( QObject * parent = 0 ) * ~QStyledItemDelegate () */ -HB_FUNC( QT_QSTYLEITEMDELEGATE ) +HB_FUNC( QT_QSTYLEDITEMDELEGATE ) { hb_retptr( ( QStyledItemDelegate* ) new QStyledItemDelegate( hbqt_par_QObject( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/hbqt_qstyleoption.cpp b/harbour/contrib/hbqt/hbqt_qstyleoption.cpp index b321130de6..9c7ac43eff 100644 --- a/harbour/contrib/hbqt/hbqt_qstyleoption.cpp +++ b/harbour/contrib/hbqt/hbqt_qstyleoption.cpp @@ -68,7 +68,7 @@ * QStyleOption ( const QStyleOption & other ) * ~QStyleOption () */ -HB_FUNC( QT_STYLEOPTION ) +HB_FUNC( QT_QSTYLEOPTION ) { hb_retptr( ( QStyleOption* ) new QStyleOption() ); } diff --git a/harbour/contrib/hbqt/hbqt_qtextinlineobject.cpp b/harbour/contrib/hbqt/hbqt_qtextinlineobject.cpp index b62f73386d..11d6091126 100644 --- a/harbour/contrib/hbqt/hbqt_qtextinlineobject.cpp +++ b/harbour/contrib/hbqt/hbqt_qtextinlineobject.cpp @@ -67,7 +67,7 @@ * QTextInlineObject ( int i, QTextEngine * e ) * */ -HB_FUNC( QT_Q ) +HB_FUNC( QT_QTEXTINLINEOBJECT ) { hb_retptr( ( QTextInlineObject* ) new QTextInlineObject( hb_parni( 1 ), hbqt_par_QTextEngine( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/hbqt_qtextobject.cpp b/harbour/contrib/hbqt/hbqt_qtextobject.cpp new file mode 100644 index 0000000000..b363d9f0a4 --- /dev/null +++ b/harbour/contrib/hbqt/hbqt_qtextobject.cpp @@ -0,0 +1,110 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009 Marcos Antonio Gambeta + * Copyright 2009 Pritpal Bedi + * www - http://www.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. + * + */ +/*----------------------------------------------------------------------*/ + +#include "hbapi.h" +#include "hbqt.h" + +/*----------------------------------------------------------------------*/ +#if QT_VERSION >= 0x040500 +/*----------------------------------------------------------------------*/ + + +#include + + +/* + * + */ +HB_FUNC( QT_QTEXTOBJECT ) +{ + +} + +/* + * QTextDocument * document () const + */ +HB_FUNC( QT_QTEXTOBJECT_DOCUMENT ) +{ + hb_retptr( ( QTextDocument* ) hbqt_par_QTextObject( 1 )->document() ); +} + +/* + * QTextFormat format () const + */ +HB_FUNC( QT_QTEXTOBJECT_FORMAT ) +{ + hb_retptr( new QTextFormat( hbqt_par_QTextObject( 1 )->format() ) ); +} + +/* + * int formatIndex () const + */ +HB_FUNC( QT_QTEXTOBJECT_FORMATINDEX ) +{ + hb_retni( hbqt_par_QTextObject( 1 )->formatIndex() ); +} + +/* + * int objectIndex () const + */ +HB_FUNC( QT_QTEXTOBJECT_OBJECTINDEX ) +{ + hb_retni( hbqt_par_QTextObject( 1 )->objectIndex() ); +} + + +/*----------------------------------------------------------------------*/ +#endif /* #if QT_VERSION >= 0x040500 */ +/*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbqt/qth/QAbstractItemModel.qth b/harbour/contrib/hbqt/qth/QAbstractItemModel.qth new file mode 100644 index 0000000000..c706e560c5 --- /dev/null +++ b/harbour/contrib/hbqt/qth/QAbstractItemModel.qth @@ -0,0 +1,143 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT Source Generator for Harbour + * + * Copyright 2009 Pritpal Bedi + * www - http://www.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. + * + */ +/*----------------------------------------------------------------------*/ +; +; Header File to Generate QT Wrapper Sources +; + + +Inherits = QObject +Type = Core +New = + + + +#include + + +/* + * QAbstractItemModel ( QObject * parent = 0 ) + * virtual ~QAbstractItemModel () + */ +HB_FUNC( QT_QABSTRACTITEMMODEL ) +{ + //hb_retptr( ( QAbstractItemModel* ) new QAbstractItemModel( hbqt_par_QObject( 1 ) ) ); +} + + + + + + +virtual QModelIndex buddy ( const QModelIndex & index ) const +virtual bool canFetchMore ( const QModelIndex & parent ) const +virtual int columnCount ( const QModelIndex & parent = QModelIndex() ) const = 0 +virtual QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const = 0 +virtual bool dropMimeData ( const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent ) +virtual void fetchMore ( const QModelIndex & parent ) +virtual Qt::ItemFlags flags ( const QModelIndex & index ) const +virtual bool hasChildren ( const QModelIndex & parent = QModelIndex() ) const +bool hasIndex ( int row, int column, const QModelIndex & parent = QModelIndex() ) const +virtual QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const +virtual QModelIndex index ( int row, int column, const QModelIndex & parent = QModelIndex() ) const = 0 +bool insertColumn ( int column, const QModelIndex & parent = QModelIndex() ) +virtual bool insertColumns ( int column, int count, const QModelIndex & parent = QModelIndex() ) +bool insertRow ( int row, const QModelIndex & parent = QModelIndex() ) +virtual bool insertRows ( int row, int count, const QModelIndex & parent = QModelIndex() ) +virtual QMap itemData ( const QModelIndex & index ) const +// virtual QModelIndexList match ( const QModelIndex & start, int role, const QVariant & value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags( Qt::MatchStartsWith | Qt::MatchWrap ) ) const +virtual QMimeData * mimeData ( const QModelIndexList & indexes ) const +virtual QStringList mimeTypes () const +virtual QModelIndex parent ( const QModelIndex & index ) const = 0 +bool removeColumn ( int column, const QModelIndex & parent = QModelIndex() ) +virtual bool removeColumns ( int column, int count, const QModelIndex & parent = QModelIndex() ) +bool removeRow ( int row, const QModelIndex & parent = QModelIndex() ) +virtual bool removeRows ( int row, int count, const QModelIndex & parent = QModelIndex() ) +virtual int rowCount ( const QModelIndex & parent = QModelIndex() ) const = 0 +virtual bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole ) +virtual bool setHeaderData ( int section, Qt::Orientation orientation, const QVariant & value, int role = Qt::EditRole ) +virtual bool setItemData ( const QModelIndex & index, const QMap & roles ) +void setSupportedDragActions ( Qt::DropActions actions ) +QModelIndex sibling ( int row, int column, const QModelIndex & index ) const +virtual void sort ( int column, Qt::SortOrder order = Qt::AscendingOrder ) +virtual QSize span ( const QModelIndex & index ) const +Qt::DropActions supportedDragActions () const +virtual Qt::DropActions supportedDropActions () const + + + +virtual void revert () +virtual bool submit () + + + +void columnsAboutToBeInserted ( const QModelIndex & parent, int start, int end ) +void columnsAboutToBeRemoved ( const QModelIndex & parent, int start, int end ) +void columnsInserted ( const QModelIndex & parent, int start, int end ) +void columnsRemoved ( const QModelIndex & parent, int start, int end ) +void dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight ) +void headerDataChanged ( Qt::Orientation orientation, int first, int last ) +void layoutAboutToBeChanged () +void layoutChanged () +void modelAboutToBeReset () +void modelReset () +void rowsAboutToBeInserted ( const QModelIndex & parent, int start, int end ) +void rowsAboutToBeRemoved ( const QModelIndex & parent, int start, int end ) +void rowsInserted ( const QModelIndex & parent, int start, int end ) +void rowsRemoved ( const QModelIndex & parent, int start, int end ) + + + + + + + diff --git a/harbour/contrib/hbqt/qth/QRadialGradient.qth b/harbour/contrib/hbqt/qth/QRadialGradient.qth index 9bbbb8c6b4..9f56b30315 100644 --- a/harbour/contrib/hbqt/qth/QRadialGradient.qth +++ b/harbour/contrib/hbqt/qth/QRadialGradient.qth @@ -71,7 +71,7 @@ New = * QRadialGradient ( const QPointF & center, qreal radius ) * QRadialGradient ( qreal cx, qreal cy, qreal radius ) */ -HB_FUNC( QT_RADIALGRADIENT ) +HB_FUNC( QT_QRADIALGRADIENT ) { hb_retptr( ( QRadialGradient* ) new QRadialGradient() ); } diff --git a/harbour/contrib/hbqt/qth/QStyleOption.qth b/harbour/contrib/hbqt/qth/QStyleOption.qth index f3a0bf92ae..1f13bde1b7 100644 --- a/harbour/contrib/hbqt/qth/QStyleOption.qth +++ b/harbour/contrib/hbqt/qth/QStyleOption.qth @@ -69,7 +69,7 @@ New = * QStyleOption ( const QStyleOption & other ) * ~QStyleOption () */ -HB_FUNC( QT_STYLEOPTION ) +HB_FUNC( QT_QSTYLEOPTION ) { hb_retptr( ( QStyleOption* ) new QStyleOption() ); } diff --git a/harbour/contrib/hbqt/qth/QStyledItemDelegate.qth b/harbour/contrib/hbqt/qth/QStyledItemDelegate.qth index 7e4cfe8da3..93c82be51a 100644 --- a/harbour/contrib/hbqt/qth/QStyledItemDelegate.qth +++ b/harbour/contrib/hbqt/qth/QStyledItemDelegate.qth @@ -68,7 +68,7 @@ New = * QStyledItemDelegate ( QObject * parent = 0 ) * ~QStyledItemDelegate () */ -HB_FUNC( QT_QSTYLEITEMDELEGATE ) +HB_FUNC( QT_QSTYLEDITEMDELEGATE ) { hb_retptr( ( QStyledItemDelegate* ) new QStyledItemDelegate( hbqt_par_QObject( 1 ) ) ); } diff --git a/harbour/contrib/hbqt/qth/QTextInlineObject.qth b/harbour/contrib/hbqt/qth/QTextInlineObject.qth index 425911b5b2..f6a90b9a1b 100644 --- a/harbour/contrib/hbqt/qth/QTextInlineObject.qth +++ b/harbour/contrib/hbqt/qth/QTextInlineObject.qth @@ -68,7 +68,7 @@ New = iInt, pEngine * QTextInlineObject ( int i, QTextEngine * e ) * */ -HB_FUNC( QT_Q ) +HB_FUNC( QT_QTEXTINLINEOBJECT ) { hb_retptr( ( QTextInlineObject* ) new QTextInlineObject( hb_parni( 1 ), hbqt_par_QTextEngine( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qth/QTextObject.qth b/harbour/contrib/hbqt/qth/QTextObject.qth new file mode 100644 index 0000000000..dff3f1b249 --- /dev/null +++ b/harbour/contrib/hbqt/qth/QTextObject.qth @@ -0,0 +1,96 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT Source Generator for Harbour + * + * Copyright 2009 Pritpal Bedi + * www - http://www.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. + * + */ +/*----------------------------------------------------------------------*/ +; +; Header File to Generate QT Wrapper Sources +; + + +Inherits = QObject +Type = Core +New = + + + +#include + + +/* + * + */ +HB_FUNC( QT_QTEXTOBJECT ) +{ + +} + + + + + + +QTextDocument * document () const +QTextFormat format () const +int formatIndex () const +int objectIndex () const + + + + + + + + + + + + + diff --git a/harbour/contrib/hbqt/tests/demoqt.prg b/harbour/contrib/hbqt/tests/demoqt.prg index c5b6eb751f..29396fda02 100644 --- a/harbour/contrib/hbqt/tests/demoqt.prg +++ b/harbour/contrib/hbqt/tests/demoqt.prg @@ -240,71 +240,185 @@ PROCEDURE hb_GtSys() STATIC FUNCTION Dummies() LOCAL oSome + oSome := QAbstractButton():new() + oSome := QAbstractItemView():new() + oSome := QAbstractPrintDialog():new() + oSome := QAbstractScrollArea():new() + oSome := QAbstractSlider():new() + oSome := QAbstractSpinBox():new() oSome := QAction():new() + //oSome := QApplication():new() + oSome := QBitmap():new() oSome := QBoxLayout():new() + oSome := QBrush():new() oSome := QCalendarWidget():new() oSome := QCheckBox():new() + oSome := QClipboard():new() + oSome := QColor():new() oSome := QColorDialog():new() oSome := QComboBox():new() oSome := QCommandLinkButton():new() + oSome := QCommonStyle():new() + oSome := QConicalGradient():new() + //oSome := QCoreApplication():new() oSome := QDateEdit():new() oSome := QDateTimeEdit():new() + oSome := QDesktopWidget():new() oSome := QDial():new() oSome := QDialog():new() + oSome := QDir():new() + oSome := QDockWidget():new() oSome := QDoubleSpinBox():new() oSome := QErrorMessage():new() + oSome := QEvent():new() + oSome := QEventLoop():new() oSome := QFileDialog():new() oSome := QFocusFrame():new() + oSome := QFont():new() oSome := QFontComboBox():new() oSome := QFontDialog():new() + oSome := QFontInfo():new() oSome := QFormLayout():new() oSome := QFrame():new() + oSome := QFtp():new() + oSome := QGradient():new() + oSome := QGridLayout():new() oSome := QGroupBox():new() oSome := QHBoxLayout():new() + oSome := QHeaderView():new() + oSome := QHttp():new() + oSome := QIcon():new() + oSome := QImage():new() + oSome := QImageReader():new() + oSome := QImageWriter():new() oSome := QInputDialog():new() + oSome := QInputEvent():new() oSome := QLabel():new() oSome := QLayout():new() oSome := QLayoutItem():new() oSome := QLCDNumber():new() + oSome := QLine():new() + oSome := QLinearGradient():new() oSome := QLineEdit():new() oSome := QListView():new() + oSome := QListWidget():new() + oSome := QListWidgetItem():new() oSome := QMainWindow():new() oSome := QMenu():new() oSome := QMenuBar():new() oSome := QMessageBox():new() oSome := QObject():new() - oSome := QPageSetupDialog():new() oSome := QPaintDevice():new() + oSome := QPageSetupDialog():new() oSome := QPainter():new() + oSome := QPaintEvent():new() + oSome := QPalette():new() + oSome := QPen():new() + oSome := QPicture():new() + oSome := QPixmap():new() + oSome := QPoint():new() + oSome := QPointF():new() oSome := QPrintDialog():new() oSome := QPrintPreviewDialog():new() oSome := QProgressBar():new() - oSome := QProgressDialog():New() + oSome := QProgressDialog():new() oSome := QPushButton():new() + oSome := QRadialGradient():new() + oSome := QRect():new() + oSome := QRectF():new() oSome := QRadioButton():new() + oSome := QRegion():new() + oSome := QResource():new() oSome := QScrollArea():new() oSome := QScrollBar():new() + oSome := QSignalMapper():new() + oSome := QSize():new() + oSome := QSizeF():new() oSome := QSizeGrip():new() + oSome := QSizePolicy():new() oSome := QSlider():new() + oSome := QSound():new() oSome := QSpinBox():new() + oSome := QSplashScreen():new() oSome := QSplitter():new() + oSome := QStandardItem():new() + oSome := QStandardItemModel():new() + oSome := QStatusBar():new() + oSome := QStyle():new() + oSome := QStyledItemDelegate():new() + oSome := QStyleHintReturn():new() + oSome := QStyleHintReturnMask():new() + oSome := QStyleHintReturnVariant():new() + oSome := QStyleOption():new() + oSome := QStyleOptionButton():new() + oSome := QStyleOptionComboBox():new() + oSome := QStyleOptionComplex():new() + oSome := QStyleOptionDockWidget():new() + oSome := QStyleOptionFocusRect():new() + oSome := QStyleOptionFrame():new() + oSome := QStyleOptionGroupBox():new() + oSome := QStyleOptionHeader():new() + oSome := QStyleOptionMenuItem():new() + oSome := QStyleOptionProgressBar():new() + oSome := QStyleOptionSizeGrip():new() + oSome := QStyleOptionSlider():new() + oSome := QStyleOptionSpinBox():new() + oSome := QStyleOptionTab():new() + oSome := QStyleOptionTabBarBase():new() + oSome := QStyleOptionTabWidgetFrame():new() + oSome := QStyleOptionTitleBar():new() + oSome := QStyleOptionToolBar():new() + oSome := QStyleOptionToolBox():new() + oSome := QStyleOptionToolButton():new() + oSome := QStyleOptionViewItem():new() + oSome := QStylePainter():new() oSome := QTabBar():new() oSome := QTableView():new() oSome := QTableWidget():new() oSome := QTableWidgetItem():new() oSome := QTabWidget():new() + oSome := QTextBlock():new() + oSome := QTextBlockFormat():new() + oSome := QTextBlockGroup():new() + oSome := QTextBrowser():new() + oSome := QTextBoundaryFinder():new() + oSome := QTextCharFormat():new() + oSome := QTextCodec():new() + oSome := QTextCursor():new() + oSome := QTextDecoder():new() + oSome := QTextDocument():new() + oSome := QTextDocumentFragment():new() + oSome := QTextDocumentWriter():new() oSome := QTextEdit():new() + oSome := QTextEncoder():new() + oSome := QTextFormat():new() + oSome := QTextFragment():new() + oSome := QTextFrame():new() + oSome := QTextFrameFormat():new() + oSome := QTextImageFormat():new() + oSome := QTextInlineObject():new() + oSome := QTextItem():new() + oSome := QTextLayout():new() + oSome := QTextLength():new() + oSome := QTextLine():new() + oSome := QTextObject():new() + oSome := QTextStream():new() oSome := QTimeEdit():new() + oSome := QTimer():new() oSome := QToolBar():new() oSome := QToolBox():new() oSome := QToolButton():new() oSome := QTreeView():new() oSome := QTreeWidget():new() oSome := QTreeWidgetItem():new() + oSome := QUrl():new() + oSome := QVariant():new() oSome := QVBoxLayout():new() oSome := QWebPage():new() - oSome := QWebView():new() oSome := QWidget():new() + oSome := QWebView():new() + oSome := QWindowsStyle():new() + oSome := QWindowsXPStyle():new() oSome := QWizard():new() RETURN nil