Fix bug #12772

[lyx.git] / src / Dimension.h

diff --git a/src/Dimension.h b/src/Dimension.h
index bd8f10d8f259c64db33737f9f6acfe7ef6f19b60..802b3bb5557345b6787be54f8e3c966ddc07222c 100644 (file)
--- a/src/Dimension.h
+++ b/src/Dimension.h
@@ -18,20 +18,18 @@ namespace lyx {
 class Dimension {
 public:
        /// constructor
-       Dimension() : wid(0), asc(0), des(0) {}
+       Dimension() = default;
        /// initialize data
        Dimension(int w, int a, int d) : wid(w), asc(a), des(d) {}
+       ///
+       Dimension & operator=(Dimension const & dim) = default;
 
-       Dimension & operator=(Dimension const & dim) {
-               wid = dim.wid;
-               asc = dim.asc;
-               des = dim.des;
-               return *this;
-       }
        /// glue horizontally
        void operator+=(Dimension const & dim);
        /// set to empty box
        void clear() { wid = asc = des = 0; }
+       /// check whether box is empty
+       bool empty() const { return wid == 0 && asc == 0 && des == 0; }
        /// get height
        int height() const { return asc + des; }
        /// get ascent
@@ -57,35 +55,33 @@ public:
        ///
        /// makes the code neither faster nor clearer
        /// width
-       int wid;
+       int wid = 0;
        /// ascent
-       int asc;
+       int asc = 0;
        /// descent
-       int des;
+       int des = 0;
 };
 
 inline
 bool operator==(Dimension const & a, Dimension const & b)
 {
-       return a.wid == b.wid && a.asc == b.asc && a.des == b.des ;
+       return a.wid == b.wid && a.asc == b.asc && a.des == b.des;
 }
 
 
 inline
 bool operator!=(Dimension const & a, Dimension const & b)
 {
-       return a.wid != b.wid || a.asc != b.asc || a.des != b.des ;
+       return !(a == b);
 }
 
 class Point {
 public:
-       Point()
-               : x_(0), y_(0)
-       {}
-
+       Point() = default;
        Point(int x, int y);
 
-       int x_, y_;
+       int x_ = 0;
+       int y_ = 0;
 };
 
 } // namespace lyx