Index: trunk/KDE/kdevelop/plugins/builders/makebuilder/makeoutputmodel.cpp
===================================================================
--- trunk/KDE/kdevelop/plugins/builders/makebuilder/makeoutputmodel.cpp	(revision 910041)
+++ trunk/KDE/kdevelop/plugins/builders/makebuilder/makeoutputmodel.cpp	(revision 910042)
@@ -1,237 +1,239 @@
 /***************************************************************************
  *   This file is part of KDevelop                                         *
  *   Copyright 2007 Andreas Pakulat <apaku@gmx.de>                     *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU Library General Public License as       *
  *   published by the Free Software Foundation; either version 2 of the    *
  *   License, or (at your option) any later version.                       *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU Library General Public     *
  *   License along with this program; if not, write to the                 *
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "makeoutputmodel.h"
 
 #include <QFileInfo>
 
 #include <ktexteditor/cursor.h>
 #include <kurl.h>
 #include <kdebug.h>
 
 #include <interfaces/icore.h>
 #include <interfaces/idocumentcontroller.h>
 
 #include "outputfilters.h"
 
 class FilteredItem
 {
     public:
         FilteredItem( const QString& line )
             : originalLine( line ), 
               type( QVariant::fromValue( MakeOutputModel::StandardItem ) ),
               shortenedText( line ), isActivatable(false), lineNo(-1) { kDebug() << "created item with type:" << type << type.value<MakeOutputModel::OutputItemType>(); }
         QString originalLine;
         QVariant type;
         QString shortenedText;
         bool isActivatable;
         KUrl url;
         int lineNo;
 };
 
 const int MakeOutputModel::MakeItemTypeRole = Qt::UserRole + 1;
 
 MakeOutputModel::MakeOutputModel( QObject* parent )
     : QAbstractListModel(parent)
 {
 }
 
 QVariant MakeOutputModel::data( const QModelIndex& idx, int role ) const
 {
     if( isValidIndex(idx) )
     {
         switch( role )
         {
             case Qt::DisplayRole:
                 return items.at( idx.row() ).shortenedText;
                 break;
             case MakeOutputModel::MakeItemTypeRole:
                 return items.at( idx.row() ).type;
                 break;
             default:
                 break;
         }
     }
     return QVariant();
 }
 
 int MakeOutputModel::rowCount( const QModelIndex& parent ) const
 {
     if( !parent.isValid() )
         return items.count();
     return 0;
 }
 
 QVariant MakeOutputModel::headerData( int, Qt::Orientation, int ) const
 {
     return QVariant();
 }
 
 bool MakeOutputModel::isValidIndex( const QModelIndex& idx ) const
 {
     return ( idx.isValid() && idx.row() >= 0 && idx.row() < rowCount() && idx.column() == 0 );
 }
 
 void MakeOutputModel::activate( const QModelIndex& index )
 {
     if( index.model() != this || !isValidIndex(index) )
     {
         kDebug(9037) << "not my model, returning";
         return;
     }
     kDebug(9037) << "Model activated" << index.row();
 
 
     FilteredItem item = items.at( index.row() );
     if( item.isActivatable )
     {
         KTextEditor::Cursor range( item.lineNo, 0);
         KDevelop::IDocumentController *docCtrl = KDevelop::ICore::self()->documentController();
         docCtrl->openDocument( item.url, range );
     }
 }
 
 QModelIndex MakeOutputModel::nextHighlightIndex( const QModelIndex &currentIdx )
 {
     int startrow = 0;
     if( isValidIndex(currentIdx) )
     {
         startrow = currentIdx.row();
     }
     int currow = startrow + 1;
     int rows = rowCount();
     while( currow != startrow )
     {
         if( currow == rows )
         {
             currow = 0;
         }
         if( items.at( currow ).isActivatable )
         {
             return index( currow, 0, QModelIndex() );
         }
         currow++;
     }
     return QModelIndex();
 }
 
 QModelIndex MakeOutputModel::previousHighlightIndex( const QModelIndex &currentIdx )
 {
 
     int startrow = 0;
-    if( isValidIndex(currentIdx) )
+    if( !isValidIndex(currentIdx) )
     {
         startrow = rowCount() - 1;
+    }else{
+        startrow = currentIdx.row();
     }
     int currow = startrow - 1;
     while( currow != startrow )
     {
         if( currow < 0 )
         {
             currow = rowCount() - 1;
         }
         if( items.at( currow ).isActivatable )
         {
             return index( currow, 0, QModelIndex() );
         }
         currow--;
     }
     return QModelIndex();
 }
 
 KUrl MakeOutputModel::urlForFile( const QString& filename ) const
 {
     QFileInfo fi(filename);
     KUrl u;
     if( fi.isRelative() )
     {
         u = KUrl( currentDir );
         u.addPath( filename );
     } else 
     {
         u = KUrl( filename );
     }
     return u;
 }
 
 void MakeOutputModel::addLines( const QStringList& lines )
 {
     if( lines.isEmpty() )
         return;
     beginInsertRows( QModelIndex(), rowCount(), rowCount() + lines.count() - 1 );
     foreach( const QString& line, lines )
     {
 
         FilteredItem item( line );
         bool matched = false;
         foreach( const ErrorFormat& errFormat, ErrorFormat::errorFormats )
         {
             QRegExp regEx = errFormat.expression;
             
             ///@todo What about other languages?
             QRegExp warningRegExp("(warnung\\:)|(warning)");
             warningRegExp.setCaseSensitivity(Qt::CaseInsensitive);
             
             if( regEx.indexIn( line ) != -1 && !( line.contains( "Each undeclared identifier is reported only once" ) || line.contains( "for each function it appears in." ) ) )
             {
 //                 kDebug() << "found an error:" << line;
                 item.url = urlForFile( regEx.cap( errFormat.fileGroup ) );
                 item.lineNo = regEx.cap( errFormat.lineGroup ).toInt() - 1;
                 //item.shortenedText = regEx.cap( errFormat.textGroup );
                 item.type = QVariant::fromValue( ( regEx.cap(3).contains(warningRegExp) ? MakeOutputModel::WarningItem : MakeOutputModel::ErrorItem ) );
                 item.isActivatable = true;
                 matched = true;
                 break;
             }
         }
         if( !matched )
         {
             foreach( const ActionFormat& actFormat, ActionFormat::actionFormats )
             {
                 QRegExp regEx = actFormat.expression;
                 if( regEx.indexIn( line ) != -1 )
                 {
                     kDebug() << "found an action" << line << actFormat.tool << actFormat.toolGroup << actFormat.fileGroup;
                     item.type = QVariant::fromValue( MakeOutputModel::ActionItem );
                     if( actFormat.fileGroup != -1 && actFormat.toolGroup != -1 )
                     {
                         item.shortenedText = QString( "%1 %2 (%3)").arg( actFormat.action ).arg( regEx.cap( actFormat.fileGroup ) ).arg( regEx.cap( actFormat.toolGroup ) );
                     }
                     if( actFormat.action == "cd" )
                     {
                         currentDir = regEx.cap( actFormat.fileGroup );
                     }
                     matched = true;
                     break;
                 }
             }
         }
         kDebug() << "adding item:" << item.shortenedText << item.type;
         items << item;
     }
     endInsertRows();
 }
 
 void MakeOutputModel::addLine( const QString& l )
 {
     addLines( QStringList() << l );
 }
 
 #include "makeoutputmodel.moc"