summaryrefslogtreecommitdiffstats
path: root/kcontrol/privacy
diff options
context:
space:
mode:
authorAutomated System <[email protected]>2013-02-15 22:07:52 -0600
committerAutomated System <[email protected]>2013-02-15 22:07:52 -0600
commit0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch)
tree8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /kcontrol/privacy
parentb2502b94cf23298f676853d91188b2cacc6ab0bd (diff)
parent77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (diff)
downloadtdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.tar.gz
tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol/privacy')
-rw-r--r--kcontrol/privacy/kprivacymanager.cpp2
-rw-r--r--kcontrol/privacy/privacy.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index 4336b6058..c52c1b5c4 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -24,7 +24,7 @@
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kprocess.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <tderecentdocument.h>
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index 52dac1921..535aa21cf 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -29,10 +29,10 @@
#include <tdeaboutdata.h>
#include <tdeconfig.h>
#include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <ktextedit.h>
#include "privacy.h"