Fixed various "missing features" in the tabular/textinset code.

[lyx.git] / src / bufferlist.h

diff --git a/src/bufferlist.h b/src/bufferlist.h
index 7cf20fae51b07c98d10b62a214166e368a9788c3..0b4efadfae45bc043d75968d3b4b03c2dbdfc1bb 100644 (file)
--- a/src/bufferlist.h
+++ b/src/bufferlist.h
@@ -1,24 +1,26 @@
 // -*- C++ -*-
 /* This file is part of
 // -*- C++ -*-
 /* This file is part of

-* ======================================================
-* 
-*           LyX, The Document Processor         
-*          Copyright (C) 1995 Matthias Ettrich
-*
-*           This file is Copyleft (C) 1996
-*           Lars Gullik Bjønnes
-*
-*======================================================*/
-
-#ifndef _BUFFER_LIST_H_
-#define _BUFFER_LIST_H_
+ * ====================================================== 
+ * 
+ *           LyX, The Document Processor        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team
+ *
+ *           This file is Copyright 1996-2000
+ *           Lars Gullik Bjønnes
+ *
+ * ====================================================== */
+
+#ifndef BUFFER_LIST_H
+#define BUFFER_LIST_H

 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include "buffer.h"
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include "buffer.h"

-#include "error.h"
+#include "debug.h"
+#include <boost/utility.hpp>

 
 /** A class to hold all the buffers in a structure
   The point of this class is to hide from bufferlist what kind
 
 /** A class to hold all the buffers in a structure
   The point of this class is to hide from bufferlist what kind


@@ -28,65 +30,49 @@
   This class should ideally be enclosed inside class BufferList, but that
   gave me an "internal gcc error".
   */
   This class should ideally be enclosed inside class BufferList, but that
   gave me an "internal gcc error".
   */

-class BufferStorage {
+class BufferStorage : public noncopyable {

 public:
        ///
 public:
        ///

-       BufferStorage();
+       typedef std::vector<Buffer *> Container;

        ///
        ///

-       bool isEmpty();
+       typedef Container::iterator iterator;

        ///
        ///

-       void release(Buffer* buf);
+       typedef Container::const_iterator const_iterator;

        ///
        ///

-       Buffer* newBuffer(string const &s, LyXRC *, bool =false);
-private:
-       enum {
-               /** The max number of buffers there are possible to have
-                   loaded at the same time. (this only applies when we use an
-                   array)
-               */
-               NUMBER_OF_BUFFERS = 50
-       };
-       
-       /** The Bufferlist is currently implemented as a static array.
-         The buffers are new'ed and deleted as reqested.
-         */
-       Buffer *buffer[NUMBER_OF_BUFFERS];
+       typedef Container::size_type size_type;

        ///
        ///

-       friend class BufferStorage_Iter;
-};
-
-/// An Iterator class for BufferStorage
-class BufferStorage_Iter {
-public:
+       bool empty() const { return container.empty(); }

        ///
        ///

-       BufferStorage_Iter(const BufferStorage & bs)
-       { cs=&bs; index=0;}
-       /// next
-       Buffer* operator() ();
+       void release(Buffer * buf);

        ///
        ///

-       Buffer* operator[] (int a);
-private:
+       Buffer * newBuffer(string const & s, bool = false);
+       ///
+       Container::iterator begin() { return container.begin(); }
+       ///
+       Container::iterator end() { return container.end(); }
+       ///
+       Container::const_iterator begin() const { return container.begin(); }

        ///
        ///

-       const BufferStorage *cs;
+       Container::const_iterator end() const { return container.end(); }

        ///
        ///

-       unsigned char index;
+       Buffer * front() { return container.front(); }
+       ///
+       Buffer * operator[](int c) { return container[c]; }
+       ///
+       size_type size() const { return container.size(); }
+private:
+       ///
+       Container container;

 };
 
 
 };
 
 

