summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:49:28 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:49:28 -0600
commit59664c7dfa6dd188fca3b471766f7b32f3ea08c8 (patch)
tree37bf05f17dda972f03d438da96cc064440578512
parent0ef94e0c80e663dc0710502dbae9f7380b01a751 (diff)
downloadkpicosim-59664c7dfa6dd188fca3b471766f7b32f3ea08c8.tar.gz
kpicosim-59664c7dfa6dd188fca3b471766f7b32f3ea08c8.zip
Rename additional header files to avoid conflicts with KDE4
-rwxr-xr-xsrc/codeeditor.cpp2
-rwxr-xr-xsrc/kpicosim.cpp6
-rwxr-xr-xsrc/main.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/codeeditor.cpp b/src/codeeditor.cpp
index c21be56..156aabd 100755
--- a/src/codeeditor.cpp
+++ b/src/codeeditor.cpp
@@ -21,7 +21,7 @@
#include <klibloader.h>
#include <tqmessagebox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqlayout.h>
#include <tdefiledialog.h>
diff --git a/src/kpicosim.cpp b/src/kpicosim.cpp
index 1802d41..e5de4ef 100755
--- a/src/kpicosim.cpp
+++ b/src/kpicosim.cpp
@@ -64,9 +64,9 @@
#include <tqlabel.h>
#include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tqlayout.h>
#include <tqkeysequence.h>
#include <knuminput.h>
@@ -78,7 +78,7 @@
#include "kexportdialog.h"
#include "kjtagdialog.h"
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqlayout.h>
#include <ksimpleconfig.h>
#include <khelpmenu.h>
diff --git a/src/main.cpp b/src/main.cpp
index f3c55f8..104c6d2 100755
--- 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("A TDE KPart Application");