#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
#include "QtLyXView.h"
#include "debug.h"
#include "funcrequest.h"
#include "lyxfunc.h"
#include "FileDialog_private.h"
+#include "qt_helpers.h"
#include "support/lstrings.h"
string::size_type pos = label.find(sc[1]);
if (pos == string::npos)
return label;
- label.insert(pos, "&");
+ label.insert(pos, 1, '&');
return label;
}
LyXFileDialog::LyXFileDialog(string const & p, string const & m,
string const & t,
FileDialog::Button const & b1, FileDialog::Button const & b2)
- : QFileDialog(p.c_str(), m.c_str(),
- qApp->mainWidget(), t.c_str(), true),
+ : QFileDialog(toqstr(p), toqstr(m),
+ qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget(), toqstr(t), true),
b1_(0), b2_(0)
{
- setCaption(t.c_str());
+ setCaption(toqstr(t));
if (!b1.first.empty()) {
b1_dir_ = b1.second;
b1_ = new QToolButton(this);
connect(b1_, SIGNAL(clicked()), this, SLOT(buttonClicked()));
- b1_->setText(getLabel(b1.first).c_str());
+ b1_->setText(toqstr(getLabel(b1.first)));
addToolButton(b1_, true);
}
b2_dir_ = b2.second;
b2_ = new QToolButton(this);
connect(b2_, SIGNAL(clicked()), this, SLOT(buttonClicked()));
- b2_->setText(getLabel(b2.first).c_str());
+ b2_->setText(toqstr(getLabel(b2.first)));
addToolButton(b2_);
}
}
void LyXFileDialog::buttonClicked()
{
if (sender() == b1_)
- setDir(b1_dir_.c_str());
+ setDir(toqstr(b1_dir_));
else if (sender() == b2_)
- setDir(b2_dir_.c_str());
+ setDir(toqstr(b2_dir_));
}