Changeset View
Changeset View
Standalone View
Standalone View
src/utils/kateconfig.h
Show First 20 Lines • Show All 569 Lines • ▼ Show 20 Line(s) | 440 | public: | |||
---|---|---|---|---|---|
570 | void setFoldFirstLine(bool on); | 570 | void setFoldFirstLine(bool on); | ||
571 | 571 | | |||
572 | bool showWordCount(); | 572 | bool showWordCount(); | ||
573 | void setShowWordCount(bool on); | 573 | void setShowWordCount(bool on); | ||
574 | 574 | | |||
575 | bool autoBrackets() const; | 575 | bool autoBrackets() const; | ||
576 | void setAutoBrackets(bool on); | 576 | void setAutoBrackets(bool on); | ||
577 | 577 | | |||
578 | bool backspaceRemoveComposed() const; | ||||
579 | void setBackspaceRemoveComposed(bool on); | ||||
580 | | ||||
578 | private: | 581 | private: | ||
579 | bool m_dynWordWrap; | 582 | bool m_dynWordWrap; | ||
580 | int m_dynWordWrapIndicators; | 583 | int m_dynWordWrapIndicators; | ||
581 | int m_dynWordWrapAlignIndent; | 584 | int m_dynWordWrapAlignIndent; | ||
582 | bool m_lineNumbers; | 585 | bool m_lineNumbers; | ||
583 | bool m_scrollBarMarks; | 586 | bool m_scrollBarMarks; | ||
584 | bool m_scrollBarPreview; | 587 | bool m_scrollBarPreview; | ||
585 | bool m_scrollBarMiniMap; | 588 | bool m_scrollBarMiniMap; | ||
Show All 17 Lines | |||||
603 | bool m_wordCompletion; | 606 | bool m_wordCompletion; | ||
604 | bool m_keywordCompletion; | 607 | bool m_keywordCompletion; | ||
605 | int m_wordCompletionMinimalWordLength; | 608 | int m_wordCompletionMinimalWordLength; | ||
606 | bool m_wordCompletionRemoveTail; | 609 | bool m_wordCompletionRemoveTail; | ||
607 | bool m_smartCopyCut; | 610 | bool m_smartCopyCut; | ||
608 | bool m_scrollPastEnd; | 611 | bool m_scrollPastEnd; | ||
609 | bool m_foldFirstLine; | 612 | bool m_foldFirstLine; | ||
610 | bool m_showWordCount; | 613 | bool m_showWordCount; | ||
611 | bool m_autoBrackets; | 614 | bool m_autoBrackets; | ||
615 | bool m_backspaceRemoveComposed; | ||||
dhaumann: After this line you should add bool m_backspaceRemoveComposed; | |||||
612 | 616 | | |||
613 | bool m_dynWordWrapSet : 1; | 617 | bool m_dynWordWrapSet : 1; | ||
614 | bool m_dynWordWrapIndicatorsSet : 1; | 618 | bool m_dynWordWrapIndicatorsSet : 1; | ||
615 | bool m_dynWordWrapAlignIndentSet : 1; | 619 | bool m_dynWordWrapAlignIndentSet : 1; | ||
616 | bool m_lineNumbersSet : 1; | 620 | bool m_lineNumbersSet : 1; | ||
617 | bool m_scrollBarMarksSet : 1; | 621 | bool m_scrollBarMarksSet : 1; | ||
618 | bool m_scrollBarPreviewSet : 1; | 622 | bool m_scrollBarPreviewSet : 1; | ||
619 | bool m_scrollBarMiniMapSet : 1; | 623 | bool m_scrollBarMiniMapSet : 1; | ||
Show All 17 Lines | |||||
637 | bool m_keywordCompletionSet : 1; | 641 | bool m_keywordCompletionSet : 1; | ||
638 | bool m_wordCompletionMinimalWordLengthSet : 1; | 642 | bool m_wordCompletionMinimalWordLengthSet : 1; | ||
639 | bool m_smartCopyCutSet : 1; | 643 | bool m_smartCopyCutSet : 1; | ||
640 | bool m_scrollPastEndSet : 1; | 644 | bool m_scrollPastEndSet : 1; | ||
641 | bool m_allowMarkMenu : 1; | 645 | bool m_allowMarkMenu : 1; | ||
642 | bool m_wordCompletionRemoveTailSet : 1; | 646 | bool m_wordCompletionRemoveTailSet : 1; | ||
643 | bool m_foldFirstLineSet : 1; | 647 | bool m_foldFirstLineSet : 1; | ||
644 | bool m_autoBracketsSet : 1; | 648 | bool m_autoBracketsSet : 1; | ||
649 | bool m_backspaceRemoveComposedSet : 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… | |||||
645 | 650 | | |||
646 | private: | 651 | private: | ||
647 | static KateViewConfig *s_global; | 652 | static KateViewConfig *s_global; | ||
648 | KTextEditor::ViewPrivate *m_view; | 653 | KTextEditor::ViewPrivate *m_view; | ||
649 | }; | 654 | }; | ||
650 | 655 | | |||
651 | class KTEXTEDITOR_EXPORT KateRendererConfig : public KateConfig | 656 | class KTEXTEDITOR_EXPORT KateRendererConfig : public KateConfig | ||
652 | { | 657 | { | ||
▲ Show 20 Lines • Show All 201 Lines • Show Last 20 Lines |
After this line you should add bool m_backspaceRemoveComposed;