Skip to content

Commit

Permalink
ResolveConflictWTrackMenu
Browse files Browse the repository at this point in the history
  • Loading branch information
@evelynnev
evelynnev committed Feb 1, 2025
1 parent 8d480d1 commit 2534cf6
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions src/widget/wtrackmenu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,18 @@ class WTrackMenu : public QMenu {
QMenu* m_pBPMMenu{};
QMenu* m_pColorMenu{};
WCoverArtMenu* m_pCoverMenu{};
parented_ptr<QMenu> m_pLoadToMenu;

Check failure on line 300 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pLoadToMenu’

Check failure on line 300 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pLoadToMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 300 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pLoadToMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 300 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pLoadToMenu’

Check failure on line 300 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pLoadToMenu’

Check failure on line 300 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pLoadToMenu’

Check failure on line 300 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pLoadToMenu'

Check failure on line 300 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pLoadToMenu'

Check failure on line 300 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pLoadToMenu'

Check failure on line 300 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pLoadToMenu'
parented_ptr<QMenu> m_pDeckMenu;

Check failure on line 301 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pDeckMenu’

Check failure on line 301 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pDeckMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 301 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pDeckMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 301 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pDeckMenu’

Check failure on line 301 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pDeckMenu’

Check failure on line 301 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pDeckMenu’

Check failure on line 301 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pDeckMenu'

Check failure on line 301 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pDeckMenu'

Check failure on line 301 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pDeckMenu'

Check failure on line 301 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pDeckMenu'
parented_ptr<QMenu> m_pSamplerMenu;

Check failure on line 302 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pSamplerMenu’

Check failure on line 302 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pSamplerMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 302 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pSamplerMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 302 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pSamplerMenu’

Check failure on line 302 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pSamplerMenu’

Check failure on line 302 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pSamplerMenu’

Check failure on line 302 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pSamplerMenu'

Check failure on line 302 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pSamplerMenu'

Check failure on line 302 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pSamplerMenu'

Check failure on line 302 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pSamplerMenu'
parented_ptr<QMenu> m_pPlaylistMenu;

Check failure on line 303 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pPlaylistMenu’

Check failure on line 303 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pPlaylistMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 303 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pPlaylistMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 303 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pPlaylistMenu’

Check failure on line 303 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pPlaylistMenu’

Check failure on line 303 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pPlaylistMenu’

Check failure on line 303 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pPlaylistMenu'

Check failure on line 303 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pPlaylistMenu'

Check failure on line 303 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pPlaylistMenu'

Check failure on line 303 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pPlaylistMenu'
parented_ptr<QMenu> m_pCrateMenu;

Check failure on line 304 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pCrateMenu’

Check failure on line 304 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pCrateMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 304 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pCrateMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 304 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pCrateMenu’

Check failure on line 304 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pCrateMenu’

Check failure on line 304 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pCrateMenu’

Check failure on line 304 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pCrateMenu'

Check failure on line 304 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pCrateMenu'

Check failure on line 304 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pCrateMenu'

Check failure on line 304 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pCrateMenu'
parented_ptr<QMenu> m_pMetadataMenu;

Check failure on line 305 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pMetadataMenu’

Check failure on line 305 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pMetadataMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 305 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pMetadataMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 305 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pMetadataMenu’

Check failure on line 305 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pMetadataMenu’

Check failure on line 305 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pMetadataMenu’

Check failure on line 305 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pMetadataMenu'

Check failure on line 305 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pMetadataMenu'

Check failure on line 305 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pMetadataMenu'

Check failure on line 305 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pMetadataMenu'
parented_ptr<QMenu> m_pMetadataUpdateExternalCollectionsMenu;

Check failure on line 306 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pMetadataUpdateExternalCollectionsMenu’

Check failure on line 306 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pMetadataUpdateExternalCollectionsMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 306 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pMetadataUpdateExternalCollectionsMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 306 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pMetadataUpdateExternalCollectionsMenu’

Check failure on line 306 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pMetadataUpdateExternalCollectionsMenu’

Check failure on line 306 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pMetadataUpdateExternalCollectionsMenu’

Check failure on line 306 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pMetadataUpdateExternalCollectionsMenu'

Check failure on line 306 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pMetadataUpdateExternalCollectionsMenu'

Check failure on line 306 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pMetadataUpdateExternalCollectionsMenu'

Check failure on line 306 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pMetadataUpdateExternalCollectionsMenu'
parented_ptr<QMenu> m_pClearMetadataMenu;

Check failure on line 307 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pClearMetadataMenu’

Check failure on line 307 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pClearMetadataMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 307 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pClearMetadataMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 307 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pClearMetadataMenu’

Check failure on line 307 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pClearMetadataMenu’

Check failure on line 307 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pClearMetadataMenu’

Check failure on line 307 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pClearMetadataMenu'

Check failure on line 307 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pClearMetadataMenu'

Check failure on line 307 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pClearMetadataMenu'

Check failure on line 307 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pClearMetadataMenu'
parented_ptr<QMenu> m_pAnalyzeMenu;

Check failure on line 308 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pAnalyzeMenu’

Check failure on line 308 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pAnalyzeMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 308 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pAnalyzeMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 308 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pAnalyzeMenu’

Check failure on line 308 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pAnalyzeMenu’

Check failure on line 308 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pAnalyzeMenu’

Check failure on line 308 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pAnalyzeMenu'

Check failure on line 308 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pAnalyzeMenu'

Check failure on line 308 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pAnalyzeMenu'

Check failure on line 308 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pAnalyzeMenu'
parented_ptr<QMenu> m_pBPMMenu;

Check failure on line 309 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pBPMMenu’

Check failure on line 309 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pBPMMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 309 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC) 

'WTrackMenu::m_pBPMMenu': 'parented_ptr<QMenu>' differs in levels of indirection from 'QMenu *'

Check failure on line 309 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / Ubuntu 24.04 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pBPMMenu’

Check failure on line 309 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pBPMMenu’

Check failure on line 309 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / coverage 

redeclaration of ‘parented_ptr<QMenu> WTrackMenu::m_pBPMMenu’

Check failure on line 309 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pBPMMenu'

Check failure on line 309 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 x64 

duplicate member 'm_pBPMMenu'

Check failure on line 309 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pBPMMenu'

Check failure on line 309 in src/widget/wtrackmenu.h

View workflow job for this annotation

GitHub Actions / macOS 13 arm64 

duplicate member 'm_pBPMMenu'
parented_ptr<QMenu> m_pColorMenu;
parented_ptr<WCoverArtMenu> m_pCoverMenu;
parented_ptr<WSearchRelatedTracksMenu> m_pSearchRelatedMenu;
parented_ptr<WFindOnWebMenu> m_pFindOnWebMenu;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
Expand Down

0 comments on commit 2534cf6

Please sign in to comment.