Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move FolderCreationDialog into the OCC namespace #2904

Merged
merged 1 commit into from
Feb 5, 2021

Conversation

ivaradi
Copy link
Contributor

@ivaradi ivaradi commented Feb 4, 2021

Compilation has started to fail recently with the following:

                 from /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/src/gui/nextcloudCore_autogen/mocs_compilation.cpp:24:
/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/src/gui/nextcloudCore_autogen/EWIEGA46WW/../../../../../src/gui/foldercreationdialog.h:38:5: error: reference to ‘Ui’ is ambiguous
   38 |     Ui::FolderCreationDialog *ui;
      |     ^~
In file included from /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/src/gui/nextcloudCore_autogen/EWIEGA46WW/moc_accountsettings.cpp:10,
                 from /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/src/gui/nextcloudCore_autogen/mocs_compilation.cpp:7:
/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/src/gui/nextcloudCore_autogen/EWIEGA46WW/../../../../../src/gui/accountsettings.h:37:11: note: candidates are: ‘namespace OCC::Ui { }’
   37 | namespace Ui {
      |           ^~
In file included from /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/src/gui/nextcloudCore_autogen/EWIEGA46WW/moc_foldercreationdialog.cpp:10,
                 from /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/src/gui/nextcloudCore_autogen/mocs_compilation.cpp:24:
/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/src/gui/nextcloudCore_autogen/EWIEGA46WW/../../../../../src/gui/foldercreationdialog.h:20:11: note:                 ‘namespace Ui { }’
   20 | namespace Ui {
      |           ^~

This patch attempts to fix it by moving FolderCreationDialog into the OCC namespace.

@ivaradi ivaradi requested a review from allexzander February 4, 2021 15:15
Copy link
Member

@er-vin er-vin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't the problem more that FolderCreationDialog isn't in the OCC namespace?

@ivaradi ivaradi changed the title Make Ui namespace reference unambiguous Move FolderCreationDialog into the OCC namespace Feb 4, 2021
@ivaradi
Copy link
Contributor Author

ivaradi commented Feb 4, 2021

That sounds reasonable and seems to work too (now really...)

@ivaradi ivaradi force-pushed the ui-namespace branch 2 times, most recently from 4baf25b to ef1f3e0 Compare February 4, 2021 16:31
@ivaradi ivaradi requested a review from er-vin February 4, 2021 18:18
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-2904-92f1074fcce742ab9d2acac83c5f270f62430224-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@allexzander
Copy link
Contributor

@ivaradi @er-vin Good catch indeed. My bad for overlooking this. Many thanks.

@allexzander allexzander merged commit 496f174 into nextcloud:master Feb 5, 2021
@ivaradi ivaradi deleted the ui-namespace branch September 16, 2024 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants