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

15 files changed, 38 insertions, 38 deletions

diff --git a/knotes/ChangeLog b/knotes/ChangeLog
index b0d0c047..ef73afec 100644
--- a/knotes/ChangeLog
+++ b/knotes/ChangeLog
@@ -231,13 +231,13 @@ ChangeLog for KNotes
 
     * revert dependency on tdelibs-HEAD, we need KDE 3.2.x for the KDE PIM 3.3
       release
-    * add a hack to work around inconsistency/limitation in KConfig XT:
+    * add a hack to work around inconsistency/limitation in TDEConfig XT:
       it is not possible to make one KCXT-generated class inherit another
       one due to CTOR-incompatibilites. The hack installs a CustomAddition
       and simply provides a copied&pasted CTOR from the generated code with
       adapted arguments (none, actually).
     * so now KNotesGlobalConfig inherits KNoteConfig and the global config
-      dialog needs only one KConfigSkeleton---the former one
+      dialog needs only one TDEConfigSkeleton---the former one
     * due to the last point it is now possible (and needed) to not simply copy
       the knotesrc for new notes but rather just copy part of KNotesGlobalConfig
       into the new KNoteConfig object. And boy, this makes creation of new notes
@@ -266,7 +266,7 @@ ChangeLog for KNotes
 
 2004/03/31  Michael Brade <brade@kde.org>
 
-    * hmm, wasn't such a good idea to set a default desktop in KConfig XT - only
+    * hmm, wasn't such a good idea to set a default desktop in TDEConfig XT - only
       changes will actually be saved and thus every new note that is not moved
       to a different desktop after creation appeared on the desktop KNotes was
       started on. Fixed.
@@ -340,8 +340,8 @@ ChangeLog for KNotes
 
     * adapt to new KWin: s/Always on Top/Keep Above Others/g and added
       Keep Below Others; furthermore use the corresponding new NET::State flags
-    * completely rewrote the config dialog, make it inherit KConfigDialog
-    * ported KNotes to KConfig XT, had to change the config file format:
+    * completely rewrote the config dialog, make it inherit TDEConfigDialog
+    * ported KNotes to TDEConfig XT, had to change the config file format:
       removed "state" entry and added "KeepAbove", "KeepBelow", "ShowInTaskbar"
 
 2004/03/15  Michael Brade <brade@kde.org>
@@ -367,7 +367,7 @@ ChangeLog for KNotes
       name anyway. Dunno why I introduced the attachments at all in the first
       place...
     * KNotes is now "network-enabled" regarding config files: it now only uses
-      KIO::NetAccess for the file handling.
+      TDEIO::NetAccess for the file handling.
 
 2004/03/09  Michael Brade <brade@kde.org>
 
@@ -732,7 +732,7 @@ ChangeLog for KNotes
     saved on a session shutdown.  The patch fixes those and adds some workarounds
     for some weird behavior in the QMultiLineEdit widget which adds some phantom
     lines to your text now and then.  It also reduces the memory usage by not
-    keeping a KConfig object open for each note all the time - it just creates
+    keeping a TDEConfig object open for each note all the time - it just creates
     them when saving new changes to the note settings."
 
 2000/09/24  Dirk Müller <mueller@kde.org>
@@ -810,7 +810,7 @@ ChangeLog for KNotes
 2000/05/30  Wynn Wilkes <wynnw@calderasystems.com>
 
     KNotes rewrite:
-     - changed config file to use KConfig
+     - changed config file to use TDEConfig
      - use KTQt::DockWindow and KUniqueApplication
      - Changed structure to make smaller files
 
diff --git a/knotes/TODO b/knotes/TODO
index bc2f5c57..202f563d 100644
--- a/knotes/TODO
+++ b/knotes/TODO
@@ -33,9 +33,9 @@ TODO:
  * do not copy the knotesrc file anymore
    => use the static KNotesGlobalConfig object and copy the important stuff over
       Disadv: some keys and defaults must be defined in both config files
