mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-23 21:05:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix clang-tidy namespace concatenation warning

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2024-01-02 16:02:53 +08:00
parent 0856138b2e
commit fca6b37804
4 changed files with 8 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/macOS/fileproviderxpc.h
View file

@ -12,17 +12,15 @@
* for more details.
*/
#pragma once
#include <QObject>
#import <Foundation/Foundation.h>
#import "ClientCommunicationProtocol.h"
namespace OCC {
#pragma once
namespace Mac {
namespace OCC::Mac {
class FileProviderXPC : public QObject
{
@ -47,6 +45,4 @@ private:
NSDictionary<NSString *, NSObject<ClientCommunicationProtocol> *_clientCommServices;
};
}
}
} // namespace OCC::Mac

8
src/gui/macOS/fileproviderxpc_mac.mm
View file

@ -19,9 +19,7 @@
#include "gui/accountmanager.h"
#include "gui/macOS/fileproviderxpc_mac_utils.h"
namespace OCC {
namespace Mac {
namespace OCC::Mac {
Q_LOGGING_CATEGORY(lcFileProviderXPC, "nextcloud.gui.macos.fileprovider.xpc", QtInfoMsg)
@ -139,6 +137,4 @@ void FileProviderXPC::slotAccountStateChanged(const AccountState::State state) c
}
}
} // namespace OCC
} // namespace Mac
} // namespace OCC::Mac

6
src/gui/macOS/fileproviderxpc_mac_utils.h
View file

@ -19,9 +19,7 @@
#import "ClientCommunicationProtocol.h"
namespace OCC {
namespace Mac {
namespace FileProviderXPCUtils {
namespace OCC::Mac::FileProviderXPCUtils {
NSArray<NSFileProviderManager *> *getDomainManagers();
NSArray<NSURL *> *getDomainUrlsForManagers(NSArray<NSFileProviderManager *> *managers);
@ -31,6 +29,4 @@ void configureFileProviderConnection(NSXPCConnection *connection);
NSObject *getRemoteServiceObject(NSXPCConnection *connection, Protocol *protocol);
NSString *getExtensionAccountId(NSObject<ClientCommunicationProtocol> *clientCommService);
}
}
}

14
src/gui/macOS/fileproviderxpc_mac_utils.mm
View file

@ -19,20 +19,14 @@
#include "gui/accountmanager.h"
namespace {
const char *const clientCommunicationServiceName = "com.nextcloud.desktopclient.ClientCommunicationService";
NSString *const nsClientCommunicationServiceName = [NSString stringWithUTF8String:clientCommunicationServiceName];
}
namespace OCC {
namespace Mac {
namespace OCC::Mac::FileProviderXPCUtils {
Q_LOGGING_CATEGORY(lcFileProviderXPCUtils, "nextcloud.gui.macos.fileprovider.xpc.utils", QtInfoMsg)
namespace FileProviderXPCUtils {
NSArray<NSFileProviderManager *> *getDomainManagers()
{
dispatch_group_t group = dispatch_group_create();
@ -225,8 +219,4 @@ NSString *getExtensionAccountId(NSObject<ClientCommunicationProtocol> *const cli
return extensionNcAccount;
}
} // namespace FileProviderXPCUtils
} // namespace Mac
} // namespace OCC
} // namespace OCC::Mac::FileProviderXPCUtils