Rename kiobuffer and KHTML

8 files changed, 45 insertions, 45 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index c853ef9..587ee65 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@ SUBDIRS = $(LIB_KDEEXTRADIR) . pics
 
 # the library search path.
 kchmviewer_LDADD = $(top_builddir)/lib/libchmfile/libchmfile.a  $(LIB_KDEEXTRA) \
-	$(CHM_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO)
+	$(CHM_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_KPARTS) $(LIB_KIO)
 kchmviewer_LDFLAGS = $(QT_LDFLAGS) $(KDE_LDFLAGS) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO) -L../lib/chmlib/
 
 METASOURCES = AUTO
diff --git a/src/kchmmainwindow.cpp b/src/kchmmainwindow.cpp
index 137f228..da29e54 100644
--- a/src/kchmmainwindow.cpp
+++ b/src/kchmmainwindow.cpp
@@ -731,7 +731,7 @@ void KCHMMainWindow::slotChangeSettingsMenuItemActivated()
 
 	dlg.m_qtBrowserPath->setText ( appConfig.m_TQtBrowserPath );
 	dlg.m_radioUseQtextBrowser->setChecked ( appConfig.m_kdeUseTQTextBrowser );
-	dlg.m_radioUseKHTMLPart->setChecked ( !appConfig.m_kdeUseTQTextBrowser );
+	dlg.m_radioUseTDEHTMLPart->setChecked ( !appConfig.m_kdeUseTQTextBrowser );
 	
 	dlg.m_enableJS->setChecked ( appConfig.m_kdeEnableJS );
 	dlg.m_enablePlugins->setChecked ( appConfig.m_kdeEnablePlugins );
diff --git a/src/kchmsetupdialog.cpp b/src/kchmsetupdialog.cpp
index e4809e9..c7e8b6b 100644
--- a/src/kchmsetupdialog.cpp
+++ b/src/kchmsetupdialog.cpp
@@ -169,8 +169,8 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     m_radioUseQtextBrowser = new TQRadioButton( buttonGroup5_2, "m_radioUseQtextBrowser" );
     buttonGroup5_2Layout->addWidget( m_radioUseQtextBrowser );
 
-    m_radioUseKHTMLPart = new TQRadioButton( buttonGroup5_2, "m_radioUseKHTMLPart" );
-    buttonGroup5_2Layout->addWidget( m_radioUseKHTMLPart );
+    m_radioUseTDEHTMLPart = new TQRadioButton( buttonGroup5_2, "m_radioUseTDEHTMLPart" );
+    buttonGroup5_2Layout->addWidget( m_radioUseTDEHTMLPart );
     m_groupKDEsettingsLayout->addWidget( buttonGroup5_2 );
 
     groupKhtmlSecurity = new TQGroupBox( m_groupKDEsettings, "groupKhtmlSecurity" );
@@ -279,7 +279,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     // signals and slots connections
     connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
     connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
-    connect( m_radioUseKHTMLPart, TQT_SIGNAL( toggled(bool) ), groupKhtmlSecurity, TQT_SLOT( setEnabled(bool) ) );
+    connect( m_radioUseTDEHTMLPart, TQT_SIGNAL( toggled(bool) ), groupKhtmlSecurity, TQT_SLOT( setEnabled(bool) ) );
     connect( m_advViewSourceExternal, TQT_SIGNAL( toggled(bool) ), m_advExternalProgramName, TQT_SLOT( setEnabled(bool) ) );
     connect( m_radioUseQtextBrowser, TQT_SIGNAL( toggled(bool) ), groupKhtmlSecurity, TQT_SLOT( setDisabled(bool) ) );
 
@@ -300,8 +300,8 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     setTabOrder( m_radioNewChmAsk, m_radioNewChmOpenNever );
     setTabOrder( m_radioNewChmOpenNever, m_qtBrowserPath );
     setTabOrder( m_qtBrowserPath, m_radioUseQtextBrowser );
-    setTabOrder( m_radioUseQtextBrowser, m_radioUseKHTMLPart );
-    setTabOrder( m_radioUseKHTMLPart, m_enableJS );
+    setTabOrder( m_radioUseQtextBrowser, m_radioUseTDEHTMLPart );
+    setTabOrder( m_radioUseTDEHTMLPart, m_enableJS );
     setTabOrder( m_enableJS, m_enablePlugins );
     setTabOrder( m_enablePlugins, m_enableJava );
     setTabOrder( m_enableJava, m_enableRefresh );
