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

---
 konqueror/konq_combo.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'konqueror/konq_combo.cc')

diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index 4edce07ad..c252cd0dc 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@@ -36,7 +36,7 @@
 
 #include "konq_combo.h"
 
-KConfig * KonqCombo::s_config = 0L;
+TDEConfig * KonqCombo::s_config = 0L;
 const int KonqCombo::temporary = 0;
 
 static TQString titleOfURL( const TQString& urlStr )
@@ -103,7 +103,7 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name )
 
     Q_ASSERT( s_config );
 
-    KConfigGroupSaver cs( s_config, "Location Bar" );
+    TDEConfigGroupSaver cs( s_config, "Location Bar" );
     setMaxCount( s_config->readNumEntry("Maximum of URLs in combo", 20 ));
 
     // We should also connect the completionBox' highlighted signal to
@@ -594,7 +594,7 @@ void KonqCombo::slotActivated( const TQString& text )
     m_modifier = Qt::NoButton;
 }
 
-void KonqCombo::setConfig( KConfig *kc )
+void KonqCombo::setConfig( TDEConfig *kc )
 {
     s_config = kc;
 }
-- 
cgit v1.2.3