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

4 files changed, 8 insertions, 8 deletions

diff --git a/kio/bookmarks/kbookmarkimporter_kde1.cc b/kio/bookmarks/kbookmarkimporter_kde1.cc
index 49999e675..ac0d29b97 100644
--- a/kio/bookmarks/kbookmarkimporter_kde1.cc
+++ b/kio/bookmarks/kbookmarkimporter_kde1.cc
@@ -81,8 +81,8 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString &
                 parentElem.appendChild( groupElem );
                 TQDomElement textElem = m_pDoc->createElement( "title" );
                 groupElem.appendChild( textElem );
-                textElem.appendChild( m_pDoc->createTextNode( KIO::decodeFileName( ep->d_name ) ) );
-                if ( KIO::decodeFileName( ep->d_name ) == "Toolbar" )
+                textElem.appendChild( m_pDoc->createTextNode( TDEIO::decodeFileName( ep->d_name ) ) );
+                if ( TDEIO::decodeFileName( ep->d_name ) == "Toolbar" )
                     groupElem.setAttribute("toolbar","yes");
                 scanIntern( groupElem, file.path() );
             }
@@ -136,7 +136,7 @@ void KBookmarkImporter::parseBookmark( TQDomElement & parentElem, TQCString _tex
     if (icon.right( 4 ) == ".xpm" ) // prevent warnings
         icon.truncate( icon.length() - 4 );
 
-    TQString text = KIO::decodeFileName( TQString::fromLocal8Bit(_text) );
+    TQString text = TDEIO::decodeFileName( TQString::fromLocal8Bit(_text) );
     if ( text.length() > 8 && text.right( 8 ) == ".desktop" )
         text.truncate( text.length() - 8 );
     if ( text.length() > 7 && text.right( 7 ) == ".kdelnk" )
diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc
index 9e6d711d2..a87e0f20e 100644
--- a/kio/bookmarks/kbookmarkmanager.cc
+++ b/kio/bookmarks/kbookmarkmanager.cc
@@ -702,7 +702,7 @@ KBookmarkSettings* KBookmarkSettings::s_self = 0;
 
 void KBookmarkSettings::readSettings()
 {
-   KConfig config("kbookmarkrc", false, false);
+   TDEConfig config("kbookmarkrc", false, false);
    config.setGroup("Bookmarks");
 
    // add bookmark dialog usage - no reparse
diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc
index 20ce42a86..5e85bc1f6 100644
--- a/kio/bookmarks/kbookmarkmenu.cc
+++ b/kio/bookmarks/kbookmarkmenu.cc
@@ -1099,7 +1099,7 @@ void KBookmarkMenuNSImporter::endFolder()
 
 KBookmarkMenu::DynMenuInfo KBookmarkMenu::showDynamicBookmarks( const TQString &id )
 {
-  KConfig config("kbookmarkrc", false, false);
+  TDEConfig config("kbookmarkrc", false, false);
   config.setGroup("Bookmarks");
 
   DynMenuInfo info;
@@ -1131,7 +1131,7 @@ KBookmarkMenu::DynMenuInfo KBookmarkMenu::showDynamicBookmarks( const TQString &
 
 TQStringList KBookmarkMenu::dynamicBookmarksList()
 {
-  KConfig config("kbookmarkrc", false, false);
+  TDEConfig config("kbookmarkrc", false, false);
   config.setGroup("Bookmarks");
 
   TQStringList mlist;
@@ -1145,7 +1145,7 @@ TQStringList KBookmarkMenu::dynamicBookmarksList()
 
 void KBookmarkMenu::setDynamicBookmarks(const TQString &id, const DynMenuInfo &newMenu)
 {
-  KConfig config("kbookmarkrc", false, false);
+  TDEConfig config("kbookmarkrc", false, false);
 
   // add group unconditionally
   config.setGroup("DynamicMenu-" + id);
diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h
index fa0368b68..b54398a02 100644
--- a/kio/bookmarks/kbookmarkmenu.h
+++ b/kio/bookmarks/kbookmarkmenu.h
@@ -50,7 +50,7 @@ class KBookmarkOwner;
 class KBookmarkMenu;
 class KPopupMenu;
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 /**
  * This class provides a bookmark menu.  It is typically used in