diff --git a/outputview/filtereditem.h b/outputview/filtereditem.h --- a/outputview/filtereditem.h +++ b/outputview/filtereditem.h @@ -56,7 +56,6 @@ QString originalLine; FilteredOutputItemType type; - QString shortenedText; bool isActivatable; QUrl url; /// lineNo starts with 0 diff --git a/outputview/filtereditem.cpp b/outputview/filtereditem.cpp --- a/outputview/filtereditem.cpp +++ b/outputview/filtereditem.cpp @@ -27,7 +27,6 @@ FilteredItem::FilteredItem( const QString& line ) : originalLine( line ) , type( InvalidItem ) -, shortenedText( line ) , isActivatable(false) , lineNo(-1) , columnNo(-1) @@ -37,7 +36,6 @@ FilteredItem::FilteredItem( const QString& line, FilteredOutputItemType type ) : originalLine( line ) , type( type ) -, shortenedText( line ) , isActivatable(false) , lineNo(-1) , columnNo(-1) diff --git a/outputview/outputfilteringstrategies.cpp b/outputview/outputfilteringstrategies.cpp --- a/outputview/outputfilteringstrategies.cpp +++ b/outputview/outputfilteringstrategies.cpp @@ -194,17 +194,6 @@ const auto match = curActFilter.expression.match(line); if( match.hasMatch() ) { item.type = FilteredItem::ActionItem; - KLocalizedString shortened = curActFilter.label; - if (curActFilter.fileGroup != -1) { - shortened = shortened.subs(match.captured(curActFilter.fileGroup)); - } - if (curActFilter.toolGroup != -1 ) { - shortened = shortened.subs(match.captured(curActFilter.toolGroup)); - } else if (!curActFilter.tool.isEmpty()) { - shortened = shortened.subs(curActFilter.tool); - } - - item.shortenedText = shortened.toString(); if( curActFilter.tool == "cd" ) { const Path path(match.captured(curActFilter.fileGroup)); diff --git a/outputview/outputformats.h b/outputview/outputformats.h --- a/outputview/outputformats.h +++ b/outputview/outputformats.h @@ -27,7 +27,6 @@ KLocalizedString label; QRegularExpression expression; QString tool; - int toolGroup; int fileGroup; }; diff --git a/outputview/outputformats.cpp b/outputview/outputformats.cpp --- a/outputview/outputformats.cpp +++ b/outputview/outputformats.cpp @@ -38,15 +38,13 @@ : label( label ) , expression( regExp ) , tool( _tool ) - , toolGroup(-1) , fileGroup( file ) { } ActionFormat::ActionFormat( const KLocalizedString& label, int tool, int file, const QString& regExp) : label( label ) , expression( regExp ) - , toolGroup( tool ) , fileGroup( file ) { } diff --git a/outputview/outputmodel.cpp b/outputview/outputmodel.cpp --- a/outputview/outputmodel.cpp +++ b/outputview/outputmodel.cpp @@ -250,7 +250,7 @@ switch( role ) { case Qt::DisplayRole: - return d->m_filteredItems.at( idx.row() ).shortenedText; + return d->m_filteredItems.at( idx.row() ).originalLine; break; case OutputModel::OutputItemTypeRole: return static_cast(d->m_filteredItems.at( idx.row() ).type); diff --git a/outputview/tests/test_filteringstrategy.h b/outputview/tests/test_filteringstrategy.h --- a/outputview/tests/test_filteringstrategy.h +++ b/outputview/tests/test_filteringstrategy.h @@ -33,8 +33,6 @@ void testCompilerFilterStrategy(); void testCompilerFilterstrategyMultipleKeywords_data(); void testCompilerFilterstrategyMultipleKeywords(); - void testCompilerFilterStrategyShortenedText(); - void testCompilerFilterStrategyShortenedText_data(); void testCompilerFilterstrategyUrlFromAction_data(); void testCompilerFilterstrategyUrlFromAction(); void testScriptErrorFilterStrategy_data(); diff --git a/outputview/tests/test_filteringstrategy.cpp b/outputview/tests/test_filteringstrategy.cpp --- a/outputview/tests/test_filteringstrategy.cpp +++ b/outputview/tests/test_filteringstrategy.cpp @@ -173,38 +173,6 @@ QCOMPARE(item1.type, expectedAction); } -void TestFilteringStrategy::testCompilerFilterStrategyShortenedText_data() -{ - QTest::addColumn("line"); - QTest::addColumn("expectedShortenedText"); - - QTest::newRow("c++-compile") - << "g++ -c main.cpp -o main.o" << "compiling main.cpp (g++)"; - QTest::newRow("clang++-link") - << "clang++ -c main.cpp -o main.o" << "compiling main.cpp (clang++)"; - // see bug: https://bugs.kde.org/show_bug.cgi?id=240017 - QTest::newRow("mpicc-link") - << "/usr/bin/mpicc -c main.cpp -o main.o" << "compiling main.cpp (mpicc)"; - - QTest::newRow("c++-link") - << "/usr/bin/g++ main.cpp -o main" << "linking main (g++)"; - QTest::newRow("clang++-link") - << "/usr/bin/clang++ main.cpp -o a.out" << "linking a.out (clang++)"; - QTest::newRow("mpicc-link") - << "mpicc main.cpp -o main" << "linking main (mpicc)"; -} - -void TestFilteringStrategy::testCompilerFilterStrategyShortenedText() -{ - QFETCH(QString, line); - QFETCH(QString, expectedShortenedText); - - QUrl projecturl = QUrl::fromLocalFile( projectPath() ); - CompilerFilterStrategy testee(projecturl); - FilteredItem item = testee.actionInLine(line); - QCOMPARE(item.shortenedText, expectedShortenedText); -} - void TestFilteringStrategy::testScriptErrorFilterStrategy_data() { QTest::addColumn("line");