Skip to content

Commit 8f1c085

Browse files
committed
Use custom symbol for imported
1 parent f63955e commit 8f1c085

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

projects/qt5/output-config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"include": ["../common/output-config.json", "doccomments.json"],
33
"configModule": "qt.config",
44
"helperModule": "qt.helpers",
5+
"importedSymbol": "dqtimported",
56
"builtinCppTypes": true,
67
"includeDeclFilenamePatterns": ["qt[0-9]*/orig/.*"],
78
"arrayLikeTypes": [

projects/qt6/output-config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"include": ["../common/output-config.json", "doccomments.json"],
33
"configModule": "qt.config",
44
"helperModule": "qt.helpers",
5+
"importedSymbol": "dqtimported",
56
"builtinCppTypes": true,
67
"includeDeclFilenamePatterns": ["qt[0-9]*/orig/.*"],
78
"arrayLikeTypes": [

src/cppconv/dwriter.d

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ struct DCodeOptions
128128
string indent = " ";
129129
string configModule = "config";
130130
string helperModule = "cppconvhelpers";
131+
string importedSymbol = "imported";
131132
bool includeAllDecls;
132133
ConfigRegex includeDeclFilenamePatterns;
133134
bool builtinCppTypes;
@@ -7766,7 +7767,7 @@ string qualifyName(string name, Declaration d, DWriterData data, Scope currentSc
77667767
&& data.currentMacroInstance.macroDeclaration !is null
77677768
&& data.currentMacroInstance.macroDeclaration.type == DeclarationType.macro_
77687769
&& data.currentMacroInstance.macroTranslation == MacroTranslation.mixin_)
7769-
name = "imported!q{" ~ data.fileByDecl[d].moduleName ~ "}." ~ name;
7770+
name = data.options.importedSymbol ~ "!q{" ~ data.fileByDecl[d].moduleName ~ "}." ~ name;
77707771
else if (d in data.fileByDecl && data.fileByDecl[d] != data.currentFilename
77717772
&& (!conditionInMultipleModules.isFalse || name in data.importedPackagesGraphHere))
77727773
name = data.fileByDecl[d].moduleName ~ "." ~ name;

0 commit comments

Comments
 (0)