mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-23 10:18:50 +00:00
remove unneeded extra lyx:: namespace qualifier
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16746 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
200db1541a
commit
644f7b46df
@ -75,16 +75,16 @@ FileDialog::Result const FileDialog::save(docstring const & path,
|
|||||||
FileFilterList const & filters,
|
FileFilterList const & filters,
|
||||||
docstring const & suggested)
|
docstring const & suggested)
|
||||||
{
|
{
|
||||||
lyxerr[Debug::GUI] << "Select with path \"" << lyx::to_utf8(path)
|
lyxerr[Debug::GUI] << "Select with path \"" << to_utf8(path)
|
||||||
<< "\", mask \"" << lyx::to_utf8(filters.as_string())
|
<< "\", mask \"" << to_utf8(filters.as_string())
|
||||||
<< "\", suggested \"" << lyx::to_utf8(suggested) << '"' << endl;
|
<< "\", suggested \"" << to_utf8(suggested) << '"' << endl;
|
||||||
FileDialog::Result result;
|
FileDialog::Result result;
|
||||||
result.first = FileDialog::Chosen;
|
result.first = FileDialog::Chosen;
|
||||||
|
|
||||||
#ifdef USE_NATIVE_FILEDIALOG
|
#ifdef USE_NATIVE_FILEDIALOG
|
||||||
docstring const startsWith = from_utf8(
|
docstring const startsWith = from_utf8(
|
||||||
makeAbsPath(to_utf8(suggested), to_utf8(path)).absFilename());
|
makeAbsPath(to_utf8(suggested), to_utf8(path)).absFilename());
|
||||||
result.second = lyx::from_utf8(internal_path(fromqstr(
|
result.second = from_utf8(internal_path(fromqstr(
|
||||||
QFileDialog::getSaveFileName(qApp->focusWidget(),
|
QFileDialog::getSaveFileName(qApp->focusWidget(),
|
||||||
toqstr(title_), toqstr(startsWith), toqstr(filters.as_string()) ))));
|
toqstr(title_), toqstr(startsWith), toqstr(filters.as_string()) ))));
|
||||||
#else
|
#else
|
||||||
@ -99,7 +99,7 @@ FileDialog::Result const FileDialog::save(docstring const & path,
|
|||||||
int res = dlg.exec();
|
int res = dlg.exec();
|
||||||
lyxerr[Debug::GUI] << "result " << res << endl;
|
lyxerr[Debug::GUI] << "result " << res << endl;
|
||||||
if (res == QDialog::Accepted)
|
if (res == QDialog::Accepted)
|
||||||
result.second = lyx::from_utf8(internal_path(
|
result.second = from_utf8(internal_path(
|
||||||
fromqstr(dlg.selectedFiles()[0])));
|
fromqstr(dlg.selectedFiles()[0])));
|
||||||
dlg.hide();
|
dlg.hide();
|
||||||
#endif
|
#endif
|
||||||
@ -111,16 +111,16 @@ FileDialog::Result const FileDialog::open(docstring const & path,
|
|||||||
FileFilterList const & filters,
|
FileFilterList const & filters,
|
||||||
docstring const & suggested)
|
docstring const & suggested)
|
||||||
{
|
{
|
||||||
lyxerr[Debug::GUI] << "Select with path \"" << lyx::to_utf8(path)
|
lyxerr[Debug::GUI] << "Select with path \"" << to_utf8(path)
|
||||||
<< "\", mask \"" << lyx::to_utf8(filters.as_string())
|
<< "\", mask \"" << to_utf8(filters.as_string())
|
||||||
<< "\", suggested \"" << lyx::to_utf8(suggested) << '"' << endl;
|
<< "\", suggested \"" << to_utf8(suggested) << '"' << endl;
|
||||||
FileDialog::Result result;
|
FileDialog::Result result;
|
||||||
result.first = FileDialog::Chosen;
|
result.first = FileDialog::Chosen;
|
||||||
|
|
||||||
#ifdef USE_NATIVE_FILEDIALOG
|
#ifdef USE_NATIVE_FILEDIALOG
|
||||||
docstring const startsWith = from_utf8(
|
docstring const startsWith = from_utf8(
|
||||||
makeAbsPath(to_utf8(suggested), to_utf8(path)).absFilename());
|
makeAbsPath(to_utf8(suggested), to_utf8(path)).absFilename());
|
||||||
result.second = lyx::from_utf8(internal_path(fromqstr(
|
result.second = from_utf8(internal_path(fromqstr(
|
||||||
QFileDialog::getOpenFileName(qApp->focusWidget(),
|
QFileDialog::getOpenFileName(qApp->focusWidget(),
|
||||||
toqstr(title_), toqstr(startsWith), toqstr(filters.as_string()) ))));
|
toqstr(title_), toqstr(startsWith), toqstr(filters.as_string()) ))));
|
||||||
#else
|
#else
|
||||||
@ -133,7 +133,7 @@ FileDialog::Result const FileDialog::open(docstring const & path,
|
|||||||
int res = dlg.exec();
|
int res = dlg.exec();
|
||||||
lyxerr[Debug::GUI] << "result " << res << endl;
|
lyxerr[Debug::GUI] << "result " << res << endl;
|
||||||
if (res == QDialog::Accepted)
|
if (res == QDialog::Accepted)
|
||||||
result.second = lyx::from_utf8(internal_path(
|
result.second = from_utf8(internal_path(
|
||||||
fromqstr(dlg.selectedFiles()[0])));
|
fromqstr(dlg.selectedFiles()[0])));
|
||||||
dlg.hide();
|
dlg.hide();
|
||||||
#endif
|
#endif
|
||||||
@ -144,15 +144,15 @@ FileDialog::Result const FileDialog::open(docstring const & path,
|
|||||||
FileDialog::Result const FileDialog::opendir(docstring const & path,
|
FileDialog::Result const FileDialog::opendir(docstring const & path,
|
||||||
docstring const & suggested)
|
docstring const & suggested)
|
||||||
{
|
{
|
||||||
lyxerr[Debug::GUI] << "Select with path \"" << lyx::to_utf8(path)
|
lyxerr[Debug::GUI] << "Select with path \"" << to_utf8(path)
|
||||||
<< "\", suggested \"" << lyx::to_utf8(suggested) << '"' << endl;
|
<< "\", suggested \"" << to_utf8(suggested) << '"' << endl;
|
||||||
FileDialog::Result result;
|
FileDialog::Result result;
|
||||||
result.first = FileDialog::Chosen;
|
result.first = FileDialog::Chosen;
|
||||||
|
|
||||||
#ifdef USE_NATIVE_FILEDIALOG
|
#ifdef USE_NATIVE_FILEDIALOG
|
||||||
docstring const startsWith = from_utf8(
|
docstring const startsWith = from_utf8(
|
||||||
makeAbsPath(to_utf8(suggested), to_utf8(path)).absFilename());
|
makeAbsPath(to_utf8(suggested), to_utf8(path)).absFilename());
|
||||||
result.second = lyx::from_utf8(internal_path(fromqstr(
|
result.second = from_utf8(internal_path(fromqstr(
|
||||||
QFileDialog::getExistingDirectory(qApp->focusWidget(),
|
QFileDialog::getExistingDirectory(qApp->focusWidget(),
|
||||||
toqstr(title_),toqstr(startsWith)))));
|
toqstr(title_),toqstr(startsWith)))));
|
||||||
#else
|
#else
|
||||||
@ -169,7 +169,7 @@ FileDialog::Result const FileDialog::opendir(docstring const & path,
|
|||||||
int res = dlg.exec();
|
int res = dlg.exec();
|
||||||
lyxerr[Debug::GUI] << "result " << res << endl;
|
lyxerr[Debug::GUI] << "result " << res << endl;
|
||||||
if (res == QDialog::Accepted)
|
if (res == QDialog::Accepted)
|
||||||
result.second = lyx::from_utf8(internal_path(
|
result.second = from_utf8(internal_path(
|
||||||
fromqstr(dlg.selectedFiles()[0])));
|
fromqstr(dlg.selectedFiles()[0])));
|
||||||
dlg.hide();
|
dlg.hide();
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user