summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2024-07-08 01:46:01 +0200
committerSlávek Banko <[email protected]>2024-07-08 03:47:32 +0200
commit03a1c2f4fd4e105a2780c6553a8f72ec1b9e1555 (patch)
tree082c569f746aacc13bc7c62513f8fd778ae65217
parentf1352532be208711b426c69f97645b2e19b70ce7 (diff)
downloadtde-cmake-03a1c2f4fd4e105a2780c6553a8f72ec1b9e1555.tar.gz
tde-cmake-03a1c2f4fd4e105a2780c6553a8f72ec1b9e1555.zip
tde_uic: Cover all wizard include variants and class name in one regexp.
Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit e875dd8b52c352596ffe5a8a9e33005339646165)
-rw-r--r--modules/tde_uic.cmake9
1 files changed, 3 insertions, 6 deletions
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 <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( )
@@ -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 <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}" )