refactor: rename PIP_NO_\* to PIP_HAS_\* with inverted logic
All feature flags now use positive naming (enabled by default): - PIP_HAS_FILESYSTEM, PIP_HAS_THREADS, PIP_HAS_SOCKET - PIP_HAS_PROCESS, PIP_HAS_DYNLIB, PIP_HAS_FFT, PIP_HAS_SERIAL Preprocessor guards inverted: - #ifndef PIP_NO_X → #ifdef PIP_HAS_X - #ifdef PIP_NO_X → #ifndef PIP_HAS_X CMake options default ON instead of OFF. Platform blocks set flags OFF to disable features. 85 files transformed via Python script + 2 manual fixes.
This commit is contained in:
@@ -43,7 +43,7 @@ PIString mask(const PIString & str) {
|
||||
}
|
||||
|
||||
PIString overrideFile(PIString path) {
|
||||
#ifndef PIP_NO_FILESYSTEM
|
||||
#ifdef PIP_HAS_FILESYSTEM
|
||||
if (path.isEmpty()) return {};
|
||||
PIFile::FileInfo fi(path);
|
||||
auto ext = fi.extension();
|
||||
@@ -142,7 +142,7 @@ PIValueTree PIValueTreeConversions::fromText(PIIODevice * device) {
|
||||
PIMap<PIString, PIString> substitutions;
|
||||
if (!device) return ret;
|
||||
PIString base_path;
|
||||
#ifndef PIP_NO_FILESYSTEM
|
||||
#ifdef PIP_HAS_FILESYSTEM
|
||||
if (device->isTypeOf<PIFile>()) base_path = PIFile::FileInfo(device->path()).dir().replaceAll('\\', '/');
|
||||
#endif
|
||||
PIIOTextStream ts(device);
|
||||
@@ -217,7 +217,7 @@ PIValueTree PIValueTreeConversions::fromText(PIIODevice * device) {
|
||||
line.cutLeft(1).trim();
|
||||
if (path.front() == "include") {
|
||||
PIString include = line.trimmed();
|
||||
#ifndef PIP_NO_FILESYSTEM
|
||||
#ifdef PIP_HAS_FILESYSTEM
|
||||
if (!PIFile::FileInfo(include).isAbsolute()) {
|
||||
include = base_path + "/" + include.replaceAll('\\', '/');
|
||||
include.replaceAll("//", '/');
|
||||
@@ -353,7 +353,7 @@ PIValueTree PIValueTreeConversions::fromText(const PIString & str) {
|
||||
|
||||
|
||||
PIValueTree PIValueTreeConversions::fromJSONFile(const PIString & path) {
|
||||
#ifdef PIP_NO_FILESYSTEM
|
||||
#ifndef PIP_HAS_FILESYSTEM
|
||||
return PIValueTree();
|
||||
#else
|
||||
auto ret = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(path))));
|
||||
@@ -368,7 +368,7 @@ PIValueTree PIValueTreeConversions::fromJSONFile(const PIString & path) {
|
||||
|
||||
|
||||
PIValueTree PIValueTreeConversions::fromTextFile(const PIString & path) {
|
||||
#ifdef PIP_NO_FILESYSTEM
|
||||
#ifndef PIP_HAS_FILESYSTEM
|
||||
return PIValueTree();
|
||||
#else
|
||||
PIFile f(path, PIIODevice::ReadOnly);
|
||||
@@ -385,7 +385,7 @@ PIValueTree PIValueTreeConversions::fromTextFile(const PIString & path) {
|
||||
|
||||
|
||||
bool PIValueTreeConversions::toJSONFile(const PIString & path, const PIValueTree & root, Options options) {
|
||||
#ifdef PIP_NO_FILESYSTEM
|
||||
#ifndef PIP_HAS_FILESYSTEM
|
||||
return false;
|
||||
#else
|
||||
auto d = toJSON(root, options).toJSON(PIJSON::Tree).toUTF8();
|
||||
@@ -396,7 +396,7 @@ bool PIValueTreeConversions::toJSONFile(const PIString & path, const PIValueTree
|
||||
|
||||
|
||||
bool PIValueTreeConversions::toTextFile(const PIString & path, const PIValueTree & root, Options options) {
|
||||
#ifdef PIP_NO_FILESYSTEM
|
||||
#ifndef PIP_HAS_FILESYSTEM
|
||||
return false;
|
||||
#else
|
||||
auto d = toText(root, options).toUTF8();
|
||||
|
||||
Reference in New Issue
Block a user