Commit b7d9cf3f authored by Dirk Mueller's avatar Dirk Mueller
Browse files

christmas hacking: cleanups, fixes, improved DOM2 compatibility,

more performant namespace handling, performance improvements,
starting to change the things like discussed with Lars

svn path=/trunk/kdelibs/; revision=128829
parent d35c270b
......@@ -17,18 +17,9 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
#AM_CXXFLAGS += -DTABLE_DEBUG
#AM_CXXFLAGS += -DDEBUG_LAYOUT
#AM_CXXFLAGS += -DDEBUG_EVENTS
#AM_CXXFLAGS += -DTOKEN_DEBUG
#AM_CXXFLAGS += -DPARSER_DEBUG
#AM_CXXFLAGS += -DCACHE_DEBUG
KDE_CXXFLAGS = -UQT_NO_COMPAT
SUBDIRS = misc dom css xml html rendering pics @DOJAVA@ . ecma
SUBDIRS = misc dom css xml html rendering pics $(DOJAVA) ecma .
lib_LTLIBRARIES = libkhtml.la libkhtmlimage.la
libkhtml_la_SOURCES = khtmlview.cpp khtml_part.cpp khtml_run.cpp khtml_factory.cpp khtml_settings.cc \
......@@ -44,7 +35,7 @@ noinst_HEADERS = design.h testkhtml.h testrender.h test_regression.h khtml_find.
libkhtml_la_LDFLAGS = -version-info 4:0 -module -no-undefined $(all_libraries)
libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
./rendering/libkhtmlrender.la ./css/libkhtmlcss.la \
./misc/libkhtmlmisc.la ./dom/libkhtmldom.la @LIBKJAVA@ \
./misc/libkhtmlmisc.la ./dom/libkhtmldom.la $(LIBKJAVA) \
../kio/libkio.la \
$(top_builddir)/kparts/libkparts.la \
$(top_builddir)/kfile/libkfile.la \
......
......@@ -17,7 +17,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
KDE_CXXFLAGS = -UQT_NO_COMPAT
KDE_CXXFLAGS = $(WOVERLOADED_VIRTUAL)
noinst_LTLIBRARIES = libkhtmlcss.la
libkhtmlcss_la_SOURCES = \
......@@ -33,10 +33,7 @@ noinst_HEADERS = \
cssstyleselector.h csshelper.h
INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
-I$(top_srcdir)/khtml -I$(top_srcdir)/khtml/misc -I$(top_srcdir)/khtml/css \
-I$(top_srcdir)/khtml/dom -I$(top_srcdir)/khtml/xml -I$(top_srcdir)/khtml/html \
-I$(top_srcdir)/libltdl -I$(top_srcdir) $(all_includes)
-I$(top_srcdir)/khtml -I$(top_srcdir)/libltdl -I$(top_srcdir) $(all_includes)
cssdir = $(kde_datadir)/khtml/css
css_DATA = html4.css
......
......@@ -17,21 +17,20 @@
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
* $Id$
*/
#include "css_ruleimpl.h"
#include "css_rule.h"
#include "css_stylesheet.h"
#include "css_stylesheetimpl.h"
#include "css_valueimpl.h"
#include "cssparser.h"
#include "dom/css_rule.h"
#include "dom/css_stylesheet.h"
#include "dom/dom_exception.h"
#include "dom/dom_string.h"
#include "css/css_stylesheetimpl.h"
#include "css/css_valueimpl.h"
#include "css/cssparser.h"
#include "css/css_ruleimpl.h"
#include "misc/loader.h"
#include "xml/dom_docimpl.h"
#include "dom_exception.h"
#include "dom_string.h"
using namespace DOM;
#include <kdebug.h>
......@@ -360,7 +359,7 @@ bool CSSStyleRuleImpl::parseString( const DOMString &/*string*/, bool )
return false;
}
void CSSStyleRuleImpl::setSelector( QList<CSSSelector> *selector)
void CSSStyleRuleImpl::setSelector( QPtrList<CSSSelector> *selector)
{
m_selector = selector;
}
......
......@@ -23,11 +23,9 @@
#ifndef _CSS_css_ruleimpl_h_
#define _CSS_css_ruleimpl_h_
#include <dom_string.h>
//#include <css_stylesheetimpl.h>
#include <css_rule.h>
#include "cssparser.h"
#include "dom/dom_string.h"
#include "dom/css_rule.h"
#include "css/cssparser.h"
#include "misc/loader_client.h"
namespace khtml {
......@@ -195,7 +193,7 @@ public:
CSSStyleDeclarationImpl *declaration() { return m_style; }
void setNonCSSHints();
protected:
CSSStyleDeclarationImpl *m_style;
QPtrList<CSSSelector> *m_selector;
......@@ -222,11 +220,11 @@ public:
unsigned long length() const;
CSSRuleImpl *item ( unsigned long index );
/* not part of the DOM */
unsigned long insertRule ( CSSRuleImpl *rule, unsigned long index );
void deleteRule ( unsigned long index );
protected:
QPtrList<CSSRuleImpl> m_lstCSSRules;
};
......
......@@ -23,18 +23,18 @@
//#define CSS_STYLESHEET_DEBUG
#include "css_stylesheetimpl.h"
#include "css_stylesheet.h"
#include "css_rule.h"
#include "css_ruleimpl.h"
#include "css_valueimpl.h"
#include "cssparser.h"
#include "dom_string.h"
#include "dom_exception.h"
#include "dom_nodeimpl.h"
#include "html_documentimpl.h"
#include "dom/dom_string.h"
#include "dom/dom_exception.h"
#include "dom/css_stylesheet.h"
#include "dom/css_rule.h"
#include "css/css_ruleimpl.h"
#include "css/css_valueimpl.h"
#include "css/cssparser.h"
#include "css/css_stylesheetimpl.h"
#include "xml/dom_nodeimpl.h"
#include "html/html_documentimpl.h"
#include "misc/loader.h"
#include <kdebug.h>
......@@ -125,7 +125,7 @@ void StyleSheetImpl::setMedia( MediaListImpl *media )
m_media->deref();
m_media = media;
if( m_media )
m_media->ref();
m_media->ref();
}
// -----------------------------------------------------------------------
......@@ -134,7 +134,7 @@ void StyleSheetImpl::setMedia( MediaListImpl *media )
CSSStyleSheetImpl::CSSStyleSheetImpl(CSSStyleSheetImpl *parentSheet, DOMString href)
: StyleSheetImpl(parentSheet, href)
{
m_lstChildren = new QList<StyleBaseImpl>;
m_lstChildren = new QPtrList<StyleBaseImpl>;
m_doc = 0;
m_implicit = false;
}
......@@ -142,7 +142,7 @@ CSSStyleSheetImpl::CSSStyleSheetImpl(CSSStyleSheetImpl *parentSheet, DOMString h
CSSStyleSheetImpl::CSSStyleSheetImpl(DOM::NodeImpl *parentNode, DOMString href, bool _implicit)
: StyleSheetImpl(parentNode, href)
{
m_lstChildren = new QList<StyleBaseImpl>;
m_lstChildren = new QPtrList<StyleBaseImpl>;
m_doc = parentNode->nodeType() == Node::DOCUMENT_NODE ? static_cast<DocumentImpl*>(parentNode) : m_doc = parentNode->ownerDocument();
m_implicit = _implicit;
}
......@@ -150,7 +150,7 @@ CSSStyleSheetImpl::CSSStyleSheetImpl(DOM::NodeImpl *parentNode, DOMString href,
CSSStyleSheetImpl::CSSStyleSheetImpl(CSSRuleImpl *ownerRule, DOMString href)
: StyleSheetImpl(ownerRule, href)
{
m_lstChildren = new QList<StyleBaseImpl>;
m_lstChildren = new QPtrList<StyleBaseImpl>;
m_doc = 0;
m_implicit = false;
}
......@@ -158,7 +158,7 @@ CSSStyleSheetImpl::CSSStyleSheetImpl(CSSRuleImpl *ownerRule, DOMString href)
CSSStyleSheetImpl::CSSStyleSheetImpl(DOM::NodeImpl *parentNode, CSSStyleSheetImpl *orig)
: StyleSheetImpl(parentNode, orig->m_strHref)
{
m_lstChildren = new QList<StyleBaseImpl>;
m_lstChildren = new QPtrList<StyleBaseImpl>;
StyleBaseImpl *rule;
for ( rule = orig->m_lstChildren->first(); rule != 0; rule = orig->m_lstChildren->next() )
{
......@@ -172,7 +172,7 @@ CSSStyleSheetImpl::CSSStyleSheetImpl(DOM::NodeImpl *parentNode, CSSStyleSheetImp
CSSStyleSheetImpl::CSSStyleSheetImpl(CSSRuleImpl *ownerRule, CSSStyleSheetImpl *orig)
: StyleSheetImpl(ownerRule, orig->m_strHref)
{
m_lstChildren = new QList<StyleBaseImpl>;
m_lstChildren = new QPtrList<StyleBaseImpl>;
StyleBaseImpl *rule;
for ( rule = orig->m_lstChildren->first(); rule != 0; rule = orig->m_lstChildren->next() )
{
......@@ -321,7 +321,7 @@ StyleSheetListImpl::StyleSheetListImpl()
StyleSheetListImpl::~StyleSheetListImpl()
{
for ( QListIterator<StyleSheetImpl> it ( styleSheets ); it.current(); ++it )
for ( QPtrListIterator<StyleSheetImpl> it ( styleSheets ); it.current(); ++it )
it.current()->deref();
}
......@@ -343,7 +343,7 @@ unsigned long StyleSheetListImpl::length() const
{
// hack so implicit BODY stylesheets don't get counted here
unsigned long l = 0;
QListIterator<StyleSheetImpl> it(styleSheets);
QPtrListIterator<StyleSheetImpl> it(styleSheets);
for (; it.current(); ++it) {
if (!it.current()->isCSSStyleSheet() || !static_cast<CSSStyleSheetImpl*>(it.current())->implicit())
l++;
......@@ -354,7 +354,7 @@ unsigned long StyleSheetListImpl::length() const
StyleSheetImpl *StyleSheetListImpl::item ( unsigned long index )
{
unsigned long l = 0;
QListIterator<StyleSheetImpl> it(styleSheets);
QPtrListIterator<StyleSheetImpl> it(styleSheets);
for (; it.current(); ++it) {
if (!it.current()->isCSSStyleSheet() || !static_cast<CSSStyleSheetImpl*>(it.current())->implicit()) {
if (l == index)
......
......@@ -24,14 +24,12 @@
#define _CSS_css_stylesheetimpl_h_
#include <qvaluelist.h>
#include <qptrlist.h>
#include <dom_string.h>
#include "cssparser.h"
#include "dom/dom_string.h"
#include "css/cssparser.h"
#include "misc/loader_client.h"
#include <qlist.h>
namespace khtml {
class CachedCSSStyleSheet;
class DocLoader;
......
......@@ -17,25 +17,25 @@
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
* $Id$
*/
#include "css_valueimpl.h"
#include "css_value.h"
#include "css_ruleimpl.h"
#include "css_stylesheetimpl.h"
#include "cssparser.h"
#include "dom_exception.h"
#include "dom_string.h"
#include "dom_stringimpl.h"
#include "dom_nodeimpl.h"
#include "dom/css_value.h"
#include "dom/dom_exception.h"
#include "dom/dom_string.h"
#include "css/css_valueimpl.h"
#include "css/css_ruleimpl.h"
#include "css/css_stylesheetimpl.h"
#include "css/cssparser.h"
#include "css/cssvalues.h"
#include "xml/dom_stringimpl.h"
#include "xml/dom_nodeimpl.h"
#include "misc/loader.h"
#include <kdebug.h>
#include "cssvalues.h"
// Hack for debugging purposes
extern DOM::DOMString getPropertyName(unsigned short id);
......@@ -48,7 +48,7 @@ CSSStyleDeclarationImpl::CSSStyleDeclarationImpl(CSSRuleImpl *parent)
m_node = 0;
}
CSSStyleDeclarationImpl::CSSStyleDeclarationImpl(CSSRuleImpl *parent, QList<CSSProperty> *lstValues)
CSSStyleDeclarationImpl::CSSStyleDeclarationImpl(CSSRuleImpl *parent, QPtrList<CSSProperty> *lstValues)
: StyleBaseImpl(parent)
{
m_lstValues = lstValues;
......@@ -99,7 +99,7 @@ CSSValueImpl *CSSStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
bool CSSStyleDeclarationImpl::removeProperty( int propertyID, bool onlyNonCSSHints )
{
QListIterator<CSSProperty> lstValuesIt(*m_lstValues);
QPtrListIterator<CSSProperty> lstValuesIt(*m_lstValues);
lstValuesIt.toLast();
while (lstValuesIt.current() &&
( lstValuesIt.current()->m_id != propertyID || onlyNonCSSHints != lstValuesIt.current()->nonCSSHint) )
......@@ -127,7 +127,7 @@ DOMString CSSStyleDeclarationImpl::removeProperty(int id)
if(!m_lstValues) return DOMString();
DOMString value;
QListIterator<CSSProperty> lstValuesIt(*m_lstValues);
QPtrListIterator<CSSProperty> lstValuesIt(*m_lstValues);
lstValuesIt.toLast();
while (lstValuesIt.current() && lstValuesIt.current()->m_id != id)
--lstValuesIt;
......@@ -185,7 +185,7 @@ void CSSStyleDeclarationImpl::setProperty(const DOMString &propName, const DOMSt
void CSSStyleDeclarationImpl::setProperty(int id, const DOMString &value, bool important, bool nonCSSHint)
{
if(!m_lstValues) {
m_lstValues = new QList<CSSProperty>;
m_lstValues = new QPtrList<CSSProperty>;
m_lstValues->setAutoDelete(true);
}
if ( !removeProperty(id, nonCSSHint ) )
......@@ -204,7 +204,7 @@ void CSSStyleDeclarationImpl::setProperty(int id, const DOMString &value, bool i
void CSSStyleDeclarationImpl::setProperty(int id, int value, bool important, bool nonCSSHint)
{
if(!m_lstValues) {
m_lstValues = new QList<CSSProperty>;
m_lstValues = new QPtrList<CSSProperty>;
m_lstValues->setAutoDelete(true);
}
if ( !removeProperty(id, nonCSSHint ) )
......@@ -220,7 +220,7 @@ void CSSStyleDeclarationImpl::setProperty(int id, int value, bool important, boo
void CSSStyleDeclarationImpl::setProperty ( const DOMString &propertyString)
{
DOMString ppPropertyString = preprocess(propertyString.string(),true);
QList<CSSProperty> *props = parseProperties(ppPropertyString.unicode(),
QPtrList<CSSProperty> *props = parseProperties(ppPropertyString.unicode(),
ppPropertyString.unicode()+ppPropertyString.length());
if(!props || !props->count())
{
......@@ -232,7 +232,7 @@ void CSSStyleDeclarationImpl::setProperty ( const DOMString &propertyString)
unsigned int i = 0;
if(!m_lstValues) {
m_lstValues = new QList<CSSProperty>;
m_lstValues = new QPtrList<CSSProperty>;
m_lstValues->setAutoDelete( true );
}
while(i < props->count())
......
......@@ -23,9 +23,9 @@
#ifndef _CSS_css_valueimpl_h_
#define _CSS_css_valueimpl_h_
#include <css_value.h>
#include "dom_string.h"
#include "cssparser.h"
#include "dom/css_value.h"
#include "dom/dom_string.h"
#include "css/cssparser.h"
#include "misc/loader_client.h"
#include <qintdict.h>
......
......@@ -24,23 +24,24 @@
* $Id$
*/
//#define CSS_DEBUG
#define CSS_DEBUG
//#define CSS_AURAL
//#define CSS_DEBUG_BCKGR
#include <assert.h>
#include "css_stylesheetimpl.h"
#include "css_stylesheet.h"
#include "css_rule.h"
#include "css_ruleimpl.h"
#include "css_valueimpl.h"
#include "csshelper.h"
#include "css/css_stylesheetimpl.h"
#include "css/css_ruleimpl.h"
#include "css/css_valueimpl.h"
#include "css/csshelper.h"
#include "dom/css_stylesheet.h"
#include "dom/css_rule.h"
#include "dom/dom_string.h"
#include "dom/dom_exception.h"
#include "dom_string.h"
#include "xml/dom_nodeimpl.h"
#include "html/html_documentimpl.h"
#include "dom_exception.h"
#include "khtml_part.h"
#include "khtmlview.h"
......@@ -51,7 +52,7 @@ using namespace DOM;
#include <kglobalsettings.h> // For system fonts
#include <kapplication.h>
#include "htmlhashes.h"
#include "misc/htmlhashes.h"
#include "misc/helper.h"
//
......@@ -501,21 +502,15 @@ StyleBaseImpl::parseSelector2(const QChar *curP, const QChar *endP,
root = root->parent();
if (root->isCSSStyleSheet())
doc = static_cast<CSSStyleSheetImpl*>(root)->doc();
if ( doc && !doc->isHTMLDocument() ) {
const DOMString s = tag;
cs->tag = doc->cssTagId(s.implementation());
}
else {
int tagID = khtml::getTagID(tag.lower().ascii(), tag.length());
if (tagID) {
cs->tag = tagID;
} else if (doc && !(tag.isEmpty())) {
const DOMString s = tag;
cs->tag = doc->cssTagId(s.implementation());
} else {
kdWarning() << "Error in CSS" << endl;
}
if ( doc ) {
if (doc->isHTMLDocument())
tag = tag.lower();
const DOMString dtag(tag);
cs->tag = doc->tagId(dtag.implementation(), 0);
}
else
cs->tag = khtml::getTagID(tag.lower().ascii(), tag.length());
}
}
#ifdef CSS_DEBUG
......@@ -607,14 +602,14 @@ StyleBaseImpl::parseSelector1(const QChar *curP, const QChar *endP)
return(selecStack);
}
QList<CSSSelector> *
QPtrList<CSSSelector> *
StyleBaseImpl::parseSelector(const QChar *curP, const QChar *endP)
{
#ifdef CSS_DEBUG
kdDebug( 6080 ) << "selector is \'" << QString(curP, endP-curP) << "\'" << endl;
#endif
QList<CSSSelector> *slist = 0;
QPtrList<CSSSelector> *slist = 0;
const QChar *startP;
while (curP < endP)
......@@ -629,7 +624,7 @@ StyleBaseImpl::parseSelector(const QChar *curP, const QChar *endP)
{
if (!slist)
{
slist = new QList<CSSSelector>;
slist = new QPtrList<CSSSelector>;
slist->setAutoDelete(true);
}
slist->append(selector);
......@@ -734,9 +729,9 @@ void StyleBaseImpl::parseProperty(const QChar *curP, const QChar *endP)
}
}
QList<CSSProperty> *StyleBaseImpl::parseProperties(const QChar *curP, const QChar *endP)
QPtrList<CSSProperty> *StyleBaseImpl::parseProperties(const QChar *curP, const QChar *endP)
{
m_propList = new QList<CSSProperty>;
m_propList = new QPtrList<CSSProperty>;
m_propList->setAutoDelete(true);
while (curP < endP)
{
......@@ -1097,7 +1092,7 @@ bool StyleBaseImpl::parseFont(const QChar *curP, const QChar *endP)
// ---------------- end font property --------------------------
bool StyleBaseImpl::parseValue( const QChar *curP, const QChar *endP, int propId,
bool important, bool nonCSSHint, QList<CSSProperty> *propList)
bool important, bool nonCSSHint, QPtrList<CSSProperty> *propList)
{
m_bImportant = important;
m_bnonCSSHint = nonCSSHint;
......@@ -2195,7 +2190,7 @@ bool StyleBaseImpl::parseAuralValue( const QChar *curP, const QChar *endP, int p
#endif
void StyleBaseImpl::setParsedValue(int propId, const CSSValueImpl *parsedValue,
bool important, bool nonCSSHint, QList<CSSProperty> *propList)
bool important, bool nonCSSHint, QPtrList<CSSProperty> *propList)
{
m_bImportant = important;
m_bnonCSSHint = nonCSSHint;
......@@ -2205,7 +2200,7 @@ void StyleBaseImpl::setParsedValue(int propId, const CSSValueImpl *parsedValue,
void StyleBaseImpl::setParsedValue( int propId, const CSSValueImpl *parsedValue)
{
QListIterator<CSSProperty> propIt(*m_propList);
QPtrListIterator<CSSProperty> propIt(*m_propList);
propIt.toLast(); // just remove the top one - not sure what should happen if we have multiple instances of the property
while (propIt.current() &&
( propIt.current()->m_id != propId || propIt.current()->nonCSSHint != m_bnonCSSHint ||
......@@ -2320,10 +2315,10 @@ bool StyleBaseImpl::parseBackgroundPosition(const QChar *curP, const QChar *&nex
return found;
}
QList<QChar> StyleBaseImpl::splitShorthandProperties(const QChar *curP, const QChar *endP)
QPtrList<QChar> StyleBaseImpl::splitShorthandProperties(const QChar *curP, const QChar *endP)
{
bool last = false;
QList<QChar> list;
QPtrList<QChar> list;
while(!last) {
const QChar *nextP = curP;
while(!(nextP->isSpace())) {
......@@ -2352,7 +2347,7 @@ QList<QChar> StyleBaseImpl::splitShorthandProperties(const QChar *curP, const QC
// used for shorthand properties xxx{1,2}
bool StyleBaseImpl::parse2Values( const QChar *curP, const QChar *endP, const int *properties)
{
QList<QChar> list = splitShorthandProperties(curP, endP);
QPtrList<QChar> list = splitShorthandProperties(curP, endP);
switch(list.count())
{
case 2:
......@@ -2380,7 +2375,7 @@ bool StyleBaseImpl::parse4Values( const QChar *curP, const QChar *endP, const in
* right, bottom, and left, respectively.
*/
QList<QChar> list = splitShorthandProperties(curP, endP);
QPtrList<QChar> list = splitShorthandProperties(curP, endP);
switch(list.count())
{
case 2:
......@@ -2574,8 +2569,8 @@ StyleBaseImpl::parseStyleRule(const QChar *&curP, const QChar *endP)
//kdDebug( 6080 ) << "style rule is \'" << QString(curP, endP-curP) << "\'" << endl;
const QChar *startP;
QList<CSSSelector> *slist;
QList<CSSProperty> *plist;
QPtrList<CSSSelector> *slist;
QPtrList<CSSProperty> *plist;
startP = curP;
curP = parseToChar(startP, endP, '{', false);
......
......@@ -24,9 +24,9 @@
#ifndef _CSS_cssparser_h_
#define _CSS_cssparser_h_
#include "dom_string.h"
#include "dom_misc.h"
#include <qdatetime.h>
#include "dom/dom_string.h"
#include "dom/dom_misc.h"
#include <qdatetime.h>
#include <qptrlist.h>
namespace DOM {
......@@ -56,7 +56,7 @@ public:
// checks if the 2 selectors (including sub selectors) agree.
bool operator == ( const CSSSelector &other );
// tag == -1 means apply to all elements (Selector = *)
/* how the attribute value has to match.... Default is Exact */
......@@ -141,9 +141,9 @@ public:
QPtrList<CSSProperty> *parseProperties(const QChar *curP, const QChar *endP);
/* parses generic CSSValues, return true, if it found a valid value */
bool parseValue(const QChar *curP, const QChar *endP, int propId);
bool parseValue(const QChar *curP, const QChar *endP, int propId,
bool important, bool nonCSSHint, QPtrList<CSSProperty> *propList);
bool parseValue(const QChar *curP, const QChar *endP, int propId);
bool parseValue(const QChar *curP, const QChar *endP, int propId,
bool important, bool nonCSSHint, QPtrList<CSSProperty> *propList);
bool parseFont(const QChar *curP, const QChar *endP);
bool parse4Values(const QChar *curP, const QChar *endP, const int *properties);
bool parseShortHand(const QChar *curP, const QChar *endP, const int *properties, int num);
......@@ -152,7 +152,7 @@ public:
bool important, bool nonCSSHint, QPtrList<CSSProperty> *propList);
QPtrList<QChar> splitShorthandProperties(const QChar *curP, const QChar *endP);
bool parseBackgroundPosition(const QChar *curP, const QChar *&nextP, const QChar *endP);
/* define CSS_AURAL in cssparser.cpp if you want to parse CSS2 Aural properties */
bool parse2Values(const QChar *curP, const QChar *endP, const int *properties);
bool parseAuralValue(const QChar *curP, const QChar *endP, int propId);
......
......@@ -17,15 +17,14 @@
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
* $Id$
*/
#include "cssstyleselector.h"
#include "css/cssstyleselector.h"
#include "rendering/render_style.h"
#include "css_stylesheetimpl.h"
#include "css_ruleimpl.h"