2008-12-02 12:01:29 +01:00
|
|
|
/***************************************************************************
|
|
|
|
|
**
|
|
|
|
|
** This file is part of Qt Creator
|
|
|
|
|
**
|
2009-01-13 19:21:51 +01:00
|
|
|
** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
|
2008-12-02 12:01:29 +01:00
|
|
|
**
|
|
|
|
|
** Contact: Qt Software Information (qt-info@nokia.com)
|
|
|
|
|
**
|
2008-12-02 14:17:16 +01:00
|
|
|
**
|
|
|
|
|
** Non-Open Source Usage
|
|
|
|
|
**
|
2008-12-02 12:01:29 +01:00
|
|
|
** Licensees may use this file in accordance with the Qt Beta Version
|
|
|
|
|
** License Agreement, Agreement version 2.2 provided with the Software or,
|
|
|
|
|
** alternatively, in accordance with the terms contained in a written
|
2008-12-02 14:17:16 +01:00
|
|
|
** agreement between you and Nokia.
|
|
|
|
|
**
|
|
|
|
|
** GNU General Public License Usage
|
|
|
|
|
**
|
2008-12-02 12:01:29 +01:00
|
|
|
** Alternatively, this file may be used under the terms of the GNU General
|
|
|
|
|
** Public License versions 2.0 or 3.0 as published by the Free Software
|
|
|
|
|
** Foundation and appearing in the file LICENSE.GPL included in the packaging
|
|
|
|
|
** of this file. Please review the following information to ensure GNU
|
|
|
|
|
** General Public Licensing requirements will be met:
|
|
|
|
|
**
|
|
|
|
|
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
|
|
|
|
|
** http://www.gnu.org/copyleft/gpl.html.
|
|
|
|
|
**
|
|
|
|
|
** In addition, as a special exception, Nokia gives you certain additional
|
2008-12-02 14:17:16 +01:00
|
|
|
** rights. These rights are described in the Nokia Qt GPL Exception
|
2008-12-16 17:20:00 +01:00
|
|
|
** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
|
2008-12-02 14:17:16 +01:00
|
|
|
**
|
|
|
|
|
***************************************************************************/
|
2008-12-02 16:19:05 +01:00
|
|
|
|
2008-12-02 12:01:29 +01:00
|
|
|
#ifndef DIFFHIGHLIGHTER_H
|
|
|
|
|
#define DIFFHIGHLIGHTER_H
|
|
|
|
|
|
|
|
|
|
#include "vcsbase_global.h"
|
|
|
|
|
|
|
|
|
|
#include <QtGui/QSyntaxHighlighter>
|
|
|
|
|
#include <QtGui/QTextCharFormat>
|
|
|
|
|
#include <QtCore/QVector>
|
|
|
|
|
|
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
|
class QRegExp;
|
|
|
|
|
QT_END_NAMESPACE
|
|
|
|
|
|
|
|
|
|
namespace Core {
|
|
|
|
|
class ICore;
|
|
|
|
|
}
|
|
|
|
|
namespace TextEditor {
|
|
|
|
|
class FontSettingsPage;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
namespace VCSBase {
|
|
|
|
|
|
|
|
|
|
struct DiffHighlighterPrivate;
|
|
|
|
|
|
|
|
|
|
/* A highlighter for diffs. Parametrizable by the file indicator,
|
|
|
|
|
* which is for example '^====' in case of p4:
|
|
|
|
|
* \code
|
|
|
|
|
==== //depot/research/main/qdynamicmainwindow3/qdynamicdockwidgetlayout_p.h#34 (text) ====
|
|
|
|
|
* \endcode
|
|
|
|
|
* Or '--- a/|'+++ b/' in case of git:
|
|
|
|
|
* \code
|
|
|
|
|
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
|
|
|
|
|
index 9401ee7..ef35c3b 100644
|
|
|
|
|
--- a/src/plugins/plugins.pro
|
|
|
|
|
+++ b/src/plugins/plugins.pro
|
|
|
|
|
@@ -10,6 +10,7 @@ SUBDIRS = plugin_coreplugin \
|
|
|
|
|
* \endcode
|
|
|
|
|
* */
|
|
|
|
|
|
|
|
|
|
class VCSBASE_EXPORT DiffHighlighter : public QSyntaxHighlighter
|
|
|
|
|
{
|
|
|
|
|
Q_OBJECT
|
|
|
|
|
public:
|
|
|
|
|
explicit DiffHighlighter(const QRegExp &filePattern,
|
|
|
|
|
QTextDocument *document = 0);
|
|
|
|
|
virtual ~DiffHighlighter();
|
|
|
|
|
|
|
|
|
|
virtual void highlightBlock(const QString &text);
|
|
|
|
|
|
|
|
|
|
// Set formats from a sequence of type QTextCharFormat
|
|
|
|
|
void setFormats(const QVector<QTextCharFormat> &s);
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
DiffHighlighterPrivate *m_d;
|
|
|
|
|
};
|
|
|
|
|
|
2008-12-02 16:19:05 +01:00
|
|
|
} // namespace VCSBase
|
2008-12-02 12:01:29 +01:00
|
|
|
|
|
|
|
|
#endif // DIFFHIGHLIGHTER_H
|