-
-/** The class governing all the open buffers
-  This class governs all the currently open buffers. Currently all the buffer
-  are located in a static array, soon this will change and we will have a
-  linked list instead.
+/** The class govern all open buffers.

  */
  */

-class BufferList {
+class BufferList : public noncopyable {

 public:
        ///
        BufferList();
 
 public:
        ///
        BufferList();
 

-       ///
-       ~BufferList();
-

        /// state info
        enum list_state {
                ///
        /// state info
        enum list_state {
                ///


@@ -96,21 +82,18 @@ public:
        };
 
        /// returns the state of the bufferlist
        };
 
        /// returns the state of the bufferlist

-       list_state getState() { return _state; }
+       list_state getState() const { return state_; }

        
        /** loads a LyX file or...
        
        /** loads a LyX file or...

-         If the optional argument tolastfiles is false (default is
+           If the optional argument tolastfiles is false (default is

             true), the file name will not be added to the last opened
            files list
             true), the file name will not be added to the last opened
            files list

-           */  
-       Buffer* loadLyXFile(string const & filename, 
-                           bool tolastfiles = true);
+       */  
+       Buffer * loadLyXFile(string const & filename, 
+                            bool tolastfiles = true);

        
        ///
        
        ///

-       bool isEmpty();
-
-       /// Saves buffer. Returns false if unsuccesful.
-       bool write(Buffer *, bool makeBackup = true);
+       bool empty() const;

 
        ///
         bool QwriteAll();
 
        ///
         bool QwriteAll();


@@ -122,53 +105,50 @@ public:
        void resize();
 
        /// Read a file into a buffer readonly or not.
        void resize();
 
        /// Read a file into a buffer readonly or not.

-       Buffer* readFile(string const &, bool ro);
+       Buffer * readFile(string const &, bool ro);

 
        /// Make a new file (buffer) using a template
 
        /// Make a new file (buffer) using a template

-       Buffer* newFile(string const &, string);
-
-       /** This one must be moved to some other place.
-        */
-       void makePup(int);
-
-       ///** Later with multiple frames this should not be here.
-       // */
-       //Buffer* switchBuffer(Buffer *from, int);
+       Buffer * newFile(string const &, string, bool isNamed=false);
+       /// returns a vector with all the buffers filenames
+       std::vector<string> const getFileNames() const;

 
        ///
 
        ///

-       void updateInset(Inset*, bool = true);
-
-       ///
-       int unlockInset(UpdatableInset*);
+       int unlockInset(UpdatableInset *);

 
        ///
        void updateIncludedTeXfiles(string const &);
 
        ///
        void emergencyWriteAll();
 
        ///
        void updateIncludedTeXfiles(string const &);
 
        ///
        void emergencyWriteAll();

-
-       /** closes buffer
-         Returns false if operation was canceled
+       
+       /** Close buffer.
+           @param buf the buffer that should be closed
+           @return #false# if operation was canceled

          */
          */

-       bool close(Buffer *);
+       bool close(Buffer * buf);

 
        ///
 
        ///

-       Buffer* first();
+       Buffer * first();

        
        /// returns true if the buffer exists already
        
        /// returns true if the buffer exists already

-       bool exists(string const &);
+       bool exists(string const &) const;

 
 

+       /// returns true if the buffer is loaded
+       bool isLoaded(Buffer const * b) const;
+       

        /// returns a pointer to the buffer with the given name.
        /// returns a pointer to the buffer with the given name.

-       Buffer* getBuffer(string const &);
+       Buffer * getBuffer(string const &);

        /// returns a pointer to the buffer with the given number.
        /// returns a pointer to the buffer with the given number.

-       Buffer* getBuffer(int);
+       Buffer * getBuffer(unsigned int);

 
 private:
        ///
        BufferStorage bstore;
        
        ///
 
 private:
        ///
        BufferStorage bstore;
        
        ///

-       list_state _state;
+       list_state state_;
+       ///
+       void emergencyWrite(Buffer * buf);

 };
 
 #endif
 };
 
 #endif