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

10 files changed, 36 insertions, 36 deletions

diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp
index d1a0de8..3cff9c7 100644
--- a/kmouth/optionsdialog.cpp
+++ b/kmouth/optionsdialog.cpp
@@ -119,7 +119,7 @@ OptionsDialog::OptionsDialog (TQWidget *parent)
 {
    setHelp ("config-dialog");
 
-   TQPixmap iconGeneral = KGlobal::iconLoader()->loadIcon("configure", KIcon::NoGroup, KIcon::SizeMedium);
+   TQPixmap iconGeneral = TDEGlobal::iconLoader()->loadIcon("configure", KIcon::NoGroup, KIcon::SizeMedium);
    TQGrid *pageGeneral = addGridPage (1, Qt::Horizontal, i18n("General Options"), TQString(), iconGeneral);
    
    tabCtl = new TQTabWidget (pageGeneral, "general");
@@ -132,13 +132,13 @@ OptionsDialog::OptionsDialog (TQWidget *parent)
    commandWidget->layout()->setMargin(KDialog::marginHint());
    tabCtl->addTab (commandWidget, i18n("&Text-to-Speech"));
    
-   TQPixmap iconCompletion = KGlobal::iconLoader()->loadIcon("keyboard", KIcon::NoGroup, KIcon::SizeMedium);
+   TQPixmap iconCompletion = TDEGlobal::iconLoader()->loadIcon("keyboard", KIcon::NoGroup, KIcon::SizeMedium);
    TQGrid *pageCompletion = addGridPage (1, Qt::Horizontal, i18n("Word Completion"), TQString(), iconCompletion);
    completionWidget = new WordCompletionWidget(pageCompletion, "Word Completion widget");
 
    kttsd = loadKttsd();
    if (kttsd != 0) {
-      TQPixmap iconKttsd = KGlobal::iconLoader()->loadIcon("multimedia", KIcon::NoGroup, KIcon::SizeMedium);
+      TQPixmap iconKttsd = TDEGlobal::iconLoader()->loadIcon("multimedia", KIcon::NoGroup, KIcon::SizeMedium);
       TQGrid *pageKttsd = addGridPage (1, Qt::Horizontal, i18n("KTTSD Speech Service"),
                                       i18n("TDE Text-to-Speech Daemon Configuration"), iconKttsd);
       
diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp
index ffa3ff2..f03cd96 100644
--- a/kmouth/phrasebook/phrasebook.cpp
+++ b/kmouth/phrasebook/phrasebook.cpp
@@ -102,7 +102,7 @@ void PhraseBook::print(KPrinter *pPrinter) {
    int x = size.x();
    int y = size.y();
    int w = size.width();
-   printpainter.setFont (TQFont (KGlobalSettings::generalFont().family(), 12));
+   printpainter.setFont (TQFont (TDEGlobalSettings::generalFont().family(), 12));
    TQFontMetrics metrics = printpainter.fontMetrics();
 
    PhraseBookEntryList::iterator it;
diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp
index a8a0609..832e184 100644
--- a/kmouth/phrasebook/phrasebookdialog.cpp
+++ b/kmouth/phrasebook/phrasebookdialog.cpp
@@ -403,7 +403,7 @@ TQString PhraseBookDialog::displayPath (TQString filename) {
 }
 
 StandardBookList PhraseBookDialog::standardPhraseBooks() {
-   TQStringList bookPaths = KGlobal::instance()->dirs()->findAllResources (
+   TQStringList bookPaths = TDEGlobal::instance()->dirs()->findAllResources (
                           "data", "kmouth/books/*.phrasebook", true, true);
    TQStringList bookNames;
    TQMap<TQString,StandardBook> bookMap;
diff --git a/kmouth/phrasebook/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp
index 27735c5..f8e89a9 100644
--- a/kmouth/phrasebook/phrasetree.cpp
+++ b/kmouth/phrasebook/phrasetree.cpp
@@ -77,9 +77,9 @@ void PhraseTreeItem::setCut (KShortcut cut) {
 PhraseTree::PhraseTree (TQWidget *parent, const char *name)
    : KListView (parent, name)
 {
-   phrasebook_open   = KGlobal::iconLoader()->loadIcon("phrasebook",        KIcon::Small);
-   phrasebook_closed = KGlobal::iconLoader()->loadIcon("phrasebook_closed", KIcon::Small);
-   phrase            = KGlobal::iconLoader()->loadIcon("phrase",            KIcon::Small);
+   phrasebook_open   = TDEGlobal::iconLoader()->loadIcon("phrasebook",        KIcon::Small);
+   phrasebook_closed = TDEGlobal::iconLoader()->loadIcon("phrasebook_closed", KIcon::Small);
+   phrase            = TDEGlobal::iconLoader()->loadIcon("phrase",            KIcon::Small);
 
    connect (this, TQT_SIGNAL(expanded (TQListViewItem *)), this, TQT_SLOT(itemExpanded (TQListViewItem *)));
    connect (this, TQT_SIGNAL(collapsed (TQListViewItem *)), this, TQT_SLOT(itemCollapsed (TQListViewItem *)));
@@ -494,7 +494,7 @@ bool PhraseTree::isStdAccelPresent (const KShortcut& cut, bool warnUser) {
 }
 
 bool PhraseTree::isGlobalKeyPresent (const KShortcut& cut, bool warnUser) {
-   TQMap<TQString, TQString> mapEntry = KGlobal::config()->entryMap ("Global Shortcuts");
+   TQMap<TQString, TQString> mapEntry = TDEGlobal::config()->entryMap ("Global Shortcuts");
    TQMap<TQString, TQString>::Iterator it;
    for (it = mapEntry.begin(); it != mapEntry.end(); ++it) {
       int iSeq = keyConflict (cut, KShortcut(*it));
diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp
index 7d447a2..736b3a1 100644
--- a/kmouth/phraselist.cpp
+++ b/kmouth/phraselist.cpp
@@ -75,7 +75,7 @@ PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,nam
    rowLayout->addWidget(lineEdit);
    lineEdit->setFocus();
 
-   TQIconSet icon = KGlobal::iconLoader()->loadIconSet("speak", KIcon::Small);
+   TQIconSet icon = TDEGlobal::iconLoader()->loadIconSet("speak", KIcon::Small);
    speakButton = new TQPushButton (icon, i18n("&Speak"), this);
    speakButton->setFocusPolicy(TQ_NoFocus);
    speakButton->setAutoDefault(false);
@@ -188,8 +188,8 @@ void PhraseList::readCompletionOptions(KConfig *config) {
 
    if (config->hasGroup ("Completion")) {
       config->setGroup("Completion");
-      int mode = config->readNumEntry ("Mode", KGlobalSettings::completionMode());
-      lineEdit->setCompletionMode (static_cast<KGlobalSettings::Completion>(mode));
+      int mode = config->readNumEntry ("Mode", TDEGlobalSettings::completionMode());
+      lineEdit->setCompletionMode (static_cast<TDEGlobalSettings::Completion>(mode));
 
       TQString current = config->readEntry ("List", TQString());
       TQStringList list = completion->wordLists();
diff --git a/kmouth/speech.cpp b/kmouth/speech.cpp
index 413690c..ae68838 100644
--- a/kmouth/speech.cpp
+++ b/kmouth/speech.cpp
@@ -206,36 +206,36 @@ void Speech::speak(TQString command, bool stdIn, const TQString &text, const TQS
 
       // 3. create a new process
       process << command;
-      connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *)));
-      connect(&process, TQT_SIGNAL(wroteStdin(KProcess *)), this, TQT_SLOT(wroteStdin(KProcess *)));
-      connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(receivedStdout(KProcess *, char *, int)));
-      connect(&process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(receivedStderr(KProcess *, char *, int)));
+      connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *)));
+      connect(&process, TQT_SIGNAL(wroteStdin(TDEProcess *)), this, TQT_SLOT(wroteStdin(TDEProcess *)));
+      connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(receivedStdout(TDEProcess *, char *, int)));
+      connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(receivedStderr(TDEProcess *, char *, int)));
 
       // 4. start the process
       if (stdIn) {
-         process.start(KProcess::NotifyOnExit, KProcess::All);
+         process.start(TDEProcess::NotifyOnExit, TDEProcess::All);
          if (encText.size() > 0)
             process.writeStdin(encText, encText.size());
          else
             process.closeStdin();
       }
       else
-         process.start(KProcess::NotifyOnExit, KProcess::AllOutput);
+         process.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
    }
 }
 
-void Speech::receivedStdout (KProcess *, char *buffer, int buflen) {
+void Speech::receivedStdout (TDEProcess *, char *buffer, int buflen) {
    kdDebug() << TQString::fromLatin1(buffer, buflen) + "\n";
 }
-void Speech::receivedStderr (KProcess *, char *buffer, int buflen) {
+void Speech::receivedStderr (TDEProcess *, char *buffer, int buflen) {
    kdDebug() << TQString::fromLatin1(buffer, buflen) + "\n";
 }
 
-void Speech::wroteStdin(KProcess *) {
+void Speech::wroteStdin(TDEProcess *) {
    process.closeStdin();
 }
 
-void Speech::processExited(KProcess *) {
+void Speech::processExited(TDEProcess *) {
    delete this;
 }
 
diff --git a/kmouth/speech.h b/kmouth/speech.h
index fd73e47..3c62a44 100644
--- a/kmouth/speech.h
+++ b/kmouth/speech.h
@@ -59,10 +59,10 @@ public:
                      const TQString &filename, const TQString &language);
 
 public slots:
-   void wroteStdin (KProcess *p);
-   void processExited (KProcess *p);
-   void receivedStdout (KProcess *proc, char *buffer, int buflen);
-   void receivedStderr (KProcess *proc, char *buffer, int buflen);
+   void wroteStdin (TDEProcess *p);
+   void processExited (TDEProcess *p);
+   void receivedStdout (TDEProcess *proc, char *buffer, int buflen);
+   void receivedStderr (TDEProcess *proc, char *buffer, int buflen);
 
 private:
    KShellProcess process;
diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp
index 1346722..bb35713 100644
--- a/kmouth/wordcompletion/dictionarycreationwizard.cpp
+++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp
@@ -256,8 +256,8 @@ TQString DictionaryCreationWizard::language() {
       return mergeWidget->language();
    }
    else if (creationSource->emptyButton->isChecked()) {
-      if (KGlobal::locale())
-         return KGlobal::locale()->language();
+      if (TDEGlobal::locale())
+         return TDEGlobal::locale()->language();
       else
          return KLocale::defaultLanguage();
    }
diff --git a/kmouth/wordcompletion/klanguagebuttonhelper.cpp b/kmouth/wordcompletion/klanguagebuttonhelper.cpp
index ddc0c8f..0698b43 100644
--- a/kmouth/wordcompletion/klanguagebuttonhelper.cpp
+++ b/kmouth/wordcompletion/klanguagebuttonhelper.cpp
@@ -30,7 +30,7 @@
 #include "klanguagebutton.h"
 
 TQString languageName (TQString languageCode) {
-   TQString filename = KGlobal::dirs()->findResource("locale",
+   TQString filename = TDEGlobal::dirs()->findResource("locale",
 			languageCode + TQString::fromLatin1("/entry.desktop"));
       
    KSimpleConfig entry(filename);
@@ -41,7 +41,7 @@ TQString languageName (TQString languageCode) {
 void loadLanguageList(KLanguageButton *combo)
 // This function was taken from tdebase/kcontrol/tdm/tdm-appear.cpp
 {
-  TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
+  TQStringList langlist = TDEGlobal::dirs()->findAllResources("locale",
 			TQString::fromLatin1("*/entry.desktop"));
   langlist.sort();
   for ( TQStringList::ConstIterator it = langlist.begin();
@@ -57,8 +57,8 @@ void loadLanguageList(KLanguageButton *combo)
     combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString());
   }
   
-  if (KGlobal::locale())
-     combo->setCurrentItem (KGlobal::locale()->language());
+  if (TDEGlobal::locale())
+     combo->setCurrentItem (TDEGlobal::locale()->language());
   else
      combo->setCurrentItem (KLocale::defaultLanguage());
 }
diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp
index 7e54fe4..b5e34d6 100644
--- a/kmouth/wordcompletion/wordcompletionwidget.cpp
+++ b/kmouth/wordcompletion/wordcompletionwidget.cpp
@@ -70,7 +70,7 @@ public:
    }
 
    void setLanguage (TQString languageCode) {
-      TQString filename = KGlobal::dirs()->findResource("locale",
+      TQString filename = TDEGlobal::dirs()->findResource("locale",
 			languageCode + TQString::fromLatin1("/entry.desktop"));
 
       KSimpleConfig entry(filename);
@@ -141,7 +141,7 @@ void WordCompletionWidget::load() {
 
    // Clean up disc space
    for (TQStringList::Iterator it = newDictionaryFiles.begin(); it != newDictionaryFiles.end(); ++it) {
-      TQString filename = KGlobal::dirs()->findResource ("appdata", *it);
+      TQString filename = TDEGlobal::dirs()->findResource ("appdata", *it);
       if (!filename.isEmpty() && !filename.isNull())
          TQFile::remove (filename);
    }
@@ -171,7 +171,7 @@ void WordCompletionWidget::save() {
 
    // Clean up disc space
    for (TQStringList::Iterator it = removedDictionaryFiles.begin(); it != removedDictionaryFiles.end(); ++it) {
-      TQString filename = KGlobal::dirs()->findResource ("appdata", *it);
+      TQString filename = TDEGlobal::dirs()->findResource ("appdata", *it);
       if (!filename.isEmpty() && !filename.isNull())
          TQFile::remove (filename);
    }
@@ -257,7 +257,7 @@ void WordCompletionWidget::exportDictionary() {
          }
       }
       KURL src;
-      src.setPath( KGlobal::dirs()->findResource ("appdata", item->filename()) );
+      src.setPath( TDEGlobal::dirs()->findResource ("appdata", item->filename()) );
       KIO::NetAccess::copy (src, url, this);
    }
 }