Cleanup private part of Layout Box on destructor (probably not really an

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

diff --git a/src/frontends/qt4/GuiCommandBuffer.cpp b/src/frontends/qt4/GuiCommandBuffer.cpp
index d3d0487f0419549d4a589dac2b72e9d1a687f02d..176725016654e600d9fce28b649c221ad7d84795 100644 (file)
--- a/src/frontends/qt4/GuiCommandBuffer.cpp
+++ b/src/frontends/qt4/GuiCommandBuffer.cpp
@@ -18,10 +18,11 @@
 #include "GuiCommandEdit.h"
 #include "GuiView.h"
 #include "qt_helpers.h"
+#include "Validator.h"
 
 #include "BufferView.h"
 #include "Cursor.h"
-#include "LyXFunc.h"
+#include "LyX.h"
 #include "LyXAction.h"
 #include "FuncRequest.h"
 #include "Session.h"
@@ -107,6 +108,7 @@ GuiCommandBuffer::GuiCommandBuffer(GuiView * view)
        edit_ = new GuiCommandEdit(this);
        edit_->setMinimumSize(edit_->sizeHint());
        edit_->setFocusPolicy(Qt::ClickFocus);
+       edit_->setValidator(new NoNewLineValidator(edit_));
 
        connect(edit_, SIGNAL(escapePressed()), this, SLOT(cancel()));
        connect(edit_, SIGNAL(returnPressed()), this, SLOT(dispatch()));
@@ -208,16 +210,16 @@ void GuiCommandBuffer::showList(vector<string> const & list,
        listBox->move(pos.x(), y);
 
        connect(listBox, SIGNAL(itemClicked(QListWidgetItem *)),
-               this, SLOT(item_selected(QListWidgetItem *)));
+               this, SLOT(itemSelected(QListWidgetItem *)));
        connect(listBox, SIGNAL(itemActivated(QListWidgetItem *)),
-               this, SLOT(item_selected(QListWidgetItem *)));
+               this, SLOT(itemSelected(QListWidgetItem *)));
 
        listBox->show();
        listBox->setFocus();
 }
 
 
-void GuiCommandBuffer::item_selected(QListWidgetItem * item)
+void GuiCommandBuffer::itemSelected(QListWidgetItem * item)
 {
        QWidget const * widget = static_cast<QWidget const *>(sender());
        const_cast<QWidget *>(widget)->hide();
@@ -248,7 +250,8 @@ void GuiCommandBuffer::down()
        if (!h.empty())
                edit_->setText(toqstr(h));
 
-       downPB->setEnabled(history_pos_ != history_.end()-1);
+       downPB->setEnabled(!history_.empty()
+                          && history_pos_ != history_.end() - 1);
        upPB->setEnabled(history_pos_ != history_.begin());
 }
        
@@ -296,14 +299,13 @@ string const GuiCommandBuffer::historyDown()
 
 docstring const GuiCommandBuffer::getCurrentState() const
 {
-       return view_->view()->cursor().currentState();
+       return view_->currentBufferView()->cursor().currentState();
 }
 
 
 void GuiCommandBuffer::hide() const
 {
        FuncRequest cmd(LFUN_COMMAND_EXECUTE, "off");
-       theLyXFunc().setLyXView(view_);
        lyx::dispatch(cmd);
 }
 
@@ -313,7 +315,7 @@ GuiCommandBuffer::completions(string const & prefix, string & new_prefix)
 {
        vector<string> comp;
 
-       copy_if(commands_.begin(), commands_.end(),
+       lyx::copy_if(commands_.begin(), commands_.end(),
                back_inserter(comp), prefix_p(prefix));
 
        if (comp.empty()) {
@@ -333,7 +335,7 @@ GuiCommandBuffer::completions(string const & prefix, string & new_prefix)
                test += tmp[test.length()];
        while (test.length() < tmp.length()) {
                vector<string> vtmp;
-               copy_if(comp.begin(), comp.end(),
+               lyx::copy_if(comp.begin(), comp.end(),
                        back_inserter(vtmp), prefix_p(test));
                if (vtmp.size() != comp.size()) {
                        test.erase(test.length() - 1);
@@ -357,8 +359,7 @@ void GuiCommandBuffer::dispatch(string const & str)
        upPB->setEnabled(history_pos_ != history_.begin());
        downPB->setEnabled(history_pos_ != history_.end());
        FuncRequest func = lyxaction.lookupFunc(str);
-       func.origin = FuncRequest::COMMANDBUFFER;
-       theLyXFunc().setLyXView(view_);
+       func.setOrigin(FuncRequest::COMMANDBUFFER);
        lyx::dispatch(func);
 }