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

6 files changed, 48 insertions, 48 deletions

diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index c72768a7..f14cad8d 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -2384,7 +2384,7 @@ bool KPrCanvas::exportPage( int nPage,
             }
             if( !bLocalFile ){
                 if( res ){
-                    res = KIO::NetAccess::upload( tmpFile->name(), fileURL, this );
+                    res = TDEIO::NetAccess::upload( tmpFile->name(), fileURL, this );
                 }
             }
         }
@@ -3610,7 +3610,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
           - static_cast<int>( MM_TO_POINT( top_margin ) ) );*/
     }
 
-    KConfig *config=KPrFactory::global()->config();
+    TDEConfig *config=KPrFactory::global()->config();
     config->setGroup("Misc");
     bool printNotes = config->readBoolEntry("PrintNotes", true);
 
@@ -4020,7 +4020,7 @@ void KPrCanvas::dropEvent( TQDropEvent *e )
 
             TQString filename;
             if ( !url.isLocalFile() ) {
-                if ( !KIO::NetAccess::download( url, filename, this ) )
+                if ( !TDEIO::NetAccess::download( url, filename, this ) )
                     continue;
             } else {
                 filename = url.path();
@@ -4057,7 +4057,7 @@ void KPrCanvas::dropEvent( TQDropEvent *e )
                     setCursor( c );
                 }
             }
-            KIO::NetAccess::removeTempFile( filename );
+            TDEIO::NetAccess::removeTempFile( filename );
         }
     }
     else if (m_currentTextObjectView)
diff --git a/kpresenter/KPrConfig.h b/kpresenter/KPrConfig.h
index 65a55dfc..2616298a 100644
--- a/kpresenter/KPrConfig.h
+++ b/kpresenter/KPrConfig.h
@@ -28,7 +28,7 @@ class KPrView;
 class KPrDocument;
 class KIntNumInput;
 class KColorButton;
-class KConfig;
+class TDEConfig;
 class TQCheckBox;
 class KLineEdit;
 class KDoubleNumInput;
@@ -56,7 +56,7 @@ public:
     void slotDefault();
 private:
     KPrView* m_pView;
-    KConfig* config;
+    TDEConfig* config;
     int oldNbRecentFiles;
     KDoubleNumInput* indent;
     KIntNumInput* recentFiles;
@@ -75,7 +75,7 @@ protected:
     KPrView* m_pView;
     KColorButton* bgColor;
     KColorButton* gridColor;
-    KConfig* config;
+    TDEConfig* config;
     TQColor oldBgColor;
     TQColor oldGridColor;
 } ;
@@ -91,7 +91,7 @@ public:
 private:
     KPrView* m_pView;
     KSpell2::ConfigWidget *m_spellConfigWidget;
-    KConfig* config;
+    TDEConfig* config;
 };
 
 class KPrConfigureMiscPage : public TQWidget
@@ -104,7 +104,7 @@ public:
     void slotDefault();
 private:
     KPrView* m_pView;
-    KConfig* config;
+    TDEConfig* config;
     KIntNumInput* m_undoRedoLimit;
     int m_oldNbRedo;
     bool m_printNotes;
@@ -131,7 +131,7 @@ private:
     bool m_oldBackupFile;
     TQString m_oldLanguage;
     KPrView* m_pView;
-    KConfig* config;
+    TDEConfig* config;
     TQFont *font;
     TQLabel *fontName;
     KIntNumInput* autoSave;
@@ -158,7 +158,7 @@ public slots:
 
 private:
     KPrView* m_pView;
-    KConfig* config;
+    TDEConfig* config;
 
     KPrPenStyleWidget *m_confPenDia;
     KPrBrushProperty *m_brushProperty;
@@ -180,7 +180,7 @@ private slots:
     void slotSelectionChanged(TQListViewItem *);
 private:
     KPrView* m_pView;
-    KConfig* config;
+    TDEConfig* config;
     KListView* m_pPathView;
     TQPushButton *m_modifyPath;
 };
@@ -196,7 +196,7 @@ public:
 private slots:
   void screenReaderOptionChanged();
 private:
-  KConfig* config;
+  TDEConfig* config;
   TQCheckBox* m_cbSpeakPointerWidget;
   TQCheckBox* m_cbSpeakFocusWidget;
   TQVGroupBox* m_gbScreenReaderOptions;
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index dad2baf6..c08ab692 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -158,7 +158,7 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje
     KoParagStyle* m_standardStyle = new KoParagStyle( "Standard" );
     m_styleColl->addStyle( m_standardStyle );
 
