summaryrefslogtreecommitdiffstats
path: root/tdecore/kglobalsettings.h
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 /tdecore/kglobalsettings.h
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kglobalsettings.h')
-rw-r--r--tdecore/kglobalsettings.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/kglobalsettings.h b/tdecore/kglobalsettings.h
index 5fad8fa5a..2d3adc5e1 100644
--- a/tdecore/kglobalsettings.h
+++ b/tdecore/kglobalsettings.h
@@ -45,7 +45,7 @@ class KURL;
*
* @author David Faure <faure@kde.org>
*/
-class TDECORE_EXPORT KGlobalSettings
+class TDECORE_EXPORT TDEGlobalSettings
{
public:
@@ -74,7 +74,7 @@ class TDECORE_EXPORT KGlobalSettings
* {
* if( !(e->state() && LeftButton)) return;
*
- * int delay = KGlobalSettings::dndEventDelay();
+ * int delay = TDEGlobalSettings::dndEventDelay();
* TQPoint newPos = e->pos();
* if(newPos.x() > mOldPos.x()+delay || newPos.x() < mOldPos.x()-delay ||
* newPos.y() > mOldPos.y()+delay || newPos.y() < mOldPos.y()-delay)