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

4 files changed, 7 insertions, 7 deletions

diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index 29cabe4e..7ae6b4a4 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -152,7 +152,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList,
   treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar()));
   treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQT_SLOT(slotEditToolbar()));
 
-  globalShortcuts = KGlobal::config()->entryMap( "Global Shortcuts" );
+  globalShortcuts = TDEGlobal::config()->entryMap( "Global Shortcuts" );
 }
 
 ActionConfigDialog::~ActionConfigDialog()
diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp
index 70d06c86..3664f21f 100644
--- a/quanta/dialogs/dirtydlg.cpp
+++ b/quanta/dialogs/dirtydlg.cpp
@@ -53,10 +53,10 @@ void DirtyDlg::slotOk()
  if (m_mainWidget->buttonCompare->isChecked())
  {
    m_busy = true;
-   KProcess *proc = new KProcess();
+   TDEProcess *proc = new TDEProcess();
    *proc << "kompare" << m_src.path() << m_dest.path();
    proc->start();
-   connect(proc, TQT_SIGNAL(processExited(KProcess*)),TQT_SLOT(slotCompareDone(KProcess*)));
+   connect(proc, TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotCompareDone(TDEProcess*)));
    enableButton(KDialogBase::Ok, false);
    enableButton(KDialogBase::Cancel, false);
  } else
@@ -70,7 +70,7 @@ void DirtyDlg::slotOk()
 }
 
 /** No descriptions */
-void DirtyDlg::slotCompareDone(KProcess* proc)
+void DirtyDlg::slotCompareDone(TDEProcess* proc)
 {
  delete proc;
 
diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h
index 194275af..04cf3824 100644
--- a/quanta/dialogs/dirtydlg.h
+++ b/quanta/dialogs/dirtydlg.h
@@ -23,7 +23,7 @@
 class DirtyDialog;
 class KDialogBase;
 
-class KProcess;
+class TDEProcess;
 class TQCloseEvent;
 
 class DirtyDlg : public KDialogBase  {
@@ -38,7 +38,7 @@ protected slots: // Protected slots
   /** No descriptions */
    void slotOk();
   /** No descriptions */
-  void slotCompareDone(KProcess*);
+  void slotCompareDone(TDEProcess*);
   /** No descriptions */
   void slotResult(KIO::Job *);
   /** No descriptions */
diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp
index 538aaa0b..eb143120 100644
--- a/quanta/dialogs/settings/abbreviation.cpp
+++ b/quanta/dialogs/settings/abbreviation.cpp
@@ -221,7 +221,7 @@ void AbbreviationDlg::saveTemplates()
   TQListViewItem *item = templatesList->currentItem();
   if (item && m_currentAbbrev)
      m_currentAbbrev->abbreviations.insert(item->text(0) + " " + item->text(1), codeEdit->text());
-  TQString abbrevFile = KGlobal::dirs()->saveLocation("data") + resourceDir + "abbreviations.xml";
+  TQString abbrevFile = TDEGlobal::dirs()->saveLocation("data") + resourceDir + "abbreviations.xml";
   TQString s = "<!DOCTYPE Templates>\n<Templates>\n</Templates>\n";
   TQString s2;
   TQDomDocument doc;