summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2024-07-07 18:50:54 +0200
committerSlávek Banko <[email protected]>2024-07-08 03:46:01 +0200
commitd2186b1a07912dfe51ddba6a22da37e146bbd3f7 (patch)
tree6216d724495004dc7d1b28ca02bf1629d90df8ff
parent3c9e11e1dd9b27bf8e57c9f72f1203c61f1341d4 (diff)
downloadadmin-d2186b1a07912dfe51ddba6a22da37e146bbd3f7.tar.gz
admin-d2186b1a07912dfe51ddba6a22da37e146bbd3f7.zip
am_edit: Cover all wizard include variants and class name in one regexp.
Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit 316450ad53987b392aee244756b2bd91167a36d0)
-rw-r--r--am_edit4
1 files changed, 2 insertions, 2 deletions
diff --git a/am_edit b/am_edit
index b22080e..2c97eba 100644
--- a/am_edit
+++ b/am_edit
@@ -1366,7 +1366,7 @@ sub tag_UIFILES ()
my ($mangled_source) = $source;
$mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage
$dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n";
- $dep_lines .= "\t\$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\" ),TQString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),TQString::null,g\" | \$(PERL) -pe \"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" | \$(PERL) -pe \"s,: TQWizard\\(,: KWizard(,g; s,: QWizard\\(,: KWizard(,g;\" >> $source.$cxxsuffix ;\\\n";
+ $dep_lines .= "\t\$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\" ),TQString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),TQString::null,g\" | \$(PERL) -pe \"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" | \$(PERL) -pe \"s,: T?QWizard\\(,: KWizard(,g;\" >> $source.$cxxsuffix ;\\\n";
$dep_lines .= "\trm -f $source.$cxxsuffix.temp ;\\\n";
} else {
$dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > $source.$cxxsuffix; ret=\$\$?; \\\n";
@@ -1375,7 +1375,7 @@ sub tag_UIFILES ()
$dep_lines .= "$source.h: $sourcedir$source.ui\n";
$dep_lines .= "\trm -rf $source.h;\n";
if (!$kdeopts{"tqtonly"}) {
- $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pe \"s,public TQWizard,public KWizard,g; s,#include <ntqwizard.h>,#include <kwizard.h>,g; s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
+ $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pe \"s,public T?QWizard,public KWizard,g; s,#include <(n?t)?qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
} else {
$dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
}