Rename a number of old tq methods that are no longer tq specific

1 files changed, 14 insertions, 14 deletions

diff --git a/src/diff.cpp b/src/diff.cpp
index 136275c..28dfb4a 100644
--- a/src/diff.cpp
+++ b/src/diff.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <tqfileinfo.h>
 #include <tqdir.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <map>
 #include <assert.h>
@@ -492,7 +492,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
             KMessageBox::error(m_pOptionDialog, 
                i18n("Preprocessing possibly failed. Check this command:\n\n  %1"
                   "\n\nThe preprocessing command will be disabled now."
-               ).tqarg(cmd) );
+               ).arg(cmd) );
             m_pOptionDialog->m_PreProcessorCmd = "";
             m_normalData.readFile( fileNameIn1 );
             pEncoding1 = m_pEncoding;
@@ -527,7 +527,7 @@ void SourceData::readAndPreprocess( TQTextCodec* pEncoding, bool bAutoDetectUnic
             KMessageBox::error(m_pOptionDialog, 
                i18n("The line-matching-preprocessing possibly failed. Check this command:\n\n  %1"
                     "\n\nThe line-matching-preprocessing command will be disabled now."
-                   ).tqarg(cmd) );
+                   ).arg(cmd) );
             m_pOptionDialog->m_LineMatchingPreProcessorCmd = "";
             m_lmppData.readFile( fileNameIn2 );
          }
@@ -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;
@@ -1190,7 +1190,7 @@ void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManua
    if ( pManualDiffHelpList->empty() )
       return;
 
-   // If a line appears unaligned in comparison to the manual tqalignment, correct this.
+   // If a line appears unaligned in comparison to the manual alignment, correct this.
 
    ManualDiffHelpList::iterator iMDHL;
    for( iMDHL =  pManualDiffHelpList->begin(); iMDHL != pManualDiffHelpList->end(); ++iMDHL )
@@ -1228,7 +1228,7 @@ void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManua
 
       if (wi>=1 && wi <= 3)
       {
-         // Found manual tqalignment for one source
+         // Found manual alignment for one source
          Diff3LineList::iterator iDest = i3;
 
          // Move lines up until the next firstLine is found. Omit wi from move and search.