summaryrefslogtreecommitdiffstats
path: root/filters
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commitb6edfe41c9395f2e20784cbf0e630af6426950a3 (patch)
tree56ed9b871d4296e6c15949c24e16420be1b28697 /filters
parentef39e8e4178a8f98cf5f154916ba0f03e4855206 (diff)
downloadkoffice-b6edfe41c9395f2e20784cbf0e630af6426950a3.tar.gz
koffice-b6edfe41c9395f2e20784cbf0e630af6426950a3.zip
rename the following methods:
tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'filters')
-rw-r--r--filters/chalk/gmagick/kis_image_magick_converter.cc8
-rw-r--r--filters/chalk/jpeg/iccjpeg.c2
-rw-r--r--filters/chalk/magick/kis_image_magick_converter.cc8
-rw-r--r--filters/chalk/xcf/xcf/xcf-load.cc2
-rw-r--r--filters/karbon/ai/aiparserbase.cc16
-rw-r--r--filters/karbon/applixgraphics/applixgraphicimport.cc4
-rw-r--r--filters/karbon/eps/pscommentlexer.cc4
-rw-r--r--filters/karbon/oodraw/oodrawimport.cc8
-rw-r--r--filters/karbon/svg/svgimport.cc42
-rw-r--r--filters/karbon/xaml/xamlimport.cc42
-rwxr-xr-xfilters/kpresenter/magicpoint/mgp2kpr.py22
-rw-r--r--filters/kpresenter/ooimpress/ooimpressexport.cc2
-rw-r--r--filters/kpresenter/ooimpress/ooimpressimport.cc10
-rw-r--r--filters/kpresenter/powerpoint/libppt/objects.cpp2
-rw-r--r--filters/kpresenter/powerpoint/libppt/ustring.cpp2
-rw-r--r--filters/kpresenter/powerpoint/libppt/ustring.h2
-rw-r--r--filters/kspread/applixspread/applixspreadimport.cc36
-rw-r--r--filters/kspread/csv/csvdialog.cpp2
-rw-r--r--filters/kspread/csv/csvexport.cc12
-rw-r--r--filters/kspread/csv/csvimport.cc4
-rw-r--r--filters/kspread/excel/import/excelimport.cc2
-rw-r--r--filters/kspread/excel/sidewinder/excel.cpp20
-rw-r--r--filters/kspread/excel/sidewinder/excel.h2
-rw-r--r--filters/kspread/excel/sidewinder/ustring.cpp2
-rw-r--r--filters/kspread/excel/sidewinder/ustring.h2
-rw-r--r--filters/kspread/gnumeric/gnumericexport.cc18
-rw-r--r--filters/kspread/gnumeric/gnumericimport.cc40
-rw-r--r--filters/kspread/html/htmlexport.cc10
-rw-r--r--filters/kspread/opencalc/opencalcexport.cc4
-rw-r--r--filters/kspread/opencalc/opencalcimport.cc98
-rw-r--r--filters/kspread/qpro/libqpro/src/formula.cc4
-rw-r--r--filters/kword/abiword/ImportHelpers.cc4
-rw-r--r--filters/kword/abiword/ImportStyle.cc6
-rw-r--r--filters/kword/abiword/abiwordexport.cc14
-rw-r--r--filters/kword/abiword/abiwordimport.cc8
-rw-r--r--filters/kword/applixword/applixwordimport.cc20
-rw-r--r--filters/kword/ascii/asciiexport.cc4
-rw-r--r--filters/kword/ascii/asciiimport.cc14
-rw-r--r--filters/kword/hancomword/hancomwordimport.cpp2
-rw-r--r--filters/kword/html/export/ExportCss.cc2
-rw-r--r--filters/kword/html/export/ExportDocStruct.cc4
-rw-r--r--filters/kword/html/export/ExportFilter.cc8
-rw-r--r--filters/kword/kword1.3/import/kword13document.cpp4
-rw-r--r--filters/kword/kword1.3/import/kword13formatone.cpp2
-rw-r--r--filters/kword/kword1.3/import/kword13layout.cpp2
-rw-r--r--filters/kword/kword1.3/import/kword13parser.cpp2
-rw-r--r--filters/kword/kword1.3/import/kword13picture.cpp2
-rw-r--r--filters/kword/latex/export/pixmapFrame.cc4
-rw-r--r--filters/kword/latex/export/textzone.cc6
-rw-r--r--filters/kword/latex/import/parser/command.cc8
-rw-r--r--filters/kword/latex/import/parser/env.cc2
-rw-r--r--filters/kword/libexport/KWEFKWordLeader.cc2
-rw-r--r--filters/kword/libexport/TagProcessing.h4
-rw-r--r--filters/kword/msword/texthandler.cpp4
-rw-r--r--filters/kword/mswrite/mswriteexport.cc8
-rw-r--r--filters/kword/mswrite/mswriteimport.cc10
-rw-r--r--filters/kword/mswrite/structures_private.cpp2
-rw-r--r--filters/kword/oowriter/ExportFilter.cc22
-rw-r--r--filters/kword/oowriter/oowriterimport.cc10
-rw-r--r--filters/kword/palmdoc/palmdocimport.cc12
-rw-r--r--filters/kword/pdf/misc.cpp20
-rw-r--r--filters/kword/pdf/xpdf/goo/GHash.cc12
-rw-r--r--filters/kword/pdf/xpdf/goo/GHash.h4
-rw-r--r--filters/kword/pdf/xpdf/xpdf/CMap.cc2
-rw-r--r--filters/kword/pdf/xpdf/xpdf/CMap.h2
-rw-r--r--filters/kword/pdf/xpdf/xpdf/Dict.cc8
-rw-r--r--filters/kword/pdf/xpdf/xpdf/Dict.h2
-rw-r--r--filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc10
-rw-r--r--filters/kword/pdf/xpdf/xpdf/Link.cc2
-rw-r--r--filters/kword/pdf/xpdf/xpdf/Link.h2
-rw-r--r--filters/kword/pdf/xpdf/xpdf/PDFDoc.h2
-rw-r--r--filters/kword/pdf/xpdf/xpdf/XPDFCore.cc4
-rw-r--r--filters/kword/pdf/xpdf/xpdf/XPDFCore.h4
-rw-r--r--filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc10
-rw-r--r--filters/kword/pdf/xpdf/xpdf/XPDFViewer.h2
-rw-r--r--filters/kword/rtf/export/ExportFilter.cc56
-rw-r--r--filters/kword/rtf/import/rtfimport.cpp24
-rw-r--r--filters/kword/rtf/import/rtfimport_dom.cpp12
-rw-r--r--filters/kword/wml/wmlimport.cc6
-rw-r--r--filters/kword/wordperfect/import/kwordfilter.cpp10
-rw-r--r--filters/olefilters/lib/klaola.cc2
-rw-r--r--filters/olefilters/lib/klaola.h2
-rw-r--r--filters/olefilters/olefilter.cc28
-rw-r--r--filters/olefilters/powerpoint97/powerpoint.cc4
-rw-r--r--filters/olefilters/powerpoint97/pptxml.cc10
-rw-r--r--filters/xsltfilter/export/xsltexportdia.cc4
-rw-r--r--filters/xsltfilter/import/xsltimportdia.cc4
87 files changed, 436 insertions, 436 deletions
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc
index a0545569e..2118e3768 100644
--- a/filters/chalk/gmagick/kis_image_magick_converter.cc
+++ b/filters/chalk/gmagick/kis_image_magick_converter.cc
@@ -1025,7 +1025,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
description = info -> description;
kdDebug(41008) << "Found import filter for: " << name << "\n";
- if (!description.isEmpty() && !description.tqcontains('/')) {
+ if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());
@@ -1042,7 +1042,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
description = mi -> description;
kdDebug(41008) << "Found import filter for: " << name << "\n";
- if (!description.isEmpty() && !description.tqcontains('/')) {
+ if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());
@@ -1102,7 +1102,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
description = info -> description;
- if (!description.isEmpty() && !description.tqcontains('/')) {
+ if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());
@@ -1121,7 +1121,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
description = mi -> description;
- if (!description.isEmpty() && !description.tqcontains('/')) {
+ if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());
diff --git a/filters/chalk/jpeg/iccjpeg.c b/filters/chalk/jpeg/iccjpeg.c
index 7abe1ff40..fefa95096 100644
--- a/filters/chalk/jpeg/iccjpeg.c
+++ b/filters/chalk/jpeg/iccjpeg.c
@@ -133,7 +133,7 @@ write_icc_profile (j_compress_ptr cinfo,
void
setup_read_icc_profile (j_decompress_ptr cinfo)
{
- /* Tell the library to keep any APP2 data it may tqfind */
+ /* Tell the library to keep any APP2 data it may find */
jpeg_save_markers(cinfo, ICC_MARKER, 0xFFFF);
}
diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc
index ee6267add..16140414a 100644
--- a/filters/chalk/magick/kis_image_magick_converter.cc
+++ b/filters/chalk/magick/kis_image_magick_converter.cc
@@ -970,7 +970,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
description = info -> description;
kdDebug(41008) << "Found import filter for: " << name << "\n";
- if (!description.isEmpty() && !description.tqcontains('/')) {
+ if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());
@@ -987,7 +987,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
description = mi -> description;
kdDebug(41008) << "Found import filter for: " << name << "\n";
- if (!description.isEmpty() && !description.tqcontains('/')) {
+ if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());
@@ -1047,7 +1047,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
description = info -> description;
- if (!description.isEmpty() && !description.tqcontains('/')) {
+ if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());
@@ -1066,7 +1066,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
description = mi -> description;
- if (!description.isEmpty() && !description.tqcontains('/')) {
+ if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());
diff --git a/filters/chalk/xcf/xcf/xcf-load.cc b/filters/chalk/xcf/xcf/xcf-load.cc
index cf1152c6d..670bec0aa 100644
--- a/filters/chalk/xcf/xcf/xcf-load.cc
+++ b/filters/chalk/xcf/xcf/xcf-load.cc
@@ -128,7 +128,7 @@ xcf_load_image (XcfInfo * info)
goto hard_error;
/* check for a GimpGrid parasite */
- parasite = gimp_image_parasite_tqfind (GIMP_IMAGE (gimage),
+ parasite = gimp_image_parasite_find (GIMP_IMAGE (gimage),
gimp_grid_parasite_name ());
if (parasite)
{
diff --git a/filters/karbon/ai/aiparserbase.cc b/filters/karbon/ai/aiparserbase.cc
index 6e9ff0406..817c3d7ec 100644
--- a/filters/karbon/ai/aiparserbase.cc
+++ b/filters/karbon/ai/aiparserbase.cc
@@ -791,16 +791,16 @@ void AIParserBase::_handleDocumentProcessColors(const char *data) {
signed int index;
- index = tmp.tqfind ("Cyan");
+ index = tmp.find ("Cyan");
if (index > 0) colorSet |= PC_Cyan;
- index = tmp.tqfind ("Magenta");
+ index = tmp.find ("Magenta");
if (index > 0) colorSet |= PC_Magenta;
- index = tmp.tqfind ("Yellow");
+ index = tmp.find ("Yellow");
if (index > 0) colorSet |= PC_Yellow;
- index = tmp.tqfind ("Black");
+ index = tmp.find ("Black");
if (index > 0) colorSet |= PC_Black;
if (m_documentHandler) m_documentHandler->gotProcessColors (colorSet);
@@ -945,7 +945,7 @@ void AIParserBase::gotToken (const char *value) {
TQString string(value);
- if (m_modules.tqfindIndex(string) != -1)
+ if (m_modules.findIndex(string) != -1)
{
AIElement element (string, AIElement::Reference);
handleElement (element);
@@ -1067,7 +1067,7 @@ CommentOperation AIParserBase::getCommentOperation (const char *command) {
for(;;) {
CommentOperationMapping map = commentMappings[i];
if (map.op == NULL) return CO_Other;
- index = data.tqfind (map.op);
+ index = data.find (map.op);
if (index >= 0) return map.action;
i++;
}
@@ -1088,7 +1088,7 @@ void GStateHandlerBase::gotStrokePattern (const char *pname, double px, double p
const char *AIParserBase::getValue (const char *input) {
TQString data(input);
- signed int index = data.tqfind (':');
+ signed int index = data.find (':');
if (index < 0) return "";
index++;
while (data.at(index) == ' ') index++;
@@ -1099,7 +1099,7 @@ bool AIParserBase::getRectangle (const char* input, int &llx, int &lly, int &urx
if (input == NULL) return false;
TQString s(input);
- if (s.tqcontains ("(atend)")) return false;
+ if (s.contains ("(atend)")) return false;
TQStringList values = TQStringList::split (" ", input);
if (values.size() < 5) return false;
llx = values[1].toInt();
diff --git a/filters/karbon/applixgraphics/applixgraphicimport.cc b/filters/karbon/applixgraphics/applixgraphicimport.cc
index 8a433ec9f..b3df1581a 100644
--- a/filters/karbon/applixgraphics/applixgraphicimport.cc
+++ b/filters/karbon/applixgraphics/applixgraphicimport.cc
@@ -231,11 +231,11 @@ KoFilter::ConversiontqStatus APPLIXGRAPHICImport::convert( const TQCString& from
//mystr.remove (0, 7);
- //remove_pos = mystr.tqfind ('(');
+ //remove_pos = mystr.find ('(');
//mystr.remove (0, remove_pos);
//agLine.offX= mystr.toInt();
- //remove_pos = mystr.tqfind (',');
+ //remove_pos = mystr.find (',');
//mystr.remove (0, remove_pos);
//agLine.offY= mystr.toInt();
rueck = sscanf ((const char *) mystr.latin1(), "(%d,%d)",
diff --git a/filters/karbon/eps/pscommentlexer.cc b/filters/karbon/eps/pscommentlexer.cc
index dc0a67a19..04aa9aaa7 100644
--- a/filters/karbon/eps/pscommentlexer.cc
+++ b/filters/karbon/eps/pscommentlexer.cc
@@ -298,7 +298,7 @@ BoundingBoxExtractor::~BoundingBoxExtractor() {}
void BoundingBoxExtractor::gotComment (const char *value)
{
TQString data (value);
- if (data.tqfind("%BoundingBox:")==-1) return;
+ if (data.find("%BoundingBox:")==-1) return;
getRectangle (value, m_llx, m_lly, m_urx, m_ury);
}
@@ -308,7 +308,7 @@ bool BoundingBoxExtractor::getRectangle (const char* input, int &llx, int &lly,
if (input == NULL) return false;
TQString s(input);
- if (s.tqcontains ("(atend)")) return false;
+ if (s.contains ("(atend)")) return false;
TQString s2 = s.remove("%BoundingBox:");
TQStringList values = TQStringList::split (" ", s2.latin1());
diff --git a/filters/karbon/oodraw/oodrawimport.cc b/filters/karbon/oodraw/oodrawimport.cc
index d571762b0..ef90c93d8 100644
--- a/filters/karbon/oodraw/oodrawimport.cc
+++ b/filters/karbon/oodraw/oodrawimport.cc
@@ -659,7 +659,7 @@ OoDrawImport::parseViewBox( const TQDomElement& object )
{
// allow for viewbox def with ',' or whitespace
TQString viewbox( object.attributeNS( ooNS::svg, "viewBox", TQString() ) );
- TQStringList points = TQStringList::split( ' ', viewbox.tqreplace( ',', ' ').simplifyWhiteSpace() );
+ TQStringList points = TQStringList::split( ' ', viewbox.replace( ',', ' ').simplifyWhiteSpace() );
rect.setX( points[0].toFloat() );
rect.setY( points[1].toFloat() );
@@ -715,19 +715,19 @@ OoDrawImport::parseColor( VColor &color, const TQString &s )
TQString g = colors[1];
TQString b = colors[2].left( ( colors[2].length() - 1 ) );
- if( r.tqcontains( "%" ) )
+ if( r.contains( "%" ) )
{
r = r.left( r.length() - 1 );
r = TQString::number( int( ( double( 255 * r.toDouble() ) / 100.0 ) ) );
}
- if( g.tqcontains( "%" ) )
+ if( g.contains( "%" ) )
{
g = g.left( g.length() - 1 );
g = TQString::number( int( ( double( 255 * g.toDouble() ) / 100.0 ) ) );
}
- if( b.tqcontains( "%" ) )
+ if( b.contains( "%" ) )
{
b = b.left( b.length() - 1 );
b = TQString::number( int( ( double( 255 * b.toDouble() ) / 100.0 ) ) );
diff --git a/filters/karbon/svg/svgimport.cc b/filters/karbon/svg/svgimport.cc
index b8b580f7c..5a5e90aa1 100644
--- a/filters/karbon/svg/svgimport.cc
+++ b/filters/karbon/svg/svgimport.cc
@@ -63,7 +63,7 @@ KoFilter::ConversiontqStatus SvgImport::convert(const TQCString& from, const TQC
//Find the last extension
TQString strExt;
TQString fileIn ( m_chain->inputFile() );
- const int result=fileIn.tqfindRev('.');
+ const int result=fileIn.findRev('.');
if (result>=0)
strExt=fileIn.mid(result).lower();
@@ -143,7 +143,7 @@ void SvgImport::convert()
{
// allow for viewbox def with ',' or whitespace
TQString viewbox( docElem.attribute( "viewBox" ) );
- TQStringList points = TQStringList::split( ' ', viewbox.tqreplace( ',', ' ').simplifyWhiteSpace() );
+ TQStringList points = TQStringList::split( ' ', viewbox.replace( ',', ' ').simplifyWhiteSpace() );
gc->matrix.scale( width / points[2].toFloat() , height / points[3].toFloat() );
m_outerRect.setWidth( m_outerRect.width() * ( points[2].toFloat() / width ) );
@@ -310,11 +310,11 @@ VObject* SvgImport::findObject( const TQString &name )
SvgImport::GradientHelper* SvgImport::findGradient( const TQString &id, const TQString &href)
{
// check if gradient was already parsed, and return it
- if( m_gradients.tqcontains( id ) )
+ if( m_gradients.contains( id ) )
return &m_gradients[ id ];
// check if gradient was stored for later parsing
- if( !m_defs.tqcontains( id ) )
+ if( !m_defs.contains( id ) )
return 0L;
TQDomElement e = m_defs[ id ];
@@ -322,7 +322,7 @@ SvgImport::GradientHelper* SvgImport::findGradient( const TQString &id, const TQ
{
TQString mhref = e.attribute("xlink:href").mid(1);
- if(m_defs.tqcontains(mhref))
+ if(m_defs.contains(mhref))
return findGradient(mhref, id);
else
return 0L;
@@ -340,7 +340,7 @@ SvgImport::GradientHelper* SvgImport::findGradient( const TQString &id, const TQ
else
n = href;
- if( m_gradients.tqcontains( n ) )
+ if( m_gradients.contains( n ) )
return &m_gradients[ n ];
else
return 0L;
@@ -456,19 +456,19 @@ void SvgImport::parseColor( VColor &color, const TQString &s )
TQString g = colors[1];
TQString b = colors[2].left( ( colors[2].length() - 1 ) );
- if( r.tqcontains( "%" ) )
+ if( r.contains( "%" ) )
{
r = r.left( r.length() - 1 );
r = TQString::number( int( ( double( 255 * r.toDouble() ) / 100.0 ) ) );
}
- if( g.tqcontains( "%" ) )
+ if( g.contains( "%" ) )
{
g = g.left( g.length() - 1 );
g = TQString::number( int( ( double( 255 * g.toDouble() ) / 100.0 ) ) );
}
- if( b.tqcontains( "%" ) )
+ if( b.contains( "%" ) )
{
b = b.left( b.length() - 1 );
b = TQString::number( int( ( double( 255 * b.toDouble() ) / 100.0 ) ) );
@@ -504,7 +504,7 @@ void SvgImport::parseColorStops( VGradient *gradient, const TQDomElement &e )
{
float offset;
TQString temp = stop.attribute( "offset" );
- if( temp.tqcontains( '%' ) )
+ if( temp.contains( '%' ) )
{
temp = temp.left( temp.length() - 1 );
offset = temp.toFloat() / 100.0;
@@ -582,7 +582,7 @@ void SvgImport::parseGradient( const TQDomElement &e , const TQDomElement &refer
if( !id.isEmpty() )
{
// Copy existing gradient if it exists
- if( m_gradients.tqfind( id ) != m_gradients.end() )
+ if( m_gradients.find( id ) != m_gradients.end() )
gradhelper.gradient = m_gradients[ id ].gradient;
}
@@ -676,8 +676,8 @@ void SvgImport::parsePA( VObject *obj, SvgGraphicsContext *gc, const TQString &c
gc->fill.setType( VFill::none );
else if( params.startsWith( "url(" ) )
{
- unsigned int start = params.tqfind("#") + 1;
- unsigned int end = params.tqfindRev(")");
+ unsigned int start = params.find("#") + 1;
+ unsigned int end = params.findRev(")");
TQString key = params.mid( start, end - start );
GradientHelper *gradHelper = findGradient( key );
if( gradHelper )
@@ -739,8 +739,8 @@ void SvgImport::parsePA( VObject *obj, SvgGraphicsContext *gc, const TQString &c
gc->stroke.setType( VStroke::none );
else if( params.startsWith( "url(" ) )
{
- unsigned int start = params.tqfind("#") + 1;
- unsigned int end = params.tqfindRev(")");
+ unsigned int start = params.find("#") + 1;
+ unsigned int end = params.findRev(")");
TQString key = params.mid( start, end - start );
GradientHelper *gradHelper = findGradient( key );
@@ -810,7 +810,7 @@ void SvgImport::parsePA( VObject *obj, SvgGraphicsContext *gc, const TQString &c
else if( command == "font-family" )
{
TQString family = params;
- family.tqreplace( '\'' , ' ' );
+ family.replace( '\'' , ' ' );
gc->font.setFamily( family );
}
else if( command == "font-size" )
@@ -1006,7 +1006,7 @@ void SvgImport::parseUse( VGroup *grp, const TQDomElement &e )
m_gc.current()->matrix.translate(tx,ty);
}
- if(m_defs.tqcontains(key))
+ if(m_defs.contains(key))
{
TQDomElement a = m_defs[key];
if(a.tagName() == "g" || a.tagName() == "a")
@@ -1100,7 +1100,7 @@ void SvgImport::parseDefs( const TQDomElement &e )
TQString definition = b.attribute( "id" );
if( !definition.isEmpty() )
{
- if( !m_defs.tqcontains( definition ) )
+ if( !m_defs.contains( definition ) )
m_defs.insert( definition, b );
}
}
@@ -1152,7 +1152,7 @@ void SvgImport::createText( VGroup *grp, const TQDomElement &b )
continue;
TQString key = e.attribute( "xlink:href" ).mid( 1 );
- if( ! m_defs.tqcontains(key) )
+ if( ! m_defs.contains(key) )
{
// try to find referenced object in document
VObject* obj = findObject( key );
@@ -1214,7 +1214,7 @@ void SvgImport::createText( VGroup *grp, const TQDomElement &b )
continue;
TQString key = e.attribute( "xlink:href" ).mid( 1 );
- if( ! m_defs.tqcontains(key) )
+ if( ! m_defs.contains(key) )
{
// try to find referenced object in document
VObject* obj = findObject( key );
@@ -1328,7 +1328,7 @@ void SvgImport::createObject( VGroup *grp, const TQDomElement &b, const VObject:
bool bFirst = true;
TQString points = b.attribute( "points" ).simplifyWhiteSpace();
- points.tqreplace( ',', ' ' );
+ points.replace( ',', ' ' );
points.remove( '\r' );
points.remove( '\n' );
TQStringList pointList = TQStringList::split( ' ', points );
diff --git a/filters/karbon/xaml/xamlimport.cc b/filters/karbon/xaml/xamlimport.cc
index b7f68bbb4..3a7551813 100644
--- a/filters/karbon/xaml/xamlimport.cc
+++ b/filters/karbon/xaml/xamlimport.cc
@@ -61,7 +61,7 @@ KoFilter::ConversiontqStatus XAMLImport::convert(const TQCString& from, const TQ
//Find the last extension
TQString strExt;
TQString fileIn ( m_chain->inputFile() );
- const int result=fileIn.tqfindRev('.');
+ const int result=fileIn.findRev('.');
if (result>=0)
{
strExt=fileIn.mid(result).lower();
@@ -133,7 +133,7 @@ XAMLImport::convert()
{
// allow for viewbox def with ',' or whitespace
TQString viewbox( docElem.attribute( "viewBox" ) );
- TQStringList points = TQStringList::split( ' ', viewbox.tqreplace( ',', ' ').simplifyWhiteSpace() );
+ TQStringList points = TQStringList::split( ' ', viewbox.replace( ',', ' ').simplifyWhiteSpace() );
gc->matrix.scale( width / points[2].toFloat() , height / points[3].toFloat() );
m_outerRect.setWidth( m_outerRect.width() * ( points[2].toFloat() / width ) );
@@ -303,19 +303,19 @@ XAMLImport::parseColor( VColor &color, const TQString &s )
TQString g = colors[1];
TQString b = colors[2].left( ( colors[2].length() - 1 ) );
- if( r.tqcontains( "%" ) )
+ if( r.contains( "%" ) )
{
r = r.left( r.length() - 1 );
r = TQString::number( int( ( double( 255 * r.toDouble() ) / 100.0 ) ) );
}
- if( g.tqcontains( "%" ) )
+ if( g.contains( "%" ) )
{
g = g.left( g.length() - 1 );
g = TQString::number( int( ( double( 255 * g.toDouble() ) / 100.0 ) ) );
}
- if( b.tqcontains( "%" ) )
+ if( b.contains( "%" ) )
{
b = b.left( b.length() - 1 );
b = TQString::number( int( ( double( 255 * b.toDouble() ) / 100.0 ) ) );
@@ -347,7 +347,7 @@ XAMLImport::parseColorStops( VGradient *gradient, const TQDomElement &e )
{
float offset;
TQString temp = stop.attribute( "offset" );
- if( temp.tqcontains( '%' ) )
+ if( temp.contains( '%' ) )
{
temp = temp.left( temp.length() - 1 );
offset = temp.toFloat() / 100.0;
@@ -454,8 +454,8 @@ XAMLImport::parsePA( VObject *obj, XAMLGraphicsContext *gc, const TQString &comm
gc->fill.setType( VFill::none );
else if( params.startsWith( "url(" ) )
{
- unsigned int start = params.tqfind("#") + 1;
- unsigned int end = params.tqfindRev(")");
+ unsigned int start = params.find("#") + 1;
+ unsigned int end = params.findRev(")");
TQString key = params.mid( start, end - start );
gc->fill.gradient() = m_gradients[ key ].gradient;
if( m_gradients[ key ].bbox )
@@ -505,8 +505,8 @@ XAMLImport::parsePA( VObject *obj, XAMLGraphicsContext *gc, const TQString &comm
gc->stroke.setType( VStroke::none );
else if( params.startsWith( "url(" ) )
{
- unsigned int start = params.tqfind("#") + 1;
- unsigned int end = params.tqfindRev(")");
+ unsigned int start = params.find("#") + 1;
+ unsigned int end = params.findRev(")");
TQString key = params.mid( start, end - start );
gc->stroke.gradient() = m_gradients[ key ].gradient;
gc->stroke.gradient().transform( m_gradients[ key ].gradientTransform );
@@ -567,7 +567,7 @@ XAMLImport::parsePA( VObject *obj, XAMLGraphicsContext *gc, const TQString &comm
else if( command == "font-family" )
{
TQString family = params;
- family.tqreplace( '\'' , ' ' );
+ family.replace( '\'' , ' ' );
gc->font.setFamily( family );
}
else if( command == "font-size" )
@@ -750,10 +750,10 @@ XAMLImport::parseGroup( VGroup *grp, const TQDomElement &e )
if( !b.attribute( "xlink:href" ).isEmpty() )
{
TQString params = b.attribute( "xlink:href" );
- unsigned int start = params.tqfind("#") + 1;
- unsigned int end = params.tqfindRev(")");
+ unsigned int start = params.find("#") + 1;
+ unsigned int end = params.findRev(")");
TQString key = params.mid( start, end - start );
- if(m_paths.tqcontains(key))
+ if(m_paths.contains(key))
{
TQDomElement a = m_paths[key];
obj = createObject( a );
@@ -854,10 +854,10 @@ void XAMLImport::createText( VGroup *grp, const TQDomElement &b )
continue;
TQString uri = e.attribute( "xlink:href" );
- unsigned int start = uri.tqfind("#") + 1;
- unsigned int end = uri.tqfindRev(")");
+ unsigned int start = uri.find("#") + 1;
+ unsigned int end = uri.findRev(")");
TQString key = uri.mid( start, end - start );
- if( ! m_paths.tqcontains(key) )
+ if( ! m_paths.contains(key) )
{
VObject* obj = findObject( key );
if( obj )
@@ -899,11 +899,11 @@ void XAMLImport::createText( VGroup *grp, const TQDomElement &b )
continue;
TQString uri = e.attribute( "xlink:href" );
- unsigned int start = uri.tqfind("#") + 1;
- unsigned int end = uri.tqfindRev(")");
+ unsigned int start = uri.find("#") + 1;
+ unsigned int end = uri.findRev(")");
TQString key = uri.mid( start, end - start );
- if( ! m_paths.tqcontains(key) )
+ if( ! m_paths.contains(key) )
{
VObject* obj = findObject( key );
if( obj )
@@ -1000,7 +1000,7 @@ VObject* XAMLImport::createObject( const TQDomElement &b )
bool bFirst = true;
TQString points = b.attribute( "points" ).simplifyWhiteSpace();
- points.tqreplace( ',', ' ' );
+ points.replace( ',', ' ' );
points.remove( '\r' );
points.remove( '\n' );
TQStringList pointList = TQStringList::split( ' ', points );
diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py
index 73751f26d..e57169896 100755
--- a/filters/kpresenter/magicpoint/mgp2kpr.py
+++ b/filters/kpresenter/magicpoint/mgp2kpr.py
@@ -84,14 +84,14 @@ class MgpImporter:
def __setupDefaultFonts(self,command):
tokens=string.split(command,' ')
- _key=string.tqreplace(tokens[1], '"', '')
- _val=string.tqreplace(tokens[3], '"', '')
+ _key=string.replace(tokens[1], '"', '')
+ _val=string.replace(tokens[3], '"', '')
self.defFonts[_key]=_val
#print self.defFonts
def __setFontIndirect(self,command):
tokens=string.split(command,' ')
- _font=string.tqreplace(tokens[1], '"', '')
+ _font=string.replace(tokens[1], '"', '')
if _font in self.defFonts.keys(): # we have a "default" font, find it in the map
self.__setFont(None,self.defFonts[_font])
#print self.defFonts[_font]
@@ -99,9 +99,9 @@ class MgpImporter:
def __setFont(self,command,font=""):
if command:
tokens=string.split(command,' ')
- font=string.tqreplace(tokens[1], '"', '').strip() #XLFD-like, eg: mincho-medium-r (family-weight-slant)
+ font=string.replace(tokens[1], '"', '').strip() #XLFD-like, eg: mincho-medium-r (family-weight-slant)
- _numDash=string.tqfind(font,"-") #find dashes
+ _numDash=string.find(font,"-") #find dashes
if (_numDash==-1): #mincho
self.fontName=font
@@ -124,7 +124,7 @@ class MgpImporter:
def __setBgColor(self, command):
tokens=string.split(command,' ')
self.bctype="0"
- self.color1=string.tqreplace(tokens[1].strip(),'"', '') #strip quotes and \n
+ self.color1=string.replace(tokens[1].strip(),'"', '') #strip quotes and \n
def __setBgGradient(self, command):
tokens=string.split(command,' ')
@@ -135,8 +135,8 @@ class MgpImporter:
try:
dir=tokens[4]
- self.color1=string.tqreplace(tokens[6].strip(),'"', '') #strip quotes and \n
- self.color2=string.tqreplace(tokens[7].strip(),'"', '')
+ self.color1=string.replace(tokens[6].strip(),'"', '') #strip quotes and \n
+ self.color2=string.replace(tokens[7].strip(),'"', '')
except:
self.bctype="0"
self.color1="black"
@@ -296,14 +296,14 @@ class MgpImporter:
def __setTextColor(self,command):
tokens=string.split(command,' ')
- self.textColor=string.tqreplace(tokens[1].strip(),'"', '') #strip quotes
+ self.textColor=string.replace(tokens[1].strip(),'"', '') #strip quotes
#print self.textColor
def __handleBar(self,command):
tokens=string.split(command,' ')
try:
- color=string.tqreplace(tokens[1].strip(),'"', '') #strip quotes and \n
+ color=string.replace(tokens[1].strip(),'"', '') #strip quotes and \n
width=tokens[2].strip()/1000*Y_OFFSET #in per mils of display height
start=tokens[3].strip()/100*PAGE_WIDTH #start position percent of display width
length=tokens[4].strip()/100*PAGE_WIDTH #length percent of display width
@@ -357,7 +357,7 @@ class MgpImporter:
if (line.startswith('#') or line.startswith('%%')): #skip comments
continue
elif (line.startswith('%')): #commands
- commands=string.split(string.tqreplace(line, '%', ''),',') #list of commands, comma separated, remove '%'
+ commands=string.split(string.replace(line, '%', ''),',') #list of commands, comma separated, remove '%'
for command in commands:
command=command.strip().lower()
#print command
diff --git a/filters/kpresenter/ooimpress/ooimpressexport.cc b/filters/kpresenter/ooimpress/ooimpressexport.cc
index 3e54a05f3..0e4771cf2 100644
--- a/filters/kpresenter/ooimpress/ooimpressexport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressexport.cc
@@ -886,7 +886,7 @@ void OoImpressExport::appendPicture( TQDomDocument & doc, TQDomElement & source,
{
TQString str = pictureKey( key );
TQString returnstr = m_kpresenterPictureLst[str];
- const int pos=returnstr.tqfindRev('.');
+ const int pos=returnstr.findRev('.');
if (pos!=-1)
{
const TQString extension( returnstr.mid(pos+1) );
diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc
index 0c286fb55..cf853deae 100644
--- a/filters/kpresenter/ooimpress/ooimpressimport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressimport.cc
@@ -828,11 +828,11 @@ void OoImpressImport::append2DGeometry( TQDomDocument& doc, TQDomElement& e, con
kdDebug(30518)<<" object transform \n";
//todo parse it
TQString transform = object.attributeNS( ooNS::draw, "transform", TQString() );
- if( transform.tqcontains("rotate ("))
+ if( transform.contains("rotate ("))
{
//kdDebug(30518)<<" rotate object \n";
transform = transform.remove("rotate (" );
- transform = transform.left(transform.tqfind(")"));
+ transform = transform.left(transform.find(")"));
//kdDebug(30518)<<" transform :"<<transform<<endl;
bool ok;
double radian = transform.toDouble(&ok);
@@ -1353,7 +1353,7 @@ void OoImpressImport::appendShadow( TQDomDocument& doc, TQDomElement& e )
// use the shadow attribute to indicate a text-shadow
TQDomElement shadow = doc.createElement( "SHADOW" );
TQString distance = m_styleStack.attributeNS( ooNS::fo, "text-shadow" );
- distance.truncate( distance.tqfind( ' ' ) );
+ distance.truncate( distance.find( ' ' ) );
shadow.setAttribute( "distance", KoUnit::parseValue( distance ) );
shadow.setAttribute( "direction", 5 );
shadow.setAttribute( "color", "#a0a0a0" );
@@ -2045,7 +2045,7 @@ TQString OoImpressImport::storeImage( const TQDomElement& object )
TQString url = object.attributeNS( ooNS::xlink, "href", TQString() ).remove( '#' );
KArchiveFile* file = (KArchiveFile*) m_zip->directory()->entry( url );
- TQString extension = url.mid( url.tqfind( '.' ) );
+ TQString extension = url.mid( url.find( '.' ) );
TQString fileName = TQString( "picture%1" ).tqarg( m_numPicture++ ) + extension;
KoStoreDevice* out = m_chain->storageFile( "pictures/" + fileName, KoStore::Write );
@@ -2071,7 +2071,7 @@ TQString OoImpressImport::storeSound(const TQDomElement & object, TQDomElement &
if (!file.exists())
return TQString();
- TQString extension = url.mid( url.tqfind( '.' ) );
+ TQString extension = url.mid( url.find( '.' ) );
TQString fileName = TQString( "sound%1" ).tqarg( m_numSound++ ) + extension;
fileName = "sounds/" + fileName;
KoStoreDevice* out = m_chain->storageFile( fileName, KoStore::Write );
diff --git a/filters/kpresenter/powerpoint/libppt/objects.cpp b/filters/kpresenter/powerpoint/libppt/objects.cpp
index 82359d150..d0343b43a 100644
--- a/filters/kpresenter/powerpoint/libppt/objects.cpp
+++ b/filters/kpresenter/powerpoint/libppt/objects.cpp
@@ -139,7 +139,7 @@ void Object::setBackground( bool bg )
bool Object::hasProperty( std::string name )
{
std::map<std::string,PropertyValue>::const_iterator i;
- i = d->properties.tqfind( name );
+ i = d->properties.find( name );
if( i == d->properties.end() )
return false;
else
diff --git a/filters/kpresenter/powerpoint/libppt/ustring.cpp b/filters/kpresenter/powerpoint/libppt/ustring.cpp
index b574d7dec..23b61d30a 100644
--- a/filters/kpresenter/powerpoint/libppt/ustring.cpp
+++ b/filters/kpresenter/powerpoint/libppt/ustring.cpp
@@ -526,7 +526,7 @@ unsigned long UString::toULong(bool *ok) const
return static_cast<unsigned long>(d);
}
-int UString::tqfind(const UString &f, int pos) const
+int UString::find(const UString &f, int pos) const
{
if (isNull())
return -1;
diff --git a/filters/kpresenter/powerpoint/libppt/ustring.h b/filters/kpresenter/powerpoint/libppt/ustring.h
index 087aff505..c0e34cf4b 100644
--- a/filters/kpresenter/powerpoint/libppt/ustring.h
+++ b/filters/kpresenter/powerpoint/libppt/ustring.h
@@ -334,7 +334,7 @@ namespace Libppt {
* @return Position of first occurence of f starting at position pos.
* -1 if the search was not successful.
*/
- int tqfind(const UString &f, int pos = 0) const;
+ int find(const UString &f, int pos = 0) const;
/**
* @return Position of first occurence of f searching backwards from
* position pos.
diff --git a/filters/kspread/applixspread/applixspreadimport.cc b/filters/kspread/applixspread/applixspreadimport.cc
index 16ea0d8fd..ab3201c8a 100644
--- a/filters/kspread/applixspread/applixspreadimport.cc
+++ b/filters/kspread/applixspread/applixspreadimport.cc
@@ -181,7 +181,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from,
// Search for ')'
- pos = mystr.tqfind (')');
+ pos = mystr.find (')');
typestr = mystr.left (pos);
@@ -190,7 +190,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from,
// alllenght = alllenght - pos - 1;
// Search for ':'
- pos = mystr.tqfind (':');
+ pos = mystr.find (':');
// Copy cellnumber informations
cellnostr = mystr.left (pos);
@@ -201,7 +201,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from,
// Split Table and Cell Number
- pos = cellnostr.tqfind ('!');
+ pos = cellnostr.find ('!');
// Copy tabnumber informations
tabnostr = cellnostr.left (pos);
@@ -215,7 +215,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from,
- pos = cellnostr.tqfind (TQRegExp ("[0-9]"));
+ pos = cellnostr.find (TQRegExp ("[0-9]"));
kdDebug()<<" findpos :"<<pos<<endl;
@@ -251,9 +251,9 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from,
// Replace part for this characters: <, >, &
- mystr.tqreplace (TQRegExp ("&"), "&amp;");
- mystr.tqreplace (TQRegExp ("<"), "&lt;");
- mystr.tqreplace (TQRegExp (">"), "&gt;");
+ mystr.replace (TQRegExp ("&"), "&amp;");
+ mystr.replace (TQRegExp ("<"), "&lt;");
+ mystr.replace (TQRegExp (">"), "&gt;");
// Replace part for Applix Characters
@@ -265,7 +265,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from,
// initialize
foundSpecialCharakter = false;
- pos = mystr.tqfind ("^");
+ pos = mystr.find ("^");
// is there a special character ?
if (pos > -1 )
@@ -277,7 +277,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from,
newchar = specCharfind (mystr[pos+1], mystr[pos+2]);
// replace the character
- mystr.tqreplace (pos, 3, newchar);
+ mystr.replace (pos, 3, newchar);
}
}
@@ -290,8 +290,8 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from,
TQString typeCharStr;
TQString typeCellStr;
- int pos1 = typestr.tqfind ("|");
- int pos2 = typestr.tqfindRev ("|");
+ int pos1 = typestr.find ("|");
+ int pos2 = typestr.findRev ("|");
typeFormStr = typestr.left (pos1);
@@ -313,7 +313,7 @@ KoFilter::ConversiontqStatus APPLIXSPREADImport::convert( const TQCString& from,
tabctr = tabnostr;
// Searching for the rowcol part and adding to the hole string
- pos = my_rc.tabname.tqfindIndex (tabnostr);
+ pos = my_rc.tabname.findIndex (tabnostr);
if (pos > -1) str += my_rc.rc[pos];
}
@@ -936,12 +936,12 @@ APPLIXSPREADImport::readColormap (TQTextStream &stream, TQPtrList<t_mycolor> &m
kdDebug()<<" -> "<< mystr<<endl;
// Count the number of whitespaces
- contcount = mystr.tqcontains (' ');
+ contcount = mystr.contains (' ');
kdDebug()<< "contcount: "<< contcount<<endl;
contcount -= 5;
// Begin off interest
- pos = mystr.tqfind (" 0 ");
+ pos = mystr.find (" 0 ");
// get colorname
colstr = mystr.left (pos);
@@ -1035,7 +1035,7 @@ APPLIXSPREADImport::readView (TQTextStream &stream, TQString instr, t_rc &rc)
sscanf ((*it).latin1(), "%c:%d", &ccolumn, &colwidth);
int len = (*it).length ();
- int pos = (*it).tqfind (":");
+ int pos = (*it).find (":");
(*it).remove (pos, len-pos);
printf( " >%s<- -<%c><%d> \n", (*it).latin1(), ccolumn, colwidth);
@@ -1120,7 +1120,7 @@ APPLIXSPREADImport::filterSHFGBG (TQString it, int *style, int *bgcolor,
int m2=0, m3=0;
// filter SH = Brushstyle Background
- pos = it.tqfind ("SH");
+ pos = it.find ("SH");
if (pos > -1)
{
tmpstr = it;
@@ -1134,7 +1134,7 @@ APPLIXSPREADImport::filterSHFGBG (TQString it, int *style, int *bgcolor,
// filter FG = FGCOLOR
- pos = it.tqfind ("FG");
+ pos = it.find ("FG");
if (pos > -1)
{
tmpstr = it;
@@ -1148,7 +1148,7 @@ APPLIXSPREADImport::filterSHFGBG (TQString it, int *style, int *bgcolor,
// filter BG = BGCOLOR
- pos = it.tqfind ("BG");
+ pos = it.find ("BG");
if (pos > -1)
{
tmpstr = it;
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp
index f6fae839a..47cb19fe6 100644
--- a/filters/kspread/csv/csvdialog.cpp
+++ b/filters/kspread/csv/csvdialog.cpp
@@ -351,7 +351,7 @@ void CSVDialog::fillTable( )
for (column = 0; column < m_dialog->m_sheet->numCols(); ++column)
{
const TQString header = m_dialog->m_sheet->horizontalHeader()->label(column);
- if ( m_formatList.tqfind( header ) == m_formatList.end() )
+ if ( m_formatList.find( header ) == m_formatList.end() )
m_dialog->m_sheet->horizontalHeader()->setLabel(column, i18n("Text"));
m_dialog->m_sheet->adjustColumn(column);
diff --git a/filters/kspread/csv/csvexport.cc b/filters/kspread/csv/csvexport.cc
index 4e54a0714..9961d2182 100644
--- a/filters/kspread/csv/csvexport.cc
+++ b/filters/kspread/csv/csvexport.cc
@@ -93,18 +93,18 @@ TQString CSVExport::exportCSVCell( Sheet const * const sheet, int col, int row,
bool quote = false;
if ( !text.isEmpty() )
{
- if ( text.tqfind( textQuote ) != -1 )
+ if ( text.find( textQuote ) != -1 )
{
TQString doubleTextQuote(textQuote);
doubleTextQuote.append(textQuote);
- text.tqreplace(textQuote, doubleTextQuote);
+ text.replace(textQuote, doubleTextQuote);
quote = true;
} else if ( text[0].isSpace() || text[text.length()-1].isSpace() )
quote = true;
- else if ( text.tqfind( csvDelimiter ) != -1 )
+ else if ( text.find( csvDelimiter ) != -1 )
quote = true;
- else if ( text.tqfind( "\n" ) != -1 || text.tqfind( "\r" ) != -1 )
+ else if ( text.find( "\n" ) != -1 || text.find( "\r" ) != -1 )
quote = true;
}
@@ -308,10 +308,10 @@ KoFilter::ConversiontqStatus CSVExport::convert( const TQCString & from, const T
else
name = "********<SHEETNAME>********";
const TQString tname( i18n("<SHEETNAME>") );
- int pos = name.tqfind( tname );
+ int pos = name.find( tname );
if ( pos != -1 )
{
- name.tqreplace( pos, tname.length(), sheet->sheetName() );
+ name.replace( pos, tname.length(), sheet->sheetName() );
}
str += name;
str += m_eol;
diff --git a/filters/kspread/csv/csvimport.cc b/filters/kspread/csv/csvimport.cc
index c05c075cc..cd93017b9 100644
--- a/filters/kspread/csv/csvimport.cc
+++ b/filters/kspread/csv/csvimport.cc
@@ -193,7 +193,7 @@ KoFilter::ConversiontqStatus CSVFilter::convert( const TQCString& from, const TQ
bool ok = false;
TQString tmp ( text );
tmp.remove ( TQRegExp( "[^0-9,Ee+-]" ) ); // Keep only 0 to 9, comma, E, e, plus, minus
- tmp.tqreplace ( ',', '.' );
+ tmp.replace ( ',', '.' );
kdDebug(30501) << "Comma: " << text << " => " << tmp << endl;
const double d = tmp.toDouble( &ok );
if ( !ok )
@@ -214,7 +214,7 @@ KoFilter::ConversiontqStatus CSVFilter::convert( const TQCString& from, const TQ
bool ok = false;
TQString tmp ( text );
tmp.remove ( TQRegExp( "[^0-9\\.EeD+-]" ) ); // Keep only 0 to 9, dot, E, e, D, plus, minus
- tmp.tqreplace ( 'D', 'E' ); // double from FORTRAN use D instead of E
+ tmp.replace ( 'D', 'E' ); // double from FORTRAN use D instead of E
kdDebug(30501) << "Point: " << text << " => " << tmp << endl;
const double d = tmp.toDouble( &ok );
if ( !ok )
diff --git a/filters/kspread/excel/import/excelimport.cc b/filters/kspread/excel/import/excelimport.cc
index 88a20e331..f1bade9e8 100644
--- a/filters/kspread/excel/import/excelimport.cc
+++ b/filters/kspread/excel/import/excelimport.cc
@@ -692,7 +692,7 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit
if( !xmlWriter ) return;
// only IF automatic style for this format has not been already created yet
- if( !styleFormats.tqcontains( cell->formatIndex() ) )
+ if( !styleFormats.contains( cell->formatIndex() ) )
{
styleFormats[ cell->formatIndex() ] = true;
diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp
index 7d128a5bf..c201ea27c 100644
--- a/filters/kspread/excel/sidewinder/excel.cpp
+++ b/filters/kspread/excel/sidewinder/excel.cpp
@@ -5520,11 +5520,11 @@ void ExcelReader::handleFooter( FooterRecord* record )
int pos = -1, len = 0;
// left part
- pos = footer.tqfind( UString("&L") );
+ pos = footer.find( UString("&L") );
if( pos >= 0 )
{
pos += 2;
- len = footer.tqfind( UString("&C") ) - pos;
+ len = footer.find( UString("&C") ) - pos;
if( len > 0 )
{
left = footer.substr( pos, len );
@@ -5533,11 +5533,11 @@ void ExcelReader::handleFooter( FooterRecord* record )
}
// center part
- pos = footer.tqfind( UString("&C") );
+ pos = footer.find( UString("&C") );
if( pos >= 0 )
{
pos += 2;
- len = footer.tqfind( UString("&R") ) - pos;
+ len = footer.find( UString("&R") ) - pos;
if( len > 0 )
{
center = footer.substr( pos, len );
@@ -5546,7 +5546,7 @@ void ExcelReader::handleFooter( FooterRecord* record )
}
// right part
- pos = footer.tqfind( UString("&R") );
+ pos = footer.find( UString("&R") );
if( pos >= 0 )
{
pos += 2;
@@ -5569,11 +5569,11 @@ void ExcelReader::handleHeader( HeaderRecord* record )
int pos = -1, len = 0;
// left part of the header
- pos = header.tqfind( UString("&L") );
+ pos = header.find( UString("&L") );
if( pos >= 0 )
{
pos += 2;
- len = header.tqfind( UString("&C") ) - pos;
+ len = header.find( UString("&C") ) - pos;
if( len > 0 )
{
left = header.substr( pos, len );
@@ -5582,11 +5582,11 @@ void ExcelReader::handleHeader( HeaderRecord* record )
}
// center part of the header
- pos = header.tqfind( UString("&C") );
+ pos = header.find( UString("&C") );
if( pos >= 0 )
{
pos += 2;
- len = header.tqfind( UString("&R") ) - pos;
+ len = header.find( UString("&R") ) - pos;
if( len > 0 )
{
center = header.substr( pos, len );
@@ -5595,7 +5595,7 @@ void ExcelReader::handleHeader( HeaderRecord* record )
}
// right part of the header
- pos = header.tqfind( UString("&R") );
+ pos = header.find( UString("&R") );
if( pos >= 0 )
{
pos += 2;
diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h
index 8450d643a..c114aa803 100644
--- a/filters/kspread/excel/sidewinder/excel.h
+++ b/filters/kspread/excel/sidewinder/excel.h
@@ -1838,7 +1838,7 @@ private:
/**
- Class MergedCellsRecord represents MergedCells record, which tqcontains
+ Class MergedCellsRecord represents MergedCells record, which contains
a list of all merged cells in the current sheets. Each entry in this list
define the range of cells that should be merged, namely firstRow, lastRow,
firstColumn and lastColumn.
diff --git a/filters/kspread/excel/sidewinder/ustring.cpp b/filters/kspread/excel/sidewinder/ustring.cpp
index 497bc5868..b26ee1969 100644
--- a/filters/kspread/excel/sidewinder/ustring.cpp
+++ b/filters/kspread/excel/sidewinder/ustring.cpp
@@ -492,7 +492,7 @@ UString UString::substr(int pos, int len) const
return result;
}
-int UString::tqfind(const UString &f, int pos) const
+int UString::find(const UString &f, int pos) const
{
if (isNull())
return -1;
diff --git a/filters/kspread/excel/sidewinder/ustring.h b/filters/kspread/excel/sidewinder/ustring.h
index 0643400d7..1c4f2bc53 100644
--- a/filters/kspread/excel/sidewinder/ustring.h
+++ b/filters/kspread/excel/sidewinder/ustring.h
@@ -333,7 +333,7 @@ namespace Swinder {
* @return Position of first occurence of f starting at position pos.
* -1 if the search was not successful.
*/
- int tqfind(const UString &f, int pos = 0) const;
+ int find(const UString &f, int pos = 0) const;
/**
* Static instance of a null string.
diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc
index beb78879f..cccfcc9fc 100644
--- a/filters/kspread/gnumeric/gnumericexport.cc
+++ b/filters/kspread/gnumeric/gnumericexport.cc
@@ -1340,8 +1340,8 @@ KoFilter::ConversiontqStatus GNUMERICExport::convert( const TQCString& from, con
if ( cell->isFormula() )
{
TQString tmp = cell->text();
- if ( tmp.tqcontains( "==" ) )
- tmp=tmp.tqreplace( "==", "=" );
+ if ( tmp.contains( "==" ) )
+ tmp=tmp.replace( "==", "=" );
text = tmp;
isLink = false;
}
@@ -1406,7 +1406,7 @@ KoFilter::ConversiontqStatus GNUMERICExport::convert( const TQCString& from, con
isLink = false;
TQString tmp = cell->text();
if ( tmp =="==" )
- tmp=tqreplace( "==", "=" );
+ tmp=replace( "==", "=" );
/* cell->calc( TRUE ); // Incredible, cells are not calculated if the document was just opened text = cell->valueString(); */
text = tmp;
break;
@@ -1561,12 +1561,12 @@ TQString GNUMERICExport::convertRefToBase( const TQString & table, const TQRect
TQString GNUMERICExport::convertVariable( TQString headerFooter )
{
- headerFooter = headerFooter.tqreplace( "<sheet>", "&[TAB]" );
- headerFooter = headerFooter.tqreplace( "<date>", "&[DATE]" );
- headerFooter = headerFooter.tqreplace( "<page>", "&[PAGE]" );
- headerFooter = headerFooter.tqreplace( "<pages>", "&[PAGES]" );
- headerFooter = headerFooter.tqreplace( "<time>", "&[TIME]" );
- headerFooter = headerFooter.tqreplace( "<file>", "&[FILE]" );
+ headerFooter = headerFooter.replace( "<sheet>", "&[TAB]" );
+ headerFooter = headerFooter.replace( "<date>", "&[DATE]" );
+ headerFooter = headerFooter.replace( "<page>", "&[PAGE]" );
+ headerFooter = headerFooter.replace( "<pages>", "&[PAGES]" );
+ headerFooter = headerFooter.replace( "<time>", "&[TIME]" );
+ headerFooter = headerFooter.replace( "<file>", "&[FILE]" );
return headerFooter;
}
diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cc
index ad97a5487..249258b3d 100644
--- a/filters/kspread/gnumeric/gnumericimport.cc
+++ b/filters/kspread/gnumeric/gnumericimport.cc
@@ -176,8 +176,8 @@ void convert_string_to_qcolor(TQString color_string, TQColor * color)
bool number_ok;
- first_col_pos = color_string.tqfind(":", 0);
- second_col_pos = color_string.tqfind(":", first_col_pos + 1);
+ first_col_pos = color_string.find(":", 0);
+ second_col_pos = color_string.find(":", first_col_pos + 1);
/* Fore="0:0:FF00" */
/* If GNUmeric kicks out some invalid colors, we could crash. */
@@ -196,30 +196,30 @@ void areaNames( Doc * ksdoc, const TQString &_name, TQString _zone )
{
//Sheet2!$A$2:$D$8
TQString tableName;
- int pos = _zone.tqfind( '!' );
+ int pos = _zone.find( '!' );
if ( pos != -1 )
{
tableName = _zone.left( pos );
_zone = _zone.right( _zone.length()-pos-1 );
- pos = _zone.tqfind( ':' );
+ pos = _zone.find( ':' );
TQRect rect;
if ( pos != -1 )
{
TQString left = _zone.mid( 1, pos-1 );
TQString right = _zone.mid( pos+2, _zone.length()-pos-2 );
- int pos = left.tqfind( '$' );
+ int pos = left.find( '$' );
rect.setLeft( util_decodeColumnLabelText(left.left(pos ) ) );
rect.setTop( left.right( left.length()-pos-1 ).toInt() );
- pos = right.tqfind( '$' );
+ pos = right.find( '$' );
rect.setRight( util_decodeColumnLabelText(right.left(pos ) ) );
rect.setBottom( right.right( right.length()-pos-1 ).toInt() );
}
else
{
TQString left = _zone;
- int pos = left.tqfind( '$' );
+ int pos = left.find( '$' );
int leftPos = util_decodeColumnLabelText(left.left(pos ) );
rect.setLeft( leftPos );
rect.setRight( leftPos );
@@ -814,15 +814,15 @@ TQString GNUMERICFilter::convertVars( TQString const & str, Sheet * table ) cons
for ( uint i = 0; i < count; ++i )
{
- int n = result.tqfind( list1[i] );
+ int n = result.find( list1[i] );
if ( n != -1 )
{
kdDebug(30521) << "Found var: " << list1[i] << endl;
if ( i == 0 )
- result = result.tqreplace( list1[i], table->tableName() );
+ result = result.replace( list1[i], table->tableName() );
else
- result = result.tqreplace( list1[i], list2[i] );
+ result = result.replace( list1[i], list2[i] );
}
}
@@ -926,7 +926,7 @@ void GNUMERICFilter::ParsePrintInfo( TQDomNode const & printInfo, Sheet * table
if ( !repeate.isEmpty() )
{
//fix row too high
- repeate = repeate.tqreplace( "65536", "32500" );
+ repeate = repeate.replace( "65536", "32500" );
Range range(repeate);
//kdDebug()<<" repeate :"<<repeate<<"range. ::start row : "<<range.startRow ()<<" start col :"<<range.startCol ()<<" end row :"<<range.endRow ()<<" end col :"<<range.endCol ()<<endl;
table->print()->setPrintRepeatColumns( tqMakePair( range.startCol (),range.endCol ()) );
@@ -983,7 +983,7 @@ void GNUMERICFilter::ParseFormat(TQString const & formatString, Cell * kspread_c
{
if ((formatString[0] == '[') && (formatString[1] == '$'))
{
- int n = formatString.tqfind(']');
+ int n = formatString.find(']');
if (n != -1)
{
TQString currency = formatString.mid(2, n - 2);
@@ -992,7 +992,7 @@ void GNUMERICFilter::ParseFormat(TQString const & formatString, Cell * kspread_c
}
lastPos = ++n;
}
- else if (formatString.tqfind("E+0") != -1)
+ else if (formatString.find("E+0") != -1)
{
kspread_cell->format()->setFormatType(Scientific_format);
}
@@ -1004,7 +1004,7 @@ void GNUMERICFilter::ParseFormat(TQString const & formatString, Cell * kspread_c
if ( setType(kspread_cell, formatString, content) )
return;
- if (formatString.tqfind("?/?") != -1)
+ if (formatString.find("?/?") != -1)
{
// TODO: fixme!
kspread_cell->format()->setFormatType( fraction_three_digits );
@@ -1035,7 +1035,7 @@ void GNUMERICFilter::ParseFormat(TQString const & formatString, Cell * kspread_c
while (formatString[lastPos] == ' ')
++lastPos;
- int n = formatString.tqfind( '.', lastPos );
+ int n = formatString.find( '.', lastPos );
if ( n != -1)
{
lastPos = n + 1;
@@ -1051,12 +1051,12 @@ void GNUMERICFilter::ParseFormat(TQString const & formatString, Cell * kspread_c
}
bool red = false;
- if (formatString.tqfind("[RED]", lastPos) != -1)
+ if (formatString.find("[RED]", lastPos) != -1)
{
red = true;
kspread_cell->format()->setFloatColor( Format::NegRed );
}
- if ( formatString.tqfind('(', lastPos) != -1 )
+ if ( formatString.find('(', lastPos) != -1 )
{
if ( red )
kspread_cell->format()->setFloatColor( Format::NegRedBrackets );
@@ -1067,11 +1067,11 @@ void GNUMERICFilter::ParseFormat(TQString const & formatString, Cell * kspread_c
void GNUMERICFilter::convertFormula( TQString & formula ) const
{
- int n = formula.tqfind( '=', 1 );
+ int n = formula.find( '=', 1 );
// TODO: check if we do not screw something up here...
if ( n != -1 )
- formula = formula.tqreplace( n, 1, "==" );
+ formula = formula.replace( n, 1, "==" );
bool inQuote1 = false;
bool inQuote2 = false;
@@ -1083,7 +1083,7 @@ void GNUMERICFilter::convertFormula( TQString & formula ) const
else if ( formula[i] == '"' )
inQuote2 = !inQuote2;
else if ( formula[i] == ',' && !inQuote1 && !inQuote2 )
- formula = formula.tqreplace( i, 1, ";" );
+ formula = formula.replace( i, 1, ";" );
}
}
diff --git a/filters/kspread/html/htmlexport.cc b/filters/kspread/html/htmlexport.cc
index 3360c5934..54711d8d6 100644
--- a/filters/kspread/html/htmlexport.cc
+++ b/filters/kspread/html/htmlexport.cc
@@ -105,7 +105,7 @@ KoFilter::ConversiontqStatus HTMLExport::convert( const TQCString& from, const T
Sheet *sheet = ksdoc->map()->firstSheet();
TQString filenameBase = m_chain->outputFile();
- filenameBase = filenameBase.left( filenameBase.tqfindRev( '.' ) );
+ filenameBase = filenameBase.left( filenameBase.findRev( '.' ) );
TQStringList sheets;
while( sheet != 0 )
@@ -345,10 +345,10 @@ void HTMLExport::convertSheet( Sheet *sheet, TQString &str, int iMaxUsedRow, int
text = text.right(text.length()-1);
} else if ( !link ) {
// Escape HTML characters.
- text.tqreplace ('&' , strAmp)
- .tqreplace ('<' , strLt)
- .tqreplace ('>' , strGt)
- .tqreplace (' ' , nbsp);
+ text.replace ('&' , strAmp)
+ .replace ('<' , strLt)
+ .replace ('>' , strGt)
+ .replace (' ' , nbsp);
}
line += ">\n";
diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc
index f38b0bb85..6a0376f49 100644
--- a/filters/kspread/opencalc/opencalcexport.cc
+++ b/filters/kspread/opencalc/opencalcexport.cc
@@ -474,14 +474,14 @@ bool OpenCalcExport::exportBody( TQDomDocument & doc, TQDomElement & content, co
TQString name( sheet->tableName() );
- int n = name.tqfind( ' ' );
+ int n = name.find( ' ' );
if ( n != -1 )
{
kdDebug(30518) << "Sheet name converting: " << name << endl;
name[n] == '_';
kdDebug(30518) << "Sheet name converted: " << name << endl;
}
- name = name.tqreplace( ' ', "_" );
+ name = name.replace( ' ', "_" );
TQRect _printRange = sheet->print()->printRange();
if ( _printRange != ( TQRect( TQPoint( 1, 1 ), TQPoint( KS_colMax, KS_rowMax ) ) ) )
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc
index 5316749ef..f52ffd0fa 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cc
@@ -80,7 +80,7 @@ OpenCalcImport::OpenCalcPoint::OpenCalcPoint( TQString const & str )
int colonPos = -1;
TQString range;
- // tqreplace '.' with '!'
+ // replace '.' with '!'
for ( int i = 0; i < l; ++i )
{
if ( str[i] == '$' )
@@ -261,9 +261,9 @@ void OpenCalcImport::checkForNamedAreas( TQString & formula ) const
}
if ( word.length() > 0 )
{
- if ( m_namedAreas.tqfind( word ) != m_namedAreas.end() )
+ if ( m_namedAreas.find( word ) != m_namedAreas.end() )
{
- formula = formula.tqreplace( start, word.length(), "'" + word + "'" );
+ formula = formula.replace( start, word.length(), "'" + word + "'" );
l = formula.length();
++i;
kdDebug(30518) << "Formula: " << formula << ", L: " << l << ", i: " << i + 1 <<endl;
@@ -276,9 +276,9 @@ void OpenCalcImport::checkForNamedAreas( TQString & formula ) const
}
if ( word.length() > 0 )
{
- if ( m_namedAreas.tqfind( word ) != m_namedAreas.end() )
+ if ( m_namedAreas.find( word ) != m_namedAreas.end() )
{
- formula = formula.tqreplace( start, word.length(), "'" + word + "'" );
+ formula = formula.replace( start, word.length(), "'" + word + "'" );
l = formula.length();
++i;
kdDebug(30518) << "Formula: " << formula << ", L: " << l << ", i: " << i + 1 <<endl;
@@ -635,13 +635,13 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet * table, int row,
int year=0, month=0, day=0;
ok = false;
- int p1 = value.tqfind( '-' );
+ int p1 = value.find( '-' );
if ( p1 > 0 )
year = value.left( p1 ).toInt( &ok );
kdDebug(30518) << "year: " << value.left( p1 ) << endl;
- int p2 = value.tqfind( '-', ++p1 );
+ int p2 = value.find( '-', ++p1 );
if ( ok )
month = value.mid( p1, p2 - p1 ).toInt( &ok );
@@ -807,14 +807,14 @@ void OpenCalcImport::loadOasisCondition(Cell*cell,const TQDomElement &property )
void OpenCalcImport::loadOasisConditionValue( const TQString &styleCondition, Conditional &newCondition )
{
TQString val( styleCondition );
- if ( val.tqcontains( "cell-content()" ) )
+ if ( val.contains( "cell-content()" ) )
{
val = val.remove( "cell-content()" );
loadOasisCondition( val,newCondition );
}
//GetFunction ::= cell-content-is-between(Value, Value) | cell-content-is-not-between(Value, Value)
//for the moment we support just int/double value, not text/date/time :(
- if ( val.tqcontains( "cell-content-is-between(" ) )
+ if ( val.contains( "cell-content-is-between(" ) )
{
val = val.remove( "cell-content-is-between(" );
val = val.remove( ")" );
@@ -822,7 +822,7 @@ void OpenCalcImport::loadOasisConditionValue( const TQString &styleCondition, Co
loadOasisValidationValue( listVal, newCondition );
newCondition.cond = Conditional::Between;
}
- if ( val.tqcontains( "cell-content-is-not-between(" ) )
+ if ( val.contains( "cell-content-is-not-between(" ) )
{
val = val.remove( "cell-content-is-not-between(" );
val = val.remove( ")" );
@@ -837,33 +837,33 @@ void OpenCalcImport::loadOasisConditionValue( const TQString &styleCondition, Co
void OpenCalcImport::loadOasisCondition( TQString &valExpression, Conditional &newCondition )
{
TQString value;
- if (valExpression.tqfind( "<=" )==0 )
+ if (valExpression.find( "<=" )==0 )
{
value = valExpression.remove( 0,2 );
newCondition.cond = Conditional::InferiorEqual;
}
- else if (valExpression.tqfind( ">=" )==0 )
+ else if (valExpression.find( ">=" )==0 )
{
value = valExpression.remove( 0,2 );
newCondition.cond = Conditional::SuperiorEqual;
}
- else if (valExpression.tqfind( "!=" )==0 )
+ else if (valExpression.find( "!=" )==0 )
{
//add Differentto attribute
value = valExpression.remove( 0,2 );
newCondition.cond = Conditional::DifferentTo;
}
- else if ( valExpression.tqfind( "<" )==0 )
+ else if ( valExpression.find( "<" )==0 )
{
value = valExpression.remove( 0,1 );
newCondition.cond = Conditional::Inferior;
}
- else if(valExpression.tqfind( ">" )==0 )
+ else if(valExpression.find( ">" )==0 )
{
value = valExpression.remove( 0,1 );
newCondition.cond = Conditional::Superior;
}
- else if (valExpression.tqfind( "=" )==0 )
+ else if (valExpression.find( "=" )==0 )
{
value = valExpression.remove( 0,1 );
newCondition.cond = Conditional::Equal;
@@ -1135,9 +1135,9 @@ bool OpenCalcImport::readColLayouts( TQDomElement & content, Sheet * table )
void replaceMacro( TQString & text, TQString const & old, TQString const & newS )
{
- int n = text.tqfind( old );
+ int n = text.find( old );
if ( n != -1 )
- text = text.tqreplace( n, old.length(), newS );
+ text = text.replace( n, old.length(), newS );
}
TQString getPart( TQDomNode const & part )
@@ -1332,35 +1332,35 @@ void OpenCalcImport::loadOasisMasterLayoutPage( Sheet * table,KoStyleStack &styl
TQString str = styleStack.attributeNS( ooNS::style, "print" );
kdDebug(30518)<<" style:print :"<<str<<endl;
- if (str.tqcontains( "headers" ) )
+ if (str.contains( "headers" ) )
{
//todo implement it into kspread
}
- if ( str.tqcontains( "grid" ) )
+ if ( str.contains( "grid" ) )
{
table->print()->setPrintGrid( true );
}
- if ( str.tqcontains( "annotations" ) )
+ if ( str.contains( "annotations" ) )
{
//todo it's not implemented
}
- if ( str.tqcontains( "objects" ) )
+ if ( str.contains( "objects" ) )
{
//todo it's not implemented
}
- if ( str.tqcontains( "charts" ) )
+ if ( str.contains( "charts" ) )
{
//todo it's not implemented
}
- if ( str.tqcontains( "drawings" ) )
+ if ( str.contains( "drawings" ) )
{
//todo it's not implemented
}
- if ( str.tqcontains( "formulas" ) )
+ if ( str.contains( "formulas" ) )
{
table->setShowFormula(true);
}
- if ( str.tqcontains( "zero-values" ) )
+ if ( str.contains( "zero-values" ) )
{
//todo it's not implemented
}
@@ -1624,11 +1624,11 @@ void OpenCalcImport::loadOasisAreaName( const TQDomElement&body )
TQString range( point.translation );
- if ( point.translation.tqfind( ':' ) == -1 )
+ if ( point.translation.find( ':' ) == -1 )
{
Point p( point.translation );
- int n = range.tqfind( '!' );
+ int n = range.find( '!' );
if ( n > 0 )
range = range + ":" + range.right( range.length() - n - 1);
@@ -2001,7 +2001,7 @@ void OpenCalcImport::loadBorder( Format * tqlayout, TQString const & borderDef,
if ( borderDef == "none" )
return;
- int p = borderDef.tqfind( ' ' );
+ int p = borderDef.find( ' ' );
if ( p < 0 )
return;
@@ -2011,7 +2011,7 @@ void OpenCalcImport::loadBorder( Format * tqlayout, TQString const & borderDef,
++p;
- int p2 = borderDef.tqfind( ' ', p );
+ int p2 = borderDef.find( ' ', p );
TQString s = borderDef.mid( p, p2 - p );
kdDebug(30518) << "Borderstyle: " << s << endl;
@@ -2031,7 +2031,7 @@ void OpenCalcImport::loadBorder( Format * tqlayout, TQString const & borderDef,
}
++p2;
- p = borderDef.tqfind( ' ', p2 );
+ p = borderDef.find( ' ', p2 );
if ( p == -1 )
p = borderDef.length();
@@ -2224,7 +2224,7 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style
if ( style.hasAttributeNS( ooNS::style, "tqparent-style-name" ) )
{
Format * cp
- = m_defaultStyles.tqfind( style.attributeNS( ooNS::style, "tqparent-style-name", TQString() ) );
+ = m_defaultStyles.find( style.attributeNS( ooNS::style, "tqparent-style-name", TQString() ) );
kdDebug(30518) << "Copying tqlayout from " << style.attributeNS( ooNS::style, "tqparent-style-name", TQString() ) << endl;
if ( cp != 0 )
@@ -2233,7 +2233,7 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style
else if ( style.hasAttributeNS( ooNS::style, "family") )
{
TQString name = style.attribute( "style-family" ) + "default";
- Format * cp = m_defaultStyles.tqfind( name );
+ Format * cp = m_defaultStyles.find( name );
kdDebug(30518) << "Copying tqlayout from " << name << ", " << !cp << endl;
@@ -2440,7 +2440,7 @@ void OpenCalcImport::loadOasisValidation( Validity* val, const TQString& validat
//A NumberValue is a whole or decimal number. It must not contain comma separators for numbers of 1000 or greater.
//ExtendedTrueCondition
- if ( valExpression.tqcontains( "cell-content-text-length()" ) )
+ if ( valExpression.contains( "cell-content-text-length()" ) )
{
//"cell-content-text-length()>45"
valExpression = valExpression.remove("cell-content-text-length()" );
@@ -2450,7 +2450,7 @@ void OpenCalcImport::loadOasisValidation( Validity* val, const TQString& validat
loadOasisValidationCondition( val, valExpression );
}
//cell-content-text-length-is-between(Value, Value) | cell-content-text-length-is-not-between(Value, Value)
- else if ( valExpression.tqcontains( "cell-content-text-length-is-between" ) )
+ else if ( valExpression.contains( "cell-content-text-length-is-between" ) )
{
val->m_restriction = Restriction::TextLength;
val->m_cond = Conditional::Between;
@@ -2460,7 +2460,7 @@ void OpenCalcImport::loadOasisValidation( Validity* val, const TQString& validat
TQStringList listVal = TQStringList::split( ",", valExpression );
loadOasisValidationValue( val, listVal );
}
- else if ( valExpression.tqcontains( "cell-content-text-length-is-not-between" ) )
+ else if ( valExpression.contains( "cell-content-text-length-is-not-between" ) )
{
val->m_restriction = Restriction::TextLength;
val->m_cond = Conditional::Different;
@@ -2475,36 +2475,36 @@ void OpenCalcImport::loadOasisValidation( Validity* val, const TQString& validat
//TrueFunction ::= cell-content-is-whole-number() | cell-content-is-decimal-number() | cell-content-is-date() | cell-content-is-time()
else
{
- if (valExpression.tqcontains( "cell-content-is-whole-number()" ) )
+ if (valExpression.contains( "cell-content-is-whole-number()" ) )
{
val->m_restriction = Restriction::Number;
valExpression = valExpression.remove( "cell-content-is-whole-number() and " );
}
- else if (valExpression.tqcontains( "cell-content-is-decimal-number()" ) )
+ else if (valExpression.contains( "cell-content-is-decimal-number()" ) )
{
val->m_restriction = Restriction::Integer;
valExpression = valExpression.remove( "cell-content-is-decimal-number() and " );
}
- else if (valExpression.tqcontains( "cell-content-is-date()" ) )
+ else if (valExpression.contains( "cell-content-is-date()" ) )
{
val->m_restriction = Restriction::Date;
valExpression = valExpression.remove( "cell-content-is-date() and " );
}
- else if (valExpression.tqcontains( "cell-content-is-time()" ) )
+ else if (valExpression.contains( "cell-content-is-time()" ) )
{
val->m_restriction = Restriction::Time;
valExpression = valExpression.remove( "cell-content-is-time() and " );
}
kdDebug(30518)<<"valExpression :"<<valExpression<<endl;
- if ( valExpression.tqcontains( "cell-content()" ) )
+ if ( valExpression.contains( "cell-content()" ) )
{
valExpression = valExpression.remove( "cell-content()" );
loadOasisValidationCondition( val, valExpression );
}
//GetFunction ::= cell-content-is-between(Value, Value) | cell-content-is-not-between(Value, Value)
//for the moment we support just int/double value, not text/date/time :(
- if ( valExpression.tqcontains( "cell-content-is-between(" ) )
+ if ( valExpression.contains( "cell-content-is-between(" ) )
{
valExpression = valExpression.remove( "cell-content-is-between(" );
valExpression = valExpression.remove( ")" );
@@ -2513,7 +2513,7 @@ void OpenCalcImport::loadOasisValidation( Validity* val, const TQString& validat
val->m_cond = Conditional::Between;
}
- if ( valExpression.tqcontains( "cell-content-is-not-between(" ) )
+ if ( valExpression.contains( "cell-content-is-not-between(" ) )
{
valExpression = valExpression.remove( "cell-content-is-not-between(" );
valExpression = valExpression.remove( ")" );
@@ -2623,33 +2623,33 @@ void OpenCalcImport::loadOasisValidationValue( Validity* val, const TQStringList
void OpenCalcImport::loadOasisValidationCondition( Validity* val,TQString &valExpression )
{
TQString value;
- if (valExpression.tqcontains( "<=" ) )
+ if (valExpression.contains( "<=" ) )
{
value = valExpression.remove( "<=" );
val->m_cond = Conditional::InferiorEqual;
}
- else if (valExpression.tqcontains( ">=" ) )
+ else if (valExpression.contains( ">=" ) )
{
value = valExpression.remove( ">=" );
val->m_cond = Conditional::SuperiorEqual;
}
- else if (valExpression.tqcontains( "!=" ) )
+ else if (valExpression.contains( "!=" ) )
{
//add Differentto attribute
value = valExpression.remove( "!=" );
val->m_cond = Conditional::DifferentTo;
}
- else if ( valExpression.tqcontains( "<" ) )
+ else if ( valExpression.contains( "<" ) )
{
value = valExpression.remove( "<" );
val->m_cond = Conditional::Inferior;
}
- else if(valExpression.tqcontains( ">" ) )
+ else if(valExpression.contains( ">" ) )
{
value = valExpression.remove( ">" );
val->m_cond = Conditional::Superior;
}
- else if (valExpression.tqcontains( "=" ) )
+ else if (valExpression.contains( "=" ) )
{
value = valExpression.remove( "=" );
val->m_cond = Conditional::Equal;
diff --git a/filters/kspread/qpro/libqpro/src/formula.cc b/filters/kspread/qpro/libqpro/src/formula.cc
index bd2500485..13e3a4574 100644
--- a/filters/kspread/qpro/libqpro/src/formula.cc
+++ b/filters/kspread/qpro/libqpro/src/formula.cc
@@ -214,7 +214,7 @@ static const QpFormulaConv gConv[] =
{73, QpFormula::func3, "@mid("},
{74, QpFormula::func1, "@char("},
{75, QpFormula::func1, "@code("},
- {76, QpFormula::func3, "@tqfind("},
+ {76, QpFormula::func3, "@find("},
{77, QpFormula::func1, "@dateVal("},
{78, QpFormula::func1, "@timeVal("},
{79, QpFormula::func1, "@cellPtr("},
@@ -244,7 +244,7 @@ static const QpFormulaConv gConv[] =
{103, QpFormula::func1, "@lower("},
{104, QpFormula::func2, "@left("},
{105, QpFormula::func2, "@right("},
- {106, QpFormula::func4, "@tqreplace("},
+ {106, QpFormula::func4, "@replace("},
{107, QpFormula::func1, "@proper("},
{108, QpFormula::func2, "@cell("},
{109, QpFormula::func1, "@trim("},
diff --git a/filters/kword/abiword/ImportHelpers.cc b/filters/kword/abiword/ImportHelpers.cc
index d37b078c6..c3cad308a 100644
--- a/filters/kword/abiword/ImportHelpers.cc
+++ b/filters/kword/abiword/ImportHelpers.cc
@@ -26,7 +26,7 @@
bool AbiPropsMap::setProperty(const TQString& newName, const TQString& newValue)
{
- tqreplace(newName,AbiProps(newValue));
+ replace(newName,AbiProps(newValue));
return true;
}
@@ -43,7 +43,7 @@ void AbiPropsMap::splitAndAddAbiProps(const TQString& strProps)
TQStringList::ConstIterator end(list.end());
for (it=list.begin();it!=end;++it)
{
- const int result=(*it).tqfind(':');
+ const int result=(*it).find(':');
if (result==-1)
{
name=(*it);
diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cc
index 62d951e5f..4f84a8e48 100644
--- a/filters/kword/abiword/ImportStyle.cc
+++ b/filters/kword/abiword/ImportStyle.cc
@@ -57,7 +57,7 @@ void StyleDataMap::defineNewStyleFromOld(const TQString& strName, const TQString
return;
}
- StyleDataMap::Iterator it=tqfind(strOld);
+ StyleDataMap::Iterator it=find(strOld);
if (it==end())
{
defineNewStyle(strName,level,strProps);
@@ -76,7 +76,7 @@ void StyleDataMap::defineNewStyle(const TQString& strName, const int level,
{
// Despite its name, this method can be called multiple times
// We must take care that KWord just gets it only one time.
- StyleDataMap::Iterator it=tqfind(strName);
+ StyleDataMap::Iterator it=find(strName);
if (it==end())
{
// The style does not exist yet, so we must define it.
@@ -95,7 +95,7 @@ void StyleDataMap::defineNewStyle(const TQString& strName, const int level,
StyleDataMap::Iterator StyleDataMap::useOrCreateStyle(const TQString& strName)
{
// We are using a style but we are not sure if it is defined
- StyleDataMap::Iterator it=tqfind(strName);
+ StyleDataMap::Iterator it=find(strName);
if (it==end())
{
// The style is not yet defined!
diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc
index c48b3c278..96c5cc6d4 100644
--- a/filters/kword/abiword/abiwordexport.cc
+++ b/filters/kword/abiword/abiwordexport.cc
@@ -153,7 +153,7 @@ bool AbiWordWorker::doOpenFile(const TQString& filenameOut, const TQString& )
<< " (in AbiWordWorker::doOpenFile)" << endl;
//Find the last extension
TQString strExt;
- const int result=filenameOut.tqfindRev('.');
+ const int result=filenameOut.findRev('.');
if (result>=0)
{
strExt=filenameOut.mid(result);
@@ -253,7 +253,7 @@ void AbiWordWorker::writePictureData(const TQString& koStoreName, const TQString
TQByteArray image;
TQString strExtension(koStoreName.lower());
- const int result=koStoreName.tqfindRev(".");
+ const int result=koStoreName.findRev(".");
if (result>=0)
{
strExtension=koStoreName.mid(result+1);
@@ -543,7 +543,7 @@ void AbiWordWorker::writeAbiProps (const TextFormatting& formatLayout, const Tex
TQString abiprops=textFormatToAbiProps(formatLayout,format,false);
// Erase the last semi-comma (as in CSS2, semi-commas only separate instructions and do not terminate them)
- const int result=abiprops.tqfindRev(";");
+ const int result=abiprops.findRev(";");
if (result>=0)
{
@@ -566,9 +566,9 @@ void AbiWordWorker::processNormalText ( const TQString &paraText,
// Replace line feeds by line breaks
int pos;
- while ((pos=partialText.tqfind(TQChar(10)))>-1)
+ while ((pos=partialText.find(TQChar(10)))>-1)
{
- partialText.tqreplace(pos,1,"<br/>");
+ partialText.replace(pos,1,"<br/>");
}
if (formatData.text.missing)
@@ -904,7 +904,7 @@ bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData&
{
// Find the last semi-comma
// Note: as in CSS2, semi-commas only separates instructions (like in PASCAL) and do not terminate them (like in C)
- const int result=props.tqfindRev(";");
+ const int result=props.findRev(";");
if (result>=0)
{
// Remove the last semi-comma and the space thereafter
@@ -956,7 +956,7 @@ bool AbiWordWorker::doFullDefineStyle(LayoutData& tqlayout)
TQString abiprops=layoutToCss(tqlayout,tqlayout,true);
- const int result=abiprops.tqfindRev(";");
+ const int result=abiprops.findRev(";");
if (result>=0)
{
// Remove the last semi-comma and the space thereafter
diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc
index 2d0697ba3..56524cd69 100644
--- a/filters/kword/abiword/abiwordimport.cc
+++ b/filters/kword/abiword/abiwordimport.cc
@@ -157,7 +157,7 @@ bool StructureParser::StartElementC(StackItem* stackItem, StackItem* stackCurren
TQString strStyleName=attributes.value("style").stripWhiteSpace();
if (!strStyleName.isEmpty())
{
- StyleDataMap::Iterator it=styleDataMap.tqfind(strStyleName);
+ StyleDataMap::Iterator it=styleDataMap.find(strStyleName);
if (it!=styleDataMap.end())
{
strStyleProps=it.data().m_props;
@@ -823,7 +823,7 @@ static bool StartElementPBR(StackItem* /*stackItem*/, StackItem* stackCurrent,
if (!nodeList.count())
{
- kdError(30506) << "Unable to tqfind <LAYOUT> element! Aborting! (in StartElementPBR)" <<endl;
+ kdError(30506) << "Unable to find <LAYOUT> element! Aborting! (in StartElementPBR)" <<endl;
return false;
}
@@ -1587,7 +1587,7 @@ bool StructureParser::endDocument(void)
StyleDataMap::ConstIterator it;
// At first, we put the Normal style
- it=styleDataMap.tqfind("Normal");
+ it=styleDataMap.find("Normal");
if (it!=styleDataMap.end())
{
kdDebug(30506) << "\"" << it.key() << "\" => " << it.data().m_props << endl;
@@ -1774,7 +1774,7 @@ KoFilter::ConversiontqStatus ABIWORDImport::convert( const TQCString& from, cons
//Find the last extension
TQString strExt;
TQString fileIn = m_chain->inputFile();
- const int result=fileIn.tqfindRev('.');
+ const int result=fileIn.findRev('.');
if (result>=0)
{
strExt=fileIn.mid(result);
diff --git a/filters/kword/applixword/applixwordimport.cc b/filters/kword/applixword/applixwordimport.cc
index 17af6d88a..d7acc7ed8 100644
--- a/filters/kword/applixword/applixwordimport.cc
+++ b/filters/kword/applixword/applixwordimport.cc
@@ -160,7 +160,7 @@ KoFilter::ConversiontqStatus APPLIXWORDImport::convert( const TQCString& from, c
if (mystr.startsWith ("<color "))
{
mystr.remove (0, 8);
- pos = mystr.tqfind ("\"");
+ pos = mystr.find ("\"");
coltxt = mystr.left (pos);
mystr.remove (0,pos+1);
rueck = sscanf ((const char *) mystr.latin1() ,
@@ -252,7 +252,7 @@ KoFilter::ConversiontqStatus APPLIXWORDImport::convert( const TQCString& from, c
int y=0;
do
{
- pos = mystr.tqfind ("\"", y);
+ pos = mystr.find ("\"", y);
kdDebug(30517)<<"POS:"<<pos<<" length:"<< mystr.length()<<" y:"<<y <<endl;
kdDebug(30517)<<"< "<<mystr<<" >\n";
@@ -334,7 +334,7 @@ KoFilter::ConversiontqStatus APPLIXWORDImport::convert( const TQCString& from, c
(*it).remove (0, 7);
(*it).remove ((*it).length()-1, 1);
colname = *it;
- colpos = mcoltxt.tqfindIndex (colname);
+ colpos = mcoltxt.findIndex (colname);
kdDebug(30517) <<" Color: "<< colname<<" "<< colpos <<" \n";
}
else
@@ -691,9 +691,9 @@ APPLIXWORDImport::replaceSpecial (TQString &textstr)
int ok, pos;
// 1. Replace Part for this characters: <, >, &
- textstr.tqreplace ('&', "&amp;");
- textstr.tqreplace ('<', "&lt;");
- textstr.tqreplace ('>', "&gt;");
+ textstr.replace ('&', "&amp;");
+ textstr.replace ('<', "&lt;");
+ textstr.replace ('>', "&gt;");
// 2. Replace part for this characters: applixwear qoutes
@@ -702,12 +702,12 @@ APPLIXWORDImport::replaceSpecial (TQString &textstr)
do
{
// Searching for an quote
- pos = textstr.tqfind ('\"', pos);
+ pos = textstr.find ('\"', pos);
// Is it an textqoute ?
if ((pos > -1) && (textstr[pos-1] == '\\'))
{
- textstr.tqreplace (pos-1, 2,"\"");
+ textstr.replace (pos-1, 2,"\"");
}
else
{
@@ -727,7 +727,7 @@ APPLIXWORDImport::replaceSpecial (TQString &textstr)
// initialize
foundSpecialCharakter = false;
- pos = textstr.tqfind ("^");
+ pos = textstr.find ("^");
// is there a special character ?
if (pos > -1 )
@@ -739,7 +739,7 @@ APPLIXWORDImport::replaceSpecial (TQString &textstr)
newchar = specCharfind (textstr[pos+1], textstr[pos+2]);
// replace the character
- textstr.tqreplace (pos, 3, newchar);
+ textstr.replace (pos, 3, newchar);
}
}
while (foundSpecialCharakter == true);
diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cc
index 04b7f4512..4f4fbb061 100644
--- a/filters/kword/ascii/asciiexport.cc
+++ b/filters/kword/ascii/asciiexport.cc
@@ -391,7 +391,7 @@ bool ASCIIWorker::ProcessParagraphData(const TQString& paraText,
case 1: // Normal text
{
TQString strText(paraText.mid((*paraFormatDataIt).pos,(*paraFormatDataIt).len));
- strText = strText.tqreplace(TQChar(10), m_eol, true);
+ strText = strText.replace(TQChar(10), m_eol, true);
*m_streamOut << strText;
break;
}
@@ -409,7 +409,7 @@ bool ASCIIWorker::ProcessParagraphData(const TQString& paraText,
TQValueList<ParaData>::ConstIterator it;
TQValueList<ParaData>::ConstIterator end(paraList->end());
for (it=paraList->begin();it!=end;++it)
- notestr += (*it).text.stripWhiteSpace().tqreplace(TQChar(10), m_eol, true) + m_eol;
+ notestr += (*it).text.stripWhiteSpace().replace(TQChar(10), m_eol, true) + m_eol;
*m_streamOut << "[";
if (automatic) {
diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc
index a04da78ff..f2a6e039b 100644
--- a/filters/kword/ascii/asciiimport.cc
+++ b/filters/kword/ascii/asciiimport.cc
@@ -404,7 +404,7 @@ void ASCIIImport::sentenceConvert(TQTextStream& stream, TQDomDocument& mainDocum
lastChar=strLine[lastPos];
if (lastChar.isNull())
break;
- else if (skippingQuotes.tqfind(lastChar)==-1)
+ else if (skippingQuotes.find(lastChar)==-1)
break;
else
lastPos--;
@@ -413,7 +413,7 @@ void ASCIIImport::sentenceConvert(TQTextStream& stream, TQDomDocument& mainDocum
lastChar=strLine[lastPos];
if (lastChar.isNull())
continue;
- else if (stoppingPunctuation.tqfind(lastChar)!=-1)
+ else if (stoppingPunctuation.find(lastChar)!=-1)
break;
}
#if 1
@@ -659,12 +659,12 @@ bool ASCIIImport::Table( TQString *Line, int *linecount, int no_lines,
}
// find column positions and record text fields
- while((index2 = Line->tqfind( TQRegExp("\t"),index)) > index
+ while((index2 = Line->find( TQRegExp("\t"),index)) > index
|| (index3 = MultSpaces( *Line, index)) > index )
{
index1 = kMax(index2, index3);
if( index2 > index3)
- index1 = Line->tqfind( TQRegExp("[^\t]"), index1);
+ index1 = Line->find( TQRegExp("[^\t]"), index1);
tabcount++;
tabs[i].field[no_cols] = Line->mid(index, (index1 - index -1));
tabs[i].width[no_cols] = index1 - index + spacespertab - 1;
@@ -916,13 +916,13 @@ int ASCIIImport::MultSpaces(const TQString& text, const int index) const
{
type = "6";
// delete * at beginning of line
- text.tqreplace( TQRegExp("^[ \t]*\\* "), "");
+ text.replace( TQRegExp("^[ \t]*\\* "), "");
}
else if( listtype[begin] == dash) // write out a dash list
{
type = "7";
// delete - at beginning of line
- text.tqreplace( TQRegExp("^[ \t]*\\- "), "");
+ text.replace( TQRegExp("^[ \t]*\\- "), "");
}
else if( listtype[begin] == none) // write out a paragraph
type = "";
@@ -965,7 +965,7 @@ bool ASCIIImport::IsListItem( TQString FirstLine, TQChar mark )
- int k = FirstLine.tqfind(mark);
+ int k = FirstLine.find(mark);
if( k < 0) return false; // list item mark not on line
diff --git a/filters/kword/hancomword/hancomwordimport.cpp b/filters/kword/hancomword/hancomwordimport.cpp
index 412442475..6fc353e5b 100644
--- a/filters/kword/hancomword/hancomwordimport.cpp
+++ b/filters/kword/hancomword/hancomwordimport.cpp
@@ -200,7 +200,7 @@ TQByteArray HancomWordImport::Private::createContent()
for( uint i = 0; i < paragraphs.count(); i++ )
{
TQString text = paragraphs[i];
- text.tqreplace( '\r', ' ' );
+ text.replace( '\r', ' ' );
contentWriter->startElement( "text:p" );
contentWriter->addTextNode( text );
contentWriter->endElement(); // text:p
diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc
index 057cdd86e..49abcf79a 100644
--- a/filters/kword/html/export/ExportCss.cc
+++ b/filters/kword/html/export/ExportCss.cc
@@ -101,7 +101,7 @@ TQString HtmlCssWorker::textFormatToCss(const TextFormatting& formatOrigin,
&& (force || (formatOrigin.fontName!=formatData.fontName)))
{
strElement+="font-family: ";
- if (fontName.tqfind(' ')==-1)
+ if (fontName.find(' ')==-1)
strElement+=escapeHtmlText(fontName);
else
{ // If the font name contains a space, it should be quoted.
diff --git a/filters/kword/html/export/ExportDocStruct.cc b/filters/kword/html/export/ExportDocStruct.cc
index 545d3e31c..f0e4b3aa1 100644
--- a/filters/kword/html/export/ExportDocStruct.cc
+++ b/filters/kword/html/export/ExportDocStruct.cc
@@ -66,7 +66,7 @@ void HtmlDocStructWorker::openFormatData(const FormatData& formatOrigin,
{
// TODO/FIXME: find another way to find fixed fonts
// TODO/FIXME: (leaves out "Typewriter", "Monospace", "Mono")
- if (format.text.fontName.tqcontains("ourier"))
+ if (format.text.fontName.contains("ourier"))
{
*m_streamOut << "<tt>"; // teletype
}
@@ -133,7 +133,7 @@ void HtmlDocStructWorker::closeFormatData(const FormatData& formatOrigin,
}
}
- if (format.text.fontName.tqcontains("ourier")) // Courier?
+ if (format.text.fontName.contains("ourier")) // Courier?
{
*m_streamOut << "</tt>"; // teletype
}
diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc
index 4a4cd64d2..aa1b18175 100644
--- a/filters/kword/html/export/ExportFilter.cc
+++ b/filters/kword/html/export/ExportFilter.cc
@@ -98,7 +98,7 @@ TQString HtmlWorker::getAdditionalFileName(const TQString& additionalName)
TQString strFileName(m_strSubDirectoryName);
strFileName+="/";
- const int result=additionalName.tqfindRev("/");
+ const int result=additionalName.findRev("/");
if (result>=0)
{
strFileName+=additionalName.mid(result+1);
@@ -140,7 +140,7 @@ bool HtmlWorker::makeImage(const FrameAnchor& anchor)
const double height = anchor.frame.bottom - anchor.frame.top;
const double width = anchor.frame.right - anchor.frame.left;
- const int pos = anchor.picture.koStoreName.tqfindRev( '.' );
+ const int pos = anchor.picture.koStoreName.findRev( '.' );
TQString extension;
if ( pos > -1 )
extension = anchor.picture.koStoreName.mid( pos+1 ).lower();
@@ -243,9 +243,9 @@ void HtmlWorker::formatTextParagraph(const TQString& strText,
// Replace line feeds by line breaks
int pos;
TQString strBr(isXML()?TQString("<br />"):TQString("<br>"));
- while ((pos=strEscaped.tqfind(TQChar(10)))>-1)
+ while ((pos=strEscaped.find(TQChar(10)))>-1)
{
- strEscaped.tqreplace(pos,1,strBr);
+ strEscaped.replace(pos,1,strBr);
}
if (!format.text.missing)
diff --git a/filters/kword/kword1.3/import/kword13document.cpp b/filters/kword/kword1.3/import/kword13document.cpp
index fcf8e60c9..db75a02f4 100644
--- a/filters/kword/kword1.3/import/kword13document.cpp
+++ b/filters/kword/kword1.3/import/kword13document.cpp
@@ -147,7 +147,7 @@ void KWord13Document::xmldump( TQIODevice* io )
TQString KWord13Document::getDocumentInfo( const TQString& name ) const
{
- TQMap<TQString,TQString>::ConstIterator it ( m_documentInfo.tqfind( name ) );
+ TQMap<TQString,TQString>::ConstIterator it ( m_documentInfo.find( name ) );
if ( it == m_documentInfo.end() )
{
// Property does not exist
@@ -176,7 +176,7 @@ TQString KWord13Document::getProperty( const TQString& name, const TQString& old
TQString KWord13Document::getPropertyInternal( const TQString& name ) const
{
- TQMap<TQString,TQString>::ConstIterator it ( m_documentProperties.tqfind( name ) );
+ TQMap<TQString,TQString>::ConstIterator it ( m_documentProperties.find( name ) );
if ( it == m_documentProperties.end() )
{
// Property does not exist
diff --git a/filters/kword/kword1.3/import/kword13formatone.cpp b/filters/kword/kword1.3/import/kword13formatone.cpp
index 5f4dca5fa..9a658e419 100644
--- a/filters/kword/kword1.3/import/kword13formatone.cpp
+++ b/filters/kword/kword1.3/import/kword13formatone.cpp
@@ -48,7 +48,7 @@ TQString KWord13FormatOneData::key( void ) const
TQString KWord13FormatOneData::getProperty( const TQString& name ) const
{
- TQMap<TQString,TQString>::ConstIterator it ( m_properties.tqfind( name ) );
+ TQMap<TQString,TQString>::ConstIterator it ( m_properties.find( name ) );
if ( it == m_properties.end() )
{
// Property does not exist
diff --git a/filters/kword/kword1.3/import/kword13layout.cpp b/filters/kword/kword1.3/import/kword13layout.cpp
index 4ec4c59d9..cc8a7046d 100644
--- a/filters/kword/kword1.3/import/kword13layout.cpp
+++ b/filters/kword/kword1.3/import/kword13layout.cpp
@@ -63,7 +63,7 @@ TQString KWord13Layout::key( void ) const
TQString KWord13Layout::getProperty( const TQString& name ) const
{
- TQMap<TQString,TQString>::ConstIterator it ( m_layoutProperties.tqfind( name ) );
+ TQMap<TQString,TQString>::ConstIterator it ( m_layoutProperties.find( name ) );
if ( it == m_layoutProperties.end() )
{
// Property does not exist
diff --git a/filters/kword/kword1.3/import/kword13parser.cpp b/filters/kword/kword1.3/import/kword13parser.cpp
index 00d8290de..2f6403af4 100644
--- a/filters/kword/kword1.3/import/kword13parser.cpp
+++ b/filters/kword/kword1.3/import/kword13parser.cpp
@@ -474,7 +474,7 @@ bool KWord13Parser::startElementAnchor( const TQString& name, const TQXmlAttribu
six->m_anchorName = frameset;
}
// add frameset name to the list of anchored framesets
- if ( m_kwordDocument->m_anchoredFramesetNames.tqfind( frameset ) == m_kwordDocument->m_anchoredFramesetNames.end() )
+ if ( m_kwordDocument->m_anchoredFramesetNames.find( frameset ) == m_kwordDocument->m_anchoredFramesetNames.end() )
{
m_kwordDocument->m_anchoredFramesetNames.append( frameset );
}
diff --git a/filters/kword/kword1.3/import/kword13picture.cpp b/filters/kword/kword1.3/import/kword13picture.cpp
index 13437d6c2..c94d1e342 100644
--- a/filters/kword/kword1.3/import/kword13picture.cpp
+++ b/filters/kword/kword1.3/import/kword13picture.cpp
@@ -72,7 +72,7 @@ TQString KWord13Picture::getOasisPictureName( void ) const
number += TQString::number( (long long)( (void*) m_tempFile ) , 16 ); // in hex
TQString strExtension( m_storeName.lower() );
- const int result = m_storeName.tqfindRev( '.' );
+ const int result = m_storeName.findRev( '.' );
if ( result >= 0 )
{
strExtension = m_storeName.mid( result );
diff --git a/filters/kword/latex/export/pixmapFrame.cc b/filters/kword/latex/export/pixmapFrame.cc
index bbd0430b2..25f5951d7 100644
--- a/filters/kword/latex/export/pixmapFrame.cc
+++ b/filters/kword/latex/export/pixmapFrame.cc
@@ -102,7 +102,7 @@ void PixmapFrame::getPixmap(const TQDomNode balise_initiale)
FileHeader::instance()->useGraphics();
TQString file = getKey();
/* Remove the extension */
- int posExt = file.tqfindRev('.');
+ int posExt = file.findRev('.');
file.truncate(posExt);
/* Remove the path */
file = file.section('/', -1);
@@ -166,7 +166,7 @@ void PixmapFrame::convert()
Config::instance()->getPicturesDir() == NULL)
{
dir = getFilename();
- dir.truncate(getFilename().tqfindRev('/'));
+ dir.truncate(getFilename().findRev('/'));
}
else
dir = Config::instance()->getPicturesDir();
diff --git a/filters/kword/latex/export/textzone.cc b/filters/kword/latex/export/textzone.cc
index 476babb36..a4beb8757 100644
--- a/filters/kword/latex/export/textzone.cc
+++ b/filters/kword/latex/export/textzone.cc
@@ -269,7 +269,7 @@ void TextZone::convert(TQString& text, int tqunicode, const char* escape)
if( !TQString(escape).isEmpty() )
{
/*1. translate special characters with a space after. */
- text = text.tqreplace( TQRegExp( expression), TQString(escape));
+ text = text.replace( TQRegExp( expression), TQString(escape));
}
}
@@ -347,7 +347,7 @@ void TextZone::display(TQString texte, TQTextStream& out)
{
TQString line;
int index = 0, end = 0;
- end = texte.tqfind(' ', 60, false);
+ end = texte.find(' ', 60, false);
if(end != -1)
line = texte.mid(index, end - index);
else
@@ -361,7 +361,7 @@ void TextZone::display(TQString texte, TQTextStream& out)
out << line << endl;
Config::instance()->writeIndent(out);
index = end;
- end = texte.tqfind(' ', index + 60, false);
+ end = texte.find(' ', index + 60, false);
line = texte.mid(index, end - index);
}
kdDebug(30522) << line << endl;
diff --git a/filters/kword/latex/import/parser/command.cc b/filters/kword/latex/import/parser/command.cc
index 9b7d1979e..d110c0899 100644
--- a/filters/kword/latex/import/parser/command.cc
+++ b/filters/kword/latex/import/parser/command.cc
@@ -86,16 +86,16 @@ Command::~Command()
void Command::addParam(const char* )
{
/*TQString test = TQString(name);
- TQString key = test.left(test.tqfind("="));
- TQString value = test.right(test.tqfind("="));
+ TQString key = test.left(test.find("="));
+ TQString value = test.right(test.find("="));
addParam(key, value);*/
}
void Command::addOption(const char* )
{
/*TQString test = TQString(name);
- TQString key = test.left(test.tqfind("="));
- TQString value = test.right(test.tqfind("="));
+ TQString key = test.left(test.find("="));
+ TQString value = test.right(test.find("="));
addOption(key, value);*/
}
diff --git a/filters/kword/latex/import/parser/env.cc b/filters/kword/latex/import/parser/env.cc
index a490d3280..e25e95ab7 100644
--- a/filters/kword/latex/import/parser/env.cc
+++ b/filters/kword/latex/import/parser/env.cc
@@ -30,7 +30,7 @@ Env::Env(const char* command)
setType(Element::LATEX_ENV);
/* Parse the command name */
TQString pattern = TQString(command);
- int pos = pattern.tqfind("{");
+ int pos = pattern.find("{");
/* Remove \begin{ at the begining and the } at the end. */
if(pos != -1)
_name = pattern.mid(pos + 1, pattern.length() - pos - 2);
diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cc
index 4a966dadb..3e9a724e3 100644
--- a/filters/kword/libexport/KWEFKWordLeader.cc
+++ b/filters/kword/libexport/KWEFKWordLeader.cc
@@ -178,7 +178,7 @@ static void ProcessParagraphTag ( TQDomNode myNode,
AllowNoAttributes (myNode);
// We need to adjust the paragraph number (0 if first)
- TQMap<TQString,int>::Iterator it = leader->m_paraCountMap.tqfind( leader->m_currentFramesetName );
+ TQMap<TQString,int>::Iterator it = leader->m_paraCountMap.find( leader->m_currentFramesetName );
if ( it == leader->m_paraCountMap.end() )
leader->m_paraCountMap.insert( leader->m_currentFramesetName, 0 );
else
diff --git a/filters/kword/libexport/TagProcessing.h b/filters/kword/libexport/TagProcessing.h
index 27512bfd0..f2bf46652 100644
--- a/filters/kword/libexport/TagProcessing.h
+++ b/filters/kword/libexport/TagProcessing.h
@@ -47,7 +47,7 @@ class KWEFKWordLeader;
* AllowNoSubtags () allow for easing parsing of subtags in the
* current tag. If don't expect any subtags you call AllowNoSubtags ().
* Otherwise you create a list of TagProcessing elements and pass that
- * to ProcessSubtags () which will go through all subtags it can tqfind,
+ * to ProcessSubtags () which will go through all subtags it can find,
* call the corresponding processing function, and do all the
* necessary error handling.
*/
@@ -89,7 +89,7 @@ void AllowNoSubtags ( const TQDomNode& myNode, KWEFKWordLeader *leader );
* attributes. If don't expect any attributes you call AllowNoAttributes ().
* Otherwise you create a list of AttrProcessing elements and pass
* that to ProcessAttributes () which will go through all attributes
- * it can tqfind, retrieve the value in the datatype defined, and do all
+ * it can find, retrieve the value in the datatype defined, and do all
* the necessary error handling.
*/
diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp
index e58ffead2..1fea66259 100644
--- a/filters/kword/msword/texthandler.cpp
+++ b/filters/kword/msword/texthandler.cpp
@@ -497,7 +497,7 @@ TQString KWordTextHandler::getFont(unsigned fc) const
static const unsigned ENTRIES = 6;
static const char* const fuzzyLookup[ENTRIES][2] =
{
- // MS tqcontains X11 font family
+ // MS contains X11 font family
// substring. non-Xft name.
{ "times", "times" },
{ "courier", "courier" },
@@ -515,7 +515,7 @@ TQString KWordTextHandler::getFont(unsigned fc) const
for (i = 0; i < ENTRIES; i++)
{
// The loop will leave unchanged any MS font name not fuzzy-matched.
- if (font.tqfind(fuzzyLookup[i][0], 0, FALSE) != -1)
+ if (font.find(fuzzyLookup[i][0], 0, FALSE) != -1)
{
font = fuzzyLookup[i][1];
break;
diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cc
index efc4020ca..02d980ef2 100644
--- a/filters/kword/mswrite/mswriteexport.cc
+++ b/filters/kword/mswrite/mswriteexport.cc
@@ -1028,7 +1028,7 @@ public:
MSWrite::DWord imageSize = 0;
TQString imageType;
- int pos = frameAnchor.picture.koStoreName.tqfindRev ('.');
+ int pos = frameAnchor.picture.koStoreName.findRev ('.');
if (pos != -1) imageType = frameAnchor.picture.koStoreName.mid (pos).lower ();
kdDebug (30509) << "\timageType: " << imageType << endl;
@@ -1783,19 +1783,19 @@ public:
if (softHyphen == -2)
{
- softHyphen = stringUnicode.tqfind (TQChar (0xAD), upto);
+ softHyphen = stringUnicode.find (TQChar (0xAD), upto);
if (softHyphen == -1) softHyphen = INT_MAX;
}
if (nonBreakingSpace == -2)
{
- nonBreakingSpace = stringUnicode.tqfind (TQChar (0xA0), upto);
+ nonBreakingSpace = stringUnicode.find (TQChar (0xA0), upto);
if (nonBreakingSpace == -1) nonBreakingSpace = INT_MAX;
}
if (newLine == -2)
{
- newLine = stringUnicode.tqfind (TQChar ('\n'), upto);
+ newLine = stringUnicode.find (TQChar ('\n'), upto);
if (newLine == -1) newLine = INT_MAX;
}
diff --git a/filters/kword/mswrite/mswriteimport.cc b/filters/kword/mswrite/mswriteimport.cc
index feff49171..379d3c015 100644
--- a/filters/kword/mswrite/mswriteimport.cc
+++ b/filters/kword/mswrite/mswriteimport.cc
@@ -1182,11 +1182,11 @@ public:
m_charInfoCountLen += strUnicode.length ();
// make string XML-friendly (TODO: speed up)
- strUnicode.tqreplace ('&', "&amp;");
- strUnicode.tqreplace ('<', "&lt;");
- strUnicode.tqreplace ('>', "&gt;");
- strUnicode.tqreplace ('\"', "&quot;");
- strUnicode.tqreplace ('\'', "&apos;");
+ strUnicode.replace ('&', "&amp;");
+ strUnicode.replace ('<', "&lt;");
+ strUnicode.replace ('>', "&gt;");
+ strUnicode.replace ('\"', "&quot;");
+ strUnicode.replace ('\'', "&apos;");
return writeTextInternal (strUnicode);
}
diff --git a/filters/kword/mswrite/structures_private.cpp b/filters/kword/mswrite/structures_private.cpp
index dec806c08..6779e1d73 100644
--- a/filters/kword/mswrite/structures_private.cpp
+++ b/filters/kword/mswrite/structures_private.cpp
@@ -479,7 +479,7 @@ namespace MSWrite
code++;
}
- // couldn't tqfind
+ // couldn't find
return 0xFFFFFFFF;
}
diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc
index 364851053..40f0bee62 100644
--- a/filters/kword/oowriter/ExportFilter.cc
+++ b/filters/kword/oowriter/ExportFilter.cc
@@ -361,7 +361,7 @@ void OOWriterWorker::writeFontDeclaration(void)
TQMap<TQString,TQString>::ConstIterator end(m_fontNames.end());
for (TQMap<TQString,TQString>::ConstIterator it=m_fontNames.begin(); it!=end; ++it)
{
- const bool space=(it.key().tqfind(' ')>=0); // Does the font has at least a space in its name
+ const bool space=(it.key().find(' ')>=0); // Does the font has at least a space in its name
const TQString fontName(escapeOOText(it.key()));
zipWriteData(" <style:font-decl style:name=\"");
zipWriteData(fontName);
@@ -864,7 +864,7 @@ TQString OOWriterWorker::textFormatToStyle(const TextFormatting& formatOrigin,
const TQString lang ( formatData.language );
if ( ! lang.isEmpty() )
{
- const int res = lang.tqfind( '_' );
+ const int res = lang.find( '_' );
if ( res >= 0 )
{
@@ -1054,7 +1054,7 @@ bool OOWriterWorker::makeTableRows( const TQString& tableName, const Table& tabl
const TQString props ( cellToProperties( (*itCell), key ) );
TQString automaticCellStyle;
- TQMap<TQString,TQString>::ConstIterator it ( mapCellStyleKeys.tqfind( key ) );
+ TQMap<TQString,TQString>::ConstIterator it ( mapCellStyleKeys.find( key ) );
if ( it == mapCellStyleKeys.end() )
{
automaticCellStyle = makeAutomaticStyleName( tableName + ".Cell", cellNumber );
@@ -1349,7 +1349,7 @@ bool OOWriterWorker::makePicture( const FrameAnchor& anchor, const AnchorType an
TQByteArray image;
TQString strExtension(koStoreName.lower());
- const int result=koStoreName.tqfindRev(".");
+ const int result=koStoreName.findRev(".");
if (result>=0)
{
strExtension=koStoreName.mid(result+1);
@@ -1495,7 +1495,7 @@ void OOWriterWorker::processNormalText ( const TQString &paraText,
TQString styleKey;
const TQString props ( textFormatToStyle(formatLayout,formatData.text,false,styleKey) );
- TQMap<TQString,TQString>::ConstIterator it ( m_mapTextStyleKeys.tqfind(styleKey) );
+ TQMap<TQString,TQString>::ConstIterator it ( m_mapTextStyleKeys.find(styleKey) );
kdDebug(30518) << "Searching text key: " << styleKey << endl;
TQString automaticStyle;
@@ -1989,7 +1989,7 @@ bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData&
TQString actualStyle(tqlayout.styleName);
if (!props.isEmpty())
{
- TQMap<TQString,TQString>::ConstIterator it ( m_mapParaStyleKeys.tqfind(styleKey) );
+ TQMap<TQString,TQString>::ConstIterator it ( m_mapParaStyleKeys.find(styleKey) );
kdDebug(30518) << "Searching paragraph key: " << styleKey << endl;
TQString automaticStyle;
@@ -2156,7 +2156,7 @@ void OOWriterWorker::declareFont(const TQString& fontName)
if (fontName.isEmpty())
return;
- if (m_fontNames.tqfind(fontName)==m_fontNames.end())
+ if (m_fontNames.find(fontName)==m_fontNames.end())
{
TQString props;
@@ -2205,22 +2205,22 @@ TQString OOWriterWorker::makeAutomaticStyleName(const TQString& prefix, ulong& c
// Checks if the automatic style has not the same name as a user one.
// If it is the case, change it!
- if (m_styleMap.tqfind(str)==m_styleMap.end())
+ if (m_styleMap.find(str)==m_styleMap.end())
return str; // Unique, so let's go!
TQString str2(str+"_bis");
- if (m_styleMap.tqfind(str2)==m_styleMap.end())
+ if (m_styleMap.find(str2)==m_styleMap.end())
return str2;
str2 = str+"_ter";
- if (m_styleMap.tqfind(str2)==m_styleMap.end())
+ if (m_styleMap.find(str2)==m_styleMap.end())
return str2;
// If it is still not unique, try a time stamp.
const TQDateTime dt(TQDateTime::tqcurrentDateTime(Qt::UTC));
str2 = str + "_" + TQString::number(dt.toTime_t(),16);
- if (m_styleMap.tqfind(str2)==m_styleMap.end())
+ if (m_styleMap.find(str2)==m_styleMap.end())
return str2;
kdWarning(30518) << "Could not make an unique style name: " << str2 << endl;
diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc
index 4304f346c..e1aeda783 100644
--- a/filters/kword/oowriter/oowriterimport.cc
+++ b/filters/kword/oowriter/oowriterimport.cc
@@ -1131,7 +1131,7 @@ void OoWriterImport::parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement&
}
else if ( isTextNS && localName == "bookmark-end" ) {
TQString bkName = ts.attributeNS( ooNS::text, "name", TQString() );
- BookmarkStartsMap::iterator it = m_bookmarkStarts.tqfind( bkName );
+ BookmarkStartsMap::iterator it = m_bookmarkStarts.find( bkName );
if ( it == m_bookmarkStarts.end() ) { // bookmark end without start. This seems to happen..
// insert simple bookmark then
appendBookmark( doc, numberOfParagraphs( m_currentFrameset ),
@@ -1811,7 +1811,7 @@ TQString OoWriterImport::appendPicture(TQDomDocument& doc, const TQDomElement& o
if ( href[0]=='#' )
{
TQString strExtension;
- const int result=href.tqfindRev(".");
+ const int result=href.findRev(".");
if (result>=0)
{
strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot.
@@ -1953,7 +1953,7 @@ void OoWriterImport::appendField(TQDomDocument& doc, TQDomElement& outputFormats
{
TQString dataStyleName = object.attributeNS( ooNS::style, "data-style-name", TQString() );
TQString dateFormat = "locale";
- DataFormatsMap::const_iterator it = m_dateTimeFormats.tqfind( dataStyleName );
+ DataFormatsMap::const_iterator it = m_dateTimeFormats.find( dataStyleName );
if ( it != m_dateTimeFormats.end() )
dateFormat = (*it);
@@ -2234,7 +2234,7 @@ void OoWriterImport::parseTable( TQDomDocument &doc, const TQDomElement& tqparen
repeat=1; // At least one column defined!
const TQString styleName ( elem.attributeNS( ooNS::table, "style-name", TQString()) );
kdDebug(30518) << "Column " << col << " style " << styleName << endl;
- const TQDomElement* style=m_styles.tqfind(styleName);
+ const TQDomElement* style=m_styles.find(styleName);
double width=0.0;
if (style)
{
@@ -2481,7 +2481,7 @@ TQString OoWriterImport::kWordStyleName( const TQString& ooStyleName )
{
if ( ooStyleName.startsWith( "Contents " ) ) {
TQString s( ooStyleName );
- return s.tqreplace( 0, 9, TQString("Contents Head ") ); // Awful hack for KWord's broken "update TOC" feature
+ return s.replace( 0, 9, TQString("Contents Head ") ); // Awful hack for KWord's broken "update TOC" feature
} else {
return ooStyleName;
}
diff --git a/filters/kword/palmdoc/palmdocimport.cc b/filters/kword/palmdoc/palmdocimport.cc
index f659cad0f..98cd76296 100644
--- a/filters/kword/palmdoc/palmdocimport.cc
+++ b/filters/kword/palmdoc/palmdocimport.cc
@@ -133,11 +133,11 @@ TQString PalmDocImport::processPlainParagraph( TQString text )
tqlayout.append( "</LAYOUT>\n" );
// encode text for XML-ness
- text.tqreplace( '&', "&amp;" );
- text.tqreplace( '<', "&lt;" );
- text.tqreplace( '>', "&gt;" );
- text.tqreplace( '"', "&quot;" );
- text.tqreplace( '\'', "&apos;" );
+ text.replace( '&', "&amp;" );
+ text.replace( '<', "&lt;" );
+ text.replace( '>', "&gt;" );
+ text.replace( '"', "&quot;" );
+ text.replace( '\'', "&apos;" );
// construct the <PARAGRAPH>
result.append( "<PARAGRAPH>\n" );
@@ -160,7 +160,7 @@ TQString PalmDocImport::processPlainDocument( TQString plaindoc )
for( unsigned int i = 0; i < paragraphs.count(); i++ )
{
TQString text = paragraphs[i];
- text.tqreplace( '\n', ' ' );
+ text.replace( '\n', ' ' );
content.append( processPlainParagraph( text ) );
}
diff --git a/filters/kword/pdf/misc.cpp b/filters/kword/pdf/misc.cpp
index 86eb81f67..0ffc9dbad 100644
--- a/filters/kword/pdf/misc.cpp
+++ b/filters/kword/pdf/misc.cpp
@@ -177,17 +177,17 @@ static const KnownData KNOWN_DATA[] = {
void Font::init(const TQString &n)
{
// check if font already parsed
- _data = _dict->tqfind(n);
+ _data = _dict->find(n);
if ( _data==0 ) {
// kdDebug(30516) << "font " << n << endl;
TQString name = n;
- name.tqreplace("oblique", "italic");
+ name.replace("oblique", "italic");
// check if known font
_data = new Data;
uint i = 0;
while ( KNOWN_DATA[i].name!=0 ) {
- if ( name.tqfind(KNOWN_DATA[i].name)!=-1 ) {
+ if ( name.find(KNOWN_DATA[i].name)!=-1 ) {
// kdDebug(30516) << "found " << KNOWN_DATA[i].name
// << " " << isBold(KNOWN_DATA[i].style) << endl;
_data->family = FAMILY_DATA[KNOWN_DATA[i].family];
@@ -201,13 +201,13 @@ void Font::init(const TQString &n)
if ( _data->family.isEmpty() ) { // let's try harder
// simple heuristic
kdDebug(30516) << "unknown font : " << n << endl;
- if ( name.tqfind("times")!=-1 )
+ if ( name.find("times")!=-1 )
_data->family = FAMILY_DATA[Times];
- else if ( name.tqfind("helvetica")!=-1 )
+ else if ( name.find("helvetica")!=-1 )
_data->family = FAMILY_DATA[Helvetica];
- else if ( name.tqfind("courier")!=-1 )
+ else if ( name.find("courier")!=-1 )
_data->family = FAMILY_DATA[Courier];
- else if ( name.tqfind("symbol")!=-1 )
+ else if ( name.find("symbol")!=-1 )
_data->family = FAMILY_DATA[Symbol];
else { // with TQt
TQFontDatabase fdb;
@@ -223,8 +223,8 @@ void Font::init(const TQString &n)
}
}
- bool italic = ( name.tqfind("italic")!=-1 );
- bool bold = ( name.tqfind("bold")!=-1 );
+ bool italic = ( name.find("italic")!=-1 );
+ bool bold = ( name.find("bold")!=-1 );
_data->style = toStyle(bold, italic);
_data->latex = false;
}
@@ -233,7 +233,7 @@ void Font::init(const TQString &n)
}
// check if TQFont already created
- if ( !_data->height.tqcontains(_pointSize) ) {
+ if ( !_data->height.contains(_pointSize) ) {
TQFont font(_data->family, _pointSize,
(isBold(_data->style) ? TQFont::Bold : TQFont::Normal),
isItalic(_data->style));
diff --git a/filters/kword/pdf/xpdf/goo/GHash.cc b/filters/kword/pdf/xpdf/goo/GHash.cc
index b8f511e0f..d336f88e3 100644
--- a/filters/kword/pdf/xpdf/goo/GHash.cc
+++ b/filters/kword/pdf/xpdf/goo/GHash.cc
@@ -97,7 +97,7 @@ void *GHash::lookup(const GString *key) {
GHashBucket *p;
int h;
- if (!(p = tqfind(key, &h))) {
+ if (!(p = find(key, &h))) {
return NULL;
}
return p->val;
@@ -107,7 +107,7 @@ void *GHash::lookup(const char *key) {
GHashBucket *p;
int h;
- if (!(p = tqfind(key, &h))) {
+ if (!(p = find(key, &h))) {
return NULL;
}
return p->val;
@@ -119,7 +119,7 @@ void *GHash::remove(const GString *key) {
void *val;
int h;
- if (!(p = tqfind(key, &h))) {
+ if (!(p = find(key, &h))) {
return NULL;
}
q = &tab[h];
@@ -142,7 +142,7 @@ void *GHash::remove(const char *key) {
void *val;
int h;
- if (!(p = tqfind(key, &h))) {
+ if (!(p = find(key, &h))) {
return NULL;
}
q = &tab[h];
@@ -190,7 +190,7 @@ void GHash::killIter(GHashIter **iter) {
*iter = NULL;
}
-GHashBucket *GHash::tqfind(const GString *key, int *h) {
+GHashBucket *GHash::find(const GString *key, int *h) {
GHashBucket *p;
*h = hash(key);
@@ -202,7 +202,7 @@ GHashBucket *GHash::tqfind(const GString *key, int *h) {
return NULL;
}
-GHashBucket *GHash::tqfind(const char *key, int *h) {
+GHashBucket *GHash::find(const char *key, int *h) {
GHashBucket *p;
*h = hash(key);
diff --git a/filters/kword/pdf/xpdf/goo/GHash.h b/filters/kword/pdf/xpdf/goo/GHash.h
index 426428c1d..79d9a7eaa 100644
--- a/filters/kword/pdf/xpdf/goo/GHash.h
+++ b/filters/kword/pdf/xpdf/goo/GHash.h
@@ -37,8 +37,8 @@ public:
private:
- GHashBucket *tqfind(const GString *key, int *h);
- GHashBucket *tqfind(const char *key, int *h);
+ GHashBucket *find(const GString *key, int *h);
+ GHashBucket *find(const char *key, int *h);
int hash(const GString *key);
int hash(const char *key);
diff --git a/filters/kword/pdf/xpdf/xpdf/CMap.cc b/filters/kword/pdf/xpdf/xpdf/CMap.cc
index 21f0af227..b00021835 100644
--- a/filters/kword/pdf/xpdf/xpdf/CMap.cc
+++ b/filters/kword/pdf/xpdf/xpdf/CMap.cc
@@ -61,7 +61,7 @@ CMap *CMap::parse(CMapCache *cache, GString *collectionA,
return new CMap(collectionA->copy(), cMapNameA->copy(), 1);
}
- error(-1, "Couldn't tqfind '%s' CMap file for '%s' collection",
+ error(-1, "Couldn't find '%s' CMap file for '%s' collection",
cMapNameA->getCString(), collectionA->getCString());
return NULL;
}
diff --git a/filters/kword/pdf/xpdf/xpdf/CMap.h b/filters/kword/pdf/xpdf/xpdf/CMap.h
index 5ece26359..ce926baf3 100644
--- a/filters/kword/pdf/xpdf/xpdf/CMap.h
+++ b/filters/kword/pdf/xpdf/xpdf/CMap.h
@@ -45,7 +45,7 @@ public:
GBool match(GString *collectionA, GString *cMapNameA);
// Return the CID corresponding to the character code starting at
- // <s>, which tqcontains <len> bytes. Sets *<nUsed> to the number of
+ // <s>, which contains <len> bytes. Sets *<nUsed> to the number of
// bytes used by the char code.
CID getCID(char *s, int len, int *nUsed);
diff --git a/filters/kword/pdf/xpdf/xpdf/Dict.cc b/filters/kword/pdf/xpdf/xpdf/Dict.cc
index 048ce80aa..351c23a02 100644
--- a/filters/kword/pdf/xpdf/xpdf/Dict.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Dict.cc
@@ -50,7 +50,7 @@ void Dict::add(char *key, Object *val) {
++length;
}
-inline DictEntry *Dict::tqfind(const char *key) {
+inline DictEntry *Dict::find(const char *key) {
int i;
for (i = 0; i < length; ++i) {
@@ -63,19 +63,19 @@ inline DictEntry *Dict::tqfind(const char *key) {
GBool Dict::is(const char *type) {
DictEntry *e;
- return (e = tqfind("Type")) && e->val.isName(type);
+ return (e = find("Type")) && e->val.isName(type);
}
Object *Dict::lookup(const char *key, Object *obj) {
DictEntry *e;
- return (e = tqfind(key)) ? e->val.fetch(xref, obj) : obj->initNull();
+ return (e = find(key)) ? e->val.fetch(xref, obj) : obj->initNull();
}
Object *Dict::lookupNF(const char *key, Object *obj) {
DictEntry *e;
- return (e = tqfind(key)) ? e->val.copy(obj) : obj->initNull();
+ return (e = find(key)) ? e->val.copy(obj) : obj->initNull();
}
char *Dict::getKey(int i) {
diff --git a/filters/kword/pdf/xpdf/xpdf/Dict.h b/filters/kword/pdf/xpdf/xpdf/Dict.h
index cc66161e5..4bc4408ec 100644
--- a/filters/kword/pdf/xpdf/xpdf/Dict.h
+++ b/filters/kword/pdf/xpdf/xpdf/Dict.h
@@ -71,7 +71,7 @@ private:
int length; // number of entries in dictionary
int ref; // reference count
- DictEntry *tqfind(const char *key);
+ DictEntry *find(const char *key);
};
#endif
diff --git a/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc b/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc
index c5d5450b8..ec76e1ccf 100644
--- a/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc
+++ b/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc
@@ -1121,7 +1121,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y,
case 3: // xnor
dest ^= ((src1 ^ 0xff) >> s1) & m2;
break;
- case 4: // tqreplace
+ case 4: // replace
dest = (dest & ~m3) | ((src1 >> s1) & m3);
break;
}
@@ -1144,7 +1144,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y,
case 3: // xnor
dest ^= (src1 ^ 0xff) & m2;
break;
- case 4: // tqreplace
+ case 4: // replace
dest = (src1 & m2) | (dest & m1);
break;
}
@@ -1174,7 +1174,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y,
case 3: // xnor
dest ^= (src1 ^ 0xff) >> s1;
break;
- case 4: // tqreplace
+ case 4: // replace
dest = (dest & (0xff << s2)) | (src1 >> s1);
break;
}
@@ -1206,7 +1206,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y,
case 3: // xnor
dest ^= src ^ 0xff;
break;
- case 4: // tqreplace
+ case 4: // replace
dest = src;
break;
}
@@ -1231,7 +1231,7 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *bitmap, int x, int y,
case 3: // xnor
dest ^= (src ^ 0xff) & m2;
break;
- case 4: // tqreplace
+ case 4: // replace
dest = (src & m2) | (dest & m1);
break;
}
diff --git a/filters/kword/pdf/xpdf/xpdf/Link.cc b/filters/kword/pdf/xpdf/xpdf/Link.cc
index b660c0359..345e7296a 100644
--- a/filters/kword/pdf/xpdf/xpdf/Link.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Link.cc
@@ -713,7 +713,7 @@ Links::~Links() {
gfree(links);
}
-LinkAction *Links::tqfind(double x, double y) {
+LinkAction *Links::find(double x, double y) {
int i;
for (i = numLinks - 1; i >= 0; --i) {
diff --git a/filters/kword/pdf/xpdf/xpdf/Link.h b/filters/kword/pdf/xpdf/xpdf/Link.h
index 651618764..17eab2c79 100644
--- a/filters/kword/pdf/xpdf/xpdf/Link.h
+++ b/filters/kword/pdf/xpdf/xpdf/Link.h
@@ -357,7 +357,7 @@ public:
// If point <x>,<y> is in a link, return the associated action;
// else return NULL.
- LinkAction *tqfind(double x, double y);
+ LinkAction *find(double x, double y);
// Return true if <x>,<y> is in a link.
GBool onLink(double x, double y);
diff --git a/filters/kword/pdf/xpdf/xpdf/PDFDoc.h b/filters/kword/pdf/xpdf/xpdf/PDFDoc.h
index 64c6cd2ad..ff6e359ce 100644
--- a/filters/kword/pdf/xpdf/xpdf/PDFDoc.h
+++ b/filters/kword/pdf/xpdf/xpdf/PDFDoc.h
@@ -103,7 +103,7 @@ public:
// If point <x>,<y> is in a link, return the associated action;
// else return NULL.
- LinkAction *findLink(double x, double y) { return links->tqfind(x, y); }
+ LinkAction *findLink(double x, double y) { return links->find(x, y); }
// Return true if <x>,<y> is in a link.
GBool onLink(double x, double y) { return links->onLink(x, y); }
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc
index 2aa620d62..5c53ade12 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc
@@ -1231,10 +1231,10 @@ void XPDFCore::runCommand(GString *cmdFmt, GString *arg) {
//------------------------------------------------------------------------
-// tqfind
+// find
//------------------------------------------------------------------------
-void XPDFCore::tqfind(char *s) {
+void XPDFCore::find(char *s) {
Unicode *u;
TextOutputDev *textOut;
int xMin, yMin, xMax, yMax;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFCore.h b/filters/kword/pdf/xpdf/xpdf/XPDFCore.h
index 4c250704a..adc7f5073 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFCore.h
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFCore.h
@@ -142,9 +142,9 @@ public:
void doAction(LinkAction *action);
- //----- tqfind
+ //----- find
- void tqfind(char *s);
+ void find(char *s);
//----- simple modal dialogs
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
index cf2ea6d01..a75830b83 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
@@ -690,7 +690,7 @@ void XPDFViewer::initWindow() {
zoomMenu = XmCreateOptionMenu(toolBar, "zoomMenu", args, n);
XtManageChild(zoomMenu);
- // tqfind/print/about buttons
+ // find/print/about buttons
n = 0;
XtSetArg(args[n], XmNleftAttachment, XmATTACH_WIDGET); ++n;
XtSetArg(args[n], XmNleftWidget, zoomMenu); ++n;
@@ -698,7 +698,7 @@ void XPDFViewer::initWindow() {
XtSetArg(args[n], XmNbottomAttachment, XmATTACH_FORM); ++n;
XtSetArg(args[n], XmNmarginWidth, 6); ++n;
XtSetArg(args[n], XmNlabelString, emptyString); ++n;
- findBtn = XmCreatePushButton(toolBar, "tqfind", args, n);
+ findBtn = XmCreatePushButton(toolBar, "find", args, n);
XtManageChild(findBtn);
XtAddCallback(findBtn, XmNactivateCallback,
&findCbk, (XtPointer)this);
@@ -1741,7 +1741,7 @@ void XPDFViewer::openOkCbk(Widget widget, XtPointer ptr,
}
//------------------------------------------------------------------------
-// GUI code: "tqfind" dialog
+// GUI code: "find" dialog
//------------------------------------------------------------------------
void XPDFViewer::initFindDialog() {
@@ -1780,7 +1780,7 @@ void XPDFViewer::initFindDialog() {
findText = XmCreateTextField(row1, "text", args, n);
XtManageChild(findText);
- //----- "tqfind" and "close" buttons
+ //----- "find" and "close" buttons
n = 0;
XtSetArg(args[n], XmNtopAttachment, XmATTACH_WIDGET); ++n;
XtSetArg(args[n], XmNtopWidget, row1); ++n;
@@ -1816,7 +1816,7 @@ void XPDFViewer::findFindCbk(Widget widget, XtPointer ptr,
XtPointer callData) {
XPDFViewer *viewer = (XPDFViewer *)ptr;
- viewer->core->tqfind(XmTextFieldGetString(viewer->findText));
+ viewer->core->find(XmTextFieldGetString(viewer->findText));
}
void XPDFViewer::findCloseCbk(Widget widget, XtPointer ptr,
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h
index df6063952..b9b0b2dab 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.h
@@ -139,7 +139,7 @@ private:
static void openOkCbk(Widget widget, XtPointer ptr,
XtPointer callData);
- //----- GUI code: "tqfind" dialog
+ //----- GUI code: "find" dialog
void initFindDialog();
static void findFindCbk(Widget widget, XtPointer ptr,
XtPointer callData);
diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc
index 67df3fd14..2fa566fac 100644
--- a/filters/kword/rtf/export/ExportFilter.cc
+++ b/filters/kword/rtf/export/ExportFilter.cc
@@ -200,7 +200,7 @@ TQString RTFWorker::makeImage(const FrameAnchor& anchor)
kdDebug(30515) << "RTFWorker::makeImage" << endl << anchor.picture.koStoreName << endl;
- const int pos=strImageName.tqfindRev('.');
+ const int pos=strImageName.findRev('.');
if(pos!=-1) strExt = strImageName.mid(pos+1).lower();
TQString strTag;
@@ -345,9 +345,9 @@ TQString RTFWorker::formatTextParagraph(const TQString& strText,
// Replace line feeds by forced line breaks
int pos;
TQString strBr("\\line ");
- while ((pos=strEscaped.tqfind(TQChar(10)))>-1)
+ while ((pos=strEscaped.find(TQChar(10)))>-1)
{
- strEscaped.tqreplace(pos,1,strBr);
+ strEscaped.replace(pos,1,strBr);
}
str+=strEscaped;
@@ -609,26 +609,26 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
// KLocale's key differ from KWord
// Date
- key.tqreplace( "%Y", "yyyy" ); // Year 4 digits
- key.tqreplace( "%y", "yy" ); // Year 2 digits
- key.tqreplace( "%n", "M" ); // Month 1 digit
- key.tqreplace( "%m", "MM" ); // Month 2 digits
- key.tqreplace( "%e", "d" ); // Day 1 digit
- key.tqreplace( "%d", "dd" ); // Day 2 digits
- key.tqreplace( "%b", "MMM" ); // Month 3 letters
- key.tqreplace( "%B", "MMMM" ); // Month all letters
- key.tqreplace( "%a", "ddd" ); // Day 3 letters
- key.tqreplace( "%A", "dddd" ); // Day all letters
+ key.replace( "%Y", "yyyy" ); // Year 4 digits
+ key.replace( "%y", "yy" ); // Year 2 digits
+ key.replace( "%n", "M" ); // Month 1 digit
+ key.replace( "%m", "MM" ); // Month 2 digits
+ key.replace( "%e", "d" ); // Day 1 digit
+ key.replace( "%d", "dd" ); // Day 2 digits
+ key.replace( "%b", "MMM" ); // Month 3 letters
+ key.replace( "%B", "MMMM" ); // Month all letters
+ key.replace( "%a", "ddd" ); // Day 3 letters
+ key.replace( "%A", "dddd" ); // Day all letters
// 12h
- key.tqreplace( "%p", "am/pm" ); // AM/PM (KLocale knows it only lower case)
- key.tqreplace( "%I", "hh" ); // 12 hour 2 digits
- key.tqreplace( "%l", "h" ); // 12 hour 1 digits
+ key.replace( "%p", "am/pm" ); // AM/PM (KLocale knows it only lower case)
+ key.replace( "%I", "hh" ); // 12 hour 2 digits
+ key.replace( "%l", "h" ); // 12 hour 1 digits
// 24h
- key.tqreplace( "%H", "HH" ); // 24 hour 2 digits
- key.tqreplace( "%k", "H" ); // 24 hour 1 digit
+ key.replace( "%H", "HH" ); // 24 hour 2 digits
+ key.replace( "%k", "H" ); // 24 hour 1 digit
// Other times
- key.tqreplace( "%M", "mm" ); // minute 2 digits (KLocale knows it with 2 digits)
- key.tqreplace( "%S", "ss" ); // second 2 digits (KLocale knows it with 2 digits)
+ key.replace( "%M", "mm" ); // minute 2 digits (KLocale knows it with 2 digits)
+ key.replace( "%S", "ss" ); // second 2 digits (KLocale knows it with 2 digits)
kdDebug(30515) << "Locale date in RTF format: " << key << endl;
}
@@ -638,18 +638,18 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
if (regexp.search(key)!=-1)
{
// 12h
- key.tqreplace("ap","am/pm");
- key.tqreplace("AP","AM/PM");
+ key.replace("ap","am/pm");
+ key.replace("AP","AM/PM");
}
else
{
//24h
- key.tqreplace('h','H'); // MS Word uses H for 24hour times
+ key.replace('h','H'); // MS Word uses H for 24hour times
}
// MS Word do not know possesive months
- key.tqreplace("PPP","MMM");
- key.tqreplace("PPPP","MMMM");
- key.tqreplace("zzz","000"); // replace microseconds by 000
+ key.replace("PPP","MMM");
+ key.replace("PPPP","MMMM");
+ key.replace("zzz","000"); // replace microseconds by 000
kdDebug(30515) << "New format: " << key << endl;
content += "\\@ \"";
content += key;
@@ -954,9 +954,9 @@ void RTFWorker::writeFontData(void)
{
const TQString strLower( (*it).lower() );
*m_streamOut << "{\\f" << count;
- if ( (strLower.tqfind("symbol")>-1) || (strLower.tqfind("dingbat")>-1) )
+ if ( (strLower.find("symbol")>-1) || (strLower.find("dingbat")>-1) )
*m_streamOut << "\\ftech";
- else if ( (strLower.tqfind("script")>-1) )
+ else if ( (strLower.find("script")>-1) )
*m_streamOut << "\\fscript";
#if 1
diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp
index bb17d5328..2526a6b00 100644
--- a/filters/kword/rtf/import/rtfimport.cpp
+++ b/filters/kword/rtf/import/rtfimport.cpp
@@ -1,4 +1,4 @@
-// kate: space-indent on; indent-width 4; tqreplace-tabs off;
+// kate: space-indent on; indent-width 4; replace-tabs off;
/*
This file is part of the KDE project
Copyright (C) 2001 Ewald Snel <ewald@rambo.its.tudelft.nl>
@@ -1347,7 +1347,7 @@ void RTFImport::parseFontTable( RTFProperty * )
qFont.setStyleHint( font.tqstyleHint );
for(;!qFont.exactMatch();)
{
- int space=font.name.tqfindRev(' ', font.name.length());
+ int space=font.name.findRev(' ', font.name.length());
if(space==-1)
break;
font.name.truncate(space);
@@ -1571,7 +1571,7 @@ void RTFImport::addImportedPicture( const TQString& rawFileName )
}
TQString slashPath( rawFileName );
- slashPath.tqreplace('\\','/'); // Replace directory separators.
+ slashPath.replace('\\','/'); // Replace directory separators.
// ### TODO: what with MS-DOS absolute paths? (Will only work for KOffice on Win32)
TQFileInfo info;
info.setFile( inFileName );
@@ -1801,10 +1801,10 @@ void RTFImport::parseField( RTFProperty * )
}
TQString format(regexp.cap(1));
kdDebug(30515) << "Date/time field format: " << format << endl;
- format.tqreplace("am/pm", "ap");
- format.tqreplace("a/p", "ap"); // Approximation
- format.tqreplace("AM/PM", "AP");
- format.tqreplace("A/P", "AP"); // Approximation
+ format.replace("am/pm", "ap");
+ format.replace("a/p", "ap"); // Approximation
+ format.replace("AM/PM", "AP");
+ format.replace("A/P", "AP"); // Approximation
format.remove("'"); // KWord 1.3 cannot protect text in date/time
addDateTime( format, (fieldName == "DATE"), fldfmt );
}
@@ -2110,7 +2110,7 @@ void RTFImport::addFormat( DomNode &node, const KWFormat& format, const RTFForma
{
node.addNode( "FONT" );
- if (fontTable.tqcontains( format.fmt.font ))
+ if (fontTable.contains( format.fmt.font ))
{
node.setAttribute( "name", fontTable[format.fmt.font] );
}
@@ -2524,10 +2524,10 @@ void RTFImport::finishTable()
// ### TODO: use ConstIterator
for (uint k=0; k < row.cells.count(); k++)
{
- if (!cellx.tqcontains( row.cells[k].x ))
+ if (!cellx.contains( row.cells[k].x ))
cellx << row.cells[k].x;
}
- if (!cellx.tqcontains( row.left ))
+ if (!cellx.contains( row.left ))
{
cellx << row.left;
}
@@ -2562,7 +2562,7 @@ void RTFImport::finishTable()
{
char buf[64];
int x2 = row.cells[k].x;
- int col = cellx.tqfindIndex( x1 );
+ int col = cellx.findIndex( x1 );
sprintf( buf, "Table %d Cell %d,%d", textState->table, i, col );
frameSets.addFrameSet( buf, 1, 0 );
@@ -2571,7 +2571,7 @@ void RTFImport::finishTable()
frameSets.setAttribute( "row", (int)i );
frameSets.setAttribute( "col", col );
frameSets.setAttribute( "rows", 1 );
- frameSets.setAttribute( "cols", cellx.tqfindIndex( x2 ) - col );
+ frameSets.setAttribute( "cols", cellx.findIndex( x2 ) - col );
frameSets.addFrame( x1, y1, x2, y2, (row.height < 0) ? 2 : 0, 1, 0 );
diff --git a/filters/kword/rtf/import/rtfimport_dom.cpp b/filters/kword/rtf/import/rtfimport_dom.cpp
index 9794e0888..95fa43fc6 100644
--- a/filters/kword/rtf/import/rtfimport_dom.cpp
+++ b/filters/kword/rtf/import/rtfimport_dom.cpp
@@ -33,11 +33,11 @@ TQString CheckAndEscapeXmlText(const TQString& strText)
const int test = ch.tqunicode();
// The i+= is for the additional characters
- if (test == 38) { strReturn.tqreplace(i, 1, "&amp;"); i+=4; } // &
- else if (test == 60) { strReturn.tqreplace(i, 1, "&lt;"); i+=3; } // <
- else if (test == 62) { strReturn.tqreplace(i, 1, "&gt;"); i+=3; } // >
- else if (test == 34) { strReturn.tqreplace(i, 1, "&quot;"); i+=5; } // "
- else if (test == 39) { strReturn.tqreplace(i, 1, "&apos;"); i+=5; } // '
+ if (test == 38) { strReturn.replace(i, 1, "&amp;"); i+=4; } // &
+ else if (test == 60) { strReturn.replace(i, 1, "&lt;"); i+=3; } // <
+ else if (test == 62) { strReturn.replace(i, 1, "&gt;"); i+=3; } // >
+ else if (test == 34) { strReturn.replace(i, 1, "&quot;"); i+=5; } // "
+ else if (test == 39) { strReturn.replace(i, 1, "&apos;"); i+=5; } // '
else if (test >= 32) continue; // Normal character (from space on)
else if ((test == 9) || (test == 10) || (test == 13) ) continue; // Allowed control characters: TAB, LF, CR
else
@@ -47,7 +47,7 @@ TQString CheckAndEscapeXmlText(const TQString& strText)
// - could be not supported encoding.
// In any case, we must replace this character.
kdDebug(30515) << "Control character in XML stream: " << test << endl;
- strReturn.tqreplace(i, 1, '?'); // Replacement character
+ strReturn.replace(i, 1, '?'); // Replacement character
}
}
diff --git a/filters/kword/wml/wmlimport.cc b/filters/kword/wml/wmlimport.cc
index a9b5edc7b..e44c10ae9 100644
--- a/filters/kword/wml/wmlimport.cc
+++ b/filters/kword/wml/wmlimport.cc
@@ -167,9 +167,9 @@ bool WMLConverter::doParagraph( TQString atext, WMLFormatList formatList,
// encode the text for XML-ness
text = atext;
- text.tqreplace( '&', "&amp;" );
- text.tqreplace( '<', "&lt;" );
- text.tqreplace( '>', "&gt;" );
+ text.replace( '&', "&amp;" );
+ text.replace( '<', "&lt;" );
+ text.replace( '>', "&gt;" );
// formats, taken from formatList
WMLFormatList::iterator it;
diff --git a/filters/kword/wordperfect/import/kwordfilter.cpp b/filters/kword/wordperfect/import/kwordfilter.cpp
index 56e91b330..de9246cc4 100644
--- a/filters/kword/wordperfect/import/kwordfilter.cpp
+++ b/filters/kword/wordperfect/import/kwordfilter.cpp
@@ -282,11 +282,11 @@ KWordFilter::parse (const TQString & filename)
// encode text for XML-ness
// FIXME could be faster without TQRegExp
- text.tqreplace( TQRegExp("&"), "&amp;" );
- text.tqreplace( TQRegExp("<"), "&lt;" );
- text.tqreplace( TQRegExp(">"), "&gt;" );
- text.tqreplace( TQRegExp("\""), "&quot;" );
- text.tqreplace( TQRegExp("'"), "&apos;" );
+ text.replace( TQRegExp("&"), "&amp;" );
+ text.replace( TQRegExp("<"), "&lt;" );
+ text.replace( TQRegExp(">"), "&gt;" );
+ text.replace( TQRegExp("\""), "&quot;" );
+ text.replace( TQRegExp("'"), "&apos;" );
// construct the <PARAGRAPH>
root.append( "<PARAGRAPH>\n" );
diff --git a/filters/olefilters/lib/klaola.cc b/filters/olefilters/lib/klaola.cc
index 7db5d815f..80f57f0ff 100644
--- a/filters/olefilters/lib/klaola.cc
+++ b/filters/olefilters/lib/klaola.cc
@@ -130,7 +130,7 @@ bool KLaola::enterDir(const OLENode *dirHandle) {
return false;
}
-const KLaola::NodeList KLaola::tqfind(const TQString &name, bool onlyCurrentDir) {
+const KLaola::NodeList KLaola::find(const TQString &name, bool onlyCurrentDir) {
OLENode *node;
NodeList ret;
diff --git a/filters/olefilters/lib/klaola.h b/filters/olefilters/lib/klaola.h
index b292716ff..fd44aa561 100644
--- a/filters/olefilters/lib/klaola.h
+++ b/filters/olefilters/lib/klaola.h
@@ -73,7 +73,7 @@ public:
NodeList parseRootDir();
NodeList parseCurrentDir();
const NodeList currentPath() const;
- const NodeList tqfind(const TQString &name, bool onlyCurrentDir=false);
+ const NodeList find(const TQString &name, bool onlyCurrentDir=false);
bool enterDir(const OLENode *node);
bool leaveDir();
diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc
index ff40cd72e..9d1ded51f 100644
--- a/filters/olefilters/olefilter.cc
+++ b/filters/olefilters/olefilter.cc
@@ -226,7 +226,7 @@ void OLEFilter::slotSavePic(
if(nameIN.isEmpty())
return;
- TQMap<TQString, TQString>::ConstIterator it = imageMap.tqfind(nameIN);
+ TQMap<TQString, TQString>::ConstIterator it = imageMap.find(nameIN);
if (it != imageMap.end())
// The key is already here - return the part id.
@@ -284,7 +284,7 @@ void OLEFilter::slotGetStream(const TQString &name, myFile &stream) {
KLaola::NodeList handle;
- handle=docfile->tqfind(name, true); // search only in current dir!
+ handle=docfile->find(name, true); // search only in current dir!
if (handle.count()==1)
stream=docfile->stream(handle.at(0));
@@ -348,22 +348,22 @@ void OLEFilter::convert( const TQCString& mimeTypeHint )
myFile main;
KLaola::NodeList tmp;
- tmp=docfile->tqfind("WordDocument", true);
+ tmp=docfile->find("WordDocument", true);
if(tmp.count()==1) {
// okay, not a dummy
main=docfile->stream(tmp.at(0));
myFile table0, table1, data;
- tmp=docfile->tqfind("0Table", true);
+ tmp=docfile->find("0Table", true);
if(tmp.count()==1)
table0=docfile->stream(tmp.at(0));
- tmp=docfile->tqfind("1Table", true);
+ tmp=docfile->find("1Table", true);
if(tmp.count()==1)
table1=docfile->stream(tmp.at(0));
- tmp=docfile->tqfind("Data", true);
+ tmp=docfile->find("Data", true);
if(tmp.count()==1)
data=docfile->stream(tmp.at(0));
@@ -380,11 +380,11 @@ void OLEFilter::convert( const TQCString& mimeTypeHint )
myFile workbook;
KLaola::NodeList tmp;
- tmp = docfile->tqfind( "Workbook", true );
+ tmp = docfile->find( "Workbook", true );
if ( tmp.count() == 1 )
workbook = docfile->stream( tmp.at( 0 ) );
else {
- tmp = docfile->tqfind( "Book", true );
+ tmp = docfile->find( "Book", true );
if ( tmp.count() == 1 )
workbook = docfile->stream( tmp.at( 0 ) );
}
@@ -398,23 +398,23 @@ void OLEFilter::convert( const TQCString& mimeTypeHint )
myFile main, currentUser, pictures, summary, documentSummary;
KLaola::NodeList tmp;
- tmp=docfile->tqfind("PowerPoint Document", true);
+ tmp=docfile->find("PowerPoint Document", true);
if(tmp.count()==1)
main=docfile->stream(tmp.at(0));
- tmp=docfile->tqfind("Current User", true);
+ tmp=docfile->find("Current User", true);
if(tmp.count()==1)
currentUser=docfile->stream(tmp.at(0));
- tmp=docfile->tqfind("Pictures", true);
+ tmp=docfile->find("Pictures", true);
if(tmp.count()==1)
pictures=docfile->stream(tmp.at(0));
- tmp=docfile->tqfind("SummaryInformation", true);
+ tmp=docfile->find("SummaryInformation", true);
if(tmp.count()==1)
summary=docfile->stream(tmp.at(0));
- tmp=docfile->tqfind("DocumentSummaryInformation", true);
+ tmp=docfile->find("DocumentSummaryInformation", true);
if(tmp.count()==1)
documentSummary=docfile->stream(tmp.at(0));
@@ -426,7 +426,7 @@ void OLEFilter::convert( const TQCString& mimeTypeHint )
myFile prvText;
KLaola::NodeList tmp;
- tmp = docfile->tqfind( "PrvText", true );
+ tmp = docfile->find( "PrvText", true );
if( tmp.count() == 1 ) prvText = docfile->stream( tmp.at( 0 ) );
myFilter = new HancomWordFilter( prvText );
diff --git a/filters/olefilters/powerpoint97/powerpoint.cc b/filters/olefilters/powerpoint97/powerpoint.cc
index b240a6907..b53acfc57 100644
--- a/filters/olefilters/powerpoint97/powerpoint.cc
+++ b/filters/olefilters/powerpoint97/powerpoint.cc
@@ -724,7 +724,7 @@ void Powerpoint::opPersistPtrIncrementalBlock(
// Create a record of this persistent reference.
- if (m_persistentReferences.end() == m_persistentReferences.tqfind(reference))
+ if (m_persistentReferences.end() == m_persistentReferences.find(reference))
{
if(reference < 5)
{
@@ -1287,7 +1287,7 @@ void Powerpoint::walkRecord(TQ_UINT32 mainStreamOffset)
void Powerpoint::walkReference(TQ_UINT32 reference)
{
- if (m_persistentReferences.end() == m_persistentReferences.tqfind(reference))
+ if (m_persistentReferences.end() == m_persistentReferences.find(reference))
{
kdError(s_area) << "cannot find reference: " << reference << endl;
}
diff --git a/filters/olefilters/powerpoint97/pptxml.cc b/filters/olefilters/powerpoint97/pptxml.cc
index 7c6a45fea..96a035672 100644
--- a/filters/olefilters/powerpoint97/pptxml.cc
+++ b/filters/olefilters/powerpoint97/pptxml.cc
@@ -64,15 +64,15 @@ void PptXml::encode(TQString &text)
// accidentally converting user text into one of the other escape
// sequences.
- text.tqreplace('&', "&amp;");
- text.tqreplace('<', "&lt;");
- text.tqreplace('>', "&gt;"); // Needed to avoid ]]>
+ text.replace('&', "&amp;");
+ text.replace('<', "&lt;");
+ text.replace('>', "&gt;"); // Needed to avoid ]]>
// Strictly, there is no need to encode " or ', but we do so to allow
// them to co-exist!
- text.tqreplace('"', "&quot;");
- text.tqreplace('\'', "&apos;");
+ text.replace('"', "&quot;");
+ text.replace('\'', "&apos;");
}
const TQString PptXml::getXml() const
diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc
index 2da253aa0..b77e91280 100644
--- a/filters/xsltfilter/export/xsltexportdia.cc
+++ b/filters/xsltfilter/export/xsltexportdia.cc
@@ -97,7 +97,7 @@ XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidge
name = tempList.last();
tempList.pop_back();
kdDebug() << name << " " << file << endl;
- if(!_namesList.tqcontains(name) && file == "main.xsl")
+ if(!_namesList.contains(name) && file == "main.xsl")
{
_filesList.append(file);
_namesList.append(name);
@@ -210,7 +210,7 @@ void XSLTExportDia::okSlot()
TQString stylesheet = _currentFile.directory() + TQDir::separator() + _currentFile.fileName();
/* Add the current file in the recent list if is not and save the list. */
- if(_recentList.tqcontains(stylesheet) == 0)
+ if(_recentList.contains(stylesheet) == 0)
{
kdDebug() << "Style sheet add to recent list" << endl;
/* Remove the older stylesheet used */
diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc
index a72b2b1ce..0d55c309b 100644
--- a/filters/xsltfilter/import/xsltimportdia.cc
+++ b/filters/xsltfilter/import/xsltimportdia.cc
@@ -92,7 +92,7 @@ XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* tq
name = tempList.last();
tempList.pop_back();
kdDebug() << name << " " << file << endl;
- if(!_namesList.tqcontains(name) && file == "main.xsl")
+ if(!_namesList.contains(name) && file == "main.xsl")
{
_filesList.append(file);
_namesList.append(name);
@@ -209,7 +209,7 @@ void XSLTImportDia::okSlot()
TQString stylesheet = _currentFile.directory() + "/" + _currentFile.fileName();
/* Add the current file in the recent list if is not and save the list. */
- if(_recentList.tqcontains(stylesheet) == 0)
+ if(_recentList.contains(stylesheet) == 0)
{
kdDebug() << "Style sheet add to recent list" << endl;
/* Remove the older stylesheet used */