From 03a1c2f4fd4e105a2780c6553a8f72ec1b9e1555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 8 Jul 2024 01:46:01 +0200 Subject: tde_uic: Cover all wizard include variants and class name in one regexp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit e875dd8b52c352596ffe5a8a9e33005339646165) --- modules/tde_uic.cmake | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'modules/tde_uic.cmake') diff --git a/modules/tde_uic.cmake b/modules/tde_uic.cmake index 572781a..f557d58 100644 --- a/modules/tde_uic.cmake +++ b/modules/tde_uic.cmake @@ -49,10 +49,8 @@ if( _ui_h_content ) string( REGEX REPLACE "#ifndef " "#ifndef UI_" _ui_h_content "${_ui_h_content}" ) string( REGEX REPLACE "#define " "#define UI_" _ui_h_content "${_ui_h_content}" ) if ( TDE_FOUND AND NOT TQT_ONLY ) - string( REGEX REPLACE "public TQWizard" "public KWizard" _ui_h_content "${_ui_h_content}" ) - string( REGEX REPLACE "public QWizard" "public KWizard" _ui_h_content "${_ui_h_content}" ) - string( REGEX REPLACE "#include " "#include " _ui_h_content "${_ui_h_content}" ) - string( REGEX REPLACE "#include " "#include " _ui_h_content "${_ui_h_content}" ) + string( REGEX REPLACE "public T?QWizard" "public KWizard" _ui_h_content "${_ui_h_content}" ) + string( REGEX REPLACE "#include <(n?t)?qwizard.h>" "#include " _ui_h_content "${_ui_h_content}" ) endif( TDE_FOUND AND NOT TQT_ONLY ) file( WRITE ${_ui_basename}.h "${_ui_h_content}" ) endif( ) @@ -69,8 +67,7 @@ if( _ui_cpp_content ) string( REGEX REPLACE "${TR_FUNC}\\(\"\"\\)" "TQString::null" _ui_cpp_content "${_ui_cpp_content}" ) string( REGEX REPLACE "${TR_FUNC}\\(\"\", \"\"\\)" "TQString::null" _ui_cpp_content "${_ui_cpp_content}" ) if ( TDE_FOUND AND NOT TQT_ONLY ) - string( REGEX REPLACE ": TQWizard\\(" ": KWizard(" _ui_cpp_content "${_ui_cpp_content}" ) - string( REGEX REPLACE ": QWizard\\(" ": KWizard(" _ui_cpp_content "${_ui_cpp_content}" ) + string( REGEX REPLACE ": T?QWizard\\(" ": KWizard(" _ui_cpp_content "${_ui_cpp_content}" ) set( _ui_cpp_content "#include \n#include \n\n${_ui_cpp_content}" ) endif( TDE_FOUND AND NOT TQT_ONLY ) file( WRITE ${_ui_basename}.cpp "${_ui_cpp_content}" ) -- cgit v1.2.1