summaryrefslogtreecommitdiffstats
path: root/ksayit/src
diff options
context:
space:
mode:
Diffstat (limited to 'ksayit/src')
-rw-r--r--ksayit/src/docbookclasses.cpp6
-rw-r--r--ksayit/src/docbookparser.cpp6
-rw-r--r--ksayit/src/doctreeviewimpl.cpp12
-rw-r--r--ksayit/src/fxpluginhandler.cpp10
-rw-r--r--ksayit/src/fxsetupimpl.cpp2
5 files changed, 18 insertions, 18 deletions
diff --git a/ksayit/src/docbookclasses.cpp b/ksayit/src/docbookclasses.cpp
index 5f0fa00..901d494 100644
--- a/ksayit/src/docbookclasses.cpp
+++ b/ksayit/src/docbookclasses.cpp
@@ -389,9 +389,9 @@ Author::~Author()
// {
// // canonify string
// TQString m_data = data;
-// m_data.tqreplace( TQRegExp("\n"), "" ); // remove Newlines
-// m_data.tqreplace( TQRegExp(" {2,}"), " " ); // remove multiple spaces
-// m_data.tqreplace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs
+// m_data.replace( TQRegExp("\n"), "" ); // remove Newlines
+// m_data.replace( TQRegExp(" {2,}"), " " ); // remove multiple spaces
+// m_data.replace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs
// // split string "firstname surname"
// TQString firstname = m_data.section(' ', 0, 0);
// TQString surname = m_data.section(' ', 1, 1);
diff --git a/ksayit/src/docbookparser.cpp b/ksayit/src/docbookparser.cpp
index f1e0c51..8a5baa1 100644
--- a/ksayit/src/docbookparser.cpp
+++ b/ksayit/src/docbookparser.cpp
@@ -479,9 +479,9 @@ void DocbookParser::parsePara(const TQDomElement &element, ListViewInterface *it
TQString raw = node2raw(element);
// remove <para> tags
- raw.tqreplace( TQRegExp("</?(para|Para|PARA)/?>"),"");
- raw.tqreplace( TQRegExp("^ "),"" );
- raw.tqreplace( TQRegExp("^\n"), "" );
+ raw.replace( TQRegExp("</?(para|Para|PARA)/?>"),"");
+ raw.replace( TQRegExp("^ "),"" );
+ raw.replace( TQRegExp("^\n"), "" );
para->setValue(KSayItGlobal::RAWDATA, raw);
para->setValue(KSayItGlobal::RTFDATA, raw);
diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp
index db6ed32..c4b9797 100644
--- a/ksayit/src/doctreeviewimpl.cpp
+++ b/ksayit/src/doctreeviewimpl.cpp
@@ -197,7 +197,7 @@ void DocTreeViewImpl::openFile(const KURL &url)
TQString line;
int offset;
file.readLine( line, file.size() );
- while( !file.atEnd() && (offset = line.tqfind("<book", 0, false)) < 0 ){
+ while( !file.atEnd() && (offset = line.find("<book", 0, false)) < 0 ){
header += line;
file.readLine( line, file.size() );
}
@@ -391,9 +391,9 @@ void DocTreeViewImpl::setEditMode(bool mode)
void DocTreeViewImpl::makeToSingleLine( TQString &content )
{
// canonify string
- content.tqreplace( TQRegExp("\n"), "" ); // remove Newlines
- content.tqreplace( TQRegExp(" {2,}"), " " ); // remove multiple spaces
- content.tqreplace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs
+ content.replace( TQRegExp("\n"), "" ); // remove Newlines
+ content.replace( TQRegExp(" {2,}"), " " ); // remove multiple spaces
+ content.replace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs
}
@@ -594,8 +594,8 @@ TQString DocTreeViewImpl::getItemTitle( ListViewInterface *item )
title = ( item->getValue(KSayItGlobal::SPEAKERDATA) ).toString().left(32);
// canonify string
- title.tqreplace( TQRegExp("^( |\t|\n)+"), "");
- title.tqreplace( TQRegExp("( |\t|\n)$+"), "");
+ title.replace( TQRegExp("^( |\t|\n)+"), "");
+ title.replace( TQRegExp("( |\t|\n)$+"), "");
} else {
title = col0.left(32);
}
diff --git a/ksayit/src/fxpluginhandler.cpp b/ksayit/src/fxpluginhandler.cpp
index fc5ed5d..a923f5c 100644
--- a/ksayit/src/fxpluginhandler.cpp
+++ b/ksayit/src/fxpluginhandler.cpp
@@ -70,7 +70,7 @@ void FXPluginHandler::searchPlugins()
if ( factory ){
kdDebug(100200) << "FXPluginHandler::searchPlugins(): Plugin factory found." << endl;
// register found plugin
- if ( !sRegistered.tqcontains( TQString(name) )){
+ if ( !sRegistered.contains( TQString(name) )){
sRegistered.append( TQString(name) );
plugin.name = name;
plugin.library = library;
@@ -96,7 +96,7 @@ void FXPluginHandler::readConfiguration()
// unload all plugins and destroy the effect objects
lit = m_lstActivePlugins.begin();
while ( lit != m_lstActivePlugins.end() ){
- mit = m_mapPluginList.tqfind( *lit );
+ mit = m_mapPluginList.find( *lit );
if ( mit!=m_mapPluginList.end() ){
plugin = *mit;
if ( (plugin.p != NULL) && (plugin.EffectID == 0) ){
@@ -116,7 +116,7 @@ void FXPluginHandler::readConfiguration()
KLibFactory *factory = NULL;
for (lit=conf_active.begin(); lit!=conf_active.end(); ++lit){ // for all in config
- mit = m_mapPluginList.tqfind(*lit);
+ mit = m_mapPluginList.find(*lit);
if( mit!=m_mapPluginList.end() ){
// plugin found in list of registered plugins
plugin = *mit;
@@ -146,7 +146,7 @@ void FXPluginHandler::showEffectGUI(const TQString &pname)
fx_struct plugin;
// find plugin with name==pname in list and show its GUI
- mit = m_mapPluginList.tqfind(pname);
+ mit = m_mapPluginList.find(pname);
if ( mit != m_mapPluginList.end() ){
plugin = *mit;
if ( plugin.p != NULL ){ // plugin loaded
@@ -198,7 +198,7 @@ void FXPluginHandler::activateEffect(const TQString &pname,
fx_struct plugin;
// find plugin with name==pname
- mit = m_mapPluginList.tqfind(pname);
+ mit = m_mapPluginList.find(pname);
if ( mit!=m_mapPluginList.end() ){
plugin = *mit;
if ( plugin.p != NULL ){
diff --git a/ksayit/src/fxsetupimpl.cpp b/ksayit/src/fxsetupimpl.cpp
index 9f18b81..c066f88 100644
--- a/ksayit/src/fxsetupimpl.cpp
+++ b/ksayit/src/fxsetupimpl.cpp
@@ -109,7 +109,7 @@ void FX_SetupImpl::Init(TQStringList c_avail)
pushButton_removeAll->setEnabled(false);
for (sit=conf_active.begin(); sit!=conf_active.end(); ++sit){
- it = c_avail.tqfind(*sit);
+ it = c_avail.find(*sit);
if ( it!=c_avail.end() ){ // active plugin as per config-file in pluginlist found
c_active.append(*sit); // append to active list
c_avail.remove(*sit); // remove active plugin from the list of avail plugins