X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flayout.h;h=f29ebb2572af29ea635f69e9ea31c525f1da9386;hb=ba0820145782f4f6a31d9fe88c73e15d4a3e1fd6;hp=9125c3fc44e3d45beaac99827814c62e2d6d60a6;hpb=0088121bd8c3fc7f2109e8dc9b22b73ca193f20e;p=lyx.git

diff --git a/src/layout.h b/src/layout.h
index 9125c3fc44..f29ebb2572 100644
--- a/src/layout.h
+++ b/src/layout.h
@@ -12,6 +12,8 @@
 #ifndef LAYOUT_H
 #define LAYOUT_H
 
+#include <vector>
+
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -20,9 +22,6 @@
 #include "lyxfont.h"
 #include "Spacing.h"
 
-#include <vector>
-using std::vector;
-using std::pair;
 
 /// Reads the style files
 extern void LyXSetStyle();
@@ -355,12 +354,13 @@ private:
 class LyXTextClass {
 public:
 	///
-	typedef vector<LyXLayout> LayoutList;
+	typedef std::vector<LyXLayout> LayoutList;
 	///
 	typedef LayoutList::const_iterator const_iterator;
 	///
 	typedef LayoutList::size_type size_type;
 	///
+	explicit
 	LyXTextClass (string const & = string(), 
 		      string const & = string(), 
 		      string const & = string());
@@ -510,26 +510,14 @@ void operator|=(LyXTextClass::Provides & p1, LyXTextClass::Provides p2)
 
 
 ///
-inline
-ostream & operator<<(ostream & os, LyXTextClass::PageSides p)
-{
-	switch (p) {
-	case LyXTextClass::OneSide:
-		os << "1";
-		break;
-	case LyXTextClass::TwoSides:
-		os << "2";
-		break;
-	}
-	return os;
-}
+std::ostream & operator<<(std::ostream & os, LyXTextClass::PageSides p);
 
 
 ///
 class LyXTextClassList {
 public:
 	///
-	typedef vector<LyXTextClass> ClassList;
+	typedef std::vector<LyXTextClass> ClassList;
 	///
 	typedef ClassList::const_iterator const_iterator;
 	///
@@ -544,7 +532,7 @@ public:
 				LyXTextClass::size_type layout) const;
 
 	/// Gets layout number from textclass number and layout name
-	pair<bool, LyXTextClass::size_type>
+	std::pair<bool, LyXTextClass::size_type>
 	NumberOfLayout(size_type textclass,
 		       string const & name) const;
 
@@ -556,7 +544,7 @@ public:
 	/** Gets textclass number from name.
 	    Returns -1 if textclass name does not exist
 	*/
-	pair<bool, size_type>
+	std::pair<bool, size_type>
 	NumberOfClass(string const & textclass) const;
 
 	///