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

8 files changed, 29 insertions, 29 deletions

diff --git a/khexedit/dialog.cc b/khexedit/dialog.cc
index 1ce9636..6daed1a 100644
--- a/khexedit/dialog.cc
+++ b/khexedit/dialog.cc
@@ -78,7 +78,7 @@ CGotoDialog::CGotoDialog( TQWidget *parent, const char *name, bool modal )
   gbox->addWidget( mCheckVisible, 2, 0 );
   gbox->setRowStretch( 3, 10 );
 
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup("Goto Dialog");
   mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", false ) );
   mCheckVisible->setChecked( config.readBoolEntry( "StayVisible", true ) );
@@ -89,7 +89,7 @@ CGotoDialog::CGotoDialog( TQWidget *parent, const char *name, bool modal )
 
 CGotoDialog::~CGotoDialog( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup("Goto Dialog");
   config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() );
   config.writeEntry( "StayVisible", mCheckVisible->isChecked() );
@@ -232,7 +232,7 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal )
   gbox->addWidget( mCheckIgnoreCase, 3, 0 );
   gbox->setRowStretch( 4, 10 );
 
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup("Find Dialog");
   mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", true ) );
   mCheckInSelection->setChecked( config.readBoolEntry( "InSelection", false) );
@@ -248,7 +248,7 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal )
 
 CFindDialog::~CFindDialog( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup("Find Dialog");
   config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() );
   config.writeEntry( "InSelection", mCheckInSelection->isChecked() );
@@ -573,7 +573,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal )
   gbox->addWidget( mCheckIgnoreCase, 3, 0 );
   gbox->setRowStretch( 4, 10 );
 
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup("Replace Dialog");
   mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", true ) );
   mCheckInSelection->setChecked( config.readBoolEntry( "InSelection", false) );
@@ -592,7 +592,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal )
 
 CReplaceDialog::~CReplaceDialog( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup("Replace Dialog");
   config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() );
   config.writeEntry( "InSelection", mCheckInSelection->isChecked() );
@@ -1146,7 +1146,7 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal )
   connect( mCheckOnCursor, TQT_SIGNAL(clicked()), TQT_SLOT(cursorCheck()) );
   gbox->setRowStretch( 3, 10 );
 
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup("Insert Pattern Dialog");
   mCheckPattern->setChecked( config.readBoolEntry( "RepeatPattern", false ) );
   mCheckOnCursor->setChecked( config.readBoolEntry( "InsertOnCursor", false) );
@@ -1159,7 +1159,7 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal )
 
 CInsertDialog::~CInsertDialog( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup("Insert Pattern Dialog");
   config.writeEntry( "RepeatPattern", mCheckPattern->isChecked() );
   config.writeEntry( "InsertOnCursor", mCheckOnCursor->isChecked() );
diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc
index 5bf6c7f..0656e96 100644
--- a/khexedit/hexeditorwidget.cc
+++ b/khexedit/hexeditorwidget.cc
@@ -121,7 +121,7 @@ void CHexEditorWidget::initialize( void )
 }
 
 
-void CHexEditorWidget::writeConfiguration( KConfig &config )
+void CHexEditorWidget::writeConfiguration( TDEConfig &config )
 {
   SDisplayLayout &layout = mDisplayState.layout;
   config.setGroup( "Display Options" );
@@ -219,7 +219,7 @@ void CHexEditorWidget::writeConfiguration( KConfig &config )
   }
 }
 
-void CHexEditorWidget::readConfiguration( KConfig &config )
+void CHexEditorWidget::readConfiguration( TDEConfig &config )
 {
   SDisplayLayout &layout = mDisplayState.layout;
   config.setGroup( "Display Options" );
@@ -1987,12 +1987,12 @@ int CHexEditorWidget::readURL( const KURL &url, bool insert )
   // 3) Load the file.
   //
   TQString tmpfile;
-  if ( !KIO::NetAccess::download( url, tmpfile, this ) )
+  if ( !TDEIO::NetAccess::download( url, tmpfile, this ) )
     return Err_ReadFailed;
 
   bool success = readFile( tmpfile, url.url(), insert );
 
-  KIO::NetAccess::removeTempFile( tmpfile );
+  TDEIO::NetAccess::removeTempFile( tmpfile );
 
   return( success == true ? Err_Success : Err_ReadFailed );
 }
@@ -2009,7 +2009,7 @@ void CHexEditorWidget::writeURL( TQString &url )
     KTempFile tf;
     tf.setAutoDelete( true );
     writeFile( tf.name() );
