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

13 files changed, 35 insertions, 35 deletions

diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index dd9d0ba84..9bf1c4150 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -60,7 +60,7 @@ KateApp::KateApp (TDECmdLineArgs *args)
   dcopClient()->suspend();
 
   // insert right translations for the katepart
-  KGlobal::locale()->insertCatalogue("katepart");
+  TDEGlobal::locale()->insertCatalogue("katepart");
 
   // some global default
   Kate::Document::setFileChangedDialogsActivated (true);
diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp
index b70de5905..6ff64dc93 100644
--- a/kate/app/kateconsole.cpp
+++ b/kate/app/kateconsole.cpp
@@ -70,7 +70,7 @@ void KateConsole::loadConsoleIfNeeded()
 
   setFocusProxy(m_part->widget());
 
-  KGlobal::locale()->insertCatalogue("konsole");
+  TDEGlobal::locale()->insertCatalogue("konsole");
 
   m_part->widget()->show();
 
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index 0542d0c33..627fe47dd 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -69,7 +69,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
   : TQWidget(parent, name/*, false*/), m_fixFocus(true), childproc(0)
 {
   setCaption(i18n("Find in Files"));
-  config = KGlobal::config();
+  config = TDEGlobal::config();
   config->setGroup("GrepTool");
   lastSearchItems = config->readListEntry("LastSearchItems");
   lastSearchPaths = config->readListEntry("LastSearchPaths");
@@ -351,7 +351,7 @@ void GrepTool::slotSearch()
   TQString pattern = leTemplate->text();
   pattern.replace( "%s", s );
 
-  childproc = new KProcess();
+  childproc = new TDEProcess();
   childproc->setWorkingDirectory( m_workingDir );
   *childproc << "find" << ".";
   if (!cbRecursive->isChecked())
@@ -377,18 +377,18 @@ void GrepTool::slotSearch()
   *childproc << "/dev/null"; //trick to have grep always display the filename
   *childproc << ";";
 
-  connect( childproc, TQT_SIGNAL(processExited(KProcess *)),
+  connect( childproc, TQT_SIGNAL(processExited(TDEProcess *)),
            TQT_SLOT(childExited()) );
-  connect( childproc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
-           TQT_SLOT(receivedOutput(KProcess *, char *, int)) );
-  connect( childproc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
-           TQT_SLOT(receivedErrOutput(KProcess *, char *, int)) );
+  connect( childproc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+           TQT_SLOT(receivedOutput(TDEProcess *, char *, int)) );
+  connect( childproc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+           TQT_SLOT(receivedErrOutput(TDEProcess *, char *, int)) );
 
   // actually it should be checked whether the process was started successfully
   lbResult->setCursor( TQCursor(Qt::WaitCursor) );
   btnClear->setEnabled( false );
   btnSearch->setGuiItem( KGuiItem(i18n("Cancel"), "button_cancel"));
-  childproc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
+  childproc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
 }
 
 void GrepTool::slotSearchFor(const TQString &pattern)
@@ -483,13 +483,13 @@ void GrepTool::childExited()
     finish();
 }
 
-void GrepTool::receivedOutput(KProcess */*proc*/, char *buffer, int buflen)
+void GrepTool::receivedOutput(TDEProcess */*proc*/, char *buffer, int buflen)
 {
   buf += TQCString(buffer, buflen+1);
   processOutput();
 }
 
-void GrepTool::receivedErrOutput(KProcess */*proc*/, char *buffer, int buflen)
+void GrepTool::receivedErrOutput(TDEProcess */*proc*/, char *buffer, int buflen)
 {
   errbuf += TQCString( buffer, buflen + 1 );
 }
diff --git a/kate/app/kategrepdialog.h b/kate/app/kategrepdialog.h
index 525d6b7f1..0d8d48366 100644
--- a/kate/app/kategrepdialog.h
+++ b/kate/app/kategrepdialog.h
@@ -30,7 +30,7 @@ class TQCheckBox;
 class TQListBox;
 class KPushButton;
 class TQLabel;
-class KProcess;
+class TDEProcess;
 class KConfig;
 class KURLRequester;
 class TQEvent;
