summaryrefslogtreecommitdiffstats
path: root/twin
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:14:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:14:55 -0600
commitde9b6c9ad15f9f51812daae17cce635d1050a9ba (patch)
tree6b26400ab1a616925443c5d365246eb86c9bad57 /twin
parent4f841fbbbc5d3399535ade061699cc76363c7a3f (diff)
downloadtdebase-de9b6c9ad15f9f51812daae17cce635d1050a9ba.tar.gz
tdebase-de9b6c9ad15f9f51812daae17cce635d1050a9ba.zip
Rename KIcon to enhance compatibility with KDE4
Diffstat (limited to 'twin')
-rw-r--r--twin/clients/b2/b2client.cpp6
-rw-r--r--twin/clients/keramik/keramik.cpp4
-rw-r--r--twin/kcmtwin/twindecoration/preview.cpp4
-rw-r--r--twin/tabbox.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 71d6fdfdd..32a1ec28a 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -1063,16 +1063,16 @@ static void redraw_pixmaps()
}
// Apply the hilight effect to the 'Hover' icons
- KIconEffect ie;
+ TDEIconEffect ie;
TQPixmap hilighted;
for (i = 0; i < P_NUM_BUTTON_TYPES; i++) {
int offset = i * NumStates;
hilighted = ie.apply(*pixmap[offset + Norm],
- KIcon::Small, KIcon::ActiveState);
+ TDEIcon::Small, TDEIcon::ActiveState);
*pixmap[offset + Hover] = hilighted;
hilighted = ie.apply(*pixmap[offset + INorm],
- KIcon::Small, KIcon::ActiveState);
+ TDEIcon::Small, TDEIcon::ActiveState);
*pixmap[offset + IHover] = hilighted;
}
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index d90291ad2..638bcce35 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -633,7 +633,7 @@ TQImage *KeramikHandler::loadImage( const TQString &name, const TQColor &col )
{
if ( col.isValid() ) {
TQImage *img = new TQImage( imageDb->image(name)->copy() );
- KIconEffect::colorize( *img, col, 1.0 );
+ TDEIconEffect::colorize( *img, col, 1.0 );
return img;
} else
return new TQImage( imageDb->image(name)->copy() );
@@ -1268,7 +1268,7 @@ void KeramikClient::updateCaptionBuffer()
} else {
if ( ! inactiveIcon ) {
TQImage img = this->icon().pixmap( TQIconSet::Small, TQIconSet::Normal ).convertToImage();
- KIconEffect::semiTransparent( img );
+ TDEIconEffect::semiTransparent( img );
inactiveIcon = new TQPixmap( img );
}
icon = inactiveIcon;
diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp
index 238bb2498..3525ac56b 100644
--- a/twin/kcmtwin/twindecoration/preview.cpp
+++ b/twin/kcmtwin/twindecoration/preview.cpp
@@ -321,8 +321,8 @@ NET::WindowType KDecorationPreviewBridge::windowType( unsigned long ) const
TQIconSet KDecorationPreviewBridge::icon() const
{
- return TQIconSet( TDEGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 16 ),
- TDEGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 32 ));
+ return TQIconSet( TDEGlobal::iconLoader()->loadIcon( "xapp", TDEIcon::NoGroup, 16 ),
+ TDEGlobal::iconLoader()->loadIcon( "xapp", TDEIcon::NoGroup, 32 ));
}
TQString KDecorationPreviewBridge::caption() const
diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp
index 7d343962f..4b9175b48 100644
--- a/twin/tabbox.cpp
+++ b/twin/tabbox.cpp
@@ -434,7 +434,7 @@ void TabBox::drawContents( TQPainter * )
if( !icon.isNull())
{
if( (*it)->isMinimized())
- KIconEffect::semiTransparent( icon );
+ TDEIconEffect::semiTransparent( icon );
p.drawPixmap( x+5, y + (lineHeight - iconWidth)/2, icon );
}