Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

12 files changed, 82 insertions, 82 deletions

diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp
index 409f4ca43..53aca2270 100644
--- a/konsole/konsole/TEPty.cpp
+++ b/konsole/konsole/TEPty.cpp
@@ -171,11 +171,11 @@ void TEPty::setWriteable(bool writeable)
 TEPty::TEPty()
 {
   m_bufferFull = false;
-  connect(this, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
-	  this, TQT_SLOT(dataReceived(KProcess *,char *, int)));
-  connect(this, TQT_SIGNAL(processExited(KProcess *)),
+  connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+	  this, TQT_SLOT(dataReceived(TDEProcess *,char *, int)));
+  connect(this, TQT_SIGNAL(processExited(TDEProcess *)),
           this, TQT_SLOT(donePty()));
-  connect(this, TQT_SIGNAL(wroteStdin(KProcess *)),
+  connect(this, TQT_SIGNAL(wroteStdin(TDEProcess *)),
           this, TQT_SLOT(writeReady()));
 
   setUsePty(All, false); // utmp will be overridden later
@@ -237,7 +237,7 @@ void TEPty::send_bytes(const char* s, int len)
 }
 
 /*! indicates that a block of data is received */
-void TEPty::dataReceived(KProcess *,char *buf, int len)
+void TEPty::dataReceived(TDEProcess *,char *buf, int len)
 {
   emit block_in(buf,len);
 }
@@ -252,7 +252,7 @@ void TEPty::lockPty(bool lock)
 
 int TEPty::commSetupDoneC ()
 {
-    int ok = KProcess::commSetupDoneC ();
+    int ok = TDEProcess::commSetupDoneC ();
     if ( ok ) {
         emit forkedChild();
     }
diff --git a/konsole/konsole/TEPty.h b/konsole/konsole/TEPty.h
index d6cee77dd..21ea3ff94 100644
--- a/konsole/konsole/TEPty.h
+++ b/konsole/konsole/TEPty.h
@@ -29,7 +29,7 @@
 #include <tqvaluelist.h>
 #include <tqmemarray.h>
 
-class TEPty: public KProcess
+class TEPty: public TDEProcess
 {
 Q_OBJECT
 
@@ -94,12 +94,12 @@ Q_OBJECT
     void send_string(const char* s);
     bool buffer_full() { return m_bufferFull; }
 
-    // override from KProcess to allow the client of konsolePart
+    // override from TDEProcess to allow the client of konsolePart
     // to set up things after fork() but before exec()
     virtual int commSetupDoneC();
 
   protected slots:
-      void dataReceived(KProcess *, char *buf, int len);
+      void dataReceived(TDEProcess *, char *buf, int len);
   public slots:
       void donePty();
       
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index f8bef39bd..e13a5eb1d 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -941,7 +941,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
      if (!mResizeWidget)
      {
         mResizeWidget = new TQFrame(this);
-        TQFont f = KGlobalSettings::generalFont();
+        TQFont f = TDEGlobalSettings::generalFont();
         int fs = f.pointSize();
         if (fs == -1)
            fs = TQFontInfo(f).pointSize();
@@ -1367,7 +1367,7 @@ void TEWidget::mouseMoveEvent(TQMouseEvent* ev)
     // we had a mouse down, but haven't confirmed a drag yet
     // if the mouse has moved sufficiently, we will confirm
 
-   int distance = KGlobalSettings::dndEventDelay();
+   int distance = TDEGlobalSettings::dndEventDelay();
    if ( ev->x() > dragInfo.start.x() + distance || ev->x() < dragInfo.start.x() - distance ||
         ev->y() > dragInfo.start.y() + distance || ev->y() < dragInfo.start.y() - distance) {
       // we've left the drag square, we can start a real drag operation now
diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp
index 18d453a58..3a4168e89 100644
--- a/konsole/konsole/keytrans.cpp
+++ b/konsole/konsole/keytrans.cpp
@@ -716,7 +716,7 @@ void KeyTrans::loadAll()
   KeyTrans* sc = new KeyTrans("[buildin]");
   sc->addKeyTrans();
 
-  TQStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
+  TQStringList lst = TDEGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
 
   for(TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
   {
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 3d5ad49cb..225f6687d 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -297,7 +297,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
   // read and apply default values ///////////////////////////////////////////
   resize(321, 321); // Dummy.
   TQSize currentSize = size();
-  KConfig * config = KGlobal::config();
+  KConfig * config = TDEGlobal::config();
   config->setDesktopGroup();
   applyMainWindowSettings(config);
   if (currentSize != size())
@@ -367,7 +367,7 @@ Konsole::~Konsole()
     }
 
     // Wait a bit for all childs to clean themselves up.
-    while(sessions.count() && KProcessController::theKProcessController->waitForProcessExit(1))
+    while(sessions.count() && TDEProcessController::theTDEProcessController->waitForProcessExit(1))
         ;
 
     sessions.setAutoDelete(true);
@@ -652,7 +652,7 @@ void Konsole::makeGUI()
 
       // encoding menu, start with default checked !
       selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetEncoding()), actions, "set_encoding" );
-      TQStringList list = KGlobal::charsets()->descriptiveEncodingNames();
+      TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames();
       list.prepend( i18n( "Default" ) );
       selectSetEncoding->setItems(list);
       selectSetEncoding->setCurrentItem (0);
@@ -703,7 +703,7 @@ void Konsole::makeGUI()
       KAction *configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actions);
       configure->plug(m_options);
 
-      if (KGlobalSettings::insertTearOffHandle())
+      if (TDEGlobalSettings::insertTearOffHandle())
          m_options->insertTearOffHandle();
    }
 
@@ -758,7 +758,7 @@ void Konsole::makeGUI()
       }
       m_rightButton->insertSeparator();
       m_closeSession->plug(m_rightButton );
-      if (KGlobalSettings::insertTearOffHandle())
+      if (TDEGlobalSettings::insertTearOffHandle())
          m_rightButton->insertTearOffHandle();
    }
 
