summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:50:50 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:50:50 -0600
commitee6c0691a841863219e4e797d797e6e0dda6ac60 (patch)
treed885d90afe7990fe34aef7de62c062d4b7609a2a
parentc74fd6afe8652ad52f51f1932e65c3c3bc605b67 (diff)
downloadkvkbd-ee6c0691a841863219e4e797d797e6e0dda6ac60.tar.gz
kvkbd-ee6c0691a841863219e4e797d797e6e0dda6ac60.zip
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--src/main.cpp2
-rw-r--r--src/resizabledragwidget.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index ee07e74..7f95969 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,7 +22,7 @@
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kuniqueapplication.h>
diff --git a/src/resizabledragwidget.cpp b/src/resizabledragwidget.cpp
index 7af09fd..609289a 100644
--- a/src/resizabledragwidget.cpp
+++ b/src/resizabledragwidget.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "resizabledragwidget.h"
#include <tqpoint.h>
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
#include "tqpainter.h"
ResizableDragWidget::ResizableDragWidget(TQWidget *parent, const char *name, WFlags f)