From 22e7adf3ed072dce5600693e9ba7c14eda94e025 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 24 Dec 2011 11:54:22 -0600 Subject: Rename a few stragglers --- khtml/dom/css_extensions.h | 2 +- khtml/ecma/kjs_debugwin.cpp | 4 ++-- khtml/ecma/kjs_window.cpp | 2 +- kstyles/light/lightstyle-v3.cpp | 4 ++-- kutils/kmultitabbar.cpp | 6 +++--- tdecore/network/kresolver.cpp | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/khtml/dom/css_extensions.h b/khtml/dom/css_extensions.h index e93cb7d21..a6cdb2149 100644 --- a/khtml/dom/css_extensions.h +++ b/khtml/dom/css_extensions.h @@ -2515,7 +2515,7 @@ public: /** * See the + * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-unicode-bidi"> * unicode-bidi property definition in CSS2. * */ diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp index f7ba774f8..8e605d79c 100644 --- a/khtml/ecma/kjs_debugwin.cpp +++ b/khtml/ecma/kjs_debugwin.cpp @@ -216,8 +216,8 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw, TQColor textColor; if (lineno == m_currentLine) { - bgColor = tqpalette().active().highlight(); - textColor = tqpalette().active().highlightedText(); + bgColor = palette().active().highlight(); + textColor = palette().active().highlightedText(); } else if (m_debugWin->haveBreakpoint(m_sourceFile,lineno+1,lineno+1)) { bgColor = palette().active().text(); diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp index 998737ff2..e0e81de73 100644 --- a/khtml/ecma/kjs_window.cpp +++ b/khtml/ecma/kjs_window.cpp @@ -1633,7 +1633,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString if (winargs.y < screen.y() || winargs.y > screen.bottom()) winargs.y = screen.y(); // only safe choice until size is determined } else if (key == "height") { - winargs.height = (int)val.toFloat() + 2*tqApp->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; + winargs.height = (int)val.toFloat() + 2*tqApp->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; if (winargs.height > screen.height()) // should actually check workspace winargs.height = screen.height(); if (winargs.height < 100) diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp index 94e4d09d0..af062f4f9 100644 --- a/kstyles/light/lightstyle-v3.cpp +++ b/kstyles/light/lightstyle-v3.cpp @@ -847,7 +847,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control, if ( flags & Style_Selected ) { - p->fillRect( br.right() - 3, br.top() + 1, 3, br.height() - 1, cg.tqbrush(TQColorGroup::Highlight)); + p->fillRect( br.right() - 3, br.top() + 1, 3, br.height() - 1, cg.brush(TQColorGroup::Highlight)); br.addCoords( 1, 1, -4, 0 ); } else @@ -885,7 +885,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control, if ( flags & Style_Selected ) { - p->fillRect( br.right() - 2, br.top(), 3, br.height(), cg.tqbrush(TQColorGroup::Highlight)); + p->fillRect( br.right() - 2, br.top(), 3, br.height(), cg.brush(TQColorGroup::Highlight)); br.addCoords( 1, 0, -3, -1 ); } else diff --git a/kutils/kmultitabbar.cpp b/kutils/kmultitabbar.cpp index 914258899..082470538 100644 --- a/kutils/kmultitabbar.cpp +++ b/kutils/kmultitabbar.cpp @@ -650,8 +650,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { if (isOn()) st|=TQStyle::Style_On; - tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); - tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); + style().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); + style().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); switch (m_position) { case KMultiTabBar::Left: @@ -667,7 +667,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { paint->drawPixmap(0,0,pixmap); break; } -// tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), +// style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), // colorGroup(),TQStyle::Style_Enabled); diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp index 6271fe7f6..672edb5af 100644 --- a/tdecore/network/kresolver.cpp +++ b/tdecore/network/kresolver.cpp @@ -1118,7 +1118,7 @@ static TQCString ToASCII(const TQString& label) static TQString ToUnicode(const TQString& label) { #ifdef HAVE_IDNA_H - // We have idna.h, so we can use the idna_to_tqunicode + // We have idna.h, so we can use the idna_to_unicode // function :) TQ_UINT32 *ucs4_input, *ucs4_output; -- cgit v1.2.3