#include <boost/assert.hpp>
+namespace lyx {
+
using std::string;
-Bullet::Bullet(string const & t)
+Bullet::Bullet(docstring const & t)
: font(MIN), character(MIN), size(MIN), user_text(1), text(t)
{
testInvariant();
}
-void Bullet::setText(string const & t)
+void Bullet::setText(docstring const & t)
{
font = character = size = MIN;
user_text = 1;
}
-string const & Bullet::getText() const
+docstring const & Bullet::getText() const
{
if (user_text == 0) {
generateText();
}
-string const Bullet::bulletSize(int s)
+docstring const Bullet::bulletSize(int s)
{
// use a parameter rather than hard code `size' in here
// in case some future function may want to retrieve
"\\large", "\\Large", "\\LARGE", "\\huge", "\\Huge"
};
- return BulletSize[s];
+ return from_ascii(BulletSize[s]);
}
-string const Bullet::bulletEntry(int f, int c)
+docstring const Bullet::bulletEntry(int f, int c)
{
// Despite how this may at first appear the static local variables
// are only initialized once..
BulletPanel4, BulletPanel5
};
- return BulletPanels[f][c];
+ return from_ascii(BulletPanels[f][c]);
}
void Bullet::testInvariant() const
// }
#endif
}
+
+
+} // namespace lyx