Skip to content

Commit

Permalink
Do not exclude file provider config entries from compile on non-macOS…
Browse files Browse the repository at this point in the history
… platforms

Signed-off-by: Claudio Cambra <[email protected]>
  • Loading branch information
claucambra committed May 12, 2023
1 parent b7d9826 commit 23855a1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
6 changes: 0 additions & 6 deletions src/libsync/configfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,7 @@ static constexpr char certPasswd[] = "http_certificatePasswd";

static const QSet validUpdateChannels { QStringLiteral("stable"), QStringLiteral("beta") };

#ifdef Q_OS_MACOS
static constexpr auto macFileProviderModuleEnabledC = "macFileProviderModuleEnabled";
#endif
}

namespace OCC {
Expand Down Expand Up @@ -1175,8 +1173,6 @@ void ConfigFile::setDiscoveredLegacyConfigPath(const QString &discoveredLegacyCo
_discoveredLegacyConfigPath = discoveredLegacyConfigPath;
}

#ifdef Q_OS_MACOS

bool ConfigFile::macFileProviderModuleEnabled() const
{
QSettings settings(configFile(), QSettings::IniFormat);
Expand All @@ -1189,6 +1185,4 @@ void ConfigFile::setMacFileProviderModuleEnabled(const bool moduleEnabled)
settings.setValue(QLatin1String(macFileProviderModuleEnabledC), moduleEnabled);
}

#endif

}
2 changes: 0 additions & 2 deletions src/libsync/configfile.h
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,8 @@ class OWNCLOUDSYNC_EXPORT ConfigFile
[[nodiscard]] static QString discoveredLegacyConfigPath();
static void setDiscoveredLegacyConfigPath(const QString &discoveredLegacyConfigPath);

#ifdef Q_OS_MACOS
[[nodiscard]] bool macFileProviderModuleEnabled() const;
void setMacFileProviderModuleEnabled(const bool moduleEnabled);
#endif

protected:
[[nodiscard]] QVariant getPolicySetting(const QString &policy, const QVariant &defaultValue = QVariant()) const;
Expand Down

0 comments on commit 23855a1

Please sign in to comment.