diff options
| author | Timothy Pearson <[email protected]> | 2011-12-24 11:32:45 -0600 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-06-25 03:21:35 +0200 |
| commit | 2c543c7698709f76fe49ff073056a264d9b904ec (patch) | |
| tree | c133d320b844f335abd276daeac7e7e2856c45e1 | |
| parent | 97ccef8ebcb1c875f41e70c58d29214f1838b5a2 (diff) | |
| download | basket-2c543c7698709f76fe49ff073056a264d9b904ec.tar.gz basket-2c543c7698709f76fe49ff073056a264d9b904ec.zip | |
Rename a few stragglers
(cherry picked from commit 5959ea6d0dcff36e49773b89200b42b0af4a9646)
| -rw-r--r-- | src/linklabel.cpp | 4 | ||||
| -rw-r--r-- | src/systemtray.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/linklabel.cpp b/src/linklabel.cpp index 6932dca..5cac60d 100644 --- a/src/linklabel.cpp +++ b/src/linklabel.cpp @@ -231,7 +231,7 @@ void LinkLabel::setLook(LinkLook *look) // FIXME: called externaly (so, without font.setUnderline(look->underlineOutside()); font.setItalic(look->italic()); m_title->setFont(font); - m_title->setPaletteForegroundColor( m_isSelected ? KApplication::tqpalette().active().highlightedText() : look->effectiveColor() ); + m_title->setPaletteForegroundColor( m_isSelected ? KApplication::palette().active().highlightedText() : look->effectiveColor() ); m_icon->setShown( m_icon->pixmap() && ! m_icon->pixmap()->isNull() ); @@ -323,7 +323,7 @@ void LinkLabel::setSelected(bool selected) { m_isSelected = selected; if (selected) - m_title->setPaletteForegroundColor(KApplication::tqpalette().active().highlightedText()); + m_title->setPaletteForegroundColor(KApplication::palette().active().highlightedText()); else if (m_isHovered) m_title->setPaletteForegroundColor(m_look->effectiveHoverColor()); else diff --git a/src/systemtray.cpp b/src/systemtray.cpp index 5e8df64..49f9d41 100644 --- a/src/systemtray.cpp +++ b/src/systemtray.cpp @@ -164,7 +164,7 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu) painter.setPen( TQPen(KApplication::palette().active().dark(), CIRCLE_WIDTH) ); painter.drawArc(ax + SHADOW_OFFSET, ay + SHADOW_OFFSET, tw + 2*CIRCLE_MARGINS, th + 2*CIRCLE_MARGINS, 0, 16*360); - painter.setPen( TQPen(TQt::red/*KApplication::tqpalette().active().highlight()*/, CIRCLE_WIDTH) ); + painter.setPen( TQPen(TQt::red/*KApplication::palette().active().highlight()*/, CIRCLE_WIDTH) ); painter.drawArc(ax, ay, tw + 2*CIRCLE_MARGINS, th + 2*CIRCLE_MARGINS, 0, 16*360); #if 1 // Draw the pixmap over the screenshot in case a window hide the icon: |