two small missing bits for rev18468

[lyx.git] / src / frontends / Application.h

diff --git a/src/frontends/Application.h b/src/frontends/Application.h
index 3bd0c226ae1739209b4d407f9b24b2d1f4ee4809..f64ee45fc4ba74869b85d5334ff854c0d56495cb 100644 (file)
--- a/src/frontends/Application.h
+++ b/src/frontends/Application.h
@@ -19,7 +19,7 @@ namespace lyx {
 
 class BufferView;
 class LyXView;
-class LColor_color;
+class Color_color;
 struct RGBColor;
 
 namespace frontend {
@@ -145,17 +145,17 @@ public:
        * The function returns true if successful.
        * It returns false on failure and sets r, g, b to 0.
        */
-       virtual bool getRgbColor(LColor_color col, RGBColor & rgbcol) = 0;
+       virtual bool getRgbColor(Color_color col, RGBColor & rgbcol) = 0;
 
-       /** Eg, passing LColor::black returns "000000",
-       *      passing LColor::white returns "ffffff".
+       /** Eg, passing Color::black returns "000000",
+       *      passing Color::white returns "ffffff".
        */
-       virtual std::string const hexName(LColor_color col) = 0;
+       virtual std::string const hexName(Color_color col) = 0;
 
        /**
        * update an altered GUI color
        */
-       virtual void updateColor(LColor_color col) = 0;
+       virtual void updateColor(Color_color col) = 0;
 
        /**
        * add a callback for socket read notification
@@ -172,14 +172,14 @@ public:
 
        /// Create the main window with given geometry settings.
        LyXView & createView(unsigned int width, unsigned int height,
-               int posx, int posy, bool maximize, unsigned int iconSizeXY,
-               const std::string & geometryArg);
+               int posx, int posy, int maximized,
+               unsigned int iconSizeXY, const std::string & geometryArg);
        
        /// 
-       LyXView const & currentView() const;
+       LyXView const * currentView() const;
 
        /// 
-       LyXView & currentView();
+       LyXView * currentView();
 
        ///
        void setCurrentView(LyXView & current_view);
@@ -193,7 +193,7 @@ private:
 
 } // namespace frontend
 
-extern frontend::Application * theApp;
+frontend::Application * theApp();
 frontend::Application * createApplication(int & argc, char * argv[]);