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

---
 kview/modules/browser/kmyfileitemlist.cpp               | 2 +-
 kview/modules/browser/kviewbrowser.h                    | 2 +-
 kview/modules/presenter/CMakeLists.txt                  | 2 +-
 kview/modules/presenter/config/CMakeLists.txt           | 2 +-
 kview/modules/presenter/config/Makefile.am              | 2 +-
 kview/modules/presenter/config/kviewpresenterconfig.cpp | 2 +-
 kview/modules/presenter/imagelistdialog.ui              | 4 ++--
 kview/modules/presenter/kviewpresenter.cpp              | 4 ++--
 kview/modules/presenter/kviewpresenterconfmodule.cpp    | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'kview/modules')

diff --git a/kview/modules/browser/kmyfileitemlist.cpp b/kview/modules/browser/kmyfileitemlist.cpp
index 28c3cb08..24d70527 100644
--- a/kview/modules/browser/kmyfileitemlist.cpp
+++ b/kview/modules/browser/kmyfileitemlist.cpp
@@ -18,7 +18,7 @@
 // $Id$
 
 #include "kmyfileitemlist.h"
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 KMyFileItemList::KMyFileItemList() {}
 KMyFileItemList::KMyFileItemList( const TQPtrList<KFileItem> & l ) : TQPtrList<KFileItem>( l ) {}
diff --git a/kview/modules/browser/kviewbrowser.h b/kview/modules/browser/kviewbrowser.h
index 985ec564..a26b90c1 100644
--- a/kview/modules/browser/kviewbrowser.h
+++ b/kview/modules/browser/kviewbrowser.h
@@ -21,7 +21,7 @@
 #define __kviewbrowser_h
 
 #include <tdeparts/plugin.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 namespace KImageViewer { class Viewer; }
 
diff --git a/kview/modules/presenter/CMakeLists.txt b/kview/modules/presenter/CMakeLists.txt
index a34cc893..aa21d851 100644
--- a/kview/modules/presenter/CMakeLists.txt
+++ b/kview/modules/presenter/CMakeLists.txt
@@ -36,6 +36,6 @@ install( FILES
 tde_add_kpart( kview_presenterplugin AUTOMOC
   SOURCES
     imagelistitem.cpp imagelistdialog.ui kviewpresenter.cpp
-  LINK kio-shared tdeparts-shared
+  LINK tdeio-shared tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/modules/presenter/config/CMakeLists.txt b/kview/modules/presenter/config/CMakeLists.txt
index b8dfc56a..e359bee9 100644
--- a/kview/modules/presenter/config/CMakeLists.txt
+++ b/kview/modules/presenter/config/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 
 install( FILES
     kviewpresenterconfig.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kcm_kviewpresenterconfig (module) #########
diff --git a/kview/modules/presenter/config/Makefile.am b/kview/modules/presenter/config/Makefile.am
index 8c212e7f..88d3d479 100644
--- a/kview/modules/presenter/config/Makefile.am
+++ b/kview/modules/presenter/config/Makefile.am
@@ -9,7 +9,7 @@ kcm_kviewpresenterconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcm_kviewpresenterconfig_la_LIBADD = $(LIB_KUTILS)
 
 kcm_kviewpresenterconfig_DATA = kviewpresenterconfig.desktop
-kcm_kviewpresenterconfigdir = $(kde_servicesdir)/kconfiguredialog
+kcm_kviewpresenterconfigdir = $(kde_servicesdir)/tdeconfiguredialog
 
 METASOURCES = AUTO
 
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp
index 7ed447c2..c3682d5f 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.cpp
+++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 
 typedef KGenericFactory<KViewPresenterConfig, TQWidget> KViewPresenterConfigFactory;
diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index 05d3b90f..8878eab6 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -256,9 +256,9 @@
     <include location="global" impldecl="in declaration">kdialog.h</include>
     <include location="global" impldecl="in implementation">kdebug.h</include>
     <include location="global" impldecl="in implementation">kimageviewer/viewer.h</include>
-    <include location="global" impldecl="in implementation">kio/netaccess.h</include>
+    <include location="global" impldecl="in implementation">tdeio/netaccess.h</include>
     <include location="global" impldecl="in implementation">kurl.h</include>
-    <include location="global" impldecl="in implementation">kfiledialog.h</include>
+    <include location="global" impldecl="in implementation">tdefiledialog.h</include>
     <include location="global" impldecl="in implementation">tqstring.h</include>
     <include location="global" impldecl="in implementation">kmessagebox.h</include>
     <include location="local" impldecl="in implementation">imagelistitem.h</include>
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index 534b305c..b7aef984 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -39,11 +39,11 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <knuminput.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimageio.h>
 #include <kimageviewer/viewer.h>
 #include <kimageviewer/canvas.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kurldrag.h>
diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp
index 1c79ee15..df9622b8 100644
--- a/kview/modules/presenter/kviewpresenterconfmodule.cpp
+++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KViewPresenterConfModule::KViewPresenterConfModule( TQObject * parent )
 	: KPreferencesModule( "kviewpresenter", parent, "KView Presenter Config Module" )
-- 
cgit v1.2.1