-    KConfig *config = KPrFactory::global()->config();
+    TDEConfig *config = KPrFactory::global()->config();
     config->setGroup("Document defaults" );
     TQString defaultFontname=config->readEntry("DefaultFont");
     if ( !defaultFontname.isEmpty() )
@@ -303,11 +303,11 @@ void KPrDocument::saveConfig()
 {
     if ( !isReadWrite())
         return;
-    KConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" );
+    TDEConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" );
     group.writeEntry( "PersonalDict", m_spellCheckPersonalDict );
     if ( !isEmbedded() )
     {
-        KConfig *config = KPrFactory::global()->config();
+        TDEConfig *config = KPrFactory::global()->config();
         config->setGroup( "Interface" );
         config->writeEntry( "Zoom", m_zoomHandler->zoom() );
         config->writeEntry( "AllowAutoFormat" , m_bAllowAutoFormat );
@@ -322,7 +322,7 @@ void KPrDocument::saveConfig()
 void KPrDocument::initConfig()
 {
     int zoom;
-    KConfig* config = KPrFactory::global()->config();
+    TDEConfig* config = KPrFactory::global()->config();
     if( config->hasGroup("Interface") ) {
         config->setGroup( "Interface" );
         setAutoSave( config->readNumEntry( "AutoSave", defaultAutoSave()/60 ) * 60 );
@@ -387,7 +387,7 @@ void KPrDocument::initConfig()
     }
 
     // Load personal dict
-    KConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" );
+    TDEConfigGroup group( KoGlobal::kofficeConfig(), "Spelling" );
     m_spellCheckPersonalDict = group.readListEntry( "PersonalDict" );
 
     // Apply configuration, without creating an undo/redo command
@@ -3621,7 +3621,7 @@ TQString KPrDocument::templateFileName( bool chooseTemplate, const TQString &the
         kdDebug(33001) << "Copying template  (in KPrDocument::templateFileName)" << endl
                        << "  from: " << src.prettyURL() << endl
                        << "  to: " << dest.prettyURL() << endl;
-        KIO::NetAccess::file_copy( src,
+        TDEIO::NetAccess::file_copy( src,
 				   dest,
 				   -1, /* default permissions */
 				   true /* overwrite */ );
@@ -4634,7 +4634,7 @@ void KPrDocument::changeBgSpellCheckingState( bool b )
 {
     enableBackgroundSpellCheck( b );
     reactivateBgSpellChecking();
-    KConfig *config = KPrFactory::global()->config();
+    TDEConfig *config = KPrFactory::global()->config();
     config->setGroup("KSpell kpresenter" );
     config->writeEntry( "SpellCheck", (int)b );
 }
@@ -4759,7 +4759,7 @@ void KPrDocument::updateDirectCursorButton()
 void KPrDocument::setInsertDirectCursor(bool _b)
 {
     m_bInsertDirectCursor=_b;
-    KConfig *config = KPrFactory::global()->config();
+    TDEConfig *config = KPrFactory::global()->config();
     config->setGroup( "Interface" );
     config->writeEntry( "InsertDirectCursor", _b );
     updateDirectCursorButton();
diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp
index 8cb8861d..7386bceb 100644
--- a/kpresenter/KPrMSPresentationSetup.cpp
+++ b/kpresenter/KPrMSPresentationSetup.cpp
@@ -84,7 +84,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
     // we create the DCIM file, and then iterate through looking
     // for the next "available" directory slot
     KURL str(  path + "/DCIM"  );
-    KIO::NetAccess::mkdir( str,( TQWidget* )0L  );
+    TDEIO::NetAccess::mkdir( str,( TQWidget* )0L  );
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
@@ -92,7 +92,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
 
     for (int dirNum = 101; dirNum < 999; dirNum++) {
         slidePath = TQString("/DCIM/%1MSPJP").arg(dirNum);
-        if (! KIO::NetAccess::exists(( path + slidePath), true, ( TQWidget* )0L) )
+        if (! TDEIO::NetAccess::exists(( path + slidePath), true, ( TQWidget* )0L) )
             break;
     }
 
@@ -101,20 +101,20 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
     kapp->processEvents();
 
     str = (  path + slidePath );
-    KIO::NetAccess::mkdir( str,( TQWidget* )0L  );
+    TDEIO::NetAccess::mkdir( str,( TQWidget* )0L  );
     p = progressBar->progress();
     progressBar->setProgress( ++p );
     kapp->processEvents();
 
     // now do the SPP file directory
     str = (  path + "/MSSONY" );
-    KIO::NetAccess::mkdir( str,( TQWidget* )0L  );
+    TDEIO::NetAccess::mkdir( str,( TQWidget* )0L  );
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
     kapp->processEvents();
     str = (  path + "/MSSONY/PJ" );
-    KIO::NetAccess::mkdir( str,( TQWidget* )0L  );
+    TDEIO::NetAccess::mkdir( str,( TQWidget* )0L  );
 
 
     p = progressBar->progress();
@@ -130,7 +130,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
     KTempFile tmp;
     TQString filename = path + slidePath + "/SPJT0002.JPG";
     titleSlide.save( tmp.name(), "JPEG" );
-    KIO::NetAccess::file_move( tmp.name(), filename, -1, true /*overwrite*/);
+    TDEIO::NetAccess::file_move( tmp.name(), filename, -1, true /*overwrite*/);
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
@@ -145,7 +145,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
 
     KTempFile tmp2;
     titleSlide.save( tmp2.name(), "JPEG" );
-    KIO::NetAccess::file_move( tmp2.name(), filename, -1, true /*overwrite*/);
+    TDEIO::NetAccess::file_move( tmp2.name(), filename, -1, true /*overwrite*/);
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
@@ -168,7 +168,7 @@ void KPrMSPresentation::createSlidesPictures( KProgress *progressBar )
         view->getCanvas()->exportPage( pgNum, 1023, 767,
                                        tmp.name(), "JPEG" );
 
-        KIO::NetAccess::file_move( tmp.name(), ( path + slidePath + filename ), -1, true /*overwrite*/);
+        TDEIO::NetAccess::file_move( tmp.name(), ( path + slidePath + filename ), -1, true /*overwrite*/);
 
         p = progressBar->progress();
         progressBar->setProgress( ++p );
@@ -266,7 +266,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
     kapp->processEvents();
 
     sppFile.close();
-    KIO::NetAccess::file_move( sppFile.name(), filenameStore, -1, true /*overwrite*/);
+    TDEIO::NetAccess::file_move( sppFile.name(), filenameStore, -1, true /*overwrite*/);
 }
 
 void KPrMSPresentation::init()
@@ -441,7 +441,7 @@ void KPrMSPresentationSetup::finish()
     TQString pathname = path->lineEdit()->text();
 
     // path doesn't exist. ask user if it should be created.
-    if ( !KIO::NetAccess::exists(pathname, false, this) ) {
+    if ( !TDEIO::NetAccess::exists(pathname, false, this) ) {
         TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>"
                             "Do you want create it?</qt>" );
         if( KMessageBox::questionYesNo( this, msg.arg( pathname ),
@@ -450,7 +450,7 @@ void KPrMSPresentationSetup::finish()
             {
                 // we are trying to create the directory
                 TQDir dir;
-                bool ok = KIO::NetAccess::mkdir( pathname,this );
+                bool ok = TDEIO::NetAccess::mkdir( pathname,this );
                 if( !ok ) {
                     // then directory couldn't be created
                     KMessageBox::sorry( this,
@@ -467,7 +467,7 @@ void KPrMSPresentationSetup::finish()
     }
 
     TQString sppFile( pathname + "/MSSONY/PJ/" + title->text() + ".SPP" );
-    if (KIO::NetAccess::exists(sppFile, false, this ) ) {
+    if (TDEIO::NetAccess::exists(sppFile, false, this ) ) {
         if ( KMessageBox::warningYesNo( 0,
                                    i18n( "You are about to overwrite an existing index "
                                          "file : %1.\n "
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 37ce7db8..907aaf43 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -457,12 +457,12 @@ KPrView::~KPrView()
     delete m_findReplace;
     m_findReplace = 0L;
     if(sidebar) {
-        KConfig *config=TDEGlobal::config();
+        TDEConfig *config=TDEGlobal::config();
         config->setGroup("Global");
         config->writeEntry("Sidebar", sidebar->isVisible());
     }
     if(notebar) {
-        KConfig *config=TDEGlobal::config();
+        TDEConfig *config=TDEGlobal::config();
         config->setGroup("Global");
         config->writeEntry("Notebar", notebar->isVisible());
     }
@@ -771,7 +771,7 @@ void KPrView::insertPicture()
         return;
     }
     TQString file;
-    if ( !KIO::NetAccess::download( url, file, this ) )
+    if ( !TDEIO::NetAccess::download( url, file, this ) )
     {
         m_canvas->setToolEditMode( TEM_MOUSE, false );
         return;
@@ -843,10 +843,10 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture)
                         {
                             picture.save( TQT_TQIODEVICE(&file) );
                             file.close();
-                            if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) )
+                            if ( !TDEIO::NetAccess::upload( tempFile.name(), url, this ) )
                             {
                                 KMessageBox::sorry( this, i18n(
-                                   "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ),
+                                   "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( TDEIO::NetAccess::lastErrorString() ),
                                    i18n("Save Failed") );
                             }
                         }
@@ -2231,7 +2231,7 @@ void KPrView::createGUI()
     {
         sidebar->outline()->setCurrentItem( sidebar->outline()->firstChild() );
         sidebar->outline()->setSelected( sidebar->outline()->firstChild(), TRUE );
-        KConfig *config=TDEGlobal::config();
+        TDEConfig *config=TDEGlobal::config();
         config->setGroup("Global");
         if(!config->readBoolEntry("Sidebar", true)) {
             sidebar->hide();
@@ -2242,7 +2242,7 @@ void KPrView::createGUI()
 
     if ( notebar )
     {
-        KConfig *config=TDEGlobal::config();
+        TDEConfig *config=TDEGlobal::config();
         config->setGroup("Global");
         if(!config->readBoolEntry("Notebar", true)) {
             notebar->hide();
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index a8f56470..2fbb7336 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -269,14 +269,14 @@ void KPrWebPresentation::initCreation( KProgress *progressBar )
     TQString cmd;
     int p;
     KURL str(  path + "/html"  );
-    KIO::NetAccess::mkdir( str,( TQWidget* )0L  );
+    TDEIO::NetAccess::mkdir( str,( TQWidget* )0L  );
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
     kapp->processEvents();
 
     str = path + "/pics";
-    KIO::NetAccess::mkdir( str,( TQWidget* )0L );
+    TDEIO::NetAccess::mkdir( str,( TQWidget* )0L );
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
@@ -293,7 +293,7 @@ void KPrWebPresentation::initCreation( KProgress *progressBar )
         srcurl.setPath( locate( "slideshow", filename, KPrFactory::global() ) );
         desturl = path;
         desturl.addPath( "/pics/" + filename );
-        KIO::NetAccess::file_copy( srcurl, desturl, -1, true /*overwrite*/);
+        TDEIO::NetAccess::file_copy( srcurl, desturl, -1, true /*overwrite*/);
         p = progressBar->progress();
         progressBar->setProgress( ++p );
         kapp->processEvents();
@@ -315,7 +315,7 @@ void KPrWebPresentation::createSlidesPictures( KProgress *progressBar )
         KTempFile tmp;
         pix.save( tmp.name(), "PNG" );
 
-        KIO::NetAccess::file_move( tmp.name(), filename, -1, true /*overwrite*/);
+        TDEIO::NetAccess::file_move( tmp.name(), filename, -1, true /*overwrite*/);
 
         p = progressBar->progress();
         progressBar->setProgress( ++p );
@@ -520,7 +520,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
 
         file.close();
 
-        KIO::NetAccess::file_move( tmp.name(), dest, -1, true /*overwrite*/);
+        TDEIO::NetAccess::file_move( tmp.name(), dest, -1, true /*overwrite*/);
 
         int p = progressBar->progress();
         progressBar->setProgress( ++p );
@@ -567,7 +567,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar )
     streamOut << "</body>\n</html>\n";
     file.close();
 
-    KIO::NetAccess::file_move( tmp.name(), dest, -1, true /*overwrite*/);
+    TDEIO::NetAccess::file_move( tmp.name(), dest, -1, true /*overwrite*/);
 
 
     progressBar->setProgress( progressBar->totalSteps() );
@@ -1077,7 +1077,7 @@ void KPrWebPresentationWizard::pageChanged()
         TQString pathname = path->lineEdit()->text();
 
         // path doesn't exist. ask user if it should be created.
-        if ( !KIO::NetAccess::exists( pathname, true/*write*/,this ) )
+        if ( !TDEIO::NetAccess::exists( pathname, true/*write*/,this ) )
         {
             TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>"
                                 "Do you want create it?</qt>" );
@@ -1085,7 +1085,7 @@ void KPrWebPresentationWizard::pageChanged()
                                             i18n( "Directory Not Found" ) )
                 == KMessageBox::Yes)
             {
-                bool ok = KIO::NetAccess::mkdir( pathname, this );
+                bool ok = TDEIO::NetAccess::mkdir( pathname, this );
                 if( !ok )
                 {
                     KMessageBox::sorry( this,