Author: jghali
Date: Mon Feb 19 18:25:05 2018
New Revision: 22401

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22401
Log:
fix typos in various variable names and functions

Modified:
    trunk/Scribus/scribus/text/boxes.cpp
    trunk/Scribus/scribus/text/boxes.h
    trunk/Scribus/scribus/text/glyphcluster.cpp
    trunk/Scribus/scribus/text/glyphcluster.h

Modified: trunk/Scribus/scribus/text/boxes.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22401&path=/trunk/Scribus/scribus/text/boxes.cpp
==============================================================================
--- trunk/Scribus/scribus/text/boxes.cpp        (original)
+++ trunk/Scribus/scribus/text/boxes.cpp        Mon Feb 19 18:25:05 2018
@@ -103,7 +103,7 @@
                if (m_direction == D_Horizontal)
                        nH = qMax(m_naturalHeight, box->naturalHeight());
                else
-                       nH = ceil(box->y() + box->ascent() - 
box->naturalDecent());
+                       nH = ceil(box->y() + box->ascent() - 
box->naturalDescent());
        }
        return nH;
 }
@@ -137,7 +137,7 @@
                else
                {
                        m_naturalWidth = qMax(m_naturalWidth, 
box->naturalWidth());
-                       m_naturalHeight = ceil(box->y() + box->ascent() - 
box->naturalDecent());
+                       m_naturalHeight = ceil(box->y() + box->ascent() - 
box->naturalDescent());
                }
        }
 
@@ -325,7 +325,7 @@
 
 void LineBox::update()
 {
-       m_naturalWidth = m_naturalAscent = m_naturalDecent = 0;
+       m_naturalWidth = m_naturalAscent = m_naturalDescent = 0;
        for (int i = 0; i < m_boxes.count(); ++i)
        {
                Box* box = m_boxes[i];
@@ -336,7 +336,7 @@
                m_naturalWidth += box->width();
 
                m_naturalAscent = qMax(m_naturalAscent, box->naturalAsc());
-               m_naturalDecent = qMin(m_naturalDecent, box->naturalDecent());
+               m_naturalDescent = qMin(m_naturalDescent, 
box->naturalDescent());
        }
 
 //     emit boxChanged();

Modified: trunk/Scribus/scribus/text/boxes.h
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22401&path=/trunk/Scribus/scribus/text/boxes.h
==============================================================================
--- trunk/Scribus/scribus/text/boxes.h  (original)
+++ trunk/Scribus/scribus/text/boxes.h  Mon Feb 19 18:25:05 2018
@@ -51,7 +51,7 @@
                m_firstChar = 0;
                m_lastChar = 0;
                m_naturalAscent = 0;
-               m_naturalDecent = 0;
+               m_naturalDescent = 0;
        }
 
        virtual ~Box()
@@ -137,9 +137,9 @@
        /// Draw selection if the the box selected
        virtual void drawSelection(ScreenPainter *p, ITextContext *ctx) const {}
 
-       /// Get natural ascent and decent.
+       /// Get natural ascent and descent.
        virtual double naturalAsc() const { return m_naturalAscent; }
-       virtual double naturalDecent() const { return m_naturalDecent; }
+       virtual double naturalDescent() const { return m_naturalDescent; }
 
        /// return box type
        BoxType type() const { return m_type; }
@@ -162,7 +162,7 @@
        int m_lastChar;
        QTransform m_matrix;
        double m_naturalAscent;
-       double m_naturalDecent;
+       double m_naturalDescent;
 };
 
 
@@ -265,7 +265,7 @@
                m_lastChar = run.lastChar();
                m_width = run.width();
                m_naturalAscent = run.ascent();
-               m_naturalDecent = run.desent();
+               m_naturalDescent = run.descent();
        }
 
        int pointToPosition(QPointF coord, const StoryText &story) const;

Modified: trunk/Scribus/scribus/text/glyphcluster.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22401&path=/trunk/Scribus/scribus/text/glyphcluster.cpp
==============================================================================
--- trunk/Scribus/scribus/text/glyphcluster.cpp (original)
+++ trunk/Scribus/scribus/text/glyphcluster.cpp Mon Feb 19 18:25:05 2018
@@ -43,7 +43,7 @@
        return asc;
 }
 
-double GlyphCluster::desent() const
+double GlyphCluster::descent() const
 {
        const ScFace &font = m_style->font();
        double des = 0;

Modified: trunk/Scribus/scribus/text/glyphcluster.h
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22401&path=/trunk/Scribus/scribus/text/glyphcluster.h
==============================================================================
--- trunk/Scribus/scribus/text/glyphcluster.h   (original)
+++ trunk/Scribus/scribus/text/glyphcluster.h   Mon Feb 19 18:25:05 2018
@@ -29,7 +29,7 @@
        double width() const;
 
        double ascent() const;
-       double desent() const;
+       double descent() const;
 
        double scaleH() const;
        double scaleV() const;


_______________________________________________
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit

Reply via email to