From 8406945c901291c26d10203f93fe2509c22c9bf7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 20:58:22 -0600
Subject: [PATCH] Rename kiobuffer and KHTML

---
 acinclude.m4                   | 4 ++--
 cmake                          | 2 +-
 iso/{kio_isorc => tdeio_isorc} | 0
 krusader.kdevprj               | 2 +-
 krusader/KViewer/krviewer.cpp  | 6 +++---
 krusader/Makefile.am           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename iso/{kio_isorc => tdeio_isorc} (100%)

diff --git a/acinclude.m4 b/acinclude.m4
index 9208ac2..ae1c0ff 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2075,7 +2075,7 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
    AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
@@ -2096,7 +2096,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
    AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
diff --git a/cmake b/cmake
index 9a21790..274366f 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d
+Subproject commit 274366fb8b90704586d7beef216b765cc0688b08
diff --git a/iso/kio_isorc b/iso/tdeio_isorc
similarity index 100%
rename from iso/kio_isorc
rename to iso/tdeio_isorc
diff --git a/krusader.kdevprj b/krusader.kdevprj
index 1bef1f6..8866107 100644
--- a/krusader.kdevprj
+++ b/krusader.kdevprj
@@ -22,7 +22,7 @@ bin_program=krusader
 cflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE
 cppflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE
 cxxflags=\s-O0 -Wall
-ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_KPARTS) $(LIB_KFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 ldflags=\s                                        \s
 
 [General]
diff --git a/krusader/KViewer/krviewer.cpp b/krusader/KViewer/krviewer.cpp
index 00ae77d..f79864f 100644
--- a/krusader/KViewer/krviewer.cpp
+++ b/krusader/KViewer/krviewer.cpp
@@ -119,7 +119,7 @@ KrViewer::~KrViewer() {
 }
 
 void KrViewer::createGUI( KParts::Part* part ) {
-	if ( part == 0 )   /*     KHTMLPart calls this function with 0 at destruction.    */
+	if ( part == 0 )   /*     TDEHTMLPart calls this function with 0 at destruction.    */
 		return ;        /*   Can cause crash after JavaScript self.close() if removed  */
 
 	
@@ -607,10 +607,10 @@ bool KrViewer::viewGeneric() {
 
 	if ( !generic_part ) {
 		if ( mimetype.contains( "html" ) ) {
-			KHTMLPart * p = new KHTMLPart( this, 0, 0, 0, KHTMLPart::BrowserViewGUI );
+			TDEHTMLPart * p = new TDEHTMLPart( this, 0, 0, 0, TDEHTMLPart::BrowserViewGUI );
 			connect( p->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
 			         TQT_TQOBJECT(this), TQT_SLOT( handleOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) );
-			/* At JavaScript self.close() the KHTMLPart destroys itself.  */
+			/* At JavaScript self.close() the TDEHTMLPart destroys itself.  */
 			/* After destruction, just close the window */
 			connect( p, TQT_SIGNAL( destroyed() ), TQT_TQOBJECT(this), TQT_SLOT( close() ) );
 
diff --git a/krusader/Makefile.am b/krusader/Makefile.am
index b837ac8..2b64227 100644
--- a/krusader/Makefile.am
+++ b/krusader/Makefile.am
@@ -97,7 +97,7 @@ krusader_LDADD   = \
 	$(LIB_KJSEMBED) \
 	$(LIB_KPARTS) \
 	$(LIB_KFILE) \
-	$(LIB_KHTML) \
+	$(LIB_TDEHTML) \
 	$(LIB_TDEUI) \
 	$(LIB_TDECORE) \
 	$(LIB_QT) \