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

List:       kde-core-devel
Subject:    PATCH: am_edit
From:       John Birch <John.Birch () xtra ! co ! nz>
Date:       2000-09-30 2:37:17
[Download RAW message or body]

Small patch to allow am_edit to find includes of the form 
"<whitespace>#include blah.moc"

jbb

["am_edit.patch" (text/plain)]

Index: am_edit
===================================================================
RCS file: /home/kde/kde-common/admin/am_edit,v
retrieving revision 1.206
diff -u -r1.206 am_edit
--- am_edit	2000/09/25 20:04:13	1.206
+++ am_edit	2000/09/30 02:30:51
@@ -873,7 +873,7 @@
 	  $dep_lines .= "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-skel $source.kidl\n";
 	}
 	@cppFiles =
-	  `grep -l "^#include *.$sourcename\.h." $cppExt 2> /dev/null`;
+	  `grep -l "^\s*#include *.$sourcename\.h." $cppExt 2> /dev/null`;
         foreach $file (@cppFiles) {
 	  chomp ($file);
 	  $dep_lines .= "\$(srcdir)/$file: $sourcename.h\n";
@@ -950,7 +950,7 @@
 	$dep_lines .= "$source.moc: $source.h\n";
 	$dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n";
 
-	@depFiles = `grep -l "^#include *.$source\.h." $cppExt $hExt 2> /dev/null`;
+	@depFiles = `grep -l "\s*^#include *.$source\.h." $cppExt $hExt 2> /dev/null`;
         foreach $file (@depFiles) {
 	  chomp ($file);
 	  next unless $file;
@@ -1532,7 +1532,7 @@
     {
         # Find corresponding c++ files that includes the moc file
         @cppFiles =
-            `grep -l "^#include[ ]*.$mocFile\.moc." $cppExt 2> /dev/null`;
+            `grep -l "^\s*#include[ ]*.$mocFile\.moc." $cppExt 2> /dev/null`;
 
         if (@cppFiles == 1)
         {


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