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

---
 libk3b/cddb/k3bcddb.cpp          |  2 +-
 libk3b/cddb/k3bcddb.h            |  4 ++--
 libk3b/cddb/k3bcddbhttpquery.cpp | 14 +++++++-------
 libk3b/cddb/k3bcddbhttpquery.h   |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'libk3b/cddb')

diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp
index f89f9d2..d1852a8 100644
--- a/libk3b/cddb/k3bcddb.cpp
+++ b/libk3b/cddb/k3bcddb.cpp
@@ -53,7 +53,7 @@ K3bCddb::~K3bCddb()
 }
 
 
-void K3bCddb::readConfig( KConfig* c )
+void K3bCddb::readConfig( TDEConfig* c )
 {
   c->setGroup( "Cddb" );
 
diff --git a/libk3b/cddb/k3bcddb.h b/libk3b/cddb/k3bcddb.h
index 554da46..bd6fff1 100644
--- a/libk3b/cddb/k3bcddb.h
+++ b/libk3b/cddb/k3bcddb.h
@@ -26,7 +26,7 @@
 #include "k3bcddbresult.h"
 #include "k3b_export.h"
 
-class KConfig;
+class TDEConfig;
 class K3bCddbQuery;
 class K3bCddbHttpQuery;
 class K3bCddbpQuery;
@@ -55,7 +55,7 @@ class LIBK3B_EXPORT K3bCddb : public TQObject
  public slots:  
   /** query a cd and connect to the queryFinished signal */
   void query( const K3bDevice::Toc& );
-  void readConfig( KConfig* c );
+  void readConfig( TDEConfig* c );
   void saveEntry( const K3bCddbResultEntry& );
 
  signals:
diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp
index 65eb915..63e5581 100644
--- a/libk3b/cddb/k3bcddbhttpquery.cpp
+++ b/libk3b/cddb/k3bcddbhttpquery.cpp
@@ -78,7 +78,7 @@ void K3bCddbHttpQuery::performCommand( const TQString& cmd )
 
   kdDebug() << "(K3bCddbHttpQuery) getting url: " << url.prettyURL() << endl;
 
-  KIO::TransferJob* job = KIO::get( url, false, false );
+  TDEIO::TransferJob* job = TDEIO::get( url, false, false );
 
   if( !job ) {
     setError( CONNECTION_ERROR );
@@ -87,15 +87,15 @@ void K3bCddbHttpQuery::performCommand( const TQString& cmd )
     return;
   }
 
-  connect( job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-	   TQT_SLOT(slotData(KIO::Job*, const TQByteArray&)) );
-  connect( job, TQT_SIGNAL(result(KIO::Job*)),
-	   TQT_SLOT(slotResult(KIO::Job*)) );
+  connect( job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+	   TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&)) );
+  connect( job, TQT_SIGNAL(result(TDEIO::Job*)),
+	   TQT_SLOT(slotResult(TDEIO::Job*)) );
 }
 
 
 
-void K3bCddbHttpQuery::slotData( KIO::Job*, const TQByteArray& data )
+void K3bCddbHttpQuery::slotData( TDEIO::Job*, const TQByteArray& data )
 {
   if( data.size() ) {
     TQDataStream stream( m_data, IO_WriteOnly | IO_Append );
@@ -104,7 +104,7 @@ void K3bCddbHttpQuery::slotData( KIO::Job*, const TQByteArray& data )
 }
 
 
-void K3bCddbHttpQuery::slotResult( KIO::Job* job )
+void K3bCddbHttpQuery::slotResult( TDEIO::Job* job )
 {
   if( job->error() ) {
     emit infoMessage( job->errorString() );
diff --git a/libk3b/cddb/k3bcddbhttpquery.h b/libk3b/cddb/k3bcddbhttpquery.h
index 63774e3..de86aad 100644
--- a/libk3b/cddb/k3bcddbhttpquery.h
+++ b/libk3b/cddb/k3bcddbhttpquery.h
@@ -22,7 +22,7 @@
 
 #include <tqvaluelist.h>
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -42,8 +42,8 @@ class K3bCddbHttpQuery : public K3bCddbQuery
  protected slots:
   void doQuery();
   void doMatchQuery();
-  void slotResult( KIO::Job* );
-  void slotData( KIO::Job*, const TQByteArray& data );
+  void slotResult( TDEIO::Job* );
+  void slotData( TDEIO::Job*, const TQByteArray& data );
 
  private:
   void performCommand( const TQString& );
-- 
cgit v1.2.3