do what the FIXME suggested

[lyx.git] / src / frontends / qt4 / GuiDocument.h

diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index bc5dc1c4b0f76e74dd340b343b42e23a30d85dfb..980fdc5173723fea859e16fb90659a98556fcc85 100644 (file)
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -64,6 +64,7 @@ public:
 };
 
 
+/// SelectionManager for use with modules
 class ModuleSelMan : public GuiSelectionManager 
 {
 public:
@@ -98,9 +99,6 @@ private:
 };
 
 
-typedef void const * BufferId;
-
-
 class GuiDocument : public GuiDialog, public Ui::DocumentUi
 {
        Q_OBJECT
@@ -166,9 +164,9 @@ private:
        std::vector<std::string> lang_;
 
        /// Available modules
-       GuiIdListModel * availableModel() { return &available_model_; }
+       GuiIdListModel * availableModel() { return &modules_av_model_; }
        /// Selected modules
-       GuiIdListModel * selectedModel() { return &selected_model_; }
+       GuiIdListModel * selectedModel() { return &modules_sel_model_; }
 private:
        /// Apply changes
        void applyView();
@@ -184,10 +182,14 @@ private:
        void saveDocDefault();
        /// reset to default params
        void useClassDefaults();
+       ///
+       void setLayoutComboByIDString(std::string const & idString);
+       /// available classes
+       GuiIdListModel classes_model_;
        /// available modules
-       GuiIdListModel available_model_;
+       GuiIdListModel modules_av_model_;
        /// selected modules
-       GuiIdListModel selected_model_;
+       GuiIdListModel modules_sel_model_;
        /// current buffer
        BufferId current_id_;
 
@@ -210,7 +212,7 @@ protected:
        /// always true since we don't manipulate document contents
        bool canApply() const { return true; }
        ///
-       TextClass const & textClass() const;
+       DocumentClass const & documentClass() const;
        ///
        BufferParams & params() { return bp_; }
        ///