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 d764c574af539e2a24f386a4481743b40c99222f..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"
 
@@ -30,7 +30,6 @@
 
 #include "BufferList.h"
 #include "BufferView.h"
-#include "Color.h"
 #include "debug.h"
 #include "FuncRequest.h"
 #include "gettext.h"
@@ -55,6 +54,8 @@
 #ifdef Q_WS_X11
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
+#undef CursorShape
+#undef None
 #endif
 
 #include <boost/bind.hpp>
@@ -125,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");
@@ -193,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_;
@@ -285,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: ");
@@ -316,7 +341,7 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event)
                QApplication::exit(1);
        }
 
-       return return_value;
+       return false;
 }
 
 
@@ -330,8 +355,7 @@ void GuiApplication::syncEvents()
 }
 
 
-bool GuiApplication::getRgbColor(Color_color col,
-       RGBColor & rgbcol)
+bool GuiApplication::getRgbColor(ColorCode col, RGBColor & rgbcol)
 {
        QColor const & qcol = color_cache_.get(col);
        if (!qcol.isValid()) {
@@ -347,13 +371,13 @@ bool GuiApplication::getRgbColor(Color_color col,
 }
 
 
-string const GuiApplication::hexName(Color_color col)
+string const GuiApplication::hexName(ColorCode col)
 {
        return support::ltrim(fromqstr(color_cache_.get(col).name()), "#");
 }
 
 
-void GuiApplication::updateColor(Color_color)
+void GuiApplication::updateColor(ColorCode)
 {
        // FIXME: Bleh, can't we just clear them all at once ?
        color_cache_.clear();