From e875dd8b52c352596ffe5a8a9e33005339646165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Mon, 8 Jul 2024 01:46:01 +0200
Subject: [PATCH] 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 <slavek.banko@axis.cz>
---
 modules/tde_uic.cmake | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/tde_uic.cmake b/modules/tde_uic.cmake
index a00b54f..7b4f50e 100644
--- a/modules/tde_uic.cmake
+++ b/modules/tde_uic.cmake
@@ -47,10 +47,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 <ntqwizard.h>" "#include <kwizard.h>" _ui_h_content "${_ui_h_content}" )
-    string( REGEX REPLACE "#include <qwizard.h>" "#include <kwizard.h>" _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 <kwizard.h>" _ui_h_content "${_ui_h_content}" )
   endif( TDE_FOUND AND NOT TQT_ONLY )
   file( WRITE ${_ui_basename}.h "${_ui_h_content}" )
 endif( )
@@ -67,8 +65,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 <kdialog.h>\n#include <tdelocale.h>\n\n${_ui_cpp_content}" )
   endif( TDE_FOUND AND NOT TQT_ONLY )
   file( WRITE ${_ui_basename}.cpp "${_ui_cpp_content}" )