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

4 files changed, 24 insertions, 24 deletions

diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
index ccaf6d3..4fb8ede 100644
--- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
@@ -92,7 +92,7 @@ void KOfxDirectConnectDlg::init(void)
     d->m_fpTrace.open(IO_WriteOnly | IO_Append);
   }
 
-  m_job = KIO::http_post(
+  m_job = TDEIO::http_post(
     m_connector.url(),
     request,
     true
@@ -109,9 +109,9 @@ void KOfxDirectConnectDlg::init(void)
   }
 
   m_job->addMetaData("content-type", "Content-type: application/x-ofx" );
-  connect(m_job,TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(slotOfxFinished(KIO::Job*)));
-  connect(m_job,TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),this,TQT_SLOT(slotOfxData(KIO::Job*,const TQByteArray&)));
-  connect(m_job,TQT_SIGNAL(connected(KIO::Job*)),this,TQT_SLOT(slotOfxConnected(KIO::Job*)));
+  connect(m_job,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(slotOfxFinished(TDEIO::Job*)));
+  connect(m_job,TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),this,TQT_SLOT(slotOfxData(TDEIO::Job*,const TQByteArray&)));
+  connect(m_job,TQT_SIGNAL(connected(TDEIO::Job*)),this,TQT_SLOT(slotOfxConnected(TDEIO::Job*)));
 
   setStatus(TQString("Contacting %1...").arg(m_connector.url()));
   kProgress1->setTotalSteps(3);
@@ -129,7 +129,7 @@ void KOfxDirectConnectDlg::setDetails(const TQString& _details)
   kdDebug(2) << "DETAILS: " << _details << endl;
 }
 
-void KOfxDirectConnectDlg::slotOfxConnected(KIO::Job*)
+void KOfxDirectConnectDlg::slotOfxConnected(TDEIO::Job*)
 {
   if ( m_tmpfile )
   {
@@ -143,7 +143,7 @@ void KOfxDirectConnectDlg::slotOfxConnected(KIO::Job*)
   kProgress1->advance(1);
 }
 
-void KOfxDirectConnectDlg::slotOfxData(KIO::Job*,const TQByteArray& _ba)
+void KOfxDirectConnectDlg::slotOfxData(TDEIO::Job*,const TQByteArray& _ba)
 {
   if ( !m_tmpfile )
 //     throw new MYMONEYEXCEPTION("Not currently connected!!");
@@ -157,7 +157,7 @@ void KOfxDirectConnectDlg::slotOfxData(KIO::Job*,const TQByteArray& _ba)
   setDetails(TQString("Got %1 bytes").arg(_ba.size()));
 }
 
-void KOfxDirectConnectDlg::slotOfxFinished(KIO::Job* /* e */)
+void KOfxDirectConnectDlg::slotOfxFinished(TDEIO::Job* /* e */)
 {
   kProgress1->advance(1);
   setStatus("Completed.");
diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h
index b0025e3..9caedc5 100644
--- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h
+++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h
@@ -31,7 +31,7 @@
 class KTempFile;
 class KOfxDirectConnectDlgPrivate;
 
-namespace KIO
+namespace TDEIO
 {
 class Job;
 class TransferJob;
@@ -64,9 +64,9 @@ signals:
   void statementReady(const TQString& fname);
 
 protected slots:
-  void slotOfxFinished(KIO::Job*);
-  void slotOfxData(KIO::Job*,const TQByteArray&);
-  void slotOfxConnected(KIO::Job*);
+  void slotOfxFinished(TDEIO::Job*);
+  void slotOfxData(TDEIO::Job*,const TQByteArray&);
+  void slotOfxConnected(TDEIO::Job*);
   virtual void reject(void);
 
 protected:
@@ -75,7 +75,7 @@ protected:
 
   KTempFile* m_tmpfile;
   MyMoneyOfxConnector m_connector;
-  KIO::TransferJob* m_job;
+  TDEIO::TransferJob* m_job;
 
 private:
   /// \internal d-pointer class.
diff --git a/kmymoney2/plugins/ofximport/ofxpartner.cpp b/kmymoney2/plugins/ofximport/ofxpartner.cpp
index 9bcb938..c91b2cc 100644
--- a/kmymoney2/plugins/ofximport/ofxpartner.cpp
+++ b/kmymoney2/plugins/ofximport/ofxpartner.cpp
@@ -305,7 +305,7 @@ OfxHttpsRequest::OfxHttpsRequest(const TQString& type, const KURL &url, const TQ
     d->m_fpTrace.open(IO_WriteOnly | IO_Append);
   }
 
-  m_job = KIO::http_post(url, postData, showProgressInfo);
+  m_job = TDEIO::http_post(url, postData, showProgressInfo);
   m_job->addMetaData("content-type", "Content-type: application/x-ofx" );
 
   if(d->m_fpTrace.isOpen()) {
@@ -314,9 +314,9 @@ OfxHttpsRequest::OfxHttpsRequest(const TQString& type, const KURL &url, const TQ
     ts << "request:\n" << TQString(postData) << "\n" << "response:\n";
   }
 
-  connect(m_job,TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(slotOfxFinished(KIO::Job*)));
-  connect(m_job,TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),this,TQT_SLOT(slotOfxData(KIO::Job*,const TQByteArray&)));
-  connect(m_job,TQT_SIGNAL(connected(KIO::Job*)),this,TQT_SLOT(slotOfxConnected(KIO::Job*)));
+  connect(m_job,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(slotOfxFinished(TDEIO::Job*)));
+  connect(m_job,TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),this,TQT_SLOT(slotOfxData(TDEIO::Job*,const TQByteArray&)));
+  connect(m_job,TQT_SIGNAL(connected(TDEIO::Job*)),this,TQT_SLOT(slotOfxConnected(TDEIO::Job*)));
 
   tqApp->enter_loop();
 }
@@ -328,13 +328,13 @@ OfxHttpsRequest::~OfxHttpsRequest()
   }
 }
 
