From bab4623e336551a456eb8928f8b3fa3031ba0e43 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 13 Sep 2023 13:19:09 +0900 Subject: [PATCH] Replace Q_EXPORT_*/Q_EXTERN defines with TQ_EXPORT_*/TQ_EXTERN Signed-off-by: Michele Calgaro --- qtinterface/parser2.sh | 2 +- qtinterface/tqt.h.cmake | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/qtinterface/parser2.sh b/qtinterface/parser2.sh index 0272595..af55933 100755 --- a/qtinterface/parser2.sh +++ b/qtinterface/parser2.sh @@ -12,7 +12,7 @@ echo " " for var in "$@" do - cat $var | grep "class " | sed 's/class //g' | sed 's/QM_EXPORT_XML //g' | sed 's/Q_EXPORT //g' | sed 's/QM_EXPORT_TABLE //g' | sed 's/QM_EXPORT_SQL //g' | sed 's/QM_EXPORT_NETWORK //g' | sed 's/QM_EXPORT_CANVAS //g' | sed 's/QM_EXPORT_DOM //g' | sed 's/QM_EXPORT_HTTP //g' | sed 's/QM_EXPORT_ICONVIEW //g' | sed 's/QM_EXPORT_OPENGL //g' | sed 's/Q_EXPORT_CODECS_JP //g' | sed 's/Q_EXPORT_CODECS_CN //g' | sed 's/Q_PNGEXPORT //g' | sed 's/Q_EXPORT_STYLE_COMPACT //g' | sed 's/Q_EXPORT_CODECS_KR //g' | awk '{print $1}' | sed 's/\/\/.//g' | sed 's/\/\///g' | sed 's/://g' | sed 's/;//g' | xargs ./parser3.sh + cat $var | grep "class " | sed 's/class //g' | sed 's/QM_EXPORT_XML //g' | sed 's/TQ_EXPORT //g' | sed 's/QM_EXPORT_TABLE //g' | sed 's/QM_EXPORT_SQL //g' | sed 's/QM_EXPORT_NETWORK //g' | sed 's/QM_EXPORT_CANVAS //g' | sed 's/QM_EXPORT_DOM //g' | sed 's/QM_EXPORT_HTTP //g' | sed 's/QM_EXPORT_ICONVIEW //g' | sed 's/QM_EXPORT_OPENGL //g' | sed 's/Q_EXPORT_CODECS_JP //g' | sed 's/Q_EXPORT_CODECS_CN //g' | sed 's/Q_PNGEXPORT //g' | sed 's/Q_EXPORT_STYLE_COMPACT //g' | sed 's/Q_EXPORT_CODECS_KR //g' | awk '{print $1}' | sed 's/\/\/.//g' | sed 's/\/\///g' | sed 's/://g' | sed 's/;//g' | xargs ./parser3.sh done echo " " diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake index 472903a..cf56d64 100644 --- a/qtinterface/tqt.h.cmake +++ b/qtinterface/tqt.h.cmake @@ -142,10 +142,6 @@ Boston, MA 02110-1301, USA. #define static_TQUType_varptr static_QUType_varptr #define static_TQUType_charstar static_QUType_charstar -#define TQ_EXTERN_C Q_EXTERN_C -#define TQ_EXPORT_PLUGIN Q_EXPORT_PLUGIN -#define TQ_EXPORT Q_EXPORT - #define tqreadBlock readBlock #define tqwriteBlock writeBlock #define TQT_TQIO_LONG TQ_LONG