summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:17:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:17:16 -0600
commitc7ce89fcae12a35ac8bfa9b908854c50ca0ceee2 (patch)
tree058c11d7f94face85bf6cedd2ec1c20ee47f1791
parent92994ee2036ac7c4c68747f67dbc0ecbaf4c250c (diff)
downloadtdeaccessibility-c7ce89fcae12a35ac8bfa9b908854c50ca0ceee2.tar.gz
tdeaccessibility-c7ce89fcae12a35ac8bfa9b908854c50ca0ceee2.zip
Rename obsolete tq methods to standard names
-rw-r--r--kbstateapplet/kbstate.cpp18
-rw-r--r--kbstateapplet/kbstate.h2
-rw-r--r--kmag/kmag.cpp2
-rw-r--r--kmousetool/kmousetool/kmousetoolui.ui8
-rw-r--r--kmouth/optionsdialog.cpp4
-rw-r--r--kmouth/phrasebook/phrasebook.cpp2
-rw-r--r--kmouth/phrasebook/phrasebookdialog.cpp4
-rw-r--r--kmouth/phraselist.cpp8
-rw-r--r--kmouth/phraselistitem.cpp2
-rw-r--r--kmouth/wordcompletion/dictionarycreationwizard.cpp10
-rw-r--r--kmouth/wordcompletion/wordcompletionui.ui4
-rw-r--r--ksayit/Freeverb_plugin/freeverb_setup.ui4
-rw-r--r--ksayit/KTTSD_Lib/KTTSDlibSetup.ui2
-rw-r--r--ksayit/src/fx_setup.ui10
-rw-r--r--ksayit/src/ksayit.cpp2
-rw-r--r--kttsd/debian/man/kttsd.12
-rw-r--r--kttsd/debian/man/kttsmgr.12
-rw-r--r--kttsd/filters/sbd/sbdconf.cpp6
-rw-r--r--kttsd/filters/sbd/sbdconfwidget.ui14
-rw-r--r--kttsd/filters/stringreplacer/editreplacementwidget.ui10
-rw-r--r--kttsd/filters/stringreplacer/stringreplacerconf.cpp6
-rw-r--r--kttsd/filters/stringreplacer/stringreplacerconfwidget.ui14
-rw-r--r--kttsd/filters/talkerchooser/talkerchooserconf.cpp6
-rw-r--r--kttsd/filters/talkerchooser/talkerchooserconfwidget.ui12
-rw-r--r--kttsd/filters/xmltransformer/xmltransformerconf.cpp6
-rw-r--r--kttsd/filters/xmltransformer/xmltransformerconfwidget.ui8
-rw-r--r--kttsd/kcmkttsmgr/kcmkttsmgr.cpp4
-rw-r--r--kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui36
-rw-r--r--kttsd/kttsd/kttsd.cpp2
-rw-r--r--kttsd/kttsjobmgr/kttsjobmgr.cpp2
-rw-r--r--kttsd/libkttsd/selecttalkerwidget.ui14
-rw-r--r--kttsd/plugins/command/commandconf.cpp6
-rw-r--r--kttsd/plugins/command/commandconfwidget.ui4
-rw-r--r--kttsd/plugins/epos/eposconf.cpp6
-rw-r--r--kttsd/plugins/epos/eposconfwidget.ui24
-rw-r--r--kttsd/plugins/festivalint/festivalintconf.cpp6
-rw-r--r--kttsd/plugins/festivalint/festivalintconfwidget.ui12
-rw-r--r--kttsd/plugins/flite/fliteconf.cpp6
-rw-r--r--kttsd/plugins/freetts/freettsconf.cpp6
-rw-r--r--kttsd/plugins/freetts/freettsconfigwidget.ui2
-rw-r--r--kttsd/plugins/hadifix/hadifixconf.cpp6
-rw-r--r--kttsd/plugins/hadifix/hadifixconfigui.ui2
42 files changed, 153 insertions, 153 deletions
diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp
index 94f660f..4afc15d 100644
--- a/kbstateapplet/kbstate.cpp
+++ b/kbstateapplet/kbstate.cpp
@@ -179,7 +179,7 @@ void KbStateApplet::updateMenu()
void calculateSizes (int space, int modifiers, int lockkeys, int accessx,
bool showMouse, int &lines, int &length, int &size)
-// Calculates the tqlayout based on a given number of modifiers, lockkeys and
+// Calculates the layout based on a given number of modifiers, lockkeys and
// accessx features.
// Output:
// lines: number of lines
@@ -281,17 +281,17 @@ void KbStateApplet::toggleFillSpace() {
fillSpace = !fillSpace;
saveConfig();
updateMenu();
- tqlayout();
+ layout();
updateGeometry();
emit updateLayout();
}
void KbStateApplet::resizeEvent( TQResizeEvent*e ) {
TQWidget::resizeEvent(e);
- tqlayout();
+ layout();
}
-void KbStateApplet::tqlayout() {
+void KbStateApplet::layout() {
int size = this->size;
int lines, length, x,y,dx,dy, ldx,ldy;
@@ -608,7 +608,7 @@ bool KbStateApplet::x11Event (XEvent *evt) {
else
mouse->setActiveKey (0);
- tqlayout();
+ layout();
updateGeometry();
emit updateLayout();
break;
@@ -660,7 +660,7 @@ void KbStateApplet::stateChangeRequest (KeyIcon *source, bool latched, bool lock
void KbStateApplet::toggleModifier() {
showModifiers = !showModifiers;
updateMenu();
- tqlayout();
+ layout();
updateGeometry();
saveConfig();
emit updateLayout();
@@ -669,7 +669,7 @@ void KbStateApplet::toggleModifier() {
void KbStateApplet::toggleLockkeys() {
showLockkeys = !showLockkeys;
updateMenu();
- tqlayout();
+ layout();
updateGeometry();
saveConfig();
emit updateLayout();
@@ -678,7 +678,7 @@ void KbStateApplet::toggleLockkeys() {
void KbStateApplet::toggleMouse() {
showMouse = !showMouse;
updateMenu();
- tqlayout();
+ layout();
updateGeometry();
saveConfig();
emit updateLayout();
@@ -687,7 +687,7 @@ void KbStateApplet::toggleMouse() {
void KbStateApplet::toggleAccessX() {
showAccessX = !showAccessX;
updateMenu();
- tqlayout();
+ layout();
updateGeometry();
saveConfig();
emit updateLayout();
diff --git a/kbstateapplet/kbstate.h b/kbstateapplet/kbstate.h
index 892aeb9..65cf63f 100644
--- a/kbstateapplet/kbstate.h
+++ b/kbstateapplet/kbstate.h
@@ -170,7 +170,7 @@ private slots:
private:
void loadConfig();
void saveConfig();
- void tqlayout();
+ void layout();
int xkb_base_event_type;
diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp
index 8a58ac4..f345f8e 100644
--- a/kmag/kmag.cpp
+++ b/kmag/kmag.cpp
@@ -864,7 +864,7 @@ void KmagApp::slotFileQuit()
void KmagApp::copyToClipBoard()
{
- TQClipboard *cb=KApplication::tqclipboard();
+ TQClipboard *cb=KApplication::clipboard();
cb->setPixmap(m_zoomView->getPixmap());
}
diff --git a/kmousetool/kmousetool/kmousetoolui.ui b/kmousetool/kmousetool/kmousetoolui.ui
index 5df32f9..2d7d9fb 100644
--- a/kmousetool/kmousetool/kmousetoolui.ui
+++ b/kmousetool/kmousetool/kmousetoolui.ui
@@ -49,7 +49,7 @@
</property>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<grid>
<property name="name">
@@ -207,7 +207,7 @@
</widget>
<widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -276,7 +276,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -341,7 +341,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp
index a32eb6e..1ff3817 100644
--- a/kmouth/optionsdialog.cpp
+++ b/kmouth/optionsdialog.cpp
@@ -125,11 +125,11 @@ OptionsDialog::OptionsDialog (TQWidget *parent)
tabCtl = new TQTabWidget (pageGeneral, "general");
behaviourWidget = new PreferencesWidget (tabCtl, "prefPage");
- behaviourWidget->tqlayout()->setMargin(KDialog::marginHint());
+ behaviourWidget->layout()->setMargin(KDialog::marginHint());
tabCtl->addTab (behaviourWidget, i18n("&Preferences"));
commandWidget = new TextToSpeechConfigurationWidget (tabCtl, "ttsTab");
- commandWidget->tqlayout()->setMargin(KDialog::marginHint());
+ commandWidget->layout()->setMargin(KDialog::marginHint());
tabCtl->addTab (commandWidget, i18n("&Text-to-Speech"));
TQPixmap iconCompletion = KGlobal::iconLoader()->loadIcon("keyboard", KIcon::NoGroup, KIcon::SizeMedium);
diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp
index 6188a8a..ffa3ff2 100644
--- a/kmouth/phrasebook/phrasebook.cpp
+++ b/kmouth/phrasebook/phrasebook.cpp
@@ -151,7 +151,7 @@ TQCString encodeString (const TQString str) {
TQCString res = "";
for (int i = 0; i < (int)str.length(); i++) {
TQChar ch = str.at(i);
- ushort uc = ch.tqunicode();
+ ushort uc = ch.unicode();
TQCString number; number.setNum(uc);
if ((uc>127) || (uc<32) || (ch=='<') || (ch=='>') || (ch=='&') || (ch==';'))
res = res + "&#" + number + ";";
diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp
index 838d5ec..1c035e6 100644
--- a/kmouth/phrasebook/phrasebookdialog.cpp
+++ b/kmouth/phrasebook/phrasebookdialog.cpp
@@ -667,12 +667,12 @@ void PhraseBookDialog::slotCut () {
void PhraseBookDialog::slotCopy () {
PhraseBook book;
treeView->fillBook (&book, true);
- TQApplication::tqclipboard()->setData(new PhraseBookDrag(&book));
+ TQApplication::clipboard()->setData(new PhraseBookDrag(&book));
}
void PhraseBookDialog::slotPaste () {
PhraseBook book;
- if (PhraseBookDrag::decode(TQApplication::tqclipboard()->data(), &book)) {
+ if (PhraseBookDrag::decode(TQApplication::clipboard()->data(), &book)) {
addBook (treeView->currentItem(), &book);
}
}
diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp
index ef4557e..7d447a2 100644
--- a/kmouth/phraselist.cpp
+++ b/kmouth/phraselist.cpp
@@ -48,16 +48,16 @@
PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,name) {
isInSlot = false;
setBackgroundMode(PaletteBase);
- TQVBoxLayout *tqlayout = new TQVBoxLayout (this);
+ TQVBoxLayout *layout = new TQVBoxLayout (this);
listBox = new KListBox (this);
listBox->setFocusPolicy(TQ_NoFocus);
listBox->setSelectionMode (TQListBox::Extended);
TQWhatsThis::add (listBox, i18n("This list contains the history of spoken sentences. You can select sentences and press the speak button for re-speaking."));
- tqlayout->addWidget(listBox);
+ layout->addWidget(listBox);
TQHBoxLayout *rowLayout = new TQHBoxLayout ();
- tqlayout->addLayout(rowLayout);
+ layout->addLayout(rowLayout);
completion = new WordCompletion();
@@ -271,7 +271,7 @@ void PhraseList::cutListSelection () {
}
void PhraseList::copyListSelection () {
- TQApplication::tqclipboard()->setText (getListSelection().join ("\n"));
+ TQApplication::clipboard()->setText (getListSelection().join ("\n"));
}
void PhraseList::lineEntered (const TQString &phrase) {
diff --git a/kmouth/phraselistitem.cpp b/kmouth/phraselistitem.cpp
index 0574d2b..10d29ae 100644
--- a/kmouth/phraselistitem.cpp
+++ b/kmouth/phraselistitem.cpp
@@ -46,7 +46,7 @@ void PhraseListItem::paint (TQPainter *p) {
if (drawCursor()) {
TQRect r (0, 0, listBox()->maxItemWidth(), height (listBox()));
- listBox()->tqstyle().tqdrawPrimitive (TQStyle::PE_FocusRect, p, r,
+ listBox()->style().tqdrawPrimitive (TQStyle::PE_FocusRect, p, r,
listBox()->colorGroup());
}
}
diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp
index 6f777a0..0b8e18c 100644
--- a/kmouth/wordcompletion/dictionarycreationwizard.cpp
+++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp
@@ -283,10 +283,10 @@ MergeWidget::MergeWidget(KWizard *parent, const char *name,
TQWidget *contents = new TQWidget(viewport());
addChild(contents);
- TQGridLayout *tqlayout = new TQGridLayout (contents);
+ TQGridLayout *layout = new TQGridLayout (contents);
setResizePolicy (TQScrollView::AutoOneFit);
- tqlayout->setColStretch (0, 0);
- tqlayout->setColStretch (1, 1);
+ layout->setColStretch (0, 0);
+ layout->setColStretch (1, 1);
int row = 0;
TQStringList::Iterator nIt = dictionaryNames.begin();
@@ -295,8 +295,8 @@ MergeWidget::MergeWidget(KWizard *parent, const char *name,
for (; nIt != dictionaryNames.end(); ++nIt, ++fIt, ++lIt) {
TQCheckBox *checkbox = new TQCheckBox(*nIt, contents);
KIntNumInput *numInput = new KIntNumInput(contents);
- tqlayout->addWidget (checkbox, row, 0);
- tqlayout->addWidget (numInput, row, 1);
+ layout->addWidget (checkbox, row, 0);
+ layout->addWidget (numInput, row, 1);
checkbox->setChecked (true);
numInput->setRange (1, 100, 10, true);
diff --git a/kmouth/wordcompletion/wordcompletionui.ui b/kmouth/wordcompletion/wordcompletionui.ui
index 7083045..03bccf7 100644
--- a/kmouth/wordcompletion/wordcompletionui.ui
+++ b/kmouth/wordcompletion/wordcompletionui.ui
@@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@@ -152,7 +152,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
diff --git a/ksayit/Freeverb_plugin/freeverb_setup.ui b/ksayit/Freeverb_plugin/freeverb_setup.ui
index 7e3c0d0..7cd1a02 100644
--- a/ksayit/Freeverb_plugin/freeverb_setup.ui
+++ b/ksayit/Freeverb_plugin/freeverb_setup.ui
@@ -38,7 +38,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -571,7 +571,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
diff --git a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
index 9df5c07..052ed1f 100644
--- a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
+++ b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
@@ -51,7 +51,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/ksayit/src/fx_setup.ui b/ksayit/src/fx_setup.ui
index fb7285e..4e9e975 100644
--- a/ksayit/src/fx_setup.ui
+++ b/ksayit/src/fx_setup.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -61,7 +61,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -139,7 +139,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -173,7 +173,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp
index 6cfb056..101bd86 100644
--- a/ksayit/src/ksayit.cpp
+++ b/ksayit/src/ksayit.cpp
@@ -92,7 +92,7 @@ KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f,
TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()) );
// init Clipboard
- cb = TQApplication::tqclipboard();
+ cb = TQApplication::clipboard();
connect(cb, TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotClipboardChanged()) );
// create SystemTray object
diff --git a/kttsd/debian/man/kttsd.1 b/kttsd/debian/man/kttsd.1
index 7482fd8..379d7f0 100644
--- a/kttsd/debian/man/kttsd.1
+++ b/kttsd/debian/man/kttsd.1
@@ -131,7 +131,7 @@ set XIM server
disable XIM
.TP
.B --reverse
-mirrors the whole tqlayout of widgets
+mirrors the whole layout of widgets
.SS
.SH SEE ALSO
diff --git a/kttsd/debian/man/kttsmgr.1 b/kttsd/debian/man/kttsmgr.1
index 127d697..547ff14 100644
--- a/kttsd/debian/man/kttsmgr.1
+++ b/kttsd/debian/man/kttsmgr.1
@@ -130,7 +130,7 @@ set XIM server
disable XIM
.TP
.B --reverse
-mirrors the whole tqlayout of widgets
+mirrors the whole layout of widgets
.SS
.SH SEE ALSO
diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp
index 7aaed49..4d595f0 100644
--- a/kttsd/filters/sbd/sbdconf.cpp
+++ b/kttsd/filters/sbd/sbdconf.cpp
@@ -62,11 +62,11 @@ SbdConf::SbdConf( TQWidget *parent, const char *name, const TQStringList& /*args
// kdDebug() << "SbdConf::SbdConf: Running" << endl;
// Create configuration widget.
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "SbdConfigWidgetLayout");
- tqlayout->setAlignment (TQt::AlignTop);
+ layout->setAlignment (TQt::AlignTop);
m_widget = new SbdConfWidget(this, "SbdConfigWidget");
- tqlayout->addWidget(m_widget);
+ layout->addWidget(m_widget);
// Determine if tdeutils Regular Expression Editor is installed.
m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
diff --git a/kttsd/filters/sbd/sbdconfwidget.ui b/kttsd/filters/sbd/sbdconfwidget.ui
index d066339..1b57c98 100644
--- a/kttsd/filters/sbd/sbdconfwidget.ui
+++ b/kttsd/filters/sbd/sbdconfwidget.ui
@@ -35,7 +35,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -74,7 +74,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@@ -118,7 +118,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout17_2</cstring>
+ <cstring>layout17_2</cstring>
</property>
<hbox>
<property name="name">
@@ -168,7 +168,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<vbox>
<property name="name">
@@ -213,7 +213,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@@ -221,7 +221,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -265,7 +265,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kttsd/filters/stringreplacer/editreplacementwidget.ui b/kttsd/filters/stringreplacer/editreplacementwidget.ui
index aa4e78d..8c61932 100644
--- a/kttsd/filters/stringreplacer/editreplacementwidget.ui
+++ b/kttsd/filters/stringreplacer/editreplacementwidget.ui
@@ -33,7 +33,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -63,7 +63,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -128,7 +128,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -136,7 +136,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<grid>
<property name="name">
@@ -190,7 +190,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
index e9af2f7..d38f33c 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp
+++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
@@ -67,11 +67,11 @@ StringReplacerConf::StringReplacerConf( TQWidget *parent, const char *name, cons
// kdDebug() << "StringReplacerConf::StringReplacerConf: Running" << endl;
// Create configuration widget.
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "StringReplacerConfigWidgetLayout");
- tqlayout->setAlignment (TQt::AlignTop);
+ layout->setAlignment (TQt::AlignTop);
m_widget = new StringReplacerConfWidget(this, "StringReplacerConfigWidget");
- tqlayout->addWidget(m_widget);
+ layout->addWidget(m_widget);
m_widget->substLView->setSortColumn(-1);
connect(m_widget->nameLineEdit, TQT_SIGNAL(textChanged(const TQString&)),
diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
index b9af6e4..d18b541 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
+++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
@@ -23,7 +23,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -73,7 +73,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<vbox>
<property name="name">
@@ -118,7 +118,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@@ -126,7 +126,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -170,7 +170,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -243,7 +243,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout24</cstring>
+ <cstring>layout24</cstring>
</property>
<grid>
<property name="name">
@@ -303,7 +303,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout23</cstring>
+ <cstring>layout23</cstring>
</property>
<vbox>
<property name="name">
diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
index e34753a..2b2c47a 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp
+++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
@@ -55,11 +55,11 @@ TalkerChooserConf::TalkerChooserConf( TQWidget *parent, const char *name, const
// kdDebug() << "TalkerChooserConf::TalkerChooserConf: Running" << endl;
// Create configuration widget.
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "TalkerChooserConfigWidgetLayout");
- tqlayout->setAlignment (TQt::AlignTop);
+ layout->setAlignment (TQt::AlignTop);
m_widget = new TalkerChooserConfWidget(this, "TalkerChooserConfigWidget");
- tqlayout->addWidget(m_widget);
+ layout->addWidget(m_widget);
// Determine if tdeutils Regular Expression Editor is installed.
m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
diff --git a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
index 9bd2904..a6a2dfa 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
+++ b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
@@ -23,7 +23,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -73,7 +73,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<vbox>
<property name="name">
@@ -118,7 +118,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@@ -126,7 +126,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -167,7 +167,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout19_2</cstring>
+ <cstring>layout19_2</cstring>
</property>
<hbox>
<property name="name">
@@ -228,7 +228,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp
index 09b29cf..d0bd0d3 100644
--- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp
+++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp
@@ -49,11 +49,11 @@ XmlTransformerConf::XmlTransformerConf( TQWidget *parent, const char *name, cons
// kdDebug() << "XmlTransformerConf::XmlTransformerConf: Running" << endl;
// Create configuration widget.
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "XmlTransformerConfWidgetLayout");
- tqlayout->setAlignment (TQt::AlignTop);
+ layout->setAlignment (TQt::AlignTop);
m_widget = new XmlTransformerConfWidget(this, "XmlTransformerConfigWidget");
- tqlayout->addWidget(m_widget);
+ layout->addWidget(m_widget);
// Set up defaults.
defaults();
diff --git a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
index 085fa79..471446b 100644
--- a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
+++ b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
@@ -22,7 +22,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -59,7 +59,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@@ -135,7 +135,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@@ -169,7 +169,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index aec09a9..d6c3461 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -119,10 +119,10 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &)
m_suppressConfigChanged = false;
// Add the KTTS Manager widget
- TQGridLayout *tqlayout = new TQGridLayout(this, 0, 0);
+ TQGridLayout *layout = new TQGridLayout(this, 0, 0);
m_kttsmgrw = new KCMKttsMgrWidget(this, "kttsmgrw");
// m_kttsmgrw = new KCMKttsMgrWidget(this);
- tqlayout->addWidget(m_kttsmgrw, 0, 0);
+ layout->addWidget(m_kttsmgrw, 0, 0);
// Give buttons icons.
// Talkers tab.
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
index 38e386e..766a1a2 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
+++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
@@ -92,7 +92,7 @@
</spacer>
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -133,7 +133,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout5_2</cstring>
+ <cstring>layout5_2</cstring>
</property>
<hbox>
<property name="name">
@@ -286,7 +286,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@@ -495,7 +495,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout21</cstring>
+ <cstring>layout21</cstring>
</property>
<hbox>
<property name="name">
@@ -535,7 +535,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout28</cstring>
+ <cstring>layout28</cstring>
</property>
<hbox>
<property name="name">
@@ -690,7 +690,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout19_2</cstring>
+ <cstring>layout19_2</cstring>
</property>
<hbox>
<property name="name">
@@ -753,7 +753,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@@ -818,7 +818,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@@ -848,7 +848,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9_2</cstring>
+ <cstring>layout9_2</cstring>
</property>
<vbox>
<property name="name">
@@ -988,7 +988,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout18</cstring>
+ <cstring>layout18</cstring>
</property>
<hbox>
<property name="name">
@@ -1018,7 +1018,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<vbox>
<property name="name">
@@ -1079,7 +1079,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<grid>
<property name="name">
@@ -1251,7 +1251,7 @@
</property>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -1291,7 +1291,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -1439,7 +1439,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -1482,7 +1482,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
- <cstring>tqlayout8_2_2</cstring>
+ <cstring>layout8_2_2</cstring>
</property>
<hbox>
<property name="name">
@@ -1582,7 +1582,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout21</cstring>
+ <cstring>layout21</cstring>
</property>
<hbox>
<property name="name">
@@ -1613,7 +1613,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8_2</cstring>
+ <cstring>layout8_2</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kttsd/kttsd/kttsd.cpp b/kttsd/kttsd/kttsd.cpp
index de4320c..ce7757e 100644
--- a/kttsd/kttsd/kttsd.cpp
+++ b/kttsd/kttsd/kttsd.cpp
@@ -790,7 +790,7 @@ uint KTTSD::moveRelTextSentence(const int n, const uint jobNum /*=0*/)
void KTTSD::speakClipboard()
{
// Get the clipboard object.
- TQClipboard *cb = kapp->tqclipboard();
+ TQClipboard *cb = kapp->clipboard();
// Copy text from the clipboard.
TQString text = cb->text();
diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp
index 2c2101f..baf177f 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.cpp
+++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp
@@ -506,7 +506,7 @@ void KttsJobMgrPart::slot_job_change_talker()
void KttsJobMgrPart::slot_speak_clipboard()
{
// Get the clipboard object.
- TQClipboard *cb = kapp->tqclipboard();
+ TQClipboard *cb = kapp->clipboard();
// Copy text from the clipboard.
diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui
index b8470ec..be55d45 100644
--- a/kttsd/libkttsd/selecttalkerwidget.ui
+++ b/kttsd/libkttsd/selecttalkerwidget.ui
@@ -77,7 +77,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -127,7 +127,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout11_2</cstring>
+ <cstring>layout11_2</cstring>
</property>
<hbox>
<property name="name">
@@ -178,7 +178,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="2">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -243,7 +243,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@@ -291,7 +291,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="2">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -339,7 +339,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@@ -426,7 +426,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp
index 9e04749..72731df 100644
--- a/kttsd/plugins/command/commandconf.cpp
+++ b/kttsd/plugins/command/commandconf.cpp
@@ -48,11 +48,11 @@ CommandConf::CommandConf( TQWidget* parent, const char* name, const TQStringList
m_commandProc = 0;
m_progressDlg = 0;
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "CommandConfigWidgetLayout");
- tqlayout->setAlignment (TQt::AlignTop);
+ layout->setAlignment (TQt::AlignTop);
m_widget = new CommandConfWidget(this, "CommandConfigWidget");
- tqlayout->addWidget(m_widget);
+ layout->addWidget(m_widget);
// Build codec list and fill combobox.
m_codecList = PlugInProc::buildCodecList();
diff --git a/kttsd/plugins/command/commandconfwidget.ui b/kttsd/plugins/command/commandconfwidget.ui
index 7b61d06..75ce080 100644
--- a/kttsd/plugins/command/commandconfwidget.ui
+++ b/kttsd/plugins/command/commandconfwidget.ui
@@ -74,7 +74,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -120,7 +120,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kttsd/plugins/epos/eposconf.cpp b/kttsd/plugins/epos/eposconf.cpp
index 7a0ca17..53bf672 100644
--- a/kttsd/plugins/epos/eposconf.cpp
+++ b/kttsd/plugins/epos/eposconf.cpp
@@ -55,11 +55,11 @@ EposConf::EposConf( TQWidget* parent, const char* name, const TQStringList& /*ar
m_eposProc = 0;
m_progressDlg = 0;
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "EposConfigWidgetLayout");
- tqlayout->setAlignment (TQt::AlignTop);
+ layout->setAlignment (TQt::AlignTop);
m_widget = new EposConfWidget(this, "EposConfigWidget");
- tqlayout->addWidget(m_widget);
+ layout->addWidget(m_widget);
// Build codec list and fill combobox.
m_codecList = PlugInProc::buildCodecList();
diff --git a/kttsd/plugins/epos/eposconfwidget.ui b/kttsd/plugins/epos/eposconfwidget.ui
index 28acdad..c66a081 100644
--- a/kttsd/plugins/epos/eposconfwidget.ui
+++ b/kttsd/plugins/epos/eposconfwidget.ui
@@ -67,7 +67,7 @@
</property>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -112,7 +112,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@@ -120,7 +120,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<vbox>
<property name="name">
@@ -174,7 +174,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<vbox>
<property name="name">
@@ -246,7 +246,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<vbox>
<property name="name">
@@ -316,7 +316,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -324,7 +324,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<vbox>
<property name="name">
@@ -384,7 +384,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<vbox>
<property name="name">
@@ -445,7 +445,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<grid>
<property name="name">
@@ -453,7 +453,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@@ -479,7 +479,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<vbox>
<property name="name">
@@ -543,7 +543,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp
index 920bfbc..4e34b1a 100644
--- a/kttsd/plugins/festivalint/festivalintconf.cpp
+++ b/kttsd/plugins/festivalint/festivalintconf.cpp
@@ -65,11 +65,11 @@ FestivalIntConf::FestivalIntConf( TQWidget* parent, const char* name, const TQSt
m_progressDlg = 0;
m_supportsSSML = FestivalIntProc::ssUnknown;
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "FestivalIntConfigWidgetLayout");
- tqlayout->setAlignment (TQt::AlignTop);
+ layout->setAlignment (TQt::AlignTop);
m_widget = new FestivalIntConfWidget(this, "FestivalIntConfigWidget");
- tqlayout->addWidget(m_widget);
+ layout->addWidget(m_widget);
m_widget->festivalPath->setMode(KFile::File | KFile::ExistingOnly);
m_widget->festivalPath->setFilter("*");
diff --git a/kttsd/plugins/festivalint/festivalintconfwidget.ui b/kttsd/plugins/festivalint/festivalintconfwidget.ui
index bb0b9bf..76a570f 100644
--- a/kttsd/plugins/festivalint/festivalintconfwidget.ui
+++ b/kttsd/plugins/festivalint/festivalintconfwidget.ui
@@ -182,7 +182,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -190,7 +190,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -266,7 +266,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@@ -369,7 +369,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
@@ -471,7 +471,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -520,7 +520,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kttsd/plugins/flite/fliteconf.cpp b/kttsd/plugins/flite/fliteconf.cpp
index c837209..2d39003 100644
--- a/kttsd/plugins/flite/fliteconf.cpp
+++ b/kttsd/plugins/flite/fliteconf.cpp
@@ -49,11 +49,11 @@ FliteConf::FliteConf( TQWidget* parent, const char* name, const TQStringList& /*
m_fliteProc = 0;
m_progressDlg = 0;
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "FliteConfigWidgetLayout");
- tqlayout->setAlignment (TQt::AlignTop);
+ layout->setAlignment (TQt::AlignTop);
m_widget = new FliteConfWidget(this, "FliteConfigWidget");
- tqlayout->addWidget(m_widget);
+ layout->addWidget(m_widget);
defaults();
diff --git a/kttsd/plugins/freetts/freettsconf.cpp b/kttsd/plugins/freetts/freettsconf.cpp
index 4652c3c..68285d5 100644
--- a/kttsd/plugins/freetts/freettsconf.cpp
+++ b/kttsd/plugins/freetts/freettsconf.cpp
@@ -47,11 +47,11 @@ FreeTTSConf::FreeTTSConf( TQWidget* parent, const char* name, const TQStringList
m_freettsProc = 0;
m_progressDlg = 0;
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "FreeTTSConfigWidgetLayout");
- tqlayout->setAlignment (TQt::AlignTop);
+ layout->setAlignment (TQt::AlignTop);
m_widget = new FreeTTSConfWidget(this, "FreeTTSConfigWidget");
- tqlayout->addWidget(m_widget);
+ layout->addWidget(m_widget);
defaults();
diff --git a/kttsd/plugins/freetts/freettsconfigwidget.ui b/kttsd/plugins/freetts/freettsconfigwidget.ui
index e71cb73..e93f3ba 100644
--- a/kttsd/plugins/freetts/freettsconfigwidget.ui
+++ b/kttsd/plugins/freetts/freettsconfigwidget.ui
@@ -148,7 +148,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp
index 642e722..c38a0b3 100644
--- a/kttsd/plugins/hadifix/hadifixconf.cpp
+++ b/kttsd/plugins/hadifix/hadifixconf.cpp
@@ -206,8 +206,8 @@ class HadifixConfPrivate {
HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList &) :
PlugInConf( parent, name ){
// kdDebug() << "HadifixConf::HadifixConf: Running" << endl;
- TQVBoxLayout *tqlayout = new TQVBoxLayout (this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout");
- tqlayout->setAlignment (TQt::AlignTop);
+ TQVBoxLayout *layout = new TQVBoxLayout (this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout");
+ layout->setAlignment (TQt::AlignTop);
d = new HadifixConfPrivate();
d->configWidget = new HadifixConfigUI (this, "configWidget");
@@ -224,7 +224,7 @@ HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList
d->initializeCharacterCodes();
d->initializeVoices();
d->setDefaults();
- tqlayout->addWidget (d->configWidget);
+ layout->addWidget (d->configWidget);
}
/** Destructor */
diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui
index 51acf94..8a686c2 100644
--- a/kttsd/plugins/hadifix/hadifixconfigui.ui
+++ b/kttsd/plugins/hadifix/hadifixconfigui.ui
@@ -470,7 +470,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">