summaryrefslogtreecommitdiffstats
path: root/tdeui/kpushbutton.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /tdeui/kpushbutton.cpp
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kpushbutton.cpp')
-rw-r--r--tdeui/kpushbutton.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp
index 07127cdc8..c61d140dd 100644
--- a/tdeui/kpushbutton.cpp
+++ b/tdeui/kpushbutton.cpp
@@ -114,7 +114,7 @@ void KPushButton::init( const KGuiItem &item )
void KPushButton::readSettings()
{
- s_useIcons = KGlobalSettings::showIconsOnPushButtons();
+ s_useIcons = TDEGlobalSettings::showIconsOnPushButtons();
}
void KPushButton::setGuiItem( const KGuiItem& item )
@@ -195,7 +195,7 @@ void KPushButton::mouseMoveEvent( TQMouseEvent *e )
if ( (e->state() & Qt::LeftButton) &&
(e->pos() - startPos).manhattanLength() >
- KGlobalSettings::dndEventDelay() )
+ TDEGlobalSettings::dndEventDelay() )
{
startDrag();
setDown( false );