summaryrefslogtreecommitdiffstats
path: root/lib/kofficecore
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kofficecore')
-rw-r--r--lib/kofficecore/KoApplication.cpp2
-rw-r--r--lib/kofficecore/KoChild.cpp22
-rw-r--r--lib/kofficecore/KoChild.h2
-rw-r--r--lib/kofficecore/KoDetailsPane.cpp2
-rw-r--r--lib/kofficecore/KoDocument.cpp12
-rw-r--r--lib/kofficecore/KoDocumentChild.cpp4
-rw-r--r--lib/kofficecore/KoDocumentInfo.cpp2
-rw-r--r--lib/kofficecore/KoDocumentInfoDlg.cpp2
-rw-r--r--lib/kofficecore/KoFilter.cpp4
-rw-r--r--lib/kofficecore/KoFilterManager.cpp12
-rw-r--r--lib/kofficecore/KoFrame.cpp24
-rw-r--r--lib/kofficecore/KoGenStyles.cpp16
-rw-r--r--lib/kofficecore/KoGenStyles.h4
-rw-r--r--lib/kofficecore/KoGlobal.cpp8
-rw-r--r--lib/kofficecore/KoMainWindow.cpp18
-rw-r--r--lib/kofficecore/KoMainWindow.h2
-rw-r--r--lib/kofficecore/KoOasisStore.cpp2
-rw-r--r--lib/kofficecore/KoOasisStyles.cpp6
-rw-r--r--lib/kofficecore/KoPictureCollection.cpp6
-rw-r--r--lib/kofficecore/KoPictureShared.cpp4
-rw-r--r--lib/kofficecore/KoQueryTrader.h6
-rw-r--r--lib/kofficecore/KoRect.cpp6
-rw-r--r--lib/kofficecore/KoRect.h6
-rw-r--r--lib/kofficecore/KoSpeaker.cpp26
-rw-r--r--lib/kofficecore/KoStyleStack.h4
-rw-r--r--lib/kofficecore/KoTemplates.cpp8
-rw-r--r--lib/kofficecore/KoTemplates.h4
-rw-r--r--lib/kofficecore/KoUnit.cpp2
-rw-r--r--lib/kofficecore/KoView.cpp10
-rw-r--r--lib/kofficecore/KoXmlReader.cpp12
-rw-r--r--lib/kofficecore/THOUGHTS2
-rw-r--r--lib/kofficecore/kkbdaccessextensions.cpp6
-rw-r--r--lib/kofficecore/tests/filter_graph.cpp6
33 files changed, 126 insertions, 126 deletions
diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp
index 2be62bbea..d127f4448 100644
--- a/lib/kofficecore/KoApplication.cpp
+++ b/lib/kofficecore/KoApplication.cpp
@@ -108,7 +108,7 @@ bool KoApplication::start()
KCmdLineArgs *koargs = KCmdLineArgs::parsedArgs("koffice");
TQCString dpiValues = koargs->getOption( "dpi" );
if ( !dpiValues.isEmpty() ) {
- int sep = dpiValues.tqfind( TQRegExp( "[x, ]" ) );
+ int sep = dpiValues.find( TQRegExp( "[x, ]" ) );
int dpiX;
int dpiY = 0;
bool ok = true;
diff --git a/lib/kofficecore/KoChild.cpp b/lib/kofficecore/KoChild.cpp
index 85d549390..8394f59a7 100644
--- a/lib/kofficecore/KoChild.cpp
+++ b/lib/kofficecore/KoChild.cpp
@@ -104,9 +104,9 @@ TQPointArray KoChild::pointArray( const TQWMatrix &matrix ) const
return pointArray( TQRect( 0, 0, d->m_tqgeometry.width(), d->m_tqgeometry.height() ), matrix );
}
-//bool KoChild::tqcontains( const TQPoint &point ) const
+//bool KoChild::contains( const TQPoint &point ) const
//{
-// return region().tqcontains( point );
+// return region().contains( point );
//}
TQRect KoChild::boundingRect() const
@@ -338,26 +338,26 @@ bool KoChild::isTransparent() const
KoChild::Gadget KoChild::gadgetHitTest( const TQPoint &p )
{
- if ( !frameRegion().tqcontains( p ) )
+ if ( !frameRegion().contains( p ) )
return NoGadget;
- if ( TQRegion( pointArray( TQRect( -5, -5, 5, 5 ) ) ).tqcontains( p ) )
+ if ( TQRegion( pointArray( TQRect( -5, -5, 5, 5 ) ) ).contains( p ) )
return TopLeft;
- if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width() / 2 - 3, -5, 5, 5 ) ) ).tqcontains( p ) )
+ if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width() / 2 - 3, -5, 5, 5 ) ) ).contains( p ) )
return TopMid;
- if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), -5, 5, 5 ) ) ).tqcontains( p ) )
+ if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), -5, 5, 5 ) ) ).contains( p ) )
return TopRight;
- if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).tqcontains( p ) )
+ if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) )
return MidLeft;
- if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height(), 5, 5 ) ) ).tqcontains( p ) )
+ if ( TQRegion( pointArray( TQRect( -5, d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) )
return BottomLeft;
if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width() / 2 - 3,
- d->m_tqgeometry.height(), 5, 5 ) ) ).tqcontains( p ) )
+ d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) )
return BottomMid;
- if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), d->m_tqgeometry.height(), 5, 5 ) ) ).tqcontains( p ) )
+ if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(), d->m_tqgeometry.height(), 5, 5 ) ) ).contains( p ) )
return BottomRight;
if ( TQRegion( pointArray( TQRect( d->m_tqgeometry.width(),
- d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).tqcontains( p ) )
+ d->m_tqgeometry.height() / 2 - 3, 5, 5 ) ) ).contains( p ) )
return MidRight;
return Move;
diff --git a/lib/kofficecore/KoChild.h b/lib/kofficecore/KoChild.h
index 4734bbd45..0dbc74be0 100644
--- a/lib/kofficecore/KoChild.h
+++ b/lib/kofficecore/KoChild.h
@@ -96,7 +96,7 @@ public:
* Tests whether the part contains a certain point. The point is
* in the coordinate system of the tqparent.
*/
- //virtual bool tqcontains( const TQPoint& ) const;
+ //virtual bool contains( const TQPoint& ) const;
/**
* @return the effective bounding rect after all transformations.
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index 85d9c3d6f..efddc96a6 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -305,7 +305,7 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* tqparent, KInstance* inst
// Support for kdelibs-3.5's new RecentFiles format: name[url]
if(path.endsWith("]")) {
- int pos = path.tqfind("[");
+ int pos = path.find("[");
name = path.mid(0, pos - 1);
path = path.mid(pos + 1, path.length() - pos - 2);
}
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index e9d985aad..a579e9256 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -747,7 +747,7 @@ KoDocumentInfo *KoDocument::documentInfo() const
void KoDocument::setViewBuildDocument( KoView *view, const TQDomDocument &doc )
{
- if ( d->m_views.tqfind( view ) == -1 )
+ if ( d->m_views.find( view ) == -1 )
return;
uint viewIdx = d->m_views.at();
@@ -762,7 +762,7 @@ TQDomDocument KoDocument::viewBuildDocument( KoView *view )
{
TQDomDocument res;
- if ( d->m_views.tqfind( view ) == -1 )
+ if ( d->m_views.find( view ) == -1 )
return res;
uint viewIdx = d->m_views.at();
@@ -1623,7 +1623,7 @@ bool KoDocument::oldLoadAndParse(KoStore* store, const TQString& filename, TQDom
if (!store->open(filename))
{
kdWarning(30003) << "Entry " << filename << " not found!" << endl;
- d->lastErrorMessage = i18n( "Could not tqfind %1" ).tqarg( filename );
+ d->lastErrorMessage = i18n( "Could not find %1" ).tqarg( filename );
return false;
}
// Error variables for TQDomDocument::setContent
@@ -2199,7 +2199,7 @@ TQCString KoDocument::nativeFormatMimeType() const
TQCString nativeMimeType = service->property( "X-KDE-NativeMimeType" ).toString().latin1();
if ( nativeMimeType.isEmpty() ) {
// shouldn't happen, let's find out why it happened
- if ( !service->serviceTypes().tqcontains( "KOfficePart" ) )
+ if ( !service->serviceTypes().contains( "KOfficePart" ) )
kdWarning(30003) << "Wrong desktop file, KOfficePart isn't mentionned" << endl;
else if ( !KServiceType::serviceType( "KOfficePart" ) )
kdWarning(30003) << "The KOfficePart service type isn't installed!" << endl;
@@ -2290,7 +2290,7 @@ bool KoDocument::isNativeFormat( const TQCString& mimetype ) const
{
if ( mimetype == nativeFormatMimeType() )
return true;
- return extraNativeMimeTypes().tqcontains( mimetype );
+ return extraNativeMimeTypes().contains( mimetype );
}
TQStringList KoDocument::extraNativeMimeTypes() const
@@ -2315,7 +2315,7 @@ int KoDocument::supportedSpecialFormats() const
void KoDocument::addShell( KoMainWindow *shell )
{
- if ( d->m_shells.tqfindRef( shell ) == -1 )
+ if ( d->m_shells.findRef( shell ) == -1 )
{
//kdDebug(30003) << "addShell: shell " << (void*)shell << " added to doc " << this << endl;
d->m_shells.append( shell );
diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp
index 27d4a6737..38c4439ae 100644
--- a/lib/kofficecore/KoDocumentChild.cpp
+++ b/lib/kofficecore/KoDocumentChild.cpp
@@ -109,7 +109,7 @@ KoDocument* KoDocumentChild::parentDocument() const
KoDocument* KoDocumentChild::hitTest( const TQPoint &p, const TQWMatrix &_matrix )
{
- if ( !region( _matrix ).tqcontains( p ) || !d->m_doc )
+ if ( !region( _matrix ).contains( p ) || !d->m_doc )
return 0L;
TQWMatrix m( _matrix );
@@ -357,7 +357,7 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr
{
KParts::PartManager *manager = tqparent->manager();
- if ( !manager->parts()->tqcontainsRef( d->m_doc ) &&
+ if ( !manager->parts()->containsRef( d->m_doc ) &&
!tqparent->isSingleViewMode() )
manager->addPart( d->m_doc, false );
}
diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp
index ccec34244..f6a3fe69a 100644
--- a/lib/kofficecore/KoDocumentInfo.cpp
+++ b/lib/kofficecore/KoDocumentInfo.cpp
@@ -920,7 +920,7 @@ bool KoDocumentInfoUserMetadata::loadOasis( const TQDomNode& metaDoc )
if ( e.namespaceURI() == KoXmlNS::meta && e.localName() == "user-defined" && !e.text().isEmpty() )
{
TQString name = e.attributeNS( KoXmlNS::meta, "name", TQString() );
- if ( !m_reserved.tqcontains( name ) )
+ if ( !m_reserved.contains( name ) )
m_metaList[ name ] = e.text();
}
}
diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp
index 8fa70f076..786e3982f 100644
--- a/lib/kofficecore/KoDocumentInfoDlg.cpp
+++ b/lib/kofficecore/KoDocumentInfoDlg.cpp
@@ -487,7 +487,7 @@ void KoDocumentInfoPropsPage::applyChanges()
assert( entry );
if ( entry->name() == "documentinfo.xml" ||
- ( !docInfoSaved && !entries.tqcontains( "documentinfo.xml" ) ) )
+ ( !docInfoSaved && !entries.contains( "documentinfo.xml" ) ) )
{
d->m_dlg->save();
diff --git a/lib/kofficecore/KoFilter.cpp b/lib/kofficecore/KoFilter.cpp
index ba37191c1..628d5f17a 100644
--- a/lib/kofficecore/KoFilter.cpp
+++ b/lib/kofficecore/KoFilter.cpp
@@ -106,7 +106,7 @@ void KoEmbeddingFilter::endInternalEmbedding()
int KoEmbeddingFilter::internalPartReference( const TQString& key ) const
{
- TQMapConstIterator<TQString, PartReference> it = m_partStack.top()->m_partReferences.tqfind( key );
+ TQMapConstIterator<TQString, PartReference> it = m_partStack.top()->m_partReferences.find( key );
if ( it == m_partStack.top()->m_partReferences.end() )
return -1;
return it.data().m_index;
@@ -114,7 +114,7 @@ int KoEmbeddingFilter::internalPartReference( const TQString& key ) const
TQCString KoEmbeddingFilter::internalPartMimeType( const TQString& key ) const
{
- TQMapConstIterator<TQString, PartReference> it = m_partStack.top()->m_partReferences.tqfind( key );
+ TQMapConstIterator<TQString, PartReference> it = m_partStack.top()->m_partReferences.find( key );
if ( it == m_partStack.top()->m_partReferences.end() )
return TQCString();
return it.data().m_mimeType;
diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp
index bc4d48bca..91522fbbd 100644
--- a/lib/kofficecore/KoFilterManager.cpp
+++ b/lib/kofficecore/KoFilterManager.cpp
@@ -78,7 +78,7 @@ KoFilterChooser::KoFilterChooser (TQWidget *tqparent, const TQStringList &mimeTy
if (nativeFormat == "application/x-kword")
{
- const int index = m_mimeTypes.tqfindIndex ("text/plain");
+ const int index = m_mimeTypes.findIndex ("text/plain");
if (index > -1)
m_filterList->setCurrentItem (index);
}
@@ -370,7 +370,7 @@ namespace // in order not to mess with the global namespace ;)
TQStringList::ConstIterator testIt = ( *it )->export_.begin();
TQStringList::ConstIterator testEnd = ( *it )->export_.end();
for ( ; testIt != testEnd ; ++testIt ) {
- if ( stopList.tqfind( *testIt ) == stopEnd ) {
+ if ( stopList.find( *testIt ) == stopEnd ) {
expList.append( *testIt );
}
}
@@ -381,7 +381,7 @@ namespace // in order not to mess with the global namespace ;)
TQStringList::ConstIterator testIt = ( *it )->import.begin();
const TQStringList::ConstIterator testEnd = ( *it )->import.end();
for ( ; testIt != testEnd ; ++testIt ) {
- if ( stopList.tqfind( *testIt ) == stopEnd ) {
+ if ( stopList.find( *testIt ) == stopEnd ) {
impList.append( *testIt );
}
}
@@ -493,7 +493,7 @@ TQStringList KoFilterManager::mimeFilter( const TQCString& mimetype, Direction d
const TQStringList outMimes = connected( vertices, (*natit).latin1() );
//kdDebug(s_area) << k_funcinfo << "output formats connected to mime " << *natit << " : " << outMimes << endl;
for ( TQStringList::ConstIterator mit = outMimes.begin(); mit != outMimes.end(); ++mit )
- if ( lst.tqfind( *mit ) == lst.end() ) // append only if not there already. TQt4: TQSet<TQString>?
+ if ( lst.find( *mit ) == lst.end() ) // append only if not there already. TQt4: TQSet<TQString>?
lst.append( *mit );
}
return lst;
@@ -511,7 +511,7 @@ TQStringList KoFilterManager::mimeFilter()
if ( partIt == partEnd )
return TQStringList();
- // To tqfind *all* reachable mimetypes, we have to resort to
+ // To find *all* reachable mimetypes, we have to resort to
// a small hat trick, in order to avoid multiple searches:
// We introduce a fake vertex, which is connected to every
// single KOffice mimetype. Due to that one BFS is enough :)
@@ -550,7 +550,7 @@ bool KoFilterManager::filterAvailable( KoFilterEntry::Ptr entry )
key += " - ";
key += entry->service()->library();
- if ( !m_filterAvailable.tqcontains( key ) ) {
+ if ( !m_filterAvailable.contains( key ) ) {
//kdDebug( 30500 ) << "Not cached, checking..." << endl;
KLibrary* library = KLibLoader::self()->library( TQFile::encodeName( entry->service()->library() ) );
diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp
index 2662169e1..f11ba9f0c 100644
--- a/lib/kofficecore/KoFrame.cpp
+++ b/lib/kofficecore/KoFrame.cpp
@@ -217,21 +217,21 @@ void KoFrame::mousePressEvent( TQMouseEvent* ev )
TQRect r7( 0, height() / 2 - 3, 5, 5 );
TQRect r8( width()- 5, height() / 2 - 3, 5, 5 );
- if ( r1.tqcontains( ev->pos() ) )
+ if ( r1.contains( ev->pos() ) )
d->m_mode = 1;
- else if ( r2.tqcontains( ev->pos() ) )
+ else if ( r2.contains( ev->pos() ) )
d->m_mode = 2;
- else if ( r3.tqcontains( ev->pos() ) )
+ else if ( r3.contains( ev->pos() ) )
d->m_mode = 3;
- else if ( r4.tqcontains( ev->pos() ) )
+ else if ( r4.contains( ev->pos() ) )
d->m_mode = 4;
- else if ( r5.tqcontains( ev->pos() ) )
+ else if ( r5.contains( ev->pos() ) )
d->m_mode = 5;
- else if ( r6.tqcontains( ev->pos() ) )
+ else if ( r6.contains( ev->pos() ) )
d->m_mode = 6;
- else if ( r7.tqcontains( ev->pos() ) )
+ else if ( r7.contains( ev->pos() ) )
d->m_mode = 7;
- else if ( r8.tqcontains( ev->pos() ) )
+ else if ( r8.contains( ev->pos() ) )
d->m_mode = 8;
else
d->m_mode = 0;
@@ -327,13 +327,13 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
TQRect r7( 0, height() / 2 - 3, 5, 5 );
TQRect r8( width()- 5, height() / 2 - 3, 5, 5 );
- if ( r1.tqcontains( ev->pos() ) || r3.tqcontains( ev->pos() ) )
+ if ( r1.contains( ev->pos() ) || r3.contains( ev->pos() ) )
setCursor( sizeFDiagCursor );
- else if ( r2.tqcontains( ev->pos() ) || r4.tqcontains( ev->pos() ) )
+ else if ( r2.contains( ev->pos() ) || r4.contains( ev->pos() ) )
setCursor( sizeBDiagCursor );
- else if ( r5.tqcontains( ev->pos() ) || r6.tqcontains( ev->pos() ) )
+ else if ( r5.contains( ev->pos() ) || r6.contains( ev->pos() ) )
setCursor( sizeVerCursor );
- else if ( r7.tqcontains( ev->pos() ) || r8.tqcontains( ev->pos() ) )
+ else if ( r7.contains( ev->pos() ) || r8.contains( ev->pos() ) )
setCursor( sizeHorCursor );
else
setCursor( KCursor::handCursor() );
diff --git a/lib/kofficecore/KoGenStyles.cpp b/lib/kofficecore/KoGenStyles.cpp
index 68b8477ab..221288df7 100644
--- a/lib/kofficecore/KoGenStyles.cpp
+++ b/lib/kofficecore/KoGenStyles.cpp
@@ -31,7 +31,7 @@ KoGenStyles::~KoGenStyles()
TQString KoGenStyles::lookup( const KoGenStyle& style, const TQString& name, int flags )
{
- StyleMap::iterator it = m_styleMap.tqfind( style );
+ StyleMap::iterator it = m_styleMap.find( style );
if ( it == m_styleMap.end() ) {
// Not found, try if this style is in fact equal to its tqparent (the find above
// wouldn't have found it, due to m_parentName being set).
@@ -52,7 +52,7 @@ TQString KoGenStyles::lookup( const KoGenStyle& style, const TQString& name, int
testStyle.m_type = parentStyle->m_type;
// Also it's ok to not have the display name of the tqparent style
// in the auto style
- TQMap<TQString, TQString>::const_iterator it = parentStyle->m_attributes.tqfind( "style:display-name" );
+ TQMap<TQString, TQString>::const_iterator it = parentStyle->m_attributes.find( "style:display-name" );
if ( it != parentStyle->m_attributes.end() )
testStyle.addAttribute( "style:display-name", *it );
@@ -84,16 +84,16 @@ TQString KoGenStyles::makeUniqueName( const TQString& base, int flags ) const
{
// If this name is not used yet, and numbering isn't forced, then the given name is ok.
if ( ( flags & DontForceNumbering )
- && m_autoStylesInStylesDotXml.tqfind( base ) == m_autoStylesInStylesDotXml.end()
- && m_styleNames.tqfind( base ) == m_styleNames.end() )
+ && m_autoStylesInStylesDotXml.find( base ) == m_autoStylesInStylesDotXml.end()
+ && m_styleNames.find( base ) == m_styleNames.end() )
return base;
int num = 1;
TQString name;
do {
name = base;
name += TQString::number( num++ );
- } while ( m_autoStylesInStylesDotXml.tqfind( name ) != m_autoStylesInStylesDotXml.end()
- || m_styleNames.tqfind( name ) != m_styleNames.end() );
+ } while ( m_autoStylesInStylesDotXml.find( name ) != m_autoStylesInStylesDotXml.end()
+ || m_styleNames.find( name ) != m_styleNames.end() );
return name;
}
@@ -105,7 +105,7 @@ TQValueList<KoGenStyles::NamedStyle> KoGenStyles::styles( int type, bool markedF
const StyleArray::const_iterator end = m_styleArray.end();
for ( ; it != end ; ++it ) {
// Look up if it's marked for styles.xml or not by looking up in the corresponding style map.
- if ( (*it).style->type() == type && nameMap.tqfind((*it).name) != nameMap.end() ) {
+ if ( (*it).style->type() == type && nameMap.find((*it).name) != nameMap.end() ) {
lst.append( *it );
}
}
@@ -130,7 +130,7 @@ KoGenStyle* KoGenStyles::styleForModification( const TQString& name )
void KoGenStyles::markStyleForStylesXml( const TQString& name )
{
- Q_ASSERT( m_styleNames.tqfind( name ) != m_styleNames.end() );
+ Q_ASSERT( m_styleNames.find( name ) != m_styleNames.end() );
m_styleNames.remove( name );
m_autoStylesInStylesDotXml.insert( name, true );
styleForModification( name )->setAutoStyleInStylesDotXml( true );
diff --git a/lib/kofficecore/KoGenStyles.h b/lib/kofficecore/KoGenStyles.h
index ad25609ee..67f46da15 100644
--- a/lib/kofficecore/KoGenStyles.h
+++ b/lib/kofficecore/KoGenStyles.h
@@ -420,14 +420,14 @@ public:
private:
TQString property( const TQString& propName, PropertyType type ) const {
- TQMap<TQString, TQString>::const_iterator it = m_properties[type].tqfind( propName );
+ TQMap<TQString, TQString>::const_iterator it = m_properties[type].find( propName );
if ( it != m_properties[type].end() )
return it.data();
return TQString();
}
TQString attribute( const TQString& propName ) const {
- TQMap<TQString, TQString>::const_iterator it = m_attributes.tqfind( propName );
+ TQMap<TQString, TQString>::const_iterator it = m_attributes.find( propName );
if ( it != m_attributes.end() )
return it.data();
return TQString();
diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp
index 578687465..8ba1c0777 100644
--- a/lib/kofficecore/KoGlobal.cpp
+++ b/lib/kofficecore/KoGlobal.cpp
@@ -142,12 +142,12 @@ void KoGlobal::createListOfLanguages()
{
// Extract the language tag from the directory name
TQString tag = *it;
- int index = tag.tqfindRev('/');
+ int index = tag.findRev('/');
tag = tag.left(index);
- index = tag.tqfindRev('/');
+ index = tag.findRev('/');
tag = tag.mid(index+1);
- if ( seenLanguages.tqfind( tag ) == seenLanguages.end() ) {
+ if ( seenLanguages.find( tag ) == seenLanguages.end() ) {
KSimpleConfig entry(*it);
entry.setGroup("KCM Locale");
@@ -169,7 +169,7 @@ void KoGlobal::createListOfLanguages()
TQString KoGlobal::tagOfLanguage( const TQString & _lang)
{
const LanguageMap& map = self()->m_langMap;
- TQMap<TQString,TQString>::ConstIterator it = map.tqfind( _lang );
+ TQMap<TQString,TQString>::ConstIterator it = map.find( _lang );
if ( it != map.end() )
return *it;
return TQString();
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index be8a0fa28..4e30d64a1 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -322,7 +322,7 @@ KoMainWindow::~KoMainWindow()
// safety first ;)
d->m_manager->setActivePart(0);
- if(d->m_rootViews.tqfindRef(d->m_activeView)==-1) {
+ if(d->m_rootViews.findRef(d->m_activeView)==-1) {
delete d->m_activeView;
d->m_activeView=0L;
}
@@ -375,7 +375,7 @@ void KoMainWindow::setRootDocument( KoDocument *doc )
d->m_rootViews.current()->show();
// The addShell has been done already if using openURL
- if ( !d->m_rootDoc->shells().tqcontains( this ) )
+ if ( !d->m_rootDoc->shells().contains( this ) )
d->m_rootDoc->addShell( this );
d->m_removeView->setEnabled(false);
d->m_orientation->setEnabled(false);
@@ -445,7 +445,7 @@ void KoMainWindow::addRecentURL( const KURL& url )
TQString path = url.path( -1 );
TQStringList tmpDirs = KGlobal::dirs()->resourceDirs( "tmp" );
for ( TQStringList::Iterator it = tmpDirs.begin() ; ok && it != tmpDirs.end() ; ++it )
- if ( path.tqcontains( *it ) )
+ if ( path.contains( *it ) )
ok = false; // it's in the tmp resource
if ( ok )
KRecentDocument::add(path);
@@ -530,7 +530,7 @@ KoDocument *KoMainWindow::rootDocument() const
KoView *KoMainWindow::rootView() const
{
- if(d->m_rootViews.tqfind(d->m_activeView)!=-1)
+ if(d->m_rootViews.find(d->m_activeView)!=-1)
return d->m_activeView;
return d->m_rootViews.first();
}
@@ -743,7 +743,7 @@ bool KoMainWindow::saveDocument( bool saveas, bool silent )
KURL suggestedURL = pDoc->url();
TQStringList mimeFilter = KoFilterManager::mimeFilter( _native_format, KoFilterManager::Export, pDoc->extraNativeMimeTypes() );
- if (mimeFilter.tqfindIndex (oldOutputFormat) < 0 && !isExporting())
+ if (mimeFilter.findIndex (oldOutputFormat) < 0 && !isExporting())
{
kdDebug(30003) << "KoMainWindow::saveDocument no export filter for '" << oldOutputFormat << "'" << endl;
@@ -754,7 +754,7 @@ bool KoMainWindow::saveDocument( bool saveas, bool silent )
TQString suggestedFilename = suggestedURL.fileName ();
if ( !suggestedFilename.isEmpty () ) // ".kwd" looks strange for a name
{
- int c = suggestedFilename.tqfindRev ('.');
+ int c = suggestedFilename.findRev ('.');
KMimeType::Ptr mime = KMimeType::mimeType( _native_format );
TQString ext = mime->property( "X-KDE-NativeExtension" ).toString();
@@ -1296,7 +1296,7 @@ void KoMainWindow::slotNewToolbarConfig()
d->m_veryHackyActionList);
// This one only for root views
- if(d->m_rootViews.tqfindRef(d->m_activeView)!=-1)
+ if(d->m_rootViews.findRef(d->m_activeView)!=-1)
factory->plugActionList(d->m_activeView, "view_split",
d->m_splitViewActionList );
plugActionList( "toolbarlist", d->m_toolbarList );
@@ -1388,7 +1388,7 @@ void KoMainWindow::slotCloseAllViews() {
void KoMainWindow::slotRemoveView() {
KoView *view;
- if(d->m_rootViews.tqfindRef(d->m_activeView)!=-1)
+ if(d->m_rootViews.findRef(d->m_activeView)!=-1)
view=d->m_rootViews.current();
else
view=d->m_rootViews.first();
@@ -1514,7 +1514,7 @@ void KoMainWindow::slotActivePartChanged( KParts::Part *newPart )
factory->plugActionList(d->m_activeView, "view_closeallviews",
d->m_veryHackyActionList);
// This one only for root views
- if(d->m_rootViews.tqfindRef(d->m_activeView)!=-1)
+ if(d->m_rootViews.findRef(d->m_activeView)!=-1)
factory->plugActionList(d->m_activeView, "view_split", d->m_splitViewActionList );
// Position and show toolbars according to user's preference
diff --git a/lib/kofficecore/KoMainWindow.h b/lib/kofficecore/KoMainWindow.h
index f1dd6419f..8913e1a85 100644
--- a/lib/kofficecore/KoMainWindow.h
+++ b/lib/kofficecore/KoMainWindow.h
@@ -43,7 +43,7 @@ namespace KParts
* @brief Main window for a KOffice application
*
* This class is used to represent a main window
- * of a KOffice component. Each main window tqcontains
+ * of a KOffice component. Each main window contains
* a menubar and some toolbars.
*
* @note This class does NOT need to be subclassed in your application.
diff --git a/lib/kofficecore/KoOasisStore.cpp b/lib/kofficecore/KoOasisStore.cpp
index 7eec46a5b..ea99ce8ab 100644
--- a/lib/kofficecore/KoOasisStore.cpp
+++ b/lib/kofficecore/KoOasisStore.cpp
@@ -145,7 +145,7 @@ bool KoOasisStore::loadAndParse( const TQString& fileName, TQDomDocument& doc, T
if (!m_store->open(fileName))
{
kdWarning(30003) << "Entry " << fileName << " not found!" << endl;
- errorMessage = i18n( "Could not tqfind %1" ).tqarg( fileName );
+ errorMessage = i18n( "Could not find %1" ).tqarg( fileName );
return false;
}
// Error variables for TQDomDocument::setContent
diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp
index d135a501a..fe4ee658e 100644
--- a/lib/kofficecore/KoOasisStyles.cpp
+++ b/lib/kofficecore/KoOasisStyles.cpp
@@ -180,7 +180,7 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles )
if ( styleAutoStyles ) {
TQDict<TQDomElement>& dict = d->m_stylesAutoStyles[ family ];
dict.setAutoDelete( true );
- if ( dict.tqfind( name ) != 0 )
+ if ( dict.find( name ) != 0 )
kdDebug(30003) << "Auto-style: '" << name << "' already exists" << endl;
dict.insert( name, new TQDomElement( e ) );
//kdDebug(30003) << "Style: '" << name << "' loaded as a style auto style" << endl;
@@ -188,7 +188,7 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles )
TQDict<TQDomElement>& dict = d->m_styles[ family ];
dict.setAutoDelete( true );
- if ( dict.tqfind( name ) != 0 )
+ if ( dict.find( name ) != 0 )
kdDebug(30003) << "Style: '" << name << "' already exists" << endl;
dict.insert( name, new TQDomElement( e ) );
//kdDebug(30003) << "Style: '" << name << "' loaded " << endl;
@@ -198,7 +198,7 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles )
|| localName == "font-decl"
|| localName == "presentation-page-tqlayout" ) )
{
- if ( m_styles.tqfind( name ) != 0 )
+ if ( m_styles.find( name ) != 0 )
kdDebug(30003) << "Style: '" << name << "' already exists" << endl;
m_styles.insert( name, new TQDomElement( e ) );
} else if ( localName == "default-style" && ns == KoXmlNS::style ) {
diff --git a/lib/kofficecore/KoPictureCollection.cpp b/lib/kofficecore/KoPictureCollection.cpp
index 3d680bf73..835beafb3 100644
--- a/lib/kofficecore/KoPictureCollection.cpp
+++ b/lib/kofficecore/KoPictureCollection.cpp
@@ -37,7 +37,7 @@ KoPicture KoPictureCollection::findPicture(const KoPictureKey& key) const
#ifdef DEBUG_PICTURES
kdDebug(30003) << "KoPictureCollection::findPicture " << key.toString() << endl;
#endif
- ConstIterator it = tqfind( key );
+ ConstIterator it = find( key );
if ( it == end() )
{
KoPicture picture;
@@ -285,7 +285,7 @@ void KoPictureCollection::readFromStore( KoStore * store, const StoreMap & store
}
}
- const int pos=u.tqfindRev('.');
+ const int pos=u.findRev('.');
if (pos==-1)
{
kdError(30003) << "File with no extension! Not supported!" << endl;
@@ -305,7 +305,7 @@ void KoPictureCollection::readFromStore( KoStore * store, const StoreMap & store
KoPicture KoPictureCollection::findOrLoad(const TQString& fileName, const TQDateTime& dateTime)
{
// As now all KoPictureKey objects have a valid TQDateTime, we must do it without a date/time check.
- ConstIterator it = tqfind( KoPictureKey ( fileName, dateTime ) );
+ ConstIterator it = find( KoPictureKey ( fileName, dateTime ) );
if ( it == end() )
{
return loadPicture( fileName );
diff --git a/lib/kofficecore/KoPictureShared.cpp b/lib/kofficecore/KoPictureShared.cpp
index 16fea2efb..6bc69345c 100644
--- a/lib/kofficecore/KoPictureShared.cpp
+++ b/lib/kofficecore/KoPictureShared.cpp
@@ -299,7 +299,7 @@ bool KoPictureShared::loadXpm(TQIODevice* io)
int pos=0;
- while ((pos=array.tqfind(char(1),pos))!=-1)
+ while ((pos=array.find(char(1),pos))!=-1)
{
array[pos]='"';
}
@@ -436,7 +436,7 @@ bool KoPictureShared::loadFromFile(const TQString& fileName)
return false;
bool flag = false;
- const int pos=fileName.tqfindRev('.');
+ const int pos=fileName.findRev('.');
if (pos==-1)
{
kdDebug(30003) << "File with no extension!" << endl;
diff --git a/lib/kofficecore/KoQueryTrader.h b/lib/kofficecore/KoQueryTrader.h
index ff2a51000..54fa811e0 100644
--- a/lib/kofficecore/KoQueryTrader.h
+++ b/lib/kofficecore/KoQueryTrader.h
@@ -64,7 +64,7 @@ public:
* @return TRUE if the document can handle the requested mimetype.
*/
bool supportsMimeType( const TQString & _mimetype ) const
- { return mimeTypes().tqcontains( _mimetype ); }
+ { return mimeTypes().contains( _mimetype ); }
/**
* Uses the factory of the component to create
@@ -152,13 +152,13 @@ public:
* @return TRUE if the filter can import the requested mimetype.
*/
bool imports( const TQString& _mimetype ) const
- { return ( import.tqcontains( _mimetype ) ); }
+ { return ( import.contains( _mimetype ) ); }
/**
* @return TRUE if the filter can export the requested mimetype.
*/
bool exports( const TQString& _m ) const
- { return ( export_.tqcontains( _m ) ); }
+ { return ( export_.contains( _m ) ); }
/**
* This function will query KDED to find all available filters.
diff --git a/lib/kofficecore/KoRect.cpp b/lib/kofficecore/KoRect.cpp
index 78a63992d..2a3259a92 100644
--- a/lib/kofficecore/KoRect.cpp
+++ b/lib/kofficecore/KoRect.cpp
@@ -166,15 +166,15 @@ KoRect &KoRect::operator&=(const KoRect &rhs) {
return *this;
}
-bool KoRect::tqcontains(const KoPoint &p) const {
+bool KoRect::contains(const KoPoint &p) const {
return (p.x() >= m_tl.x() && p.x() <= m_br.x() && p.y() >= m_tl.y() && p.y() <= m_br.y());
}
-bool KoRect::tqcontains(const double &x, const double &y) const {
+bool KoRect::contains(const double &x, const double &y) const {
return (x >= m_tl.x() && x <= m_br.x() && y >= m_tl.y() && y <= m_br.y());
}
-bool KoRect::tqcontains(const KoRect &r) const {
+bool KoRect::contains(const KoRect &r) const {
return (r.left() >= m_tl.x() && r.right() <= m_br.x() && r.top() >= m_tl.y() && r.bottom() <= m_br.y());
}
diff --git a/lib/kofficecore/KoRect.h b/lib/kofficecore/KoRect.h
index b42890887..bb4f1161c 100644
--- a/lib/kofficecore/KoRect.h
+++ b/lib/kofficecore/KoRect.h
@@ -108,11 +108,11 @@ public:
* Note that for KoRect(0, 0, 100, 100) the KoPoint(0, 0) as well as KoPoint(100, 100) are
* mathmatically contained in the rect, this in contrary to pixel based rectangles.
*/
- bool tqcontains(const KoPoint &p) const;
+ bool contains(const KoPoint &p) const;
/// Helper function for the above function.
- bool tqcontains(const double &x, const double &y) const;
+ bool contains(const double &x, const double &y) const;
/// Helper function for the above function.
- bool tqcontains(const KoRect &r) const;
+ bool contains(const KoRect &r) const;
KoRect unite(const KoRect &r) const;
KoRect intersect(const KoRect &r) const;
bool intersects(const KoRect &r) const;
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index fd42bcf30..75c8fec8c 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -307,7 +307,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
if (pos == TQPoint())
item = iv->currentItem();
else
- item = iv->tqfindItem(iv->viewportToContents(iv->viewport()->mapFromGlobal(pos)));
+ item = iv->findItem(iv->viewportToContents(iv->viewport()->mapFromGlobal(pos)));
if (item) {
id = item->index();
text = item->text();
@@ -431,7 +431,7 @@ bool KoSpeaker::sayWidget(const TQString& msg)
{
TQString s = msg;
if (d->m_speakFlags & SpeakAccelerator) {
- int amp = s.tqfind("&");
+ int amp = s.find("&");
if (amp >= 0) {
TQString acc = s.mid(++amp,1);
acc = acc.stripWhiteSpace();
@@ -442,20 +442,20 @@ bool KoSpeaker::sayWidget(const TQString& msg)
s.remove("&");
if (TQStyleSheet::mightBeRichText(s)) {
// kdDebug() << "richtext" << endl;
- s.tqreplace(TQRegExp("</?[pbius]>"), "");
- s.tqreplace(TQRegExp("</?h\\d>"), "");
- s.tqreplace(TQRegExp("<(br|hr)>"), " ");
- s.tqreplace(TQRegExp(
+ s.replace(TQRegExp("</?[pbius]>"), "");
+ s.replace(TQRegExp("</?h\\d>"), "");
+ s.replace(TQRegExp("<(br|hr)>"), " ");
+ s.replace(TQRegExp(
"</?(qt|center|li|pre|div|span|em|strong|big|small|sub|sup|code|tt|font|nobr|ul|ol|dl|dt)>"), "");
- s.tqreplace(TQRegExp("</?(table|tr|th|td).*>"), "");
- s.tqreplace(TQRegExp("</?a\\s.+>"), "");
+ s.replace(TQRegExp("</?(table|tr|th|td).*>"), "");
+ s.replace(TQRegExp("</?a\\s.+>"), "");
// Replace <img source="small|frame_text"> with "small frame_text image. "
- s.tqreplace(TQRegExp("<img\\s.*(?:source=|src=)\"([^|\"]+)[|]?([^|\"]*)\">"), "\\1 \\2 image. ");
+ s.replace(TQRegExp("<img\\s.*(?:source=|src=)\"([^|\"]+)[|]?([^|\"]*)\">"), "\\1 \\2 image. ");
}
if (s.isEmpty()) return false;
- s.tqreplace("Ctrl+", i18n("control plus "));
- s.tqreplace("Alt+", i18n("alt plus "));
- s.tqreplace("+", i18n(" plus "));
+ s.replace("Ctrl+", i18n("control plus "));
+ s.replace("Alt+", i18n("alt plus "));
+ s.replace("+", i18n(" plus "));
sayScreenReaderOutput(s, "");
return true;
}
@@ -468,7 +468,7 @@ bool KoSpeaker::sayWidget(const TQString& msg)
// int id = m->idAt(i);
// TQMenuItem* mi = m->findItem(id);
// TQWidget* w = mi->widget();
-// if (w->rect().tqcontains(w->mapFromGlobal(p))) return id;
+// if (w->rect().contains(w->mapFromGlobal(p))) return id;
// }
// return -1;
// }
diff --git a/lib/kofficecore/KoStyleStack.h b/lib/kofficecore/KoStyleStack.h
index 4e6cfa7e2..4fbc17937 100644
--- a/lib/kofficecore/KoStyleStack.h
+++ b/lib/kofficecore/KoStyleStack.h
@@ -98,7 +98,7 @@ public:
/**
* Check if any of the styles on the stack has an attribute called 'name'-'detail'
* where detail is e.g. left, right, top or bottom.
- * This allows to also tqfind 'name' alone (e.g. padding implies padding-left, padding-right etc.)
+ * This allows to also find 'name' alone (e.g. padding implies padding-left, padding-right etc.)
*/
bool hasAttribute( const TQString& name, const TQString& detail = TQString() ) const KDE_DEPRECATED;
@@ -111,7 +111,7 @@ public:
/**
* Check if any of the styles on the stack has an attribute called 'name'-'detail'
* where detail is e.g. left, right, top or bottom.
- * This allows to also tqfind 'name' alone (e.g. padding implies padding-left, padding-right etc.)
+ * This allows to also find 'name' alone (e.g. padding implies padding-left, padding-right etc.)
*/
bool hasAttributeNS( const char* nsURI, const char* localName, const char* detail = 0 ) const;
diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp
index 178c6271e..62c8358d6 100644
--- a/lib/kofficecore/KoTemplates.cpp
+++ b/lib/kofficecore/KoTemplates.cpp
@@ -101,7 +101,7 @@ void KoTemplateGroup::setHidden(bool hidden) const {
bool KoTemplateGroup::add(KoTemplate *t, bool force, bool touch) {
- KoTemplate *myTemplate=tqfind(t->name());
+ KoTemplate *myTemplate=find(t->name());
if(myTemplate==0L) {
m_templates.append(t);
m_touched=touch;
@@ -120,7 +120,7 @@ bool KoTemplateGroup::add(KoTemplate *t, bool force, bool touch) {
return false;
}
-KoTemplate *KoTemplateGroup::tqfind(const TQString &name) const {
+KoTemplate *KoTemplateGroup::find(const TQString &name) const {
TQPtrListIterator<KoTemplate> it(m_templates);
while(it.current() && it.current()->name()!=name)
@@ -192,14 +192,14 @@ void KoTemplateTree::writeTemplateTree() {
void KoTemplateTree::add(KoTemplateGroup *g) {
- KoTemplateGroup *group=tqfind(g->name());
+ KoTemplateGroup *group=find(g->name());
if(group==0L)
m_groups.append(g);
else
group->addDir(g->dirs().first()); // "...there can be only one..." (Queen)
}
-KoTemplateGroup *KoTemplateTree::tqfind(const TQString &name) const {
+KoTemplateGroup *KoTemplateTree::find(const TQString &name) const {
TQPtrListIterator<KoTemplateGroup> it(m_groups);
while(it.current() && it.current()->name()!=name)
diff --git a/lib/kofficecore/KoTemplates.h b/lib/kofficecore/KoTemplates.h
index 7547fd60d..98c3ef720 100644
--- a/lib/kofficecore/KoTemplates.h
+++ b/lib/kofficecore/KoTemplates.h
@@ -92,7 +92,7 @@ public:
KoTemplate *current() { return m_templates.current(); }
bool add(KoTemplate *t, bool force=false, bool touch=true);
- KoTemplate *tqfind(const TQString &name) const;
+ KoTemplate *find(const TQString &name) const;
bool touched() const { return m_touched; }
@@ -124,7 +124,7 @@ public:
KoTemplateGroup *current() { return m_groups.current(); }
void add(KoTemplateGroup *g);
- KoTemplateGroup *tqfind(const TQString &name) const;
+ KoTemplateGroup *find(const TQString &name) const;
KoTemplateGroup *defaultGroup() const { return m_defaultGroup; }
KoTemplate *defaultTemplate() const { return m_defaultTemplate; }
diff --git a/lib/kofficecore/KoUnit.cpp b/lib/kofficecore/KoUnit.cpp
index 51c634992..cc8823457 100644
--- a/lib/kofficecore/KoUnit.cpp
+++ b/lib/kofficecore/KoUnit.cpp
@@ -153,7 +153,7 @@ double KoUnit::parseValue( TQString value, double defaultVal )
if( value.isEmpty() )
return defaultVal;
- int index = value.tqfind( TQRegExp( "[a-z]+$" ) );
+ int index = value.find( TQRegExp( "[a-z]+$" ) );
if ( index == -1 )
return value.toDouble();
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index 87751a341..e2b9775e4 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -203,7 +203,7 @@ void KoView::setPartManager( KParts::PartManager *manager )
{
d->m_manager = manager;
if ( !koDocument()->isSingleViewMode() &&
- manager->parts()->tqcontainsRef( koDocument() ) == 0 ) // is there another view registered?
+ manager->parts()->containsRef( koDocument() ) == 0 ) // is there another view registered?
{
d->m_registered = true; // no, so we have to register now and ungregister again in the DTOR
manager->addPart( koDocument(), false );
@@ -241,11 +241,11 @@ KoDocument *KoView::hitTest( const TQPoint &viewPos )
{
if ( ( viewChild = child( docChild->document() ) ) )
{
- if ( viewChild->frameRegion().tqcontains( pos ) )
+ if ( viewChild->frameRegion().contains( pos ) )
return 0;
}
else
- if ( docChild->frameRegion().tqcontains( pos ) )
+ if ( docChild->frameRegion().contains( pos ) )
return 0;
}
@@ -254,11 +254,11 @@ KoDocument *KoView::hitTest( const TQPoint &viewPos )
{
if ( ( viewChild = child( docChild->document() ) ) )
{
- if ( viewChild->frameRegion().tqcontains( pos ) )
+ if ( viewChild->frameRegion().contains( pos ) )
return 0;
}
else
- if ( docChild->frameRegion().tqcontains( pos ) )
+ if ( docChild->frameRegion().contains( pos ) )
return 0;
}
diff --git a/lib/kofficecore/KoXmlReader.cpp b/lib/kofficecore/KoXmlReader.cpp
index 371b4d298..52e6d8ae4 100644
--- a/lib/kofficecore/KoXmlReader.cpp
+++ b/lib/kofficecore/KoXmlReader.cpp
@@ -421,7 +421,7 @@ TQString KoXmlNodeData::attribute( const TQString& name )
bool KoXmlNodeData::hasAttribute( const TQString& name )
{
- return attr.tqcontains( name );
+ return attr.contains( name );
}
void KoXmlNodeData::setAttributeNS( const TQString& nsURI,
@@ -429,7 +429,7 @@ const TQString& name, const TQString& value )
{
TQString prefix;
TQString localName = name;
- int i = name.tqfind( ':' );
+ int i = name.find( ':' );
if( i != -1 )
{
localName = name.mid( i + 1 );
@@ -451,7 +451,7 @@ TQString KoXmlNodeData::attributeNS( const TQString& nsURI, const TQString& name
bool KoXmlNodeData::hasAttributeNS( const TQString& nsURI, const TQString& name )
{
DTQString key( nsURI, name );
- return attrNS.tqcontains( key );
+ return attrNS.contains( key );
}
TQString KoXmlNodeData::data() const
@@ -665,7 +665,7 @@ const TQString& name, const TQXmlAttributes& atts )
nodeTagName = name;
nodeLocalName = name;
nodePrefix = nsURI.isNull() ? TQString() : TQString("");
- int i = name.tqfind( ':' );
+ int i = name.find( ':' );
if( i != -1 )
{
nodeTagName = name.mid( i + 1 );
@@ -695,7 +695,7 @@ const TQString& name, const TQXmlAttributes& atts )
TQString name; // without prefix, i.e. local name
name = qName = atts.qName(c);
- int i = qName.tqfind( ':' );
+ int i = qName.find( ':' );
if( i != -1 ) prefix = qName.left( i );
if( i != -1 ) name = qName.mid( i + 1 );
element->setAttributeNS( atts.uri(c), qName, atts.value(c) );
@@ -720,7 +720,7 @@ const TQString& name, const TQXmlAttributes& atts )
{
TQString prefix;
TQString name = atts.qName(c); // qName contains the prefix
- int i = name.tqfind( ':' );
+ int i = name.find( ':' );
if( i != -1 ) prefix = name.left( i );
if( i != -1 ) name = atts.qName(c).mid( i + 1 );
if( !atts.uri(c).isEmpty() )
diff --git a/lib/kofficecore/THOUGHTS b/lib/kofficecore/THOUGHTS
index 33befa051..fc936fdc1 100644
--- a/lib/kofficecore/THOUGHTS
+++ b/lib/kofficecore/THOUGHTS
@@ -77,7 +77,7 @@ as inactive child.
###
If a part doesn't support zooming natively we have to fall back to WMartix
-hacks (don't know how we can "ask" a part about that, but I'm sure we tqfind
+hacks (don't know how we can "ask" a part about that, but I'm sure we find
some BC way).
2.2) Widget embedding:
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index a45e13349..dccc913a3 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -310,7 +310,7 @@ void KKbdAccessExtensions::nextHandle()
advance = (d->handleNdx > 2 || !dynamic_cast<TQDockWindow *>(panel)->area());
if (advance) {
TQWidgetList* allWidgets = getAllPanels();
- allWidgets->tqfindRef(panel);
+ allWidgets->findRef(panel);
panel = 0;
if (allWidgets->current()) panel = allWidgets->next();
delete allWidgets;
@@ -340,7 +340,7 @@ void KKbdAccessExtensions::prevHandle()
rewind = (d->handleNdx < 1);
if (rewind) {
TQWidgetList* allWidgets = getAllPanels();
- allWidgets->tqfindRef(panel);
+ allWidgets->findRef(panel);
panel = 0;
if (allWidgets->current()) panel = allWidgets->prev();
delete allWidgets;
@@ -563,7 +563,7 @@ void KKbdAccessExtensions::displayAccessKeys()
KKeySequence seq = sc.seq(i);
if (seq.count() == 1) {
TQString s = seq.toString();
- if (availableAccessKeys.tqcontains(s))
+ if (availableAccessKeys.contains(s))
availableAccessKeys.remove(s);
}
}
diff --git a/lib/kofficecore/tests/filter_graph.cpp b/lib/kofficecore/tests/filter_graph.cpp
index ac25c8d72..baead627c 100644
--- a/lib/kofficecore/tests/filter_graph.cpp
+++ b/lib/kofficecore/tests/filter_graph.cpp
@@ -53,7 +53,7 @@ int main( int /*argc*/, char ** /*argv*/ )
output += " \"";
output += key.latin1();
output += "\" [tqshape=box, style=filled, fillcolor=lightblue];\n";
- if ( vertices.tqfind( key ) == vertices.end() )
+ if ( vertices.find( key ) == vertices.end() )
vertices.append( key );
}
}
@@ -71,7 +71,7 @@ int main( int /*argc*/, char ** /*argv*/ )
TQStringList::ConstIterator importEnd = ( *it )->import.end();
for ( ; importIt != importEnd; ++importIt ) {
// already there?
- if ( vertices.tqfind( *importIt ) == vertices.end() ) {
+ if ( vertices.find( *importIt ) == vertices.end() ) {
vertices.append( *importIt );
output += " \"";
output += ( *importIt ).latin1();
@@ -84,7 +84,7 @@ int main( int /*argc*/, char ** /*argv*/ )
for ( ; exportIt != exportEnd; ++exportIt ) {
// First make sure the export vertex is in place
- if ( vertices.tqfind( *exportIt ) == vertices.end() ) {
+ if ( vertices.find( *exportIt ) == vertices.end() ) {
output += " \"";
output += ( *exportIt ).latin1();
output += "\";\n";
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-06 08:06:12 +0000