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

5 files changed, 21 insertions, 21 deletions

diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index f0a1c70..99c3ff9 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -388,10 +388,10 @@ void KJotsMain::deleteEntry()
 
 void KJotsMain::configure()
 {
-    if(KConfigDialog::showDialog("settings"))
+    if(TDEConfigDialog::showDialog("settings"))
         return;
 
-    KConfigDialog* dialog = new KConfigDialog(this, "settings", KJotsSettings::self());
+    TDEConfigDialog* dialog = new TDEConfigDialog(this, "settings", KJotsSettings::self());
 
     confPageFont* cpFont = new confPageFont(0, "Font");
     dialog->addPage(cpFont, i18n("Font"), "fonts");
@@ -492,7 +492,7 @@ void KJotsMain::saveBookToFile(bool plainText)
             tryAgain = false;
         }
 
-        if (!KIO::NetAccess::exists(res.URLs[0], true, this) ||
+        if (!TDEIO::NetAccess::exists(res.URLs[0], true, this) ||
             KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").arg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes)
         {
             tryAgain = false;
@@ -533,7 +533,7 @@ void KJotsMain::savePageToFile(bool plainText)
             tryAgain = false;
         }
 
-        if (!KIO::NetAccess::exists(res.URLs[0], true, this) ||
+        if (!TDEIO::NetAccess::exists(res.URLs[0], true, this) ||
             KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").arg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes)
         {
             tryAgain = false;
diff --git a/kjots/KJotsSettings.kcfgc b/kjots/KJotsSettings.kcfgc
index 486cddb..f6e99d5 100644
--- a/kjots/KJotsSettings.kcfgc
+++ b/kjots/KJotsSettings.kcfgc
@@ -3,6 +3,6 @@ File=kjots.kcfg
 ClassName=KJotsSettings
 Singleton=true
 Mutators=Width,Height,SplitterSizes,CurrentSelection,OpenBooks,LastId
-# Inherits=KConfigSkeleton
+# Inherits=TDEConfigSkeleton
 # IncludeFiles=libtdepim/kpimprefs.h
 # MemberVariables=public
diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp
index a13fc2f..83b10e2 100644
--- a/kjots/kjotsentry.cpp
+++ b/kjots/kjotsentry.cpp
@@ -521,7 +521,7 @@ void KJotsBook::saveToFile(KURL url, bool plainText, const TQString& encoding)
 
     m_saveToPlainText = plainText;
     m_saveEncoding = TQTextCodec::codecForName(encoding.ascii());
-    KIO::TransferJob* job = KIO::put(url, -1, true, false, false);
+    TDEIO::TransferJob* job = TDEIO::put(url, -1, true, false, false);
 
     if (!job)
     {
@@ -541,8 +541,8 @@ void KJotsBook::saveToFile(KURL url, bool plainText, const TQString& encoding)
     m_saveProgressDialog->showCancelButton(false);
     m_saveProgressDialog->setAutoClose(true);
 
-    connect(job, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray&)), TQT_SLOT(saveDataReq(KIO::Job*, TQByteArray&)));
-    connect(job, TQT_SIGNAL(result( KIO::Job *)), TQT_SLOT(slotSaveResult( KIO::Job *)));
+    connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQT_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&)));
+    connect(job, TQT_SIGNAL(result( TDEIO::Job *)), TQT_SLOT(slotSaveResult( TDEIO::Job *)));
 
     m_saveInProgress = true;
 }
@@ -551,7 +551,7 @@ void KJotsBook::saveToFile(KURL url, bool plainText, const TQString& encoding)
     \brief Pumps out data when saving to a file.
     This function pumps out page data during a disk save. 
 */
