diff options
Diffstat (limited to 'kompare/libdiff2/kompareprocess.cpp')
| -rw-r--r-- | kompare/libdiff2/kompareprocess.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/kompare/libdiff2/kompareprocess.cpp b/kompare/libdiff2/kompareprocess.cpp index 2d5eac00..db165ae5 100644 --- a/kompare/libdiff2/kompareprocess.cpp +++ b/kompare/libdiff2/kompareprocess.cpp @@ -19,9 +19,9 @@ ** ***************************************************************************/ -#include <qdir.h> -#include <qstringlist.h> -#include <qtextcodec.h> +#include <tqdir.h> +#include <tqstringlist.h> +#include <tqtextcodec.h> #include <kcharsets.h> #include <kdebug.h> @@ -30,7 +30,7 @@ #include "diffsettings.h" #include "kompareprocess.h" -KompareProcess::KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMode mode, QString source, QString destination, QString dir ) +KompareProcess::KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMode mode, TQString source, TQString destination, TQString dir ) : KProcess(), m_diffSettings( diffSettings ), m_mode( mode ), @@ -39,14 +39,14 @@ KompareProcess::KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMo setUseShell( true ); // connect the stdout and stderr signals - connect( this, SIGNAL( receivedStdout( KProcess*, char*, int ) ), - SLOT ( slotReceivedStdout( KProcess*, char*, int ) ) ); - connect( this, SIGNAL( receivedStderr( KProcess*, char*, int ) ), - SLOT ( slotReceivedStderr( KProcess*, char*, int ) ) ); + connect( this, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), + TQT_SLOT ( slotReceivedStdout( KProcess*, char*, int ) ) ); + connect( this, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), + TQT_SLOT ( slotReceivedStderr( KProcess*, char*, int ) ) ); // connect the signal that indicates that the proces has exited - connect( this, SIGNAL( processExited( KProcess* ) ), - SLOT ( slotProcessExited( KProcess* ) ) ); + connect( this, TQT_SIGNAL( processExited( KProcess* ) ), + TQT_SLOT ( slotProcessExited( KProcess* ) ) ); *this << "LANG=C"; @@ -61,7 +61,7 @@ KompareProcess::KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMo } if( !dir.isEmpty() ) { - QDir::setCurrent( dir ); + TQDir::setCurrent( dir ); } // Write file names @@ -81,7 +81,7 @@ void KompareProcess::writeDefaultCommandLine() *this << m_diffSettings->m_diffProgram << "-dr"; } - *this << "-U" << QString::number( m_diffSettings->m_linesOfContext ); + *this << "-U" << TQString::number( m_diffSettings->m_linesOfContext ); } void KompareProcess::writeCommandLine() @@ -100,10 +100,10 @@ void KompareProcess::writeCommandLine() switch( m_diffSettings->m_format ) { case Kompare::Unified : - *this << "-U" << QString::number( m_diffSettings->m_linesOfContext ); + *this << "-U" << TQString::number( m_diffSettings->m_linesOfContext ); break; case Kompare::Context : - *this << "-C" << QString::number( m_diffSettings->m_linesOfContext ); + *this << "-C" << TQString::number( m_diffSettings->m_linesOfContext ); break; case Kompare::RCS : *this << "-n"; @@ -188,8 +188,8 @@ void KompareProcess::writeCommandLine() if ( m_diffSettings->m_excludeFilePattern ) { - QStringList::ConstIterator it = m_diffSettings->m_excludeFilePatternList.begin(); - QStringList::ConstIterator end = m_diffSettings->m_excludeFilePatternList.end(); + TQStringList::ConstIterator it = m_diffSettings->m_excludeFilePatternList.begin(); + TQStringList::ConstIterator end = m_diffSettings->m_excludeFilePatternList.end(); for ( ; it != end; ++it ) { *this << "-x" << KProcess::quote( *it ); @@ -206,21 +206,21 @@ KompareProcess::~KompareProcess() { } -void KompareProcess::setEncoding( const QString& encoding ) +void KompareProcess::setEncoding( const TQString& encoding ) { if ( encoding.lower() == "default" ) { - m_textDecoder = QTextCodec::codecForLocale()->makeDecoder(); + m_textDecoder = TQTextCodec::codecForLocale()->makeDecoder(); } else { - QTextCodec* textCodec = KGlobal::charsets()->codecForName( encoding.latin1() ); + TQTextCodec* textCodec = KGlobal::charsets()->codecForName( encoding.latin1() ); if ( textCodec ) m_textDecoder = textCodec->makeDecoder(); else { kdDebug(8101) << "Using locale codec as backup..." << endl; - textCodec = QTextCodec::codecForLocale(); + textCodec = TQTextCodec::codecForLocale(); m_textDecoder = textCodec->makeDecoder(); } } @@ -247,8 +247,8 @@ void KompareProcess::slotReceivedStderr( KProcess* /* process */, char* buffer, bool KompareProcess::start() { #ifndef NDEBUG - QString cmdLine; - QValueList<QCString>::ConstIterator it = arguments.begin(); + TQString cmdLine; + TQValueList<TQCString>::ConstIterator it = arguments.begin(); for (; it != arguments.end(); ++it ) cmdLine += "\"" + (*it) + "\" "; kdDebug(8101) << cmdLine << endl; |