diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-24 11:51:11 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:26:35 +0200 |
| commit | 81db2daabdbee7429b708a9a845f86adbf4873ea (patch) | |
| tree | fd3546859464c85114255409364d1aadff207184 | |
| parent | 0251b10c2e9a79e857e5729453d375d09fa8336e (diff) | |
| download | tdebase-81db2daabdbee7429b708a9a845f86adbf4873ea.tar.gz tdebase-81db2daabdbee7429b708a9a845f86adbf4873ea.zip | |
Rename a few stragglers
(cherry picked from commit a2146f655c7ca3b10cf50833eefd483e635e1f4a)
| -rw-r--r-- | kcontrol/info/memory.cpp | 2 | ||||
| -rw-r--r-- | kicker/kicker/core/container_extension.cpp | 2 | ||||
| -rw-r--r-- | kicker/kicker/ui/addapplet.cpp | 2 | ||||
| -rw-r--r-- | kicker/libkicker/global.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 372bb71b9..7bfe52948 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -342,7 +342,7 @@ bool KMemoryWidget::Display_Graph(int widgetindex, /* draw surrounding box */ paint.setPen(pen); TQRect r = graph->rect(); - qDrawShadePanel(&paint, r.x(), r.y(), r.width(), r.height(), tqpalette().active(), true, 1); + qDrawShadePanel(&paint, r.x(), r.y(), r.width(), r.height(), palette().active(), true, 1); paint.end(); bitBlt(graph, 0, 0, &pm); diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index e5b70c8aa..16bb55a6d 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -1378,7 +1378,7 @@ void ExtensionContainer::updateHighlightColor() { KConfig *config = KGlobal::config(); config->setGroup("WM"); - TQColor color = TQApplication::tqpalette().active().highlight(); + TQColor color = TQApplication::palette().active().highlight(); m_highlightColor = config->readColorEntry("activeBackground", &color); update(); } diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index 133df0016..d6b144803 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -291,7 +291,7 @@ void AddAppletDialog::resizeAppletView() { m_appletBox->layout()->activate(); w = v->visibleWidth(); - h = m_appletBox->tqlayout()->minimumSize().height(); + h = m_appletBox->layout()->minimumSize().height(); v->resizeContents(w, QMAX(h, v->visibleHeight())); if (w == m_appletBox->width() && h == m_appletBox->height()) break; diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index 6f6f3a7fb..d4735c2ba 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -328,7 +328,7 @@ void colorize(TQImage& image) { KConfig *config = KGlobal::config(); config->setGroup("WM"); - TQColor color = TQApplication::tqpalette().active().highlight(); + TQColor color = TQApplication::palette().active().highlight(); TQColor activeTitle = config->readColorEntry("activeBackground", &color); TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &color); @@ -336,7 +336,7 @@ void colorize(TQImage& image) int h1, s1, v1, h2, s2, v2, h3, s3, v3; activeTitle.hsv(&h1, &s1, &v1); inactiveTitle.hsv(&h2, &s2, &v2); - TQApplication::tqpalette().active().background().hsv(&h3, &s3, &v3); + TQApplication::palette().active().background().hsv(&h3, &s3, &v3); if ( (kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < kAbs(h2-h3)+kAbs(s2-s3)+kAbs(v2-v3)) && ((kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < 32) || (s1 < 32)) && (s2 > s1)) |