Commit b9ae25fa authored by Shawn Rutledge's avatar Shawn Rutledge
Browse files

Android: replace qFind with std::find


qFind is deprecated, so these cause build errors with
configure -no-feature-DEPRECATED

Change-Id: Iefcb061d5e8ce256445528f601ead4c9d5d1dfd2
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Showing with 13 additions and 13 deletions
...@@ -53,18 +53,18 @@ QAndroidPlatformMenu::~QAndroidPlatformMenu() ...@@ -53,18 +53,18 @@ QAndroidPlatformMenu::~QAndroidPlatformMenu()
void QAndroidPlatformMenu::insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) void QAndroidPlatformMenu::insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before)
{ {
QMutexLocker lock(&m_menuItemsMutex); QMutexLocker lock(&m_menuItemsMutex);
m_menuItems.insert(qFind(m_menuItems.begin(), m_menuItems.insert(std::find(m_menuItems.begin(),
m_menuItems.end(), m_menuItems.end(),
static_cast<QAndroidPlatformMenuItem *>(before)), static_cast<QAndroidPlatformMenuItem *>(before)),
static_cast<QAndroidPlatformMenuItem *>(menuItem)); static_cast<QAndroidPlatformMenuItem *>(menuItem));
} }
void QAndroidPlatformMenu::removeMenuItem(QPlatformMenuItem *menuItem) void QAndroidPlatformMenu::removeMenuItem(QPlatformMenuItem *menuItem)
{ {
QMutexLocker lock(&m_menuItemsMutex); QMutexLocker lock(&m_menuItemsMutex);
PlatformMenuItemsType::iterator it = qFind(m_menuItems.begin(), PlatformMenuItemsType::iterator it = std::find(m_menuItems.begin(),
m_menuItems.end(), m_menuItems.end(),
static_cast<QAndroidPlatformMenuItem *>(menuItem)); static_cast<QAndroidPlatformMenuItem *>(menuItem));
if (it != m_menuItems.end()) if (it != m_menuItems.end())
m_menuItems.erase(it); m_menuItems.erase(it);
} }
......
...@@ -51,18 +51,18 @@ QAndroidPlatformMenuBar::~QAndroidPlatformMenuBar() ...@@ -51,18 +51,18 @@ QAndroidPlatformMenuBar::~QAndroidPlatformMenuBar()
void QAndroidPlatformMenuBar::insertMenu(QPlatformMenu *menu, QPlatformMenu *before) void QAndroidPlatformMenuBar::insertMenu(QPlatformMenu *menu, QPlatformMenu *before)
{ {
QMutexLocker lock(&m_menusListMutex); QMutexLocker lock(&m_menusListMutex);
m_menus.insert(qFind(m_menus.begin(), m_menus.insert(std::find(m_menus.begin(),
m_menus.end(), m_menus.end(),
static_cast<QAndroidPlatformMenu *>(before)), static_cast<QAndroidPlatformMenu *>(before)),
static_cast<QAndroidPlatformMenu *>(menu)); static_cast<QAndroidPlatformMenu *>(menu));
} }
void QAndroidPlatformMenuBar::removeMenu(QPlatformMenu *menu) void QAndroidPlatformMenuBar::removeMenu(QPlatformMenu *menu)
{ {
QMutexLocker lock(&m_menusListMutex); QMutexLocker lock(&m_menusListMutex);
m_menus.erase(qFind(m_menus.begin(), m_menus.erase(std::find(m_menus.begin(),
m_menus.end(), m_menus.end(),
static_cast<QAndroidPlatformMenu *>(menu))); static_cast<QAndroidPlatformMenu *>(menu)));
} }
void QAndroidPlatformMenuBar::syncMenu(QPlatformMenu *menu) void QAndroidPlatformMenuBar::syncMenu(QPlatformMenu *menu)
......
Supports Markdown
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