summaryrefslogtreecommitdiffstats
path: root/tdehtml
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml')
-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/cssstyleselector.cpp2
-rw-r--r--tdehtml/css/parser.y10
-rw-r--r--tdehtml/dom/css_value.cpp2
-rw-r--r--tdehtml/dom/css_value.h6
-rw-r--r--tdehtml/ecma/kjs_binding.cpp2
-rw-r--r--tdehtml/java/kjavaappletviewer.cpp2
-rw-r--r--tdehtml/java/kjavaprocess.h4
-rw-r--r--tdehtml/misc/helper.cpp2
-rw-r--r--tdehtml/misc/helper.h6
-rw-r--r--tdehtml/misc/loader.h2
-rw-r--r--tdehtml/tdehtmlpart_p.h6
-rw-r--r--tdehtml/test_regression.cpp8
-rw-r--r--tdehtml/xml/dom_stringimpl.h2
17 files changed, 34 insertions, 34 deletions
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/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/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;
diff --git a/tdehtml/dom/css_value.cpp b/tdehtml/dom/css_value.cpp
index 4e365644a..edbf15075 100644
--- a/tdehtml/dom/css_value.cpp
+++ b/tdehtml/dom/css_value.cpp
@@ -483,7 +483,7 @@ RGBColor::RGBColor(const RGBColor &other)
m_color = other.m_color;
}
-RGBColor::RGBColor(QRgb color)
+RGBColor::RGBColor(TQRgb color)
{
m_color = color;
}
diff --git a/tdehtml/dom/css_value.h b/tdehtml/dom/css_value.h
index e2028feac..6e3d89717 100644
--- a/tdehtml/dom/css_value.h
+++ b/tdehtml/dom/css_value.h
@@ -596,7 +596,7 @@ public:
* @deprecated
*/
RGBColor(const TQColor& c) { m_color = c.rgb(); }
- RGBColor(QRgb color);
+ RGBColor(TQRgb color);
RGBColor(const RGBColor &other);
RGBColor & operator = (const RGBColor &other);
@@ -624,9 +624,9 @@ public:
/**
* @internal
*/
- QRgb color() const { return m_color; }
+ TQRgb color() const { return m_color; }
protected:
- QRgb m_color;
+ TQRgb m_color;
};
class RectImpl;
diff --git a/tdehtml/ecma/kjs_binding.cpp b/tdehtml/ecma/kjs_binding.cpp
index 82c11d308..0a0a2da47 100644
--- a/tdehtml/ecma/kjs_binding.cpp
+++ b/tdehtml/ecma/kjs_binding.cpp
@@ -50,7 +50,7 @@ Value DOMObject::get(ExecState *exec, const Identifier &p) const
}
catch (DOM::DOMException e) {
// ### translate code into readable string ?
- // ### oh, and s/QString/i18n or I18N_NOOP (the code in kjs uses I18N_NOOP... but where is it translated ?)
+ // ### oh, and s/TQString/i18n or I18N_NOOP (the code in kjs uses I18N_NOOP... but where is it translated ?)
// and where does it appear to the user ?
Object err = Error::create(exec, GeneralError, TQString(TQString("DOM exception %1").arg(e.code)).local8Bit());
exec->setException( err );
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index f80690aa9..6c3f13ace 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -79,7 +79,7 @@ public:
void setServer (KJavaAppletServer * s);
TQGuardedPtr <KJavaAppletServer> server;
private:
- typedef TQMap <QPair <TQObject*, TQString>, QPair <KJavaAppletContext*, int> >
+ typedef TQMap <TQPair <TQObject*, TQString>, TQPair <KJavaAppletContext*, int> >
ContextMap;
ContextMap m_contextmap;
};
diff --git a/tdehtml/java/kjavaprocess.h b/tdehtml/java/kjavaprocess.h
index 53b9542e7..4e00d4080 100644
--- a/tdehtml/java/kjavaprocess.h
+++ b/tdehtml/java/kjavaprocess.h
@@ -37,7 +37,7 @@
*/
class KJavaProcessPrivate;
-class KJavaProcess : public TDEProcess //QObject
+class KJavaProcess : public TDEProcess //TQObject
{
TQ_OBJECT
@@ -110,7 +110,7 @@ public:
/**
* Sends a command to the KJAS Applet Server by building a QByteArray
- * out of the data, and then writes it standard out. It adds each QString
+ * out of the data, and then writes it standard out. It adds each TQString
* in the arg list, and then adds the data array.
*/
void send( char cmd_code, const TQStringList& args, const TQByteArray& data );
diff --git a/tdehtml/misc/helper.cpp b/tdehtml/misc/helper.cpp
index b5191c7ca..6b9e06a14 100644
--- a/tdehtml/misc/helper.cpp
+++ b/tdehtml/misc/helper.cpp
@@ -66,7 +66,7 @@ double calcHue(double temp1, double temp2, double hueVal)
// explanation available at http://en.wikipedia.org/wiki/HSL_color_space
// all values are in the range of 0 to 1.0
-QRgb tdehtml::tqRgbaFromHsla(double h, double s, double l, double a)
+TQRgb tdehtml::tqRgbaFromHsla(double h, double s, double l, double a)
{
double temp2 = l < 0.5 ? l * (1.0 + s) : l + s - l * s;
double temp1 = 2.0 * l - temp2;
diff --git a/tdehtml/misc/helper.h b/tdehtml/misc/helper.h
index 10ffb8035..2433c9284 100644
--- a/tdehtml/misc/helper.h
+++ b/tdehtml/misc/helper.h
@@ -32,15 +32,15 @@ class TQPainter;
namespace tdehtml
{
class RenderObject;
- const QRgb transparentColor = 0x00000000;
- const QRgb invertedColor = 0x00000002;
+ const TQRgb transparentColor = 0x00000000;
+ const TQRgb invertedColor = 0x00000002;
extern TQPainter *printpainter;
void setPrintPainter( TQPainter *printer );
bool hasSufficientContrast(const TQColor &c1, const TQColor &c2);
TQColor retrieveBackgroundColor(const RenderObject *obj);
- QRgb tqRgbaFromHsla(double h, double s, double l, double a);
+ TQRgb tqRgbaFromHsla(double h, double s, double l, double a);
//enumerator for findSelectionNode
enum FindSelectionResult { SelectionPointBefore,
diff --git a/tdehtml/misc/loader.h b/tdehtml/misc/loader.h
index 2639f82f6..e340b3023 100644
--- a/tdehtml/misc/loader.h
+++ b/tdehtml/misc/loader.h
@@ -317,7 +317,7 @@ namespace tdehtml
TQPixmap* p;
TQPixmap* scaled;
TQPixmap* bg;
- QRgb bgColor;
+ TQRgb bgColor;
TQSize bgSize;
mutable TQPixmap* pixPart;
diff --git a/tdehtml/tdehtmlpart_p.h b/tdehtml/tdehtmlpart_p.h
index 6306d1961..d81643556 100644
--- a/tdehtml/tdehtmlpart_p.h
+++ b/tdehtml/tdehtmlpart_p.h
@@ -146,10 +146,10 @@ class TDEHTMLWalletQueue : public TQObject
#ifndef TDEHTML_NO_WALLET
TDEWallet::Wallet *wallet;
#endif // TDEHTML_NO_WALLET
- typedef QPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller;
+ typedef TQPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller;
typedef TQValueList<Caller> CallerList;
CallerList callers;
- TQValueList<QPair<TQString, TQMap<TQString, TQString> > > savers;
+ TQValueList<TQPair<TQString, TQMap<TQString, TQString> > > savers;
signals:
void walletOpened(TDEWallet::Wallet*);
@@ -172,7 +172,7 @@ class TDEHTMLWalletQueue : public TQObject
}
}
wallet->setFolder(TDEWallet::Wallet::FormDataFolder());
- for (TQValueList<QPair<TQString, TQMap<TQString, TQString> > >::Iterator i = savers.begin(); i != savers.end(); ++i) {
+ for (TQValueList<TQPair<TQString, TQMap<TQString, TQString> > >::Iterator i = savers.begin(); i != savers.end(); ++i) {
wallet->writeMap((*i).first, (*i).second);
}
}
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 62842e086..674abdf4c 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -994,12 +994,12 @@ bool RegressionTest::imageEqual( const TQImage &lhsi, const TQImage &rhsi )
for ( int y = 0; y < h; ++y )
{
- QRgb* ls = ( QRgb* ) lhsi.scanLine( y );
- QRgb* rs = ( QRgb* ) rhsi.scanLine( y );
+ TQRgb* ls = ( TQRgb* ) lhsi.scanLine( y );
+ TQRgb* rs = ( TQRgb* ) rhsi.scanLine( y );
if ( memcmp( ls, rs, bytes ) ) {
for ( int x = 0; x < w; ++x ) {
- QRgb l = ls[x];
- QRgb r = rs[x];
+ TQRgb l = ls[x];
+ TQRgb r = rs[x];
if ( ( abs( tqRed( l ) - tqRed(r ) ) < 20 ) &&
( abs( tqGreen( l ) - tqGreen(r ) ) < 20 ) &&
( abs( tqBlue( l ) - tqBlue(r ) ) < 20 ) )
diff --git a/tdehtml/xml/dom_stringimpl.h b/tdehtml/xml/dom_stringimpl.h
index c8f5ce7d8..09c746336 100644
--- a/tdehtml/xml/dom_stringimpl.h
+++ b/tdehtml/xml/dom_stringimpl.h
@@ -81,7 +81,7 @@ public:
const TQChar &operator [] (int pos) { return s[pos]; }
bool containsOnlyWhitespace() const;
- // ignores trailing garbage, unlike QString
+ // ignores trailing garbage, unlike TQString
int toInt(bool* ok = 0) const;
tdehtml::Length* toLengthArray(int& len) const;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 15:03:34 +0000