diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ae63337fce..0156c3ea2e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2011-03-21 17:23 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qtgui/qth/QBoxLayout.qth + * contrib/hbqt/qtgui/qth/QLayout.qth + * contrib/hbqt/qtgui/qth/QMainWindow.qth + * contrib/hbqt/qtgui/qth/QTableWidget.qth + * contrib/hbqt/qtgui/qth/QTreeWidget.qth + ! Fixed: detached objects. Hopefully hbIDE should exit clean + if just entered and exited. However, if some dialog using + .ui (.uic) files, it is still broken. + 2011-03-21 12:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/hbmk2_qt.hbs ! HB_TRACE() rationalized. diff --git a/harbour/contrib/hbqt/qtgui/qth/QBoxLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QBoxLayout.qth index ef406ab935..f421628c7d 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QBoxLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QBoxLayout.qth @@ -36,11 +36,11 @@ enum Direction { LeftToRight, RightToLeft, TopToBottom, BottomToTop } void addLayout ( QLayout * layout, int stretch = 0 ) [*D=1*] -void addSpacerItem ( QSpacerItem * spacerItem ) [*D=1*] +void addSpacerItem ( QSpacerItem * spacerItem ) [*D=1*] void addSpacing ( int size ) void addStretch ( int stretch = 0 ) void addStrut ( int size ) -void addWidget ( QWidget * widget, int stretch = 0, Qt::Alignment alignment = 0 ) [*D=1*] +void addWidget ( QWidget * widget, int stretch = 0, Qt::Alignment alignment = 0 ) Direction direction () const void insertLayout ( int index, QLayout * layout, int stretch = 0 ) void insertSpacerItem ( int index, QSpacerItem * spacerItem ) diff --git a/harbour/contrib/hbqt/qtgui/qth/QLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QLayout.qth index b327a06650..32ad3c4506 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QLayout.qth @@ -37,8 +37,8 @@ enum SizeConstraint { SetDefaultConstraint, SetFixedSize, SetMinimumSize, SetMax bool activate () -virtual void addItem ( QLayoutItem * item ) [*D=1*] -void addWidget ( QWidget * w ) [*D=1*] +virtual void addItem ( QLayoutItem * item ) [*D=1*] +void addWidget ( QWidget * w ) QRect contentsRect () const virtual int count () const = 0 virtual Qt::Orientations expandingDirections () const @@ -51,7 +51,7 @@ QWidget * menuBar () const virtual QSize minimumSize () const QWidget * parentWidget () const void removeItem ( QLayoutItem * item ) [*A=1*] -void removeWidget ( QWidget * widget ) [*A=1*] +void removeWidget ( QWidget * widget ) bool setAlignment ( QWidget * w, Qt::Alignment alignment ) void setAlignment ( Qt::Alignment alignment ) bool setAlignment ( QLayout * l, Qt::Alignment alignment ) diff --git a/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth b/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth index 0c2e438b90..f878744b26 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth @@ -59,8 +59,8 @@ flags DockOptions -void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget ) -void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget, Qt::Orientation orientation ) +void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget ) [*D=2*] +void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget, Qt::Orientation orientation ) [*D=2*] void addToolBar ( Qt::ToolBarArea area, QToolBar * toolbar ) void addToolBar ( QToolBar * toolbar ) QToolBar * addToolBar ( const QString & title ) // NOT implemented @@ -72,7 +72,7 @@ DockOptions dockOptions () const Qt::DockWidgetArea dockWidgetArea ( QDockWidget * dockwidget ) const bool documentMode () const QSize iconSize () const -void insertToolBar ( QToolBar * before, QToolBar * toolbar ) +void insertToolBar ( QToolBar * before, QToolBar * toolbar ) [*D=2*] void insertToolBarBreak ( QToolBar * before ) bool isAnimated () const bool isDockNestingEnabled () const @@ -84,14 +84,14 @@ void removeToolBarBreak ( QToolBar * before ) bool restoreDockWidget ( QDockWidget * dockwidget ) bool restoreState ( const QByteArray & state, int version = 0 ) QByteArray saveState ( int version = 0 ) const -void setCentralWidget ( QWidget * widget ) +void setCentralWidget ( QWidget * widget ) [*D=1*] void setCorner ( Qt::Corner corner, Qt::DockWidgetArea area ) void setDockOptions ( DockOptions options ) void setDocumentMode ( bool enabled ) void setIconSize ( const QSize & iconSize ) -void setMenuBar ( QMenuBar * menuBar ) -void setMenuWidget ( QWidget * menuBar ) -void setStatusBar ( QStatusBar * statusbar ) +void setMenuBar ( QMenuBar * menuBar ) [*D=1*] +void setMenuWidget ( QWidget * menuBar ) [*D=1*] +void setStatusBar ( QStatusBar * statusbar ) [*D=1*] void setTabPosition ( Qt::DockWidgetAreas areas, QTabWidget::TabPosition tabPosition ) void setTabShape ( QTabWidget::TabShape tabShape ) void setToolButtonStyle ( Qt::ToolButtonStyle toolButtonStyle ) diff --git a/harbour/contrib/hbqt/qtgui/qth/QTableWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QTableWidget.qth index d1da600437..3df4aef8df 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTableWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTableWidget.qth @@ -55,24 +55,24 @@ int row ( const QTableWidgetItem * item ) const int rowCount () const QList selectedItems () QList selectedRanges () const -void setCellWidget ( int row, int column, QWidget * widget ) [*D=3*] +void setCellWidget ( int row, int column, QWidget * widget ) [*D=3*] void setColumnCount ( int columns ) void setCurrentCell ( int row, int column ) void setCurrentCell ( int row, int column, QItemSelectionModel::SelectionFlags command ) -void setCurrentItem ( QTableWidgetItem * item ) [*D=1*] +void setCurrentItem ( QTableWidgetItem * item ) [*D=1*] void setCurrentItem ( QTableWidgetItem * item, QItemSelectionModel::SelectionFlags command ) [*D=1*] void setHorizontalHeaderItem ( int column, QTableWidgetItem * item ) [*D=2*] void setHorizontalHeaderLabels ( const QStringList & labels ) -void setItem ( int row, int column, QTableWidgetItem * item ) [*D=3*] +void setItem ( int row, int column, QTableWidgetItem * item ) [*D=3*] void setItemPrototype ( const QTableWidgetItem * item ) void setRangeSelected ( const QTableWidgetSelectionRange & range, bool select ) void setRowCount ( int rows ) -void setVerticalHeaderItem ( int row, QTableWidgetItem * item ) [*D=2*] +void setVerticalHeaderItem ( int row, QTableWidgetItem * item ) [*D=2*] void setVerticalHeaderLabels ( const QStringList & labels ) void sortItems ( int column, Qt::SortOrder order = Qt::AscendingOrder ) -QTableWidgetItem * takeHorizontalHeaderItem ( int column ) [*A=1*] -QTableWidgetItem * takeItem ( int row, int column ) [*A=1*] -QTableWidgetItem * takeVerticalHeaderItem ( int row ) [*A=1*] +QTableWidgetItem * takeHorizontalHeaderItem ( int column ) [*A=1*] +QTableWidgetItem * takeItem ( int row, int column ) [*A=1*] +QTableWidgetItem * takeVerticalHeaderItem ( int row ) [*A=1*] QTableWidgetItem * verticalHeaderItem ( int row ) const int visualColumn ( int logicalColumn ) const QRect visualItemRect ( const QTableWidgetItem * item ) const diff --git a/harbour/contrib/hbqt/qtgui/qth/QTreeWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QTreeWidget.qth index caa11603f9..483780ccec 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTreeWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTreeWidget.qth @@ -41,7 +41,7 @@ void editItem ( QTreeWidgetItem * item, int column = 0 ) QList findItems ( const QString & text, Qt::MatchFlags flags, int column = 0 ) const QTreeWidgetItem * headerItem () const int indexOfTopLevelItem ( QTreeWidgetItem * item ) const -void insertTopLevelItem ( int index, QTreeWidgetItem * item ) +void insertTopLevelItem ( int index, QTreeWidgetItem * item ) [*D=2*] void insertTopLevelItems ( int index, const QList & items ) QTreeWidgetItem * invisibleRootItem () const bool isFirstItemColumnSpanned ( const QTreeWidgetItem * item ) const @@ -54,17 +54,17 @@ void openPersistentEditor ( QTreeWidgetItem * item, int column = 0 ) void removeItemWidget ( QTreeWidgetItem * item, int column ) QList selectedItems () const void setColumnCount ( int columns ) -void setCurrentItem ( QTreeWidgetItem * item ) [*D=1*] -void setCurrentItem ( QTreeWidgetItem * item, int column ) [*D=1*] +void setCurrentItem ( QTreeWidgetItem * item ) [*D=1*] +void setCurrentItem ( QTreeWidgetItem * item, int column ) [*D=1*] void setCurrentItem ( QTreeWidgetItem * item, int column, QItemSelectionModel::SelectionFlags command ) [*D=1*] void setFirstItemColumnSpanned ( const QTreeWidgetItem * item, bool span ) -void setHeaderItem ( QTreeWidgetItem * item ) [*D=1*] +void setHeaderItem ( QTreeWidgetItem * item ) [*D=1*] void setHeaderLabel ( const QString & label ) void setHeaderLabels ( const QStringList & labels ) void setItemWidget ( QTreeWidgetItem * item, int column, QWidget * widget ) int sortColumn () const void sortItems ( int column, Qt::SortOrder order ) -QTreeWidgetItem * takeTopLevelItem ( int index ) [*A=1*] +QTreeWidgetItem * takeTopLevelItem ( int index ) [*A=1*] QTreeWidgetItem * topLevelItem ( int index ) const int topLevelItemCount () const QRect visualItemRect ( const QTreeWidgetItem * item ) const