@@ -64,8 +64,8 @@ protected:
 private slots:
     void templateActivated(int index);
     void childExited();
-    void receivedOutput(KProcess *proc, char *buffer, int buflen);
-    void receivedErrOutput(KProcess *proc, char *buffer, int buflen);
+    void receivedOutput(TDEProcess *proc, char *buffer, int buflen);
+    void receivedErrOutput(TDEProcess *proc, char *buffer, int buflen);
     void itemSelected(const TQString&);
     void slotSearch();
     void slotCancel();
@@ -82,7 +82,7 @@ private:
     TQCheckBox *cbCasesensitive, *cbRegex;
     TQListBox *lbResult;
     KPushButton *btnSearch, *btnClear;
-    KProcess *childproc;
+    TDEProcess *childproc;
     TQString buf;
     TQString errbuf;
     KConfig* config;
diff --git a/kate/app/katemain.h b/kate/app/katemain.h
index a0cb3c10e..5c9c3d1b9 100644
--- a/kate/app/katemain.h
+++ b/kate/app/katemain.h
@@ -45,7 +45,7 @@ class KFileViewItem;
 class KHistoryCombo;
 class KLineEdit;
 class KListBox;
-class KProcess;
+class TDEProcess;
 class KPushButton;
 class KRecentFilesAction;
 class KSelectAction;
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 948dc089e..4220a4b15 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -287,7 +287,7 @@ void Sidebar::setSplitter (Splitter *sp)
 {
   m_splitter = sp;
   m_ownSplit = new Splitter ((position() == KMultiTabBar::Top || position() == KMultiTabBar::Bottom) ? Qt::Horizontal : Qt::Vertical, m_splitter);
-  m_ownSplit->setOpaqueResize( KGlobalSettings::opaqueResize() );
+  m_ownSplit->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
   m_ownSplit->setChildrenCollapsible( false );
   m_splitter->setResizeMode( m_ownSplit, TQSplitter::KeepSize );
   m_ownSplit->hide ();
@@ -673,7 +673,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
   m_sidebars[KMultiTabBar::Left] = new Sidebar (KMultiTabBar::Left, this, hb);
 
   m_hSplitter = new Splitter (Qt::Horizontal, hb);
-  m_hSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
+  m_hSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
 
   m_sidebars[KMultiTabBar::Left]->setSplitter (m_hSplitter);
 
@@ -683,7 +683,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
   m_sidebars[KMultiTabBar::Top] = new Sidebar (KMultiTabBar::Top, this, vb);
 
   m_vSplitter = new Splitter (Qt::Vertical, vb);
-  m_vSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
+  m_vSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
 
   m_sidebars[KMultiTabBar::Top]->setSplitter (m_vSplitter);
 
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index 0ea7cdc71..e8bee5a35 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -212,16 +212,16 @@ void KateMwModOnHdDialog::slotDiff()
   if ( KateDocManager::self()->documentInfo( doc )->modifiedOnDiscReason == 3 )
     return;
 
-  // Start a KProcess that creates a diff
+  // Start a TDEProcess that creates a diff
   KProcIO *p = new KProcIO();
-  p->setComm( KProcess::All );
+  p->setComm( TDEProcess::All );
   *p << "diff" << "-u" << "-" <<  doc->url().path();
-  connect( p, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPDone(KProcess*)) );
+  connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) );
   connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) );
 
   setCursor( WaitCursor );
 
-  p->start( KProcess::NotifyOnExit, true );
+  p->start( TDEProcess::NotifyOnExit, true );
 
   uint lastln =  doc->numLines();
   for ( uint l = 0; l <  lastln; l++ )
@@ -247,7 +247,7 @@ void KateMwModOnHdDialog::slotPRead( KProcIO *p)
     p->ackRead();
 }
 