@@ -355,9 +355,9 @@ void KCHMSetupDialog::languageChange()
     buttonGroup5_2->setTitle( tr( "To show HTML content, use" ) );
     m_radioUseQtextBrowser->setText( tr( "&TQTextBrowser-based widget" ) );
     m_radioUseQtextBrowser->setAccel( TQKeySequence( tr( "Alt+Q" ) ) );
-    m_radioUseKHTMLPart->setText( tr( "&KHTMLPart-based widget" ) );
-    m_radioUseKHTMLPart->setAccel( TQKeySequence( tr( "Alt+K" ) ) );
-    groupKhtmlSecurity->setTitle( tr( "KHTMLPart security" ) );
+    m_radioUseTDEHTMLPart->setText( tr( "&TDEHTMLPart-based widget" ) );
+    m_radioUseTDEHTMLPart->setAccel( TQKeySequence( tr( "Alt+K" ) ) );
+    groupKhtmlSecurity->setTitle( tr( "TDEHTMLPart security" ) );
     m_enableJS->setText( tr( "Enable Java&Script" ) );
     m_enableJS->setAccel( TQKeySequence( tr( "Alt+S" ) ) );
     m_enablePlugins->setText( tr( "Enable &plugins" ) );
@@ -387,9 +387,9 @@ void KCHMSetupDialog::languageChange()
     buttonCancel->setAccel( TQKeySequence( TQString() ) );
 }
 
-void KCHMSetupDialog::m_radioUseKHTMLPart_toggled(bool)
+void KCHMSetupDialog::m_radioUseTDEHTMLPart_toggled(bool)
 {
-    tqWarning( "KCHMSetupDialog::m_radioUseKHTMLPart_toggled(bool): Not implemented yet" );
+    tqWarning( "KCHMSetupDialog::m_radioUseTDEHTMLPart_toggled(bool): Not implemented yet" );
 }
 
 #include "kchmsetupdialog.moc"
diff --git a/src/kchmsetupdialog.ui b/src/kchmsetupdialog.ui
index f4e3ca0..4d8ebd3 100644
--- a/src/kchmsetupdialog.ui
+++ b/src/kchmsetupdialog.ui
@@ -352,10 +352,10 @@
                                     </widget>
                                     <widget class="TQRadioButton">
                                         <property name="name">
-                                            <cstring>m_radioUseKHTMLPart</cstring>
+                                            <cstring>m_radioUseTDEHTMLPart</cstring>
                                         </property>
                                         <property name="text">
-                                            <string>&amp;KHTMLPart-based widget</string>
+                                            <string>&amp;TDEHTMLPart-based widget</string>
                                         </property>
                                         <property name="accel">
                                             <string>Alt+K</string>
@@ -368,7 +368,7 @@
                                     <cstring>groupKhtmlSecurity</cstring>
                                 </property>
                                 <property name="title">
-                                    <string>KHTMLPart security</string>
+                                    <string>TDEHTMLPart security</string>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -657,7 +657,7 @@
         <slot>reject()</slot>
     </connection>
     <connection>
-        <sender>m_radioUseKHTMLPart</sender>
+        <sender>m_radioUseTDEHTMLPart</sender>
         <signal>toggled(bool)</signal>
         <receiver>groupKhtmlSecurity</receiver>
         <slot>setEnabled(bool)</slot>
@@ -693,7 +693,7 @@
     <tabstop>m_radioNewChmOpenNever</tabstop>
     <tabstop>m_qtBrowserPath</tabstop>
     <tabstop>m_radioUseQtextBrowser</tabstop>
-    <tabstop>m_radioUseKHTMLPart</tabstop>
+    <tabstop>m_radioUseTDEHTMLPart</tabstop>
     <tabstop>m_enableJS</tabstop>
     <tabstop>m_enablePlugins</tabstop>
     <tabstop>m_enableJava</tabstop>
@@ -704,7 +704,7 @@
     <tabstop>buttonCancel</tabstop>
 </tabstops>
 <Q_SLOTS>
-    <slot>m_radioUseKHTMLPart_toggled( bool )</slot>
+    <slot>m_radioUseTDEHTMLPart_toggled( bool )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/src/kchmviewwindow.cpp b/src/kchmviewwindow.cpp
index 394df67..f776efe 100644
--- a/src/kchmviewwindow.cpp
+++ b/src/kchmviewwindow.cpp
@@ -110,7 +110,7 @@ bool KCHMViewWindow::openUrl ( const TQString& origurl )
 			tqFatal("KCHMViewWindow::openUrl(): opened new chm file %s while current is %s",
 				   chmfile.ascii(), ::mainWindow->getOpenedFileName().ascii() );
 
