diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 67d2f80a16..27ca8e047c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,74 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-02 13:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/utils/hbqtgen.prg + + Added to automatically generate HBQT_TYPE_* constants. + + * contrib/hbqt/hbqt.h + - Deleted (manual and central) HBQT_TYPE_* constants, + along with the TOFIX note. + + * contrib/hbqt/qtwebkit/g/hbqtwebkit.h + * contrib/hbqt/qtcore/g/hbqtcore.h + * contrib/hbqt/qtnetwork/g/hbqtnetwork.h + * contrib/hbqt/qtdesigner/g/hbqtdesigner.h + * contrib/hbqt/qtgui/g/hbqtgui.h + * Regenerated. + + * contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h + ! Fixed to use hbqtgui header instead of hbqt. + + * contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp + * contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.cpp + * contrib/hbqt/qtgui/hbqt_hbqmainwindow.cpp + * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp + * contrib/hbqt/qtgui/hbqt_hbqtableview.cpp + ! Fixed header inclusion regression after prev change. + + * contrib/hbqt/qtcore/hbqtcore.hbc + * contrib/hbqt/qtgui/hbqtgui.hbc + * contrib/hbqt/qtwebkit/hbqtwebkit.hbc + * contrib/hbqt/qtnetwork/hbqtnetwork.hbc + * contrib/hbqt/qtdesigner/hbqtdesigner.hbc + + Added g dir to header path list. + + * contrib/hbqt/qtwebkit/hbqtwebkit.hbc + * contrib/hbqt/qtwebkit/hbqtwebkits.hbp + * contrib/hbqt/qtwebkit/hbqtwebkit.hbp + * contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth + * contrib/hbqt/qtwebkit/qth/QWebFrame.qth + * contrib/hbqt/qtwebkit/qth/QWebView.qth + * contrib/hbqt/qtwebkit/qth/QWebPage.qth + * contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth + * contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth + * contrib/hbqt/qtwebkit/qth/QWebSettings.qth + * contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth + + Added hbqtgui and hbqtnetwork as a dependency. + - Disabled QList, QList references since they fail + at build time. + + * contrib/hbqt/qtdesigner/hbqtdesigner.hbp + * contrib/hbqt/qtdesigner/hbqtdesigners.hbp + * contrib/hbqt/qtdesigner/hbqtdesigner.hbc + * contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth + * contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth + * contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth + * contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth + * contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth + * contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth + * contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth + * contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth + + Added hbqtgui as dependency. + + * contrib/hbqt/qtdesigner/g/* + * contrib/hbqt/qtwebkit/g/* + * contrib/hbqt/qtwebkit/doc/en/* + * Regenerated. + + * contrib/hbqt/hbqt.hbp + + Enabled hbqtwebkit and hbqtwebdesigner + 2010-08-02 12:34 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/xhb/xhbqself.c * do not use depreciated symbol hb_symEval in HB_QSELF() function @@ -737,6 +805,7 @@ % Changed hbct LTOC to simple iif() ; TOFIX: xhb makes reference to (deprecated) hb_symEval symbol: Info: resolving _hb_symEval by linking to __imp__hb_symEval (auto-import) + [DONE] * contrib/rddsql/hbrddsql.h ! Added HB_EXTERN_BEGIN/END @@ -750,7 +819,7 @@ * contrib/hbqt/generator/hbqtgen.prg * contrib/hbqt/hbqt.h ! Fixed to add HB_EXPORT to public declarations. - ; TOFIX: hbqt still doesn't link in hbdyn mode. + ; TOFIX: hbqt still doesn't link in hbdyn mode. [DONE] * contrib/hbqt/hbqt_garbage.h * contrib/hbqt/doc/en/*.txt diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/hbqt.h index ba084e7a3b..839dc02b19 100644 --- a/harbour/contrib/hbqt/hbqt.h +++ b/harbour/contrib/hbqt/hbqt.h @@ -67,7 +67,7 @@ #include #if !( QT_VERSION >= 0x040500 ) - #error QT library version 4.5.0 or upper is required for hbqt. +# error QT library version 4.5.0 or upper is required for hbqt. #endif #define QT_G_FUNC( hbfunc ) void hbfunc( void * Cargo ) /* callback function for cleaning garbage memory pointer */ @@ -76,10 +76,10 @@ typedef QT_G_FUNC_ * QT_G_FUNC_PTR; typedef struct { - void * ph; - bool bNew; - QT_G_FUNC_PTR func; - int type; + void * ph; + bool bNew; + QT_G_FUNC_PTR func; + int type; } QGC_POINTER; HB_GARBAGE_FUNC( Q_release ); @@ -97,320 +97,10 @@ extern HB_EXPORT void * hbqt_pPtrFromItem( PHB_ITEM pObj ); #define hbqt_par_char( n ) ( hb_parcx( n ) ) /* - * DEFINES FOR HBQt PSEUDO-CASTING + * DEFINES HBQt CODEBLOCKs * - * Format: - * 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 -#define HBQT_TYPE_QAbstractEventDispatcher 1004 -#define HBQT_TYPE_QAbstractItemDelegate 1005 -#define HBQT_TYPE_QAbstractItemModel 1006 -#define HBQT_TYPE_QAbstractItemView 1007 -#define HBQT_TYPE_QAbstractListModel 1008 -#define HBQT_TYPE_QAbstractPrintDialog 1009 -#define HBQT_TYPE_QAbstractProxyModel 1010 -#define HBQT_TYPE_QAbstractScrollArea 1011 -#define HBQT_TYPE_QAbstractSlider 1012 -#define HBQT_TYPE_QAbstractSpinBox 1013 -#define HBQT_TYPE_QAbstractTableModel 1014 -#define HBQT_TYPE_QAbstractTextDocumentLayout 1015 -#define HBQT_TYPE_QAction 1016 -#define HBQT_TYPE_QActionGroup 1017 -#define HBQT_TYPE_QApplication 1018 -#define HBQT_TYPE_QAxBase 1019 -#define HBQT_TYPE_QBitArray 1020 -#define HBQT_TYPE_QBitmap 1021 -#define HBQT_TYPE_QBoxLayout 1022 -#define HBQT_TYPE_QBrush 1023 -#define HBQT_TYPE_QBuffer 1024 -#define HBQT_TYPE_QButtonGroup 1025 -#define HBQT_TYPE_QByteArray 1026 -#define HBQT_TYPE_QCalendarWidget 1027 -#define HBQT_TYPE_QChar 1028 -#define HBQT_TYPE_QCheckBox 1029 -#define HBQT_TYPE_QClipboard 1030 -#define HBQT_TYPE_QColor 1031 -#define HBQT_TYPE_QColorDialog 1032 -#define HBQT_TYPE_QComboBox 1033 -#define HBQT_TYPE_QCommandLinkButton 1034 -#define HBQT_TYPE_QCommonStyle 1035 -#define HBQT_TYPE_QCompleter 1036 -#define HBQT_TYPE_QConicalGradient 1037 -#define HBQT_TYPE_QContextMenuEvent 1038 -#define HBQT_TYPE_QCoreApplication 1039 -#define HBQT_TYPE_QCursor 1040 -#define HBQT_TYPE_QDateEdit 1041 -#define HBQT_TYPE_QDataStream 1042 -#define HBQT_TYPE_QDate 1043 -#define HBQT_TYPE_QDateTime 1044 -#define HBQT_TYPE_QDateTimeEdit 1045 -#define HBQT_TYPE_QDesktopWidget 1046 -#define HBQT_TYPE_QDial 1047 -#define HBQT_TYPE_QDialog 1048 -#define HBQT_TYPE_QDir 1049 -#define HBQT_TYPE_QDirModel 1050 -#define HBQT_TYPE_QDockWidget 1051 -#define HBQT_TYPE_QDoubleSpinBox 1053 -#define HBQT_TYPE_QDragEnterEvent 1054 -#define HBQT_TYPE_QDragLeaveEvent 1055 -#define HBQT_TYPE_QDragMoveEvent 1056 -#define HBQT_TYPE_QDropEvent 1057 -#define HBQT_TYPE_QErrorMessage 1058 -#define HBQT_TYPE_QEvent 1059 -#define HBQT_TYPE_QEventLoop 1060 -#define HBQT_TYPE_QFile 1061 -#define HBQT_TYPE_QFileDialog 1062 -#define HBQT_TYPE_QFileIconProvider 1063 -#define HBQT_TYPE_QFileInfo 1064 -#define HBQT_TYPE_QFileSystemModel 1065 -#define HBQT_TYPE_QFocusEvent 1066 -#define HBQT_TYPE_QFocusFrame 1067 -#define HBQT_TYPE_QFont 1068 -#define HBQT_TYPE_QFontComboBox 1069 -#define HBQT_TYPE_QFontDatabase 1070 -#define HBQT_TYPE_QFontDialog 1071 -#define HBQT_TYPE_QFontInfo 1072 -#define HBQT_TYPE_QFontMetrics 1073 -#define HBQT_TYPE_QFontMetricsF 1074 -#define HBQT_TYPE_QFormLayout 1075 -#define HBQT_TYPE_QFrame 1076 -#define HBQT_TYPE_QFtp 1077 -#define HBQT_TYPE_QGradient 1078 -#define HBQT_TYPE_QGradientStops 1079 -#define HBQT_TYPE_QGridLayout 1080 -#define HBQT_TYPE_QGroupBox 1081 -#define HBQT_TYPE_QHBoxLayout 1082 -#define HBQT_TYPE_QHeaderView 1083 -#define HBQT_TYPE_QHelpEvent 1084 -#define HBQT_TYPE_QHideEvent 1085 -#define HBQT_TYPE_QHttp 1086 -#define HBQT_TYPE_QHttpHeader 1087 -#define HBQT_TYPE_QHttpResponseHeader 1088 -#define HBQT_TYPE_QHttpRequestHeader 1089 -#define HBQT_TYPE_QIcon 1090 -#define HBQT_TYPE_QImage 1091 -#define HBQT_TYPE_QImageReader 1092 -#define HBQT_TYPE_QImageWriter 1093 -#define HBQT_TYPE_QInputContext 1094 -#define HBQT_TYPE_QInputDialog 1095 -#define HBQT_TYPE_QInputEvent 1096 -#define HBQT_TYPE_QInputMethodEvent 1097 -#define HBQT_TYPE_QIODevice 1098 -#define HBQT_TYPE_QItemDelegate 1099 -#define HBQT_TYPE_QItemEditorCreator 1100 -#define HBQT_TYPE_QItemEditorCreatorBase 1101 -#define HBQT_TYPE_QItemEditorFactory 1102 -#define HBQT_TYPE_QItemSelection 1103 -#define HBQT_TYPE_QItemSelectionModel 1104 -#define HBQT_TYPE_QKeyEvent 1105 -#define HBQT_TYPE_QKeySequence 1106 -#define HBQT_TYPE_QLabel 1107 -#define HBQT_TYPE_QLatin1Char 1108 -#define HBQT_TYPE_QLatin1String 1109 -#define HBQT_TYPE_QLayout 1110 -#define HBQT_TYPE_QLayoutItem 1111 -#define HBQT_TYPE_QLCDNumber 1112 -#define HBQT_TYPE_QLibraryInfo 1113 -#define HBQT_TYPE_QLine 1114 -#define HBQT_TYPE_QLinearGradient 1115 -#define HBQT_TYPE_QLineEdit 1116 -#define HBQT_TYPE_QLineF 1117 -#define HBQT_TYPE_QList 1118 -#define HBQT_TYPE_QListView 1119 -#define HBQT_TYPE_QListWidget 1120 -#define HBQT_TYPE_QListWidgetItem 1121 -#define HBQT_TYPE_QLocale 1122 -#define HBQT_TYPE_QMainWindow 1123 -#define HBQT_TYPE_QMatrix 1124 -#define HBQT_TYPE_QMdiArea 1125 -#define HBQT_TYPE_QMdiSubWindow 1126 -#define HBQT_TYPE_QMenu 1127 -#define HBQT_TYPE_QMenuBar 1128 -#define HBQT_TYPE_QMessageBox 1129 -#define HBQT_TYPE_QMimeData 1130 -#define HBQT_TYPE_QModelIndex 1131 -#define HBQT_TYPE_QModelIndexList 1132 -#define HBQT_TYPE_QMouseEvent 1133 -#define HBQT_TYPE_QMoveEvent 1134 -#define HBQT_TYPE_QMovie 1135 -#define HBQT_TYPE_QNetworkAccessManager 1136 -#define HBQT_TYPE_QNetworkProxy 1137 -#define HBQT_TYPE_QNetworkRequest 1138 -#define HBQT_TYPE_QObject 1139 -#define HBQT_TYPE_QPageSetupDialog 1140 -#define HBQT_TYPE_QPaintDevice 1141 -#define HBQT_TYPE_QPaintEngine 1142 -#define HBQT_TYPE_QPaintEngineState 1143 -#define HBQT_TYPE_QPainter 1144 -#define HBQT_TYPE_QPainterPath 1145 -#define HBQT_TYPE_QPaintEvent 1146 -#define HBQT_TYPE_QPalette 1147 -#define HBQT_TYPE_QPen 1148 -#define HBQT_TYPE_QPicture 1149 -#define HBQT_TYPE_QPixmap 1150 -#define HBQT_TYPE_QPlainTextDocumentLayout 1151 -#define HBQT_TYPE_QPlainTextEdit 1152 -#define HBQT_TYPE_QPoint 1153 -#define HBQT_TYPE_QPointF 1154 -#define HBQT_TYPE_QPolygon 1155 -#define HBQT_TYPE_QPolygonF 1156 -#define HBQT_TYPE_QPrintDialog 1157 -#define HBQT_TYPE_QPrintEngine 1158 -#define HBQT_TYPE_QPrinter 1159 -#define HBQT_TYPE_QPrintPreviewDialog 1160 -#define HBQT_TYPE_QProcess 1161 -#define HBQT_TYPE_QProgressBar 1162 -#define HBQT_TYPE_QProgressDialog 1163 -#define HBQT_TYPE_QPushButton 1164 -#define HBQT_TYPE_QRadialGradient 1165 -#define HBQT_TYPE_QRadioButton 1166 -#define HBQT_TYPE_QRect 1167 -#define HBQT_TYPE_QRectF 1168 -#define HBQT_TYPE_QRegExp 1169 -#define HBQT_TYPE_QRegion 1170 -#define HBQT_TYPE_QResizeEvent 1171 -#define HBQT_TYPE_QResource 1172 -#define HBQT_TYPE_QScrollArea 1173 -#define HBQT_TYPE_QScrollBar 1174 -#define HBQT_TYPE_QSessionManager 1175 -#define HBQT_TYPE_QSettings 1176 -#define HBQT_TYPE_QShowEvent 1177 -#define HBQT_TYPE_QSignalMapper 1178 -#define HBQT_TYPE_QSize 1179 -#define HBQT_TYPE_QSizeF 1180 -#define HBQT_TYPE_QSizeGrip 1181 -#define HBQT_TYPE_QSizePolicy 1182 -#define HBQT_TYPE_QSlider 1183 -#define HBQT_TYPE_QSound 1184 -#define HBQT_TYPE_QSpacerItem 1185 -#define HBQT_TYPE_QSpinBox 1186 -#define HBQT_TYPE_QSplashScreen 1187 -#define HBQT_TYPE_QSplitter 1188 -#define HBQT_TYPE_QStackedWidget 1189 -#define HBQT_TYPE_QStandardItem 1190 -#define HBQT_TYPE_QStandardItemModel 1191 -#define HBQT_TYPE_QStatusBar 1192 -#define HBQT_TYPE_QStringList 1193 -#define HBQT_TYPE_QStringListModel 1194 -#define HBQT_TYPE_QStyle 1195 -#define HBQT_TYPE_QStyledItemDelegate 1196 -#define HBQT_TYPE_QStyleFactory 1197 -#define HBQT_TYPE_QStyleHintReturn 1198 -#define HBQT_TYPE_QStyleHintReturnMask 1199 -#define HBQT_TYPE_QStyleHintReturnVariant 1200 -#define HBQT_TYPE_QStyleOption 1201 -#define HBQT_TYPE_QStyleOptionButton 1202 -#define HBQT_TYPE_QStyleOptionComboBox 1203 -#define HBQT_TYPE_QStyleOptionComplex 1204 -#define HBQT_TYPE_QStyleOptionDockWidget 1205 -#define HBQT_TYPE_QStyleOptionFocusRect 1206 -#define HBQT_TYPE_QStyleOptionFrame 1207 -#define HBQT_TYPE_QStyleOptionGroupBox 1208 -#define HBQT_TYPE_QStyleOptionHeader 1209 -#define HBQT_TYPE_QStyleOptionMenuItem 1210 -#define HBQT_TYPE_QStyleOptionProgressBar 1211 -#define HBQT_TYPE_QStyleOptionSizeGrip 1212 -#define HBQT_TYPE_QStyleOptionSlider 1213 -#define HBQT_TYPE_QStyleOptionSpinBox 1214 -#define HBQT_TYPE_QStyleOptionTab 1215 -#define HBQT_TYPE_QStyleOptionTabBarBase 1216 -#define HBQT_TYPE_QStyleOptionTabWidgetFrame 1217 -#define HBQT_TYPE_QStyleOptionTitleBar 1218 -#define HBQT_TYPE_QStyleOptionToolBar 1219 -#define HBQT_TYPE_QStyleOptionToolBox 1220 -#define HBQT_TYPE_QStyleOptionToolButton 1221 -#define HBQT_TYPE_QStyleOptionViewItem 1222 -#define HBQT_TYPE_QStylePainter 1224 -#define HBQT_TYPE_QSyntaxHighlighter 1225 -#define HBQT_TYPE_QSystemTrayIcon 1226 -#define HBQT_TYPE_QTabBar 1227 -#define HBQT_TYPE_QTableView 1228 -#define HBQT_TYPE_QTableWidget 1229 -#define HBQT_TYPE_QTableWidgetItem 1230 -#define HBQT_TYPE_QTableWidgetSelectionRange 1231 -#define HBQT_TYPE_QTabWidget 1232 -#define HBQT_TYPE_QTcpSocket 1233 -#define HBQT_TYPE_QTextBlock 1234 -#define HBQT_TYPE_QTextBlockFormat 1235 -#define HBQT_TYPE_QTextBlockGroup 1236 -#define HBQT_TYPE_QTextBlockUserData 1237 -#define HBQT_TYPE_QTextBoundaryFinder 1238 -#define HBQT_TYPE_QTextBrowser 1239 -#define HBQT_TYPE_QTextCharFormat 1240 -#define HBQT_TYPE_QTextCodec 1241 -#define HBQT_TYPE_QTextCursor 1244 -#define HBQT_TYPE_QTextDecoder 1245 -#define HBQT_TYPE_QTextDocument 1246 -#define HBQT_TYPE_QTextDocumentFragment 1247 -#define HBQT_TYPE_QTextDocumentWriter 1248 -#define HBQT_TYPE_QTextEdit 1249 -#define HBQT_TYPE_QTextEncoder 1250 -#define HBQT_TYPE_QTextEngine 1251 -#define HBQT_TYPE_QTextFormat 1252 -#define HBQT_TYPE_QTextFragment 1253 -#define HBQT_TYPE_QTextFrame 1254 -#define HBQT_TYPE_QTextFrameFormat 1255 -#define HBQT_TYPE_QTextImageFormat 1256 -#define HBQT_TYPE_QTextInlineObject 1257 -#define HBQT_TYPE_QTextItem 1258 -#define HBQT_TYPE_QTextList 1259 -#define HBQT_TYPE_QTextLayout 1260 -#define HBQT_TYPE_QTextLength 1261 -#define HBQT_TYPE_QTextLine 1262 -#define HBQT_TYPE_QTextListFormat 1263 -#define HBQT_TYPE_QTextObject 1264 -#define HBQT_TYPE_QTextOption 1265 -#define HBQT_TYPE_QTextStream 1266 -#define HBQT_TYPE_QTextTableFormat 1267 -#define HBQT_TYPE_QThread 1268 -#define HBQT_TYPE_QTime 1269 -#define HBQT_TYPE_QTimeEdit 1270 -#define HBQT_TYPE_QTimer 1271 -#define HBQT_TYPE_QToolBar 1272 -#define HBQT_TYPE_QToolBox 1273 -#define HBQT_TYPE_QToolButton 1274 -#define HBQT_TYPE_QTransform 1275 -#define HBQT_TYPE_QTranslator 1276 -#define HBQT_TYPE_QTreeView 1277 -#define HBQT_TYPE_QTreeWidget 1278 -#define HBQT_TYPE_QTreeWidgetItem 1279 -#define HBQT_TYPE_QUiLoader 1280 -#define HBQT_TYPE_QUrl 1281 -#define HBQT_TYPE_QValidator 1282 -#define HBQT_TYPE_QVariant 1283 -#define HBQT_TYPE_QVBoxLayout 1284 -#define HBQT_TYPE_QVector 1285 -#define HBQT_TYPE_QWheelEvent 1286 -#define HBQT_TYPE_QWidget 1287 -#define HBQT_TYPE_QWidgetAction 1288 -#define HBQT_TYPE_QWidgetItem 1289 -#define HBQT_TYPE_QWindowsStyle 1290 -#define HBQT_TYPE_QWindowSurface 1291 -#define HBQT_TYPE_QWindowsXPStyle 1292 -#define HBQT_TYPE_QWindowStateChangeEvent 1293 -#define HBQT_TYPE_QWizard 1294 -#define HBQT_TYPE_QWizardPage 1295 -#define HBQT_TYPE_QWSEvent 1296 - -#define HBQT_TYPE_HBQAbstractItemModel 1402 -#define HBQT_TYPE_HBEvents 1403 -#define HBQT_TYPE_HBQMainWindow 1404 -#define HBQT_TYPE_HBQPlainTextEdit 1405 -#define HBQT_TYPE_HBQTableView 1406 -#define HBQT_TYPE_HBQSyntaxHighlighter 1407 -#define HBQT_TYPE_HBQTextBlockUserData 1408 -#define HBQT_TYPE_HBSlots 1409 - -/* - * DEFINES HBQt CODEBLOCKs - * - * Format: - * HBQT_(Qt class initials)_(Qt overloaded member) + * Format: + * HBQT_(Qt class initials)_(Qt overloaded member) */ #define HBQT_QAIM_data 1001 diff --git a/harbour/contrib/hbqt/hbqt.hbp b/harbour/contrib/hbqt/hbqt.hbp index 7d118b6749..b36f7496fb 100644 --- a/harbour/contrib/hbqt/hbqt.hbp +++ b/harbour/contrib/hbqt/hbqt.hbp @@ -10,5 +10,7 @@ -hbcontainer hbqtcore.hbc +hbqtdesigner.hbc hbqtgui.hbc hbqtnetwork.hbc +hbqtwebkit.hbc diff --git a/harbour/contrib/hbqt/qtcore/g/hbqtcore.h b/harbour/contrib/hbqt/qtcore/g/hbqtcore.h index 1f819613c2..04488ae0ff 100644 --- a/harbour/contrib/hbqt/qtcore/g/hbqtcore.h +++ b/harbour/contrib/hbqt/qtcore/g/hbqtcore.h @@ -117,56 +117,110 @@ extern HB_EXPORT void * hbqt_gcAllocate_QTranslator( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QUrl( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QVariant( void * pObj, bool bNew ); -#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 ) ) +#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 ) ) + +#define HBQT_TYPE_QTCORE_BASE 27000 + +#define HBQT_TYPE_HBEvents ( HBQT_TYPE_QTCORE_BASE + 1 ) +#define HBQT_TYPE_HBSlots ( HBQT_TYPE_QTCORE_BASE + 2 ) +#define HBQT_TYPE_QAbstractItemModel ( HBQT_TYPE_QTCORE_BASE + 3 ) +#define HBQT_TYPE_QAbstractListModel ( HBQT_TYPE_QTCORE_BASE + 4 ) +#define HBQT_TYPE_QAbstractTableModel ( HBQT_TYPE_QTCORE_BASE + 5 ) +#define HBQT_TYPE_QBitArray ( HBQT_TYPE_QTCORE_BASE + 6 ) +#define HBQT_TYPE_QBuffer ( HBQT_TYPE_QTCORE_BASE + 7 ) +#define HBQT_TYPE_QByteArray ( HBQT_TYPE_QTCORE_BASE + 8 ) +#define HBQT_TYPE_QChar ( HBQT_TYPE_QTCORE_BASE + 9 ) +#define HBQT_TYPE_QCoreApplication ( HBQT_TYPE_QTCORE_BASE + 10 ) +#define HBQT_TYPE_QDataStream ( HBQT_TYPE_QTCORE_BASE + 11 ) +#define HBQT_TYPE_QDate ( HBQT_TYPE_QTCORE_BASE + 12 ) +#define HBQT_TYPE_QDateTime ( HBQT_TYPE_QTCORE_BASE + 13 ) +#define HBQT_TYPE_QDir ( HBQT_TYPE_QTCORE_BASE + 14 ) +#define HBQT_TYPE_QEvent ( HBQT_TYPE_QTCORE_BASE + 15 ) +#define HBQT_TYPE_QEventLoop ( HBQT_TYPE_QTCORE_BASE + 16 ) +#define HBQT_TYPE_QFile ( HBQT_TYPE_QTCORE_BASE + 17 ) +#define HBQT_TYPE_QFileInfo ( HBQT_TYPE_QTCORE_BASE + 18 ) +#define HBQT_TYPE_QIODevice ( HBQT_TYPE_QTCORE_BASE + 19 ) +#define HBQT_TYPE_QLatin1Char ( HBQT_TYPE_QTCORE_BASE + 20 ) +#define HBQT_TYPE_QLatin1String ( HBQT_TYPE_QTCORE_BASE + 21 ) +#define HBQT_TYPE_QLine ( HBQT_TYPE_QTCORE_BASE + 22 ) +#define HBQT_TYPE_QLineF ( HBQT_TYPE_QTCORE_BASE + 23 ) +#define HBQT_TYPE_QList ( HBQT_TYPE_QTCORE_BASE + 24 ) +#define HBQT_TYPE_QLocale ( HBQT_TYPE_QTCORE_BASE + 25 ) +#define HBQT_TYPE_QMimeData ( HBQT_TYPE_QTCORE_BASE + 26 ) +#define HBQT_TYPE_QModelIndex ( HBQT_TYPE_QTCORE_BASE + 27 ) +#define HBQT_TYPE_QObject ( HBQT_TYPE_QTCORE_BASE + 28 ) +#define HBQT_TYPE_QPoint ( HBQT_TYPE_QTCORE_BASE + 29 ) +#define HBQT_TYPE_QPointF ( HBQT_TYPE_QTCORE_BASE + 30 ) +#define HBQT_TYPE_QProcess ( HBQT_TYPE_QTCORE_BASE + 31 ) +#define HBQT_TYPE_QRect ( HBQT_TYPE_QTCORE_BASE + 32 ) +#define HBQT_TYPE_QRectF ( HBQT_TYPE_QTCORE_BASE + 33 ) +#define HBQT_TYPE_QRegExp ( HBQT_TYPE_QTCORE_BASE + 34 ) +#define HBQT_TYPE_QResource ( HBQT_TYPE_QTCORE_BASE + 35 ) +#define HBQT_TYPE_QSettings ( HBQT_TYPE_QTCORE_BASE + 36 ) +#define HBQT_TYPE_QSignalMapper ( HBQT_TYPE_QTCORE_BASE + 37 ) +#define HBQT_TYPE_QSize ( HBQT_TYPE_QTCORE_BASE + 38 ) +#define HBQT_TYPE_QSizeF ( HBQT_TYPE_QTCORE_BASE + 39 ) +#define HBQT_TYPE_QStringList ( HBQT_TYPE_QTCORE_BASE + 40 ) +#define HBQT_TYPE_QTextBoundaryFinder ( HBQT_TYPE_QTCORE_BASE + 41 ) +#define HBQT_TYPE_QTextCodec ( HBQT_TYPE_QTCORE_BASE + 42 ) +#define HBQT_TYPE_QTextDecoder ( HBQT_TYPE_QTCORE_BASE + 43 ) +#define HBQT_TYPE_QTextEncoder ( HBQT_TYPE_QTCORE_BASE + 44 ) +#define HBQT_TYPE_QTextStream ( HBQT_TYPE_QTCORE_BASE + 45 ) +#define HBQT_TYPE_QThread ( HBQT_TYPE_QTCORE_BASE + 46 ) +#define HBQT_TYPE_QTime ( HBQT_TYPE_QTCORE_BASE + 47 ) +#define HBQT_TYPE_QTimer ( HBQT_TYPE_QTCORE_BASE + 48 ) +#define HBQT_TYPE_QTranslator ( HBQT_TYPE_QTCORE_BASE + 49 ) +#define HBQT_TYPE_QUrl ( HBQT_TYPE_QTCORE_BASE + 50 ) +#define HBQT_TYPE_QVariant ( HBQT_TYPE_QTCORE_BASE + 51 ) #endif /* __HBQTCORE_H */ diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc index a175c9b63c..2a0a165ea2 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc @@ -9,6 +9,8 @@ libs=../hbqt_common.hbc +incpaths=g + # TOFIX: QtGui is needed by hbqt_hbslots.cpp. This dependency should be removed. {!HB_STATIC_QT&!hbdyn}libs=hbqtcore${__HB_DYN__} {!HB_STATIC_QT&(allwin|os2)}libs=QtCore4 QtGui4 diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp index 4c7aea8455..a69036af23 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp @@ -68,6 +68,8 @@ #include +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp index dd236a68ab..ce7a456ad3 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp @@ -68,6 +68,8 @@ #include +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp index dde40f7308..bf4d67f553 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp @@ -73,6 +73,8 @@ #include +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp index 0ddf9d2f32..5dd773cbb0 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp @@ -73,6 +73,8 @@ #include +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp index bd55ab7f44..c4d55f17e1 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp @@ -68,6 +68,8 @@ #include +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp index 14f4a6df14..f769e911c5 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp @@ -68,6 +68,8 @@ #include +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp index 56f4ed2dc9..caaa38f324 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp @@ -68,6 +68,8 @@ #include +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp index ff9509edc1..c410423c26 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp @@ -68,6 +68,8 @@ #include +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner.h b/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner.h index 251a1d7a5c..da4aa6dea6 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner.h +++ b/harbour/contrib/hbqt/qtdesigner/g/hbqtdesigner.h @@ -31,13 +31,24 @@ extern HB_EXPORT void * hbqt_gcAllocate_QDesignerObjectInspectorInterface( void extern HB_EXPORT void * hbqt_gcAllocate_QDesignerPropertyEditorInterface( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QDesignerWidgetBoxInterface( void * pObj, bool bNew ); -#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 ) ) +#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 ) ) + +#define HBQT_TYPE_QTDESIGNER_BASE 56000 + +#define HBQT_TYPE_QDesignerActionEditorInterface ( HBQT_TYPE_QTDESIGNER_BASE + 1 ) +#define HBQT_TYPE_QDesignerFormEditorInterface ( HBQT_TYPE_QTDESIGNER_BASE + 2 ) +#define HBQT_TYPE_QDesignerFormWindowCursorInterface ( HBQT_TYPE_QTDESIGNER_BASE + 3 ) +#define HBQT_TYPE_QDesignerFormWindowInterface ( HBQT_TYPE_QTDESIGNER_BASE + 4 ) +#define HBQT_TYPE_QDesignerFormWindowManagerInterface ( HBQT_TYPE_QTDESIGNER_BASE + 5 ) +#define HBQT_TYPE_QDesignerObjectInspectorInterface ( HBQT_TYPE_QTDESIGNER_BASE + 6 ) +#define HBQT_TYPE_QDesignerPropertyEditorInterface ( HBQT_TYPE_QTDESIGNER_BASE + 7 ) +#define HBQT_TYPE_QDesignerWidgetBoxInterface ( HBQT_TYPE_QTDESIGNER_BASE + 8 ) #endif /* __HBQTDESIGNER_H */ diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc index dc0606ec07..2197111eb2 100644 --- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc +++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbc @@ -8,6 +8,9 @@ # --------------------------------------------------------------- libs=../qtcore/hbqtcore.hbc +libs=../qtgui/hbqtgui.hbc + +incpaths=g {!HB_STATIC_QT&!hbdyn}libs=hbqtdesigner${__HB_DYN__} {!HB_STATIC_QT&(allwin|os2)}libs=QtDesigner4 diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp index 7ce057f1be..26ddee722f 100644 --- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp +++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp @@ -9,5 +9,6 @@ g/filelist.hbm -ig ../qtcore/hbqtcore.hbc +../qtgui/hbqtgui.hbc hbqtdesigners.hbp diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigners.hbp b/harbour/contrib/hbqt/qtdesigner/hbqtdesigners.hbp index 984a718a96..b2b90bf36e 100644 --- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigners.hbp +++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigners.hbp @@ -9,3 +9,4 @@ g/filelist.hbm -ig ../qtcore/hbqtcore.hbc +../qtgui/hbqtgui.hbc diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth index 540b549dd4..71eadd7ba4 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth @@ -69,6 +69,8 @@ folder = hbqtdesigner +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth index 09f047bcce..6a1bb44f34 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth @@ -69,6 +69,8 @@ folder = hbqtdesigner +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth index 07a868d5ce..90e0cc30f3 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth @@ -69,6 +69,8 @@ folder = hbqtdesigner +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth index 841c99853f..f59fc1642a 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth @@ -69,6 +69,8 @@ folder = hbqtdesigner +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth index 66d56bb81f..f57750d714 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth @@ -69,6 +69,8 @@ folder = hbqtdesigner +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth index fadb8f5cc7..1e4e844841 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth @@ -69,6 +69,8 @@ folder = hbqtdesigner +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth index 98f4a796c2..16eace9c47 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth @@ -69,6 +69,8 @@ folder = hbqtdesigner +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth index f4a50e5e66..67640a00a1 100644 --- a/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth +++ b/harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth @@ -69,6 +69,8 @@ folder = hbqtdesigner +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtgui/g/hbqtgui.h b/harbour/contrib/hbqt/qtgui/g/hbqtgui.h index f3a8b60c91..ef5594fa64 100644 --- a/harbour/contrib/hbqt/qtgui/g/hbqtgui.h +++ b/harbour/contrib/hbqt/qtgui/g/hbqtgui.h @@ -463,229 +463,456 @@ extern HB_EXPORT void * hbqt_gcAllocate_QWizard( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QWizardPage( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QUiLoader( void * pObj, bool bNew ); -#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 ) ) +#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 ) ) + +#define HBQT_TYPE_QTGUI_BASE 45000 + +#define HBQT_TYPE_HBQAbstractItemModel ( HBQT_TYPE_QTGUI_BASE + 1 ) +#define HBQT_TYPE_HBQMainWindow ( HBQT_TYPE_QTGUI_BASE + 2 ) +#define HBQT_TYPE_HBQPlainTextEdit ( HBQT_TYPE_QTGUI_BASE + 3 ) +#define HBQT_TYPE_HBQSyntaxHighlighter ( HBQT_TYPE_QTGUI_BASE + 4 ) +#define HBQT_TYPE_HBQTableView ( HBQT_TYPE_QTGUI_BASE + 5 ) +#define HBQT_TYPE_HBQTextBlockUserData ( HBQT_TYPE_QTGUI_BASE + 6 ) +#define HBQT_TYPE_QAbstractButton ( HBQT_TYPE_QTGUI_BASE + 7 ) +#define HBQT_TYPE_QAbstractItemDelegate ( HBQT_TYPE_QTGUI_BASE + 8 ) +#define HBQT_TYPE_QAbstractItemView ( HBQT_TYPE_QTGUI_BASE + 9 ) +#define HBQT_TYPE_QAbstractPrintDialog ( HBQT_TYPE_QTGUI_BASE + 10 ) +#define HBQT_TYPE_QAbstractProxyModel ( HBQT_TYPE_QTGUI_BASE + 11 ) +#define HBQT_TYPE_QAbstractScrollArea ( HBQT_TYPE_QTGUI_BASE + 12 ) +#define HBQT_TYPE_QAbstractSlider ( HBQT_TYPE_QTGUI_BASE + 13 ) +#define HBQT_TYPE_QAbstractSpinBox ( HBQT_TYPE_QTGUI_BASE + 14 ) +#define HBQT_TYPE_QAbstractTextDocumentLayout ( HBQT_TYPE_QTGUI_BASE + 15 ) +#define HBQT_TYPE_QAction ( HBQT_TYPE_QTGUI_BASE + 16 ) +#define HBQT_TYPE_QActionGroup ( HBQT_TYPE_QTGUI_BASE + 17 ) +#define HBQT_TYPE_QApplication ( HBQT_TYPE_QTGUI_BASE + 18 ) +#define HBQT_TYPE_QBitmap ( HBQT_TYPE_QTGUI_BASE + 19 ) +#define HBQT_TYPE_QBoxLayout ( HBQT_TYPE_QTGUI_BASE + 20 ) +#define HBQT_TYPE_QBrush ( HBQT_TYPE_QTGUI_BASE + 21 ) +#define HBQT_TYPE_QButtonGroup ( HBQT_TYPE_QTGUI_BASE + 22 ) +#define HBQT_TYPE_QCalendarWidget ( HBQT_TYPE_QTGUI_BASE + 23 ) +#define HBQT_TYPE_QCheckBox ( HBQT_TYPE_QTGUI_BASE + 24 ) +#define HBQT_TYPE_QClipboard ( HBQT_TYPE_QTGUI_BASE + 25 ) +#define HBQT_TYPE_QColor ( HBQT_TYPE_QTGUI_BASE + 26 ) +#define HBQT_TYPE_QColorDialog ( HBQT_TYPE_QTGUI_BASE + 27 ) +#define HBQT_TYPE_QComboBox ( HBQT_TYPE_QTGUI_BASE + 28 ) +#define HBQT_TYPE_QCommandLinkButton ( HBQT_TYPE_QTGUI_BASE + 29 ) +#define HBQT_TYPE_QCommonStyle ( HBQT_TYPE_QTGUI_BASE + 30 ) +#define HBQT_TYPE_QCompleter ( HBQT_TYPE_QTGUI_BASE + 31 ) +#define HBQT_TYPE_QConicalGradient ( HBQT_TYPE_QTGUI_BASE + 32 ) +#define HBQT_TYPE_QContextMenuEvent ( HBQT_TYPE_QTGUI_BASE + 33 ) +#define HBQT_TYPE_QCursor ( HBQT_TYPE_QTGUI_BASE + 34 ) +#define HBQT_TYPE_QDateEdit ( HBQT_TYPE_QTGUI_BASE + 35 ) +#define HBQT_TYPE_QDateTimeEdit ( HBQT_TYPE_QTGUI_BASE + 36 ) +#define HBQT_TYPE_QDesktopWidget ( HBQT_TYPE_QTGUI_BASE + 37 ) +#define HBQT_TYPE_QDial ( HBQT_TYPE_QTGUI_BASE + 38 ) +#define HBQT_TYPE_QDialog ( HBQT_TYPE_QTGUI_BASE + 39 ) +#define HBQT_TYPE_QDirModel ( HBQT_TYPE_QTGUI_BASE + 40 ) +#define HBQT_TYPE_QDockWidget ( HBQT_TYPE_QTGUI_BASE + 41 ) +#define HBQT_TYPE_QDoubleSpinBox ( HBQT_TYPE_QTGUI_BASE + 42 ) +#define HBQT_TYPE_QDragEnterEvent ( HBQT_TYPE_QTGUI_BASE + 43 ) +#define HBQT_TYPE_QDragLeaveEvent ( HBQT_TYPE_QTGUI_BASE + 44 ) +#define HBQT_TYPE_QDragMoveEvent ( HBQT_TYPE_QTGUI_BASE + 45 ) +#define HBQT_TYPE_QDropEvent ( HBQT_TYPE_QTGUI_BASE + 46 ) +#define HBQT_TYPE_QErrorMessage ( HBQT_TYPE_QTGUI_BASE + 47 ) +#define HBQT_TYPE_QFileDialog ( HBQT_TYPE_QTGUI_BASE + 48 ) +#define HBQT_TYPE_QFileIconProvider ( HBQT_TYPE_QTGUI_BASE + 49 ) +#define HBQT_TYPE_QFileSystemModel ( HBQT_TYPE_QTGUI_BASE + 50 ) +#define HBQT_TYPE_QFocusEvent ( HBQT_TYPE_QTGUI_BASE + 51 ) +#define HBQT_TYPE_QFocusFrame ( HBQT_TYPE_QTGUI_BASE + 52 ) +#define HBQT_TYPE_QFont ( HBQT_TYPE_QTGUI_BASE + 53 ) +#define HBQT_TYPE_QFontComboBox ( HBQT_TYPE_QTGUI_BASE + 54 ) +#define HBQT_TYPE_QFontDatabase ( HBQT_TYPE_QTGUI_BASE + 55 ) +#define HBQT_TYPE_QFontDialog ( HBQT_TYPE_QTGUI_BASE + 56 ) +#define HBQT_TYPE_QFontInfo ( HBQT_TYPE_QTGUI_BASE + 57 ) +#define HBQT_TYPE_QFontMetrics ( HBQT_TYPE_QTGUI_BASE + 58 ) +#define HBQT_TYPE_QFontMetricsF ( HBQT_TYPE_QTGUI_BASE + 59 ) +#define HBQT_TYPE_QFormLayout ( HBQT_TYPE_QTGUI_BASE + 60 ) +#define HBQT_TYPE_QFrame ( HBQT_TYPE_QTGUI_BASE + 61 ) +#define HBQT_TYPE_QGradient ( HBQT_TYPE_QTGUI_BASE + 62 ) +#define HBQT_TYPE_QGridLayout ( HBQT_TYPE_QTGUI_BASE + 63 ) +#define HBQT_TYPE_QGroupBox ( HBQT_TYPE_QTGUI_BASE + 64 ) +#define HBQT_TYPE_QHBoxLayout ( HBQT_TYPE_QTGUI_BASE + 65 ) +#define HBQT_TYPE_QHeaderView ( HBQT_TYPE_QTGUI_BASE + 66 ) +#define HBQT_TYPE_QHelpEvent ( HBQT_TYPE_QTGUI_BASE + 67 ) +#define HBQT_TYPE_QHideEvent ( HBQT_TYPE_QTGUI_BASE + 68 ) +#define HBQT_TYPE_QIcon ( HBQT_TYPE_QTGUI_BASE + 69 ) +#define HBQT_TYPE_QImage ( HBQT_TYPE_QTGUI_BASE + 70 ) +#define HBQT_TYPE_QImageReader ( HBQT_TYPE_QTGUI_BASE + 71 ) +#define HBQT_TYPE_QImageWriter ( HBQT_TYPE_QTGUI_BASE + 72 ) +#define HBQT_TYPE_QInputDialog ( HBQT_TYPE_QTGUI_BASE + 73 ) +#define HBQT_TYPE_QInputEvent ( HBQT_TYPE_QTGUI_BASE + 74 ) +#define HBQT_TYPE_QInputMethodEvent ( HBQT_TYPE_QTGUI_BASE + 75 ) +#define HBQT_TYPE_QItemDelegate ( HBQT_TYPE_QTGUI_BASE + 76 ) +#define HBQT_TYPE_QItemEditorCreatorBase ( HBQT_TYPE_QTGUI_BASE + 77 ) +#define HBQT_TYPE_QItemEditorFactory ( HBQT_TYPE_QTGUI_BASE + 78 ) +#define HBQT_TYPE_QItemSelection ( HBQT_TYPE_QTGUI_BASE + 79 ) +#define HBQT_TYPE_QItemSelectionModel ( HBQT_TYPE_QTGUI_BASE + 80 ) +#define HBQT_TYPE_QKeyEvent ( HBQT_TYPE_QTGUI_BASE + 81 ) +#define HBQT_TYPE_QKeySequence ( HBQT_TYPE_QTGUI_BASE + 82 ) +#define HBQT_TYPE_QLabel ( HBQT_TYPE_QTGUI_BASE + 83 ) +#define HBQT_TYPE_QLayout ( HBQT_TYPE_QTGUI_BASE + 84 ) +#define HBQT_TYPE_QLayoutItem ( HBQT_TYPE_QTGUI_BASE + 85 ) +#define HBQT_TYPE_QLCDNumber ( HBQT_TYPE_QTGUI_BASE + 86 ) +#define HBQT_TYPE_QLinearGradient ( HBQT_TYPE_QTGUI_BASE + 87 ) +#define HBQT_TYPE_QLineEdit ( HBQT_TYPE_QTGUI_BASE + 88 ) +#define HBQT_TYPE_QListView ( HBQT_TYPE_QTGUI_BASE + 89 ) +#define HBQT_TYPE_QListWidget ( HBQT_TYPE_QTGUI_BASE + 90 ) +#define HBQT_TYPE_QListWidgetItem ( HBQT_TYPE_QTGUI_BASE + 91 ) +#define HBQT_TYPE_QMainWindow ( HBQT_TYPE_QTGUI_BASE + 92 ) +#define HBQT_TYPE_QMatrix ( HBQT_TYPE_QTGUI_BASE + 93 ) +#define HBQT_TYPE_QMdiArea ( HBQT_TYPE_QTGUI_BASE + 94 ) +#define HBQT_TYPE_QMdiSubWindow ( HBQT_TYPE_QTGUI_BASE + 95 ) +#define HBQT_TYPE_QMenu ( HBQT_TYPE_QTGUI_BASE + 96 ) +#define HBQT_TYPE_QMenuBar ( HBQT_TYPE_QTGUI_BASE + 97 ) +#define HBQT_TYPE_QMessageBox ( HBQT_TYPE_QTGUI_BASE + 98 ) +#define HBQT_TYPE_QMouseEvent ( HBQT_TYPE_QTGUI_BASE + 99 ) +#define HBQT_TYPE_QMoveEvent ( HBQT_TYPE_QTGUI_BASE + 100 ) +#define HBQT_TYPE_QMovie ( HBQT_TYPE_QTGUI_BASE + 101 ) +#define HBQT_TYPE_QPageSetupDialog ( HBQT_TYPE_QTGUI_BASE + 102 ) +#define HBQT_TYPE_QPaintDevice ( HBQT_TYPE_QTGUI_BASE + 103 ) +#define HBQT_TYPE_QPaintEngine ( HBQT_TYPE_QTGUI_BASE + 104 ) +#define HBQT_TYPE_QPainter ( HBQT_TYPE_QTGUI_BASE + 105 ) +#define HBQT_TYPE_QPainterPath ( HBQT_TYPE_QTGUI_BASE + 106 ) +#define HBQT_TYPE_QPaintEvent ( HBQT_TYPE_QTGUI_BASE + 107 ) +#define HBQT_TYPE_QPalette ( HBQT_TYPE_QTGUI_BASE + 108 ) +#define HBQT_TYPE_QPen ( HBQT_TYPE_QTGUI_BASE + 109 ) +#define HBQT_TYPE_QPicture ( HBQT_TYPE_QTGUI_BASE + 110 ) +#define HBQT_TYPE_QPixmap ( HBQT_TYPE_QTGUI_BASE + 111 ) +#define HBQT_TYPE_QPlainTextDocumentLayout ( HBQT_TYPE_QTGUI_BASE + 112 ) +#define HBQT_TYPE_QPlainTextEdit ( HBQT_TYPE_QTGUI_BASE + 113 ) +#define HBQT_TYPE_QPolygon ( HBQT_TYPE_QTGUI_BASE + 114 ) +#define HBQT_TYPE_QPolygonF ( HBQT_TYPE_QTGUI_BASE + 115 ) +#define HBQT_TYPE_QPrintDialog ( HBQT_TYPE_QTGUI_BASE + 116 ) +#define HBQT_TYPE_QPrintEngine ( HBQT_TYPE_QTGUI_BASE + 117 ) +#define HBQT_TYPE_QPrinter ( HBQT_TYPE_QTGUI_BASE + 118 ) +#define HBQT_TYPE_QPrintPreviewDialog ( HBQT_TYPE_QTGUI_BASE + 119 ) +#define HBQT_TYPE_QProgressBar ( HBQT_TYPE_QTGUI_BASE + 120 ) +#define HBQT_TYPE_QProgressDialog ( HBQT_TYPE_QTGUI_BASE + 121 ) +#define HBQT_TYPE_QPushButton ( HBQT_TYPE_QTGUI_BASE + 122 ) +#define HBQT_TYPE_QRadialGradient ( HBQT_TYPE_QTGUI_BASE + 123 ) +#define HBQT_TYPE_QRadioButton ( HBQT_TYPE_QTGUI_BASE + 124 ) +#define HBQT_TYPE_QRegion ( HBQT_TYPE_QTGUI_BASE + 125 ) +#define HBQT_TYPE_QResizeEvent ( HBQT_TYPE_QTGUI_BASE + 126 ) +#define HBQT_TYPE_QScrollArea ( HBQT_TYPE_QTGUI_BASE + 127 ) +#define HBQT_TYPE_QScrollBar ( HBQT_TYPE_QTGUI_BASE + 128 ) +#define HBQT_TYPE_QSessionManager ( HBQT_TYPE_QTGUI_BASE + 129 ) +#define HBQT_TYPE_QShowEvent ( HBQT_TYPE_QTGUI_BASE + 130 ) +#define HBQT_TYPE_QSizeGrip ( HBQT_TYPE_QTGUI_BASE + 131 ) +#define HBQT_TYPE_QSizePolicy ( HBQT_TYPE_QTGUI_BASE + 132 ) +#define HBQT_TYPE_QSlider ( HBQT_TYPE_QTGUI_BASE + 133 ) +#define HBQT_TYPE_QSound ( HBQT_TYPE_QTGUI_BASE + 134 ) +#define HBQT_TYPE_QSpacerItem ( HBQT_TYPE_QTGUI_BASE + 135 ) +#define HBQT_TYPE_QSpinBox ( HBQT_TYPE_QTGUI_BASE + 136 ) +#define HBQT_TYPE_QSplashScreen ( HBQT_TYPE_QTGUI_BASE + 137 ) +#define HBQT_TYPE_QSplitter ( HBQT_TYPE_QTGUI_BASE + 138 ) +#define HBQT_TYPE_QStackedWidget ( HBQT_TYPE_QTGUI_BASE + 139 ) +#define HBQT_TYPE_QStandardItem ( HBQT_TYPE_QTGUI_BASE + 140 ) +#define HBQT_TYPE_QStandardItemModel ( HBQT_TYPE_QTGUI_BASE + 141 ) +#define HBQT_TYPE_QStatusBar ( HBQT_TYPE_QTGUI_BASE + 142 ) +#define HBQT_TYPE_QStringListModel ( HBQT_TYPE_QTGUI_BASE + 143 ) +#define HBQT_TYPE_QStyle ( HBQT_TYPE_QTGUI_BASE + 144 ) +#define HBQT_TYPE_QStyledItemDelegate ( HBQT_TYPE_QTGUI_BASE + 145 ) +#define HBQT_TYPE_QStyleFactory ( HBQT_TYPE_QTGUI_BASE + 146 ) +#define HBQT_TYPE_QStyleHintReturn ( HBQT_TYPE_QTGUI_BASE + 147 ) +#define HBQT_TYPE_QStyleHintReturnMask ( HBQT_TYPE_QTGUI_BASE + 148 ) +#define HBQT_TYPE_QStyleHintReturnVariant ( HBQT_TYPE_QTGUI_BASE + 149 ) +#define HBQT_TYPE_QStyleOption ( HBQT_TYPE_QTGUI_BASE + 150 ) +#define HBQT_TYPE_QStyleOptionButton ( HBQT_TYPE_QTGUI_BASE + 151 ) +#define HBQT_TYPE_QStyleOptionComboBox ( HBQT_TYPE_QTGUI_BASE + 152 ) +#define HBQT_TYPE_QStyleOptionComplex ( HBQT_TYPE_QTGUI_BASE + 153 ) +#define HBQT_TYPE_QStyleOptionDockWidget ( HBQT_TYPE_QTGUI_BASE + 154 ) +#define HBQT_TYPE_QStyleOptionFocusRect ( HBQT_TYPE_QTGUI_BASE + 155 ) +#define HBQT_TYPE_QStyleOptionFrame ( HBQT_TYPE_QTGUI_BASE + 156 ) +#define HBQT_TYPE_QStyleOptionGroupBox ( HBQT_TYPE_QTGUI_BASE + 157 ) +#define HBQT_TYPE_QStyleOptionHeader ( HBQT_TYPE_QTGUI_BASE + 158 ) +#define HBQT_TYPE_QStyleOptionMenuItem ( HBQT_TYPE_QTGUI_BASE + 159 ) +#define HBQT_TYPE_QStyleOptionProgressBar ( HBQT_TYPE_QTGUI_BASE + 160 ) +#define HBQT_TYPE_QStyleOptionSizeGrip ( HBQT_TYPE_QTGUI_BASE + 161 ) +#define HBQT_TYPE_QStyleOptionSlider ( HBQT_TYPE_QTGUI_BASE + 162 ) +#define HBQT_TYPE_QStyleOptionSpinBox ( HBQT_TYPE_QTGUI_BASE + 163 ) +#define HBQT_TYPE_QStyleOptionTab ( HBQT_TYPE_QTGUI_BASE + 164 ) +#define HBQT_TYPE_QStyleOptionTabBarBase ( HBQT_TYPE_QTGUI_BASE + 165 ) +#define HBQT_TYPE_QStyleOptionTabWidgetFrame ( HBQT_TYPE_QTGUI_BASE + 166 ) +#define HBQT_TYPE_QStyleOptionTitleBar ( HBQT_TYPE_QTGUI_BASE + 167 ) +#define HBQT_TYPE_QStyleOptionToolBar ( HBQT_TYPE_QTGUI_BASE + 168 ) +#define HBQT_TYPE_QStyleOptionToolBox ( HBQT_TYPE_QTGUI_BASE + 169 ) +#define HBQT_TYPE_QStyleOptionToolButton ( HBQT_TYPE_QTGUI_BASE + 170 ) +#define HBQT_TYPE_QStyleOptionViewItem ( HBQT_TYPE_QTGUI_BASE + 171 ) +#define HBQT_TYPE_QStylePainter ( HBQT_TYPE_QTGUI_BASE + 172 ) +#define HBQT_TYPE_QSyntaxHighlighter ( HBQT_TYPE_QTGUI_BASE + 173 ) +#define HBQT_TYPE_QSystemTrayIcon ( HBQT_TYPE_QTGUI_BASE + 174 ) +#define HBQT_TYPE_QTabBar ( HBQT_TYPE_QTGUI_BASE + 175 ) +#define HBQT_TYPE_QTableView ( HBQT_TYPE_QTGUI_BASE + 176 ) +#define HBQT_TYPE_QTableWidget ( HBQT_TYPE_QTGUI_BASE + 177 ) +#define HBQT_TYPE_QTableWidgetItem ( HBQT_TYPE_QTGUI_BASE + 178 ) +#define HBQT_TYPE_QTableWidgetSelectionRange ( HBQT_TYPE_QTGUI_BASE + 179 ) +#define HBQT_TYPE_QTabWidget ( HBQT_TYPE_QTGUI_BASE + 180 ) +#define HBQT_TYPE_QTextBlock ( HBQT_TYPE_QTGUI_BASE + 181 ) +#define HBQT_TYPE_QTextBlockFormat ( HBQT_TYPE_QTGUI_BASE + 182 ) +#define HBQT_TYPE_QTextBlockGroup ( HBQT_TYPE_QTGUI_BASE + 183 ) +#define HBQT_TYPE_QTextBrowser ( HBQT_TYPE_QTGUI_BASE + 184 ) +#define HBQT_TYPE_QTextCharFormat ( HBQT_TYPE_QTGUI_BASE + 185 ) +#define HBQT_TYPE_QTextCursor ( HBQT_TYPE_QTGUI_BASE + 186 ) +#define HBQT_TYPE_QTextDocument ( HBQT_TYPE_QTGUI_BASE + 187 ) +#define HBQT_TYPE_QTextDocumentFragment ( HBQT_TYPE_QTGUI_BASE + 188 ) +#define HBQT_TYPE_QTextDocumentWriter ( HBQT_TYPE_QTGUI_BASE + 189 ) +#define HBQT_TYPE_QTextEdit ( HBQT_TYPE_QTGUI_BASE + 190 ) +#define HBQT_TYPE_QTextFormat ( HBQT_TYPE_QTGUI_BASE + 191 ) +#define HBQT_TYPE_QTextFragment ( HBQT_TYPE_QTGUI_BASE + 192 ) +#define HBQT_TYPE_QTextFrame ( HBQT_TYPE_QTGUI_BASE + 193 ) +#define HBQT_TYPE_QTextFrameFormat ( HBQT_TYPE_QTGUI_BASE + 194 ) +#define HBQT_TYPE_QTextImageFormat ( HBQT_TYPE_QTGUI_BASE + 195 ) +#define HBQT_TYPE_QTextInlineObject ( HBQT_TYPE_QTGUI_BASE + 196 ) +#define HBQT_TYPE_QTextItem ( HBQT_TYPE_QTGUI_BASE + 197 ) +#define HBQT_TYPE_QTextLayout ( HBQT_TYPE_QTGUI_BASE + 198 ) +#define HBQT_TYPE_QTextLength ( HBQT_TYPE_QTGUI_BASE + 199 ) +#define HBQT_TYPE_QTextLine ( HBQT_TYPE_QTGUI_BASE + 200 ) +#define HBQT_TYPE_QTextList ( HBQT_TYPE_QTGUI_BASE + 201 ) +#define HBQT_TYPE_QTextListFormat ( HBQT_TYPE_QTGUI_BASE + 202 ) +#define HBQT_TYPE_QTextObject ( HBQT_TYPE_QTGUI_BASE + 203 ) +#define HBQT_TYPE_QTextOption ( HBQT_TYPE_QTGUI_BASE + 204 ) +#define HBQT_TYPE_QTextTableFormat ( HBQT_TYPE_QTGUI_BASE + 205 ) +#define HBQT_TYPE_QTimeEdit ( HBQT_TYPE_QTGUI_BASE + 206 ) +#define HBQT_TYPE_QToolBar ( HBQT_TYPE_QTGUI_BASE + 207 ) +#define HBQT_TYPE_QToolBox ( HBQT_TYPE_QTGUI_BASE + 208 ) +#define HBQT_TYPE_QToolButton ( HBQT_TYPE_QTGUI_BASE + 209 ) +#define HBQT_TYPE_QTransform ( HBQT_TYPE_QTGUI_BASE + 210 ) +#define HBQT_TYPE_QTreeView ( HBQT_TYPE_QTGUI_BASE + 211 ) +#define HBQT_TYPE_QTreeWidget ( HBQT_TYPE_QTGUI_BASE + 212 ) +#define HBQT_TYPE_QTreeWidgetItem ( HBQT_TYPE_QTGUI_BASE + 213 ) +#define HBQT_TYPE_QValidator ( HBQT_TYPE_QTGUI_BASE + 214 ) +#define HBQT_TYPE_QVBoxLayout ( HBQT_TYPE_QTGUI_BASE + 215 ) +#define HBQT_TYPE_QWheelEvent ( HBQT_TYPE_QTGUI_BASE + 216 ) +#define HBQT_TYPE_QWidget ( HBQT_TYPE_QTGUI_BASE + 217 ) +#define HBQT_TYPE_QWidgetAction ( HBQT_TYPE_QTGUI_BASE + 218 ) +#define HBQT_TYPE_QWidgetItem ( HBQT_TYPE_QTGUI_BASE + 219 ) +#define HBQT_TYPE_QWindowsStyle ( HBQT_TYPE_QTGUI_BASE + 220 ) +#define HBQT_TYPE_QWindowStateChangeEvent ( HBQT_TYPE_QTGUI_BASE + 221 ) +#define HBQT_TYPE_QWizard ( HBQT_TYPE_QTGUI_BASE + 222 ) +#define HBQT_TYPE_QWizardPage ( HBQT_TYPE_QTGUI_BASE + 223 ) +#define HBQT_TYPE_QUiLoader ( HBQT_TYPE_QTGUI_BASE + 224 ) #endif /* __HBQTGUI_H */ diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp index ef5dadce71..e5eea79a51 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp +++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp @@ -51,6 +51,8 @@ * */ +#include "hbqt.h" + #include "hbapiitm.h" #include "hbvm.h" diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h b/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h index 57adf65e36..30da1bee31 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h +++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.h @@ -54,7 +54,8 @@ #ifndef HBQT_HBQAbstractItemModel_H #define HBQT_HBQAbstractItemModel_H -#include "hbqt.h" +#include "hbqtcore.h" +#include "hbqtgui.h" /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqmainwindow.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqmainwindow.cpp index 2e0298ae51..7cd5e8ee78 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_hbqmainwindow.cpp +++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqmainwindow.cpp @@ -49,7 +49,8 @@ * If you do not wish that, delete this exception notice. * */ -/*----------------------------------------------------------------------*/ + +#include "hbqt.h" #include "hbapiitm.h" #include "hbvm.h" diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp index 992397f807..0be43af130 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp +++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp @@ -65,6 +65,8 @@ */ /*----------------------------------------------------------------------*/ +#include "hbqt.h" + #include "hbapiitm.h" #include "hbvm.h" diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.cpp index cc1120f3aa..e49d54a270 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.cpp +++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.cpp @@ -49,7 +49,8 @@ * If you do not wish that, delete this exception notice. * */ -/*----------------------------------------------------------------------*/ + +#include "hbqt.h" #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.cpp index 53f028b332..a82e78eec2 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.cpp +++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.cpp @@ -51,7 +51,8 @@ * If you do not wish that, delete this exception notice. * */ -/*----------------------------------------------------------------------*/ + +#include "hbqt.h" #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbc b/harbour/contrib/hbqt/qtgui/hbqtgui.hbc index 9e40099840..39d50e52b2 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbc +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbc @@ -9,6 +9,8 @@ libs=../qtcore/hbqtcore.hbc +incpaths=g + {!HB_STATIC_QT&!hbdyn}libs=hbqtgui${__HB_DYN__} {!HB_STATIC_QT&(allwin|os2)}libs=QtGui4 {!HB_STATIC_QT&linux}libs=QtGui diff --git a/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork.h b/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork.h index 77b0b41202..bd6e5c5c7a 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork.h +++ b/harbour/contrib/hbqt/qtnetwork/g/hbqtnetwork.h @@ -27,11 +27,20 @@ extern HB_EXPORT void * hbqt_gcAllocate_QHttpRequestHeader( void * pObj, bool bN extern HB_EXPORT void * hbqt_gcAllocate_QHttpResponseHeader( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QNetworkRequest( void * pObj, bool bNew ); -#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 ) ) +#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 ) ) + +#define HBQT_TYPE_QTNETWORK_BASE 64000 + +#define HBQT_TYPE_QFtp ( HBQT_TYPE_QTNETWORK_BASE + 1 ) +#define HBQT_TYPE_QHttp ( HBQT_TYPE_QTNETWORK_BASE + 2 ) +#define HBQT_TYPE_QHttpHeader ( HBQT_TYPE_QTNETWORK_BASE + 3 ) +#define HBQT_TYPE_QHttpRequestHeader ( HBQT_TYPE_QTNETWORK_BASE + 4 ) +#define HBQT_TYPE_QHttpResponseHeader ( HBQT_TYPE_QTNETWORK_BASE + 5 ) +#define HBQT_TYPE_QNetworkRequest ( HBQT_TYPE_QTNETWORK_BASE + 6 ) #endif /* __HBQTNETWORK_H */ diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc index 31e33c471c..cffe4c3681 100644 --- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc +++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc @@ -9,6 +9,8 @@ libs=../qtcore/hbqtcore.hbc +incpaths=g + {!HB_STATIC_QT&!hbdyn}libs=hbqtnetwork${__HB_DYN__} {!HB_STATIC_QT&(allwin|os2)}libs=QtNetwork4 {!HB_STATIC_QT&linux}libs=QtNetwork diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpluginfactory.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpluginfactory.txt index d1d58eca34..4b522d300e 100644 --- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpluginfactory.txt +++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpluginfactory.txt @@ -27,7 +27,6 @@ * An instance of the object of type QWebPluginFactory * $METHODS$ * :create( cMimeType, pUrl, pArgumentNames, pArgumentValues ) -> pQObject - * :plugins() -> pQList * :refreshPlugins() -> NIL * :supportsExtension( nExtension ) -> lBool * diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsecurityorigin.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsecurityorigin.txt index fb51b36e9f..a9d742f1c2 100644 --- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsecurityorigin.txt +++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsecurityorigin.txt @@ -28,7 +28,6 @@ * $METHODS$ * :databaseQuota() -> nQint64 * :databaseUsage() -> nQint64 - * :databases() -> pQList * :host() -> cQString * :port() -> nInt * :scheme() -> cQString diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp index f4ed545f17..c5d6785673 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp @@ -81,6 +81,8 @@ #include +#include "hbqtgui.h" + #include #include diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp index 49c2174db8..eea153438e 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp @@ -68,6 +68,8 @@ #include +#include "hbqtgui.h" + #include #include diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp index 37c0206ee6..1cd8bbe6d4 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp @@ -68,6 +68,8 @@ #include +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp index 17b08e35a8..6c466ef8a2 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp @@ -78,6 +78,8 @@ #include +#include "hbqtgui.h" + #include #include diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp index 1ff05a2c59..eda20e3b79 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp @@ -73,6 +73,8 @@ #include +#include "hbqtgui.h" + #include @@ -139,20 +141,6 @@ HB_FUNC( QT_QWEBPLUGINFACTORY_CREATE ) } } -/* - * virtual QList plugins () const = 0 - */ -HB_FUNC( QT_QWEBPLUGINFACTORY_PLUGINS ) -{ - QWebPluginFactory * p = hbqt_par_QWebPluginFactory( 1 ); - if( p ) - hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->plugins() ), true ) ); - else - { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QWEBPLUGINFACTORY_PLUGINS FP=hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->plugins() ), true ) ); p is NULL" ) ); - } -} - /* * virtual void refreshPlugins () */ diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp index 7ce9d8bd7d..7c8749d75a 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp @@ -170,20 +170,6 @@ HB_FUNC( QT_QWEBSECURITYORIGIN_DATABASEUSAGE ) } } -/* - * QList databases () const - */ -HB_FUNC( QT_QWEBSECURITYORIGIN_DATABASES ) -{ - QWebSecurityOrigin * p = hbqt_par_QWebSecurityOrigin( 1 ); - if( p ) - hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->databases() ), true ) ); - else - { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QWEBSECURITYORIGIN_DATABASES FP=hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->databases() ), true ) ); p is NULL" ) ); - } -} - /* * QString host () const */ diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp index 83f7da157e..d571006be8 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp @@ -75,6 +75,8 @@ #include +#include "hbqtgui.h" + #include #include diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp index 2bf9321df3..b499922e03 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp @@ -68,6 +68,9 @@ #include +#include "hbqtgui.h" +#include "hbqtnetwork.h" + #include diff --git a/harbour/contrib/hbqt/qtwebkit/g/TQWebPluginFactory.prg b/harbour/contrib/hbqt/qtwebkit/g/TQWebPluginFactory.prg index cb585299d8..3374d08a14 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/TQWebPluginFactory.prg +++ b/harbour/contrib/hbqt/qtwebkit/g/TQWebPluginFactory.prg @@ -68,7 +68,6 @@ CREATE CLASS QWebPluginFactory INHERIT HbQtObjectHandler, QObject METHOD new( ... ) METHOD create( cMimeType, pUrl, pArgumentNames, pArgumentValues ) - METHOD plugins() METHOD refreshPlugins() METHOD supportsExtension( nExtension ) @@ -88,10 +87,6 @@ METHOD QWebPluginFactory:create( cMimeType, pUrl, pArgumentNames, pArgumentValue RETURN Qt_QWebPluginFactory_create( ::pPtr, cMimeType, hbqt_ptr( pUrl ), hbqt_ptr( pArgumentNames ), hbqt_ptr( pArgumentValues ) ) -METHOD QWebPluginFactory:plugins() - RETURN Qt_QWebPluginFactory_plugins( ::pPtr ) - - METHOD QWebPluginFactory:refreshPlugins() RETURN Qt_QWebPluginFactory_refreshPlugins( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtwebkit/g/TQWebSecurityOrigin.prg b/harbour/contrib/hbqt/qtwebkit/g/TQWebSecurityOrigin.prg index cc5f28938c..1264e98a62 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/TQWebSecurityOrigin.prg +++ b/harbour/contrib/hbqt/qtwebkit/g/TQWebSecurityOrigin.prg @@ -69,7 +69,6 @@ CREATE CLASS QWebSecurityOrigin INHERIT HbQtObjectHandler METHOD databaseQuota() METHOD databaseUsage() - METHOD databases() METHOD host() METHOD port() METHOD scheme() @@ -96,10 +95,6 @@ METHOD QWebSecurityOrigin:databaseUsage() RETURN Qt_QWebSecurityOrigin_databaseUsage( ::pPtr ) -METHOD QWebSecurityOrigin:databases() - RETURN Qt_QWebSecurityOrigin_databases( ::pPtr ) - - METHOD QWebSecurityOrigin:host() RETURN Qt_QWebSecurityOrigin_host( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h b/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h index 4011908926..94429a39c2 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h +++ b/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h @@ -35,15 +35,28 @@ extern HB_EXPORT void * hbqt_gcAllocate_QWebSecurityOrigin( void * pObj, bool bN extern HB_EXPORT void * hbqt_gcAllocate_QWebSettings( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QWebView( void * pObj, bool bNew ); -#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 ) ) +#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 ) ) + +#define HBQT_TYPE_QTWEBKIT_BASE 60000 + +#define HBQT_TYPE_QWebFrame ( HBQT_TYPE_QTWEBKIT_BASE + 1 ) +#define HBQT_TYPE_QWebHistory ( HBQT_TYPE_QTWEBKIT_BASE + 2 ) +#define HBQT_TYPE_QWebHistoryInterface ( HBQT_TYPE_QTWEBKIT_BASE + 3 ) +#define HBQT_TYPE_QWebHistoryItem ( HBQT_TYPE_QTWEBKIT_BASE + 4 ) +#define HBQT_TYPE_QWebHitTestResult ( HBQT_TYPE_QTWEBKIT_BASE + 5 ) +#define HBQT_TYPE_QWebPage ( HBQT_TYPE_QTWEBKIT_BASE + 6 ) +#define HBQT_TYPE_QWebPluginFactory ( HBQT_TYPE_QTWEBKIT_BASE + 7 ) +#define HBQT_TYPE_QWebSecurityOrigin ( HBQT_TYPE_QTWEBKIT_BASE + 8 ) +#define HBQT_TYPE_QWebSettings ( HBQT_TYPE_QTWEBKIT_BASE + 9 ) +#define HBQT_TYPE_QWebView ( HBQT_TYPE_QTWEBKIT_BASE + 10 ) #endif /* __HBQTWEBKIT_H */ diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc index 7742ca0a95..1f7ab39632 100644 --- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc +++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc @@ -8,6 +8,10 @@ # --------------------------------------------------------------- libs=../qtcore/hbqtcore.hbc +libs=../qtgui/hbqtgui.hbc +libs=../qtnetwork/hbqtnetwork.hbc + +incpaths=g {!HB_STATIC_QT&!hbdyn}libs=hbqtwebkit${__HB_DYN__} {!HB_STATIC_QT&(allwin|os2)}libs=QtWebKit4 diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp index e728e6bdbd..f3292c920f 100644 --- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp +++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp @@ -9,5 +9,7 @@ g/filelist.hbm -ig ../qtcore/hbqtcore.hbc +../qtgui/hbqtgui.hbc +../qtnetwork/hbqtnetwork.hbc hbqtwebkits.hbp diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp b/harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp index 984a718a96..bcc20e2181 100644 --- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp +++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp @@ -9,3 +9,5 @@ g/filelist.hbm -ig ../qtcore/hbqtcore.hbc +../qtgui/hbqtgui.hbc +../qtnetwork/hbqtnetwork.hbc diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth index 06d2742779..3aec71e81a 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth @@ -63,6 +63,8 @@ folder = qtwebkit +#include "hbqtgui.h" + #include #include diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth index 0709c11d20..93af993938 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth @@ -63,6 +63,8 @@ folder = qtwebkit +#include "hbqtgui.h" + #include #include diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth index 7be1ffee51..de506b6516 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth @@ -63,6 +63,8 @@ folder = qtwebkit +#include "hbqtgui.h" + #include diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth index be7785f5f1..47800cdd98 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth @@ -61,6 +61,8 @@ folder = qtwebkit +#include "hbqtgui.h" + #include #include diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth index 2e3b8a0c4d..82a5363cf7 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth @@ -62,6 +62,8 @@ folder = qtwebkit +#include "hbqtgui.h" + #include @@ -83,7 +85,7 @@ enum Extension { } virtual QObject * create ( const QString & mimeType, const QUrl & url, const QStringList & argumentNames, const QStringList & argumentValues ) const = 0 // virtual bool extension ( Extension extension, const ExtensionOption * option = 0, ExtensionReturn * output = 0 ) -virtual QList plugins () const = 0 +// virtual QList plugins () const = 0 virtual void refreshPlugins () virtual bool supportsExtension ( Extension extension ) const diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth index b73d2bd2e9..4b4ad3879e 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth @@ -85,7 +85,7 @@ HB_FUNC( QT_QWEBSECURITYORIGIN ) qint64 databaseQuota () const qint64 databaseUsage () const -QList databases () const +// QList databases () const QString host () const int port () const QString scheme () const diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth index a9813f434f..cf81bf323a 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebSettings.qth @@ -64,6 +64,8 @@ folder = qtwebkit +#include "hbqtgui.h" + #include #include diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth index a9103b819c..20a2c341db 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth @@ -61,6 +61,9 @@ folder = qtwebkit +#include "hbqtgui.h" +#include "hbqtnetwork.h" + #include diff --git a/harbour/contrib/hbqt/utils/hbqtgen.prg b/harbour/contrib/hbqt/utils/hbqtgen.prg index b37e9a6cd8..484cddbde0 100644 --- a/harbour/contrib/hbqt/utils/hbqtgen.prg +++ b/harbour/contrib/hbqt/utils/hbqtgen.prg @@ -1778,6 +1778,7 @@ STATIC FUNCTION Build_HeaderFile( cpp_, cPathOut, cProFile ) LOCAL txt_ := {} LOCAL s LOCAL tmp + LOCAL cName := FNameGetName( cProFile ) aadd( txt_, "/*" ) aadd( txt_, " * $" + "Id" + "$" ) @@ -1789,8 +1790,8 @@ STATIC FUNCTION Build_HeaderFile( cpp_, cPathOut, cProFile ) aadd( txt_, "/* or the generator tool itself, and run regenarate. */" ) aadd( txt_, "/* -------------------------------------------------------------------- */" ) aadd( txt_, "" ) - aadd( txt_, "#ifndef __HB" + Upper( FNameGetName( cProFile ) ) + "_H" ) - aadd( txt_, "#define __HB" + Upper( FNameGetName( cProFile ) ) + "_H" ) + aadd( txt_, "#ifndef __HB" + Upper( cName ) + "_H" ) + aadd( txt_, "#define __HB" + Upper( cName ) + "_H" ) aadd( txt_, "" ) aadd( txt_, '#include "hbqt.h"' ) aadd( txt_, "" ) @@ -1813,13 +1814,20 @@ STATIC FUNCTION Build_HeaderFile( cpp_, cPathOut, cProFile ) ELSE tmp := s ENDIF - aadd( txt_, PadR( "#define hbqt_par_" + s + "( n )", 52 ) + PadR( "( ( " + tmp, 32 ) + "* ) hbqt_gcpointer( n ) )" ) + aadd( txt_, PadR( "#define hbqt_par_" + s + "( n )", 64 ) + PadR( "( ( " + tmp, 48 ) + "* ) hbqt_gcpointer( n ) )" ) NEXT aadd( txt_, "" ) - aadd( txt_, "#endif /* __HB" + Upper( FNameGetName( cProFile ) ) + "_H */" ) + aadd( txt_, PadR( "#define HBQT_TYPE_" + Upper( cName ) + "_BASE", 64 ) + hb_ntos( Round( hb_crc16( Upper( cName ) ), -3 ) ) ) + aadd( txt_, "" ) + FOR EACH s IN cpp_ + aadd( txt_, PadR( "#define HBQT_TYPE_" + s, 64 ) + "( HBQT_TYPE_" + Upper( cName ) + "_BASE + " + hb_ntos( s:__enumIndex() ) + " )" ) + NEXT + aadd( txt_, "" ) - CreateTarget( cFile + "hb" + FNameGetName( cProFile ) + ".h", txt_ ) + aadd( txt_, "#endif /* __HB" + Upper( cName ) + "_H */" ) + + CreateTarget( cFile + "hb" + cName + ".h", txt_ ) RETURN NIL