X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBullet.h;h=5d192283c1ac09b2d35a4435e5babb5e44234aed;hb=eead5ba43d0ddf06544ad1b40063981d3788c635;hp=547d7d1989fa5d26147f8537cfb83431d85fe3bc;hpb=da7667356810c250a0875649d0b0291c90462c65;p=lyx.git diff --git a/src/Bullet.h b/src/Bullet.h index 547d7d1989..5d192283c1 100644 --- a/src/Bullet.h +++ b/src/Bullet.h @@ -1,7 +1,7 @@ // -*- C++ -*- /* This is the bullet class definition file. * This file is part of - * ====================================================== + * ====================================================== * * LyX, The Document Processor * @@ -15,10 +15,6 @@ #ifndef BULLET_H #define BULLET_H -#ifdef __GNUG__ -#pragma interface -#endif - #include "LString.h" /// @@ -60,7 +56,7 @@ private: This enum makes adding additional panels or changing panel sizes easier. Since you only need change these values for all tests to be correct for the new values. - + Note: MAX means the size of the array so to test you need: (x < MAX) *not* (x <= MAX) */ @@ -74,33 +70,33 @@ private: /// SIZEMAX = 10 }; - + /// void generateText() const; /// - static string const bulletSize(short int); + static string const bulletSize(int); /// - static string const bulletEntry(short int, short int); - + static string const bulletEntry(int, int); + /// int font; /// int character; /// int size; - - // size, character and font are array indices to access + + // size, character and font are array indices to access // the predefined arrays of LaTeX equivalent strings. - + /** flag indicates if user has control of text (1) or if I can use it to generate strings (0) or have already (-1) */ - mutable short user_text; - + mutable short user_text; + //NOTE: Arranging these four shorts above to be together // like this should ensure they are in a single cache line - + /** text may contain a user-defined LaTeX symbol command or one generated internally from the font, character and size settings.