13 files changed, 3 insertions, 45 deletions
diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp
index 82c3625d..97aaedcc 100644
--- a/kompare/libdiff2/diffmodel.cpp
+++ b/kompare/libdiff2/diffmodel.cpp
@@ -405,5 +405,3 @@ bool DiffModel::setSelectedDifference( Difference* diff )
 }
 
 #include "diffmodel.moc"
-
-/* vim: set ts=4 sw=4 noet: */
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index 0011da62..11171ade 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -1419,5 +1419,3 @@ void KompareModelList::slotActionUnapplyAllDifferences()
 }
 
 #include "komparemodellist.moc"
-
-/* vim: set ts=4 sw=4 noet: */
diff --git a/kompare/main.cpp b/kompare/main.cpp
index 811bde3d..8f8a378a 100644
--- a/kompare/main.cpp
+++ b/kompare/main.cpp
@@ -212,6 +212,3 @@ int main(int argc, char *argv[])
 
 	return kapp->exec();
 }
-
-/* vim: set ts=4 sw=4 noet: */
-
diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff
index b7d82cff..ad3a9132 100644
--- a/kompare/tests/cvsdiff/contextm.diff
+++ b/kompare/tests/cvsdiff/contextm.diff
@@ -730,9 +730,6 @@ diff -c -r1.26 dcop.cpp
 + 
       return 0;
   }
-+ 
-+ // vim: set ts=8 sts=4 sw=4 noet:
-+ 
 Index: client/dcopfind.cpp
 ===================================================================
 RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
diff --git a/kompare/tests/cvsdiff/edm.diff b/kompare/tests/cvsdiff/edm.diff
index 5e1f338d..a88ddde7 100644
--- a/kompare/tests/cvsdiff/edm.diff
+++ b/kompare/tests/cvsdiff/edm.diff
@@ -4,9 +4,6 @@ RCS file: /home/kde/tdelibs/dcop/client/dcop.cpp,v
 retrieving revision 1.26
 diff -e -r1.26 dcop.cpp
 343a
-
-// vim: set ts=8 sts=4 sw=4 noet:
-
 .
 340a
 }
diff --git a/kompare/tests/cvsdiff/normalm.diff b/kompare/tests/cvsdiff/normalm.diff
index ead8a517..6a62dbb5 100644
--- a/kompare/tests/cvsdiff/normalm.diff
+++ b/kompare/tests/cvsdiff/normalm.diff
@@ -612,10 +612,6 @@ diff -r1.26 dcop.cpp
 > 	users[ user ] = userList()[ user ];
 > 
 >     runDCOP( args, users, session, sessionName, readStdin );
-343a771,773
-> 
-> // vim: set ts=8 sts=4 sw=4 noet:
-> 
 Index: client/dcopfind.cpp
 ===================================================================
 RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
diff --git a/kompare/tests/cvsdiff/rcsm.diff b/kompare/tests/cvsdiff/rcsm.diff
index d3ac561c..3f4884d5 100644
--- a/kompare/tests/cvsdiff/rcsm.diff
+++ b/kompare/tests/cvsdiff/rcsm.diff
@@ -539,10 +539,6 @@ int main( int argc, char** argv )
 	users[ user ] = userList()[ user ];
 
     runDCOP( args, users, session, sessionName, readStdin );
-a343 3
-
-// vim: set ts=8 sts=4 sw=4 noet:
-
 Index: client/dcopfind.cpp
 ===================================================================
 RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff
index a459066e..b7a319f5 100644
--- a/kompare/tests/cvsdiff/unifiedm.diff
+++ b/kompare/tests/cvsdiff/unifiedm.diff
@@ -116,7 +116,7 @@ diff -u -r1.26 dcop.cpp
  	tqWarning( "arguments do not match" );
  	exit(1);
      }
-@@ -265,79 +294,480 @@
+@@ -265,79 +294,477 @@
          }
      }
  }
@@ -651,9 +651,6 @@ diff -u -r1.26 dcop.cpp
 +
      return 0;
  }
-+
-+// vim: set ts=8 sts=4 sw=4 noet:
-+
 Index: client/dcopfind.cpp
 ===================================================================
 RCS file: /home/kde/tdelibs/dcop/client/dcopfind.cpp,v
diff --git a/kompare/tests/diff/contextm.diff b/kompare/tests/diff/contextm.diff
index 570d23fa..5607c94a 100644
--- a/kompare/tests/diff/contextm.diff
+++ b/kompare/tests/diff/contextm.diff
@@ -247,7 +247,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
   
       return 0;
   }
---- 295,773 ----
+--- 295,770 ----
       }
   }
   
@@ -724,9 +724,6 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
   
       return 0;
   }
-+ 
-+ // vim: set ts=8 sts=4 sw=4 noet:
-+ 
 diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
 *** dcop/client/dcopfind.cpp	Wed Jan 30 22:38:07 2002
 --- dcop2/client/dcopfind.cpp	Wed Jan 30 22:37:04 2002
diff --git a/kompare/tests/diff/edm.diff b/kompare/tests/diff/edm.diff
index 654e1131..44489e8d 100644
--- a/kompare/tests/diff/edm.diff
+++ b/kompare/tests/diff/edm.diff
@@ -1,8 +1,4 @@
 diff -er dcop/client/dcop.cpp dcop2/client/dcop.cpp
-343a
-
-// vim: set ts=8 sts=4 sw=4 noet:
-
 .
 340a
 }
diff --git a/kompare/tests/diff/normalm.diff b/kompare/tests/diff/normalm.diff
index d3c9d893..38676f0e 100644
--- a/kompare/tests/diff/normalm.diff
+++ b/kompare/tests/diff/normalm.diff
@@ -608,10 +608,6 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp
 > 	users[ user ] = userList()[ user ];
 > 
 >     runDCOP( args, users, session, sessionName, readStdin );
-343a771,773
-> 
-> // vim: set ts=8 sts=4 sw=4 noet:
-> 
 diff -r dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
 39c39
 < bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
diff --git a/kompare/tests/diff/rcsm.diff b/kompare/tests/diff/rcsm.diff
index d2a6aa73..588fd7f1 100644
--- a/kompare/tests/diff/rcsm.diff
+++ b/kompare/tests/diff/rcsm.diff
@@ -535,10 +535,6 @@ int main( int argc, char** argv )
 	users[ user ] = userList()[ user ];
 
     runDCOP( args, users, session, sessionName, readStdin );
-a343 3
-
-// vim: set ts=8 sts=4 sw=4 noet:
-
 diff -nr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
 d39 1
 a39 1
diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff
index 85adad04..1b62d739 100644
--- a/kompare/tests/diff/unifiedm.diff
+++ b/kompare/tests/diff/unifiedm.diff
@@ -112,7 +112,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
  	tqWarning( "arguments do not match" );
  	exit(1);
      }
-@@ -266,78 +295,479 @@
+@@ -266,78 +295,476 @@
      }
  }
  
@@ -646,9 +646,6 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
  
      return 0;
  }
-+
-+// vim: set ts=8 sts=4 sw=4 noet:
-+
 diff -aur dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
 --- dcop/client/dcopfind.cpp	Wed Jan 30 22:38:07 2002
 +++ dcop2/client/dcopfind.cpp	Wed Jan 30 22:37:04 2002