-void OfxHttpsRequest::slotOfxConnected(KIO::Job*)
+void OfxHttpsRequest::slotOfxConnected(TDEIO::Job*)
 {
   m_file.setName(m_dst.path());
   m_file.open(IO_WriteOnly);
 }
 
-void OfxHttpsRequest::slotOfxData(KIO::Job*,const TQByteArray& _ba)
+void OfxHttpsRequest::slotOfxData(TDEIO::Job*,const TQByteArray& _ba)
 {
   if(m_file.isOpen()) {
     TQTextStream ts(&m_file);
@@ -348,7 +348,7 @@ void OfxHttpsRequest::slotOfxData(KIO::Job*,const TQByteArray& _ba)
   }
 }
 
-void OfxHttpsRequest::slotOfxFinished(KIO::Job* /* e */)
+void OfxHttpsRequest::slotOfxFinished(TDEIO::Job* /* e */)
 {
   if(m_file.isOpen()) {
     m_file.close();
diff --git a/kmymoney2/plugins/ofximport/ofxpartner.h b/kmymoney2/plugins/ofximport/ofxpartner.h
index 6367884..2739d82 100644
--- a/kmymoney2/plugins/ofximport/ofxpartner.h
+++ b/kmymoney2/plugins/ofximport/ofxpartner.h
@@ -29,7 +29,7 @@
 // KDE Includes
 
 #include <kurl.h>
-namespace KIO
+namespace TDEIO
 {
   class Job;
   class TransferJob;
@@ -89,9 +89,9 @@ public:
   TQHttp::Error error(void) const { return m_error; }
 
 protected slots:
-  void slotOfxFinished(KIO::Job*);
-  void slotOfxData(KIO::Job*,const TQByteArray&);
-  void slotOfxConnected(KIO::Job*);
+  void slotOfxFinished(TDEIO::Job*);
+  void slotOfxData(TDEIO::Job*,const TQByteArray&);
+  void slotOfxConnected(TDEIO::Job*);
 
 private:
   class Private;
@@ -99,6 +99,6 @@ private:
   KURL              m_dst;
   TQFile             m_file;
   TQHttp::Error      m_error;
-  KIO::TransferJob* m_job;
+  TDEIO::TransferJob* m_job;
 };
 #endif // OFXPARTNER_H