[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kde-common/admin
From:       David Faure <faure () kde ! org>
Date:       2004-12-17 20:18:28
Message-ID: 20041217201828.E2DEA1C01A () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Patch by Aaron Seigo to turn QWizard into KWizard when compiling .ui files.


  M +5 -3      am_edit   1.412


--- kde-common/admin/am_edit  #1.411:1.412
@@ -1369,5 +1369,5 @@
                     $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}( \\\"\\\" \
),QString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \"s,\${UIC_TR}( \
\\\"\\\"\\, \\\"\\\" ),QString::null,g\" | \$(PERL) -pe \
\"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" >> \
$source.$cxxsuffix ;\\\n"; +                    $dep_lines .= "\t\$(PERL) -pe \
\"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \
\"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | \$(PERL) -pe \
\"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" | \$(PERL) -pe \
                \"s,: QWizard\\(,: KWizard(,g\" >> $source.$cxxsuffix ;\\\n";
                     $dep_lines .= "\trm -f $source.$cxxsuffix.temp ;\\\n";
                 } else {
@@ -1376,5 +1376,7 @@
                 $dep_lines .= "\tif test \"\$\$ret\" = 0; then echo '#include \
\"$source.moc\"' >> $source.$cxxsuffix; else rm -f $source.$cxxsuffix ; exit \$\$ret \
; fi\n\n";  $dep_lines .= "$source.h: $sourcedir$source.ui\n";
-                $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n\n";
+                $dep_lines .= "\trm -rf $source.h;\n";
+                $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \
\"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" \
>> $source.h ;\n"; +
                 $dep_lines .= "$source.moc: $source.h\n";
                 $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n";


[prev in list] [next in list] [prev in thread] [next in thread]