@@ -884,8 +884,8 @@ void Konsole::slotSetEncoding()
   else
   {
     bool found;
-    TQString enc = KGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
-    qtc = KGlobal::charsets()->codecForName(enc, found);
+    TQString enc = TDEGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
+    qtc = TDEGlobal::charsets()->codecForName(enc, found);
 
     // BR114535 : Remove jis7 due to infinite loop.
     if ( enc == "jis7" ) {
@@ -966,7 +966,7 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev )
     {
       TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
       if ((mev->pos() - m_newSessionButtonMousePressPos).manhattanLength()
-            > KGlobalSettings::dndEventDelay())
+            > TDEGlobalSettings::dndEventDelay())
       {
         m_newSessionButton->openPopup();
         return true;
@@ -1167,7 +1167,7 @@ void Konsole::makeBasicGUI()
   new KAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
 
   // Should we load all *.desktop files now?  Required for Session shortcuts.
-  if ( KConfigGroup(KGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) {
+  if ( KConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) {
     b_sessionShortcutsEnabled = true;
     loadSessionCommands();
     loadScreenSessions();
@@ -1438,7 +1438,7 @@ void Konsole::slotSaveSessionsProfile()
   if ( ok ) {
     TQString path = locateLocal( "data",
         TQString::fromLatin1( "konsole/profiles/" ) + prof,
-        KGlobal::instance() );
+        TDEGlobal::instance() );
 
     if ( TQFile::exists( path ) )
       TQFile::remove( path );
@@ -1454,7 +1454,7 @@ void Konsole::saveProperties(KConfig* config) {
   uint active=0;
   TQString key;
 
-  if (config != KGlobal::config())
+  if (config != TDEGlobal::config())
   {
      // called by the session manager
      config->writeEntry("numSes",sessions.count());
@@ -1526,7 +1526,7 @@ void Konsole::saveProperties(KConfig* config) {
 
   if (selectSetEncoding)
   {
-    TQString encoding = KGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
+    TQString encoding = TDEGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
     config->writeEntry("EncodingName", encoding);
   } else {    // This will not always work (ie 'winsami' saves as 'ws2')
     if (se) config->writeEntry("EncodingName", se->encoding());
@@ -1538,7 +1538,7 @@ void Konsole::saveProperties(KConfig* config) {
   }
 
   config->writeEntry("class",name());
-  if (config != KGlobal::config())
+  if (config != TDEGlobal::config())
   {
       saveMainWindowSettings(config);
   }
@@ -1551,7 +1551,7 @@ void Konsole::saveProperties(KConfig* config) {
 }
 
 
-// Called by constructor (with config = KGlobal::config())
+// Called by constructor (with config = TDEGlobal::config())
 // and by session-management (with config = sessionconfig).
 // So it has to apply the settings when reading them.
 void Konsole::readProperties(KConfig* config)
@@ -1567,7 +1567,7 @@ void Konsole::readProperties(KConfig* config)
 void Konsole::readProperties(KConfig* config, const TQString &schema, bool globalConfigOnly)
 {
 
-   if (config==KGlobal::config())
+   if (config==TDEGlobal::config())
    {
      config->setDesktopGroup();
      b_warnQuit=config->readBoolEntry( "WarnQuit", true );
@@ -1614,7 +1614,7 @@ void Konsole::readProperties(KConfig* config, const TQString &schema, bool globa
 
       // (1) set menu items and Konsole members
 
-      TQFont tmpFont = KGlobalSettings::fixedFont();
+      TQFont tmpFont = TDEGlobalSettings::fixedFont();
       defaultFont = config->readFontEntry("defaultfont", &tmpFont);
 
       //set the schema
@@ -2013,7 +2013,7 @@ void Konsole::slotSelectTabbar() {
 
 void Konsole::slotSaveSettings()
 {
-  KConfig *config = KGlobal::config();
+  KConfig *config = TDEGlobal::config();
   config->setDesktopGroup();
   saveProperties(config);
   saveMainWindowSettings(config);
@@ -2047,7 +2047,7 @@ void Konsole::slotConfigureKeys()
          m_shortcuts->action( i )->shortcut().count() &&
          TQString(m_shortcuts->action( i )->name()).startsWith("SSC_") ) {
       b_sessionShortcutsEnabled = true;
-      KConfigGroup group(KGlobal::config(), "General");
+      KConfigGroup group(TDEGlobal::config(), "General");
       group.writeEntry("SessionShortcutsEnabled", true);
     }
   }
@@ -2078,8 +2078,8 @@ void Konsole::slotConfigure()
 
 void Konsole::reparseConfiguration()
 {
-  KGlobal::config()->reparseConfiguration();
-  readProperties(KGlobal::config(), TQString::null, true);
+  TDEGlobal::config()->reparseConfiguration();
+  readProperties(TDEGlobal::config(), TQString::null, true);
 
   // The .desktop files may have been changed by user...
   b_sessionShortcutsMapped = false;
@@ -2125,7 +2125,7 @@ void Konsole::reparseConfiguration()
   m_shortcuts->readShortcutSettings();
 
   // User may have changed Schema->Set as default schema
-  s_kconfigSchema = KGlobal::config()->readEntry("schema");
+  s_kconfigSchema = TDEGlobal::config()->readEntry("schema");
   ColorSchema* sch = colors->find(s_kconfigSchema);
   if (!sch)
   {
@@ -2662,8 +2662,8 @@ void Konsole::setSessionEncoding( const TQString &encoding, TESession *session )
         session = se;
 
     bool found = false;
-    TQString enc = KGlobal::charsets()->encodingForName(encoding);
-    TQTextCodec * qtc = KGlobal::charsets()->codecForName(enc, found);
+    TQString enc = TDEGlobal::charsets()->encodingForName(encoding);
+    TQTextCodec * qtc = TDEGlobal::charsets()->codecForName(enc, found);
     if ( !found || !qtc )
         return;
 
@@ -2671,13 +2671,13 @@ void Konsole::setSessionEncoding( const TQString &encoding, TESession *session )
     // it corresponds to.
     int i = 0;
     bool found_encoding = false;
-    TQStringList encodingNames = KGlobal::charsets()->descriptiveEncodingNames();
+    TQStringList encodingNames = TDEGlobal::charsets()->descriptiveEncodingNames();
     TQStringList::ConstIterator it = encodingNames.begin();
     TQString t_encoding = encoding.lower();
 
     while ( it != encodingNames.end() && !found_encoding )
     {
-      if ( TQString::compare( KGlobal::charsets()->encodingForName(*it), 
+      if ( TQString::compare( TDEGlobal::charsets()->encodingForName(*it), 
                              t_encoding ) == 0 ) {
          found_encoding = true;
       }
@@ -2727,7 +2727,7 @@ void Konsole::allowPrevNext()
 KSimpleConfig *Konsole::defaultSession()
 {
   if (!m_defaultSession) {
-    KConfig * config = KGlobal::config();
+    KConfig * config = TDEGlobal::config();
     config->setDesktopGroup();
     setDefaultSession(config->readEntry("DefaultSession","shell.desktop"));
   }
@@ -2886,7 +2886,7 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis
     initTEWidget(te, te_old);
   }
   else {
-    readProperties(KGlobal::config(), "", true);
+    readProperties(TDEGlobal::config(), "", true);
     te->setVTFont(font);
     te->setScrollbarLocation(n_scroll);
     te->setBellMode(n_bell);
@@ -3287,9 +3287,9 @@ void Konsole::notifySessionState(TESession* session, int state)
       && session->testAndSetStateIconName(state_iconname)
       && m_tabViewMode != ShowTextOnly) {
 
-    TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(state_iconname,
+    TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(state_iconname,
                        KIcon::Small, 0, KIcon::DefaultState, 0L, true);
-    TQPixmap active = KGlobal::instance()->iconLoader()->loadIcon(state_iconname,
+    TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(state_iconname,
                        KIcon::Small, 0, KIcon::ActiveState, 0L, true);
 
     // make sure they are not larger than 16x16
@@ -3375,7 +3375,7 @@ void Konsole::addSessionCommand(const TQString &path)
 
   exec = KRun::binaryName(exec, false);
   exec = KShell::tildeExpand(exec);
-  TQString pexec = KGlobal::dirs()->findExe(exec);
+  TQString pexec = TDEGlobal::dirs()->findExe(exec);
 
   if (typ.isEmpty() || txt.isEmpty() || typ != "KonsoleApplication"
       || ( !exec.isEmpty() && pexec.isEmpty() ) )
@@ -3425,7 +3425,7 @@ void Konsole::loadSessionCommands()
 
   addSessionCommand(TQString::null);
 
-  TQStringList lst = KGlobal::dirs()->findAllResources("appdata", "*.desktop", false, true);
+  TQStringList lst = TDEGlobal::dirs()->findAllResources("appdata", "*.desktop", false, true);
 
   for(TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
     if (!(*it).endsWith("/shell.desktop"))
@@ -4128,9 +4128,9 @@ void Konsole::slotZModemUpload()
          i18n("<p>The current session already has a ZModem file transfer in progress."));
     return;
   }
-  TQString zmodem = KGlobal::dirs()->findExe("sz");
+  TQString zmodem = TDEGlobal::dirs()->findExe("sz");
   if (zmodem.isEmpty())
-    zmodem = KGlobal::dirs()->findExe("lsz");
+    zmodem = TDEGlobal::dirs()->findExe("lsz");
   if (zmodem.isEmpty())
   {
     KMessageBox::sorry(this,
@@ -4155,9 +4155,9 @@ void Konsole::slotZModemDetected(TESession *session)
   if(se != session)
     activateSession(session);
 
-  TQString zmodem = KGlobal::dirs()->findExe("rz");
+  TQString zmodem = TDEGlobal::dirs()->findExe("rz");
   if (zmodem.isEmpty())
-    zmodem = KGlobal::dirs()->findExe("lrz");
+    zmodem = TDEGlobal::dirs()->findExe("lrz");
   if (zmodem.isEmpty())
   {
     KMessageBox::information(this,
@@ -4167,7 +4167,7 @@ void Konsole::slotZModemDetected(TESession *session)
                         "<p>You may wish to install the 'rzsz' or 'lrzsz' package.\n"));
     return;
   }
-  KURLRequesterDlg dlg(KGlobalSettings::documentPath(),
+  KURLRequesterDlg dlg(TDEGlobalSettings::documentPath(),
                    i18n("A ZModem file transfer attempt has been detected.\n"
                         "Please specify the folder you want to store the file(s):"),
                    this, "zmodem_dlg");
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index b6fa5eedf..34550fd30 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -261,7 +261,7 @@ konsolePart::~konsolePart()
     se->closeSession();
 
     // Wait a bit for all childs to clean themselves up.
-    while(se && KProcessController::theKProcessController->waitForProcessExit(1))
+    while(se && TDEProcessController::theTDEProcessController->waitForProcessExit(1))
         ;
 
     disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) );
@@ -370,7 +370,7 @@ void konsolePart::makeGUI()
 
       // encoding menu, start with default checked !
       selectSetEncoding = new KSelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQT_SLOT(slotSetEncoding()), settingsActions, "set_encoding" );
-      TQStringList list = KGlobal::charsets()->descriptiveEncodingNames();
+      TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames();
       list.prepend( i18n( "Default" ) );
       selectSetEncoding->setItems(list);
       selectSetEncoding->setCurrentItem (0);
@@ -447,7 +447,7 @@ void konsolePart::makeGUI()
      KAction *saveSettings = new KAction(i18n("&Save as Default"), "filesave", 0, this, 
                     TQT_SLOT(saveProperties()), actions, "save_default");
      saveSettings->plug(m_options);
-     if (KGlobalSettings::insertTearOffHandle())
+     if (TDEGlobalSettings::insertTearOffHandle())
         m_options->insertTearOffHandle();
   }
 
@@ -480,7 +480,7 @@ void konsolePart::makeGUI()
   KAction *closeSession = new KAction(i18n("&Close Terminal Emulator"), "fileclose", 0, this,
                                       TQT_SLOT(closeCurrentSession()), actions, "close_session");
   closeSession->plug(m_popupMenu);
-  if (KGlobalSettings::insertTearOffHandle())
+  if (TDEGlobalSettings::insertTearOffHandle())
     m_popupMenu->insertTearOffHandle();
 }
 
@@ -569,7 +569,7 @@ void konsolePart::readProperties()
 
   n_encoding = config->readNumEntry("encoding",0);
 
-  TQFont tmpFont = KGlobalSettings::fixedFont();
+  TQFont tmpFont = TDEGlobalSettings::fixedFont();
   defaultFont = config->readFontEntry("defaultfont", &tmpFont);
 
   TQString schema = config->readEntry("Schema");
@@ -891,8 +891,8 @@ void konsolePart::slotSetEncoding()
   if (!se) return;
 
   bool found;
-  TQString enc = KGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
-  TQTextCodec * qtc = KGlobal::charsets()->codecForName(enc, found);
+  TQString enc = TDEGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
+  TQTextCodec * qtc = TDEGlobal::charsets()->codecForName(enc, found);
   if(!found)
   {
     kdDebug() << "Codec " << selectSetEncoding->currentText() << " not found!" << endl;
@@ -1098,8 +1098,8 @@ void konsolePart::newSession()
            this, TQT_SLOT( updateTitle(TESession*) ) );
   connect( se, TQT_SIGNAL(enableMasterModeConnections()),
            this, TQT_SLOT(enableMasterModeConnections()) );
-  connect( se, TQT_SIGNAL( processExited(KProcess *) ),
-           this, TQT_SIGNAL( processExited(KProcess *) ) );
+  connect( se, TQT_SIGNAL( processExited(TDEProcess *) ),
+           this, TQT_SIGNAL( processExited(TDEProcess *) ) );
   connect( se, TQT_SIGNAL( receivedData( const TQString& ) ),
            this, TQT_SIGNAL( receivedData( const TQString& ) ) );
   connect( se, TQT_SIGNAL( forkedChild() ),
diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h
index ae97f553b..981c4d6c9 100644
--- a/konsole/konsole/konsole_part.h
+++ b/konsole/konsole/konsole_part.h
@@ -74,7 +74,7 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public
     virtual ~konsolePart();
 
 signals:
-    void processExited( KProcess * );
+    void processExited( TDEProcess * );
     void receivedData( const TQString& s );
     void forkedChild();
  protected:
diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp
index c1bc0a06c..6802db6fa 100644
--- a/konsole/konsole/kwrited.cpp
+++ b/konsole/konsole/kwrited.cpp
@@ -66,8 +66,8 @@ KWrited::KWrited() : TQTextEdit()
 {
   int pref_width, pref_height;
 
-  setFont(KGlobalSettings::fixedFont());
-  pref_width = (2 * KGlobalSettings::desktopGeometry(0).width()) / 3;
+  setFont(TDEGlobalSettings::fixedFont());
+  pref_width = (2 * TDEGlobalSettings::desktopGeometry(0).width()) / 3;
   pref_height = fontMetrics().lineSpacing() * 10;
   setMinimumWidth(pref_width);
   setMinimumHeight(pref_height);
@@ -125,14 +125,14 @@ TQPopupMenu *KWrited::createPopupMenu( const TQPoint &pos )
 KWritedModule::KWritedModule( const TQCString& obj )
     : KDEDModule( obj )
 {
-    KGlobal::locale()->insertCatalogue("konsole");
+    TDEGlobal::locale()->insertCatalogue("konsole");
     pro = new KWrited;
 }
 
 KWritedModule::~KWritedModule()
 {
     delete pro;
-    KGlobal::locale()->removeCatalogue("konsole");
+    TDEGlobal::locale()->removeCatalogue("konsole");
 }
 
 extern "C"
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index 840ac6ac1..2ea4ff58b 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -256,7 +256,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
 #endif
 
   TQString dataPathBase = KStandardDirs::kde_default("data").append("konsole/");
-  KGlobal::dirs()->addResourceType("wallpaper", dataPathBase + "wallpapers");
+  TDEGlobal::dirs()->addResourceType("wallpaper", dataPathBase + "wallpapers");
 
   KImageIO::registerFormats(); // add io for additional image formats
   //2.1 secs
@@ -316,7 +316,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
     type = args->getOption("type");
   }
   if(args->isSet("types")) {
-    TQStringList types = KGlobal::dirs()->findAllResources("appdata", "*.desktop", false, true);
+    TQStringList types = TDEGlobal::dirs()->findAllResources("appdata", "*.desktop", false, true);
     types.sort();
     for(TQStringList::ConstIterator it = types.begin();
         it != types.end(); ++it)
@@ -343,7 +343,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
   }
 
   if(args->isSet("keytabs")) {
-    TQStringList lst = KGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
+    TQStringList lst = TDEGlobal::dirs()->findAllResources("data", "konsole/*.keytab");
 
     printf("default\n");   // 'buildin' keytab
     lst.sort();
@@ -378,7 +378,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
   }
   if (args->isSet("profiles"))
   {
-     TQStringList profiles = KGlobal::dirs()->findAllResources("data", "konsole/profiles/*", false, true);
+     TQStringList profiles = TDEGlobal::dirs()->findAllResources("data", "konsole/profiles/*", false, true);
      profiles.sort();
      for(TQStringList::ConstIterator it = profiles.begin();
          it != profiles.end(); ++it)
@@ -477,7 +477,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
         m->setEncoding(sessionconfig->readNumEntry("Encoding0"));
         m->setSchema(sessionconfig->readEntry("Schema0"));
         // Use konsolerc default as tmpFont instead?
-        TQFont tmpFont = KGlobalSettings::fixedFont();
+        TQFont tmpFont = TDEGlobalSettings::fixedFont();
         m->initSessionFont(sessionconfig->readFontEntry("SessionFont0", &tmpFont));
         m->initSessionKeyTab(sessionconfig->readEntry("KeyTab0"));
         m->initMonitorActivity(sessionconfig->readBoolEntry("MonitorActivity0",false));
@@ -522,7 +522,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
           key = TQString("Encoding%1").arg(counter);
           m->setEncoding(sessionconfig->readNumEntry(key));
           key = TQString("SessionFont%1").arg(counter);
-          TQFont tmpFont = KGlobalSettings::fixedFont();
+          TQFont tmpFont = TDEGlobalSettings::fixedFont();
           m->initSessionFont(sessionconfig->readFontEntry(key, &tmpFont));
           key = TQString("KeyTab%1").arg(counter);
           m->initSessionKeyTab(sessionconfig->readEntry(key));
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp
index fc31980a2..8befb2e56 100644
--- a/konsole/konsole/schema.cpp
+++ b/konsole/konsole/schema.cpp
@@ -530,7 +530,7 @@ bool ColorSchemaList::updateAllSchemaTimes(const TQDateTime& now)
 //  KONSOLEDEBUG << "Updating time stamps" << endl;
 
   TQStringList list;
-  KGlobal::dirs()->findAllResources("data", "konsole/*.schema", false, true, list);
+  TDEGlobal::dirs()->findAllResources("data", "konsole/*.schema", false, true, list);
   TQStringList::ConstIterator it;
   bool r = false;
 
diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp
index 2559ac288..3637dcf02 100644
--- a/konsole/konsole/session.cpp
+++ b/konsole/konsole/session.cpp
@@ -174,7 +174,7 @@ void TESession::run()
   TQString exec = TQFile::encodeName(pgm);
   exec = KRun::binaryName(exec, false);
   exec = KShell::tildeExpand(exec);
-  TQString pexec = KGlobal::dirs()->findExe(exec);
+  TQString pexec = TDEGlobal::dirs()->findExe(exec);
   if ( pexec.isEmpty() ) {
     kdError()<<"can not execute "<<exec<<endl;
     TQTimer::singleShot(1, this, TQT_SLOT(done()));
@@ -633,12 +633,12 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T
   zmodemProc->start(KProcIO::NotifyOnExit, false);
 
   // Override the read-processing of KProcIO
-  disconnect(zmodemProc,TQT_SIGNAL (receivedStdout (KProcess *, char *, int)), 0, 0);
-  connect(zmodemProc,TQT_SIGNAL (receivedStdout (KProcess *, char *, int)),
-          this, TQT_SLOT(zmodemSendBlock(KProcess *, char *, int)));
-  connect(zmodemProc,TQT_SIGNAL (receivedStderr (KProcess *, char *, int)),
-          this, TQT_SLOT(zmodemStatus(KProcess *, char *, int)));
-  connect(zmodemProc,TQT_SIGNAL (processExited(KProcess *)),
+  disconnect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), 0, 0);
+  connect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
+          this, TQT_SLOT(zmodemSendBlock(TDEProcess *, char *, int)));
+  connect(zmodemProc,TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
+          this, TQT_SLOT(zmodemStatus(TDEProcess *, char *, int)));
+  connect(zmodemProc,TQT_SIGNAL (processExited(TDEProcess *)),
           this, TQT_SLOT(zmodemDone()));
 
   disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) );
@@ -654,7 +654,7 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T
   zmodemProgress->show();
 }
 
-void TESession::zmodemSendBlock(KProcess *, char *data, int len)
+void TESession::zmodemSendBlock(TDEProcess *, char *data, int len)
 {
   sh->send_bytes(data, len);
 //  tqWarning("<-- %d bytes", len);
@@ -671,7 +671,7 @@ void TESession::zmodemContinue()
 //  tqWarning("ZModem resume");
 }
 
-void TESession::zmodemStatus(KProcess *, char *data, int len)
+void TESession::zmodemStatus(TDEProcess *, char *data, int len)
 {
   TQCString msg(data, len+1);
   while(!msg.isEmpty())
diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h
index cbe41ab50..d3bc9b8f4 100644
--- a/konsole/konsole/session.h
+++ b/konsole/konsole/session.h
@@ -32,7 +32,7 @@
 #include "sessioniface.h"
 
 class KProcIO;
-class KProcess;
+class TDEProcess;
 class ZModemDialog;
 
 class TESession : public TQObject, virtual public SessionIface
@@ -137,15 +137,15 @@ public slots:
   void slotZModemDetected();
   void emitZModemDetected();
 
-  void zmodemStatus(KProcess *, char *data, int len);
-  void zmodemSendBlock(KProcess *, char *data, int len);
+  void zmodemStatus(TDEProcess *, char *data, int len);
+  void zmodemSendBlock(TDEProcess *, char *data, int len);
   void zmodemRcvBlock(const char *data, int len);
   void zmodemDone();
   void zmodemContinue();
 
 signals:
 
-  void processExited(KProcess *);
+  void processExited(TDEProcess *);
   void forkedChild();
   void receivedData( const TQString& text );
   void done(TESession*);