Polish status bar statistics

[lyx.git] / src / Bullet.cpp

diff --git a/src/Bullet.cpp b/src/Bullet.cpp
index 1e617773ad4053e50bd00e9402df73b659af4549..4308189d92d4bb3442f802b5e0217ac4cb593a89 100644 (file)
--- a/src/Bullet.cpp
+++ b/src/Bullet.cpp
@@ -54,7 +54,7 @@ Bullet::Bullet(int f, int c, int s)
 
 
 Bullet::Bullet(docstring const & t)
-       : font(MIN), character(MIN), size(MIN), user_text(1), text(t), unicode(t)
+       : font(MIN), character(MIN), size(MIN), user_text(1), text(t), label(t)
 {
        testInvariant();
 }
@@ -98,7 +98,7 @@ void Bullet::setText(docstring const & t)
        font = character = size = MIN;
        user_text = 1;
        text = t;
-       unicode = t;
+       label = t;
        testInvariant();
 }
 
@@ -123,7 +123,6 @@ int Bullet::getSize() const
 
 FontSize Bullet::getFontSize() const
 {
-
        if (size >= 0)
                return bulletFontSize(size);
        else
@@ -139,7 +138,7 @@ Bullet & Bullet::operator=(Bullet const & b)
        size = b.size;
        user_text = b.user_text;
        text = b.text;
-       unicode = b.unicode;
+       label = b.label;
        this->testInvariant();
        return *this;
 }
@@ -153,11 +152,11 @@ docstring const & Bullet::getText() const
 }
 
 
-docstring const & Bullet::getUnicode() const
+docstring const & Bullet::getLabel() const
 {
        if (user_text == 0)
                generateText();
-       return unicode;
+       return label;
 }
 
 
@@ -196,7 +195,7 @@ void Bullet::generateText() const
 
        if ((font >= 0) && (character >= 0)) {
                text = bulletEntry(font, character);
-               unicode = bulletUnicode(font, character);
+               label = bulletLabel(font, character);
                if (size >= 0)
                        text = bulletSize(size) + text;
                user_text = -1;
@@ -379,7 +378,7 @@ FontSize Bullet::bulletFontSize(int s)
 }
 
 
-docstring const Bullet::bulletUnicode(int f, int c)
+docstring const Bullet::bulletLabel(int f, int c)
 {
        // see comment at bulletEntry
        static int UnicodeBulletPanel0[CHARMAX] = {