summaryrefslogtreecommitdiffstats
path: root/ksayit/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:44:52 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:44:52 -0600
commit23aecb275d6085b7a15a38da0180edf156c8ea9d (patch)
tree1acc5451905a1fdd8b967d901399226fe72d8d03 /ksayit/src
parent2d8b424e2324165d85cb4694a58464c6d7022f45 (diff)
downloadtdeaccessibility-23aecb275d6085b7a15a38da0180edf156c8ea9d.tar.gz
tdeaccessibility-23aecb275d6085b7a15a38da0180edf156c8ea9d.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'ksayit/src')
-rw-r--r--ksayit/src/DocTreeView.ui2
-rw-r--r--ksayit/src/KSayItView.ui2
-rw-r--r--ksayit/src/docbookclasses.cpp2
-rw-r--r--ksayit/src/docbookgenerator.h2
-rw-r--r--ksayit/src/docbookparser.cpp34
-rw-r--r--ksayit/src/doctreeviewimpl.cpp42
-rw-r--r--ksayit/src/fx_setup.ui24
-rw-r--r--ksayit/src/ksayit.cpp10
-rw-r--r--ksayit/src/ksayit.h4
-rw-r--r--ksayit/src/ksayitviewimpl.cpp2
-rw-r--r--ksayit/src/ksayitviewimpl.h2
-rw-r--r--ksayit/src/saxhandler.cpp4
-rw-r--r--ksayit/src/voicesetupdlg.cpp8
13 files changed, 69 insertions, 69 deletions
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/docbookclasses.cpp b/ksayit/src/docbookclasses.cpp
index 60a7bde..695c22e 100644
--- a/ksayit/src/docbookclasses.cpp
+++ b/ksayit/src/docbookclasses.cpp
@@ -11,7 +11,7 @@
//
// TQt includes
#include <tqwidget.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqpixmap.h>
#include <tqregexp.h>
#include <tqstringlist.h>
diff --git a/ksayit/src/docbookgenerator.h b/ksayit/src/docbookgenerator.h
index 109d0c5..392c406 100644
--- a/ksayit/src/docbookgenerator.h
+++ b/ksayit/src/docbookgenerator.h
@@ -13,7 +13,7 @@
#define DOCBOOKGENERATOR_H
// TQt includes
-#include <tqtextstream.h>
+#include <textstream.h>
// KDE includes
diff --git a/ksayit/src/docbookparser.cpp b/ksayit/src/docbookparser.cpp
index 8a5baa1..a48858e 100644
--- a/ksayit/src/docbookparser.cpp
+++ b/ksayit/src/docbookparser.cpp
@@ -13,7 +13,7 @@
// TQt includes
#include <tqregexp.h>
#include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
//KDE includes
#include <kdebug.h>
@@ -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 98b76b1..17e5dc0 100644
--- a/ksayit/src/doctreeviewimpl.cpp
+++ b/ksayit/src/doctreeviewimpl.cpp
@@ -15,7 +15,7 @@
#include <tqdom.h>
#include <tqfile.h>
#include <tqwidget.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqregexp.h>
#include <tqdatetime.h>
#include <tqcolor.h>
@@ -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,10 +924,10 @@ 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::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 );
@@ -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/fx_setup.ui b/ksayit/src/fx_setup.ui
index 77f2cd9..4e9e975 100644
--- a/ksayit/src/fx_setup.ui
+++ b/ksayit/src/fx_setup.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -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>
@@ -61,7 +61,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -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>
@@ -139,7 +139,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -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>
@@ -173,7 +173,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -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..101bd86 100644
--- a/ksayit/src/ksayit.cpp
+++ b/ksayit/src/ksayit.cpp
@@ -92,7 +92,7 @@ KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f,
TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()) );
// init Clipboard
- cb = TQApplication::tqclipboard();
+ cb = TQApplication::clipboard();
connect(cb, TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotClipboardChanged()) );
// create SystemTray object
@@ -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
@@ -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 &)));
@@ -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..56949ec 100644
--- a/ksayit/src/ksayit.h
+++ b/ksayit/src/ksayit.h
@@ -26,7 +26,7 @@ using namespace std;
// include files for TQt
#include <tqstringlist.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
// include files for KDE
#include <kapplication.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/ksayitviewimpl.cpp b/ksayit/src/ksayitviewimpl.cpp
index e3eb5ee..5c1b697 100644
--- a/ksayit/src/ksayitviewimpl.cpp
+++ b/ksayit/src/ksayitviewimpl.cpp
@@ -21,7 +21,7 @@ using namespace std;
// QT includes
#include <tqradiobutton.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstring.h>
// KDE includes
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/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/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp
index 298f32f..7135dbd 100644
--- a/ksayit/src/voicesetupdlg.cpp
+++ b/ksayit/src/voicesetupdlg.cpp
@@ -23,7 +23,7 @@
#include <tqstringlist.h>
#include <tqcombobox.h>
#include <tqcolor.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwidget.h>
// KDE includes
@@ -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();
}