1 files changed, 28 insertions, 28 deletions

diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp
index cbe3f6d7e..4bedf8806 100644
--- a/libkcal/htmlexport.cpp
+++ b/libkcal/htmlexport.cpp
@@ -172,14 +172,14 @@ void HtmlExport::createMonthView(TQTextStream *ts)
         *ts << "    <td valign=\"top\"><table border=\"0\">";
 
         *ts << "<tr><td ";
-        if (mHolidayMap.tqcontains(start) || start.dayOfWeek() == 7) {
+        if (mHolidayMap.contains(start) || start.dayOfWeek() == 7) {
           *ts << "class=\"dateholiday\"";
         } else {
           *ts << "class=\"date\"";
         }
         *ts << ">" << TQString::number(start.day());
 
-        if (mHolidayMap.tqcontains(start)) {
+        if (mHolidayMap.contains(start)) {
           *ts << " <em>" << mHolidayMap[start] << "</em>";
         }
 
@@ -332,13 +332,13 @@ void HtmlExport::createTodoList ( TQTextStream *ts )
     Todo *subev = ev;
     if ( ev->relatedTo() ) {
       if ( ev->relatedTo()->type()=="Todo" ) {
-        if ( rawTodoList.tqfind( static_cast<Todo *>( ev->relatedTo() ) ) ==
+        if ( rawTodoList.find( static_cast<Todo *>( ev->relatedTo() ) ) ==
              rawTodoList.end() ) {
           rawTodoList.append( static_cast<Todo *>( ev->relatedTo() ) );
         }
       }
     }
-    it = rawTodoList.tqfind( subev );
+    it = rawTodoList.find( subev );
     ++it;
   }
 
@@ -589,7 +589,7 @@ void HtmlExport::formatAttendees( TQTextStream *ts, Incidence *event )
 
 TQString HtmlExport::breakString(const TQString &text)
 {
-  int number = text.tqcontains("\n");
+  int number = text.contains("\n");
   if(number < 0) {
     return text;
   } else {
@@ -598,7 +598,7 @@ TQString HtmlExport::breakString(const TQString &text)
     int pos = 0;
     TQString tmp;
     for(int i=0;i<=number;i++) {
-      pos = tmpText.tqfind("\n");
+      pos = tmpText.find("\n");
       tmp = tmpText.left(pos);
       tmpText = tmpText.right(tmpText.length() - pos - 1);
       out += tmp + "<br />";
@@ -640,28 +640,28 @@ void HtmlExport::createFooter( TQTextStream *ts )
 TQString HtmlExport::cleanChars(const TQString &text)
 {
   TQString txt = text;
-  txt = txt.tqreplace( "&", "&amp;" );
-  txt = txt.tqreplace( "<", "&lt;" );
-  txt = txt.tqreplace( ">", "&gt;" );
-  txt = txt.tqreplace( "\"", "&quot;" );
-  txt = txt.tqreplace( TQString::fromUtf8("ä"), "&auml;" );
-  txt = txt.tqreplace( TQString::fromUtf8("á"), "&aacute;" );
-  txt = txt.tqreplace( TQString::fromUtf8("à"), "&agrave;" );
-  txt = txt.tqreplace( TQString::fromUtf8("â"), "&acirc;" );
-  txt = txt.tqreplace( TQString::fromUtf8("Ä"), "&Auml;" );
-  txt = txt.tqreplace( TQString::fromUtf8("ó"), "&oacute;" );
-  txt = txt.tqreplace( TQString::fromUtf8("ô"), "&ocirc;" );
-  txt = txt.tqreplace( TQString::fromUtf8("ö"), "&ouml;" );
-  txt = txt.tqreplace( TQString::fromUtf8("Ö"), "&Ouml;" );
-  txt = txt.tqreplace( TQString::fromUtf8("ü"), "&uuml;" );
-  txt = txt.tqreplace( TQString::fromUtf8("Ü"), "&Uuml;" );
-  txt = txt.tqreplace( TQString::fromUtf8("ß"), "&szlig;" );
-  txt = txt.tqreplace( TQString::fromUtf8("€"), "&euro;" );
-  txt = txt.tqreplace( TQString::fromUtf8("é"), "&eacute;" );
-  txt = txt.tqreplace( TQString::fromUtf8("ë"), "&euml;" );
-  txt = txt.tqreplace( TQString::fromUtf8("è"), "&egrave;" );
-  txt = txt.tqreplace( TQString::fromUtf8("ñ"), "&ntilde;" );
-  txt = txt.tqreplace( TQString::fromUtf8("ç"), "&ccedil;" );
+  txt = txt.replace( "&", "&amp;" );
+  txt = txt.replace( "<", "&lt;" );
+  txt = txt.replace( ">", "&gt;" );
+  txt = txt.replace( "\"", "&quot;" );
+  txt = txt.replace( TQString::fromUtf8("ä"), "&auml;" );
+  txt = txt.replace( TQString::fromUtf8("á"), "&aacute;" );
+  txt = txt.replace( TQString::fromUtf8("à"), "&agrave;" );
+  txt = txt.replace( TQString::fromUtf8("â"), "&acirc;" );
+  txt = txt.replace( TQString::fromUtf8("Ä"), "&Auml;" );
+  txt = txt.replace( TQString::fromUtf8("ó"), "&oacute;" );
+  txt = txt.replace( TQString::fromUtf8("ô"), "&ocirc;" );
+  txt = txt.replace( TQString::fromUtf8("ö"), "&ouml;" );
+  txt = txt.replace( TQString::fromUtf8("Ö"), "&Ouml;" );
+  txt = txt.replace( TQString::fromUtf8("ü"), "&uuml;" );
+  txt = txt.replace( TQString::fromUtf8("Ü"), "&Uuml;" );
+  txt = txt.replace( TQString::fromUtf8("ß"), "&szlig;" );
+  txt = txt.replace( TQString::fromUtf8("€"), "&euro;" );
+  txt = txt.replace( TQString::fromUtf8("é"), "&eacute;" );
+  txt = txt.replace( TQString::fromUtf8("ë"), "&euml;" );
+  txt = txt.replace( TQString::fromUtf8("è"), "&egrave;" );
+  txt = txt.replace( TQString::fromUtf8("ñ"), "&ntilde;" );
+  txt = txt.replace( TQString::fromUtf8("ç"), "&ccedil;" );
 
   return txt;
 }