Browse Source

Fix regex for "Remove Trailing Spaces" not to eat empty lines.

git-svn-id: file:///var/svn/tigccpp/trunk@554 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 18 years ago
parent
commit
f524f71cf3
1 changed files with 4 additions and 4 deletions
  1. 4 4
      ktigcc/tpr.cpp

+ 4 - 4
ktigcc/tpr.cpp

@@ -520,8 +520,8 @@ QString loadFileText(const char *fileName)
     ret=ret.replace('\r','\n');
     // remove trailing spaces if requested
     if (preferences.removeTrailingSpaces) {
-      ret=ret.replace(QRegExp("\\s*\n"),"\n");
-      ret=ret.remove(QRegExp("\\s*$"));
+      ret=ret.replace(QRegExp("((?!\n)\\s)*\n"),"\n");
+      ret=ret.remove(QRegExp("((?!\n)\\s)*$"));
     }
   }
   return ret;
@@ -754,8 +754,8 @@ int saveFileText(const char *fileName,const QString &fileText)
   // remove trailing spaces if requested
   QString text=fileText;
   if (preferences.removeTrailingSpaces && !text.isNull()) {
-    text=text.replace(QRegExp("\\s*\n"),"\n");
-    text=text.remove(QRegExp("\\s*$"));
+    text=text.replace(QRegExp("((?!\n)\\s)*\n"),"\n");
+    text=text.remove(QRegExp("((?!\n)\\s)*$"));
   }
   
   f=fopen(fileName,"wb");