Commit b31b1488 authored by KO Myung-Hun's avatar KO Myung-Hun Committed by Jean-Baptiste Kempf

skins2: os2: prepend std:: explicitly

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent ab41e0e2
......@@ -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 == ".." )
......
......@@ -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;
};
......
......@@ -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;
......
......@@ -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;
......
......@@ -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 );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment