Initial TDE conversion

24 files changed, 71 insertions, 71 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index e01521b..6a1baf9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,20 +4,20 @@ INCLUDES = -I/usr/include/qt3 $(all_includes)
 
 CXXFLAGS += $(USE_EXCEPTIONS)
 
-kde_module_LTLIBRARIES = kio_sword.la
+kde_module_LTLIBRARIES = tdeio_sword.la
 
-kio_sword_la_SOURCES = kio_sword.cpp renderer.cpp ks_osishtml.cpp ks_gbfhtml.cpp \
+tdeio_sword_la_SOURCES = tdeio_sword.cpp renderer.cpp ks_osishtml.cpp ks_gbfhtml.cpp \
 			ks_thmlhtml.cpp utils.cpp swordutils.cpp swordoptions.cpp filter.cpp template.cpp
 
-kio_sword_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(LIB_SWORD)
+tdeio_sword_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_SWORD)
 	
-kio_sword_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN)
+tdeio_sword_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN)
 
 protocol_DATA = sword.protocol
 protocoldir = $(kde_servicesdir)
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kio_sword.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_sword.pot
 
-noinst_HEADERS = kio_sword.h renderer.h swordoptions.h ks_osishtml.h \
+noinst_HEADERS = tdeio_sword.h renderer.h swordoptions.h ks_osishtml.h \
 				ks_gbfhtml.h ks_thmlhtml.h utils.h swordutils.h option.h filter.h template.h
diff --git a/src/data/Makefile.am b/src/data/Makefile.am
index 486fc57..00089e3 100644
--- a/src/data/Makefile.am
+++ b/src/data/Makefile.am
@@ -1,4 +1,4 @@
-kiosworddatadir = $(kde_datadir)/kio_sword
-kiosworddata_DATA = kio_sword.css swordvertical.png
+kiosworddatadir = $(kde_datadir)/tdeio_sword
+kiosworddata_DATA = tdeio_sword.css swordvertical.png
 
 EXTRA_DIST = $(kiosworddata_DATA)
diff --git a/src/data/kio_sword.css b/src/data/tdeio_sword.css
index bf6cdb2..52b6d66 100644
--- a/src/data/kio_sword.css
+++ b/src/data/tdeio_sword.css
@@ -17,7 +17,7 @@ div.content
 	margin: 0px;
 	background: #ffffff;
 	border: solid #808080 1px;
-	/* background-image: url('file:///usr/share/apps/kio_sword/swordvertical.png'); 
+	/* background-image: url('file:///usr/share/apps/tdeio_sword/swordvertical.png'); 
 	   background-repeat: no-repeat;
 	   background-position: 50% 50%; */
 }
diff --git a/src/data/kio_sword.css.in b/src/data/tdeio_sword.css.in
index 4b139f2..ad54f41 100644
--- a/src/data/kio_sword.css.in
+++ b/src/data/tdeio_sword.css.in
@@ -17,7 +17,7 @@ div.content
 	margin: 0px;
 	background: #ffffff;
 	border: solid #808080 1px;
-	/* background-image: url('file://@prefix@/share/apps/kio_sword/swordvertical.png'); 
+	/* background-image: url('file://@prefix@/share/apps/tdeio_sword/swordvertical.png'); 
 	   background-repeat: no-repeat;
 	   background-position: 50% 50%; */
 }
diff --git a/src/filter.h b/src/filter.h
index 0c2b4e0..c7d0bb7 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -1,6 +1,6 @@
 /***************************************************************************
     File:         filter.h
-    Project:      kio-sword -- An ioslave for SWORD and KDE
+    Project:      tdeio-sword -- An ioslave for SWORD and KDE
     Copyright:    Copyright (C) 2005 Luke Plant
  ***************************************************************************/
 
diff --git a/src/option.h b/src/option.h
index 9728270..c71d95c 100644
--- a/src/option.h
+++ b/src/option.h
@@ -24,7 +24,7 @@
 #ifndef option_h
 #define option_h
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <ntqstring.h>
 #include <ntqmap.h>
@@ -36,8 +36,8 @@ namespace KioSword
 		public:
 		virtual void readFromQueryString(TQMap<TQString, TQString> params, bool allowPropagating) = 0;
 		virtual void getQueryStringPair(TQString& name, TQString& val) = 0;
