|
43 | 43 | #include "fileinfo.h"
|
44 | 44 | #include "dir.h"
|
45 | 45 | #include "textstream.h"
|
| 46 | +#include "dotgraph.h" |
46 | 47 |
|
47 | 48 | #define YY_NO_INPUT 1
|
48 | 49 | #define YY_NO_UNISTD_H 1
|
@@ -2064,13 +2065,11 @@ void Config::checkAndCorrect(bool quiet, const bool check)
|
2064 | 2065 |
|
2065 | 2066 | }
|
2066 | 2067 |
|
2067 |
| -static void appendAttribute(QCString& a, const char * name, ConfigObsolete* value) |
| 2068 | +static void appendAttribute(DotAttributes& attr, QCString name, ConfigObsolete* value) |
2068 | 2069 | {
|
2069 | 2070 | if (!value || !value->valueStringRef()->length())
|
2070 | 2071 | return;
|
2071 |
| - if (a.length()) |
2072 |
| - a += ' '; |
2073 |
| - a += name + QCString("=") + value->valueStringRef()->quoted(); |
| 2072 | + attr[name] = *value->valueStringRef(); |
2074 | 2073 | }
|
2075 | 2074 |
|
2076 | 2075 | void Config::updateObsolete()
|
@@ -2113,15 +2112,19 @@ void Config::updateObsolete()
|
2113 | 2112 | " You may want to clear or change DOT_FONTNAME.\n"
|
2114 | 2113 | " Otherwise you run the risk that the wrong font is being used for dot generated graphs.\n");
|
2115 | 2114 |
|
2116 |
| - QCString& common_attr = *dynamic_cast<ConfigString*>(ConfigImpl::instance()->get("DOT_COMMON_ATTR"))->valueRef(); |
| 2115 | + QCString& common_attr_str = *dynamic_cast<ConfigString*>(ConfigImpl::instance()->get("DOT_COMMON_ATTR"))->valueRef(); |
| 2116 | + DotAttributes common_attr{common_attr_str}; |
2117 | 2117 |
|
2118 | 2118 | appendAttribute(common_attr, "fontname", fontname);
|
2119 | 2119 | appendAttribute(common_attr, "fontsize", fontsize);
|
| 2120 | + common_attr_str = common_attr.str(); |
2120 | 2121 |
|
2121 |
| - QCString& edge_attr = *dynamic_cast<ConfigString*>(ConfigImpl::instance()->get("DOT_EDGE_ATTR"))->valueRef(); |
| 2122 | + QCString& edge_attr_str = *dynamic_cast<ConfigString*>(ConfigImpl::instance()->get("DOT_EDGE_ATTR"))->valueRef(); |
| 2123 | + DotAttributes edge_attr{edge_attr_str}; |
2122 | 2124 |
|
2123 | 2125 | appendAttribute(edge_attr, "labelfontname", fontname);
|
2124 | 2126 | appendAttribute(edge_attr, "labelfontsize", fontsize);
|
| 2127 | + edge_attr_str = edge_attr.str(); |
2125 | 2128 | }
|
2126 | 2129 |
|
2127 | 2130 | void Config::writeTemplate(TextStream &t,bool shortList,bool update)
|
|
0 commit comments