]> git.lyx.org Git - lyx.git/blobdiff - src/Session.cpp
typo
[lyx.git] / src / Session.cpp
index 35498bdbb479524627174c49833b0b23603d055b..f09d2f6b73b87de539420c485d2052b792ddac90 100644 (file)
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Bo Peng
  *
  * Full author contact details are available in file CREDITS.
 #include <config.h>
 
 #include "Session.h"
+
 #include "support/debug.h"
-#include "support/Package.h"
 #include "support/filetools.h"
+#include "support/Package.h"
 
 #include <fstream>
 #include <sstream>
@@ -290,153 +291,6 @@ BookmarksSection::Bookmark const & BookmarksSection::bookmark(unsigned int i) co
 }
 
 
-void ToolbarSection::read(istream & is)
-{
-       string tmp;
-       do {
-               char c = is.peek();
-               if (c == '[')
-                       break;
-               getline(is, tmp);
-               if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ')
-                       continue;
-
-               try {
-                       // Read session info, saved as key/value pairs
-                       // would better yell if pos returns npos
-                       size_t pos = tmp.find_first_of(" = ");
-                       // silently ignore lines without " = "
-                       if (pos != string::npos) {
-                               ToolbarItem item;
-                               item.key = tmp.substr(0, pos);
-                               int state;
-                               int location;
-                               istringstream value(tmp.substr(pos + 3));
-                               value >> state;
-                               value >> location;
-                               value >> item.info.posx;
-                               value >> item.info.posy;
-                               item.info.state = ToolbarInfo::State(state);
-                               item.info.location = ToolbarInfo::Location(location);
-                               toolbars.push_back(item);
-                       } else
-                               LYXERR(Debug::INIT, "LyX: Warning: Ignore toolbar info: " << tmp);
-               } catch (...) {
-                       LYXERR(Debug::INIT, "LyX: Warning: unknown Toolbar info: " << tmp);
-               }
-       } while (is.good());
-       // sort the toolbars by location, line and position
-       sort(toolbars.begin(), toolbars.end());
-}
-
-
-void ToolbarSection::write(ostream & os) const
-{
-       os << '\n' << sec_toolbars << '\n';
-       for (ToolbarList::const_iterator tb = toolbars.begin();
-               tb != toolbars.end(); ++tb) {
-               os << tb->key << " = "
-                 << static_cast<int>(tb->info.state) << " "
-                 << static_cast<int>(tb->info.location) << " "
-                 << tb->info.posx << " "
-                 << tb->info.posy << '\n';
-       }
-}
-
-
-ToolbarSection::ToolbarInfo & ToolbarSection::load(string const & name)
-{
-       for (ToolbarList::iterator tb = toolbars.begin();
-               tb != toolbars.end(); ++tb)
-               if (tb->key == name)
-                       return tb->info;
-
-       // add a new item
-       ToolbarItem item;
-       item.key = name;
-       toolbars.push_back(item);
-       return toolbars.back().info;
-}
-
-
-bool operator<(ToolbarSection::ToolbarItem const & a, ToolbarSection::ToolbarItem const & b)
-{
-       ToolbarSection::ToolbarInfo lhs = a.info;
-       ToolbarSection::ToolbarInfo rhs = b.info;
-       // on if before off
-       if (lhs.state != rhs.state)
-               return static_cast<int>(lhs.state) < static_cast<int>(rhs.state);
-       // order of dock does not really matter
-       if (lhs.location != rhs.location)
-               return static_cast<int>(lhs.location) < static_cast<int>(rhs.location);
-       // if the same dock, the order depends on position
-       if (lhs.location == ToolbarSection::ToolbarInfo::TOP ||
-               lhs.location == ToolbarSection::ToolbarInfo::BOTTOM)
-               return lhs.posy < rhs.posy || (lhs.posy == rhs.posy && lhs.posx < rhs.posx);
-       else if (lhs.location == ToolbarSection::ToolbarInfo::LEFT ||
-               lhs.location == ToolbarSection::ToolbarInfo::RIGHT)
-               return lhs.posx < rhs.posx || (lhs.posx == rhs.posx && lhs.posy < rhs.posy);
-       return true;
-}
-
-
-void SessionInfoSection::read(istream & is)
-{
-       string tmp;
-       do {
-               char c = is.peek();
-               if (c == '[')
-                       break;
-               getline(is, tmp);
-               if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ')
-                       continue;
-
-               try {
-                       // Read session info, saved as key/value pairs
-                       // would better yell if pos returns npos
-                       string::size_type pos = tmp.find_first_of(" = ");
-                       // silently ignore lines without " = "
-                       if (pos != string::npos) {
-                               string key = tmp.substr(0, pos);
-                               string value = tmp.substr(pos + 3);
-                               sessioninfo[key] = value;
-                       } else
-                               LYXERR(Debug::INIT, "LyX: Warning: Ignore session info: " << tmp);
-               } catch (...) {
-                       LYXERR(Debug::INIT, "LyX: Warning: unknown Session info: " << tmp);
-               }
-       } while (is.good());
-}
-
-
-void SessionInfoSection::write(ostream & os) const
-{
-       os << '\n' << sec_session << '\n';
-       for (MiscInfo::const_iterator val = sessioninfo.begin();
-               val != sessioninfo.end(); ++val) {
-               os << val->first << " = " << val->second << '\n';
-       }
-}
-
-
-void SessionInfoSection::save(string const & key, string const & value)
-{
-       sessioninfo[key] = value;
-}
-
-
-string const SessionInfoSection::load(string const & key, bool release)
-{
-       MiscInfo::const_iterator pos = sessioninfo.find(key);
-       string value;
-       if (pos != sessioninfo.end())
-               value = pos->second;
-       if (release)
-               sessioninfo.erase(key);
-       return value;
-}
-
-
 Session::Session(unsigned int num) :
        last_files(num)
 {
@@ -469,10 +323,6 @@ void Session::readFile()
                        lastFilePos().read(is);
                else if (tmp == sec_bookmarks)
                        bookmarks().read(is);
-               else if (tmp == sec_toolbars)
-                       toolbars().read(is);
-               else if (tmp == sec_session)
-                       sessionInfo().read(is);
                else
                        LYXERR(Debug::INIT, "LyX: Warning: unknown Session section: " << tmp);
        }
@@ -490,8 +340,6 @@ void Session::writeFile() const
                lastOpened().write(os);
                lastFilePos().write(os);
                bookmarks().write(os);
-               toolbars().write(os);
-               sessionInfo().write(os);
        } else
                LYXERR(Debug::INIT, "LyX: Warning: unable to save Session: "
                       << session_file);