summaryrefslogtreecommitdiffstats
path: root/src/diff.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/diff.cpp')
-rw-r--r--src/diff.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/diff.cpp b/src/diff.cpp
index 722950f..feb1373 100644
--- a/src/diff.cpp
+++ b/src/diff.cpp
@@ -557,7 +557,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
m_lmppData.m_v.resize( m_normalData.m_vSize );
for(int i=m_lmppData.m_vSize; i<m_normalData.m_vSize; ++i )
{ // Set all empty lines to point to the end of the buffer.
- m_lmppData.m_v[i].pLine = m_lmppData.m_tqunicodeBuf.tqunicode()+m_lmppData.m_tqunicodeBuf.length();
+ m_lmppData.m_v[i].pLine = m_lmppData.m_unicodeBuf.unicode()+m_lmppData.m_unicodeBuf.length();
}
m_lmppData.m_vSize = m_normalData.m_vSize;
@@ -567,8 +567,8 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
if ( m_pOptionDialog->m_bIgnoreCase )
{
int i;
- TQChar* pBuf = const_cast<TQChar*>(m_lmppData.m_tqunicodeBuf.tqunicode());
- int ucSize = m_lmppData.m_tqunicodeBuf.length();
+ TQChar* pBuf = const_cast<TQChar*>(m_lmppData.m_unicodeBuf.unicode());
+ int ucSize = m_lmppData.m_unicodeBuf.length();
for(i=0; i<ucSize; ++i)
{
pBuf[i] = pBuf[i].upper();
@@ -604,7 +604,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
/** Prepare the linedata vector for every input line.*/
void SourceData::FileData::preprocess( bool bPreserveCR, TQTextCodec* pEncoding )
{
- //m_tqunicodeBuf = decodeString( m_pBuf, m_size, eEncoding );
+ //m_unicodeBuf = decodeString( m_pBuf, m_size, eEncoding );
long skipBytes = 0;
TQTextCodec* pCodec = ::detectEncoding( m_pBuf, m_size, skipBytes );
@@ -616,11 +616,11 @@ void SourceData::FileData::preprocess( bool bPreserveCR, TQTextCodec* pEncoding
TQTextStream ts( ba, IO_ReadOnly );
ts.setCodec( pEncoding);
//ts.setAutoDetectUnicode( false );
- m_tqunicodeBuf = ts.read();
+ m_unicodeBuf = ts.read();
ba.resetRawData( m_pBuf+skipBytes, m_size-skipBytes );
- int ucSize = m_tqunicodeBuf.length();
- const TQChar* p = m_tqunicodeBuf.tqunicode();
+ int ucSize = m_unicodeBuf.length();
+ const TQChar* p = m_unicodeBuf.unicode();
m_bIsText = true;
int lines = 1;
@@ -770,9 +770,9 @@ static void checkLineForComments(
void SourceData::FileData::removeComments()
{
int line=0;
- TQChar* p = const_cast<TQChar*>(m_tqunicodeBuf.tqunicode());
+ TQChar* p = const_cast<TQChar*>(m_unicodeBuf.unicode());
bool bWithinComment=false;
- int size = m_tqunicodeBuf.length();
+ int size = m_unicodeBuf.length();
for(int i=0; i<size; ++i )
{
// std::cout << "2 " << std::string(&p[i], m_v[line].size) << std::endl;