summaryrefslogtreecommitdiffstats
path: root/tdeui/ktabbar.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:47:22 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /tdeui/ktabbar.cpp
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/ktabbar.cpp')
-rw-r--r--tdeui/ktabbar.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp
index a2d20a505..35242da4c 100644
--- a/tdeui/ktabbar.cpp
+++ b/tdeui/ktabbar.cpp
@@ -123,7 +123,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
mDragSwitchTab = 0;
}
- int delay = KGlobalSettings::dndEventDelay();
+ int delay = TDEGlobalSettings::dndEventDelay();
TQPoint newPos = e->pos();
if( newPos.x() > mDragStart.x()+delay || newPos.x() < mDragStart.x()-delay ||
newPos.y() > mDragStart.y()+delay || newPos.y() < mDragStart.y()-delay )
@@ -136,7 +136,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
}
else if ( e->state() == Qt::MidButton ) {
if (mReorderStartTab==-1) {
- int delay = KGlobalSettings::dndEventDelay();
+ int delay = TDEGlobalSettings::dndEventDelay();
TQPoint newPos = e->pos();
if( newPos.x() > mDragStart.x()+delay || newPos.x() < mDragStart.x()-delay ||
newPos.y() > mDragStart.y()+delay || newPos.y() < mDragStart.y()-delay )
@@ -191,7 +191,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
}
mHoverCloseButton = new TQPushButton( this );
- mHoverCloseButton->setIconSet( KGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) );
+ mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Toolbar, KIcon::SizeSmall) );
mHoverCloseButton->setGeometry( rect );
TQToolTip::add(mHoverCloseButton,i18n("Close this tab"));
mHoverCloseButton->setFlat(true);