-void KJotsBook::saveDataReq(KIO::Job* /* job */, TQByteArray& data)
+void KJotsBook::saveDataReq(TDEIO::Job* /* job */, TQByteArray& data)
 {
     if (!m_saveInProgress) return; //sanity check
 
@@ -575,7 +575,7 @@ void KJotsBook::saveDataReq(KIO::Job* /* job */, TQByteArray& data)
     This function is called after a disk save. The disk save may or may 
     not have completed normally.
 */
-void KJotsBook::slotSaveResult(KIO::Job *)
+void KJotsBook::slotSaveResult(TDEIO::Job *)
 {
     m_saveInProgress = false;
     delete m_saveProgressDialog;
@@ -933,14 +933,14 @@ void KJotsPage::saveToFile(KURL url, bool plainText, const TQString& encoding)
 
     m_saveToPlainText = plainText;
     m_saveEncoding = TQTextCodec::codecForName(encoding.ascii());
-    KIO::TransferJob* job = KIO::put(url, -1, true, false, false);
+    TDEIO::TransferJob* job = TDEIO::put(url, -1, true, false, false);
     if (!job)
     {
         return;
     }
 
-    connect(job, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray&)), TQT_SLOT(saveDataReq(KIO::Job*, TQByteArray&)));
-    connect(job, TQT_SIGNAL(result( KIO::Job *)), TQT_SLOT(slotSaveResult( KIO::Job *)));
+    connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQT_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&)));
+    connect(job, TQT_SIGNAL(result( TDEIO::Job *)), TQT_SLOT(slotSaveResult( TDEIO::Job *)));
     m_saveInProgress = true;
 }
 
@@ -950,7 +950,7 @@ void KJotsPage::saveToFile(KURL url, bool plainText, const TQString& encoding)
 
     \todo This should be augmented to cycle in case of REALLY long pages.
 */
-void KJotsPage::saveDataReq(KIO::Job* /* job */, TQByteArray& data)
+void KJotsPage::saveDataReq(TDEIO::Job* /* job */, TQByteArray& data)
 {
     if (!m_saveInProgress) return; //sanity check
 
@@ -974,7 +974,7 @@ void KJotsPage::saveDataReq(KIO::Job* /* job */, TQByteArray& data)
     This function is called after a disk save. The disk save may or may 
     not have completed normally.
 */
-void KJotsPage::slotSaveResult(KIO::Job *)
+void KJotsPage::slotSaveResult(TDEIO::Job *)
 {
     m_saveInProgress = false;
     /* if (job->error() != 0) {} */
diff --git a/kjots/kjotsentry.h b/kjots/kjotsentry.h
index 96e5086..a0260c8 100644
--- a/kjots/kjotsentry.h
+++ b/kjots/kjotsentry.h
@@ -41,7 +41,7 @@ class TQFile;
 
 class KJotsBook;
 
-namespace KIO
+namespace TDEIO
 {
     class Job;
 }
@@ -122,8 +122,8 @@ class KJotsBook : public KJotsEntryBase
         TQString generateText( void );
 
     protected slots:
-        void saveDataReq(KIO::Job* job, TQByteArray& data);
-        void slotSaveResult(KIO::Job*);
+        void saveDataReq(TDEIO::Job* job, TQByteArray& data);
+        void slotSaveResult(TDEIO::Job*);
 
     private:
         TQString getToc();
@@ -166,8 +166,8 @@ class KJotsPage : public KJotsEntryBase
         TQString generateText( void );
 
     protected slots:
-        void saveDataReq(KIO::Job* job, TQByteArray& data);
-        void slotSaveResult(KIO::Job*);
+        void saveDataReq(TDEIO::Job* job, TQByteArray& data);
+        void slotSaveResult(TDEIO::Job*);
 
     private:
         TQString m_text;
diff --git a/kjots/main.cpp b/kjots/main.cpp
index b8c6f22..d2a3e0a 100644
--- a/kjots/main.cpp
+++ b/kjots/main.cpp
@@ -62,7 +62,7 @@ int main( int argc, char **argv )
 
   // backwards compatibility code to convert "old" user font settings
   // to the new config settings
-  KConfig *config = a.config();
+  TDEConfig *config = a.config();
   config->setGroup("kjots");
   if (config->hasKey("EFontFamily")) {
     // read old font and create it