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

List:       kde-core-devel
Subject:    [PATCH]: am_edit vs. uic images
From:       Werner Trobin <trobin () kde ! org>
Date:       2002-02-22 17:49:15
[Download RAW message or body]

Hi!

As the designer always generates the same names for embedded images in .ui 
files (image0, image1,...) --enable-final breaks as multiple arrays in the 
huge .all_cpp.cpp file are called the same way.

The attached patch simply prefixes those image names with the filename.

Comments? Suggestions?

Ciao,
Werner
["uifun.diff" (text/x-diff)]

Index: am_edit
===================================================================
RCS file: /home/kde/kde-common/admin/am_edit,v
retrieving revision 1.300
diff -b -u -p -r1.300 am_edit
--- am_edit	2002/01/19 00:28:13	1.300
+++ am_edit	2002/02/22 17:43:07
@@ -1092,7 +1092,7 @@ sub tag_UIFILES ()
                 $dep_lines .= "\trm -f $source.$cxxsuffix\n";
                 if (!$kdeopts{"qtonly"}) {
                     $dep_lines .= "\techo '#include <klocale.h>' > \
                $source.$cxxsuffix\n";
-                    $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h \
$sourcedir$source.ui | sed -e \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" | sed -e \
\"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" >> $source.$cxxsuffix || rm \
-f $source.$cxxsuffix\n"; +                    $dep_lines .= "\t\$(UIC) -tr \
\${UIC_TR} -i $source.h $sourcedir$source.ui | sed -e \"s,\${UIC_TR}( \\\"\\\" \
),QString::null,g\" | sed -e \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" \
| sed -e \"s,\\(image[0-9][0-9]*_data\\)," . $source . "\_\\1,g\" >> \
$source.$cxxsuffix || rm -f $source.$cxxsuffix\n";  } else {
                     $dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > \
$source.$cxxsuffix || rm -f $source.$cxxsuffix\n";  }



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