summaryrefslogtreecommitdiffstats
path: root/kcontrol/clock
diff options
context:
space:
mode:
authorAutomated System <kb9vqf@pearsoncomputing.net>2013-02-15 22:07:52 -0600
committerAutomated System <kb9vqf@pearsoncomputing.net>2013-02-15 22:07:52 -0600
commit0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch)
tree8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /kcontrol/clock
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/clock')
-rw-r--r--kcontrol/clock/dtime.cpp4
-rw-r--r--kcontrol/clock/tzone.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp
index f46031640..d469b1ff9 100644
--- a/kcontrol/clock/dtime.cpp
+++ b/kcontrol/clock/dtime.cpp
@@ -33,9 +33,9 @@
#include <tqregexp.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdialog.h>
#include <tdeconfig.h>
diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp
index 4af720b04..518c6663d 100644
--- a/kcontrol/clock/tzone.cpp
+++ b/kcontrol/clock/tzone.cpp
@@ -29,8 +29,8 @@
#include <tqfile.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdialog.h>
#include <tdeio/netaccess.h>
@@ -39,7 +39,7 @@
#include "tzone.moc"
#if defined(USE_SOLARIS)
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kstandarddirs.h>
#include <sys/param.h>
#include <sys/types.h>