Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

2 files changed, 14 insertions, 14 deletions

diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index 82d35eb..5fd1047 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -113,7 +113,7 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name,
 
 SearchBarPlugin::~SearchBarPlugin()
 {
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("SearchBar");
 	config->writeEntry("Mode", (int) m_searchMode);
 	config->writeEntry("CurrentEngine", m_currentEngine);
@@ -125,7 +125,7 @@ SearchBarPlugin::~SearchBarPlugin()
 
 TQChar delimiter()
 {
-        KConfig config( "kuriikwsfilterrc", true, false );
+        TDEConfig config( "kuriikwsfilterrc", true, false );
         config.setGroup( "General" );
         return config.readNumEntry( "KeywordDelimiter", ':' );
 }
@@ -463,7 +463,7 @@ void SearchBarPlugin::searchEnginesSelected(TDEProcess *process)
 {
 	if(!process || process->exitStatus() == 0)
 	{
-		KConfig *config = kapp->config();
+		TDEConfig *config = kapp->config();
 		config->setGroup("SearchBar");
 		config->writeEntry("CurrentEngine", m_currentEngine);
 		config->sync();
@@ -474,7 +474,7 @@ void SearchBarPlugin::searchEnginesSelected(TDEProcess *process)
 
 void SearchBarPlugin::configurationChanged()
 {
-	KConfig *config = new KConfig("kuriikwsfilterrc");
+	TDEConfig *config = new TDEConfig("kuriikwsfilterrc");
 	config->setGroup("General");
 	TQString engine = config->readEntry("DefaultSearchEngine", "google");
 
@@ -627,7 +627,7 @@ void SearchBarCombo::show()
 void SearchBarPlugin::selectGoogleSuggestMode()
 {
 	m_googleMode = (GoogleMode)m_googleMenu->currentItem();
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("SearchBar");
 	config->writeEntry("GoogleSuggestMode", m_googleMode);
 	config->sync();
@@ -651,14 +651,14 @@ void SearchBarPlugin::gsMakeCompletionList()
 
 	if (!m_searchCombo->currentText().isEmpty())
 	{
-		KIO::TransferJob* tj =
-				KIO::get(KURL("http://www.google.com/complete/search?hl=en&js=true&qu=" + m_searchCombo->currentText()), false, false);
-		connect(tj, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), this, TQT_SLOT(gsDataArrived(KIO::Job*, const TQByteArray&)));
-		connect(tj, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(gsJobFinished(KIO::Job*)));
+		TDEIO::TransferJob* tj =
+				TDEIO::get(KURL("http://www.google.com/complete/search?hl=en&js=true&qu=" + m_searchCombo->currentText()), false, false);
+		connect(tj, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), this, TQT_SLOT(gsDataArrived(TDEIO::Job*, const TQByteArray&)));
+		connect(tj, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(gsJobFinished(TDEIO::Job*)));
 	}
 }
 
-void SearchBarPlugin::gsDataArrived(KIO::Job*, const TQByteArray& data)
+void SearchBarPlugin::gsDataArrived(TDEIO::Job*, const TQByteArray& data)
 {
 	m_gsData += TQString::fromUtf8(data.data());
 }
@@ -676,9 +676,9 @@ static TQString reformatNumber(const TQString& number)
 	return s;
 }
 
-void SearchBarPlugin::gsJobFinished(KIO::Job* job)
+void SearchBarPlugin::gsJobFinished(TDEIO::Job* job)
 {
-	if (((KIO::TransferJob*)job)->error() == 0)
+	if (((TDEIO::TransferJob*)job)->error() == 0)
 	{
 		TQString temp;
 		temp = m_gsData.mid(m_gsData.find('(') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1);
diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h
index fd1f846..bf01e21 100644
--- a/konq-plugins/searchbar/searchbar.h
+++ b/konq-plugins/searchbar/searchbar.h
@@ -159,8 +159,8 @@ class SearchBarPlugin : public KParts::Plugin
 		void selectGoogleSuggestMode();
 		void gsStartDelay();
 		void gsMakeCompletionList();
-		void gsDataArrived(KIO::Job*, const TQByteArray& data);
-		void gsJobFinished(KIO::Job* job);
+		void gsDataArrived(TDEIO::Job*, const TQByteArray& data);
+		void gsJobFinished(TDEIO::Job* job);
 		void gsSetCompletedText(const TQString& text);
 		void gsPutTextInBox(const TQString& text);