Changeset View
Changeset View
Standalone View
Standalone View
src/utils/kateconfig.h
Show First 20 Lines • Show All 565 Lines • ▼ Show 20 Line(s) | 436 | public: | |||
---|---|---|---|---|---|
566 | void setFoldFirstLine(bool on); | 566 | void setFoldFirstLine(bool on); | ||
567 | 567 | | |||
568 | bool showWordCount(); | 568 | bool showWordCount(); | ||
569 | void setShowWordCount(bool on); | 569 | void setShowWordCount(bool on); | ||
570 | 570 | | |||
571 | bool autoBrackets() const; | 571 | bool autoBrackets() const; | ||
572 | void setAutoBrackets(bool on); | 572 | void setAutoBrackets(bool on); | ||
573 | 573 | | |||
574 | bool backspaceRemoveComposed() const; | ||||
575 | void setBackspaceRemoveComposed(bool on); | ||||
576 | | ||||
574 | private: | 577 | private: | ||
575 | bool m_dynWordWrap; | 578 | bool m_dynWordWrap; | ||
576 | int m_dynWordWrapIndicators; | 579 | int m_dynWordWrapIndicators; | ||
577 | int m_dynWordWrapAlignIndent; | 580 | int m_dynWordWrapAlignIndent; | ||
578 | bool m_lineNumbers; | 581 | bool m_lineNumbers; | ||
579 | bool m_scrollBarMarks; | 582 | bool m_scrollBarMarks; | ||
580 | bool m_scrollBarPreview; | 583 | bool m_scrollBarPreview; | ||
581 | bool m_scrollBarMiniMap; | 584 | bool m_scrollBarMiniMap; | ||
Show All 17 Lines | |||||
599 | bool m_wordCompletion; | 602 | bool m_wordCompletion; | ||
600 | bool m_keywordCompletion; | 603 | bool m_keywordCompletion; | ||
601 | int m_wordCompletionMinimalWordLength; | 604 | int m_wordCompletionMinimalWordLength; | ||
602 | bool m_wordCompletionRemoveTail; | 605 | bool m_wordCompletionRemoveTail; | ||
603 | bool m_smartCopyCut; | 606 | bool m_smartCopyCut; | ||
604 | bool m_scrollPastEnd; | 607 | bool m_scrollPastEnd; | ||
605 | bool m_foldFirstLine; | 608 | bool m_foldFirstLine; | ||
606 | bool m_showWordCount; | 609 | bool m_showWordCount; | ||
607 | bool m_autoBrackets; | 610 | bool m_autoBrackets; | ||
dhaumann: After this line you should add bool m_backspaceRemoveComposed; | |||||
608 | 611 | | |||
609 | bool m_dynWordWrapSet : 1; | 612 | bool m_dynWordWrapSet : 1; | ||
610 | bool m_dynWordWrapIndicatorsSet : 1; | 613 | bool m_dynWordWrapIndicatorsSet : 1; | ||
611 | bool m_dynWordWrapAlignIndentSet : 1; | 614 | bool m_dynWordWrapAlignIndentSet : 1; | ||
612 | bool m_lineNumbersSet : 1; | 615 | bool m_lineNumbersSet : 1; | ||
613 | bool m_scrollBarMarksSet : 1; | 616 | bool m_scrollBarMarksSet : 1; | ||
614 | bool m_scrollBarPreviewSet : 1; | 617 | bool m_scrollBarPreviewSet : 1; | ||
615 | bool m_scrollBarMiniMapSet : 1; | 618 | bool m_scrollBarMiniMapSet : 1; | ||
Show All 17 Lines | |||||
633 | bool m_keywordCompletionSet : 1; | 636 | bool m_keywordCompletionSet : 1; | ||
634 | bool m_wordCompletionMinimalWordLengthSet : 1; | 637 | bool m_wordCompletionMinimalWordLengthSet : 1; | ||
635 | bool m_smartCopyCutSet : 1; | 638 | bool m_smartCopyCutSet : 1; | ||
636 | bool m_scrollPastEndSet : 1; | 639 | bool m_scrollPastEndSet : 1; | ||
637 | bool m_allowMarkMenu : 1; | 640 | bool m_allowMarkMenu : 1; | ||
638 | bool m_wordCompletionRemoveTailSet : 1; | 641 | bool m_wordCompletionRemoveTailSet : 1; | ||
639 | bool m_foldFirstLineSet : 1; | 642 | bool m_foldFirstLineSet : 1; | ||
640 | bool m_autoBracketsSet : 1; | 643 | bool m_autoBracketsSet : 1; | ||
644 | bool m_backspaceRemoveComposed : 1; | ||||
You need two flags: one m_backspaceRemoveComposedSet flat that knows whether this option is set for an individual view, and another one called m_backspaceRemoveComposed for the actual config value. Just look at how this is e.g. done for m_autoCenterlinesSet and m_autoCenterlines. dhaumann: You need two flags: one m_backspaceRemoveComposedSet flat that knows whether this option is set… | |||||
641 | 645 | | |||
642 | private: | 646 | private: | ||
643 | static KateViewConfig *s_global; | 647 | static KateViewConfig *s_global; | ||
644 | KTextEditor::ViewPrivate *m_view; | 648 | KTextEditor::ViewPrivate *m_view; | ||
645 | }; | 649 | }; | ||
646 | 650 | | |||
647 | class KTEXTEDITOR_EXPORT KateRendererConfig : public KateConfig | 651 | class KTEXTEDITOR_EXPORT KateRendererConfig : public KateConfig | ||
648 | { | 652 | { | ||
▲ Show 20 Lines • Show All 201 Lines • Show Last 20 Lines |
After this line you should add bool m_backspaceRemoveComposed;