-    if( !KIO::NetAccess::upload(tf.name(),url,this) )
+    if( !TDEIO::NetAccess::upload(tf.name(),url,this) )
     {
       mHexView->setModified( modified );
       TQString msg = i18n("Could not save remote file.");
diff --git a/khexedit/hexeditorwidget.h b/khexedit/hexeditorwidget.h
index a417343..0f63a89 100644
--- a/khexedit/hexeditorwidget.h
+++ b/khexedit/hexeditorwidget.h
@@ -48,7 +48,7 @@ class CExportDialog;
 class CConverterDialog;
 class CFindNavigatorDialog;
 class CReplacePromptDialog;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 
 class CHexEditorWidget : public TQWidget
@@ -75,8 +75,8 @@ class CHexEditorWidget : public TQWidget
     ~CHexEditorWidget( void );
 
     void initialize( void );
-    void writeConfiguration( KConfig &config );
-    void readConfiguration( KConfig &config );
+    void writeConfiguration( TDEConfig &config );
+    void readConfiguration( TDEConfig &config );
 
     bool isOpen( const TQString &url, uint &offset );
     bool modified( void );
diff --git a/khexedit/hextoolwidget.cc b/khexedit/hextoolwidget.cc
index b5e918e..4fa957b 100644
--- a/khexedit/hextoolwidget.cc
+++ b/khexedit/hextoolwidget.cc
@@ -157,7 +157,7 @@ CHexToolWidget::~CHexToolWidget( void )
 }
 
 
-void CHexToolWidget::writeConfiguration( KConfig &config )
+void CHexToolWidget::writeConfiguration( TDEConfig &config )
 {
   config.setGroup("Conversion" );
   config.writeEntry("LittleEndian",  mCheckIntelFormat->isChecked() );
@@ -165,7 +165,7 @@ void CHexToolWidget::writeConfiguration( KConfig &config )
   config.writeEntry("StreamWindow", mBitCombo->currentItem() );
 }
 
-void CHexToolWidget::readConfiguration( KConfig &config )
+void CHexToolWidget::readConfiguration( TDEConfig &config )
 {
   config.setGroup("Conversion" );
   bool s1  = config.readBoolEntry( "LittleEndian", true );
diff --git a/khexedit/hextoolwidget.h b/khexedit/hextoolwidget.h
index 94eb10c..fda0058 100644
--- a/khexedit/hextoolwidget.h
+++ b/khexedit/hextoolwidget.h
@@ -40,8 +40,8 @@ class CHexToolWidget : public TQFrame
     CHexToolWidget( TQWidget *parent = 0, const char *name = 0 );
     ~CHexToolWidget( void );
 
-    void writeConfiguration( KConfig &config );
-    void readConfiguration( KConfig &config );
+    void writeConfiguration( TDEConfig &config );
+    void readConfiguration( TDEConfig &config );
     unsigned long bitValue( SCursorState &state, int n );
 
   protected:
diff --git a/khexedit/stringdialog.cc b/khexedit/stringdialog.cc
index 37247ae..a1367b4 100644
--- a/khexedit/stringdialog.cc
+++ b/khexedit/stringdialog.cc
@@ -150,7 +150,7 @@ void CStringDialog::showEvent( TQShowEvent *e )
 
 void CStringDialog::readConfiguration( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup( "String Dialog" );
 
   mLengthSpin->setValue( config.readNumEntry("MinimumLength", 4)  );
@@ -163,7 +163,7 @@ void CStringDialog::readConfiguration( void )
 
 void CStringDialog::writeConfiguration( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   config.setGroup( "String Dialog" );
 
   config.writeEntry( "MinimumLength", mLengthSpin->value() );
diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc
index 2297c62..cd92779 100644
--- a/khexedit/toplevel.cc
+++ b/khexedit/toplevel.cc
@@ -378,7 +378,7 @@ void KHexEdit::initialize( bool openFiles )
   {
     // Code modified from tdelibs/tdeui/kactionclasses.cpp KRecentFilesAction::loadEntries
       
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     const TQString oldGroup = config->group();
     
@@ -644,19 +644,19 @@ bool KHexEdit::queryExit( void )
 
 void KHexEdit::readConfiguration( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   readConfiguration( config );
 }
 
 
 void KHexEdit::writeConfiguration( void )
 {
-  KConfig &config = *kapp->config();
+  TDEConfig &config = *kapp->config();
   writeConfiguration( config );
 }
 
 
-void KHexEdit::writeConfiguration( KConfig &config )
+void KHexEdit::writeConfiguration( TDEConfig &config )
 {
     saveMainWindowSettings(& config, "General Options");
   config.setGroup("General Options" );
@@ -676,7 +676,7 @@ void KHexEdit::writeConfiguration( KConfig &config )
 }
 
 
-void KHexEdit::readConfiguration( KConfig &config )
+void KHexEdit::readConfiguration( TDEConfig &config )
 {
     applyMainWindowSettings(& config, "General Options");
 
diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h
index cb07e3c..8af4f0d 100644
--- a/khexedit/toplevel.h
+++ b/khexedit/toplevel.h
@@ -213,8 +213,8 @@ protected:
     void renameDocument( const TQString &curName, const TQString &newName );
     void setTickedDocument( const TQString &fileName );
 
-    void writeConfiguration( KConfig &config );
-    void readConfiguration( KConfig &config );
+    void writeConfiguration( TDEConfig &config );
+    void readConfiguration( TDEConfig &config );
     bool eventFilter( TQObject *obj, TQEvent *event );
 
     int acceleratorNumKey( uint index );