remove RowList_fwd.h. Not really needed

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

diff --git a/src/Makefile.am b/src/Makefile.am
index a7ca2db4462a093b5c71e2890667caa258fbb61c..d481460628a280ac24e20ce3ecb584cb4b43d56e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -222,7 +222,6 @@ lyx_SOURCES = \
        PrinterParams.h \
        Row.cpp \
        Row.h \
-       RowList_fwd.h \
        rowpainter.cpp \
        rowpainter.h \
        Session.cpp \

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 038eadb96c091c6068e732f0334a7abccdd37838..3a39620c85adae7c39cdd73479413f67256002ad 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -20,7 +20,7 @@
 #include "Dimension.h"
 #include "InsetList.h"
 #include "lyxlayout_ptr_fwd.h"
-#include "RowList_fwd.h"
+#include "Row.h"
 
 #include "insets/Inset.h" // only for Inset::Code
 

diff --git a/src/ParagraphMetrics.h b/src/ParagraphMetrics.h
index 7c0992705b161071ac608e5dfa2f5ae7b1ea8f5e..78ace39b1fe71b3669572e51efc7b6877646e454 100644 (file)
--- a/src/ParagraphMetrics.h
+++ b/src/ParagraphMetrics.h
@@ -21,6 +21,13 @@
 
 namespace lyx {
 
+/**
+ * Each paragraph is broken up into a number of rows on the screen.
+ * This is a list of such on-screen rows, ordered from the top row
+ * downwards.
+ */
+typedef std::vector<Row> RowList;
+
 class MetricsInfo;
 class PainterInfo;
 
@@ -72,6 +79,8 @@ public:
        void dump() const;
 
 private:
+       ///
+       typedef std::vector<size_type> RowSignature;
        ///
        size_type calculateRowSignature(Row const &);
        ///

diff --git a/src/RowList_fwd.h b/src/RowList_fwd.h
deleted file mode 100644 (file)
index 709b090..0000000
--- a/src/RowList_fwd.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// -*- C++ -*-
-/**
- * \file RowList_fwd.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Angus Leeming
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef ROW_LIST_FWD_H
-#define ROW_LIST_FWD_H
-
-#include "Row.h"
-
-#include <vector>
-#include <map>
-
-
-namespace lyx {
-
-/**
- * Each paragraph is broken up into a number of rows on the screen.
- * This is a list of such on-screen rows, ordered from the top row
- * downwards.
- */
-typedef std::vector<Row> RowList;
-///
-typedef std::vector<size_type> RowSignature;
-
-
-} // namespace lyx
-
-#endif

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index b0f60cb9e206441776a25bba867ffb7ccce823b5..90b7c0306028fdc7f447bf19d9e63dd9d945858a 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -13,7 +13,6 @@
 #define INSETTEXT_H
 
 #include "Inset.h"
-#include "RowList_fwd.h"
 #include "Font.h"
 #include "Text.h"