summaryrefslogtreecommitdiffstats
path: root/kiconedit
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:03:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:03:37 -0600
commit2e25fa39cd67cca2472d3eabdb478feb517d72a5 (patch)
tree63725962f632d152cbf20709191d39f6fc865966 /kiconedit
parent190d88dfc662f3fc466c9d1f53acbbea65f33c49 (diff)
downloadtdegraphics-2e25fa39cd67cca2472d3eabdb478feb517d72a5.tar.gz
tdegraphics-2e25fa39cd67cca2472d3eabdb478feb517d72a5.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kiconedit')
-rw-r--r--kiconedit/CMakeLists.txt2
-rw-r--r--kiconedit/kicon.cpp4
-rw-r--r--kiconedit/kiconconfig.cpp2
-rw-r--r--kiconedit/kiconedit.cpp2
-rw-r--r--kiconedit/knew.cpp2
-rw-r--r--kiconedit/main.cpp2
-rw-r--r--kiconedit/properties.cpp2
7 files changed, 8 insertions, 8 deletions
diff --git a/kiconedit/CMakeLists.txt b/kiconedit/CMakeLists.txt
index fbd10516..285760ce 100644
--- a/kiconedit/CMakeLists.txt
+++ b/kiconedit/CMakeLists.txt
@@ -37,6 +37,6 @@ tde_add_executable( kiconedit AUTOMOC
kiconcolors.cpp kcolorgrid.cpp palettetoolbar.cpp
kicon.cpp kresize.cpp knew.cpp properties.cpp
kiconeditslots.cpp kiconconfig.cpp
- LINK kio-shared tdeprint-shared
+ LINK tdeio-shared tdeprint-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kiconedit/kicon.cpp b/kiconedit/kicon.cpp
index b16a78b5..d5ee400a 100644
--- a/kiconedit/kicon.cpp
+++ b/kiconedit/kicon.cpp
@@ -23,8 +23,8 @@
#include <tqimage.h>
#include <kmessagebox.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
#include <kimageio.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp
index 1a2d7bf2..3dbd10e7 100644
--- a/kiconedit/kiconconfig.cpp
+++ b/kiconedit/kiconconfig.cpp
@@ -32,7 +32,7 @@
#include <kapplication.h>
#include <klocale.h>
#include <kcolorbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <kdebug.h>
#include <kurlrequester.h>
diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp
index 8f93dc37..0afd63c4 100644
--- a/kiconedit/kiconedit.cpp
+++ b/kiconedit/kiconedit.cpp
@@ -23,7 +23,7 @@
#include <kpopupmenu.h>
#include <kstdaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kdebug.h>
diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp
index 1c25fe2f..11f27ba8 100644
--- a/kiconedit/knew.cpp
+++ b/kiconedit/knew.cpp
@@ -24,7 +24,7 @@
#include <tqradiobutton.h>
#include <tqpushbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <kglobal.h>
#include <kiconloader.h>
diff --git a/kiconedit/main.cpp b/kiconedit/main.cpp
index 1d6ca16d..a64cbf9e 100644
--- a/kiconedit/main.cpp
+++ b/kiconedit/main.cpp
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kaboutdata.h>
#include <kcmdlineargs.h>
#include <kdebug.h>
diff --git a/kiconedit/properties.cpp b/kiconedit/properties.cpp
index f9ad44b4..8d42c039 100644
--- a/kiconedit/properties.cpp
+++ b/kiconedit/properties.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kapplication.h>