From 638545a9cc2c72eea34cfba6cb2bd847f31ca80a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 11 Mar 2019 15:54:30 +0100 Subject: shiboken: Make the indentor helper class more flexible Move it to a separate header and turn it into a non-type template with a tabWidth parameter to make it possible to use it with arbitrary tab widths. Turn it into a non-type template taking the tab width. Change-Id: Ib2b6a7379ce66d1a22e73b4cb6a4a9a9b457014d Reviewed-by: Cristian Maureira-Fredes --- sources/shiboken2/generator/shiboken2/overloaddata.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'sources/shiboken2/generator/shiboken2/overloaddata.cpp') diff --git a/sources/shiboken2/generator/shiboken2/overloaddata.cpp b/sources/shiboken2/generator/shiboken2/overloaddata.cpp index a95603754..6a85bf7ef 100644 --- a/sources/shiboken2/generator/shiboken2/overloaddata.cpp +++ b/sources/shiboken2/generator/shiboken2/overloaddata.cpp @@ -30,6 +30,7 @@ #include #include #include "overloaddata.h" +#include "indentor.h" #include "shibokengenerator.h" #include @@ -857,13 +858,14 @@ static inline QString toHtml(QString s) QString OverloadData::dumpGraph() const { - QString indent(4, QLatin1Char(' ')); + Indentor INDENT; + Indentation indent(INDENT); QString result; QTextStream s(&result); if (m_argPos == -1) { const AbstractMetaFunction* rfunc = referenceFunction(); s << "digraph OverloadedFunction {" << endl; - s << indent << "graph [fontsize=12 fontname=freemono labelloc=t splines=true overlap=false rankdir=LR];" << endl; + s << INDENT << "graph [fontsize=12 fontname=freemono labelloc=t splines=true overlap=false rankdir=LR];" << endl; // Shows all function signatures s << "legend [fontsize=9 fontname=freemono shape=rect label=\""; @@ -878,7 +880,7 @@ QString OverloadData::dumpGraph() const s << "\"];" << endl; // Function box title - s << indent << '"' << rfunc->name() << "\" [shape=plaintext style=\"filled,bold\" margin=0 fontname=freemono fillcolor=white penwidth=1 "; + s << INDENT << '"' << rfunc->name() << "\" [shape=plaintext style=\"filled,bold\" margin=0 fontname=freemono fillcolor=white penwidth=1 "; s << "label=<"; s << "
"; if (rfunc->ownerClass()) @@ -931,14 +933,14 @@ QString OverloadData::dumpGraph() const s << "
> ];" << endl; for (const OverloadData *pd : m_nextOverloadData) - s << indent << '"' << rfunc->name() << "\" -> " << pd->dumpGraph(); + s << INDENT << '"' << rfunc->name() << "\" -> " << pd->dumpGraph(); s << "}" << endl; } else { QString argId = QLatin1String("arg_") + QString::number(quintptr(this)); s << argId << ';' << endl; - s << indent << '"' << argId << "\" [shape=\"plaintext\" style=\"filled,bold\" margin=\"0\" fontname=\"freemono\" fillcolor=\"white\" penwidth=1 "; + s << INDENT << '"' << argId << "\" [shape=\"plaintext\" style=\"filled,bold\" margin=\"0\" fontname=\"freemono\" fillcolor=\"white\" penwidth=1 "; s << "label=<"; // Argument box title @@ -982,7 +984,7 @@ QString OverloadData::dumpGraph() const s << "
>];" << endl; for (const OverloadData *pd : m_nextOverloadData) - s << indent << argId << " -> " << pd->dumpGraph(); + s << INDENT << argId << " -> " << pd->dumpGraph(); } return result; } -- cgit v1.2.3