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.

Sign up for GitHub

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

Jump to bottom

kill CNetworkServices global #13785

Merged
merged 2 commits into from Apr 23, 2018
Merged

kill CNetworkServices global #13785

merged 2 commits into from Apr 23, 2018

Conversation

afedchin
Copy link
Member

see title

@afedchin afedchin added Type: Cleanup non-breaking change which removes non-working or unmaintained functionality v18 Leia labels Apr 18, 2018
@afedchin afedchin added this to the Leia 18.0-alpha2 milestone Apr 18, 2018
@afedchin afedchin requested a review from garbear April 18, 2018 08:38
@afedchin afedchin changed the title kill CNetworkServices glogal kill CNetworkServices global Apr 18, 2018
@notspiff
Copy link
Contributor

consider incorporating some ala 56514f1 so you kill the ifdef spaghetti.

@afedchin
Copy link
Member Author

@notspiff I'll add it. thanks.

garbear
garbear reviewed Apr 18, 2018
View reviewed changes
xbmc/network/Network.h
@@ -160,6 +167,8 @@ class CNetwork
#include "platform/win32/network/NetworkWin32.h"
#elif defined(HAS_WIN10_NETWORK)
#include "platform/win10/network/NetworkWin10.h"
#else
using CNetwork = CNetworkBase;

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@notspiff @afedchin
changed: rename CNetwork to CNetworkBase
594d81c 
and add typedefs to CNetwork for specific platforms.
in preparation for rtti'ing the service
@afedchin
Copy link
Member Author

jenkins build this please

@afedchin
Copy link
Member Author

@garbear is this good to go?

@notspiff
Copy link
Contributor

4 days, no comment. i'm merging.

@notspiff notspiff merged commit 0ce9982 into xbmc:master Apr 23, 2018
stefansaraev
stefansaraev reviewed Apr 23, 2018
View reviewed changes
xbmc/network/NetworkServices.cpp
#ifdef HAS_WEB_SERVER
:
m_settings(settings),

This comment was marked as spam.

Sign in to view

@stefansaraev stefansaraev mentioned this pull request Apr 23, 2018
Merged
10 tasks
@afedchin afedchin deleted the network-global branch April 25, 2018 05:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@garbear garbear garbear left review comments

@stefansaraev stefansaraev stefansaraev left review comments

@notspiff notspiff notspiff left review comments

Assignees
No one assigned
Labels
Component: Profiles Type: Cleanup non-breaking change which removes non-working or unmaintained functionality v18 Leia
Projects
None yet
Milestone
Leia 18.0-alpha2
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@afedchin @notspiff @garbear @stefansaraev