summaryrefslogtreecommitdiffstats
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
parent6687cd2515bdebbd8f0c92261f3acf8777441ca6 (diff)
downloadtdeaccessibility-92994ee2036ac7c4c68747f67dbc0ecbaf4c250c.tar.gz
tdeaccessibility-92994ee2036ac7c4c68747f67dbc0ecbaf4c250c.zip
Remove additional unneeded tq method conversions
-rw-r--r--kmag/kmag.cpp4
-rw-r--r--kmag/kmag.h2
-rw-r--r--kmag/kmagselrect.cpp16
-rw-r--r--kmag/kmagzoomview.cpp46
-rw-r--r--kmousetool/kmousetool/kmousetoolui.ui2
-rw-r--r--kmouth/kmouth.h2
-rw-r--r--kmouth/phrasebook/phrasebook.cpp12
-rw-r--r--kmouth/phrasebook/phrasebookdialog.cpp8
-rw-r--r--kmouth/phrasebook/phrasetree.cpp6
-rw-r--r--kmouth/phraselist.cpp4
-rw-r--r--kmouth/wordcompletion/dictionarycreationwizard.cpp2
-rw-r--r--kmouth/wordcompletion/wordcompletionwidget.cpp6
-rw-r--r--ksayit/Freeverb_plugin/freeverb_setup.ui10
-rw-r--r--ksayit/src/docbookparser.cpp32
-rw-r--r--ksayit/src/doctreeviewimpl.cpp38
-rw-r--r--ksayit/src/ksayit.cpp4
-rw-r--r--ksayit/src/ksayit.h2
-rw-r--r--ksayit/src/saxhandler.cpp4
-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
54 files changed, 210 insertions, 210 deletions
diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp
index 2ee430c..8a58ac4 100644
--- a/kmag/kmag.cpp
+++ b/kmag/kmag.cpp
@@ -571,7 +571,7 @@ void KmagApp::saveZoomPixmap()
KMessageBox::error(0, i18n("Unable to upload file over the network."),
i18n("Error Writing File"));
} else {
- KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").tqarg(url.prettyURL()),
+ KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").arg(url.prettyURL()),
i18n("Information"), "save_confirm");
}
}
@@ -583,7 +583,7 @@ void KmagApp::saveZoomPixmap()
KMessageBox::error(0, i18n("Unable to save file. Please check if you have permission to write to the directory."),
i18n("Error Writing File"));
} else {
- KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").tqarg(url.prettyURL()),
+ KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").arg(url.prettyURL()),
i18n("Information"), "save_confirm");
}
}
diff --git a/kmag/kmag.h b/kmag/kmag.h
index aeee22b..445d51e 100644
--- a/kmag/kmag.h
+++ b/kmag/kmag.h
@@ -71,7 +71,7 @@ class KmagApp : public KMainWindow
protected:
- /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
+ /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
* file
*/
void saveOptions();
diff --git a/kmag/kmagselrect.cpp b/kmag/kmagselrect.cpp
index 236bddf..73caf5a 100644
--- a/kmag/kmagselrect.cpp
+++ b/kmag/kmagselrect.cpp
@@ -184,19 +184,19 @@ void KMagSelRect::hide()
void KMagSelRect::update()
{
// make sure the selection window does not go outside of the display
- if (height() > TQApplication::desktop()->tqgeometry().height())
- setHeight (TQApplication::desktop()->tqgeometry().height());
- if (width() > TQApplication::desktop()->tqgeometry().width())
- setWidth (TQApplication::desktop()->tqgeometry().width());
+ if (height() > TQApplication::desktop()->geometry().height())
+ setHeight (TQApplication::desktop()->geometry().height());
+ if (width() > TQApplication::desktop()->geometry().width())
+ setWidth (TQApplication::desktop()->geometry().width());
if (top() < 0)
moveTop (0);
if (left() < 0)
moveLeft (0);
- if (bottom() > TQApplication::desktop()->tqgeometry().bottom())
- moveBottom (TQApplication::desktop()->tqgeometry().bottom());
- if (right() > TQApplication::desktop()->tqgeometry().right())
- moveRight (TQApplication::desktop()->tqgeometry().right());
+ if (bottom() > TQApplication::desktop()->geometry().bottom())
+ moveBottom (TQApplication::desktop()->geometry().bottom());
+ if (right() > TQApplication::desktop()->geometry().right())
+ moveRight (TQApplication::desktop()->geometry().right());
if (selectionwindow != 0)
selectionwindow->setSelRect (TQRect (topLeft(), bottomRight()));
diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp
index 4dd9a12..47f6a46 100644
--- a/kmag/kmagzoomview.cpp
+++ b/kmag/kmagzoomview.cpp
@@ -80,22 +80,22 @@ static uchar phand_bits[] = {
static bool obscuredRegion (TQRegion &region, Window winId, Window ignoreId, Window start = 0, int level = -1) {
- Window root, parent, *tqchildren; uint ntqchildren;
+ Window root, parent, *children; uint nchildren;
if (0 == start)
start = qt_xrootwin();
bool winIdFound = false;
- if (0 != XQueryTree (qt_xdisplay(), start, &root, &parent, &tqchildren, &ntqchildren)) {
- for (uint i=0; i < ntqchildren; ++i) {
+ if (0 != XQueryTree (qt_xdisplay(), start, &root, &parent, &children, &nchildren)) {
+ for (uint i=0; i < nchildren; ++i) {
if (winIdFound) {
- if (ignoreId != tqchildren [i]) {
+ if (ignoreId != children [i]) {
XWindowAttributes atts;
- XGetWindowAttributes (qt_xdisplay(), tqchildren [i], &atts);
+ XGetWindowAttributes (qt_xdisplay(), children [i], &atts);
if (atts.map_state == IsViewable)
region -= TQRegion (atts.x, atts.y, atts.width, atts.height, TQRegion::Rectangle);
}
}
- else if (winId == tqchildren [i])
+ else if (winId == children [i])
winIdFound = true;
// According to tests, my own window ID is either on toplevel or two levels below.
@@ -103,15 +103,15 @@ static bool obscuredRegion (TQRegion &region, Window winId, Window ignoreId, Win
// then to five recursion levels, and make a full recursive search only if that
// was unsuccessful.
else if (level > 1)
- winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], level-1);
+ winIdFound = obscuredRegion (region, winId, ignoreId, children [i], level-1);
else if (level == -1)
- if (! (winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], 0)))
- if (! (winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], 1)))
- winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], -1);
+ if (! (winIdFound = obscuredRegion (region, winId, ignoreId, children [i], 0)))
+ if (! (winIdFound = obscuredRegion (region, winId, ignoreId, children [i], 1)))
+ winIdFound = obscuredRegion (region, winId, ignoreId, children [i], -1);
}
- if (tqchildren != NULL)
- XFree (tqchildren);
+ if (children != NULL)
+ XFree (children);
}
return winIdFound;
@@ -493,7 +493,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e)
// set the mouse mode to normal
m_mouseMode = Normal;
- // restore the cursor tqshape
+ // restore the cursor shape
setCursor(arrowCursor);
// restore the cursor position
@@ -504,7 +504,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e)
// set the mouse mode to normal
m_mouseMode = Normal;
- // restore the cursor tqshape
+ // restore the cursor shape
setCursor(arrowCursor);
// restore the cursor position
@@ -516,7 +516,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e)
// set the mouse mode to normal
m_mouseMode = Normal;
- // restore the cursor tqshape
+ // restore the cursor shape
setCursor(arrowCursor);
}
break;
@@ -706,7 +706,7 @@ void KMagZoomView::fitToWindow()
m_selRect.moveCenter(currCenter);
m_selRect.update();
- viewport()->tqrepaint(false);
+ viewport()->repaint(false);
}
void KMagZoomView::setFitToWindow(bool fit)
@@ -755,14 +755,14 @@ void KMagZoomView::grabFrame()
intersection.translate (-selRect.x(), -selRect.y());
TQPainter painter (&m_grabbedPixmap, true);
- TQMemArray<TQRect> rects (intersection.tqrects());
+ TQMemArray<TQRect> rects (intersection.rects());
for (uint i = 0; i < rects.size(); i++)
painter.fillRect (rects[i], TQBrush (TQColor (128, 128, 128)));
- // call tqrepaint to display the newly grabbed image
+ // call repaint to display the newly grabbed image
TQRect newSize = m_zoomMatrix.mapRect (m_grabbedPixmap.rect());
resizeContents (newSize.width(), newSize.height());
- viewport()->tqrepaint(false);
+ viewport()->repaint(false);
}
@@ -775,7 +775,7 @@ void KMagZoomView::updateMouseView()
if(m_selRect.left() <= pos.x() && pos.x() <= m_selRect.right() &&
m_selRect.top() <= pos.y() && pos.y() <= m_selRect.bottom() &&
m_refreshSwitch)
- viewport()->tqrepaint(false);
+ viewport()->repaint(false);
}
/**
@@ -801,7 +801,7 @@ void KMagZoomView::setZoom(float zoom)
{
m_zoom = zoom;
updateMatrix();
- viewport()->tqrepaint();
+ viewport()->repaint();
}
/**
@@ -811,7 +811,7 @@ void KMagZoomView::setRotation(int rotation)
{
m_rotation = rotation;
updateMatrix();
- viewport()->tqrepaint();
+ viewport()->repaint();
}
/**
@@ -820,7 +820,7 @@ void KMagZoomView::setRotation(int rotation)
void KMagZoomView::setInvertation(bool invert)
{
m_invert = invert;
- viewport()->tqrepaint();
+ viewport()->repaint();
}
/**
diff --git a/kmousetool/kmousetool/kmousetoolui.ui b/kmousetool/kmousetool/kmousetoolui.ui
index 2e95f73..5df32f9 100644
--- a/kmousetool/kmousetool/kmousetoolui.ui
+++ b/kmousetool/kmousetool/kmousetoolui.ui
@@ -300,7 +300,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignJustify|AlignVCenter</set>
</property>
</widget>
diff --git a/kmouth/kmouth.h b/kmouth/kmouth.h
index fe610a6..b8d791d 100644
--- a/kmouth/kmouth.h
+++ b/kmouth/kmouth.h
@@ -79,7 +79,7 @@ class KMouthApp : public KMainWindow
void enableMenuEntries(bool existSelectedEntries, bool existDeselectedEntries);
protected:
- /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
+ /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
* file
*/
void saveOptions();
diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp
index 6aa2668..6188a8a 100644
--- a/kmouth/phrasebook/phrasebook.cpp
+++ b/kmouth/phrasebook/phrasebook.cpp
@@ -274,8 +274,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p
}
if (KIO::NetAccess::exists(url)) {
- if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. "
- "Do you want to overwrite it?").tqarg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) {
+ if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
+ "Do you want to overwrite it?").arg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) {
return 0;
}
}
@@ -286,8 +286,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p
url.setFileName (url.fileName(false) + ".phrasebook");
}
else if (url.fileName (false).right (11).contains (".phrasebook", false) == 0) {
- int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").tqarg(i18n("Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>. "
- "Do you wish to add <i>.phrasebook</i> to the filename?").tqarg(url.filename())),i18n("File Extension"),i18n("Add"),i18n("Do Not Add"));
+ int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").arg(i18n("Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>. "
+ "Do you wish to add <i>.phrasebook</i> to the filename?").arg(url.filename())),i18n("File Extension"),i18n("Add"),i18n("Do Not Add"));
if (filetype == KMessageBox::Cancel) {
return 0;
}
@@ -302,8 +302,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p
result = save (url, false);
}
else {
- int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").tqarg(i18n("Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>. "
- "Do you wish to save in phrasebook format?").tqarg(url.filename())),i18n("File Extension"),i18n("As Phrasebook"),i18n("As Plain Text"));
+ int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").arg(i18n("Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>. "
+ "Do you wish to save in phrasebook format?").arg(url.filename())),i18n("File Extension"),i18n("As Phrasebook"),i18n("As Plain Text"));
if (filetype == KMessageBox::Cancel) {
return 0;
}
diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp
index 3cfe25b..838d5ec 100644
--- a/kmouth/phrasebook/phrasebookdialog.cpp
+++ b/kmouth/phrasebook/phrasebookdialog.cpp
@@ -132,7 +132,7 @@ void CheckBookItem::childChange (int numberDiff, int selDiff) {
((CheckBookItem*)parent)->childChange (numberDiff, selDiff);
TQString text = i18n(" (%1 of %2 books selected)");
- text = text.tqarg(selectedBooks).tqarg(numberOfBooks);
+ text = text.arg(selectedBooks).arg(numberOfBooks);
setText(0, this->text(PhraseBookPrivate::name)+text);
}
@@ -597,7 +597,7 @@ void PhraseBookDialog::setShortcut( const KShortcut& cut ) {
{
TQString s = i18n("In order to use the '%1' key as a shortcut, "
"it must be combined with the "
- "Win, Alt, Ctrl, and/or Shift keys.").tqarg(TQChar(key.sym()));
+ "Win, Alt, Ctrl, and/or Shift keys.").arg(TQChar(key.sym()));
KMessageBox::sorry( this, s, i18n("Invalid Shortcut Key") );
return;
}
@@ -731,7 +731,7 @@ void PhraseBookDialog::slotImportPhrasebook (const KURL &url) {
if (book.open (url))
addBook(treeView->currentItem(), &book);
else
- KMessageBox::sorry(this,i18n("There was an error loading file\n%1").tqarg( url.url() ));
+ KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() ));
}
}
@@ -741,7 +741,7 @@ void PhraseBookDialog::slotExportPhrasebook () {
KURL url;
if (book.save (this, i18n("Export Phrase Book"), url) == -1)
- KMessageBox::sorry(this,i18n("There was an error saving file\n%1").tqarg( url.url() ));
+ KMessageBox::sorry(this,i18n("There was an error saving file\n%1").arg( url.url() ));
}
void PhraseBookDialog::slotPrint()
diff --git a/kmouth/phrasebook/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp
index e4adde1..27735c5 100644
--- a/kmouth/phrasebook/phrasetree.cpp
+++ b/kmouth/phrasebook/phrasetree.cpp
@@ -470,7 +470,7 @@ void PhraseTree::_warning (const KKeySequence& cut, TQString sAction, TQString s
i18n("The '%1' key combination has already been allocated "
"to %2.\n"
"Please choose a unique key combination.").
- tqarg(cut.toString()).tqarg(sAction);
+ arg(cut.toString()).arg(sAction);
KMessageBox::sorry( this, s, sTitle );
}
@@ -485,7 +485,7 @@ bool PhraseTree::isStdAccelPresent (const KShortcut& cut, bool warnUser) {
{
if (warnUser)
_warning (cut.seq(iSeq),
- i18n("the standard \"%1\" action").tqarg(KStdAccel::label(id)),
+ i18n("the standard \"%1\" action").arg(KStdAccel::label(id)),
i18n("Conflict with Standard Application Shortcut"));
return true;
}
@@ -501,7 +501,7 @@ bool PhraseTree::isGlobalKeyPresent (const KShortcut& cut, bool warnUser) {
if (iSeq > -1) {
if (warnUser)
_warning (cut.seq(iSeq),
- i18n("the global \"%1\" action").tqarg(it.key()),
+ i18n("the global \"%1\" action").arg(it.key()),
i18n("Conflict with Global Shortcuts"));
return true;
}
diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp
index 3cbd9d4..ef4557e 100644
--- a/kmouth/phraselist.cpp
+++ b/kmouth/phraselist.cpp
@@ -446,7 +446,7 @@ void PhraseList::save () {
KURL url;
if (book.save (this, i18n("Save As"), url, false) == -1)
- KMessageBox::sorry(this,i18n("There was an error saving file\n%1").tqarg( url.url() ));
+ KMessageBox::sorry(this,i18n("There was an error saving file\n%1").arg( url.url() ));
}
void PhraseList::open () {
@@ -472,7 +472,7 @@ void PhraseList::open (KURL url) {
insertIntoPhraseList (*it, false);
}
else
- KMessageBox::sorry(this,i18n("There was an error loading file\n%1").tqarg( url.url() ));
+ KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() ));
}
#include "phraselist.moc"
diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp
index 5108845..6f777a0 100644
--- a/kmouth/wordcompletion/dictionarycreationwizard.cpp
+++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp
@@ -221,7 +221,7 @@ TQString DictionaryCreationWizard::createDictionary() {
TQString dictionaryFile;
do {
dictnumber++;
- filename = TQString("wordcompletion%1.dict").tqarg(dictnumber);
+ filename = TQString("wordcompletion%1.dict").arg(dictnumber);
dictionaryFile = KApplication::kApplication()->dirs()->findResource("appdata", filename);
}
while (KStandardDirs::exists(dictionaryFile));
diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp
index a2068f2..7e54fe4 100644
--- a/kmouth/wordcompletion/wordcompletionwidget.cpp
+++ b/kmouth/wordcompletion/wordcompletionwidget.cpp
@@ -159,7 +159,7 @@ void WordCompletionWidget::save() {
while (it.current()) {
DictionaryListItem *item = dynamic_cast<DictionaryListItem*>(it.current());
if (item != 0) {
- config->setGroup(TQString("Dictionary %1").tqarg(number));
+ config->setGroup(TQString("Dictionary %1").arg(number));
config->writeEntry ("Filename", item->filename());
config->writeEntry ("Name", item->text (0));
config->writeEntry ("Language", item->languageCode());
@@ -251,8 +251,8 @@ void WordCompletionWidget::exportDictionary() {
return;
if (KIO::NetAccess::exists(url, false, this)) {
- if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. "
- "Do you want to overwrite it?").tqarg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) {
+ if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
+ "Do you want to overwrite it?").arg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) {
return;
}
}
diff --git a/ksayit/Freeverb_plugin/freeverb_setup.ui b/ksayit/Freeverb_plugin/freeverb_setup.ui
index 44e6e87..7e3c0d0 100644
--- a/ksayit/Freeverb_plugin/freeverb_setup.ui
+++ b/ksayit/Freeverb_plugin/freeverb_setup.ui
@@ -79,7 +79,7 @@
<property name="text">
<string>&lt;b&gt;Room&lt;/b&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -184,7 +184,7 @@
<property name="text">
<string>&lt;b&gt;Damp&lt;/b&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -283,7 +283,7 @@
<property name="text">
<string>&lt;b&gt;Wet&lt;/b&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -382,7 +382,7 @@
<property name="text">
<string>&lt;b&gt;Dry&lt;/b&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -481,7 +481,7 @@
<property name="text">
<string>&lt;b&gt;Width&lt;/b&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
diff --git a/ksayit/src/docbookparser.cpp b/ksayit/src/docbookparser.cpp
index 8a5baa1..4cdad6a 100644
--- a/ksayit/src/docbookparser.cpp
+++ b/ksayit/src/docbookparser.cpp
@@ -58,7 +58,7 @@ TQString DocbookParser::node2raw(TQDomNode node) const
void DocbookParser::parseBook(const TQDomElement &element, ListViewInterface *item)
{
kdDebug(100200) << "+++ entering parseBook()" << endl;
- item->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ item->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( item );
@@ -89,7 +89,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface
kdDebug(100200) << "+++ entering parseBookInfo()" << endl;
Overview *overview = new Overview(item, NULL, i18n("Overview"));
- overview->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ overview->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( overview );
@@ -122,7 +122,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface
data = node.firstChild().toText();
if( !data.isNull() ){
Date *date = new Date(overview, NULL, i18n("Date"));
- date->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ date->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
date->setText( 1, data.nodeValue() );
date->setValue(KSayItGlobal::RTFDATA, data.nodeValue());
date->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue());
@@ -140,7 +140,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface
data = node.firstChild().toText();
if( !data.isNull() ){
ReleaseInfo *relinfo = new ReleaseInfo(overview, NULL, i18n("Release"));
- relinfo->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ relinfo->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
relinfo->setText( 1, data.nodeValue() );
relinfo->setValue(KSayItGlobal::RTFDATA, data.nodeValue());
relinfo->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue());
@@ -176,7 +176,7 @@ void DocbookParser::parseAuthorGroup(const TQDomElement &element, ListViewInterf
// item = overview
AuthorGroup *authorgroup = new AuthorGroup(item, NULL, i18n("Author(s)"));
- authorgroup->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ authorgroup->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( authorgroup );
@@ -203,7 +203,7 @@ void DocbookParser::parseAuthor(const TQDomElement &element, ListViewInterface *
TQString s_surname = TQString();
Author *author = new Author(item);
- author->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ author->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
TQDomNode node = element.firstChild();
while( !node.isNull() ){
@@ -241,7 +241,7 @@ void DocbookParser::parseKeywordSet(const TQDomElement &element, ListViewInterfa
// item = overview
KeywordSet *keywordset = new KeywordSet(item, NULL, i18n("Keywords"));
- keywordset->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ keywordset->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( keywordset );
@@ -252,7 +252,7 @@ void DocbookParser::parseKeywordSet(const TQDomElement &element, ListViewInterfa
data = node.firstChild().toText();
if( !data.isNull() ){
Keyword *keyword = new Keyword(keywordset);
- keyword->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ keyword->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
keyword->setText(0, data.nodeValue() );
keyword->setValue(KSayItGlobal::RTFDATA, data.nodeValue() );
keyword->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue() );
@@ -275,7 +275,7 @@ void DocbookParser::parseAbstract(const TQDomElement &element, ListViewInterface
// item = overview
TQDomText data;
Abstract *abstract = new Abstract(item, NULL, i18n("Abstract"));
- abstract->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ abstract->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( abstract );
@@ -296,7 +296,7 @@ void DocbookParser::parseChapter(const TQDomElement &element, ListViewInterface
TQDomText data;
Chapter *chapter = new Chapter(item, NULL, i18n("Chapter"));
- chapter->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ chapter->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( chapter );
@@ -326,7 +326,7 @@ void DocbookParser::parseSect1(const TQDomElement &element, ListViewInterface *i
TQDomText data;
Sect1 *sect1 = new Sect1(item, NULL, i18n("Section Level 1"));
- sect1->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ sect1->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( sect1 );
@@ -356,7 +356,7 @@ void DocbookParser::parseSect2(const TQDomElement &element, ListViewInterface *i
TQDomText data;
Sect2 *sect2 = new Sect2(item, NULL, i18n("Section Level 2"));
- sect2->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ sect2->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( sect2 );
@@ -386,7 +386,7 @@ void DocbookParser::parseSect3(const TQDomElement &element, ListViewInterface *i
TQDomText data;
Sect3 *sect3 = new Sect3(item, NULL, i18n("Section Level 3"));
- sect3->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ sect3->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( sect3 );
@@ -416,7 +416,7 @@ void DocbookParser::parseSect4(const TQDomElement &element, ListViewInterface *i
TQDomText data;
Sect4 *sect4 = new Sect4(item, NULL, i18n("Section Level 4"));
- sect4->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ sect4->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( sect4 );
@@ -446,7 +446,7 @@ void DocbookParser::parseSect5(const TQDomElement &element, ListViewInterface *i
TQDomText data;
Sect5 *sect5 = new Sect5(item, NULL, i18n("Section Level 4"));
- sect5->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ sect5->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( sect5 );
@@ -473,7 +473,7 @@ void DocbookParser::parsePara(const TQDomElement &element, ListViewInterface *it
kdDebug(100200) << "+++ entering parsePara()" << endl;
Para *para = new Para(item, NULL, i18n("Paragraph"));
- para->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ para->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
// register Popup menu
m_contextmenuhandler->registerPopupMenu( para );
diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp
index 8eb34ab..5fd76c3 100644
--- a/ksayit/src/doctreeviewimpl.cpp
+++ b/ksayit/src/doctreeviewimpl.cpp
@@ -261,7 +261,7 @@ void DocTreeViewImpl::openFile(const KURL &url)
docbookparser.parseBook(root , m_rootItem);
m_idCounter = docbookparser.getIdCounter();
} else {
- err = i18n("The file is of type %1, 'book' expected.").tqarg(root.tagName() );
+ err = i18n("The file is of type %1, 'book' expected.").arg(root.tagName() );
throw(err);
}
@@ -779,7 +779,7 @@ void DocTreeViewImpl::slotDeleteItem()
TQListViewItemIterator itr( m_rootItem );
while ( itr.current() ) {
item = static_cast<ListViewInterface*>(itr.current());
- item->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') );
+ item->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') );
++itr;
}
@@ -797,7 +797,7 @@ void DocTreeViewImpl::slotNewBookInfo()
if ( whoAmI == "RobDocument" ){
int newIndex = newIndexFirstChild();
Overview *overview = new Overview( m_currentItem, NULL, i18n("Overview") );
- overview->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ overview->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
m_contextmenuhandler->registerPopupMenu( overview );
}
@@ -810,7 +810,7 @@ void DocTreeViewImpl::slotNewChapter()
if ( whoAmI == "RobDocument" ){
int newIndex = newIndexLastChild();
Chapter *chapter = new Chapter( m_currentItem, NULL, i18n("Chapter") );
- chapter->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ chapter->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
TQString newTitle = i18n("New Chapter Title");
chapter->setText(0, newTitle );
@@ -829,7 +829,7 @@ void DocTreeViewImpl::slotNewKeywordSet()
// New TreeView item
int newIndex = newIndexFirstChild();
KeywordSet *keywordset = new KeywordSet(m_currentItem, NULL, i18n("Keywords"));
- keywordset->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ keywordset->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
m_contextmenuhandler->registerPopupMenu( keywordset );
}
@@ -843,7 +843,7 @@ void DocTreeViewImpl::slotNewKeyword()
// New TreeView item
int newIndex = newIndexLastChild();
Keyword *keyword = new Keyword(m_currentItem, NULL, i18n("Keyword"));
- keyword->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ keyword->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
TQString newKeyword = i18n("New Keyword");
keyword->setText(0, newKeyword );
@@ -863,7 +863,7 @@ void DocTreeViewImpl::slotNewAbstract()
// New TreeView item
int newIndex = newIndexLastChild();
Abstract *abstract = new Abstract(m_currentItem, NULL, i18n("Abstract"));
- abstract->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ abstract->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
m_contextmenuhandler->registerPopupMenu( abstract );
@@ -883,7 +883,7 @@ void DocTreeViewImpl::slotNewAuthorGroup()
// New TreeView item
int newIndex = newIndexFirstChild();
AuthorGroup *authorgroup = new AuthorGroup(m_currentItem, NULL, i18n("Author(s)"));
- authorgroup->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ authorgroup->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
m_contextmenuhandler->registerPopupMenu( authorgroup );
@@ -903,7 +903,7 @@ void DocTreeViewImpl::slotNewAuthor()
// New TreeView item
int newIndex = newIndexLastChild();
Author *author = new Author(m_currentItem);
- author->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ author->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
author->setText(0, i18n("Author") );
TQString newAuthor = i18n("Firstname Surname");
@@ -924,7 +924,7 @@ void DocTreeViewImpl::slotNewDate()
// New TreeView item
int newIndex = newIndexLastChild();
Date *date = new Date(m_currentItem, NULL, i18n("Date"));
- date->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ date->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
// get current date
TQString today;
today = KGlobal::locale()->formatDate(TQDate::currentDate(Qt::LocalTime), true);
@@ -945,7 +945,7 @@ void DocTreeViewImpl::slotNewReleaseInfo()
// New TreeView item
int newIndex = newIndexLastChild();
ReleaseInfo *relinfo = new ReleaseInfo(m_currentItem, NULL, i18n("Release"));
- relinfo->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ relinfo->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
TQString newRelease = "0.0.0";
relinfo->setText( 1, newRelease );
@@ -979,7 +979,7 @@ void DocTreeViewImpl::slotNewParagraph()
// New TreeView item
int newIndex = newIndexLastChild();
Para *para = new Para(m_currentItem, NULL, i18n("Paragraph"));
- para->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ para->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
m_contextmenuhandler->registerPopupMenu( para );
@@ -992,7 +992,7 @@ void DocTreeViewImpl::slotNewSection_1()
if ( whoAmI == "Chapter" ){
int newIndex = newIndexLastChild();
Sect1 *sect1 = new Sect1(m_currentItem, NULL, i18n("Section Level 1"));
- sect1->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ sect1->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
TQString newTitle = i18n("New Section Title");
sect1->setValue( KSayItGlobal::RTFHEADER, newTitle );
@@ -1009,7 +1009,7 @@ void DocTreeViewImpl::slotNewSection_2()
if ( whoAmI == "Sect1" ){
int newIndex = newIndexLastChild();
Sect2 *sect2 = new Sect2(m_currentItem, NULL, i18n("Section Level 2"));
- sect2->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ sect2->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
TQString newTitle = i18n("New Section Title");
sect2->setValue( KSayItGlobal::RTFHEADER, newTitle );
@@ -1026,7 +1026,7 @@ void DocTreeViewImpl::slotNewSection_3()
if ( whoAmI == "Sect2" ){
int newIndex = newIndexLastChild();
Sect3 *sect3 = new Sect3(m_currentItem, NULL, i18n("Section Level 3"));
- sect3->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ sect3->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
TQString newTitle = i18n("New Section Title");
sect3->setValue( KSayItGlobal::RTFHEADER, newTitle );
@@ -1043,7 +1043,7 @@ void DocTreeViewImpl::slotNewSection_4()
if ( whoAmI == "Sect3" ){
int newIndex = newIndexLastChild();
Sect4 *sect4 = new Sect4(m_currentItem, NULL, i18n("Section Level 4"));
- sect4->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ sect4->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
TQString newTitle = i18n("New Section Title");
sect4->setValue( KSayItGlobal::RTFHEADER, newTitle );
@@ -1060,7 +1060,7 @@ void DocTreeViewImpl::slotNewSection_5()
if ( whoAmI == "Sect4" ){
int newIndex = newIndexLastChild();
Sect5 *sect5 = new Sect5(m_currentItem, NULL, i18n("Section Level 5"));
- sect5->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
+ sect5->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
TQString newTitle = i18n("New Section Title");
sect5->setValue( KSayItGlobal::RTFHEADER, newTitle );
@@ -1086,7 +1086,7 @@ int DocTreeViewImpl::newIndexFirstChild()
item = static_cast<ListViewInterface*>(it.current());
itemIndex = (item->text(3)).toInt();
if ( itemIndex > currentIndex ){
- item->setText(3, TQString("%1").tqarg(itemIndex+1).rightJustify(8,'0') );;
+ item->setText(3, TQString("%1").arg(itemIndex+1).rightJustify(8,'0') );;
}
++it;
}
@@ -1116,7 +1116,7 @@ int DocTreeViewImpl::newIndexLastChild()
item = static_cast<ListViewInterface*>(it.current());
itemIndex = (item->text(3)).toInt();
if ( itemIndex > lastIndex ){
- item->setText(3, TQString("%1").tqarg(itemIndex+1).rightJustify(8,'0') );
+ item->setText(3, TQString("%1").arg(itemIndex+1).rightJustify(8,'0') );
}
++it;
}
diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp
index 25db48a..6cfb056 100644
--- a/ksayit/src/ksayit.cpp
+++ b/ksayit/src/ksayit.cpp
@@ -293,7 +293,7 @@ void KSayItApp::slotChangeBookmarkFilename(const TQString &newname)
// copy old bookmarkfile to new file
if ( m_currentBookmarkFile != newbkFile ){
if ( TQFile::exists(m_currentBookmarkFile) ){
- TQString command = TQString("cp %1 %2").tqarg(m_currentBookmarkFile).tqarg(newbkFile);
+ TQString command = TQString("cp %1 %2").arg(m_currentBookmarkFile).arg(newbkFile);
system( command.ascii() );
}
// install new BookmarkHandler based on the new file
@@ -813,7 +813,7 @@ void KSayItApp::setActions(int actions)
// Get the mask of supported actions from the plugin.
int mask = m_kttslib->getActions();
- kdDebug(100200) << TQString("KSayItApp:PSA: %1").tqarg(mask, 0, 2) << endl;
+ kdDebug(100200) << TQString("KSayItApp:PSA: %1").arg(mask, 0, 2) << endl;
// disable actions not supported by the plugin
int ma = actions & mask;
diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h
index 97d2c95..4f9ed01 100644
--- a/ksayit/src/ksayit.h
+++ b/ksayit/src/ksayit.h
@@ -115,7 +115,7 @@ private slots:
*/
void slotTreeViewChanged(const TQString &str);
- /** save general Options like all bar positions and status as well as the tqgeometry to
+ /** save general Options like all bar positions and status as well as the geometry to
* the configuration file.
*/
void slotSaveOptions();
diff --git a/ksayit/src/saxhandler.cpp b/ksayit/src/saxhandler.cpp
index 7e2d6aa..e8035dc 100644
--- a/ksayit/src/saxhandler.cpp
+++ b/ksayit/src/saxhandler.cpp
@@ -127,7 +127,7 @@ bool SaxHandler::characters(const TQString & ch)
bool SaxHandler::fatalError(const TQXmlParseException &exc)
{
TQString err = i18n("Fatal error while parsing XML-Paragraph:\n");
- err += i18n("%1, Line: %2").tqarg(exc.message()).tqarg(exc.lineNumber());
+ err += i18n("%1, Line: %2").arg(exc.message()).arg(exc.lineNumber());
KMessageBox::error(0, err, i18n("Fatal error") );
return false;
}
@@ -160,7 +160,7 @@ bool SaxHandler::internalEntityDecl(const TQString & name,
bool SaxHandler::skippedEntity(const TQString &name)
{
- TQString warn = i18n("Unresolved entity found: %1.\n").tqarg(name);
+ TQString warn = i18n("Unresolved entity found: %1.\n").arg(name);
warn += i18n("KSayIt does not support DocBook files with external entities. ");
warn += i18n("Parsing can continue, but the resulting text will contain gaps.");
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"));
}
}