-void KateMwModOnHdDialog::slotPDone( KProcess *p )
+void KateMwModOnHdDialog::slotPDone( TDEProcess *p )
 {
   setCursor( ArrowCursor );
   if( ! m_tmpfile )
diff --git a/kate/app/katemwmodonhddialog.h b/kate/app/katemwmodonhddialog.h
index 7a5d8f7ca..5cc406e92 100644
--- a/kate/app/katemwmodonhddialog.h
+++ b/kate/app/katemwmodonhddialog.h
@@ -26,7 +26,7 @@
 
 typedef  TQPtrVector<Kate::Document> DocVector;
 class KProcIO;
-class KProcess;
+class TDEProcess;
 /**
  * A dialog for handling multiple documents modified on disk
  * from within KateMainWindow
@@ -47,7 +47,7 @@ class KateMwModOnHdDialog : public KDialogBase
     void slotDiff();
     void slotSelectionChanged();
     void slotPRead(KProcIO*);
-    void slotPDone(KProcess*);
+    void slotPDone(TDEProcess*);
 
   private:
     enum Action { Ignore, Overwrite, Reload };
diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp
index 09257300c..8d1c49753 100644
--- a/kate/app/katesavemodifieddialog.cpp
+++ b/kate/app/katesavemodifieddialog.cpp
@@ -48,7 +48,7 @@ public:
 	STATE state() const { return m_state;}
 	void setState(enum STATE state) {
 		m_state=state;
-		KIconLoader *loader = KGlobal::instance()->iconLoader();
+		KIconLoader *loader = TDEGlobal::instance()->iconLoader();
 		switch (state) {
 			case InitialState:
 				setPixmap(0,TQPixmap());
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index a62924b92..e21b9f29b 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -67,7 +67,7 @@ KateSession::KateSession (KateSessionManager *manager, const TQString &fileName,
 void KateSession::init ()
 {
   // given file exists, use it to load some stuff ;)
-  if (!m_sessionFileRel.isEmpty() && KGlobal::dirs()->exists(sessionFile ()))
+  if (!m_sessionFileRel.isEmpty() && TDEGlobal::dirs()->exists(sessionFile ()))
   {
     KSimpleConfig config (sessionFile (), true);
 
@@ -146,7 +146,7 @@ bool KateSession::create (const TQString &name, bool force)
     KMD5 md5 (tname);
     m_sessionFileRel = TQString ("%1.katesession").arg (md5.hexDigest().data());
 
-    if (!KGlobal::dirs()->exists(sessionFile ()))
+    if (!TDEGlobal::dirs()->exists(sessionFile ()))
       break;
   }
 
@@ -211,7 +211,7 @@ KateSessionManager::KateSessionManager (TQObject *parent)
   kdDebug() << "LOCAL SESSION DIR: " << m_sessionsDir << endl;
 
   // create dir if needed
-  KGlobal::dirs()->makeDir (m_sessionsDir);
+  TDEGlobal::dirs()->makeDir (m_sessionsDir);
 }
 
 KateSessionManager::~KateSessionManager()
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index 73ca6a097..33f87e7c0 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -349,8 +349,8 @@ KateVSStatusBar::~KateVSStatusBar ()
 void KateVSStatusBar::setStatus( int r, int c, int ovr, bool block, int, const TQString &msg )
 {
   m_lineColLabel->setText(
-    i18n(" Line: %1 Col: %2 ").arg(KGlobal::locale()->formatNumber(r+1, 0))
-                              .arg(KGlobal::locale()->formatNumber(c+1, 0)) );
+    i18n(" Line: %1 Col: %2 ").arg(TDEGlobal::locale()->formatNumber(r+1, 0))
+                              .arg(TDEGlobal::locale()->formatNumber(c+1, 0)) );
 
   if (ovr == 0)
     m_insertModeLabel->setText( i18n(" R/O ") );
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index a7a063244..8f4e3886c 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -455,7 +455,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
 
   Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
   KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget());
-  s->setOpaqueResize( KGlobalSettings::opaqueResize() );
+  s->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
 
   if (! isFirstTime) {
     // anders: make sure the split' viewspace is always
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 2f32d2c24..152a96b98 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -593,7 +593,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 
   TDEApplication a;
 
-  KGlobal::locale()->insertCatalogue("katepart");
+  TDEGlobal::locale()->insertCatalogue("katepart");
 
   DCOPClient *client = kapp->dcopClient();
   if (!client->isRegistered())