]> git.lyx.org Git - lyx.git/blobdiff - src/bufferlist.C
fix typo that put too many include paths for most people
[lyx.git] / src / bufferlist.C
index 41327e41ecfecbfb67b30241cd611235e121ba6d..3b69c1d0713dbf6f09509f515d1f5ab999262fb7 100644 (file)
@@ -1,36 +1,25 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Word Processor
  *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team. 
+ *           Copyright 1995-2001 The LyX Team.
  *
  *           This file is Copyright 1996-2001
  *           Lars Gullik Bjønnes
  *
- * ====================================================== 
+ * ======================================================
  */
 
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <config.h>
-
-#include <assert.h>
-#include <algorithm>
-#include <functional>
-
-#include "frontends/Alert.h"
 #include "bufferlist.h"
 #include "lyx_main.h"
-#include "support/FileInfo.h"
-#include "support/filetools.h"
-#include "support/lyxmanip.h"
-#include "support/lyxfunctional.h"
-#include "support/LAssert.h"
-#include "lyx_gui_misc.h"
 #include "lastfiles.h"
 #include "debug.h"
 #include "lyxrc.h"
 #include "LyXView.h"
 #include "vc-backend.h"
 #include "TextCache.h"
+#include "lyxtextclasslist.h"
+
+#include "frontends/Alert.h"
+
+#include "support/FileInfo.h"
+#include "support/filetools.h"
+#include "support/lyxmanip.h"
+#include "support/lyxfunctional.h"
+#include "support/LAssert.h"
+
+#include <cassert>
+#include <algorithm>
+#include <functional>
+
 
 using std::vector;
 using std::find;
@@ -98,7 +101,8 @@ bool BufferList::empty() const
 }
 
 
