John's character.C patch (bug fix).

[lyx.git] / src / frontends / controllers / ControlMinipage.C

diff --git a/src/frontends/controllers/ControlMinipage.C b/src/frontends/controllers/ControlMinipage.C
index 54802e7420f5c3fa0b7cae3d955544815e1233fc..7c7f2ee9406f749dbcfec73ecf2155cbcd443bea 100644 (file)
--- a/src/frontends/controllers/ControlMinipage.C
+++ b/src/frontends/controllers/ControlMinipage.C
@@ -17,10 +17,13 @@
 #pragma implementation
 #endif
 
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlMinipage.h"
 #include "Dialogs.h"
 #include "LyXView.h"
 #include "buffer.h"
+#include "BufferView.h"
 
 using std::vector;
 using SigC::slot;
@@ -68,14 +71,16 @@ MinipageParams::MinipageParams(InsetMinipage const & inset)
        : width(inset.width()), pos(inset.pos())
 {}
 
-bool MinipageParams::operator==(MinipageParams const & o) const
+
+bool operator==(MinipageParams const & p1, MinipageParams const & p2)
 {
-       return (width == o.width && pos == o.pos);
+       return (p1.width == p2.width && p1.pos == p2.pos);
 }
 
-bool MinipageParams::operator!=(MinipageParams const & o) const
+
+bool operator!=(MinipageParams const & p1, MinipageParams const & p2)
 {
-       return !(*this == o);
+       return !(p1 == p2);
 }
 
 namespace minipage {
@@ -84,7 +89,7 @@ vector<string> const getUnits()
 {
        vector<string> units;
        const char * str;
-       for(int i=0;(str=stringFromUnit(i));++i)
+       for(int i=0; (str = stringFromUnit(i)); ++i)
            units.push_back(str);
 
        return units;