diff options
| author | Timothy Pearson <[email protected]> | 2011-12-24 11:54:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-24 11:54:22 -0600 |
| commit | 22e7adf3ed072dce5600693e9ba7c14eda94e025 (patch) | |
| tree | c20fdfcd0b7eeaf63d3ba0beb8322f1602c18f94 /khtml/ecma | |
| parent | 1180237ab336226ad932d767a6cb56208314988f (diff) | |
| download | tdelibs-22e7adf3ed072dce5600693e9ba7c14eda94e025.tar.gz tdelibs-22e7adf3ed072dce5600693e9ba7c14eda94e025.zip | |
Rename a few stragglers
Diffstat (limited to 'khtml/ecma')
| -rw-r--r-- | khtml/ecma/kjs_debugwin.cpp | 4 | ||||
| -rw-r--r-- | khtml/ecma/kjs_window.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
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) |