-bool BufferList::qwriteOne(Buffer * buf, string const & fname, string & unsaved_list)
+bool BufferList::qwriteOne(Buffer * buf, string const & fname,
+                          string & unsaved_list)
 {
        bool reask = true;
        while (reask) {
@@ -120,7 +124,7 @@ bool BufferList::qwriteOne(Buffer * buf, string const & fname, string & unsaved_
                        if (buf->isUnnamed()) {
                                removeAutosaveFile(buf->fileName());
                        }
+
                        unsaved_list += MakeDisplayPath(fname, 50) + "\n";
                        return true;
                case 3: // Cancel
@@ -130,13 +134,13 @@ bool BufferList::qwriteOne(Buffer * buf, string const & fname, string & unsaved_
        return true;
 }
 
+
 bool BufferList::qwriteAll()
 {
        string unsaved;
-       for (BufferStorage::iterator it = bstore.begin();
-            it != bstore.end(); ++it)
-       {
+       BufferStorage::iterator it = bstore.begin();
+       BufferStorage::iterator end = bstore.end();
+       for (; it != end; ++it) {
                if (!(*it)->isLyxClean()) {
                        string fname;
                        if ((*it)->isUnnamed())
@@ -147,10 +151,10 @@ bool BufferList::qwriteAll()
                                return false;
                }
        }
+
        if (!unsaved.empty() && lyxrc.exit_confirmation) {
                return Alert::askQuestion(_("Some documents were not saved:"),
-                                         unsaved, _("Exit anyway?"));
+                                         unsaved, _("Exit anyway?"));
        }
 
        return true;
@@ -163,7 +167,7 @@ void BufferList::closeAll()
        // Since we are closing we can just as well delete all
        // in the textcache this will also speed the closing/quiting up a bit.
        textcache.clear();
-       
+
        while (!bstore.empty()) {
                close(bstore.front());
        }
@@ -174,12 +178,14 @@ void BufferList::closeAll()
 bool BufferList::close(Buffer * buf)
 {
        lyx::Assert(buf);
-       
+
        // CHECK
        // Trace back why we need to use buf->getUser here.
        // Perhaps slight rewrite is in order? (Lgb)
-       
-        if (buf->getUser()) buf->getUser()->insetUnlock();
+
+       if (buf->getUser())
+               buf->getUser()->insetUnlock();
+
        if (buf->paragraph && !buf->isLyxClean() && !quitting) {
                if (buf->getUser())
                        buf->getUser()->owner()->prohibitInput();
@@ -192,7 +198,7 @@ bool BufferList::close(Buffer * buf)
                while (reask) {
                        switch (Alert::askConfirmation(_("Changes in document:"),
                                               fname,
-                                              _("Save document?"))){
+                                              _("Save document?"))) {
                        case 1: // Yes
                                if (buf->isUnnamed())
                                        reask = !WriteAs(current_view, buf);
@@ -237,14 +243,16 @@ vector<string> const BufferList::getFileNames() const
 
 Buffer * BufferList::first()
 {
-       if (bstore.empty()) return 0;
+       if (bstore.empty())
+               return 0;
        return bstore.front();
 }
 
 
 Buffer * BufferList::getBuffer(unsigned int choice)
 {
-       if (choice >= bstore.size()) return 0;
+       if (choice >= bstore.size())
+               return 0;
        return bstore[choice];
 }
 
@@ -252,10 +260,10 @@ Buffer * BufferList::getBuffer(unsigned int choice)
 int BufferList::unlockInset(UpdatableInset * inset)
 {
        lyx::Assert(inset);
-       
-       //if (!inset) return 1;
-       for (BufferStorage::iterator it = bstore.begin();
-            it != bstore.end(); ++it) {
+
+       BufferStorage::iterator it = bstore.begin();
+       BufferStorage::iterator end = bstore.end();
+       for (; it != end; ++it) {
                if ((*it)->getUser()
                    && (*it)->getUser()->theLockingInset() == inset) {
                        (*it)->getUser()->insetUnlock();
@@ -268,8 +276,9 @@ int BufferList::unlockInset(UpdatableInset * inset)
 
 void BufferList::updateIncludedTeXfiles(string const & mastertmpdir)
 {
-       for (BufferStorage::iterator it = bstore.begin();
-            it != bstore.end(); ++it) {
+       BufferStorage::iterator it = bstore.begin();
+       BufferStorage::iterator end = bstore.end();
+       for (; it != end; ++it) {
                if (!(*it)->isDepClean(mastertmpdir)) {
                        string writefile = mastertmpdir;
                        writefile += '/';
@@ -289,20 +298,21 @@ void BufferList::emergencyWriteAll()
 }
 
 
-void BufferList::emergencyWrite(Buffer * buf) 
+void BufferList::emergencyWrite(Buffer * buf)
 {
        // assert(buf) // this is not good since C assert takes an int
-                      // and a pointer is a long (JMarc)
+                      // and a pointer is a long (JMarc)
        assert(buf != 0); // use c assert to avoid a loop
 
-       
+
        // No need to save if the buffer has not changed.
-       if (buf->isLyxClean()) return;
-       
+       if (buf->isLyxClean())
+               return;
+
        lyxerr << fmt(_("lyx: Attempting to save document %s as..."),
                      buf->isUnnamed() ? OnlyFilename(buf->fileName()).c_str()
                      : buf->fileName().c_str()) << endl;
-       
+
        // We try to save three places:
 
        // 1) Same place as document. Unless it is an unnamed doc.
@@ -318,7 +328,7 @@ void BufferList::emergencyWrite(Buffer * buf)
                        lyxerr << _("  Save failed! Trying...") << endl;
                }
        }
-       
+
        // 2) In HOME directory.
        string s = AddName(GetEnvPath("HOME"), buf->fileName());
        s += ".emergency";
@@ -328,9 +338,9 @@ void BufferList::emergencyWrite(Buffer * buf)
                lyxerr << _("  Save seems successful. Phew.") << endl;
                return;
        }
-       
+
        lyxerr << _("  Save failed! Trying...") << endl;
-       
+
        // 3) In "/tmp" directory.
        // MakeAbsPath to prepend the current
        // drive letter on OS/2
@@ -349,20 +359,20 @@ void BufferList::emergencyWrite(Buffer * buf)
 
 Buffer * BufferList::readFile(string const & s, bool ronly)
 {
-       Buffer * b = bstore.newBuffer(s, ronly);
-
-       string ts = s;
+       string ts(s);
        string e = OnlyPath(s);
        string a = e;
        // File information about normal file
        FileInfo fileInfo2(s);
 
        if (!fileInfo2.exist()) {
-               Alert::alert(_("Error!"), _("Cannot open file"), 
+               Alert::alert(_("Error!"), _("Cannot open file"),
                        MakeDisplayPath(s));
                return 0;
        }
+
+       Buffer * b = bstore.newBuffer(s, ronly);
+
        // Check if emergency save file exists and is newer.
        e += OnlyFilename(s) + ".emergency";
        FileInfo fileInfoE(e);
@@ -433,7 +443,7 @@ bool BufferList::exists(string const & s) const
 bool BufferList::isLoaded(Buffer const * b) const
 {
        lyx::Assert(b);
-       
+
        BufferStorage::const_iterator cit =
                find(bstore.begin(), bstore.end(), b);
        return cit != bstore.end();
@@ -468,13 +478,15 @@ Buffer * BufferList::newFile(string const & name, string tname, bool isNamed)
                        }
                }
                if (!templateok) {
-                       Alert::alert(_("Error!"), _("Unable to open template"), 
+                       Alert::alert(_("Error!"), _("Unable to open template"),
                                   MakeDisplayPath(tname));
                        // no template, start with empty buffer
                        b->paragraph = new Paragraph;
+                       b->paragraph->layout(textclasslist[b->params.textclass].defaultLayoutName());
                }
        } else {  // start with empty buffer
                b->paragraph = new Paragraph;
+                       b->paragraph->layout(textclasslist[b->params.textclass].defaultLayoutName());
        }
 
        if (!lyxrc.new_ask_filename && !isNamed) {
@@ -483,7 +495,7 @@ Buffer * BufferList::newFile(string const & name, string tname, bool isNamed)
        }
 
        b->setReadonly(false);
-       
+
        return b;
 }
 
@@ -499,7 +511,7 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
 
        // file already open?
        if (exists(s)) {
-               if (Alert::askQuestion(_("Document is already open:"), 
+               if (Alert::askQuestion(_("Document is already open:"),
                                MakeDisplayPath(s, 50),
                                _("Do you want to reload that document?"))) {
                        // Reload is accomplished by closing and then loading
@@ -508,7 +520,7 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
                        }
                        // Fall through to new load. (Asger)
                } else {
-                       // Here, we pretend that we just loaded the 
+                       // Here, we pretend that we just loaded the
                        // open document
                        return getBuffer(s);
                }
@@ -530,15 +542,15 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
                if (LyXVC::file_not_found_hook(s)) {
                        // Ask if the file should be checked out for
                        // viewing/editing, if so: load it.
-                       if (Alert::askQuestion(_("Do you want to retrieve file under version control?"))) {
+                       if (Alert::askQuestion(_("Do you want to retrieve file under version control?"))) {
                                // How can we know _how_ to do the checkout?
                                // With the current VC support it has to be,
                                // a RCS file since CVS do not have special ,v files.
-                               RCS::retrive(s);
+                               RCS::retrieve(s);
                                return loadLyXFile(filename, tolastfiles);
                        }
                }
-               if (Alert::askQuestion(_("Cannot open specified file:"), 
+               if (Alert::askQuestion(_("Cannot open specified file:"),
                                MakeDisplayPath(s, 50),
                                _("Create new document with this name?")))
                        {