the mkfifo change, make it compile on egcs

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1103 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 6990620b2095db18740c63ea579bb2419a938488..e6ee06d0c6416dc1476e5fc4efdf1eb3ef529660 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2000-10-12    <larsbj@baywatch.lyx.org>
+
+       * src/support/lyxfunctional.h: add operator= that takes a reference
+
+       * src/lyxserver.C (mkfifo): make first arg const
+
+       * src/layout.h: renamed name(...) to setName(...) to work around
+       bugs in egcs.
+
+       * src/buffer.C (setFileName): had to change name of function to
+       work around bugs in egcs. (renamed from fileName) 
+
 2000-10-11  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/support/translator.h: move helper template clsses to

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 555803d5ac299ad855b6e7d4d207cecbc85dfa23..f0d27987a316d6ec133781c99846311fbce465a6 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,9 +26,7 @@ src/frontends/kde/formcitationdialog.C
 src/frontends/kde/FormCopyright.C
 src/frontends/kde/FormIndex.C
 src/frontends/kde/formindexdialog.C
-src/frontends/kde/formindexdialogdata.C
 src/frontends/kde/FormPrint.C
-src/frontends/kde/formprintdialogdata.C
 src/frontends/kde/FormRef.C
 src/frontends/kde/formrefdialog.C
 src/frontends/kde/FormToc.C

diff --git a/src/buffer.C b/src/buffer.C
index 02e54b679439afaa60ca6a904e06f42d8a9a7da0..eb5b792e98101a35caa49ec8174528928e955ee7 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -219,7 +219,7 @@ void Buffer::resetAutosaveTimers() const
 }
 
 
-void Buffer::fileName(string const & newfile)
+void Buffer::setFileName(string const & newfile)
 {
        filename = MakeAbsPath(newfile);
        filepath = OnlyPath(filename);

diff --git a/src/buffer.h b/src/buffer.h
index 95fbc22d4985fd980a0c3d23dc0cbfe61757cf86..1fb0bbff59cff8cc8753e3b331a06c3da4ab3824 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -236,7 +236,7 @@ public:
        string const getLatexName(bool no_path = true) const;
 
        /// Change name of buffer. Updates "read-only" flag.
-       void fileName(string const & newfile);
+       void setFileName(string const & newfile);
 
        /// Name of the document's parent
        void setParentName(string const &);

diff --git a/src/layout.C b/src/layout.C
index 4fd40f1107958343bae5326f750c61e2b8437445..0132a875f69af0861854207930c33727d31ccd20 100644 (file)
--- a/src/layout.C
+++ b/src/layout.C
@@ -871,7 +871,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                                        error = do_readStyle(lexrc, lay);
                                } else {
                                        LyXLayout lay;
-                                       lay.name(name);
+                                       lay.setName(name);
                                        if (!(error = do_readStyle(lexrc, lay)))
                                                layoutlist.push_back(lay);
                                }

diff --git a/src/layout.h b/src/layout.h
index 7359b2d4a065c09e8f1144739180c78783894514..723401e81bbdce9bc39ac49cf3b33d4ec71d8d2c 100644 (file)
--- a/src/layout.h
+++ b/src/layout.h
@@ -210,7 +210,7 @@ public:
        ///
        string const & name() const { return name_; }
        ///
-       void name(string const & n) { name_ = n; }
+       void setName(string const & n) { name_ = n; }
        ///
        string const & obsoleted_by() const { return obsoleted_by_; }
        ///

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 853d2b4f692ca59c7e0d391e00b9cc1f65ef18f3..232f54448e879e39102fc63e42b5034b9bf3ae9b 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -254,7 +254,7 @@ bool MenuWriteAs(Buffer * buffer)
                                bufferlist.close(bufferlist.getBuffer(s));
 
                                // Ok, change the name of the buffer, but don't save!
-                               buffer->fileName(s);
+                               buffer->setFileName(s);
                                buffer->markDirty();
 
                                ShowMessage(buffer, _("Document renamed to '"),
@@ -271,7 +271,7 @@ bool MenuWriteAs(Buffer * buffer)
        }
 
        // Ok, change the name of the buffer
-       buffer->fileName(s);
+       buffer->setFileName(s);
        buffer->markDirty();
        bool unnamed = buffer->isUnnamed();
        buffer->setUnnamed(false);
@@ -280,7 +280,7 @@ bool MenuWriteAs(Buffer * buffer)
        // of the document.
        // Hope this is fixed this way! (Jug)
        if (!MenuWrite(buffer)) {
-           buffer->fileName(oldname);
+           buffer->setFileName(oldname);
            buffer->setUnnamed(unnamed);
            ShowMessage(buffer, _("Document could not be saved!"),
                        _("Holding the old name."), MakeDisplayPath(oldname));

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 76a7d19975fad00cf8799e8c3b40c494c1004946..1760a0f6186ffe6384b23361e7d91917c3f0110b 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -72,8 +72,8 @@ using std::endl;
 // provide an empty mkfifo() if we do not have one. This disables the
 // lyxserver. 
 #ifndef HAVE_MKFIFO
-int    mkfifo( char *__path, mode_t __mode ) {
-       return 0;
+int mkfifo(char const * __path, mode_t __mode ) {
+        return 0;
 }
 #endif
 

diff --git a/src/support/lyxfunctional.h b/src/support/lyxfunctional.h
index 5eedb9098b236406d90e13ab322572eeccc6a01e..854ab573e108b162ccf1ccbed2253f86671225ad 100644 (file)
--- a/src/support/lyxfunctional.h
+++ b/src/support/lyxfunctional.h
@@ -41,6 +41,12 @@ public:
                return *this;
        }
 
+       back_insert_fun_iterator &
+       operator=(Type & val) {
+               container.push_back((val.*pmf)());
+               return *this;
+       }
+
        back_insert_fun_iterator & operator*() {
                return *this;
        }