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

---
 kcoloredit/kcoloredit.cpp     | 2 +-
 kcoloredit/kcoloredit.h       | 4 ++--
 kcoloredit/kxycolorselector.h | 2 +-
 kcoloredit/kzcolorselector.h  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kcoloredit')

diff --git a/kcoloredit/kcoloredit.cpp b/kcoloredit/kcoloredit.cpp
index 7ecc032e..d5079fa6 100644
--- a/kcoloredit/kcoloredit.cpp
+++ b/kcoloredit/kcoloredit.cpp
@@ -36,7 +36,7 @@
 #include "kcoloreditdoc.h"
 #include "loadpalettedlg.h"
 #include "resource.h"
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
 
 
diff --git a/kcoloredit/kcoloredit.h b/kcoloredit/kcoloredit.h
index 557cdc02..81e8b200 100644
--- a/kcoloredit/kcoloredit.h
+++ b/kcoloredit/kcoloredit.h
@@ -27,8 +27,8 @@
 
 // include files for KDE
 #include <kapplication.h>
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 
 // application specific includes
 #include "color.h"
diff --git a/kcoloredit/kxycolorselector.h b/kcoloredit/kxycolorselector.h
index 0016dac7..276174ff 100644
--- a/kcoloredit/kxycolorselector.h
+++ b/kcoloredit/kxycolorselector.h
@@ -19,7 +19,7 @@
 #define KXYCOLORSELECTOR_H
 
 #include <tqwidget.h>
-#include <kselect.h>
+#include <tdeselect.h>
 
 #include "main.h"
 
diff --git a/kcoloredit/kzcolorselector.h b/kcoloredit/kzcolorselector.h
index 6afd369d..cae9d1c5 100644
--- a/kcoloredit/kzcolorselector.h
+++ b/kcoloredit/kzcolorselector.h
@@ -20,7 +20,7 @@
 
 #include "tqcolor.h"
 #include "tqpixmap.h"
-#include "kselect.h"
+#include "tdeselect.h"
 
 #include "color.h"
 
-- 
cgit v1.2.1