Some cosmetics and a gcc compile fix.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21581 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h
index 9fef747e375fb91c18c4030ac6f719dd25aabcae..ac045354078396b496e5d0290e0cf2f8d1758ed5 100644 (file)
--- a/src/frontends/LyXView.h
+++ b/src/frontends/LyXView.h
@@ -116,7 +116,6 @@ public:
 
        /// updates the possible layouts selectable
        virtual void updateLayoutChoice(bool force) = 0;
-
        /// update the toolbar
        virtual void updateToolbars() = 0;
        /// get toolbar info
@@ -125,13 +124,9 @@ public:
        virtual void toggleToolbarState(std::string const & name, bool allowauto) = 0;
        /// update the status bar
        virtual void updateStatusBar() = 0;
-
        /// display a message in the view
        virtual void message(docstring const &) = 0;
 
-       /// clear any temporary message and replace with current status
-       virtual void clearMessage() = 0;
-
        /// dispatch to current BufferView
        virtual void dispatch(FuncRequest const & cmd) = 0;
 
@@ -143,7 +138,6 @@ public:
        /// returns true if this view has the focus.
        virtual bool hasFocus() const = 0;
 
-
        ///
        virtual void restartCursor() = 0;
        

diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp
index 2d4fc2c4c30acb5909732651a6837025424eb410..f7f12256d167e7ab6fa9c31e51e18178965e0456 100644 (file)
--- a/src/frontends/qt4/Action.cpp
+++ b/src/frontends/qt4/Action.cpp
@@ -12,8 +12,6 @@
 
 #include "Action.h"
 
-#include "frontends/LyXView.h"
-
 #include "debug.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"

diff --git a/src/frontends/qt4/GuiCommandBuffer.cpp b/src/frontends/qt4/GuiCommandBuffer.cpp
index 92317f60ddf9c15d8b41ea96fab2de432b6594e2..d77db6a90f3c3f1f9f0bbe9fba6205938a815b72 100644 (file)
--- a/src/frontends/qt4/GuiCommandBuffer.cpp
+++ b/src/frontends/qt4/GuiCommandBuffer.cpp
@@ -24,8 +24,6 @@
 #include "LyXAction.h"
 #include "FuncRequest.h"
 
-#include "frontends/LyXView.h"
-
 #include "support/lyxalgo.h"
 #include "support/lstrings.h"
 

diff --git a/src/frontends/qt4/GuiToc.cpp b/src/frontends/qt4/GuiToc.cpp
index d804eb322278a908eae51128f18b62337ad110a8..760e7d07d86f39214d7b5789497b4650582261e2 100644 (file)
--- a/src/frontends/qt4/GuiToc.cpp
+++ b/src/frontends/qt4/GuiToc.cpp
@@ -31,8 +31,6 @@
 #include "gettext.h"
 #include "TextClass.h"
 
-#include "frontends/LyXView.h"
-
 #include "support/convert.h"
 
 #include <algorithm>

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index a6166c057a3fdb405b7ff725d37d90d0d587b487..5dc221fe16ccdde065b826932241cae7523c6692 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -362,7 +362,7 @@ void GuiView::init()
        statusBar()->setSizeGripEnabled(true);
 
        QObject::connect(&statusbar_timer_, SIGNAL(timeout()),
-               this, SLOT(update_view_state_qt()));
+               this, SLOT(clearMessage()));
 
        d.setBackground();
 }
@@ -608,12 +608,6 @@ void GuiView::message(docstring const & str)
 }
 
 
-void GuiView::clearMessage()
-{
-       update_view_state_qt();
-}
-
-
 void GuiView::setIconSize(unsigned int size)
 {
        d.lastIconSize = size;
@@ -639,7 +633,7 @@ void GuiView::bigSizedIcons()
 }
 
 
-void GuiView::update_view_state_qt()
+void GuiView::clearMessage()
 {
        if (!hasFocus())
                return;

diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h
index aa42aab7396b15cb140ce437ba139661b1b64b90..45cedc88acc99b179cbf91b91bc0a1aaabb87181 100644 (file)
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -72,7 +72,6 @@ public:
        GuiToolbar * makeToolbar(ToolbarInfo const & tbinfo, bool newline);
        virtual void updateStatusBar();
        virtual void message(docstring const & str);
-       virtual void clearMessage();
        virtual bool hasFocus() const;
        void showMiniBuffer(bool);
        void openMenu(docstring const &);
@@ -108,8 +107,9 @@ Q_SIGNALS:
        void closing(int);
 
 public Q_SLOTS:
-       /// idle timeout
-       void update_view_state_qt();
+       /// idle timeout.
+       /// clear any temporary message and replace with current status.
+       void clearMessage();
 
        ///
        void updateWindowTitle(GuiWorkArea * wa);
@@ -123,7 +123,7 @@ public Q_SLOTS:
        void bigSizedIcons();
 
 private:
-       friend GuiWorkArea;
+       friend class GuiWorkArea;
 
        /// make sure we quit cleanly
        virtual void closeEvent(QCloseEvent * e);

diff --git a/src/frontends/qt4/InsertTableWidget.h b/src/frontends/qt4/InsertTableWidget.h
index f6a2b3cf7ffc8a94d024b14bf94e87b7a1479819..a36b2fc72cdcf6cee4ca70a515be66f849aa48f9 100644 (file)
--- a/src/frontends/qt4/InsertTableWidget.h
+++ b/src/frontends/qt4/InsertTableWidget.h
@@ -13,12 +13,12 @@
 #ifndef INSERTTABLEWIDGET_H
 #define INSERTTABLEWIDGET_H
 
-#include "frontends/LyXView.h"
 #include <QWidget>
 
 namespace lyx {
 namespace frontend {
 
+class LyXView;
 
 class InsertTableWidget : public QWidget {
        Q_OBJECT