anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

format is a std::string, bformat doesn't take a std::string

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32596 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2009-12-19 20:23:18 +00:00
parent 3dcec5edff
commit b677e23c58
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/frontends/qt4/GuiView.cpp
View File

@ -2616,23 +2616,23 @@ bool GuiView::goToFileRow(string const & argument)
} }
static docstring exportAndDestroy(Buffer * buffer, docstring const & format) static docstring exportAndDestroy(Buffer * buffer, std::string const & format)
{ {
bool const success = buffer->doExport(to_utf8(format), true); bool const success = buffer->doExport(format, true);
delete buffer; delete buffer;
return success return success
? bformat(_("Successful export to format: %1$s."), format) ? bformat(_("Successful export to format: %1$s"), from_utf8(format))
: bformat(_("Error exporting to format: %1$s."), format); : bformat(_("Error exporting to format: %1$s"), from_utf8(format));
} }
static docstring previewAndDestroy(Buffer * buffer, docstring const & format) static docstring previewAndDestroy(Buffer * buffer, std::string const & format)
{ {
bool const success = buffer->preview(to_utf8(format)); bool const success = buffer->preview(format);
delete buffer; delete buffer;
return success return success
? bformat(_("Successful preview of format: %1$s."), format) ? bformat(_("Successful preview of format: %1$s"), from_utf8(format))
: bformat(_("Error previewing format: %1$s."), format); : bformat(_("Error previewing format: %1$s"), from_utf8(format));
} }
@ -2687,7 +2687,7 @@ bool GuiView::dispatch(FuncRequest const & cmd)
format = doc_buffer->getDefaultOutputFormat(); format = doc_buffer->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400) #if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
QFuture<docstring> f = QtConcurrent::run(exportAndDestroy, QFuture<docstring> f = QtConcurrent::run(exportAndDestroy,
doc_buffer->clone(), from_utf8(format)); doc_buffer->clone(), format);
d.setPreviewFuture(f); d.setPreviewFuture(f);
#else #else
doc_buffer->doExport(format, true); doc_buffer->doExport(format, true);
@ -2702,7 +2702,7 @@ bool GuiView::dispatch(FuncRequest const & cmd)
format = doc_buffer->getDefaultOutputFormat(); format = doc_buffer->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400) #if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
QFuture<docstring> f = QtConcurrent::run(previewAndDestroy, QFuture<docstring> f = QtConcurrent::run(previewAndDestroy,
doc_buffer->clone(), from_utf8(format)); doc_buffer->clone(), format);
d.setPreviewFuture(f); d.setPreviewFuture(f);
#else #else
doc_buffer->preview(format); doc_buffer->preview(format);
@ -2718,7 +2718,7 @@ bool GuiView::dispatch(FuncRequest const & cmd)
format = master->getDefaultOutputFormat(); format = master->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400) #if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
QFuture<docstring> f = QtConcurrent::run(exportAndDestroy, QFuture<docstring> f = QtConcurrent::run(exportAndDestroy,
master->clone(), from_utf8(format)); master->clone(), format);
d.setPreviewFuture(f); d.setPreviewFuture(f);
#else #else
master->doExport(format, true); master->doExport(format, true);
@ -2732,7 +2732,7 @@ bool GuiView::dispatch(FuncRequest const & cmd)
format = master->getDefaultOutputFormat(); format = master->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400) #if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
QFuture<docstring> f = QtConcurrent::run(previewAndDestroy, QFuture<docstring> f = QtConcurrent::run(previewAndDestroy,
master->clone(), from_utf8(format)); master->clone(), format);
d.setPreviewFuture(f); d.setPreviewFuture(f);
#else #else
master->preview(format); master->preview(format);