diff options
Diffstat (limited to 'parts/outputviews/makeactionfilter.cpp')
| -rw-r--r-- | parts/outputviews/makeactionfilter.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp index bbcc61fb..4edaae2b 100644 --- a/parts/outputviews/makeactionfilter.cpp +++ b/parts/outputviews/makeactionfilter.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <qdatetime.h> +#include <tqdatetime.h> #include <kdebug.h> #include "makeactionfilter.h" @@ -20,7 +20,7 @@ //#define DEBUG -MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, const QString& _tool, const char * regExp, int file ) +MakeActionFilter::ActionFormat::ActionFormat( const TQString& _action, const TQString& _tool, const char * regExp, int file ) : m_action( _action ) , m_expression( regExp ) , m_tool( _tool ) @@ -29,7 +29,7 @@ MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, const QStr { } -MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, int tool, int file, const char * regExp) +MakeActionFilter::ActionFormat::ActionFormat( const TQString& _action, int tool, int file, const char * regExp) : m_action( _action ) , m_expression( regExp ) , m_tool() @@ -38,19 +38,19 @@ MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, int tool, { } -QString MakeActionFilter::ActionFormat::tool() +TQString MakeActionFilter::ActionFormat::tool() { if (m_toolGroup==-1) return m_tool; return m_expression.cap(m_toolGroup); } -QString MakeActionFilter::ActionFormat::file() +TQString MakeActionFilter::ActionFormat::file() { return m_expression.cap(m_fileGroup); } -bool MakeActionFilter::ActionFormat::matches(const QString& line) +bool MakeActionFilter::ActionFormat::matches(const TQString& line) { return ( m_expression.search( line ) != -1 ); } @@ -96,13 +96,13 @@ MakeActionFilter::ActionFormat* MakeActionFilter::actionFormats() ActionFormat( i18n("compiling"), "dcopidl2cpp", "dcopidl2cpp (?:\\S* )*([^\\s;]+)", 1 ), ActionFormat( i18n("installing"), 1, 1, "-- Installing (.*)" ), //cmake - ActionFormat( QString::null, QString::null, 0, 0 ) + ActionFormat( TQString::null, TQString::null, 0, 0 ) }; return formats; } -void MakeActionFilter::processLine( const QString& line ) +void MakeActionFilter::processLine( const TQString& line ) { ActionItem* actionItem = matchLine( line ); if ( actionItem != NULL ) @@ -115,10 +115,10 @@ void MakeActionFilter::processLine( const QString& line ) } } -ActionItem* MakeActionFilter::matchLine( const QString& line ) +ActionItem* MakeActionFilter::matchLine( const TQString& line ) { #ifdef DEBUG - QTime t; + TQTime t; t.start(); #endif /// \FIXME This is very slow, possibly due to the regexr matching. It can take @@ -148,23 +148,23 @@ ActionItem* MakeActionFilter::matchLine( const QString& line ) struct TestItem { TestItem() {} - TestItem( const QString& _line, const QString& _action, const QString& _tool, const QString& _file ) + TestItem( const TQString& _line, const TQString& _action, const TQString& _tool, const TQString& _file ) : line( _line ) , action( _action ) , tool( _tool ) , file( _file ) {} - QString line; - QString action; - QString tool; - QString file; + TQString line; + TQString action; + TQString tool; + TQString file; }; #ifdef DEBUG void MakeActionFilter::test() { - static QValueList<TestItem> testItems = QValueList<TestItem>() + static TQValueList<TestItem> testItems = TQValueList<TestItem>() << TestItem( // simple qmake compile "g++ -c -pipe -Wall -W -O2 -DQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. " @@ -282,7 +282,7 @@ void MakeActionFilter::test() "compiling", "g++", "quanta_init.cpp") ; - QValueList<TestItem>::const_iterator it = testItems.begin(); + TQValueList<TestItem>::const_iterator it = testItems.begin(); for( ; it != testItems.end(); ++it ) { ActionItem* actionItem = matchLine( (*it).line ); |