diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-24 11:33:05 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-28 02:54:11 +0200 |
commit | eb5f3be5b90ae375e86dcc703e39e2313806367d (patch) | |
tree | f2153ad89c4717f75d97ebda1f98fcf31b9a1200 | |
parent | 6c5dcecc927100f39c946164e77a3006141544b2 (diff) | |
download | digikam-eb5f3be5b90ae375e86dcc703e39e2313806367d.tar.gz digikam-eb5f3be5b90ae375e86dcc703e39e2313806367d.zip |
Rename a few stragglers
(cherry picked from commit faa356af959356d0f9820cbde8dff6c387ed26f3)
-rw-r--r-- | digikam/digikam/timelinewidget.cpp | 4 | ||||
-rw-r--r-- | digikam/libs/widgets/common/dpopupmenu.cpp | 2 | ||||
-rw-r--r-- | digikam/libs/widgets/common/histogramwidget.cpp | 2 | ||||
-rw-r--r-- | digikam/libs/widgets/iccprofiles/cietonguewidget.cpp | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/digikam/digikam/timelinewidget.cpp b/digikam/digikam/timelinewidget.cpp index 99eab6a0..2d175d6d 100644 --- a/digikam/digikam/timelinewidget.cpp +++ b/digikam/digikam/timelinewidget.cpp @@ -678,7 +678,7 @@ void TimeLineWidget::updatePixmap() if (val) { if (sel) - subDateColor = tqpalette().active().highlightedText(); + subDateColor = palette().active().highlightedText(); else subDateColor = palette().active().foreground(); } @@ -862,7 +862,7 @@ void TimeLineWidget::updatePixmap() if (val) { if (sel) - subDateColor = tqpalette().active().highlightedText(); + subDateColor = palette().active().highlightedText(); else subDateColor = palette().active().foreground(); } diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp index e611591c..4e7689e2 100644 --- a/digikam/libs/widgets/common/dpopupmenu.cpp +++ b/digikam/libs/widgets/common/dpopupmenu.cpp @@ -100,7 +100,7 @@ TQColor DPopupMenu::calcPixmapColor() 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)) diff --git a/digikam/libs/widgets/common/histogramwidget.cpp b/digikam/libs/widgets/common/histogramwidget.cpp index 8cd9dd2e..56a7987c 100644 --- a/digikam/libs/widgets/common/histogramwidget.cpp +++ b/digikam/libs/widgets/common/histogramwidget.cpp @@ -384,7 +384,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*) TQPixmap pm(size()); TQPainter p1; p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this)); - p1.fillRect(0, 0, size().width(), size().height(), tqpalette().disabled().background()); + p1.fillRect(0, 0, size().width(), size().height(), palette().disabled().background()); p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine)); p1.drawRect(0, 0, width(), height()); p1.setPen(TQPen(palette().disabled().foreground(), 1, TQt::SolidLine)); diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp index 53b11def..5f9a85a6 100644 --- a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp +++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp @@ -707,7 +707,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*) if ( !isEnabled() ) { d->painter.begin(&d->pixmap); - d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().disabled().background()); + d->painter.fillRect(0, 0, size().width(), size().height(), palette().disabled().background()); d->painter.setPen(TQPen(palette().disabled().foreground(), 1, TQt::SolidLine)); d->painter.drawRect(0, 0, width(), height()); d->painter.end(); @@ -741,7 +741,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*) // ... and we render busy text. d->painter.begin(&d->pixmap); - d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().active().background()); + d->painter.fillRect(0, 0, size().width(), size().height(), palette().active().background()); d->painter.drawPixmap(width()/2 - asize /2, asize, anim); d->painter.setPen(TQPen(palette().active().text(), 1, TQt::SolidLine)); d->painter.drawRect(0, 0, width(), height()); @@ -758,7 +758,7 @@ void CIETongueWidget::paintEvent(TQPaintEvent*) if (!d->profileDataAvailable || (!d->loadingImageMode && !d->loadingImageSucess)) { d->painter.begin(&d->pixmap); - d->painter.fillRect(0, 0, size().width(), size().height(), tqpalette().active().background()); + d->painter.fillRect(0, 0, size().width(), size().height(), palette().active().background()); d->painter.setPen(TQPen(palette().active().text(), 1, TQt::SolidLine)); d->painter.drawRect(0, 0, width(), height()); d->painter.drawText(0, 0, size().width(), size().height(), TQt::AlignCenter, |