Merge branch 'next' of git://gitorious.org/fg/flightgear into next

[flightgear.git] / src / GUI / new_gui.hxx

diff --git a/src/GUI/new_gui.hxx b/src/GUI/new_gui.hxx
index 5932512fdd33b29e8e683833c1f570617c8de2dd..53590173ef1db5b564edee4fad611e13ffaadc9b 100644 (file)
--- a/src/GUI/new_gui.hxx
+++ b/src/GUI/new_gui.hxx
@@ -212,14 +212,15 @@ private:
     };
 
     puFont *_font;
-    map<const char*,FGColor*, ltstr> _colors;
-    typedef map<const char*,FGColor*, ltstr>::iterator _itt_t;
-    typedef map<const char*,FGColor*, ltstr>::const_iterator _citt_t;
+    typedef std::map<const char*,FGColor*, ltstr> ColourDict;
+    ColourDict _colors;
+    typedef ColourDict::iterator _itt_t;
+    typedef ColourDict::const_iterator _citt_t;
 
     void clear_colors();
 
     // Read all the configuration files in a directory.
-    void readDir (const char * path);
+    void readDir (const SGPath& path);
 
     FGMenuBar * _menubar;
     FGDialog * _active_dialog;
@@ -311,8 +312,8 @@ private:
     // Path to the font directory
     SGPath _path;
 
-    typedef map<const string, fntTexFont*> TexFontMap;
-    typedef map<const FntParams, fnt*, FntParamsLess> PuFontMap;
+    typedef std::map<const std::string, fntTexFont*> TexFontMap;
+    typedef std::map<const FntParams, fnt*, FntParamsLess> PuFontMap;
     TexFontMap _texFonts;
     PuFontMap _puFonts;