merge ButtonController and its view (Qt2BC in this case)

[features.git] / src / frontends / qt4 / GuiNomencl.cpp

diff --git a/src/frontends/qt4/GuiNomencl.cpp b/src/frontends/qt4/GuiNomencl.cpp
index 48dd5e4e8bbb784594992a7f738bec597aa589c4..ff5f27f7e3fc7b8a8400452e599f86a629aa84b4 100644 (file)
--- a/src/frontends/qt4/GuiNomencl.cpp
+++ b/src/frontends/qt4/GuiNomencl.cpp
@@ -11,14 +11,12 @@
 
 #include <config.h>
 
+#include "GuiNomencl.h"
+
 #include "debug.h"
 #include "ControlCommand.h"
 #include "qt_helpers.h"
 
-#include "GuiNomencl.h"
-#include "Qt2BC.h"
-#include "ButtonController.h"
-
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
@@ -85,7 +83,7 @@ void GuiNomenclDialog::closeEvent(QCloseEvent * e)
 /////////////////////////////////////////////////////////////////////
 
 
-GuiNomencl::GuiNomencl(Dialog & parent, docstring const & title)
+GuiNomencl::GuiNomencl(GuiDialog & parent, docstring const & title)
        : GuiView<GuiNomenclDialog>(parent, title)
 {
 }
@@ -95,11 +93,11 @@ void GuiNomencl::build_dialog()
 {
        dialog_.reset(new GuiNomenclDialog(this));
 
-       bcview().setOK(dialog_->okPB);
-       bcview().setCancel(dialog_->closePB);
-       bcview().addReadOnly(dialog_->symbolED);
-       bcview().addReadOnly(dialog_->descriptionTE);
-       bcview().addReadOnly(dialog_->prefixED);
+       bc().setOK(dialog_->okPB);
+       bc().setCancel(dialog_->closePB);
+       bc().addReadOnly(dialog_->symbolED);
+       bc().addReadOnly(dialog_->descriptionTE);
+       bc().addReadOnly(dialog_->prefixED);
 }
 
 
@@ -111,7 +109,7 @@ void GuiNomencl::update_contents()
        description.replace("\\\\","\n");
        dialog_->descriptionTE->setPlainText(description);
 
-       bc().valid(isValid());
+       bc().setValid(isValid());
 }