summaryrefslogtreecommitdiffstats
path: root/src/helpers
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:52:00 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:52:00 -0600
commit5b341c1d7f5e40a531de253b2c6ba37a427146e7 (patch)
tree118204e14298c7f1a58535622686696afb4c64cb /src/helpers
parent13e480c92e41a25f2ff3e3a13062e57f183e19ed (diff)
downloadtdesvn-5b341c1d7f5e40a531de253b2c6ba37a427146e7.tar.gz
tdesvn-5b341c1d7f5e40a531de253b2c6ba37a427146e7.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/helpers')
-rw-r--r--src/helpers/ktranslateurl.cpp2
-rw-r--r--src/helpers/sub2qt.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/helpers/ktranslateurl.cpp b/src/helpers/ktranslateurl.cpp
index 4fc4d1c..ab863a4 100644
--- a/src/helpers/ktranslateurl.cpp
+++ b/src/helpers/ktranslateurl.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "ktranslateurl.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <tdefileitem.h>
diff --git a/src/helpers/sub2qt.cpp b/src/helpers/sub2qt.cpp
index cc18b4e..35cf248 100644
--- a/src/helpers/sub2qt.cpp
+++ b/src/helpers/sub2qt.cpp
@@ -20,8 +20,8 @@
#include "sub2qt.h"
#include "datetime.hpp"
-#include "kglobal.h"
-#include "klocale.h"
+#include "tdeglobal.h"
+#include "tdelocale.h"
#include <tqmap.h>
namespace helpers {