Rename a few stragglers

pull/2/head
Timothy Pearson 14 years ago
parent b492b550f3
commit a2146f655c

@ -342,7 +342,7 @@ bool KMemoryWidget::Display_Graph(int widgetindex,
/* draw surrounding box */ /* draw surrounding box */
paint.setPen(pen); paint.setPen(pen);
TQRect r = graph->rect(); 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(); paint.end();
bitBlt(graph, 0, 0, &pm); bitBlt(graph, 0, 0, &pm);

@ -1378,7 +1378,7 @@ void ExtensionContainer::updateHighlightColor()
{ {
KConfig *config = KGlobal::config(); KConfig *config = KGlobal::config();
config->setGroup("WM"); config->setGroup("WM");
TQColor color = TQApplication::tqpalette().active().highlight(); TQColor color = TQApplication::palette().active().highlight();
m_highlightColor = config->readColorEntry("activeBackground", &color); m_highlightColor = config->readColorEntry("activeBackground", &color);
update(); update();
} }

@ -291,7 +291,7 @@ void AddAppletDialog::resizeAppletView()
{ {
m_appletBox->layout()->activate(); m_appletBox->layout()->activate();
w = v->visibleWidth(); w = v->visibleWidth();
h = m_appletBox->tqlayout()->minimumSize().height(); h = m_appletBox->layout()->minimumSize().height();
v->resizeContents(w, QMAX(h, v->visibleHeight())); v->resizeContents(w, QMAX(h, v->visibleHeight()));
if (w == m_appletBox->width() && h == m_appletBox->height()) if (w == m_appletBox->width() && h == m_appletBox->height())
break; break;

@ -328,7 +328,7 @@ void colorize(TQImage& image)
{ {
KConfig *config = KGlobal::config(); KConfig *config = KGlobal::config();
config->setGroup("WM"); config->setGroup("WM");
TQColor color = TQApplication::tqpalette().active().highlight(); TQColor color = TQApplication::palette().active().highlight();
TQColor activeTitle = config->readColorEntry("activeBackground", &color); TQColor activeTitle = config->readColorEntry("activeBackground", &color);
TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &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; int h1, s1, v1, h2, s2, v2, h3, s3, v3;
activeTitle.hsv(&h1, &s1, &v1); activeTitle.hsv(&h1, &s1, &v1);
inactiveTitle.hsv(&h2, &s2, &v2); 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)) && 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)) ((kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < 32) || (s1 < 32)) && (s2 > s1))

Loading…
Cancel
Save