summaryrefslogtreecommitdiffstats
path: root/kmouth
diff options
context:
space:
mode:
Diffstat (limited to 'kmouth')
-rw-r--r--kmouth/configwizard.cpp8
-rw-r--r--kmouth/kmouth.cpp8
-rw-r--r--kmouth/phrasebook/phrasebookdialog.cpp6
-rw-r--r--kmouth/texttospeechsystem.cpp2
-rw-r--r--kmouth/wordcompletion/dictionarycreationwizard.cpp10
-rw-r--r--kmouth/wordcompletion/klanguagebutton.cpp2
-rw-r--r--kmouth/wordcompletion/klanguagebuttonhelper.cpp2
-rw-r--r--kmouth/wordcompletion/wordcompletion.cpp6
-rw-r--r--kmouth/wordcompletion/wordcompletionwidget.cpp2
-rw-r--r--kmouth/wordcompletion/wordlist.cpp6
10 files changed, 26 insertions, 26 deletions
diff --git a/kmouth/configwizard.cpp b/kmouth/configwizard.cpp
index 4960cff..fe51858 100644
--- a/kmouth/configwizard.cpp
+++ b/kmouth/configwizard.cpp
@@ -22,7 +22,7 @@
#include <tdelistview.h>
#include <tdelocale.h>
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ksconfig.h>
#include <tdeconfig.h>
@@ -63,7 +63,7 @@ void ConfigWizard::initCommandPage(TDEConfig *config) {
}
void ConfigWizard::initBookPage() {
- TQString standardBook = TDEApplication::kApplication()->dirs()->findResource("appdata", "standard.phrasebook");
+ TQString standardBook = tdeApp->dirs()->findResource("appdata", "standard.phrasebook");
bool displayBook = (standardBook.isNull() || standardBook.isEmpty());
if (displayBook) {
@@ -80,7 +80,7 @@ void ConfigWizard::initBookPage() {
void ConfigWizard::initCompletion (TDEConfig *config) {
if (!WordCompletion::isConfigured()) {
- TQString dictionaryFile = TDEApplication::kApplication()->dirs()->findResource("appdata", "dictionary.txt");
+ TQString dictionaryFile = tdeApp->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 () {
- TDEApplication::kApplication()->invokeHelp ("Wizard");
+ tdeApp->invokeHelp ("Wizard");
}
#include "configwizard.moc"
diff --git a/kmouth/kmouth.cpp b/kmouth/kmouth.cpp
index a34e602..a57b908 100644
--- a/kmouth/kmouth.cpp
+++ b/kmouth/kmouth.cpp
@@ -28,7 +28,7 @@
#include <kstdaction.h>
#include <kprinter.h>
#include <tdepopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
// application specific includes
#include "kmouth.h"
@@ -43,7 +43,7 @@
KMouthApp::KMouthApp(TQWidget* , const char* name):TDEMainWindow(0, name)
{
isConfigured = false;
- config=kapp->config();
+ config=tdeApp->config();
///////////////////////////////////////////////////////////////////
// call inits to invoke all other construction parts
@@ -266,7 +266,7 @@ void KMouthApp::readOptions()
toolBar("mainToolBar")->applySettings (config, "mainToolBar");
toolBar("phrasebookBar")->applySettings (config, "phrasebookBar");
- TQString standardBook = TDEApplication::kApplication()->dirs()->findResource("appdata", "standard.phrasebook");
+ TQString standardBook = tdeApp->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 TDEActionCollection (this, actionCollection());
book.addToGUI (popup, toolbar, phrases, this, TQ_SLOT(slotPhraseSelected (const TQString &)));
- TQString bookLocation = TDEApplication::kApplication()->dirs()->saveLocation ("appdata", "/");
+ TQString bookLocation = tdeApp->dirs()->saveLocation ("appdata", "/");
if (!bookLocation.isNull() && !bookLocation.isEmpty()) {
book.save (KURL::fromPathOrURL( bookLocation + "standard.phrasebook" ));
}
diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp
index c26c7d5..0168538 100644
--- a/kmouth/phrasebook/phrasebookdialog.cpp
+++ b/kmouth/phrasebook/phrasebookdialog.cpp
@@ -39,7 +39,7 @@
#include <kguiitem.h>
#include <tdemessagebox.h>
#include <tdefiledialog.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdesktopfile.h>
#include "phrasebookdialog.h"
@@ -225,7 +225,7 @@ void InitialPhraseBookWidget::createBook () {
}
}
- TQString bookLocation = TDEApplication::kApplication()->dirs()->saveLocation ("appdata", "/");
+ TQString bookLocation = tdeApp->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 = TDEApplication::kApplication()->dirs()->findResource("appdata", "standard.phrasebook");
+ TQString standardBook = tdeApp->dirs()->findResource("appdata", "standard.phrasebook");
if (!standardBook.isNull() && !standardBook.isEmpty()) {
PhraseBook book;
book.open(KURL( standardBook ));
diff --git a/kmouth/texttospeechsystem.cpp b/kmouth/texttospeechsystem.cpp
index 8664a99..97e284c 100644
--- a/kmouth/texttospeechsystem.cpp
+++ b/kmouth/texttospeechsystem.cpp
@@ -41,7 +41,7 @@ TextToSpeechSystem::~TextToSpeechSystem() {
}
bool kttsdSay (const TQString &text, const TQString &language) {
- DCOPClient *client = kapp->dcopClient();
+ DCOPClient *client = tdeApp->dcopClient();
TQByteArray data;
TQCString replyType;
TQByteArray replyData;
diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp
index 920fdd1..590cb0c 100644
--- a/kmouth/wordcompletion/dictionarycreationwizard.cpp
+++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp
@@ -31,7 +31,7 @@
#include <kcombobox.h>
#include <ksconfig.h>
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kprogress.h>
#include <tdeconfig.h>
@@ -222,11 +222,11 @@ TQString DictionaryCreationWizard::createDictionary() {
do {
dictnumber++;
filename = TQString("wordcompletion%1.dict").arg(dictnumber);
- dictionaryFile = TDEApplication::kApplication()->dirs()->findResource("appdata", filename);
+ dictionaryFile = tdeApp->dirs()->findResource("appdata", filename);
}
while (TDEStandardDirs::exists(dictionaryFile));
- dictionaryFile = TDEApplication::kApplication()->dirs()->saveLocation ("appdata", "/") + filename;
+ dictionaryFile = tdeApp->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 = TDEApplication::kApplication()->dirs()->findResource("appdata", name);
+ TQString dictionaryFile = tdeApp->dirs()->findResource("appdata", name);
files[dictionaryFile] = weights[name]->value();
}
}
@@ -363,7 +363,7 @@ void CompletionWizardWidget::ok (TDEConfig *config) {
TQString filename;
TQString dictionaryFile;
- dictionaryFile = TDEApplication::kApplication()->dirs()->saveLocation ("appdata", "/") + "wordcompletion1.dict";
+ dictionaryFile = tdeApp->dirs()->saveLocation ("appdata", "/") + "wordcompletion1.dict";
if (WordList::saveWordList (map, dictionaryFile)) {
config->setGroup("Dictionary 0");
config->writeEntry ("Filename", "wordcompletion1.dict");
diff --git a/kmouth/wordcompletion/klanguagebutton.cpp b/kmouth/wordcompletion/klanguagebutton.cpp
index 9d72f3a..77a6854 100644
--- a/kmouth/wordcompletion/klanguagebutton.cpp
+++ b/kmouth/wordcompletion/klanguagebutton.cpp
@@ -24,7 +24,7 @@
#define INCLUDE_MENUITEM_DEF
#include <tqpopupmenu.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "klanguagebutton.h"
diff --git a/kmouth/wordcompletion/klanguagebuttonhelper.cpp b/kmouth/wordcompletion/klanguagebuttonhelper.cpp
index a2c5e70..6854b36 100644
--- a/kmouth/wordcompletion/klanguagebuttonhelper.cpp
+++ b/kmouth/wordcompletion/klanguagebuttonhelper.cpp
@@ -25,7 +25,7 @@
#include <tdeglobal.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ksimpleconfig.h>
#include "klanguagebutton.h"
diff --git a/kmouth/wordcompletion/wordcompletion.cpp b/kmouth/wordcompletion/wordcompletion.cpp
index 8d5f1e4..585e257 100644
--- a/kmouth/wordcompletion/wordcompletion.cpp
+++ b/kmouth/wordcompletion/wordcompletion.cpp
@@ -2,7 +2,7 @@
#include <tqfile.h>
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
#include "wordcompletion.h"
@@ -144,7 +144,7 @@ bool WordCompletion::setWordList(const TQString &wordlist) {
d->current = d->dictionaries[0];
TQString filename = d->dictDetails[d->current].filename;
- TQString dictionaryFile = TDEApplication::kApplication()->dirs()->findResource("appdata", filename);
+ TQString dictionaryFile = tdeApp->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 = TDEApplication::kApplication()->dirs()->findResource("appdata", filename);
+ TQString dictionaryFile = tdeApp->dirs()->findResource("appdata", filename);
TQFile file(dictionaryFile);
if (!file.exists())
return;
diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp
index 2ba1fb2..e97b0e3 100644
--- a/kmouth/wordcompletion/wordcompletionwidget.cpp
+++ b/kmouth/wordcompletion/wordcompletionwidget.cpp
@@ -25,7 +25,7 @@
#include <kurlrequester.h>
#include <tdelocale.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <tdefiledialog.h>
diff --git a/kmouth/wordcompletion/wordlist.cpp b/kmouth/wordcompletion/wordlist.cpp
index 2031c8e..b9f4c7c 100644
--- a/kmouth/wordcompletion/wordlist.cpp
+++ b/kmouth/wordcompletion/wordlist.cpp
@@ -21,7 +21,7 @@
#include <tqdir.h>
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kprogress.h>
#include <tdelocale.h>
@@ -292,10 +292,10 @@ WordMap parseKDEDoc (TQString language, KProgressDialog *pdlg) {
pdlg->show();
tqApp->processEvents (20);
- TQStringList files = TDEApplication::kApplication()->dirs()->findAllResources ("html", language + "/*.docbook", true, true);
+ TQStringList files = tdeApp->dirs()->findAllResources ("html", language + "/*.docbook", true, true);
if ((files.count() == 0) && (language.length() == 5)) {
language = language.left(2);
- files = TDEApplication::kApplication()->dirs()->findAllResources ("html", language + "/*.docbook", true, true);
+ files = tdeApp->dirs()->findAllResources ("html", language + "/*.docbook", true, true);
}
return parseFiles (files, TQTextStream::UnicodeUTF8, 0, pdlg);