summaryrefslogtreecommitdiffstats
path: root/tdehtml/css
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml/css')
-rw-r--r--tdehtml/css/css_base.h2
-rw-r--r--tdehtml/css/css_valueimpl.cpp2
-rw-r--r--tdehtml/css/css_valueimpl.h6
-rw-r--r--tdehtml/css/cssparser.cpp4
-rw-r--r--tdehtml/css/cssparser.h2
-rw-r--r--tdehtml/css/cssproperties.h2
-rw-r--r--tdehtml/css/cssstyleselector.cpp2
-rw-r--r--tdehtml/css/cssstyleselector.h2
-rw-r--r--tdehtml/css/cssvalues.h2
-rw-r--r--tdehtml/css/makeprop2
-rwxr-xr-xtdehtml/css/makevalues2
-rw-r--r--tdehtml/css/parser.y10
12 files changed, 19 insertions, 19 deletions
diff --git a/tdehtml/css/css_base.h b/tdehtml/css/css_base.h
index d2ab4f63f..db0700a35 100644
--- a/tdehtml/css/css_base.h
+++ b/tdehtml/css/css_base.h
@@ -264,7 +264,7 @@ namespace DOM {
TQPtrList<StyleBaseImpl> *m_lstChildren;
};
- KDE_NO_EXPORT int getPropertyID(const char *tagStr, int len);
+ TDE_NO_EXPORT int getPropertyID(const char *tagStr, int len);
}
diff --git a/tdehtml/css/css_valueimpl.cpp b/tdehtml/css/css_valueimpl.cpp
index 94cca8840..31f0d6be2 100644
--- a/tdehtml/css/css_valueimpl.cpp
+++ b/tdehtml/css/css_valueimpl.cpp
@@ -505,7 +505,7 @@ CSSPrimitiveValueImpl::CSSPrimitiveValueImpl( RectImpl *r)
m_type = CSSPrimitiveValue::CSS_RECT;
}
-CSSPrimitiveValueImpl::CSSPrimitiveValueImpl(QRgb color)
+CSSPrimitiveValueImpl::CSSPrimitiveValueImpl(TQRgb color)
{
m_value.rgbcolor = color;
m_type = CSSPrimitiveValue::CSS_RGBCOLOR;
diff --git a/tdehtml/css/css_valueimpl.h b/tdehtml/css/css_valueimpl.h
index 9a6203c86..952c81f8c 100644
--- a/tdehtml/css/css_valueimpl.h
+++ b/tdehtml/css/css_valueimpl.h
@@ -163,7 +163,7 @@ public:
CSSPrimitiveValueImpl(const DOMString &str, CSSPrimitiveValue::UnitTypes type);
CSSPrimitiveValueImpl(CounterImpl *c);
CSSPrimitiveValueImpl( RectImpl *r);
- CSSPrimitiveValueImpl(QRgb color);
+ CSSPrimitiveValueImpl(TQRgb color);
CSSPrimitiveValueImpl(PairImpl *p);
virtual ~CSSPrimitiveValueImpl();
@@ -206,7 +206,7 @@ public:
return ( m_type != CSSPrimitiveValue::CSS_RECT ? 0 : m_value.rect );
}
- QRgb getRGBColorValue () const {
+ TQRgb getRGBColorValue () const {
return ( m_type != CSSPrimitiveValue::CSS_RGBCOLOR ? 0 : m_value.rgbcolor );
}
@@ -232,7 +232,7 @@ protected:
DOM::DOMStringImpl *string;
CounterImpl *counter;
RectImpl *rect;
- QRgb rgbcolor;
+ TQRgb rgbcolor;
PairImpl* pair;
} m_value;
};
diff --git a/tdehtml/css/cssparser.cpp b/tdehtml/css/cssparser.cpp
index 130fa8b61..b4b531df0 100644
--- a/tdehtml/css/cssparser.cpp
+++ b/tdehtml/css/cssparser.cpp
@@ -2053,7 +2053,7 @@ bool CSSParser::parseHSLParameters(Value* value, double* colorArray, bool parseA
return true;
}
-static bool parseColor(int unit, const TQString &name, QRgb& rgb)
+static bool parseColor(int unit, const TQString &name, TQRgb& rgb)
{
int len = name.length();
@@ -2101,7 +2101,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColor()
CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
{
- QRgb c = tdehtml::transparentColor;
+ TQRgb c = tdehtml::transparentColor;
if ( !strict && value->unit == CSSPrimitiveValue::CSS_NUMBER &&
value->fValue >= 0. && value->fValue < 1000000. ) {
TQString str;
diff --git a/tdehtml/css/cssparser.h b/tdehtml/css/cssparser.h
index 0e00ebc16..de735fe3e 100644
--- a/tdehtml/css/cssparser.h
+++ b/tdehtml/css/cssparser.h
@@ -148,7 +148,7 @@ namespace DOM {
CSSPrimitiveValueImpl *parseColorFromValue(Value* val);
CSSValueImpl* parseCounterContent(ValueList *args, bool counters);
- static bool parseColor(const TQString &name, QRgb& rgb);
+ static bool parseColor(const TQString &name, TQRgb& rgb);
// CSS3 Parsing Routines (for properties specific to CSS3)
bool parseShadow(int propId, bool important);
diff --git a/tdehtml/css/cssproperties.h b/tdehtml/css/cssproperties.h
index c06431c62..bcdcee6e3 100644
--- a/tdehtml/css/cssproperties.h
+++ b/tdehtml/css/cssproperties.h
@@ -4,7 +4,7 @@
#ifndef CSSPROPERTIES_H
#define CSSPROPERTIES_H
-DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
+DOM::DOMString getPropertyName(unsigned short id) TDE_NO_EXPORT;
#define CSS_PROP_INVALID 0
#define CSS_PROP_MIN 1
diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp
index 40dbcb2ec..e9517584e 100644
--- a/tdehtml/css/cssstyleselector.cpp
+++ b/tdehtml/css/cssstyleselector.cpp
@@ -1953,7 +1953,7 @@ static Length convertToLength( CSSPrimitiveValueImpl *primitiveValue, RenderStyl
// color mapping code
struct colorMap {
int css_value;
- QRgb color;
+ TQRgb color;
};
static const colorMap cmap[] = {
diff --git a/tdehtml/css/cssstyleselector.h b/tdehtml/css/cssstyleselector.h
index f826c0323..bc7c5c7ad 100644
--- a/tdehtml/css/cssstyleselector.h
+++ b/tdehtml/css/cssstyleselector.h
@@ -124,7 +124,7 @@ namespace tdehtml
~CSSStyleSelector();
void addSheet( DOM::CSSStyleSheetImpl *sheet );
- KDE_EXPORT static void clear();
+ TDE_EXPORT static void clear();
static void reparseConfiguration();
static void loadDefaultStyle(const TDEHTMLSettings *s, DOM::DocumentImpl *doc);
diff --git a/tdehtml/css/cssvalues.h b/tdehtml/css/cssvalues.h
index 12d606acc..0869f392f 100644
--- a/tdehtml/css/cssvalues.h
+++ b/tdehtml/css/cssvalues.h
@@ -5,7 +5,7 @@
#ifndef CSSVALUES_H
#define CSSVALUES_H
-DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
+DOM::DOMString getValueName(unsigned short id) TDE_NO_EXPORT;
#define CSS_VAL_INVALID 0
#define CSS_VAL_MIN 1
diff --git a/tdehtml/css/makeprop b/tdehtml/css/makeprop
index b01ed7319..5a806d6f7 100644
--- a/tdehtml/css/makeprop
+++ b/tdehtml/css/makeprop
@@ -26,7 +26,7 @@ grep "^[^\#]" cssproperties.in > cssproperties.strip
echo -e '%{\n/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1999 W. Bastian */\n#include "cssproperties.h"\n%}\nstruct props {\n const char *name;\n int id;\n};\n\nstatic const struct props * findProp (const char *str, unsigned int len);\n\n%%' > cssproperties.gperf
cat cssproperties.strip | awk '{ do { prop = $0; gsub("-", "_"); print prop ", CSS_PROP_" toupper($0) } while (getline) }' >> cssproperties.gperf
echo '%%' >> cssproperties.gperf
-echo -e '/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSPROPERTIES_H\n#define CSSPROPERTIES_H\n\nDOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;\n' > cssproperties.h
+echo -e '/* This file is automatically generated from cssproperties.in by makeprop, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSPROPERTIES_H\n#define CSSPROPERTIES_H\n\nDOM::DOMString getPropertyName(unsigned short id) TDE_NO_EXPORT;\n' > cssproperties.h
cat cssproperties.strip | awk '{ \
i=1; \
print "#define CSS_PROP_INVALID 0"; \
diff --git a/tdehtml/css/makevalues b/tdehtml/css/makevalues
index 3ca0a82ea..957d9b70c 100755
--- a/tdehtml/css/makevalues
+++ b/tdehtml/css/makevalues
@@ -28,7 +28,7 @@ echo -e '%{\n/* This file is automatically generated from cssvalues.in by makeva
cat cssvalues.strip | awk '{ do { prop = $0; gsub("-", "_"); print prop ", CSS_VAL_" toupper($0) } while (getline) }' >> cssvalues.gperf
echo '%%' >> cssvalues.gperf
echo -e '/* This file is automatically generated from cssvalues.in by
-#makevalues, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSVALUES_H\n#define CSSVALUES_H\n\nDOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;\n' > cssvalues.h
+#makevalues, do not edit */\n/* Copyright 1998 W. Bastian */\n\n#ifndef CSSVALUES_H\n#define CSSVALUES_H\n\nDOM::DOMString getValueName(unsigned short id) TDE_NO_EXPORT;\n' > cssvalues.h
cat cssvalues.strip | awk '{ \
i=1; \
print "#define CSS_VAL_INVALID 0"; \
diff --git a/tdehtml/css/parser.y b/tdehtml/css/parser.y
index 6d8b18e9a..236b467dd 100644
--- a/tdehtml/css/parser.y
+++ b/tdehtml/css/parser.y
@@ -634,7 +634,7 @@ element_name:
IDENT {
CSSParser *p = static_cast<CSSParser *>(parser);
DOM::DocumentImpl *doc = p->document();
- QString tag = qString($1);
+ TQString tag = qString($1);
if ( doc ) {
if (doc->isHTMLDocument())
tag = tag.lower();
@@ -699,7 +699,7 @@ attrib_id:
CSSParser *p = static_cast<CSSParser *>(parser);
DOM::DocumentImpl *doc = p->document();
- QString attr = qString($1);
+ TQString attr = qString($1);
if ( doc ) {
if (doc->isHTMLDocument())
attr = attr.lower();
@@ -798,7 +798,7 @@ pseudo:
| ':' FUNCTION INTEGER ')' {
$$ = new CSSSelector();
$$->match = CSSSelector::PseudoClass;
- $$->string_arg = QString::number($3);
+ $$->string_arg = TQString::number($3);
$$->value = domString($2);
}
// used by :nth-* and :lang
@@ -892,7 +892,7 @@ declaration:
property:
IDENT maybe_space {
- QString str = qString($1);
+ TQString str = qString($1);
$$ = getPropertyID( str.lower().latin1(), str.length() );
}
;
@@ -941,7 +941,7 @@ term:
| DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; }
| STRING maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_STRING; }
| IDENT maybe_space {
- QString str = qString( $1 );
+ TQString str = qString( $1 );
$$.id = getValueID( str.lower().latin1(), str.length() );
$$.unit = CSSPrimitiveValue::CSS_IDENT;
$$.string = $1;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 03:47:36 +0000