Fix handling of the add branch textfield in GuiBranches

[lyx.git] / src / frontends / qt4 / Dialog.cpp

diff --git a/src/frontends/qt4/Dialog.cpp b/src/frontends/qt4/Dialog.cpp
index 47db6db5a7bec86a607bfb5065f90aacfd6f8fe2..65c9a881bbb7e0e1dd61d9142e3cf17c7f878c30 100644 (file)
--- a/src/frontends/qt4/Dialog.cpp
+++ b/src/frontends/qt4/Dialog.cpp
@@ -16,6 +16,7 @@
 #include "qt_helpers.h"
 
 #include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
 #include "FuncRequest.h"
@@ -42,17 +43,6 @@ using namespace lyx::support;
 namespace lyx {
 namespace frontend {
 
-bool CheckedLineEdit2::check() const
-{
-       bool const valid = input_->hasAcceptableInput();
-       // Visual feedback.
-       setValid(input_, valid);
-       if (label_)
-               setValid(label_, valid);
-       return valid;
-}
-
-
 Dialog::Dialog(GuiView & lv, QString const & name, QString const & title)
        : name_(name), title_(title), lyxview_(&lv)
 {}
@@ -62,21 +52,6 @@ Dialog::~Dialog()
 {}
 
 
-void Dialog::addCheckedWidget(QLineEdit * input, QWidget * label)
-{
-       checked_line_edits_.append(CheckedLineEdit2(input, label));
-}
-
-
-bool Dialog::checkWidgets() const
-{
-       bool valid = true;
-       Q_FOREACH(CheckedLineEdit2 const & le, checked_line_edits_)
-                       valid &= le.check();
-       return valid;
-}
-
-
 bool Dialog::canApply() const
 {
        FuncRequest const fr(getLfun(), fromqstr(name_));
@@ -117,7 +92,7 @@ bool Dialog::isBufferReadonly() const
 }
 
 
-QString Dialog::bufferFilepath() const
+QString Dialog::bufferFilePath() const
 {
        return toqstr(buffer().filePath());
 }
@@ -125,9 +100,9 @@ QString Dialog::bufferFilepath() const
 
 KernelDocType Dialog::docType() const
 {
-       if (buffer().isLatex())
+       if (buffer().params().isLatex())
                return LATEX;
-       if (buffer().isLiterate())
+       if (buffer().params().isLiterate())
                return LITERATE;
 
        return DOCBOOK;
@@ -147,6 +122,13 @@ Buffer const & Dialog::buffer() const
 }
 
 
+Buffer const & Dialog::documentBuffer() const
+{
+       LASSERT(lyxview_->documentBufferView(), /**/);
+       return lyxview_->documentBufferView()->buffer();
+}
+
+
 void Dialog::showData(string const & data)
 {
        if (isBufferDependent() && !isBufferAvailable())