diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-11-25 09:50:22 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-11-26 08:42:25 +0100 |
| commit | b9ae25fa712c88e6861c733d60f44fab84b9c475 (patch) | |
| tree | df0c05513b5d6b5d1874fee5008eb5c97e0989f4 /src | |
| parent | 544f82ea3ad8c02c9bdffcf9e96840038823d1d8 (diff) | |
Android: replace qFind with std::find
qFind is deprecated, so these cause build errors with
configure -no-feature-DEPRECATED
Change-Id: Iefcb061d5e8ce256445528f601ead4c9d5d1dfd2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformmenu.cpp | 12 | ||||
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformmenubar.cpp | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformmenu.cpp b/src/plugins/platforms/android/qandroidplatformmenu.cpp index 8f992f6bea..f8e7df8784 100644 --- a/src/plugins/platforms/android/qandroidplatformmenu.cpp +++ b/src/plugins/platforms/android/qandroidplatformmenu.cpp @@ -53,18 +53,18 @@ QAndroidPlatformMenu::~QAndroidPlatformMenu() void QAndroidPlatformMenu::insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) { QMutexLocker lock(&m_menuItemsMutex); - m_menuItems.insert(qFind(m_menuItems.begin(), - m_menuItems.end(), - static_cast<QAndroidPlatformMenuItem *>(before)), + m_menuItems.insert(std::find(m_menuItems.begin(), + m_menuItems.end(), + static_cast<QAndroidPlatformMenuItem *>(before)), static_cast<QAndroidPlatformMenuItem *>(menuItem)); } void QAndroidPlatformMenu::removeMenuItem(QPlatformMenuItem *menuItem) { QMutexLocker lock(&m_menuItemsMutex); - PlatformMenuItemsType::iterator it = qFind(m_menuItems.begin(), - m_menuItems.end(), - static_cast<QAndroidPlatformMenuItem *>(menuItem)); + PlatformMenuItemsType::iterator it = std::find(m_menuItems.begin(), + m_menuItems.end(), + static_cast<QAndroidPlatformMenuItem *>(menuItem)); if (it != m_menuItems.end()) m_menuItems.erase(it); } diff --git a/src/plugins/platforms/android/qandroidplatformmenubar.cpp b/src/plugins/platforms/android/qandroidplatformmenubar.cpp index 87ebaa8554..2892c3ef3b 100644 --- a/src/plugins/platforms/android/qandroidplatformmenubar.cpp +++ b/src/plugins/platforms/android/qandroidplatformmenubar.cpp @@ -51,18 +51,18 @@ QAndroidPlatformMenuBar::~QAndroidPlatformMenuBar() void QAndroidPlatformMenuBar::insertMenu(QPlatformMenu *menu, QPlatformMenu *before) { QMutexLocker lock(&m_menusListMutex); - m_menus.insert(qFind(m_menus.begin(), - m_menus.end(), - static_cast<QAndroidPlatformMenu *>(before)), - static_cast<QAndroidPlatformMenu *>(menu)); + m_menus.insert(std::find(m_menus.begin(), + m_menus.end(), + static_cast<QAndroidPlatformMenu *>(before)), + static_cast<QAndroidPlatformMenu *>(menu)); } void QAndroidPlatformMenuBar::removeMenu(QPlatformMenu *menu) { QMutexLocker lock(&m_menusListMutex); - m_menus.erase(qFind(m_menus.begin(), - m_menus.end(), - static_cast<QAndroidPlatformMenu *>(menu))); + m_menus.erase(std::find(m_menus.begin(), + m_menus.end(), + static_cast<QAndroidPlatformMenu *>(menu))); } void QAndroidPlatformMenuBar::syncMenu(QPlatformMenu *menu) |