-		virtual void readFromConfig(const KConfig* config) = 0;
-		virtual void saveToConfig(KConfig* config) = 0;
+		virtual void readFromConfig(const TDEConfig* config) = 0;
+		virtual void saveToConfig(TDEConfig* config) = 0;
 		virtual void copy(const OptionBase* other) = 0;
 		
 		virtual ~OptionBase() {};
@@ -75,7 +75,7 @@ namespace KioSword
 		}
 		
 		/** return the config setting */
-		T readConfigSetting(const KConfig* config)
+		T readConfigSetting(const TDEConfig* config)
 		{
 			// We will specialise this later
 			T result;
@@ -186,7 +186,7 @@ namespace KioSword
 		}
 		
 		/** read and set the value from the config file, or set to default if no config setting */
-		virtual void readFromConfig(const KConfig* config)
+		virtual void readFromConfig(const TDEConfig* config)
 		{
 			if (!m_configName.isEmpty()) 
 			{
@@ -200,11 +200,11 @@ namespace KioSword
 		}
 		
 		/** save the value to the config file */
-		virtual void saveToConfig(KConfig* config)
+		virtual void saveToConfig(TDEConfig* config)
 		{
 			if (!m_configName.isEmpty())
 			{
-				// overloads for KConfig::writeEntry cater
+				// overloads for TDEConfig::writeEntry cater
 				// for everything we need so far
 				if (m_value != m_default_value) // keep settings file tidy
 				{
@@ -279,19 +279,19 @@ namespace KioSword
 	
 	// readConfigSetting specialisations
 	template<>
-	inline bool Option<bool>::readConfigSetting(const KConfig* config)
+	inline bool Option<bool>::readConfigSetting(const TDEConfig* config)
 	{
 		return config->readBoolEntry(m_configName, m_default_value);
 	}
 	
 	template<>
-	inline TQString Option<TQString>::readConfigSetting(const KConfig* config)
+	inline TQString Option<TQString>::readConfigSetting(const TDEConfig* config)
 	{
 		return config->readEntry(m_configName, m_default_value);
 	}
 
 	template<>
-	inline int Option<int>::readConfigSetting(const KConfig* config)
+	inline int Option<int>::readConfigSetting(const TDEConfig* config)
 	{
 		return config->readNumEntry(m_configName, m_default_value);
 	}
diff --git a/src/pics/Makefile.am b/src/pics/Makefile.am
index 7fb5403..c14cd68 100644
--- a/src/pics/Makefile.am
+++ b/src/pics/Makefile.am
@@ -1,11 +1,11 @@
-KDE_ICON = kio_sword
+KDE_ICON = tdeio_sword
 
-EXTRA_DIST = kio_sword_everything.svg \
-	kio_sword_borders.xcf \
-	hisc-app-kio_sword.svgz \
-	hi128-app-kio_sword.png \
-	hi64-app-kio_sword.png \
-	hi48-app-kio_sword.png \
-	hi32-app-kio_sword.png \
-	hi22-app-kio_sword.png \
-	hi16-app-kio_sword.png
+EXTRA_DIST = tdeio_sword_everything.svg \
+	tdeio_sword_borders.xcf \
+	hisc-app-tdeio_sword.svgz \
+	hi128-app-tdeio_sword.png \
+	hi64-app-tdeio_sword.png \
+	hi48-app-tdeio_sword.png \
+	hi32-app-tdeio_sword.png \
+	hi22-app-tdeio_sword.png \
+	hi16-app-tdeio_sword.png
diff --git a/src/pics/hi128-app-kio_sword.png b/src/pics/hi128-app-tdeio_sword.png
index dc3f665..dc3f665 100644
--- a/src/pics/hi128-app-kio_sword.png
+++ b/src/pics/hi128-app-tdeio_sword.png
diff --git a/src/pics/hi16-app-kio_sword.png b/src/pics/hi16-app-tdeio_sword.png
index 6897bdc..6897bdc 100644
--- a/src/pics/hi16-app-kio_sword.png
+++ b/src/pics/hi16-app-tdeio_sword.png
diff --git a/src/pics/hi22-app-kio_sword.png b/src/pics/hi22-app-tdeio_sword.png
index c4da37d..c4da37d 100644
--- a/src/pics/hi22-app-kio_sword.png
+++ b/src/pics/hi22-app-tdeio_sword.png
diff --git a/src/pics/hi32-app-kio_sword.png b/src/pics/hi32-app-tdeio_sword.png
index 63db51d..63db51d 100644
--- a/src/pics/hi32-app-kio_sword.png
+++ b/src/pics/hi32-app-tdeio_sword.png
diff --git a/src/pics/hi48-app-kio_sword.png b/src/pics/hi48-app-tdeio_sword.png
index 2175625..2175625 100644
--- a/src/pics/hi48-app-kio_sword.png
+++ b/src/pics/hi48-app-tdeio_sword.png
diff --git a/src/pics/hi64-app-kio_sword.png b/src/pics/hi64-app-tdeio_sword.png
index cf970ff..cf970ff 100644
--- a/src/pics/hi64-app-kio_sword.png
+++ b/src/pics/hi64-app-tdeio_sword.png
diff --git a/src/pics/hisc-app-kio_sword.svgz b/src/pics/hisc-app-tdeio_sword.svgz
index fff5113..fff5113 100644
--- a/src/pics/hisc-app-kio_sword.svgz
+++ b/src/pics/hisc-app-tdeio_sword.svgz
diff --git a/src/pics/kio_sword_borders.xcf b/src/pics/tdeio_sword_borders.xcf
index 5756d2b..5756d2b 100644
--- a/src/pics/kio_sword_borders.xcf
+++ b/src/pics/tdeio_sword_borders.xcf
diff --git a/src/pics/kio_sword_everything.svg b/src/pics/tdeio_sword_everything.svg
index 5218535..0dfc2cb 100644
--- a/src/pics/kio_sword_everything.svg
+++ b/src/pics/tdeio_sword_everything.svg
@@ -10,8 +10,8 @@
    id="svg574"
    sodipodi:version="0.32"
    inkscape:version="0.39cvs"
-   sodipodi:docname="kio_sword_everything.svg"
-   sodipodi:docbase="/home/luke/my_devel/kio_sword/src/pics"
+   sodipodi:docname="tdeio_sword_everything.svg"
+   sodipodi:docbase="/home/luke/my_devel/tdeio_sword/src/pics"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -1689,7 +1689,7 @@
         <tspan
    x="-211.79260"
    y="-233.36720"
-   id="tspan1083">KIO-SWORD</tspan>
+   id="tspan1083">TDEIO-SWORD</tspan>
       </text>
 
       <text
@@ -1703,7 +1703,7 @@
         <tspan
    x="-209.93480"
    y="-234.89661"
-   id="tspan1095">KIO-SWORD</tspan>
+   id="tspan1095">TDEIO-SWORD</tspan>
       </text>
 
       <text
diff --git a/src/renderer.cpp b/src/renderer.cpp
index 6aad63a..2fa180f 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -45,7 +45,7 @@
 
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 // QT
 #include <ntqstring.h>
diff --git a/src/sword.protocol b/src/sword.protocol
index ab82dcf..9fddf75 100644
--- a/src/sword.protocol
+++ b/src/sword.protocol
@@ -1,13 +1,13 @@
 [Protocol]
-exec=kio_sword
+exec=tdeio_sword
 protocol=sword
 input=none
 output=filesystem
 reading=true
 defaultMimetype=text/html
-Icon=kio_sword
-Description=A kioslave for quick access to Bible texts within Konqueror
-DocPath=kio_sword/index.html
+Icon=tdeio_sword
+Description=A tdeioslave for quick access to Bible texts within Konqueror
+DocPath=tdeio_sword/index.html
 determineMimetypeFromExtension=false
 Class=:local
 URIMode=uri
diff --git a/src/swordoptions.cpp b/src/swordoptions.cpp
index 705d4bb..0060b10 100644
--- a/src/swordoptions.cpp
+++ b/src/swordoptions.cpp
@@ -127,7 +127,7 @@ namespace KioSword
 	
 		
 	/** Read all options in from the config file/defaults */
-	void SwordOptions::readFromConfig(const KConfig* config)
+	void SwordOptions::readFromConfig(const TDEConfig* config)
 	{
 		vector<OptionBase*>::const_iterator it;
 		vector<OptionBase*>::const_iterator it_end = m_optionList.end();
@@ -139,7 +139,7 @@ namespace KioSword
 	}
 	
 	/** Save all options to the config file */
-	void SwordOptions::saveToConfig(KConfig* config)
+	void SwordOptions::saveToConfig(TDEConfig* config)
 	{
 		vector<OptionBase*>::const_iterator it;
 		vector<OptionBase*>::const_iterator it_end = m_optionList.end();
diff --git a/src/swordoptions.h b/src/swordoptions.h
index c001939..7c83599 100644
--- a/src/swordoptions.h
+++ b/src/swordoptions.h
@@ -28,7 +28,7 @@
 #include "option.h"
 
 // KDE
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 // TQt
 #include <ntqstring.h>
@@ -84,8 +84,8 @@ namespace KioSword {
 		SwordOptions(const SwordOptions& copyFrom);
 		virtual ~SwordOptions();
 		
-		void readFromConfig(const KConfig* config);
-		void saveToConfig(KConfig* config);
+		void readFromConfig(const TDEConfig* config);
+		void saveToConfig(TDEConfig* config);
 		
 		TQMap<TQString, TQString> getQueryStringParams() const;
 		void readFromQueryString(TQMap<TQString, TQString> params);
diff --git a/src/kio_sword.cpp b/src/tdeio_sword.cpp
index ddb4afa..4702b9c 100644
--- a/src/kio_sword.cpp
+++ b/src/tdeio_sword.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-    File:         kio_sword.cpp
+    File:         tdeio_sword.cpp
     Project:      Kio-Sword  -- An ioslave for SWORD and KDE
     Copyright:    Copyright (C) 2004-2005 Luke Plant
  
@@ -25,15 +25,15 @@
 
 // Mine
 #include "renderer.h"
-#include "kio_sword.h"
+#include "tdeio_sword.h"
 #include "utils.h"
 #include "template.h"
 #include "option.h"
 
 // KDE
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 
@@ -45,7 +45,7 @@
 #include <list>
 #include <stdlib.h>
 
-using namespace KIO;
+using namespace TDEIO;
 using std::list;
 using std::vector;
 
@@ -53,13 +53,13 @@ using std::vector;
 // main --------------------------------------------------------------------------------------------------------
 extern "C" {
 	int kdemain(int argc, char **argv) {
-		KInstance instance("kio_sword");
+		TDEInstance instance("tdeio_sword");
 		
-		kdDebug(7101) << "*** Starting kio_sword " << endl;
+		kdDebug(7101) << "*** Starting tdeio_sword " << endl;
 		
 		if (argc != 4) {
 			kdDebug(7101) <<
-			"Usage: kio_sword  protocol domain-socket1 domain-socket2"
+			"Usage: tdeio_sword  protocol domain-socket1 domain-socket2"
 			<< endl;
 			exit(-1);
 		}
@@ -67,7 +67,7 @@ extern "C" {
 		KioSword::SwordProtocol slave(argv[2], argv[3]);
 		slave.dispatchLoop();
 		
-		kdDebug(7101) << "*** kio_sword Done" << endl;
+		kdDebug(7101) << "*** tdeio_sword Done" << endl;
 		return 0;
 	}
 }
@@ -84,10 +84,10 @@ namespace KioSword
 				
 	SwordProtocol::SwordProtocol(const TQCString & pool_socket,
 					const TQCString & app_socket)
-	: SlaveBase("kio_sword", pool_socket, app_socket)
+	: SlaveBase("tdeio_sword", pool_socket, app_socket)
 	{
 		kdDebug() << "SwordProtocol::SwordProtocol()" << endl;
-		m_config = KGlobal::config();
+		m_config = TDEGlobal::config();
 	}
 	
 	
@@ -569,8 +569,8 @@ namespace KioSword
 		output += i18n("<hr><h1>Stylesheet</h1>"
 				"<p>To further customise the appearance of the Kio-Sword page, you can make your own modified "
 				"version of the style sheet. "
-				"Simply copy the file '%1kio_sword/kio_sword.css' to $HOME/.kde/share/apps/kio_sword/ and modify it as desired. You may want to use the 'simplepage' option above to make the most of this.</p>")
-					.arg(KGlobal::dirs()->findResourceDir("data", "kio_sword/kio_sword.css")); // FIXME - this must always return the system dir, not users dir.
+				"Simply copy the file '%1kio_sword/tdeio_sword.css' to $HOME/.kde/share/apps/tdeio_sword/ and modify it as desired. You may want to use the 'simplepage' option above to make the most of this.</p>")
+					.arg(TDEGlobal::dirs()->findResourceDir("data", "tdeio_sword/tdeio_sword.css")); // FIXME - this must always return the system dir, not users dir.
 				
 	
 		return output;
@@ -579,7 +579,7 @@ namespace KioSword
 	TQString SwordProtocol::helpPage() {
 		if (help_page.isEmpty()) {
 			help_page += i18n("<h1>Help</h1>"
-			"<p>For full documentation, see <a href=\"help:/kio_sword\">installed help files</a>.</p>"
+			"<p>For full documentation, see <a href=\"help:/tdeio_sword\">installed help files</a>.</p>"
 			"<p>Kio-Sword allows you to view SWORD modules (such as Bibles and commentaries) from Konqueror.\n"
 			"  These modules must already be installed - you can download them from <a href=\"http://www.crosswire.org/\">"
 			"crosswire.org</a> or you can use a program such as <a href=\"http:/www.bibletime.info\">BibleTime</a> to help"
@@ -611,7 +611,7 @@ namespace KioSword
 			"</ul>\n"
 			"<p>Problems, comments, feature requests? Email the author. "
 			"<p>Author: <a href=\"mailto:L.Plant.98@cantab.net\">L.Plant.98@cantab.net</a>"
-			"<p>Website: <a href=\"http://lukeplant.me.uk/kio-sword/\">http://lukeplant.me.uk/kio-sword/</a>.");
+			"<p>Website: <a href=\"http://lukeplant.me.uk/tdeio-sword/\">http://lukeplant.me.uk/tdeio-sword/</a>.");
 		}
 		return help_page;
 	}
diff --git a/src/kio_sword.h b/src/tdeio_sword.h
index 5996c38..f602be2 100644
--- a/src/kio_sword.h
+++ b/src/tdeio_sword.h
@@ -26,8 +26,8 @@
 #include "renderer.h"
 
 #include <kurl.h>
-#include <kconfig.h>
-#include <kio/slavebase.h>
+#include <tdeconfig.h>
+#include <tdeio/slavebase.h>
 
 #include <ntqstring.h>
 #include <ntqcstring.h>
@@ -35,7 +35,7 @@
 namespace KioSword {
 	class Template;
 
-	class SwordProtocol : public KIO::SlaveBase {
+	class SwordProtocol : public TDEIO::SlaveBase {
 		
 	public:
 		SwordProtocol(const TQCString & pool_socket,
@@ -85,7 +85,7 @@ namespace KioSword {
 			TQString module;
 		} m_redirect;
 		
-		KConfig *m_config;
+		TDEConfig *m_config;
 		
 	};
 }
diff --git a/src/kio_sword.lsm b/src/tdeio_sword.lsm
index c06ac61..6807f5e 100644
--- a/src/kio_sword.lsm
+++ b/src/tdeio_sword.lsm
@@ -1,5 +1,5 @@
 Begin3
-Title:          kio_sword -- Some description
+Title:          tdeio_sword -- Some description
 Version:        0.1
 Entered-date:   
 Description:    
@@ -9,8 +9,8 @@ Maintained-by:  Luke Plant <L.Plant.98@cantab.net>
 Home-page:      
 Alternate-site: 
 Primary-site:   ftp://ftp.kde.org/pub/kde/unstable/apps/utils
-                xxxxxx  kio_sword-0.1.tar.gz
-                xxx     kio_sword-0.1.lsm
+                xxxxxx  tdeio_sword-0.1.tar.gz
+                xxx     tdeio_sword-0.1.lsm
 Platform:       Linux. Needs KDE
 Copying-policy: GPL
 End
diff --git a/src/template.cpp b/src/template.cpp
index aa329d0..08e8a89 100644
--- a/src/template.cpp
+++ b/src/template.cpp
@@ -25,8 +25,8 @@
 #include "utils.h"
 #include "swordoptions.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <ntqstring.h>
@@ -85,7 +85,7 @@ namespace KioSword {
 	TQCString Template::render(const SwordOptions& options) const
 	{
 	
-		TQString cssdir = KGlobal::dirs()->findResourceDir("data", "kio_sword/kio_sword.css") + "kio_sword/";
+		TQString cssdir = TDEGlobal::dirs()->findResourceDir("data", "tdeio_sword/tdeio_sword.css") + "tdeio_sword/";
 	
 		TQString output = html_page;
 		output = output
@@ -97,7 +97,7 @@ namespace KioSword {
 			.replace(SETTINGSLINKCAPTION,  i18n("Settings"))
 			.replace(HELPLINK, swordUrlForPage("help", options))
 			.replace(HELPLINKCAPTION, i18n("Help"))
-			.replace(BASECSS,  cssdir + "kio_sword.css")
+			.replace(BASECSS,  cssdir + "tdeio_sword.css")
 			.replace(PAGETITLE, m_title)
 			.replace(CONTENT, m_content);
 		if (!m_nav.isEmpty())