forked from qt-creator/qt-creator
Context cleanup
Change-Id: I5e228acda32e8924d6a9bed13ea34182fff1dbb1 Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
@@ -73,11 +73,6 @@ Core::IEditor *CMakeEditor::duplicate(QWidget *parent)
|
|||||||
return ret->editor();
|
return ret->editor();
|
||||||
}
|
}
|
||||||
|
|
||||||
Core::Context CMakeEditor::context() const
|
|
||||||
{
|
|
||||||
return Core::Context(Constants::C_CMAKEEDITOR);
|
|
||||||
}
|
|
||||||
|
|
||||||
Core::Id CMakeEditor::id() const
|
Core::Id CMakeEditor::id() const
|
||||||
{
|
{
|
||||||
return CMakeProjectManager::Constants::CMAKE_EDITOR_ID;
|
return CMakeProjectManager::Constants::CMAKE_EDITOR_ID;
|
||||||
|
@@ -58,7 +58,6 @@ public:
|
|||||||
|
|
||||||
bool duplicateSupported() const { return true; }
|
bool duplicateSupported() const { return true; }
|
||||||
Core::IEditor *duplicate(QWidget *parent);
|
Core::IEditor *duplicate(QWidget *parent);
|
||||||
Core::Context context() const;
|
|
||||||
Core::Id id() const;
|
Core::Id id() const;
|
||||||
bool isTemporary() const { return false; }
|
bool isTemporary() const { return false; }
|
||||||
|
|
||||||
|
@@ -75,7 +75,7 @@ class CORE_EXPORT IContext : public QObject
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
IContext(QObject *parent = 0) : QObject(parent), m_widget(0) {}
|
IContext(QObject *parent = 0) : QObject(parent) {}
|
||||||
|
|
||||||
virtual Context context() const { return m_context; }
|
virtual Context context() const { return m_context; }
|
||||||
virtual QWidget *widget() const { return m_widget; }
|
virtual QWidget *widget() const { return m_widget; }
|
||||||
|
@@ -634,7 +634,6 @@ public:
|
|||||||
|
|
||||||
inline ITextMarkable *markableInterface() { return e->markableInterface(); }
|
inline ITextMarkable *markableInterface() { return e->markableInterface(); }
|
||||||
|
|
||||||
void setContextHelpId(const QString &id) { m_contextHelpId = id; }
|
|
||||||
QString contextHelpId() const; // from IContext
|
QString contextHelpId() const; // from IContext
|
||||||
|
|
||||||
inline void setTextCodec(QTextCodec *codec, TextCodecReason = TextCodecOtherReason) { e->setTextCodec(codec); }
|
inline void setTextCodec(QTextCodec *codec, TextCodecReason = TextCodecOtherReason) { e->setTextCodec(codec); }
|
||||||
@@ -653,7 +652,6 @@ private slots:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
BaseTextEditorWidget *e;
|
BaseTextEditorWidget *e;
|
||||||
mutable QString m_contextHelpId;
|
|
||||||
QToolBar *m_toolBar;
|
QToolBar *m_toolBar;
|
||||||
QWidget *m_stretchWidget;
|
QWidget *m_stretchWidget;
|
||||||
QAction *m_cursorPositionLabelAction;
|
QAction *m_cursorPositionLabelAction;
|
||||||
|
@@ -92,8 +92,6 @@ public:
|
|||||||
|
|
||||||
virtual ITextMarkable *markableInterface() = 0;
|
virtual ITextMarkable *markableInterface() = 0;
|
||||||
|
|
||||||
virtual void setContextHelpId(const QString &) = 0;
|
|
||||||
|
|
||||||
enum TextCodecReason {
|
enum TextCodecReason {
|
||||||
TextCodecOtherReason,
|
TextCodecOtherReason,
|
||||||
TextCodecFromSystemSetting,
|
TextCodecFromSystemSetting,
|
||||||
|
Reference in New Issue
Block a user