#include <QSettings>
#include <QString>
+#include "support/assert.h"
+
#include <string>
using namespace std;
namespace frontend {
-Dialog::Dialog(GuiView & lv, string const & name, QString const & title)
+Dialog::Dialog(GuiView & lv, QString const & name, QString const & title)
: name_(name), title_(title), lyxview_(&lv)
{}
{}
-string const & Dialog::name() const
-{
- return name_;
-}
-
-
bool Dialog::canApply() const
{
- FuncRequest const fr(getLfun(), from_ascii(name_));
+ FuncRequest const fr(getLfun(), fromqstr(name_));
FuncStatus const fs(getStatus(fr));
return fs.enabled();
}
void Dialog::updateDialog() const
{
- dispatch(FuncRequest(LFUN_DIALOG_UPDATE, from_ascii(name_)));
+ dispatch(FuncRequest(LFUN_DIALOG_UPDATE, fromqstr(name_)));
}
void Dialog::disconnect() const
{
- lyxview_->disconnectDialog(name_);
+ lyxview_->disconnectDialog(fromqstr(name_));
}
}
-string const Dialog::bufferFilepath() const
+QString Dialog::bufferFilepath() const
{
- return buffer().filePath();
+ return toqstr(buffer().filePath());
}
Buffer & Dialog::buffer()
{
- BOOST_ASSERT(lyxview_->buffer());
+ LASSERT(lyxview_->buffer(), /**/);
return *lyxview_->buffer();
}
Buffer const & Dialog::buffer() const
{
- BOOST_ASSERT(lyxview_->buffer());
+ LASSERT(lyxview_->buffer(), /**/);
return *lyxview_->buffer();
}
return;
if (!initialiseParams(data)) {
- LYXERR0("Dialog \"" << name()
+ LYXERR0("Dialog \"" << fromqstr(name())
<< "\" failed to translate the data string passed to show()");
return;
}
return;
if (!initialiseParams(data)) {
- LYXERR0("Dialog \"" << name()
+ LYXERR0("Dialog \"" << fromqstr(name())
<< "\" could not be initialized");
return;
}
QString Dialog::sessionKey() const
{
return "view-" + QString::number(lyxview_->id())
- + "/" + toqstr(name());
+ + "/" + name();
}