From 2e25fa39cd67cca2472d3eabdb478feb517d72a5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:03:37 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kcoloredit/CMakeLists.txt     | 2 +-
 kcoloredit/kcoloredit.cpp     | 4 ++--
 kcoloredit/loadpalettedlg.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kcoloredit')

diff --git a/kcoloredit/CMakeLists.txt b/kcoloredit/CMakeLists.txt
index caf8e202..ad3d5552 100644
--- a/kcoloredit/CMakeLists.txt
+++ b/kcoloredit/CMakeLists.txt
@@ -43,7 +43,7 @@ tde_add_executable( kcoloredit AUTOMOC
     kxycolorselector.cpp paletteview.cpp paletteviewscrolledarea.cpp
     editablestreamhistory.cpp color.cpp palette.cpp loadpalettedlg.cpp
     kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/kcoloredit/kcoloredit.cpp b/kcoloredit/kcoloredit.cpp
index 5b0dffb9..8e62a2d6 100644
--- a/kcoloredit/kcoloredit.cpp
+++ b/kcoloredit/kcoloredit.cpp
@@ -23,11 +23,11 @@
 // include files for KDE
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmenubar.h>
 #include <klocale.h>
 #include <kcolordialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 // application specific includes
diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp
index 23def4d5..ead23eff 100644
--- a/kcoloredit/loadpalettedlg.cpp
+++ b/kcoloredit/loadpalettedlg.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kpalette.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "main.h"
 #include "palette.h"
-- 
cgit v1.2.3