summaryrefslogtreecommitdiffstats
path: root/kttsd
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:52:23 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:52:23 -0600
commit92994ee2036ac7c4c68747f67dbc0ecbaf4c250c (patch)
treea7b8d21bab293fe30c6f1db1daa9544469fb5f37 /kttsd
parent6687cd2515bdebbd8f0c92261f3acf8777441ca6 (diff)
downloadtdeaccessibility-92994ee2036ac7c4c68747f67dbc0ecbaf4c250c.tar.gz
tdeaccessibility-92994ee2036ac7c4c68747f67dbc0ecbaf4c250c.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'kttsd')
-rw-r--r--kttsd/debian/man/kttsd.14
-rw-r--r--kttsd/debian/man/kttsmgr.14
-rw-r--r--kttsd/filters/sbd/sbdconfwidget.ui10
-rw-r--r--kttsd/filters/sbd/sbdproc.cpp4
-rw-r--r--kttsd/filters/sbd/sbdproc.h2
-rw-r--r--kttsd/filters/stringreplacer/editreplacementwidget.ui4
-rw-r--r--kttsd/filters/stringreplacer/stringreplacerconfwidget.ui6
-rw-r--r--kttsd/filters/talkerchooser/talkerchooserconfwidget.ui6
-rw-r--r--kttsd/filters/xmltransformer/xmltransformerconfwidget.ui12
-rw-r--r--kttsd/kcmkttsmgr/addtalkerwidget.ui6
-rw-r--r--kttsd/kcmkttsmgr/kcmkttsmgr.cpp8
-rw-r--r--kttsd/kcmkttsmgr/selectevent.cpp2
-rw-r--r--kttsd/kttsd/filtermgr.cpp2
-rw-r--r--kttsd/kttsd/speaker.cpp4
-rw-r--r--kttsd/kttsd/talkermgr.cpp2
-rw-r--r--kttsd/kttsmgr/kttsmgr.cpp4
-rw-r--r--kttsd/libkttsd/selecttalkerwidget.ui2
-rw-r--r--kttsd/libkttsd/stretcher.cpp2
-rw-r--r--kttsd/libkttsd/talkercode.cpp2
-rw-r--r--kttsd/libkttsd/testplayer.cpp2
-rw-r--r--kttsd/players/alsaplayer/alsaplayer.cpp6
-rw-r--r--kttsd/players/gstplayer/gstreamerplayer.cpp6
-rw-r--r--kttsd/plugins/command/commandconf.cpp12
-rw-r--r--kttsd/plugins/epos/eposconf.cpp12
-rw-r--r--kttsd/plugins/epos/eposconfwidget.ui8
-rw-r--r--kttsd/plugins/epos/eposproc.cpp6
-rw-r--r--kttsd/plugins/festivalint/festivalintconf.cpp12
-rw-r--r--kttsd/plugins/festivalint/festivalintconfwidget.ui4
-rw-r--r--kttsd/plugins/festivalint/festivalintproc.cpp6
-rw-r--r--kttsd/plugins/flite/fliteconf.cpp12
-rw-r--r--kttsd/plugins/flite/fliteconfwidget.ui2
-rw-r--r--kttsd/plugins/freetts/freettsconf.cpp12
-rw-r--r--kttsd/plugins/freetts/freettsconfigwidget.ui2
-rw-r--r--kttsd/plugins/hadifix/hadifixconf.cpp22
-rw-r--r--kttsd/plugins/hadifix/hadifixproc.cpp6
-rw-r--r--kttsd/plugins/hadifix/voicefileui.ui.h4
36 files changed, 110 insertions, 110 deletions
diff --git a/kttsd/debian/man/kttsd.1 b/kttsd/debian/man/kttsd.1
index 4b8743b..7482fd8 100644
--- a/kttsd/debian/man/kttsd.1
+++ b/kttsd/debian/man/kttsd.1
@@ -62,8 +62,8 @@ Waits for a WM_NET compatible windowmanager
.B --style <style>
sets the application GUI style
.TP
-.B --tqgeometry <tqgeometry>
-sets the client tqgeometry of the main widget
+.B --geometry <geometry>
+sets the client geometry of the main widget
.TP
.B --nofork
Don't run in the background.
diff --git a/kttsd/debian/man/kttsmgr.1 b/kttsd/debian/man/kttsmgr.1
index c01468f..127d697 100644
--- a/kttsd/debian/man/kttsmgr.1
+++ b/kttsd/debian/man/kttsmgr.1
@@ -61,8 +61,8 @@ Waits for a WM_NET compatible windowmanager
.B --style <style>
sets the application GUI style
.TP
-.B --tqgeometry <tqgeometry>
-sets the client tqgeometry of the main widget
+.B --geometry <geometry>
+sets the client geometry of the main widget
.TP
.B --nofork
Don't run in the background.
diff --git a/kttsd/filters/sbd/sbdconfwidget.ui b/kttsd/filters/sbd/sbdconfwidget.ui
index e7158dc..d066339 100644
--- a/kttsd/filters/sbd/sbdconfwidget.ui
+++ b/kttsd/filters/sbd/sbdconfwidget.ui
@@ -48,7 +48,7 @@
<property name="text">
<string>&amp;Name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -87,7 +87,7 @@
<property name="text">
<string>&amp;Sentence boundary regular expression:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -131,7 +131,7 @@
<property name="text">
<string>&amp;Replacement sentence boundary:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -181,7 +181,7 @@
<property name="text">
<string>&amp;Language is:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -199,7 +199,7 @@
<property name="text">
<string>Application &amp;ID contains:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp
index 107e6b3..98eec0d 100644
--- a/kttsd/filters/sbd/sbdproc.cpp
+++ b/kttsd/filters/sbd/sbdproc.cpp
@@ -306,7 +306,7 @@ TQString SbdThread::endSentence()
return s;
}
-// Parses a node of the SSML tree and recursively parses its tqchildren.
+// Parses a node of the SSML tree and recursively parses its children.
// Returns the filtered text with each sentence a complete ssml tree.
TQString SbdThread::parseSsmlNode( TQDomNode& n, const TQString& re )
{
@@ -441,7 +441,7 @@ TQString SbdThread::parseSsml( const TQString& inputText, const TQString& re )
// This flag is used to close out a previous sentence.
m_sentenceStarted = false;
- // Get the root element (speak) and recursively process its tqchildren.
+ // Get the root element (speak) and recursively process its children.
TQDomElement docElem = doc.documentElement();
TQDomNode n = docElem.firstChild();
TQString ssml = parseSsmlNode( docElem, re );
diff --git a/kttsd/filters/sbd/sbdproc.h b/kttsd/filters/sbd/sbdproc.h
index 0c1e7aa..d49f72c 100644
--- a/kttsd/filters/sbd/sbdproc.h
+++ b/kttsd/filters/sbd/sbdproc.h
@@ -204,7 +204,7 @@ class SbdThread: public TQObject, public TQThread
TQString startSentence();
// Ends a sentence and appends a Tab.
TQString endSentence();
- // Parses a node of the SSML tree and recursively parses its tqchildren.
+ // Parses a node of the SSML tree and recursively parses its children.
// Returns the filtered text with each sentence a complete ssml tree.
TQString parseSsmlNode( TQDomNode& n, const TQString& re );
diff --git a/kttsd/filters/stringreplacer/editreplacementwidget.ui b/kttsd/filters/stringreplacer/editreplacementwidget.ui
index 8cf4d20..aa4e78d 100644
--- a/kttsd/filters/stringreplacer/editreplacementwidget.ui
+++ b/kttsd/filters/stringreplacer/editreplacementwidget.ui
@@ -157,7 +157,7 @@
<property name="text">
<string>&amp;Replace with:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -179,7 +179,7 @@
<property name="text">
<string>&amp;Match:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
index 433de52..b9af6e4 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
+++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
@@ -36,7 +36,7 @@
<property name="text">
<string>&amp;Name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -86,7 +86,7 @@
<property name="text">
<string>Lan&amp;guage is:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -104,7 +104,7 @@
<property name="text">
<string>Application &amp;ID contains:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
index 1969489..9bd2904 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
+++ b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
@@ -36,7 +36,7 @@
<property name="text">
<string>&amp;Name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -86,7 +86,7 @@
<property name="text">
<string>Te&amp;xt contains:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -104,7 +104,7 @@
<property name="text">
<string>Application &amp;ID contains:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
index 63a83c3..085fa79 100644
--- a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
+++ b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
@@ -72,7 +72,7 @@
<property name="text">
<string>&amp;Name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -90,7 +90,7 @@
<property name="text">
<string>&amp;XSLT file:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -107,7 +107,7 @@
<property name="text">
<string>xsltproc &amp;executable:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -182,7 +182,7 @@
<property name="text">
<string>&amp;Root element is:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -200,7 +200,7 @@
<property name="text">
<string>or DOC&amp;TYPE is:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -217,7 +217,7 @@
<property name="text">
<string>and Application &amp;ID contains:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kttsd/kcmkttsmgr/addtalkerwidget.ui b/kttsd/kcmkttsmgr/addtalkerwidget.ui
index 99c511c..ae48c61 100644
--- a/kttsd/kcmkttsmgr/addtalkerwidget.ui
+++ b/kttsd/kcmkttsmgr/addtalkerwidget.ui
@@ -94,7 +94,7 @@
<property name="text">
<string>&amp;Synthesizer:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -185,7 +185,7 @@
<property name="text">
<string>Show All</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="whatsThis" stdset="0">
@@ -199,7 +199,7 @@
<property name="text">
<string>&amp;Language:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index 0c1c511..aec09a9 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -1100,7 +1100,7 @@ PlugInConf* KCMKttsMgr::loadTalkerPlugin(const TQString& name)
// Find the plugin.
KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin",
- TQString("DesktopEntryName == '%1'").tqarg(name));
+ TQString("DesktopEntryName == '%1'").arg(name));
if (offers.count() == 1)
{
@@ -1144,7 +1144,7 @@ KttsFilterConf* KCMKttsMgr::loadFilterPlugin(const TQString& plugInName)
// Find the plugin.
KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin",
- TQString("DesktopEntryName == '%1'").tqarg(plugInName));
+ TQString("DesktopEntryName == '%1'").arg(plugInName));
if (offers.count() == 1)
{
@@ -2221,7 +2221,7 @@ TQString KCMKttsMgr::FilterDesktopEntryNameToName(const TQString& desktopEntryNa
{
if (desktopEntryName.isEmpty()) return TQString();
KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin",
- TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName));
+ TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
if (offers.count() == 1)
return offers[0]->name();
@@ -2533,7 +2533,7 @@ TQListViewItem* KCMKttsMgr::addNotifyItem(
else
{
if (event == "default")
- eventName = i18n("All other %1 events").tqarg(eventSrcName);
+ eventName = i18n("All other %1 events").arg(eventSrcName);
else
eventName = NotifyEvent::getEventName(eventSrc, event);
}
diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp
index 49a7adb..0d9fe60 100644
--- a/kttsd/kcmkttsmgr/selectevent.cpp
+++ b/kttsd/kcmkttsmgr/selectevent.cpp
@@ -110,7 +110,7 @@ void SelectEvent::slotEventSrcComboBox_activated(int index)
delete config;
eventsListView->sort();
item = eventsListView->lastChild();
- TQString eventDesc = i18n("All other %1 events").tqarg(eventSrcComboBox->currentText());
+ TQString eventDesc = i18n("All other %1 events").arg(eventSrcComboBox->currentText());
if ( !item )
item = new KListViewItem( eventsListView, eventDesc, "default" );
else
diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp
index 5e4065a..91fff38 100644
--- a/kttsd/kttsd/filtermgr.cpp
+++ b/kttsd/kttsd/filtermgr.cpp
@@ -352,7 +352,7 @@ KttsFilterProc* FilterMgr::loadFilterPlugin(const TQString& desktopEntryName)
// Find the plugin.
KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin",
- TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName));
+ TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
if (offers.count() == 1)
{
diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp
index fce3b32..4d4ee3e 100644
--- a/kttsd/kttsd/speaker.cpp
+++ b/kttsd/kttsd/speaker.cpp
@@ -1316,7 +1316,7 @@ uttIterator Speaker::deleteUtterance(uttIterator it)
TQCString jobStr;
jobStr.sprintf("%08i", it->sentence->jobNum);
TQString dest = m_speechData->keepAudioPath + "/kttsd-" +
- TQString("%1-%2").tqarg(jobStr.data()).tqarg(seqStr.data()) + ".wav";
+ TQString("%1-%2").arg(jobStr.data()).arg(seqStr.data()) + ".wav";
TQFile::remove(dest);
TQDir d;
d.rename(it->audioUrl, dest);
@@ -1541,7 +1541,7 @@ Player* Speaker::createPlayerObject()
}
}
KTrader::OfferList offers = KTrader::self()->query(
- "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").tqarg(plugInName));
+ "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").arg(plugInName));
if(offers.count() == 1)
{
diff --git a/kttsd/kttsd/talkermgr.cpp b/kttsd/kttsd/talkermgr.cpp
index 6af259e..a6e5a9c 100644
--- a/kttsd/kttsd/talkermgr.cpp
+++ b/kttsd/kttsd/talkermgr.cpp
@@ -107,7 +107,7 @@ int TalkerMgr::loadPlugIns(KConfig* config)
// Find the KTTSD SynthPlugin.
KTrader::OfferList offers = KTrader::self()->query(
- "KTTSD/SynthPlugin", TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName));
+ "KTTSD/SynthPlugin", TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
if(offers.count() > 1){
++bad;
diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp
index dfe3cbe..f633a11 100644
--- a/kttsd/kttsmgr/kttsmgr.cpp
+++ b/kttsd/kttsmgr/kttsmgr.cpp
@@ -148,7 +148,7 @@ KttsToolTip::KttsToolTip ( TQWidget* parent ) : TQToolTip(parent)
KttsMgrTray* kttsMgrTray = dynamic_cast<KttsMgrTray*>(parentWidget());
- TQRect r(kttsMgrTray->tqgeometry());
+ TQRect r(kttsMgrTray->geometry());
if ( !r.isValid() )
return;
@@ -273,7 +273,7 @@ TQString KttsMgrTray::getStatus()
int sentenceCount = getTextCount(job);
uint seq = moveRelTextSentence(0, job);
status += i18n(", current job %1 at sentence %2 of %3 sentences"
- ).tqarg(stateToStr(jobState)).tqarg(seq).tqarg(sentenceCount);
+ ).arg(stateToStr(jobState)).arg(seq).arg(sentenceCount);
}
}
return status;
diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui
index 8c30cbf..b8470ec 100644
--- a/kttsd/libkttsd/selecttalkerwidget.ui
+++ b/kttsd/libkttsd/selecttalkerwidget.ui
@@ -140,7 +140,7 @@
<property name="text">
<string>&amp;Synthesizer:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kttsd/libkttsd/stretcher.cpp b/kttsd/libkttsd/stretcher.cpp
index 6af8baf..91ae8fe 100644
--- a/kttsd/libkttsd/stretcher.cpp
+++ b/kttsd/libkttsd/stretcher.cpp
@@ -61,7 +61,7 @@ bool Stretcher::stretch(const TQString &inFilename, const TQString &outFilename,
if (m_stretchProc) return false;
m_outFilename = outFilename;
m_stretchProc = new KProcess;
- TQString stretchStr = TQString("%1").tqarg(stretchFactor, 0, 'f', 3);
+ TQString stretchStr = TQString("%1").arg(stretchFactor, 0, 'f', 3);
*m_stretchProc << "sox" << inFilename << outFilename << "stretch" << stretchStr;
connect(m_stretchProc, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotProcessExited(KProcess*)));
diff --git a/kttsd/libkttsd/talkercode.cpp b/kttsd/libkttsd/talkercode.cpp
index 53be627..c0d26ed 100644
--- a/kttsd/libkttsd/talkercode.cpp
+++ b/kttsd/libkttsd/talkercode.cpp
@@ -507,7 +507,7 @@ void TalkerCode::parseTalkerCode(const TQString &talkerCode)
{
if (desktopEntryName.isEmpty()) return TQString();
KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin",
- TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName));
+ TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
if (offers.count() == 1)
return offers[0]->name();
diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp
index f83a7e4..06d97cf 100644
--- a/kttsd/libkttsd/testplayer.cpp
+++ b/kttsd/libkttsd/testplayer.cpp
@@ -162,7 +162,7 @@ Player* TestPlayer::createPlayerObject(int playerOption)
}
}
KTrader::OfferList offers = KTrader::self()->query(
- "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").tqarg(plugInName));
+ "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").arg(plugInName));
if(offers.count() == 1)
{
diff --git a/kttsd/players/alsaplayer/alsaplayer.cpp b/kttsd/players/alsaplayer/alsaplayer.cpp
index 531dd16..23edec2 100644
--- a/kttsd/players/alsaplayer/alsaplayer.cpp
+++ b/kttsd/players/alsaplayer/alsaplayer.cpp
@@ -432,10 +432,10 @@ TQStringList AlsaPlayer::getPluginList( const TQCString& /*classname*/ )
infoName += snd_pcm_info_get_name(pcminfo);
infoName += ")";
if (0 == devCnt) {
- TQString pcmName = TQString("default:%1").tqarg(card);
+ TQString pcmName = TQString("default:%1").arg(card);
result.append(pcmName + infoName);
}
- TQString pcmName = TQString("plughw:%1,%2").tqarg(card).tqarg(device);
+ TQString pcmName = TQString("plughw:%1,%2").arg(card).arg(device);
result.append(pcmName + infoName);
}
snd_ctl_close(handle);
@@ -1496,7 +1496,7 @@ void AlsaPlayer::header(int /*rtype*/, const char* /*name*/)
else if (hwdata.channels == 2)
channels = "Stereo";
else
- channels = TQString("Channels %1").tqarg(hwdata.channels);
+ channels = TQString("Channels %1").arg(hwdata.channels);
DBG("Format: %s, Rate %d Hz, %s",
snd_pcm_format_description(hwdata.format),
hwdata.rate,
diff --git a/kttsd/players/gstplayer/gstreamerplayer.cpp b/kttsd/players/gstplayer/gstreamerplayer.cpp
index bfd62d0..efc1916 100644
--- a/kttsd/players/gstplayer/gstreamerplayer.cpp
+++ b/kttsd/players/gstplayer/gstreamerplayer.cpp
@@ -189,12 +189,12 @@ bool GStreamerPlayer::requireVersion(uint major, uint minor, uint micro)
}
gst_version(&gmajor, &gminor, &gmicro);
- // kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").tqarg(gmajor).tqarg(gminor).tqarg(gmicro) << endl;
+ // kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").arg(gmajor).arg(gminor).arg(gmicro) << endl;
if (gmajor > major) return true;
if (gminor > minor) return true;
if (gmicro >= micro) return true;
- kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").tqarg(gmajor).tqarg(gminor).tqarg(gmicro) << endl;
- kdDebug() << TQString("GStreamerPlayer::requireVersion: This application requires %1.%2.%3 or greater.").tqarg(major).tqarg(minor).tqarg(micro) << endl;
+ kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").arg(gmajor).arg(gminor).arg(gmicro) << endl;
+ kdDebug() << TQString("GStreamerPlayer::requireVersion: This application requires %1.%2.%3 or greater.").arg(major).arg(minor).arg(micro) << endl;
return false;
}
diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp
index d10b051..9e04749 100644
--- a/kttsd/plugins/command/commandconf.cpp
+++ b/kttsd/plugins/command/commandconf.cpp
@@ -127,12 +127,12 @@ TQString CommandConf::getTalkerCode()
"<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
"<prosody volume=\"%4\" rate=\"%5\" />"
"<kttsd synthesizer=\"%6\" />")
- .tqarg(m_languageCode)
- .tqarg("fixed")
- .tqarg("neutral")
- .tqarg("medium")
- .tqarg("medium")
- .tqarg("Command");
+ .arg(m_languageCode)
+ .arg("fixed")
+ .arg("neutral")
+ .arg("medium")
+ .arg("medium")
+ .arg("Command");
}
}
return TQString();
diff --git a/kttsd/plugins/epos/eposconf.cpp b/kttsd/plugins/epos/eposconf.cpp
index 889916c..7a0ca17 100644
--- a/kttsd/plugins/epos/eposconf.cpp
+++ b/kttsd/plugins/epos/eposconf.cpp
@@ -194,12 +194,12 @@ TQString EposConf::getTalkerCode()
"<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
"<prosody volume=\"%4\" rate=\"%5\" />"
"<kttsd synthesizer=\"%6\" />")
- .tqarg(m_languageCode)
- .tqarg("fixed")
- .tqarg("neutral")
- .tqarg("medium")
- .tqarg(rate)
- .tqarg("Epos TTS Synthesis System");
+ .arg(m_languageCode)
+ .arg("fixed")
+ .arg("neutral")
+ .arg("medium")
+ .arg(rate)
+ .arg("Epos TTS Synthesis System");
}
}
return TQString();
diff --git a/kttsd/plugins/epos/eposconfwidget.ui b/kttsd/plugins/epos/eposconfwidget.ui
index 8bbf8fc..28acdad 100644
--- a/kttsd/plugins/epos/eposconfwidget.ui
+++ b/kttsd/plugins/epos/eposconfwidget.ui
@@ -345,7 +345,7 @@
<property name="text">
<string>Epos server executable path:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -370,7 +370,7 @@
<property name="text">
<string>Epos client executable path:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -500,7 +500,7 @@
<property name="text">
<string>Epos server:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="buddy" stdset="0">
@@ -525,7 +525,7 @@
<property name="text">
<string>Epos client:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp
index c5b49c0..5ccf568 100644
--- a/kttsd/plugins/epos/eposproc.cpp
+++ b/kttsd/plugins/epos/eposproc.cpp
@@ -210,7 +210,7 @@ void EposProc::synth(
*m_eposProc << eposClientExePath;
// Language.
if (!eposLanguage.isEmpty())
- *m_eposProc << TQString("--language=%1").tqarg(eposLanguage);
+ *m_eposProc << TQString("--language=%1").arg(eposLanguage);
// Rate (speed).
// Map 50% to 200% onto 0 to 1000.
// slider = alpha * (log(percent)-log(50))
@@ -221,10 +221,10 @@ void EposProc::synth(
slider = slider - 500;
// Map -500 to 500 onto 45 to -45 then shift to 130 to 40 (85 midpoint).
float stretchValue = (-float(slider) * 45.0 / 500.0) + 85.0;
- TQString timeMsg = TQString("--init_t=%1").tqarg(stretchValue, 0, 'f', 3);
+ TQString timeMsg = TQString("--init_t=%1").arg(stretchValue, 0, 'f', 3);
*m_eposProc << timeMsg;
// Pitch. Map 50% to 200% onto 50 to 200. easy.
- TQString pitchMsg = TQString("--init_f=%1").tqarg(pitch);
+ TQString pitchMsg = TQString("--init_f=%1").arg(pitch);
*m_eposProc << pitchMsg;
// Output file.
if (!suggestedFilename.isEmpty())
diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp
index d40b68c..920bfbc 100644
--- a/kttsd/plugins/festivalint/festivalintconf.cpp
+++ b/kttsd/plugins/festivalint/festivalintconf.cpp
@@ -229,12 +229,12 @@ TQString FestivalIntConf::getTalkerCode()
"<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
"<prosody volume=\"%4\" rate=\"%5\" />"
"<kttsd synthesizer=\"%6\" />")
- .tqarg(voiceTemp.languageCode)
- .tqarg(voiceTemp.code)
- .tqarg(voiceTemp.gender)
- .tqarg(volume)
- .tqarg(rate)
- .tqarg("Festival Interactive");
+ .arg(voiceTemp.languageCode)
+ .arg(voiceTemp.code)
+ .arg(voiceTemp.gender)
+ .arg(volume)
+ .arg(rate)
+ .arg("Festival Interactive");
return normalTalkerCode;
}
diff --git a/kttsd/plugins/festivalint/festivalintconfwidget.ui b/kttsd/plugins/festivalint/festivalintconfwidget.ui
index c6b8b4b..bb0b9bf 100644
--- a/kttsd/plugins/festivalint/festivalintconfwidget.ui
+++ b/kttsd/plugins/festivalint/festivalintconfwidget.ui
@@ -94,7 +94,7 @@
<property name="text">
<string>&amp;Festival executable:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -143,7 +143,7 @@
<property name="text">
<string>&amp;Select voice:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kttsd/plugins/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp
index 6cf06e5..e11511b 100644
--- a/kttsd/plugins/festivalint/festivalintproc.cpp
+++ b/kttsd/plugins/festivalint/festivalintproc.cpp
@@ -268,11 +268,11 @@ void FestivalIntProc::synth(
slider = slider - 500;
// Map -500 to 500 onto 0.15 to -0.15.
float stretchValue = -float(slider) * 0.15 / 500.0;
- timeMsg = TQString("(set! hts_duration_stretch %1)").tqarg(
+ timeMsg = TQString("(set! hts_duration_stretch %1)").arg(
stretchValue, 0, 'f', 3);
}
else
- timeMsg = TQString("(Parameter.set 'Duration_Stretch %1)").tqarg(
+ timeMsg = TQString("(Parameter.set 'Duration_Stretch %1)").arg(
1.0/(float(time)/100.0), 0, 'f', 2);
sendToFestival(timeMsg);
m_runningTime = time;
@@ -292,7 +292,7 @@ void FestivalIntProc::synth(
}
TQString pitchMsg = TQString(
"(set! int_lr_params '((target_f0_mean %1) (target_f0_std 14)"
- "(model_f0_mean 170) (model_f0_std 34)))").tqarg(pitchValue, 0, 10);
+ "(model_f0_mean 170) (model_f0_std 34)))").arg(pitchValue, 0, 10);
sendToFestival(pitchMsg);
m_runningPitch = pitch;
}
diff --git a/kttsd/plugins/flite/fliteconf.cpp b/kttsd/plugins/flite/fliteconf.cpp
index 7a1068a..c837209 100644
--- a/kttsd/plugins/flite/fliteconf.cpp
+++ b/kttsd/plugins/flite/fliteconf.cpp
@@ -115,12 +115,12 @@ TQString FliteConf::getTalkerCode()
"<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
"<prosody volume=\"%4\" rate=\"%5\" />"
"<kttsd synthesizer=\"%6\" />")
- .tqarg(m_languageCode)
- .tqarg("fixed")
- .tqarg("neutral")
- .tqarg("medium")
- .tqarg("medium")
- .tqarg("Festival Lite (flite)");
+ .arg(m_languageCode)
+ .arg("fixed")
+ .arg("neutral")
+ .arg("medium")
+ .arg("medium")
+ .arg("Festival Lite (flite)");
}
}
return TQString();
diff --git a/kttsd/plugins/flite/fliteconfwidget.ui b/kttsd/plugins/flite/fliteconfwidget.ui
index e2a3ba5..8efcbb1 100644
--- a/kttsd/plugins/flite/fliteconfwidget.ui
+++ b/kttsd/plugins/flite/fliteconfwidget.ui
@@ -111,7 +111,7 @@
<property name="text">
<string>&amp;Flite executable path:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kttsd/plugins/freetts/freettsconf.cpp b/kttsd/plugins/freetts/freettsconf.cpp
index 81b63e7..4652c3c 100644
--- a/kttsd/plugins/freetts/freettsconf.cpp
+++ b/kttsd/plugins/freetts/freettsconf.cpp
@@ -119,12 +119,12 @@ TQString FreeTTSConf::getTalkerCode()
"<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
"<prosody volume=\"%4\" rate=\"%5\" />"
"<kttsd synthesizer=\"%6\" />")
- .tqarg(m_languageCode)
- .tqarg("fixed")
- .tqarg("neutral")
- .tqarg("medium")
- .tqarg("medium")
- .tqarg("FreeTTS");
+ .arg(m_languageCode)
+ .arg("fixed")
+ .arg("neutral")
+ .arg("medium")
+ .arg("medium")
+ .arg("FreeTTS");
}
}
return TQString();
diff --git a/kttsd/plugins/freetts/freettsconfigwidget.ui b/kttsd/plugins/freetts/freettsconfigwidget.ui
index e74a452..e71cb73 100644
--- a/kttsd/plugins/freetts/freettsconfigwidget.ui
+++ b/kttsd/plugins/freetts/freettsconfigwidget.ui
@@ -108,7 +108,7 @@
<property name="textFormat">
<enum>AutoText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp
index 6ff806f..642e722 100644
--- a/kttsd/plugins/hadifix/hadifixconf.cpp
+++ b/kttsd/plugins/hadifix/hadifixconf.cpp
@@ -92,15 +92,15 @@ class HadifixConfPrivate {
TQString name = TQFileInfo(*it).fileName();
gender = HadifixProc::determineGender(defaultMbrolaExec, *it);
if (gender == HadifixProc::MaleGender)
- configWidget->addVoice(*it, true, i18n("Male voice \"%1\"").tqarg(name));
+ configWidget->addVoice(*it, true, i18n("Male voice \"%1\"").arg(name));
else if (gender == HadifixProc::FemaleGender)
- configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").tqarg(name));
+ configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").arg(name));
else {
if (name == "de1")
- configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").tqarg(name));
+ configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").arg(name));
else {
- configWidget->addVoice(*it, true, i18n("Unknown voice \"%1\"").tqarg(name));
- configWidget->addVoice(*it, false, i18n("Unknown voice \"%1\"").tqarg(name));
+ configWidget->addVoice(*it, true, i18n("Unknown voice \"%1\"").arg(name));
+ configWidget->addVoice(*it, false, i18n("Unknown voice \"%1\"").arg(name));
}
}
}
@@ -284,12 +284,12 @@ TQString HadifixConf::getTalkerCode()
"<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />"
"<prosody volume=\"%4\" rate=\"%5\" />"
"<kttsd synthesizer=\"%6\" />")
- .tqarg(d->languageCode)
- .tqarg(voiceCode)
- .tqarg(gender)
- .tqarg(volume)
- .tqarg(rate)
- .tqarg("Hadifix");
+ .arg(d->languageCode)
+ .arg(voiceCode)
+ .arg(gender)
+ .arg(volume)
+ .arg(rate)
+ .arg("Hadifix");
}
}
return TQString();
diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp
index 9f6a5d6..d7a7514 100644
--- a/kttsd/plugins/hadifix/hadifixproc.cpp
+++ b/kttsd/plugins/hadifix/hadifixproc.cpp
@@ -184,9 +184,9 @@ void HadifixProc::synth(TQString text,
TQString mbrolaCommand = d->hadifixProc->quote(mbrola);
mbrolaCommand += " -e"; //Ignore fatal errors on unkown diphone
- mbrolaCommand += TQString(" -v %1").tqarg(volume/100.0); // volume ratio
- mbrolaCommand += TQString(" -f %1").tqarg(pitch/100.0); // freqency ratio
- mbrolaCommand += TQString(" -t %1").tqarg(1/(time/100.0)); // time ratio
+ mbrolaCommand += TQString(" -v %1").arg(volume/100.0); // volume ratio
+ mbrolaCommand += TQString(" -f %1").arg(pitch/100.0); // freqency ratio
+ mbrolaCommand += TQString(" -t %1").arg(1/(time/100.0)); // time ratio
mbrolaCommand += " " + d->hadifixProc->quote(voice);
mbrolaCommand += " - " + d->hadifixProc->quote(waveFilename);
diff --git a/kttsd/plugins/hadifix/voicefileui.ui.h b/kttsd/plugins/hadifix/voicefileui.ui.h
index dfd177d..1d0033e 100644
--- a/kttsd/plugins/hadifix/voicefileui.ui.h
+++ b/kttsd/plugins/hadifix/voicefileui.ui.h
@@ -24,12 +24,12 @@ void VoiceFileWidget::genderButton_clicked()
}
else if (gender == HadifixProc::NoGender) {
KMessageBox::sorry (this,
- i18n("The gender of the voice file %1 could not be detected.").tqarg(voiceFileURL->url()),
+ i18n("The gender of the voice file %1 could not be detected.").arg(voiceFileURL->url()),
i18n("Trying to Determine the Gender - Hadifix Plug In"));
}
else {
KMessageBox::detailedSorry (this,
- i18n("The file %1 does not seem to be a voice file.").tqarg(voiceFileURL->url()),
+ i18n("The file %1 does not seem to be a voice file.").arg(voiceFileURL->url()),
details, i18n("Trying to Determine the Gender - Hadifix Plug In"));
}
}