summaryrefslogtreecommitdiffstats
path: root/tdeioslave/trash/trashimpl.cpp
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 /tdeioslave/trash/trashimpl.cpp
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 'tdeioslave/trash/trashimpl.cpp')
-rw-r--r--tdeioslave/trash/trashimpl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
index d49123572..cf37b8b94 100644
--- a/tdeioslave/trash/trashimpl.cpp
+++ b/tdeioslave/trash/trashimpl.cpp
@@ -18,7 +18,7 @@
*/
#include "trashimpl.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <klargefile.h>
#include <tdeio/global.h>
#include <tdeio/renamedlg.h>
@@ -26,9 +26,9 @@
#include <kdebug.h>
#include <kurl.h>
#include <kdirnotify_stub.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kmountpoint.h>
#include <tdefileitem.h>
#include <tdeio/chmodjob.h>