Rename a number of libraries and executables to avoid conflicts with KDE4

10 files changed, 33 insertions, 33 deletions

diff --git a/konsole/konsole/CMakeLists.txt b/konsole/konsole/CMakeLists.txt
index 4992cdc43..9473db291 100644
--- a/konsole/konsole/CMakeLists.txt
+++ b/konsole/konsole/CMakeLists.txt
@@ -74,5 +74,5 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdeprint-shared kio-shared ${XRENDER_LIBRARIES} dl
+  LINK tdeprint-shared tdeio-shared ${XRENDER_LIBRARIES} dl
 )
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index c00349022..32d9d9643 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -81,7 +81,7 @@
 #include <kglobalsettings.h>
 #include <kshortcut.h>
 #include <kurldrag.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqlabel.h>
 #include <tqtimer.h>
 
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 0e6265321..81449c514 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -94,7 +94,7 @@ Time to start a requirement list.
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequesterdlg.h>
 
 #include <kfontdialog.h>
@@ -138,7 +138,7 @@ Time to start a requirement list.
 #include <tdeparts/componentfactory.h>
 #include <kcharsets.h>
 #include <kcolordialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "konsole.h"
 #include <netwm.h>
@@ -247,7 +247,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
 ,wallpaperSource(0)
 ,sessionIdCounter(0)
 ,monitorSilenceSeconds(10)
-,s_kconfigSchema("")
+,s_tdeconfigSchema("")
 ,m_tabViewMode(ShowIconAndText)
 ,b_dynamicTabHide(false)
 ,b_autoResizeTabs(false)
@@ -1512,8 +1512,8 @@ void Konsole::saveProperties(TDEConfig* config) {
   }
   config->writeEntry("Fullscreen",b_fullscreen);
   config->writeEntry("defaultfont", (se->widget())->getVTFont());
-  s_kconfigSchema = colors->find( se->schemaNo() )->relPath();
-  config->writeEntry("schema",s_kconfigSchema);
+  s_tdeconfigSchema = colors->find( se->schemaNo() )->relPath();
+  config->writeEntry("schema",s_tdeconfigSchema);
   config->writeEntry("scrollbar",n_scroll);
   config->writeEntry("tabbar",n_tabbar);
   config->writeEntry("bellmode",n_bell);
@@ -1618,13 +1618,13 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo
       defaultFont = config->readFontEntry("defaultfont", &tmpFont);
 
       //set the schema
-      s_kconfigSchema=config->readEntry("schema");
-      ColorSchema* sch = colors->find(schema.isEmpty() ? s_kconfigSchema : schema);
+      s_tdeconfigSchema=config->readEntry("schema");
+      ColorSchema* sch = colors->find(schema.isEmpty() ? s_tdeconfigSchema : schema);
       if (!sch)
       {
          sch = (ColorSchema*)colors->at(0);  //the default one
-         kdWarning() << "Could not find schema named " <<s_kconfigSchema<<"; using "<<sch->relPath()<<endl;
-         s_kconfigSchema = sch->relPath();
+         kdWarning() << "Could not find schema named " <<s_tdeconfigSchema<<"; using "<<sch->relPath()<<endl;
+         s_tdeconfigSchema = sch->relPath();
       }
       if (sch->hasSchemaFileChanged()) sch->rereadSchemaFile();
       s_schema = sch->relPath();
@@ -2073,7 +2073,7 @@ void Konsole::slotConfigure()
 {
   TQStringList args;
   args << "kcmkonsole";
-  TDEApplication::tdeinitExec( "kcmshell", args );
+  TDEApplication::tdeinitExec( "tdecmshell", args );
 }
 
 void Konsole::reparseConfiguration()
@@ -2125,13 +2125,13 @@ void Konsole::reparseConfiguration()
   m_shortcuts->readShortcutSettings();
 
   // User may have changed Schema->Set as default schema
-  s_kconfigSchema = TDEGlobal::config()->readEntry("schema");
-  ColorSchema* sch = colors->find(s_kconfigSchema);
+  s_tdeconfigSchema = TDEGlobal::config()->readEntry("schema");
+  ColorSchema* sch = colors->find(s_tdeconfigSchema);
   if (!sch)
   {
      sch = (ColorSchema*)colors->at(0);  //the default one
-     kdWarning() << "Could not find schema named " <<s_kconfigSchema<<"; using "<<sch->relPath()<<endl;
-     s_kconfigSchema = sch->relPath();
+     kdWarning() << "Could not find schema named " <<s_tdeconfigSchema<<"; using "<<sch->relPath()<<endl;
+     s_tdeconfigSchema = sch->relPath();
   }
   if (sch->hasSchemaFileChanged()) sch->rereadSchemaFile();
   s_schema = sch->relPath();
@@ -2819,7 +2819,7 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis
   TQString emu = "xterm";
   TQString icon = "konsole";
   TQString key;
-  TQString sch = s_kconfigSchema;
+  TQString sch = s_tdeconfigSchema;
   TQString txt;
   TQString cwd;
   TQFont font = defaultFont;
@@ -3572,7 +3572,7 @@ void Konsole::setSchema(int numb, TEWidget* tewidget)
   {
     s = (ColorSchema*)colors->at(0);
     kdWarning() << "No schema with serial #"<<numb<<", using "<<s->relPath()<<" (#"<<s->numb()<<")." << endl;
-    s_kconfigSchema = s->relPath();
+    s_tdeconfigSchema = s->relPath();
   }
 
   if (s->hasSchemaFileChanged())
