summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kmag/kmagselrect.cpp4
-rw-r--r--kmousetool/kmousetool/kmousetoolui.ui2
-rw-r--r--kmouth/books/sv-personal.phrasebook2
-rw-r--r--kmouth/phrasebook/buttonboxui.ui2
-rw-r--r--kmouth/phraselist.cpp6
-rw-r--r--kmouth/preferencesui.ui2
-rw-r--r--kmouth/texttospeechconfigurationui.ui2
-rw-r--r--kmouth/wordcompletion/creationsourcedetailsui.ui2
-rw-r--r--kmouth/wordcompletion/creationsourceui.ui2
-rw-r--r--kmouth/wordcompletion/kdedocsourceui.ui2
-rw-r--r--kmouth/wordcompletion/wordcompletionui.ui2
-rw-r--r--ksayit/Freeverb_plugin/freeverb_setup.ui2
-rw-r--r--ksayit/KTTSD_Lib/KTTSDlibSetup.ui2
-rw-r--r--ksayit/src/DocTreeView.ui2
-rw-r--r--ksayit/src/KSayItView.ui2
-rw-r--r--ksayit/src/doctreeviewimpl.cpp32
-rw-r--r--ksayit/src/fx_setup.ui2
-rw-r--r--kttsd/compat/interfaces/kspeech/kspeech.h2
-rw-r--r--kttsd/filters/sbd/sbdconfwidget.ui2
-rw-r--r--kttsd/filters/stringreplacer/editreplacementwidget.ui2
-rw-r--r--kttsd/filters/stringreplacer/stringreplacerconfwidget.ui2
-rw-r--r--kttsd/filters/talkerchooser/talkerchooserconfwidget.ui2
-rw-r--r--kttsd/filters/xmltransformer/xmltransformerconfwidget.ui2
-rw-r--r--kttsd/kcmkttsmgr/addtalkerwidget.ui2
-rw-r--r--kttsd/kcmkttsmgr/kcmkttsmgr.cpp20
-rw-r--r--kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui2
-rw-r--r--kttsd/kcmkttsmgr/selecteventwidget.ui2
-rw-r--r--kttsd/kttsmgr/kttsmgr.cpp6
-rw-r--r--kttsd/libkttsd/selecttalkerwidget.ui2
-rw-r--r--kttsd/plugins/command/commandconfwidget.ui2
-rw-r--r--kttsd/plugins/epos/eposconfwidget.ui2
-rw-r--r--kttsd/plugins/festivalint/festivalintconfwidget.ui2
-rw-r--r--kttsd/plugins/flite/fliteconfwidget.ui2
-rw-r--r--kttsd/plugins/freetts/freettsconfigwidget.ui2
-rw-r--r--kttsd/plugins/hadifix/hadifixconfigui.ui2
-rw-r--r--kttsd/plugins/hadifix/voicefileui.ui2
36 files changed, 65 insertions, 65 deletions
diff --git a/kmag/kmagselrect.cpp b/kmag/kmagselrect.cpp
index 4a56d07..7a749cb 100644
--- a/kmag/kmagselrect.cpp
+++ b/kmag/kmagselrect.cpp
@@ -118,8 +118,8 @@ void KMagSelRect::init(TQWidget *tqparent)
{
// Make sure tqparent is the window itself, not a widget within the window
if (tqparent != 0)
- while (tqparent->tqparentWidget (true) != 0)
- tqparent=tqparent->tqparentWidget (true);
+ while (tqparent->parentWidget (true) != 0)
+ tqparent=tqparent->parentWidget (true);
selectionwindow = 0;
selWindowParent = tqparent;
diff --git a/kmousetool/kmousetool/kmousetoolui.ui b/kmousetool/kmousetool/kmousetoolui.ui
index 5e6b1a9..d5e22fa 100644
--- a/kmousetool/kmousetool/kmousetoolui.ui
+++ b/kmousetool/kmousetool/kmousetoolui.ui
@@ -406,7 +406,7 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/kmouth/books/sv-personal.phrasebook b/kmouth/books/sv-personal.phrasebook
index cb4efe7..37f7636 100644
--- a/kmouth/books/sv-personal.phrasebook
+++ b/kmouth/books/sv-personal.phrasebook
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE phrasebook>
<phrasebook name="Personligt">
-<phrase shortcut="">Jag kan bara prata med hjälp av den här dumma tqmaskinen.</phrase>
+<phrase shortcut="">Jag kan bara prata med hjälp av den här dumma maskinen.</phrase>
<phrase shortcut="">Tyvärr är jag ganska trött nu och behöver ta en paus.</phrase>
<phrase shortcut="">Tack för att du kom.</phrase>
<phrase shortcut="">Trevligt att se dig.</phrase>
diff --git a/kmouth/phrasebook/buttonboxui.ui b/kmouth/phrasebook/buttonboxui.ui
index d2b5d00..59f1d40 100644
--- a/kmouth/phrasebook/buttonboxui.ui
+++ b/kmouth/phrasebook/buttonboxui.ui
@@ -103,5 +103,5 @@
</widget>
</grid>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp
index 6264f14..11d8b31 100644
--- a/kmouth/phraselist.cpp
+++ b/kmouth/phraselist.cpp
@@ -139,7 +139,7 @@ void PhraseList::enableMenuEntries() {
else
deselected = true;
}
- KMouthApp *theApp=(KMouthApp *) tqparentWidget();
+ KMouthApp *theApp=(KMouthApp *) parentWidget();
theApp->enableMenuEntries (selected, deselected);
}
@@ -285,7 +285,7 @@ void PhraseList::lineEntered (const TQString &phrase) {
void PhraseList::speakPhrase (const TQString &phrase) {
TQApplication::setOverrideCursor (KCursor::WaitCursor, false);
- KMouthApp *theApp=(KMouthApp *) tqparentWidget();
+ KMouthApp *theApp=(KMouthApp *) parentWidget();
TQString language = completion->languageOfWordList (completion->currentWordList());
theApp->getTTSSystem()->speak(phrase, language);
TQApplication::restoreOverrideCursor ();
@@ -313,7 +313,7 @@ void PhraseList::contextMenuRequested (TQListBoxItem *, const TQPoint &pos) {
else
name = "phraselist_popup";
- KMouthApp *theApp=(KMouthApp *) tqparentWidget();
+ KMouthApp *theApp=(KMouthApp *) parentWidget();
KXMLGUIFactory *factory = theApp->factory();
TQPopupMenu *popup = (TQPopupMenu *)factory->container(name,theApp);
if (popup != 0) {
diff --git a/kmouth/preferencesui.ui b/kmouth/preferencesui.ui
index dcc219d..6d998cd 100644
--- a/kmouth/preferencesui.ui
+++ b/kmouth/preferencesui.ui
@@ -158,5 +158,5 @@
</widget>
</vbox>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kmouth/texttospeechconfigurationui.ui b/kmouth/texttospeechconfigurationui.ui
index 877b831..22c30e9 100644
--- a/kmouth/texttospeechconfigurationui.ui
+++ b/kmouth/texttospeechconfigurationui.ui
@@ -160,7 +160,7 @@
<Q_SIGNALS>
<signal>configurationChanged()</signal>
</Q_SIGNALS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kmouth/wordcompletion/creationsourcedetailsui.ui b/kmouth/wordcompletion/creationsourcedetailsui.ui
index 689ee25..52aa8a7 100644
--- a/kmouth/wordcompletion/creationsourcedetailsui.ui
+++ b/kmouth/wordcompletion/creationsourcedetailsui.ui
@@ -172,7 +172,7 @@
<functions>
<function access="private" specifier="non virtual">init()</function>
</functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kinputdialog.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kmouth/wordcompletion/creationsourceui.ui b/kmouth/wordcompletion/creationsourceui.ui
index 603d15a..d029431 100644
--- a/kmouth/wordcompletion/creationsourceui.ui
+++ b/kmouth/wordcompletion/creationsourceui.ui
@@ -175,5 +175,5 @@
<function access="private" specifier="non virtual">init()</function>
<function access="private" specifier="non virtual">destroy()</function>
</functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kmouth/wordcompletion/kdedocsourceui.ui b/kmouth/wordcompletion/kdedocsourceui.ui
index 8fc7b82..3ae3ca5 100644
--- a/kmouth/wordcompletion/kdedocsourceui.ui
+++ b/kmouth/wordcompletion/kdedocsourceui.ui
@@ -92,7 +92,7 @@
<functions>
<function access="private" specifier="non virtual">init()</function>
</functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kmouth/wordcompletion/wordcompletionui.ui b/kmouth/wordcompletion/wordcompletionui.ui
index 401a71b..5e8227e 100644
--- a/kmouth/wordcompletion/wordcompletionui.ui
+++ b/kmouth/wordcompletion/wordcompletionui.ui
@@ -279,7 +279,7 @@
<functions>
<function access="private" specifier="non virtual">init()</function>
</functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/ksayit/Freeverb_plugin/freeverb_setup.ui b/ksayit/Freeverb_plugin/freeverb_setup.ui
index c1dffb0..6172a8e 100644
--- a/ksayit/Freeverb_plugin/freeverb_setup.ui
+++ b/ksayit/Freeverb_plugin/freeverb_setup.ui
@@ -661,7 +661,7 @@
<slot>sliderWidthChanged(int)</slot>
<slot>slotOKwasClicked()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
</includehints>
diff --git a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
index 29be316..94f421a 100644
--- a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
+++ b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
@@ -117,5 +117,5 @@
<Q_SLOTS>
<slot access="protected">slotLaunchControlcenter()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/ksayit/src/DocTreeView.ui b/ksayit/src/DocTreeView.ui
index ed6f9b1..5e4da27 100644
--- a/ksayit/src/DocTreeView.ui
+++ b/ksayit/src/DocTreeView.ui
@@ -151,7 +151,7 @@
<slot access="protected">slotNewSection_5()</slot>
<slot>slotRightButtonPressed( TQListViewItem * i, const TQPoint &amp;, int )</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>
diff --git a/ksayit/src/KSayItView.ui b/ksayit/src/KSayItView.ui
index adb821b..a95a90e 100644
--- a/ksayit/src/KSayItView.ui
+++ b/ksayit/src/KSayItView.ui
@@ -62,7 +62,7 @@
<slot>slotCopyAvailable(bool)</slot>
<slot>slotTextChanged()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktextedit.h</includehint>
</includehints>
diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp
index 5776917..db6ed32 100644
--- a/ksayit/src/doctreeviewimpl.cpp
+++ b/ksayit/src/doctreeviewimpl.cpp
@@ -553,21 +553,21 @@ void DocTreeViewImpl::recursiveBuildItemIdentifier(ListViewInterface* item, TQTe
if ( !item )
return;
- // 1. Do we have a tqparent (=tqparentItem)?
+ // 1. Do we have a tqparent (=parentItem)?
// If no -> return, if yes -> recursive call
- ListViewInterface *tqparentItem = NULL;
- tqparentItem = static_cast<ListViewInterface*>( item->tqparent() );
- if ( tqparentItem ){
- recursiveBuildItemIdentifier( tqparentItem, idstring );
+ ListViewInterface *parentItem = NULL;
+ parentItem = static_cast<ListViewInterface*>( item->tqparent() );
+ if ( parentItem ){
+ recursiveBuildItemIdentifier( parentItem, idstring );
} else {
// break recursion
return;
}
- // 2. Which child of the tqparentItem are we? Append no. to idstring.
+ // 2. Which child of the parentItem are we? Append no. to idstring.
int childno = 0;
TQString itemID = item->text(3);
- ListViewInterface *i = static_cast<ListViewInterface*>( tqparentItem->firstChild() );
+ ListViewInterface *i = static_cast<ListViewInterface*>( parentItem->firstChild() );
while( i ){
childno++;
if ( i->text(3) == itemID )
@@ -756,9 +756,9 @@ void DocTreeViewImpl::slotDeleteItem()
kdDebug(100200) << "DocTreeViewImpl::slotDeleteItem()" << endl;
ListViewInterface *itemToDelete = m_currentItem;
- ListViewInterface *tqparentItem = NULL;
- tqparentItem = static_cast<ListViewInterface*>(itemToDelete->tqparent());
- if ( !tqparentItem )
+ ListViewInterface *parentItem = NULL;
+ parentItem = static_cast<ListViewInterface*>(itemToDelete->tqparent());
+ if ( !parentItem )
return; // delete only items with tqparent
// try to delete bookmark
@@ -785,9 +785,9 @@ void DocTreeViewImpl::slotDeleteItem()
// show
m_rootItem->sort();
- listView->setSelected( tqparentItem, true );
- listView->ensureItemVisible( tqparentItem );
- slotItemClicked( tqparentItem );
+ listView->setSelected( parentItem, true );
+ listView->ensureItemVisible( parentItem );
+ slotItemClicked( parentItem );
}
@@ -966,14 +966,14 @@ void DocTreeViewImpl::slotNewTitle()
void DocTreeViewImpl::slotNewParagraph()
{
/* // Create Null element
- TQDomElement tqparentElement = TQDomElement();
+ TQDomElement parentElement = TQDomElement();
NodeList_type list;
list.clear();
m_currentItem->getNodes( list );
- tqparentElement = (list.front()).toElement();
+ parentElement = (list.front()).toElement();
- if ( tqparentElement.isNull() )
+ if ( parentElement.isNull() )
return;
*/
// New TreeView item
diff --git a/ksayit/src/fx_setup.ui b/ksayit/src/fx_setup.ui
index 056ceb0..77f2cd9 100644
--- a/ksayit/src/fx_setup.ui
+++ b/ksayit/src/fx_setup.ui
@@ -248,5 +248,5 @@
<slot>slotRemoveAll()</slot>
<slot>slotConfigureEffect(TQListBoxItem*)</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kttsd/compat/interfaces/kspeech/kspeech.h b/kttsd/compat/interfaces/kspeech/kspeech.h
index 39ca74c..df7d251 100644
--- a/kttsd/compat/interfaces/kspeech/kspeech.h
+++ b/kttsd/compat/interfaces/kspeech/kspeech.h
@@ -755,7 +755,7 @@ class KSpeech : virtual public DCOPObject {
@endverbatim
*
* which replaces all sentence delimiters with a tab, but
- * preserving the first capture text (first tqparenthesis). In other
+ * preserving the first capture text (first parenthesis). In other
* words, the sentence punctuation is preserved.
* The tab is later used to separate the text into sentences.
*
diff --git a/kttsd/filters/sbd/sbdconfwidget.ui b/kttsd/filters/sbd/sbdconfwidget.ui
index c094a52..5c2662b 100644
--- a/kttsd/filters/sbd/sbdconfwidget.ui
+++ b/kttsd/filters/sbd/sbdconfwidget.ui
@@ -347,7 +347,7 @@
<tabstop>languageBrowseButton</tabstop>
<tabstop>appIdLineEdit</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kttsd/filters/stringreplacer/editreplacementwidget.ui b/kttsd/filters/stringreplacer/editreplacementwidget.ui
index 6046580..d672bbd 100644
--- a/kttsd/filters/stringreplacer/editreplacementwidget.ui
+++ b/kttsd/filters/stringreplacer/editreplacementwidget.ui
@@ -254,7 +254,7 @@
<tabstop>matchButton</tabstop>
<tabstop>substLineEdit</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
index c1882a0..8d8f193 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
+++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
@@ -457,7 +457,7 @@
<tabstop>languageBrowseButton</tabstop>
<tabstop>appIdLineEdit</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
index 3ee9947..5401b72 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
+++ b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
@@ -304,7 +304,7 @@
<tabstop>reEditorButton</tabstop>
<tabstop>appIdLineEdit</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
index cd00de3..c011b80 100644
--- a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
+++ b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
@@ -233,7 +233,7 @@
</widget>
</grid>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kurlrequester.h</includehint>
diff --git a/kttsd/kcmkttsmgr/addtalkerwidget.ui b/kttsd/kcmkttsmgr/addtalkerwidget.ui
index a3cc11d..4769c21 100644
--- a/kttsd/kcmkttsmgr/addtalkerwidget.ui
+++ b/kttsd/kcmkttsmgr/addtalkerwidget.ui
@@ -252,7 +252,7 @@
<tabstop>synthesizerSelection</tabstop>
<tabstop>languageRadioButton</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kcombobox.h</includehint>
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index 50c6f58..f4d2bbe 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -2543,23 +2543,23 @@ TQListViewItem* KCMKttsMgr::addNotifyItem(
TQString talkerName = talkerCode.getTranslatedDescription();
if (!eventSrcName.isEmpty() && !eventName.isEmpty() && !actionName.isEmpty() && !talkerName.isEmpty())
{
- TQListViewItem* tqparentItem = lv->tqfindItem(eventSrcName, nlvcEventSrcName);
- if (!tqparentItem)
+ TQListViewItem* parentItem = lv->tqfindItem(eventSrcName, nlvcEventSrcName);
+ if (!parentItem)
{
item = lv->lastItem();
if (!item)
- tqparentItem = new KListViewItem(lv, eventSrcName, TQString(), TQString(),
+ parentItem = new KListViewItem(lv, eventSrcName, TQString(), TQString(),
eventSrc);
else
- tqparentItem = new KListViewItem(lv, item, eventSrcName, TQString(), TQString(),
+ parentItem = new KListViewItem(lv, item, eventSrcName, TQString(), TQString(),
eventSrc);
if ( !iconName.isEmpty() )
- tqparentItem->setPixmap( nlvcEventSrcName, SmallIcon( iconName ) );
+ parentItem->setPixmap( nlvcEventSrcName, SmallIcon( iconName ) );
}
// No duplicates.
item = lv->tqfindItem( event, nlvcEvent );
- if ( !item || item->tqparent() != tqparentItem )
- item = new KListViewItem(tqparentItem, eventName, actionDisplayName, talkerName,
+ if ( !item || item->tqparent() != parentItem )
+ item = new KListViewItem(parentItem, eventName, actionDisplayName, talkerName,
eventSrc, event, actionName, talkerCode.getTalkerCode());
if ( action == NotifyAction::DoNotSpeak )
item->setPixmap( nlvcActionName, SmallIcon( "nospeak" ) );
@@ -2644,11 +2644,11 @@ void KCMKttsMgr::slotNotifyRemoveButton_clicked()
{
TQListViewItem* item = m_kttsmgrw->notifyListView->selectedItem();
if (!item) return;
- TQListViewItem* tqparentItem = item->tqparent();
+ TQListViewItem* parentItem = item->tqparent();
delete item;
- if (tqparentItem)
+ if (parentItem)
{
- if (tqparentItem->childCount() == 0) delete tqparentItem;
+ if (parentItem->childCount() == 0) delete parentItem;
}
slotNotifyListView_selectionChanged();
configChanged();
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
index ab66ca2..b5c7a6b 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
+++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
@@ -1894,7 +1894,7 @@
<Q_SLOTS>
<slot access="private">slotConfigChanged()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="6"/>
+<layoutdefaults spacing="6" margin="6"/>
<includehints>
<includehint>kcmodule.h</includehint>
<includehint>klistview.h</includehint>
diff --git a/kttsd/kcmkttsmgr/selecteventwidget.ui b/kttsd/kcmkttsmgr/selecteventwidget.ui
index ece6a71..6f5e910 100644
--- a/kttsd/kcmkttsmgr/selecteventwidget.ui
+++ b/kttsd/kcmkttsmgr/selecteventwidget.ui
@@ -55,7 +55,7 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>
diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp
index 9cfe77a..f4f2935 100644
--- a/kttsd/kttsmgr/kttsmgr.cpp
+++ b/kttsd/kttsmgr/kttsmgr.cpp
@@ -143,10 +143,10 @@ KttsToolTip::KttsToolTip ( TQWidget* tqparent ) : TQToolTip(tqparent)
{
Q_UNUSED(p);
- if (!tqparentWidget()->inherits("KttsMgrTray"))
+ if (!parentWidget()->inherits("KttsMgrTray"))
return;
- KttsMgrTray* kttsMgrTray = dynamic_cast<KttsMgrTray*>(tqparentWidget());
+ KttsMgrTray* kttsMgrTray = dynamic_cast<KttsMgrTray*>(parentWidget());
TQRect r(kttsMgrTray->tqgeometry());
if ( !r.isValid() )
@@ -224,7 +224,7 @@ void KttsMgrTray::textFinished(const TQCString& /*appId*/, uint /*jobNum*/)
void KttsMgrTray::exitWhenFinishedSpeaking()
{
// kdDebug() << "KttsMgrTray::exitWhenFinishedSpeaking: running" << endl;
- if ( tqparentWidget()->isShown() ) return;
+ if ( parentWidget()->isShown() ) return;
TQString jobNums = getTextJobNumbers();
TQStringList jobNumsList = TQStringList::split(jobNums, ",");
uint jobNumsListCount = jobNumsList.count();
diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui
index 7e9ad64..6a0541b 100644
--- a/kttsd/libkttsd/selecttalkerwidget.ui
+++ b/kttsd/libkttsd/selecttalkerwidget.ui
@@ -559,7 +559,7 @@
<tabstop>useSpecificTalkerRadioButton</tabstop>
<tabstop>talkersListView</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kcombobox.h</includehint>
diff --git a/kttsd/plugins/command/commandconfwidget.ui b/kttsd/plugins/command/commandconfwidget.ui
index 7a45b20..8db709c 100644
--- a/kttsd/plugins/command/commandconfwidget.ui
+++ b/kttsd/plugins/command/commandconfwidget.ui
@@ -217,7 +217,7 @@
<Q_SIGNALS>
<signal>configurationChanged()</signal>
</Q_SIGNALS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kttsd/plugins/epos/eposconfwidget.ui b/kttsd/plugins/epos/eposconfwidget.ui
index 3cc032e..1c5c0d8 100644
--- a/kttsd/plugins/epos/eposconfwidget.ui
+++ b/kttsd/plugins/epos/eposconfwidget.ui
@@ -595,7 +595,7 @@
<include location="global" impldecl="in declaration">kurlrequester.h</include>
<include location="global" impldecl="in implementation">kurlrequester.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/kttsd/plugins/festivalint/festivalintconfwidget.ui b/kttsd/plugins/festivalint/festivalintconfwidget.ui
index 36f65bd..470ec7d 100644
--- a/kttsd/plugins/festivalint/festivalintconfwidget.ui
+++ b/kttsd/plugins/festivalint/festivalintconfwidget.ui
@@ -583,7 +583,7 @@
<include location="global" impldecl="in declaration">kurlrequester.h</include>
<include location="global" impldecl="in implementation">kurlrequester.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kttsd/plugins/flite/fliteconfwidget.ui b/kttsd/plugins/flite/fliteconfwidget.ui
index 1e8e0be..21d2471 100644
--- a/kttsd/plugins/flite/fliteconfwidget.ui
+++ b/kttsd/plugins/flite/fliteconfwidget.ui
@@ -177,7 +177,7 @@
<include location="global" impldecl="in declaration">kurlrequester.h</include>
<include location="global" impldecl="in implementation">kurlrequester.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kttsd/plugins/freetts/freettsconfigwidget.ui b/kttsd/plugins/freetts/freettsconfigwidget.ui
index 7952692..0fd8f62 100644
--- a/kttsd/plugins/freetts/freettsconfigwidget.ui
+++ b/kttsd/plugins/freetts/freettsconfigwidget.ui
@@ -191,7 +191,7 @@
<include location="global" impldecl="in declaration">kurlrequester.h</include>
<include location="global" impldecl="in implementation">kurlrequester.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui
index 8a61bff..5bae3bb 100644
--- a/kttsd/plugins/hadifix/hadifixconfigui.ui
+++ b/kttsd/plugins/hadifix/hadifixconfigui.ui
@@ -673,7 +673,7 @@
<function specifier="non virtual" returnType="TQString">getVoiceFilename()</function>
<function specifier="non virtual" returnType="bool">isMaleVoice()</function>
</functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kttsd/plugins/hadifix/voicefileui.ui b/kttsd/plugins/hadifix/voicefileui.ui
index 3c9a5fa..32b4fc5 100644
--- a/kttsd/plugins/hadifix/voicefileui.ui
+++ b/kttsd/plugins/hadifix/voicefileui.ui
@@ -109,7 +109,7 @@
<Q_SLOTS>
<slot>genderButton_clicked()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>