code cosmetics to the iterator fix

[lyx.git] / src / Bullet.h

diff --git a/src/Bullet.h b/src/Bullet.h
index 184e8e976440896f03c87db7167f8912481fee3a..0f16f15ce25b7b3ec1c12a9731dbc6e85d29a22f 100644 (file)
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -13,7 +13,7 @@
 #ifndef BULLET_H
 #define BULLET_H
 
-#include "support/std_string.h"
+#include <string>
 
 ///
 class Bullet {
@@ -22,7 +22,7 @@ public:
        Bullet(int f = -1, int c = -1, int s = -1);
 
        ///
-       explicit Bullet(string const &);
+       explicit Bullet(std::string const &);
 
        ///
        void setCharacter(int);
@@ -31,7 +31,7 @@ public:
        ///
        void setSize(int);
        ///
-       void setText(string const &);
+       void setText(std::string const &);
        ///
        int getCharacter() const;
        ///
@@ -39,16 +39,14 @@ public:
        ///
        int getSize() const;
        ///
-       string const & getText() const;
+       std::string const & getText() const;
        ///
        Bullet & operator=(Bullet const &);
        ///
        friend bool operator==(Bullet const &, Bullet const &);
 protected:
-#ifdef ENABLE_ASSERTIONS
        ///
        void testInvariant() const;
-#endif
 private:
        /**
           This enum makes adding additional panels or changing panel sizes
@@ -72,9 +70,9 @@ private:
        ///
        void generateText() const;
        ///
-       static string const bulletSize(int);
+       static std::string const bulletSize(int);
        ///
-       static string const bulletEntry(int, int);
+       static std::string const bulletEntry(int, int);
 
        ///
        int font;
@@ -99,7 +97,7 @@ private:
            or one generated internally from the font, character
            and size settings.
        */
-       mutable string text;
+       mutable std::string text;
 };