From c46f36d00839916c8b6cde8ed2ca54aeb40dba19 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:23:27 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kimagemapeditor/arealistview.cpp    | 2 +-
 kimagemapeditor/imageslistview.h    | 2 +-
 kimagemapeditor/kimagemapeditor.cpp | 4 ++--
 kimagemapeditor/kimeshell.cpp       | 2 +-
 kimagemapeditor/mapslistview.cpp    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kimagemapeditor')

diff --git a/kimagemapeditor/arealistview.cpp b/kimagemapeditor/arealistview.cpp
index 3739114a..4dceda41 100644
--- a/kimagemapeditor/arealistview.cpp
+++ b/kimagemapeditor/arealistview.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 // QT
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpushbutton.h>
 #include <tqhbox.h>
 #include <tqwhatsthis.h>
diff --git a/kimagemapeditor/imageslistview.h b/kimagemapeditor/imageslistview.h
index 1a118d2f..24bac7a0 100644
--- a/kimagemapeditor/imageslistview.h
+++ b/kimagemapeditor/imageslistview.h
@@ -18,7 +18,7 @@
 #ifndef _IMAGESLISTVIEW_H_
 #define _IMAGESLISTVIEW_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 
 #include "kimagemapeditor.h"
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index bccccc7c..84756747 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -42,8 +42,8 @@
 #include <kcommand.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kaccel.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp
index 3914ac50..f27b475c 100644
--- a/kimagemapeditor/kimeshell.cpp
+++ b/kimagemapeditor/kimeshell.cpp
@@ -18,7 +18,7 @@
 
 #include <iostream>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
diff --git a/kimagemapeditor/mapslistview.cpp b/kimagemapeditor/mapslistview.cpp
index 399ad2b5..fee8f147 100644
--- a/kimagemapeditor/mapslistview.cpp
+++ b/kimagemapeditor/mapslistview.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 // KDE
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kdebug.h>
 
-- 
cgit v1.2.1