Some fixes to compile Baruch's code with compaq cxx (still does not work).

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

diff --git a/ChangeLog b/ChangeLog
index fb0d59d09e53d037557fada462d82a964d2ba226..2dc2c23bf4e93af441a046070da4b4282c089a38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2000-07-31  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+       * src/frontends/xforms/FormGraphics.C (apply): add some
+       static_cast. Not very nice, but required by compaq cxx.
+
+       * src/frontends/xforms/RadioButtonGroup.h: include header
+       <utility> instead of <pair.h>
+
+       * src/insets/insetgraphicsParams.C: add using directive. 
+       (readResize): change return type to void. 
+       (readOrigin): ditto.
+
        * src/lyxfunc.C (getStatus): add missing break for build-program
        function; add test for Literate for export functions.
 

diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C
index d730b412b7d1c36ef82387b56865e209e9635657..2abeba92ac11baa4f2b27abb1906afcc002e6bd6 100644 (file)
--- a/src/frontends/xforms/FormGraphics.C
+++ b/src/frontends/xforms/FormGraphics.C
@@ -41,6 +41,8 @@
 #include "support/LAssert.h"
 #endif
 
+using std::endl;
+
 C_RETURNCB(FormGraphics, WMHideCB)
 C_GENERICCB(FormGraphics, OKCB)
 C_GENERICCB(FormGraphics, ApplyCB)
@@ -259,12 +261,15 @@ void FormGraphics::apply()
 
     igp.filename = fl_get_input(dialog_->input_filename);
 
-    igp.display = displayButtons.getButton();
+    igp.display = static_cast<InsetGraphicsParams::DisplayType>
+           (displayButtons.getButton());
     
-    igp.widthResize = widthButtons.getButton();
+    igp.widthResize = static_cast<InsetGraphicsParams::Resize>
+           (widthButtons.getButton());
     igp.widthSize = strToDbl(fl_get_input(dialog_->input_width));
 
-    igp.heightResize = heightButtons.getButton();
+    igp.heightResize = static_cast<InsetGraphicsParams::Resize>
+           (heightButtons.getButton());
     igp.heightSize = strToDbl(fl_get_input(dialog_->input_height));
 
     igp.rotateAngle = strToInt(fl_get_input(dialog_->input_rotate_angle));

diff --git a/src/frontends/xforms/RadioButtonGroup.C b/src/frontends/xforms/RadioButtonGroup.C
index 5e6b9cadc5591d1d166878b622a325e7c9175fd1..1289c75cdd512aeb5317971ab0a5627427196453 100644 (file)
--- a/src/frontends/xforms/RadioButtonGroup.C
+++ b/src/frontends/xforms/RadioButtonGroup.C
@@ -23,6 +23,7 @@
 #include <algorithm>
 #include <iterator>
 using std::find_if;
+using std::endl;
 
 void RadioButtonGroup::registerRadioButton(FL_OBJECT *button, int value)
 {

diff --git a/src/frontends/xforms/RadioButtonGroup.h b/src/frontends/xforms/RadioButtonGroup.h
index 51b51b25a6155f1127f7e0cafdd77adddc6c80af..4c7407db8848f1b8c0ba57f4b9fcc14d2f2ec86f 100644 (file)
--- a/src/frontends/xforms/RadioButtonGroup.h
+++ b/src/frontends/xforms/RadioButtonGroup.h
@@ -24,7 +24,7 @@
 #endif
 
 #include <vector>
-#include <pair.h>
+#include <utility>
 using std::vector;
 using std::pair;
 

diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C
index 060735375a47c65caaacf9d50cdfa2b4c676ca4e..0896fac9cfca8bee07581045d04adba02543f089 100644 (file)
--- a/src/insets/insetgraphicsParams.C
+++ b/src/insets/insetgraphicsParams.C
@@ -23,6 +23,8 @@
 #include "support/LAssert.h"
 #endif
 
+using std::endl;
+
 /// This variable keeps a tab on whether the translator was set with the
 /// translations.
 static bool translatorsSet = false;
@@ -341,7 +343,8 @@ void InsetGraphicsParams::Write(Buffer const * buf, ostream & os) const
         os << " rotateAngle " << rotateAngle << endl;
 }
    
-static readResize(InsetGraphicsParams * igp, bool height, string const & token)
+static void readResize(InsetGraphicsParams * igp, bool height, 
+                      string const & token)
 {
     InsetGraphicsParams::Resize resize = InsetGraphicsParams::DEFAULT_SIZE;
 
@@ -370,7 +373,7 @@ static readResize(InsetGraphicsParams * igp, bool height, string const & token)
         igp->widthResize = resize;
 }
     
-static readOrigin(InsetGraphicsParams * igp, string const & token)
+static void readOrigin(InsetGraphicsParams * igp, string const & token)
 { // TODO: complete this function.
     igp->rotateOrigin = originTranslator.find(token);
 }