Rename KApplication to TDEApplication to avoid conflicts with KDE4

8 files changed, 17 insertions, 17 deletions

diff --git a/kmouth/configwizard.cpp b/kmouth/configwizard.cpp
index 3ca0b5c..7b21441 100644
--- a/kmouth/configwizard.cpp
+++ b/kmouth/configwizard.cpp
@@ -63,7 +63,7 @@ void ConfigWizard::initCommandPage(KConfig *config) {
 }
 
 void ConfigWizard::initBookPage() {
-   TQString standardBook = KApplication::kApplication()->dirs()->findResource("appdata", "standard.phrasebook");
+   TQString standardBook = TDEApplication::kApplication()->dirs()->findResource("appdata", "standard.phrasebook");
    bool displayBook = (standardBook.isNull() || standardBook.isEmpty());
 
    if (displayBook) {
@@ -80,7 +80,7 @@ void ConfigWizard::initBookPage() {
 
 void ConfigWizard::initCompletion (KConfig *config) {
    if (!WordCompletion::isConfigured()) {
-      TQString dictionaryFile = KApplication::kApplication()->dirs()->findResource("appdata", "dictionary.txt");
+      TQString dictionaryFile = TDEApplication::kApplication()->dirs()->findResource("appdata", "dictionary.txt");
       TQFile file(dictionaryFile);
       if (file.exists()) {
          // If there is a word completion dictionary but no entry in the
@@ -138,7 +138,7 @@ bool ConfigWizard::configurationNeeded () {
 }
 
 void ConfigWizard::help () {
-   KApplication::kApplication()->invokeHelp ("Wizard");
+   TDEApplication::kApplication()->invokeHelp ("Wizard");
 }
 
 #include "configwizard.moc"
diff --git a/kmouth/kmouth.cpp b/kmouth/kmouth.cpp
index 83c2797..7c78bae 100644
--- a/kmouth/kmouth.cpp
+++ b/kmouth/kmouth.cpp
@@ -266,7 +266,7 @@ void KMouthApp::readOptions()
   toolBar("mainToolBar")->applySettings (config, "mainToolBar");
   toolBar("phrasebookBar")->applySettings (config, "phrasebookBar");
 
-  TQString standardBook = KApplication::kApplication()->dirs()->findResource("appdata", "standard.phrasebook");
+  TQString standardBook = TDEApplication::kApplication()->dirs()->findResource("appdata", "standard.phrasebook");
   if (!standardBook.isEmpty()) {
      PhraseBook book;
      book.open(KURL::fromPathOrURL( standardBook ));
@@ -460,7 +460,7 @@ void KMouthApp::slotPhrasebookConfirmed (PhraseBook &book) {
    phrases = new KActionCollection (this, actionCollection());
    book.addToGUI (popup, toolbar, phrases, TQT_TQOBJECT(this), TQT_SLOT(slotPhraseSelected (const TQString &)));
 
-   TQString bookLocation = KApplication::kApplication()->dirs()->saveLocation ("appdata", "/");
+   TQString bookLocation = TDEApplication::kApplication()->dirs()->saveLocation ("appdata", "/");
    if (!bookLocation.isNull() && !bookLocation.isEmpty()) {
       book.save (KURL::fromPathOrURL( bookLocation + "standard.phrasebook" ));
    }
diff --git a/kmouth/kmouth.h b/kmouth/kmouth.h
index 0c5888f..72fa608 100644
--- a/kmouth/kmouth.h
+++ b/kmouth/kmouth.h
@@ -47,7 +47,7 @@ class PhraseBook;
   * KMouthApp reimplements the methods that KMainWindow provides for main window handling and supports
   * full session management as well as using KActions.
   * @see KMainWindow
-  * @see KApplication
+  * @see TDEApplication
   * @see KConfig
   *
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
diff --git a/kmouth/main.cpp b/kmouth/main.cpp
index ec7eb78..66beff7 100644
--- a/kmouth/main.cpp
+++ b/kmouth/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
 	TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
 	aboutData.addCredit("Olaf Schmidt", I18N_NOOP("Tips, extended phrase books"), 0, 0);
-  KApplication app;
+  TDEApplication app;
 
   if (app.isRestored())
   {
diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp
index 1c035e6..a8a0609 100644
--- a/kmouth/phrasebook/phrasebookdialog.cpp
+++ b/kmouth/phrasebook/phrasebookdialog.cpp
@@ -225,7 +225,7 @@ void InitialPhraseBookWidget::createBook () {
       }
    }
 
-   TQString bookLocation = KApplication::kApplication()->dirs()->saveLocation ("appdata", "/");
+   TQString bookLocation = TDEApplication::kApplication()->dirs()->saveLocation ("appdata", "/");
    if (!bookLocation.isNull() && !bookLocation.isEmpty()) {
       book.save (KURL( bookLocation + "standard.phrasebook" ));
    }
@@ -264,7 +264,7 @@ PhraseBookDialog::PhraseBookDialog ()
    initGUI();
    initActions();
    initStandardPhraseBooks();
-   TQString standardBook = KApplication::kApplication()->dirs()->findResource("appdata", "standard.phrasebook");
+   TQString standardBook = TDEApplication::kApplication()->dirs()->findResource("appdata", "standard.phrasebook");
    if (!standardBook.isNull() && !standardBook.isEmpty()) {
       PhraseBook book;
       book.open(KURL( standardBook ));
diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp
index 5574c97..1346722 100644
--- a/kmouth/wordcompletion/dictionarycreationwizard.cpp
+++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp
@@ -222,11 +222,11 @@ TQString DictionaryCreationWizard::createDictionary() {
    do {
       dictnumber++;
       filename = TQString("wordcompletion%1.dict").arg(dictnumber);
-      dictionaryFile = KApplication::kApplication()->dirs()->findResource("appdata", filename);
+      dictionaryFile = TDEApplication::kApplication()->dirs()->findResource("appdata", filename);
    }
    while (KStandardDirs::exists(dictionaryFile));
    
-   dictionaryFile = KApplication::kApplication()->dirs()->saveLocation ("appdata", "/") + filename;
+   dictionaryFile = TDEApplication::kApplication()->dirs()->saveLocation ("appdata", "/") + filename;
    if (WordList::saveWordList (map, dictionaryFile))
       return filename;
    else
@@ -319,7 +319,7 @@ TQMap <TQString, int> MergeWidget::mergeParameters () {
    for (; it.current(); ++it) {
       if (it.current()->isChecked()) {
          TQString name = it.currentKey();
-         TQString dictionaryFile = KApplication::kApplication()->dirs()->findResource("appdata", name);
+         TQString dictionaryFile = TDEApplication::kApplication()->dirs()->findResource("appdata", name);
          files[dictionaryFile] = weights[name]->value();
       }
    }
@@ -363,7 +363,7 @@ void CompletionWizardWidget::ok (KConfig *config) {
    TQString filename;
    TQString dictionaryFile;
    
-   dictionaryFile = KApplication::kApplication()->dirs()->saveLocation ("appdata", "/") + "wordcompletion1.dict";
+   dictionaryFile = TDEApplication::kApplication()->dirs()->saveLocation ("appdata", "/") + "wordcompletion1.dict";
    if (WordList::saveWordList (map, dictionaryFile)) {
       config->setGroup("Dictionary 0");
       config->writeEntry ("Filename", "wordcompletion1.dict");
diff --git a/kmouth/wordcompletion/wordcompletion.cpp b/kmouth/wordcompletion/wordcompletion.cpp
index 5abd4b7..7936044 100644
--- a/kmouth/wordcompletion/wordcompletion.cpp
+++ b/kmouth/wordcompletion/wordcompletion.cpp
@@ -144,7 +144,7 @@ bool WordCompletion::setWordList(const TQString &wordlist) {
       d->current = d->dictionaries[0];
    
    TQString filename = d->dictDetails[d->current].filename;
-   TQString dictionaryFile = KApplication::kApplication()->dirs()->findResource("appdata", filename);
+   TQString dictionaryFile = TDEApplication::kApplication()->dirs()->findResource("appdata", filename);
    TQFile file(dictionaryFile);
    if (file.exists() && file.open(IO_ReadOnly)) {
       TQTextStream stream(&file);
@@ -195,7 +195,7 @@ void WordCompletion::addSentence (const TQString &sentence) {
 void WordCompletion::save () {
    if (d->wordsToSave) {
       TQString filename = d->dictDetails[d->current].filename;
-      TQString dictionaryFile = KApplication::kApplication()->dirs()->findResource("appdata", filename);
+      TQString dictionaryFile = TDEApplication::kApplication()->dirs()->findResource("appdata", filename);
       TQFile file(dictionaryFile);
       if (!file.exists())
          return;
diff --git a/kmouth/wordcompletion/wordlist.cpp b/kmouth/wordcompletion/wordlist.cpp
index 6cb40d6..d01520c 100644
--- a/kmouth/wordcompletion/wordlist.cpp
+++ b/kmouth/wordcompletion/wordlist.cpp
@@ -292,10 +292,10 @@ WordMap parseKDEDoc (TQString language, KProgressDialog *pdlg) {
    pdlg->show();
    tqApp->processEvents (20);
    
-   TQStringList files = KApplication::kApplication()->dirs()->findAllResources ("html", language + "/*.docbook", true, true);
+   TQStringList files = TDEApplication::kApplication()->dirs()->findAllResources ("html", language + "/*.docbook", true, true);
    if ((files.count() == 0) && (language.length() == 5)) {
       language = language.left(2);
-      files = KApplication::kApplication()->dirs()->findAllResources ("html", language + "/*.docbook", true, true);
+      files = TDEApplication::kApplication()->dirs()->findAllResources ("html", language + "/*.docbook", true, true);
    }
 
    return parseFiles (files, TQTextStream::UnicodeUTF8, 0, pdlg);