-             (and thus, KConfig XT specs)
-   => how about one kconfig Xt spec and inheriting from the KConfigSkeleton or make the
-      KConfigSkeleton inherit something?
+             (and thus, TDEConfig XT specs)
+   => how about one kconfig Xt spec and inheriting from the TDEConfigSkeleton or make the
+      TDEConfigSkeleton inherit something?
  * global config dialog: use "Defaults" in the side bar and add a page with two tabs,
    Display and Editor, respectively
  * call m_calendar.update( this ) in knotesapp after saving/changing a note?
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index b68a342f..a90d891b 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -219,7 +219,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
 
     // no config file yet? -> use the default display config if available
     // we want to write to configFile, so use "false"
-    bool newNote = !KIO::NetAccess::exists( KURL::fromPathOrURL( configFile ), false, 0 );
+    bool newNote = !TDEIO::NetAccess::exists( KURL::fromPathOrURL( configFile ), false, 0 );
 
     m_config = new KNoteConfig( KSharedConfig::openConfig( configFile, false, false ) );
     m_config->readConfig();
@@ -227,7 +227,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
 
     if ( newNote )
     {
-        // until tdelibs provides copying of KConfigSkeletons (KDE 3.4)
+        // until tdelibs provides copying of TDEConfigSkeletons (KDE 3.4)
         KNotesGlobalConfig *globalConfig = KNotesGlobalConfig::self();
         m_config->setBgColor( globalConfig->bgColor() );
         m_config->setFgColor( globalConfig->fgColor() );
@@ -324,7 +324,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
     m_fold->setMask( TQRegion( m_fold->pixmap()->createHeuristicMask() ) );
 
     // if this is a new note put on current desktop - we can't use defaults
-    // in KConfig XT since only _changes_ will be stored in the config file
+    // in TDEConfig XT since only _changes_ will be stored in the config file
     int desktop = m_config->desktop();
     if ( desktop < 0 && desktop != NETWinInfo::OnAllDesktops )
         desktop = KWin::currentDesktop();
@@ -410,7 +410,7 @@ void KNote::slotKill( bool force )
     TQString configFile = TDEGlobal::dirs()->saveLocation( "appdata", "notes/" );
     configFile += m_journal->uid();
 
-    if ( !KIO::NetAccess::del( KURL::fromPathOrURL( configFile ), this ) )
+    if ( !TDEIO::NetAccess::del( KURL::fromPathOrURL( configFile ), this ) )
         kdError(5500) << "Can't remove the note config: " << configFile << endl;
 
     emit sigKillNote( m_journal );
@@ -654,15 +654,15 @@ void KNote::sync( const TQString& app )
     hash.update( m_editor->text().utf8() );
     hash.hexDigest( result );
 
-    // hacky... not possible with KConfig XT
-    KConfig *config = m_config->config();
+    // hacky... not possible with TDEConfig XT
+    TDEConfig *config = m_config->config();
     config->setGroup( "Synchronisation" );
     config->writeEntry( app, result.data() );
 }
 
 bool KNote::isNew( const TQString& app ) const
 {
-    KConfig *config = m_config->config();
+    TDEConfig *config = m_config->config();
     config->setGroup( "Synchronisation" );
     TQString hash = config->readEntry( app );
     return hash.isEmpty();
@@ -679,7 +679,7 @@ bool KNote::isModified( const TQString& app ) const
     hash.update( m_editor->text().utf8() );
     hash.hexDigest();
 
-    KConfig *config = m_config->config();
+    TDEConfig *config = m_config->config();
     config->setGroup( "Synchronisation" );
     TQString orig = config->readEntry( app );
 
diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index 9eeb3fdc..f35ad9e9 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -43,7 +43,7 @@
 
 KNoteConfigDlg::KNoteConfigDlg( KNoteConfig *config, const TQString& title,
         TQWidget *parent, const char *name )
-    : KConfigDialog( parent, name, config ? config : KNotesGlobalConfig::self(), IconList,
+    : TDEConfigDialog( parent, name, config ? config : KNotesGlobalConfig::self(), IconList,
                      config ? Default|Ok|Apply|Cancel : Default|Ok|Cancel, Ok )
 {
     setCaption( title );
diff --git a/knotes/knoteconfigdlg.h b/knotes/knoteconfigdlg.h
index 18300d98..5d7118ca 100644
--- a/knotes/knoteconfigdlg.h
+++ b/knotes/knoteconfigdlg.h
@@ -27,7 +27,7 @@ class TQString;
 class KNoteConfig;
 
 
-class KNoteConfigDlg : public KConfigDialog
+class KNoteConfigDlg : public TDEConfigDialog
 {
     Q_OBJECT
   
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 9df09cf3..d53ac911 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -163,7 +163,7 @@ KNotesApp::KNotesApp()
 
     m_globalAccel->readSettings();
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup( "Global Keybindings" );
     m_globalAccel->setEnabled( config->readBoolEntry( "Enabled", true ) );
 
@@ -199,7 +199,7 @@ KNotesApp::KNotesApp()
     m_alarm = new KNotesAlarm( m_manager, TQT_TQOBJECT(this) );
 
     // create the socket and possibly start listening for connections
-    m_listener = new KServerSocket();
+    m_listener = new TDEServerSocket();
     m_listener->setResolutionEnabled( true );
     connect( m_listener, TQT_SIGNAL(readyAccept()), TQT_SLOT(acceptConnection()) );
     updateNetworkListener();
diff --git a/knotes/knotesapp.h b/knotes/knotesapp.h
index 66a3eea4..a850bec7 100644
--- a/knotes/knotesapp.h
+++ b/knotes/knotesapp.h
@@ -48,7 +48,7 @@ namespace KCal {
 }
 
 namespace KNetwork {
-    class KServerSocket;
+    class TDEServerSocket;
 }
 
 
@@ -145,7 +145,7 @@ private:
     KNotesResourceManager *m_manager;
 
     KNotesAlarm     *m_alarm;
-    KNetwork::KServerSocket   *m_listener;
+    KNetwork::TDEServerSocket   *m_listener;
 
     TQDict<KNote>    m_noteList;
     KNoteActionList m_noteActions;
diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp
index c7e79172..6c59f13e 100644
--- a/knotes/knoteslegacy.cpp
+++ b/knotes/knoteslegacy.cpp
@@ -146,7 +146,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir,
     TQString configFile = noteDir.absFilePath( journal->uid() );
 
     // set the defaults
-    KIO::NetAccess::copy(
+    TDEIO::NetAccess::copy(
         KURL( TDEGlobal::dirs()->saveLocation( "config" ) + "knotesrc" ),
         KURL( configFile ),
         0
@@ -240,7 +240,7 @@ bool KNotesLegacy::convertKNotes2Config( Journal *journal, TQDir& noteDir,
     }
 
     // update the config
-    KConfig config( configFile );
+    TDEConfig config( configFile );
     config.setGroup( "Data" );
     journal->setSummary( config.readEntry( "name" ) );
     config.deleteGroup( "Data", true );
diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp
index a843c47b..5845812c 100644
--- a/knotes/knotesnetrecv.cpp
+++ b/knotes/knotesnetrecv.cpp
@@ -145,7 +145,7 @@ void KNotesNetworkReceiver::slotConnectionClosed()
 void KNotesNetworkReceiver::slotError( int err )
 {
     kdWarning() << k_funcinfo
-                << m_sock->KNetwork::KSocketBase::errorString( static_cast<KSocketBase::SocketError>(err) )
+                << m_sock->KNetwork::TDESocketBase::errorString( static_cast<TDESocketBase::SocketError>(err) )
                 << endl;
 }
 
diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp
index 998439de..20e2b07f 100644
--- a/knotes/knotesnetsend.cpp
+++ b/knotes/knotesnetsend.cpp
@@ -91,7 +91,7 @@ void KNotesNetworkSender::slotReadyWrite()
 void KNotesNetworkSender::slotError( int err )
 {
     KMessageBox::sorry( 0, i18n("Communication error: %1")
-           .arg( TQString(KNetwork::KSocketBase::errorString( static_cast<KSocketBase::SocketError>(err) )) )
+           .arg( TQString(KNetwork::TDESocketBase::errorString( static_cast<TDESocketBase::SocketError>(err) )) )
     );
     slotClosed();
 }
diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp
index 440b1454..7e208531 100644
--- a/knotes/resourcelocal.cpp
+++ b/knotes/resourcelocal.cpp
@@ -44,7 +44,7 @@
 
 
 
-ResourceLocal::ResourceLocal( const KConfig *config )
+ResourceLocal::ResourceLocal( const TDEConfig *config )
     : ResourceNotes( config ), mCalendar( TQString::fromLatin1( "UTC" ) )
 {
     kdDebug(5500) << "ResourceLocal::ResourceLocal()" << endl;
@@ -63,7 +63,7 @@ ResourceLocal::~ResourceLocal()
 {
 }
 
-void ResourceLocal::writeConfig( KConfig *config )
+void ResourceLocal::writeConfig( TDEConfig *config )
 {
     KRES::Resource::writeConfig( config );
     config->writePathEntry( "NotesURL", mURL.prettyURL() );
diff --git a/knotes/resourcelocal.h b/knotes/resourcelocal.h
index baeb710e..d2100989 100644
--- a/knotes/resourcelocal.h
+++ b/knotes/resourcelocal.h
@@ -43,10 +43,10 @@
 class ResourceLocal : public ResourceNotes
 {
 public:
-    ResourceLocal( const KConfig* );
+    ResourceLocal( const TDEConfig* );
     virtual ~ResourceLocal();
 
-    virtual void writeConfig( KConfig *config );
+    virtual void writeConfig( TDEConfig *config );
 
     /**
      * Load resource data.
diff --git a/knotes/resourcelocal_plugin.cpp b/knotes/resourcelocal_plugin.cpp
index 846a5a3a..ddd696ae 100644
--- a/knotes/resourcelocal_plugin.cpp
+++ b/knotes/resourcelocal_plugin.cpp
@@ -38,7 +38,7 @@ class LocalNotesFactory
     : public KRES::PluginFactoryBase
 {
 public:
-    KRES::Resource *resource( const KConfig *config )
+    KRES::Resource *resource( const TDEConfig *config )
     {
         return new ResourceLocal( config );
     }
@@ -61,7 +61,7 @@ extern "C"
         return new ResourceLocalConfig( parent, "Configure Local Resource" );
     }
 
-    KRES::Resource *resource( const KConfig* config )
+    KRES::Resource *resource( const TDEConfig* config )
     {
         return new ResourceLocal( config );
     }
diff --git a/knotes/resourcenotes.cpp b/knotes/resourcenotes.cpp
index 13114272..2cd31eb0 100644
--- a/knotes/resourcenotes.cpp
+++ b/knotes/resourcenotes.cpp
@@ -33,7 +33,7 @@
 #include "resourcenotes.h"
 
 
-ResourceNotes::ResourceNotes( const KConfig *config )
+ResourceNotes::ResourceNotes( const TDEConfig *config )
     : KRES::Resource( config ), mManager( 0 )
 {
     if ( !config )
diff --git a/knotes/resourcenotes.h b/knotes/resourcenotes.h
index 65cf1acb..1e0d07d1 100644
--- a/knotes/resourcenotes.h
+++ b/knotes/resourcenotes.h
@@ -37,7 +37,7 @@
 #include <tdepimmacros.h>
 #include <libkcal/alarm.h>
 
-class KConfig;
+class TDEConfig;
 class KNotesResourceManager;
 
 namespace KCal {
@@ -55,7 +55,7 @@ namespace KCal {
 class KDE_EXPORT ResourceNotes : public KRES::Resource
 {
 public:
-    ResourceNotes( const KConfig * );
+    ResourceNotes( const TDEConfig * );
     virtual ~ResourceNotes();
 
     /**