diff options
| author | Michele Calgaro <[email protected]> | 2023-11-24 10:55:57 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2023-11-25 15:17:48 +0900 |
| commit | 4c9f3f02c0e1a9be5567649f5c97d6638033f74f (patch) | |
| tree | 1979e02cfb76240b6e03e1fcebe7b546143c74e1 /tdehtml | |
| parent | cf7f8e74af96c15491c49457261a7d0d001250ad (diff) | |
| download | tdelibs-4c9f3f02c0e1a9be5567649f5c97d6638033f74f.tar.gz tdelibs-4c9f3f02c0e1a9be5567649f5c97d6638033f74f.zip | |
Replaced various '#define' with actual strings - part 3
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 8d79c40791fa0bcac4d4ce1dc7385b19e523ba08)
Diffstat (limited to 'tdehtml')
| -rw-r--r-- | tdehtml/rendering/render_form.cpp | 4 | ||||
| -rw-r--r-- | tdehtml/tdehtml_settings.cpp | 2 | ||||
| -rw-r--r-- | tdehtml/xml/dom_nodeimpl.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp index f28706bd3..63bba2914 100644 --- a/tdehtml/rendering/render_form.cpp +++ b/tdehtml/rendering/render_form.cpp @@ -263,7 +263,7 @@ void RenderSubmitButton::calcMinMaxWidth() raw = TQString::fromLatin1("X"); TQFontMetrics fm = pb->fontMetrics(); TQSize ts = fm.size( ShowPrefix, raw); - TQSize s(pb->style().tqsizeFromContents( TQStyle::CT_PushButton, pb, ts ) + TQSize s(pb->style().sizeFromContents( TQStyle::CT_PushButton, pb, ts ) .expandedTo(TQApplication::globalStrut())); int margin = pb->style().pixelMetric( TQStyle::PM_ButtonMargin, pb) + pb->style().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2; @@ -805,7 +805,7 @@ void RenderFileButton::calcMinMaxWidth() int h = fm.lineSpacing(); int w = fm.width( 'x' ) * (size > 0 ? size+1 : 17); // "some" KLineEdit* edit = static_cast<KURLRequester*>( m_widget )->lineEdit(); - TQSize s = edit->style().tqsizeFromContents(TQStyle::CT_LineEdit, + TQSize s = edit->style().sizeFromContents(TQStyle::CT_LineEdit, edit, TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth())) .expandedTo(TQApplication::globalStrut()); diff --git a/tdehtml/tdehtml_settings.cpp b/tdehtml/tdehtml_settings.cpp index 7f799e311..2e4c5dcb6 100644 --- a/tdehtml/tdehtml_settings.cpp +++ b/tdehtml/tdehtml_settings.cpp @@ -442,7 +442,7 @@ void TDEHTMLSettings::init( TDEConfig * config, bool reset ) d->m_fallbackAccessKeysAssignments.clear(); for( TQStringList::ConstIterator it = accesskeys.begin(); it != accesskeys.end(); ++it ) if( (*it).length() > 2 && (*it)[ 1 ] == ':' ) - d->m_fallbackAccessKeysAssignments.append( tqMakePair( (*it).mid( 2 ), (*it)[ 0 ] )); + d->m_fallbackAccessKeysAssignments.append( qMakePair( (*it).mid( 2 ), (*it)[ 0 ] )); } // Colors diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp index a00b072b9..22b71051f 100644 --- a/tdehtml/xml/dom_nodeimpl.cpp +++ b/tdehtml/xml/dom_nodeimpl.cpp @@ -1659,7 +1659,7 @@ NodeImpl *NodeListImpl::item( unsigned long index ) const bool usedCache = false; if (m_cache->current.node) { //Compute distance from the requested index to the cache node - long cacheDist = QABS(long(index) - long(m_cache->position)); + long cacheDist = TQABS(long(index) - long(m_cache->position)); if (cacheDist < (long)index) { //Closer to the cached position usedCache = true; |