Kaynağa Gözat

Fix extra newline incorrectly added each time a file is saved.

git-svn-id: file:///var/svn/tigccpp/branches/ktigcc-1-branch@1178 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 17 yıl önce
ebeveyn
işleme
c0635ede86
3 değiştirilmiş dosya ile 5 ekleme ve 4 silme
  1. 1 0
      ktigcc/NEWS
  2. 3 3
      ktigcc/tpr.cpp
  3. 1 1
      ktigcc/tpr.h

+ 1 - 0
ktigcc/NEWS

@@ -3,6 +3,7 @@ This is a summary of the changes in KTIGCC since the first alpha release:
 CVS ktigcc-1-branch (2007-07-02):
 
 * Ctrl+Return now works for "Open file at cursor" (not just Ctrl+Numpad Enter)
+* Fixed extra newline incorrectly added each time a file is saved.
 
 
 KTIGCC 1.07 (2007-04-03):

+ 3 - 3
ktigcc/tpr.cpp

@@ -794,7 +794,7 @@ enum CharModes {cmNone, cmNormalText, cmNumber, cmMultiSymbol, cmString, cmChar,
 int saveAndSplitFileText(const char *fileName, const QString &fileText,
                          bool split, bool addCLineDirective,
                          bool addASMLineDirective, const QString &origFileName,
-                         LineStartList *pLineStartList)
+                         LineStartList *pLineStartList, bool addNewline)
 {
   FILE *f;
   LineStartList lineStartList;
@@ -1025,7 +1025,7 @@ int saveAndSplitFileText(const char *fileName, const QString &fileText,
       if (fwrite(s,1,l,f)<l) return -2;
     }
     if (writeToFile(f,text)) {fclose(f); return -2;}
-    if (fwrite("\n",1,1,f)<1) {fclose(f); return -2;}
+    if (addNewline && fwrite("\n",1,1,f)<1) {fclose(f); return -2;}
   }
   if (fclose(f)) return -2;
   if (pLineStartList) *pLineStartList=lineStartList;
@@ -1035,7 +1035,7 @@ int saveAndSplitFileText(const char *fileName, const QString &fileText,
 int saveFileText(const char *fileName,const QString &fileText)
 {
   return saveAndSplitFileText(fileName,fileText,FALSE,FALSE,FALSE,QString::null,
-                              static_cast<LineStartList *>(NULL));
+                              static_cast<LineStartList *>(NULL),FALSE);
 }
 
 void kurlNewFileName(KURL &dir,const QString &newFileName)

+ 1 - 1
ktigcc/tpr.h

@@ -173,7 +173,7 @@ void mkdir_multi(const char *fileName);
 int saveAndSplitFileText(const char *fileName, const QString &fileText,
                          bool split, bool addCLineDirective,
                          bool addASMLineDirective, const QString &origFileName,
-                         LineStartList *pLineStartList);
+                         LineStartList *pLineStartList, bool addNewline=true);
 int saveFileText(const char *fileName,const QString &fileText);
 
 void kurlNewFileName(KURL &dir,const QString &newFileName);