summaryrefslogtreecommitdiffstats
path: root/tdescreensaver/tdepartsaver
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:15 -0600
commitce1660ccd810825d9e087d0e9bc27dd4aea3e08a (patch)
tree57df8fa20601c7b06117399bd921a485b7476e4a /tdescreensaver/tdepartsaver
parent2a66a2cdb1c9c8017e821e34ec93732761b14d47 (diff)
downloadtdeartwork-ce1660ccd810825d9e087d0e9bc27dd4aea3e08a.tar.gz
tdeartwork-ce1660ccd810825d9e087d0e9bc27dd4aea3e08a.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdescreensaver/tdepartsaver')
-rw-r--r--tdescreensaver/tdepartsaver/configwidget.ui2
-rw-r--r--tdescreensaver/tdepartsaver/tdepartsaver.cpp2
-rw-r--r--tdescreensaver/tdepartsaver/tdepartsaver.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/tdescreensaver/tdepartsaver/configwidget.ui b/tdescreensaver/tdepartsaver/configwidget.ui
index a246d8f4..75fc07db 100644
--- a/tdescreensaver/tdepartsaver/configwidget.ui
+++ b/tdescreensaver/tdepartsaver/configwidget.ui
@@ -293,7 +293,7 @@
</vbox>
</widget>
<includes>
- <include location="global" impldecl="in declaration">klocale.h</include>
+ <include location="global" impldecl="in declaration">tdelocale.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.cpp b/tdescreensaver/tdepartsaver/tdepartsaver.cpp
index 10eb9a5a..69628e66 100644
--- a/tdescreensaver/tdepartsaver/tdepartsaver.cpp
+++ b/tdescreensaver/tdepartsaver/tdepartsaver.cpp
@@ -32,7 +32,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <klibloader.h>
diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.h b/tdescreensaver/tdepartsaver/tdepartsaver.h
index feba06ed..8ce95052 100644
--- a/tdescreensaver/tdepartsaver/tdepartsaver.h
+++ b/tdescreensaver/tdepartsaver/tdepartsaver.h
@@ -31,7 +31,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeconfig.h>