From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:35:07 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 khtml/khtmlview.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'khtml/khtmlview.cpp')

diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 411d03f2e..4a5c7cf2d 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -994,8 +994,8 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
         bool hasHorBar = visibleWidth() < contentsWidth();
         bool hasVerBar = visibleHeight() < contentsHeight();
 
-        KConfig *config = TDEGlobal::config();
-        KConfigGroupSaver saver( config, "HTML Settings" );
+        TDEConfig *config = TDEGlobal::config();
+        TDEConfigGroupSaver saver( config, "HTML Settings" );
         if ( config->readBoolEntry( "ShowMouseScrollIndicator", true ) ) {
             d->m_mouseScrollIndicator->show();
             d->m_mouseScrollIndicator->unsetCursor();
@@ -4517,7 +4517,7 @@ static const int SCROLL_TICK = 20;
 
 void KHTMLView::scrollBy(int dx, int dy)
 {
-    KConfigGroup cfg( TDEGlobal::config(), "KDE" );
+    TDEConfigGroup cfg( TDEGlobal::config(), "KDE" );
     if( !cfg.readBoolEntry( "SmoothScrolling", false )) {
         TQScrollView::scrollBy( dx, dy );
         return;
-- 
cgit v1.2.3