summaryrefslogtreecommitdiffstats
path: root/tdeui/kstatusbar.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
commit7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch)
treec76702a7f6310fbe9d437e347535422e836e94e9 /tdeui/kstatusbar.cpp
parenta2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff)
parent27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff)
downloadtdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz
tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdeui/kstatusbar.cpp')
-rw-r--r--tdeui/kstatusbar.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp
index b70c8ae9c..daa22f46b 100644
--- a/tdeui/kstatusbar.cpp
+++ b/tdeui/kstatusbar.cpp
@@ -20,8 +20,8 @@
#include <kdebug.h>
#include <kstatusbar.h>
-#include <kconfig.h>
-#include <kglobal.h>
+#include <tdeconfig.h>
+#include <tdeglobal.h>
KStatusBarLabel::KStatusBarLabel( const TQString& text, int _id,
@@ -63,7 +63,7 @@ KStatusBar::KStatusBar( TQWidget *parent, const char *name )
{
// make the size grip stuff configurable
// ...but off by default (sven)
- KConfig *config = KGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
TQString group(config->group());
config->setGroup(TQString::fromLatin1("StatusBar style"));
bool grip_enabled = config->readBoolEntry(TQString::fromLatin1("SizeGripEnabled"), false);