diff options
Diffstat (limited to 'kmouth')
-rw-r--r-- | kmouth/phrasebook/phrasebook.cpp | 8 | ||||
-rw-r--r-- | kmouth/phrasebook/phrasebook.h | 2 | ||||
-rw-r--r-- | kmouth/phraselistitem.cpp | 2 | ||||
-rw-r--r-- | kmouth/speech.cpp | 4 | ||||
-rw-r--r-- | kmouth/wordcompletion/creationsourcedetailsui.ui.h | 4 | ||||
-rw-r--r-- | kmouth/wordcompletion/creationsourceui.ui | 2 | ||||
-rw-r--r-- | kmouth/wordcompletion/klanguagebutton.cpp | 10 | ||||
-rw-r--r-- | kmouth/wordcompletion/klanguagebuttonhelper.cpp | 14 | ||||
-rw-r--r-- | kmouth/wordcompletion/wordcompletionui.ui | 2 | ||||
-rw-r--r-- | kmouth/wordcompletion/wordcompletionui.ui.h | 4 | ||||
-rw-r--r-- | kmouth/wordcompletion/wordcompletionwidget.cpp | 10 | ||||
-rw-r--r-- | kmouth/wordcompletion/wordlist.cpp | 16 |
12 files changed, 39 insertions, 39 deletions
diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp index 2332ee6..6aa2668 100644 --- a/kmouth/phrasebook/phrasebook.cpp +++ b/kmouth/phrasebook/phrasebook.cpp @@ -477,15 +477,15 @@ const char *PhraseBookDrag::format (int i) const { return xmlphrasebook.format(i/3); } -TQByteArray PhraseBookDrag::tqencodedData (const char* mime) const { +TQByteArray PhraseBookDrag::encodedData (const char* mime) const { TQCString m(mime); m = m.lower(); if (m.contains("xml-phrasebook")) - return xmlphrasebook.tqencodedData(mime); + return xmlphrasebook.encodedData(mime); else if (m.contains("xml")) - return xml.tqencodedData(mime); + return xml.encodedData(mime); else - return plain.tqencodedData(mime); + return plain.encodedData(mime); } bool PhraseBookDrag::canDecode (const TQMimeSource* e) { diff --git a/kmouth/phrasebook/phrasebook.h b/kmouth/phrasebook/phrasebook.h index 200bbae..25f1d37 100644 --- a/kmouth/phrasebook/phrasebook.h +++ b/kmouth/phrasebook/phrasebook.h @@ -157,7 +157,7 @@ public: virtual void setBook (PhraseBook *book); const char *format (int i) const; - virtual TQByteArray tqencodedData (const char *) const; + virtual TQByteArray encodedData (const char *) const; static bool canDecode (const TQMimeSource *e); static bool decode (const TQMimeSource *e, PhraseBook *book); diff --git a/kmouth/phraselistitem.cpp b/kmouth/phraselistitem.cpp index 6e902f3..0574d2b 100644 --- a/kmouth/phraselistitem.cpp +++ b/kmouth/phraselistitem.cpp @@ -47,6 +47,6 @@ void PhraseListItem::paint (TQPainter *p) { if (drawCursor()) { TQRect r (0, 0, listBox()->maxItemWidth(), height (listBox())); listBox()->tqstyle().tqdrawPrimitive (TQStyle::PE_FocusRect, p, r, - listBox()->tqcolorGroup()); + listBox()->colorGroup()); } } diff --git a/kmouth/speech.cpp b/kmouth/speech.cpp index 81ed650..8c1d151 100644 --- a/kmouth/speech.cpp +++ b/kmouth/speech.cpp @@ -225,10 +225,10 @@ void Speech::speak(TQString command, bool stdIn, const TQString &text, const TQS } void Speech::receivedStdout (KProcess *, char *buffer, int buflen) { - kdDebug() << TQString::tqfromLatin1(buffer, buflen) + "\n"; + kdDebug() << TQString::fromLatin1(buffer, buflen) + "\n"; } void Speech::receivedStderr (KProcess *, char *buffer, int buflen) { - kdDebug() << TQString::tqfromLatin1(buffer, buflen) + "\n"; + kdDebug() << TQString::fromLatin1(buffer, buflen) + "\n"; } void Speech::wroteStdin(KProcess *) { diff --git a/kmouth/wordcompletion/creationsourcedetailsui.ui.h b/kmouth/wordcompletion/creationsourcedetailsui.ui.h index f3ed793..12869aa 100644 --- a/kmouth/wordcompletion/creationsourcedetailsui.ui.h +++ b/kmouth/wordcompletion/creationsourcedetailsui.ui.h @@ -15,7 +15,7 @@ void CreationSourceDetailsUI::init() { TQWhatsThis::add (languageButton, i18n("With this combo box you decide which language should be associated with the new dictionary.")); loadLanguageList(languageButton); - languageButton->insertLanguage("??", i18n("Other"), TQString::tqfromLatin1("l10n/"), TQString()); + languageButton->insertLanguage("??", i18n("Other"), TQString::fromLatin1("l10n/"), TQString()); connect (languageButton, TQT_SIGNAL(activated(int)), this, TQT_SLOT(languageButton_activated(int))); } @@ -28,7 +28,7 @@ void CreationSourceDetailsUI::languageButton_activated (int) { languageButton->setCurrentItem(customLanguage); } else { - languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString()); + languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::fromLatin1("l10n/"), TQString()); languageButton->setCurrentItem(customLanguage); } } diff --git a/kmouth/wordcompletion/creationsourceui.ui b/kmouth/wordcompletion/creationsourceui.ui index 49af73d..0efac9c 100644 --- a/kmouth/wordcompletion/creationsourceui.ui +++ b/kmouth/wordcompletion/creationsourceui.ui @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kmouth/wordcompletion/klanguagebutton.cpp b/kmouth/wordcompletion/klanguagebutton.cpp index 51d2066..ffb6715 100644 --- a/kmouth/wordcompletion/klanguagebutton.cpp +++ b/kmouth/wordcompletion/klanguagebutton.cpp @@ -132,12 +132,12 @@ void KLanguageButton::insertSubmenu( const TQString &text, const TQString &tag, void KLanguageButton::insertLanguage( const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu, int index ) { - TQString output = name + TQString::tqfromLatin1( " (" ) + path + - TQString::tqfromLatin1( ")" ); + TQString output = name + TQString::fromLatin1( " (" ) + path + + TQString::fromLatin1( ")" ); #if 0 // Nooooo ! Country != language TQPixmap flag( locate( "locale", sub + path + - TQString::tqfromLatin1( "/flag.png" ) ) ); + TQString::fromLatin1( "/flag.png" ) ) ); #endif insertItem( output, path, submenu, index ); } @@ -182,8 +182,8 @@ void KLanguageButton::clear() { if ( i < 0 || i >= count() ) return; - TQString output = name + TQString::tqfromLatin1( " (" ) + tag( i ) + - TQString::tqfromLatin1( ")" ); + TQString output = name + TQString::fromLatin1( " (" ) + tag( i ) + + TQString::fromLatin1( ")" ); changeItem( output, i ); }*/ diff --git a/kmouth/wordcompletion/klanguagebuttonhelper.cpp b/kmouth/wordcompletion/klanguagebuttonhelper.cpp index 19bb721..91f2966 100644 --- a/kmouth/wordcompletion/klanguagebuttonhelper.cpp +++ b/kmouth/wordcompletion/klanguagebuttonhelper.cpp @@ -31,18 +31,18 @@ TQString languageName (TQString languageCode) { TQString filename = KGlobal::dirs()->findResource("locale", - languageCode + TQString::tqfromLatin1("/entry.desktop")); + languageCode + TQString::fromLatin1("/entry.desktop")); KSimpleConfig entry(filename); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - return entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + return entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); } void loadLanguageList(KLanguageButton *combo) // This function was taken from tdebase/kcontrol/kdm/kdm-appear.cpp { TQStringList langlist = KGlobal::dirs()->findAllResources("locale", - TQString::tqfromLatin1("*/entry.desktop")); + TQString::fromLatin1("*/entry.desktop")); langlist.sort(); for ( TQStringList::ConstIterator it = langlist.begin(); it != langlist.end(); ++it ) @@ -52,9 +52,9 @@ void loadLanguageList(KLanguageButton *combo) TQString nid = fpath.mid(index + 1); KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); - combo->insertLanguage(nid, name, TQString::tqfromLatin1("l10n/"), TQString()); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); + combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString()); } if (KGlobal::locale()) diff --git a/kmouth/wordcompletion/wordcompletionui.ui b/kmouth/wordcompletion/wordcompletionui.ui index 5e8227e..7083045 100644 --- a/kmouth/wordcompletion/wordcompletionui.ui +++ b/kmouth/wordcompletion/wordcompletionui.ui @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>240</height> diff --git a/kmouth/wordcompletion/wordcompletionui.ui.h b/kmouth/wordcompletion/wordcompletionui.ui.h index d74137e..6ce5e75 100644 --- a/kmouth/wordcompletion/wordcompletionui.ui.h +++ b/kmouth/wordcompletion/wordcompletionui.ui.h @@ -15,7 +15,7 @@ void WordCompletionUI::init() { TQWhatsThis::add (languageButton, i18n("With this combo box you select the language associated with the selected dictionary.")); loadLanguageList(languageButton); - languageButton->insertLanguage("??", i18n("Other"), TQString::tqfromLatin1("l10n/"), TQString()); + languageButton->insertLanguage("??", i18n("Other"), TQString::fromLatin1("l10n/"), TQString()); connect (languageButton, TQT_SIGNAL(activated(int)), this, TQT_SLOT(languageButton_activated(int))); } @@ -28,7 +28,7 @@ void WordCompletionUI::languageButton_activated (int) { languageButton->setCurrentItem(customLanguage); } else { - languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString()); + languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::fromLatin1("l10n/"), TQString()); languageButton->setCurrentItem(customLanguage); } } diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp index 2403faf..a2068f2 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.cpp +++ b/kmouth/wordcompletion/wordcompletionwidget.cpp @@ -71,11 +71,11 @@ public: void setLanguage (TQString languageCode) { TQString filename = KGlobal::dirs()->findResource("locale", - languageCode + TQString::tqfromLatin1("/entry.desktop")); + languageCode + TQString::fromLatin1("/entry.desktop")); KSimpleConfig entry(filename); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); setLanguage (name + " (" + languageCode + ")", languageCode); } @@ -136,7 +136,7 @@ void WordCompletionWidget::load() { config->readEntry("Name"), languageTag); if (!languageButton->containsTag(languageTag)) - languageButton->insertLanguage(languageTag, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString()); + languageButton->insertLanguage(languageTag, i18n("without name"), TQString::fromLatin1("l10n/"), TQString()); } // Clean up disc space @@ -200,7 +200,7 @@ void WordCompletionWidget::addDictionary() { newDictionaryFiles += filename; TQString languageTag = wizard->language(); if (!languageButton->containsTag(languageTag)) { - languageButton->insertLanguage(languageTag, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString()); + languageButton->insertLanguage(languageTag, i18n("without name"), TQString::fromLatin1("l10n/"), TQString()); } KListViewItem *item = new DictionaryListItem (dictionaryList, filename, wizard->name(), languageTag); diff --git a/kmouth/wordcompletion/wordlist.cpp b/kmouth/wordcompletion/wordlist.cpp index 11a15a1..2e88852 100644 --- a/kmouth/wordcompletion/wordlist.cpp +++ b/kmouth/wordcompletion/wordlist.cpp @@ -228,7 +228,7 @@ WordMap parseFiles (TQStringList files, TQTextStream::Encoding encoding, TQTextC if (steps != 0 && progress*100/steps > percent) { percent = progress*100/steps; pdlg->progressBar()->setProgress(percent); - tqApp->tqprocessEvents (20); + tqApp->processEvents (20); } } return map; @@ -237,7 +237,7 @@ WordMap parseFiles (TQStringList files, TQTextStream::Encoding encoding, TQTextC WordMap mergeFiles (TQMap<TQString,int> files, KProgressDialog *pdlg) { pdlg->setLabel (i18n("Merging dictionaries...")); pdlg->show(); - tqApp->tqprocessEvents (20); + tqApp->processEvents (20); int progress = 0; int steps = files.count(); @@ -269,7 +269,7 @@ WordMap mergeFiles (TQMap<TQString,int> files, KProgressDialog *pdlg) { if (steps != 0 && progress*100/steps > percent) { percent = progress*100/steps; pdlg->progressBar()->setProgress(percent); - tqApp->tqprocessEvents (20); + tqApp->processEvents (20); } } @@ -290,7 +290,7 @@ WordMap mergeFiles (TQMap<TQString,int> files, KProgressDialog *pdlg) { WordMap parseKDEDoc (TQString language, KProgressDialog *pdlg) { pdlg->setLabel (i18n("Parsing the KDE documentation...")); pdlg->show(); - tqApp->tqprocessEvents (20); + tqApp->processEvents (20); TQStringList files = KApplication::kApplication()->dirs()->findAllResources ("html", language + "/*.docbook", true, true); if ((files.count() == 0) && (language.length() == 5)) { @@ -304,7 +304,7 @@ WordMap parseKDEDoc (TQString language, KProgressDialog *pdlg) { WordMap parseFile (TQString filename, TQTextStream::Encoding encoding, TQTextCodec *codec, KProgressDialog *pdlg) { pdlg->setLabel (i18n("Parsing file...")); pdlg->show(); - tqApp->tqprocessEvents (20); + tqApp->processEvents (20); TQStringList files = filename; @@ -314,7 +314,7 @@ WordMap parseFile (TQString filename, TQTextStream::Encoding encoding, TQTextCod WordMap parseDir (TQString directory, TQTextStream::Encoding encoding, TQTextCodec *codec, KProgressDialog *pdlg) { pdlg->setLabel (i18n("Parsing directory...")); pdlg->show(); - tqApp->tqprocessEvents (20); + tqApp->processEvents (20); TQStringList directories; directories += directory; @@ -504,7 +504,7 @@ WordMap spellCheck (WordMap map, TQString dictionary, KProgressDialog *pdlg) { pdlg->setLabel (i18n("Performing spell check...")); pdlg->progressBar()->setTotalSteps(100); pdlg->progressBar()->setProgress(0); - tqApp->tqprocessEvents (20); + tqApp->processEvents (20); int progress = 0; int steps = 0; int percent = 0; @@ -535,7 +535,7 @@ WordMap spellCheck (WordMap map, TQString dictionary, KProgressDialog *pdlg) { if (steps != 0 && progress*100/steps > percent) { percent = progress*100/steps; pdlg->progressBar()->setProgress(percent); - tqApp->tqprocessEvents (20); + tqApp->processEvents (20); } } } |