Rename is_valid_ as validated_, which is a bit more informative.

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 5fed8df61debd867b767a27ee85358316a74df32..e370170a265b106776d3d07870303423b4251333 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -574,7 +574,7 @@ void PreambleModule::closeEvent(QCloseEvent * e)
 /////////////////////////////////////////////////////////////////////
 
 
-LocalLayout::LocalLayout() : current_id_(0), is_valid_(false)
+LocalLayout::LocalLayout() : current_id_(0), validated_(false)
 {
        connect(locallayoutTE, SIGNAL(textChanged()), this, SLOT(textChanged()));
        connect(validatePB, SIGNAL(clicked()), this, SLOT(validatePressed()));
@@ -612,7 +612,7 @@ void LocalLayout::textChanged()
                fromqstr(locallayoutTE->document()->toPlainText().trimmed());
 
        if (layout.empty()) {
-               is_valid_ = true;
+               validated_ = true;
                validatePB->setEnabled(false);
                validLB->setText("");
                convertPB->hide();
@@ -620,7 +620,7 @@ void LocalLayout::textChanged()
                changed();
        } else if (!validatePB->isEnabled()) {
                // if that's already enabled, we shouldn't need to do anything.
-               is_valid_ = false;
+               validated_ = false;
                validLB->setText(message);
                validatePB->setEnabled(true);
                convertPB->setEnabled(false);
@@ -664,9 +664,9 @@ void LocalLayout::validate() {
                fromqstr(locallayoutTE->document()->toPlainText().trimmed());
        if (!layout.empty()) {
                TextClass::ReturnValues const ret = TextClass::validate(layout);
-               is_valid_ = (ret == TextClass::OK) || (ret == TextClass::OK_OLDFORMAT);
+               validated_ = (ret == TextClass::OK) || (ret == TextClass::OK_OLDFORMAT);
                validatePB->setEnabled(false);
-               validLB->setText(is_valid_ ? vtext : ivtext);
+               validLB->setText(validated_ ? vtext : ivtext);
                if (ret == TextClass::OK_OLDFORMAT) {
                        convertPB->show();
                        convertPB->setEnabled(true);

diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h
index 69067df6e7a7449f9809e0990b5e3f97b602b1c1..4ab74c6dbf8f3a5805c0112d6f7405eb6382d692 100644 (file)
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@@ -287,7 +287,7 @@ public:
        LocalLayout();
        void update(BufferParams const & params, BufferId id);
        void apply(BufferParams & params);
-       bool isValid() const { return is_valid_; }
+       bool isValid() const { return validated_; }
 
 Q_SIGNALS:
        /// signal that something's changed in the Widget.
@@ -303,7 +303,7 @@ private Q_SLOTS:
 
 private:
        BufferId current_id_;
-       bool is_valid_;
+       bool validated_;
 };