r36234 - lyx-devel/trunk/src/frontends/qt4

[forenr]

Author: forenr
Date: Wed Nov 10 15:36:35 2010
New Revision: 36234
URL: http://www.lyx.org/trac/changeset/36234

Log:
Correct style and squash compiler warnings.

Modified:
   lyx-devel/trunk/src/frontends/qt4/GuiView.cpp

Modified: lyx-devel/trunk/src/frontends/qt4/GuiView.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiView.cpp       Wed Nov 10 15:00:54 
2010        (r36233)
+++ lyx-devel/trunk/src/frontends/qt4/GuiView.cpp       Wed Nov 10 15:36:35 
2010        (r36234)
@@ -496,6 +496,7 @@
        return areas;
 }
 
+
 void GuiView::setCursorShapes(Qt::CursorShape shape)
 {
        QVector<GuiWorkArea*> areas = d.guiWorkAreas();
@@ -504,6 +505,7 @@
        }
 }
 
+
 void GuiView::restoreCursorShapes()
 {
        QVector<GuiWorkArea*> areas = d.guiWorkAreas();
@@ -514,6 +516,7 @@
        }
 }
 
+
 void GuiView::saveCursorShapes()
 {
        d.orig_cursors_.clear();
@@ -523,6 +526,7 @@
        }
 }
 
+
 void GuiView::indicateProcessing()
 {
        if (d.indicates_processing_) {
@@ -533,6 +537,7 @@
        d.indicates_processing_ = !d.indicates_processing_;
 }
 
+
 void GuiView::processingThreadStarted()
 {
        saveCursorShapes();
@@ -541,6 +546,7 @@
        d.processing_cursor_timer_.start();
 }
 
+
 void GuiView::processingThreadFinished()
 {
 #if (QT_VERSION >= 0x040400)
@@ -2877,18 +2883,21 @@
                : bformat(_("Error " + msg + " format: %1$s"), 
from_utf8(format));
 }
 
+
 docstring GuiView::GuiViewPrivate::compileAndDestroy(Buffer const * orig, 
Buffer * buffer, string const & format)
 {
        bool (Buffer::* mem_func)(std::string const &, bool, bool) const = 
&Buffer::doExport;
        return runAndDestroy(bind(mem_func, buffer, _1, true, _2), orig, 
buffer, format, "export");
 }
 
+
 docstring GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, 
Buffer * buffer, string const & format)
 {
        bool (Buffer::* mem_func)(std::string const &, bool, bool) const = 
&Buffer::doExport;
        return runAndDestroy(bind(mem_func, buffer, _1, false, _2), orig, 
buffer, format, "export");
 }
 
+
 docstring GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, 
Buffer * buffer, string const & format)
 {
        bool(Buffer::* mem_func)(std::string const &, bool) const = 
&Buffer::preview;
@@ -2899,17 +2908,22 @@
 
 // not used, but the linker needs them
 
-docstring GuiView::GuiViewPrivate::compileAndDestroy(Buffer const * orig, 
Buffer * buffer, string const & format)
+docstring GuiView::GuiViewPrivate::compileAndDestroy(
+               Buffer const *, Buffer *, string const &)
 {
        return docstring();
 }
 
-docstring GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, 
Buffer * buffer, string const & format)
+
+docstring GuiView::GuiViewPrivate::exportAndDestroy(
+               Buffer const *, Buffer *, string const &)
 {
        return docstring();
 }
 
-docstring GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, 
Buffer * buffer, string const & format)
+
+docstring GuiView::GuiViewPrivate::previewAndDestroy(
+               Buffer const *, Buffer *, string const &)
 {
        return docstring();
 }
@@ -2925,14 +2939,14 @@
                           bool (Buffer::*syncFunc)(string const &, bool, bool) 
const,
                           bool (Buffer::*previewFunc)(string const &, bool) 
const)
 {
-       if (!used_buffer) {
+       if (!used_buffer)
                return false;
-       }
+
        gv_->processingThreadStarted();
        string format = argument;
-       if (format.empty()) {
+       if (format.empty())
                format = used_buffer->getDefaultOutputFormat();
-       }
+
 #if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
        if (!msg.empty()) {
                progress_->clearMessages();