summaryrefslogtreecommitdiffstats
path: root/kicker/extensions/kasbar/kasitem.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kicker/extensions/kasbar/kasitem.cpp
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker/extensions/kasbar/kasitem.cpp')
-rw-r--r--kicker/extensions/kasbar/kasitem.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp
index 323148713..866f6eb57 100644
--- a/kicker/extensions/kasbar/kasitem.cpp
+++ b/kicker/extensions/kasbar/kasitem.cpp
@@ -341,7 +341,7 @@ void KasItem::paintLabel( TQPainter *p )
}
}
- p->setFont( KGlobalSettings::taskbarFont() );
+ p->setFont( TDEGlobalSettings::taskbarFont() );
p->setPen( resources()->labelPenColor() );
if ( fontMetrics().width( text ) > extent()-4 )
@@ -405,7 +405,7 @@ void KasItem::paintArrowLabel( TQPainter *p, int arrowSize, bool arrowOnLeft )
w -= arrowSize;
}
- p->setFont( KGlobalSettings::taskbarFont() );
+ p->setFont( TDEGlobalSettings::taskbarFont() );
p->setPen( resources()->labelPenColor() );
if ( fontMetrics().width( text ) > w )
p->drawText( lx, ly, w, h-1, AlignLeft | AlignVCenter, text );