Added various inset functions for Jean-Marc (see Changelog). Small fix in

[lyx.git] / src / insets / insetgraphicsParams.C

diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C
index 89cc26c1a99db0071983395bc287d9472fe53f3e..0218ac1ddcdc6a1e2108181490417cf49713dab2 100644 (file)
--- a/src/insets/insetgraphicsParams.C
+++ b/src/insets/insetgraphicsParams.C
@@ -1,10 +1,9 @@
-// -*- C++ -*-
 /* This file is part of
  * =================================================
  * 
  *          LyX, The Document Processor
  *          Copyright 1995 Matthias Ettrich.
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  *          This file Copyright 2000 Baruch Even
  * ================================================= */
@@ -146,34 +145,34 @@ void InsetGraphicsParams::testInvariant() const
        // Filename might be empty (when the dialog is first created).
        // Assert(!filename.empty());
 
-       Assert(display == COLOR ||
+       lyx::Assert(display == COLOR ||
               display == MONOCHROME ||
               display == GRAYSCALE ||
               display == NONE
              );
 
-       Assert(widthResize == DEFAULT_SIZE ||
+       lyx::Assert(widthResize == DEFAULT_SIZE ||
               widthResize == CM ||
               widthResize == INCH ||
               widthResize == PERCENT_PAGE ||
               widthResize == PERCENT_COLUMN
              );
 
-       Assert(heightResize == DEFAULT_SIZE ||
+       lyx::Assert(heightResize == DEFAULT_SIZE ||
               heightResize == CM ||
               heightResize == INCH ||
               heightResize == PERCENT_PAGE
              );
 
-       Assert(widthSize >= 0.0);
-       Assert(heightSize >= 0.0);
+       lyx::Assert(widthSize >= 0.0);
+       lyx::Assert(heightSize >= 0.0);
 
        // Angle is in degrees and ranges -360 < angle < 360
        // The reason for this is that in latex there is a meaning for the
        // different angles and they are not necessarliy interchangeable,
        // it depends on the rotation origin.
-       Assert(rotateAngle < 360);
-       Assert(rotateAngle > -360);
+       lyx::Assert(rotateAngle < 360);
+       lyx::Assert(rotateAngle > -360);
 
 }
 
@@ -198,6 +197,12 @@ bool operator==(InsetGraphicsParams const & left,
        return false;
 }
 
+bool operator!=(InsetGraphicsParams const & left,
+                InsetGraphicsParams const & right)
+{
+       return  !(left == right);
+}
+
 
 namespace {