summaryrefslogtreecommitdiffstats
path: root/khtml/rendering
diff options
context:
space:
mode:
Diffstat (limited to 'khtml/rendering')
-rw-r--r--khtml/rendering/enumerate.cpp2
-rw-r--r--khtml/rendering/font.cpp2
-rw-r--r--khtml/rendering/render_applet.cpp14
-rw-r--r--khtml/rendering/render_form.cpp26
-rw-r--r--khtml/rendering/render_frames.cpp42
-rw-r--r--khtml/rendering/render_generated.cpp2
-rw-r--r--khtml/rendering/render_layer.cpp6
-rw-r--r--khtml/rendering/render_list.cpp12
-rw-r--r--khtml/rendering/render_object.cpp10
-rw-r--r--khtml/rendering/render_replaced.cpp4
10 files changed, 60 insertions, 60 deletions
diff --git a/khtml/rendering/enumerate.cpp b/khtml/rendering/enumerate.cpp
index 57445c12b..9cfe149ad 100644
--- a/khtml/rendering/enumerate.cpp
+++ b/khtml/rendering/enumerate.cpp
@@ -138,7 +138,7 @@ TQString toHebrew( int number ) {
TQString letter;
if (number < 1) return TQString::number(number);
if (number>999) {
- letter = toHebrew(number/1000) + TQString::tqfromLatin1("'");
+ letter = toHebrew(number/1000) + TQString::fromLatin1("'");
number = number%1000;
}
diff --git a/khtml/rendering/font.cpp b/khtml/rendering/font.cpp
index 766c89840..64ede83e3 100644
--- a/khtml/rendering/font.cpp
+++ b/khtml/rendering/font.cpp
@@ -407,7 +407,7 @@ bool Font::isFontScalable(TQFontDatabase& db, const TQFont& font)
/* Cache size info */
if (!scalSizesCache)
scalSizesCache = new TQMap<ScalKey, TQValueList<int> >;
- (*scalSizesCache)[key] = db.tqsmoothSizes(font.family(), db.styleString(font));
+ (*scalSizesCache)[key] = db.smoothSizes(font.family(), db.styleString(font));
}
}
diff --git a/khtml/rendering/render_applet.cpp b/khtml/rendering/render_applet.cpp
index 3a00589e2..fce22f7c8 100644
--- a/khtml/rendering/render_applet.cpp
+++ b/khtml/rendering/render_applet.cpp
@@ -123,22 +123,22 @@ void RenderApplet::processArguments(const TQMap<TQString, TQString> &args)
KJavaApplet* applet = w ? w->applet() : 0;
if ( applet ) {
- applet->setBaseURL( args[TQString::tqfromLatin1("baseURL") ] );
- applet->setAppletClass( args[TQString::tqfromLatin1("code") ] );
+ applet->setBaseURL( args[TQString::fromLatin1("baseURL") ] );
+ applet->setAppletClass( args[TQString::fromLatin1("code") ] );
- TQString str = args[TQString::tqfromLatin1("codeBase") ];
+ TQString str = args[TQString::fromLatin1("codeBase") ];
if( !str.isEmpty() )
applet->setCodeBase( str );
- str = args[TQString::tqfromLatin1("name") ];
+ str = args[TQString::fromLatin1("name") ];
if( !str.isNull() )
applet->setAppletName( str );
else
- applet->setAppletName( args[TQString::tqfromLatin1("code") ] );
+ applet->setAppletName( args[TQString::fromLatin1("code") ] );
- str = args[TQString::tqfromLatin1("archive") ];
+ str = args[TQString::fromLatin1("archive") ];
if( !str.isEmpty() )
- applet->setArchives( args[TQString::tqfromLatin1("archive") ] );
+ applet->setArchives( args[TQString::fromLatin1("archive") ] );
}
}
diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index 5c53f0250..d55b32fe4 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -155,8 +155,8 @@ void RenderCheckBox::calcMinMaxWidth()
KHTMLAssert( !minMaxKnown() );
TQCheckBox *cb = static_cast<TQCheckBox *>( m_widget );
- TQSize s( cb->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorWidth ),
- cb->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorHeight ) );
+ TQSize s( cb->tqstyle().pixelMetric( TQStyle::PM_IndicatorWidth ),
+ cb->tqstyle().pixelMetric( TQStyle::PM_IndicatorHeight ) );
setIntrinsicWidth( s.width() );
setIntrinsicHeight( s.height() );
@@ -207,8 +207,8 @@ void RenderRadioButton::calcMinMaxWidth()
KHTMLAssert( !minMaxKnown() );
TQRadioButton *rb = static_cast<TQRadioButton *>( m_widget );
- TQSize s( rb->tqstyle().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ),
- rb->tqstyle().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) );
+ TQSize s( rb->tqstyle().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ),
+ rb->tqstyle().pixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) );
setIntrinsicWidth( s.width() );
setIntrinsicHeight( s.height() );
@@ -260,17 +260,17 @@ void RenderSubmitButton::calcMinMaxWidth()
bool empty = raw.isEmpty();
if ( empty )
- raw = TQString::tqfromLatin1("X");
+ raw = TQString::fromLatin1("X");
TQFontMetrics fm = pb->fontMetrics();
TQSize ts = fm.size( ShowPrefix, raw);
TQSize s(pb->tqstyle().tqsizeFromContents( TQStyle::CT_PushButton, pb, ts )
.expandedTo(TQApplication::globalStrut()));
- int margin = pb->tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, pb) +
- pb->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2;
+ int margin = pb->tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, pb) +
+ pb->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2;
int w = ts.width() + margin;
int h = s.height();
if (pb->isDefault() || pb->autoDefault()) {
- int dbw = pb->tqstyle().tqpixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2;
+ int dbw = pb->tqstyle().pixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2;
w += dbw;
}
@@ -1018,7 +1018,7 @@ void RenderSelect::updateFromElement()
DOMString label = optElem->getAttribute(ATTR_LABEL);
if (!label.isEmpty())
text = label.string();
- text = TQString::tqfromLatin1(" ")+text;
+ text = TQString::fromLatin1(" ")+text;
}
if(m_useListBox) {
@@ -1406,7 +1406,7 @@ void TextAreaWidget::slotReplaceNext()
}
if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) {
- viewport()->tqsetUpdatesEnabled(false);
+ viewport()->setUpdatesEnabled(false);
}
KFind::Result res = KFind::NoMatch;
@@ -1449,7 +1449,7 @@ void TextAreaWidget::slotReplaceNext()
}
if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) {
- viewport()->tqsetUpdatesEnabled(true);
+ viewport()->setUpdatesEnabled(true);
repaintChanged();
}
@@ -1738,13 +1738,13 @@ TQString RenderTextArea::text()
paragraphText = paragraphText.left(pl); //Snip invented space.
for (int l = 0; l < pl; ++l) {
if (lindex != w->lineOfChar(p, l)) {
- paragraphText.insert(l+ll++, TQString::tqfromLatin1("\n"));
+ paragraphText.insert(l+ll++, TQString::fromLatin1("\n"));
lindex = w->lineOfChar(p, l);
}
}
txt += paragraphText;
if (p < w->paragraphs() - 1)
- txt += TQString::tqfromLatin1("\n");
+ txt += TQString::fromLatin1("\n");
}
}
else
diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp
index 9f58a0a4f..bc3f00be4 100644
--- a/khtml/rendering/render_frames.cpp
+++ b/khtml/rendering/render_frames.cpp
@@ -728,16 +728,16 @@ void RenderPartObject::updateWidget()
HTMLParamElementImpl *p = static_cast<HTMLParamElementImpl *>( child );
TQString aStr = p->name();
- aStr += TQString::tqfromLatin1("=\"");
+ aStr += TQString::fromLatin1("=\"");
aStr += p->value();
- aStr += TQString::tqfromLatin1("\"");
+ aStr += TQString::fromLatin1("\"");
TQString name_lower = p->name().lower();
- if (name_lower == TQString::tqfromLatin1("type") && objbase->id() != ID_APPLET) {
+ if (name_lower == TQString::fromLatin1("type") && objbase->id() != ID_APPLET) {
objbase->setServiceType(p->value());
} else if (url.isEmpty() &&
- (name_lower == TQString::tqfromLatin1("src") ||
- name_lower == TQString::tqfromLatin1("movie") ||
- name_lower == TQString::tqfromLatin1("code"))) {
+ (name_lower == TQString::fromLatin1("src") ||
+ name_lower == TQString::fromLatin1("movie") ||
+ name_lower == TQString::fromLatin1("code"))) {
url = p->value();
}
params.append(aStr);
@@ -754,8 +754,8 @@ void RenderPartObject::updateWidget()
}
}
}
- params.append( TQString::tqfromLatin1("__KHTML__PLUGINEMBED=\"YES\"") );
- params.append( TQString::tqfromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url()));
+ params.append( TQString::fromLatin1("__KHTML__PLUGINEMBED=\"YES\"") );
+ params.append( TQString::fromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url()));
HTMLEmbedElementImpl *embed = 0;
TQString classId;
@@ -775,18 +775,18 @@ void RenderPartObject::updateWidget()
}
classId = objbase->classId;
- params.append( TQString::tqfromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) );
- params.append( TQString::tqfromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) );
+ params.append( TQString::fromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) );
+ params.append( TQString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) );
if (!objbase->getAttribute(ATTR_WIDTH).isEmpty())
- params.append( TQString::tqfromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) );
+ params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) );
else if (embed && !embed->getAttribute(ATTR_WIDTH).isEmpty()) {
- params.append( TQString::tqfromLatin1("WIDTH=\"%1\"").arg( embed->getAttribute(ATTR_WIDTH).string() ) );
+ params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( embed->getAttribute(ATTR_WIDTH).string() ) );
objbase->setAttribute(ATTR_WIDTH, embed->getAttribute(ATTR_WIDTH));
}
if (!objbase->getAttribute(ATTR_HEIGHT).isEmpty())
- params.append( TQString::tqfromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) );
+ params.append( TQString::fromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) );
else if (embed && !embed->getAttribute(ATTR_HEIGHT).isEmpty()) {
- params.append( TQString::tqfromLatin1("HEIGHT=\"%1\"").arg( embed->getAttribute(ATTR_HEIGHT).string() ) );
+ params.append( TQString::fromLatin1("HEIGHT=\"%1\"").arg( embed->getAttribute(ATTR_HEIGHT).string() ) );
objbase->setAttribute(ATTR_HEIGHT, embed->getAttribute(ATTR_HEIGHT));
}
@@ -808,7 +808,7 @@ void RenderPartObject::updateWidget()
serviceType = "application/x-activex-handler";
#endif
- if(classId.find(TQString::tqfromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) {
+ if(classId.find(TQString::fromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) {
// It is ActiveX, but the nsplugin system handling
// should also work, that's why we don't override the
// serviceType with application/x-activex-handler
@@ -817,17 +817,17 @@ void RenderPartObject::updateWidget()
// with nspluginviewer (Niko)
serviceType = "application/x-shockwave-flash";
}
- else if(classId.find(TQString::tqfromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0)
+ else if(classId.find(TQString::fromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0)
serviceType = "audio/x-pn-realaudio-plugin";
- else if(classId.find(TQString::tqfromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 ||
- objbase->classId.find(TQString::tqfromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0)
+ else if(classId.find(TQString::fromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 ||
+ objbase->classId.find(TQString::fromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0)
serviceType = "application/x-java-applet";
// http://www.apple.com/quicktime/tools_tips/tutorials/activex.html
- else if(classId.find(TQString::tqfromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0)
+ else if(classId.find(TQString::fromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0)
serviceType = "video/quicktime";
// http://msdn.microsoft.com/library/en-us/dnwmt/html/adding_windows_media_to_web_pages__etse.asp?frame=true
- else if(objbase->classId.find(TQString::tqfromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 ||
- classId.find(TQString::tqfromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0)
+ else if(objbase->classId.find(TQString::fromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 ||
+ classId.find(TQString::fromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0)
serviceType = "video/x-msvideo";
else
diff --git a/khtml/rendering/render_generated.cpp b/khtml/rendering/render_generated.cpp
index f5fc70687..ba80a5aa1 100644
--- a/khtml/rendering/render_generated.cpp
+++ b/khtml/rendering/render_generated.cpp
@@ -379,7 +379,7 @@ void RenderGlyph::paint(PaintInfo& paintInfo, int _tx, int _ty)
diamond[2] = TQPoint(x+s, y+2*s);
diamond[3] = TQPoint(x, y+s);
p->setBrush( color );
- p->tqdrawConvexPolygon( diamond, 0, 4 );
+ p->drawConvexPolygon( diamond, 0, 4 );
return;
}
case LNONE:
diff --git a/khtml/rendering/render_layer.cpp b/khtml/rendering/render_layer.cpp
index 3427bf1dc..e82e0d831 100644
--- a/khtml/rendering/render_layer.cpp
+++ b/khtml/rendering/render_layer.cpp
@@ -637,7 +637,7 @@ int RenderLayer::verticalScrollbarWidth()
#ifdef APPLE_CHANGES
return m_vBar->width();
#else
- return m_vBar->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
+ return m_vBar->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent);
#endif
}
@@ -650,7 +650,7 @@ int RenderLayer::horizontalScrollbarHeight()
#ifdef APPLE_CHANGES
return m_hBar->height();
#else
- return m_hBar->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
+ return m_hBar->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent);
#endif
}
@@ -691,7 +691,7 @@ void RenderLayer::positionScrollbars(const TQRect& absBounds)
TQScrollBar *b = m_hBar;
if (!m_hBar)
b = m_vBar;
- int sw = b->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
+ int sw = b->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent);
if (m_vBar) {
TQRect vBarRect = TQRect(tx + w - sw + 1, ty, sw, h - (m_hBar ? sw : 0) + 1);
diff --git a/khtml/rendering/render_list.cpp b/khtml/rendering/render_list.cpp
index c88f103d3..769b79670 100644
--- a/khtml/rendering/render_list.cpp
+++ b/khtml/rendering/render_list.cpp
@@ -333,7 +333,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
diamond[2] = TQPoint(x+s, y+2*s);
diamond[3] = TQPoint(x, y+s);
p->setBrush( color );
- p->tqdrawConvexPolygon( diamond, 0, 4 );
+ p->drawConvexPolygon( diamond, 0, 4 );
return;
}
case LNONE:
@@ -344,21 +344,21 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
if( style()->direction() == LTR) {
p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
p->drawText(_tx + fm.width(m_item), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip,
- TQString::tqfromLatin1(". "));
+ TQString::fromLatin1(". "));
}
else {
- const TQString& punct(TQString::tqfromLatin1(" ."));
+ const TQString& punct(TQString::fromLatin1(" ."));
p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct);
p->drawText(_tx + fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
}
} else {
if (style()->direction() == LTR) {
- const TQString& punct(TQString::tqfromLatin1(". "));
+ const TQString& punct(TQString::fromLatin1(". "));
p->drawText(_tx-offset/2, _ty, 0, 0, Qt::AlignRight|TQt::DontClip, punct);
p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, Qt::AlignRight|TQt::DontClip, m_item);
}
else {
- const TQString& punct(TQString::tqfromLatin1(" ."));
+ const TQString& punct(TQString::fromLatin1(" ."));
p->drawText(_tx+offset/2, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct);
p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
}
@@ -543,7 +543,7 @@ void RenderListMarker::calcMinMaxWidth()
default:
KHTMLAssert(false);
}
- m_markerWidth = fm.width(m_item) + fm.width(TQString::tqfromLatin1(". "));
+ m_markerWidth = fm.width(m_item) + fm.width(TQString::fromLatin1(". "));
}
end:
diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp
index 1fc72c7d8..e69991930 100644
--- a/khtml/rendering/render_object.cpp
+++ b/khtml/rendering/render_object.cpp
@@ -1164,15 +1164,15 @@ TQString RenderObject::information() const
<< " mB: " << marginBottom() << " qB: " << isBottomMarginQuirk()
<< "}"
<< (isTableCell() ?
- ( TQString::tqfromLatin1(" [r=") +
+ ( TQString::fromLatin1(" [r=") +
TQString::number( static_cast<const RenderTableCell *>(this)->row() ) +
- TQString::tqfromLatin1(" c=") +
+ TQString::fromLatin1(" c=") +
TQString::number( static_cast<const RenderTableCell *>(this)->col() ) +
- TQString::tqfromLatin1(" rs=") +
+ TQString::fromLatin1(" rs=") +
TQString::number( static_cast<const RenderTableCell *>(this)->rowSpan() ) +
- TQString::tqfromLatin1(" cs=") +
+ TQString::fromLatin1(" cs=") +
TQString::number( static_cast<const RenderTableCell *>(this)->colSpan() ) +
- TQString::tqfromLatin1("]") ) : TQString::null );
+ TQString::fromLatin1("]") ) : TQString::null );
if ( layer() )
ts << " layer=" << layer();
if ( continuation() )
diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp
index 01379930a..f0a6f94a9 100644
--- a/khtml/rendering/render_replaced.cpp
+++ b/khtml/rendering/render_replaced.cpp
@@ -558,7 +558,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx,
if ( external ) {
// even hackier!
TQPainter pt( pm );
- const TQColor c = widget->tqcolorGroup().base();
+ const TQColor c = widget->colorGroup().base();
for (int i = 0; i < cnt; ++i)
pt.fillRect( br[i], c );
} else {
@@ -672,7 +672,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
// don't allow the widget to react to wheel event unless its
// currently focused. this avoids accidentally changing a select box
// or something while wheeling a webpage.
- if (tqApp->tqfocusWidget() != widget() &&
+ if (tqApp->focusWidget() != widget() &&
widget()->focusPolicy() <= TQ_StrongFocus) {
TQT_TQWHEELEVENT(e)->ignore();
TQApplication::sendEvent(view(), e);
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-27 13:51:06 +0000