summaryrefslogtreecommitdiffstats
path: root/lib/interfaces
diff options
context:
space:
mode:
Diffstat (limited to 'lib/interfaces')
-rw-r--r--lib/interfaces/codemodel.cpp50
-rw-r--r--lib/interfaces/codemodel_utils.cpp2
-rw-r--r--lib/interfaces/codemodel_utils.h4
-rw-r--r--lib/interfaces/kdevproject.cpp2
4 files changed, 29 insertions, 29 deletions
diff --git a/lib/interfaces/codemodel.cpp b/lib/interfaces/codemodel.cpp
index 3d4bbe63..e2e211ad 100644
--- a/lib/interfaces/codemodel.cpp
+++ b/lib/interfaces/codemodel.cpp
@@ -380,12 +380,12 @@ const FileList CodeModel::fileList( ) const
bool CodeModel::hasFile( const TQString & name ) const
{
- return m_files.tqcontains( name );
+ return m_files.contains( name );
}
FileDom CodeModel::fileByName( const TQString & name )
{
- TQMap<TQString, FileDom>::const_iterator it = m_files.tqfind( name );
+ TQMap<TQString, FileDom>::const_iterator it = m_files.find( name );
if( it != m_files.end() ) {
return *it;
} else {
@@ -395,7 +395,7 @@ FileDom CodeModel::fileByName( const TQString & name )
const FileDom CodeModel::fileByName( const TQString & name ) const
{
- TQMap<TQString, FileDom>::const_iterator it = m_files.tqfind( name );
+ TQMap<TQString, FileDom>::const_iterator it = m_files.find( name );
if( it != m_files.end() ) {
return *it;
} else {
@@ -502,7 +502,7 @@ bool CodeModel::addFile( FileDom file )
if( file->name().isEmpty() )
return false;
- if( m_files.tqfind( file->name() ) != m_files.end() ) {
+ if( m_files.find( file->name() ) != m_files.end() ) {
///the error-channel is set to 9007 because this problem appears with the cpp-support, so it is needed while debugging it
kdDebug(9007) << "file " << file->name() << " was added to code-model without removing it before! \n" << kdBacktrace() << endl;
removeFile( fileByName( file->name() ) );
@@ -679,17 +679,17 @@ const NamespaceList NamespaceModel::namespaceList( ) const
NamespaceDom NamespaceModel::namespaceByName( const TQString & name )
{
- return m_namespaces.tqcontains( name ) ? m_namespaces[ name ] : NamespaceDom();
+ return m_namespaces.contains( name ) ? m_namespaces[ name ] : NamespaceDom();
}
const NamespaceDom NamespaceModel::namespaceByName( const TQString & name ) const
{
- return m_namespaces.tqcontains( name ) ? m_namespaces[ name ] : NamespaceDom();
+ return m_namespaces.contains( name ) ? m_namespaces[ name ] : NamespaceDom();
}
bool NamespaceModel::hasNamespace( const TQString & name ) const
{
- return m_namespaces.tqcontains( name );
+ return m_namespaces.contains( name );
}
bool NamespaceModel::addNamespace( NamespaceDom ns )
@@ -760,17 +760,17 @@ const ClassList ClassModel::classList( ) const
bool ClassModel::hasClass( const TQString & name ) const
{
- return m_classes.tqcontains( name );
+ return m_classes.contains( name );
}
ClassList ClassModel::classByName( const TQString & name )
{
- return m_classes.tqcontains( name ) ? m_classes[ name ] : ClassList();
+ return m_classes.contains( name ) ? m_classes[ name ] : ClassList();
}
const ClassList ClassModel::classByName( const TQString & name ) const
{
- return m_classes.tqcontains( name ) ? m_classes[ name ] : ClassList();
+ return m_classes.contains( name ) ? m_classes[ name ] : ClassList();
}
bool ClassModel::addClass( ClassDom klass )
@@ -816,17 +816,17 @@ const FunctionList ClassModel::functionList( ) const
bool ClassModel::hasFunction( const TQString & name ) const
{
- return m_functions.tqcontains( name );
+ return m_functions.contains( name );
}
FunctionList ClassModel::functionByName( const TQString & name )
{
- return m_functions.tqcontains( name ) ? m_functions[ name ] : FunctionList();
+ return m_functions.contains( name ) ? m_functions[ name ] : FunctionList();
}
const FunctionList ClassModel::functionByName( const TQString & name ) const
{
- return m_functions.tqcontains( name ) ? m_functions[ name ] : FunctionList();
+ return m_functions.contains( name ) ? m_functions[ name ] : FunctionList();
}
bool ClassModel::addFunction( FunctionDom fun )
@@ -872,17 +872,17 @@ const FunctionDefinitionList ClassModel::functionDefinitionList( ) const
bool ClassModel::hasFunctionDefinition( const TQString & name ) const
{
- return m_functionDefinitions.tqcontains( name );
+ return m_functionDefinitions.contains( name );
}
FunctionDefinitionList ClassModel::functionDefinitionByName( const TQString & name )
{
- return m_functionDefinitions.tqcontains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList();
+ return m_functionDefinitions.contains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList();
}
const FunctionDefinitionList ClassModel::functionDefinitionByName( const TQString & name ) const
{
- return m_functionDefinitions.tqcontains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList();
+ return m_functionDefinitions.contains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList();
}
bool ClassModel::addFunctionDefinition( FunctionDefinitionDom fun )
@@ -914,17 +914,17 @@ const VariableList ClassModel::variableList( ) const
VariableDom ClassModel::variableByName( const TQString & name )
{
- return m_variables.tqcontains( name ) ? m_variables[ name ] : VariableDom();
+ return m_variables.contains( name ) ? m_variables[ name ] : VariableDom();
}
const VariableDom ClassModel::variableByName( const TQString & name ) const
{
- return m_variables.tqcontains( name ) ? m_variables[ name ] : VariableDom();
+ return m_variables.contains( name ) ? m_variables[ name ] : VariableDom();
}
bool ClassModel::hasVariable( const TQString & name ) const
{
- return m_variables.tqcontains( name );
+ return m_variables.contains( name );
}
bool ClassModel::addVariable( VariableDom var )
@@ -953,17 +953,17 @@ const EnumList ClassModel::enumList( ) const
EnumDom ClassModel::enumByName( const TQString & name )
{
- return m_enumerators.tqcontains( name ) ? m_enumerators[ name ] : EnumDom();
+ return m_enumerators.contains( name ) ? m_enumerators[ name ] : EnumDom();
}
const EnumDom ClassModel::enumByName( const TQString & name ) const
{
- return m_enumerators.tqcontains( name ) ? m_enumerators[ name ] : EnumDom();
+ return m_enumerators.contains( name ) ? m_enumerators[ name ] : EnumDom();
}
bool ClassModel::hasEnum( const TQString & name ) const
{
- return m_enumerators.tqcontains( name );
+ return m_enumerators.contains( name );
}
bool ClassModel::addEnum( EnumDom e )
@@ -1028,17 +1028,17 @@ const TypeAliasList ClassModel::typeAliasList( ) const
bool ClassModel::hasTypeAlias( const TQString & name ) const
{
- return m_typeAliases.tqcontains( name );
+ return m_typeAliases.contains( name );
}
TypeAliasList ClassModel::typeAliasByName( const TQString & name )
{
- return m_typeAliases.tqcontains( name ) ? m_typeAliases[ name ] : TypeAliasList();
+ return m_typeAliases.contains( name ) ? m_typeAliases[ name ] : TypeAliasList();
}
const TypeAliasList ClassModel::typeAliasByName( const TQString & name ) const
{
- return m_typeAliases.tqcontains( name ) ? m_typeAliases[ name ] : TypeAliasList();
+ return m_typeAliases.contains( name ) ? m_typeAliases[ name ] : TypeAliasList();
}
bool ClassModel::addTypeAlias( TypeAliasDom typeAlias )
diff --git a/lib/interfaces/codemodel_utils.cpp b/lib/interfaces/codemodel_utils.cpp
index 5c9c71e9..afb946bd 100644
--- a/lib/interfaces/codemodel_utils.cpp
+++ b/lib/interfaces/codemodel_utils.cpp
@@ -296,7 +296,7 @@ AllFunctionDefinitions allFunctionDefinitionsDetailed( const FileDom & dom )
bool resultTypesFit( const FunctionDom & dec, const FunctionDefinitionDom & def ) {
- if( !def->resultType().tqcontains("::") ) return dec->resultType() == def->resultType();
+ if( !def->resultType().contains("::") ) return dec->resultType() == def->resultType();
TQStringList l1 = dec->scope() + TQStringList::split("::", dec->resultType() );
TQStringList l2 = TQStringList::split("::", def->resultType() );
diff --git a/lib/interfaces/codemodel_utils.h b/lib/interfaces/codemodel_utils.h
index 14e97656..2879a424 100644
--- a/lib/interfaces/codemodel_utils.h
+++ b/lib/interfaces/codemodel_utils.h
@@ -462,11 +462,11 @@ class PredAmOwner{
/**@return A list of all functions in the file.
@param dom File Dom to look for functions in.*/
FunctionList allFunctions(const FileDom &dom);
-/**@return A detailed list of all functions in the file (detailed list tqcontains
+/**@return A detailed list of all functions in the file (detailed list contains
the information about a scope of each FunctionDom found).
@param dom File Dom to look for functions in.*/
AllFunctions allFunctionsDetailed(const FileDom &dom);
-/**@return A detailed list of all function definitions in the file (detailed list tqcontains
+/**@return A detailed list of all function definitions in the file (detailed list contains
the information about a scope of each FunctionDefinitionDom found).
@param dom File Dom to look for functions in.*/
AllFunctionDefinitions allFunctionDefinitionsDetailed(const FileDom &dom);
diff --git a/lib/interfaces/kdevproject.cpp b/lib/interfaces/kdevproject.cpp
index 1c334a8d..fe495ea1 100644
--- a/lib/interfaces/kdevproject.cpp
+++ b/lib/interfaces/kdevproject.cpp
@@ -80,7 +80,7 @@ KDevProject::Options KDevProject::options() const
bool KDevProject::isProjectFile( const TQString & absFileName )
{
- return d->m_absToRel.tqcontains( absFileName );
+ return d->m_absToRel.contains( absFileName );
}
TQString KDevProject::relativeProjectFile( const TQString & absFileName )