-		// It is OK to have a new file in chm for KHTMLPart
+		// It is OK to have a new file in chm for TDEHTMLPart
 		newurl = page;
 	}
 
diff --git a/src/kchmviewwindowmgr.cpp b/src/kchmviewwindowmgr.cpp
index 5be3640..6499951 100644
--- a/src/kchmviewwindowmgr.cpp
+++ b/src/kchmviewwindowmgr.cpp
@@ -95,7 +95,7 @@ KCHMViewWindow * KCHMViewWindowMgr::addNewTab( bool set_active )
 	
 #if defined (USE_KDE)
 	if ( !appConfig.m_kdeUseTQTextBrowser )
-		viewvnd = new KCHMViewWindow_KHTMLPart( this );
+		viewvnd = new KCHMViewWindow_TDEHTMLPart( this );
 	else
 #endif
 		viewvnd = new KCHMViewWindow_QTextBrowser( this );
diff --git a/src/kde/kchmviewwindow_tdehtmlpart.cpp b/src/kde/kchmviewwindow_tdehtmlpart.cpp
index 4ad2538..73f136e 100644
--- a/src/kde/kchmviewwindow_tdehtmlpart.cpp
+++ b/src/kde/kchmviewwindow_tdehtmlpart.cpp
@@ -32,13 +32,13 @@
 #include "kchmviewwindow_tdehtmlpart.moc"
 
 
-TQWidget * KCHMViewWindow_KHTMLPart::getTQWidget()
+TQWidget * KCHMViewWindow_TDEHTMLPart::getTQWidget()
 {
 	 return view();
 }
 
-KCHMViewWindow_KHTMLPart::KCHMViewWindow_KHTMLPart( TQTabWidget * parent )
-	: KHTMLPart ( parent ), KCHMViewWindow ( parent )
+KCHMViewWindow_TDEHTMLPart::KCHMViewWindow_TDEHTMLPart( TQTabWidget * parent )
+	: TDEHTMLPart ( parent ), KCHMViewWindow ( parent )
 {
 	m_zoomfactor = 0;
 	m_currentEncoding = 0;
@@ -54,11 +54,11 @@ KCHMViewWindow_KHTMLPart::KCHMViewWindow_KHTMLPart( TQTabWidget * parent )
 }
 
 
-KCHMViewWindow_KHTMLPart::~KCHMViewWindow_KHTMLPart()
+KCHMViewWindow_TDEHTMLPart::~KCHMViewWindow_TDEHTMLPart()
 {
 }
 
-bool KCHMViewWindow_KHTMLPart::openPage (const TQString& url)
+bool KCHMViewWindow_TDEHTMLPart::openPage (const TQString& url)
 {
 	// Set or change the encoding
 	if ( m_currentEncoding != ::mainWindow->chmFile()->currentEncoding() )
@@ -73,15 +73,15 @@ bool KCHMViewWindow_KHTMLPart::openPage (const TQString& url)
 	return true;
 }
 
-void KCHMViewWindow_KHTMLPart::setZoomFactor( int zoom )
+void KCHMViewWindow_TDEHTMLPart::setZoomFactor( int zoom )
 {
 	m_zoomfactor = zoom;
 	
 	// Default ZoomFactor is 100, any increase or decrease should modify this value.
-	KHTMLPart::setZoomFactor ( 100 + (m_zoomfactor * 10) );
+	TDEHTMLPart::setZoomFactor ( 100 + (m_zoomfactor * 10) );
 }
 
-void KCHMViewWindow_KHTMLPart::invalidate( )
+void KCHMViewWindow_TDEHTMLPart::invalidate( )
 {
 	m_zoomfactor = 0;
 	m_searchForward = true;
@@ -95,28 +95,28 @@ void KCHMViewWindow_KHTMLPart::invalidate( )
 	KCHMViewWindow::invalidate( );
 }
 
-int KCHMViewWindow_KHTMLPart::getScrollbarPosition( )
+int KCHMViewWindow_TDEHTMLPart::getScrollbarPosition( )
 {
 	return view()->contentsY ();
 }
 
-void KCHMViewWindow_KHTMLPart::setScrollbarPosition( int pos )
+void KCHMViewWindow_TDEHTMLPart::setScrollbarPosition( int pos )
 {
 	view()->scrollBy (0, pos);
 }
 
