From 49a465daeaf37868b38b5690829ffb17eff50727 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 2 Aug 2010 08:34:02 +0000 Subject: [PATCH] 2010-08-02 10:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/hbqt.h - Deleted component specific hbqt_par_*() defines. - Deleted some hbqt_par_*() defines which were not defined anymore or not used. * contrib/hbqt/hbqt_common.hbm % Deleted hbqtcore dir from header path list. * contrib/hbqt/qtcore/hbqt_hbevents.h * contrib/hbqt/qtcore/hbqt_hbslots.h + Include main component header. * contrib/hbqt/utils/hbqtgen.prg + Will now generate hbqt_par_*() macros automatically, in local component dir. % Deleted more unused code. * contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth * contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth * contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth * contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth * contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth * contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth * contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth * contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth * contrib/hbqt/qtwebkit/qth/QWebFrame.qth * contrib/hbqt/qtwebkit/qth/QWebHistory.qth * contrib/hbqt/qtwebkit/qth/QWebHistoryInterface.qth * contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth * contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth * contrib/hbqt/qtwebkit/qth/QWebPage.qth * contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth * contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth * contrib/hbqt/qtwebkit/qth/QWebSettings.qth * contrib/hbqt/qtwebkit/qth/QWebView.qth - Deleted manual references to component header. (now automatically generated) * contrib/hbqt/qtcore/hbqtcore.hbp * contrib/hbqt/qtcore/hbqtcores.hbp * contrib/hbqt/qtgui/hbqtgui.hbp * contrib/hbqt/qtgui/hbqtguis.hbp + Added main component dir to header path list. * contrib/hbqt/qtgui/qth/HBQAbstractItemModel.qth * contrib/hbqt/qtgui/qth/HBQMainWindow.qth * contrib/hbqt/qtgui/qth/HBQPlainTextEdit.qth * contrib/hbqt/qtgui/qth/HBQSyntaxHighlighter.qth * contrib/hbqt/qtgui/qth/HBQTableView.qth * contrib/hbqt/qtgui/qth/HBQTextBlockUserData.qth * contrib/hbqt/qtgui/qth/QSyntaxHighlighter.qth * contrib/hbqt/qtgui/qth/QTextBlock.qth * contrib/hbqt/qtcore/qth/HBEvents.qth * contrib/hbqt/qtcore/qth/HBSlots.qth - Deleted relative paths when referencing component local headers. * contrib/hbqt/qtgui/qth/QPaintEngine.qth ! Commented references to QPaintEngineState (it's not implemented). * contrib/hbqt/qtcore/qth/QSignalMapper.qth ! Commented references to QWidget (it's QtGui component. It can be readded by adding some tricks if absolutely necessary, I don't know how important these methods are). - contrib/hbqt/qtwebkit/hbqt_local.h - contrib/hbqt/qtdesigner/hbqt_local.h + contrib/hbqt/qtdesigner/g/hbqtdesigner.h + contrib/hbqt/qtwebkit/g/hbqtwebkit.h + contrib/hbqt/qtcore/g/hbqtcore.h + contrib/hbqt/qtgui/g/hbqtgui.h + contrib/hbqt/qtnetwork/g/hbqtnetwork.h + Added/moved component local headers to g dir. These are now generated automatically. - contrib/hbqt/qtgui/g/QInputContext.cpp - contrib/hbqt/qtgui/g/TQInputContext.prg - Deleted generated source which is not generated since long. * contrib/hbqt/qtcore/doc/en/* * contrib/hbqt/qtcore/g/* * contrib/hbqt/qtdesigner/g/* * contrib/hbqt/qtgui/doc/en/* * contrib/hbqt/qtgui/g/* * contrib/hbqt/qtnetwork/g/* * contrib/hbqt/qtwebkit/g/* * Regenerated. --- harbour/ChangeLog | 87 +++++ harbour/contrib/hbqt/hbqt.h | 311 +----------------- harbour/contrib/hbqt/hbqt_common.hbm | 1 - .../qtcore/doc/en/class_qsignalmapper.txt | 6 +- harbour/contrib/hbqt/qtcore/g/HBEvents.cpp | 3 +- harbour/contrib/hbqt/qtcore/g/HBSlots.cpp | 3 +- .../hbqt/qtcore/g/QAbstractItemModel.cpp | 1 + .../hbqt/qtcore/g/QAbstractListModel.cpp | 1 + .../hbqt/qtcore/g/QAbstractTableModel.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QBitArray.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QBuffer.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QByteArray.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QChar.cpp | 1 + .../hbqt/qtcore/g/QCoreApplication.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QDataStream.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QDate.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QDateTime.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QDir.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QEvent.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QFile.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QIODevice.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp | 1 + .../contrib/hbqt/qtcore/g/QLatin1String.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QLine.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QLineF.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QList.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QLocale.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QMimeData.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QObject.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QPoint.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QPointF.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QProcess.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QRect.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QRectF.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QRegExp.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QResource.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QSettings.cpp | 1 + .../contrib/hbqt/qtcore/g/QSignalMapper.cpp | 37 +-- harbour/contrib/hbqt/qtcore/g/QSize.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QSizeF.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QStringList.cpp | 1 + .../hbqt/qtcore/g/QTextBoundaryFinder.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp | 1 + .../contrib/hbqt/qtcore/g/QTextDecoder.cpp | 1 + .../contrib/hbqt/qtcore/g/QTextEncoder.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QTextStream.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QThread.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QTime.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QTimer.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QTranslator.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QUrl.cpp | 1 + harbour/contrib/hbqt/qtcore/g/QVariant.cpp | 1 + .../contrib/hbqt/qtcore/g/TQSignalMapper.prg | 22 +- harbour/contrib/hbqt/qtcore/g/hbqtcore.h | 68 ++++ harbour/contrib/hbqt/qtcore/hbqt_hbevents.h | 1 + harbour/contrib/hbqt/qtcore/hbqt_hbslots.h | 1 + harbour/contrib/hbqt/qtcore/hbqtcore.hbp | 1 + harbour/contrib/hbqt/qtcore/hbqtcores.hbp | 1 + harbour/contrib/hbqt/qtcore/qth/HBEvents.qth | 8 +- harbour/contrib/hbqt/qtcore/qth/HBSlots.qth | 6 +- .../contrib/hbqt/qtcore/qth/QSignalMapper.qth | 7 +- .../g/QDesignerActionEditorInterface.cpp | 3 +- .../g/QDesignerFormEditorInterface.cpp | 3 +- .../g/QDesignerFormWindowCursorInterface.cpp | 3 +- .../g/QDesignerFormWindowInterface.cpp | 3 +- .../g/QDesignerFormWindowManagerInterface.cpp | 3 +- .../g/QDesignerObjectInspectorInterface.cpp | 3 +- .../g/QDesignerPropertyEditorInterface.cpp | 3 +- .../g/QDesignerWidgetBoxInterface.cpp | 3 +- .../contrib/hbqt/qtdesigner/g/hbqtdesigner.h | 25 ++ harbour/contrib/hbqt/qtdesigner/hbqt_local.h | 66 ---- .../qth/QDesignerActionEditorInterface.qth | 1 - .../qth/QDesignerFormEditorInterface.qth | 1 - .../QDesignerFormWindowCursorInterface.qth | 1 - .../qth/QDesignerFormWindowInterface.qth | 1 - .../QDesignerFormWindowManagerInterface.qth | 1 - .../qth/QDesignerObjectInspectorInterface.qth | 1 - .../qth/QDesignerPropertyEditorInterface.qth | 1 - .../qth/QDesignerWidgetBoxInterface.qth | 1 - .../hbqt/qtgui/doc/en/class_qpaintengine.txt | 1 - .../hbqt/qtgui/g/HBQAbstractItemModel.cpp | 4 +- .../contrib/hbqt/qtgui/g/HBQMainWindow.cpp | 4 +- .../contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp | 4 +- .../hbqt/qtgui/g/HBQSyntaxHighlighter.cpp | 4 +- harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp | 4 +- .../hbqt/qtgui/g/HBQTextBlockUserData.cpp | 4 +- .../contrib/hbqt/qtgui/g/QAbstractButton.cpp | 2 + .../hbqt/qtgui/g/QAbstractItemDelegate.cpp | 2 + .../hbqt/qtgui/g/QAbstractItemView.cpp | 2 + .../hbqt/qtgui/g/QAbstractPrintDialog.cpp | 2 + .../hbqt/qtgui/g/QAbstractProxyModel.cpp | 2 + .../hbqt/qtgui/g/QAbstractScrollArea.cpp | 2 + .../contrib/hbqt/qtgui/g/QAbstractSlider.cpp | 2 + .../contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp | 2 + .../qtgui/g/QAbstractTextDocumentLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QAction.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QApplication.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QBitmap.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QBrush.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp | 2 + .../contrib/hbqt/qtgui/g/QCalendarWidget.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QClipboard.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QColor.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QComboBox.cpp | 2 + .../hbqt/qtgui/g/QCommandLinkButton.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QCompleter.cpp | 2 + .../contrib/hbqt/qtgui/g/QConicalGradient.cpp | 2 + .../hbqt/qtgui/g/QContextMenuEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QCursor.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp | 2 + .../contrib/hbqt/qtgui/g/QDateTimeEdit.cpp | 2 + .../contrib/hbqt/qtgui/g/QDesktopWidget.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QDial.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QDirModel.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp | 2 + .../contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp | 2 + .../contrib/hbqt/qtgui/g/QDragEnterEvent.cpp | 2 + .../contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp | 2 + .../contrib/hbqt/qtgui/g/QDragMoveEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp | 2 + .../contrib/hbqt/qtgui/g/QErrorMessage.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp | 2 + .../hbqt/qtgui/g/QFileIconProvider.cpp | 2 + .../contrib/hbqt/qtgui/g/QFileSystemModel.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QFont.cpp | 2 + .../contrib/hbqt/qtgui/g/QFontComboBox.cpp | 2 + .../contrib/hbqt/qtgui/g/QFontDatabase.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp | 2 + .../contrib/hbqt/qtgui/g/QFontMetricsF.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QFrame.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QGradient.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QIcon.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QImage.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QImageReader.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp | 2 + .../contrib/hbqt/qtgui/g/QInputContext.cpp | 218 ------------ harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp | 2 + .../hbqt/qtgui/g/QInputMethodEvent.cpp | 2 + .../contrib/hbqt/qtgui/g/QItemDelegate.cpp | 2 + .../hbqt/qtgui/g/QItemEditorCreatorBase.cpp | 2 + .../hbqt/qtgui/g/QItemEditorFactory.cpp | 2 + .../contrib/hbqt/qtgui/g/QItemSelection.cpp | 2 + .../hbqt/qtgui/g/QItemSelectionModel.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QLabel.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp | 2 + .../contrib/hbqt/qtgui/g/QLinearGradient.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QListView.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QListWidget.cpp | 2 + .../contrib/hbqt/qtgui/g/QListWidgetItem.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QMatrix.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp | 2 + .../contrib/hbqt/qtgui/g/QMdiSubWindow.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QMenu.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QMovie.cpp | 2 + .../contrib/hbqt/qtgui/g/QPageSetupDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp | 16 +- harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QPainter.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QPalette.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QPen.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QPicture.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QPixmap.cpp | 2 + .../hbqt/qtgui/g/QPlainTextDocumentLayout.cpp | 2 + .../contrib/hbqt/qtgui/g/QPlainTextEdit.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QPolygon.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp | 2 + .../hbqt/qtgui/g/QPrintPreviewDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QPrinter.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp | 2 + .../contrib/hbqt/qtgui/g/QProgressDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QPushButton.cpp | 2 + .../contrib/hbqt/qtgui/g/QRadialGradient.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QRegion.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp | 2 + .../contrib/hbqt/qtgui/g/QSessionManager.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QSlider.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QSound.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp | 2 + .../contrib/hbqt/qtgui/g/QSplashScreen.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QSplitter.cpp | 2 + .../contrib/hbqt/qtgui/g/QStackedWidget.cpp | 2 + .../contrib/hbqt/qtgui/g/QStandardItem.cpp | 2 + .../hbqt/qtgui/g/QStandardItemModel.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp | 2 + .../contrib/hbqt/qtgui/g/QStringListModel.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QStyle.cpp | 2 + .../contrib/hbqt/qtgui/g/QStyleFactory.cpp | 2 + .../contrib/hbqt/qtgui/g/QStyleHintReturn.cpp | 2 + .../hbqt/qtgui/g/QStyleHintReturnMask.cpp | 2 + .../hbqt/qtgui/g/QStyleHintReturnVariant.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionButton.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionComboBox.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionComplex.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionDockWidget.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionFocusRect.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionFrame.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionGroupBox.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionHeader.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionMenuItem.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionProgressBar.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionSizeGrip.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionSlider.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionSpinBox.cpp | 2 + .../contrib/hbqt/qtgui/g/QStyleOptionTab.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionTabBarBase.cpp | 2 + .../qtgui/g/QStyleOptionTabWidgetFrame.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionTitleBar.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionToolBar.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionToolBox.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionToolButton.cpp | 2 + .../hbqt/qtgui/g/QStyleOptionViewItem.cpp | 2 + .../contrib/hbqt/qtgui/g/QStylePainter.cpp | 2 + .../hbqt/qtgui/g/QStyledItemDelegate.cpp | 2 + .../hbqt/qtgui/g/QSyntaxHighlighter.cpp | 4 +- .../contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTabBar.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTableView.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp | 2 + .../contrib/hbqt/qtgui/g/QTableWidgetItem.cpp | 2 + .../qtgui/g/QTableWidgetSelectionRange.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp | 4 +- .../contrib/hbqt/qtgui/g/QTextBlockFormat.cpp | 2 + .../contrib/hbqt/qtgui/g/QTextBlockGroup.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp | 2 + .../contrib/hbqt/qtgui/g/QTextCharFormat.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp | 2 + .../contrib/hbqt/qtgui/g/QTextDocument.cpp | 2 + .../hbqt/qtgui/g/QTextDocumentFragment.cpp | 2 + .../hbqt/qtgui/g/QTextDocumentWriter.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp | 2 + .../contrib/hbqt/qtgui/g/QTextFragment.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp | 2 + .../contrib/hbqt/qtgui/g/QTextFrameFormat.cpp | 2 + .../contrib/hbqt/qtgui/g/QTextImageFormat.cpp | 2 + .../hbqt/qtgui/g/QTextInlineObject.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTextItem.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTextLength.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTextLine.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTextList.cpp | 2 + .../contrib/hbqt/qtgui/g/QTextListFormat.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTextObject.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTextOption.cpp | 2 + .../contrib/hbqt/qtgui/g/QTextTableFormat.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QToolBar.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QToolBox.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QToolButton.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTransform.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTreeView.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp | 2 + .../contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QUiLoader.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QValidator.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QWidget.cpp | 2 + .../contrib/hbqt/qtgui/g/QWidgetAction.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp | 2 + .../hbqt/qtgui/g/QWindowStateChangeEvent.cpp | 2 + .../contrib/hbqt/qtgui/g/QWindowsStyle.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QWizard.cpp | 2 + harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp | 2 + .../contrib/hbqt/qtgui/g/TQInputContext.prg | 136 -------- .../contrib/hbqt/qtgui/g/TQPaintEngine.prg | 5 - harbour/contrib/hbqt/qtgui/g/hbqtgui.h | 241 ++++++++++++++ harbour/contrib/hbqt/qtgui/hbqtgui.hbp | 1 + harbour/contrib/hbqt/qtgui/hbqtguis.hbp | 1 + .../hbqt/qtgui/qth/HBQAbstractItemModel.qth | 10 +- .../contrib/hbqt/qtgui/qth/HBQMainWindow.qth | 10 +- .../hbqt/qtgui/qth/HBQPlainTextEdit.qth | 4 +- .../hbqt/qtgui/qth/HBQSyntaxHighlighter.qth | 10 +- .../contrib/hbqt/qtgui/qth/HBQTableView.qth | 10 +- .../hbqt/qtgui/qth/HBQTextBlockUserData.qth | 10 +- .../contrib/hbqt/qtgui/qth/QPaintEngine.qth | 4 +- .../hbqt/qtgui/qth/QSyntaxHighlighter.qth | 2 +- harbour/contrib/hbqt/qtgui/qth/QTextBlock.qth | 10 +- harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp | 2 + harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp | 2 + .../contrib/hbqt/qtnetwork/g/QHttpHeader.cpp | 2 + .../hbqt/qtnetwork/g/QHttpRequestHeader.cpp | 2 + .../hbqt/qtnetwork/g/QHttpResponseHeader.cpp | 2 + .../hbqt/qtnetwork/g/QNetworkRequest.cpp | 2 + .../contrib/hbqt/qtnetwork/g/hbqtnetwork.h | 23 ++ harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp | 3 +- .../contrib/hbqt/qtwebkit/g/QWebHistory.cpp | 3 +- .../hbqt/qtwebkit/g/QWebHistoryInterface.cpp | 3 +- .../hbqt/qtwebkit/g/QWebHistoryItem.cpp | 3 +- .../hbqt/qtwebkit/g/QWebHitTestResult.cpp | 3 +- harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp | 3 +- .../hbqt/qtwebkit/g/QWebPluginFactory.cpp | 3 +- .../hbqt/qtwebkit/g/QWebSecurityOrigin.cpp | 3 +- .../contrib/hbqt/qtwebkit/g/QWebSettings.cpp | 3 +- harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp | 3 +- harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h | 27 ++ harbour/contrib/hbqt/qtwebkit/hbqt_local.h | 69 ---- .../contrib/hbqt/qtwebkit/qth/QWebFrame.qth | 1 - .../contrib/hbqt/qtwebkit/qth/QWebHistory.qth | 1 - .../qtwebkit/qth/QWebHistoryInterface.qth | 1 - .../hbqt/qtwebkit/qth/QWebHistoryItem.qth | 1 - .../hbqt/qtwebkit/qth/QWebHitTestResult.qth | 1 - .../contrib/hbqt/qtwebkit/qth/QWebPage.qth | 1 - .../hbqt/qtwebkit/qth/QWebPluginFactory.qth | 1 - .../hbqt/qtwebkit/qth/QWebSecurityOrigin.qth | 1 - .../hbqt/qtwebkit/qth/QWebSettings.qth | 1 - .../contrib/hbqt/qtwebkit/qth/QWebView.qth | 1 - harbour/contrib/hbqt/utils/hbqtgen.prg | 200 ++--------- 352 files changed, 1116 insertions(+), 1140 deletions(-) create mode 100644 harbour/contrib/hbqt/qtcore/g/hbqtcore.h create mode 100644 harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner.h delete mode 100644 harbour/contrib/hbqt/qtdesigner/hbqt_local.h delete mode 100644 harbour/contrib/hbqt/qtgui/g/QInputContext.cpp delete mode 100644 harbour/contrib/hbqt/qtgui/g/TQInputContext.prg create mode 100644 harbour/contrib/hbqt/qtgui/g/hbqtgui.h create mode 100644 harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork.h create mode 100644 harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h delete mode 100644 harbour/contrib/hbqt/qtwebkit/hbqt_local.h diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c1131537cf..01cb58bc7f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,93 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-02 10:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/hbqt.h + - Deleted component specific hbqt_par_*() defines. + - Deleted some hbqt_par_*() defines which were not defined anymore + or not used. + + * contrib/hbqt/hbqt_common.hbm + % Deleted hbqtcore dir from header path list. + + * contrib/hbqt/qtcore/hbqt_hbevents.h + * contrib/hbqt/qtcore/hbqt_hbslots.h + + Include main component header. + + * contrib/hbqt/utils/hbqtgen.prg + + Will now generate hbqt_par_*() macros automatically, in local + component dir. + % Deleted more unused code. + + * contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth + * contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth + * contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth + * contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth + * contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth + * contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth + * contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth + * contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth + * contrib/hbqt/qtwebkit/qth/QWebFrame.qth + * contrib/hbqt/qtwebkit/qth/QWebHistory.qth + * contrib/hbqt/qtwebkit/qth/QWebHistoryInterface.qth + * contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth + * contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth + * contrib/hbqt/qtwebkit/qth/QWebPage.qth + * contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth + * contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth + * contrib/hbqt/qtwebkit/qth/QWebSettings.qth + * contrib/hbqt/qtwebkit/qth/QWebView.qth + - Deleted manual references to component header. (now automatically generated) + + * contrib/hbqt/qtcore/hbqtcore.hbp + * contrib/hbqt/qtcore/hbqtcores.hbp + * contrib/hbqt/qtgui/hbqtgui.hbp + * contrib/hbqt/qtgui/hbqtguis.hbp + + Added main component dir to header path list. + + * contrib/hbqt/qtgui/qth/HBQAbstractItemModel.qth + * contrib/hbqt/qtgui/qth/HBQMainWindow.qth + * contrib/hbqt/qtgui/qth/HBQPlainTextEdit.qth + * contrib/hbqt/qtgui/qth/HBQSyntaxHighlighter.qth + * contrib/hbqt/qtgui/qth/HBQTableView.qth + * contrib/hbqt/qtgui/qth/HBQTextBlockUserData.qth + * contrib/hbqt/qtgui/qth/QSyntaxHighlighter.qth + * contrib/hbqt/qtgui/qth/QTextBlock.qth + * contrib/hbqt/qtcore/qth/HBEvents.qth + * contrib/hbqt/qtcore/qth/HBSlots.qth + - Deleted relative paths when referencing component local headers. + + * contrib/hbqt/qtgui/qth/QPaintEngine.qth + ! Commented references to QPaintEngineState (it's not implemented). + + * contrib/hbqt/qtcore/qth/QSignalMapper.qth + ! Commented references to QWidget (it's QtGui component. It can be + readded by adding some tricks if absolutely necessary, I don't know + how important these methods are). + + - contrib/hbqt/qtwebkit/hbqt_local.h + - contrib/hbqt/qtdesigner/hbqt_local.h + + contrib/hbqt/qtdesigner/g/hbqtdesigner.h + + contrib/hbqt/qtwebkit/g/hbqtwebkit.h + + contrib/hbqt/qtcore/g/hbqtcore.h + + contrib/hbqt/qtgui/g/hbqtgui.h + + contrib/hbqt/qtnetwork/g/hbqtnetwork.h + + Added/moved component local headers to g dir. These are now + generated automatically. + + - contrib/hbqt/qtgui/g/QInputContext.cpp + - contrib/hbqt/qtgui/g/TQInputContext.prg + - Deleted generated source which is not generated since long. + + * contrib/hbqt/qtcore/doc/en/* + * contrib/hbqt/qtcore/g/* + * contrib/hbqt/qtdesigner/g/* + * contrib/hbqt/qtgui/doc/en/* + * contrib/hbqt/qtgui/g/* + * contrib/hbqt/qtnetwork/g/* + * contrib/hbqt/qtwebkit/g/* + * Regenerated. + 2010-08-02 08:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) - contrib/hbqt/qtdesigner/* + contrib/hbqt/qtdesigner/g diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/hbqt.h index 5385d6da75..ba084e7a3b 100644 --- a/harbour/contrib/hbqt/hbqt.h +++ b/harbour/contrib/hbqt/hbqt.h @@ -51,8 +51,6 @@ * If you do not wish that, delete this exception notice. * */ -/*----------------------------------------------------------------------*/ - #ifndef __HBQT_H #define __HBQT_H @@ -92,314 +90,6 @@ extern HB_EXPORT const HB_GC_FUNCS * hbqt_gcFuncs( void ); extern HB_EXPORT void * hbqt_pPtrFromObj( int iParam ); extern HB_EXPORT void * hbqt_pPtrFromItem( PHB_ITEM pObj ); -/* TOFIX: Here basically we're using GC pointers without pointer type identification, - which means that it's very easy to cause a GPF by passing wrong type. */ -#define hbqt_par_ExtensionOption( n ) ( ( ExtensionOption * ) hbqt_gcpointer( n ) ) -#define hbqt_par_IUnknown( n ) ( ( IUnknown * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAbstractButton( n ) ( ( QAbstractButton * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAbstractEventDispatcher( n ) ( ( QAbstractEventDispatcher * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAbstractItemDelegate( n ) ( ( QAbstractItemDelegate * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAbstractItemModel( n ) ( ( QAbstractItemModel * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAbstractItemView( n ) ( ( QAbstractItemView * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAbstractListModel( n ) ( ( QAbstractListModel * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAbstractPrintDialog( n ) ( ( QAbstractPrintDialog * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAbstractProxyModel( n ) ( ( QAbstractProxyModel * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAbstractScrollArea( n ) ( ( QAbstractScrollArea * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAbstractSlider( n ) ( ( QAbstractSlider * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAbstractSpinBox( n ) ( ( QAbstractSpinBox * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAbstractTableModel( n ) ( ( QAbstractTableModel * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAbstractTextDocumentLayout( n ) ( ( QAbstractTextDocumentLayout * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAction( n ) ( ( QAction * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QActionGroup( n ) ( ( QActionGroup * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QApplication( n ) ( ( QApplication * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QAxBase( n ) ( ( QAxBase * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QBitArray( n ) ( ( QBitArray * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QBitmap( n ) ( ( QBitmap * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QBoxLayout( n ) ( ( QBoxLayout * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QBrush( n ) ( ( QBrush * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QBuffer( n ) ( ( QBuffer * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QButtonGroup( n ) ( ( QButtonGroup * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QByteArray( n ) ( ( QByteArray * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QCalendarWidget( n ) ( ( QCalendarWidget * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QChar( n ) ( ( QChar * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QCheckBox( n ) ( ( QCheckBox * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QClipboard( n ) ( ( QClipboard * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QColor( n ) ( ( QColor * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QColorDialog( n ) ( ( QColorDialog * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QComboBox( n ) ( ( QComboBox * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QCommandLinkButton( n ) ( ( QCommandLinkButton * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QCommonStyle( n ) ( ( QCommonStyle * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QCompleter( n ) ( ( QCompleter * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QConicalGradient( n ) ( ( QConicalGradient * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QContextMenuEvent( n ) ( ( QContextMenuEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QCoreApplication( n ) ( ( QCoreApplication * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QCursor( n ) ( ( QCursor * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDateEdit( n ) ( ( QDateEdit * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDataStream( n ) ( ( QDataStream * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDate( n ) ( ( QDate * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDateTime( n ) ( ( QDateTime * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDateTimeEdit( n ) ( ( QDateTimeEdit * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDesktopWidget( n ) ( ( QDesktopWidget * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDial( n ) ( ( QDial * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDialog( n ) ( ( QDialog * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDir( n ) ( ( QDir * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDirModel( n ) ( ( QDirModel * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDockWidget( n ) ( ( QDockWidget * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDockWidget( n ) ( ( QDockWidget * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDoubleSpinBox( n ) ( ( QDoubleSpinBox * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDragEnterEvent( n ) ( ( QDragEnterEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDragLeaveEvent( n ) ( ( QDragLeaveEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDragMoveEvent( n ) ( ( QDragMoveEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDropEvent( n ) ( ( QDropEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QErrorMessage( n ) ( ( QErrorMessage * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QEvent( n ) ( ( QEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QEventLoop( n ) ( ( QEventLoop * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFile( n ) ( ( QFile * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFileDialog( n ) ( ( QFileDialog * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFileIconProvider( n ) ( ( QFileIconProvider * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFileInfo( n ) ( ( QFileInfo * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFileSystemModel( n ) ( ( QFileSystemModel * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFocusEvent( n ) ( ( QFocusEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFocusFrame( n ) ( ( QFocusFrame * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFont( n ) ( ( QFont * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFontComboBox( n ) ( ( QFontComboBox * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFontDatabase( n ) ( ( QFontDatabase * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFontDialog( n ) ( ( QFontDialog * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFontInfo( n ) ( ( QFontInfo * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFontMetrics( n ) ( ( QFontMetrics * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFontMetricsF( n ) ( ( QFontMetricsF * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFormLayout( n ) ( ( QFormLayout * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFrame( n ) ( ( QFrame * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QFtp( n ) ( ( QFtp * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QGradient( n ) ( ( QGradient * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QGradientStops( n ) ( ( QGradientStops * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QGridLayout( n ) ( ( QGridLayout * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QGroupBox( n ) ( ( QGroupBox * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QHBoxLayout( n ) ( ( QHBoxLayout * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QHeaderView( n ) ( ( QHeaderView * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QHelpEvent( n ) ( ( QHelpEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QHideEvent( n ) ( ( QHideEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QHttp( n ) ( ( QHttp * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QHttpHeader( n ) ( ( QHttpHeader * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QHttpResponseHeader( n ) ( ( QHttpResponseHeader * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QHttpRequestHeader( n ) ( ( QHttpRequestHeader * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QIcon( n ) ( ( QIcon * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QImage( n ) ( ( QImage * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QImageReader( n ) ( ( QImageReader * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QImageWriter( n ) ( ( QImageWriter * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QInputContext( n ) ( ( QInputContext * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QInputDialog( n ) ( ( QInputDialog * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QInputEvent( n ) ( ( QInputEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QInputMethodEvent( n ) ( ( QInputMethodEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QIODevice( n ) ( ( QIODevice * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QItemDelegate( n ) ( ( QItemDelegate * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QItemEditorCreator( n ) ( ( QItemEditorCreator * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QItemEditorCreatorBase( n ) ( ( QItemEditorCreatorBase * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QItemEditorFactory( n ) ( ( QItemEditorFactory * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QItemSelection( n ) ( ( QItemSelection * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QItemSelectionModel( n ) ( ( QItemSelectionModel * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QKeyEvent( n ) ( ( QKeyEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QKeySequence( n ) ( ( QKeySequence * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QLabel( n ) ( ( QLabel * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QLatin1Char( n ) ( ( QLatin1Char * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QLatin1String( n ) ( ( QLatin1String * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QLayout( n ) ( ( QLayout * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QLayoutItem( n ) ( ( QLayoutItem * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QLCDNumber( n ) ( ( QLCDNumber * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QLibraryInfo( n ) ( ( QLibraryInfo * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QLine( n ) ( ( QLine * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QLinearGradient( n ) ( ( QLinearGradient * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QLineEdit( n ) ( ( QLineEdit * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QLineF( n ) ( ( QLineF * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QList( n ) ( ( QList< void * > * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QListView( n ) ( ( QListView * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QListWidget( n ) ( ( QListWidget * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QListWidgetItem( n ) ( ( QListWidgetItem * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QLocale( n ) ( ( QLocale * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMainWindow( n ) ( ( QMainWindow * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMatrix( n ) ( ( QMatrix * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMdiArea( n ) ( ( QMdiArea * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMdiSubWindow( n ) ( ( QMdiSubWindow * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMenu( n ) ( ( QMenu * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMenuBar( n ) ( ( QMenuBar * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMessageBox( n ) ( ( QMessageBox * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMimeData( n ) ( ( QMimeData * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QModelIndex( n ) ( ( QModelIndex * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QModelIndexList( n ) ( ( QModelIndexList * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMouseEvent( n ) ( ( QMouseEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMoveEvent( n ) ( ( QMoveEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QMovie( n ) ( ( QMovie * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QNetworkAccessManager( n ) ( ( QNetworkAccessManager * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QNetworkProxy( n ) ( ( QNetworkProxy * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QNetworkRequest( n ) ( ( QNetworkRequest * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QObject( n ) ( ( QObject * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPageSetupDialog( n ) ( ( QPageSetupDialog * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPaintDevice( n ) ( ( QPaintDevice * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPaintEngine( n ) ( ( QPaintEngine * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPaintEngineState( n ) ( ( QPaintEngineState * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPainter( n ) ( ( QPainter * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPainterPath( n ) ( ( QPainterPath * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPaintEvent( n ) ( ( QPaintEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPalette( n ) ( ( QPalette * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPen( n ) ( ( QPen * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPicture( n ) ( ( QPicture * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPixmap( n ) ( ( QPixmap * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPlainTextDocumentLayout( n ) ( ( QPlainTextDocumentLayout * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPlainTextEdit( n ) ( ( QPlainTextEdit * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPoint( n ) ( ( QPoint * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPointF( n ) ( ( QPointF * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPolygon( n ) ( ( QPolygon * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPolygonF( n ) ( ( QPolygonF * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPrintDialog( n ) ( ( QPrintDialog * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPrintEngine( n ) ( ( QPrintEngine * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPrinter( n ) ( ( QPrinter * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPrintPreviewDialog( n ) ( ( QPrintPreviewDialog * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QProcess( n ) ( ( QProcess * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QProgressBar( n ) ( ( QProgressBar * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QProgressDialog( n ) ( ( QProgressDialog * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QPushButton( n ) ( ( QPushButton * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QRadialGradient( n ) ( ( QRadialGradient * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QRadioButton( n ) ( ( QRadioButton * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QRect( n ) ( ( QRect * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QRectF( n ) ( ( QRectF * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QRegExp( n ) ( ( QRegExp * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QRegion( n ) ( ( QRegion * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QResizeEvent( n ) ( ( QResizeEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QResource( n ) ( ( QResource * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QScrollArea( n ) ( ( QScrollArea * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QScrollBar( n ) ( ( QScrollBar * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSessionManager( n ) ( ( QSessionManager * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSettings( n ) ( ( QSettings * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QShowEvent( n ) ( ( QShowEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSignalMapper( n ) ( ( QSignalMapper * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSize( n ) ( ( QSize * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSizeF( n ) ( ( QSizeF * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSizeGrip( n ) ( ( QSizeGrip * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSizePolicy( n ) ( ( QSizePolicy * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSlider( n ) ( ( QSlider * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSound( n ) ( ( QSound * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSpacerItem( n ) ( ( QSpacerItem * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSpinBox( n ) ( ( QSpinBox * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSplashScreen( n ) ( ( QSplashScreen * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSplitter( n ) ( ( QSplitter * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStackedWidget( n ) ( ( QStackedWidget * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStandardItem( n ) ( ( QStandardItem * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStandardItemModel( n ) ( ( QStandardItemModel * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStatusBar( n ) ( ( QStatusBar * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStringList( n ) ( ( QStringList * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStringListModel( n ) ( ( QStringListModel * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyle( n ) ( ( QStyle * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyledItemDelegate( n ) ( ( QStyledItemDelegate * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleFactory( n ) ( ( QStyleFactory * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleHintReturn( n ) ( ( QStyleHintReturn * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleHintReturnMask( n ) ( ( QStyleHintReturnMask * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleHintReturnVariant( n ) ( ( QStyleHintReturnVariant * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOption( n ) ( ( QStyleOption * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionButton( n ) ( ( QStyleOptionButton * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionComboBox( n ) ( ( QStyleOptionComboBox * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionComplex( n ) ( ( QStyleOptionComplex * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionDockWidget( n ) ( ( QStyleOptionDockWidget * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionFocusRect( n ) ( ( QStyleOptionFocusRect * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionFrame( n ) ( ( QStyleOptionFrame * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionGroupBox( n ) ( ( QStyleOptionGroupBox * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionHeader( n ) ( ( QStyleOptionHeader * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionMenuItem( n ) ( ( QStyleOptionMenuItem * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionProgressBar( n ) ( ( QStyleOptionProgressBar * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionSizeGrip( n ) ( ( QStyleOptionSizeGrip * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionSlider( n ) ( ( QStyleOptionSlider * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionSpinBox( n ) ( ( QStyleOptionSpinBox * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionTab( n ) ( ( QStyleOptionTab * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionTabBarBase( n ) ( ( QStyleOptionTabBarBase * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionTabWidgetFrame( n ) ( ( QStyleOptionTabWidgetFrame * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionTitleBar( n ) ( ( QStyleOptionTitleBar * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionToolBar( n ) ( ( QStyleOptionToolBar * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionToolBox( n ) ( ( QStyleOptionToolBox * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionToolButton( n ) ( ( QStyleOptionToolButton * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionViewItem( n ) ( ( QStyleOptionViewItem * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStyleOptionViewItem( n ) ( ( QStyleOptionViewItem * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QStylePainter( n ) ( ( QStylePainter * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSyntaxHighlighter( n ) ( ( QSyntaxHighlighter * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QSystemTrayIcon( n ) ( ( QSystemTrayIcon * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTabBar( n ) ( ( QTabBar * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTableView( n ) ( ( QTableView * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTableWidget( n ) ( ( QTableWidget * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTableWidgetItem( n ) ( ( QTableWidgetItem * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTableWidgetSelectionRange( n ) ( ( QTableWidgetSelectionRange * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTabWidget( n ) ( ( QTabWidget * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTcpSocket( n ) ( ( QTcpSocket * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextBlock( n ) ( ( QTextBlock * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextBlockFormat( n ) ( ( QTextBlockFormat * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextBlockGroup( n ) ( ( QTextBlockGroup * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextBlockUserData( n ) ( ( QTextBlockUserData * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextBoundaryFinder( n ) ( ( QTextBoundaryFinder * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextBrowser( n ) ( ( QTextBrowser * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextCharFormat( n ) ( ( QTextCharFormat * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextCodec( n ) ( ( QTextCodec * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextCodec( n ) ( ( QTextCodec * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextCursor( n ) ( ( QTextCursor * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextCursor( n ) ( ( QTextCursor * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextDecoder( n ) ( ( QTextDecoder * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextDocument( n ) ( ( QTextDocument * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextDocumentFragment( n ) ( ( QTextDocumentFragment * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextDocumentWriter( n ) ( ( QTextDocumentWriter * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextEdit( n ) ( ( QTextEdit * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextEncoder( n ) ( ( QTextEncoder * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextEngine( n ) ( ( QTextEngine * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextFormat( n ) ( ( QTextFormat * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextFragment( n ) ( ( QTextFragment * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextFrame( n ) ( ( QTextFrame * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextFrameFormat( n ) ( ( QTextFrameFormat * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextImageFormat( n ) ( ( QTextImageFormat * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextInlineObject( n ) ( ( QTextInlineObject * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextItem( n ) ( ( QTextItem * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextList( n ) ( ( QTextList * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextLayout( n ) ( ( QTextLayout * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextLength( n ) ( ( QTextLength * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextLine( n ) ( ( QTextLine * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextListFormat( n ) ( ( QTextListFormat * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextObject( n ) ( ( QTextObject * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextOption( n ) ( ( QTextOption * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextStream( n ) ( ( QTextStream * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTextTableFormat( n ) ( ( QTextTableFormat * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QThread( n ) ( ( QThread * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTime( n ) ( ( QTime * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTimeEdit( n ) ( ( QTimeEdit * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTimer( n ) ( ( QTimer * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QToolBar( n ) ( ( QToolBar * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QToolBox( n ) ( ( QToolBox * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QToolButton( n ) ( ( QToolButton * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTransform( n ) ( ( QTransform * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTranslator( n ) ( ( QTranslator * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTreeView( n ) ( ( QTreeView * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTreeWidget( n ) ( ( QTreeWidget * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QTreeWidgetItem( n ) ( ( QTreeWidgetItem * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QUiLoader( n ) ( ( QUiLoader * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QUrl( n ) ( ( QUrl * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QValidator( n ) ( ( QValidator * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QVariant( n ) ( ( QVariant * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QVBoxLayout( n ) ( ( QVBoxLayout * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QVector( n ) ( ( QVector * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWheelEvent( n ) ( ( QWheelEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWidget( n ) ( ( QWidget * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWidgetAction( n ) ( ( QWidgetAction * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWidgetItem( n ) ( ( QWidgetItem * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWindowsStyle( n ) ( ( QWindowsStyle * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWindowSurface( n ) ( ( QWindowSurface * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWindowsXPStyle( n ) ( ( QWindowsXPStyle * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWindowStateChangeEvent( n ) ( ( QWindowStateChangeEvent * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWizard( n ) ( ( QWizard * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWizardPage( n ) ( ( QWizardPage * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWSEvent( n ) ( ( QWSEvent * ) hbqt_gcpointer( n ) ) - -#define hbqt_par_HBQAbstractItemModel( n ) ( ( HBQAbstractItemModel * ) hbqt_gcpointer( n ) ) -#define hbqt_par_HBEvents( n ) ( ( HBEvents * ) hbqt_gcpointer( n ) ) -#define hbqt_par_HBQMainWindow( n ) ( ( HBQMainWindow * ) hbqt_gcpointer( n ) ) -#define hbqt_par_HBQPlainTextEdit( n ) ( ( HBQPlainTextEdit * ) hbqt_gcpointer( n ) ) -#define hbqt_par_HBQTableView( n ) ( ( HBQTableView * ) hbqt_gcpointer( n ) ) -#define hbqt_par_HBQSyntaxHighlighter( n ) ( ( HBQSyntaxHighlighter * ) hbqt_gcpointer( n ) ) -#define hbqt_par_HBQTextBlockUserData( n ) ( ( HBQTextBlockUserData * ) hbqt_gcpointer( n ) ) -#define hbqt_par_HBSlots( n ) ( ( HBSlots * ) hbqt_gcpointer( n ) ) - #define hbqt_par_QString( n ) ( ( QString ) hb_parcx( n ) ) #define hbqt_par_uchar( n ) ( ( uchar * ) hb_parcx( n ) ) #define hbqt_par_QRgb( n ) ( hb_parnint( n ) ) @@ -413,6 +103,7 @@ extern HB_EXPORT void * hbqt_pPtrFromItem( PHB_ITEM pObj ); * HBQT_TYPE_(Qt class) */ +/* TOFIX: Move these to component headers */ #define HBQT_TYPE_ExtensionOption 1001 #define HBQT_TYPE_IUnknown 1002 #define HBQT_TYPE_QAbstractButton 1003 diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm index c5b3bd4b51..2460171880 100644 --- a/harbour/contrib/hbqt/hbqt_common.hbm +++ b/harbour/contrib/hbqt/hbqt_common.hbm @@ -18,7 +18,6 @@ -w3 -es2 -i. --iqtcore -iqtcore/g -stop{dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64} diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qsignalmapper.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qsignalmapper.txt index c765f0ec18..945720fd24 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qsignalmapper.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qsignalmapper.txt @@ -28,13 +28,11 @@ * $METHODS$ * :mapping( nId ) -> pQObject * :mapping_1( cId ) -> pQObject - * :mapping_2( pWidget ) -> pQObject - * :mapping_3( pObject ) -> pQObject + * :mapping_2( pObject ) -> pQObject * :removeMappings( pSender ) -> NIL * :setMapping( pSender, nId ) -> NIL * :setMapping_1( pSender, cText ) -> NIL - * :setMapping_2( pSender, pWidget ) -> NIL - * :setMapping_3( pSender, pObject ) -> NIL + * :setMapping_2( pSender, pObject ) -> NIL * :map() -> NIL * :map_1( pSender ) -> NIL * diff --git a/harbour/contrib/hbqt/qtcore/g/HBEvents.cpp b/harbour/contrib/hbqt/qtcore/g/HBEvents.cpp index 15a49505e1..2bb083b421 100644 --- a/harbour/contrib/hbqt/qtcore/g/HBEvents.cpp +++ b/harbour/contrib/hbqt/qtcore/g/HBEvents.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -69,7 +70,7 @@ #include #include -#include "../hbqt_hbevents.h" +#include "hbqt_hbevents.h" /* diff --git a/harbour/contrib/hbqt/qtcore/g/HBSlots.cpp b/harbour/contrib/hbqt/qtcore/g/HBSlots.cpp index 9d50f1b3e6..f9d3f8be82 100644 --- a/harbour/contrib/hbqt/qtcore/g/HBSlots.cpp +++ b/harbour/contrib/hbqt/qtcore/g/HBSlots.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -69,7 +70,7 @@ #include #include -#include "../hbqt_hbslots.h" +#include "hbqt_hbslots.h" /* diff --git a/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp index a0273ad686..3d79efcd2c 100644 --- a/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp index 91cf0769ce..bf7f6746c5 100644 --- a/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp index 45af2f5702..4982d4909b 100644 --- a/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QBitArray.cpp b/harbour/contrib/hbqt/qtcore/g/QBitArray.cpp index a2c8e68ced..46c76a3ee5 100644 --- a/harbour/contrib/hbqt/qtcore/g/QBitArray.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QBitArray.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp b/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp index 700d23f64e..e26bf1d2f2 100644 --- a/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp b/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp index db09014940..8770b378d3 100644 --- a/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QChar.cpp b/harbour/contrib/hbqt/qtcore/g/QChar.cpp index 0b3cbf9649..3d1b629a23 100644 --- a/harbour/contrib/hbqt/qtcore/g/QChar.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QChar.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp b/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp index 01b5ac7f0a..22feec37e9 100644 --- a/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QDataStream.cpp b/harbour/contrib/hbqt/qtcore/g/QDataStream.cpp index 9ed4034522..c780ac5718 100644 --- a/harbour/contrib/hbqt/qtcore/g/QDataStream.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QDataStream.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QDate.cpp b/harbour/contrib/hbqt/qtcore/g/QDate.cpp index 7ca69e38c2..6f5b85f2ce 100644 --- a/harbour/contrib/hbqt/qtcore/g/QDate.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QDate.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QDateTime.cpp b/harbour/contrib/hbqt/qtcore/g/QDateTime.cpp index 8040bb4465..2e1fca0d63 100644 --- a/harbour/contrib/hbqt/qtcore/g/QDateTime.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QDateTime.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QDir.cpp b/harbour/contrib/hbqt/qtcore/g/QDir.cpp index 302a5a8212..173a71907f 100644 --- a/harbour/contrib/hbqt/qtcore/g/QDir.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QDir.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QEvent.cpp b/harbour/contrib/hbqt/qtcore/g/QEvent.cpp index 588b1111df..e5dba3888d 100644 --- a/harbour/contrib/hbqt/qtcore/g/QEvent.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QEvent.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp b/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp index fdefd6c6fd..6914b5dc1f 100644 --- a/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QFile.cpp b/harbour/contrib/hbqt/qtcore/g/QFile.cpp index fa42783707..b5d0adc1dd 100644 --- a/harbour/contrib/hbqt/qtcore/g/QFile.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QFile.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp b/harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp index 520fae9ab9..771bda79f5 100644 --- a/harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp b/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp index de3a4e5ec4..8849171b1b 100644 --- a/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp b/harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp index 4209186840..830f8a11ca 100644 --- a/harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp b/harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp index 3a09879ad2..78ed427309 100644 --- a/harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QLine.cpp b/harbour/contrib/hbqt/qtcore/g/QLine.cpp index b668fd05eb..4281dc1c5c 100644 --- a/harbour/contrib/hbqt/qtcore/g/QLine.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QLine.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QLineF.cpp b/harbour/contrib/hbqt/qtcore/g/QLineF.cpp index 515bd76383..7e6adaf01a 100644 --- a/harbour/contrib/hbqt/qtcore/g/QLineF.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QLineF.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QList.cpp b/harbour/contrib/hbqt/qtcore/g/QList.cpp index 9507ba9403..835cda5d06 100644 --- a/harbour/contrib/hbqt/qtcore/g/QList.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QList.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QLocale.cpp b/harbour/contrib/hbqt/qtcore/g/QLocale.cpp index 1615bf4e9e..98b7ce19b2 100644 --- a/harbour/contrib/hbqt/qtcore/g/QLocale.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QLocale.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp b/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp index 9f06720346..b5e76c8813 100644 --- a/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp b/harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp index 7c0a8b973b..3e42d58bb5 100644 --- a/harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QObject.cpp b/harbour/contrib/hbqt/qtcore/g/QObject.cpp index e2eafa9672..540127f73f 100644 --- a/harbour/contrib/hbqt/qtcore/g/QObject.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QObject.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QPoint.cpp b/harbour/contrib/hbqt/qtcore/g/QPoint.cpp index ccc9b467e0..09ae07310f 100644 --- a/harbour/contrib/hbqt/qtcore/g/QPoint.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QPoint.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QPointF.cpp b/harbour/contrib/hbqt/qtcore/g/QPointF.cpp index e439bbbf42..02abc97379 100644 --- a/harbour/contrib/hbqt/qtcore/g/QPointF.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QPointF.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QProcess.cpp b/harbour/contrib/hbqt/qtcore/g/QProcess.cpp index e9911e0c18..f0622db019 100644 --- a/harbour/contrib/hbqt/qtcore/g/QProcess.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QProcess.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QRect.cpp b/harbour/contrib/hbqt/qtcore/g/QRect.cpp index e8439cde47..875fb1824f 100644 --- a/harbour/contrib/hbqt/qtcore/g/QRect.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QRect.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QRectF.cpp b/harbour/contrib/hbqt/qtcore/g/QRectF.cpp index 761ff361d5..2f6bffeecf 100644 --- a/harbour/contrib/hbqt/qtcore/g/QRectF.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QRectF.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QRegExp.cpp b/harbour/contrib/hbqt/qtcore/g/QRegExp.cpp index 8e2253f15e..7f28c23e59 100644 --- a/harbour/contrib/hbqt/qtcore/g/QRegExp.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QRegExp.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QResource.cpp b/harbour/contrib/hbqt/qtcore/g/QResource.cpp index 71288649a0..5fbc51c384 100644 --- a/harbour/contrib/hbqt/qtcore/g/QResource.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QResource.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QSettings.cpp b/harbour/contrib/hbqt/qtcore/g/QSettings.cpp index f1729d632b..3742ab78cb 100644 --- a/harbour/contrib/hbqt/qtcore/g/QSettings.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QSettings.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp b/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp index 63b197b583..38bb0b8991 100644 --- a/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -178,31 +179,17 @@ HB_FUNC( QT_QSIGNALMAPPER_MAPPING_1 ) } } -/* - * QObject * mapping ( QWidget * widget ) const - */ -HB_FUNC( QT_QSIGNALMAPPER_MAPPING_2 ) -{ - QSignalMapper * p = hbqt_par_QSignalMapper( 1 ); - if( p ) - hb_retptrGC( hbqt_gcAllocate_QObject( ( p )->mapping( hbqt_par_QWidget( 2 ) ), false ) ); - else - { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSIGNALMAPPER_MAPPING_2 FP=hb_retptrGC( hbqt_gcAllocate_QObject( ( p )->mapping( hbqt_par_QWidget( 2 ) ), false ) ); p is NULL" ) ); - } -} - /* * QObject * mapping ( QObject * object ) const */ -HB_FUNC( QT_QSIGNALMAPPER_MAPPING_3 ) +HB_FUNC( QT_QSIGNALMAPPER_MAPPING_2 ) { QSignalMapper * p = hbqt_par_QSignalMapper( 1 ); if( p ) hb_retptrGC( hbqt_gcAllocate_QObject( ( p )->mapping( hbqt_par_QObject( 2 ) ), false ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSIGNALMAPPER_MAPPING_3 FP=hb_retptrGC( hbqt_gcAllocate_QObject( ( p )->mapping( hbqt_par_QObject( 2 ) ), false ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSIGNALMAPPER_MAPPING_2 FP=hb_retptrGC( hbqt_gcAllocate_QObject( ( p )->mapping( hbqt_par_QObject( 2 ) ), false ) ); p is NULL" ) ); } } @@ -248,31 +235,17 @@ HB_FUNC( QT_QSIGNALMAPPER_SETMAPPING_1 ) } } -/* - * void setMapping ( QObject * sender, QWidget * widget ) - */ -HB_FUNC( QT_QSIGNALMAPPER_SETMAPPING_2 ) -{ - QSignalMapper * p = hbqt_par_QSignalMapper( 1 ); - if( p ) - ( p )->setMapping( hbqt_par_QObject( 2 ), hbqt_par_QWidget( 3 ) ); - else - { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSIGNALMAPPER_SETMAPPING_2 FP=( p )->setMapping( hbqt_par_QObject( 2 ), hbqt_par_QWidget( 3 ) ); p is NULL" ) ); - } -} - /* * void setMapping ( QObject * sender, QObject * object ) */ -HB_FUNC( QT_QSIGNALMAPPER_SETMAPPING_3 ) +HB_FUNC( QT_QSIGNALMAPPER_SETMAPPING_2 ) { QSignalMapper * p = hbqt_par_QSignalMapper( 1 ); if( p ) ( p )->setMapping( hbqt_par_QObject( 2 ), hbqt_par_QObject( 3 ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSIGNALMAPPER_SETMAPPING_3 FP=( p )->setMapping( hbqt_par_QObject( 2 ), hbqt_par_QObject( 3 ) ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSIGNALMAPPER_SETMAPPING_2 FP=( p )->setMapping( hbqt_par_QObject( 2 ), hbqt_par_QObject( 3 ) ); p is NULL" ) ); } } diff --git a/harbour/contrib/hbqt/qtcore/g/QSize.cpp b/harbour/contrib/hbqt/qtcore/g/QSize.cpp index 1d0348d678..7ba61ab4d3 100644 --- a/harbour/contrib/hbqt/qtcore/g/QSize.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QSize.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QSizeF.cpp b/harbour/contrib/hbqt/qtcore/g/QSizeF.cpp index 8fdc762ff9..f64dc95d9f 100644 --- a/harbour/contrib/hbqt/qtcore/g/QSizeF.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QSizeF.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QStringList.cpp b/harbour/contrib/hbqt/qtcore/g/QStringList.cpp index 4af501e612..df30119579 100644 --- a/harbour/contrib/hbqt/qtcore/g/QStringList.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QStringList.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp b/harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp index 5ee55aa2bf..f8e3634157 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp b/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp index 7c327d38b5..2f65f806ea 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp b/harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp index 5ce41ba3dc..eaf3049527 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp b/harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp index 7b465e764b..373e4114f0 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QTextStream.cpp b/harbour/contrib/hbqt/qtcore/g/QTextStream.cpp index b5d34796b1..cead4a29b8 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTextStream.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTextStream.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QThread.cpp b/harbour/contrib/hbqt/qtcore/g/QThread.cpp index d46981be3f..7f8d7c89c0 100644 --- a/harbour/contrib/hbqt/qtcore/g/QThread.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QThread.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QTime.cpp b/harbour/contrib/hbqt/qtcore/g/QTime.cpp index 91d512d01d..e915d24601 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTime.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTime.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QTimer.cpp b/harbour/contrib/hbqt/qtcore/g/QTimer.cpp index e361c1c26e..94b5d64670 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTimer.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTimer.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp b/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp index 222ec271c2..a0e6085ff7 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QUrl.cpp b/harbour/contrib/hbqt/qtcore/g/QUrl.cpp index f83f2f12f5..9528ded1f4 100644 --- a/harbour/contrib/hbqt/qtcore/g/QUrl.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QUrl.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/QVariant.cpp b/harbour/contrib/hbqt/qtcore/g/QVariant.cpp index 7026329e89..dcc77dc93e 100644 --- a/harbour/contrib/hbqt/qtcore/g/QVariant.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QVariant.cpp @@ -61,6 +61,7 @@ #include "hbqt.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtcore/g/TQSignalMapper.prg b/harbour/contrib/hbqt/qtcore/g/TQSignalMapper.prg index 20c6564eea..1da1fe3593 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQSignalMapper.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQSignalMapper.prg @@ -69,13 +69,11 @@ CREATE CLASS QSignalMapper INHERIT HbQtObjectHandler, QObject METHOD mapping( nId ) METHOD mapping_1( cId ) - METHOD mapping_2( pWidget ) - METHOD mapping_3( pObject ) + METHOD mapping_2( pObject ) METHOD removeMappings( pSender ) METHOD setMapping( pSender, nId ) METHOD setMapping_1( pSender, cText ) - METHOD setMapping_2( pSender, pWidget ) - METHOD setMapping_3( pSender, pObject ) + METHOD setMapping_2( pSender, pObject ) METHOD map() METHOD map_1( pSender ) @@ -99,12 +97,8 @@ METHOD QSignalMapper:mapping_1( cId ) RETURN Qt_QSignalMapper_mapping_1( ::pPtr, cId ) -METHOD QSignalMapper:mapping_2( pWidget ) - RETURN Qt_QSignalMapper_mapping_2( ::pPtr, hbqt_ptr( pWidget ) ) - - -METHOD QSignalMapper:mapping_3( pObject ) - RETURN Qt_QSignalMapper_mapping_3( ::pPtr, hbqt_ptr( pObject ) ) +METHOD QSignalMapper:mapping_2( pObject ) + RETURN Qt_QSignalMapper_mapping_2( ::pPtr, hbqt_ptr( pObject ) ) METHOD QSignalMapper:removeMappings( pSender ) @@ -119,12 +113,8 @@ METHOD QSignalMapper:setMapping_1( pSender, cText ) RETURN Qt_QSignalMapper_setMapping_1( ::pPtr, hbqt_ptr( pSender ), cText ) -METHOD QSignalMapper:setMapping_2( pSender, pWidget ) - RETURN Qt_QSignalMapper_setMapping_2( ::pPtr, hbqt_ptr( pSender ), hbqt_ptr( pWidget ) ) - - -METHOD QSignalMapper:setMapping_3( pSender, pObject ) - RETURN Qt_QSignalMapper_setMapping_3( ::pPtr, hbqt_ptr( pSender ), hbqt_ptr( pObject ) ) +METHOD QSignalMapper:setMapping_2( pSender, pObject ) + RETURN Qt_QSignalMapper_setMapping_2( ::pPtr, hbqt_ptr( pSender ), hbqt_ptr( pObject ) ) METHOD QSignalMapper:map() diff --git a/harbour/contrib/hbqt/qtcore/g/hbqtcore.h b/harbour/contrib/hbqt/qtcore/g/hbqtcore.h new file mode 100644 index 0000000000..556145768b --- /dev/null +++ b/harbour/contrib/hbqt/qtcore/g/hbqtcore.h @@ -0,0 +1,68 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +#include "hbqt.h" + +#ifndef __HBQTCORE_H +#define __HBQTCORE_H + +#define hbqt_par_HBEvents( n ) ( ( HBEvents * ) hbqt_gcpointer( n ) ) +#define hbqt_par_HBSlots( n ) ( ( HBSlots * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractItemModel( n ) ( ( QAbstractItemModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractListModel( n ) ( ( QAbstractListModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractTableModel( n ) ( ( QAbstractTableModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QBitArray( n ) ( ( QBitArray * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QBuffer( n ) ( ( QBuffer * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QByteArray( n ) ( ( QByteArray * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QChar( n ) ( ( QChar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QCoreApplication( n ) ( ( QCoreApplication * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDataStream( n ) ( ( QDataStream * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDate( n ) ( ( QDate * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDateTime( n ) ( ( QDateTime * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDir( n ) ( ( QDir * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QEvent( n ) ( ( QEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QEventLoop( n ) ( ( QEventLoop * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFile( n ) ( ( QFile * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFileInfo( n ) ( ( QFileInfo * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QIODevice( n ) ( ( QIODevice * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLatin1Char( n ) ( ( QLatin1Char * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLatin1String( n ) ( ( QLatin1String * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLine( n ) ( ( QLine * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLineF( n ) ( ( QLineF * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QList( n ) ( ( QList< void * > * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLocale( n ) ( ( QLocale * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMimeData( n ) ( ( QMimeData * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QModelIndex( n ) ( ( QModelIndex * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QObject( n ) ( ( QObject * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPoint( n ) ( ( QPoint * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPointF( n ) ( ( QPointF * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QProcess( n ) ( ( QProcess * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QRect( n ) ( ( QRect * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QRectF( n ) ( ( QRectF * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QRegExp( n ) ( ( QRegExp * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QResource( n ) ( ( QResource * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSettings( n ) ( ( QSettings * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSignalMapper( n ) ( ( QSignalMapper * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSize( n ) ( ( QSize * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSizeF( n ) ( ( QSizeF * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStringList( n ) ( ( QStringList * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextBoundaryFinder( n ) ( ( QTextBoundaryFinder * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextCodec( n ) ( ( QTextCodec * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextDecoder( n ) ( ( QTextDecoder * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextEncoder( n ) ( ( QTextEncoder * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextStream( n ) ( ( QTextStream * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QThread( n ) ( ( QThread * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTime( n ) ( ( QTime * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTimer( n ) ( ( QTimer * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTranslator( n ) ( ( QTranslator * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QUrl( n ) ( ( QUrl * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QVariant( n ) ( ( QVariant * ) hbqt_gcpointer( n ) ) + +#endif /* __HBQTCORE_H */ diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbevents.h b/harbour/contrib/hbqt/qtcore/hbqt_hbevents.h index e902b118e5..6eb02df24a 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbevents.h +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbevents.h @@ -60,6 +60,7 @@ /*----------------------------------------------------------------------*/ #include "hbqtcore_garbage.h" +#include "hbqtcore.h" #include #include diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h b/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h index 1272941bcc..180026f781 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h @@ -58,6 +58,7 @@ #include "hbapiitm.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /* TOFIX: QtGui components should not be accessed from this component */ #include diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbp b/harbour/contrib/hbqt/qtcore/hbqtcore.hbp index 59c478ba76..6702231fb4 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbp +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbp @@ -7,6 +7,7 @@ g/filelist.hbm hbqtcore.hbm +-i. -ig hbqtcores.hbp diff --git a/harbour/contrib/hbqt/qtcore/hbqtcores.hbp b/harbour/contrib/hbqt/qtcore/hbqtcores.hbp index 42e92d1886..40b960f8ec 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcores.hbp +++ b/harbour/contrib/hbqt/qtcore/hbqtcores.hbp @@ -7,4 +7,5 @@ g/filelist.hbm hbqtcore.hbm +-i. -ig diff --git a/harbour/contrib/hbqt/qtcore/qth/HBEvents.qth b/harbour/contrib/hbqt/qtcore/qth/HBEvents.qth index c53953fc67..4efc3e5a4b 100644 --- a/harbour/contrib/hbqt/qtcore/qth/HBEvents.qth +++ b/harbour/contrib/hbqt/qtcore/qth/HBEvents.qth @@ -55,9 +55,9 @@ ; -QObject = +QObject = Inherits = QObject -Type = +Type = New = @@ -69,11 +69,11 @@ New = #include -#include "../hbqt_hbevents.h" +#include "hbqt_hbevents.h" /* - * HBEvents() + * HBEvents() * ~HBEvents() * */ diff --git a/harbour/contrib/hbqt/qtcore/qth/HBSlots.qth b/harbour/contrib/hbqt/qtcore/qth/HBSlots.qth index 99cfe92ba7..231c6fa536 100644 --- a/harbour/contrib/hbqt/qtcore/qth/HBSlots.qth +++ b/harbour/contrib/hbqt/qtcore/qth/HBSlots.qth @@ -55,9 +55,9 @@ ; -QObject = +QObject = Inherits = QObject -Type = +Type = New = @@ -69,7 +69,7 @@ New = #include -#include "../hbqt_hbslots.h" +#include "hbqt_hbslots.h" /* diff --git a/harbour/contrib/hbqt/qtcore/qth/QSignalMapper.qth b/harbour/contrib/hbqt/qtcore/qth/QSignalMapper.qth index bef19bb185..7a0510eb15 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QSignalMapper.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QSignalMapper.qth @@ -76,12 +76,12 @@ HB_FUNC( QT_QSIGNALMAPPER ) QObject * mapping ( int id ) const QObject * mapping ( const QString & id ) const -QObject * mapping ( QWidget * widget ) const +// QObject * mapping ( QWidget * widget ) const QObject * mapping ( QObject * object ) const void removeMappings ( QObject * sender ) void setMapping ( QObject * sender, int id ) void setMapping ( QObject * sender, const QString & text ) -void setMapping ( QObject * sender, QWidget * widget ) +// void setMapping ( QObject * sender, QWidget * widget ) void setMapping ( QObject * sender, QObject * object ) @@ -93,7 +93,6 @@ void map ( QObject * sender ) void mapped ( int i ) void mapped ( const QString & text ) -void mapped ( QWidget * widget ) +// void mapped ( QWidget * widget ) void mapped ( QObject * object ) - diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp index 1a99fe1b5d..ca995baa01 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtdesigner_garbage.h" +#include "hbqtdesigner.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp index 28a8c9a2d9..29ef2728e0 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtdesigner_garbage.h" +#include "hbqtdesigner.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp index b88e249356..558e5622fe 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtdesigner_garbage.h" +#include "hbqtdesigner.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -75,7 +77,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp index 8a448c55a4..69adb416a0 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtdesigner_garbage.h" +#include "hbqtdesigner.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -75,7 +77,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp index 4c3b15f2d8..54beec492d 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtdesigner_garbage.h" +#include "hbqtdesigner.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp index ac625b2d3e..c1e1e2b02b 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtdesigner_garbage.h" +#include "hbqtdesigner.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp index c09b4cad48..89ba717090 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtdesigner_garbage.h" +#include "hbqtdesigner.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp index 7a10cda0b2..057dcd32f1 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtdesigner_garbage.h" +#include "hbqtdesigner.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner.h b/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner.h new file mode 100644 index 0000000000..3da69874fd --- /dev/null +++ b/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner.h @@ -0,0 +1,25 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +#include "hbqt.h" + +#ifndef __HBQTDESIGNER_H +#define __HBQTDESIGNER_H + +#define hbqt_par_QDesignerActionEditorInterface( n )( ( QDesignerActionEditorInterfa* ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDesignerFormEditorInterface( n ) ( ( QDesignerFormEditorInterface* ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDesignerFormWindowCursorInterface(( ( QDesignerFormWindowCursorInt* ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDesignerFormWindowInterface( n ) ( ( QDesignerFormWindowInterface* ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDesignerFormWindowManagerInterface( ( QDesignerFormWindowManagerIn* ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDesignerObjectInspectorInterface( ( ( QDesignerObjectInspectorInte* ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDesignerPropertyEditorInterface( n( ( QDesignerPropertyEditorInter* ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDesignerWidgetBoxInterface( n ) ( ( QDesignerWidgetBoxInterface * ) hbqt_gcpointer( n ) ) + +#endif /* __HBQTDESIGNER_H */ diff --git a/harbour/contrib/hbqt/qtdesigner/hbqt_local.h b/harbour/contrib/hbqt/qtdesigner/hbqt_local.h deleted file mode 100644 index a279987d2f..0000000000 --- a/harbour/contrib/hbqt/qtdesigner/hbqt_local.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * QT wrapper main header - * - * Copyright 2010 Pritpal Bedi - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ -/*----------------------------------------------------------------------*/ - - -#ifndef __HBQT_LOCAL_H -#define __HBQT_LOCAL_H - -#define hbqt_par_QDesignerActionEditorInterface( n ) ( ( QDesignerActionEditorInterface * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDesignerFormEditorInterface( n ) ( ( QDesignerFormEditorInterface * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDesignerFormWindowCursorInterface( n ) ( ( QDesignerFormWindowCursorInterface * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDesignerFormWindowInterface( n ) ( ( QDesignerFormWindowInterface * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDesignerFormWindowManagerInterface( n ) ( ( QDesignerFormWindowManagerInterface * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDesignerObjectInspectorInterface( n ) ( ( QDesignerObjectInspectorInterface * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDesignerPropertyEditorInterface( n ) ( ( QDesignerPropertyEditorInterface * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QDesignerWidgetBoxInterface( n ) ( ( QDesignerWidgetBoxInterface * ) hbqt_gcpointer( n ) ) - -#endif /* __HBQT_LOCAL_H */ diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth index d6c4a42def..540b549dd4 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth @@ -70,7 +70,6 @@ folder = hbqtdesigner #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth index 4f62bed9c9..09f047bcce 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth @@ -70,7 +70,6 @@ folder = hbqtdesigner #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth index cb495867b2..07a868d5ce 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth @@ -70,7 +70,6 @@ folder = hbqtdesigner #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth index 78bd22894f..841c99853f 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth @@ -70,7 +70,6 @@ folder = hbqtdesigner #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth index 2369485cf9..66d56bb81f 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth @@ -70,7 +70,6 @@ folder = hbqtdesigner #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth index 447816f931..fadb8f5cc7 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth @@ -70,7 +70,6 @@ folder = hbqtdesigner #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth index bd4ade912a..98f4a796c2 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth @@ -70,7 +70,6 @@ folder = hbqtdesigner #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth index d8ca564300..f4a50e5e66 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth @@ -70,7 +70,6 @@ folder = hbqtdesigner #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintengine.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintengine.txt index 2a8404b98d..b18d27efe4 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintengine.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintengine.txt @@ -49,7 +49,6 @@ * :painter() -> pQPainter * :setActive( lState ) -> NIL * :type() -> nType - * :updateState( pState ) -> NIL * * $DESCRIPTION$ * diff --git a/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp b/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp index 5846892e7b..1476729b26 100644 --- a/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,7 @@ #include #include -#include "../hbqt_hbqabstractitemmodel.h" +#include "hbqt_hbqabstractitemmodel.h" /* diff --git a/harbour/contrib/hbqt/qtgui/g/HBQMainWindow.cpp b/harbour/contrib/hbqt/qtgui/g/HBQMainWindow.cpp index cc2e48b0c3..b9bf72e615 100644 --- a/harbour/contrib/hbqt/qtgui/g/HBQMainWindow.cpp +++ b/harbour/contrib/hbqt/qtgui/g/HBQMainWindow.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,7 @@ #include #include -#include "../hbqt_hbqmainwindow.h" +#include "hbqt_hbqmainwindow.h" /* diff --git a/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp index 3d4f475213..296bc7dbb1 100644 --- a/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -71,7 +73,7 @@ #include -#include "../hbqt_hbqplaintextedit.h" +#include "hbqt_hbqplaintextedit.h" /* * HBQPlainTextEdit ( QWidget * parent = 0 ) diff --git a/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp index 2a8239e385..48275e081e 100644 --- a/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,7 @@ #include #include -#include "../hbqt_hbqsyntaxhighlighter.h" +#include "hbqt_hbqsyntaxhighlighter.h" /* * diff --git a/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp b/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp index 928b7b464e..8ccc08d6fd 100644 --- a/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp +++ b/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,7 @@ #include #include -#include "../hbqt_hbqtableview.h" +#include "hbqt_hbqtableview.h" /* diff --git a/harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp b/harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp index 6c90d0a8ef..437e6f796d 100644 --- a/harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp +++ b/harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,7 @@ #include #include -#include "../hbqt_hbqsyntaxhighlighter.h" +#include "hbqt_hbqsyntaxhighlighter.h" /* * HBQTextBlockUserData() diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp index a2312f0291..63932febb6 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp index 04e16ba395..499c480cb5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp index 54d0270832..950654e295 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp index 0d0339f387..39610675ba 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp index 084a2ba441..85e4726485 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp index 8fc16a93ff..92bbe79d34 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp index fa26e5e4ba..335352a12d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp index 032c3224de..2942409102 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp index 0ffdeaa657..1239bd2f6f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QAction.cpp b/harbour/contrib/hbqt/qtgui/g/QAction.cpp index 61164a05aa..3b4bfcdf17 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAction.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAction.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp index 56711fa238..761c0cd276 100644 --- a/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp index 1192a7fca1..95bda0fb6a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QBitmap.cpp b/harbour/contrib/hbqt/qtgui/g/QBitmap.cpp index 763cd45cf0..a7890551dd 100644 --- a/harbour/contrib/hbqt/qtgui/g/QBitmap.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QBitmap.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp index aeed2a0415..57c334a54d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QBrush.cpp b/harbour/contrib/hbqt/qtgui/g/QBrush.cpp index c7c57e6418..8dfbab5eb1 100644 --- a/harbour/contrib/hbqt/qtgui/g/QBrush.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QBrush.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp index 7b47cbcbfd..19b2d867f1 100644 --- a/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp index ae37873efb..9a76221658 100644 --- a/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp b/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp index 3f77d7f575..9bcb57e539 100644 --- a/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QClipboard.cpp b/harbour/contrib/hbqt/qtgui/g/QClipboard.cpp index e38e4be45f..fe607891d0 100644 --- a/harbour/contrib/hbqt/qtgui/g/QClipboard.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QClipboard.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QColor.cpp b/harbour/contrib/hbqt/qtgui/g/QColor.cpp index 42c77f0d64..d05b24edb3 100644 --- a/harbour/contrib/hbqt/qtgui/g/QColor.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QColor.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp index 7c11b9d8bc..dc842143ae 100644 --- a/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp index 603d28a16c..1466abd422 100644 --- a/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp b/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp index 86f113d183..85bfd03618 100644 --- a/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp b/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp index 6413c98015..c5baf1dfca 100644 --- a/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp b/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp index f80ba567e5..13e542d11f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp index 94088ad504..a60f10bfb7 100644 --- a/harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp index 3a2ce23269..7d59f7261f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QCursor.cpp b/harbour/contrib/hbqt/qtgui/g/QCursor.cpp index 9fd5df368a..f43860e8b5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QCursor.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QCursor.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp index 3e3c8de24e..8b963415ec 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp index 854f248633..d70833c6b3 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp index bc6a03088b..eac8a8ba0f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QDial.cpp b/harbour/contrib/hbqt/qtgui/g/QDial.cpp index 48e91aef90..e5d7039255 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDial.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDial.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QDialog.cpp index afe2f73a7f..c2a07fe7bd 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDialog.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp b/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp index 81a275041c..34ab08c6dd 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp index eca4445a43..ff14c8e85b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp index 90ec928e81..f2bb2e0f26 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp index 8cd89a076e..7178f7b7c2 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp index 0a995b7b15..2d7b5d319a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp index 8a0c12834e..c00ce8ee93 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp index c29bacc20b..4d34fe4946 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp b/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp index 903e354ec2..7f4ba20ed7 100644 --- a/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp index 6edac65492..0f8452792d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp b/harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp index 6be04886d1..68de78d28a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp b/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp index c845ffc86f..2325fdacfe 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp index 6adffdf279..530e9f689e 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp index f82b9f793f..8238a736ee 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QFont.cpp b/harbour/contrib/hbqt/qtgui/g/QFont.cpp index 8506975949..9a3888c302 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFont.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFont.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp index 1390e11e7f..adc0a44570 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp b/harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp index 29f4226572..02241ee823 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp index 700a21174e..19897cbb97 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp b/harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp index 729f8aeaa6..fd3ff87ced 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp b/harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp index a3701fcf19..05a1ecf055 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp b/harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp index 96f158faa2..7245014fd4 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp index c7dae19af0..73e40b5412 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QFrame.cpp index c939bc6997..bc95a545c5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFrame.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QGradient.cpp index c24e1ee341..c12769f8f1 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGradient.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp index 30e7a8565e..98a7de5ca8 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp b/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp index fa329677ee..5b08d13734 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp index ff2a871851..80e4810886 100644 --- a/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp b/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp index 11da32fd92..df5e6f97ea 100644 --- a/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp index 954e5822b6..87bae9b83b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp index ebc9f069a8..20663ba68a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QIcon.cpp b/harbour/contrib/hbqt/qtgui/g/QIcon.cpp index da14010525..2f8e2268ad 100644 --- a/harbour/contrib/hbqt/qtgui/g/QIcon.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QIcon.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QImage.cpp b/harbour/contrib/hbqt/qtgui/g/QImage.cpp index 1e0d5a1c70..184d44cec2 100644 --- a/harbour/contrib/hbqt/qtgui/g/QImage.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QImage.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QImageReader.cpp b/harbour/contrib/hbqt/qtgui/g/QImageReader.cpp index d14a1e1e74..9247d431e5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QImageReader.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QImageReader.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp b/harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp index ecfa0236ac..ef6ab72e90 100644 --- a/harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QInputContext.cpp b/harbour/contrib/hbqt/qtgui/g/QInputContext.cpp deleted file mode 100644 index 1dc1bbbbea..0000000000 --- a/harbour/contrib/hbqt/qtgui/g/QInputContext.cpp +++ /dev/null @@ -1,218 +0,0 @@ -/* - * $Id$ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -/* - * Harbour Project source code: - * QT wrapper main header - * - * Copyright 2009-2010 Pritpal Bedi - * - * Copyright 2009 Marcos Antonio Gambeta - * 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 "../hbqt.h" - -/*----------------------------------------------------------------------*/ -#if QT_VERSION >= 0x040500 -/*----------------------------------------------------------------------*/ - -/* - * enum StandardFormat { PreeditFormat, SelectionFormat } - */ - -/* - * Constructed[ 11/13 [ 84.62% ] ] - * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * virtual QList actions () - * - * *** Commented out protos which construct fine but do not compile *** - * - * // virtual bool x11FilterEvent ( QWidget * keywidget, XEvent * event ) - */ - -#include - -#include -#include - -/* QInputContext ( QObject * parent = 0 ) - * virtual ~QInputContext () - */ - -typedef struct -{ - void * ph; - bool bNew; - QT_G_FUNC_PTR func; - QPointer< QInputContext > pq; -} QGC_POINTER_QInputContext; - -QT_G_FUNC( hbqt_gcRelease_QInputContext ) -{ - HB_SYMBOL_UNUSED( Cargo ); -} - -void * hbqt_gcAllocate_QInputContext( void * pObj, bool bNew ) -{ - QGC_POINTER_QInputContext * p = ( QGC_POINTER_QInputContext * ) hb_gcAllocate( sizeof( QGC_POINTER_QInputContext ), hbqt_gcFuncs() ); - - p->ph = pObj; - p->bNew = bNew; - p->func = hbqt_gcRelease_QInputContext; - - if( bNew ) - { - new( & p->pq ) QPointer< QInputContext >( ( QInputContext * ) pObj ); - HB_TRACE( HB_TR_DEBUG, ( " _new_QInputContext ph=%p", pObj ) ); - } - return p; -} - -HB_FUNC( QT_QINPUTCONTEXT ) -{ -} - -/* - * virtual bool filterEvent ( const QEvent * event ) - */ -HB_FUNC( QT_QINPUTCONTEXT_FILTEREVENT ) -{ - hb_retl( hbqt_par_QInputContext( 1 )->filterEvent( hbqt_par_QEvent( 2 ) ) ); -} - -/* - * virtual QFont font () const - */ -HB_FUNC( QT_QINPUTCONTEXT_FONT ) -{ - hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QInputContext( 1 )->font() ), true ) ); -} - -/* - * virtual QString identifierName () = 0 - */ -HB_FUNC( QT_QINPUTCONTEXT_IDENTIFIERNAME ) -{ - hb_retc( hbqt_par_QInputContext( 1 )->identifierName().toAscii().data() ); -} - -/* - * virtual bool isComposing () const = 0 - */ -HB_FUNC( QT_QINPUTCONTEXT_ISCOMPOSING ) -{ - hb_retl( hbqt_par_QInputContext( 1 )->isComposing() ); -} - -/* - * virtual QString language () = 0 - */ -HB_FUNC( QT_QINPUTCONTEXT_LANGUAGE ) -{ - hb_retc( hbqt_par_QInputContext( 1 )->language().toAscii().data() ); -} - -/* - * virtual void mouseHandler ( int x, QMouseEvent * event ) - */ -HB_FUNC( QT_QINPUTCONTEXT_MOUSEHANDLER ) -{ - hbqt_par_QInputContext( 1 )->mouseHandler( hb_parni( 2 ), hbqt_par_QMouseEvent( 3 ) ); -} - -/* - * virtual void reset () = 0 - */ -HB_FUNC( QT_QINPUTCONTEXT_RESET ) -{ - hbqt_par_QInputContext( 1 )->reset(); -} - -/* - * void sendEvent ( const QInputMethodEvent & event ) - */ -HB_FUNC( QT_QINPUTCONTEXT_SENDEVENT ) -{ - hbqt_par_QInputContext( 1 )->sendEvent( *hbqt_par_QInputMethodEvent( 2 ) ); -} - -/* - * QTextFormat standardFormat ( StandardFormat s ) const - */ -HB_FUNC( QT_QINPUTCONTEXT_STANDARDFORMAT ) -{ - hb_retptrGC( hbqt_gcAllocate_QTextFormat( new QTextFormat( hbqt_par_QInputContext( 1 )->standardFormat( ( QInputContext::StandardFormat ) hb_parni( 2 ) ) ), true ) ); -} - -/* - * virtual void update () - */ -HB_FUNC( QT_QINPUTCONTEXT_UPDATE ) -{ - hbqt_par_QInputContext( 1 )->update(); -} - -/* - * virtual void widgetDestroyed ( QWidget * widget ) - */ -HB_FUNC( QT_QINPUTCONTEXT_WIDGETDESTROYED ) -{ - hbqt_par_QInputContext( 1 )->widgetDestroyed( hbqt_par_QWidget( 2 ) ); -} - - -/*----------------------------------------------------------------------*/ -#endif /* #if QT_VERSION >= 0x040500 */ -/*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp index 3b4404c109..af803d03b8 100644 --- a/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp index 0cb17ad406..d52ab469e5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp index 37220b8fd1..554cf67f44 100644 --- a/harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp index 2521fcf5f4..0f78ac86ed 100644 --- a/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp b/harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp index 6bfe1c7705..f1c63499e6 100644 --- a/harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp b/harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp index 5a1aead47c..ca857632c5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp b/harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp index 0ef429a0b2..1a75e5b08b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp b/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp index 4c3a13cc1d..be5ee1fbf1 100644 --- a/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp index e16a566d3a..0a87858167 100644 --- a/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp b/harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp index 4a64c9f70a..76e929737e 100644 --- a/harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp b/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp index f15e60cd24..752f1913b5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QLabel.cpp b/harbour/contrib/hbqt/qtgui/g/QLabel.cpp index bcdead7d53..0c88724d87 100644 --- a/harbour/contrib/hbqt/qtgui/g/QLabel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QLabel.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QLayout.cpp index a738329cd0..d993b7ea96 100644 --- a/harbour/contrib/hbqt/qtgui/g/QLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QLayout.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp b/harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp index 82d3f621b4..1bba1ddd45 100644 --- a/harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp index 068e40b557..2ad656f8ce 100644 --- a/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp index 62396962a9..5fcb0746b5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QListView.cpp b/harbour/contrib/hbqt/qtgui/g/QListView.cpp index 6697884305..6f217dad3b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QListView.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QListView.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp index 3ff0abc2f6..08da364192 100644 --- a/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp index bbc96d1f43..487ce3b3b1 100644 --- a/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp b/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp index edbbf396e0..2cf7f2f2be 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QMatrix.cpp b/harbour/contrib/hbqt/qtgui/g/QMatrix.cpp index 0e34d3f332..3ee620b3a2 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMatrix.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMatrix.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp b/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp index 89f7697109..2667c20832 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp b/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp index 13553115c8..99880e08dc 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QMenu.cpp b/harbour/contrib/hbqt/qtgui/g/QMenu.cpp index 3921679090..325fc1fd6d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMenu.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMenu.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp b/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp index ac2c6162db..2f6bbd2e3f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp b/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp index 547ce98c29..99462bf29a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp index c22f11b9f8..030ee1f59a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp index b91ed3d3fa..af2094d5b4 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QMovie.cpp b/harbour/contrib/hbqt/qtgui/g/QMovie.cpp index 946d36096b..d48b955353 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMovie.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMovie.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp index 0dd34a3b52..695e94c50b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp b/harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp index d8ec7bbd70..5101e9b7ef 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp b/harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp index ead7722656..dc509070c0 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -452,20 +454,6 @@ HB_FUNC( QT_QPAINTENGINE_TYPE ) } } -/* - * virtual void updateState ( const QPaintEngineState & state ) = 0 - */ -HB_FUNC( QT_QPAINTENGINE_UPDATESTATE ) -{ - QPaintEngine * p = hbqt_par_QPaintEngine( 1 ); - if( p ) - ( p )->updateState( *hbqt_par_QPaintEngineState( 2 ) ); - else - { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QPAINTENGINE_UPDATESTATE FP=( p )->updateState( *hbqt_par_QPaintEngineState( 2 ) ); p is NULL" ) ); - } -} - /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ diff --git a/harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp index d38c0e79dd..f1238849fe 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPainter.cpp b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp index 4397b927e4..7b9e17cf36 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPainter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp b/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp index 227344bb36..68368bafc9 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPalette.cpp b/harbour/contrib/hbqt/qtgui/g/QPalette.cpp index 827d478543..c315e9b85a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPalette.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPalette.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPen.cpp b/harbour/contrib/hbqt/qtgui/g/QPen.cpp index 88e5823fad..0725d7d4ad 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPen.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPen.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPicture.cpp b/harbour/contrib/hbqt/qtgui/g/QPicture.cpp index b276cd9e45..8e0299845a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPicture.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPicture.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp b/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp index e74be9e7bc..7e79837860 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp index b51b0dce8f..3dba12f096 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp index 1210deea0d..c296ed3f7a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPolygon.cpp b/harbour/contrib/hbqt/qtgui/g/QPolygon.cpp index 46610eabbb..148db5f9b1 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPolygon.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPolygon.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp b/harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp index fcca333cde..37739b48c5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp index bf09cb9af1..131bce6bfe 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp b/harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp index b3ff707230..58793f0d21 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp index b186cb9ed4..7850d6a2c8 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPrinter.cpp b/harbour/contrib/hbqt/qtgui/g/QPrinter.cpp index b199568960..767485d902 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPrinter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPrinter.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp b/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp index c1934f7e6e..b5ff0ef624 100644 --- a/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp index 7e1ae67052..0d7eeaf052 100644 --- a/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp b/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp index 6bed9b4287..cfdf81f96e 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp index 05efa636e8..0aef5470a5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp b/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp index 8c9eaf5bad..49f82ba392 100644 --- a/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QRegion.cpp b/harbour/contrib/hbqt/qtgui/g/QRegion.cpp index 9786c1e47d..0eccec1224 100644 --- a/harbour/contrib/hbqt/qtgui/g/QRegion.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QRegion.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp index fb22903468..e0d79e53c0 100644 --- a/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp b/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp index 4d81599bd6..67f4beedb5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp b/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp index d73cfdad9f..30233bd266 100644 --- a/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp b/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp index 4f4bdca0f3..9a86833132 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp index fd8e4d61b8..bcb45d1bce 100644 --- a/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp index 2aad977c35..cabee7cfc0 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp b/harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp index 4fd1b8adc1..4c7e99c251 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QSlider.cpp b/harbour/contrib/hbqt/qtgui/g/QSlider.cpp index 1f849f695c..1c78aae5f5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSlider.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSlider.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QSound.cpp b/harbour/contrib/hbqt/qtgui/g/QSound.cpp index abc7e184e0..bba901a73e 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSound.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSound.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp b/harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp index ed184d389f..69bd2ecc29 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp index cee5e76403..7646dbd419 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp b/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp index 07984597c3..339c010e86 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp b/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp index 796ea1571d..d23f0d6f75 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp index 7c7fb481ba..fac8a987bc 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp index eb71046e4f..4eb0f15837 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp b/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp index 3a9ddcaeb4..40ff1b2e24 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp index fcaa137888..f5bac9beb8 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp b/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp index b8e0cb6743..e758775580 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyle.cpp b/harbour/contrib/hbqt/qtgui/g/QStyle.cpp index 5eb9a666ab..9bf1587001 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyle.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp index b1bf232f71..8a8a994e1f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp index 8b40608683..4527d2cbb5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp index 63dc05519c..40e58beca9 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp index 03ff9aba5f..a14d95238c 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp index 77faa8e480..59bf9d6508 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp index 60795917d5..f38eca6f7b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp index 96cc907c88..6e63f2c3e7 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp index ff47189203..c986b21db1 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp index cb6b47e510..6fdb2b66e6 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp index 77ed743b1d..049436c889 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp index 6d45c99b58..36d6a2ffc6 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp index 7aa473ddff..8b1eb907d2 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp index f91357d8f4..47e10ee9ca 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp index 14812d0440..b4229c883b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp index ca1f48dd3f..eb8322f714 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp index f4558f057c..eb4541ef9b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp index 0d23b2da54..9f082ecf2b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp index b7e8aa7cbc..dd914522a8 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp index 92bf9e1592..4ad07ddcc9 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp index b8aae3e65f..7549e71400 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp index c68251a530..6f41e11dd2 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp index 49b5b1340f..4d759d3964 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp index 6fd7f9f214..11c4510d20 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp index 898765e538..303be17c0a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp index 5e77a4e0d9..0ae3977a4e 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp index ab472dff29..77d1871b56 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp b/harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp index a882f848b8..2acd5e4cff 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp index cf19cf9c3f..b5fade5620 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp index 3f1afde3f9..9c79e69035 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,7 @@ #include #include -#include "../hbqt_hbqsyntaxhighlighter.h" +#include "hbqt_hbqsyntaxhighlighter.h" /* * QSyntaxHighlighter ( QObject * parent ) diff --git a/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp b/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp index a8dfc648a7..a772027155 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp b/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp index ce2432e168..4bbd55a671 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp index 43e79de001..a70d1c22fb 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTableView.cpp b/harbour/contrib/hbqt/qtgui/g/QTableView.cpp index 890a0449af..cbf991d932 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTableView.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTableView.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp index 5acd55255f..910a3b14d2 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp index e6a26bd99b..4ce5870e51 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp b/harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp index 33e09c6b5b..81e918896b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp index 69064ebb6c..ee525d9700 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -71,7 +73,7 @@ #include #include -#include "../hbqt_hbqsyntaxhighlighter.h" +#include "hbqt_hbqsyntaxhighlighter.h" /* * QTextBlock ( const QTextBlock & other ) diff --git a/harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp index 90c8b1c944..c6f3776b38 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp index 25a25f9471..50d753d880 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp index 92e7ba6eab..2fcaed48f3 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp index fd7c6c71e5..4327bdea1d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp b/harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp index 476ebc8bf2..48b1987ab3 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp b/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp index 57553f2691..7f09973851 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp b/harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp index b03db06624..85709c4601 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp b/harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp index 9fee9ae20e..9a0513ecea 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp index 164aeb543d..175c55b134 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp index 8fec643df0..82db315f5d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp index b1c33f2a08..2280f4c439 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp index 9a4f84f046..95c4b4ffd6 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp index 11bca09ed9..a08c8c3ce1 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp index 357d93208b..e04ca06e17 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp b/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp index 133c78b966..425a06d7e0 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextItem.cpp b/harbour/contrib/hbqt/qtgui/g/QTextItem.cpp index 788de276bc..912db80586 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextItem.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp index 7c23c3f616..4ef54c388d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextLength.cpp b/harbour/contrib/hbqt/qtgui/g/QTextLength.cpp index f57ae7bfbd..7d7e6e1dd3 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextLength.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextLength.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextLine.cpp b/harbour/contrib/hbqt/qtgui/g/QTextLine.cpp index b3378228d5..f553f4e3cb 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextLine.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextLine.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextList.cpp b/harbour/contrib/hbqt/qtgui/g/QTextList.cpp index 15c86de05a..658c561608 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextList.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextList.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp index cc4f0dd342..2b6fa8dd76 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextObject.cpp b/harbour/contrib/hbqt/qtgui/g/QTextObject.cpp index 65def3aed8..cf7738e079 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextObject.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextObject.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextOption.cpp b/harbour/contrib/hbqt/qtgui/g/QTextOption.cpp index e5e203c354..8366a1fe33 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextOption.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextOption.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp index 47279d680e..72c6e18ed3 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp index 57d6ba76d5..1570e10f3a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp b/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp index 26b2176f00..4ac715e84d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp b/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp index a1cde798dd..ebbf62ee97 100644 --- a/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp b/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp index 0a7ab9ede3..a72610d09e 100644 --- a/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTransform.cpp b/harbour/contrib/hbqt/qtgui/g/QTransform.cpp index 57ec513e8e..0816bbac6a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTransform.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTransform.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp index af8979fcc6..74af1e8029 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp index 7232d53597..2ed0db4adb 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp index a65d27445b..3e78ebb552 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QUiLoader.cpp b/harbour/contrib/hbqt/qtgui/g/QUiLoader.cpp index da944a94ba..db682d59ad 100644 --- a/harbour/contrib/hbqt/qtgui/g/QUiLoader.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QUiLoader.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp index 5a13d1e400..31e4b906c9 100644 --- a/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QValidator.cpp b/harbour/contrib/hbqt/qtgui/g/QValidator.cpp index faa7ba6c63..bca5e0fa54 100644 --- a/harbour/contrib/hbqt/qtgui/g/QValidator.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QValidator.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp index 71a42c42d1..d94f6ce00d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QWidget.cpp index e44ada575c..940108bb24 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWidget.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp b/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp index 47ac30eccc..33fb085f24 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp index 4654798c34..051fc4dd8b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp index 386081b829..b3581f8d92 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp b/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp index e66ffc0ed2..934e3bc176 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QWizard.cpp b/harbour/contrib/hbqt/qtgui/g/QWizard.cpp index 4411e6192b..a75c912cbb 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWizard.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWizard.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp b/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp index cd28180f26..2eef7c0c30 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtgui_garbage.h" +#include "hbqtgui.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/g/TQInputContext.prg b/harbour/contrib/hbqt/qtgui/g/TQInputContext.prg deleted file mode 100644 index b1d4ec57b7..0000000000 --- a/harbour/contrib/hbqt/qtgui/g/TQInputContext.prg +++ /dev/null @@ -1,136 +0,0 @@ -/* - * $Id$ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -/* - * Harbour Project source code: - * QT wrapper main header - * - * Copyright 2009-2010 Pritpal Bedi - * - * Copyright 2009 Marcos Antonio Gambeta - * 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 QInputContext INHERIT HbQtObjectHandler, QObject - - METHOD new( ... ) - - METHOD filterEvent( pEvent ) - METHOD font() - METHOD identifierName() - METHOD isComposing() - METHOD language() - METHOD mouseHandler( nX, pEvent ) - METHOD reset() - METHOD sendEvent( pEvent ) - METHOD standardFormat( nS ) - METHOD update() - METHOD widgetDestroyed( pWidget ) - - ENDCLASS - - -METHOD QInputContext:new( ... ) - LOCAL p - FOR EACH p IN { ... } - hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) - NEXT - ::pPtr := Qt_QInputContext( ... ) - RETURN Self - - -METHOD QInputContext:filterEvent( pEvent ) - RETURN Qt_QInputContext_filterEvent( ::pPtr, hbqt_ptr( pEvent ) ) - - -METHOD QInputContext:font() - RETURN Qt_QInputContext_font( ::pPtr ) - - -METHOD QInputContext:identifierName() - RETURN Qt_QInputContext_identifierName( ::pPtr ) - - -METHOD QInputContext:isComposing() - RETURN Qt_QInputContext_isComposing( ::pPtr ) - - -METHOD QInputContext:language() - RETURN Qt_QInputContext_language( ::pPtr ) - - -METHOD QInputContext:mouseHandler( nX, pEvent ) - RETURN Qt_QInputContext_mouseHandler( ::pPtr, nX, hbqt_ptr( pEvent ) ) - - -METHOD QInputContext:reset() - RETURN Qt_QInputContext_reset( ::pPtr ) - - -METHOD QInputContext:sendEvent( pEvent ) - RETURN Qt_QInputContext_sendEvent( ::pPtr, hbqt_ptr( pEvent ) ) - - -METHOD QInputContext:standardFormat( nS ) - RETURN Qt_QInputContext_standardFormat( ::pPtr, nS ) - - -METHOD QInputContext:update() - RETURN Qt_QInputContext_update( ::pPtr ) - - -METHOD QInputContext:widgetDestroyed( pWidget ) - RETURN Qt_QInputContext_widgetDestroyed( ::pPtr, hbqt_ptr( pWidget ) ) - diff --git a/harbour/contrib/hbqt/qtgui/g/TQPaintEngine.prg b/harbour/contrib/hbqt/qtgui/g/TQPaintEngine.prg index 2779e4b147..34b8f2ff89 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPaintEngine.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPaintEngine.prg @@ -90,7 +90,6 @@ CREATE CLASS QPaintEngine INHERIT HbQtObjectHandler METHOD painter() METHOD setActive( lState ) METHOD type() - METHOD updateState( pState ) ENDCLASS @@ -195,7 +194,3 @@ METHOD QPaintEngine:setActive( lState ) METHOD QPaintEngine:type() RETURN Qt_QPaintEngine_type( ::pPtr ) - -METHOD QPaintEngine:updateState( pState ) - RETURN Qt_QPaintEngine_updateState( ::pPtr, hbqt_ptr( pState ) ) - diff --git a/harbour/contrib/hbqt/qtgui/g/hbqtgui.h b/harbour/contrib/hbqt/qtgui/g/hbqtgui.h new file mode 100644 index 0000000000..88e4625d87 --- /dev/null +++ b/harbour/contrib/hbqt/qtgui/g/hbqtgui.h @@ -0,0 +1,241 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +#include "hbqt.h" + +#ifndef __HBQTGUI_H +#define __HBQTGUI_H + +#define hbqt_par_HBQAbstractItemModel( n ) ( ( HBQAbstractItemModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_HBQMainWindow( n ) ( ( HBQMainWindow * ) hbqt_gcpointer( n ) ) +#define hbqt_par_HBQPlainTextEdit( n ) ( ( HBQPlainTextEdit * ) hbqt_gcpointer( n ) ) +#define hbqt_par_HBQSyntaxHighlighter( n ) ( ( HBQSyntaxHighlighter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_HBQTableView( n ) ( ( HBQTableView * ) hbqt_gcpointer( n ) ) +#define hbqt_par_HBQTextBlockUserData( n ) ( ( HBQTextBlockUserData * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractButton( n ) ( ( QAbstractButton * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractItemDelegate( n ) ( ( QAbstractItemDelegate * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractItemView( n ) ( ( QAbstractItemView * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractPrintDialog( n ) ( ( QAbstractPrintDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractProxyModel( n ) ( ( QAbstractProxyModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractScrollArea( n ) ( ( QAbstractScrollArea * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractSlider( n ) ( ( QAbstractSlider * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractSpinBox( n ) ( ( QAbstractSpinBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractTextDocumentLayout( n ) ( ( QAbstractTextDocumentLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAction( n ) ( ( QAction * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QActionGroup( n ) ( ( QActionGroup * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QApplication( n ) ( ( QApplication * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QBitmap( n ) ( ( QBitmap * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QBoxLayout( n ) ( ( QBoxLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QBrush( n ) ( ( QBrush * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QButtonGroup( n ) ( ( QButtonGroup * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QCalendarWidget( n ) ( ( QCalendarWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QCheckBox( n ) ( ( QCheckBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QClipboard( n ) ( ( QClipboard * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QColor( n ) ( ( QColor * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QColorDialog( n ) ( ( QColorDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QComboBox( n ) ( ( QComboBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QCommandLinkButton( n ) ( ( QCommandLinkButton * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QCommonStyle( n ) ( ( QCommonStyle * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QCompleter( n ) ( ( QCompleter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QConicalGradient( n ) ( ( QConicalGradient * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QContextMenuEvent( n ) ( ( QContextMenuEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QCursor( n ) ( ( QCursor * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDateEdit( n ) ( ( QDateEdit * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDateTimeEdit( n ) ( ( QDateTimeEdit * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDesktopWidget( n ) ( ( QDesktopWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDial( n ) ( ( QDial * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDialog( n ) ( ( QDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDirModel( n ) ( ( QDirModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDockWidget( n ) ( ( QDockWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDoubleSpinBox( n ) ( ( QDoubleSpinBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDragEnterEvent( n ) ( ( QDragEnterEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDragLeaveEvent( n ) ( ( QDragLeaveEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDragMoveEvent( n ) ( ( QDragMoveEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDropEvent( n ) ( ( QDropEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QErrorMessage( n ) ( ( QErrorMessage * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFileDialog( n ) ( ( QFileDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFileIconProvider( n ) ( ( QFileIconProvider * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFileSystemModel( n ) ( ( QFileSystemModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFocusEvent( n ) ( ( QFocusEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFocusFrame( n ) ( ( QFocusFrame * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFont( n ) ( ( QFont * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFontComboBox( n ) ( ( QFontComboBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFontDatabase( n ) ( ( QFontDatabase * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFontDialog( n ) ( ( QFontDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFontInfo( n ) ( ( QFontInfo * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFontMetrics( n ) ( ( QFontMetrics * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFontMetricsF( n ) ( ( QFontMetricsF * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFormLayout( n ) ( ( QFormLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFrame( n ) ( ( QFrame * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QGradient( n ) ( ( QGradient * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QGridLayout( n ) ( ( QGridLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QGroupBox( n ) ( ( QGroupBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QHBoxLayout( n ) ( ( QHBoxLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QHeaderView( n ) ( ( QHeaderView * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QHelpEvent( n ) ( ( QHelpEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QHideEvent( n ) ( ( QHideEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QIcon( n ) ( ( QIcon * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QImage( n ) ( ( QImage * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QImageReader( n ) ( ( QImageReader * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QImageWriter( n ) ( ( QImageWriter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QInputDialog( n ) ( ( QInputDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QInputEvent( n ) ( ( QInputEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QInputMethodEvent( n ) ( ( QInputMethodEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QItemDelegate( n ) ( ( QItemDelegate * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QItemEditorCreatorBase( n ) ( ( QItemEditorCreatorBase * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QItemEditorFactory( n ) ( ( QItemEditorFactory * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QItemSelection( n ) ( ( QItemSelection * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QItemSelectionModel( n ) ( ( QItemSelectionModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QKeyEvent( n ) ( ( QKeyEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QKeySequence( n ) ( ( QKeySequence * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLabel( n ) ( ( QLabel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLayout( n ) ( ( QLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLayoutItem( n ) ( ( QLayoutItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLCDNumber( n ) ( ( QLCDNumber * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLinearGradient( n ) ( ( QLinearGradient * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLineEdit( n ) ( ( QLineEdit * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QListView( n ) ( ( QListView * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QListWidget( n ) ( ( QListWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QListWidgetItem( n ) ( ( QListWidgetItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMainWindow( n ) ( ( QMainWindow * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMatrix( n ) ( ( QMatrix * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMdiArea( n ) ( ( QMdiArea * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMdiSubWindow( n ) ( ( QMdiSubWindow * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMenu( n ) ( ( QMenu * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMenuBar( n ) ( ( QMenuBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMessageBox( n ) ( ( QMessageBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMouseEvent( n ) ( ( QMouseEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMoveEvent( n ) ( ( QMoveEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMovie( n ) ( ( QMovie * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPageSetupDialog( n ) ( ( QPageSetupDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPaintDevice( n ) ( ( QPaintDevice * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPaintEngine( n ) ( ( QPaintEngine * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPainter( n ) ( ( QPainter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPainterPath( n ) ( ( QPainterPath * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPaintEvent( n ) ( ( QPaintEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPalette( n ) ( ( QPalette * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPen( n ) ( ( QPen * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPicture( n ) ( ( QPicture * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPixmap( n ) ( ( QPixmap * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPlainTextDocumentLayout( n ) ( ( QPlainTextDocumentLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPlainTextEdit( n ) ( ( QPlainTextEdit * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPolygon( n ) ( ( QPolygon * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPolygonF( n ) ( ( QPolygonF * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPrintDialog( n ) ( ( QPrintDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPrintEngine( n ) ( ( QPrintEngine * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPrinter( n ) ( ( QPrinter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPrintPreviewDialog( n ) ( ( QPrintPreviewDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QProgressBar( n ) ( ( QProgressBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QProgressDialog( n ) ( ( QProgressDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPushButton( n ) ( ( QPushButton * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QRadialGradient( n ) ( ( QRadialGradient * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QRadioButton( n ) ( ( QRadioButton * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QRegion( n ) ( ( QRegion * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QResizeEvent( n ) ( ( QResizeEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QScrollArea( n ) ( ( QScrollArea * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QScrollBar( n ) ( ( QScrollBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSessionManager( n ) ( ( QSessionManager * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QShowEvent( n ) ( ( QShowEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSizeGrip( n ) ( ( QSizeGrip * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSizePolicy( n ) ( ( QSizePolicy * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSlider( n ) ( ( QSlider * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSound( n ) ( ( QSound * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSpacerItem( n ) ( ( QSpacerItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSpinBox( n ) ( ( QSpinBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSplashScreen( n ) ( ( QSplashScreen * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSplitter( n ) ( ( QSplitter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStackedWidget( n ) ( ( QStackedWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStandardItem( n ) ( ( QStandardItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStandardItemModel( n ) ( ( QStandardItemModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStatusBar( n ) ( ( QStatusBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStringListModel( n ) ( ( QStringListModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyle( n ) ( ( QStyle * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyledItemDelegate( n ) ( ( QStyledItemDelegate * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleFactory( n ) ( ( QStyleFactory * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleHintReturn( n ) ( ( QStyleHintReturn * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleHintReturnMask( n ) ( ( QStyleHintReturnMask * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleHintReturnVariant( n ) ( ( QStyleHintReturnVariant * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOption( n ) ( ( QStyleOption * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionButton( n ) ( ( QStyleOptionButton * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionComboBox( n ) ( ( QStyleOptionComboBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionComplex( n ) ( ( QStyleOptionComplex * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionDockWidget( n ) ( ( QStyleOptionDockWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionFocusRect( n ) ( ( QStyleOptionFocusRect * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionFrame( n ) ( ( QStyleOptionFrame * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionGroupBox( n ) ( ( QStyleOptionGroupBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionHeader( n ) ( ( QStyleOptionHeader * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionMenuItem( n ) ( ( QStyleOptionMenuItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionProgressBar( n ) ( ( QStyleOptionProgressBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionSizeGrip( n ) ( ( QStyleOptionSizeGrip * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionSlider( n ) ( ( QStyleOptionSlider * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionSpinBox( n ) ( ( QStyleOptionSpinBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionTab( n ) ( ( QStyleOptionTab * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionTabBarBase( n ) ( ( QStyleOptionTabBarBase * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionTabWidgetFrame( n ) ( ( QStyleOptionTabWidgetFrame * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionTitleBar( n ) ( ( QStyleOptionTitleBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionToolBar( n ) ( ( QStyleOptionToolBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionToolBox( n ) ( ( QStyleOptionToolBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionToolButton( n ) ( ( QStyleOptionToolButton * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionViewItem( n ) ( ( QStyleOptionViewItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStylePainter( n ) ( ( QStylePainter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSyntaxHighlighter( n ) ( ( QSyntaxHighlighter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSystemTrayIcon( n ) ( ( QSystemTrayIcon * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTabBar( n ) ( ( QTabBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTableView( n ) ( ( QTableView * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTableWidget( n ) ( ( QTableWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTableWidgetItem( n ) ( ( QTableWidgetItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTableWidgetSelectionRange( n ) ( ( QTableWidgetSelectionRange * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTabWidget( n ) ( ( QTabWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextBlock( n ) ( ( QTextBlock * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextBlockFormat( n ) ( ( QTextBlockFormat * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextBlockGroup( n ) ( ( QTextBlockGroup * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextBrowser( n ) ( ( QTextBrowser * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextCharFormat( n ) ( ( QTextCharFormat * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextCursor( n ) ( ( QTextCursor * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextDocument( n ) ( ( QTextDocument * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextDocumentFragment( n ) ( ( QTextDocumentFragment * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextDocumentWriter( n ) ( ( QTextDocumentWriter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextEdit( n ) ( ( QTextEdit * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextFormat( n ) ( ( QTextFormat * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextFragment( n ) ( ( QTextFragment * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextFrame( n ) ( ( QTextFrame * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextFrameFormat( n ) ( ( QTextFrameFormat * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextImageFormat( n ) ( ( QTextImageFormat * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextInlineObject( n ) ( ( QTextInlineObject * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextItem( n ) ( ( QTextItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextLayout( n ) ( ( QTextLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextLength( n ) ( ( QTextLength * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextLine( n ) ( ( QTextLine * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextList( n ) ( ( QTextList * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextListFormat( n ) ( ( QTextListFormat * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextObject( n ) ( ( QTextObject * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextOption( n ) ( ( QTextOption * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextTableFormat( n ) ( ( QTextTableFormat * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTimeEdit( n ) ( ( QTimeEdit * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QToolBar( n ) ( ( QToolBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QToolBox( n ) ( ( QToolBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QToolButton( n ) ( ( QToolButton * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTransform( n ) ( ( QTransform * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTreeView( n ) ( ( QTreeView * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTreeWidget( n ) ( ( QTreeWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTreeWidgetItem( n ) ( ( QTreeWidgetItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QValidator( n ) ( ( QValidator * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QVBoxLayout( n ) ( ( QVBoxLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWheelEvent( n ) ( ( QWheelEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWidget( n ) ( ( QWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWidgetAction( n ) ( ( QWidgetAction * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWidgetItem( n ) ( ( QWidgetItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWindowsStyle( n ) ( ( QWindowsStyle * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWindowStateChangeEvent( n ) ( ( QWindowStateChangeEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWizard( n ) ( ( QWizard * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWizardPage( n ) ( ( QWizardPage * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QUiLoader( n ) ( ( QUiLoader * ) hbqt_gcpointer( n ) ) + +#endif /* __HBQTGUI_H */ diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbp b/harbour/contrib/hbqt/qtgui/hbqtgui.hbp index 0345898d5b..41952fa159 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbp +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbp @@ -7,6 +7,7 @@ g/filelist.hbm hbqtgui.hbm +-i. -ig ../qtcore/hbqtcore.hbc diff --git a/harbour/contrib/hbqt/qtgui/hbqtguis.hbp b/harbour/contrib/hbqt/qtgui/hbqtguis.hbp index b5b1df0f10..0ed49cec58 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtguis.hbp +++ b/harbour/contrib/hbqt/qtgui/hbqtguis.hbp @@ -7,6 +7,7 @@ g/filelist.hbm hbqtgui.hbm +-i. -ig ../qtcore/hbqtcore.hbc diff --git a/harbour/contrib/hbqt/qtgui/qth/HBQAbstractItemModel.qth b/harbour/contrib/hbqt/qtgui/qth/HBQAbstractItemModel.qth index 88ce26397f..afd747a8e7 100644 --- a/harbour/contrib/hbqt/qtgui/qth/HBQAbstractItemModel.qth +++ b/harbour/contrib/hbqt/qtgui/qth/HBQAbstractItemModel.qth @@ -55,9 +55,9 @@ ; -QObject = +QObject = Inherits = QAbstractItemModel -Type = +Type = New = @@ -69,12 +69,12 @@ New = #include -#include "../hbqt_hbqabstractitemmodel.h" +#include "hbqt_hbqabstractitemmodel.h" /* - * - * + * + * */ HB_FUNC( QT_HBQABSTRACTITEMMODEL ) { diff --git a/harbour/contrib/hbqt/qtgui/qth/HBQMainWindow.qth b/harbour/contrib/hbqt/qtgui/qth/HBQMainWindow.qth index f4f8bd19cc..840e502900 100644 --- a/harbour/contrib/hbqt/qtgui/qth/HBQMainWindow.qth +++ b/harbour/contrib/hbqt/qtgui/qth/HBQMainWindow.qth @@ -55,9 +55,9 @@ ; -QObject = +QObject = Inherits = QMainWindow -Type = +Type = New = @@ -69,12 +69,12 @@ New = #include -#include "../hbqt_hbqmainwindow.h" +#include "hbqt_hbqmainwindow.h" /* - * - * + * + * */ HB_FUNC( QT_HBQMAINWINDOW ) { diff --git a/harbour/contrib/hbqt/qtgui/qth/HBQPlainTextEdit.qth b/harbour/contrib/hbqt/qtgui/qth/HBQPlainTextEdit.qth index 056196a0dc..0bb9d9babe 100644 --- a/harbour/contrib/hbqt/qtgui/qth/HBQPlainTextEdit.qth +++ b/harbour/contrib/hbqt/qtgui/qth/HBQPlainTextEdit.qth @@ -67,7 +67,7 @@ New = #include -#include "../hbqt_hbqplaintextedit.h" +#include "hbqt_hbqplaintextedit.h" /* * HBQPlainTextEdit ( QWidget * parent = 0 ) @@ -154,7 +154,7 @@ HB_FUNC( QT_HBQPLAINTEXTEDIT ) void hbSetFieldsListActive( bool active ) void hbToggleCodeCompetion() void hbToggleCompetionTips() - + diff --git a/harbour/contrib/hbqt/qtgui/qth/HBQSyntaxHighlighter.qth b/harbour/contrib/hbqt/qtgui/qth/HBQSyntaxHighlighter.qth index 1985bb388b..35a3b1eafe 100644 --- a/harbour/contrib/hbqt/qtgui/qth/HBQSyntaxHighlighter.qth +++ b/harbour/contrib/hbqt/qtgui/qth/HBQSyntaxHighlighter.qth @@ -55,9 +55,9 @@ ; -QObject = +QObject = Inherits = QSyntaxHighlighter -Type = +Type = New = @@ -69,11 +69,11 @@ New = #include -#include "../hbqt_hbqsyntaxhighlighter.h" +#include "hbqt_hbqsyntaxhighlighter.h" /* - * - * + * + * */ HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER ) { diff --git a/harbour/contrib/hbqt/qtgui/qth/HBQTableView.qth b/harbour/contrib/hbqt/qtgui/qth/HBQTableView.qth index 3f6e49bc61..6a7f8cfc47 100644 --- a/harbour/contrib/hbqt/qtgui/qth/HBQTableView.qth +++ b/harbour/contrib/hbqt/qtgui/qth/HBQTableView.qth @@ -55,9 +55,9 @@ ; -QObject = +QObject = Inherits = QTableView -Type = +Type = New = @@ -69,12 +69,12 @@ New = #include -#include "../hbqt_hbqtableview.h" +#include "hbqt_hbqtableview.h" /* - * - * + * + * */ HB_FUNC( QT_HBQTABLEVIEW ) { diff --git a/harbour/contrib/hbqt/qtgui/qth/HBQTextBlockUserData.qth b/harbour/contrib/hbqt/qtgui/qth/HBQTextBlockUserData.qth index b3860fd2a2..f141ba6c37 100644 --- a/harbour/contrib/hbqt/qtgui/qth/HBQTextBlockUserData.qth +++ b/harbour/contrib/hbqt/qtgui/qth/HBQTextBlockUserData.qth @@ -56,8 +56,8 @@ QObject = no -Inherits = -Type = +Inherits = +Type = New = @@ -69,11 +69,11 @@ New = #include -#include "../hbqt_hbqsyntaxhighlighter.h" +#include "hbqt_hbqsyntaxhighlighter.h" /* - * HBQTextBlockUserData() - * ~HBQTextBlockUserData() + * HBQTextBlockUserData() + * ~HBQTextBlockUserData() */ HB_FUNC( QT_HBQTEXTBLOCKUSERDATA ) { diff --git a/harbour/contrib/hbqt/qtgui/qth/QPaintEngine.qth b/harbour/contrib/hbqt/qtgui/qth/QPaintEngine.qth index b9e46cb7a6..27bc5d0c9a 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPaintEngine.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPaintEngine.qth @@ -57,7 +57,7 @@ QObject = no Inherits = -Type = +Type = New = @@ -114,7 +114,7 @@ QPaintDevice * paintDevice () const QPainter * painter () const void setActive ( bool state ) virtual Type type () const = 0 -virtual void updateState ( const QPaintEngineState & state ) = 0 +// virtual void updateState ( const QPaintEngineState & state ) = 0 diff --git a/harbour/contrib/hbqt/qtgui/qth/QSyntaxHighlighter.qth b/harbour/contrib/hbqt/qtgui/qth/QSyntaxHighlighter.qth index dec899cd72..c93a22b3d0 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QSyntaxHighlighter.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QSyntaxHighlighter.qth @@ -72,7 +72,7 @@ oSynHiliter := HBQSyntaxHighlighter():new( "QTextEdit", pQTextEdit ) #include -#include "../hbqt_hbqsyntaxhighlighter.h" +#include "hbqt_hbqsyntaxhighlighter.h" /* * QSyntaxHighlighter ( QObject * parent ) diff --git a/harbour/contrib/hbqt/qtgui/qth/QTextBlock.qth b/harbour/contrib/hbqt/qtgui/qth/QTextBlock.qth index 59f0119afd..2c32ae23e2 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QTextBlock.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QTextBlock.qth @@ -56,15 +56,15 @@ QObject = no -Inherits = +Inherits = Type = Core -New = +New = #include #include -#include "../hbqt_hbqsyntaxhighlighter.h" +#include "hbqt_hbqsyntaxhighlighter.h" /* * QTextBlock ( const QTextBlock & other ) @@ -128,7 +128,3 @@ int userState () const - - - - diff --git a/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp b/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp index e5162bdeae..9db0cc09c9 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp +++ b/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtnetwork_garbage.h" +#include "hbqtnetwork.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp index 572c30270e..03fd70f102 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp +++ b/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtnetwork_garbage.h" +#include "hbqtnetwork.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp index 4fbaaa92fa..5c9bdd4b27 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp +++ b/harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtnetwork_garbage.h" +#include "hbqtnetwork.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp index 317cdd4a9e..54a2b4058b 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp +++ b/harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtnetwork_garbage.h" +#include "hbqtnetwork.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp index f7f307908e..66f41a0604 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp +++ b/harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtnetwork_garbage.h" +#include "hbqtnetwork.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp b/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp index 371ac81d2e..9f28140884 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp +++ b/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtnetwork_garbage.h" +#include "hbqtnetwork.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork.h b/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork.h new file mode 100644 index 0000000000..300e1f4be7 --- /dev/null +++ b/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork.h @@ -0,0 +1,23 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +#include "hbqt.h" + +#ifndef __HBQTNETWORK_H +#define __HBQTNETWORK_H + +#define hbqt_par_QFtp( n ) ( ( QFtp * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QHttp( n ) ( ( QHttp * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QHttpHeader( n ) ( ( QHttpHeader * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QHttpRequestHeader( n ) ( ( QHttpRequestHeader * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QHttpResponseHeader( n ) ( ( QHttpResponseHeader * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QNetworkRequest( n ) ( ( QNetworkRequest * ) hbqt_gcpointer( n ) ) + +#endif /* __HBQTNETWORK_H */ diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp index c7d2cde838..1d74427680 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtwebkit_garbage.h" +#include "hbqtwebkit.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -84,7 +86,6 @@ #include #include -#include "../hbqt_local.h" /* * diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp index 63c52201ac..fc5291b9d2 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtwebkit_garbage.h" +#include "hbqtwebkit.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp index 7137f5bb89..a0b9976650 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtwebkit_garbage.h" +#include "hbqtwebkit.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp index 1d8d9d25f0..2f5e10a804 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtwebkit_garbage.h" +#include "hbqtwebkit.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -71,7 +73,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp index e57d291042..f3c8b13b4e 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtwebkit_garbage.h" +#include "hbqtwebkit.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp index 688935162a..031d530d67 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtwebkit_garbage.h" +#include "hbqtwebkit.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -81,7 +83,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp index 53bf86daf7..7c6b756210 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtwebkit_garbage.h" +#include "hbqtwebkit.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -75,7 +77,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp index f71cd17b93..8e00a0c95c 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtwebkit_garbage.h" +#include "hbqtwebkit.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp index 75ba665a1e..1dcdc9471b 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtwebkit_garbage.h" +#include "hbqtwebkit.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -78,7 +80,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp index 22be18e238..96138609fd 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp @@ -61,7 +61,9 @@ #include "hbqt.h" #include "hbqtwebkit_garbage.h" +#include "hbqtwebkit.h" #include "hbqtcore_garbage.h" +#include "hbqtcore.h" /*----------------------------------------------------------------------*/ #if QT_VERSION >= 0x040500 @@ -70,7 +72,6 @@ #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h b/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h new file mode 100644 index 0000000000..7a9539ae82 --- /dev/null +++ b/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h @@ -0,0 +1,27 @@ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +#include "hbqt.h" + +#ifndef __HBQTWEBKIT_H +#define __HBQTWEBKIT_H + +#define hbqt_par_QWebFrame( n ) ( ( QWebFrame * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebHistory( n ) ( ( QWebHistory * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebHistoryInterface( n ) ( ( QWebHistoryInterface * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebHistoryItem( n ) ( ( QWebHistoryItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebHitTestResult( n ) ( ( QWebHitTestResult * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebPage( n ) ( ( QWebPage * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebPluginFactory( n ) ( ( QWebPluginFactory * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebSecurityOrigin( n ) ( ( QWebSecurityOrigin * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebSettings( n ) ( ( QWebSettings * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebView( n ) ( ( QWebView * ) hbqt_gcpointer( n ) ) + +#endif /* __HBQTWEBKIT_H */ diff --git a/harbour/contrib/hbqt/qtwebkit/hbqt_local.h b/harbour/contrib/hbqt/qtwebkit/hbqt_local.h deleted file mode 100644 index 847f1a9276..0000000000 --- a/harbour/contrib/hbqt/qtwebkit/hbqt_local.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * QT wrapper main header - * - * Copyright 2010 Pritpal Bedi - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ -/*----------------------------------------------------------------------*/ - - -#ifndef __HBQT_LOCAL_H -#define __HBQT_LOCAL_H - -#define hbqt_par_QWebFrame( n ) ( ( QWebFrame * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebHistory( n ) ( ( QWebHistory * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebHistoryInterface( n ) ( ( QWebHistoryInterface * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebHistoryItem( n ) ( ( QWebHistoryItem * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebHitTestResult( n ) ( ( QWebHitTestResult * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebNetworkRequest( n ) ( ( QWebNetworkRequest * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebPage( n ) ( ( QWebPage * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebPluginFactory( n ) ( ( QWebPluginFactory * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebSecurityOrigin( n ) ( ( QWebSecurityOrigin * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebSettings( n ) ( ( QWebSettings * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebView( n ) ( ( QWebView * ) hbqt_gcpointer( n ) ) - -#endif /* __HBQT_LOCAL_H */ diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth index 817f401ed4..06d2742779 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth @@ -65,7 +65,6 @@ folder = qtwebkit #include #include -#include "../hbqt_local.h" /* * diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistory.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistory.qth index 1bc49cc91a..f19c8a4e75 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistory.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistory.qth @@ -65,7 +65,6 @@ folder = qtwebkit #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryInterface.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryInterface.qth index 067246192a..b017f913d0 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryInterface.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryInterface.qth @@ -63,7 +63,6 @@ folder = qtwebkit #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth index 571ecc2bd9..0709c11d20 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth @@ -65,7 +65,6 @@ folder = qtwebkit #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth index ef1f67a450..7be1ffee51 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth @@ -64,7 +64,6 @@ folder = qtwebkit #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth index 927c4368ce..be7785f5f1 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth @@ -63,7 +63,6 @@ folder = qtwebkit #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth index 103873251a..2e3b8a0c4d 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth @@ -63,7 +63,6 @@ folder = qtwebkit #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth index b5b147a9f0..b73d2bd2e9 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth @@ -64,7 +64,6 @@ folder = qtwebkit #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth index eea5846885..a9813f434f 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth @@ -66,7 +66,6 @@ folder = qtwebkit #include #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth index 25a43ea11c..a9103b819c 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth @@ -62,7 +62,6 @@ folder = qtwebkit #include -#include "../hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/utils/hbqtgen.prg b/harbour/contrib/hbqt/utils/hbqtgen.prg index ab1e49dc48..15dd1e1a37 100644 --- a/harbour/contrib/hbqt/utils/hbqtgen.prg +++ b/harbour/contrib/hbqt/utils/hbqtgen.prg @@ -1515,8 +1515,10 @@ STATIC FUNCTION BuildHeader( txt_, nMode, cProFile ) IF nMode == 0 aadd( txt_, '#include "hbqt.h"' ) aadd( txt_, '#include "hb' + FNameGetName( cProFile ) + '_garbage.h"' ) + aadd( txt_, '#include "hb' + FNameGetName( cProFile ) + '.h"' ) IF !( FNameGetName( cProFile ) == "qtcore" ) aadd( txt_, '#include "hbqtcore_garbage.h"' ) + aadd( txt_, '#include "hbqtcore.h"' ) ENDIF // aadd( txt_, '#include "hbqt_local.h"' ) aadd( txt_, "" ) @@ -1776,10 +1778,11 @@ STATIC FUNCTION Build_Document( cProFile, cWidget, cls_, doc_, cPathDoc, subCls_ /*----------------------------------------------------------------------*/ STATIC FUNCTION Build_GarbageFile( cpp_, cPathOut, cProFile ) - LOCAL cFile + LOCAL cFile := iif( empty( cPathOut ), "", cPathOut + hb_ps() ) LOCAL hdr_:= {} LOCAL txt_ := {} LOCAL s + LOCAL tmp aadd( hdr_, "/*" ) aadd( hdr_, " * $" + "Id" + "$" ) @@ -1809,9 +1812,30 @@ STATIC FUNCTION Build_GarbageFile( cpp_, cPathOut, cProFile ) aadd( txt_, "" ) ENDIF - cFile := iif( empty( cPathOut ), "", cPathOut + hb_ps() + hb_ps() ) CreateTarget( cFile + "hb" + FNameGetName( cProFile ) + "_garbage.h", txt_ ) + txt_ := {} + aeval( hdr_, {|e| aadd( txt_, e ) } ) + + aadd( txt_, "#ifndef __HB" + Upper( FNameGetName( cProFile ) ) + "_H" ) + aadd( txt_, "#define __HB" + Upper( FNameGetName( cProFile ) ) + "_H" ) + aadd( txt_, "" ) + + FOR EACH s IN cpp_ + IF s == "QList" /* TOFIX: Ugly hack */ + tmp := s + "< void * >" + ELSE + tmp := s + ENDIF + aadd( txt_, PadR( "#define hbqt_par_" + s + "( n )", 52 ) + PadR( "( ( " + tmp, 32 ) + "* ) hbqt_gcpointer( n ) )" ) + NEXT + aadd( txt_, "" ) + + aadd( txt_, "#endif /* __HB" + Upper( FNameGetName( cProFile ) ) + "_H */" ) + + + CreateTarget( cFile + "hb" + FNameGetName( cProFile ) + ".h", txt_ ) + RETURN NIL /*----------------------------------------------------------------------*/ @@ -1850,178 +1874,6 @@ STATIC FUNCTION Build_MakeFile( cPathOut, aWidgetList ) /*----------------------------------------------------------------------*/ -#define CRLF chr( 13 )+chr( 10 ) - -FUNCTION Build_HTML( cWidget, aHM_, aHF_, cPathOut, docum_ ) - LOCAL cFile := cPathOut + hb_ps() + "html" + hb_ps() + cWidget + ".htm" - LOCAL i, j, s, nCounter := 0, cPara - LOCAL nCols, aHTML - LOCAL setColorBG, setColorText, setColorTable - LOCAL aColumns, cCell, uColData - - HB_SYMBOL_UNUSED( aHM_ ) - - setColorText := "#000000" - SetColorBG := "#FFFFFF" - SetColorTable := "#D0D0D0" - aColumns := { { 1,"Function", "C", 100 },; - { 2,"Returns" , "C", 20 } } - - aHTML := {} - nCols := len( aColumns ) - - aadd( aHtml, "" ) - Build_HtmlHeader( @aHTML ) - - s := '' - aadd( aHtml, s ) - - Build_HtmlTable( @aHTML, , SetColorTable ) - aadd( aHtml, "" ) - - /* Class Documentation */ - s := "" + "CLASS REFERENCE" + "" - aadd( aHtml, s ) - s := "" + "Source: /contrib/hbqt/T" + cWidget + ".prg" + "" - aadd( aHtml, s ) - s := QT_WEB + QT_VER + "/" + lower( cWidget ) + ".htm" - s := "' + s + "" - aadd( aHtml, s ) - // - IF !empty( docum_ ) - s := "" - - cPara := "pr" + hb_ntos( ++nCounter ) - - s += '' - s += '
'
-      s += CRLF
-      s += CRLF
-      s += "IMPORTANT:  Call the constructor with exact number of parameter. "+ CRLF
-      s += "            No defaults, otherwise application will GPF" + CRLF
-      for i := 1 to len( docum_ )
-         s += docum_[ i ] + CRLF
-      next
-      s += "
" - - aadd( aHtml, s + "" ) - ENDIF - // - FOR j := 1 TO len( aHM_ ) - s := "" - - FOR i := 1 TO nCols - uColData := aHM_[ j, i ] - if Empty( uColData ) - cCell := " " - else - cCell := uColData - endif - s += "" + cCell - next - - aadd( aHtml, s + "" ) - NEXT - - /* Function Documentation */ - s := "" + "FUNCTIONS REFERENCE" + "" - aadd( aHtml, s ) - s := "" + "Source: /contrib/hbqt/" + cWidget + ".cpp" + "" - aadd( aHtml, s ) - FOR j := 1 TO len( aHF_ ) - s := "" - - FOR i := 1 TO nCols - uColData := aHF_[ j, i ] - if Empty( uColData ) - cCell := " " - else - cCell := uColData - endif - s += "" + cCell - next - - aadd( aHtml, s + "" ) - NEXT - - aadd( aHtml, "" ) - aadd( aHtml, "" ) - aadd( aHtml, "" ) - aadd( aHtml, "" ) - - Return CreateTarget( cFile, aHTML ) - -/*----------------------------------------------------------------------*/ - -FUNCTION Build_HtmlTable( aHTML, cTitle, SetColorTable ) - Local s - LOCAL nBorder := 1 - LOCAL nCellSpacing := 0 - LOCAL nCellPadding := 4 - LOCAL nCols := 2 - - aadd( aHtml, "
" ) - - s := "" - aadd( aHtml, s ) - - if !Empty( cTitle ) - aadd( aHtml, "" ) - endif - - Return NIL - -/*----------------------------------------------------------------------*/ - -FUNCTION Build_HtmlHeader( aHTML ) - - aadd( aHtml, " " ) - aadd( aHtml, ' ' ) - aadd( aHtml, ' ' ) - aadd( aHtml, ' ' ) - aadd( aHtml, " " ) - aadd( aHtml, ' " ) - aadd( aHtml, " " ) - aadd( aHtml, " " ) - - RETURN Nil - -/*----------------------------------------------------------------------*/ - FUNCTION Get_Command_1( cWgt, cCmn ) RETURN "hb_retptrGC( hbqt_gcAllocate_" + cWgt + "( new " + cWgt + "( *( " + cCmn + " ) ), true ) )"
" + cTitle + "