@@ -3589,7 +3589,7 @@ void Konsole::setSchema(const TQString & path)
   {
      s = (ColorSchema*)colors->at(0);  //the default one
      kdWarning() << "No schema with the name " <<path<<", using "<<s->relPath()<<endl;
-     s_kconfigSchema = s->relPath();
+     s_tdeconfigSchema = s->relPath();
   }
   if (s->hasSchemaFileChanged())
   {
diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h
index f24f823ce..d64c30968 100644
--- a/konsole/konsole/konsole.h
+++ b/konsole/konsole/konsole.h
@@ -393,7 +393,7 @@ private:
   int         monitorSilenceSeconds;
 
   TQString     s_schema;
-  TQString     s_kconfigSchema;
+  TQString     s_tdeconfigSchema;
   TQString     s_word_seps;			// characters that are considered part of a word
   TQString     pmPath; // pixmap path
   TQString     dropText;
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index 6562ea0d9..c20982ba2 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -46,7 +46,7 @@
 #include <tqpushbutton.h>
 #include <kpopupmenu.h>
 #include <krootpixmap.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 
 // We can't use the ARGB32 visual when embedded in another application
@@ -574,8 +574,8 @@ void konsolePart::readProperties()
 
   TQString schema = config->readEntry("Schema");
 
-  s_kconfigSchema=config->readEntry("schema");
-  ColorSchema* sch = colors->find(schema.isEmpty() ? s_kconfigSchema : schema);
+  s_tdeconfigSchema=config->readEntry("schema");
+  ColorSchema* sch = colors->find(schema.isEmpty() ? s_tdeconfigSchema : schema);
   if (!sch) {
     sch=(ColorSchema*)colors->at(0);  //the default one
   }
@@ -638,7 +638,7 @@ void konsolePart::saveProperties()
     config->writeEntry("keytab",n_keytab);
     config->writeEntry("has frame",b_framevis);
     config->writeEntry("LineSpacing", te->lineSpacing());
-    config->writeEntry("schema",s_kconfigSchema);
+    config->writeEntry("schema",s_tdeconfigSchema);
     config->writeEntry("scrollbar",n_scroll);
     config->writeEntry("wordseps",s_word_seps);
     config->writeEntry("encoding",n_encoding);
@@ -720,7 +720,7 @@ void konsolePart::keytab_menu_activated(int item)
 void konsolePart::schema_menu_activated(int item)
 {
   setSchema(item);
-  s_kconfigSchema = s_schema; // This is the new default
+  s_tdeconfigSchema = s_schema; // This is the new default
 }
 
 void konsolePart::schema_menu_check()
diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h
index fc76b565b..a8dfde83a 100644
--- a/konsole/konsole/konsole_part.h
+++ b/konsole/konsole/konsole_part.h
@@ -170,7 +170,7 @@ signals:
 
     TQString     pmPath; // pixmap path
     TQString     s_schema;
-    TQString     s_kconfigSchema;
+    TQString     s_tdeconfigSchema;
     TQString     s_word_seps;			// characters that are considered part of a word
 
     bool        b_framevis:1;
diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp
index b5960727e..e348e440e 100644
--- a/konsole/konsole/konsolebookmarkhandler.cpp
+++ b/konsole/konsole/konsolebookmarkhandler.cpp
@@ -16,13 +16,13 @@
     Boston, MA 02110-1301, USA.
 */
 
-// Born as tdelibs/kio/kfile/kfilebookmarkhandler.cpp
+// Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.cpp
 
 #include <kpopupmenu.h>
 #include <kstandarddirs.h>
 #include <kshell.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kdebug.h>
 #include <tqfile.h>
 
@@ -41,7 +41,7 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel
     // TODO: Consider removing for KDE4
     TQString new_bm_file = locateLocal( "data", "konsole/bookmarks.xml" );
     if ( !TQFile::exists( new_bm_file ) ) {
-        TQString old_bm_file = locateLocal( "data", "kfile/bookmarks.xml" );
+        TQString old_bm_file = locateLocal( "data", "tdefile/bookmarks.xml" );
         if ( TQFile::exists( old_bm_file ) )
             // We want sync here... 
             if ( !TDEIO::NetAccess::copy( KURL( old_bm_file ), 
diff --git a/konsole/konsole/konsolebookmarkhandler.h b/konsole/konsole/konsolebookmarkhandler.h
index e8d2845bd..5f99dfb31 100644
--- a/konsole/konsole/konsolebookmarkhandler.h
+++ b/konsole/konsole/konsolebookmarkhandler.h
@@ -16,7 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-// Born as tdelibs/kio/kfile/kfilebookmarkhandler.h
+// Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.h
 
 #ifndef KONSOLEBOOKMARKHANDLER_H
 #define KONSOLEBOOKMARKHANDLER_H
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index f3dba695a..9e12a340d 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 
 #include <config.h>
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp
index 2d3e3901f..638bc498f 100644
--- a/konsole/konsole/schema.cpp
+++ b/konsole/konsole/schema.cpp
@@ -57,7 +57,7 @@
 #include <tqdatetime.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>