From 2e7ac7ca77bef2290428603b0a19a9517f675f26 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Thu, 18 Sep 2003 11:48:11 +0000 Subject: [PATCH] Rename EnumLColor as LColor_color. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7788 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 8 ++++++++ src/LColor.h | 10 +++++----- src/frontends/ChangeLog | 6 ++++++ src/frontends/Painter.C | 4 ++-- src/frontends/Painter.h | 20 ++++++++++---------- src/frontends/controllers/ChangeLog | 8 ++++++++ src/frontends/controllers/ControlCharacter.C | 4 ++-- src/frontends/controllers/ControlCharacter.h | 6 +++--- src/frontends/controllers/ControlPrefs.C | 2 +- src/frontends/controllers/ControlPrefs.h | 4 ++-- src/frontends/controllers/character.h | 4 ++-- src/frontends/gtk/ChangeLog | 8 ++++++++ src/frontends/gtk/GPainter.C | 16 ++++++++-------- src/frontends/gtk/GPainter.h | 18 +++++++++--------- src/frontends/gtk/GWorkArea.C | 12 ++++++------ src/frontends/gtk/GWorkArea.h | 18 +++++++++--------- src/frontends/gtk/lyx_gui.C | 4 ++-- src/frontends/lyx_gui.h | 6 +++--- src/frontends/qt2/ChangeLog | 9 +++++++++ src/frontends/qt2/QLPainter.C | 16 ++++++++-------- src/frontends/qt2/QLPainter.h | 16 ++++++++-------- src/frontends/qt2/QPrefsDialog.h | 4 ++-- src/frontends/qt2/lcolorcache.C | 2 +- src/frontends/qt2/lcolorcache.h | 6 +++--- src/frontends/qt2/lyx_gui.C | 4 ++-- src/frontends/xforms/ChangeLog | 11 +++++++++++ src/frontends/xforms/Color.C | 2 +- src/frontends/xforms/Color.h | 4 ++-- src/frontends/xforms/ColorHandler.C | 8 ++++---- src/frontends/xforms/ColorHandler.h | 10 +++++----- src/frontends/xforms/FormCharacter.h | 4 ++-- src/frontends/xforms/XPainter.C | 14 +++++++------- src/frontends/xforms/XPainter.h | 14 +++++++------- src/frontends/xforms/lyx_gui.C | 4 ++-- src/insets/ChangeLog | 7 +++++++ src/insets/inset.C | 4 ++-- src/insets/inset.h | 6 +++--- src/insets/insettext.C | 4 ++-- src/insets/insettext.h | 6 +++--- src/lyxfont.C | 6 +++--- src/lyxfont.h | 8 ++++---- src/lyxtext.h | 4 ++-- src/text.C | 2 +- 43 files changed, 195 insertions(+), 138 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index efd24b59fd..b773f4532e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2003-09-18 Angus Leeming + + * LColor.h: + * lyxfont.C: + * lyxfont.h: + * lyxtext.h: + * text.C: rename EnumLColor as LColor_color. + 2003-09-18 Angus Leeming * cursor.[Ch]: use the dispatch_result wrapper class DispatchResult to remove diff --git a/src/LColor.h b/src/LColor.h index 6e481cf674..d07e899dc8 100644 --- a/src/LColor.h +++ b/src/LColor.h @@ -239,18 +239,18 @@ private: }; -/** \c EnumLColor is a wrapper for LColor::color. It can be forward-declared and +/** \c LColor_color is a wrapper for LColor::color. It can be forward-declared and * passed as a function argument without having to expose LColor.h. */ -class EnumLColor { +class LColor_color { LColor::color val_; public: /** The default constructor is nasty, - * but allows us to use EnumLColor in STL containers. + * but allows us to use LColor_color in STL containers. */ - EnumLColor() : val_(static_cast(-1)) {} + LColor_color() : val_(static_cast(-1)) {} - EnumLColor(LColor::color val) : val_(val) {} + LColor_color(LColor::color val) : val_(val) {} operator LColor::color() const{ return val_; } }; diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index c0a0f7a7a6..557a1f84ef 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,9 @@ +2003-09-18 Angus Leeming + + * Painter.C: + * Painter.h: + * lyx_gui.h: rename EnumLColor as LColor_color. + 2003-09-18 Angus Leeming * Dialogs.[Ch] (find): renamed as find_or_build. diff --git a/src/frontends/Painter.C b/src/frontends/Painter.C index 2e0c56249f..79f97bf8e8 100644 --- a/src/frontends/Painter.C +++ b/src/frontends/Painter.C @@ -59,8 +59,8 @@ Painter & Painter::buttonFrame(int x, int y, int w, int h) Painter & Painter::rectText(int x, int baseline, string const & str, LyXFont const & font, - EnumLColor back, - EnumLColor frame) + LColor_color back, + LColor_color frame) { int width; int ascent; diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h index 5560689c6e..482f77fa1c 100644 --- a/src/frontends/Painter.h +++ b/src/frontends/Painter.h @@ -17,7 +17,7 @@ #include "support/std_string.h" -class EnumLColor; +class LColor_color; class LyXFont; namespace lyx { @@ -78,7 +78,7 @@ public: virtual Painter & line( int x1, int y1, int x2, int y2, - EnumLColor, + LColor_color, line_style = line_solid, line_width = line_thin) = 0; @@ -92,7 +92,7 @@ public: int const * xp, int const * yp, int np, - EnumLColor, + LColor_color, line_style = line_solid, line_width = line_thin) = 0; @@ -100,7 +100,7 @@ public: virtual Painter & rectangle( int x, int y, int w, int h, - EnumLColor, + LColor_color, line_style = line_solid, line_width = line_thin) = 0; @@ -108,26 +108,26 @@ public: virtual Painter & fillRectangle( int x, int y, int w, int h, - EnumLColor) = 0; + LColor_color) = 0; /// draw a filled (irregular) polygon virtual Painter & fillPolygon( int const * xp, int const * yp, int np, - EnumLColor) = 0; + LColor_color) = 0; /// draw an arc virtual Painter & arc( int x, int y, unsigned int w, unsigned int h, int a1, int a2, - EnumLColor) = 0; + LColor_color) = 0; /// draw a pixel virtual Painter & point( int x, int y, - EnumLColor) = 0; + LColor_color) = 0; /// draw a filled rectangle with the shape of a 3D button virtual Painter & button(int x, int y, @@ -163,8 +163,8 @@ public: Painter & rectText(int x, int baseline, string const & string, LyXFont const & font, - EnumLColor back, - EnumLColor frame); + LColor_color back, + LColor_color frame); /// draw a string and enclose it inside a button frame Painter & buttonText(int x, diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 3db579b0db..0cb90030af 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,11 @@ +2003-09-18 Angus Leeming + + * ControlCharacter.C: + * ControlCharacter.h: + * ControlPrefs.C: + * ControlPrefs.h: + * character.h: rename EnumLColor as LColor_color. + 2003-09-16 Angus Leeming * ControlCharacter.C: add #include "LColor.h". diff --git a/src/frontends/controllers/ControlCharacter.C b/src/frontends/controllers/ControlCharacter.C index e335d51f9f..975d740b46 100644 --- a/src/frontends/controllers/ControlCharacter.C +++ b/src/frontends/controllers/ControlCharacter.C @@ -175,7 +175,7 @@ void ControlCharacter::setBar(frnt::FONT_STATE val) } -EnumLColor ControlCharacter::getColor() const +LColor_color ControlCharacter::getColor() const { if (!font_.get()) return LColor::ignore; @@ -184,7 +184,7 @@ EnumLColor ControlCharacter::getColor() const } -void ControlCharacter::setColor(EnumLColor val) +void ControlCharacter::setColor(LColor_color val) { switch (val) { case LColor::ignore: diff --git a/src/frontends/controllers/ControlCharacter.h b/src/frontends/controllers/ControlCharacter.h index e22ecbefc0..e6a3b15a89 100644 --- a/src/frontends/controllers/ControlCharacter.h +++ b/src/frontends/controllers/ControlCharacter.h @@ -17,7 +17,7 @@ #include "character.h" -class EnumLColor; +class LColor_color; class ControlCharacter : public Dialog::Controller { @@ -44,7 +44,7 @@ public: /// void setBar(frnt::FONT_STATE); /// - void setColor(EnumLColor); + void setColor(LColor_color); /// void setLanguage(string const &); /// @@ -61,7 +61,7 @@ public: /// frnt::FONT_STATE getBar() const; /// - EnumLColor getColor() const; + LColor_color getColor() const; /// string getLanguage() const; /// diff --git a/src/frontends/controllers/ControlPrefs.C b/src/frontends/controllers/ControlPrefs.C index 7c60b949fd..31696286e3 100644 --- a/src/frontends/controllers/ControlPrefs.C +++ b/src/frontends/controllers/ControlPrefs.C @@ -134,7 +134,7 @@ void ControlPrefs::redrawGUI() } -void ControlPrefs::setColor(EnumLColor col, string const & hex) +void ControlPrefs::setColor(LColor_color col, string const & hex) { string const s = lcolor.getLyXName(col) + ' ' + hex; lv_.dispatch(FuncRequest(LFUN_SET_COLOR, s)); diff --git a/src/frontends/controllers/ControlPrefs.h b/src/frontends/controllers/ControlPrefs.h index c5f1a4b301..8a5f789b58 100644 --- a/src/frontends/controllers/ControlPrefs.h +++ b/src/frontends/controllers/ControlPrefs.h @@ -19,7 +19,7 @@ class Converters; -class EnumLColor; +class LColor_color; class Formats; class ControlPrefs : public ControlDialogBI { @@ -50,7 +50,7 @@ public: void redrawGUI(); /// set a color - void setColor(EnumLColor col, string const & hex); + void setColor(LColor_color col, string const & hex); /// update the screen fonts after change void updateScreenFonts(); diff --git a/src/frontends/controllers/character.h b/src/frontends/controllers/character.h index ae12385820..26aba08af9 100644 --- a/src/frontends/controllers/character.h +++ b/src/frontends/controllers/character.h @@ -19,7 +19,7 @@ #include -class EnumLColor; +class LColor_color; /** Functions of use to the character GUI controller and view */ @@ -50,7 +50,7 @@ typedef std::pair SizePair; /// typedef std::pair BarPair; /// -typedef std::pair ColorPair; +typedef std::pair ColorPair; /// std::vector const getFamilyData(); diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog index eb4b9a7f09..343eba2c5d 100644 --- a/src/frontends/gtk/ChangeLog +++ b/src/frontends/gtk/ChangeLog @@ -1,3 +1,11 @@ +2003-09-18 Angus Leeming + + * GPainter.C: + * GPainter.h: + * GWorkArea.C: + * GWorkArea.h: + * lyx_gui.C: rename EnumLColor as LColor_color. + 2003-09-16 Angus Leeming * GScreen.[Ch] (workarea): diff --git a/src/frontends/gtk/GPainter.C b/src/frontends/gtk/GPainter.C index f5357cec9d..958e25c1ce 100644 --- a/src/frontends/gtk/GPainter.C +++ b/src/frontends/gtk/GPainter.C @@ -51,7 +51,7 @@ int GPainter::paperHeight() const } -void GPainter::setForeground(Glib::RefPtr gc, EnumLColor clr) +void GPainter::setForeground(Glib::RefPtr gc, LColor_color clr) { Gdk::Color * gclr = owner_.getColorHandler().getGdkColor(clr); gc->set_foreground(*gclr); @@ -85,7 +85,7 @@ void GPainter::setLineParam(Glib::RefPtr gc, } -Painter & GPainter::point(int x, int y, EnumLColor c) +Painter & GPainter::point(int x, int y, LColor_color c) { setForeground(owner_.getGC(), c); owner_.getPixmap()->draw_point(owner_.getGC(), x, y); @@ -95,7 +95,7 @@ Painter & GPainter::point(int x, int y, EnumLColor c) Painter & GPainter::line(int x1, int y1, int x2, int y2, - EnumLColor col, + LColor_color col, line_style ls, line_width lw) { @@ -108,7 +108,7 @@ Painter & GPainter::line(int x1, int y1, Painter & GPainter::lines(int const * xp, int const * yp, int np, - EnumLColor col, + LColor_color col, line_style ls, line_width lw) { @@ -127,7 +127,7 @@ Painter & GPainter::lines(int const * xp, int const * yp, Painter & GPainter::rectangle(int x, int y, int w, int h, - EnumLColor col, + LColor_color col, line_style ls, line_width lw) { @@ -140,7 +140,7 @@ Painter & GPainter::rectangle(int x, int y, Painter & GPainter::fillRectangle(int x, int y, int w, int h, - EnumLColor col) + LColor_color col) { setForeground(owner_.getGC(), col); owner_.getPixmap()->draw_rectangle(owner_.getGC(), true, x, y, w, h); @@ -149,7 +149,7 @@ Painter & GPainter::fillRectangle(int x, int y, Painter & GPainter::fillPolygon(int const * xp, int const * yp, - int np, EnumLColor col) + int np, LColor_color col) { setForeground(owner_.getGC(), col); std::vector points(np); @@ -165,7 +165,7 @@ Painter & GPainter::fillPolygon(int const * xp, int const * yp, Painter & GPainter::arc(int x, int y, unsigned int w, unsigned int h, - int a1, int a2, EnumLColor col) + int a1, int a2, LColor_color col) { setForeground(owner_.getGC(), col); owner_.getPixmap()->draw_arc(owner_.getGC(), diff --git a/src/frontends/gtk/GPainter.h b/src/frontends/gtk/GPainter.h index 8d20826bb9..3c93e2418d 100644 --- a/src/frontends/gtk/GPainter.h +++ b/src/frontends/gtk/GPainter.h @@ -33,15 +33,15 @@ public: /// return the height of the work area in pixels virtual int paperHeight() const; - void setForeground(Glib::RefPtr gc, EnumLColor clr); + void setForeground(Glib::RefPtr gc, LColor_color clr); void setLineParam(Glib::RefPtr gc, line_style ls, line_width lw); - XftColor * getXftColor(EnumLColor clr); + XftColor * getXftColor(LColor_color clr); /// draw a line from point to point virtual Painter & line( int x1, int y1, int x2, int y2, - EnumLColor, + LColor_color, line_style = line_solid, line_width = line_thin); @@ -55,7 +55,7 @@ public: int const * xp, int const * yp, int np, - EnumLColor, + LColor_color, line_style = line_solid, line_width = line_thin); @@ -63,7 +63,7 @@ public: virtual Painter & rectangle( int x, int y, int w, int h, - EnumLColor, + LColor_color, line_style = line_solid, line_width = line_thin); @@ -71,26 +71,26 @@ public: virtual Painter & fillRectangle( int x, int y, int w, int h, - EnumLColor); + LColor_color); /// draw a filled (irregular) polygon virtual Painter & fillPolygon( int const * xp, int const * yp, int np, - EnumLColor); + LColor_color); /// draw an arc virtual Painter & arc( int x, int y, unsigned int w, unsigned int h, int a1, int a2, - EnumLColor); + LColor_color); /// draw a pixel virtual Painter & point( int x, int y, - EnumLColor); + LColor_color); /// draw an image from the image cache virtual Painter & image(int x, int y, diff --git a/src/frontends/gtk/GWorkArea.C b/src/frontends/gtk/GWorkArea.C index 695015533f..d3be415f89 100644 --- a/src/frontends/gtk/GWorkArea.C +++ b/src/frontends/gtk/GWorkArea.C @@ -30,27 +30,27 @@ ColorCache::~ColorCache() } -Gdk::Color * ColorCache::getColor(EnumLColor clr) +Gdk::Color * ColorCache::getColor(LColor_color clr) { MapIt it = cache_.find(clr); return it == cache_.end() ? 0 : it->second; } -XftColor * ColorCache::getXftColor(EnumLColor clr) +XftColor * ColorCache::getXftColor(LColor_color clr) { MapIt2 it = cache2_.find(clr); return it == cache2_.end() ? 0 : it->second; } -void ColorCache::cacheColor(EnumLColor clr, Gdk::Color * gclr) +void ColorCache::cacheColor(LColor_color clr, Gdk::Color * gclr) { cache_[clr] = gclr; } -void ColorCache::cacheXftColor(EnumLColor clr, XftColor * xclr) +void ColorCache::cacheXftColor(LColor_color clr, XftColor * xclr) { cache2_[clr] = xclr; } @@ -69,7 +69,7 @@ void ColorCache::clear() } -XftColor * ColorHandler::getXftColor(EnumLColor clr) +XftColor * ColorHandler::getXftColor(LColor_color clr) { XftColor * xclr = colorCache.getXftColor(clr); if (!xclr) { @@ -86,7 +86,7 @@ XftColor * ColorHandler::getXftColor(EnumLColor clr) } -Gdk::Color * ColorHandler::getGdkColor(EnumLColor clr) +Gdk::Color * ColorHandler::getGdkColor(LColor_color clr) { Gdk::Color * gclr = colorCache.getColor(clr); if (!gclr) { diff --git a/src/frontends/gtk/GWorkArea.h b/src/frontends/gtk/GWorkArea.h index ffb3abc8a3..d47c77107f 100644 --- a/src/frontends/gtk/GWorkArea.h +++ b/src/frontends/gtk/GWorkArea.h @@ -20,20 +20,20 @@ #include -class EnumLColor; +class LColor_color; class ColorCache { - typedef std::map Map; + typedef std::map Map; typedef Map::iterator MapIt; - typedef std::map Map2; + typedef std::map Map2; typedef Map2::iterator MapIt2; public: ~ColorCache(); - Gdk::Color * getColor(EnumLColor); - XftColor * getXftColor(EnumLColor); - void cacheColor(EnumLColor, Gdk::Color *); - void cacheXftColor(EnumLColor, XftColor *); + Gdk::Color * getColor(LColor_color); + XftColor * getXftColor(LColor_color); + void cacheColor(LColor_color, Gdk::Color *); + void cacheXftColor(LColor_color, XftColor *); void clear(); private: Map cache_; @@ -46,8 +46,8 @@ class ColorHandler { public: ColorHandler(GWorkArea& owner) : owner_(owner) {} - XftColor * getXftColor(EnumLColor clr); - Gdk::Color * getGdkColor(EnumLColor clr); + XftColor * getXftColor(LColor_color clr); + Gdk::Color * getGdkColor(LColor_color clr); private: GWorkArea & owner_; }; diff --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C index b5455b579e..d11ce197fe 100644 --- a/src/frontends/gtk/lyx_gui.C +++ b/src/frontends/gtk/lyx_gui.C @@ -363,7 +363,7 @@ FuncStatus lyx_gui::getStatus(FuncRequest const & /*ev*/) } -string const lyx_gui::hexname(EnumLColor col) +string const lyx_gui::hexname(LColor_color col) { Gdk::Color gdkColor; Gdk::Color * gclr = colorCache.getColor(col); @@ -385,7 +385,7 @@ string const lyx_gui::hexname(EnumLColor col) } -void lyx_gui::update_color(EnumLColor /*col*/) +void lyx_gui::update_color(LColor_color /*col*/) { colorCache.clear(); } diff --git a/src/frontends/lyx_gui.h b/src/frontends/lyx_gui.h index e27e2ffccf..04f889e701 100644 --- a/src/frontends/lyx_gui.h +++ b/src/frontends/lyx_gui.h @@ -18,7 +18,7 @@ #include class Dialogs; -class EnumLColor; +class LColor_color; class LyXFont; class LyXComm; class FuncRequest; @@ -72,12 +72,12 @@ FuncStatus getStatus(FuncRequest const & ev); /** Eg, passing LColor::black returns "000000", * passing LColor::white returns "ffffff". */ -string const hexname(EnumLColor col); +string const hexname(LColor_color col); /** * update an altered GUI color */ -void update_color(EnumLColor col); +void update_color(LColor_color col); /** * update the font cache diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 0e0bef6cee..7096deed91 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,12 @@ +2003-09-18 Angus Leeming + + * QLPainter.C: + * QLPainter.h: + * QPrefsDialog.h: + * lcolorcache.C: + * lcolorcache.h: + * lyx_gui.C: rename EnumLColor as LColor_color. + 2003-09-16 Angus Leeming * QLImage.[Ch]: separate interface from implementation. Make all the virtual diff --git a/src/frontends/qt2/QLPainter.C b/src/frontends/qt2/QLPainter.C index 8de17fae2a..a6dce362db 100644 --- a/src/frontends/qt2/QLPainter.C +++ b/src/frontends/qt2/QLPainter.C @@ -63,7 +63,7 @@ int QLPainter::paperHeight() const } -QPainter & QLPainter::setPen(EnumLColor c, +QPainter & QLPainter::setPen(LColor_color c, Painter::line_style ls, Painter::line_width lw) { QPen pen = qp_->pen(); @@ -85,7 +85,7 @@ QPainter & QLPainter::setPen(EnumLColor c, } -Painter & QLPainter::point(int x, int y, EnumLColor c) +Painter & QLPainter::point(int x, int y, LColor_color c) { setPen(c).drawPoint(x, y); return *this; @@ -94,7 +94,7 @@ Painter & QLPainter::point(int x, int y, EnumLColor c) Painter & QLPainter::line(int x1, int y1, int x2, int y2, - EnumLColor col, + LColor_color col, line_style ls, line_width lw) { @@ -105,7 +105,7 @@ Painter & QLPainter::line(int x1, int y1, Painter & QLPainter::lines(int const * xp, int const * yp, int np, - EnumLColor col, + LColor_color col, line_style ls, line_width lw) { @@ -127,7 +127,7 @@ Painter & QLPainter::lines(int const * xp, int const * yp, Painter & QLPainter::rectangle(int x, int y, int w, int h, - EnumLColor col, + LColor_color col, line_style ls, line_width lw) { @@ -138,7 +138,7 @@ Painter & QLPainter::rectangle(int x, int y, Painter & QLPainter::fillRectangle(int x, int y, int w, int h, - EnumLColor col) + LColor_color col) { qp_->fillRect(x, y, w, h, lcolorcache.get(col)); return *this; @@ -146,7 +146,7 @@ Painter & QLPainter::fillRectangle(int x, int y, Painter & QLPainter::fillPolygon(int const * xp, int const * yp, - int np, EnumLColor col) + int np, LColor_color col) { // Must use new as np is not known at compile time. boost::scoped_array points(new QCOORD[np * 2]); @@ -169,7 +169,7 @@ Painter & QLPainter::fillPolygon(int const * xp, int const * yp, Painter & QLPainter::arc(int x, int y, unsigned int w, unsigned int h, - int a1, int a2, EnumLColor col) + int a1, int a2, LColor_color col) { // LyX usings 1/64ths degree, Qt usings 1/16th setPen(col).drawArc(x, y, w, h, a1 / 4, a2 / 4); diff --git a/src/frontends/qt2/QLPainter.h b/src/frontends/qt2/QLPainter.h index ff3fc3d4fb..e24a56335b 100644 --- a/src/frontends/qt2/QLPainter.h +++ b/src/frontends/qt2/QLPainter.h @@ -45,7 +45,7 @@ public: virtual Painter & line( int x1, int y1, int x2, int y2, - EnumLColor, + LColor_color, line_style = line_solid, line_width = line_thin); @@ -59,7 +59,7 @@ public: int const * xp, int const * yp, int np, - EnumLColor, + LColor_color, line_style = line_solid, line_width = line_thin); @@ -67,7 +67,7 @@ public: virtual Painter & rectangle( int x, int y, int w, int h, - EnumLColor, + LColor_color, line_style = line_solid, line_width = line_thin); @@ -75,26 +75,26 @@ public: virtual Painter & fillRectangle( int x, int y, int w, int h, - EnumLColor); + LColor_color); /// draw a filled (irregular) polygon virtual Painter & fillPolygon( int const * xp, int const * yp, int np, - EnumLColor); + LColor_color); /// draw an arc virtual Painter & arc( int x, int y, unsigned int w, unsigned int h, int a1, int a2, - EnumLColor); + LColor_color); /// draw a pixel virtual Painter & point( int x, int y, - EnumLColor); + LColor_color); /// draw an image from the image cache virtual Painter & image(int x, int y, @@ -121,7 +121,7 @@ private: QString const & str, LyXFont const & f); /// set pen parameters - QPainter & setPen(EnumLColor c, + QPainter & setPen(LColor_color c, line_style ls = line_solid, line_width lw = line_thin); diff --git a/src/frontends/qt2/QPrefsDialog.h b/src/frontends/qt2/QPrefsDialog.h index a99dfd58a9..2f1afcc6d6 100644 --- a/src/frontends/qt2/QPrefsDialog.h +++ b/src/frontends/qt2/QPrefsDialog.h @@ -17,7 +17,7 @@ #include -class EnumLColor; +class LColor_color; class QPrefs; class QPrefAsciiModule; class QPrefDateModule; @@ -83,7 +83,7 @@ protected: private: - std::vector colors_; + std::vector colors_; QPrefAsciiModule * asciiModule; QPrefDateModule * dateModule; diff --git a/src/frontends/qt2/lcolorcache.C b/src/frontends/qt2/lcolorcache.C index 9e128ad04b..f7cd8a2729 100644 --- a/src/frontends/qt2/lcolorcache.C +++ b/src/frontends/qt2/lcolorcache.C @@ -22,7 +22,7 @@ LColorCache::LColorCache() } -QColor const & LColorCache::get(EnumLColor col) const +QColor const & LColorCache::get(LColor_color col) const { lcolor_map::const_iterator cit = colormap.find(col); if (cit != colormap.end()) diff --git a/src/frontends/qt2/lcolorcache.h b/src/frontends/qt2/lcolorcache.h index 60ee45ff30..90d384ccd9 100644 --- a/src/frontends/qt2/lcolorcache.h +++ b/src/frontends/qt2/lcolorcache.h @@ -17,7 +17,7 @@ #include -class EnumLColor; +class LColor_color; // FIXME: use a fixed-size array not a map ? @@ -30,13 +30,13 @@ public: LColorCache(); /// get the given color - QColor const & get(EnumLColor color) const; + QColor const & get(LColor_color color) const; /// clear all colors void clear(); private: - typedef std::map lcolor_map; + typedef std::map lcolor_map; mutable lcolor_map colormap; }; diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt2/lyx_gui.C index d39173d205..8139691036 100644 --- a/src/frontends/qt2/lyx_gui.C +++ b/src/frontends/qt2/lyx_gui.C @@ -193,13 +193,13 @@ FuncStatus getStatus(FuncRequest const & ev) } -string const hexname(EnumLColor col) +string const hexname(LColor_color col) { return ltrim(fromqstr(lcolorcache.get(col).name()), "#"); } -void update_color(EnumLColor) +void update_color(LColor_color) { // FIXME: Bleh, can't we just clear them all at once ? lcolorcache.clear(); diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index cb3b3440a8..da55eb7d57 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,14 @@ +2003-09-18 Angus Leeming + + * Color.C: + * Color.h: + * ColorHandler.C: + * ColorHandler.h: + * FormCharacter.h: + * XPainter.C: + * XPainter.h: + * lyx_gui.C: rename EnumLColor as LColor_color. + 2003-09-16 Angus Leeming * xformsImage.[Ch]: separate interface from implementation. Make all the virtual diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C index 8b688d4734..03aed496ae 100644 --- a/src/frontends/xforms/Color.C +++ b/src/frontends/xforms/Color.C @@ -50,7 +50,7 @@ int hexstrToInt(string const & str) -bool getRGBColor(EnumLColor col, +bool getRGBColor(LColor_color col, unsigned int & r, unsigned int & g, unsigned int & b) { string const name = lcolor.getX11Name(col); diff --git a/src/frontends/xforms/Color.h b/src/frontends/xforms/Color.h index 6216e5cefd..79979b7f03 100644 --- a/src/frontends/xforms/Color.h +++ b/src/frontends/xforms/Color.h @@ -20,13 +20,13 @@ #include "support/std_string.h" -class EnumLColor; +class LColor_color; /** Given col, fills r, g, b in the range 0-255. The function returns true if successful. It returns false on failure and sets r, g, b to 0. */ -bool getRGBColor(EnumLColor col, +bool getRGBColor(LColor_color col, unsigned int & r, unsigned int & g, unsigned int & b); struct RGBColor; diff --git a/src/frontends/xforms/ColorHandler.C b/src/frontends/xforms/ColorHandler.C index 8467928860..fcc38a859f 100644 --- a/src/frontends/xforms/ColorHandler.C +++ b/src/frontends/xforms/ColorHandler.C @@ -77,7 +77,7 @@ LyXColorHandler::~LyXColorHandler() } -unsigned long LyXColorHandler::colorPixel(EnumLColor c) +unsigned long LyXColorHandler::colorPixel(LColor_color c) { XGCValues val; XGetGCValues(display, getGCForeground(c), GCForeground, &val); @@ -163,7 +163,7 @@ GC LyXColorHandler::getGCForeground(string const & s) // Gets GC according to color // Uses caching -GC LyXColorHandler::getGCForeground(EnumLColor c) +GC LyXColorHandler::getGCForeground(LColor_color c) { if (static_cast(c) >= colorGCcache.size()) { colorGCcache.resize(c + 1, 0); @@ -188,7 +188,7 @@ GC LyXColorHandler::getGCForeground(EnumLColor c) // Gets GC for line GC LyXColorHandler::getGCLinepars(Painter::line_style ls, - Painter::line_width lw, EnumLColor c) + Painter::line_width lw, LColor_color c) { //if (lyxerr.debugging()) { // lyxerr << "Painter drawable: " << drawable() << endl; @@ -234,7 +234,7 @@ GC LyXColorHandler::getGCLinepars(Painter::line_style ls, // update GC cache after color redefinition -void LyXColorHandler::updateColor (EnumLColor c) +void LyXColorHandler::updateColor (LColor_color c) { // color GC cache GC gc = colorGCcache[c]; diff --git a/src/frontends/xforms/ColorHandler.h b/src/frontends/xforms/ColorHandler.h index f1acce0b47..625246310d 100644 --- a/src/frontends/xforms/ColorHandler.h +++ b/src/frontends/xforms/ColorHandler.h @@ -22,7 +22,7 @@ // This is only included to provide stuff for the non-public sections #include -class EnumLColor; +class LColor_color; class LyXFont; /** @@ -36,14 +36,14 @@ public: /// ~LyXColorHandler(); /// - unsigned long colorPixel(EnumLColor c); + unsigned long colorPixel(LColor_color c); /// - GC getGCForeground(EnumLColor c); + GC getGCForeground(LColor_color c); /// GC getGCLinepars(Painter::line_style, - Painter::line_width, EnumLColor c); + Painter::line_width, LColor_color c); /// update the cache after a color definition change - void updateColor(EnumLColor c); + void updateColor(LColor_color c); private: /// diff --git a/src/frontends/xforms/FormCharacter.h b/src/frontends/xforms/FormCharacter.h index a66c85d2a1..76cca5bb79 100644 --- a/src/frontends/xforms/FormCharacter.h +++ b/src/frontends/xforms/FormCharacter.h @@ -16,7 +16,7 @@ #include "FormDialogView.h" #include "ControlCharacter.h" // for ControlCharacter enum -struct EnumLColor; +struct LColor_color; struct FD_character; /** @@ -54,7 +54,7 @@ private: /// std::vector bar_; /// - std::vector color_; + std::vector color_; /// std::vector lang_; }; diff --git a/src/frontends/xforms/XPainter.C b/src/frontends/xforms/XPainter.C index dc762f7cfe..1c48f846ad 100644 --- a/src/frontends/xforms/XPainter.C +++ b/src/frontends/xforms/XPainter.C @@ -49,7 +49,7 @@ int XPainter::paperHeight() const } -Painter & XPainter::point(int x, int y, EnumLColor c) +Painter & XPainter::point(int x, int y, LColor_color c) { XDrawPoint(fl_get_display(), owner_.getPixmap(), lyxColorHandler->getGCForeground(c), x, y); @@ -59,7 +59,7 @@ Painter & XPainter::point(int x, int y, EnumLColor c) Painter & XPainter::line(int x1, int y1, int x2, int y2, - EnumLColor col, + LColor_color col, line_style ls, line_width lw) { @@ -72,7 +72,7 @@ Painter & XPainter::line(int x1, int y1, Painter & XPainter::lines(int const * xp, int const * yp, int np, - EnumLColor col, + LColor_color col, line_style ls, line_width lw) { @@ -93,7 +93,7 @@ Painter & XPainter::lines(int const * xp, int const * yp, Painter & XPainter::rectangle(int x, int y, int w, int h, - EnumLColor col, + LColor_color col, line_style ls, line_width lw) { @@ -106,7 +106,7 @@ Painter & XPainter::rectangle(int x, int y, Painter & XPainter::fillRectangle(int x, int y, int w, int h, - EnumLColor col) + LColor_color col) { XFillRectangle(fl_get_display(), owner_.getPixmap(), lyxColorHandler->getGCForeground(col), x, y, w, h); @@ -115,7 +115,7 @@ Painter & XPainter::fillRectangle(int x, int y, Painter & XPainter::fillPolygon(int const * xp, int const * yp, - int np, EnumLColor col) + int np, LColor_color col) { boost::scoped_array points(new XPoint[np]); @@ -134,7 +134,7 @@ Painter & XPainter::fillPolygon(int const * xp, int const * yp, Painter & XPainter::arc(int x, int y, unsigned int w, unsigned int h, - int a1, int a2, EnumLColor col) + int a1, int a2, LColor_color col) { XDrawArc(fl_get_display(), owner_.getPixmap(), lyxColorHandler->getGCForeground(col), diff --git a/src/frontends/xforms/XPainter.h b/src/frontends/xforms/XPainter.h index ba1d8e602b..d5473486d5 100644 --- a/src/frontends/xforms/XPainter.h +++ b/src/frontends/xforms/XPainter.h @@ -38,7 +38,7 @@ public: virtual Painter & line( int x1, int y1, int x2, int y2, - EnumLColor, + LColor_color, line_style = line_solid, line_width = line_thin); @@ -52,7 +52,7 @@ public: int const * xp, int const * yp, int np, - EnumLColor, + LColor_color, line_style = line_solid, line_width = line_thin); @@ -60,7 +60,7 @@ public: virtual Painter & rectangle( int x, int y, int w, int h, - EnumLColor, + LColor_color, line_style = line_solid, line_width = line_thin); @@ -68,26 +68,26 @@ public: virtual Painter & fillRectangle( int x, int y, int w, int h, - EnumLColor); + LColor_color); /// draw a filled (irregular) polygon virtual Painter & fillPolygon( int const * xp, int const * yp, int np, - EnumLColor); + LColor_color); /// draw an arc virtual Painter & arc( int x, int y, unsigned int w, unsigned int h, int a1, int a2, - EnumLColor); + LColor_color); /// draw a pixel virtual Painter & point( int x, int y, - EnumLColor); + LColor_color); /// draw an image from the image cache virtual Painter & image(int x, int y, diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C index 52326b410e..6ad47a3afc 100644 --- a/src/frontends/xforms/lyx_gui.C +++ b/src/frontends/xforms/lyx_gui.C @@ -332,7 +332,7 @@ FuncStatus getStatus(FuncRequest const & /*ev*/) return FuncStatus(); } -string const hexname(EnumLColor col) +string const hexname(LColor_color col) { unsigned int r, g, b; bool const success = getRGBColor(col, r, g, b); @@ -353,7 +353,7 @@ string const hexname(EnumLColor col) } -void update_color(EnumLColor col) +void update_color(LColor_color col) { lyxColorHandler->updateColor(col); } diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index ec1d6a81c4..d84a0548ef 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,10 @@ +2003-09-18 Angus Leeming + + * inset.C: + * inset.h: + * insettext.C: + * insettext.h: rename EnumLColor as LColor_color. + 2003-09-18 Angus Leeming * inset.h: add the InsetOld::Code wrapper class InsetOld_code. diff --git a/src/insets/inset.C b/src/insets/inset.C index eaa9ac769e..8b8aa3def7 100644 --- a/src/insets/inset.C +++ b/src/insets/inset.C @@ -85,13 +85,13 @@ LyXText * InsetOld::getLyXText(BufferView const * bv, bool /*recursive*/) const } -void InsetOld::setBackgroundColor(EnumLColor color) +void InsetOld::setBackgroundColor(LColor_color color) { background_color_ = color; } -EnumLColor InsetOld::backgroundColor() const +LColor_color InsetOld::backgroundColor() const { if (background_color_ == LColor::inherit) { if (owner()) diff --git a/src/insets/inset.h b/src/insets/inset.h index 2a7c886243..94b2b47783 100644 --- a/src/insets/inset.h +++ b/src/insets/inset.h @@ -20,7 +20,7 @@ #include "ParagraphList_fwd.h" class Buffer; -class EnumLColor; +class LColor_color; class FuncRequest; class LatexRunParams; class LyXCursor; @@ -204,9 +204,9 @@ public: /// UpdatableInset * owner() const { return owner_; } /// - void setBackgroundColor(EnumLColor); + void setBackgroundColor(LColor_color); /// - EnumLColor backgroundColor() const; + LColor_color backgroundColor() const; /// int x() const { return top_x; } /// diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 435f4c4318..83b8baeb8d 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -1452,13 +1452,13 @@ void InsetText::setDrawFrame(DrawFrame how) } -EnumLColor InsetText::frameColor() const +LColor_color InsetText::frameColor() const { return LColor::color(frame_color_); } -void InsetText::setFrameColor(EnumLColor col) +void InsetText::setFrameColor(LColor_color col) { frame_color_ = col; } diff --git a/src/insets/insettext.h b/src/insets/insettext.h index d1079994fb..d110d619cf 100644 --- a/src/insets/insettext.h +++ b/src/insets/insettext.h @@ -27,7 +27,7 @@ class Buffer; class BufferParams; class BufferView; class Dimension; -class EnumLColor; +class LColor_color; class LyXCursor; class Painter; class Paragraph; @@ -128,8 +128,8 @@ public: /// void setDrawFrame(DrawFrame); /// - EnumLColor frameColor() const; - void setFrameColor(EnumLColor); + LColor_color frameColor() const; + void setFrameColor(LColor_color); /// LyXText * getLyXText(BufferView const *, bool const recursive = false) const; diff --git a/src/lyxfont.C b/src/lyxfont.C index 4dfe32f320..18bdaea92c 100644 --- a/src/lyxfont.C +++ b/src/lyxfont.C @@ -203,7 +203,7 @@ LyXFont::FONT_MISC_STATE LyXFont::underbar() const } -EnumLColor LyXFont::color() const +LColor_color LyXFont::color() const { return LColor::color(bits.color); } @@ -276,7 +276,7 @@ void LyXFont::setNoun(LyXFont::FONT_MISC_STATE n) } -void LyXFont::setColor(EnumLColor c) +void LyXFont::setColor(LColor_color c) { bits.color = int(c); } @@ -921,7 +921,7 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base, } -EnumLColor LyXFont::realColor() const +LColor_color LyXFont::realColor() const { if (color() == LColor::none) return LColor::foreground; diff --git a/src/lyxfont.h b/src/lyxfont.h index f407257baf..1706ea2ab0 100644 --- a/src/lyxfont.h +++ b/src/lyxfont.h @@ -18,7 +18,7 @@ #include "support/std_string.h" #include -class EnumLColor; +class LColor_color; class LyXLex; class BufferParams; class Language; @@ -206,7 +206,7 @@ public: FONT_MISC_STATE number() const; /// - EnumLColor color() const; + LColor_color color() const; /// Language const * language() const; @@ -229,7 +229,7 @@ public: void setUnderbar(LyXFont::FONT_MISC_STATE u); void setNoun(LyXFont::FONT_MISC_STATE n); void setNumber(LyXFont::FONT_MISC_STATE n); - void setColor(EnumLColor c); + void setColor(LColor_color c); void setLanguage(Language const * l); /// Set family after LyX text format @@ -300,7 +300,7 @@ public: string const stateText(BufferParams * params) const; /// - EnumLColor realColor() const; + LColor_color realColor() const; /// friend diff --git a/src/lyxtext.h b/src/lyxtext.h index e536a1aefb..4561c55c69 100644 --- a/src/lyxtext.h +++ b/src/lyxtext.h @@ -27,7 +27,7 @@ class Buffer; class BufferParams; class BufferView; class Dimension; -class EnumLColor; +class LColor_color; class InsetText; class LyXCursor; class MetricsInfo; @@ -399,7 +399,7 @@ public: lyx::pos_type pos, char c, LyXFont const & Font) const; /// return the color of the canvas - EnumLColor backgroundColor() const; + LColor_color backgroundColor() const; /// mutable bool bidi_same_direction; diff --git a/src/text.C b/src/text.C index 6088af6a85..8069b925bc 100644 --- a/src/text.C +++ b/src/text.C @@ -878,7 +878,7 @@ int LyXText::labelFill(ParagraphList::iterator pit, Row const & row) const } -EnumLColor LyXText::backgroundColor() const +LColor_color LyXText::backgroundColor() const { if (inset_owner) return inset_owner->backgroundColor(); -- 2.39.2