From 5f5e05347d4898766d1c06c41c6c56e23b71bcd7 Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Sun, 15 Mar 2009 22:18:20 +0100
Subject: move CssPropertyInfo definition to cssparser.cc

---
 src/css.cc       |  3 ++-
 src/cssparser.cc | 11 +++++++++++
 src/cssparser.hh |  9 +--------
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/css.cc b/src/css.cc
index 627f221d..ef2f7af0 100644
--- a/src/css.cc
+++ b/src/css.cc
@@ -20,7 +20,8 @@
 using namespace dw::core::style;
 
 void CssProperty::print () {
-   fprintf (stderr, "%s - %d\n", Css_property_info[name].symbol, value.intVal);
+   fprintf (stderr, "%s - %d\n",
+            CssParser::propertyNameString((CssPropertyName) name), value.intVal);
 }
 
 CssPropertyList::~CssPropertyList () {
diff --git a/src/cssparser.cc b/src/cssparser.cc
index 876c6301..8910bdcd 100644
--- a/src/cssparser.cc
+++ b/src/cssparser.cc
@@ -42,6 +42,12 @@ using namespace dw::core::style;
    (CSS_PROPERTY_LAST - CSS_NUM_INTERNAL_PROPERTIES)
 
 
+typedef struct {
+   const char *symbol;
+   const CssValueType type[3];
+   const char *const *enum_symbols;
+} CssPropertyInfo;
+
 static const char *const Css_border_style_enum_vals[] = {
    "none", "hidden", "dotted", "dashed", "solid", "double", "groove",
    "ridge", "inset", "outset", NULL
@@ -1191,6 +1197,11 @@ void CssParser::parseRuleset()
       nextToken();
 }
 
+const char * CssParser::propertyNameString(CssPropertyName name)
+{
+   return Css_property_info[name].symbol;
+}
+
 void CssParser::parse(CssContext * context,
                       const char *buf,
                       int buflen, CssOrigin origin)
diff --git a/src/cssparser.hh b/src/cssparser.hh
index 8e29d303..e28516a6 100644
--- a/src/cssparser.hh
+++ b/src/cssparser.hh
@@ -3,14 +3,6 @@
 
 #include "css.hh"
 
-typedef struct {
-   const char *symbol;
-   const CssValueType type[3];
-   const char *const *enum_symbols;
-} CssPropertyInfo;
-
-extern const CssPropertyInfo Css_property_info[CSS_PROPERTY_LAST];
-
 class CssParser {
    private:
       typedef enum {
@@ -49,6 +41,7 @@ class CssParser {
       static CssPropertyList *parseDeclarationBlock(const char *buf, int buflen);
       static void parse(CssContext *context, const char *buf, int buflen,
                         CssOrigin origin);
+      static const char *propertyNameString(CssPropertyName name);
 };
 
 #endif
-- 
cgit v1.2.3