diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:29:23 -0600 | 
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:26:26 +0200 | 
| commit | 6a1f2b1b6b19b0dd47b1e58afff29a12ae158226 (patch) | |
| tree | b3de8cec6a2df2306a13d2d884ea95a8f0c207d2 /kwin/tabbox.cpp | |
| parent | 6ca5e6d65a74d794637953bfea85c42e3bf828dd (diff) | |
| download | tdebase-6a1f2b1b6b19b0dd47b1e58afff29a12ae158226.tar.gz tdebase-6a1f2b1b6b19b0dd47b1e58afff29a12ae158226.zip | |
Rename old tq methods that no longer need a unique name
(cherry picked from commit 628043be55ddd2f534411d028e4f68c8fe4eaabb)
Diffstat (limited to 'kwin/tabbox.cpp')
| -rw-r--r-- | kwin/tabbox.cpp | 20 | 
1 files changed, 10 insertions, 10 deletions
| diff --git a/kwin/tabbox.cpp b/kwin/tabbox.cpp index 19f6560a1..e1aa9618f 100644 --- a/kwin/tabbox.cpp +++ b/kwin/tabbox.cpp @@ -400,7 +400,7 @@ void TabBox::drawContents( TQPainter * )                    {                    // draw highlight background                    if ( (*it) == current_client ) -                    p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight()); +                    p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight());                    // draw icon                    TQPixmap icon; @@ -437,11 +437,11 @@ void TabBox::drawContents( TQPainter * )                    // draw text                    if ( (*it) == current_client ) -                    p.setPen(tqcolorGroup().highlightedText()); +                    p.setPen(colorGroup().highlightedText());                    else if( (*it)->isMinimized())                      { -                    TQColor c1 = tqcolorGroup().text(); -                    TQColor c2 = tqcolorGroup().background(); +                    TQColor c1 = colorGroup().text(); +                    TQColor c2 = colorGroup().background();                      // from kicker's TaskContainer::blendColors()                      int r1, g1, b1;                      int r2, g2, b2; @@ -456,7 +456,7 @@ void TabBox::drawContents( TQPainter * )                      p.setPen(TQColor( r1, g1, b1 ));                      }                    else -                    p.setPen(tqcolorGroup().text()); +                    p.setPen(colorGroup().text());                    p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight,                                Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, s); @@ -494,13 +494,13 @@ void TabBox::drawContents( TQPainter * )              {              // draw highlight background              if ( iDesktop == desk )  // current desktop -              p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight()); +              p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight());              p.save();              // draw "icon" (here: number of desktop) -            p.fillRect(x+5, y+2, iconWidth, iconHeight, tqcolorGroup().base()); -            p.setPen(tqcolorGroup().text()); +            p.fillRect(x+5, y+2, iconWidth, iconHeight, colorGroup().base()); +            p.setPen(colorGroup().text());              p.drawRect(x+5, y+2, iconWidth, iconHeight);              // draw desktop-number @@ -512,9 +512,9 @@ void TabBox::drawContents( TQPainter * )              // draw desktop name text              if ( iDesktop == desk ) -              p.setPen(tqcolorGroup().highlightedText()); +              p.setPen(colorGroup().highlightedText());              else -              p.setPen(tqcolorGroup().text()); +              p.setPen(colorGroup().text());              p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight,                         Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, | 
