summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:28:00 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-20 19:43:54 +0200
commitb33c04530149523d99425f92e428231b79b7991d (patch)
tree79275b0a04020e042902d8bb6fd3afe926098f6d
parentee22425fa7d7f0f730e37f16d65e21ab8ce7bd40 (diff)
downloadtdeaccessibility-b33c04530149523d99425f92e428231b79b7991d.tar.gz
tdeaccessibility-b33c04530149523d99425f92e428231b79b7991d.zip
Rename old tq methods that no longer need a unique name
(cherry picked from commit 6687cd2515bdebbd8f0c92261f3acf8777441ca6)
-rw-r--r--kbstateapplet/kbstate.cpp8
-rw-r--r--kbstateapplet/kbstate.h2
-rw-r--r--kmag/kmag.cpp8
-rw-r--r--kmag/kmagzoomview.cpp4
-rw-r--r--kmag/kmagzoomview.h2
-rw-r--r--kmousetool/kmousetool/kmousetoolui.ui10
-rw-r--r--kmouth/phrasebook/phrasebook.cpp8
-rw-r--r--kmouth/phrasebook/phrasebook.h2
-rw-r--r--kmouth/phraselistitem.cpp2
-rw-r--r--kmouth/speech.cpp4
-rw-r--r--kmouth/wordcompletion/creationsourcedetailsui.ui.h4
-rw-r--r--kmouth/wordcompletion/creationsourceui.ui2
-rw-r--r--kmouth/wordcompletion/klanguagebutton.cpp10
-rw-r--r--kmouth/wordcompletion/klanguagebuttonhelper.cpp14
-rw-r--r--kmouth/wordcompletion/wordcompletionui.ui2
-rw-r--r--kmouth/wordcompletion/wordcompletionui.ui.h4
-rw-r--r--kmouth/wordcompletion/wordcompletionwidget.cpp10
-rw-r--r--kmouth/wordcompletion/wordlist.cpp16
-rw-r--r--ksayit/Freeverb_plugin/freeverb_setup.ui16
-rw-r--r--ksayit/KTTSD_Lib/KTTSDlibSetup.ui4
-rw-r--r--ksayit/KTTSD_Lib/kttsdlib.cpp2
-rw-r--r--ksayit/KTTSD_Lib/kttsdlib.h2
-rw-r--r--ksayit/src/DocTreeView.ui2
-rw-r--r--ksayit/src/KSayItView.ui2
-rw-r--r--ksayit/src/doctreeviewimpl.cpp2
-rw-r--r--ksayit/src/fx_setup.ui14
-rw-r--r--ksayit/src/ksayit.cpp4
-rw-r--r--ksayit/src/ksayitviewimpl.h2
-rw-r--r--ksayit/src/voicesetupdlg.cpp6
-rw-r--r--kttsd/filters/sbd/sbdconf.cpp2
-rw-r--r--kttsd/filters/stringreplacer/editreplacementwidget.ui2
-rw-r--r--kttsd/filters/stringreplacer/stringreplacerconf.cpp2
-rw-r--r--kttsd/filters/stringreplacer/stringreplacerconfwidget.ui2
-rw-r--r--kttsd/filters/talkerchooser/talkerchooserconf.cpp2
-rw-r--r--kttsd/filters/xmltransformer/xmltransformerconf.cpp2
-rw-r--r--kttsd/filters/xmltransformer/xmltransformerproc.cpp4
-rw-r--r--kttsd/kcmkttsmgr/addtalkerwidget.ui10
-rw-r--r--kttsd/kcmkttsmgr/kcmkttsmgr.cpp2
-rw-r--r--kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui22
-rw-r--r--kttsd/kcmkttsmgr/selectevent.cpp14
-rw-r--r--kttsd/kttsd/talkermgr.cpp2
-rw-r--r--kttsd/kttsjobmgr/kttsjobmgr.cpp8
-rw-r--r--kttsd/kttsmgr/kttsmgr.cpp4
-rw-r--r--kttsd/kttsmgr/kttsmgr.h2
-rw-r--r--kttsd/libkttsd/notify.cpp10
-rw-r--r--kttsd/libkttsd/selecttalkerwidget.ui4
-rw-r--r--kttsd/plugins/command/commandconf.cpp2
-rw-r--r--kttsd/plugins/command/commandconfwidget.ui4
-rw-r--r--kttsd/plugins/command/commandproc.cpp4
-rw-r--r--kttsd/plugins/epos/eposconf.cpp2
-rw-r--r--kttsd/plugins/epos/eposconfwidget.ui2
-rw-r--r--kttsd/plugins/epos/eposproc.cpp4
-rw-r--r--kttsd/plugins/festivalint/festivalintconf.cpp2
-rw-r--r--kttsd/plugins/festivalint/festivalintconfwidget.ui2
-rw-r--r--kttsd/plugins/festivalint/festivalintproc.cpp4
-rw-r--r--kttsd/plugins/flite/fliteconf.cpp2
-rw-r--r--kttsd/plugins/flite/fliteconfwidget.ui4
-rw-r--r--kttsd/plugins/flite/fliteproc.cpp4
-rw-r--r--kttsd/plugins/freetts/freettsconf.cpp2
-rw-r--r--kttsd/plugins/freetts/freettsconfigwidget.ui4
-rw-r--r--kttsd/plugins/freetts/freettsproc.cpp4
-rw-r--r--kttsd/plugins/hadifix/hadifixconf.cpp2
-rw-r--r--kttsd/plugins/hadifix/hadifixconfigui.ui2
-rw-r--r--kttsd/plugins/hadifix/hadifixproc.cpp4
64 files changed, 158 insertions, 158 deletions
diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp
index 0966f58..94f660f 100644
--- a/kbstateapplet/kbstate.cpp
+++ b/kbstateapplet/kbstate.cpp
@@ -810,7 +810,7 @@ void KeyIcon::drawButton (TQPainter *p) {
int y = (height()-locked.height())/2;
int o = 0;
if (isLocked || isLatched) {
- qDrawShadePanel (p, 0, 0, width(), height(), tqcolorGroup(), true, 1, NULL);
+ qDrawShadePanel (p, 0, 0, width(), height(), colorGroup(), true, 1, NULL);
p->fillRect (1,1,width()-2,height()-2, KGlobalSettings::highlightColor());
if (strcmp(modifierKeys[keyId].icon, ""))
p->drawPixmap (x+1,y+1, latched);
@@ -818,7 +818,7 @@ void KeyIcon::drawButton (TQPainter *p) {
o = 1;
}
else {
- qDrawShadePanel (p, 0, 0, width(), height(), tqcolorGroup(), false, 1, NULL);
+ qDrawShadePanel (p, 0, 0, width(), height(), colorGroup(), false, 1, NULL);
if (strcmp(modifierKeys[keyId].icon, ""))
p->drawPixmap (x,y, unlatched);
black = KGlobalSettings::textColor();
@@ -1068,12 +1068,12 @@ void TimeoutIcon::drawButton (TQPainter *p) {
StatusIcon::StatusIcon (const TQString &text, TQWidget *parent, const char *name)
: TQPushButton (text, parent, name) {
- tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored));
+ setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored));
}
StatusIcon::~StatusIcon () {
}
-TQSize StatusIcon::tqminimumSizeHint () const {
+TQSize StatusIcon::minimumSizeHint () const {
return TQSize (0,0);
}
diff --git a/kbstateapplet/kbstate.h b/kbstateapplet/kbstate.h
index fc6987f..892aeb9 100644
--- a/kbstateapplet/kbstate.h
+++ b/kbstateapplet/kbstate.h
@@ -40,7 +40,7 @@ public:
StatusIcon (const TQString &text, TQWidget *parent, const char *name=0);
~StatusIcon ();
- TQSize tqminimumSizeHint () const;
+ TQSize minimumSizeHint () const;
};
typedef TQPtrList<StatusIcon> IconList;
diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp
index 80549be..6ea36b5 100644
--- a/kmag/kmag.cpp
+++ b/kmag/kmag.cpp
@@ -247,7 +247,7 @@ void KmagApp::initActions()
void KmagApp::initView()
{
m_zoomView = new KMagZoomView( this, "ZoomView" );
- m_zoomView->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, m_zoomView->sizePolicy().hasHeightForWidth() ) );
+ m_zoomView->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, m_zoomView->sizePolicy().hasHeightForWidth() ) );
m_zoomView->setFrameShape( TQFrame::StyledPanel );
m_zoomView->setFrameShadow( TQFrame::Raised );
@@ -550,7 +550,7 @@ void KmagApp::saveZoomPixmap()
bool toggled(false);
// stop refresh temporarily
- if (m_zoomView->getRefreshtqStatus()) {
+ if (m_zoomView->getRefreshStatus()) {
slotToggleRefresh();
toggled = true;
}
@@ -597,7 +597,7 @@ void KmagApp::saveZoomPixmap()
void KmagApp::slotToggleRefresh()
{
m_zoomView->toggleRefresh();
- if(m_zoomView->getRefreshtqStatus()) {
+ if(m_zoomView->getRefreshStatus()) {
refreshSwitch->setIcon("stop.png");
refreshSwitch->setText(i18n("Stop"));
refreshSwitch->setToolTip(i18n("Click to stop window update"));
@@ -810,7 +810,7 @@ void KmagApp::slotFilePrint()
#endif
// stop refresh temporarily
- if (m_zoomView->getRefreshtqStatus()) {
+ if (m_zoomView->getRefreshStatus()) {
slotToggleRefresh();
toggled = true;
}
diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp
index f0f3715..4dd9a12 100644
--- a/kmag/kmagzoomview.cpp
+++ b/kmag/kmagzoomview.cpp
@@ -255,7 +255,7 @@ void KMagZoomView::drawContents ( TQPainter * p, int clipx, int clipy, int clipw
if (m_invert) {
TQImage zoomedImage;
zoomedImage = zoomedPixmap.convertToImage();
- zoomedImage.tqinvertPixels (false);
+ zoomedImage.invertPixels (false);
p->drawImage (TQPoint (clipx-contentsX(), clipy-contentsY()), zoomedImage, zoomedImage.rect(),
TQt::ThresholdDither | TQt::ThresholdAlphaDither | TQt::AvoidDither);
} else {
@@ -751,7 +751,7 @@ void KMagZoomView::grabFrame()
intersection &= TQRegion (selRect, TQRegion::Rectangle);
// We don't want to overpaint other windows that happen to be on top
- obscuredRegion (intersection, tqtopLevelWidget()->winId(), m_selRect.winId());
+ obscuredRegion (intersection, topLevelWidget()->winId(), m_selRect.winId());
intersection.translate (-selRect.x(), -selRect.y());
TQPainter painter (&m_grabbedPixmap, true);
diff --git a/kmag/kmagzoomview.h b/kmag/kmagzoomview.h
index 1f8d9bc..89882b4 100644
--- a/kmag/kmagzoomview.h
+++ b/kmag/kmagzoomview.h
@@ -61,7 +61,7 @@ class KMagZoomView : public TQScrollView
TQPixmap getPixmap();
/// Returns the state of the refresh switch
- bool getRefreshtqStatus() const { return m_refreshSwitch; };
+ bool getRefreshStatus() const { return m_refreshSwitch; };
/// Returns teh status of followMouse
bool getFollowMouse() const { return m_followMouse; };
diff --git a/kmousetool/kmousetool/kmousetoolui.ui b/kmousetool/kmousetool/kmousetoolui.ui
index d5e22fa..2e95f73 100644
--- a/kmousetool/kmousetool/kmousetoolui.ui
+++ b/kmousetool/kmousetool/kmousetoolui.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -65,7 +65,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -239,7 +239,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -314,7 +314,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>8</width>
<height>8</height>
@@ -365,7 +365,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>241</width>
<height>20</height>
diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp
index 2332ee6..6aa2668 100644
--- a/kmouth/phrasebook/phrasebook.cpp
+++ b/kmouth/phrasebook/phrasebook.cpp
@@ -477,15 +477,15 @@ const char *PhraseBookDrag::format (int i) const {
return xmlphrasebook.format(i/3);
}
-TQByteArray PhraseBookDrag::tqencodedData (const char* mime) const {
+TQByteArray PhraseBookDrag::encodedData (const char* mime) const {
TQCString m(mime);
m = m.lower();
if (m.contains("xml-phrasebook"))
- return xmlphrasebook.tqencodedData(mime);
+ return xmlphrasebook.encodedData(mime);
else if (m.contains("xml"))
- return xml.tqencodedData(mime);
+ return xml.encodedData(mime);
else
- return plain.tqencodedData(mime);
+ return plain.encodedData(mime);
}
bool PhraseBookDrag::canDecode (const TQMimeSource* e) {
diff --git a/kmouth/phrasebook/phrasebook.h b/kmouth/phrasebook/phrasebook.h
index 200bbae..25f1d37 100644
--- a/kmouth/phrasebook/phrasebook.h
+++ b/kmouth/phrasebook/phrasebook.h
@@ -157,7 +157,7 @@ public:
virtual void setBook (PhraseBook *book);
const char *format (int i) const;
- virtual TQByteArray tqencodedData (const char *) const;
+ virtual TQByteArray encodedData (const char *) const;
static bool canDecode (const TQMimeSource *e);
static bool decode (const TQMimeSource *e, PhraseBook *book);
diff --git a/kmouth/phraselistitem.cpp b/kmouth/phraselistitem.cpp
index 6e902f3..0574d2b 100644
--- a/kmouth/phraselistitem.cpp
+++ b/kmouth/phraselistitem.cpp
@@ -47,6 +47,6 @@ void PhraseListItem::paint (TQPainter *p) {
if (drawCursor()) {
TQRect r (0, 0, listBox()->maxItemWidth(), height (listBox()));
listBox()->tqstyle().tqdrawPrimitive (TQStyle::PE_FocusRect, p, r,
- listBox()->tqcolorGroup());
+ listBox()->colorGroup());
}
}
diff --git a/kmouth/speech.cpp b/kmouth/speech.cpp
index f74e1fd..8fc8f19 100644
--- a/kmouth/speech.cpp
+++ b/kmouth/speech.cpp
@@ -225,10 +225,10 @@ void Speech::speak(TQString command, bool stdIn, const TQString &text, const TQS
}
void Speech::receivedStdout (KProcess *, char *buffer, int buflen) {
- kdDebug() << TQString::tqfromLatin1(buffer, buflen) + "\n";
+ kdDebug() << TQString::fromLatin1(buffer, buflen) + "\n";
}
void Speech::receivedStderr (KProcess *, char *buffer, int buflen) {
- kdDebug() << TQString::tqfromLatin1(buffer, buflen) + "\n";
+ kdDebug() << TQString::fromLatin1(buffer, buflen) + "\n";
}
void Speech::wroteStdin(KProcess *) {
diff --git a/kmouth/wordcompletion/creationsourcedetailsui.ui.h b/kmouth/wordcompletion/creationsourcedetailsui.ui.h
index f3ed793..12869aa 100644
--- a/kmouth/wordcompletion/creationsourcedetailsui.ui.h
+++ b/kmouth/wordcompletion/creationsourcedetailsui.ui.h
@@ -15,7 +15,7 @@ void CreationSourceDetailsUI::init() {
TQWhatsThis::add (languageButton, i18n("With this combo box you decide which language should be associated with the new dictionary."));
loadLanguageList(languageButton);
- languageButton->insertLanguage("??", i18n("Other"), TQString::tqfromLatin1("l10n/"), TQString());
+ languageButton->insertLanguage("??", i18n("Other"), TQString::fromLatin1("l10n/"), TQString());
connect (languageButton, TQT_SIGNAL(activated(int)), this, TQT_SLOT(languageButton_activated(int)));
}
@@ -28,7 +28,7 @@ void CreationSourceDetailsUI::languageButton_activated (int) {
languageButton->setCurrentItem(customLanguage);
}
else {
- languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString());
+ languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::fromLatin1("l10n/"), TQString());
languageButton->setCurrentItem(customLanguage);
}
}
diff --git a/kmouth/wordcompletion/creationsourceui.ui b/kmouth/wordcompletion/creationsourceui.ui
index 49af73d..0efac9c 100644
--- a/kmouth/wordcompletion/creationsourceui.ui
+++ b/kmouth/wordcompletion/creationsourceui.ui
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kmouth/wordcompletion/klanguagebutton.cpp b/kmouth/wordcompletion/klanguagebutton.cpp
index 51d2066..ffb6715 100644
--- a/kmouth/wordcompletion/klanguagebutton.cpp
+++ b/kmouth/wordcompletion/klanguagebutton.cpp
@@ -132,12 +132,12 @@ void KLanguageButton::insertSubmenu( const TQString &text, const TQString &tag,
void KLanguageButton::insertLanguage( const TQString& path, const TQString& name,
const TQString& sub, const TQString &submenu, int index )
{
- TQString output = name + TQString::tqfromLatin1( " (" ) + path +
- TQString::tqfromLatin1( ")" );
+ TQString output = name + TQString::fromLatin1( " (" ) + path +
+ TQString::fromLatin1( ")" );
#if 0
// Nooooo ! Country != language
TQPixmap flag( locate( "locale", sub + path +
- TQString::tqfromLatin1( "/flag.png" ) ) );
+ TQString::fromLatin1( "/flag.png" ) ) );
#endif
insertItem( output, path, submenu, index );
}
@@ -182,8 +182,8 @@ void KLanguageButton::clear()
{
if ( i < 0 || i >= count() )
return;
- TQString output = name + TQString::tqfromLatin1( " (" ) + tag( i ) +
- TQString::tqfromLatin1( ")" );
+ TQString output = name + TQString::fromLatin1( " (" ) + tag( i ) +
+ TQString::fromLatin1( ")" );
changeItem( output, i );
}*/
diff --git a/kmouth/wordcompletion/klanguagebuttonhelper.cpp b/kmouth/wordcompletion/klanguagebuttonhelper.cpp
index 8f1785e..72a2311 100644
--- a/kmouth/wordcompletion/klanguagebuttonhelper.cpp
+++ b/kmouth/wordcompletion/klanguagebuttonhelper.cpp
@@ -31,18 +31,18 @@
TQString languageName (TQString languageCode) {
TQString filename = KGlobal::dirs()->findResource("locale",
- languageCode + TQString::tqfromLatin1("/entry.desktop"));
+ languageCode + TQString::fromLatin1("/entry.desktop"));
KSimpleConfig entry(filename);
- entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
- return entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
+ return entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
}
void loadLanguageList(KLanguageButton *combo)
// This function was taken from kdebase/kcontrol/kdm/kdm-appear.cpp
{
TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
- TQString::tqfromLatin1("*/entry.desktop"));
+ TQString::fromLatin1("*/entry.desktop"));
langlist.sort();
for ( TQStringList::ConstIterator it = langlist.begin();
it != langlist.end(); ++it )
@@ -52,9 +52,9 @@ void loadLanguageList(KLanguageButton *combo)
TQString nid = fpath.mid(index + 1);
KSimpleConfig entry(*it);
- entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
- combo->insertLanguage(nid, name, TQString::tqfromLatin1("l10n/"), TQString());
+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+ combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString());
}
if (KGlobal::locale())
diff --git a/kmouth/wordcompletion/wordcompletionui.ui b/kmouth/wordcompletion/wordcompletionui.ui
index 5e8227e..7083045 100644
--- a/kmouth/wordcompletion/wordcompletionui.ui
+++ b/kmouth/wordcompletion/wordcompletionui.ui
@@ -141,7 +141,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>240</height>
diff --git a/kmouth/wordcompletion/wordcompletionui.ui.h b/kmouth/wordcompletion/wordcompletionui.ui.h
index d74137e..6ce5e75 100644
--- a/kmouth/wordcompletion/wordcompletionui.ui.h
+++ b/kmouth/wordcompletion/wordcompletionui.ui.h
@@ -15,7 +15,7 @@ void WordCompletionUI::init() {
TQWhatsThis::add (languageButton, i18n("With this combo box you select the language associated with the selected dictionary."));
loadLanguageList(languageButton);
- languageButton->insertLanguage("??", i18n("Other"), TQString::tqfromLatin1("l10n/"), TQString());
+ languageButton->insertLanguage("??", i18n("Other"), TQString::fromLatin1("l10n/"), TQString());
connect (languageButton, TQT_SIGNAL(activated(int)), this, TQT_SLOT(languageButton_activated(int)));
}
@@ -28,7 +28,7 @@ void WordCompletionUI::languageButton_activated (int) {
languageButton->setCurrentItem(customLanguage);
}
else {
- languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString());
+ languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::fromLatin1("l10n/"), TQString());
languageButton->setCurrentItem(customLanguage);
}
}
diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp
index 2403faf..a2068f2 100644
--- a/kmouth/wordcompletion/wordcompletionwidget.cpp
+++ b/kmouth/wordcompletion/wordcompletionwidget.cpp
@@ -71,11 +71,11 @@ public:
void setLanguage (TQString languageCode) {
TQString filename = KGlobal::dirs()->findResource("locale",
- languageCode + TQString::tqfromLatin1("/entry.desktop"));
+ languageCode + TQString::fromLatin1("/entry.desktop"));
KSimpleConfig entry(filename);
- entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
setLanguage (name + " (" + languageCode + ")", languageCode);
}
@@ -136,7 +136,7 @@ void WordCompletionWidget::load() {
config->readEntry("Name"),
languageTag);
if (!languageButton->containsTag(languageTag))
- languageButton->insertLanguage(languageTag, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString());
+ languageButton->insertLanguage(languageTag, i18n("without name"), TQString::fromLatin1("l10n/"), TQString());
}
// Clean up disc space
@@ -200,7 +200,7 @@ void WordCompletionWidget::addDictionary() {
newDictionaryFiles += filename;
TQString languageTag = wizard->language();
if (!languageButton->containsTag(languageTag)) {
- languageButton->insertLanguage(languageTag, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString());
+ languageButton->insertLanguage(languageTag, i18n("without name"), TQString::fromLatin1("l10n/"), TQString());
}
KListViewItem *item = new DictionaryListItem (dictionaryList,
filename, wizard->name(), languageTag);
diff --git a/kmouth/wordcompletion/wordlist.cpp b/kmouth/wordcompletion/wordlist.cpp
index 11a15a1..2e88852 100644
--- a/kmouth/wordcompletion/wordlist.cpp
+++ b/kmouth/wordcompletion/wordlist.cpp
@@ -228,7 +228,7 @@ WordMap parseFiles (TQStringList files, TQTextStream::Encoding encoding, TQTextC
if (steps != 0 && progress*100/steps > percent) {
percent = progress*100/steps;
pdlg->progressBar()->setProgress(percent);
- tqApp->tqprocessEvents (20);
+ tqApp->processEvents (20);
}
}
return map;
@@ -237,7 +237,7 @@ WordMap parseFiles (TQStringList files, TQTextStream::Encoding encoding, TQTextC
WordMap mergeFiles (TQMap<TQString,int> files, KProgressDialog *pdlg) {
pdlg->setLabel (i18n("Merging dictionaries..."));
pdlg->show();
- tqApp->tqprocessEvents (20);
+ tqApp->processEvents (20);
int progress = 0;
int steps = files.count();
@@ -269,7 +269,7 @@ WordMap mergeFiles (TQMap<TQString,int> files, KProgressDialog *pdlg) {
if (steps != 0 && progress*100/steps > percent) {
percent = progress*100/steps;
pdlg->progressBar()->setProgress(percent);
- tqApp->tqprocessEvents (20);
+ tqApp->processEvents (20);
}
}
@@ -290,7 +290,7 @@ WordMap mergeFiles (TQMap<TQString,int> files, KProgressDialog *pdlg) {
WordMap parseKDEDoc (TQString language, KProgressDialog *pdlg) {
pdlg->setLabel (i18n("Parsing the KDE documentation..."));
pdlg->show();
- tqApp->tqprocessEvents (20);
+ tqApp->processEvents (20);
TQStringList files = KApplication::kApplication()->dirs()->findAllResources ("html", language + "/*.docbook", true, true);
if ((files.count() == 0) && (language.length() == 5)) {
@@ -304,7 +304,7 @@ WordMap parseKDEDoc (TQString language, KProgressDialog *pdlg) {
WordMap parseFile (TQString filename, TQTextStream::Encoding encoding, TQTextCodec *codec, KProgressDialog *pdlg) {
pdlg->setLabel (i18n("Parsing file..."));
pdlg->show();
- tqApp->tqprocessEvents (20);
+ tqApp->processEvents (20);
TQStringList files = filename;
@@ -314,7 +314,7 @@ WordMap parseFile (TQString filename, TQTextStream::Encoding encoding, TQTextCod
WordMap parseDir (TQString directory, TQTextStream::Encoding encoding, TQTextCodec *codec, KProgressDialog *pdlg) {
pdlg->setLabel (i18n("Parsing directory..."));
pdlg->show();
- tqApp->tqprocessEvents (20);
+ tqApp->processEvents (20);
TQStringList directories;
directories += directory;
@@ -504,7 +504,7 @@ WordMap spellCheck (WordMap map, TQString dictionary, KProgressDialog *pdlg) {
pdlg->setLabel (i18n("Performing spell check..."));
pdlg->progressBar()->setTotalSteps(100);
pdlg->progressBar()->setProgress(0);
- tqApp->tqprocessEvents (20);
+ tqApp->processEvents (20);
int progress = 0;
int steps = 0;
int percent = 0;
@@ -535,7 +535,7 @@ WordMap spellCheck (WordMap map, TQString dictionary, KProgressDialog *pdlg) {
if (steps != 0 && progress*100/steps > percent) {
percent = progress*100/steps;
pdlg->progressBar()->setProgress(percent);
- tqApp->tqprocessEvents (20);
+ tqApp->processEvents (20);
}
}
}
diff --git a/ksayit/Freeverb_plugin/freeverb_setup.ui b/ksayit/Freeverb_plugin/freeverb_setup.ui
index 6172a8e..44e6e87 100644
--- a/ksayit/Freeverb_plugin/freeverb_setup.ui
+++ b/ksayit/Freeverb_plugin/freeverb_setup.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>360</width>
<height>300</height>
@@ -56,7 +56,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>260</height>
@@ -161,7 +161,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>260</height>
@@ -260,7 +260,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>260</height>
@@ -359,7 +359,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>260</height>
@@ -458,7 +458,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>260</height>
@@ -587,7 +587,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>180</width>
<height>20</height>
@@ -598,7 +598,7 @@
<property name="name">
<cstring>OK_Button</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>60</width>
<height>0</height>
diff --git a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
index 94f421a..9df5c07 100644
--- a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
+++ b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui
@@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -95,7 +95,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp
index 707ebab..342e43c 100644
--- a/ksayit/KTTSD_Lib/kttsdlib.cpp
+++ b/ksayit/KTTSD_Lib/kttsdlib.cpp
@@ -81,7 +81,7 @@ int KTTSDLib::getActions()
}
-int KTTSDLib::gettqStatus() const
+int KTTSDLib::getStatus() const
{
return TTS::AUDIOFILE;
}
diff --git a/ksayit/KTTSD_Lib/kttsdlib.h b/ksayit/KTTSD_Lib/kttsdlib.h
index d0e902b..d205b79 100644
--- a/ksayit/KTTSD_Lib/kttsdlib.h
+++ b/ksayit/KTTSD_Lib/kttsdlib.h
@@ -93,7 +93,7 @@ public:
void sayText();
- int gettqStatus() const;
+ int getStatus() const;
void stop();
diff --git a/ksayit/src/DocTreeView.ui b/ksayit/src/DocTreeView.ui
index 1222c83..be3c4d6 100644
--- a/ksayit/src/DocTreeView.ui
+++ b/ksayit/src/DocTreeView.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>200</height>
diff --git a/ksayit/src/KSayItView.ui b/ksayit/src/KSayItView.ui
index a95a90e..90d8332 100644
--- a/ksayit/src/KSayItView.ui
+++ b/ksayit/src/KSayItView.ui
@@ -23,7 +23,7 @@
<property name="name">
<cstring>TextEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>400</width>
<height>200</height>
diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp
index 98b76b1..8eb34ab 100644
--- a/ksayit/src/doctreeviewimpl.cpp
+++ b/ksayit/src/doctreeviewimpl.cpp
@@ -927,7 +927,7 @@ void DocTreeViewImpl::slotNewDate()
date->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') );
// get current date
TQString today;
- today = KGlobal::locale()->formatDate(TQDate::tqcurrentDate(Qt::LocalTime), true);
+ today = KGlobal::locale()->formatDate(TQDate::currentDate(Qt::LocalTime), true);
date->setText( 1, today);
date->setValue( KSayItGlobal::RAWDATA, today );
date->setValue( KSayItGlobal::RTFDATA, today );
diff --git a/ksayit/src/fx_setup.ui b/ksayit/src/fx_setup.ui
index 77f2cd9..fb7285e 100644
--- a/ksayit/src/fx_setup.ui
+++ b/ksayit/src/fx_setup.ui
@@ -50,7 +50,7 @@
<property name="name">
<cstring>listBox_Available</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>150</width>
<height>170</height>
@@ -77,7 +77,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -88,7 +88,7 @@
<property name="name">
<cstring>toolButton_add</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -105,7 +105,7 @@
<property name="name">
<cstring>toolButton_remove</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -157,7 +157,7 @@
<property name="name">
<cstring>listBox_Active</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>150</width>
<height>170</height>
@@ -189,7 +189,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp
index cefaba6..25db48a 100644
--- a/ksayit/src/ksayit.cpp
+++ b/ksayit/src/ksayit.cpp
@@ -322,12 +322,12 @@ void KSayItApp::initView()
{
// create the main widget
view = new KSayItViewImpl(this);
- view->setMinimumSize(view->tqsizeHint());
+ view->setMinimumSize(view->sizeHint());
setCentralWidget(view);
// connections
connect( view, TQT_SIGNAL(signalEnableCopyCut(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotEnableCopyCut(bool)));
- connect( view, TQT_SIGNAL(signalShowtqStatus(const TQString &)),
+ connect( view, TQT_SIGNAL(signalShowStatus(const TQString &)),
TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &)));
connect( view, TQT_SIGNAL(signalSetCaption(const TQString &)),
TQT_TQOBJECT(this), TQT_SLOT(slotSetCaption(const TQString &)));
diff --git a/ksayit/src/ksayitviewimpl.h b/ksayit/src/ksayitviewimpl.h
index 6128fe2..105c0f2 100644
--- a/ksayit/src/ksayitviewimpl.h
+++ b/ksayit/src/ksayitviewimpl.h
@@ -41,7 +41,7 @@ public:
signals:
void signalSetCaption(const TQString &caption);
- void signalShowtqStatus(const TQString &status);
+ void signalShowStatus(const TQString &status);
void signalEnableCopyCut(bool enable);
/** Emitted when the text in the TextEditor view cahnges.
diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp
index 298f32f..d8df70a 100644
--- a/ksayit/src/voicesetupdlg.cpp
+++ b/ksayit/src/voicesetupdlg.cpp
@@ -88,7 +88,7 @@ void VoiceSetupDlg::initFXPage()
connect( this, TQT_SIGNAL(signalReloadFX()), fxDialog, TQT_SLOT(slotReload()) );
// Disable/enable FX-Setup depending on TTS-libs capability
- int status = m_kttslib->gettqStatus() & TTS::AUDIOFILE;
+ int status = m_kttslib->getStatus() & TTS::AUDIOFILE;
if ( status ){
m_fxPage->setEnabled(true);
} else {
@@ -105,7 +105,7 @@ void VoiceSetupDlg::slotPageChanged(TQWidget *page)
if ( page != m_fxPage )
return;
- int status = m_kttslib->gettqStatus() & TTS::AUDIOFILE;
+ int status = m_kttslib->getStatus() & TTS::AUDIOFILE;
if ( status ){
m_fxPage->setEnabled(true);
} else {
@@ -120,7 +120,7 @@ void VoiceSetupDlg::slotOk()
{
kdDebug(100200) << "+++ entering VoiceSetupDlg::slotOK()" << endl;
- int status = m_kttslib->gettqStatus();
+ int status = m_kttslib->getStatus();
if ( (status & TTS::AUDIOFILE) == 0 ){
emit signalRemoveAllFX();
}
diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp
index 0460521..f0e60a7 100644
--- a/kttsd/filters/sbd/sbdconf.cpp
+++ b/kttsd/filters/sbd/sbdconf.cpp
@@ -64,7 +64,7 @@ SbdConf::SbdConf( TQWidget *parent, const char *name, const TQStringList& /*args
// Create configuration widget.
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "SbdConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ tqlayout->setAlignment (TQt::AlignTop);
m_widget = new SbdConfWidget(this, "SbdConfigWidget");
tqlayout->addWidget(m_widget);
diff --git a/kttsd/filters/stringreplacer/editreplacementwidget.ui b/kttsd/filters/stringreplacer/editreplacementwidget.ui
index d672bbd..8cf4d20 100644
--- a/kttsd/filters/stringreplacer/editreplacementwidget.ui
+++ b/kttsd/filters/stringreplacer/editreplacementwidget.ui
@@ -21,7 +21,7 @@
<verstretch>255</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
index ab71382..6ee17b5 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp
+++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp
@@ -69,7 +69,7 @@ StringReplacerConf::StringReplacerConf( TQWidget *parent, const char *name, cons
// Create configuration widget.
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "StringReplacerConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ tqlayout->setAlignment (TQt::AlignTop);
m_widget = new StringReplacerConfWidget(this, "StringReplacerConfigWidget");
tqlayout->addWidget(m_widget);
m_widget->substLView->setSortColumn(-1);
diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
index 73c5954..433de52 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
+++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
@@ -427,7 +427,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
index 350f845..e57bb06 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp
+++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp
@@ -57,7 +57,7 @@ TalkerChooserConf::TalkerChooserConf( TQWidget *parent, const char *name, const
// Create configuration widget.
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "TalkerChooserConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ tqlayout->setAlignment (TQt::AlignTop);
m_widget = new TalkerChooserConfWidget(this, "TalkerChooserConfigWidget");
tqlayout->addWidget(m_widget);
diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp
index c143f21..09b29cf 100644
--- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp
+++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp
@@ -51,7 +51,7 @@ XmlTransformerConf::XmlTransformerConf( TQWidget *parent, const char *name, cons
// Create configuration widget.
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "XmlTransformerConfWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ tqlayout->setAlignment (TQt::AlignTop);
m_widget = new XmlTransformerConfWidget(this, "XmlTransformerConfigWidget");
tqlayout->addWidget(m_widget);
diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp
index eeb6e91..11ce799 100644
--- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp
+++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp
@@ -373,13 +373,13 @@ void XmlTransformerProc::slotProcessExited(KProcess*)
void XmlTransformerProc::slotReceivedStdout(KProcess*, char* /*buffer*/, int /*buflen*/)
{
- // TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ // TQString buf = TQString::fromLatin1(buffer, buflen);
// kdDebug() << "XmlTransformerProc::slotReceivedStdout: Received from xsltproc: " << buf << endl;
}
void XmlTransformerProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
{
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "XmlTransformerProc::slotReceivedStderr: Received error from xsltproc: " << buf << endl;
}
diff --git a/kttsd/kcmkttsmgr/addtalkerwidget.ui b/kttsd/kcmkttsmgr/addtalkerwidget.ui
index 4769c21..99c511c 100644
--- a/kttsd/kcmkttsmgr/addtalkerwidget.ui
+++ b/kttsd/kcmkttsmgr/addtalkerwidget.ui
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>351</width>
<height>21</height>
@@ -115,7 +115,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>25</width>
<height>20</height>
@@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -166,7 +166,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>25</width>
<height>20</height>
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index c81feea..0c1c511 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -2093,7 +2093,7 @@ void KCMKttsMgr::configureFilter()
true,
true);
m_configDlg->setInitialSize(TQSize(600, 450), false);
- m_loadedFilterPlugIn->setMinimumSize(m_loadedFilterPlugIn->tqminimumSizeHint());
+ m_loadedFilterPlugIn->setMinimumSize(m_loadedFilterPlugIn->minimumSizeHint());
m_loadedFilterPlugIn->show();
m_configDlg->setMainWidget(m_loadedFilterPlugIn);
m_configDlg->setHelp("configure-filter", "kttsd");
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
index b5c7a6b..38e386e 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
+++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -407,7 +407,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -576,7 +576,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>152</width>
<height>20</height>
@@ -780,7 +780,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -975,7 +975,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1053,7 +1053,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>11</height>
@@ -1229,7 +1229,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>180</height>
@@ -1391,7 +1391,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -1408,7 +1408,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>90</width>
<height>20</height>
diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp
index 2deeb6d..725ba33 100644
--- a/kttsd/kcmkttsmgr/selectevent.cpp
+++ b/kttsd/kcmkttsmgr/selectevent.cpp
@@ -61,10 +61,10 @@ SelectEvent::SelectEvent(TQWidget* parent, const char* name, WFlags fl, const TQ
if ( !relativePath.isEmpty() )
{
KConfig* config = new KConfig(relativePath, true, false, "data");
- config->setGroup( TQString::tqfromLatin1("!Global!") );
- TQString icon = config->readEntry(TQString::tqfromLatin1("IconName"),
- TQString::tqfromLatin1("misc"));
- TQString description = config->readEntry( TQString::tqfromLatin1("Comment"),
+ config->setGroup( TQString::fromLatin1("!Global!") );
+ TQString icon = config->readEntry(TQString::fromLatin1("IconName"),
+ TQString::fromLatin1("misc"));
+ TQString description = config->readEntry( TQString::fromLatin1("Comment"),
i18n("No description available") );
delete config;
int index = relativePath.find( '/' );
@@ -89,7 +89,7 @@ void SelectEvent::slotEventSrcComboBox_activated(int index)
eventsListView->clear();
TQListViewItem* item = 0;
TQString eventSrc = m_eventSrcNames[index];
- TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" );
+ TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" );
KConfig* config = new KConfig( configFilename, true, false, "data" );
TQStringList eventNames = config->groupList();
uint eventNamesCount = eventNames.count();
@@ -99,8 +99,8 @@ void SelectEvent::slotEventSrcComboBox_activated(int index)
if ( eventName != "!Global!" )
{
config->setGroup( eventName );
- TQString eventDesc = config->readEntry( TQString::tqfromLatin1( "Comment" ),
- config->readEntry( TQString::tqfromLatin1( "Name" )));
+ TQString eventDesc = config->readEntry( TQString::fromLatin1( "Comment" ),
+ config->readEntry( TQString::fromLatin1( "Name" )));
if ( !item )
item = new KListViewItem( eventsListView, eventDesc, eventName );
else
diff --git a/kttsd/kttsd/talkermgr.cpp b/kttsd/kttsd/talkermgr.cpp
index 8d6264b..6af259e 100644
--- a/kttsd/kttsd/talkermgr.cpp
+++ b/kttsd/kttsd/talkermgr.cpp
@@ -134,7 +134,7 @@ int TalkerMgr::loadPlugIns(KConfig* config)
} else {
// Synchronous plugins are run in a separate thread.
// Init will start the thread and it will immediately go to sleep.
- TQString threadedPlugInName = TQString::tqfromLatin1("threaded") + desktopEntryName;
+ TQString threadedPlugInName = TQString::fromLatin1("threaded") + desktopEntryName;
ThreadedPlugIn* speechThread = new ThreadedPlugIn(speech,
this, threadedPlugInName.latin1());
speechThread->init(config, "Talker_" + talkerCode);
diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp
index 2d6477e..2c2101f 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.cpp
+++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp
@@ -163,7 +163,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) :
hbox3->setSpacing(6);
// Do not let button box stretch vertically.
- m_buttonBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+ m_buttonBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
// All the buttons with "job_" at start of their names will be enabled/disabled when a job is
// selected in the Job List View.
@@ -274,7 +274,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) :
// Create a label for current sentence.
TQLabel* currentSentenceLabel = new TQLabel(sentenceVBox);
- currentSentenceLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+ currentSentenceLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
currentSentenceLabel->setText(i18n("Current Sentence"));
// Create a box to contain the current sentence.
@@ -518,7 +518,7 @@ void KttsJobMgrPart::slot_speak_clipboard()
{
if (supportsMarkup(NULL, KSpeech::mtHtml))
{
- TQByteArray d = data->tqencodedData("text/html");
+ TQByteArray d = data->encodedData("text/html");
text = TQString(d);
}
}
@@ -526,7 +526,7 @@ void KttsJobMgrPart::slot_speak_clipboard()
{
if (supportsMarkup(NULL, KSpeech::mtSsml))
{
- TQByteArray d = data->tqencodedData("text/ssml");
+ TQByteArray d = data->encodedData("text/ssml");
text = TQString(d);
}
}
diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp
index cd3a0c1..2e20e7b 100644
--- a/kttsd/kttsmgr/kttsmgr.cpp
+++ b/kttsd/kttsmgr/kttsmgr.cpp
@@ -155,7 +155,7 @@ KttsToolTip::KttsToolTip ( TQWidget* parent ) : TQToolTip(parent)
TQString status = "<qt><b>KTTSMgr</b> - ";
status += i18n("<qt>Text-to-Speech Manager");
status += "<br/><br/>";
- status += kttsMgrTray->gettqStatus();
+ status += kttsMgrTray->getStatus();
status += "</qt>";
tip(r, status);
@@ -257,7 +257,7 @@ TQString KttsMgrTray::stateToStr(int state)
}
}
-TQString KttsMgrTray::gettqStatus()
+TQString KttsMgrTray::getStatus()
{
if (!isKttsdRunning()) return i18n("Text-to-Speech System is not running");
uint jobCount = getTextJobCount();
diff --git a/kttsd/kttsmgr/kttsmgr.h b/kttsd/kttsmgr/kttsmgr.h
index a2a99df..92245da 100644
--- a/kttsd/kttsmgr/kttsmgr.h
+++ b/kttsd/kttsmgr/kttsmgr.h
@@ -55,7 +55,7 @@ class KttsMgrTray: public KSystemTray, public KSpeech_stub, virtual public KSpee
~KttsMgrTray();
void setExitWhenFinishedSpeaking();
- TQString gettqStatus();
+ TQString getStatus();
protected:
// ASYNC textStarted(const TQCString& appId, uint jobNum);
diff --git a/kttsd/libkttsd/notify.cpp b/kttsd/libkttsd/notify.cpp
index a226675..bd2fbd1 100644
--- a/kttsd/libkttsd/notify.cpp
+++ b/kttsd/libkttsd/notify.cpp
@@ -148,9 +148,9 @@ static void notifypresent_init()
*/
/*static*/ TQString NotifyEvent::getEventSrcName(const TQString& eventSrc, TQString& iconName)
{
- TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" );
+ TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" );
KConfig* config = new KConfig( configFilename, true, false, "data" );
- config->setGroup( TQString::tqfromLatin1( "!Global!" ) );
+ config->setGroup( TQString::fromLatin1( "!Global!" ) );
TQString appDesc = config->readEntry( "Comment", i18n("No description available") );
iconName = config->readEntry( "IconName" );
delete config;
@@ -163,13 +163,13 @@ static void notifypresent_init()
/*static*/ TQString NotifyEvent::getEventName(const TQString& eventSrc, const TQString& event)
{
TQString eventName;
- TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" );
+ TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" );
KConfig* config = new KConfig( configFilename, true, false, "data" );
if ( config->hasGroup( event ) )
{
config->setGroup( event );
- eventName = config->readEntry( TQString::tqfromLatin1( "Comment" ),
- config->readEntry( TQString::tqfromLatin1( "Name" )));
+ eventName = config->readEntry( TQString::fromLatin1( "Comment" ),
+ config->readEntry( TQString::fromLatin1( "Name" )));
}
delete config;
return eventName;
diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui
index 6a0541b..8c30cbf 100644
--- a/kttsd/libkttsd/selecttalkerwidget.ui
+++ b/kttsd/libkttsd/selecttalkerwidget.ui
@@ -93,7 +93,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -442,7 +442,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp
index 9045f14..d10b051 100644
--- a/kttsd/plugins/command/commandconf.cpp
+++ b/kttsd/plugins/command/commandconf.cpp
@@ -50,7 +50,7 @@ CommandConf::CommandConf( TQWidget* parent, const char* name, const TQStringList
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "CommandConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ tqlayout->setAlignment (TQt::AlignTop);
m_widget = new CommandConfWidget(this, "CommandConfigWidget");
tqlayout->addWidget(m_widget);
diff --git a/kttsd/plugins/command/commandconfwidget.ui b/kttsd/plugins/command/commandconfwidget.ui
index 8db709c..7b61d06 100644
--- a/kttsd/plugins/command/commandconfwidget.ui
+++ b/kttsd/plugins/command/commandconfwidget.ui
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>201</width>
<height>20</height>
@@ -187,7 +187,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp
index d1eb223..062dc02 100644
--- a/kttsd/plugins/command/commandproc.cpp
+++ b/kttsd/plugins/command/commandproc.cpp
@@ -382,13 +382,13 @@ void CommandProc::slotProcessExited(KProcess*)
void CommandProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
{
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "CommandProc::slotReceivedStdout: Received output from Command: " << buf << endl;
}
void CommandProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
{
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "CommandProc::slotReceivedStderr: Received error from Command: " << buf << endl;
}
diff --git a/kttsd/plugins/epos/eposconf.cpp b/kttsd/plugins/epos/eposconf.cpp
index a755ac8..889916c 100644
--- a/kttsd/plugins/epos/eposconf.cpp
+++ b/kttsd/plugins/epos/eposconf.cpp
@@ -57,7 +57,7 @@ EposConf::EposConf( TQWidget* parent, const char* name, const TQStringList& /*ar
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "EposConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ tqlayout->setAlignment (TQt::AlignTop);
m_widget = new EposConfWidget(this, "EposConfigWidget");
tqlayout->addWidget(m_widget);
diff --git a/kttsd/plugins/epos/eposconfwidget.ui b/kttsd/plugins/epos/eposconfwidget.ui
index 1c5c0d8..8bbf8fc 100644
--- a/kttsd/plugins/epos/eposconfwidget.ui
+++ b/kttsd/plugins/epos/eposconfwidget.ui
@@ -559,7 +559,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>410</width>
<height>20</height>
diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp
index 670a1c4..c5b49c0 100644
--- a/kttsd/plugins/epos/eposproc.cpp
+++ b/kttsd/plugins/epos/eposproc.cpp
@@ -326,13 +326,13 @@ void EposProc::slotProcessExited(KProcess*)
void EposProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
{
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "EposProc::slotReceivedStdout: Received output from Epos: " << buf << endl;
}
void EposProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
{
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "EposProc::slotReceivedStderr: Received error from Epos: " << buf << endl;
}
diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp
index 10a3ad9..590d6de 100644
--- a/kttsd/plugins/festivalint/festivalintconf.cpp
+++ b/kttsd/plugins/festivalint/festivalintconf.cpp
@@ -67,7 +67,7 @@ FestivalIntConf::FestivalIntConf( TQWidget* parent, const char* name, const TQSt
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "FestivalIntConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ tqlayout->setAlignment (TQt::AlignTop);
m_widget = new FestivalIntConfWidget(this, "FestivalIntConfigWidget");
tqlayout->addWidget(m_widget);
diff --git a/kttsd/plugins/festivalint/festivalintconfwidget.ui b/kttsd/plugins/festivalint/festivalintconfwidget.ui
index 470ec7d..c6b8b4b 100644
--- a/kttsd/plugins/festivalint/festivalintconfwidget.ui
+++ b/kttsd/plugins/festivalint/festivalintconfwidget.ui
@@ -498,7 +498,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>20</height>
diff --git a/kttsd/plugins/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp
index 6e3a9f3..6cf06e5 100644
--- a/kttsd/plugins/festivalint/festivalintproc.cpp
+++ b/kttsd/plugins/festivalint/festivalintproc.cpp
@@ -500,7 +500,7 @@ void FestivalIntProc::slotProcessExited(KProcess*)
void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
{
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
// kdDebug() << "FestivalIntProc::slotReceivedStdout: Received from Festival: " << buf << endl;
bool promptSeen = (buf.contains("festival>") > 0);
bool emitQueryVoicesFinished = false;
@@ -569,7 +569,7 @@ void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
void FestivalIntProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
{
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "FestivalIntProc::slotReceivedStderr: Received error from Festival: " << buf << endl;
}
diff --git a/kttsd/plugins/flite/fliteconf.cpp b/kttsd/plugins/flite/fliteconf.cpp
index 076fcb0..7a1068a 100644
--- a/kttsd/plugins/flite/fliteconf.cpp
+++ b/kttsd/plugins/flite/fliteconf.cpp
@@ -51,7 +51,7 @@ FliteConf::FliteConf( TQWidget* parent, const char* name, const TQStringList& /*
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "FliteConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ tqlayout->setAlignment (TQt::AlignTop);
m_widget = new FliteConfWidget(this, "FliteConfigWidget");
tqlayout->addWidget(m_widget);
diff --git a/kttsd/plugins/flite/fliteconfwidget.ui b/kttsd/plugins/flite/fliteconfwidget.ui
index 21d2471..e2a3ba5 100644
--- a/kttsd/plugins/flite/fliteconfwidget.ui
+++ b/kttsd/plugins/flite/fliteconfwidget.ui
@@ -41,7 +41,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>100</height>
@@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>221</width>
<height>20</height>
diff --git a/kttsd/plugins/flite/fliteproc.cpp b/kttsd/plugins/flite/fliteproc.cpp
index 238cf26..3f0df60 100644
--- a/kttsd/plugins/flite/fliteproc.cpp
+++ b/kttsd/plugins/flite/fliteproc.cpp
@@ -218,13 +218,13 @@ void FliteProc::slotProcessExited(KProcess*)
void FliteProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
{
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "FliteProc::slotReceivedStdout: Received output from Flite: " << buf << endl;
}
void FliteProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
{
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "FliteProc::slotReceivedStderr: Received error from Flite: " << buf << endl;
}
diff --git a/kttsd/plugins/freetts/freettsconf.cpp b/kttsd/plugins/freetts/freettsconf.cpp
index 87f12b4..81b63e7 100644
--- a/kttsd/plugins/freetts/freettsconf.cpp
+++ b/kttsd/plugins/freetts/freettsconf.cpp
@@ -49,7 +49,7 @@ FreeTTSConf::FreeTTSConf( TQWidget* parent, const char* name, const TQStringList
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint(), "FreeTTSConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ tqlayout->setAlignment (TQt::AlignTop);
m_widget = new FreeTTSConfWidget(this, "FreeTTSConfigWidget");
tqlayout->addWidget(m_widget);
diff --git a/kttsd/plugins/freetts/freettsconfigwidget.ui b/kttsd/plugins/freetts/freettsconfigwidget.ui
index 0fd8f62..e74a452 100644
--- a/kttsd/plugins/freetts/freettsconfigwidget.ui
+++ b/kttsd/plugins/freetts/freettsconfigwidget.ui
@@ -38,7 +38,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -164,7 +164,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>410</width>
<height>20</height>
diff --git a/kttsd/plugins/freetts/freettsproc.cpp b/kttsd/plugins/freetts/freettsproc.cpp
index e99cd73..c7b2200 100644
--- a/kttsd/plugins/freetts/freettsproc.cpp
+++ b/kttsd/plugins/freetts/freettsproc.cpp
@@ -206,12 +206,12 @@ void FreeTTSProc::slotProcessExited(KProcess*) {
}
void FreeTTSProc::slotReceivedStdout(KProcess*, char* buffer, int buflen) {
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "FreeTTSProc::slotReceivedStdout: Received output from FreeTTS: " << buf << endl;
}
void FreeTTSProc::slotReceivedStderr(KProcess*, char* buffer, int buflen) {
- TQString buf = TQString::tqfromLatin1(buffer, buflen);
+ TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "FreeTTSProc::slotReceivedStderr: Received error from FreeTTS: " << buf << endl;
}
diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp
index 798455c..6ff806f 100644
--- a/kttsd/plugins/hadifix/hadifixconf.cpp
+++ b/kttsd/plugins/hadifix/hadifixconf.cpp
@@ -207,7 +207,7 @@ HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList
PlugInConf( parent, name ){
// kdDebug() << "HadifixConf::HadifixConf: Running" << endl;
TQVBoxLayout *tqlayout = new TQVBoxLayout (this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout");
- tqlayout->tqsetAlignment (TQt::AlignTop);
+ tqlayout->setAlignment (TQt::AlignTop);
d = new HadifixConfPrivate();
d->configWidget = new HadifixConfigUI (this, "configWidget");
diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui
index a280945..51acf94 100644
--- a/kttsd/plugins/hadifix/hadifixconfigui.ui
+++ b/kttsd/plugins/hadifix/hadifixconfigui.ui
@@ -525,7 +525,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>240</width>
<height>20</height>
diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp
index 4c3f85f..9f6a5d6 100644
--- a/kttsd/plugins/hadifix/hadifixproc.cpp
+++ b/kttsd/plugins/hadifix/hadifixproc.cpp
@@ -389,11 +389,11 @@ HadifixProc::VoiceGender HadifixProc::determineGender(TQString mbrola, TQString
}
void HadifixProc::receivedStdout (KProcess *, char *buffer, int buflen) {
- stdOut += TQString::tqfromLatin1(buffer, buflen);
+ stdOut += TQString::fromLatin1(buffer, buflen);
}
void HadifixProc::receivedStderr (KProcess *, char *buffer, int buflen) {
- stdErr += TQString::tqfromLatin1(buffer, buflen);
+ stdErr += TQString::fromLatin1(buffer, buflen);
}
/**