feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
53bfd5285de2633f560ed5a2c5d5bd42b78a1c99
qt-creator/src/plugins/texteditor/itextmark.h

106 lines
3.2 KiB
C
Raw Normal View History

Adjust license headers Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-02 09:12:39 +02:00
/****************************************************************************
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
**
Incremented year in copyright info Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-07 13:27:11 +01:00
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
Adjust license headers Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-02 09:12:39 +02:00
** Contact: http://www.qt-project.org/legal
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
**
Adjust license headers Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-02 09:12:39 +02:00
** This file is part of Qt Creator.
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
**
Adjust license headers Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-02 09:12:39 +02:00
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
**
** GNU Lesser General Public License Usage
Adjust license headers Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-02 09:12:39 +02:00
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
Adjust license headers Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-02 09:12:39 +02:00
****************************************************************************/
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
#ifndef ITEXTMARK_H
#define ITEXTMARK_H
#include "texteditor_global.h"
#include <QObject>
#include <QIcon>
QT_BEGIN_NAMESPACE
class QPainter;
class QRect;
class QTextBlock;
QT_END_NAMESPACE
namespace TextEditor {
class ITextEditor;
Remove ITextMarkable There was only a single user (TextEditor::DocumentMarker) which in turn was only used in a single place (BaseTextDocument), so merge the ITextMarkable into BaseTextDocument. Change-Id: I1ca8675f9fc22cb56097b843dc5a0fe76875d3e7 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-18 15:29:04 +02:00
class BaseTextDocument;
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
class TEXTEDITOR_EXPORT ITextMark
{
public:
Fix reloading removing all BaseTextMarks It was already broken in 2.4. Task-number: QTCREATORBUG-7110 Change-Id: I24fae889c67ba5436548b7534d7257b6680a8c81 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-30 11:40:31 +02:00
ITextMark(int line)
Remove ITextMarkable There was only a single user (TextEditor::DocumentMarker) which in turn was only used in a single place (BaseTextDocument), so merge the ITextMarkable into BaseTextDocument. Change-Id: I1ca8675f9fc22cb56097b843dc5a0fe76875d3e7 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-18 15:29:04 +02:00
: m_baseTextDocument(0),
Fix reloading removing all BaseTextMarks It was already broken in 2.4. Task-number: QTCREATORBUG-7110 Change-Id: I24fae889c67ba5436548b7534d7257b6680a8c81 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-30 11:40:31 +02:00
m_lineNumber(line),
Make ITextMark::widthFactor() and visible() non virtual Instead make them simple properties of ITextMark The BaseTextMark destructor calls removeMark(this), at which point the virtual functions are already returning a possibly wrong value. Change-Id: Ic5b58dc0bc285a9618f4b9967ecfe941d75883c7 Reviewed-by: hjk <qthjk@ovi.com>
2012-05-02 13:10:14 +02:00
m_priority(NormalPriority),
Reduce padding in often-used structs Reduce the padding in some often-used structs for 64bit machines. 32bit machines should also profit from most changes, but to a lesser degree. Change-Id: Ic4c67b94e962731de4f31164c52a372d78944ccc Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-18 18:47:54 +01:00
m_visible(true),
m_widthFactor(1.0)
Fix reloading removing all BaseTextMarks It was already broken in 2.4. Task-number: QTCREATORBUG-7110 Change-Id: I24fae889c67ba5436548b7534d7257b6680a8c81 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-30 11:40:31 +02:00
{}
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
virtual ~ITextMark();
// determine order on markers on the same line.
enum Priority
{
LowPriority,
NormalPriority,
HighPriority // shown on top.
};
int lineNumber() const;
virtual void paint(QPainter *painter, const QRect &rect) const;
virtual void updateLineNumber(int lineNumber);
virtual void updateBlock(const QTextBlock &block);
Bookmarks: Support manual editing of line number Task-number: QTCREATORBUG-9721 Change-Id: I914568d58857bf897a3894a1d2a6082126e47b62 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-09 17:18:03 +03:00
virtual void move(int line);
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
virtual void removedFromEditor();
TextEditor: adjust ITextMark getters to coding style bool getters should have an 'is' prefix. Change-Id: I6d8b0a680e7985fa454b5e7df1b85ace6da264e6 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-09 14:02:52 +02:00
virtual bool isClickable() const;
Make ITextMark::widthFactor() and visible() non virtual Instead make them simple properties of ITextMark The BaseTextMark destructor calls removeMark(this), at which point the virtual functions are already returning a possibly wrong value. Change-Id: Ic5b58dc0bc285a9618f4b9967ecfe941d75883c7 Reviewed-by: hjk <qthjk@ovi.com>
2012-05-02 13:10:14 +02:00
virtual void clicked();
BaseTextEditor: make ITextMarks draggable Change-Id: I36fd6d49ec99975d059f201aa23db11dd80e4ad6 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-09 22:32:44 +02:00
virtual bool isDraggable() const;
virtual void dragToLine(int lineNumber);
Make ITextMark::widthFactor() and visible() non virtual Instead make them simple properties of ITextMark The BaseTextMark destructor calls removeMark(this), at which point the virtual functions are already returning a possibly wrong value. Change-Id: Ic5b58dc0bc285a9618f4b9967ecfe941d75883c7 Reviewed-by: hjk <qthjk@ovi.com>
2012-05-02 13:10:14 +02:00
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
void setIcon(const QIcon &icon);
Fix reloading removing all BaseTextMarks It was already broken in 2.4. Task-number: QTCREATORBUG-7110 Change-Id: I24fae889c67ba5436548b7534d7257b6680a8c81 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-30 11:40:31 +02:00
// call this if the icon has changed.
void updateMarker();
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
Priority priority() const;
void setPriority(Priority prioriy);
TextEditor: adjust ITextMark getters to coding style bool getters should have an 'is' prefix. Change-Id: I6d8b0a680e7985fa454b5e7df1b85ace6da264e6 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-09 14:02:52 +02:00
bool isVisible() const;
void setVisible(bool isVisible);
Make ITextMark::widthFactor() and visible() non virtual Instead make them simple properties of ITextMark The BaseTextMark destructor calls removeMark(this), at which point the virtual functions are already returning a possibly wrong value. Change-Id: Ic5b58dc0bc285a9618f4b9967ecfe941d75883c7 Reviewed-by: hjk <qthjk@ovi.com>
2012-05-02 13:10:14 +02:00
double widthFactor() const;
void setWidthFactor(double factor);
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
Remove ITextMarkable There was only a single user (TextEditor::DocumentMarker) which in turn was only used in a single place (BaseTextDocument), so merge the ITextMarkable into BaseTextDocument. Change-Id: I1ca8675f9fc22cb56097b843dc5a0fe76875d3e7 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-18 15:29:04 +02:00
BaseTextDocument *baseTextDocument() const;
void setBaseTextDocument(BaseTextDocument *baseTextDocument);
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
private:
Mark ITextMark as non copyable Change-Id: I05807f7222bb2a08ef9e0b281026c6d83b3e9f7e Reviewed-by: hjk <qthjk@ovi.com>
2012-04-18 12:03:50 +02:00
Q_DISABLE_COPY(ITextMark)
Remove ITextMarkable There was only a single user (TextEditor::DocumentMarker) which in turn was only used in a single place (BaseTextDocument), so merge the ITextMarkable into BaseTextDocument. Change-Id: I1ca8675f9fc22cb56097b843dc5a0fe76875d3e7 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-18 15:29:04 +02:00
BaseTextDocument *m_baseTextDocument;
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
int m_lineNumber;
Priority m_priority;
Make ITextMark::widthFactor() and visible() non virtual Instead make them simple properties of ITextMark The BaseTextMark destructor calls removeMark(this), at which point the virtual functions are already returning a possibly wrong value. Change-Id: Ic5b58dc0bc285a9618f4b9967ecfe941d75883c7 Reviewed-by: hjk <qthjk@ovi.com>
2012-05-02 13:10:14 +02:00
bool m_visible;
Reduce padding in often-used structs Reduce the padding in some often-used structs for 64bit machines. 32bit machines should also profit from most changes, but to a lesser degree. Change-Id: Ic4c67b94e962731de4f31164c52a372d78944ccc Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-18 18:47:54 +01:00
QIcon m_icon;
double m_widthFactor;
Fix compilation of QmlJS code formatter test. Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-02-27 20:55:36 +01:00
};
} // namespace TextEditor
#endif // ITEXTMARK_H
Copy Permalink