Fix broken Apple speller interface

[features.git] / src / frontends / qt / GuiDocument.h

diff --git a/src/frontends/qt/GuiDocument.h b/src/frontends/qt/GuiDocument.h
index 9647f3b60ca4b02443f9fbb6ee84d9794e029291..b6a51c5b748707b18e7043d542e12d739c0e5b68 100644 (file)
--- a/src/frontends/qt/GuiDocument.h
+++ b/src/frontends/qt/GuiDocument.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Edwin Leuven
- * \author Richard Heck (modules)
+ * \author Richard Kimberly Heck (modules)
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,12 +14,12 @@
 #define GUIDOCUMENT_H
 
 #include "BufferParams.h"
-#include "BulletsModule.h"
 #include "GuiDialog.h"
 #include "GuiIdListModel.h"
 
 #include "ui_BiblioUi.h"
 #include "ui_ColorUi.h"
+#include "ui_ChangeTrackingUi.h"
 #include "ui_DocumentUi.h"
 #include "ui_FontUi.h"
 #include "ui_LanguageUi.h"
@@ -37,14 +37,14 @@
 #include "ui_PreambleUi.h"
 #include "ui_TextLayoutUi.h"
 
+#include "support/unique_ptr.h"
+
 #include <QStandardItemModel>
 
 namespace lyx {
 
-class BufferParams;
 class LayoutModuleList;
 class LyXModule;
-class TextClass;
 
 namespace support {
        class TempFile;
@@ -52,6 +52,8 @@ namespace support {
 
 namespace frontend {
 
+class BulletsModule;
+class FancyLineEdit;
 class FloatPlacement;
 class GuiBranches;
 class GuiIndices;
@@ -91,7 +93,7 @@ public:
        BufferParams const & params() const { return bp_; }
 
 public Q_SLOTS:
-       void onBufferViewChanged();//override
+       void onBufferViewChanged() override;
        // OK button clicked
        void slotOK();
        // Apply button clicked
@@ -163,6 +165,9 @@ private Q_SLOTS:
        void moduleFilterChanged(const QString & text);
        void resetModuleFilter();
        void linenoToggled(bool);
+       void outputChangesToggled(bool);
+       void setOutputSync(bool);
+       void bookmarksopenChanged(bool);
 private:
        /// validate listings parameters and return an error message, if any
        QString validateListingsParameters();
@@ -174,6 +179,7 @@ private:
        UiWidget<Ui::MarginsUi> *marginsModule;
        UiWidget<Ui::LanguageUi> *langModule;
        UiWidget<Ui::ColorUi> *colorModule;
+       UiWidget<Ui::ChangeTrackingUi> *changesModule;
        UiWidget<Ui::NumberingUi> *numberingModule;
        UiWidget<Ui::BiblioUi> *biblioModule;
        UiWidget<Ui::MathsUi> *mathsModule;
@@ -199,14 +205,16 @@ private:
        GuiIdListModel * selectedModel() { return &modules_sel_model_; }
 
        /// Apply changes
-       void applyView();
+       void applyView() override;
        /// update
-       void updateContents();
+       void updateContents() override;
        ///
        void updateAvailableModules();
        ///
        void updateSelectedModules();
        ///
+       void updateIncludeonlyDisplay();
+       ///
        void updateIncludeonlys();
        ///
        void updateDefaultBiblio(std::string const & style,
@@ -231,24 +239,24 @@ private:
        FancyLineEdit * filter_;
 
        /// return false if validate_listings_params returns error
-       bool isValid();
+       bool isValid() override;
 
        /// font family names for BufferParams::fonts_default_family
        static char const * const fontfamilies[5];
        /// GUI names corresponding fontfamilies
        static char const * fontfamilies_gui[5];
        ///
-       bool initialiseParams(std::string const & data);
+       bool initialiseParams(std::string const & data) override;
        ///
-       void clearParams();
+       void clearParams() override;
        ///
-       void dispatchParams();
+       void dispatchParams() override;
        ///
        void modulesToParams(BufferParams &);
        ///
-       bool isBufferDependent() const { return true; }
+       bool isBufferDependent() const override { return true; }
        /// always true since we don't manipulate document contents
-       bool canApply() const { return true; }
+       bool canApply() const override { return true; }
        ///
        DocumentClass const & documentClass() const;
        ///
@@ -357,7 +365,7 @@ Q_SIGNALS:
        void changed();
 
 private:
-       void closeEvent(QCloseEvent *);
+       void closeEvent(QCloseEvent *) override;
        void on_preambleTE_textChanged() { changed(); }
 
        typedef std::map<BufferId, std::pair<int,int> > Coords;