summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:51:10 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:51:10 -0600
commit3fb9fe1123909b59dcaf2ff3bffe229abe2a0000 (patch)
tree18e3760967e7c88d2c565e3decf46f073b48e97a /src
parent35b94200603bd8a48262c8a3899e603d68acaab6 (diff)
downloadpotracegui-3fb9fe1123909b59dcaf2ff3bffe229abe2a0000.tar.gz
potracegui-3fb9fe1123909b59dcaf2ff3bffe229abe2a0000.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp2
-rw-r--r--src/mainwidget.cpp4
-rw-r--r--src/potracegui.cpp6
3 files changed, 6 insertions, 6 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 0bc32e9..6ff31b5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,7 +23,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] =
I18N_NOOP("An interface for potrace and autotrace");
diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp
index 7762784..19833ee 100644
--- a/src/mainwidget.cpp
+++ b/src/mainwidget.cpp
@@ -37,12 +37,12 @@
#include <tdefiledialog.h>
#include <kimageio.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcombobox.h>
#include <kcolorbutton.h>
#include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <cstdlib>
#include <fstream>
diff --git a/src/potracegui.cpp b/src/potracegui.cpp
index 8a01db8..c361ef0 100644
--- a/src/potracegui.cpp
+++ b/src/potracegui.cpp
@@ -25,10 +25,10 @@
#include <tqclipboard.h>
#include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstatusbar.h>
#include <tdetoolbar.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tdepopupmenu.h>
#include <tdestdaccel.h>
#include <tdeaction.h>
@@ -37,7 +37,7 @@
#include <kimageio.h>
#include <kkeydialog.h>
#include <kedittoolbar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
potracegui::potracegui()
: TDEMainWindow( 0, "potracegui" ), m_centralWidget(new MainWidget(this))