Jean-Marc Lasgouttes wrote:
> Jean-Marc> And concerning the warnings, they seem indeed very
> Jean-Marc> interesting. At least the one in qt2/floatplacement.C is a
> Jean-Marc> bug.
>
> The following micropatch fixes two real bugs and silences a warning.
> Of course, I went after the easiest ones :)
Ha! Mine were easier still. I just cut and pasted them from Asger's
patch ;-)
Committing these now.
--
Angus
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.2093
diff -u -p -r1.2093 ChangeLog
--- src/ChangeLog 20 Jan 2005 15:02:15 -0000 1.2093
+++ src/ChangeLog 20 Jan 2005 15:03:58 -0000
@@ -1,3 +1,9 @@
+2005-01-20 Asger Ottar Alstrup <[EMAIL PROTECTED]>
+
+ * lyx_main.C (init): Compile fix.
+
+ * lyxserver.[Ch] (inPipeName, outPipeName): move out of line.
+
2005-01-20 Angus Leeming <[EMAIL PROTECTED]>
* mover.h: change commentary to reflect the changed meaning of
Index: src/lyx_main.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_main.C,v
retrieving revision 1.195
diff -u -p -r1.195 lyx_main.C
--- src/lyx_main.C 19 Jan 2005 14:17:36 -0000 1.195
+++ src/lyx_main.C 20 Jan 2005 15:03:59 -0000
@@ -401,7 +401,7 @@ void LyX::init(bool gui)
#if !defined (USE_POSIX_PACKAGING)
// Add the directory containing the LyX executable to the path
// so that LyX can find things like reLyX.
- if (package.build_support().empty())
+ if (package().build_support().empty())
prependEnvPath("PATH", package.binary_dir());
#endif
Index: src/lyxserver.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxserver.C,v
retrieving revision 1.58
diff -u -p -r1.58 lyxserver.C
--- src/lyxserver.C 23 Jul 2004 19:01:48 -0000 1.58
+++ src/lyxserver.C 20 Jan 2005 15:04:00 -0000
@@ -355,6 +355,18 @@ void LyXComm::send(string const & msg)
}
+string const LyXComm::inPipeName() const
+{
+ return pipename + string(".in");
+}
+
+
+string const LyXComm::outPipeName() const
+{
+ return pipename + string(".out");
+}
+
+
// LyXServer class
LyXServer::~LyXServer()
Index: src/lyxserver.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxserver.h,v
retrieving revision 1.21
diff -u -p -r1.21 lyxserver.h
--- src/lyxserver.h 19 Jan 2005 15:26:40 -0000 1.21
+++ src/lyxserver.h 20 Jan 2005 15:04:00 -0000
@@ -58,14 +58,10 @@ public:
private:
/// the filename of the in pipe
- std::string const inPipeName() const {
- return pipename + std::string(".in");
- }
+ std::string const inPipeName() const;
/// the filename of the out pipe
- std::string const outPipeName() const {
- return pipename + std::string(".out");
- }
+ std::string const outPipeName() const;
/// Open pipes
void openConnection();
