From 22cbf2e1182468daab2cd601cbc894926b47cd65 Mon Sep 17 00:00:00 2001
From: tpearson
" ) ); + l.replace( rx, u8( "\\1
" ) ); rx = TQRegExp( u8( "\\n[ ]*\\.\\n" ) ); - l.tqreplace( rx, u8( "
" ) ); + l.replace( rx, u8( "
" ) ); rx = TQRegExp( u8( "\n " ) ); - l.tqreplace( rx, u8( " " ) ); + l.replace( rx, u8( " " ) ); rx = TQRegExp( u8( "\n - (.*)(\n|$)" ) ); rx.setMinimal( true ); - l.tqreplace( rx, u8( "\n
" ) + l + u8( "
" ); } diff --git a/adept/libadept/dpkgpm.cpp b/adept/libadept/dpkgpm.cpp index c575a70..7756505 100644 --- a/adept/libadept/dpkgpm.cpp +++ b/adept/libadept/dpkgpm.cpp @@ -291,22 +291,22 @@ void DPkgPM::dpkgMonitor () // parse status updates from dpkg while ( true ) { - std::string::size_type colon, nl = b.tqfind( '\n' ); + std::string::size_type colon, nl = b.find( '\n' ); m_statusBuffer.append( string( b, 0, nl ) ); if ( nl == std::string::npos ) break; // cerr << "dpkg status completed line: " << m_statusBuffer << endl; - colon = m_statusBuffer.tqfind( ": " ); + colon = m_statusBuffer.find( ": " ); string l( m_statusBuffer, 0, colon ); string r( m_statusBuffer, colon + 2, string::npos ); if ( l == "status" ) { - colon = r.tqfind( ": " ); + colon = r.find( ": " ); std::string p( r, 0, colon ); r = string( r, colon + 2, string::npos ); - colon = r.tqfind( ": " ); + colon = r.find( ": " ); std::string e( r, 0, colon ); if ( colon == string::npos ) r = ""; @@ -317,7 +317,7 @@ void DPkgPM::dpkgMonitor () b = string( b, nl + 1, string::npos ); m_statusBuffer = string(); - nl = b.tqfind( '\n' ); + nl = b.find( '\n' ); } } } @@ -348,7 +348,7 @@ bool DPkgPM::runScripts (const char *Cnf, bool sP) // Determine the protocol version string OptSec = Opts->Value; string::size_type Pos; - if ((Pos = OptSec.tqfind(' ')) == string::npos || Pos == 0) + if ((Pos = OptSec.find(' ')) == string::npos || Pos == 0) Pos = OptSec.length(); OptSec = "DPkg::Tools::Options::" + string(Opts->Value.c_str(),Pos); diff --git a/adept/libadept/packageinfo.cpp b/adept/libadept/packageinfo.cpp index 9ed85bf..d0f52a9 100644 --- a/adept/libadept/packageinfo.cpp +++ b/adept/libadept/packageinfo.cpp @@ -90,15 +90,15 @@ TQString formatLongDescription( TQString l ) { TQRegExp rx( u8( "^(.*)\n" ) ); rx.setMinimal( true ); - l.tqreplace( rx, u8( "\\1" ) ); + l.replace( rx, u8( "\\1
" ) ); rx = TQRegExp( u8( "\\n[ ]*\\.\\n" ) ); - l.tqreplace( rx, u8( "
" ) ); + l.replace( rx, u8( "
" ) ); rx = TQRegExp( u8( "\n " ) ); - l.tqreplace( rx, u8( " " ) ); + l.replace( rx, u8( " " ) ); rx = TQRegExp( u8( "\n - (.*)(\n|$)" ) ); rx.setMinimal( true ); - l.tqreplace( rx, u8( "\n
" ) + l + u8( "
" ); } diff --git a/adept/tests/tut.h b/adept/tests/tut.h index e068870..dec471a 100644 --- a/adept/tests/tut.h +++ b/adept/tests/tut.h @@ -232,7 +232,7 @@ namespace tut throw std::invalid_argument("group shall be non-null"); } - groups::iterator found = groups_.tqfind(name); + groups::iterator found = groups_.find(name); if( found != groups_.end() ) { std::string msg("attempt to add already existent group "+name); @@ -316,7 +316,7 @@ namespace tut { callback_->run_started(); - const_iterator i = groups_.tqfind(group_name); + const_iterator i = groups_.find(group_name); if( i == groups_.end() ) { throw no_such_group(group_name); @@ -347,7 +347,7 @@ namespace tut { callback_->run_started(); - const_iterator i = groups_.tqfind(group_name); + const_iterator i = groups_.find(group_name); if( i == groups_.end() ) { throw no_such_group(group_name); @@ -724,7 +724,7 @@ namespace tut if( tests_.rbegin()->first < n ) throw beyond_last_test(); // withing scope; check if given test exists - tests_iterator ti = tests_.tqfind(n); + tests_iterator ti = tests_.find(n); if( ti == tests_.end() ) throw no_such_test(); safe_holder