diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:28 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:28 -0600 |
| commit | 934db26c3f8efe148a5680c22f965ee10f818a61 (patch) | |
| tree | 4a47cbb3ef398d11fa9283b5afdcd0a8d84fad7c /src/basket.cpp | |
| parent | a1fb52e00e362130a46b34570e53f2c1f322f373 (diff) | |
| download | basket-934db26c3f8efe148a5680c22f965ee10f818a61.tar.gz basket-934db26c3f8efe148a5680c22f965ee10f818a61.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/basket.cpp')
| -rw-r--r-- | src/basket.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/basket.cpp b/src/basket.cpp index a20a5c9..69b941e 100644 --- a/src/basket.cpp +++ b/src/basket.cpp @@ -2767,7 +2767,7 @@ void Basket::drawInserter(TQPainter &painter, int xPainter, int yPainter) TQColor dark = TDEApplication::palette().active().dark(); TQColor light = dark.light().light(); if (m_inserterGroup && Settings::groupOnInsertionLine()) - light = Tools::mixColor(light, KGlobalSettings::highlightColor()); + light = Tools::mixColor(light, TDEGlobalSettings::highlightColor()); painter.setPen(dark); // The horizontal line: //painter.drawRect( rect.x(), rect.y() + lineY, rect.width(), 2); @@ -3017,7 +3017,7 @@ void Basket::animateLoad() TQColor Basket::selectionRectInsideColor() { - return Tools::mixColor(Tools::mixColor(backgroundColor(), KGlobalSettings::highlightColor()), backgroundColor()); + return Tools::mixColor(Tools::mixColor(backgroundColor(), TDEGlobalSettings::highlightColor()), backgroundColor()); } TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const int a) @@ -3088,7 +3088,7 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt label->setAlignment( int( TQLabel::AlignTop ) ); layout->addMultiCellWidget( label, 0, 0, 1, 2 ); TQLabel* pixmap = new TQLabel( m_decryptBox, "pixmap" ); - pixmap->setPixmap( KGlobal::iconLoader()->loadIcon("encrypted", KIcon::NoGroup, KIcon::SizeHuge) ); + pixmap->setPixmap( TDEGlobal::iconLoader()->loadIcon("encrypted", KIcon::NoGroup, KIcon::SizeHuge) ); layout->addMultiCellWidget( pixmap, 0, 1, 0, 0 ); TQSpacerItem* spacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); @@ -3180,9 +3180,9 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt selectionRectInside.moveBy(rect.x(), rect.y()); blendBackground(painter2, selectionRectInside, rect.x(), rect.y(), true, /*&*/m_selectedBackgroundPixmap); } - painter2.setPen(KGlobalSettings::highlightColor().dark()); + painter2.setPen(TDEGlobalSettings::highlightColor().dark()); painter2.drawRect(selectionRect); - painter2.setPen(Tools::mixColor(KGlobalSettings::highlightColor().dark(), backgroundColor())); + painter2.setPen(Tools::mixColor(TDEGlobalSettings::highlightColor().dark(), backgroundColor())); painter2.drawPoint(selectionRect.topLeft()); painter2.drawPoint(selectionRect.topRight()); painter2.drawPoint(selectionRect.bottomLeft()); @@ -3649,7 +3649,7 @@ TQColor Basket::backgroundColor() if (m_backgroundColorSetting.isValid()) return m_backgroundColorSetting; else - return KGlobalSettings::baseColor(); + return TDEGlobalSettings::baseColor(); } TQColor Basket::textColor() @@ -3657,7 +3657,7 @@ TQColor Basket::textColor() if (m_textColorSetting.isValid()) return m_textColorSetting; else - return KGlobalSettings::textColor(); + return TDEGlobalSettings::textColor(); } void Basket::unbufferizeAll() |