summaryrefslogtreecommitdiffstats
path: root/khtml
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-24 11:54:22 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-02 19:05:07 +0200
commitb2fbb2c5c17039c4ff309c048e6058ad4dfb3a89 (patch)
treea006c4e6cc6cd2fa0bade663e694c03c499ad508 /khtml
parentffd8d17b0ba4286d25112d69d0b04bbe50e31b26 (diff)
downloadtdelibs-b2fbb2c5c17039c4ff309c048e6058ad4dfb3a89.tar.gz
tdelibs-b2fbb2c5c17039c4ff309c048e6058ad4dfb3a89.zip
Rename a few stragglers
(cherry picked from commit 22e7adf3ed072dce5600693e9ba7c14eda94e025)
Diffstat (limited to 'khtml')
-rw-r--r--khtml/dom/css_extensions.h2
-rw-r--r--khtml/ecma/kjs_debugwin.cpp4
-rw-r--r--khtml/ecma/kjs_window.cpp2
3 files changed, 4 insertions, 4 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 <a
- * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-tqunicode-bidi">
+ * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-unicode-bidi">
* unicode-bidi property definition </a> 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 d21f60554..3b5428f4f 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)