-void KCHMViewWindow_KHTMLPart::addZoomFactor( int value )
+void KCHMViewWindow_TDEHTMLPart::addZoomFactor( int value )
 {
 	setZoomFactor( m_zoomfactor + value);
 }
 
-bool KCHMViewWindow_KHTMLPart::printCurrentPage()
+bool KCHMViewWindow_TDEHTMLPart::printCurrentPage()
 {
 	view()->print();
 	return true;
 }
 
-void KCHMViewWindow_KHTMLPart::searchWord( const TQString & word, bool forward, bool )
+void KCHMViewWindow_TDEHTMLPart::searchWord( const TQString & word, bool forward, bool )
 {
 	if ( word != m_searchText || forward != m_searchForward )
 	{
@@ -129,25 +129,25 @@ void KCHMViewWindow_KHTMLPart::searchWord( const TQString & word, bool forward,
 	findTextNext ();
 }
 
-void KCHMViewWindow_KHTMLPart::onOpenURLRequest( const KURL & url, const KParts::URLArgs & )
+void KCHMViewWindow_TDEHTMLPart::onOpenURLRequest( const KURL & url, const KParts::URLArgs & )
 {
 	bool sourcechange = true;
 	emit signalLinkClicked ( url.prettyURL(), sourcechange );
 }
 
-void KCHMViewWindow_KHTMLPart::slotLinkClicked( const TQString & newlink )
+void KCHMViewWindow_TDEHTMLPart::slotLinkClicked( const TQString & newlink )
 {
 	bool notused;
 	emit signalLinkClicked (newlink, notused);
 }
 
 
-void KCHMViewWindow_KHTMLPart::clipSelectAll()
+void KCHMViewWindow_TDEHTMLPart::clipSelectAll()
 {
 	selectAll ();
 }
 
-void KCHMViewWindow_KHTMLPart::clipCopy()
+void KCHMViewWindow_TDEHTMLPart::clipCopy()
 {
 	TQString text = selectedText();
 	
@@ -155,7 +155,7 @@ void KCHMViewWindow_KHTMLPart::clipCopy()
 		TQApplication::clipboard()->setText( text );
 }
 
-void  KCHMViewWindow_KHTMLPart::onPopupMenu ( const TQString &url, const TQPoint & point )
+void  KCHMViewWindow_TDEHTMLPart::onPopupMenu ( const TQString &url, const TQPoint & point )
 {
 	KTQPopupMenu * menu = getContextMenu( url, view() );
 	menu->exec( point );
diff --git a/src/kde/kchmviewwindow_tdehtmlpart.h b/src/kde/kchmviewwindow_tdehtmlpart.h
index b840b44..4bc45c7 100644
--- a/src/kde/kchmviewwindow_tdehtmlpart.h
+++ b/src/kde/kchmviewwindow_tdehtmlpart.h
@@ -19,8 +19,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#ifndef KCHMVIEWWINDOW_KHTMLPART_H
-#define KCHMVIEWWINDOW_KHTMLPART_H
+#ifndef KCHMVIEWWINDOW_TDEHTMLPART_H
+#define KCHMVIEWWINDOW_TDEHTMLPART_H
 
 #include "kde-qt.h"
 
@@ -36,19 +36,19 @@
 @author Georgy Yunaev
 */
 /*
- * For TQt-only version, we cannot compile KCHMViewWindow_KHTMLPart. However,
+ * For TQt-only version, we cannot compile KCHMViewWindow_TDEHTMLPart. However,
  * we cannot just exclude it, because it would not generate a MOC file for a KDE
  * version. Therefore we declare it, and compile the .moc file, but do not provide
  * the class methods.
  */
 #if defined (USE_KDE)
-class KCHMViewWindow_KHTMLPart : public KHTMLPart, public KCHMViewWindow
+class KCHMViewWindow_TDEHTMLPart : public TDEHTMLPart, public KCHMViewWindow
 {
 Q_OBJECT
 
 public:
-	KCHMViewWindow_KHTMLPart( TQTabWidget * parent );
-	~KCHMViewWindow_KHTMLPart();
+	KCHMViewWindow_TDEHTMLPart( TQTabWidget * parent );
+	~KCHMViewWindow_TDEHTMLPart();
 
 	//! Open a page from current chm archive
 	virtual bool	openPage (const TQString& url);
@@ -115,4 +115,4 @@ private:
 
 #endif /* USE_KDE */
 
-#endif /* KCHMVIEWWINDOW_KHTMLPART_H */
+#endif /* KCHMVIEWWINDOW_TDEHTMLPART_H */