remove #includes; cosmetics

[lyx.git] / src / frontends / qt4 / GuiApplication.cpp

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 5404d6d453376e920d90b1cadca008ce073e27ad..a61b2a80803a97380dbe48766ca1d52a6dd54b59 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -14,11 +14,11 @@
 
 #include "GuiApplication.h"
 
+#include "GuiView.h"
 #include "qt_helpers.h"
 #include "GuiImage.h"
 
 #include "frontends/alert.h"
-#include "frontends/LyXView.h"
 
 #include "graphics/LoaderQueue.h"
 
@@ -126,7 +126,7 @@ GuiApplication * guiApp;
 
 
 GuiApplication::GuiApplication(int & argc, char ** argv)
-       : QApplication(argc, argv), Application(argc, argv)
+       : QApplication(argc, argv), Application()
 {
        QCoreApplication::setOrganizationName("The LyX Community");
        QCoreApplication::setOrganizationDomain("lyx.org");
@@ -194,6 +194,31 @@ GuiApplication::~GuiApplication()
 }
 
 
+LyXView & GuiApplication::createView(unsigned int width,
+                                 unsigned int height,
+                                 int posx, int posy,
+                                 int maximized,
+                                 unsigned int iconSizeXY,
+                                 const std::string & geometryArg)
+{
+       int const id = gui_.createRegisteredView();
+       GuiView & view = static_cast<GuiView &>(gui_.view(id));
+       theLyXFunc().setLyXView(&view);
+
+       view.init();
+       view.setGeometry(width, height, posx, posy, GuiView::Maximized(maximized),
+               iconSizeXY, geometryArg);
+
+       view.setFocus();
+
+       setCurrentView(view);
+
+       return view;
+}
+
+
+
+
 Clipboard & GuiApplication::clipboard()
 {
        return clipboard_;
@@ -286,21 +311,20 @@ bool GuiApplication::event(QEvent * e)
 
 bool GuiApplication::notify(QObject * receiver, QEvent * event)
 {
-       bool return_value = false;
        try {
-               return_value = QApplication::notify(receiver, event);
+               return QApplication::notify(receiver, event);
        }
-       catch (support::ExceptionMessage  const & e) {
+       catch (support::ExceptionMessage const & e) {
                if (e.type_ == support::ErrorException) {
                        Alert::error(e.title_, e.details_);
                        LyX::cref().emergencyCleanup();
                        QApplication::exit(1);
                } else if (e.type_ == support::WarningException) {
                        Alert::warning(e.title_, e.details_);
-                       return return_value;
+                       return false;
                }
        }
-       catch (std::exception  const & e) {
+       catch (std::exception const & e) {
                docstring s = _("LyX has caught an exception, it will now "
                        "attemp to save all unsaved documents and exit."
                        "\n\nException: ");
@@ -317,7 +341,7 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event)
                QApplication::exit(1);
        }
 
-       return return_value;
+       return false;
 }
 
 
@@ -331,8 +355,7 @@ void GuiApplication::syncEvents()
 }
 
 
-bool GuiApplication::getRgbColor(ColorCode col,
-       RGBColor & rgbcol)
+bool GuiApplication::getRgbColor(ColorCode col, RGBColor & rgbcol)
 {
        QColor const & qcol = color_cache_.get(col);
        if (!qcol.isValid()) {