diff options
Diffstat (limited to 'kttsd/libkttsd')
| -rw-r--r-- | kttsd/libkttsd/notify.cpp | 4 | ||||
| -rw-r--r-- | kttsd/libkttsd/talkercode.cpp | 2 | ||||
| -rw-r--r-- | kttsd/libkttsd/utils.cpp | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/kttsd/libkttsd/notify.cpp b/kttsd/libkttsd/notify.cpp index f21f813..a226675 100644 --- a/kttsd/libkttsd/notify.cpp +++ b/kttsd/libkttsd/notify.cpp @@ -68,7 +68,7 @@ static void notifyaction_init() /*static*/ int NotifyAction::action( const TQString& actionName ) { notifyaction_init(); - return s_actionNames->tqfindIndex( actionName ); + return s_actionNames->findIndex( actionName ); } /*static*/ TQString NotifyAction::actionDisplayName( const int action ) @@ -126,7 +126,7 @@ static void notifypresent_init() /*static*/ int NotifyPresent::present( const TQString& presentName ) { notifypresent_init(); - return s_presentNames->tqfindIndex( presentName ); + return s_presentNames->findIndex( presentName ); } /*static*/ TQString NotifyPresent::presentDisplayName( const int present ) diff --git a/kttsd/libkttsd/talkercode.cpp b/kttsd/libkttsd/talkercode.cpp index 2b3fbcf..53be627 100644 --- a/kttsd/libkttsd/talkercode.cpp +++ b/kttsd/libkttsd/talkercode.cpp @@ -304,7 +304,7 @@ void TalkerCode::normalize() void TalkerCode::parseTalkerCode(const TQString &talkerCode) { TQString fullLanguageCode; - if (talkerCode.tqcontains("\"")) + if (talkerCode.contains("\"")) { fullLanguageCode = talkerCode.section("lang=", 1, 1); fullLanguageCode = fullLanguageCode.section('"', 1, 1); diff --git a/kttsd/libkttsd/utils.cpp b/kttsd/libkttsd/utils.cpp index df24e35..57bfe18 100644 --- a/kttsd/libkttsd/utils.cpp +++ b/kttsd/libkttsd/utils.cpp @@ -41,7 +41,7 @@ bool KttsUtils::hasRootElement(const TQString &xmldoc, const TQString &elementNa if(doc.startsWith("<?xml")) { // Look for ?> and strip everything off from there to the start - effectively removing // <?xml...?> - int xmlStatementEnd = doc.tqfind("?>"); + int xmlStatementEnd = doc.find("?>"); if(xmlStatementEnd == -1) { kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n"; return false; @@ -51,7 +51,7 @@ bool KttsUtils::hasRootElement(const TQString &xmldoc, const TQString &elementNa } // Take off leading comments, if they exist. while(doc.startsWith("<!--") || doc.startsWith(" <!--")) { - int commentStatementEnd = doc.tqfind("-->"); + int commentStatementEnd = doc.find("-->"); if(commentStatementEnd == -1) { kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n"; return false; @@ -61,7 +61,7 @@ bool KttsUtils::hasRootElement(const TQString &xmldoc, const TQString &elementNa } // Take off the doctype statement if it exists. while(doc.startsWith("<!DOCTYPE") || doc.startsWith(" <!DOCTYPE")) { - int doctypeStatementEnd = doc.tqfind(">"); + int doctypeStatementEnd = doc.find(">"); if(doctypeStatementEnd == -1) { kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n"; return false; @@ -88,7 +88,7 @@ bool KttsUtils::hasDoctype(const TQString &xmldoc, const TQString &name/*, const if(doc.startsWith("<?xml")) { // Look for ?> and strip everything off from there to the start - effectively removing // <?xml...?> - int xmlStatementEnd = doc.tqfind("?>"); + int xmlStatementEnd = doc.find("?>"); if(xmlStatementEnd == -1) { kdDebug() << "KttsUtils::hasDoctype: Bad XML file syntax\n"; return false; @@ -99,7 +99,7 @@ bool KttsUtils::hasDoctype(const TQString &xmldoc, const TQString &name/*, const } // Take off leading comments, if they exist. while(doc.startsWith("<!--")) { - int commentStatementEnd = doc.tqfind("-->"); + int commentStatementEnd = doc.find("-->"); if(commentStatementEnd == -1) { kdDebug() << "KttsUtils::hasDoctype: Bad XML file syntax\n"; return false; |