From 41bf0e17f47af5a9f33570a1fc836e9b81300926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Sat, 11 Nov 2023 13:43:23 +0100 Subject: [PATCH] 2023-11-11 13:43 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/gtqtc/gtqtc.h * use QT_VERSION >= 0x050000 instead of QT_VERSION <= 0x040900 * indenting --- ChangeLog.txt | 5 +++++ contrib/gtqtc/gtqtc.h | 38 +++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 5b5372ee90..ce6bd331ab 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,11 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2023-11-11 13:43 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * contrib/gtqtc/gtqtc.h + * use QT_VERSION >= 0x050000 instead of QT_VERSION <= 0x040900 + * indenting + 2023-11-11 13:33 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/common/hbdate.c * accept timestamp values with trailing "Z" indicating UTC time diff --git a/contrib/gtqtc/gtqtc.h b/contrib/gtqtc/gtqtc.h index c2d48dff40..3460830829 100644 --- a/contrib/gtqtc/gtqtc.h +++ b/contrib/gtqtc/gtqtc.h @@ -65,18 +65,7 @@ #include #include -#if QT_VERSION <= 0x040900 -#include -#include -#include -#include -#include -#include -#include -#ifdef HB_QT_SOUND - #include -#endif -#else +#if QT_VERSION >= 0x050000 #include #include #include @@ -88,6 +77,17 @@ #ifdef HB_QT_SOUND #include #endif +#else +#include +#include +#include +#include +#include +#include +#include +#ifdef HB_QT_SOUND + #include +#endif #endif #include "hbapi.h" @@ -394,18 +394,18 @@ class QTConsole : public QWidget class QTCWindow : public QMainWindow { - Q_OBJECT + Q_OBJECT public: - QTCWindow( PHB_GTQTC pQTC ); - virtual ~QTCWindow( void ); + QTCWindow( PHB_GTQTC pQTC ); + virtual ~QTCWindow( void ); - QTConsole * qConsole; - void setWindowSize( void ); - void setResizing( void ); + QTConsole * qConsole; + void setWindowSize( void ); + void setResizing( void ); protected: - void closeEvent( QCloseEvent * evt ); + void closeEvent( QCloseEvent * evt ); }; #endif /* HB_QTC_H_ */