vlc | branch: master | KO Myung-Hun <[email protected]> | Mon Jul 6 17:03:24 2015 +0900| [b31b14883f6a8d7d3ab130715a070dc99811d9a4] | committer: Jean-Baptiste Kempf
skins2: os2: prepend std:: explicitly Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b31b14883f6a8d7d3ab130715a070dc99811d9a4 --- modules/gui/skins2/os2/os2_factory.cpp | 18 +++++++++--------- modules/gui/skins2/os2/os2_factory.hpp | 12 ++++++------ modules/gui/skins2/os2/os2_loop.hpp | 2 +- modules/gui/skins2/os2/os2_popup.cpp | 2 +- modules/gui/skins2/os2/os2_popup.hpp | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/gui/skins2/os2/os2_factory.cpp b/modules/gui/skins2/os2/os2_factory.cpp index 2cbfb85..0dcdffe 100644 --- a/modules/gui/skins2/os2/os2_factory.cpp +++ b/modules/gui/skins2/os2/os2_factory.cpp @@ -218,15 +218,15 @@ bool OS2Factory::init() // Initialize the resource path char *datadir = config_GetUserDir( VLC_DATA_DIR ); - m_resourcePath.push_back( (string)datadir + "\\skins" ); + m_resourcePath.push_back( (std::string)datadir + "\\skins" ); free( datadir ); datadir = config_GetDataDir(); - m_resourcePath.push_back( (string)datadir + "\\skins" ); - m_resourcePath.push_back( (string)datadir + "\\skins2" ); - m_resourcePath.push_back( (string)datadir + "\\share\\skins" ); - m_resourcePath.push_back( (string)datadir + "\\share\\skins2" ); - m_resourcePath.push_back( (string)datadir + "\\vlc\\skins" ); - m_resourcePath.push_back( (string)datadir + "\\vlc\\skins2" ); + m_resourcePath.push_back( (std::string)datadir + "\\skins" ); + m_resourcePath.push_back( (std::string)datadir + "\\skins2" ); + m_resourcePath.push_back( (std::string)datadir + "\\share\\skins" ); + m_resourcePath.push_back( (std::string)datadir + "\\share\\skins2" ); + m_resourcePath.push_back( (std::string)datadir + "\\vlc\\skins" ); + m_resourcePath.push_back( (std::string)datadir + "\\vlc\\skins2" ); free( datadir ); // All went well @@ -424,7 +424,7 @@ void OS2Factory::changeCursor( CursorType_t type ) const } -void OS2Factory::rmDir( const string &rPath ) +void OS2Factory::rmDir( const std::string &rPath ) { struct dirent *file; DIR *dir; @@ -436,7 +436,7 @@ void OS2Factory::rmDir( const string &rPath ) while( (file = readdir( dir )) ) { struct stat statbuf; - string filename = file->d_name; + std::string filename = file->d_name; // Skip "." and ".." if( filename == "." || filename == ".." ) diff --git a/modules/gui/skins2/os2/os2_factory.hpp b/modules/gui/skins2/os2/os2_factory.hpp index e125504..531cf60 100644 --- a/modules/gui/skins2/os2/os2_factory.hpp +++ b/modules/gui/skins2/os2/os2_factory.hpp @@ -88,10 +88,10 @@ public: virtual OSPopup *createOSPopup(); /// Get the directory separator - virtual const string &getDirSeparator() const { return m_dirSep; } + virtual const std::string &getDirSeparator() const { return m_dirSep; } /// Get the resource path - virtual const list<string> &getResourcePath() const + virtual const std::list<std::string> &getResourcePath() const { return m_resourcePath; } /// Get the screen size @@ -116,10 +116,10 @@ public: virtual void changeCursor( CursorType_t type ) const; /// Delete a directory recursively - virtual void rmDir( const string &rPath ); + virtual void rmDir( const std::string &rPath ); /// Map to find the GenericWindow associated with a OS2Window - map<HWND, GenericWindow*> m_windowMap; + std::map<HWND, GenericWindow*> m_windowMap; /// Get the parent window handle HWND getParentWindow() { return m_hParentClientWindow; } @@ -149,9 +149,9 @@ private: /// Cursor type mutable CursorType_t m_cursorType; /// Directory separator - const string m_dirSep; + const std::string m_dirSep; /// Resource path - list<string> m_resourcePath; + std::list<std::string> m_resourcePath; }; diff --git a/modules/gui/skins2/os2/os2_loop.hpp b/modules/gui/skins2/os2/os2_loop.hpp index 3873377..9250f1c 100644 --- a/modules/gui/skins2/os2/os2_loop.hpp +++ b/modules/gui/skins2/os2/os2_loop.hpp @@ -59,7 +59,7 @@ private: /// Map associating special (i.e. non ascii) virtual key codes with /// internal vlc key codes - map<int, int> virtKeyToVlcKey; + std::map<int, int> virtKeyToVlcKey; /// Helper function to find the modifier in a Windows message int getMod( MPARAM mp ) const; diff --git a/modules/gui/skins2/os2/os2_popup.cpp b/modules/gui/skins2/os2/os2_popup.cpp index 6479bdd..4a12489 100644 --- a/modules/gui/skins2/os2/os2_popup.cpp +++ b/modules/gui/skins2/os2/os2_popup.cpp @@ -78,7 +78,7 @@ void OS2Popup::hide() } -void OS2Popup::addItem( const string &rLabel, int pos ) +void OS2Popup::addItem( const std::string &rLabel, int pos ) { MENUITEM mi; diff --git a/modules/gui/skins2/os2/os2_popup.hpp b/modules/gui/skins2/os2/os2_popup.hpp index 939dd39..d1fbe47 100644 --- a/modules/gui/skins2/os2/os2_popup.hpp +++ b/modules/gui/skins2/os2/os2_popup.hpp @@ -42,7 +42,7 @@ public: virtual void hide(); /// Append a new menu item with the given label to the popup menu - virtual void addItem( const string &rLabel, int pos ); + virtual void addItem( const std::string &rLabel, int pos ); /// Create a dummy menu item to separate sections virtual void addSeparator( int pos ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
