summaryrefslogtreecommitdiffstats
path: root/kompare/libdiff2
diff options
context:
space:
mode:
Diffstat (limited to 'kompare/libdiff2')
-rw-r--r--kompare/libdiff2/cvsdiffparser.cpp10
-rw-r--r--kompare/libdiff2/diffmodel.cpp12
-rw-r--r--kompare/libdiff2/diffmodel.h2
-rw-r--r--kompare/libdiff2/diffparser.cpp10
-rw-r--r--kompare/libdiff2/kompare.h2
-rw-r--r--kompare/libdiff2/komparemodellist.cpp8
-rw-r--r--kompare/libdiff2/komparemodellist.h4
-rw-r--r--kompare/libdiff2/parser.cpp2
-rw-r--r--kompare/libdiff2/perforceparser.cpp8
9 files changed, 29 insertions, 29 deletions
diff --git a/kompare/libdiff2/cvsdiffparser.cpp b/kompare/libdiff2/cvsdiffparser.cpp
index f29e422c..47c79a0f 100644
--- a/kompare/libdiff2/cvsdiffparser.cpp
+++ b/kompare/libdiff2/cvsdiffparser.cpp
@@ -53,27 +53,27 @@ enum Kompare::Format CVSDiffParser::determineFormat()
while( it != m_diffLines.end() )
{
- if( (*it).tqfind( normalRE, 0 ) == 0 )
+ if( (*it).find( normalRE, 0 ) == 0 )
{
// kdDebug(8101) << "Difflines are from a Normal diff..." << endl;
return Kompare::Normal;
}
- else if( (*it).tqfind( unifiedRE, 0 ) == 0 )
+ else if( (*it).find( unifiedRE, 0 ) == 0 )
{
// kdDebug(8101) << "Difflines are from a Unified diff..." << endl;
return Kompare::Unified;
}
- else if( (*it).tqfind( contextRE, 0 ) == 0 )
+ else if( (*it).find( contextRE, 0 ) == 0 )
{
// kdDebug(8101) << "Difflines are from a Context diff..." << endl;
return Kompare::Context;
}
- else if( (*it).tqfind( rcsRE, 0 ) == 0 )
+ else if( (*it).find( rcsRE, 0 ) == 0 )
{
// kdDebug(8101) << "Difflines are from a RCS diff..." << endl;
return Kompare::RCS;
}
- else if( (*it).tqfind( edRE, 0 ) == 0 )
+ else if( (*it).find( edRE, 0 ) == 0 )
{
// kdDebug(8101) << "Difflines are from an ED diff..." << endl;
return Kompare::Ed;
diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp
index 438055c6..cd348dfc 100644
--- a/kompare/libdiff2/diffmodel.cpp
+++ b/kompare/libdiff2/diffmodel.cpp
@@ -79,10 +79,10 @@ void DiffModel::splitSourceInPathAndFileName()
{
int pos;
- if( ( pos = m_source.tqfindRev( "/" ) ) >= 0 )
+ if( ( pos = m_source.findRev( "/" ) ) >= 0 )
m_sourcePath = m_source.mid( 0, pos+1 );
- if( ( pos = m_source.tqfindRev( "/" ) ) >= 0 )
+ if( ( pos = m_source.findRev( "/" ) ) >= 0 )
m_sourceFile = m_source.mid( pos+1, m_source.length() - pos );
else
m_sourceFile = m_source;
@@ -94,10 +94,10 @@ void DiffModel::splitDestinationInPathAndFileName()
{
int pos;
- if( ( pos = m_destination.tqfindRev( "/" ) )>= 0 )
+ if( ( pos = m_destination.findRev( "/" ) )>= 0 )
m_destinationPath = m_destination.mid( 0, pos+1 );
- if( ( pos = m_destination.tqfindRev( "/" ) ) >= 0 )
+ if( ( pos = m_destination.findRev( "/" ) ) >= 0 )
m_destinationFile = m_destination.mid( pos+1, m_destination.length() - pos );
else
m_destinationFile = m_source;
@@ -393,10 +393,10 @@ bool DiffModel::setSelectedDifference( Difference* diff )
if ( diff != m_selectedDifference )
{
- if ( ( m_differences.tqfindIndex( diff ) ) == -1 )
+ if ( ( m_differences.findIndex( diff ) ) == -1 )
return false;
// Dont set m_diffIndex if it cant be found
- m_diffIndex = m_differences.tqfindIndex( diff );
+ m_diffIndex = m_differences.findIndex( diff );
kdDebug( 8101 ) << "m_diffIndex = " << m_diffIndex << endl;
m_selectedDifference = diff;
}
diff --git a/kompare/libdiff2/diffmodel.h b/kompare/libdiff2/diffmodel.h
index 3467b55b..493403f2 100644
--- a/kompare/libdiff2/diffmodel.h
+++ b/kompare/libdiff2/diffmodel.h
@@ -61,7 +61,7 @@ public:
DifferenceList* allDifferences();
- int findDifference( Difference* diff ) const { return m_differences.tqfindIndex( diff ); }
+ int findDifference( Difference* diff ) const { return m_differences.findIndex( diff ); }
Difference* firstDifference();
Difference* lastDifference();
diff --git a/kompare/libdiff2/diffparser.cpp b/kompare/libdiff2/diffparser.cpp
index b077ec20..d85256d2 100644
--- a/kompare/libdiff2/diffparser.cpp
+++ b/kompare/libdiff2/diffparser.cpp
@@ -49,27 +49,27 @@ enum Kompare::Format DiffParser::determineFormat()
while( it != m_diffLines.end() )
{
kdDebug(8101) << (*it) << endl;
- if( (*it).tqfind( normalRE, 0 ) == 0 )
+ if( (*it).find( normalRE, 0 ) == 0 )
{
kdDebug(8101) << "Difflines are from a Normal diff..." << endl;
return Kompare::Normal;
}
- else if( (*it).tqfind( unifiedRE, 0 ) == 0 )
+ else if( (*it).find( unifiedRE, 0 ) == 0 )
{
kdDebug(8101) << "Difflines are from a Unified diff..." << endl;
return Kompare::Unified;
}
- else if( (*it).tqfind( contextRE, 0 ) == 0 )
+ else if( (*it).find( contextRE, 0 ) == 0 )
{
kdDebug(8101) << "Difflines are from a Context diff..." << endl;
return Kompare::Context;
}
- else if( (*it).tqfind( rcsRE, 0 ) == 0 )
+ else if( (*it).find( rcsRE, 0 ) == 0 )
{
kdDebug(8101) << "Difflines are from an RCS diff..." << endl;
return Kompare::RCS;
}
- else if( (*it).tqfind( edRE, 0 ) == 0 )
+ else if( (*it).find( edRE, 0 ) == 0 )
{
kdDebug(8101) << "Difflines are from an ED diff..." << endl;
return Kompare::Ed;
diff --git a/kompare/libdiff2/kompare.h b/kompare/libdiff2/kompare.h
index 1c21db07..ded4c5a6 100644
--- a/kompare/libdiff2/kompare.h
+++ b/kompare/libdiff2/kompare.h
@@ -135,7 +135,7 @@ public:
relative += "../";
}
- relative += TQString( to ).tqreplace( 0, root.path(1).length(), "" );
+ relative += TQString( to ).replace( 0, root.path(1).length(), "" );
return relative;
}
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index dc39c1bc..ada2b949 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -494,7 +494,7 @@ TQStringList KompareModelList::split( const TQString& fileContents )
#else
const char split = '\n';
#endif
- while ( ( pos = contents.tqfind( split, oldpos ) ) >= 0 )
+ while ( ( pos = contents.find( split, oldpos ) ) >= 0 )
{
list.append( contents.mid( oldpos, pos - oldpos + 1 ) );
oldpos = pos + 1;
@@ -637,7 +637,7 @@ void KompareModelList::slotSelectionChanged( const Diff2::DiffModel* model, cons
// kdDebug(8101) << kdBacktrace() << endl;
m_selectedModel = const_cast<DiffModel*>(model);
- m_modelIndex = m_models->tqfindIndex( m_selectedModel );
+ m_modelIndex = m_models->findIndex( m_selectedModel );
kdDebug( 8101 ) << "m_modelIndex = " << m_modelIndex << endl;
m_selectedDifference = const_cast<Difference*>(diff);
@@ -1255,10 +1255,10 @@ bool KompareModelList::setSelectedModel( DiffModel* model )
if ( model != m_selectedModel )
{
- if ( m_models->tqfindIndex( model ) == -1 )
+ if ( m_models->findIndex( model ) == -1 )
return false;
kdDebug(8101) << "m_selectedModel (was) = " << m_selectedModel << endl;
- m_modelIndex = m_models->tqfindIndex( model );
+ m_modelIndex = m_models->findIndex( model );
kdDebug(8101) << "m_selectedModel (is) = " << m_selectedModel << endl;
m_selectedModel = model;
}
diff --git a/kompare/libdiff2/komparemodellist.h b/kompare/libdiff2/komparemodellist.h
index 3b7b6bff..f4fb797e 100644
--- a/kompare/libdiff2/komparemodellist.h
+++ b/kompare/libdiff2/komparemodellist.h
@@ -88,11 +88,11 @@ public:
int appliedCount() const;
const DiffModel* modelAt( int i ) const { return *( m_models->at( i ) ); };
- int findModel( DiffModel* model ) const { return m_models->tqfindIndex( model ); };
+ int findModel( DiffModel* model ) const { return m_models->findIndex( model ); };
bool isModified() const;
- int currentModel() const { return m_models->tqfindIndex( m_selectedModel ); };
+ int currentModel() const { return m_models->findIndex( m_selectedModel ); };
int currentDifference() const { return m_selectedModel ? m_selectedModel->findDifference( m_selectedDifference ) : -1; };
const DiffModel* selectedModel() const { return m_selectedModel; };
diff --git a/kompare/libdiff2/parser.cpp b/kompare/libdiff2/parser.cpp
index 67386508..1e3efc8a 100644
--- a/kompare/libdiff2/parser.cpp
+++ b/kompare/libdiff2/parser.cpp
@@ -50,7 +50,7 @@ int Parser::cleanUpCrap( TQStringList& diffLines )
// correcting the advance of the iterator because of the remove
--it;
TQString temp( *it );
- temp.truncate( temp.tqfind( '\n' ) );
+ temp.truncate( temp.find( '\n' ) );
*it = temp;
++nol;
}
diff --git a/kompare/libdiff2/perforceparser.cpp b/kompare/libdiff2/perforceparser.cpp
index 59a2dae2..b0d54157 100644
--- a/kompare/libdiff2/perforceparser.cpp
+++ b/kompare/libdiff2/perforceparser.cpp
@@ -53,22 +53,22 @@ enum Kompare::Format PerforceParser::determineFormat()
while( it != m_diffLines.end() )
{
- if( (*it).tqfind( unifiedRE, 0 ) == 0 )
+ if( (*it).find( unifiedRE, 0 ) == 0 )
{
kdDebug(8101) << "Difflines are from a Unified diff..." << endl;
return Kompare::Unified;
}
- else if( (*it).tqfind( contextRE, 0 ) == 0 )
+ else if( (*it).find( contextRE, 0 ) == 0 )
{
kdDebug(8101) << "Difflines are from a Context diff..." << endl;
return Kompare::Context;
}
- else if( (*it).tqfind( normalRE, 0 ) == 0 )
+ else if( (*it).find( normalRE, 0 ) == 0 )
{
kdDebug(8101) << "Difflines are from a Normal diff..." << endl;
return Kompare::Normal;
}
- else if( (*it).tqfind( rcsRE, 0 ) == 0 )
+ else if( (*it).find( rcsRE, 0 ) == 0 )
{
kdDebug(8101) << "Difflines are from a RCS diff..." << endl;
return Kompare::RCS;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-03 03:16:45 +0000