diff --git a/src/libs/3rdparty/modeling/qmt/config/configcontroller.cpp b/src/libs/3rdparty/modeling/qmt/config/configcontroller.cpp
index 09520e1006a54917c93a71656e296e66a02a5d88..6df4cb28975b519123757410237586db836dff9c 100644
--- a/src/libs/3rdparty/modeling/qmt/config/configcontroller.cpp
+++ b/src/libs/3rdparty/modeling/qmt/config/configcontroller.cpp
@@ -66,9 +66,9 @@ ConfigController::~ConfigController()
delete d;
}
-void ConfigController::setStereotypeController(StereotypeController *stereotype_controller)
+void ConfigController::setStereotypeController(StereotypeController *stereotypeController)
{
- d->m_stereotypeController = stereotype_controller;
+ d->m_stereotypeController = stereotypeController;
}
void ConfigController::readStereotypeDefinitions(const QString &path)
@@ -79,8 +79,8 @@ void ConfigController::readStereotypeDefinitions(const QString &path)
QDir dir(path);
dir.setNameFilters(QStringList() << QStringLiteral("*.def"));
- foreach (const QString &file_name, dir.entryList(QDir::Files)) {
- QFile file(QFileInfo(dir, file_name).absoluteFilePath());
+ foreach (const QString &fileName, dir.entryList(QDir::Files)) {
+ QFile file(QFileInfo(dir, fileName).absoluteFilePath());
if (file.open(QIODevice::ReadOnly)) {
QString text = QString::fromUtf8(file.readAll());
file.close();
@@ -99,9 +99,9 @@ void ConfigController::readStereotypeDefinitions(const QString &path)
}
}
-void ConfigController::onStereotypeIconParsed(const StereotypeIcon &stereotype_icon)
+void ConfigController::onStereotypeIconParsed(const StereotypeIcon &stereotypeIcon)
{
- d->m_stereotypeController->addStereotypeIcon(stereotype_icon);
+ d->m_stereotypeController->addStereotypeIcon(stereotypeIcon);
}
void ConfigController::onToolbarParsed(const Toolbar &toolbar)
diff --git a/src/libs/3rdparty/modeling/qmt/config/configcontroller.h b/src/libs/3rdparty/modeling/qmt/config/configcontroller.h
index a3ade9d5eadee9df80eb037313941e16484aaeb2..b8bcc72adafb2aaa5d1f2337e1d653a85a8f2ba1 100644
--- a/src/libs/3rdparty/modeling/qmt/config/configcontroller.h
+++ b/src/libs/3rdparty/modeling/qmt/config/configcontroller.h
@@ -55,7 +55,7 @@ public:
public:
- void setStereotypeController(StereotypeController *stereotype_controller);
+ void setStereotypeController(StereotypeController *stereotypeController);
public:
@@ -63,7 +63,7 @@ public:
private slots:
- void onStereotypeIconParsed(const StereotypeIcon &stereotype_icon);
+ void onStereotypeIconParsed(const StereotypeIcon &stereotypeIcon);
void onToolbarParsed(const Toolbar &toolbar);
diff --git a/src/libs/3rdparty/modeling/qmt/config/sourcepos.cpp b/src/libs/3rdparty/modeling/qmt/config/sourcepos.cpp
index 0a49bba2c7fb2a518b96f046777d864b74982713..b9cf89a6e3e53555d06b30d1b0304200f275e66d 100644
--- a/src/libs/3rdparty/modeling/qmt/config/sourcepos.cpp
+++ b/src/libs/3rdparty/modeling/qmt/config/sourcepos.cpp
@@ -39,10 +39,10 @@ SourcePos::SourcePos()
{
}
-SourcePos::SourcePos(int source_id, int line_number, int column_number)
- : m_sourceId(source_id),
- m_lineNumber(line_number),
- m_columnNumber(column_number)
+SourcePos::SourcePos(int sourceId, int lineNumber, int columnNumber)
+ : m_sourceId(sourceId),
+ m_lineNumber(lineNumber),
+ m_columnNumber(columnNumber)
{
}
diff --git a/src/libs/3rdparty/modeling/qmt/config/sourcepos.h b/src/libs/3rdparty/modeling/qmt/config/sourcepos.h
index 897348e0fa0ff02c265d2d29624c0bae1c35d992..7e745d4b8903c750d986382482498015c3e9cd39 100644
--- a/src/libs/3rdparty/modeling/qmt/config/sourcepos.h
+++ b/src/libs/3rdparty/modeling/qmt/config/sourcepos.h
@@ -41,7 +41,7 @@ public:
SourcePos();
- SourcePos(int source_id, int line_number, int column_number = -1);
+ SourcePos(int sourceId, int lineNumber, int columnNumber = -1);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.cpp b/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.cpp
index 2e7591bb274e2e3cb7da0c47c5ae402eede846b5..01fdc836dbc179f587109e4d9b0ec3ebdb71a41c 100644
--- a/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.cpp
+++ b/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.cpp
@@ -95,9 +95,9 @@ QHash<T, U> operator<<(QHash<T, U> hash, QPair<T, U> pair) {
}
-StereotypeDefinitionParserError::StereotypeDefinitionParserError(const QString &error_msg, const SourcePos &source_pos)
- : Exception(error_msg),
- m_sourcePos(source_pos)
+StereotypeDefinitionParserError::StereotypeDefinitionParserError(const QString &errorMsg, const SourcePos &sourcePos)
+ : Exception(errorMsg),
+ m_sourcePos(sourcePos)
{
}
@@ -145,8 +145,8 @@ StereotypeDefinitionParser::~StereotypeDefinitionParser()
void StereotypeDefinitionParser::parse(ITextSource *source)
{
- TextScanner text_scanner;
- text_scanner.setKeywords(
+ TextScanner textScanner;
+ textScanner.setKeywords(
QList<QPair<QString, int> >()
<< qMakePair(QString(QStringLiteral("icon")), KEYWORD_ICON)
<< qMakePair(QString(QStringLiteral("title")), KEYWORD_TITLE)
@@ -178,7 +178,7 @@ void StereotypeDefinitionParser::parse(ITextSource *source)
<< qMakePair(QString(QStringLiteral("tool")), KEYWORD_TOOL)
<< qMakePair(QString(QStringLiteral("separator")), KEYWORD_SEPARATOR)
);
- text_scanner.setOperators(
+ textScanner.setOperators(
QList<QPair<QString, int> >()
<< qMakePair(QString(QStringLiteral(";")), OPERATOR_SEMICOLON)
<< qMakePair(QString(QStringLiteral(":")), OPERATOR_COLON)
@@ -186,9 +186,9 @@ void StereotypeDefinitionParser::parse(ITextSource *source)
<< qMakePair(QString(QStringLiteral(".")), OPERATOR_PERIOD)
<< qMakePair(QString(QStringLiteral("-")), OPERATOR_MINUS)
);
- text_scanner.setSource(source);
+ textScanner.setSource(source);
- d->m_scanner = &text_scanner;
+ d->m_scanner = &textScanner;
try {
parseFile();
} catch (...) {
@@ -227,22 +227,22 @@ void StereotypeDefinitionParser::parseIcon()
throw StereotypeDefinitionParserError(QStringLiteral("Expected identifier."), token.getSourcePos());
}
QString id = token.getText();
- StereotypeIcon stereotype_icon;
- stereotype_icon.setId(id);
- parseIconProperties(&stereotype_icon);
+ StereotypeIcon stereotypeIcon;
+ stereotypeIcon.setId(id);
+ parseIconProperties(&stereotypeIcon);
token = readNextToken();
if (token.getType() != Token::TOKEN_KEYWORD || token.getSubtype() != KEYWORD_BEGIN) {
throw StereotypeDefinitionParserError(QStringLiteral("Expected token 'begin'."), token.getSourcePos());
}
- parseIconCommands(&stereotype_icon);
+ parseIconCommands(&stereotypeIcon);
token = readNextToken();
if (token.getType() != Token::TOKEN_KEYWORD || token.getSubtype() != KEYWORD_END) {
throw StereotypeDefinitionParserError(QStringLiteral("Expected token 'end'."), token.getSourcePos());
}
- emit iconParsed(stereotype_icon);
+ emit iconParsed(stereotypeIcon);
}
-void StereotypeDefinitionParser::parseIconProperties(StereotypeIcon *stereotype_icon)
+void StereotypeDefinitionParser::parseIconProperties(StereotypeIcon *stereotypeIcon)
{
Token token;
bool loop = true;
@@ -255,24 +255,24 @@ void StereotypeDefinitionParser::parseIconProperties(StereotypeIcon *stereotype_
} else {
switch (token.getSubtype()) {
case KEYWORD_TITLE:
- stereotype_icon->setTitle(parseStringProperty());
+ stereotypeIcon->setTitle(parseStringProperty());
expectSemicolonOrEndOfLine();
break;
case KEYWORD_ELEMENTS:
{
QList<QString> identifiers = parseIdentifierListProperty();
foreach (const QString &identifier, identifiers) {
- static QHash<QString, StereotypeIcon::Element> element_names = QHash<QString, StereotypeIcon::Element>()
+ static QHash<QString, StereotypeIcon::Element> elementNames = QHash<QString, StereotypeIcon::Element>()
<< qMakePair(QString(QStringLiteral("package")), StereotypeIcon::ELEMENT_PACKAGE)
<< qMakePair(QString(QStringLiteral("component")), StereotypeIcon::ELEMENT_COMPONENT)
<< qMakePair(QString(QStringLiteral("class")), StereotypeIcon::ELEMENT_CLASS)
<< qMakePair(QString(QStringLiteral("diagram")), StereotypeIcon::ELEMENT_DIAGRAM)
<< qMakePair(QString(QStringLiteral("item")), StereotypeIcon::ELEMENT_ITEM);
- QString element_name = identifier.toLower();
- if (!element_names.contains(element_name)) {
+ QString elementName = identifier.toLower();
+ if (!elementNames.contains(elementName)) {
throw StereotypeDefinitionParserError(QString(QStringLiteral("Unexpected value \"%1\" for element.")).arg(identifier), token.getSourcePos());
}
- elements.insert(element_names.value(element_name));
+ elements.insert(elementNames.value(elementName));
}
expectSemicolonOrEndOfLine();
break;
@@ -282,75 +282,75 @@ void StereotypeDefinitionParser::parseIconProperties(StereotypeIcon *stereotype_
expectSemicolonOrEndOfLine();
break;
case KEYWORD_WIDTH:
- stereotype_icon->setWidth(parseFloatProperty());
+ stereotypeIcon->setWidth(parseFloatProperty());
expectSemicolonOrEndOfLine();
break;
case KEYWORD_HEIGHT:
- stereotype_icon->setHeight(parseFloatProperty());
+ stereotypeIcon->setHeight(parseFloatProperty());
expectSemicolonOrEndOfLine();
break;
case KEYWORD_MINWIDTH:
- stereotype_icon->setMinWidth(parseFloatProperty());
+ stereotypeIcon->setMinWidth(parseFloatProperty());
expectSemicolonOrEndOfLine();
break;
case KEYWORD_MINHEIGHT:
- stereotype_icon->setMinHeight(parseFloatProperty());
+ stereotypeIcon->setMinHeight(parseFloatProperty());
expectSemicolonOrEndOfLine();
break;
case KEYWORD_LOCK_SIZE:
{
- QString lock_value = parseIdentifierProperty();
- QString lock_name = lock_value.toLower();
- static QHash<QString, StereotypeIcon::SizeLock> lock_names = QHash<QString, StereotypeIcon::SizeLock>()
+ QString lockValue = parseIdentifierProperty();
+ QString lockName = lockValue.toLower();
+ static QHash<QString, StereotypeIcon::SizeLock> lockNames = QHash<QString, StereotypeIcon::SizeLock>()
<< qMakePair(QString(QStringLiteral("none")), StereotypeIcon::LOCK_NONE)
<< qMakePair(QString(QStringLiteral("width")), StereotypeIcon::LOCK_WIDTH)
<< qMakePair(QString(QStringLiteral("height")), StereotypeIcon::LOCK_HEIGHT)
<< qMakePair(QString(QStringLiteral("size")), StereotypeIcon::LOCK_SIZE)
<< qMakePair(QString(QStringLiteral("ratio")), StereotypeIcon::LOCK_RATIO);
- if (lock_names.contains(lock_name)) {
- StereotypeIcon::SizeLock size_lock = lock_names.value(lock_name);
- stereotype_icon->setSizeLock(size_lock);
+ if (lockNames.contains(lockName)) {
+ StereotypeIcon::SizeLock sizeLock = lockNames.value(lockName);
+ stereotypeIcon->setSizeLock(sizeLock);
} else {
- throw StereotypeDefinitionParserError(QString(QStringLiteral("Unexpected value \"%1\" for size lock.")).arg(lock_value), token.getSourcePos());
+ throw StereotypeDefinitionParserError(QString(QStringLiteral("Unexpected value \"%1\" for size lock.")).arg(lockValue), token.getSourcePos());
}
break;
}
case KEYWORD_DISPLAY:
{
- QString display_value = parseIdentifierProperty();
- QString display_name = display_value.toLower();
- static QHash<QString, StereotypeIcon::Display> display_names = QHash<QString, StereotypeIcon::Display>()
+ QString displayValue = parseIdentifierProperty();
+ QString displayName = displayValue.toLower();
+ static QHash<QString, StereotypeIcon::Display> displayNames = QHash<QString, StereotypeIcon::Display>()
<< qMakePair(QString(QStringLiteral("none")), StereotypeIcon::DISPLAY_NONE)
<< qMakePair(QString(QStringLiteral("label")), StereotypeIcon::DISPLAY_LABEL)
<< qMakePair(QString(QStringLiteral("decoration")), StereotypeIcon::DISPLAY_DECORATION)
<< qMakePair(QString(QStringLiteral("icon")), StereotypeIcon::DISPLAY_ICON)
<< qMakePair(QString(QStringLiteral("smart")), StereotypeIcon::DISPLAY_SMART);
- if (display_names.contains(display_name)) {
- StereotypeIcon::Display display = display_names.value(display_name);
- stereotype_icon->setDisplay(display);
+ if (displayNames.contains(displayName)) {
+ StereotypeIcon::Display display = displayNames.value(displayName);
+ stereotypeIcon->setDisplay(display);
} else {
- throw StereotypeDefinitionParserError(QString(QStringLiteral("Unexpected value \"%1\" for stereotype display.")).arg(display_value), token.getSourcePos());
+ throw StereotypeDefinitionParserError(QString(QStringLiteral("Unexpected value \"%1\" for stereotype display.")).arg(displayValue), token.getSourcePos());
}
break;
}
case KEYWORD_TEXTALIGN:
{
- QString align_value = parseIdentifierProperty();
- QString align_name = align_value.toLower();
- static QHash<QString, StereotypeIcon::TextAlignment> align_names = QHash<QString, StereotypeIcon::TextAlignment>()
+ QString alignValue = parseIdentifierProperty();
+ QString alignName = alignValue.toLower();
+ static QHash<QString, StereotypeIcon::TextAlignment> alignNames = QHash<QString, StereotypeIcon::TextAlignment>()
<< qMakePair(QString(QStringLiteral("below")), StereotypeIcon::TEXTALIGN_BELOW)
<< qMakePair(QString(QStringLiteral("center")), StereotypeIcon::TEXTALIGN_CENTER)
<< qMakePair(QString(QStringLiteral("none")), StereotypeIcon::TEXTALIGN_NONE);
- if (align_names.contains(align_name)) {
- StereotypeIcon::TextAlignment text_alignment = align_names.value(align_name);
- stereotype_icon->setTextAlignment(text_alignment);
+ if (alignNames.contains(alignName)) {
+ StereotypeIcon::TextAlignment textAlignment = alignNames.value(alignName);
+ stereotypeIcon->setTextAlignment(textAlignment);
} else {
- throw StereotypeDefinitionParserError(QString(QStringLiteral("Unexpected value \"%1\" for text alignment.")).arg(align_value), token.getSourcePos());
+ throw StereotypeDefinitionParserError(QString(QStringLiteral("Unexpected value \"%1\" for text alignment.")).arg(alignValue), token.getSourcePos());
}
break;
}
case KEYWORD_BASECOLOR:
- stereotype_icon->setBaseColor(parseColorProperty());
+ stereotypeIcon->setBaseColor(parseColorProperty());
expectSemicolonOrEndOfLine();
break;
default:
@@ -359,8 +359,8 @@ void StereotypeDefinitionParser::parseIconProperties(StereotypeIcon *stereotype_
}
}
}
- stereotype_icon->setElements(elements);
- stereotype_icon->setStereotypes(stereotypes);
+ stereotypeIcon->setElements(elements);
+ stereotypeIcon->setStereotypes(stereotypes);
d->m_scanner->unread(token);
}
@@ -464,11 +464,11 @@ QColor StereotypeDefinitionParser::parseColorProperty()
return parseColorExpression();
}
-void StereotypeDefinitionParser::parseIconCommands(StereotypeIcon *stereotype_icon)
+void StereotypeDefinitionParser::parseIconCommands(StereotypeIcon *stereotypeIcon)
{
Token token;
bool loop = true;
- IconShape icon_shape;
+ IconShape iconShape;
QList<ShapeValueF> parameters;
typedef QList<IconCommandParameter> Parameters;
@@ -484,67 +484,67 @@ void StereotypeDefinitionParser::parseIconCommands(StereotypeIcon *stereotype_ic
switch (token.getSubtype()) {
case KEYWORD_CIRCLE:
parameters = parseIconCommandParameters(Parameters() << SCALED << SCALED << SCALED);
- icon_shape.addCircle(ShapePointF(parameters.at(0), parameters.at(1)), parameters.at(2));
+ iconShape.addCircle(ShapePointF(parameters.at(0), parameters.at(1)), parameters.at(2));
expectSemicolonOrEndOfLine();
break;
case KEYWORD_ELLIPSE:
parameters = parseIconCommandParameters(Parameters() << SCALED << SCALED << SCALED << SCALED);
- icon_shape.addEllipse(ShapePointF(parameters.at(0), parameters.at(1)), ShapeSizeF(parameters.at(2), parameters.at(3)));
+ iconShape.addEllipse(ShapePointF(parameters.at(0), parameters.at(1)), ShapeSizeF(parameters.at(2), parameters.at(3)));
expectSemicolonOrEndOfLine();
break;
case KEYWORD_LINE:
parameters = parseIconCommandParameters(Parameters() << SCALED << SCALED << SCALED << SCALED);
- icon_shape.addLine(ShapePointF(parameters.at(0), parameters.at(1)), ShapePointF(parameters.at(2), parameters.at(3)));
+ iconShape.addLine(ShapePointF(parameters.at(0), parameters.at(1)), ShapePointF(parameters.at(2), parameters.at(3)));
expectSemicolonOrEndOfLine();
break;
case KEYWORD_RECT:
parameters = parseIconCommandParameters(Parameters() << SCALED << SCALED << SCALED << SCALED);
- icon_shape.addRect(ShapePointF(parameters.at(0), parameters.at(1)), ShapeSizeF(parameters.at(2), parameters.at(3)));
+ iconShape.addRect(ShapePointF(parameters.at(0), parameters.at(1)), ShapeSizeF(parameters.at(2), parameters.at(3)));
expectSemicolonOrEndOfLine();
break;
case KEYWORD_ROUNDEDRECT:
parameters = parseIconCommandParameters(Parameters() << SCALED << SCALED << SCALED << SCALED << FIX);
- icon_shape.addRoundedRect(ShapePointF(parameters.at(0), parameters.at(1)), ShapeSizeF(parameters.at(2), parameters.at(3)), parameters.at(4));
+ iconShape.addRoundedRect(ShapePointF(parameters.at(0), parameters.at(1)), ShapeSizeF(parameters.at(2), parameters.at(3)), parameters.at(4));
expectSemicolonOrEndOfLine();
break;
case KEYWORD_ARC:
{
parameters = parseIconCommandParameters(Parameters() << SCALED << SCALED << SCALED << SCALED << ABSOLUTE << ABSOLUTE);
- qreal start_angle = expectAbsoluteValue(parameters.at(4), d->m_scanner->getSourcePos());
- qreal span_angle = expectAbsoluteValue(parameters.at(5), d->m_scanner->getSourcePos());
- icon_shape.addArc(ShapePointF(parameters.at(0), parameters.at(1)), ShapeSizeF(parameters.at(2), parameters.at(3)), start_angle, span_angle);
+ qreal startAngle = expectAbsoluteValue(parameters.at(4), d->m_scanner->getSourcePos());
+ qreal spanAngle = expectAbsoluteValue(parameters.at(5), d->m_scanner->getSourcePos());
+ iconShape.addArc(ShapePointF(parameters.at(0), parameters.at(1)), ShapeSizeF(parameters.at(2), parameters.at(3)), startAngle, spanAngle);
expectSemicolonOrEndOfLine();
break;
}
case KEYWORD_MOVETO:
parameters = parseIconCommandParameters(Parameters() << SCALED << SCALED);
- icon_shape.moveTo(ShapePointF(parameters.at(0), parameters.at(1)));
+ iconShape.moveTo(ShapePointF(parameters.at(0), parameters.at(1)));
expectSemicolonOrEndOfLine();
break;
case KEYWORD_LINETO:
parameters = parseIconCommandParameters(Parameters() << SCALED << SCALED);
- icon_shape.lineTo(ShapePointF(parameters.at(0), parameters.at(1)));
+ iconShape.lineTo(ShapePointF(parameters.at(0), parameters.at(1)));
expectSemicolonOrEndOfLine();
break;
case KEYWORD_ARCMOVETO:
{
parameters = parseIconCommandParameters(Parameters() << SCALED << SCALED << SCALED << SCALED << ABSOLUTE);
qreal angle = expectAbsoluteValue(parameters.at(4), d->m_scanner->getSourcePos());
- icon_shape.arcMoveTo(ShapePointF(parameters.at(0), parameters.at(1)), ShapeSizeF(parameters.at(2), parameters.at(3)), angle);
+ iconShape.arcMoveTo(ShapePointF(parameters.at(0), parameters.at(1)), ShapeSizeF(parameters.at(2), parameters.at(3)), angle);
expectSemicolonOrEndOfLine();
break;
}
case KEYWORD_ARCTO:
{
parameters = parseIconCommandParameters(Parameters() << SCALED << SCALED << SCALED << SCALED << ABSOLUTE << ABSOLUTE);
- qreal start_angle = expectAbsoluteValue(parameters.at(4), d->m_scanner->getSourcePos());
- qreal sweep_length = expectAbsoluteValue(parameters.at(5), d->m_scanner->getSourcePos());
- icon_shape.arcTo(ShapePointF(parameters.at(0), parameters.at(1)), ShapeSizeF(parameters.at(2), parameters.at(3)), start_angle, sweep_length);
+ qreal startAngle = expectAbsoluteValue(parameters.at(4), d->m_scanner->getSourcePos());
+ qreal sweepLength = expectAbsoluteValue(parameters.at(5), d->m_scanner->getSourcePos());
+ iconShape.arcTo(ShapePointF(parameters.at(0), parameters.at(1)), ShapeSizeF(parameters.at(2), parameters.at(3)), startAngle, sweepLength);
expectSemicolonOrEndOfLine();
break;
}
case KEYWORD_CLOSE:
- icon_shape.closePath();
+ iconShape.closePath();
expectSemicolonOrEndOfLine();
break;
default:
@@ -553,7 +553,7 @@ void StereotypeDefinitionParser::parseIconCommands(StereotypeIcon *stereotype_ic
}
}
}
- stereotype_icon->setIconShape(icon_shape);
+ stereotypeIcon->setIconShape(iconShape);
d->m_scanner->unread(token);
}
@@ -594,25 +594,25 @@ void StereotypeDefinitionParser::parseToolbarCommands(Toolbar *toolbar)
switch (token.getSubtype()) {
case KEYWORD_TOOL:
{
- QString tool_name = parseStringExpression();
+ QString toolName = parseStringExpression();
expectComma();
QString element = parseIdentifierExpression();
- static QSet<QString> element_names = QSet<QString>()
+ static QSet<QString> elementNames = QSet<QString>()
<< QStringLiteral("package")
<< QStringLiteral("component")
<< QStringLiteral("class")
<< QStringLiteral("item")
<< QStringLiteral("annotation")
<< QStringLiteral("boundary");
- QString element_name = element.toLower();
- if (!element_names.contains(element_name)) {
+ QString elementName = element.toLower();
+ if (!elementNames.contains(elementName)) {
throw StereotypeDefinitionParserError(QString(QStringLiteral("Unexpected value \"%1\" for element.")).arg(element), token.getSourcePos());
}
QString stereotype;
if (nextIsComma()) {
stereotype = parseStringExpression();
}
- tools.append(Toolbar::Tool(tool_name, element, stereotype));
+ tools.append(Toolbar::Tool(toolName, element, stereotype));
expectSemicolonOrEndOfLine();
break;
}
@@ -727,10 +727,10 @@ Token StereotypeDefinitionParser::readNextToken()
}
}
-qreal StereotypeDefinitionParser::expectAbsoluteValue(const ShapeValueF &value, const SourcePos &source_pos)
+qreal StereotypeDefinitionParser::expectAbsoluteValue(const ShapeValueF &value, const SourcePos &sourcePos)
{
if (value.getUnit() != ShapeValueF::UNIT_ABSOLUTE || value.getOrigin() != ShapeValueF::ORIGIN_SMART) {
- throw StereotypeDefinitionParserError(QStringLiteral("Expected absolute value"), source_pos);
+ throw StereotypeDefinitionParserError(QStringLiteral("Expected absolute value"), sourcePos);
}
return value.getValue();
}
@@ -753,11 +753,11 @@ bool StereotypeDefinitionParser::nextIsComma()
return true;
}
-void StereotypeDefinitionParser::expectOperator(int op, const QString &op_name)
+void StereotypeDefinitionParser::expectOperator(int op, const QString &opName)
{
Token token = d->m_scanner->read();
if (token.getType() != Token::TOKEN_OPERATOR || token.getSubtype() != op) {
- throw StereotypeDefinitionParserError(QString(QStringLiteral("Expected '%1'.")).arg(op_name), token.getSourcePos());
+ throw StereotypeDefinitionParserError(QString(QStringLiteral("Expected '%1'.")).arg(opName), token.getSourcePos());
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.h b/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.h
index cc8aad00b1be1d74aa7ec9e5c6f3b41eb207fbdb..3c01b1fb3a3d6e8710146984c6cba5bca38dab51 100644
--- a/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.h
+++ b/src/libs/3rdparty/modeling/qmt/config/stereotypedefinitionparser.h
@@ -50,7 +50,7 @@ class QMT_EXPORT StereotypeDefinitionParserError :
{
public:
- StereotypeDefinitionParserError(const QString &error_msg, const SourcePos &source_pos);
+ StereotypeDefinitionParserError(const QString &errorMsg, const SourcePos &sourcePos);
~StereotypeDefinitionParserError();
@@ -79,7 +79,7 @@ public:
signals:
- void iconParsed(const StereotypeIcon &stereotype_icon);
+ void iconParsed(const StereotypeIcon &stereotypeIcon);
void toolbarParsed(const Toolbar &toolbar);
@@ -93,7 +93,7 @@ private:
void parseIcon();
- void parseIconProperties(StereotypeIcon *stereotype_icon);
+ void parseIconProperties(StereotypeIcon *stereotypeIcon);
void parseToolbar();
@@ -113,7 +113,7 @@ private:
QColor parseColorProperty();
- void parseIconCommands(StereotypeIcon *stereotype_icon);
+ void parseIconCommands(StereotypeIcon *stereotypeIcon);
QList<ShapeValueF> parseIconCommandParameters(const QList<IconCommandParameter> ¶meters);
@@ -133,13 +133,13 @@ private:
Token readNextToken();
- qreal expectAbsoluteValue(const ShapeValueF &value, const SourcePos &source_pos);
+ qreal expectAbsoluteValue(const ShapeValueF &value, const SourcePos &sourcePos);
void expectSemicolonOrEndOfLine();
bool nextIsComma();
- void expectOperator(int op, const QString &op_name);
+ void expectOperator(int op, const QString &opName);
void expectComma();
diff --git a/src/libs/3rdparty/modeling/qmt/config/stringtextsource.cpp b/src/libs/3rdparty/modeling/qmt/config/stringtextsource.cpp
index e8a2cccb8e615334012e18829277941d11ce77a7..db4a45cb7cb1c75ada4db6f23bde1571aa0b014f 100644
--- a/src/libs/3rdparty/modeling/qmt/config/stringtextsource.cpp
+++ b/src/libs/3rdparty/modeling/qmt/config/stringtextsource.cpp
@@ -55,9 +55,9 @@ void StringTextSource::setText(const QString &text)
m_columnNumber = 1;
}
-void StringTextSource::setSourceId(int source_id)
+void StringTextSource::setSourceId(int sourceId)
{
- m_sourceId = source_id;
+ m_sourceId = sourceId;
}
SourceChar StringTextSource::readNextChar()
diff --git a/src/libs/3rdparty/modeling/qmt/config/stringtextsource.h b/src/libs/3rdparty/modeling/qmt/config/stringtextsource.h
index 2246679a7003aa39f5f9d4179403333765495be1..b313f9f8702cff9537c20cc7a8c61738efc0a139 100644
--- a/src/libs/3rdparty/modeling/qmt/config/stringtextsource.h
+++ b/src/libs/3rdparty/modeling/qmt/config/stringtextsource.h
@@ -51,7 +51,7 @@ public:
int getSourceId() const { return m_sourceId; }
- void setSourceId(int source_id);
+ void setSourceId(int sourceId);
// ITextSource interface
public:
diff --git a/src/libs/3rdparty/modeling/qmt/config/textscanner.cpp b/src/libs/3rdparty/modeling/qmt/config/textscanner.cpp
index 4cf4d519b86936d0de53378b1ad7393051452184..f2ac13dbaec6db1a92b6bfb512ff15f10feb582d 100644
--- a/src/libs/3rdparty/modeling/qmt/config/textscanner.cpp
+++ b/src/libs/3rdparty/modeling/qmt/config/textscanner.cpp
@@ -44,9 +44,9 @@ typedef QPair<QString, int> DefTuple;
namespace qmt {
-TextScannerError::TextScannerError(const QString &error_msg, const SourcePos &source_pos)
- : Exception(error_msg),
- m_sourcePos(source_pos)
+TextScannerError::TextScannerError(const QString &errorMsg, const SourcePos &sourcePos)
+ : Exception(errorMsg),
+ m_sourcePos(sourcePos)
{
}
@@ -110,9 +110,9 @@ void TextScanner::setOperators(const QList<QPair<QString, int> > &operators)
}
}
-void TextScanner::setSource(ITextSource *text_source)
+void TextScanner::setSource(ITextSource *textSource)
{
- d->m_source = text_source;
+ d->m_source = textSource;
}
SourcePos TextScanner::getSourcePos() const
@@ -126,23 +126,23 @@ Token TextScanner::read()
return d->m_unreadTokens.pop();
}
skipWhitespaces();
- SourceChar source_char = readChar();
- if (source_char.ch == QLatin1Char('\'') || source_char.ch == QLatin1Char('\"')) {
- return scanString(source_char);
- } else if (source_char.ch.isDigit()) {
- return scanNumber(source_char);
- } else if (source_char.ch.isLetter() || source_char.ch == QLatin1Char('_')) {
- return scanIdentifier(source_char);
- } else if (source_char.ch == QLatin1Char('#')) {
- return scanColorIdentifier(source_char);
- } else if (source_char.ch == QChar::LineFeed || source_char.ch == QChar::CarriageReturn) {
- return Token(Token::TOKEN_ENDOFLINE, QString(), source_char.pos);
- } else if (source_char.ch.isNull()) {
- return Token(Token::TOKEN_ENDOFINPUT, QString(), source_char.pos);
- } else if (d->m_operatorFirstCharsSet.contains(source_char.ch)) {
- return scanOperator(source_char);
+ SourceChar sourceChar = readChar();
+ if (sourceChar.ch == QLatin1Char('\'') || sourceChar.ch == QLatin1Char('\"')) {
+ return scanString(sourceChar);
+ } else if (sourceChar.ch.isDigit()) {
+ return scanNumber(sourceChar);
+ } else if (sourceChar.ch.isLetter() || sourceChar.ch == QLatin1Char('_')) {
+ return scanIdentifier(sourceChar);
+ } else if (sourceChar.ch == QLatin1Char('#')) {
+ return scanColorIdentifier(sourceChar);
+ } else if (sourceChar.ch == QChar::LineFeed || sourceChar.ch == QChar::CarriageReturn) {
+ return Token(Token::TOKEN_ENDOFLINE, QString(), sourceChar.pos);
+ } else if (sourceChar.ch.isNull()) {
+ return Token(Token::TOKEN_ENDOFINPUT, QString(), sourceChar.pos);
+ } else if (d->m_operatorFirstCharsSet.contains(sourceChar.ch)) {
+ return scanOperator(sourceChar);
} else {
- throw TextScannerError(QStringLiteral("Unexpected character."), source_char.pos);
+ throw TextScannerError(QStringLiteral("Unexpected character."), sourceChar.pos);
}
}
@@ -163,158 +163,158 @@ SourceChar TextScanner::readChar()
return ch;
}
-void TextScanner::unreadChar(const SourceChar &source_char)
+void TextScanner::unreadChar(const SourceChar &sourceChar)
{
- d->m_unreadSourceChars.push(source_char);
+ d->m_unreadSourceChars.push(sourceChar);
}
void TextScanner::skipWhitespaces()
{
for (;;) {
- SourceChar source_char = readChar();
- if (source_char.ch == QLatin1Char('/')) {
- SourceChar second_source_char = readChar();
- if (second_source_char.ch == QLatin1Char('/')) {
+ SourceChar sourceChar = readChar();
+ if (sourceChar.ch == QLatin1Char('/')) {
+ SourceChar secondSourceChar = readChar();
+ if (secondSourceChar.ch == QLatin1Char('/')) {
for (;;) {
- SourceChar comment_char = readChar();
- if (comment_char.ch.isNull() || comment_char.ch == QChar::LineFeed || comment_char.ch == QChar::CarriageReturn) {
+ SourceChar commentChar = readChar();
+ if (commentChar.ch.isNull() || commentChar.ch == QChar::LineFeed || commentChar.ch == QChar::CarriageReturn) {
break;
}
}
} else {
- unreadChar(second_source_char);
- unreadChar(source_char);
+ unreadChar(secondSourceChar);
+ unreadChar(sourceChar);
}
- } else if (source_char.ch == QChar::LineFeed || source_char.ch == QChar::CarriageReturn || !source_char.ch.isSpace()) {
- unreadChar(source_char);
+ } else if (sourceChar.ch == QChar::LineFeed || sourceChar.ch == QChar::CarriageReturn || !sourceChar.ch.isSpace()) {
+ unreadChar(sourceChar);
return;
}
}
}
-Token TextScanner::scanString(const SourceChar &delimiter_char)
+Token TextScanner::scanString(const SourceChar &delimiterChar)
{
QString text;
for (;;) {
- SourceChar source_char = readChar();
- if (source_char.ch == delimiter_char.ch) {
- return Token(Token::TOKEN_STRING, text, delimiter_char.pos);
- } else if (source_char.ch == QLatin1Char('\\')) {
- source_char = readChar();
- if (source_char.ch == QLatin1Char('n')) {
+ SourceChar sourceChar = readChar();
+ if (sourceChar.ch == delimiterChar.ch) {
+ return Token(Token::TOKEN_STRING, text, delimiterChar.pos);
+ } else if (sourceChar.ch == QLatin1Char('\\')) {
+ sourceChar = readChar();
+ if (sourceChar.ch == QLatin1Char('n')) {
text += QLatin1Char('\n');
- } else if (source_char.ch == QLatin1Char('\\')) {
+ } else if (sourceChar.ch == QLatin1Char('\\')) {
text += QLatin1Char('\\');
- } else if (source_char.ch == QLatin1Char('t')) {
+ } else if (sourceChar.ch == QLatin1Char('t')) {
text += QLatin1Char('\t');
- } else if (source_char.ch == QLatin1Char('\"')) {
+ } else if (sourceChar.ch == QLatin1Char('\"')) {
text += QLatin1Char('\"');
- } else if (source_char.ch == QLatin1Char('\'')) {
+ } else if (sourceChar.ch == QLatin1Char('\'')) {
text += QLatin1Char('\'');
} else {
- throw TextScannerError(QStringLiteral("Unexpected character after '\\' in string constant."), source_char.pos);
+ throw TextScannerError(QStringLiteral("Unexpected character after '\\' in string constant."), sourceChar.pos);
}
- } else if (source_char.ch == QChar::LineFeed || source_char.ch == QChar::CarriageReturn) {
- throw TextScannerError(QStringLiteral("Unexpected end of line in string constant."), source_char.pos);
+ } else if (sourceChar.ch == QChar::LineFeed || sourceChar.ch == QChar::CarriageReturn) {
+ throw TextScannerError(QStringLiteral("Unexpected end of line in string constant."), sourceChar.pos);
} else {
- text += source_char.ch;
+ text += sourceChar.ch;
}
}
}
-Token TextScanner::scanNumber(const SourceChar &first_digit)
+Token TextScanner::scanNumber(const SourceChar &firstDigit)
{
- QString text = first_digit.ch;
- SourceChar source_char;
+ QString text = firstDigit.ch;
+ SourceChar sourceChar;
for (;;) {
- source_char = readChar();
- if (!source_char.ch.isDigit()) {
+ sourceChar = readChar();
+ if (!sourceChar.ch.isDigit()) {
break;
}
- text += source_char.ch;
+ text += sourceChar.ch;
}
- if (source_char.ch == QLatin1Char('.')) {
- text += source_char.ch;
+ if (sourceChar.ch == QLatin1Char('.')) {
+ text += sourceChar.ch;
for (;;) {
- source_char = readChar();
- if (!source_char.ch.isDigit()) {
+ sourceChar = readChar();
+ if (!sourceChar.ch.isDigit()) {
break;
}
- text += source_char.ch;
+ text += sourceChar.ch;
}
- unreadChar(source_char);
- return Token(Token::TOKEN_FLOAT, text, first_digit.pos);
+ unreadChar(sourceChar);
+ return Token(Token::TOKEN_FLOAT, text, firstDigit.pos);
} else {
- unreadChar(source_char);
- return Token(Token::TOKEN_INTEGER, text, first_digit.pos);
+ unreadChar(sourceChar);
+ return Token(Token::TOKEN_INTEGER, text, firstDigit.pos);
}
}
-Token TextScanner::scanIdentifier(const SourceChar &first_char)
+Token TextScanner::scanIdentifier(const SourceChar &firstChar)
{
- QString text = first_char.ch;
- SourceChar source_char;
+ QString text = firstChar.ch;
+ SourceChar sourceChar;
for (;;) {
- source_char = readChar();
- if (!source_char.ch.isLetterOrNumber() && source_char.ch != QLatin1Char('_')) {
- unreadChar(source_char);
+ sourceChar = readChar();
+ if (!sourceChar.ch.isLetterOrNumber() && sourceChar.ch != QLatin1Char('_')) {
+ unreadChar(sourceChar);
QString keyword = text.toLower();
if (d->m_keywordToSubtypeMap.contains(keyword)) {
- return Token(Token::TOKEN_KEYWORD, d->m_keywordToSubtypeMap.value(keyword), text, first_char.pos);
+ return Token(Token::TOKEN_KEYWORD, d->m_keywordToSubtypeMap.value(keyword), text, firstChar.pos);
}
- return Token(Token::TOKEN_IDENTIFIER, text, first_char.pos);
+ return Token(Token::TOKEN_IDENTIFIER, text, firstChar.pos);
}
- text += source_char.ch;
+ text += sourceChar.ch;
}
}
-Token TextScanner::scanColorIdentifier(const SourceChar &first_char)
+Token TextScanner::scanColorIdentifier(const SourceChar &firstChar)
{
- QString text = first_char.ch;
- SourceChar source_char;
+ QString text = firstChar.ch;
+ SourceChar sourceChar;
for (;;) {
- source_char = readChar();
- QChar ch = source_char.ch.toLower();
+ sourceChar = readChar();
+ QChar ch = sourceChar.ch.toLower();
if (!(ch.isDigit() || (ch >= QLatin1Char('a') && ch <= QLatin1Char('f')))) {
- unreadChar(source_char);
- return Token(Token::TOKEN_COLOR, text, first_char.pos);
+ unreadChar(sourceChar);
+ return Token(Token::TOKEN_COLOR, text, firstChar.pos);
}
- text += source_char.ch;
+ text += sourceChar.ch;
}
}
-Token TextScanner::scanOperator(const SourceChar &first_char)
+Token TextScanner::scanOperator(const SourceChar &firstChar)
{
- QString text = first_char.ch;
- SourceChar source_char;
- QStack<SourceChar> extra_chars;
- bool have_operator = false;
- int operator_length = 0;
+ QString text = firstChar.ch;
+ SourceChar sourceChar;
+ QStack<SourceChar> extraChars;
+ bool haveOperator = false;
+ int operatorLength = 0;
int subtype = 0;
QString op;
- extra_chars.push(first_char);
+ extraChars.push(firstChar);
for (;;) {
if (d->m_operatorToSubtypeMap.contains(text)) {
- have_operator = true;
- operator_length = text.length();
+ haveOperator = true;
+ operatorLength = text.length();
subtype = d->m_operatorToSubtypeMap.value(text);
op = text;
}
- source_char = readChar();
- if (text.length() >= d->m_maxOperatorLength || !d->m_operatorCharsSet.contains(source_char.ch)) {
- unreadChar(source_char);
+ sourceChar = readChar();
+ if (text.length() >= d->m_maxOperatorLength || !d->m_operatorCharsSet.contains(sourceChar.ch)) {
+ unreadChar(sourceChar);
int i = text.length();
- while (i > operator_length) {
+ while (i > operatorLength) {
--i;
- unreadChar(extra_chars.pop());
+ unreadChar(extraChars.pop());
}
- QMT_CHECK(have_operator);
- Q_UNUSED(have_operator); // avoid warning in release mode
- return Token(Token::TOKEN_OPERATOR, subtype, op, first_char.pos);
+ QMT_CHECK(haveOperator);
+ Q_UNUSED(haveOperator); // avoid warning in release mode
+ return Token(Token::TOKEN_OPERATOR, subtype, op, firstChar.pos);
}
- text += source_char.ch;
- extra_chars.push(source_char);
+ text += sourceChar.ch;
+ extraChars.push(sourceChar);
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/config/textscanner.h b/src/libs/3rdparty/modeling/qmt/config/textscanner.h
index 5651b6fd95975abc38cea9cd5c6c83e00b753353..2d00cedf936d0e83e90fcfd945321b5abee19ab1 100644
--- a/src/libs/3rdparty/modeling/qmt/config/textscanner.h
+++ b/src/libs/3rdparty/modeling/qmt/config/textscanner.h
@@ -48,7 +48,7 @@ class QMT_EXPORT TextScannerError :
{
public:
- TextScannerError(const QString &error_msg, const SourcePos &source_pos);
+ TextScannerError(const QString &errorMsg, const SourcePos &sourcePos);
~TextScannerError();
@@ -80,7 +80,7 @@ public:
void setOperators(const QList<QPair<QString, int> > &operators);
- void setSource(ITextSource *text_source);
+ void setSource(ITextSource *textSource);
SourcePos getSourcePos() const;
@@ -94,19 +94,19 @@ private:
SourceChar readChar();
- void unreadChar(const SourceChar &source_char);
+ void unreadChar(const SourceChar &sourceChar);
void skipWhitespaces();
- Token scanString(const SourceChar &delimiter_char);
+ Token scanString(const SourceChar &delimiterChar);
- Token scanNumber(const SourceChar &first_digit);
+ Token scanNumber(const SourceChar &firstDigit);
- Token scanIdentifier(const SourceChar &first_char);
+ Token scanIdentifier(const SourceChar &firstChar);
- Token scanColorIdentifier(const SourceChar &first_char);
+ Token scanColorIdentifier(const SourceChar &firstChar);
- Token scanOperator(const SourceChar &first_char);
+ Token scanOperator(const SourceChar &firstChar);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/config/textsource.h b/src/libs/3rdparty/modeling/qmt/config/textsource.h
index d026fd334a2c1edccaefd1aba44617d9ccb9665d..8b28d6fc4ab8da64983e0929c90e84d523a5b691 100644
--- a/src/libs/3rdparty/modeling/qmt/config/textsource.h
+++ b/src/libs/3rdparty/modeling/qmt/config/textsource.h
@@ -40,9 +40,9 @@ namespace qmt {
struct SourceChar {
SourceChar() { }
- SourceChar(QChar chr, const SourcePos &source_pos)
+ SourceChar(QChar chr, const SourcePos &sourcePos)
: ch(chr),
- pos(source_pos)
+ pos(sourcePos)
{
}
diff --git a/src/libs/3rdparty/modeling/qmt/config/token.cpp b/src/libs/3rdparty/modeling/qmt/config/token.cpp
index 13ce83b727450a18b11da9f70c4816185d958bf5..21f5e699fa9cb8df84032c1d11e8e95372d2e2d6 100644
--- a/src/libs/3rdparty/modeling/qmt/config/token.cpp
+++ b/src/libs/3rdparty/modeling/qmt/config/token.cpp
@@ -38,19 +38,19 @@ Token::Token()
{
}
-Token::Token(Type type, const QString &text, const SourcePos &source_pos)
+Token::Token(Type type, const QString &text, const SourcePos &sourcePos)
: m_type(type),
m_subtype(0),
m_text(text),
- m_sourcePos(source_pos)
+ m_sourcePos(sourcePos)
{
}
-Token::Token(Token::Type type, int subtype, const QString &text, const SourcePos &source_pos)
+Token::Token(Token::Type type, int subtype, const QString &text, const SourcePos &sourcePos)
: m_type(type),
m_subtype(subtype),
m_text(text),
- m_sourcePos(source_pos)
+ m_sourcePos(sourcePos)
{
}
@@ -73,9 +73,9 @@ void Token::setText(const QString &text)
m_text = text;
}
-void Token::setSourcePos(const SourcePos &source_pos)
+void Token::setSourcePos(const SourcePos &sourcePos)
{
- m_sourcePos = source_pos;
+ m_sourcePos = sourcePos;
}
} // namespace qmt
diff --git a/src/libs/3rdparty/modeling/qmt/config/token.h b/src/libs/3rdparty/modeling/qmt/config/token.h
index 5464904eb7b3d1d7daa364d72ae7575c8b0c9fae..e6be0e3d364821a7f0730287e2cfd74043c566fa 100644
--- a/src/libs/3rdparty/modeling/qmt/config/token.h
+++ b/src/libs/3rdparty/modeling/qmt/config/token.h
@@ -56,8 +56,8 @@ public:
public:
Token();
- Token(Type type, const QString &text, const SourcePos &source_pos);
- Token(Type type, int subtype, const QString &text, const SourcePos &source_pos);
+ Token(Type type, const QString &text, const SourcePos &sourcePos);
+ Token(Type type, int subtype, const QString &text, const SourcePos &sourcePos);
~Token();
public:
@@ -76,7 +76,7 @@ public:
SourcePos getSourcePos() const { return m_sourcePos; }
- void setSourcePos(const SourcePos &source_pos);
+ void setSourcePos(const SourcePos &sourcePos);
private:
Type m_type;
diff --git a/src/libs/3rdparty/modeling/qmt/controller/namecontroller.cpp b/src/libs/3rdparty/modeling/qmt/controller/namecontroller.cpp
index 2cec12590964c25258667ba5e3958ceca15feac0..a6a659716a3c269ed66c8fe24293dafe861bb424 100644
--- a/src/libs/3rdparty/modeling/qmt/controller/namecontroller.cpp
+++ b/src/libs/3rdparty/modeling/qmt/controller/namecontroller.cpp
@@ -45,117 +45,117 @@ NameController::~NameController()
}
-QString NameController::convertFileNameToElementName(const QString &file_name)
+QString NameController::convertFileNameToElementName(const QString &fileName)
{
- QFileInfo file_info(file_name);
- QString base_name = file_info.baseName().trimmed();
- QString element_name;
- bool make_uppercase = true;
- bool insert_space = false;
- for (int i = 0; i < base_name.size(); ++i) {
- if (base_name.at(i) == QLatin1Char('_')) {
- make_uppercase = true;
- insert_space = true;
- } else if (base_name.at(i) == QLatin1Char(' ') || base_name.at(i) == QLatin1Char('-')) {
- make_uppercase = true;
- insert_space = false;
- element_name += base_name.at(i);
- } else if (make_uppercase) {
- if (insert_space) {
- element_name += QLatin1Char(' ');
- insert_space = false;
+ QFileInfo fileInfo(fileName);
+ QString baseName = fileInfo.baseName().trimmed();
+ QString elementName;
+ bool makeUppercase = true;
+ bool insertSpace = false;
+ for (int i = 0; i < baseName.size(); ++i) {
+ if (baseName.at(i) == QLatin1Char('_')) {
+ makeUppercase = true;
+ insertSpace = true;
+ } else if (baseName.at(i) == QLatin1Char(' ') || baseName.at(i) == QLatin1Char('-')) {
+ makeUppercase = true;
+ insertSpace = false;
+ elementName += baseName.at(i);
+ } else if (makeUppercase) {
+ if (insertSpace) {
+ elementName += QLatin1Char(' ');
+ insertSpace = false;
}
- element_name += base_name.at(i).toUpper();
- make_uppercase = false;
+ elementName += baseName.at(i).toUpper();
+ makeUppercase = false;
} else {
- if (insert_space) {
- element_name += QLatin1Char(' ');
- insert_space = false;
+ if (insertSpace) {
+ elementName += QLatin1Char(' ');
+ insertSpace = false;
}
- element_name += base_name.at(i);
+ elementName += baseName.at(i);
}
}
- return element_name;
+ return elementName;
}
-QString NameController::convertElementNameToBaseFileName(const QString &element_name)
+QString NameController::convertElementNameToBaseFileName(const QString &elementName)
{
- QString base_file_name;
- bool insert_underscore = false;
- for (int i = 0; i < element_name.size(); ++i) {
- if (element_name.at(i) == QLatin1Char(' ')) {
- insert_underscore = true;
+ QString baseFileName;
+ bool insertUnderscore = false;
+ for (int i = 0; i < elementName.size(); ++i) {
+ if (elementName.at(i) == QLatin1Char(' ')) {
+ insertUnderscore = true;
} else {
- if (insert_underscore) {
- base_file_name += QLatin1Char('_');
- insert_underscore = false;
+ if (insertUnderscore) {
+ baseFileName += QLatin1Char('_');
+ insertUnderscore = false;
}
- base_file_name += element_name.at(i).toLower();
+ baseFileName += elementName.at(i).toLower();
}
}
- return base_file_name;
+ return baseFileName;
}
-QString NameController::calcRelativePath(const QString &absolute_file_name, const QString &anchor_path)
+QString NameController::calcRelativePath(const QString &absoluteFileName, const QString &anchorPath)
{
- int second_last_slash_index = -1;
- int slash_index = -1;
+ int secondLastSlashIndex = -1;
+ int slashIndex = -1;
int i = 0;
- while (i < absolute_file_name.size() && i < anchor_path.size() && absolute_file_name.at(i) == anchor_path.at(i)) {
- if (absolute_file_name.at(i) == QLatin1Char('/')) {
- second_last_slash_index = slash_index;
- slash_index = i;
+ while (i < absoluteFileName.size() && i < anchorPath.size() && absoluteFileName.at(i) == anchorPath.at(i)) {
+ if (absoluteFileName.at(i) == QLatin1Char('/')) {
+ secondLastSlashIndex = slashIndex;
+ slashIndex = i;
}
++i;
}
- QString relative_path;
+ QString relativePath;
- if (slash_index < 0) {
- relative_path = absolute_file_name;
- } else if (i >= absolute_file_name.size()) {
- // absolute_file_name is a substring of anchor path.
- if (slash_index == i - 1) {
- if (second_last_slash_index < 0) {
- relative_path = absolute_file_name;
+ if (slashIndex < 0) {
+ relativePath = absoluteFileName;
+ } else if (i >= absoluteFileName.size()) {
+ // absoluteFileName is a substring of anchor path.
+ if (slashIndex == i - 1) {
+ if (secondLastSlashIndex < 0) {
+ relativePath = absoluteFileName;
} else {
- relative_path = absolute_file_name.mid(second_last_slash_index + 1);
+ relativePath = absoluteFileName.mid(secondLastSlashIndex + 1);
}
} else {
- relative_path = absolute_file_name.mid(slash_index + 1);
+ relativePath = absoluteFileName.mid(slashIndex + 1);
}
} else {
- relative_path = absolute_file_name.mid(slash_index + 1);
+ relativePath = absoluteFileName.mid(slashIndex + 1);
}
- return relative_path;
+ return relativePath;
}
-QString NameController::calcElementNameSearchId(const QString &element_name)
+QString NameController::calcElementNameSearchId(const QString &elementName)
{
- QString search_id;
- foreach (const QChar &c, element_name) {
+ QString searchId;
+ foreach (const QChar &c, elementName) {
if (c.isLetterOrNumber()) {
- search_id += c.toLower();
+ searchId += c.toLower();
}
}
- return search_id;
+ return searchId;
}
-QList<QString> NameController::buildElementsPath(const QString &file_path, bool ignore_last_file_path_part)
+QList<QString> NameController::buildElementsPath(const QString &filePath, bool ignoreLastFilePathPart)
{
- QList<QString> relative_elements;
+ QList<QString> relativeElements;
- QStringList splitted = file_path.split(QStringLiteral("/"));
- QStringList::const_iterator splitted_end = splitted.end();
- if (ignore_last_file_path_part || splitted.last().isEmpty()) {
- splitted_end = --splitted_end;
+ QStringList splitted = filePath.split(QStringLiteral("/"));
+ QStringList::const_iterator splittedEnd = splitted.end();
+ if (ignoreLastFilePathPart || splitted.last().isEmpty()) {
+ splittedEnd = --splittedEnd;
}
- for (QStringList::const_iterator it = splitted.cbegin(); it != splitted_end; ++it) {
- QString package_name = qmt::NameController::convertFileNameToElementName(*it);
- relative_elements.append(package_name);
+ for (QStringList::const_iterator it = splitted.cbegin(); it != splittedEnd; ++it) {
+ QString packageName = qmt::NameController::convertFileNameToElementName(*it);
+ relativeElements.append(packageName);
}
- return relative_elements;
+ return relativeElements;
}
diff --git a/src/libs/3rdparty/modeling/qmt/controller/namecontroller.h b/src/libs/3rdparty/modeling/qmt/controller/namecontroller.h
index 73a9b67f880d7e7a2246bb6848751b0e1c16265a..73fd66633e5b253c4202fee68e1ddce6423c5209 100644
--- a/src/libs/3rdparty/modeling/qmt/controller/namecontroller.h
+++ b/src/libs/3rdparty/modeling/qmt/controller/namecontroller.h
@@ -51,15 +51,15 @@ private:
public:
- static QString convertFileNameToElementName(const QString &file_name);
+ static QString convertFileNameToElementName(const QString &fileName);
- static QString convertElementNameToBaseFileName(const QString &element_name);
+ static QString convertElementNameToBaseFileName(const QString &elementName);
- static QString calcRelativePath(const QString &absolute_file_name, const QString &anchor_path);
+ static QString calcRelativePath(const QString &absoluteFileName, const QString &anchorPath);
- static QString calcElementNameSearchId(const QString &element_name);
+ static QString calcElementNameSearchId(const QString &elementName);
- static QList<QString> buildElementsPath(const QString &file_path, bool ignore_last_file_path_part);
+ static QList<QString> buildElementsPath(const QString &filePath, bool ignoreLastFilePathPart);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/controller/selection.cpp b/src/libs/3rdparty/modeling/qmt/controller/selection.cpp
index 4e00e574630dbe247a76769ae6a6eb2f3fa6839c..c4768894d454283f1cb1e62748c3eb1588bb414c 100644
--- a/src/libs/3rdparty/modeling/qmt/controller/selection.cpp
+++ b/src/libs/3rdparty/modeling/qmt/controller/selection.cpp
@@ -55,9 +55,9 @@ void Selection::append(const Index &index)
m_indices.append(index);
}
-void Selection::append(const Uid &element_key, const Uid &owner_key)
+void Selection::append(const Uid &elementKey, const Uid &ownerKey)
{
- append(Index(element_key, owner_key));
+ append(Index(elementKey, ownerKey));
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/controller/selection.h b/src/libs/3rdparty/modeling/qmt/controller/selection.h
index 5462d7ccaf16b44c42babb4a4c6d7d57e92a00c6..4f89f88738d504eb0a3026525a47ccceec819ff8 100644
--- a/src/libs/3rdparty/modeling/qmt/controller/selection.h
+++ b/src/libs/3rdparty/modeling/qmt/controller/selection.h
@@ -44,9 +44,9 @@ public:
class Index {
public:
- Index(const Uid &element_key, const Uid &owner_key)
- : m_elementKey(element_key),
- m_ownerKey(owner_key)
+ Index(const Uid &elementKey, const Uid &ownerKey)
+ : m_elementKey(elementKey),
+ m_ownerKey(ownerKey)
{
}
@@ -83,7 +83,7 @@ public:
void append(const Index &index);
- void append(const Uid &element_key, const Uid &owner_key);
+ void append(const Uid &elementKey, const Uid &ownerKey);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/controller/undocommand.cpp b/src/libs/3rdparty/modeling/qmt/controller/undocommand.cpp
index 6ad64949b155505326f97e8bc2dd04c9ac20ef9c..007b35f84b642c6bb8dde6fed4f36f124865fa17 100644
--- a/src/libs/3rdparty/modeling/qmt/controller/undocommand.cpp
+++ b/src/libs/3rdparty/modeling/qmt/controller/undocommand.cpp
@@ -50,21 +50,21 @@ int UndoCommand::id() const
return 1;
}
-void UndoCommand::setDoNotMerge(bool do_not_merge)
+void UndoCommand::setDoNotMerge(bool doNotMerge)
{
- m_doNotMerge = do_not_merge;
+ m_doNotMerge = doNotMerge;
}
bool UndoCommand::mergeWith(const QUndoCommand *other)
{
- const UndoCommand *other_command = dynamic_cast<const UndoCommand *>(other);
- if (!other_command) {
+ const UndoCommand *otherCommand = dynamic_cast<const UndoCommand *>(other);
+ if (!otherCommand) {
return false;
}
- if (other_command->m_doNotMerge) {
+ if (otherCommand->m_doNotMerge) {
return false;
}
- return mergeWith(other_command);
+ return mergeWith(otherCommand);
}
bool UndoCommand::mergeWith(const UndoCommand *other)
diff --git a/src/libs/3rdparty/modeling/qmt/controller/undocommand.h b/src/libs/3rdparty/modeling/qmt/controller/undocommand.h
index 38707be047f4f592b0fee5868b8adff7eb3f9a46..c30285baf7401841373446fb9ee867d8108d1923 100644
--- a/src/libs/3rdparty/modeling/qmt/controller/undocommand.h
+++ b/src/libs/3rdparty/modeling/qmt/controller/undocommand.h
@@ -51,7 +51,7 @@ public:
int id() const;
- void setDoNotMerge(bool do_not_merge);
+ void setDoNotMerge(bool doNotMerge);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dannotation.cpp b/src/libs/3rdparty/modeling/qmt/diagram/dannotation.cpp
index 149a290dbc6037bb945e56cccb93c6ffd3d37637..eb1a05f58e079593a2fd144c1e0d1f91f3500223 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram/dannotation.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram/dannotation.cpp
@@ -84,14 +84,14 @@ void DAnnotation::setRect(const QRectF &rect)
m_rect = rect;
}
-void DAnnotation::setVisualRole(DAnnotation::VisualRole visual_role)
+void DAnnotation::setVisualRole(DAnnotation::VisualRole visualRole)
{
- m_visualRole = visual_role;
+ m_visualRole = visualRole;
}
-void DAnnotation::setAutoSize(bool auto_sized)
+void DAnnotation::setAutoSize(bool autoSized)
{
- m_autoSized = auto_sized;
+ m_autoSized = autoSized;
}
void DAnnotation::accept(DVisitor *visitor)
diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dannotation.h b/src/libs/3rdparty/modeling/qmt/diagram/dannotation.h
index 9e61e0f8b97fd6f60161b52803c1323d2636cf2d..d6fb0f751575503b3b71df27e372dd7305d42071 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram/dannotation.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram/dannotation.h
@@ -82,11 +82,11 @@ public:
VisualRole getVisualRole() const { return m_visualRole; }
- void setVisualRole(VisualRole visual_role);
+ void setVisualRole(VisualRole visualRole);
bool hasAutoSize() const { return m_autoSized; }
- void setAutoSize(bool auto_sized);
+ void setAutoSize(bool autoSized);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dassociation.cpp b/src/libs/3rdparty/modeling/qmt/diagram/dassociation.cpp
index f580d8824f1f11a392d7177bca07255eddbc6f07..7e28537f6d1c92c09f885759caf3ec1d27da3309 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram/dassociation.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram/dassociation.cpp
@@ -93,14 +93,14 @@ DAssociation::~DAssociation()
{
}
-void DAssociation::setA(const DAssociationEnd &end_a)
+void DAssociation::setA(const DAssociationEnd &endA)
{
- m_endA = end_a;
+ m_endA = endA;
}
-void DAssociation::setB(const DAssociationEnd &end_b)
+void DAssociation::setB(const DAssociationEnd &endB)
{
- m_endB = end_b;
+ m_endB = endB;
}
void DAssociation::setAssociationClassUid(const Uid &uid)
diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dassociation.h b/src/libs/3rdparty/modeling/qmt/diagram/dassociation.h
index 299ea45a515c9cf247ebddd99b09eb3b7a6d45b4..08c6b3afa815cb5402e5245725a0f5f371d67ad9 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram/dassociation.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram/dassociation.h
@@ -92,11 +92,11 @@ public:
DAssociationEnd getA() const { return m_endA; }
- void setA(const DAssociationEnd &end_a);
+ void setA(const DAssociationEnd &endA);
DAssociationEnd getB() const { return m_endB; }
- void setB(const DAssociationEnd &end_b);
+ void setB(const DAssociationEnd &endB);
Uid getAssoicationClassUid() const { return m_associationClassUid; }
diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dclass.cpp b/src/libs/3rdparty/modeling/qmt/diagram/dclass.cpp
index 7d5935a10e6142a048d75982a547fdce944c4e14..6aecdd22c572132a30e3065237e303554a555aea 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram/dclass.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram/dclass.cpp
@@ -42,14 +42,14 @@ DClass::DClass()
{
}
-void DClass::setNamespace(const QString &name_space)
+void DClass::setNamespace(const QString &nameSpace)
{
- m_namespace = name_space;
+ m_namespace = nameSpace;
}
-void DClass::setTemplateParameters(const QList<QString> &template_parameters)
+void DClass::setTemplateParameters(const QList<QString> &templateParameters)
{
- m_templateParameters = template_parameters;
+ m_templateParameters = templateParameters;
}
void DClass::setMembers(const QList<MClassMember> &members)
@@ -57,19 +57,19 @@ void DClass::setMembers(const QList<MClassMember> &members)
m_members = members;
}
-void DClass::setVisibleMembers(const QSet<Uid> &visible_members)
+void DClass::setVisibleMembers(const QSet<Uid> &visibleMembers)
{
- m_visibleMembers = visible_members;
+ m_visibleMembers = visibleMembers;
}
-void DClass::setTemplateDisplay(DClass::TemplateDisplay template_display)
+void DClass::setTemplateDisplay(DClass::TemplateDisplay templateDisplay)
{
- m_templateDisplay = template_display;
+ m_templateDisplay = templateDisplay;
}
-void DClass::setShowAllMembers(bool show_all_members)
+void DClass::setShowAllMembers(bool showAllMembers)
{
- m_showAllMembers = show_all_members;
+ m_showAllMembers = showAllMembers;
}
void DClass::accept(DVisitor *visitor)
diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dclass.h b/src/libs/3rdparty/modeling/qmt/diagram/dclass.h
index 30529184d3979d2eaddebd3deb5836d18edcd2e2..9e75462dda1eb7f469474b4befc5e618439bbf37 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram/dclass.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram/dclass.h
@@ -57,11 +57,11 @@ public:
QString getNamespace() const { return m_namespace; }
- void setNamespace(const QString &name_space);
+ void setNamespace(const QString &nameSpace);
QList<QString> getTemplateParameters() const { return m_templateParameters; }
- void setTemplateParameters(const QList<QString> &template_parameters);
+ void setTemplateParameters(const QList<QString> &templateParameters);
QList<MClassMember> getMembers() const { return m_members; }
@@ -69,15 +69,15 @@ public:
QSet<Uid> getVisibleMembers() const { return m_visibleMembers; }
- void setVisibleMembers(const QSet<Uid> &visible_members);
+ void setVisibleMembers(const QSet<Uid> &visibleMembers);
TemplateDisplay getTemplateDisplay() const { return m_templateDisplay; }
- void setTemplateDisplay(TemplateDisplay template_display);
+ void setTemplateDisplay(TemplateDisplay templateDisplay);
bool getShowAllMembers() const { return m_showAllMembers; }
- void setShowAllMembers(bool show_all_members);
+ void setShowAllMembers(bool showAllMembers);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dcomponent.cpp b/src/libs/3rdparty/modeling/qmt/diagram/dcomponent.cpp
index b8683bd98ec8afb41578430c6e68f6ee89669443..1010a485655ba8a0caa8132ff63961992754165b 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram/dcomponent.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram/dcomponent.cpp
@@ -42,9 +42,9 @@ DComponent::DComponent()
{
}
-void DComponent::setPlainShape(bool plane_shape)
+void DComponent::setPlainShape(bool planeShape)
{
- m_plainShape = plane_shape;
+ m_plainShape = planeShape;
}
void DComponent::accept(DVisitor *visitor)
diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dcomponent.h b/src/libs/3rdparty/modeling/qmt/diagram/dcomponent.h
index 2e87cdb585ccbf3462792e3e1e104de6d52d0db6..8dd84d7593072260411db3d3ea00d8004e84ab8c 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram/dcomponent.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram/dcomponent.h
@@ -46,7 +46,7 @@ public:
bool getPlainShape() const { return m_plainShape; }
- void setPlainShape(bool plane_shape);
+ void setPlainShape(bool planeShape);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram/ditem.cpp b/src/libs/3rdparty/modeling/qmt/diagram/ditem.cpp
index 87902b271a3b81329fac7199a112e1b35aa525ba..7446e7e162a8487fb6c01181964cd1c484c5fcd4 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram/ditem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram/ditem.cpp
@@ -56,9 +56,9 @@ void DItem::setShape(const QString &shape)
m_shape = shape;
}
-void DItem::setShapeEditable(bool shape_editable)
+void DItem::setShapeEditable(bool shapeEditable)
{
- m_shapeEditable = shape_editable;
+ m_shapeEditable = shapeEditable;
}
void DItem::accept(DVisitor *visitor)
diff --git a/src/libs/3rdparty/modeling/qmt/diagram/ditem.h b/src/libs/3rdparty/modeling/qmt/diagram/ditem.h
index 1bdd7ae072b53784e20d3537603f8261d0eefb8b..0af80065e6f8f6007e4a455a5d0c0d7cce213469 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram/ditem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram/ditem.h
@@ -57,7 +57,7 @@ public:
bool isShapeEditable() const { return m_shapeEditable; }
- void setShapeEditable(bool shape_editable);
+ void setShapeEditable(bool shapeEditable);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dobject.cpp b/src/libs/3rdparty/modeling/qmt/diagram/dobject.cpp
index 4349aef8ec7a81edd7ddc1b26c098f6e9cdd78a5..26253695d03fcdc5b69ab3c12fbc4a45846e73f5 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram/dobject.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram/dobject.cpp
@@ -123,29 +123,29 @@ void DObject::setDepth(int depth)
m_depth = depth;
}
-void DObject::setVisualPrimaryRole(DObject::VisualPrimaryRole visual_primary_role)
+void DObject::setVisualPrimaryRole(DObject::VisualPrimaryRole visualPrimaryRole)
{
- m_visualPrimaryRole = visual_primary_role;
+ m_visualPrimaryRole = visualPrimaryRole;
}
-void DObject::setVisualSecondaryRole(DObject::VisualSecondaryRole visual_secondary_role)
+void DObject::setVisualSecondaryRole(DObject::VisualSecondaryRole visualSecondaryRole)
{
- m_visualSecondaryRole = visual_secondary_role;
+ m_visualSecondaryRole = visualSecondaryRole;
}
-void DObject::setStereotypeDisplay(DObject::StereotypeDisplay stereotype_display)
+void DObject::setStereotypeDisplay(DObject::StereotypeDisplay stereotypeDisplay)
{
- m_stereotypeDisplay = stereotype_display;
+ m_stereotypeDisplay = stereotypeDisplay;
}
-void DObject::setAutoSize(bool auto_sized)
+void DObject::setAutoSize(bool autoSized)
{
- m_autoSized = auto_sized;
+ m_autoSized = autoSized;
}
-void DObject::setVisualEmphasized(bool visual_emphasized)
+void DObject::setVisualEmphasized(bool visualEmphasized)
{
- m_visualEmphasized = visual_emphasized;
+ m_visualEmphasized = visualEmphasized;
}
void DObject::accept(DVisitor *visitor)
diff --git a/src/libs/3rdparty/modeling/qmt/diagram/dobject.h b/src/libs/3rdparty/modeling/qmt/diagram/dobject.h
index c4bb7d401c3374546c9512a518beb06e3fd3dc08..be57fc6a309753de01acfe834d8a5c66d93b2c08 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram/dobject.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram/dobject.h
@@ -122,23 +122,23 @@ public:
VisualPrimaryRole getVisualPrimaryRole() const { return m_visualPrimaryRole; }
- void setVisualPrimaryRole(VisualPrimaryRole visual_primary_role);
+ void setVisualPrimaryRole(VisualPrimaryRole visualPrimaryRole);
VisualSecondaryRole getVisualSecondaryRole() const { return m_visualSecondaryRole; }
- void setVisualSecondaryRole(VisualSecondaryRole visual_secondary_role);
+ void setVisualSecondaryRole(VisualSecondaryRole visualSecondaryRole);
StereotypeDisplay getStereotypeDisplay() const { return m_stereotypeDisplay; }
- void setStereotypeDisplay(StereotypeDisplay stereotype_display);
+ void setStereotypeDisplay(StereotypeDisplay stereotypeDisplay);
bool hasAutoSize() const { return m_autoSized; }
- void setAutoSize(bool auto_sized);
+ void setAutoSize(bool autoSized);
bool isVisualEmphasized() const { return m_visualEmphasized; }
- void setVisualEmphasized(bool visual_emphasized);
+ void setVisualEmphasized(bool visualEmphasized);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram/drelation.cpp b/src/libs/3rdparty/modeling/qmt/diagram/drelation.cpp
index ede7cda9ac8f53217997db1fd05464705688542a..97ac566e44b0e865073c91e42f3dc4adff05f59e 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram/drelation.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram/drelation.cpp
@@ -89,9 +89,9 @@ void DRelation::setName(const QString &name)
m_name = name;
}
-void DRelation::setIntermediatePoints(const QList<DRelation::IntermediatePoint> &intermediate_points)
+void DRelation::setIntermediatePoints(const QList<DRelation::IntermediatePoint> &intermediatePoints)
{
- m_intermediatePoints = intermediate_points;
+ m_intermediatePoints = intermediatePoints;
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram/drelation.h b/src/libs/3rdparty/modeling/qmt/diagram/drelation.h
index 0ea4bdfc71cfd9230036f4ef434392e6faff1dbb..d8158da3bbf366c73fdd3f4cb26d048942eee6ca 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram/drelation.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram/drelation.h
@@ -91,7 +91,7 @@ public:
QList<IntermediatePoint> getIntermediatePoints() const { return m_intermediatePoints; }
- void setIntermediatePoints(const QList<IntermediatePoint> &intermediate_points);
+ void setIntermediatePoints(const QList<IntermediatePoint> &intermediatePoints);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dfactory.cpp b/src/libs/3rdparty/modeling/qmt/diagram_controller/dfactory.cpp
index 6bf4fe6d7274f6344a7517d557f55905abfa4fa9..ab95f4f22f494ebf748460d640fc33b07520e535 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_controller/dfactory.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_controller/dfactory.cpp
@@ -71,41 +71,41 @@ void DFactory::visitMElement(const MElement *element)
void DFactory::visitMObject(const MObject *object)
{
- DObject *diagram_object = dynamic_cast<DObject *>(m_product);
- QMT_CHECK(diagram_object);
- diagram_object->setModelUid(object->getUid());
+ DObject *diagramObject = dynamic_cast<DObject *>(m_product);
+ QMT_CHECK(diagramObject);
+ diagramObject->setModelUid(object->getUid());
visitMElement(object);
}
void DFactory::visitMPackage(const MPackage *package)
{
QMT_CHECK(!m_product);
- DPackage *diagram_package = new DPackage();
- m_product = diagram_package;
+ DPackage *diagramPackage = new DPackage();
+ m_product = diagramPackage;
visitMObject(package);
}
void DFactory::visitMClass(const MClass *klass)
{
QMT_CHECK(!m_product);
- DClass *diagram_klass = new DClass();
- m_product = diagram_klass;
+ DClass *diagramKlass = new DClass();
+ m_product = diagramKlass;
visitMObject(klass);
}
void DFactory::visitMComponent(const MComponent *component)
{
QMT_CHECK(!m_product);
- DComponent *diagram_component = new DComponent();
- m_product = diagram_component;
+ DComponent *diagramComponent = new DComponent();
+ m_product = diagramComponent;
visitMObject(component);
}
void DFactory::visitMDiagram(const MDiagram *diagram)
{
QMT_CHECK(!m_product);
- DDiagram *diagram_diagram = new DDiagram();
- m_product = diagram_diagram;
+ DDiagram *diagramDiagram = new DDiagram();
+ m_product = diagramDiagram;
visitMObject(diagram);
}
@@ -118,40 +118,40 @@ void DFactory::visitMCanvasDiagram(const MCanvasDiagram *diagram)
void DFactory::visitMItem(const MItem *item)
{
QMT_CHECK(!m_product);
- DItem *diagram_item = new DItem();
- m_product = diagram_item;
+ DItem *diagramItem = new DItem();
+ m_product = diagramItem;
visitMObject(item);
}
void DFactory::visitMRelation(const MRelation *relation)
{
- DRelation *diagram_relation = dynamic_cast<DRelation *>(m_product);
- QMT_CHECK(diagram_relation);
- diagram_relation->setModelUid(relation->getUid());
+ DRelation *diagramRelation = dynamic_cast<DRelation *>(m_product);
+ QMT_CHECK(diagramRelation);
+ diagramRelation->setModelUid(relation->getUid());
visitMElement(relation);
}
void DFactory::visitMDependency(const MDependency *dependency)
{
QMT_CHECK(!m_product);
- DDependency *diagram_dependency = new DDependency();
- m_product = diagram_dependency;
+ DDependency *diagramDependency = new DDependency();
+ m_product = diagramDependency;
visitMRelation(dependency);
}
void DFactory::visitMInheritance(const MInheritance *inheritance)
{
QMT_CHECK(!m_product);
- DInheritance *diagram_inheritance = new DInheritance();
- m_product = diagram_inheritance;
+ DInheritance *diagramInheritance = new DInheritance();
+ m_product = diagramInheritance;
visitMRelation(inheritance);
}
void DFactory::visitMAssociation(const MAssociation *association)
{
QMT_CHECK(!m_product);
- DAssociation *diagram_association = new DAssociation();
- m_product = diagram_association;
+ DAssociation *diagramAssociation = new DAssociation();
+ m_product = diagramAssociation;
visitMRelation(association);
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp b/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp
index f10b04203619677f4ff00402393fea8cc69f3f8a..57a8754a07958e3561277e92f3b5db9b44ae23a2 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp
@@ -72,10 +72,10 @@ class DiagramController::DiagramUndoCommand :
{
public:
- DiagramUndoCommand(DiagramController *diagram_controller, const Uid &diagram_key, const QString &text)
+ DiagramUndoCommand(DiagramController *diagramController, const Uid &diagramKey, const QString &text)
: UndoCommand(text),
- m_diagramController(diagram_controller),
- m_diagramKey(diagram_key)
+ m_diagramController(diagramController),
+ m_diagramKey(diagramKey)
{
}
@@ -107,10 +107,10 @@ class DiagramController::UpdateElementCommand :
public DiagramUndoCommand
{
public:
- UpdateElementCommand(DiagramController *diagram_controller, const Uid &diagram_key, DElement *element,
- DiagramController::UpdateAction update_action)
- : DiagramUndoCommand(diagram_controller, diagram_key, tr("Change")),
- m_updateAction(update_action)
+ UpdateElementCommand(DiagramController *diagramController, const Uid &diagramKey, DElement *element,
+ DiagramController::UpdateAction updateAction)
+ : DiagramUndoCommand(diagramController, diagramKey, tr("Change")),
+ m_updateAction(updateAction)
{
DCloneVisitor visitor;
element->accept(&visitor);
@@ -124,22 +124,22 @@ public:
bool mergeWith(const UndoCommand *other)
{
- const UpdateElementCommand *other_update_command = dynamic_cast<const UpdateElementCommand *>(other);
- if (!other_update_command) {
+ const UpdateElementCommand *otherUpdateCommand = dynamic_cast<const UpdateElementCommand *>(other);
+ if (!otherUpdateCommand) {
return false;
}
- if (getDiagramKey() != other_update_command->getDiagramKey()) {
+ if (getDiagramKey() != otherUpdateCommand->getDiagramKey()) {
return false;
}
- if (m_updateAction == DiagramController::UPDATE_MAJOR || other_update_command->m_updateAction == DiagramController::UPDATE_MAJOR
- || m_updateAction != other_update_command->m_updateAction) {
+ if (m_updateAction == DiagramController::UPDATE_MAJOR || otherUpdateCommand->m_updateAction == DiagramController::UPDATE_MAJOR
+ || m_updateAction != otherUpdateCommand->m_updateAction) {
return false;
}
// join other elements into this command
- foreach (const DElement *other_element, other_update_command->m_clonedElements.values()) {
- if (!m_clonedElements.contains(other_element->getUid())) {
+ foreach (const DElement *otherElement, otherUpdateCommand->m_clonedElements.values()) {
+ if (!m_clonedElements.contains(otherElement->getUid())) {
DCloneVisitor visitor;
- other_element->accept(&visitor);
+ otherElement->accept(&visitor);
m_clonedElements.insert(visitor.getCloned()->getUid(), visitor.getCloned());
}
}
@@ -164,27 +164,27 @@ public:
private:
void swap()
{
- DiagramController *diagram_controller = getDiagramController();
+ DiagramController *diagramController = getDiagramController();
MDiagram *diagram = getDiagram();
- foreach (DElement *cloned_element, m_clonedElements) {
- DElement *active_element = diagram_controller->findElement(cloned_element->getUid(), diagram);
- QMT_CHECK(active_element);
- int row = diagram->getDiagramElements().indexOf(active_element);
- emit diagram_controller->beginUpdateElement(row, diagram);
+ foreach (DElement *clonedElement, m_clonedElements) {
+ DElement *activeElement = diagramController->findElement(clonedElement->getUid(), diagram);
+ QMT_CHECK(activeElement);
+ int row = diagram->getDiagramElements().indexOf(activeElement);
+ emit diagramController->beginUpdateElement(row, diagram);
// clone active element
- DCloneVisitor clone_visitor;
- active_element->accept(&clone_visitor);
- DElement *new_element = clone_visitor.getCloned();
+ DCloneVisitor cloneVisitor;
+ activeElement->accept(&cloneVisitor);
+ DElement *newElement = cloneVisitor.getCloned();
// reset active element to cloned element
- DFlatAssignmentVisitor visitor(active_element);
- cloned_element->accept(&visitor);
+ DFlatAssignmentVisitor visitor(activeElement);
+ clonedElement->accept(&visitor);
// replace stored element with new cloned active element
- QMT_CHECK(cloned_element->getUid() == new_element->getUid());
- m_clonedElements.insert(new_element->getUid(), new_element);
- delete cloned_element;
- emit diagram_controller->endUpdateElement(row, diagram);
+ QMT_CHECK(clonedElement->getUid() == newElement->getUid());
+ m_clonedElements.insert(newElement->getUid(), newElement);
+ delete clonedElement;
+ emit diagramController->endUpdateElement(row, diagram);
}
- diagram_controller->diagramModified(diagram);
+ diagramController->diagramModified(diagram);
}
private:
@@ -199,8 +199,8 @@ class DiagramController::AbstractAddRemCommand :
public DiagramUndoCommand
{
protected:
- AbstractAddRemCommand(DiagramController *diagram_controller, const Uid &diagram_key, const QString &command_label)
- : DiagramUndoCommand(diagram_controller, diagram_key, command_label)
+ AbstractAddRemCommand(DiagramController *diagramController, const Uid &diagramKey, const QString &commandLabel)
+ : DiagramUndoCommand(diagramController, diagramKey, commandLabel)
{
}
@@ -213,46 +213,46 @@ protected:
void remove()
{
- DiagramController *diagram_controller = getDiagramController();
+ DiagramController *diagramController = getDiagramController();
MDiagram *diagram = getDiagram();
bool removed = false;
for (int i = 0; i < m_clonedElements.count(); ++i) {
Clone &clone = m_clonedElements[i];
QMT_CHECK(!clone.m_clonedElement);
- DElement *active_element = diagram_controller->findElement(clone.m_elementKey, diagram);
- QMT_CHECK(active_element);
- clone.m_indexOfElement = diagram->getDiagramElements().indexOf(active_element);
+ DElement *activeElement = diagramController->findElement(clone.m_elementKey, diagram);
+ QMT_CHECK(activeElement);
+ clone.m_indexOfElement = diagram->getDiagramElements().indexOf(activeElement);
QMT_CHECK(clone.m_indexOfElement >= 0);
- emit diagram_controller->beginRemoveElement(clone.m_indexOfElement, diagram);
- DCloneDeepVisitor clone_visitor;
- active_element->accept(&clone_visitor);
- clone.m_clonedElement = clone_visitor.getCloned();
- diagram->removeDiagramElement(active_element);
- emit diagram_controller->endRemoveElement(clone.m_indexOfElement, diagram);
+ emit diagramController->beginRemoveElement(clone.m_indexOfElement, diagram);
+ DCloneDeepVisitor cloneVisitor;
+ activeElement->accept(&cloneVisitor);
+ clone.m_clonedElement = cloneVisitor.getCloned();
+ diagram->removeDiagramElement(activeElement);
+ emit diagramController->endRemoveElement(clone.m_indexOfElement, diagram);
removed = true;
}
if (removed) {
- diagram_controller->diagramModified(diagram);
+ diagramController->diagramModified(diagram);
}
}
void insert()
{
- DiagramController *diagram_controller = getDiagramController();
+ DiagramController *diagramController = getDiagramController();
MDiagram *diagram = getDiagram();
bool inserted = false;
for (int i = m_clonedElements.count() - 1; i >= 0; --i) {
Clone &clone = m_clonedElements[i];
QMT_CHECK(clone.m_clonedElement);
QMT_CHECK(clone.m_clonedElement->getUid() == clone.m_elementKey);
- emit diagram_controller->beginInsertElement(clone.m_indexOfElement, diagram);
+ emit diagramController->beginInsertElement(clone.m_indexOfElement, diagram);
diagram->insertDiagramElement(clone.m_indexOfElement, clone.m_clonedElement);
clone.m_clonedElement = 0;
- emit diagram_controller->endInsertElement(clone.m_indexOfElement, diagram);
+ emit diagramController->endInsertElement(clone.m_indexOfElement, diagram);
inserted = true;
}
if (inserted) {
- diagram_controller->diagramModified(diagram);
+ diagramController->diagramModified(diagram);
}
}
@@ -266,16 +266,16 @@ class DiagramController::AddElementsCommand :
public AbstractAddRemCommand
{
public:
- AddElementsCommand(DiagramController *diagram_controller, const Uid &diagram_key, const QString &command_label)
- : AbstractAddRemCommand(diagram_controller, diagram_key, command_label)
+ AddElementsCommand(DiagramController *diagramController, const Uid &diagramKey, const QString &commandLabel)
+ : AbstractAddRemCommand(diagramController, diagramKey, commandLabel)
{
}
- void add(const Uid &element_key)
+ void add(const Uid &elementKey)
{
Clone clone;
- clone.m_elementKey = element_key;
+ clone.m_elementKey = elementKey;
m_clonedElements.append(clone);
}
@@ -299,8 +299,8 @@ class DiagramController::RemoveElementsCommand :
public AbstractAddRemCommand
{
public:
- RemoveElementsCommand(DiagramController *diagram_controller, const Uid &diagram_key, const QString &command_label)
- : AbstractAddRemCommand(diagram_controller, diagram_key, command_label)
+ RemoveElementsCommand(DiagramController *diagramController, const Uid &diagramKey, const QString &commandLabel)
+ : AbstractAddRemCommand(diagramController, diagramKey, commandLabel)
{
}
@@ -340,8 +340,8 @@ class DiagramController::FindDiagramsVisitor :
{
public:
- FindDiagramsVisitor(QList<MDiagram *> *all_diagrams)
- : m_allDiagrams(all_diagrams)
+ FindDiagramsVisitor(QList<MDiagram *> *allDiagrams)
+ : m_allDiagrams(allDiagrams)
{
}
@@ -368,43 +368,43 @@ DiagramController::~DiagramController()
{
}
-void DiagramController::setModelController(ModelController *model_controller)
+void DiagramController::setModelController(ModelController *modelController)
{
if (m_modelController) {
disconnect(m_modelController, 0, this, 0);
m_modelController = 0;
}
- if (model_controller) {
- m_modelController = model_controller;
- connect(model_controller, SIGNAL(beginResetModel()), this, SLOT(onBeginResetModel()));
- connect(model_controller, SIGNAL(endResetModel()), this, SLOT(onEndResetModel()));
+ if (modelController) {
+ m_modelController = modelController;
+ connect(modelController, SIGNAL(beginResetModel()), this, SLOT(onBeginResetModel()));
+ connect(modelController, SIGNAL(endResetModel()), this, SLOT(onEndResetModel()));
- connect(model_controller, SIGNAL(beginUpdateObject(int,const MObject*)), this, SLOT(onBeginUpdateObject(int,const MObject*)));
- connect(model_controller, SIGNAL(endUpdateObject(int,const MObject*)), this, SLOT(onEndUpdateObject(int,const MObject*)));
- connect(model_controller, SIGNAL(beginInsertObject(int,const MObject*)), this, SLOT(onBeginInsertObject(int,const MObject*)));
- connect(model_controller, SIGNAL(endInsertObject(int,const MObject*)), this, SLOT(onEndInsertObject(int,const MObject*)));
- connect(model_controller, SIGNAL(beginRemoveObject(int,const MObject*)), this, SLOT(onBeginRemoveObject(int,const MObject*)));
- connect(model_controller, SIGNAL(endRemoveObject(int,const MObject*)), this, SLOT(onEndRemoveObject(int,const MObject*)));
- connect(model_controller, SIGNAL(beginMoveObject(int,const MObject*)), this, SLOT(onBeginMoveObject(int,const MObject*)));
- connect(model_controller, SIGNAL(endMoveObject(int,const MObject*)), this, SLOT(onEndMoveObject(int,const MObject*)));
+ connect(modelController, SIGNAL(beginUpdateObject(int,const MObject*)), this, SLOT(onBeginUpdateObject(int,const MObject*)));
+ connect(modelController, SIGNAL(endUpdateObject(int,const MObject*)), this, SLOT(onEndUpdateObject(int,const MObject*)));
+ connect(modelController, SIGNAL(beginInsertObject(int,const MObject*)), this, SLOT(onBeginInsertObject(int,const MObject*)));
+ connect(modelController, SIGNAL(endInsertObject(int,const MObject*)), this, SLOT(onEndInsertObject(int,const MObject*)));
+ connect(modelController, SIGNAL(beginRemoveObject(int,const MObject*)), this, SLOT(onBeginRemoveObject(int,const MObject*)));
+ connect(modelController, SIGNAL(endRemoveObject(int,const MObject*)), this, SLOT(onEndRemoveObject(int,const MObject*)));
+ connect(modelController, SIGNAL(beginMoveObject(int,const MObject*)), this, SLOT(onBeginMoveObject(int,const MObject*)));
+ connect(modelController, SIGNAL(endMoveObject(int,const MObject*)), this, SLOT(onEndMoveObject(int,const MObject*)));
- connect(model_controller, SIGNAL(beginUpdateRelation(int,const MObject*)), this, SLOT(onBeginUpdateRelation(int,const MObject*)));
- connect(model_controller, SIGNAL(endUpdateRelation(int,const MObject*)), this, SLOT(onEndUpdateRelation(int,const MObject*)));
- connect(model_controller, SIGNAL(beginRemoveRelation(int,const MObject*)), this, SLOT(onBeginRemoveRelation(int,const MObject*)));
- connect(model_controller, SIGNAL(endRemoveRelation(int,const MObject*)), this, SLOT(onEndRemoveRelation(int,const MObject*)));
- connect(model_controller, SIGNAL(beginMoveRelation(int,const MObject*)), this, SLOT(onBeginMoveRelation(int,const MObject*)));
- connect(model_controller, SIGNAL(endMoveRelation(int,const MObject*)), this, SLOT(onEndMoveRelation(int,const MObject*)));
+ connect(modelController, SIGNAL(beginUpdateRelation(int,const MObject*)), this, SLOT(onBeginUpdateRelation(int,const MObject*)));
+ connect(modelController, SIGNAL(endUpdateRelation(int,const MObject*)), this, SLOT(onEndUpdateRelation(int,const MObject*)));
+ connect(modelController, SIGNAL(beginRemoveRelation(int,const MObject*)), this, SLOT(onBeginRemoveRelation(int,const MObject*)));
+ connect(modelController, SIGNAL(endRemoveRelation(int,const MObject*)), this, SLOT(onEndRemoveRelation(int,const MObject*)));
+ connect(modelController, SIGNAL(beginMoveRelation(int,const MObject*)), this, SLOT(onBeginMoveRelation(int,const MObject*)));
+ connect(modelController, SIGNAL(endMoveRelation(int,const MObject*)), this, SLOT(onEndMoveRelation(int,const MObject*)));
}
}
-void DiagramController::setUndoController(UndoController *undo_controller)
+void DiagramController::setUndoController(UndoController *undoController)
{
- m_undoController = undo_controller;
+ m_undoController = undoController;
}
-MDiagram *DiagramController::findDiagram(const Uid &diagram_key) const
+MDiagram *DiagramController::findDiagram(const Uid &diagramKey) const
{
- return dynamic_cast<MDiagram *>(m_modelController->findObject(diagram_key));
+ return dynamic_cast<MDiagram *>(m_modelController->findObject(diagramKey));
}
void DiagramController::addElement(DElement *element, MDiagram *diagram)
@@ -413,9 +413,9 @@ void DiagramController::addElement(DElement *element, MDiagram *diagram)
emit beginInsertElement(row, diagram);
updateElementFromModel(element, diagram, false);
if (m_undoController) {
- AddElementsCommand *undo_command = new AddElementsCommand(this, diagram->getUid(), tr("Add Object"));
- m_undoController->push(undo_command);
- undo_command->add(element->getUid());
+ AddElementsCommand *undoCommand = new AddElementsCommand(this, diagram->getUid(), tr("Add Object"));
+ m_undoController->push(undoCommand);
+ undoCommand->add(element->getUid());
}
diagram->addDiagramElement(element);
emit endInsertElement(row, diagram);
@@ -428,9 +428,9 @@ void DiagramController::removeElement(DElement *element, MDiagram *diagram)
int row = diagram->getDiagramElements().indexOf(element);
emit beginRemoveElement(row, diagram);
if (m_undoController) {
- RemoveElementsCommand *undo_command = new RemoveElementsCommand(this, diagram->getUid(), tr("Remove Object"));
- m_undoController->push(undo_command);
- undo_command->add(element);
+ RemoveElementsCommand *undoCommand = new RemoveElementsCommand(this, diagram->getUid(), tr("Remove Object"));
+ m_undoController->push(undoCommand);
+ undoCommand->add(element);
}
diagram->removeDiagramElement(element);
emit endRemoveElement(row, diagram);
@@ -444,29 +444,29 @@ DElement *DiagramController::findElement(const Uid &key, const MDiagram *diagram
return diagram->findDiagramElement(key);
}
-bool DiagramController::hasDelegate(const MElement *model_element, const MDiagram *diagram) const
+bool DiagramController::hasDelegate(const MElement *modelElement, const MDiagram *diagram) const
{
// PERFORM smarter implementation after map is introduced
- return findDelegate(model_element, diagram) != 0;
+ return findDelegate(modelElement, diagram) != 0;
}
-DElement *DiagramController::findDelegate(const MElement *model_element, const MDiagram *diagram) const
+DElement *DiagramController::findDelegate(const MElement *modelElement, const MDiagram *diagram) const
{
Q_UNUSED(diagram);
// PERFORM use map to increase performance
- foreach (DElement *diagram_element, diagram->getDiagramElements()) {
- if (diagram_element->getModelUid().isValid() && diagram_element->getModelUid() == model_element->getUid()) {
- return diagram_element;
+ foreach (DElement *diagramElement, diagram->getDiagramElements()) {
+ if (diagramElement->getModelUid().isValid() && diagramElement->getModelUid() == modelElement->getUid()) {
+ return diagramElement;
}
}
return 0;
}
-void DiagramController::startUpdateElement(DElement *element, MDiagram *diagram, UpdateAction update_action)
+void DiagramController::startUpdateElement(DElement *element, MDiagram *diagram, UpdateAction updateAction)
{
emit beginUpdateElement(diagram->getDiagramElements().indexOf(element), diagram);
if (m_undoController) {
- m_undoController->push(new UpdateElementCommand(this, diagram->getUid(), element, update_action));
+ m_undoController->push(new UpdateElementCommand(this, diagram->getUid(), element, updateAction));
}
}
@@ -486,49 +486,49 @@ void DiagramController::breakUndoChain()
m_undoController->doNotMerge();
}
-DContainer DiagramController::cutElements(const DSelection &diagram_selection, MDiagram *diagram)
+DContainer DiagramController::cutElements(const DSelection &diagramSelection, MDiagram *diagram)
{
- DContainer copied_elements = copyElements(diagram_selection, diagram);
- deleteElements(diagram_selection, diagram, tr("Cut"));
- return copied_elements;
+ DContainer copiedElements = copyElements(diagramSelection, diagram);
+ deleteElements(diagramSelection, diagram, tr("Cut"));
+ return copiedElements;
}
-DContainer DiagramController::copyElements(const DSelection &diagram_selection, const MDiagram *diagram)
+DContainer DiagramController::copyElements(const DSelection &diagramSelection, const MDiagram *diagram)
{
QMT_CHECK(diagram);
- DReferences simplified_selection = simplify(diagram_selection, diagram);
- DContainer copied_elements;
- foreach (const DElement *element, simplified_selection.getElements()) {
+ DReferences simplifiedSelection = simplify(diagramSelection, diagram);
+ DContainer copiedElements;
+ foreach (const DElement *element, simplifiedSelection.getElements()) {
DCloneDeepVisitor visitor;
element->accept(&visitor);
- DElement *cloned_element = visitor.getCloned();
- copied_elements.submit(cloned_element);
+ DElement *clonedElement = visitor.getCloned();
+ copiedElements.submit(clonedElement);
}
- return copied_elements;
+ return copiedElements;
}
-void DiagramController::pasteElements(const DContainer &diagram_container, MDiagram *diagram)
+void DiagramController::pasteElements(const DContainer &diagramContainer, MDiagram *diagram)
{
QMT_CHECK(diagram);
// clone all elements and renew their keys
- QHash<Uid, Uid> renewed_keys;
- QList<DElement *> cloned_elements;
- foreach (const DElement *element, diagram_container.getElements()) {
+ QHash<Uid, Uid> renewedKeys;
+ QList<DElement *> clonedElements;
+ foreach (const DElement *element, diagramContainer.getElements()) {
if (!isDelegatedElementOnDiagram(element, diagram)) {
DCloneDeepVisitor visitor;
element->accept(&visitor);
- DElement *cloned_element = visitor.getCloned();
- renewElementKey(cloned_element, &renewed_keys);
- cloned_elements.append(cloned_element);
+ DElement *clonedElement = visitor.getCloned();
+ renewElementKey(clonedElement, &renewedKeys);
+ clonedElements.append(clonedElement);
}
}
// fix all keys referencing between pasting elements
- foreach(DElement *cloned_element, cloned_elements) {
- DRelation *relation = dynamic_cast<DRelation *>(cloned_element);
+ foreach(DElement *clonedElement, clonedElements) {
+ DRelation *relation = dynamic_cast<DRelation *>(clonedElement);
if (relation) {
- updateRelationKeys(relation, renewed_keys);
+ updateRelationKeys(relation, renewedKeys);
}
}
if (m_undoController) {
@@ -536,31 +536,31 @@ void DiagramController::pasteElements(const DContainer &diagram_container, MDiag
}
// insert all elements
bool added = false;
- foreach (DElement *cloned_element, cloned_elements) {
- if (!dynamic_cast<DRelation *>(cloned_element)) {
+ foreach (DElement *clonedElement, clonedElements) {
+ if (!dynamic_cast<DRelation *>(clonedElement)) {
int row = diagram->getDiagramElements().size();
emit beginInsertElement(row, diagram);
if (m_undoController) {
- AddElementsCommand *undo_command = new AddElementsCommand(this, diagram->getUid(), tr("Paste"));
- m_undoController->push(undo_command);
- undo_command->add(cloned_element->getUid());
+ AddElementsCommand *undoCommand = new AddElementsCommand(this, diagram->getUid(), tr("Paste"));
+ m_undoController->push(undoCommand);
+ undoCommand->add(clonedElement->getUid());
}
- diagram->addDiagramElement(cloned_element);
+ diagram->addDiagramElement(clonedElement);
emit endInsertElement(row, diagram);
added = true;
}
}
- foreach (DElement *cloned_element, cloned_elements) {
- DRelation *cloned_relation = dynamic_cast<DRelation *>(cloned_element);
- if (cloned_relation && areRelationEndsOnDiagram(cloned_relation, diagram)) {
+ foreach (DElement *clonedElement, clonedElements) {
+ DRelation *clonedRelation = dynamic_cast<DRelation *>(clonedElement);
+ if (clonedRelation && areRelationEndsOnDiagram(clonedRelation, diagram)) {
int row = diagram->getDiagramElements().size();
emit beginInsertElement(row, diagram);
if (m_undoController) {
- AddElementsCommand *undo_command = new AddElementsCommand(this, diagram->getUid(), tr("Paste"));
- m_undoController->push(undo_command);
- undo_command->add(cloned_element->getUid());
+ AddElementsCommand *undoCommand = new AddElementsCommand(this, diagram->getUid(), tr("Paste"));
+ m_undoController->push(undoCommand);
+ undoCommand->add(clonedElement->getUid());
}
- diagram->addDiagramElement(cloned_element);
+ diagram->addDiagramElement(clonedElement);
emit endInsertElement(row, diagram);
added = true;
}
@@ -573,9 +573,9 @@ void DiagramController::pasteElements(const DContainer &diagram_container, MDiag
}
}
-void DiagramController::deleteElements(const DSelection &diagram_selection, MDiagram *diagram)
+void DiagramController::deleteElements(const DSelection &diagramSelection, MDiagram *diagram)
{
- deleteElements(diagram_selection, diagram, tr("Delete"));
+ deleteElements(diagramSelection, diagram, tr("Delete"));
}
void DiagramController::onBeginResetModel()
@@ -591,8 +591,8 @@ void DiagramController::onEndResetModel()
// remove all elements which are not longer part of the model
foreach (DElement *element, diagram->getDiagramElements()) {
if (element->getModelUid().isValid()) {
- MElement *model_element = m_modelController->findElement(element->getModelUid());
- if (!model_element) {
+ MElement *modelElement = m_modelController->findElement(element->getModelUid());
+ if (!modelElement) {
removeElement(element, diagram);
}
}
@@ -615,21 +615,21 @@ void DiagramController::onBeginUpdateObject(int row, const MObject *parent)
void DiagramController::onEndUpdateObject(int row, const MObject *parent)
{
- MObject *model_object = m_modelController->getObject(row, parent);
- QMT_CHECK(model_object);
- MPackage *model_package = dynamic_cast<MPackage *>(model_object);
+ MObject *modelObject = m_modelController->getObject(row, parent);
+ QMT_CHECK(modelObject);
+ MPackage *modelPackage = dynamic_cast<MPackage *>(modelObject);
foreach (MDiagram *diagram, m_allDiagrams) {
- DObject *object = findDelegate<DObject>(model_object, diagram);
+ DObject *object = findDelegate<DObject>(modelObject, diagram);
if (object) {
updateElementFromModel(object, diagram, true);
}
- if (model_package) {
+ if (modelPackage) {
// update each element that has the updated object as its owner (for context changes)
- foreach (DElement *diagram_element, diagram->getDiagramElements()) {
- if (diagram_element->getModelUid().isValid()) {
- MObject *mobject = m_modelController->findObject(diagram_element->getModelUid());
- if (mobject && mobject->getOwner() == model_package) {
- updateElementFromModel(diagram_element, diagram, true);
+ foreach (DElement *diagramElement, diagram->getDiagramElements()) {
+ if (diagramElement->getModelUid().isValid()) {
+ MObject *mobject = m_modelController->findObject(diagramElement->getModelUid());
+ if (mobject && mobject->getOwner() == modelPackage) {
+ updateElementFromModel(diagramElement, diagram, true);
}
}
}
@@ -647,10 +647,10 @@ void DiagramController::onEndInsertObject(int row, const MObject *owner)
{
QMT_CHECK(owner);
- MObject *model_object = m_modelController->getObject(row, owner);
- if (MDiagram *model_diagram = dynamic_cast<MDiagram *>(model_object)) {
- QMT_CHECK(!m_allDiagrams.contains(model_diagram));
- m_allDiagrams.append(model_diagram);
+ MObject *modelObject = m_modelController->getObject(row, owner);
+ if (MDiagram *modelDiagram = dynamic_cast<MDiagram *>(modelObject)) {
+ QMT_CHECK(!m_allDiagrams.contains(modelDiagram));
+ m_allDiagrams.append(modelDiagram);
}
}
@@ -658,8 +658,8 @@ void DiagramController::onBeginRemoveObject(int row, const MObject *parent)
{
QMT_CHECK(parent);
- MObject *model_object = m_modelController->getObject(row, parent);
- removeObjects(model_object);
+ MObject *modelObject = m_modelController->getObject(row, parent);
+ removeObjects(modelObject);
}
void DiagramController::onEndRemoveObject(int row, const MObject *parent)
@@ -668,10 +668,10 @@ void DiagramController::onEndRemoveObject(int row, const MObject *parent)
Q_UNUSED(parent);
}
-void DiagramController::onBeginMoveObject(int former_row, const MObject *former_owner)
+void DiagramController::onBeginMoveObject(int formerRow, const MObject *formerOwner)
{
- Q_UNUSED(former_row);
- Q_UNUSED(former_owner);
+ Q_UNUSED(formerRow);
+ Q_UNUSED(formerOwner);
}
@@ -680,15 +680,15 @@ void DiagramController::onEndMoveObject(int row, const MObject *owner)
onEndUpdateObject(row, owner);
// if diagram was moved update all elements because of changed context
- MObject *model_object = m_modelController->getObject(row, owner);
- QMT_CHECK(model_object);
- MDiagram *model_diagram = dynamic_cast<MDiagram *>(model_object);
- if (model_diagram) {
- emit beginResetDiagram(model_diagram);
- foreach (DElement *diagram_element, model_diagram->getDiagramElements()) {
- updateElementFromModel(diagram_element, model_diagram, false);
+ MObject *modelObject = m_modelController->getObject(row, owner);
+ QMT_CHECK(modelObject);
+ MDiagram *modelDiagram = dynamic_cast<MDiagram *>(modelObject);
+ if (modelDiagram) {
+ emit beginResetDiagram(modelDiagram);
+ foreach (DElement *diagramElement, modelDiagram->getDiagramElements()) {
+ updateElementFromModel(diagramElement, modelDiagram, false);
}
- emit endResetDiagram(model_diagram);
+ emit endResetDiagram(modelDiagram);
}
}
@@ -702,9 +702,9 @@ void DiagramController::onBeginUpdateRelation(int row, const MObject *owner)
void DiagramController::onEndUpdateRelation(int row, const MObject *owner)
{
- MRelation *model_relation = owner->getRelations().at(row);
+ MRelation *modelRelation = owner->getRelations().at(row);
foreach (MDiagram *diagram, m_allDiagrams) {
- DRelation *relation = findDelegate<DRelation>(model_relation, diagram);
+ DRelation *relation = findDelegate<DRelation>(modelRelation, diagram);
if (relation) {
updateElementFromModel(relation, diagram, true);
}
@@ -715,8 +715,8 @@ void DiagramController::onBeginRemoveRelation(int row, const MObject *owner)
{
QMT_CHECK(owner);
- MRelation *model_relation = owner->getRelations().at(row);
- removeRelations(model_relation);
+ MRelation *modelRelation = owner->getRelations().at(row);
+ removeRelations(modelRelation);
}
void DiagramController::onEndRemoveRelation(int row, const MObject *owner)
@@ -725,10 +725,10 @@ void DiagramController::onEndRemoveRelation(int row, const MObject *owner)
Q_UNUSED(owner);
}
-void DiagramController::onBeginMoveRelation(int former_row, const MObject *former_owner)
+void DiagramController::onBeginMoveRelation(int formerRow, const MObject *formerOwner)
{
- Q_UNUSED(former_row);
- Q_UNUSED(former_owner);
+ Q_UNUSED(formerRow);
+ Q_UNUSED(formerOwner);
// nothing to do
}
@@ -738,28 +738,28 @@ void DiagramController::onEndMoveRelation(int row, const MObject *owner)
onEndUpdateRelation(row, owner);
}
-void DiagramController::deleteElements(const DSelection &diagram_selection, MDiagram *diagram, const QString &command_label)
+void DiagramController::deleteElements(const DSelection &diagramSelection, MDiagram *diagram, const QString &commandLabel)
{
QMT_CHECK(diagram);
- DReferences simplified_selection = simplify(diagram_selection, diagram);
- if (simplified_selection.getElements().isEmpty()) {
+ DReferences simplifiedSelection = simplify(diagramSelection, diagram);
+ if (simplifiedSelection.getElements().isEmpty()) {
return;
}
if (m_undoController) {
- m_undoController->beginMergeSequence(command_label);
+ m_undoController->beginMergeSequence(commandLabel);
}
bool removed = false;
- foreach (DElement *element, simplified_selection.getElements()) {
+ foreach (DElement *element, simplifiedSelection.getElements()) {
// element may have been deleted indirectly by predecessor element in loop
if ((element = findElement(element->getUid(), diagram))) {
removeRelations(element, diagram);
int row = diagram->getDiagramElements().indexOf(element);
emit beginRemoveElement(diagram->getDiagramElements().indexOf(element), diagram);
if (m_undoController) {
- RemoveElementsCommand *cut_command = new RemoveElementsCommand(this, diagram->getUid(), command_label);
- m_undoController->push(cut_command);
- cut_command->add(element);
+ RemoveElementsCommand *cutCommand = new RemoveElementsCommand(this, diagram->getUid(), commandLabel);
+ m_undoController->push(cutCommand);
+ cutCommand->add(element);
}
diagram->removeDiagramElement(element);
emit endRemoveElement(row, diagram);
@@ -785,26 +785,26 @@ DElement *DiagramController::findElementOnAnyDiagram(const Uid &uid)
return 0;
}
-void DiagramController::removeObjects(MObject *model_object)
+void DiagramController::removeObjects(MObject *modelObject)
{
foreach (MDiagram *diagram, m_allDiagrams) {
- DElement *diagram_element = findDelegate(model_object, diagram);
- if (diagram_element) {
- removeElement(diagram_element, diagram);
- }
- foreach (const Handle<MRelation> &relation, model_object->getRelations()) {
- DElement *diagram_element = findDelegate(relation.getTarget(), diagram);
- if (diagram_element) {
- removeElement(diagram_element, diagram);
+ DElement *diagramElement = findDelegate(modelObject, diagram);
+ if (diagramElement) {
+ removeElement(diagramElement, diagram);
+ }
+ foreach (const Handle<MRelation> &relation, modelObject->getRelations()) {
+ DElement *diagramElement = findDelegate(relation.getTarget(), diagram);
+ if (diagramElement) {
+ removeElement(diagramElement, diagram);
}
}
}
- foreach (const Handle<MObject> &object, model_object->getChildren()) {
+ foreach (const Handle<MObject> &object, modelObject->getChildren()) {
if (object.hasTarget()) {
removeObjects(object.getTarget());
}
}
- if (MDiagram *diagram = dynamic_cast<MDiagram *>(model_object)) {
+ if (MDiagram *diagram = dynamic_cast<MDiagram *>(modelObject)) {
emit diagramAboutToBeRemoved(diagram);
QMT_CHECK(m_allDiagrams.contains(diagram));
m_allDiagrams.removeOne(diagram);
@@ -817,59 +817,59 @@ void DiagramController::removeObjects(MObject *model_object)
}
}
-void DiagramController::removeRelations(MRelation *model_relation)
+void DiagramController::removeRelations(MRelation *modelRelation)
{
foreach (MDiagram *diagram, m_allDiagrams) {
- DElement *diagram_element = findDelegate(model_relation, diagram);
- if (diagram_element) {
- removeElement(diagram_element, diagram);
+ DElement *diagramElement = findDelegate(modelRelation, diagram);
+ if (diagramElement) {
+ removeElement(diagramElement, diagram);
}
}
}
void DiagramController::removeRelations(DElement *element, MDiagram *diagram)
{
- DObject *diagram_object = dynamic_cast<DObject *>(element);
- if (diagram_object) {
- foreach (DElement *diagram_element, diagram->getDiagramElements()) {
- if (DRelation *diagram_relation = dynamic_cast<DRelation *>(diagram_element)) {
- if (diagram_relation->getEndA() == diagram_object->getUid() || diagram_relation->getEndB() == diagram_object->getUid()) {
- removeElement(diagram_relation, diagram);
+ DObject *diagramObject = dynamic_cast<DObject *>(element);
+ if (diagramObject) {
+ foreach (DElement *diagramElement, diagram->getDiagramElements()) {
+ if (DRelation *diagramRelation = dynamic_cast<DRelation *>(diagramElement)) {
+ if (diagramRelation->getEndA() == diagramObject->getUid() || diagramRelation->getEndB() == diagramObject->getUid()) {
+ removeElement(diagramRelation, diagram);
}
}
}
}
}
-void DiagramController::renewElementKey(DElement *element, QHash<Uid, Uid> *renewed_keys)
+void DiagramController::renewElementKey(DElement *element, QHash<Uid, Uid> *renewedKeys)
{
- QMT_CHECK(renewed_keys);
+ QMT_CHECK(renewedKeys);
if (element) {
- DElement *existing_element_on_diagram = findElementOnAnyDiagram(element->getUid());
- if (existing_element_on_diagram) {
- QMT_CHECK(existing_element_on_diagram != element);
- Uid old_key = element->getUid();
+ DElement *existingElementOnDiagram = findElementOnAnyDiagram(element->getUid());
+ if (existingElementOnDiagram) {
+ QMT_CHECK(existingElementOnDiagram != element);
+ Uid oldKey = element->getUid();
element->renewUid();
- Uid new_key = element->getUid();
- renewed_keys->insert(old_key, new_key);
+ Uid newKey = element->getUid();
+ renewedKeys->insert(oldKey, newKey);
}
}
}
-void DiagramController::updateRelationKeys(DRelation *relation, const QHash<Uid, Uid> &renewed_keys)
+void DiagramController::updateRelationKeys(DRelation *relation, const QHash<Uid, Uid> &renewedKeys)
{
- Uid new_end_a_key = renewed_keys.value(relation->getEndA(), Uid::getInvalidUid());
- if (new_end_a_key.isValid()) {
- relation->setEndA(new_end_a_key);
+ Uid newEndAKey = renewedKeys.value(relation->getEndA(), Uid::getInvalidUid());
+ if (newEndAKey.isValid()) {
+ relation->setEndA(newEndAKey);
}
- Uid new_end_b_key = renewed_keys.value(relation->getEndB(), Uid::getInvalidUid());
- if (new_end_b_key.isValid()) {
- relation->setEndB(new_end_b_key);
+ Uid newEndBKey = renewedKeys.value(relation->getEndB(), Uid::getInvalidUid());
+ if (newEndBKey.isValid()) {
+ relation->setEndB(newEndBKey);
}
}
-void DiagramController::updateElementFromModel(DElement *element, const MDiagram *diagram, bool emit_update_signal)
+void DiagramController::updateElementFromModel(DElement *element, const MDiagram *diagram, bool emitUpdateSignal)
{
if (!element->getModelUid().isValid()) {
return;
@@ -880,7 +880,7 @@ void DiagramController::updateElementFromModel(DElement *element, const MDiagram
MElement *melement = m_modelController->findElement(element->getModelUid());
QMT_CHECK(melement);
- if (emit_update_signal) {
+ if (emitUpdateSignal) {
visitor.setCheckNeedsUpdate(true);
melement->accept(&visitor);
if (visitor.updateNeeded()) {
@@ -902,10 +902,10 @@ void DiagramController::diagramModified(MDiagram *diagram)
emit modified(diagram);
}
-DReferences DiagramController::simplify(const DSelection &diagram_selection, const MDiagram *diagram)
+DReferences DiagramController::simplify(const DSelection &diagramSelection, const MDiagram *diagram)
{
DReferences references;
- foreach (const DSelection::Index &index, diagram_selection.getIndices()) {
+ foreach (const DSelection::Index &index, diagramSelection.getIndices()) {
DElement *element = findElement(index.getElementKey(), diagram);
if (element) {
references.append(element);
@@ -924,11 +924,11 @@ MElement *DiagramController::getDelegatedElement(const DElement *element) const
bool DiagramController::isDelegatedElementOnDiagram(const DElement *element, const MDiagram *diagram) const
{
- MElement *model_element = getDelegatedElement(element);
- if (!model_element) {
+ MElement *modelElement = getDelegatedElement(element);
+ if (!modelElement) {
return false;
}
- return hasDelegate(model_element, diagram);
+ return hasDelegate(modelElement, diagram);
}
bool DiagramController::areRelationEndsOnDiagram(const DRelation *relation, const MDiagram *diagram) const
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.h b/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.h
index bd46b7fda04d5525a7fa0cd8e0c6541bd1f1d6ca..fc1fdc378eb8eb1910a2f7df2abf2c38d38187a1 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.h
@@ -116,15 +116,15 @@ public:
ModelController *getModelController() const { return m_modelController; }
- void setModelController(ModelController *model_controller);
+ void setModelController(ModelController *modelController);
UndoController *getUndoController() const { return m_undoController; }
- void setUndoController(UndoController *undo_controller);
+ void setUndoController(UndoController *undoController);
private:
- MDiagram *findDiagram(const Uid &diagram_key) const;
+ MDiagram *findDiagram(const Uid &diagramKey) const;
public:
@@ -137,17 +137,17 @@ public:
template<class T>
T *findElement(const Uid &key, const MDiagram *diagram) const { return dynamic_cast<T *>(findElement(key, diagram)); }
- bool hasDelegate(const MElement *model_element, const MDiagram *diagram) const;
+ bool hasDelegate(const MElement *modelElement, const MDiagram *diagram) const;
- DElement *findDelegate(const MElement *model_element, const MDiagram *diagram) const;
+ DElement *findDelegate(const MElement *modelElement, const MDiagram *diagram) const;
template<class T>
- T *findDelegate(const MElement *model_element, const MDiagram *diagram) const
+ T *findDelegate(const MElement *modelElement, const MDiagram *diagram) const
{
- return dynamic_cast<T *>(findDelegate(model_element, diagram));
+ return dynamic_cast<T *>(findDelegate(modelElement, diagram));
}
- void startUpdateElement(DElement *element, MDiagram *diagram, UpdateAction update_action);
+ void startUpdateElement(DElement *element, MDiagram *diagram, UpdateAction updateAction);
void finishUpdateElement(DElement *element, MDiagram *diagram, bool cancelled);
@@ -155,13 +155,13 @@ public:
public:
- DContainer cutElements(const DSelection &diagram_selection, MDiagram *diagram);
+ DContainer cutElements(const DSelection &diagramSelection, MDiagram *diagram);
- DContainer copyElements(const DSelection &diagram_selection, const MDiagram *diagram);
+ DContainer copyElements(const DSelection &diagramSelection, const MDiagram *diagram);
- void pasteElements(const DContainer &diagram_container, MDiagram *diagram);
+ void pasteElements(const DContainer &diagramContainer, MDiagram *diagram);
- void deleteElements(const DSelection &diagram_selection, MDiagram *diagram);
+ void deleteElements(const DSelection &diagramSelection, MDiagram *diagram);
private slots:
@@ -181,7 +181,7 @@ private slots:
void onEndRemoveObject(int row, const MObject *parent);
- void onBeginMoveObject(int former_row, const MObject *former_owner);
+ void onBeginMoveObject(int formerRow, const MObject *formerOwner);
void onEndMoveObject(int row, const MObject *owner);
@@ -193,31 +193,31 @@ private slots:
void onEndRemoveRelation(int row, const MObject *owner);
- void onBeginMoveRelation(int former_row, const MObject *former_owner);
+ void onBeginMoveRelation(int formerRow, const MObject *formerOwner);
void onEndMoveRelation(int row, const MObject *owner);
private:
- void deleteElements(const DSelection &diagram_selection, MDiagram *diagram, const QString &command_label);
+ void deleteElements(const DSelection &diagramSelection, MDiagram *diagram, const QString &commandLabel);
DElement *findElementOnAnyDiagram(const Uid &uid);
- void removeObjects(MObject *model_object);
+ void removeObjects(MObject *modelObject);
- void removeRelations(MRelation *model_relation);
+ void removeRelations(MRelation *modelRelation);
void removeRelations(DElement *element, MDiagram *diagram);
- void renewElementKey(DElement *element, QHash<Uid, Uid> *renewed_keys);
+ void renewElementKey(DElement *element, QHash<Uid, Uid> *renewedKeys);
- void updateRelationKeys(DRelation *relation, const QHash<Uid, Uid> &renewed_keys);
+ void updateRelationKeys(DRelation *relation, const QHash<Uid, Uid> &renewedKeys);
- void updateElementFromModel(DElement *element, const MDiagram *diagram, bool emit_update_signal);
+ void updateElementFromModel(DElement *element, const MDiagram *diagram, bool emitUpdateSignal);
void diagramModified(MDiagram *diagram);
- DReferences simplify(const DSelection &diagram_selection, const MDiagram *diagram);
+ DReferences simplify(const DSelection &diagramSelection, const MDiagram *diagram);
MElement *getDelegatedElement(const DElement *element) const;
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.cpp b/src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.cpp
index a83bd058f02c736555400a9efe1b7d221603801f..0d62983b2a1e5aef2d98fc55a4358f10b6b6cf30 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.cpp
@@ -54,18 +54,18 @@
namespace qmt {
-DUpdateVisitor::DUpdateVisitor(DElement *target, const MDiagram *diagram, bool check_needs_update)
+DUpdateVisitor::DUpdateVisitor(DElement *target, const MDiagram *diagram, bool checkNeedsUpdate)
: m_target(target),
m_diagram(diagram),
- m_checkNeedsUpdate(check_needs_update),
- m_updateNeeded(!check_needs_update)
+ m_checkNeedsUpdate(checkNeedsUpdate),
+ m_updateNeeded(!checkNeedsUpdate)
{
}
-void DUpdateVisitor::setCheckNeedsUpdate(bool check_needs_update)
+void DUpdateVisitor::setCheckNeedsUpdate(bool checkNeedsUpdate)
{
- m_checkNeedsUpdate = check_needs_update;
- m_updateNeeded = !check_needs_update;
+ m_checkNeedsUpdate = checkNeedsUpdate;
+ m_updateNeeded = !checkNeedsUpdate;
}
void DUpdateVisitor::visitMElement(const MElement *element)
@@ -82,11 +82,11 @@ void DUpdateVisitor::visitMObject(const MObject *object)
if (isUpdating(object->getStereotypes() != dobject->getStereotypes())) {
dobject->setStereotypes(object->getStereotypes());
}
- const MObject *object_owner = object->getOwner();
- const MObject *diagram_owner = m_diagram->getOwner();
- if (object_owner && diagram_owner && object_owner->getUid() != diagram_owner->getUid()) {
- if (isUpdating(object_owner->getName() != dobject->getContext())) {
- dobject->setContext(object_owner->getName());
+ const MObject *objectOwner = object->getOwner();
+ const MObject *diagramOwner = m_diagram->getOwner();
+ if (objectOwner && diagramOwner && objectOwner->getUid() != diagramOwner->getUid()) {
+ if (isUpdating(objectOwner->getName() != dobject->getContext())) {
+ dobject->setContext(objectOwner->getName());
}
} else {
if (isUpdating(!dobject->getContext().isEmpty())) {
@@ -191,34 +191,34 @@ void DUpdateVisitor::visitMAssociation(const MAssociation *association)
{
DAssociation *dassociation = dynamic_cast<DAssociation *>(m_target);
QMT_CHECK(dassociation);
- DAssociationEnd end_a;
- end_a.setName(association->getA().getName());
- end_a.setCardinatlity(association->getA().getCardinality());
- end_a.setNavigable(association->getA().isNavigable());
- end_a.setKind(association->getA().getKind());
- if (isUpdating(end_a != dassociation->getA())) {
- dassociation->setA(end_a);
- }
- DAssociationEnd end_b;
- end_b.setName(association->getB().getName());
- end_b.setCardinatlity(association->getB().getCardinality());
- end_b.setNavigable(association->getB().isNavigable());
- end_b.setKind(association->getB().getKind());
- if (isUpdating(end_b != dassociation->getB())) {
- dassociation->setB(end_b);
+ DAssociationEnd endA;
+ endA.setName(association->getA().getName());
+ endA.setCardinatlity(association->getA().getCardinality());
+ endA.setNavigable(association->getA().isNavigable());
+ endA.setKind(association->getA().getKind());
+ if (isUpdating(endA != dassociation->getA())) {
+ dassociation->setA(endA);
+ }
+ DAssociationEnd endB;
+ endB.setName(association->getB().getName());
+ endB.setCardinatlity(association->getB().getCardinality());
+ endB.setNavigable(association->getB().isNavigable());
+ endB.setKind(association->getB().getKind());
+ if (isUpdating(endB != dassociation->getB())) {
+ dassociation->setB(endB);
}
visitMRelation(association);
}
-bool DUpdateVisitor::isUpdating(bool value_changed)
+bool DUpdateVisitor::isUpdating(bool valueChanged)
{
if (m_checkNeedsUpdate) {
- if (value_changed) {
+ if (valueChanged) {
m_updateNeeded = true;
}
return false;
}
- return value_changed;
+ return valueChanged;
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.h b/src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.h
index 9a48e86a0933743b0c98b2326e26c492174168f1..10258d04761e6c387c100d21800af226c71f90a8 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_controller/dupdatevisitor.h
@@ -44,13 +44,13 @@ class QMT_EXPORT DUpdateVisitor :
public MConstVisitor
{
public:
- DUpdateVisitor(DElement *target, const MDiagram *diagram, bool check_needs_update = false);
+ DUpdateVisitor(DElement *target, const MDiagram *diagram, bool checkNeedsUpdate = false);
public:
bool updateNeeded() const { return m_updateNeeded; }
- void setCheckNeedsUpdate(bool check_needs_update);
+ void setCheckNeedsUpdate(bool checkNeedsUpdate);
void visitMElement(const MElement *element);
@@ -78,7 +78,7 @@ public:
private:
- bool isUpdating(bool value_changed);
+ bool isUpdating(bool valueChanged);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/alignable.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/alignable.h
index 80bf573bb9ef51183be3447672277df756a84441..39b98c15748ee083c00cca65d6977c7451a003fe 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/alignable.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/alignable.h
@@ -57,7 +57,7 @@ public:
public:
- virtual void align(AlignType align_type, const QString &identifier) = 0;
+ virtual void align(AlignType alignType, const QString &identifier) = 0;
};
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/intersectionable.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/intersectionable.h
index 8d88084f237e926465ee72c57c158f028f8d039d..fc1bee60a652792c28af7a4525b8c9b9c04fbf41 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/intersectionable.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/intersectionable.h
@@ -46,7 +46,7 @@ public:
virtual ~IIntersectionable() { }
- virtual bool intersectShapeWithLine(const QLineF &line, QPointF *intersection_point, QLineF *intersection_line = 0) const = 0;
+ virtual bool intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine = 0) const = 0;
};
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/latchable.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/latchable.h
index 17188b518856ea04e0515eb4f51bffa6d390ea92..a56e28d64d056d5fcec171d3a8739a89c0912219 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/latchable.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/latchable.h
@@ -66,11 +66,11 @@ public:
{
}
- Latch(LatchType latch_type, qreal pos, qreal other_pos1, qreal other_pos2, const QString &identifier)
- : m_latchType(latch_type),
+ Latch(LatchType latchType, qreal pos, qreal otherPos1, qreal otherPos2, const QString &identifier)
+ : m_latchType(latchType),
m_pos(pos),
- m_otherPos1(other_pos1),
- m_otherPos2(other_pos2),
+ m_otherPos1(otherPos1),
+ m_otherPos2(otherPos2),
m_identifier(identifier)
{
}
@@ -85,9 +85,9 @@ public:
virtual ~ILatchable() { }
- virtual QList<Latch> getHorizontalLatches(Action action, bool grabbed_item) const = 0;
+ virtual QList<Latch> getHorizontalLatches(Action action, bool grabbedItem) const = 0;
- virtual QList<Latch> getVerticalLatches(Action action, bool grabbed_item) const = 0;
+ virtual QList<Latch> getVerticalLatches(Action action, bool grabbedItem) const = 0;
};
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/moveable.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/moveable.h
index c040ad76976752055172d8e9c922f9c1bb9b256f..e35e54a2cf84315d73f2845376ede9f131ce4ebb 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/moveable.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/moveable.h
@@ -46,7 +46,7 @@ public:
virtual void moveDelta(const QPointF &delta) = 0;
- virtual void alignItemPositionToRaster(double raster_width, double raster_height) = 0;
+ virtual void alignItemPositionToRaster(double rasterWidth, double rasterHeight) = 0;
};
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/relationable.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/relationable.h
index 97d2d8991f491af6fbf3fb4903a004f8a046e94f..cb6736dc489970f967bf962b6ee3913e148837e0 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/relationable.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/relationable.h
@@ -48,7 +48,7 @@ public:
virtual QPointF getRelationStartPos() const = 0;
- virtual void relationDrawn(const QString &id, const QPointF &to_scene_pos, const QList<QPointF> &intermediate_points) = 0;
+ virtual void relationDrawn(const QString &id, const QPointF &toScenePos, const QList<QPointF> &intermediatePoints) = 0;
};
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/resizable.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/resizable.h
index d4676d7a758c2ebb1b5089e4315508f9b135eea9..4f3d7bf38c65cb04730befd2d78d859a5d3a568e 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/resizable.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/resizable.h
@@ -60,9 +60,9 @@ public:
virtual QSizeF getMinimumSize() const = 0;
- virtual void setPosAndRect(const QPointF &original_pos, const QRectF &original_rect, const QPointF &top_left_delta, const QPointF &bottom_right_delta) = 0;
+ virtual void setPosAndRect(const QPointF &originalPos, const QRectF &originalRect, const QPointF &topLeftDelta, const QPointF &bottomRightDelta) = 0;
- virtual void alignItemSizeToRaster(Side adjust_horizontal_side, Side adjust_vertical_side, double raster_width, double raster_height) = 0;
+ virtual void alignItemSizeToRaster(Side adjustHorizontalSide, Side adjustVerticalSide, double rasterWidth, double rasterHeight) = 0;
};
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/selectable.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/selectable.h
index 9db5cc15ac2e1b4fc4519bfedffafde20f74d9b3..6ad18141c7a700d39476d8d0d938e8a333ecb190 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/selectable.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/selectable.h
@@ -39,11 +39,11 @@ public:
virtual bool isSecondarySelected() const = 0;
- virtual void setSecondarySelected(bool secondary_selected) = 0;
+ virtual void setSecondarySelected(bool secondarySelected) = 0;
virtual bool isFocusSelected() const = 0;
- virtual void setFocusSelected(bool focus_selected) = 0;
+ virtual void setFocusSelected(bool focusSelected) = 0;
};
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/windable.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/windable.h
index 285e0716c3ec66fbd34f2c9b974f0f3743ad38cb..9432435fa81445a03e20c7cca3b07651269f7d13 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/windable.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/capabilities/windable.h
@@ -47,13 +47,13 @@ public:
virtual QPointF getHandlePos(int index) = 0;
- virtual void insertHandle(int before_index, const QPointF &pos) = 0;
+ virtual void insertHandle(int beforeIndex, const QPointF &pos) = 0;
virtual void deleteHandle(int index) = 0;
virtual void setHandlePos(int index, const QPointF &pos) = 0;
- virtual void alignHandleToRaster(int index, double raster_width, double raster_height) = 0;
+ virtual void alignHandleToRaster(int index, double rasterWidth, double rasterHeight) = 0;
};
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramgraphicsscene.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramgraphicsscene.cpp
index 5b4e562dc42e26a7fe5dbc3aa68cbe02473f92ac..b1bc28334e125214151b0ca0c664720a2564cb2c 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramgraphicsscene.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramgraphicsscene.cpp
@@ -37,9 +37,9 @@
namespace qmt {
-DiagramGraphicsScene::DiagramGraphicsScene(DiagramSceneModel *diagram_scene_model, QObject *parent)
+DiagramGraphicsScene::DiagramGraphicsScene(DiagramSceneModel *diagramSceneModel, QObject *parent)
: QGraphicsScene(parent),
- m_diagramSceneModel(diagram_scene_model)
+ m_diagramSceneModel(diagramSceneModel)
{
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramgraphicsscene.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramgraphicsscene.h
index 6499aa98f3d9ac7981faf3d950066d7dabf0dbd5..299d9119593c91685dc7fe2eb9362e7c816348de 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramgraphicsscene.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramgraphicsscene.h
@@ -45,7 +45,7 @@ class QMT_EXPORT DiagramGraphicsScene :
Q_OBJECT
public:
- DiagramGraphicsScene(DiagramSceneModel *diagram_scene_model, QObject *parent = 0);
+ DiagramGraphicsScene(DiagramSceneModel *diagramSceneModel, QObject *parent = 0);
~DiagramGraphicsScene();
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.cpp
index f348a2e8ea08282e7de27c926b7f1e80dffd5ec0..c87cc2686caeb8ac0cf384c36142ef32133cc0b9 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.cpp
@@ -117,7 +117,7 @@ DiagramSceneModel::DiagramSceneModel(QObject *parent)
m_focusItem(0)
{
m_latchController->setDiagramSceneModel(this);
- connect(m_graphicsScene, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
+ connect(m_graphicsScene, SIGNAL(selectionHasChanged()), this, SLOT(onSelectionChanged()));
// add one item at origin to force scene rect to include origin always
m_graphicsScene->addItem(m_originItem);
@@ -137,17 +137,17 @@ DiagramSceneModel::~DiagramSceneModel()
m_graphicsScene->deleteLater();
}
-void DiagramSceneModel::setDiagramController(DiagramController *diagram_controller)
+void DiagramSceneModel::setDiagramController(DiagramController *diagramController)
{
- if (m_diagramController == diagram_controller) {
+ if (m_diagramController == diagramController) {
return;
}
if (m_diagramController) {
disconnect(m_diagramController, 0, this, 0);
m_diagramController = 0;
}
- m_diagramController = diagram_controller;
- if (diagram_controller) {
+ m_diagramController = diagramController;
+ if (diagramController) {
connect(m_diagramController, SIGNAL(beginResetAllDiagrams()), this, SLOT(onBeginResetAllDiagrams()));
connect(m_diagramController, SIGNAL(endResetAllDiagrams()), this, SLOT(onEndResetAllDiagrams()));
connect(m_diagramController, SIGNAL(beginResetDiagram(const MDiagram*)), this, SLOT(onBeginResetDiagram(const MDiagram*)));
@@ -161,19 +161,19 @@ void DiagramSceneModel::setDiagramController(DiagramController *diagram_controll
}
}
-void DiagramSceneModel::setDiagramSceneController(DiagramSceneController *diagram_scene_controller)
+void DiagramSceneModel::setDiagramSceneController(DiagramSceneController *diagramSceneController)
{
- m_diagramSceneController = diagram_scene_controller;
+ m_diagramSceneController = diagramSceneController;
}
-void DiagramSceneModel::setStyleController(StyleController *style_controller)
+void DiagramSceneModel::setStyleController(StyleController *styleController)
{
- m_styleController = style_controller;
+ m_styleController = styleController;
}
-void DiagramSceneModel::setStereotypeController(StereotypeController *stereotype_controller)
+void DiagramSceneModel::setStereotypeController(StereotypeController *stereotypeController)
{
- m_stereotypeController = stereotype_controller;
+ m_stereotypeController = stereotypeController;
}
void DiagramSceneModel::setDiagram(MDiagram *diagram)
@@ -222,10 +222,10 @@ DSelection DiagramSceneModel::getSelectedElements() const
return selection;
}
-DElement *DiagramSceneModel::findTopmostElement(const QPointF &scene_pos) const
+DElement *DiagramSceneModel::findTopmostElement(const QPointF &scenePos) const
{
// fetch affected items from scene in correct drawing order to find topmost element
- QList<QGraphicsItem *> items = m_graphicsScene->items(scene_pos);
+ QList<QGraphicsItem *> items = m_graphicsScene->items(scenePos);
foreach (QGraphicsItem *item, items) {
if (m_graphicsItems.contains(item)) {
return m_itemToElementMap.value(item);
@@ -269,14 +269,14 @@ void DiagramSceneModel::selectAllElements()
void DiagramSceneModel::selectElement(DElement *element)
{
- QGraphicsItem *select_item = m_elementToItemMap.value(element);
+ QGraphicsItem *selectItem = m_elementToItemMap.value(element);
foreach (QGraphicsItem *item, m_selectedItems) {
- if (item != select_item) {
+ if (item != selectItem) {
item->setSelected(false);
}
}
- if (select_item) {
- select_item->setSelected(true);
+ if (selectItem) {
+ selectItem->setSelected(true);
}
}
@@ -290,26 +290,26 @@ void DiagramSceneModel::editElement(DElement *element)
void DiagramSceneModel::copyToClipboard()
{
- QMimeData *mime_data = new QMimeData();
+ QMimeData *mimeData = new QMimeData();
// Selections would also render to the clipboard
m_graphicsScene->clearSelection();
removeExtraSceneItems();
- QRectF scene_bounding_rect = m_graphicsScene->itemsBoundingRect();
+ QRectF sceneBoundingRect = m_graphicsScene->itemsBoundingRect();
{
// Create the image with the size of the shrunk scene
- const int scale_factor = 4;
+ const int scaleFactor = 4;
const int border = 4;
- const int base_dpi = 75;
- const int dots_per_meter = 10000 * base_dpi / 254;
- QSize image_size = scene_bounding_rect.size().toSize();
- image_size += QSize(2 * border, 2 * border);
- image_size *= scale_factor;
- QImage image(image_size, QImage::Format_ARGB32);
- image.setDotsPerMeterX(dots_per_meter * scale_factor);
- image.setDotsPerMeterY(dots_per_meter * scale_factor);
+ const int baseDpi = 75;
+ const int dotsPerMeter = 10000 * baseDpi / 254;
+ QSize imageSize = sceneBoundingRect.size().toSize();
+ imageSize += QSize(2 * border, 2 * border);
+ imageSize *= scaleFactor;
+ QImage image(imageSize, QImage::Format_ARGB32);
+ image.setDotsPerMeterX(dotsPerMeter * scaleFactor);
+ image.setDotsPerMeterY(dotsPerMeter * scaleFactor);
image.fill(Qt::white);
QPainter painter;
painter.begin(&image);
@@ -317,57 +317,57 @@ void DiagramSceneModel::copyToClipboard()
m_graphicsScene->render(&painter,
QRectF(border, border,
painter.device()->width() - 2 * border, painter.device()->height() - 2 * border),
- scene_bounding_rect);
+ sceneBoundingRect);
painter.end();
- mime_data->setImageData(image);
+ mimeData->setImageData(image);
}
#ifdef USE_PDF_CLIPBOARD
{
- const double scale_factor = 1.0;
+ const double scaleFactor = 1.0;
const double border = 5;
- const double base_dpi = 100;
- const double dots_per_mm = 25.4 / base_dpi;
-
- QBuffer pdf_buffer;
- pdf_buffer.open(QIODevice::WriteOnly);
-
- QPdfWriter pdf_writer(&pdf_buffer);
- QSizeF page_size = scene_bounding_rect.size();
- page_size += QSizeF(2.0 * border, 2.0 * border);
- page_size *= scale_factor;
- pdf_writer.setPageSize(QPdfWriter::Custom);
- pdf_writer.setPageSizeMM(page_size * dots_per_mm);
-
- QPainter pdf_painter;
- pdf_painter.begin(&pdf_writer);
- m_graphicsScene->render(&pdf_painter,
+ const double baseDpi = 100;
+ const double dotsPerMm = 25.4 / baseDpi;
+
+ QBuffer pdfBuffer;
+ pdfBuffer.open(QIODevice::WriteOnly);
+
+ QPdfWriter pdfWriter(&pdfBuffer);
+ QSizeF pageSize = sceneBoundingRect.size();
+ pageSize += QSizeF(2.0 * border, 2.0 * border);
+ pageSize *= scaleFactor;
+ pdfWriter.setPageSize(QPdfWriter::Custom);
+ pdfWriter.setPageSizeMM(pageSize * dotsPerMm);
+
+ QPainter pdfPainter;
+ pdfPainter.begin(&pdfWriter);
+ m_graphicsScene->render(&pdfPainter,
QRectF(border, border,
- pdf_painter.device()->width() - 2 * border, pdf_painter.device()->height() - 2 * border),
- scene_bounding_rect);
- pdf_painter.end();
- pdf_buffer.close();
- mime_data->setData(QStringLiteral("application/pdf"), pdf_buffer.buffer());
+ pdfPainter.device()->width() - 2 * border, pdfPainter.device()->height() - 2 * border),
+ sceneBoundingRect);
+ pdfPainter.end();
+ pdfBuffer.close();
+ mimeData->setData(QStringLiteral("application/pdf"), pdfBuffer.buffer());
}
#endif
#ifdef USE_SVG_CLIPBOARD
{
- QBuffer svg_buffer;
- QSvgGenerator svg_generator;
- svg_generator.setOutputDevice(&svg_buffer);
- QSize svg_scene_size = scene_bounding_rect.size().toSize();
- svg_generator.setSize(svg_scene_size);
- svg_generator.setViewBox(QRect(QPoint(0,0), svg_scene_size));
- QPainter svg_painter;
- svg_painter.begin(&svg_generator);
- svg_painter.setRenderHint(QPainter::Antialiasing);
- m_graphicsScene->render(&svg_painter,
+ QBuffer svgBuffer;
+ QSvgGenerator svgGenerator;
+ svgGenerator.setOutputDevice(&svgBuffer);
+ QSize svgSceneSize = sceneBoundingRect.size().toSize();
+ svgGenerator.setSize(svgSceneSize);
+ svgGenerator.setViewBox(QRect(QPoint(0,0), svgSceneSize));
+ QPainter svgPainter;
+ svgPainter.begin(&svgGenerator);
+ svgPainter.setRenderHint(QPainter::Antialiasing);
+ m_graphicsScene->render(&svgPainter,
QRectF(border, border,
painter.device()->width() - 2 * border, painter.device()->height() - 2 * border),
- scene_bounding_rect);
- svg_painter.end();
- mime_data->setData(QStringLiteral("image/svg+xml"), svg_buffer.buffer());
+ sceneBoundingRect);
+ svgPainter.end();
+ mimeData->setData(QStringLiteral("image/svg+xml"), svgBuffer.buffer());
}
#endif
@@ -375,30 +375,30 @@ void DiagramSceneModel::copyToClipboard()
// TODO implement emf clipboard
#endif
- QApplication::clipboard()->setMimeData(mime_data, QClipboard::Clipboard);
+ QApplication::clipboard()->setMimeData(mimeData, QClipboard::Clipboard);
addExtraSceneItems();
}
-bool DiagramSceneModel::exportPng(const QString &file_name)
+bool DiagramSceneModel::exportPng(const QString &fileName)
{
removeExtraSceneItems();
- QRectF scene_bounding_rect = m_graphicsScene->itemsBoundingRect();
+ QRectF sceneBoundingRect = m_graphicsScene->itemsBoundingRect();
// Create the image with the size of the shrunk scene
- const int scale_factor = 1;
+ const int scaleFactor = 1;
const int border = 5;
- const int base_dpi = 75;
- const int dots_per_meter = 10000 * base_dpi / 254;
+ const int baseDpi = 75;
+ const int dotsPerMeter = 10000 * baseDpi / 254;
- QSize image_size = scene_bounding_rect.size().toSize();
- image_size += QSize(2 * border, 2 * border);
- image_size *= scale_factor;
+ QSize imageSize = sceneBoundingRect.size().toSize();
+ imageSize += QSize(2 * border, 2 * border);
+ imageSize *= scaleFactor;
- QImage image(image_size, QImage::Format_ARGB32);
- image.setDotsPerMeterX(dots_per_meter * scale_factor);
- image.setDotsPerMeterY(dots_per_meter * scale_factor);
+ QImage image(imageSize, QImage::Format_ARGB32);
+ image.setDotsPerMeterX(dotsPerMeter * scaleFactor);
+ image.setDotsPerMeterY(dotsPerMeter * scaleFactor);
image.fill(Qt::white);
QPainter painter;
@@ -407,53 +407,53 @@ bool DiagramSceneModel::exportPng(const QString &file_name)
m_graphicsScene->render(&painter,
QRectF(border, border,
painter.device()->width() - 2 * border, painter.device()->height() - 2 * border),
- scene_bounding_rect);
+ sceneBoundingRect);
painter.end();
- bool success = image.save(file_name);
+ bool success = image.save(fileName);
addExtraSceneItems();
return success;
}
-void DiagramSceneModel::exportPdf(const QString &file_name)
+void DiagramSceneModel::exportPdf(const QString &fileName)
{
removeExtraSceneItems();
- QRectF scene_bounding_rect = m_graphicsScene->itemsBoundingRect();
+ QRectF sceneBoundingRect = m_graphicsScene->itemsBoundingRect();
- const double scale_factor = 1.0;
+ const double scaleFactor = 1.0;
const double border = 5;
- const double base_dpi = 100;
- const double dots_per_mm = 25.4 / base_dpi;
+ const double baseDpi = 100;
+ const double dotsPerMm = 25.4 / baseDpi;
- QSizeF page_size = scene_bounding_rect.size();
- page_size += QSizeF(2.0 * border, 2.0 * border);
- page_size *= scale_factor;
+ QSizeF pageSize = sceneBoundingRect.size();
+ pageSize += QSizeF(2.0 * border, 2.0 * border);
+ pageSize *= scaleFactor;
- QPdfWriter pdf_writer(file_name);
- pdf_writer.setPageSize(QPdfWriter::Custom);
- pdf_writer.setPageSizeMM(page_size * dots_per_mm);
+ QPdfWriter pdfWriter(fileName);
+ pdfWriter.setPageSize(QPdfWriter::Custom);
+ pdfWriter.setPageSizeMM(pageSize * dotsPerMm);
- QPainter pdf_painter;
- pdf_painter.begin(&pdf_writer);
- m_graphicsScene->render(&pdf_painter,
+ QPainter pdfPainter;
+ pdfPainter.begin(&pdfWriter);
+ m_graphicsScene->render(&pdfPainter,
QRectF(border, border,
- pdf_painter.device()->width() - 2 * border, pdf_painter.device()->height() - 2 * border),
- scene_bounding_rect);
- pdf_painter.end();
+ pdfPainter.device()->width() - 2 * border, pdfPainter.device()->height() - 2 * border),
+ sceneBoundingRect);
+ pdfPainter.end();
addExtraSceneItems();
}
-void DiagramSceneModel::selectItem(QGraphicsItem *item, bool multi_select)
+void DiagramSceneModel::selectItem(QGraphicsItem *item, bool multiSelect)
{
- if (!multi_select) {
+ if (!multiSelect) {
if (!item->isSelected()) {
- foreach (QGraphicsItem *selected_item, m_selectedItems) {
- if (selected_item != item) {
- selected_item->setSelected(false);
+ foreach (QGraphicsItem *selectedItem, m_selectedItems) {
+ if (selectedItem != item) {
+ selectedItem->setSelected(false);
}
}
item->setSelected(true);
@@ -463,9 +463,9 @@ void DiagramSceneModel::selectItem(QGraphicsItem *item, bool multi_select)
}
}
-void DiagramSceneModel::moveSelectedItems(QGraphicsItem *grabbed_item, const QPointF &delta)
+void DiagramSceneModel::moveSelectedItems(QGraphicsItem *grabbedItem, const QPointF &delta)
{
- Q_UNUSED(grabbed_item);
+ Q_UNUSED(grabbedItem);
if (delta != QPointF(0.0, 0.0)) {
foreach (QGraphicsItem *item, m_selectedItems) {
@@ -503,50 +503,50 @@ void DiagramSceneModel::onDoubleClickedItem(QGraphicsItem *item)
}
}
-QList<QGraphicsItem *> DiagramSceneModel::collectCollidingObjectItems(const QGraphicsItem *item, CollidingMode colliding_mode) const
+QList<QGraphicsItem *> DiagramSceneModel::collectCollidingObjectItems(const QGraphicsItem *item, CollidingMode collidingMode) const
{
- QList<QGraphicsItem *> colliding_items;
+ QList<QGraphicsItem *> collidingItems;
const IResizable *resizable = dynamic_cast<const IResizable *>(item);
if (!resizable) {
- return colliding_items;
+ return collidingItems;
}
QRectF rect = resizable->getRect();
rect.translate(resizable->getPos());
- switch (colliding_mode) {
+ switch (collidingMode) {
case COLLIDING_INNER_ITEMS:
foreach (QGraphicsItem *candidate, m_graphicsItems) {
- if (const IResizable *candidate_resizable = dynamic_cast<const IResizable *>(candidate)) {
- QRectF candidate_rect = candidate_resizable->getRect();
- candidate_rect.translate(candidate_resizable->getPos());
- if (candidate_rect.left() >= rect.left() && candidate_rect.right() <= rect.right()
- && candidate_rect.top() >= rect.top() && candidate_rect.bottom() <= rect.bottom()) {
- colliding_items.append(candidate);
+ if (const IResizable *candidateResizable = dynamic_cast<const IResizable *>(candidate)) {
+ QRectF candidateRect = candidateResizable->getRect();
+ candidateRect.translate(candidateResizable->getPos());
+ if (candidateRect.left() >= rect.left() && candidateRect.right() <= rect.right()
+ && candidateRect.top() >= rect.top() && candidateRect.bottom() <= rect.bottom()) {
+ collidingItems.append(candidate);
}
}
}
break;
case COLLIDING_ITEMS:
foreach (QGraphicsItem *candidate, m_graphicsItems) {
- if (const IResizable *candidate_resizable = dynamic_cast<const IResizable *>(candidate)) {
- QRectF candidate_rect = candidate_resizable->getRect();
- candidate_rect.translate(candidate_resizable->getPos());
- if (candidate_rect.left() <= rect.right() && candidate_rect.right() >= rect.left()
- && candidate_rect.top() <= rect.bottom() && candidate_rect.bottom() >= rect.top()) {
- colliding_items.append(candidate);
+ if (const IResizable *candidateResizable = dynamic_cast<const IResizable *>(candidate)) {
+ QRectF candidateRect = candidateResizable->getRect();
+ candidateRect.translate(candidateResizable->getPos());
+ if (candidateRect.left() <= rect.right() && candidateRect.right() >= rect.left()
+ && candidateRect.top() <= rect.bottom() && candidateRect.bottom() >= rect.top()) {
+ collidingItems.append(candidate);
}
}
}
break;
case COLLIDING_OUTER_ITEMS:
foreach (QGraphicsItem *candidate, m_graphicsItems) {
- if (const IResizable *candidate_resizable = dynamic_cast<const IResizable *>(candidate)) {
- QRectF candidate_rect = candidate_resizable->getRect();
- candidate_rect.translate(candidate_resizable->getPos());
- if (candidate_rect.left() <= rect.left() && candidate_rect.right() >= rect.right()
- && candidate_rect.top() <= rect.top() && candidate_rect.bottom() >= rect.bottom()) {
- colliding_items.append(candidate);
+ if (const IResizable *candidateResizable = dynamic_cast<const IResizable *>(candidate)) {
+ QRectF candidateRect = candidateResizable->getRect();
+ candidateRect.translate(candidateResizable->getPos());
+ if (candidateRect.left() <= rect.left() && candidateRect.right() >= rect.right()
+ && candidateRect.top() <= rect.top() && candidateRect.bottom() >= rect.bottom()) {
+ collidingItems.append(candidate);
}
}
}
@@ -554,7 +554,7 @@ QList<QGraphicsItem *> DiagramSceneModel::collectCollidingObjectItems(const QGra
default:
QMT_CHECK(false);
}
- return colliding_items;
+ return collidingItems;
}
void DiagramSceneModel::sceneActivated()
@@ -605,31 +605,31 @@ void DiagramSceneModel::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
void DiagramSceneModel::mouseReleaseEventReparenting(QGraphicsSceneMouseEvent *event)
{
if (event->modifiers() & Qt::AltModifier) {
- ModelController *model_controller = getDiagramController()->getModelController();
- MPackage *new_owner = 0;
- QSet<QGraphicsItem *> selected_item_set = m_graphicsScene->selectedItems().toSet();
- QList<QGraphicsItem *> items_under_mouse = m_graphicsScene->items(event->scenePos());
- foreach (QGraphicsItem *item, items_under_mouse) {
- if (!selected_item_set.contains(item)) {
+ ModelController *modelController = getDiagramController()->getModelController();
+ MPackage *newOwner = 0;
+ QSet<QGraphicsItem *> selectedItemSet = m_graphicsScene->selectedItems().toSet();
+ QList<QGraphicsItem *> itemsUnderMouse = m_graphicsScene->items(event->scenePos());
+ foreach (QGraphicsItem *item, itemsUnderMouse) {
+ if (!selectedItemSet.contains(item)) {
// the item may be any graphics item not matching to a DElement
DElement *element = m_itemToElementMap.value(item);
if (element && element->getModelUid().isValid()) {
- new_owner = model_controller->findElement<MPackage>(element->getModelUid());
+ newOwner = modelController->findElement<MPackage>(element->getModelUid());
}
}
- if (new_owner) {
+ if (newOwner) {
break;
}
}
- if (new_owner) {
+ if (newOwner) {
foreach (QGraphicsItem *item, m_graphicsScene->selectedItems()) {
DElement *element = m_itemToElementMap.value(item);
QMT_CHECK(element);
if (element->getModelUid().isValid()) {
- MObject *model_object = model_controller->findObject(element->getModelUid());
- if (model_object) {
- if (new_owner != model_object->getOwner()) {
- model_controller->moveObject(new_owner, model_object);
+ MObject *modelObject = modelController->findObject(element->getModelUid());
+ if (modelObject) {
+ if (newOwner != modelObject->getOwner()) {
+ modelController->moveObject(newOwner, modelObject);
}
}
}
@@ -743,38 +743,38 @@ void DiagramSceneModel::onEndRemoveElement(int row, const MDiagram *diagram)
void DiagramSceneModel::onSelectionChanged()
{
- bool selection_changed = false;
+ bool selectionChanged = false;
// collect and update all primary selected items (selected by user)
- QSet<QGraphicsItem *> new_selected_items = QSet<QGraphicsItem *>::fromList(m_graphicsScene->selectedItems());
- updateFocusItem(new_selected_items);
+ QSet<QGraphicsItem *> newSelectedItems = QSet<QGraphicsItem *>::fromList(m_graphicsScene->selectedItems());
+ updateFocusItem(newSelectedItems);
foreach (QGraphicsItem *item, m_selectedItems) {
- if (!new_selected_items.contains(item)) {
+ if (!newSelectedItems.contains(item)) {
DElement *element = m_itemToElementMap.value(item);
updateGraphicsItem(item, element);
- selection_changed = true;
+ selectionChanged = true;
}
}
- foreach (QGraphicsItem *item, new_selected_items) {
+ foreach (QGraphicsItem *item, newSelectedItems) {
if (!m_selectedItems.contains(item)) {
DElement *element = m_itemToElementMap.value(item);
updateGraphicsItem(item, element);
- selection_changed = true;
+ selectionChanged = true;
}
}
- m_selectedItems = new_selected_items;
+ m_selectedItems = newSelectedItems;
// collect and update all secondary selected items
- QSet<QGraphicsItem *> new_secondary_selected_items;
+ QSet<QGraphicsItem *> newSecondarySelectedItems;
// select all contained objects secondarily
- foreach (QGraphicsItem *selected_item, m_selectedItems) {
- foreach (QGraphicsItem *item, collectCollidingObjectItems(selected_item, COLLIDING_INNER_ITEMS)) {
+ foreach (QGraphicsItem *selectedItem, m_selectedItems) {
+ foreach (QGraphicsItem *item, collectCollidingObjectItems(selectedItem, COLLIDING_INNER_ITEMS)) {
if (!item->isSelected() && dynamic_cast<ISelectable *>(item) != 0
- && item->collidesWithItem(selected_item, Qt::ContainsItemBoundingRect)
- && isInFrontOf(item, selected_item)) {
+ && item->collidesWithItem(selectedItem, Qt::ContainsItemBoundingRect)
+ && isInFrontOf(item, selectedItem)) {
QMT_CHECK(!m_selectedItems.contains(item));
- new_secondary_selected_items.insert(item);
+ newSecondarySelectedItems.insert(item);
}
}
}
@@ -783,48 +783,48 @@ void DiagramSceneModel::onSelectionChanged()
foreach (DElement *element, m_diagram->getDiagramElements()) {
DRelation *relation = dynamic_cast<DRelation *>(element);
if (relation) {
- QGraphicsItem *relation_item = m_elementToItemMap.value(relation);
- QMT_CHECK(relation_item);
- DObject *end_a_object = m_diagramController->findElement<DObject>(relation->getEndA(), m_diagram);
- QMT_CHECK(end_a_object);
- QGraphicsItem *end_a_item = m_elementToItemMap.value(end_a_object);
- QMT_CHECK(end_a_item);
- DObject *end_b_object = m_diagramController->findElement<DObject>(relation->getEndB(), m_diagram);
- QMT_CHECK(end_b_object);
- QGraphicsItem *end_b_item = m_elementToItemMap.value(end_b_object);
- QMT_CHECK(end_b_item);
- if (!relation_item->isSelected()
- && (m_selectedItems.contains(end_a_item) || new_secondary_selected_items.contains(end_a_item))
- && (m_selectedItems.contains(end_b_item) || new_secondary_selected_items.contains(end_b_item))) {
- QMT_CHECK(!m_selectedItems.contains(relation_item));
- new_secondary_selected_items.insert(relation_item);
+ QGraphicsItem *relationItem = m_elementToItemMap.value(relation);
+ QMT_CHECK(relationItem);
+ DObject *endAObject = m_diagramController->findElement<DObject>(relation->getEndA(), m_diagram);
+ QMT_CHECK(endAObject);
+ QGraphicsItem *endAItem = m_elementToItemMap.value(endAObject);
+ QMT_CHECK(endAItem);
+ DObject *endBObject = m_diagramController->findElement<DObject>(relation->getEndB(), m_diagram);
+ QMT_CHECK(endBObject);
+ QGraphicsItem *endBItem = m_elementToItemMap.value(endBObject);
+ QMT_CHECK(endBItem);
+ if (!relationItem->isSelected()
+ && (m_selectedItems.contains(endAItem) || newSecondarySelectedItems.contains(endAItem))
+ && (m_selectedItems.contains(endBItem) || newSecondarySelectedItems.contains(endBItem))) {
+ QMT_CHECK(!m_selectedItems.contains(relationItem));
+ newSecondarySelectedItems.insert(relationItem);
}
}
}
foreach (QGraphicsItem *item, m_secondarySelectedItems) {
- if (!new_secondary_selected_items.contains(item)) {
+ if (!newSecondarySelectedItems.contains(item)) {
ISelectable *selectable = dynamic_cast<ISelectable *>(item);
QMT_CHECK(selectable);
selectable->setSecondarySelected(false);
- selection_changed = true;
+ selectionChanged = true;
}
}
- foreach (QGraphicsItem *item, new_secondary_selected_items) {
+ foreach (QGraphicsItem *item, newSecondarySelectedItems) {
if (!m_secondarySelectedItems.contains(item)) {
ISelectable *selectable = dynamic_cast<ISelectable *>(item);
QMT_CHECK(selectable);
selectable->setSecondarySelected(true);
- selection_changed = true;
+ selectionChanged = true;
}
}
- m_secondarySelectedItems = new_secondary_selected_items;
+ m_secondarySelectedItems = newSecondarySelectedItems;
QMT_CHECK((m_selectedItems & m_secondarySelectedItems).isEmpty());
- if (selection_changed) {
+ if (selectionChanged) {
m_diagramController->breakUndoChain();
- emit selectionChanged(m_diagram);
+ emit selectionHasChanged(m_diagram);
}
}
@@ -892,23 +892,23 @@ void DiagramSceneModel::deleteGraphicsItem(QGraphicsItem *item, DElement *elemen
delete item;
}
-void DiagramSceneModel::updateFocusItem(const QSet<QGraphicsItem *> &selected_items)
+void DiagramSceneModel::updateFocusItem(const QSet<QGraphicsItem *> &selectedItems)
{
- QGraphicsItem *mouse_grabber_item = m_graphicsScene->mouseGrabberItem();
- QGraphicsItem *focus_item = 0;
+ QGraphicsItem *mouseGrabberItem = m_graphicsScene->mouseGrabberItem();
+ QGraphicsItem *focusItem = 0;
ISelectable *selectable = 0;
- if (mouse_grabber_item && selected_items.contains(mouse_grabber_item)) {
- selectable = dynamic_cast<ISelectable *>(mouse_grabber_item);
+ if (mouseGrabberItem && selectedItems.contains(mouseGrabberItem)) {
+ selectable = dynamic_cast<ISelectable *>(mouseGrabberItem);
if (selectable) {
- focus_item = mouse_grabber_item;
+ focusItem = mouseGrabberItem;
}
}
- if (focus_item && focus_item != m_focusItem) {
+ if (focusItem && focusItem != m_focusItem) {
unsetFocusItem();
selectable->setFocusSelected(true);
- m_focusItem = focus_item;
- } else if (m_focusItem && !selected_items.contains(m_focusItem)) {
+ m_focusItem = focusItem;
+ } else if (m_focusItem && !selectedItems.contains(m_focusItem)) {
unsetFocusItem();
}
}
@@ -916,8 +916,8 @@ void DiagramSceneModel::updateFocusItem(const QSet<QGraphicsItem *> &selected_it
void DiagramSceneModel::unsetFocusItem()
{
if (m_focusItem) {
- if (ISelectable *old_selectable = dynamic_cast<ISelectable *>(m_focusItem)) {
- old_selectable->setFocusSelected(false);
+ if (ISelectable *oldSelectable = dynamic_cast<ISelectable *>(m_focusItem)) {
+ oldSelectable->setFocusSelected(false);
} else {
QMT_CHECK(false);
}
@@ -925,17 +925,17 @@ void DiagramSceneModel::unsetFocusItem()
}
}
-bool DiagramSceneModel::isInFrontOf(const QGraphicsItem *front_item, const QGraphicsItem *back_item)
+bool DiagramSceneModel::isInFrontOf(const QGraphicsItem *frontItem, const QGraphicsItem *backItem)
{
- QMT_CHECK(front_item);
- QMT_CHECK(back_item);
+ QMT_CHECK(frontItem);
+ QMT_CHECK(backItem);
// shortcut for usual case of root items
- if (front_item->parentItem() == 0 && back_item->parentItem() == 0) {
+ if (frontItem->parentItem() == 0 && backItem->parentItem() == 0) {
foreach (const QGraphicsItem *item, m_graphicsScene->items()) {
- if (item == front_item) {
+ if (item == frontItem) {
return true;
- } else if (item == back_item) {
+ } else if (item == backItem) {
return false;
}
}
@@ -944,56 +944,56 @@ bool DiagramSceneModel::isInFrontOf(const QGraphicsItem *front_item, const QGrap
}
// collect all anchestors of front item
- QList<const QGraphicsItem *> front_stack;
- const QGraphicsItem *iterator = front_item;
+ QList<const QGraphicsItem *> frontStack;
+ const QGraphicsItem *iterator = frontItem;
while (iterator != 0) {
- front_stack.append(iterator);
+ frontStack.append(iterator);
iterator = iterator->parentItem();
}
// collect all anchestors of back item
- QList<const QGraphicsItem *> back_stack;
- iterator = back_item;
+ QList<const QGraphicsItem *> backStack;
+ iterator = backItem;
while (iterator != 0) {
- back_stack.append(iterator);
+ backStack.append(iterator);
iterator = iterator->parentItem();
}
// search lowest common anchestor
- int front_index = front_stack.size() - 1;
- int back_index = back_stack.size() - 1;
- while (front_index >= 0 && back_index >= 0 && front_stack.at(front_index) == back_stack.at(back_index)) {
- --front_index;
- --back_index;
+ int frontIndex = frontStack.size() - 1;
+ int backIndex = backStack.size() - 1;
+ while (frontIndex >= 0 && backIndex >= 0 && frontStack.at(frontIndex) == backStack.at(backIndex)) {
+ --frontIndex;
+ --backIndex;
}
- if (front_index < 0 && back_index < 0) {
- QMT_CHECK(front_item == back_item);
+ if (frontIndex < 0 && backIndex < 0) {
+ QMT_CHECK(frontItem == backItem);
return false;
- } else if (front_index < 0) {
+ } else if (frontIndex < 0) {
// front item is higher in hierarchy and thus behind back item
return false;
- } else if (back_index < 0) {
+ } else if (backIndex < 0) {
// back item is higher in hierarchy and thus in behind front item
return true;
} else {
- front_item = front_stack.at(front_index);
- back_item = back_stack.at(back_index);
- QMT_CHECK(front_item != back_item);
+ frontItem = frontStack.at(frontIndex);
+ backItem = backStack.at(backIndex);
+ QMT_CHECK(frontItem != backItem);
- if (front_item->zValue() != back_item->zValue()) {
- return front_item->zValue() > back_item->zValue();
+ if (frontItem->zValue() != backItem->zValue()) {
+ return frontItem->zValue() > backItem->zValue();
} else {
QList<QGraphicsItem *> children;
- if (front_index + 1 < front_stack.size()) {
- children = front_stack.at(front_index + 1)->childItems();
+ if (frontIndex + 1 < frontStack.size()) {
+ children = frontStack.at(frontIndex + 1)->childItems();
} else {
children = m_graphicsScene->items(Qt::AscendingOrder);
}
foreach (const QGraphicsItem *item, children) {
- if (item == front_item) {
+ if (item == frontItem) {
return false;
- } else if (item == back_item) {
+ } else if (item == backItem) {
return true;
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.h
index 27a4c1eef3ae9c35628f927289af1fee973fe49c..809e22dae318dafb7d5f09f3cdd70e4b10c567f3 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodel.h
@@ -92,25 +92,25 @@ signals:
void diagramSceneActivated(const MDiagram *diagram);
- void selectionChanged(const MDiagram *diagram);
+ void selectionHasChanged(const MDiagram *diagram);
public:
DiagramController *getDiagramController() const { return m_diagramController; }
- void setDiagramController(DiagramController *diagram_controller);
+ void setDiagramController(DiagramController *diagramController);
DiagramSceneController *getDiagramSceneController() const { return m_diagramSceneController; }
- void setDiagramSceneController(DiagramSceneController *diagram_scene_controller);
+ void setDiagramSceneController(DiagramSceneController *diagramSceneController);
StyleController *getStyleController() const { return m_styleController; }
- void setStyleController(StyleController *style_controller);
+ void setStyleController(StyleController *styleController);
StereotypeController *getStereotypeController() const { return m_stereotypeController; }
- void setStereotypeController(StereotypeController *stereotype_controller);
+ void setStereotypeController(StereotypeController *stereotypeController);
MDiagram *getDiagram() const { return m_diagram; }
@@ -126,7 +126,7 @@ public:
DSelection getSelectedElements() const;
- DElement *findTopmostElement(const QPointF &scene_pos) const;
+ DElement *findTopmostElement(const QPointF &scenePos) const;
public:
@@ -156,21 +156,21 @@ public:
void copyToClipboard();
- bool exportPng(const QString &file_name);
+ bool exportPng(const QString &fileName);
- void exportPdf(const QString &file_name);
+ void exportPdf(const QString &fileName);
public:
- void selectItem(QGraphicsItem *item, bool multi_select);
+ void selectItem(QGraphicsItem *item, bool multiSelect);
- void moveSelectedItems(QGraphicsItem *grabbed_item, const QPointF &delta);
+ void moveSelectedItems(QGraphicsItem *grabbedItem, const QPointF &delta);
void alignSelectedItemsPositionOnRaster();
void onDoubleClickedItem(QGraphicsItem *item);
- QList<QGraphicsItem *> collectCollidingObjectItems(const QGraphicsItem *item, CollidingMode colliding_mode) const;
+ QList<QGraphicsItem *> collectCollidingObjectItems(const QGraphicsItem *item, CollidingMode collidingMode) const;
private:
@@ -228,11 +228,11 @@ private:
void deleteGraphicsItem(QGraphicsItem *item, DElement *element);
- void updateFocusItem(const QSet<QGraphicsItem *> &selected_items);
+ void updateFocusItem(const QSet<QGraphicsItem *> &selectedItems);
void unsetFocusItem();
- bool isInFrontOf(const QGraphicsItem *front_item, const QGraphicsItem *back_item);
+ bool isInFrontOf(const QGraphicsItem *frontItem, const QGraphicsItem *backItem);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
index 1cbdb44f5ce3f2c39572c0dd7a84bd242440bb1a..660dc8f47339506d39533e14b767a4bf604f1218 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
@@ -58,8 +58,8 @@
namespace qmt {
-DiagramSceneModel::CreationVisitor::CreationVisitor(DiagramSceneModel *diagram_scene_model)
- : m_diagramSceneModel(diagram_scene_model),
+DiagramSceneModel::CreationVisitor::CreationVisitor(DiagramSceneModel *diagramSceneModel)
+ : m_diagramSceneModel(diagramSceneModel),
m_graphicsItem(0)
{
}
@@ -142,10 +142,10 @@ void DiagramSceneModel::CreationVisitor::visitDBoundary(DBoundary *boundary)
-DiagramSceneModel::UpdateVisitor::UpdateVisitor(QGraphicsItem *item, DiagramSceneModel *diagram_scene_model, DElement *related_element)
+DiagramSceneModel::UpdateVisitor::UpdateVisitor(QGraphicsItem *item, DiagramSceneModel *diagramSceneModel, DElement *relatedElement)
: m_graphicsItem(item),
- m_diagramSceneModel(diagram_scene_model),
- m_relatedElement(related_element)
+ m_diagramSceneModel(diagramSceneModel),
+ m_relatedElement(relatedElement)
{
}
@@ -175,10 +175,10 @@ void DiagramSceneModel::UpdateVisitor::visitDPackage(DPackage *package)
QMT_CHECK(m_graphicsItem);
if (m_relatedElement == 0) {
- PackageItem *package_item = qgraphicsitem_cast<PackageItem *>(m_graphicsItem);
- QMT_CHECK(package_item);
- QMT_CHECK(package_item->getObject() == package);
- package_item->update();
+ PackageItem *packageItem = qgraphicsitem_cast<PackageItem *>(m_graphicsItem);
+ QMT_CHECK(packageItem);
+ QMT_CHECK(packageItem->getObject() == package);
+ packageItem->update();
}
visitDObject(package);
@@ -189,10 +189,10 @@ void DiagramSceneModel::UpdateVisitor::visitDClass(DClass *klass)
QMT_CHECK(m_graphicsItem);
if (m_relatedElement == 0) {
- ClassItem *class_item = qgraphicsitem_cast<ClassItem *>(m_graphicsItem);
- QMT_CHECK(class_item);
- QMT_CHECK(class_item->getObject() == klass);
- class_item->update();
+ ClassItem *classItem = qgraphicsitem_cast<ClassItem *>(m_graphicsItem);
+ QMT_CHECK(classItem);
+ QMT_CHECK(classItem->getObject() == klass);
+ classItem->update();
}
visitDObject(klass);
@@ -203,10 +203,10 @@ void DiagramSceneModel::UpdateVisitor::visitDComponent(DComponent *component)
QMT_CHECK(m_graphicsItem);
if (m_relatedElement == 0) {
- ComponentItem *component_item = qgraphicsitem_cast<ComponentItem *>(m_graphicsItem);
- QMT_CHECK(component_item);
- QMT_CHECK(component_item->getObject() == component);
- component_item->update();
+ ComponentItem *componentItem = qgraphicsitem_cast<ComponentItem *>(m_graphicsItem);
+ QMT_CHECK(componentItem);
+ QMT_CHECK(componentItem->getObject() == component);
+ componentItem->update();
}
visitDObject(component);
@@ -217,10 +217,10 @@ void DiagramSceneModel::UpdateVisitor::visitDDiagram(DDiagram *diagram)
QMT_CHECK(m_graphicsItem);
if (m_relatedElement == 0) {
- DiagramItem *document_item = qgraphicsitem_cast<DiagramItem *>(m_graphicsItem);
- QMT_CHECK(document_item);
- QMT_CHECK(document_item->getObject() == diagram);
- document_item->update();
+ DiagramItem *documentItem = qgraphicsitem_cast<DiagramItem *>(m_graphicsItem);
+ QMT_CHECK(documentItem);
+ QMT_CHECK(documentItem->getObject() == diagram);
+ documentItem->update();
}
visitDObject(diagram);
@@ -231,10 +231,10 @@ void DiagramSceneModel::UpdateVisitor::visitDItem(DItem *item)
QMT_CHECK(m_graphicsItem);
if (m_relatedElement == 0) {
- ItemItem *item_item = qgraphicsitem_cast<ItemItem *>(m_graphicsItem);
- QMT_CHECK(item_item);
- QMT_CHECK(item_item->getObject() == item);
- item_item->update();
+ ItemItem *itemItem = qgraphicsitem_cast<ItemItem *>(m_graphicsItem);
+ QMT_CHECK(itemItem);
+ QMT_CHECK(itemItem->getObject() == item);
+ itemItem->update();
}
visitDObject(item);
@@ -245,10 +245,10 @@ void DiagramSceneModel::UpdateVisitor::visitDRelation(DRelation *relation)
QMT_CHECK(m_graphicsItem);
if (m_relatedElement == 0 || m_relatedElement->getUid() == relation->getEndA() || m_relatedElement->getUid() == relation->getEndB()) {
- RelationItem *relation_item = qgraphicsitem_cast<RelationItem *>(m_graphicsItem);
- QMT_CHECK(relation_item);
- QMT_CHECK(relation_item->getRelation() == relation);
- relation_item->update();
+ RelationItem *relationItem = qgraphicsitem_cast<RelationItem *>(m_graphicsItem);
+ QMT_CHECK(relationItem);
+ QMT_CHECK(relationItem->getRelation() == relation);
+ relationItem->update();
}
}
@@ -272,10 +272,10 @@ void DiagramSceneModel::UpdateVisitor::visitDAnnotation(DAnnotation *annotation)
Q_UNUSED(annotation); // avoid warning in release mode
QMT_CHECK(m_graphicsItem);
- AnnotationItem *annotation_item = qgraphicsitem_cast<AnnotationItem *>(m_graphicsItem);
- QMT_CHECK(annotation_item);
- QMT_CHECK(annotation_item->getAnnotation() == annotation);
- annotation_item->update();
+ AnnotationItem *annotationItem = qgraphicsitem_cast<AnnotationItem *>(m_graphicsItem);
+ QMT_CHECK(annotationItem);
+ QMT_CHECK(annotationItem->getAnnotation() == annotation);
+ annotationItem->update();
}
void DiagramSceneModel::UpdateVisitor::visitDBoundary(DBoundary *boundary)
@@ -283,10 +283,10 @@ void DiagramSceneModel::UpdateVisitor::visitDBoundary(DBoundary *boundary)
Q_UNUSED(boundary); // avoid warning in release mode
QMT_CHECK(m_graphicsItem);
- BoundaryItem *boundary_item = qgraphicsitem_cast<BoundaryItem *>(m_graphicsItem);
- QMT_CHECK(boundary_item);
- QMT_CHECK(boundary_item->getBoundary() == boundary);
- boundary_item->update();
+ BoundaryItem *boundaryItem = qgraphicsitem_cast<BoundaryItem *>(m_graphicsItem);
+ QMT_CHECK(boundaryItem);
+ QMT_CHECK(boundaryItem->getBoundary() == boundary);
+ boundaryItem->update();
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodelitemvisitors.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodelitemvisitors.h
index 957e2b795fb494bc091936e12ffd6c2590925503..cfeb91e1277648da2e1fc0d4f062af952fb0ca39 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodelitemvisitors.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/diagramscenemodelitemvisitors.h
@@ -42,7 +42,7 @@ class QMT_EXPORT DiagramSceneModel::CreationVisitor :
{
public:
- CreationVisitor(DiagramSceneModel *diagram_scene_model);
+ CreationVisitor(DiagramSceneModel *diagramSceneModel);
public:
@@ -88,7 +88,7 @@ class DiagramSceneModel::UpdateVisitor :
{
public:
- UpdateVisitor(QGraphicsItem *item, DiagramSceneModel *diagram_scene_model, DElement *related_element = 0);
+ UpdateVisitor(QGraphicsItem *item, DiagramSceneModel *diagramSceneModel, DElement *relatedElement = 0);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/annotationitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/annotationitem.cpp
index 470cb1f5c0d07ddac35274f069bc3bbfe7706284..7195ad68a707076b3ba663b1247195d5b889e3b9 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/annotationitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/annotationitem.cpp
@@ -77,10 +77,10 @@ public:
};
-AnnotationItem::AnnotationItem(DAnnotation *annotation, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent)
+AnnotationItem::AnnotationItem(DAnnotation *annotation, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent)
: QGraphicsItem(parent),
m_annotation(annotation),
- m_diagramSceneModel(diagram_scene_model),
+ m_diagramSceneModel(diagramSceneModel),
m_secondarySelected(false),
m_focusSelected(false),
m_selectionMarker(0),
@@ -162,28 +162,28 @@ QSizeF AnnotationItem::getMinimumSize() const
return calcMinimumGeometry();
}
-void AnnotationItem::setPosAndRect(const QPointF &original_pos, const QRectF &original_rect, const QPointF &top_left_delta, const QPointF &bottom_right_delta)
+void AnnotationItem::setPosAndRect(const QPointF &originalPos, const QRectF &originalRect, const QPointF &topLeftDelta, const QPointF &bottomRightDelta)
{
- QPointF new_pos = original_pos;
- QRectF new_rect = original_rect;
- GeometryUtilities::adjustPosAndRect(&new_pos, &new_rect, top_left_delta, bottom_right_delta, QPointF(0.0, 0.0));
- if (new_pos != m_annotation->getPos() || new_rect != m_annotation->getRect()) {
+ QPointF newPos = originalPos;
+ QRectF newRect = originalRect;
+ GeometryUtilities::adjustPosAndRect(&newPos, &newRect, topLeftDelta, bottomRightDelta, QPointF(0.0, 0.0));
+ if (newPos != m_annotation->getPos() || newRect != m_annotation->getRect()) {
m_diagramSceneModel->getDiagramController()->startUpdateElement(m_annotation, m_diagramSceneModel->getDiagram(), DiagramController::UPDATE_GEOMETRY);
- m_annotation->setPos(new_pos);
- if (new_rect.size() != m_annotation->getRect().size()) {
+ m_annotation->setPos(newPos);
+ if (newRect.size() != m_annotation->getRect().size()) {
m_annotation->setAutoSize(false);
}
- m_annotation->setRect(new_rect);
+ m_annotation->setRect(newRect);
m_diagramSceneModel->getDiagramController()->finishUpdateElement(m_annotation, m_diagramSceneModel->getDiagram(), false);
}
}
-void AnnotationItem::alignItemSizeToRaster(Side adjust_horizontal_side, Side adjust_vertical_side, double raster_width, double raster_height)
+void AnnotationItem::alignItemSizeToRaster(Side adjustHorizontalSide, Side adjustVerticalSide, double rasterWidth, double rasterHeight)
{
- Q_UNUSED(adjust_horizontal_side);
- Q_UNUSED(adjust_vertical_side);
- Q_UNUSED(raster_width);
- Q_UNUSED(raster_height);
+ Q_UNUSED(adjustHorizontalSide);
+ Q_UNUSED(adjustVerticalSide);
+ Q_UNUSED(rasterWidth);
+ Q_UNUSED(rasterHeight);
}
void AnnotationItem::moveDelta(const QPointF &delta)
@@ -193,17 +193,17 @@ void AnnotationItem::moveDelta(const QPointF &delta)
m_diagramSceneModel->getDiagramController()->finishUpdateElement(m_annotation, m_diagramSceneModel->getDiagram(), false);
}
-void AnnotationItem::alignItemPositionToRaster(double raster_width, double raster_height)
+void AnnotationItem::alignItemPositionToRaster(double rasterWidth, double rasterHeight)
{
QPointF pos = m_annotation->getPos();
QRectF rect = m_annotation->getRect();
- QPointF top_left = pos + rect.topLeft();
+ QPointF topLeft = pos + rect.topLeft();
- double left_delta = qRound(top_left.x() / raster_width) * raster_width - top_left.x();
- double top_delta = qRound(top_left.y() / raster_height) * raster_height - top_left.y();
- QPointF top_left_delta(left_delta, top_delta);
+ double leftDelta = qRound(topLeft.x() / rasterWidth) * rasterWidth - topLeft.x();
+ double topDelta = qRound(topLeft.y() / rasterHeight) * rasterHeight - topLeft.y();
+ QPointF topLeftDelta(leftDelta, topDelta);
- setPosAndRect(pos, rect, top_left_delta, top_left_delta);
+ setPosAndRect(pos, rect, topLeftDelta, topLeftDelta);
}
bool AnnotationItem::isSecondarySelected() const
@@ -211,10 +211,10 @@ bool AnnotationItem::isSecondarySelected() const
return m_secondarySelected;
}
-void AnnotationItem::setSecondarySelected(bool secondary_selected)
+void AnnotationItem::setSecondarySelected(bool secondarySelected)
{
- if (m_secondarySelected != secondary_selected) {
- m_secondarySelected = secondary_selected;
+ if (m_secondarySelected != secondarySelected) {
+ m_secondarySelected = secondarySelected;
update();
}
}
@@ -224,10 +224,10 @@ bool AnnotationItem::isFocusSelected() const
return m_focusSelected;
}
-void AnnotationItem::setFocusSelected(bool focus_selected)
+void AnnotationItem::setFocusSelected(bool focusSelected)
{
- if (m_focusSelected != focus_selected) {
- m_focusSelected = focus_selected;
+ if (m_focusSelected != focusSelected) {
+ m_focusSelected = focusSelected;
update();
}
}
@@ -289,10 +289,10 @@ void AnnotationItem::updateSelectionMarker()
}
}
-void AnnotationItem::updateSelectionMarkerGeometry(const QRectF &annotation_rect)
+void AnnotationItem::updateSelectionMarkerGeometry(const QRectF &annotationRect)
{
if (m_selectionMarker) {
- m_selectionMarker->setRect(annotation_rect);
+ m_selectionMarker->setRect(annotationRect);
}
}
@@ -318,10 +318,10 @@ void AnnotationItem::onContentsChanged()
m_onChanged = true;
if (!m_onUpdate) {
- QString plain_text = m_textItem->toPlainText();
- if (m_annotation->getText() != plain_text) {
+ QString plainText = m_textItem->toPlainText();
+ if (m_annotation->getText() != plainText) {
m_diagramSceneModel->getDiagramController()->startUpdateElement(m_annotation, m_diagramSceneModel->getDiagram(), DiagramController::UPDATE_MINOR);
- m_annotation->setText(plain_text);
+ m_annotation->setText(plainText);
m_diagramSceneModel->getDiagramController()->finishUpdateElement(m_annotation, m_diagramSceneModel->getDiagram(), false);
}
}
@@ -337,8 +337,8 @@ QSizeF AnnotationItem::calcMinimumGeometry() const
if (getAnnotation()->hasAutoSize()) {
if (m_textItem) {
m_textItem->setTextWidth(-1);
- QSizeF text_size = m_textItem->document()->size();
- width = text_size.width() + 2 * CONTENTS_BORDER_HORIZONTAL;
+ QSizeF textSize = m_textItem->document()->size();
+ width = textSize.width() + 2 * CONTENTS_BORDER_HORIZONTAL;
}
}
return QSizeF(width, height);
@@ -355,9 +355,9 @@ void AnnotationItem::updateGeometry()
if (getAnnotation()->hasAutoSize()) {
if (m_textItem) {
m_textItem->setTextWidth(-1);
- QSizeF text_size = m_textItem->document()->size();
- width = text_size.width() + 2 * CONTENTS_BORDER_HORIZONTAL;
- height = text_size.height() + 2 * CONTENTS_BORDER_VERTICAL;
+ QSizeF textSize = m_textItem->document()->size();
+ width = textSize.width() + 2 * CONTENTS_BORDER_HORIZONTAL;
+ height = textSize.height() + 2 * CONTENTS_BORDER_VERTICAL;
}
} else {
QRectF rect = getAnnotation()->getRect();
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/annotationitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/annotationitem.h
index 502a2a8bc30ecf3dc1421fd26dd5e28b468e41ee..3af61822435965fe84323315d8750562ed6a5c31 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/annotationitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/annotationitem.h
@@ -58,7 +58,7 @@ class AnnotationItem :
public:
- AnnotationItem(DAnnotation *annotation, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent = 0);
+ AnnotationItem(DAnnotation *annotation, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
~AnnotationItem();
@@ -86,25 +86,25 @@ public:
QSizeF getMinimumSize() const;
- void setPosAndRect(const QPointF &original_pos, const QRectF &original_rect, const QPointF &top_left_delta, const QPointF &bottom_right_delta);
+ void setPosAndRect(const QPointF &originalPos, const QRectF &originalRect, const QPointF &topLeftDelta, const QPointF &bottomRightDelta);
- void alignItemSizeToRaster(Side adjust_horizontal_side, Side adjust_vertical_side, double raster_width, double raster_height);
+ void alignItemSizeToRaster(Side adjustHorizontalSide, Side adjustVerticalSide, double rasterWidth, double rasterHeight);
public:
void moveDelta(const QPointF &delta);
- void alignItemPositionToRaster(double raster_width, double raster_height);
+ void alignItemPositionToRaster(double rasterWidth, double rasterHeight);
public:
bool isSecondarySelected() const;
- void setSecondarySelected(bool secondary_selected);
+ void setSecondarySelected(bool secondarySelected);
bool isFocusSelected() const;
- void setFocusSelected(bool focus_selected);
+ void setFocusSelected(bool focusSelected);
public:
@@ -124,7 +124,7 @@ protected:
void updateSelectionMarker();
- void updateSelectionMarkerGeometry(const QRectF &annotation_rect);
+ void updateSelectionMarkerGeometry(const QRectF &annotationRect);
const Style *getAdaptedStyle();
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.cpp
index 5df4a278f9e3f7c77310a50c83701e7823e3eafd..92e7a8ae72292c3e647dca7b5c0c7847694363d1 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.cpp
@@ -50,8 +50,8 @@
namespace qmt {
-AssociationItem::AssociationItem(DAssociation *association, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent)
- : RelationItem(association, diagram_scene_model, parent),
+AssociationItem::AssociationItem(DAssociation *association, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent)
+ : RelationItem(association, diagramSceneModel, parent),
m_association(association),
m_endAName(0),
m_endACardinality(0),
@@ -72,107 +72,107 @@ void AssociationItem::update(const Style *style)
updateEndLabels(m_association->getB(), m_association->getA(), &m_endBName, &m_endBCardinality, style);
QMT_CHECK(m_arrow);
- QGraphicsItem *end_a_item = m_diagramSceneModel->getGraphicsItem(m_association->getEndA());
- QMT_CHECK(end_a_item);
- placeEndLabels(m_arrow->getFirstLineSegment(), m_endAName, m_endACardinality, end_a_item, m_arrow->getStartHeadLength());
- QGraphicsItem *end_b_item = m_diagramSceneModel->getGraphicsItem(m_association->getEndB());
- QMT_CHECK(end_b_item);
- placeEndLabels(m_arrow->getLastLineSegment(), m_endBName, m_endBCardinality, end_b_item, m_arrow->getEndHeadLength());
+ QGraphicsItem *endAItem = m_diagramSceneModel->getGraphicsItem(m_association->getEndA());
+ QMT_CHECK(endAItem);
+ placeEndLabels(m_arrow->getFirstLineSegment(), m_endAName, m_endACardinality, endAItem, m_arrow->getStartHeadLength());
+ QGraphicsItem *endBItem = m_diagramSceneModel->getGraphicsItem(m_association->getEndB());
+ QMT_CHECK(endBItem);
+ placeEndLabels(m_arrow->getLastLineSegment(), m_endBName, m_endBCardinality, endBItem, m_arrow->getEndHeadLength());
}
-void AssociationItem::updateEndLabels(const DAssociationEnd &end, const DAssociationEnd &other_end, QGraphicsSimpleTextItem **end_name, QGraphicsSimpleTextItem **end_cardinality, const Style *style)
+void AssociationItem::updateEndLabels(const DAssociationEnd &end, const DAssociationEnd &otherEnd, QGraphicsSimpleTextItem **endName, QGraphicsSimpleTextItem **endCardinality, const Style *style)
{
Q_UNUSED(end);
- if (!other_end.getName().isEmpty()) {
- if (!*end_name) {
- *end_name = new QGraphicsSimpleTextItem(this);
+ if (!otherEnd.getName().isEmpty()) {
+ if (!*endName) {
+ *endName = new QGraphicsSimpleTextItem(this);
}
- (*end_name)->setFont(style->getSmallFont());
- (*end_name)->setBrush(style->getTextBrush());
- (*end_name)->setText(other_end.getName());
- } else if (*end_name) {
- (*end_name)->scene()->removeItem(*end_name);
- delete *end_name;
- *end_name = 0;
+ (*endName)->setFont(style->getSmallFont());
+ (*endName)->setBrush(style->getTextBrush());
+ (*endName)->setText(otherEnd.getName());
+ } else if (*endName) {
+ (*endName)->scene()->removeItem(*endName);
+ delete *endName;
+ *endName = 0;
}
- if (!other_end.getCardinality().isEmpty()) {
- if (!*end_cardinality) {
- *end_cardinality = new QGraphicsSimpleTextItem(this);
+ if (!otherEnd.getCardinality().isEmpty()) {
+ if (!*endCardinality) {
+ *endCardinality = new QGraphicsSimpleTextItem(this);
}
- (*end_cardinality)->setFont(style->getSmallFont());
- (*end_cardinality)->setBrush(style->getTextBrush());
- (*end_cardinality)->setText(other_end.getCardinality());
- } else if (*end_cardinality) {
- (*end_cardinality)->scene()->removeItem(*end_cardinality);
- delete *end_cardinality;
- *end_cardinality = 0;
+ (*endCardinality)->setFont(style->getSmallFont());
+ (*endCardinality)->setBrush(style->getTextBrush());
+ (*endCardinality)->setText(otherEnd.getCardinality());
+ } else if (*endCardinality) {
+ (*endCardinality)->scene()->removeItem(*endCardinality);
+ delete *endCardinality;
+ *endCardinality = 0;
}
}
-void AssociationItem::placeEndLabels(const QLineF &line_segment, QGraphicsItem *end_name, QGraphicsItem *end_cardinality, QGraphicsItem *end_item, double head_length)
+void AssociationItem::placeEndLabels(const QLineF &lineSegment, QGraphicsItem *endName, QGraphicsItem *endCardinality, QGraphicsItem *endItem, double headLength)
{
- const double HEAD_OFFSET = head_length + 6.0;
+ const double HEAD_OFFSET = headLength + 6.0;
const double SIDE_OFFSET = 4.0;
- QPointF head_offset = QPointF(HEAD_OFFSET, 0);
- QPointF side_offset = QPointF(0.0, SIDE_OFFSET);
+ QPointF headOffset = QPointF(HEAD_OFFSET, 0);
+ QPointF sideOffset = QPointF(0.0, SIDE_OFFSET);
- double angle = GeometryUtilities::calcAngle(line_segment);
+ double angle = GeometryUtilities::calcAngle(lineSegment);
if (angle >= -5 && angle <= 5) {
- if (end_name) {
- end_name->setPos(line_segment.p1() + head_offset + side_offset);
+ if (endName) {
+ endName->setPos(lineSegment.p1() + headOffset + sideOffset);
}
- if (end_cardinality) {
- end_cardinality->setPos(line_segment.p1() + head_offset - side_offset - end_cardinality->boundingRect().bottomLeft());
+ if (endCardinality) {
+ endCardinality->setPos(lineSegment.p1() + headOffset - sideOffset - endCardinality->boundingRect().bottomLeft());
}
} else if (angle <= -175 || angle >= 175) {
- if (end_name) {
- end_name->setPos(line_segment.p1() - head_offset + side_offset - end_name->boundingRect().topRight());
+ if (endName) {
+ endName->setPos(lineSegment.p1() - headOffset + sideOffset - endName->boundingRect().topRight());
}
- if (end_cardinality) {
- end_cardinality->setPos(line_segment.p1() - head_offset - side_offset - end_cardinality->boundingRect().bottomRight());
+ if (endCardinality) {
+ endCardinality->setPos(lineSegment.p1() - headOffset - sideOffset - endCardinality->boundingRect().bottomRight());
}
} else {
QRectF rect;
- if (end_cardinality) {
- rect = end_cardinality->boundingRect();
+ if (endCardinality) {
+ rect = endCardinality->boundingRect();
}
- if (end_name) {
- rect = rect.united(end_name->boundingRect().translated(rect.bottomLeft()));
+ if (endName) {
+ rect = rect.united(endName->boundingRect().translated(rect.bottomLeft()));
}
- QPointF rect_placement;
- GeometryUtilities::Side aligned_side = GeometryUtilities::SIDE_UNSPECIFIED;
+ QPointF rectPlacement;
+ GeometryUtilities::Side alignedSide = GeometryUtilities::SIDE_UNSPECIFIED;
- if (IIntersectionable *object_item = dynamic_cast<IIntersectionable *>(end_item)) {
- QPointF intersection_point;
- QLineF intersection_line;
+ if (IIntersectionable *objectItem = dynamic_cast<IIntersectionable *>(endItem)) {
+ QPointF intersectionPoint;
+ QLineF intersectionLine;
- if (object_item->intersectShapeWithLine(GeometryUtilities::stretch(line_segment.translated(pos()), 2.0, 0.0), &intersection_point, &intersection_line)) {
- if (!GeometryUtilities::placeRectAtLine(rect, line_segment, HEAD_OFFSET, SIDE_OFFSET, intersection_line, &rect_placement, &aligned_side)) {
- rect_placement = intersection_point;
+ if (objectItem->intersectShapeWithLine(GeometryUtilities::stretch(lineSegment.translated(pos()), 2.0, 0.0), &intersectionPoint, &intersectionLine)) {
+ if (!GeometryUtilities::placeRectAtLine(rect, lineSegment, HEAD_OFFSET, SIDE_OFFSET, intersectionLine, &rectPlacement, &alignedSide)) {
+ rectPlacement = intersectionPoint;
}
} else {
- rect_placement = line_segment.p1();
+ rectPlacement = lineSegment.p1();
}
} else {
- rect_placement = end_item->pos();
+ rectPlacement = endItem->pos();
}
- if (end_cardinality) {
- if (aligned_side == GeometryUtilities::SIDE_RIGHT) {
- end_cardinality->setPos(rect_placement + QPointF(rect.width() - end_cardinality->boundingRect().width(), 0.0));
+ if (endCardinality) {
+ if (alignedSide == GeometryUtilities::SIDE_RIGHT) {
+ endCardinality->setPos(rectPlacement + QPointF(rect.width() - endCardinality->boundingRect().width(), 0.0));
} else {
- end_cardinality->setPos(rect_placement);
+ endCardinality->setPos(rectPlacement);
}
- rect_placement += end_cardinality->boundingRect().bottomLeft();
+ rectPlacement += endCardinality->boundingRect().bottomLeft();
}
- if (end_name) {
- if (aligned_side == GeometryUtilities::SIDE_RIGHT) {
- end_name->setPos(rect_placement + QPointF(rect.width() - end_name->boundingRect().width(), 0.0));
+ if (endName) {
+ if (alignedSide == GeometryUtilities::SIDE_RIGHT) {
+ endName->setPos(rectPlacement + QPointF(rect.width() - endName->boundingRect().width(), 0.0));
} else {
- end_name->setPos(rect_placement);
+ endName->setPos(rectPlacement);
}
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.h
index 6055543654e5d77eb7d25312c03376c612edbd49..7275fda83b82e4553974886c0c41d7089efcf92e 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/associationitem.h
@@ -49,7 +49,7 @@ class AssociationItem :
{
public:
- AssociationItem(DAssociation *association, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent = 0);
+ AssociationItem(DAssociation *association, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
~AssociationItem();
@@ -59,9 +59,9 @@ protected:
private:
- void updateEndLabels(const DAssociationEnd &end, const DAssociationEnd &other_end, QGraphicsSimpleTextItem **end_name, QGraphicsSimpleTextItem **end_cardinality, const Style *style);
+ void updateEndLabels(const DAssociationEnd &end, const DAssociationEnd &otherEnd, QGraphicsSimpleTextItem **endName, QGraphicsSimpleTextItem **endCardinality, const Style *style);
- void placeEndLabels(const QLineF &line_segment, QGraphicsItem *end_name, QGraphicsItem *end_cardinality, QGraphicsItem *end_item, double head_length);
+ void placeEndLabels(const QLineF &lineSegment, QGraphicsItem *endName, QGraphicsItem *endCardinality, QGraphicsItem *endItem, double headLength);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/boundaryitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/boundaryitem.cpp
index de15835cc2a6a345cefbc4f3e7a3c7eca4fcdd50..14fe9f585b909abeb8fd7fc41ea4d56907c7d445 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/boundaryitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/boundaryitem.cpp
@@ -79,10 +79,10 @@ public:
};
-BoundaryItem::BoundaryItem(DBoundary *boundary, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent)
+BoundaryItem::BoundaryItem(DBoundary *boundary, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent)
: QGraphicsItem(parent),
m_boundary(boundary),
- m_diagramSceneModel(diagram_scene_model),
+ m_diagramSceneModel(diagramSceneModel),
m_secondarySelected(false),
m_focusSelected(false),
m_selectionMarker(0),
@@ -177,66 +177,66 @@ QSizeF BoundaryItem::getMinimumSize() const
return calcMinimumGeometry();
}
-void BoundaryItem::setPosAndRect(const QPointF &original_pos, const QRectF &original_rect, const QPointF &top_left_delta, const QPointF &bottom_right_delta)
+void BoundaryItem::setPosAndRect(const QPointF &originalPos, const QRectF &originalRect, const QPointF &topLeftDelta, const QPointF &bottomRightDelta)
{
- QPointF new_pos = original_pos;
- QRectF new_rect = original_rect;
- GeometryUtilities::adjustPosAndRect(&new_pos, &new_rect, top_left_delta, bottom_right_delta, QPointF(0.5, 0.5));
- if (new_pos != m_boundary->getPos() || new_rect != m_boundary->getRect()) {
+ QPointF newPos = originalPos;
+ QRectF newRect = originalRect;
+ GeometryUtilities::adjustPosAndRect(&newPos, &newRect, topLeftDelta, bottomRightDelta, QPointF(0.5, 0.5));
+ if (newPos != m_boundary->getPos() || newRect != m_boundary->getRect()) {
m_diagramSceneModel->getDiagramController()->startUpdateElement(m_boundary, m_diagramSceneModel->getDiagram(), DiagramController::UPDATE_GEOMETRY);
- m_boundary->setPos(new_pos);
- m_boundary->setRect(new_rect);
+ m_boundary->setPos(newPos);
+ m_boundary->setRect(newRect);
m_diagramSceneModel->getDiagramController()->finishUpdateElement(m_boundary, m_diagramSceneModel->getDiagram(), false);
}
}
-void BoundaryItem::alignItemSizeToRaster(IResizable::Side adjust_horizontal_side, IResizable::Side adjust_vertical_side, double raster_width, double raster_height)
+void BoundaryItem::alignItemSizeToRaster(IResizable::Side adjustHorizontalSide, IResizable::Side adjustVerticalSide, double rasterWidth, double rasterHeight)
{
QPointF pos = m_boundary->getPos();
QRectF rect = m_boundary->getRect();
- double horiz_delta = rect.width() - qRound(rect.width() / raster_width) * raster_width;
- double vert_delta = rect.height() - qRound(rect.height() / raster_height) * raster_height;
+ double horizDelta = rect.width() - qRound(rect.width() / rasterWidth) * rasterWidth;
+ double vertDelta = rect.height() - qRound(rect.height() / rasterHeight) * rasterHeight;
// make sure the new size is at least the minimum size
- QSizeF minimum_size = getMinimumSize();
- while (rect.width() + horiz_delta < minimum_size.width()) {
- horiz_delta += raster_width;
+ QSizeF minimumSize = getMinimumSize();
+ while (rect.width() + horizDelta < minimumSize.width()) {
+ horizDelta += rasterWidth;
}
- while (rect.height() + vert_delta < minimum_size.height()) {
- vert_delta += raster_height;
+ while (rect.height() + vertDelta < minimumSize.height()) {
+ vertDelta += rasterHeight;
}
- double left_delta = 0.0;
- double right_delta = 0.0;
- double top_delta = 0.0;
- double bottom_delta = 0.0;
+ double leftDelta = 0.0;
+ double rightDelta = 0.0;
+ double topDelta = 0.0;
+ double bottomDelta = 0.0;
- switch (adjust_horizontal_side) {
+ switch (adjustHorizontalSide) {
case IResizable::SIDE_NONE:
break;
case IResizable::SIDE_LEFT_OR_TOP:
- left_delta = horiz_delta;
+ leftDelta = horizDelta;
break;
case IResizable::SIDE_RIGHT_OR_BOTTOM:
- right_delta = -horiz_delta;
+ rightDelta = -horizDelta;
break;
}
- switch (adjust_vertical_side) {
+ switch (adjustVerticalSide) {
case IResizable::SIDE_NONE:
break;
case IResizable::SIDE_LEFT_OR_TOP:
- top_delta = vert_delta;
+ topDelta = vertDelta;
break;
case IResizable::SIDE_RIGHT_OR_BOTTOM:
- bottom_delta = -vert_delta;
+ bottomDelta = -vertDelta;
break;
}
- QPointF top_left_delta(left_delta, top_delta);
- QPointF bottom_right_delta(right_delta, bottom_delta);
- setPosAndRect(pos, rect, top_left_delta, bottom_right_delta);
+ QPointF topLeftDelta(leftDelta, topDelta);
+ QPointF bottomRightDelta(rightDelta, bottomDelta);
+ setPosAndRect(pos, rect, topLeftDelta, bottomRightDelta);
}
void BoundaryItem::moveDelta(const QPointF &delta)
@@ -246,17 +246,17 @@ void BoundaryItem::moveDelta(const QPointF &delta)
m_diagramSceneModel->getDiagramController()->finishUpdateElement(m_boundary, m_diagramSceneModel->getDiagram(), false);
}
-void BoundaryItem::alignItemPositionToRaster(double raster_width, double raster_height)
+void BoundaryItem::alignItemPositionToRaster(double rasterWidth, double rasterHeight)
{
QPointF pos = m_boundary->getPos();
QRectF rect = m_boundary->getRect();
- QPointF top_left = pos + rect.topLeft();
+ QPointF topLeft = pos + rect.topLeft();
- double left_delta = qRound(top_left.x() / raster_width) * raster_width - top_left.x();
- double top_delta = qRound(top_left.y() / raster_height) * raster_height - top_left.y();
- QPointF top_left_delta(left_delta, top_delta);
+ double leftDelta = qRound(topLeft.x() / rasterWidth) * rasterWidth - topLeft.x();
+ double topDelta = qRound(topLeft.y() / rasterHeight) * rasterHeight - topLeft.y();
+ QPointF topLeftDelta(leftDelta, topDelta);
- setPosAndRect(pos, rect, top_left_delta, top_left_delta);
+ setPosAndRect(pos, rect, topLeftDelta, topLeftDelta);
}
bool BoundaryItem::isSecondarySelected() const
@@ -264,10 +264,10 @@ bool BoundaryItem::isSecondarySelected() const
return m_secondarySelected;
}
-void BoundaryItem::setSecondarySelected(bool secondary_selected)
+void BoundaryItem::setSecondarySelected(bool secondarySelected)
{
- if (m_secondarySelected != secondary_selected) {
- m_secondarySelected = secondary_selected;
+ if (m_secondarySelected != secondarySelected) {
+ m_secondarySelected = secondarySelected;
update();
}
}
@@ -277,10 +277,10 @@ bool BoundaryItem::isFocusSelected() const
return m_focusSelected;
}
-void BoundaryItem::setFocusSelected(bool focus_selected)
+void BoundaryItem::setFocusSelected(bool focusSelected)
{
- if (m_focusSelected != focus_selected) {
- m_focusSelected = focus_selected;
+ if (m_focusSelected != focusSelected) {
+ m_focusSelected = focusSelected;
update();
}
}
@@ -340,10 +340,10 @@ void BoundaryItem::updateSelectionMarker()
}
}
-void BoundaryItem::updateSelectionMarkerGeometry(const QRectF &boundary_rect)
+void BoundaryItem::updateSelectionMarkerGeometry(const QRectF &boundaryRect)
{
if (m_selectionMarker) {
- m_selectionMarker->setRect(boundary_rect);
+ m_selectionMarker->setRect(boundaryRect);
}
}
@@ -369,10 +369,10 @@ void BoundaryItem::onContentsChanged()
m_onChanged = true;
if (!m_onUpdate) {
- QString plain_text = m_textItem->toPlainText();
- if (m_boundary->getText() != plain_text) {
+ QString plainText = m_textItem->toPlainText();
+ if (m_boundary->getText() != plainText) {
m_diagramSceneModel->getDiagramController()->startUpdateElement(m_boundary, m_diagramSceneModel->getDiagram(), DiagramController::UPDATE_MINOR);
- m_boundary->setText(plain_text);
+ m_boundary->setText(plainText);
m_diagramSceneModel->getDiagramController()->finishUpdateElement(m_boundary, m_diagramSceneModel->getDiagram(), false);
}
}
@@ -387,14 +387,14 @@ QSizeF BoundaryItem::calcMinimumGeometry() const
if (m_textItem) {
m_textItem->setTextWidth(-1);
- QSizeF text_size = m_textItem->document()->size();
- qreal text_width = text_size.width() + 2 * CONTENTS_BORDER_HORIZONTAL;
- if (text_width > width) {
- width = text_width;
+ QSizeF textSize = m_textItem->document()->size();
+ qreal textWidth = textSize.width() + 2 * CONTENTS_BORDER_HORIZONTAL;
+ if (textWidth > width) {
+ width = textWidth;
}
- qreal text_height = text_size.height() + 2 * CONTENTS_BORDER_VERTICAL;
- if (text_height > height) {
- height = text_height;
+ qreal textHeight = textSize.height() + 2 * CONTENTS_BORDER_VERTICAL;
+ if (textHeight > height) {
+ height = textHeight;
}
}
return GeometryUtilities::ensureMinimumRasterSize(QSizeF(width, height), 2 * RASTER_WIDTH, 2 * RASTER_HEIGHT);
@@ -408,21 +408,21 @@ void BoundaryItem::updateGeometry()
qreal width = geometry.width();
qreal height = geometry.height();
- qreal text_width = 0.0;
- qreal text_height = 0.0;
+ qreal textWidth = 0.0;
+ qreal textHeight = 0.0;
if (m_textItem) {
m_textItem->setTextWidth(-1);
- QSizeF text_size = m_textItem->document()->size();
- text_width = text_size.width();
- text_height = text_size.height();
+ QSizeF textSize = m_textItem->document()->size();
+ textWidth = textSize.width();
+ textHeight = textSize.height();
}
- QRectF boundary_rect = m_boundary->getRect();
- if (boundary_rect.width() > width) {
- width = boundary_rect.width();
+ QRectF boundaryRect = m_boundary->getRect();
+ if (boundaryRect.width() > width) {
+ width = boundaryRect.width();
}
- if (boundary_rect.height() > height) {
- height = boundary_rect.height();
+ if (boundaryRect.height() > height) {
+ height = boundaryRect.height();
}
// update sizes and positions
@@ -443,11 +443,11 @@ void BoundaryItem::updateGeometry()
}
if (m_noTextItem) {
- m_noTextItem->setRect(QRectF(-text_width / 2, top + CONTENTS_BORDER_VERTICAL, text_width, text_height));
+ m_noTextItem->setRect(QRectF(-textWidth / 2, top + CONTENTS_BORDER_VERTICAL, textWidth, textHeight));
}
if (m_textItem) {
- m_textItem->setPos(-text_width / 2.0, top + CONTENTS_BORDER_VERTICAL);
+ m_textItem->setPos(-textWidth / 2.0, top + CONTENTS_BORDER_VERTICAL);
}
updateSelectionMarkerGeometry(rect);
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/boundaryitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/boundaryitem.h
index 9562e7e267974e44a5a418dff8721d20c3acf640..45161b5eceb45f45d446cab2eb5dc972840798d7 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/boundaryitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/boundaryitem.h
@@ -57,7 +57,7 @@ class BoundaryItem :
class BoundaryTextItem;
public:
- BoundaryItem(DBoundary *boundary, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent = 0);
+ BoundaryItem(DBoundary *boundary, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
~BoundaryItem();
@@ -85,25 +85,25 @@ public:
QSizeF getMinimumSize() const;
- void setPosAndRect(const QPointF &original_pos, const QRectF &original_rect, const QPointF &top_left_delta, const QPointF &bottom_right_delta);
+ void setPosAndRect(const QPointF &originalPos, const QRectF &originalRect, const QPointF &topLeftDelta, const QPointF &bottomRightDelta);
- void alignItemSizeToRaster(Side adjust_horizontal_side, Side adjust_vertical_side, double raster_width, double raster_height);
+ void alignItemSizeToRaster(Side adjustHorizontalSide, Side adjustVerticalSide, double rasterWidth, double rasterHeight);
public:
void moveDelta(const QPointF &delta);
- void alignItemPositionToRaster(double raster_width, double raster_height);
+ void alignItemPositionToRaster(double rasterWidth, double rasterHeight);
public:
bool isSecondarySelected() const;
- void setSecondarySelected(bool secondary_selected);
+ void setSecondarySelected(bool secondarySelected);
bool isFocusSelected() const;
- void setFocusSelected(bool focus_selected);
+ void setFocusSelected(bool focusSelected);
public:
@@ -123,7 +123,7 @@ protected:
void updateSelectionMarker();
- void updateSelectionMarkerGeometry(const QRectF &boundary_rect);
+ void updateSelectionMarkerGeometry(const QRectF &boundaryRect);
const Style *getAdaptedStyle();
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.cpp
index dab677e5615aa26a6ec48c598af1a03b06229884..38a889c5792e6d20c56b263c2f352a6e1afb6afa 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.cpp
@@ -69,8 +69,8 @@ static const qreal BODY_VERT_BORDER = 4.0;
static const qreal BODY_HORIZ_BORDER = 4.0;
-ClassItem::ClassItem(DClass *klass, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent)
- : ObjectItem(klass, diagram_scene_model, parent),
+ClassItem::ClassItem(DClass *klass, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent)
+ : ObjectItem(klass, diagramSceneModel, parent),
m_customIcon(0),
m_shape(0),
m_namespace(0),
@@ -95,12 +95,12 @@ void ClassItem::update()
updateStereotypeIconDisplay();
- DClass *diagram_class = dynamic_cast<DClass *>(getObject());
- QMT_CHECK(diagram_class);
+ DClass *diagramClass = dynamic_cast<DClass *>(getObject());
+ QMT_CHECK(diagramClass);
const Style *style = getAdaptedStyle(getStereotypeIconId());
- if (diagram_class->getShowAllMembers()) {
+ if (diagramClass->getShowAllMembers()) {
updateMembers(style);
} else {
m_attributesText.clear();
@@ -141,25 +141,25 @@ void ClassItem::update()
updateStereotypes(getStereotypeIconId(), getStereotypeIconDisplay(), style);
// namespace
- if (!diagram_class->getNamespace().isEmpty()) {
+ if (!diagramClass->getNamespace().isEmpty()) {
if (!m_namespace) {
m_namespace = new QGraphicsSimpleTextItem(this);
}
m_namespace->setFont(style->getSmallFont());
m_namespace->setBrush(style->getTextBrush());
- m_namespace->setText(diagram_class->getNamespace());
+ m_namespace->setText(diagramClass->getNamespace());
} else if (m_namespace) {
m_namespace->scene()->removeItem(m_namespace);
delete m_namespace;
m_namespace = 0;
}
- DClass::TemplateDisplay template_display = diagram_class->getTemplateDisplay();
- if (template_display == DClass::TEMPLATE_SMART) {
+ DClass::TemplateDisplay templateDisplay = diagramClass->getTemplateDisplay();
+ if (templateDisplay == DClass::TEMPLATE_SMART) {
if (m_customIcon) {
- template_display = DClass::TEMPLATE_NAME;
+ templateDisplay = DClass::TEMPLATE_NAME;
} else {
- template_display = DClass::TEMPLATE_BOX;
+ templateDisplay = DClass::TEMPLATE_BOX;
}
}
@@ -169,11 +169,11 @@ void ClassItem::update()
}
m_className->setFont(style->getHeaderFont());
m_className->setBrush(style->getTextBrush());
- if (template_display == DClass::TEMPLATE_NAME && !diagram_class->getTemplateParameters().isEmpty()) {
+ if (templateDisplay == DClass::TEMPLATE_NAME && !diagramClass->getTemplateParameters().isEmpty()) {
QString name = getObject()->getName();
name += QLatin1Char('<');
bool first = true;
- foreach (const QString &p, diagram_class->getTemplateParameters()) {
+ foreach (const QString &p, diagramClass->getTemplateParameters()) {
if (!first) {
name += QLatin1Char(',');
}
@@ -257,7 +257,7 @@ void ClassItem::update()
}
// template parameters
- if (template_display == DClass::TEMPLATE_BOX && !diagram_class->getTemplateParameters().isEmpty()) {
+ if (templateDisplay == DClass::TEMPLATE_BOX && !diagramClass->getTemplateParameters().isEmpty()) {
if (!m_templateParameterBox) {
m_templateParameterBox = new TemplateParameterBox(this);
}
@@ -267,7 +267,7 @@ void ClassItem::update()
m_templateParameterBox->setBrush(QBrush(Qt::white));
m_templateParameterBox->setFont(style->getSmallFont());
m_templateParameterBox->setTextBrush(style->getTextBrush());
- m_templateParameterBox->setTemplateParameters(diagram_class->getTemplateParameters());
+ m_templateParameterBox->setTemplateParameters(diagramClass->getTemplateParameters());
} else if (m_templateParameterBox) {
m_templateParameterBox->scene()->removeItem(m_templateParameterBox);
delete m_templateParameterBox;
@@ -297,7 +297,7 @@ void ClassItem::update()
updateGeometry();
}
-bool ClassItem::intersectShapeWithLine(const QLineF &line, QPointF *intersection_point, QLineF *intersection_line) const
+bool ClassItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
{
QPolygonF polygon;
if (m_customIcon) {
@@ -312,7 +312,7 @@ bool ClassItem::intersectShapeWithLine(const QLineF &line, QPointF *intersection
rect.translate(getObject()->getPos());
polygon << rect.topLeft() << rect.topRight() << rect.bottomRight() << rect.bottomLeft() << rect.topLeft();
}
- return GeometryUtilities::intersect(polygon, line, intersection_point, intersection_line);
+ return GeometryUtilities::intersect(polygon, line, intersectionPoint, intersectionLine);
}
QSizeF ClassItem::getMinimumSize() const
@@ -325,28 +325,28 @@ QPointF ClassItem::getRelationStartPos() const
return pos();
}
-void ClassItem::relationDrawn(const QString &id, const QPointF &to_scene_pos, const QList<QPointF> &intermediate_points)
+void ClassItem::relationDrawn(const QString &id, const QPointF &toScenePos, const QList<QPointF> &intermediatePoints)
{
- DElement *target_element = getDiagramSceneModel()->findTopmostElement(to_scene_pos);
- if (target_element) {
+ DElement *targetElement = getDiagramSceneModel()->findTopmostElement(toScenePos);
+ if (targetElement) {
if (id == QLatin1String("inheritance")) {
- DClass *base_class = dynamic_cast<DClass *>(target_element);
- if (base_class) {
- DClass *derived_class = dynamic_cast<DClass *>(getObject());
- QMT_CHECK(derived_class);
- getDiagramSceneModel()->getDiagramSceneController()->createInheritance(derived_class, base_class, intermediate_points, getDiagramSceneModel()->getDiagram());
+ DClass *baseClass = dynamic_cast<DClass *>(targetElement);
+ if (baseClass) {
+ DClass *derivedClass = dynamic_cast<DClass *>(getObject());
+ QMT_CHECK(derivedClass);
+ getDiagramSceneModel()->getDiagramSceneController()->createInheritance(derivedClass, baseClass, intermediatePoints, getDiagramSceneModel()->getDiagram());
}
} else if (id == QLatin1String("dependency")) {
- DObject *dependant_object = dynamic_cast<DObject *>(target_element);
- if (dependant_object) {
- getDiagramSceneModel()->getDiagramSceneController()->createDependency(getObject(), dependant_object, intermediate_points, getDiagramSceneModel()->getDiagram());
+ DObject *dependantObject = dynamic_cast<DObject *>(targetElement);
+ if (dependantObject) {
+ getDiagramSceneModel()->getDiagramSceneController()->createDependency(getObject(), dependantObject, intermediatePoints, getDiagramSceneModel()->getDiagram());
}
} else if (id == QLatin1String("association")) {
- DClass *assoziated_class = dynamic_cast<DClass *>(target_element);
- if (assoziated_class) {
- DClass *derived_class = dynamic_cast<DClass *>(getObject());
- QMT_CHECK(derived_class);
- getDiagramSceneModel()->getDiagramSceneController()->createAssociation(derived_class, assoziated_class, intermediate_points, getDiagramSceneModel()->getDiagram());
+ DClass *assoziatedClass = dynamic_cast<DClass *>(targetElement);
+ if (assoziatedClass) {
+ DClass *derivedClass = dynamic_cast<DClass *>(getObject());
+ QMT_CHECK(derivedClass);
+ getDiagramSceneModel()->getDiagramSceneController()->createAssociation(derivedClass, assoziatedClass, intermediatePoints, getDiagramSceneModel()->getDiagram());
}
}
}
@@ -364,9 +364,9 @@ bool ClassItem::extendContextMenu(QMenu *menu)
bool ClassItem::handleSelectedContextMenuAction(QAction *action)
{
- ContextMenuAction *klass_action = dynamic_cast<ContextMenuAction *>(action);
- if (klass_action) {
- if (klass_action->getId() == QStringLiteral("showDefinition")) {
+ ContextMenuAction *klassAction = dynamic_cast<ContextMenuAction *>(action);
+ if (klassAction) {
+ if (klassAction->getId() == QStringLiteral("showDefinition")) {
getDiagramSceneModel()->getDiagramSceneController()->getElementTasks()->openClassDefinition(getObject(), getDiagramSceneModel()->getDiagram());
return true;
}
@@ -384,13 +384,13 @@ QSizeF ClassItem::calcMinimumGeometry() const
}
height += BODY_VERT_BORDER;
- if (CustomIconItem *stereotype_icon_item = getStereotypeIconItem()) {
- width = std::max(width, stereotype_icon_item->boundingRect().width() + 2 * BODY_HORIZ_BORDER);
- height += stereotype_icon_item->boundingRect().height();
+ if (CustomIconItem *stereotypeIconItem = getStereotypeIconItem()) {
+ width = std::max(width, stereotypeIconItem->boundingRect().width() + 2 * BODY_HORIZ_BORDER);
+ height += stereotypeIconItem->boundingRect().height();
}
- if (StereotypesItem *stereotypes_item = getStereotypesItem()) {
- width = std::max(width, stereotypes_item->boundingRect().width() + 2 * BODY_HORIZ_BORDER);
- height += stereotypes_item->boundingRect().height();
+ if (StereotypesItem *stereotypesItem = getStereotypesItem()) {
+ width = std::max(width, stereotypesItem->boundingRect().width() + 2 * BODY_HORIZ_BORDER);
+ height += stereotypesItem->boundingRect().height();
}
if (m_namespace) {
width = std::max(width, m_namespace->boundingRect().width() + 2 * BODY_HORIZ_BORDER);
@@ -480,13 +480,13 @@ void ClassItem::updateGeometry()
}
y += BODY_VERT_BORDER;
- if (CustomIconItem *stereotype_icon_item = getStereotypeIconItem()) {
- stereotype_icon_item->setPos(right - stereotype_icon_item->boundingRect().width() - BODY_HORIZ_BORDER, y);
- y += stereotype_icon_item->boundingRect().height();
+ if (CustomIconItem *stereotypeIconItem = getStereotypeIconItem()) {
+ stereotypeIconItem->setPos(right - stereotypeIconItem->boundingRect().width() - BODY_HORIZ_BORDER, y);
+ y += stereotypeIconItem->boundingRect().height();
}
- if (StereotypesItem *stereotypes_item = getStereotypesItem()) {
- stereotypes_item->setPos(-stereotypes_item->boundingRect().width() / 2.0, y);
- y += stereotypes_item->boundingRect().height();
+ if (StereotypesItem *stereotypesItem = getStereotypesItem()) {
+ stereotypesItem->setPos(-stereotypesItem->boundingRect().width() / 2.0, y);
+ y += stereotypesItem->boundingRect().height();
}
if (m_namespace) {
m_namespace->setPos(-m_namespace->boundingRect().width() / 2.0, y);
@@ -564,22 +564,22 @@ void ClassItem::updateMembers(const Style *style)
m_attributesText.clear();
m_methodsText.clear();
- MClassMember::Visibility attributes_visibility = MClassMember::VISIBILITY_UNDEFINED;
- MClassMember::Visibility methods_visibility = MClassMember::VISIBILITY_UNDEFINED;
- QString attributes_group;
- QString methods_group;
+ MClassMember::Visibility attributesVisibility = MClassMember::VISIBILITY_UNDEFINED;
+ MClassMember::Visibility methodsVisibility = MClassMember::VISIBILITY_UNDEFINED;
+ QString attributesGroup;
+ QString methodsGroup;
- MClassMember::Visibility *current_visibility = 0;
- QString *current_group = 0;
+ MClassMember::Visibility *currentVisibility = 0;
+ QString *currentGroup = 0;
QString *text = 0;
DClass *dclass = dynamic_cast<DClass *>(getObject());
QMT_CHECK(dclass);
- // TODO move bool have_icon_fonts into class Style?
- bool have_icon_fonts = false; // style->getNormalFont().family() == QStringLiteral("Modelling");
+ // TODO move bool haveIconFonts into class Style?
+ bool haveIconFonts = false; // style->getNormalFont().family() == QStringLiteral("Modelling");
// TODO any reason to show visibility as group instead of per member?
- bool use_group_visibility = false;
+ bool useGroupVisibility = false;
foreach (const MClassMember &member, dclass->getMembers()) {
@@ -588,13 +588,13 @@ void ClassItem::updateMembers(const Style *style)
QMT_CHECK(false);
break;
case MClassMember::MEMBER_ATTRIBUTE:
- current_visibility = &attributes_visibility;
- current_group = &attributes_group;
+ currentVisibility = &attributesVisibility;
+ currentGroup = &attributesGroup;
text = &m_attributesText;
break;
case MClassMember::MEMBER_METHOD:
- current_visibility = &methods_visibility;
- current_group = &methods_group;
+ currentVisibility = &methodsVisibility;
+ currentGroup = &methodsGroup;
text = &m_methodsText;
break;
}
@@ -603,10 +603,10 @@ void ClassItem::updateMembers(const Style *style)
*text += QStringLiteral("<br/>");
}
- bool add_newline = false;
- bool add_space = false;
- if (member.getVisibility() != *current_visibility) {
- if (use_group_visibility) {
+ bool addNewline = false;
+ bool addSpace = false;
+ if (member.getVisibility() != *currentVisibility) {
+ if (useGroupVisibility) {
if (member.getVisibility() != MClassMember::VISIBILITY_UNDEFINED) {
QString vis;
switch (member.getVisibility()) {
@@ -635,82 +635,82 @@ void ClassItem::updateMembers(const Style *style)
break;
}
*text += vis;
- add_newline = true;
- add_space = true;
+ addNewline = true;
+ addSpace = true;
}
}
- *current_visibility = member.getVisibility();
+ *currentVisibility = member.getVisibility();
}
- if (member.getGroup() != current_group) {
- if (add_space) {
+ if (member.getGroup() != currentGroup) {
+ if (addSpace) {
*text += QStringLiteral(" ");
}
*text += QString(QStringLiteral("[%1]")).arg(member.getGroup());
- add_newline = true;
- *current_group = member.getGroup();
+ addNewline = true;
+ *currentGroup = member.getGroup();
}
- if (add_newline) {
+ if (addNewline) {
*text += QStringLiteral("<br/>");
}
- add_space = false;
- bool have_signal = false;
- bool have_slot = false;
- if (!use_group_visibility) {
+ addSpace = false;
+ bool haveSignal = false;
+ bool haveSlot = false;
+ if (!useGroupVisibility) {
if (member.getVisibility() != MClassMember::VISIBILITY_UNDEFINED) {
QString vis;
switch (member.getVisibility()) {
case MClassMember::VISIBILITY_UNDEFINED:
break;
case MClassMember::VISIBILITY_PUBLIC:
- vis = have_icon_fonts ? QString(QChar(0xe990)) : QStringLiteral("+");
- add_space = true;
+ vis = haveIconFonts ? QString(QChar(0xe990)) : QStringLiteral("+");
+ addSpace = true;
break;
case MClassMember::VISIBILITY_PROTECTED:
- vis = have_icon_fonts ? QString(QChar(0xe98e)) : QStringLiteral("#");
- add_space = true;
+ vis = haveIconFonts ? QString(QChar(0xe98e)) : QStringLiteral("#");
+ addSpace = true;
break;
case MClassMember::VISIBILITY_PRIVATE:
- vis = have_icon_fonts ? QString(QChar(0xe98f)) : QStringLiteral("-");
- add_space = true;
+ vis = haveIconFonts ? QString(QChar(0xe98f)) : QStringLiteral("-");
+ addSpace = true;
break;
case MClassMember::VISIBILITY_SIGNALS:
- vis = have_icon_fonts ? QString(QChar(0xe994)) : QStringLiteral(">");
- have_signal = true;
- add_space = true;
+ vis = haveIconFonts ? QString(QChar(0xe994)) : QStringLiteral(">");
+ haveSignal = true;
+ addSpace = true;
break;
case MClassMember::VISIBILITY_PRIVATE_SLOTS:
- vis = have_icon_fonts ? QString(QChar(0xe98f)) + QChar(0xe9cb)
+ vis = haveIconFonts ? QString(QChar(0xe98f)) + QChar(0xe9cb)
: QStringLiteral("-$");
- have_slot = true;
- add_space = true;
+ haveSlot = true;
+ addSpace = true;
break;
case MClassMember::VISIBILITY_PROTECTED_SLOTS:
- vis = have_icon_fonts ? QString(QChar(0xe98e)) + QChar(0xe9cb)
+ vis = haveIconFonts ? QString(QChar(0xe98e)) + QChar(0xe9cb)
: QStringLiteral("#$");
- have_slot = true;
- add_space = true;
+ haveSlot = true;
+ addSpace = true;
break;
case MClassMember::VISIBILITY_PUBLIC_SLOTS:
- vis = have_icon_fonts ? QString(QChar(0xe990)) + QChar(0xe9cb)
+ vis = haveIconFonts ? QString(QChar(0xe990)) + QChar(0xe9cb)
: QStringLiteral("+$");
- have_slot = true;
- add_space = true;
+ haveSlot = true;
+ addSpace = true;
break;
}
*text += vis;
}
}
- if (member.getProperties() & MClassMember::PROPERTY_QSIGNAL && !have_signal) {
- *text += have_icon_fonts ? QString(QChar(0xe994)) : QStringLiteral(">");
- add_space = true;
+ if (member.getProperties() & MClassMember::PROPERTY_QSIGNAL && !haveSignal) {
+ *text += haveIconFonts ? QString(QChar(0xe994)) : QStringLiteral(">");
+ addSpace = true;
}
- if (member.getProperties() & MClassMember::PROPERTY_QSLOT && !have_slot) {
- *text += have_icon_fonts ? QString(QChar(0xe9cb)) : QStringLiteral("$");
- add_space = true;
+ if (member.getProperties() & MClassMember::PROPERTY_QSLOT && !haveSlot) {
+ *text += haveIconFonts ? QString(QChar(0xe9cb)) : QStringLiteral("$");
+ addSpace = true;
}
- if (add_space) {
+ if (addSpace) {
*text += QStringLiteral(" ");
}
if (member.getProperties() & MClassMember::PROPERTY_QINVOKABLE) {
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.h
index 7fd1aef7caa7bbab1d5b2eae6f5c8fe2eee5d3ed..f5d8a26034f95bc5a8cf3b78d9b5a49223bf7d2f 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/classitem.h
@@ -58,7 +58,7 @@ class ClassItem :
public IRelationable
{
public:
- ClassItem(DClass *klass, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent = 0);
+ ClassItem(DClass *klass, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
~ClassItem();
@@ -68,7 +68,7 @@ public:
public:
- bool intersectShapeWithLine(const QLineF &line, QPointF *intersection_point, QLineF *intersection_line) const;
+ bool intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const;
public:
@@ -78,7 +78,7 @@ public:
QPointF getRelationStartPos() const;
- void relationDrawn(const QString &id, const QPointF &to_scene_pos, const QList<QPointF> &intermediate_points);
+ void relationDrawn(const QString &id, const QPointF &toScenePos, const QList<QPointF> &intermediatePoints);
protected:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.cpp
index a09772f94ae936cb2d8e6861e1d2845d713d7809..9edded482118536f2826f6523b7430d7a51afd89 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.cpp
@@ -66,8 +66,8 @@ static const qreal BODY_VERT_BORDER = 4.0;
static const qreal BODY_HORIZ_BORDER = 4.0;
-ComponentItem::ComponentItem(DComponent *component, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent)
- : ObjectItem(component, diagram_scene_model, parent),
+ComponentItem::ComponentItem(DComponent *component, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent)
+ : ObjectItem(component, diagramSceneModel, parent),
m_customIcon(0),
m_shape(0),
m_upperRect(0),
@@ -107,7 +107,7 @@ void ComponentItem::update()
}
// shape
- bool delete_rects = false;
+ bool deleteRects = false;
if (!m_customIcon) {
if (!m_shape) {
m_shape = new QGraphicsRectItem(this);
@@ -129,17 +129,17 @@ void ComponentItem::update()
m_lowerRect->setPen(style->getOuterLinePen());
m_lowerRect->setZValue(SHAPE_DETAILS_ZVALUE);
} else {
- delete_rects = true;
+ deleteRects = true;
}
} else {
- delete_rects = true;
+ deleteRects = true;
if (m_shape) {
m_shape->scene()->removeItem(m_shape);
delete m_shape;
m_shape = 0;
}
}
- if (delete_rects) {
+ if (deleteRects) {
if (m_lowerRect) {
m_lowerRect->scene()->removeItem(m_lowerRect);
delete m_lowerRect;
@@ -200,11 +200,11 @@ void ComponentItem::update()
updateGeometry();
}
-bool ComponentItem::intersectShapeWithLine(const QLineF &line, QPointF *intersection_point, QLineF *intersection_line) const
+bool ComponentItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
{
QPolygonF polygon;
if (m_customIcon) {
- // TODO use custom_icon path as shape
+ // TODO use customIcon path as shape
QRectF rect = getObject()->getRect();
rect.translate(getObject()->getPos());
polygon << rect.topLeft() << rect.topRight() << rect.bottomRight() << rect.bottomLeft() << rect.topLeft();
@@ -225,7 +225,7 @@ bool ComponentItem::intersectShapeWithLine(const QLineF &line, QPointF *intersec
<< rect.bottomLeft() + QPointF(0, UPPER_RECT_Y)
<< rect.topLeft();
}
- return GeometryUtilities::intersect(polygon, line, intersection_point, intersection_line);
+ return GeometryUtilities::intersect(polygon, line, intersectionPoint, intersectionLine);
}
QSizeF ComponentItem::getMinimumSize() const
@@ -233,14 +233,14 @@ QSizeF ComponentItem::getMinimumSize() const
return calcMinimumGeometry();
}
-QList<ILatchable::Latch> ComponentItem::getHorizontalLatches(ILatchable::Action action, bool grabbed_item) const
+QList<ILatchable::Latch> ComponentItem::getHorizontalLatches(ILatchable::Action action, bool grabbedItem) const
{
- return ObjectItem::getHorizontalLatches(action, grabbed_item);
+ return ObjectItem::getHorizontalLatches(action, grabbedItem);
}
-QList<ILatchable::Latch> ComponentItem::getVerticalLatches(ILatchable::Action action, bool grabbed_item) const
+QList<ILatchable::Latch> ComponentItem::getVerticalLatches(ILatchable::Action action, bool grabbedItem) const
{
- return ObjectItem::getVerticalLatches(action, grabbed_item);
+ return ObjectItem::getVerticalLatches(action, grabbedItem);
}
#if 0
@@ -264,14 +264,14 @@ QPointF ComponentItem::getRelationStartPos() const
return pos();
}
-void ComponentItem::relationDrawn(const QString &id, const QPointF &to_scene_pos, const QList<QPointF> &intermediate_points)
+void ComponentItem::relationDrawn(const QString &id, const QPointF &toScenePos, const QList<QPointF> &intermediatePoints)
{
- DElement *target_element = getDiagramSceneModel()->findTopmostElement(to_scene_pos);
- if (target_element) {
+ DElement *targetElement = getDiagramSceneModel()->findTopmostElement(toScenePos);
+ if (targetElement) {
if (id == QStringLiteral("dependency")) {
- DObject *dependant_object = dynamic_cast<DObject *>(target_element);
- if (dependant_object) {
- getDiagramSceneModel()->getDiagramSceneController()->createDependency(getObject(), dependant_object, intermediate_points, getDiagramSceneModel()->getDiagram());
+ DObject *dependantObject = dynamic_cast<DObject *>(targetElement);
+ if (dependantObject) {
+ getDiagramSceneModel()->getDiagramSceneController()->createDependency(getObject(), dependantObject, intermediatePoints, getDiagramSceneModel()->getDiagram());
}
}
}
@@ -279,9 +279,9 @@ void ComponentItem::relationDrawn(const QString &id, const QPointF &to_scene_pos
bool ComponentItem::hasPlainShape() const
{
- DComponent *diagram_component = dynamic_cast<DComponent *>(getObject());
- QMT_CHECK(diagram_component);
- return diagram_component->getPlainShape();
+ DComponent *diagramComponent = dynamic_cast<DComponent *>(getObject());
+ QMT_CHECK(diagramComponent);
+ return diagramComponent->getPlainShape();
}
QSizeF ComponentItem::calcMinimumGeometry() const
@@ -294,13 +294,13 @@ QSizeF ComponentItem::calcMinimumGeometry() const
}
height += BODY_VERT_BORDER;
- if (CustomIconItem *stereotype_icon_item = getStereotypeIconItem()) {
- width = std::max(width, stereotype_icon_item->boundingRect().width());
- height += stereotype_icon_item->boundingRect().height();
+ if (CustomIconItem *stereotypeIconItem = getStereotypeIconItem()) {
+ width = std::max(width, stereotypeIconItem->boundingRect().width());
+ height += stereotypeIconItem->boundingRect().height();
}
- if (StereotypesItem *stereotypes_item = getStereotypesItem()) {
- width = std::max(width, stereotypes_item->boundingRect().width());
- height += stereotypes_item->boundingRect().height();
+ if (StereotypesItem *stereotypesItem = getStereotypesItem()) {
+ width = std::max(width, stereotypesItem->boundingRect().width());
+ height += stereotypesItem->boundingRect().height();
}
if (m_componentName) {
width = std::max(width, m_componentName->boundingRect().width());
@@ -313,9 +313,9 @@ QSizeF ComponentItem::calcMinimumGeometry() const
if (!hasPlainShape()) {
width = RECT_WIDTH * 0.5 + BODY_HORIZ_BORDER + width + BODY_HORIZ_BORDER + RECT_WIDTH * 0.5;
- double min_height = UPPER_RECT_Y + RECT_HEIGHT + RECT_Y_DISTANCE + RECT_HEIGHT + LOWER_RECT_MIN_Y;
- if (height < min_height) {
- height = min_height;
+ double minHeight = UPPER_RECT_Y + RECT_HEIGHT + RECT_Y_DISTANCE + RECT_HEIGHT + LOWER_RECT_MIN_Y;
+ if (height < minHeight) {
+ height = minHeight;
}
} else {
width = BODY_HORIZ_BORDER + width + BODY_HORIZ_BORDER;
@@ -375,25 +375,25 @@ void ComponentItem::updateGeometry()
}
if (m_upperRect) {
- QRectF upper_rect(0, 0, RECT_WIDTH, RECT_HEIGHT);
- m_upperRect->setRect(upper_rect);
+ QRectF upperRect(0, 0, RECT_WIDTH, RECT_HEIGHT);
+ m_upperRect->setRect(upperRect);
m_upperRect->setPos(left - RECT_WIDTH * 0.5, top + UPPER_RECT_Y);
}
if (m_lowerRect) {
- QRectF lower_rect(0, 0, RECT_WIDTH, RECT_HEIGHT);
- m_lowerRect->setRect(lower_rect);
+ QRectF lowerRect(0, 0, RECT_WIDTH, RECT_HEIGHT);
+ m_lowerRect->setRect(lowerRect);
m_lowerRect->setPos(left - RECT_WIDTH * 0.5, top + UPPER_RECT_Y + RECT_HEIGHT + RECT_Y_DISTANCE);
}
y += BODY_VERT_BORDER;
- if (CustomIconItem *stereotype_icon_item = getStereotypeIconItem()) {
- stereotype_icon_item->setPos(right - stereotype_icon_item->boundingRect().width() - BODY_HORIZ_BORDER, y);
- y += stereotype_icon_item->boundingRect().height();
+ if (CustomIconItem *stereotypeIconItem = getStereotypeIconItem()) {
+ stereotypeIconItem->setPos(right - stereotypeIconItem->boundingRect().width() - BODY_HORIZ_BORDER, y);
+ y += stereotypeIconItem->boundingRect().height();
}
- if (StereotypesItem *stereotypes_item = getStereotypesItem()) {
- stereotypes_item->setPos(-stereotypes_item->boundingRect().width() / 2.0, y);
- y += stereotypes_item->boundingRect().height();
+ if (StereotypesItem *stereotypesItem = getStereotypesItem()) {
+ stereotypesItem->setPos(-stereotypesItem->boundingRect().width() / 2.0, y);
+ y += stereotypesItem->boundingRect().height();
}
if (m_componentName) {
m_componentName->setPos(-m_componentName->boundingRect().width() / 2.0, y);
@@ -403,8 +403,8 @@ void ComponentItem::updateGeometry()
if (m_customIcon) {
m_contextLabel->resetMaxWidth();
} else {
- double max_context_width = width - 2 * BODY_HORIZ_BORDER - (hasPlainShape() ? 0 : RECT_WIDTH);
- m_contextLabel->setMaxWidth(max_context_width);
+ double maxContextWidth = width - 2 * BODY_HORIZ_BORDER - (hasPlainShape() ? 0 : RECT_WIDTH);
+ m_contextLabel->setMaxWidth(maxContextWidth);
}
m_contextLabel->setPos(-m_contextLabel->boundingRect().width() / 2.0, y);
y += m_contextLabel->boundingRect().height();
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.h
index fecaebb6b0cf0c164d8815355d223a27ae81156d..80894255e57468b2054c6d1e6ea935972aad5f9e 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/componentitem.h
@@ -56,7 +56,7 @@ class ComponentItem :
public IRelationable
{
public:
- ComponentItem(DComponent *component, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent = 0);
+ ComponentItem(DComponent *component, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
~ComponentItem();
@@ -66,7 +66,7 @@ public:
public:
- bool intersectShapeWithLine(const QLineF &line, QPointF *intersection_point, QLineF *intersection_line) const;
+ bool intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const;
public:
@@ -74,15 +74,15 @@ public:
public:
- QList<Latch> getHorizontalLatches(Action action, bool grabbed_item) const;
+ QList<Latch> getHorizontalLatches(Action action, bool grabbedItem) const;
- QList<Latch> getVerticalLatches(Action action, bool grabbed_item) const;
+ QList<Latch> getVerticalLatches(Action action, bool grabbedItem) const;
public:
QPointF getRelationStartPos() const;
- void relationDrawn(const QString &id, const QPointF &to_scene_pos, const QList<QPointF> &intermediate_points);
+ void relationDrawn(const QString &id, const QPointF &toScenePos, const QList<QPointF> &intermediatePoints);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/diagramitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/diagramitem.cpp
index 6bf156678dc0509b898aca3c390ec99508323dbd..3655efcfb4760837ced26cc13869fb5cac1bbf9f 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/diagramitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/diagramitem.cpp
@@ -59,8 +59,8 @@ static const qreal BODY_HORIZ_BORDER = 4.0;
static const qreal BODY_VERT_BORDER = 4.0;
-DiagramItem::DiagramItem(DDiagram *diagram, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent)
- : ObjectItem(diagram, diagram_scene_model, parent),
+DiagramItem::DiagramItem(DDiagram *diagram, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent)
+ : ObjectItem(diagram, diagramSceneModel, parent),
m_customIcon(0),
m_body(0),
m_fold(0),
@@ -141,11 +141,11 @@ void DiagramItem::update()
updateGeometry();
}
-bool DiagramItem::intersectShapeWithLine(const QLineF &line, QPointF *intersection_point, QLineF *intersection_line) const
+bool DiagramItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
{
QPolygonF polygon;
if (m_customIcon) {
- // TODO use custom_icon path as shape
+ // TODO use customIcon path as shape
QRectF rect = getObject()->getRect();
rect.translate(getObject()->getPos());
polygon << rect.topLeft() << rect.topRight() << rect.bottomRight() << rect.bottomLeft() << rect.topLeft();
@@ -154,7 +154,7 @@ bool DiagramItem::intersectShapeWithLine(const QLineF &line, QPointF *intersecti
rect.translate(getObject()->getPos());
polygon << rect.topLeft() << rect.topRight() << rect.bottomRight() << rect.bottomLeft() << rect.topLeft();
}
- return GeometryUtilities::intersect(polygon, line, intersection_point, intersection_line);
+ return GeometryUtilities::intersect(polygon, line, intersectionPoint, intersectionLine);
}
QSizeF DiagramItem::getMinimumSize() const
@@ -172,15 +172,15 @@ QSizeF DiagramItem::calcMinimumGeometry() const
}
height += BODY_VERT_BORDER;
- if (CustomIconItem *stereotype_icon_item = getStereotypeIconItem()) {
- width = std::max(width, stereotype_icon_item->boundingRect().width() + 2 * BODY_HORIZ_BORDER);
- height += std::max(FOLD_HEIGHT, stereotype_icon_item->boundingRect().height());
+ if (CustomIconItem *stereotypeIconItem = getStereotypeIconItem()) {
+ width = std::max(width, stereotypeIconItem->boundingRect().width() + 2 * BODY_HORIZ_BORDER);
+ height += std::max(FOLD_HEIGHT, stereotypeIconItem->boundingRect().height());
} else {
height += FOLD_HEIGHT;
}
- if (StereotypesItem *stereotypes_item = getStereotypesItem()) {
- width = std::max(width, stereotypes_item->boundingRect().width() + 2 * BODY_HORIZ_BORDER);
- height += stereotypes_item->boundingRect().height();
+ if (StereotypesItem *stereotypesItem = getStereotypesItem()) {
+ width = std::max(width, stereotypesItem->boundingRect().width() + 2 * BODY_HORIZ_BORDER);
+ height += stereotypesItem->boundingRect().height();
}
if (m_diagramName) {
width = std::max(width, m_diagramName->boundingRect().width() + 2 * BODY_HORIZ_BORDER);
@@ -245,36 +245,36 @@ void DiagramItem::updateGeometry()
}
if (m_body) {
- QPolygonF body_polygon;
- body_polygon
+ QPolygonF bodyPolygon;
+ bodyPolygon
<< rect.topLeft()
<< rect.topRight() + QPointF(-FOLD_WIDTH, 0.0)
<< rect.topRight() + QPointF(0.0, FOLD_HEIGHT)
<< rect.bottomRight()
<< rect.bottomLeft();
- m_body->setPolygon(body_polygon);
+ m_body->setPolygon(bodyPolygon);
}
if (m_fold) {
- QPolygonF fold_polygon;
- fold_polygon
+ QPolygonF foldPolygon;
+ foldPolygon
<< rect.topRight() + QPointF(-FOLD_WIDTH, 0.0)
<< rect.topRight() + QPointF(0.0, FOLD_HEIGHT)
<< rect.topRight() + QPointF(-FOLD_WIDTH, FOLD_HEIGHT);
- m_fold->setPolygon(fold_polygon);
+ m_fold->setPolygon(foldPolygon);
}
y += BODY_VERT_BORDER;
if (!m_customIcon) {
- if (CustomIconItem *stereotype_icon_item = getStereotypeIconItem()) {
- stereotype_icon_item->setPos(left + BODY_HORIZ_BORDER, y);
- y += std::max(FOLD_HEIGHT, stereotype_icon_item->boundingRect().height());
+ if (CustomIconItem *stereotypeIconItem = getStereotypeIconItem()) {
+ stereotypeIconItem->setPos(left + BODY_HORIZ_BORDER, y);
+ y += std::max(FOLD_HEIGHT, stereotypeIconItem->boundingRect().height());
} else {
y += FOLD_HEIGHT;
}
}
- if (StereotypesItem *stereotypes_item = getStereotypesItem()) {
- stereotypes_item->setPos(-stereotypes_item->boundingRect().width() / 2.0, y);
- y += stereotypes_item->boundingRect().height();
+ if (StereotypesItem *stereotypesItem = getStereotypesItem()) {
+ stereotypesItem->setPos(-stereotypesItem->boundingRect().width() / 2.0, y);
+ y += stereotypesItem->boundingRect().height();
}
if (m_diagramName) {
m_diagramName->setPos(-m_diagramName->boundingRect().width() / 2.0, y);
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/diagramitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/diagramitem.h
index 3737263602ab6912d996045dc319a428252ed2f8..c0b538c242d3a1feccabd1d4b3c5e52e15251068 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/diagramitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/diagramitem.h
@@ -45,7 +45,7 @@ class DiagramItem :
public ObjectItem
{
public:
- explicit DiagramItem(DDiagram *diagram, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent = 0);
+ explicit DiagramItem(DDiagram *diagram, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
~DiagramItem();
@@ -55,7 +55,7 @@ public:
public:
- bool intersectShapeWithLine(const QLineF &line, QPointF *intersection_point, QLineF *intersection_line) const;
+ bool intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const;
public:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.cpp
index cd3977bfc340a8dfab468166130331e329a672be..05ae8d8380cc296290e9ffc0fe590a311cb17810 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.cpp
@@ -61,8 +61,8 @@ static const qreal BODY_VERT_BORDER = 4.0;
static const qreal BODY_HORIZ_BORDER = 4.0;
-ItemItem::ItemItem(DItem *item, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent)
- : ObjectItem(item, diagram_scene_model, parent),
+ItemItem::ItemItem(DItem *item, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent)
+ : ObjectItem(item, diagramSceneModel, parent),
m_customIcon(0),
m_shape(0),
m_itemName(0),
@@ -81,9 +81,9 @@ void ItemItem::update()
updateStereotypeIconDisplay();
- DItem *diagram_item = dynamic_cast<DItem *>(getObject());
- Q_UNUSED(diagram_item); // avoid warning about unsed variable
- QMT_CHECK(diagram_item);
+ DItem *diagramItem = dynamic_cast<DItem *>(getObject());
+ Q_UNUSED(diagramItem); // avoid warning about unsed variable
+ QMT_CHECK(diagramItem);
const Style *style = getAdaptedStyle(getShapeIconId());
@@ -166,11 +166,11 @@ void ItemItem::update()
updateGeometry();
}
-bool ItemItem::intersectShapeWithLine(const QLineF &line, QPointF *intersection_point, QLineF *intersection_line) const
+bool ItemItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
{
QPolygonF polygon;
if (m_customIcon) {
- // TODO use custom_icon path as shape
+ // TODO use customIcon path as shape
QRectF rect = getObject()->getRect();
rect.translate(getObject()->getPos());
polygon << rect.topLeft() << rect.topRight() << rect.bottomRight() << rect.bottomLeft() << rect.topLeft();
@@ -179,7 +179,7 @@ bool ItemItem::intersectShapeWithLine(const QLineF &line, QPointF *intersection_
rect.translate(getObject()->getPos());
polygon << rect.topLeft() << rect.topRight() << rect.bottomRight() << rect.bottomLeft() << rect.topLeft();
}
- return GeometryUtilities::intersect(polygon, line, intersection_point, intersection_line);
+ return GeometryUtilities::intersect(polygon, line, intersectionPoint, intersectionLine);
}
QSizeF ItemItem::getMinimumSize() const
@@ -187,14 +187,14 @@ QSizeF ItemItem::getMinimumSize() const
return calcMinimumGeometry();
}
-QList<ILatchable::Latch> ItemItem::getHorizontalLatches(ILatchable::Action action, bool grabbed_item) const
+QList<ILatchable::Latch> ItemItem::getHorizontalLatches(ILatchable::Action action, bool grabbedItem) const
{
- return ObjectItem::getHorizontalLatches(action, grabbed_item);
+ return ObjectItem::getHorizontalLatches(action, grabbedItem);
}
-QList<ILatchable::Latch> ItemItem::getVerticalLatches(ILatchable::Action action, bool grabbed_item) const
+QList<ILatchable::Latch> ItemItem::getVerticalLatches(ILatchable::Action action, bool grabbedItem) const
{
- return ObjectItem::getVerticalLatches(action, grabbed_item);
+ return ObjectItem::getVerticalLatches(action, grabbedItem);
}
QPointF ItemItem::getRelationStartPos() const
@@ -202,14 +202,14 @@ QPointF ItemItem::getRelationStartPos() const
return pos();
}
-void ItemItem::relationDrawn(const QString &id, const QPointF &to_scene_pos, const QList<QPointF> &intermediate_points)
+void ItemItem::relationDrawn(const QString &id, const QPointF &toScenePos, const QList<QPointF> &intermediatePoints)
{
- DElement *target_element = getDiagramSceneModel()->findTopmostElement(to_scene_pos);
- if (target_element) {
+ DElement *targetElement = getDiagramSceneModel()->findTopmostElement(toScenePos);
+ if (targetElement) {
if (id == QStringLiteral("dependency")) {
- DObject *dependant_object = dynamic_cast<DObject *>(target_element);
- if (dependant_object) {
- getDiagramSceneModel()->getDiagramSceneController()->createDependency(getObject(), dependant_object, intermediate_points, getDiagramSceneModel()->getDiagram());
+ DObject *dependantObject = dynamic_cast<DObject *>(targetElement);
+ if (dependantObject) {
+ getDiagramSceneModel()->getDiagramSceneController()->createDependency(getObject(), dependantObject, intermediatePoints, getDiagramSceneModel()->getDiagram());
}
}
}
@@ -225,13 +225,13 @@ QSizeF ItemItem::calcMinimumGeometry() const
}
height += BODY_VERT_BORDER;
- if (CustomIconItem *stereotype_icon_item = getStereotypeIconItem()) {
- width = std::max(width, stereotype_icon_item->boundingRect().width());
- height += stereotype_icon_item->boundingRect().height();
+ if (CustomIconItem *stereotypeIconItem = getStereotypeIconItem()) {
+ width = std::max(width, stereotypeIconItem->boundingRect().width());
+ height += stereotypeIconItem->boundingRect().height();
}
- if (StereotypesItem *stereotypes_item = getStereotypesItem()) {
- width = std::max(width, stereotypes_item->boundingRect().width());
- height += stereotypes_item->boundingRect().height();
+ if (StereotypesItem *stereotypesItem = getStereotypesItem()) {
+ width = std::max(width, stereotypesItem->boundingRect().width());
+ height += stereotypesItem->boundingRect().height();
}
if (m_itemName) {
width = std::max(width, m_itemName->boundingRect().width());
@@ -298,13 +298,13 @@ void ItemItem::updateGeometry()
}
y += BODY_VERT_BORDER;
- if (CustomIconItem *stereotype_icon_item = getStereotypeIconItem()) {
- stereotype_icon_item->setPos(right - stereotype_icon_item->boundingRect().width() - BODY_HORIZ_BORDER, y);
- y += stereotype_icon_item->boundingRect().height();
+ if (CustomIconItem *stereotypeIconItem = getStereotypeIconItem()) {
+ stereotypeIconItem->setPos(right - stereotypeIconItem->boundingRect().width() - BODY_HORIZ_BORDER, y);
+ y += stereotypeIconItem->boundingRect().height();
}
- if (StereotypesItem *stereotypes_item = getStereotypesItem()) {
- stereotypes_item->setPos(-stereotypes_item->boundingRect().width() / 2.0, y);
- y += stereotypes_item->boundingRect().height();
+ if (StereotypesItem *stereotypesItem = getStereotypesItem()) {
+ stereotypesItem->setPos(-stereotypesItem->boundingRect().width() / 2.0, y);
+ y += stereotypesItem->boundingRect().height();
}
if (m_itemName) {
m_itemName->setPos(-m_itemName->boundingRect().width() / 2.0, y);
@@ -314,8 +314,8 @@ void ItemItem::updateGeometry()
if (m_customIcon) {
m_contextLabel->resetMaxWidth();
} else {
- double max_context_width = width - 2 * BODY_HORIZ_BORDER;
- m_contextLabel->setMaxWidth(max_context_width);
+ double maxContextWidth = width - 2 * BODY_HORIZ_BORDER;
+ m_contextLabel->setMaxWidth(maxContextWidth);
}
m_contextLabel->setPos(-m_contextLabel->boundingRect().width() / 2.0, y);
y += m_contextLabel->boundingRect().height();
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.h
index 4f8e9b15612e4f3ced844e47734ef2535fc67e39..b5d548c02c22944c3828dfcb2fe2cccc3396dcaf 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/itemitem.h
@@ -56,7 +56,7 @@ class ItemItem :
public IRelationable
{
public:
- ItemItem(DItem *item, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent = 0);
+ ItemItem(DItem *item, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
~ItemItem();
@@ -66,7 +66,7 @@ public:
public:
- bool intersectShapeWithLine(const QLineF &line, QPointF *intersection_point, QLineF *intersection_line) const;
+ bool intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const;
public:
@@ -74,15 +74,15 @@ public:
public:
- QList<Latch> getHorizontalLatches(Action action, bool grabbed_item) const;
+ QList<Latch> getHorizontalLatches(Action action, bool grabbedItem) const;
- QList<Latch> getVerticalLatches(Action action, bool grabbed_item) const;
+ QList<Latch> getVerticalLatches(Action action, bool grabbedItem) const;
public:
QPointF getRelationStartPos() const;
- void relationDrawn(const QString &id, const QPointF &to_scene_pos, const QList<QPointF> &intermediate_points);
+ void relationDrawn(const QString &id, const QPointF &toScenePos, const QList<QPointF> &intermediatePoints);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.cpp
index 11bcb3e389c44b186d179a514beb41c3e809a256..1b353339db0d8f8e43140d91705ebc5f8b3286cd 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.cpp
@@ -62,10 +62,10 @@
namespace qmt {
-ObjectItem::ObjectItem(DObject *object, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent)
+ObjectItem::ObjectItem(DObject *object, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent)
: QGraphicsItem(parent),
m_object(object),
- m_diagramSceneModel(diagram_scene_model),
+ m_diagramSceneModel(diagramSceneModel),
m_secondarySelected(false),
m_focusSelected(false),
m_stereotypeIconDisplay(StereotypeIcon::DISPLAY_LABEL),
@@ -104,69 +104,69 @@ QRectF ObjectItem::getRect() const
return m_object->getRect();
}
-void ObjectItem::setPosAndRect(const QPointF &original_pos, const QRectF &original_rect, const QPointF &top_left_delta, const QPointF &bottom_right_delta)
+void ObjectItem::setPosAndRect(const QPointF &originalPos, const QRectF &originalRect, const QPointF &topLeftDelta, const QPointF &bottomRightDelta)
{
- QPointF new_pos = original_pos;
- QRectF new_rect = original_rect;
- GeometryUtilities::adjustPosAndRect(&new_pos, &new_rect, top_left_delta, bottom_right_delta, QPointF(0.5, 0.5));
- if (new_pos != m_object->getPos() || new_rect != m_object->getRect()) {
+ QPointF newPos = originalPos;
+ QRectF newRect = originalRect;
+ GeometryUtilities::adjustPosAndRect(&newPos, &newRect, topLeftDelta, bottomRightDelta, QPointF(0.5, 0.5));
+ if (newPos != m_object->getPos() || newRect != m_object->getRect()) {
m_diagramSceneModel->getDiagramController()->startUpdateElement(m_object, m_diagramSceneModel->getDiagram(), DiagramController::UPDATE_GEOMETRY);
- m_object->setPos(new_pos);
- if (new_rect.size() != m_object->getRect().size()) {
+ m_object->setPos(newPos);
+ if (newRect.size() != m_object->getRect().size()) {
m_object->setAutoSize(false);
}
- m_object->setRect(new_rect);
+ m_object->setRect(newRect);
m_diagramSceneModel->getDiagramController()->finishUpdateElement(m_object, m_diagramSceneModel->getDiagram(), false);
}
}
-void ObjectItem::alignItemSizeToRaster(IResizable::Side adjust_horizontal_side, IResizable::Side adjust_vertical_side, double raster_width, double raster_height)
+void ObjectItem::alignItemSizeToRaster(IResizable::Side adjustHorizontalSide, IResizable::Side adjustVerticalSide, double rasterWidth, double rasterHeight)
{
QPointF pos = m_object->getPos();
QRectF rect = m_object->getRect();
- double horiz_delta = rect.width() - qRound(rect.width() / raster_width) * raster_width;
- double vert_delta = rect.height() - qRound(rect.height() / raster_height) * raster_height;
+ double horizDelta = rect.width() - qRound(rect.width() / rasterWidth) * rasterWidth;
+ double vertDelta = rect.height() - qRound(rect.height() / rasterHeight) * rasterHeight;
// make sure the new size is at least the minimum size
- QSizeF minimum_size = getMinimumSize();
- while (rect.width() + horiz_delta < minimum_size.width()) {
- horiz_delta += raster_width;
+ QSizeF minimumSize = getMinimumSize();
+ while (rect.width() + horizDelta < minimumSize.width()) {
+ horizDelta += rasterWidth;
}
- while (rect.height() + vert_delta < minimum_size.height()) {
- vert_delta += raster_height;
+ while (rect.height() + vertDelta < minimumSize.height()) {
+ vertDelta += rasterHeight;
}
- double left_delta = 0.0;
- double right_delta = 0.0;
- double top_delta = 0.0;
- double bottom_delta = 0.0;
+ double leftDelta = 0.0;
+ double rightDelta = 0.0;
+ double topDelta = 0.0;
+ double bottomDelta = 0.0;
- switch (adjust_horizontal_side) {
+ switch (adjustHorizontalSide) {
case IResizable::SIDE_NONE:
break;
case IResizable::SIDE_LEFT_OR_TOP:
- left_delta = horiz_delta;
+ leftDelta = horizDelta;
break;
case IResizable::SIDE_RIGHT_OR_BOTTOM:
- right_delta = -horiz_delta;
+ rightDelta = -horizDelta;
break;
}
- switch (adjust_vertical_side) {
+ switch (adjustVerticalSide) {
case IResizable::SIDE_NONE:
break;
case IResizable::SIDE_LEFT_OR_TOP:
- top_delta = vert_delta;
+ topDelta = vertDelta;
break;
case IResizable::SIDE_RIGHT_OR_BOTTOM:
- bottom_delta = -vert_delta;
+ bottomDelta = -vertDelta;
break;
}
- QPointF top_left_delta(left_delta, top_delta);
- QPointF bottom_right_delta(right_delta, bottom_delta);
- setPosAndRect(pos, rect, top_left_delta, bottom_right_delta);
+ QPointF topLeftDelta(leftDelta, topDelta);
+ QPointF bottomRightDelta(rightDelta, bottomDelta);
+ setPosAndRect(pos, rect, topLeftDelta, bottomRightDelta);
}
void ObjectItem::moveDelta(const QPointF &delta)
@@ -176,17 +176,17 @@ void ObjectItem::moveDelta(const QPointF &delta)
m_diagramSceneModel->getDiagramController()->finishUpdateElement(m_object, m_diagramSceneModel->getDiagram(), false);
}
-void ObjectItem::alignItemPositionToRaster(double raster_width, double raster_height)
+void ObjectItem::alignItemPositionToRaster(double rasterWidth, double rasterHeight)
{
QPointF pos = m_object->getPos();
QRectF rect = m_object->getRect();
- QPointF top_left = pos + rect.topLeft();
+ QPointF topLeft = pos + rect.topLeft();
- double left_delta = qRound(top_left.x() / raster_width) * raster_width - top_left.x();
- double top_delta = qRound(top_left.y() / raster_height) * raster_height - top_left.y();
- QPointF top_left_delta(left_delta, top_delta);
+ double leftDelta = qRound(topLeft.x() / rasterWidth) * rasterWidth - topLeft.x();
+ double topDelta = qRound(topLeft.y() / rasterHeight) * rasterHeight - topLeft.y();
+ QPointF topLeftDelta(leftDelta, topDelta);
- setPosAndRect(pos, rect, top_left_delta, top_left_delta);
+ setPosAndRect(pos, rect, topLeftDelta, topLeftDelta);
}
bool ObjectItem::isSecondarySelected() const
@@ -194,10 +194,10 @@ bool ObjectItem::isSecondarySelected() const
return m_secondarySelected;
}
-void ObjectItem::setSecondarySelected(bool secondary_selected)
+void ObjectItem::setSecondarySelected(bool secondarySelected)
{
- if (m_secondarySelected != secondary_selected) {
- m_secondarySelected = secondary_selected;
+ if (m_secondarySelected != secondarySelected) {
+ m_secondarySelected = secondarySelected;
update();
}
}
@@ -207,17 +207,17 @@ bool ObjectItem::isFocusSelected() const
return m_focusSelected;
}
-void ObjectItem::setFocusSelected(bool focus_selected)
+void ObjectItem::setFocusSelected(bool focusSelected)
{
- if (m_focusSelected != focus_selected) {
- m_focusSelected = focus_selected;
+ if (m_focusSelected != focusSelected) {
+ m_focusSelected = focusSelected;
update();
}
}
-QList<ILatchable::Latch> ObjectItem::getHorizontalLatches(ILatchable::Action action, bool grabbed_item) const
+QList<ILatchable::Latch> ObjectItem::getHorizontalLatches(ILatchable::Action action, bool grabbedItem) const
{
- Q_UNUSED(grabbed_item);
+ Q_UNUSED(grabbedItem);
QRectF rect = getObject()->getRect();
rect.translate(getObject()->getPos());
@@ -244,9 +244,9 @@ QList<ILatchable::Latch> ObjectItem::getHorizontalLatches(ILatchable::Action act
return result;
}
-QList<ILatchable::Latch> ObjectItem::getVerticalLatches(ILatchable::Action action, bool grabbed_item) const
+QList<ILatchable::Latch> ObjectItem::getVerticalLatches(ILatchable::Action action, bool grabbedItem) const
{
- Q_UNUSED(grabbed_item);
+ Q_UNUSED(grabbedItem);
QRectF rect = getObject()->getRect();
rect.translate(getObject()->getPos());
@@ -273,13 +273,13 @@ QList<ILatchable::Latch> ObjectItem::getVerticalLatches(ILatchable::Action actio
return result;
}
-void ObjectItem::align(IAlignable::AlignType align_type, const QString &identifier)
+void ObjectItem::align(IAlignable::AlignType alignType, const QString &identifier)
{
Q_UNUSED(identifier); // avoid warning in release mode
// subclasses may support other identifiers than the standard ones.
// but this implementation does not. So assert the names.
- switch (align_type) {
+ switch (alignType) {
case IAlignable::ALIGN_LEFT:
QMT_CHECK(identifier == QStringLiteral("left"));
m_diagramSceneModel->getDiagramSceneController()->alignLeft(m_object, m_diagramSceneModel->getSelectedElements(), m_diagramSceneModel->getDiagram());
@@ -324,27 +324,27 @@ void ObjectItem::align(IAlignable::AlignType align_type, const QString &identifi
void ObjectItem::updateStereotypeIconDisplay()
{
- StereotypeDisplayVisitor stereotype_display_visitor;
- stereotype_display_visitor.setModelController(m_diagramSceneModel->getDiagramSceneController()->getModelController());
- stereotype_display_visitor.setStereotypeController(m_diagramSceneModel->getStereotypeController());
- m_object->accept(&stereotype_display_visitor);
- m_stereotypeIconId = stereotype_display_visitor.getStereotypeIconId();
- m_shapeIconId = stereotype_display_visitor.getShapeIconId();
- m_stereotypeIconDisplay = stereotype_display_visitor.getStereotypeIconDisplay();
+ StereotypeDisplayVisitor stereotypeDisplayVisitor;
+ stereotypeDisplayVisitor.setModelController(m_diagramSceneModel->getDiagramSceneController()->getModelController());
+ stereotypeDisplayVisitor.setStereotypeController(m_diagramSceneModel->getStereotypeController());
+ m_object->accept(&stereotypeDisplayVisitor);
+ m_stereotypeIconId = stereotypeDisplayVisitor.getStereotypeIconId();
+ m_shapeIconId = stereotypeDisplayVisitor.getShapeIconId();
+ m_stereotypeIconDisplay = stereotypeDisplayVisitor.getStereotypeIconDisplay();
}
-void ObjectItem::updateStereotypes(const QString &stereotype_icon_id, StereotypeIcon::Display stereotype_display, const Style *style)
+void ObjectItem::updateStereotypes(const QString &stereotypeIconId, StereotypeIcon::Display stereotypeDisplay, const Style *style)
{
QList<QString> stereotypes = m_object->getStereotypes();
- if (!stereotype_icon_id.isEmpty()
- && (stereotype_display == StereotypeIcon::DISPLAY_DECORATION || stereotype_display == StereotypeIcon::DISPLAY_ICON)) {
- stereotypes = m_diagramSceneModel->getStereotypeController()->filterStereotypesByIconId(stereotype_icon_id, stereotypes);
+ if (!stereotypeIconId.isEmpty()
+ && (stereotypeDisplay == StereotypeIcon::DISPLAY_DECORATION || stereotypeDisplay == StereotypeIcon::DISPLAY_ICON)) {
+ stereotypes = m_diagramSceneModel->getStereotypeController()->filterStereotypesByIconId(stereotypeIconId, stereotypes);
}
- if (!stereotype_icon_id.isEmpty() && stereotype_display == StereotypeIcon::DISPLAY_DECORATION) {
+ if (!stereotypeIconId.isEmpty() && stereotypeDisplay == StereotypeIcon::DISPLAY_DECORATION) {
if (!m_stereotypeIcon) {
m_stereotypeIcon = new CustomIconItem(m_diagramSceneModel, this);
}
- m_stereotypeIcon->setStereotypeIconId(stereotype_icon_id);
+ m_stereotypeIcon->setStereotypeIconId(stereotypeIconId);
m_stereotypeIcon->setBaseSize(QSizeF(m_stereotypeIcon->getShapeWidth(), m_stereotypeIcon->getShapeHeight()));
m_stereotypeIcon->setBrush(style->getFillBrush());
m_stereotypeIcon->setPen(style->getInnerLinePen());
@@ -353,7 +353,7 @@ void ObjectItem::updateStereotypes(const QString &stereotype_icon_id, Stereotype
delete m_stereotypeIcon;
m_stereotypeIcon = 0;
}
- if (stereotype_display != StereotypeIcon::DISPLAY_NONE && !stereotypes.isEmpty()) {
+ if (stereotypeDisplay != StereotypeIcon::DISPLAY_NONE && !stereotypes.isEmpty()) {
if (!m_stereotypes) {
m_stereotypes = new StereotypesItem(this);
}
@@ -367,42 +367,42 @@ void ObjectItem::updateStereotypes(const QString &stereotype_icon_id, Stereotype
}
}
-QSizeF ObjectItem::getStereotypeIconMinimumSize(const StereotypeIcon &stereotype_icon, qreal minimum_width, qreal minimum_height) const
+QSizeF ObjectItem::getStereotypeIconMinimumSize(const StereotypeIcon &stereotypeIcon, qreal minimumWidth, qreal minimumHeight) const
{
- Q_UNUSED(minimum_width);
+ Q_UNUSED(minimumWidth);
qreal width = 0.0;
qreal height = 0.0;
- if (stereotype_icon.hasMinWidth() && !stereotype_icon.hasMinHeight()) {
- width = stereotype_icon.getMinWidth();
- if (stereotype_icon.getSizeLock() == StereotypeIcon::LOCK_HEIGHT || stereotype_icon.getSizeLock() == StereotypeIcon::LOCK_SIZE) {
- height = stereotype_icon.getMinHeight();
+ if (stereotypeIcon.hasMinWidth() && !stereotypeIcon.hasMinHeight()) {
+ width = stereotypeIcon.getMinWidth();
+ if (stereotypeIcon.getSizeLock() == StereotypeIcon::LOCK_HEIGHT || stereotypeIcon.getSizeLock() == StereotypeIcon::LOCK_SIZE) {
+ height = stereotypeIcon.getMinHeight();
} else {
- height = width * stereotype_icon.getHeight() / stereotype_icon.getWidth();
+ height = width * stereotypeIcon.getHeight() / stereotypeIcon.getWidth();
}
- } else if (!stereotype_icon.hasMinWidth() && stereotype_icon.hasMinHeight()) {
- height = stereotype_icon.getMinHeight();
- if (stereotype_icon.getSizeLock() == StereotypeIcon::LOCK_WIDTH || stereotype_icon.getSizeLock() == StereotypeIcon::LOCK_SIZE) {
- width = stereotype_icon.getMinWidth();
+ } else if (!stereotypeIcon.hasMinWidth() && stereotypeIcon.hasMinHeight()) {
+ height = stereotypeIcon.getMinHeight();
+ if (stereotypeIcon.getSizeLock() == StereotypeIcon::LOCK_WIDTH || stereotypeIcon.getSizeLock() == StereotypeIcon::LOCK_SIZE) {
+ width = stereotypeIcon.getMinWidth();
} else {
- width = height * stereotype_icon.getWidth() / stereotype_icon.getHeight();
+ width = height * stereotypeIcon.getWidth() / stereotypeIcon.getHeight();
}
- } else if (stereotype_icon.hasMinWidth() && stereotype_icon.hasMinHeight()) {
- if (stereotype_icon.getSizeLock() == StereotypeIcon::LOCK_RATIO) {
- width = stereotype_icon.getMinWidth();
- height = width * stereotype_icon.getHeight() / stereotype_icon.getWidth();
- if (height < stereotype_icon.getMinHeight()) {
- height = stereotype_icon.getMinHeight();
- width = height * stereotype_icon.getWidth() / stereotype_icon.getHeight();
- QMT_CHECK(width <= stereotype_icon.getMinWidth());
+ } else if (stereotypeIcon.hasMinWidth() && stereotypeIcon.hasMinHeight()) {
+ if (stereotypeIcon.getSizeLock() == StereotypeIcon::LOCK_RATIO) {
+ width = stereotypeIcon.getMinWidth();
+ height = width * stereotypeIcon.getHeight() / stereotypeIcon.getWidth();
+ if (height < stereotypeIcon.getMinHeight()) {
+ height = stereotypeIcon.getMinHeight();
+ width = height * stereotypeIcon.getWidth() / stereotypeIcon.getHeight();
+ QMT_CHECK(width <= stereotypeIcon.getMinWidth());
}
} else {
- width = stereotype_icon.getMinWidth();
- height = stereotype_icon.getMinHeight();
+ width = stereotypeIcon.getMinWidth();
+ height = stereotypeIcon.getMinHeight();
}
} else {
- height = minimum_height;
- width = height * stereotype_icon.getWidth() / stereotype_icon.getHeight();
+ height = minimumHeight;
+ width = height * stereotypeIcon.getWidth() / stereotypeIcon.getHeight();
}
return QSizeF(width, height);
}
@@ -412,41 +412,41 @@ void ObjectItem::updateDepth()
setZValue(m_object->getDepth());
}
-void ObjectItem::updateSelectionMarker(CustomIconItem *custom_icon_item)
+void ObjectItem::updateSelectionMarker(CustomIconItem *customIconItem)
{
- if (custom_icon_item) {
- StereotypeIcon stereotype_icon = custom_icon_item->getStereotypeIcon();
- ResizeFlags resize_flags = RESIZE_UNLOCKED;
- switch (stereotype_icon.getSizeLock()) {
+ if (customIconItem) {
+ StereotypeIcon stereotypeIcon = customIconItem->getStereotypeIcon();
+ ResizeFlags resizeFlags = RESIZE_UNLOCKED;
+ switch (stereotypeIcon.getSizeLock()) {
case StereotypeIcon::LOCK_NONE:
- resize_flags = RESIZE_UNLOCKED;
+ resizeFlags = RESIZE_UNLOCKED;
break;
case StereotypeIcon::LOCK_WIDTH:
- resize_flags = RESIZE_LOCKED_WIDTH;
+ resizeFlags = RESIZE_LOCKED_WIDTH;
break;
case StereotypeIcon::LOCK_HEIGHT:
- resize_flags = RESIZE_LOCKED_HEIGHT;
+ resizeFlags = RESIZE_LOCKED_HEIGHT;
break;
case StereotypeIcon::LOCK_SIZE:
- resize_flags = RESIZE_LOCKED_SIZE;
+ resizeFlags = RESIZE_LOCKED_SIZE;
break;
case StereotypeIcon::LOCK_RATIO:
- resize_flags = RESIZE_LOCKED_RATIO;
+ resizeFlags = RESIZE_LOCKED_RATIO;
break;
}
- updateSelectionMarker(resize_flags);
+ updateSelectionMarker(resizeFlags);
} else {
updateSelectionMarker(RESIZE_UNLOCKED);
}
}
-void ObjectItem::updateSelectionMarker(ResizeFlags resize_flags)
+void ObjectItem::updateSelectionMarker(ResizeFlags resizeFlags)
{
- if ((isSelected() || isSecondarySelected()) && resize_flags != RESIZE_LOCKED_SIZE) {
+ if ((isSelected() || isSecondarySelected()) && resizeFlags != RESIZE_LOCKED_SIZE) {
if (!m_selectionMarker) {
m_selectionMarker = new RectangularSelectionItem(this, this);
}
- switch (resize_flags) {
+ switch (resizeFlags) {
case RESIZE_UNLOCKED:
m_selectionMarker->setFreedom(RectangularSelectionItem::FREEDOM_ANY);
break;
@@ -474,10 +474,10 @@ void ObjectItem::updateSelectionMarker(ResizeFlags resize_flags)
}
}
-void ObjectItem::updateSelectionMarkerGeometry(const QRectF &object_rect)
+void ObjectItem::updateSelectionMarkerGeometry(const QRectF &objectRect)
{
if (m_selectionMarker) {
- m_selectionMarker->setRect(object_rect);
+ m_selectionMarker->setRect(objectRect);
}
}
@@ -513,65 +513,65 @@ void ObjectItem::updateAlignmentButtons()
}
}
-void ObjectItem::updateAlignmentButtonsGeometry(const QRectF &object_rect)
+void ObjectItem::updateAlignmentButtonsGeometry(const QRectF &objectRect)
{
if (m_horizontalAlignButtons) {
m_horizontalAlignButtons->clear();
- m_horizontalAlignButtons->setPos(mapToScene(QPointF(0.0, object_rect.top() - AlignButtonsItem::NORMAL_BUTTON_HEIGHT - AlignButtonsItem::VERTICAL_DISTANCE_TO_OBEJCT)));
+ m_horizontalAlignButtons->setPos(mapToScene(QPointF(0.0, objectRect.top() - AlignButtonsItem::NORMAL_BUTTON_HEIGHT - AlignButtonsItem::VERTICAL_DISTANCE_TO_OBEJCT)));
foreach (const ILatchable::Latch &latch, getHorizontalLatches(ILatchable::MOVE, true)) {
m_horizontalAlignButtons->addButton(translateLatchTypeToAlignType(latch.m_latchType), latch.m_identifier, mapFromScene(QPointF(latch.m_pos, 0.0)).x());
}
}
if (m_verticalAlignButtons) {
m_verticalAlignButtons->clear();
- m_verticalAlignButtons->setPos(mapToScene(QPointF(object_rect.left() - AlignButtonsItem::NORMAL_BUTTON_WIDTH - AlignButtonsItem::HORIZONTAL_DISTANCE_TO_OBJECT, 0.0)));
+ m_verticalAlignButtons->setPos(mapToScene(QPointF(objectRect.left() - AlignButtonsItem::NORMAL_BUTTON_WIDTH - AlignButtonsItem::HORIZONTAL_DISTANCE_TO_OBJECT, 0.0)));
foreach (const ILatchable::Latch &latch, getVerticalLatches(ILatchable::MOVE, true)) {
m_verticalAlignButtons->addButton(translateLatchTypeToAlignType(latch.m_latchType), latch.m_identifier, mapFromScene(QPointF(0.0, latch.m_pos)).y());
}
}
}
-IAlignable::AlignType ObjectItem::translateLatchTypeToAlignType(ILatchable::LatchType latch_type)
+IAlignable::AlignType ObjectItem::translateLatchTypeToAlignType(ILatchable::LatchType latchType)
{
- IAlignable::AlignType align_type = IAlignable::ALIGN_LEFT;
- switch (latch_type) {
+ IAlignable::AlignType alignType = IAlignable::ALIGN_LEFT;
+ switch (latchType) {
case ILatchable::LEFT:
- align_type = IAlignable::ALIGN_LEFT;
+ alignType = IAlignable::ALIGN_LEFT;
break;
case ILatchable::TOP:
- align_type = IAlignable::ALIGN_TOP;
+ alignType = IAlignable::ALIGN_TOP;
break;
case ILatchable::RIGHT:
- align_type = IAlignable::ALIGN_RIGHT;
+ alignType = IAlignable::ALIGN_RIGHT;
break;
case ILatchable::BOTTOM:
- align_type = IAlignable::ALIGN_BOTTOM;
+ alignType = IAlignable::ALIGN_BOTTOM;
break;
case ILatchable::HCENTER:
- align_type = IAlignable::ALIGN_HCENTER;
+ alignType = IAlignable::ALIGN_HCENTER;
break;
case ILatchable::VCENTER:
- align_type = IAlignable::ALIGN_VCENTER;
+ alignType = IAlignable::ALIGN_VCENTER;
break;
case ILatchable::NONE:
QMT_CHECK(false);
break;
}
- return align_type;
+ return alignType;
}
-const Style *ObjectItem::getAdaptedStyle(const QString &stereotype_icon_id)
+const Style *ObjectItem::getAdaptedStyle(const QString &stereotypeIconId)
{
- QList<const DObject *> colliding_objects;
+ QList<const DObject *> collidingObjects;
foreach (const QGraphicsItem *item, m_diagramSceneModel->collectCollidingObjectItems(this, DiagramSceneModel::COLLIDING_ITEMS)) {
- if (const ObjectItem *object_item = dynamic_cast<const ObjectItem *>(item)) {
- colliding_objects.append(object_item->getObject());
+ if (const ObjectItem *objectItem = dynamic_cast<const ObjectItem *>(item)) {
+ collidingObjects.append(objectItem->getObject());
}
}
- QColor base_color;
- if (!stereotype_icon_id.isEmpty()) {
- StereotypeIcon stereotype_icon = m_diagramSceneModel->getStereotypeController()->findStereotypeIcon(stereotype_icon_id);
- base_color = stereotype_icon.getBaseColor();
+ QColor baseColor;
+ if (!stereotypeIconId.isEmpty()) {
+ StereotypeIcon stereotypeIcon = m_diagramSceneModel->getStereotypeController()->findStereotypeIcon(stereotypeIconId);
+ baseColor = stereotypeIcon.getBaseColor();
}
return m_diagramSceneModel->getStyleController()->adaptObjectStyle(
StyledObject(getObject(),
@@ -579,9 +579,9 @@ const Style *ObjectItem::getAdaptedStyle(const QString &stereotype_icon_id)
getObject()->getVisualPrimaryRole(),
getObject()->getVisualSecondaryRole(),
getObject()->isVisualEmphasized(),
- base_color,
+ baseColor,
getObject()->getDepth()),
- colliding_objects));
+ collidingObjects));
}
bool ObjectItem::showContext() const
@@ -595,8 +595,8 @@ bool ObjectItem::showContext() const
MObject *owner = mobject->getOwner();
if (owner) {
foreach (QGraphicsItem *item, m_diagramSceneModel->collectCollidingObjectItems(this, DiagramSceneModel::COLLIDING_OUTER_ITEMS)) {
- if (ObjectItem *object_item = dynamic_cast<ObjectItem *>(item)) {
- if (object_item->getObject()->getModelUid().isValid() && object_item->getObject()->getModelUid() == owner->getUid()) {
+ if (ObjectItem *objectItem = dynamic_cast<ObjectItem *>(item)) {
+ if (objectItem->getObject()->getModelUid().isValid() && objectItem->getObject()->getModelUid() == owner->getUid()) {
showContext = false;
break;
}
@@ -659,43 +659,43 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
{
QMenu menu;
- bool add_separator = false;
+ bool addSeparator = false;
if (getDiagramSceneModel()->getDiagramSceneController()->getElementTasks()->hasDiagram(m_object, m_diagramSceneModel->getDiagram())) {
menu.addAction(new ContextMenuAction(QObject::tr("Open Diagram"), QStringLiteral("openDiagram"), &menu));
- add_separator = true;
+ addSeparator = true;
} else if (getDiagramSceneModel()->getDiagramSceneController()->getElementTasks()->mayCreateDiagram(m_object, m_diagramSceneModel->getDiagram())) {
menu.addAction(new ContextMenuAction(QObject::tr("Create Diagram"), QStringLiteral("createDiagram"), &menu));
- add_separator = true;
+ addSeparator = true;
}
if (extendContextMenu(&menu)) {
- add_separator = true;
+ addSeparator = true;
}
- if (add_separator) {
+ if (addSeparator) {
menu.addSeparator();
}
menu.addAction(new ContextMenuAction(QObject::tr("Remove"), QStringLiteral("remove"), QKeySequence(QKeySequence::Delete), &menu));
menu.addAction(new ContextMenuAction(QObject::tr("Delete"), QStringLiteral("delete"), QKeySequence(Qt::CTRL + Qt::Key_D), &menu));
//menu.addAction(new ContextMenuAction(QObject::tr("Select in Model Tree"), QStringLiteral("selectInModelTree"), &menu));
- QMenu align_menu;
- align_menu.setTitle(QObject::tr("Align Objects"));
- align_menu.addAction(new ContextMenuAction(QObject::tr("Align Left"), QStringLiteral("alignLeft"), &align_menu));
- align_menu.addAction(new ContextMenuAction(QObject::tr("Center Vertically"), QStringLiteral("centerVertically"), &align_menu));
- align_menu.addAction(new ContextMenuAction(QObject::tr("Align Right"), QStringLiteral("alignRight"), &align_menu));
- align_menu.addSeparator();
- align_menu.addAction(new ContextMenuAction(QObject::tr("Align Top"), QStringLiteral("alignTop"), &align_menu));
- align_menu.addAction(new ContextMenuAction(QObject::tr("Center Horizontally"), QStringLiteral("centerHorizontally"), &align_menu));
- align_menu.addAction(new ContextMenuAction(QObject::tr("Align Bottom"), QStringLiteral("alignBottom"), &align_menu));
- align_menu.addSeparator();
- align_menu.addAction(new ContextMenuAction(QObject::tr("Same Width"), QStringLiteral("sameWidth"), &align_menu));
- align_menu.addAction(new ContextMenuAction(QObject::tr("Same Height"), QStringLiteral("sameHeight"), &align_menu));
- align_menu.addAction(new ContextMenuAction(QObject::tr("Same Size"), QStringLiteral("sameSize"), &align_menu));
- align_menu.setEnabled(m_diagramSceneModel->hasMultiObjectsSelection());
- menu.addMenu(&align_menu);
-
- QAction *selected_action = menu.exec(event->screenPos());
- if (selected_action) {
- if (!handleSelectedContextMenuAction(selected_action)) {
- ContextMenuAction *action = dynamic_cast<ContextMenuAction *>(selected_action);
+ QMenu alignMenu;
+ alignMenu.setTitle(QObject::tr("Align Objects"));
+ alignMenu.addAction(new ContextMenuAction(QObject::tr("Align Left"), QStringLiteral("alignLeft"), &alignMenu));
+ alignMenu.addAction(new ContextMenuAction(QObject::tr("Center Vertically"), QStringLiteral("centerVertically"), &alignMenu));
+ alignMenu.addAction(new ContextMenuAction(QObject::tr("Align Right"), QStringLiteral("alignRight"), &alignMenu));
+ alignMenu.addSeparator();
+ alignMenu.addAction(new ContextMenuAction(QObject::tr("Align Top"), QStringLiteral("alignTop"), &alignMenu));
+ alignMenu.addAction(new ContextMenuAction(QObject::tr("Center Horizontally"), QStringLiteral("centerHorizontally"), &alignMenu));
+ alignMenu.addAction(new ContextMenuAction(QObject::tr("Align Bottom"), QStringLiteral("alignBottom"), &alignMenu));
+ alignMenu.addSeparator();
+ alignMenu.addAction(new ContextMenuAction(QObject::tr("Same Width"), QStringLiteral("sameWidth"), &alignMenu));
+ alignMenu.addAction(new ContextMenuAction(QObject::tr("Same Height"), QStringLiteral("sameHeight"), &alignMenu));
+ alignMenu.addAction(new ContextMenuAction(QObject::tr("Same Size"), QStringLiteral("sameSize"), &alignMenu));
+ alignMenu.setEnabled(m_diagramSceneModel->hasMultiObjectsSelection());
+ menu.addMenu(&alignMenu);
+
+ QAction *selectedAction = menu.exec(event->screenPos());
+ if (selectedAction) {
+ if (!handleSelectedContextMenuAction(selectedAction)) {
+ ContextMenuAction *action = dynamic_cast<ContextMenuAction *>(selectedAction);
QMT_CHECK(action);
if (action->getId() == QStringLiteral("openDiagram")) {
m_diagramSceneModel->getDiagramSceneController()->getElementTasks()->openDiagram(m_object, m_diagramSceneModel->getDiagram());
@@ -740,19 +740,19 @@ void ObjectItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
QSizeF ObjectItem::getMinimumSize(const QSet<QGraphicsItem *> &items) const
{
- QSizeF minimum_size(0.0, 0.0);
+ QSizeF minimumSize(0.0, 0.0);
foreach (QGraphicsItem *item, items) {
if (IResizable *resizable = dynamic_cast<IResizable *>(item)) {
QSizeF size = resizable->getMinimumSize();
- if (size.width() > minimum_size.width()) {
- minimum_size.setWidth(size.width());
+ if (size.width() > minimumSize.width()) {
+ minimumSize.setWidth(size.width());
}
- if (size.height() > minimum_size.height()) {
- minimum_size.setHeight(size.height());
+ if (size.height() > minimumSize.height()) {
+ minimumSize.setHeight(size.height());
}
}
}
- return minimum_size;
+ return minimumSize;
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.h
index 8025f08d69c54b6c49ef9216bcd5640f412bd92e..f09cc38694b617a2c49d8e805ccccc56b69018c1 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/objectitem.h
@@ -84,7 +84,7 @@ protected:
public:
- ObjectItem(DObject *object, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent = 0);
+ ObjectItem(DObject *object, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
~ObjectItem();
@@ -106,7 +106,7 @@ public:
public:
- bool intersectShapeWithLine(const QLineF &line, QPointF *intersection_point, QLineF *intersection_line) const = 0;
+ bool intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const = 0;
public:
@@ -116,35 +116,35 @@ public:
QSizeF getMinimumSize() const = 0;
- void setPosAndRect(const QPointF &original_pos, const QRectF &original_rect, const QPointF &top_left_delta, const QPointF &bottom_right_delta);
+ void setPosAndRect(const QPointF &originalPos, const QRectF &originalRect, const QPointF &topLeftDelta, const QPointF &bottomRightDelta);
- void alignItemSizeToRaster(Side adjust_horizontal_side, Side adjust_vertical_side, double raster_width, double raster_height);
+ void alignItemSizeToRaster(Side adjustHorizontalSide, Side adjustVerticalSide, double rasterWidth, double rasterHeight);
public:
void moveDelta(const QPointF &delta);
- void alignItemPositionToRaster(double raster_width, double raster_height);
+ void alignItemPositionToRaster(double rasterWidth, double rasterHeight);
public:
bool isSecondarySelected() const;
- void setSecondarySelected(bool secondary_selected);
+ void setSecondarySelected(bool secondarySelected);
bool isFocusSelected() const;
- void setFocusSelected(bool focus_selected);
+ void setFocusSelected(bool focusSelected);
public:
- QList<Latch> getHorizontalLatches(Action action, bool grabbed_item) const;
+ QList<Latch> getHorizontalLatches(Action action, bool grabbedItem) const;
- QList<Latch> getVerticalLatches(Action action, bool grabbed_item) const;
+ QList<Latch> getVerticalLatches(Action action, bool grabbedItem) const;
public:
- void align(AlignType align_type, const QString &identifier);
+ void align(AlignType alignType, const QString &identifier);
protected:
@@ -156,29 +156,29 @@ protected:
StereotypeIcon::Display getStereotypeIconDisplay() const { return m_stereotypeIconDisplay; }
- void updateStereotypes(const QString &stereotype_icon_id, StereotypeIcon::Display stereotype_display, const Style *style);
+ void updateStereotypes(const QString &stereotypeIconId, StereotypeIcon::Display stereotypeDisplay, const Style *style);
StereotypesItem *getStereotypesItem() const { return m_stereotypes; }
CustomIconItem *getStereotypeIconItem() const { return m_stereotypeIcon; }
- QSizeF getStereotypeIconMinimumSize(const StereotypeIcon &stereotype_icon, qreal minimum_width, qreal minimum_height) const;
+ QSizeF getStereotypeIconMinimumSize(const StereotypeIcon &stereotypeIcon, qreal minimumWidth, qreal minimumHeight) const;
void updateDepth();
- void updateSelectionMarker(CustomIconItem *custom_icon_item);
+ void updateSelectionMarker(CustomIconItem *customIconItem);
- void updateSelectionMarker(ResizeFlags resize_flags);
+ void updateSelectionMarker(ResizeFlags resizeFlags);
- void updateSelectionMarkerGeometry(const QRectF &object_rect);
+ void updateSelectionMarkerGeometry(const QRectF &objectRect);
void updateAlignmentButtons();
- void updateAlignmentButtonsGeometry(const QRectF &object_rect);
+ void updateAlignmentButtonsGeometry(const QRectF &objectRect);
- IAlignable::AlignType translateLatchTypeToAlignType(ILatchable::LatchType latch_type);
+ IAlignable::AlignType translateLatchTypeToAlignType(ILatchable::LatchType latchType);
- const Style *getAdaptedStyle(const QString &stereotype_icon_id);
+ const Style *getAdaptedStyle(const QString &stereotypeIconId);
bool showContext() const;
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.cpp
index 7303be87ed0497ea281034734af7287fda6040eb..f489800d64200fc9da41009bd7d13d3dd8cc3f69 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.cpp
@@ -65,9 +65,9 @@ static const qreal MINIMUM_AUTO_HEIGHT = 70.0;
struct PackageItem::ShapeGeometry {
- ShapeGeometry(const QSizeF &minimum_size, const QSizeF &minimum_tab_size)
- : m_minimumSize(minimum_size),
- m_minimumTabSize(minimum_tab_size)
+ ShapeGeometry(const QSizeF &minimumSize, const QSizeF &minimumTabSize)
+ : m_minimumSize(minimumSize),
+ m_minimumTabSize(minimumTabSize)
{
}
@@ -76,8 +76,8 @@ struct PackageItem::ShapeGeometry {
};
-PackageItem::PackageItem(DPackage *package, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent)
- : ObjectItem(package, diagram_scene_model, parent),
+PackageItem::PackageItem(DPackage *package, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent)
+ : ObjectItem(package, diagramSceneModel, parent),
m_customIcon(0),
m_shape(0),
m_packageName(0),
@@ -174,11 +174,11 @@ void PackageItem::update()
updateGeometry();
}
-bool PackageItem::intersectShapeWithLine(const QLineF &line, QPointF *intersection_point, QLineF *intersection_line) const
+bool PackageItem::intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const
{
QPolygonF polygon;
if (m_customIcon) {
- // TODO use custom_icon path as shape
+ // TODO use customIcon path as shape
QRectF rect = getObject()->getRect();
rect.translate(getObject()->getPos());
polygon << rect.topLeft() << rect.topRight() << rect.bottomRight() << rect.bottomLeft() << rect.topLeft();
@@ -191,7 +191,7 @@ bool PackageItem::intersectShapeWithLine(const QLineF &line, QPointF *intersecti
<< rect.topRight() + QPointF(0.0, shape.m_minimumTabSize.height())
<< rect.bottomRight() << rect.bottomLeft() << rect.topLeft();
}
- return GeometryUtilities::intersect(polygon, line, intersection_point, intersection_line);
+ return GeometryUtilities::intersect(polygon, line, intersectionPoint, intersectionLine);
}
QSizeF PackageItem::getMinimumSize() const
@@ -200,14 +200,14 @@ QSizeF PackageItem::getMinimumSize() const
return geometry.m_minimumSize;
}
-QList<ILatchable::Latch> PackageItem::getHorizontalLatches(ILatchable::Action action, bool grabbed_item) const
+QList<ILatchable::Latch> PackageItem::getHorizontalLatches(ILatchable::Action action, bool grabbedItem) const
{
- return ObjectItem::getHorizontalLatches(action, grabbed_item);
+ return ObjectItem::getHorizontalLatches(action, grabbedItem);
}
-QList<ILatchable::Latch> PackageItem::getVerticalLatches(ILatchable::Action action, bool grabbed_item) const
+QList<ILatchable::Latch> PackageItem::getVerticalLatches(ILatchable::Action action, bool grabbedItem) const
{
- return ObjectItem::getVerticalLatches(action, grabbed_item);
+ return ObjectItem::getVerticalLatches(action, grabbedItem);
}
#if 0
@@ -232,14 +232,14 @@ QPointF PackageItem::getRelationStartPos() const
return pos();
}
-void PackageItem::relationDrawn(const QString &id, const QPointF &to_scene_pos, const QList<QPointF> &intermediate_points)
+void PackageItem::relationDrawn(const QString &id, const QPointF &toScenePos, const QList<QPointF> &intermediatePoints)
{
- DElement *target_element = getDiagramSceneModel()->findTopmostElement(to_scene_pos);
- if (target_element) {
+ DElement *targetElement = getDiagramSceneModel()->findTopmostElement(toScenePos);
+ if (targetElement) {
if (id == QStringLiteral("dependency")) {
- DObject *dependant_object = dynamic_cast<DObject *>(target_element);
- if (dependant_object) {
- getDiagramSceneModel()->getDiagramSceneController()->createDependency(getObject(), dependant_object, intermediate_points, getDiagramSceneModel()->getDiagram());
+ DObject *dependantObject = dynamic_cast<DObject *>(targetElement);
+ if (dependantObject) {
+ getDiagramSceneModel()->getDiagramSceneController()->createDependency(getObject(), dependantObject, intermediatePoints, getDiagramSceneModel()->getDiagram());
}
}
}
@@ -249,43 +249,43 @@ PackageItem::ShapeGeometry PackageItem::calcMinimumGeometry() const
{
double width = 0.0;
double height = 0.0;
- double tab_height = 0.0;
- double tab_width = 0.0;
+ double tabHeight = 0.0;
+ double tabWidth = 0.0;
if (m_customIcon) {
- return ShapeGeometry(getStereotypeIconMinimumSize(m_customIcon->getStereotypeIcon(), CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT), QSizeF(tab_width, tab_height));
+ return ShapeGeometry(getStereotypeIconMinimumSize(m_customIcon->getStereotypeIcon(), CUSTOM_ICON_MINIMUM_AUTO_WIDTH, CUSTOM_ICON_MINIMUM_AUTO_HEIGHT), QSizeF(tabWidth, tabHeight));
}
- double body_height = 0.0;
- double body_width = 0.0;
+ double bodyHeight = 0.0;
+ double bodyWidth = 0.0;
- tab_height += TAB_VERT_BORDER;
- if (StereotypesItem *stereotypes_item = getStereotypesItem()) {
- tab_width = std::max(tab_width, stereotypes_item->boundingRect().width() + 2 * TAB_HORIZ_BORDER);
- tab_height += stereotypes_item->boundingRect().height();
+ tabHeight += TAB_VERT_BORDER;
+ if (StereotypesItem *stereotypesItem = getStereotypesItem()) {
+ tabWidth = std::max(tabWidth, stereotypesItem->boundingRect().width() + 2 * TAB_HORIZ_BORDER);
+ tabHeight += stereotypesItem->boundingRect().height();
}
if (m_packageName) {
- tab_width = std::max(tab_width, m_packageName->boundingRect().width() + 2 * TAB_HORIZ_BORDER);
- tab_height += m_packageName->boundingRect().height();
+ tabWidth = std::max(tabWidth, m_packageName->boundingRect().width() + 2 * TAB_HORIZ_BORDER);
+ tabHeight += m_packageName->boundingRect().height();
}
- tab_height += TAB_VERT_BORDER;
- width = std::max(width, tab_width + TAB_MIN_RIGHT_SPACE);
- height += tab_height;
-
- body_height = BODY_VERT_BORDER;
- if (CustomIconItem *stereotype_icon_item = getStereotypeIconItem()) {
- body_width = std::max(body_width, stereotype_icon_item->boundingRect().width() + 2 * BODY_HORIZ_BORDER);
- body_height += stereotype_icon_item->boundingRect().height();
+ tabHeight += TAB_VERT_BORDER;
+ width = std::max(width, tabWidth + TAB_MIN_RIGHT_SPACE);
+ height += tabHeight;
+
+ bodyHeight = BODY_VERT_BORDER;
+ if (CustomIconItem *stereotypeIconItem = getStereotypeIconItem()) {
+ bodyWidth = std::max(bodyWidth, stereotypeIconItem->boundingRect().width() + 2 * BODY_HORIZ_BORDER);
+ bodyHeight += stereotypeIconItem->boundingRect().height();
}
if (m_contextLabel) {
- body_height += m_contextLabel->getHeight();
+ bodyHeight += m_contextLabel->getHeight();
}
- body_height += BODY_VERT_BORDER;
- body_height = std::max(body_height, BODY_MIN_HEIGHT);
- width = std::max(width, body_width);
- height += body_height;
+ bodyHeight += BODY_VERT_BORDER;
+ bodyHeight = std::max(bodyHeight, BODY_MIN_HEIGHT);
+ width = std::max(width, bodyWidth);
+ height += bodyHeight;
- return ShapeGeometry(GeometryUtilities::ensureMinimumRasterSize(QSizeF(width, height), 2 * RASTER_WIDTH, 2 * RASTER_HEIGHT), QSizeF(tab_width, tab_height));
+ return ShapeGeometry(GeometryUtilities::ensureMinimumRasterSize(QSizeF(width, height), 2 * RASTER_WIDTH, 2 * RASTER_HEIGHT), QSizeF(tabWidth, tabHeight));
}
void PackageItem::updateGeometry()
@@ -296,8 +296,8 @@ void PackageItem::updateGeometry()
double width = geometry.m_minimumSize.width();
double height = geometry.m_minimumSize.height();
- double tab_width = geometry.m_minimumTabSize.width();
- double tab_height = geometry.m_minimumTabSize.height();
+ double tabWidth = geometry.m_minimumTabSize.width();
+ double tabHeight = geometry.m_minimumTabSize.height();
// calc width and height
if (getObject()->hasAutoSize()) {
@@ -340,9 +340,9 @@ void PackageItem::updateGeometry()
y += height;
y += BODY_VERT_BORDER;
- if (StereotypesItem *stereotypes_item = getStereotypesItem()) {
- stereotypes_item->setPos(-stereotypes_item->boundingRect().width() / 2.0, y);
- y += stereotypes_item->boundingRect().height();
+ if (StereotypesItem *stereotypesItem = getStereotypesItem()) {
+ stereotypesItem->setPos(-stereotypesItem->boundingRect().width() / 2.0, y);
+ y += stereotypesItem->boundingRect().height();
}
if (m_packageName) {
m_packageName->setPos(-m_packageName->boundingRect().width() / 2.0, y);
@@ -356,17 +356,17 @@ void PackageItem::updateGeometry()
} else if (m_shape) {
QPolygonF polygon;
polygon << rect.topLeft()
- << QPointF(left + tab_width, top)
- << QPointF(left + tab_width, top + tab_height)
- << QPointF(right, top + tab_height)
+ << QPointF(left + tabWidth, top)
+ << QPointF(left + tabWidth, top + tabHeight)
+ << QPointF(right, top + tabHeight)
<< rect.bottomRight()
<< rect.bottomLeft();
m_shape->setPolygon(polygon);
y += TAB_VERT_BORDER;
- if (StereotypesItem *stereotypes_item = getStereotypesItem()) {
- stereotypes_item->setPos(left + TAB_HORIZ_BORDER, y);
- y += stereotypes_item->boundingRect().height();
+ if (StereotypesItem *stereotypesItem = getStereotypesItem()) {
+ stereotypesItem->setPos(left + TAB_HORIZ_BORDER, y);
+ y += stereotypesItem->boundingRect().height();
}
if (m_packageName) {
m_packageName->setPos(left + TAB_HORIZ_BORDER, y);
@@ -374,9 +374,9 @@ void PackageItem::updateGeometry()
}
y += TAB_VERT_BORDER;
y += BODY_VERT_BORDER;
- if (CustomIconItem *stereotype_icon_item = getStereotypeIconItem()) {
- stereotype_icon_item->setPos(right - stereotype_icon_item->boundingRect().width() - BODY_HORIZ_BORDER, y);
- y += stereotype_icon_item->boundingRect().height();
+ if (CustomIconItem *stereotypeIconItem = getStereotypeIconItem()) {
+ stereotypeIconItem->setPos(right - stereotypeIconItem->boundingRect().width() - BODY_HORIZ_BORDER, y);
+ y += stereotypeIconItem->boundingRect().height();
}
if (m_contextLabel) {
m_contextLabel->setMaxWidth(width - 2 * BODY_HORIZ_BORDER);
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.h
index 5f7e02128b4a7c2a1057ea1aeb6840a13b854d6f..5fb4a8f011f035403790ed987e99def4e646b396 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/packageitem.h
@@ -58,7 +58,7 @@ class PackageItem :
struct ShapeGeometry;
public:
- PackageItem(DPackage *package, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent = 0);
+ PackageItem(DPackage *package, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
~PackageItem();
@@ -68,7 +68,7 @@ public:
public:
- bool intersectShapeWithLine(const QLineF &line, QPointF *intersection_point, QLineF *intersection_line) const;
+ bool intersectShapeWithLine(const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine) const;
public:
@@ -76,15 +76,15 @@ public:
public:
- QList<Latch> getHorizontalLatches(Action action, bool grabbed_item) const;
+ QList<Latch> getHorizontalLatches(Action action, bool grabbedItem) const;
- QList<Latch> getVerticalLatches(Action action, bool grabbed_item) const;
+ QList<Latch> getVerticalLatches(Action action, bool grabbedItem) const;
public:
QPointF getRelationStartPos() const;
- void relationDrawn(const QString &id, const QPointF &to_scene_pos, const QList<QPointF> &intermediate_points);
+ void relationDrawn(const QString &id, const QPointF &toScenePos, const QList<QPointF> &intermediatePoints);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.cpp
index a4335d93cd82f3afa5112f41a97090f1b1c3e74e..6ca857603cf7d6a3d25b6cefabe770598798f0ca 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.cpp
@@ -64,8 +64,8 @@ class RelationItem::ArrowConfigurator :
public DConstVoidVisitor
{
public:
- ArrowConfigurator(DiagramSceneModel *diagram_scene_model, ArrowItem *arrow, const QList<QPointF> &points)
- : m_diagramSceneModel(diagram_scene_model),
+ ArrowConfigurator(DiagramSceneModel *diagramSceneModel, ArrowItem *arrow, const QList<QPointF> &points)
+ : m_diagramSceneModel(diagramSceneModel),
m_arrow(arrow),
m_points(points)
{
@@ -75,21 +75,21 @@ public:
{
Q_UNUSED(inheritance);
- DObject *base_object = m_diagramSceneModel->getDiagramController()->findElement<DObject>(inheritance->getBase(), m_diagramSceneModel->getDiagram());
- QMT_CHECK(base_object);
- bool base_is_interface = base_object->getStereotypes().contains(QStringLiteral("interface"));
- bool lollipop_display = false;
- if (base_is_interface) {
- StereotypeDisplayVisitor stereotype_display_visitor;
- stereotype_display_visitor.setModelController(m_diagramSceneModel->getDiagramSceneController()->getModelController());
- stereotype_display_visitor.setStereotypeController(m_diagramSceneModel->getStereotypeController());
- base_object->accept(&stereotype_display_visitor);
- lollipop_display = stereotype_display_visitor.getStereotypeDisplay() == DObject::STEREOTYPE_ICON;
+ DObject *baseObject = m_diagramSceneModel->getDiagramController()->findElement<DObject>(inheritance->getBase(), m_diagramSceneModel->getDiagram());
+ QMT_CHECK(baseObject);
+ bool baseIsInterface = baseObject->getStereotypes().contains(QStringLiteral("interface"));
+ bool lollipopDisplay = false;
+ if (baseIsInterface) {
+ StereotypeDisplayVisitor stereotypeDisplayVisitor;
+ stereotypeDisplayVisitor.setModelController(m_diagramSceneModel->getDiagramSceneController()->getModelController());
+ stereotypeDisplayVisitor.setStereotypeController(m_diagramSceneModel->getStereotypeController());
+ baseObject->accept(&stereotypeDisplayVisitor);
+ lollipopDisplay = stereotypeDisplayVisitor.getStereotypeDisplay() == DObject::STEREOTYPE_ICON;
}
- if (lollipop_display) {
+ if (lollipopDisplay) {
m_arrow->setShaft(ArrowItem::SHAFT_SOLID);
m_arrow->setEndHead(ArrowItem::HEAD_NONE);
- } else if (base_is_interface || inheritance->getStereotypes().contains(QStringLiteral("realize"))) {
+ } else if (baseIsInterface || inheritance->getStereotypes().contains(QStringLiteral("realize"))) {
m_arrow->setShaft(ArrowItem::SHAFT_DASHED);
m_arrow->setEndHead(ArrowItem::HEAD_TRIANGLE);
} else {
@@ -105,19 +105,19 @@ public:
{
Q_UNUSED(dependency);
- ArrowItem::Head end_a_head = ArrowItem::HEAD_NONE;
- ArrowItem::Head end_b_head = ArrowItem::HEAD_NONE;
- bool is_realization = dependency->getStereotypes().contains(QStringLiteral("realize"));
+ ArrowItem::Head endAHead = ArrowItem::HEAD_NONE;
+ ArrowItem::Head endBHead = ArrowItem::HEAD_NONE;
+ bool isRealization = dependency->getStereotypes().contains(QStringLiteral("realize"));
switch (dependency->getDirection()) {
case MDependency::A_TO_B:
- end_b_head = is_realization ? ArrowItem::HEAD_TRIANGLE : ArrowItem::HEAD_OPEN;
+ endBHead = isRealization ? ArrowItem::HEAD_TRIANGLE : ArrowItem::HEAD_OPEN;
break;
case MDependency::B_TO_A:
- end_a_head = is_realization ? ArrowItem::HEAD_TRIANGLE : ArrowItem::HEAD_OPEN;
+ endAHead = isRealization ? ArrowItem::HEAD_TRIANGLE : ArrowItem::HEAD_OPEN;
break;
case MDependency::BIDIRECTIONAL:
- end_a_head = ArrowItem::HEAD_OPEN;
- end_b_head = ArrowItem::HEAD_OPEN;
+ endAHead = ArrowItem::HEAD_OPEN;
+ endBHead = ArrowItem::HEAD_OPEN;
break;
default:
break;
@@ -125,8 +125,8 @@ public:
m_arrow->setShaft(ArrowItem::SHAFT_DASHED);
m_arrow->setArrowSize(12.0);
- m_arrow->setStartHead(end_a_head);
- m_arrow->setEndHead(end_b_head);
+ m_arrow->setStartHead(endAHead);
+ m_arrow->setEndHead(endBHead);
m_arrow->setPoints(m_points);
}
@@ -138,41 +138,41 @@ public:
m_arrow->setArrowSize(12.0);
m_arrow->setDiamondSize(12.0);
- ArrowItem::Head end_a_head = ArrowItem::HEAD_NONE;
- ArrowItem::Head end_b_head = ArrowItem::HEAD_NONE;
+ ArrowItem::Head endAHead = ArrowItem::HEAD_NONE;
+ ArrowItem::Head endBHead = ArrowItem::HEAD_NONE;
- bool a_nav = association->getA().isNavigable();
- bool b_nav = association->getB().isNavigable();
+ bool aNav = association->getA().isNavigable();
+ bool bNav = association->getB().isNavigable();
- bool a_flat = association->getA().getKind() == MAssociationEnd::ASSOCIATION;
- bool b_flat = association->getB().getKind() == MAssociationEnd::ASSOCIATION;
+ bool aFlat = association->getA().getKind() == MAssociationEnd::ASSOCIATION;
+ bool bFlat = association->getB().getKind() == MAssociationEnd::ASSOCIATION;
switch (association->getA().getKind()) {
case MAssociationEnd::ASSOCIATION:
- end_a_head = ((b_nav && !a_nav && b_flat) || (a_nav && b_nav && !b_flat)) ? ArrowItem::HEAD_FILLED_TRIANGLE : ArrowItem::HEAD_NONE;
+ endAHead = ((bNav && !aNav && bFlat) || (aNav && bNav && !bFlat)) ? ArrowItem::HEAD_FILLED_TRIANGLE : ArrowItem::HEAD_NONE;
break;
case MAssociationEnd::AGGREGATION:
- end_a_head = association->getB().isNavigable() ? ArrowItem::HEAD_DIAMOND_FILLED_TRIANGLE : ArrowItem::HEAD_DIAMOND;
+ endAHead = association->getB().isNavigable() ? ArrowItem::HEAD_DIAMOND_FILLED_TRIANGLE : ArrowItem::HEAD_DIAMOND;
break;
case MAssociationEnd::COMPOSITION:
- end_a_head = association->getB().isNavigable() ? ArrowItem::HEAD_FILLED_DIAMOND_FILLED_TRIANGLE : ArrowItem::HEAD_FILLED_DIAMOND;
+ endAHead = association->getB().isNavigable() ? ArrowItem::HEAD_FILLED_DIAMOND_FILLED_TRIANGLE : ArrowItem::HEAD_FILLED_DIAMOND;
break;
}
switch (association->getB().getKind()) {
case MAssociationEnd::ASSOCIATION:
- end_b_head = ((a_nav && !b_nav && a_flat) || (a_nav && b_nav && !a_flat)) ? ArrowItem::HEAD_FILLED_TRIANGLE : ArrowItem::HEAD_NONE;
+ endBHead = ((aNav && !bNav && aFlat) || (aNav && bNav && !aFlat)) ? ArrowItem::HEAD_FILLED_TRIANGLE : ArrowItem::HEAD_NONE;
break;
case MAssociationEnd::AGGREGATION:
- end_b_head = association->getA().isNavigable() ? ArrowItem::HEAD_DIAMOND_FILLED_TRIANGLE : ArrowItem::HEAD_DIAMOND;
+ endBHead = association->getA().isNavigable() ? ArrowItem::HEAD_DIAMOND_FILLED_TRIANGLE : ArrowItem::HEAD_DIAMOND;
break;
case MAssociationEnd::COMPOSITION:
- end_b_head = association->getA().isNavigable() ? ArrowItem::HEAD_FILLED_DIAMOND_FILLED_TRIANGLE : ArrowItem::HEAD_FILLED_DIAMOND;
+ endBHead = association->getA().isNavigable() ? ArrowItem::HEAD_FILLED_DIAMOND_FILLED_TRIANGLE : ArrowItem::HEAD_FILLED_DIAMOND;
break;
}
- m_arrow->setStartHead(end_a_head);
- m_arrow->setEndHead(end_b_head);
+ m_arrow->setStartHead(endAHead);
+ m_arrow->setEndHead(endBHead);
m_arrow->setPoints(m_points);
}
@@ -186,10 +186,10 @@ private:
};
-RelationItem::RelationItem(DRelation *relation, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent)
+RelationItem::RelationItem(DRelation *relation, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent)
: QGraphicsItem(parent),
m_relation(relation),
- m_diagramSceneModel(diagram_scene_model),
+ m_diagramSceneModel(diagramSceneModel),
m_secondarySelected(false),
m_focusSelected(false),
m_arrow(0),
@@ -254,14 +254,14 @@ void RelationItem::moveDelta(const QPointF &delta)
m_diagramSceneModel->getDiagramController()->finishUpdateElement(m_relation, m_diagramSceneModel->getDiagram(), false);
}
-void RelationItem::alignItemPositionToRaster(double raster_width, double raster_height)
+void RelationItem::alignItemPositionToRaster(double rasterWidth, double rasterHeight)
{
m_diagramSceneModel->getDiagramController()->startUpdateElement(m_relation, m_diagramSceneModel->getDiagram(), DiagramController::UPDATE_GEOMETRY);
QList<DRelation::IntermediatePoint> points;
foreach (const DRelation::IntermediatePoint &point, m_relation->getIntermediatePoints()) {
QPointF pos = point.getPos();
- double x = qRound(pos.x() / raster_width) * raster_width;
- double y = qRound(pos.y() / raster_height) * raster_height;
+ double x = qRound(pos.x() / rasterWidth) * rasterWidth;
+ double y = qRound(pos.y() / rasterHeight) * rasterHeight;
points << DRelation::IntermediatePoint(QPointF(x,y));
}
m_relation->setIntermediatePoints(points);
@@ -273,10 +273,10 @@ bool RelationItem::isSecondarySelected() const
return m_secondarySelected;
}
-void RelationItem::setSecondarySelected(bool secondary_selected)
+void RelationItem::setSecondarySelected(bool secondarySelected)
{
- if (m_secondarySelected != secondary_selected) {
- m_secondarySelected = secondary_selected;
+ if (m_secondarySelected != secondarySelected) {
+ m_secondarySelected = secondarySelected;
update();
}
}
@@ -286,10 +286,10 @@ bool RelationItem::isFocusSelected() const
return m_focusSelected;
}
-void RelationItem::setFocusSelected(bool focus_selected)
+void RelationItem::setFocusSelected(bool focusSelected)
{
- if (m_focusSelected != focus_selected) {
- m_focusSelected = focus_selected;
+ if (m_focusSelected != focusSelected) {
+ m_focusSelected = focusSelected;
update();
}
}
@@ -303,21 +303,21 @@ QPointF RelationItem::getHandlePos(int index)
// TODO implement
return QPointF(0,0);
} else {
- QList<DRelation::IntermediatePoint> intermediate_points = m_relation->getIntermediatePoints();
+ QList<DRelation::IntermediatePoint> intermediatePoints = m_relation->getIntermediatePoints();
--index;
- QMT_CHECK(index >= 0 && index < intermediate_points.size());
- return intermediate_points.at(index).getPos();
+ QMT_CHECK(index >= 0 && index < intermediatePoints.size());
+ return intermediatePoints.at(index).getPos();
}
}
-void RelationItem::insertHandle(int before_index, const QPointF &pos)
+void RelationItem::insertHandle(int beforeIndex, const QPointF &pos)
{
- if (before_index >= 1 && before_index <= m_relation->getIntermediatePoints().size() + 1) {
- QList<DRelation::IntermediatePoint> intermediate_points = m_relation->getIntermediatePoints();
- intermediate_points.insert(before_index - 1, DRelation::IntermediatePoint(pos));
+ if (beforeIndex >= 1 && beforeIndex <= m_relation->getIntermediatePoints().size() + 1) {
+ QList<DRelation::IntermediatePoint> intermediatePoints = m_relation->getIntermediatePoints();
+ intermediatePoints.insert(beforeIndex - 1, DRelation::IntermediatePoint(pos));
m_diagramSceneModel->getDiagramController()->startUpdateElement(m_relation, m_diagramSceneModel->getDiagram(), DiagramController::UPDATE_MAJOR);
- m_relation->setIntermediatePoints(intermediate_points);
+ m_relation->setIntermediatePoints(intermediatePoints);
m_diagramSceneModel->getDiagramController()->finishUpdateElement(m_relation, m_diagramSceneModel->getDiagram(), false);
}
}
@@ -325,11 +325,11 @@ void RelationItem::insertHandle(int before_index, const QPointF &pos)
void RelationItem::deleteHandle(int index)
{
if (index >= 1 && index <= m_relation->getIntermediatePoints().size()) {
- QList<DRelation::IntermediatePoint> intermediate_points = m_relation->getIntermediatePoints();
- intermediate_points.removeAt(index - 1);
+ QList<DRelation::IntermediatePoint> intermediatePoints = m_relation->getIntermediatePoints();
+ intermediatePoints.removeAt(index - 1);
m_diagramSceneModel->getDiagramController()->startUpdateElement(m_relation, m_diagramSceneModel->getDiagram(), DiagramController::UPDATE_MAJOR);
- m_relation->setIntermediatePoints(intermediate_points);
+ m_relation->setIntermediatePoints(intermediatePoints);
m_diagramSceneModel->getDiagramController()->finishUpdateElement(m_relation, m_diagramSceneModel->getDiagram(), false);
}
}
@@ -341,35 +341,35 @@ void RelationItem::setHandlePos(int index, const QPointF &pos)
} else if (index == m_relation->getIntermediatePoints().size() + 1) {
// TODO implement
} else {
- QList<DRelation::IntermediatePoint> intermediate_points = m_relation->getIntermediatePoints();
+ QList<DRelation::IntermediatePoint> intermediatePoints = m_relation->getIntermediatePoints();
--index;
- QMT_CHECK(index >= 0 && index < intermediate_points.size());
- intermediate_points[index].setPos(pos);
+ QMT_CHECK(index >= 0 && index < intermediatePoints.size());
+ intermediatePoints[index].setPos(pos);
m_diagramSceneModel->getDiagramController()->startUpdateElement(m_relation, m_diagramSceneModel->getDiagram(), DiagramController::UPDATE_MINOR);
- m_relation->setIntermediatePoints(intermediate_points);
+ m_relation->setIntermediatePoints(intermediatePoints);
m_diagramSceneModel->getDiagramController()->finishUpdateElement(m_relation, m_diagramSceneModel->getDiagram(), false);
}
}
-void RelationItem::alignHandleToRaster(int index, double raster_width, double raster_height)
+void RelationItem::alignHandleToRaster(int index, double rasterWidth, double rasterHeight)
{
if (index == 0) {
// TODO implement
} else if (index ==m_relation->getIntermediatePoints().size() + 1) {
// TODO implement
} else {
- QList<DRelation::IntermediatePoint> intermediate_points = m_relation->getIntermediatePoints();
+ QList<DRelation::IntermediatePoint> intermediatePoints = m_relation->getIntermediatePoints();
--index;
- QMT_CHECK(index >= 0 && index < intermediate_points.size());
+ QMT_CHECK(index >= 0 && index < intermediatePoints.size());
- QPointF pos = intermediate_points.at(index).getPos();
- double x = qRound(pos.x() / raster_width) * raster_width;
- double y = qRound(pos.y() / raster_height) * raster_height;
- intermediate_points[index].setPos(QPointF(x, y));
+ QPointF pos = intermediatePoints.at(index).getPos();
+ double x = qRound(pos.x() / rasterWidth) * rasterWidth;
+ double y = qRound(pos.y() / rasterHeight) * rasterHeight;
+ intermediatePoints[index].setPos(QPointF(x, y));
m_diagramSceneModel->getDiagramController()->startUpdateElement(m_relation, m_diagramSceneModel->getDiagram(), DiagramController::UPDATE_MINOR);
- m_relation->setIntermediatePoints(intermediate_points);
+ m_relation->setIntermediatePoints(intermediatePoints);
m_diagramSceneModel->getDiagramController()->finishUpdateElement(m_relation, m_diagramSceneModel->getDiagram(), false);
}
}
@@ -389,17 +389,17 @@ void RelationItem::update()
void RelationItem::update(const Style *style)
{
- QPointF end_b_pos = calcEndPoint(m_relation->getEndB(), m_relation->getEndA(), m_relation->getIntermediatePoints().size() - 1);
- QPointF end_a_pos = calcEndPoint(m_relation->getEndA(), end_b_pos, 0);
+ QPointF endBPos = calcEndPoint(m_relation->getEndB(), m_relation->getEndA(), m_relation->getIntermediatePoints().size() - 1);
+ QPointF endAPos = calcEndPoint(m_relation->getEndA(), endBPos, 0);
- setPos(end_a_pos);
+ setPos(endAPos);
QList<QPointF> points;
- points << (end_a_pos - end_a_pos);
+ points << (endAPos - endAPos);
foreach (const DRelation::IntermediatePoint &point, m_relation->getIntermediatePoints()) {
- points << (point.getPos() - end_a_pos);
+ points << (point.getPos() - endAPos);
}
- points << (end_b_pos - end_a_pos);
+ points << (endBPos - endAPos);
ArrowConfigurator visitor(m_diagramSceneModel, m_arrow, points);
m_relation->accept(&visitor);
@@ -469,71 +469,71 @@ void RelationItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
const Style *RelationItem::getAdaptedStyle()
{
- DObject *end_a_object = m_diagramSceneModel->getDiagramController()->findElement<DObject>(m_relation->getEndA(), m_diagramSceneModel->getDiagram());
- DObject *end_b_object = m_diagramSceneModel->getDiagramController()->findElement<DObject>(m_relation->getEndB(), m_diagramSceneModel->getDiagram());
- StyledRelation styled_relation(m_relation, end_a_object, end_b_object);
- return m_diagramSceneModel->getStyleController()->adaptRelationStyle(styled_relation);
+ DObject *endAObject = m_diagramSceneModel->getDiagramController()->findElement<DObject>(m_relation->getEndA(), m_diagramSceneModel->getDiagram());
+ DObject *endBObject = m_diagramSceneModel->getDiagramController()->findElement<DObject>(m_relation->getEndB(), m_diagramSceneModel->getDiagram());
+ StyledRelation styledRelation(m_relation, endAObject, endBObject);
+ return m_diagramSceneModel->getStyleController()->adaptRelationStyle(styledRelation);
}
-QPointF RelationItem::calcEndPoint(const Uid &end, const Uid &other_end, int nearest_intermediate_point_index)
+QPointF RelationItem::calcEndPoint(const Uid &end, const Uid &otherEnd, int nearestIntermediatePointIndex)
{
- QPointF other_end_pos;
- if (nearest_intermediate_point_index >= 0 && nearest_intermediate_point_index < m_relation->getIntermediatePoints().size()) {
- // other_end_pos will not be used
+ QPointF otherEndPos;
+ if (nearestIntermediatePointIndex >= 0 && nearestIntermediatePointIndex < m_relation->getIntermediatePoints().size()) {
+ // otherEndPos will not be used
} else {
- DObject *end_other_object = m_diagramSceneModel->getDiagramController()->findElement<DObject>(other_end, m_diagramSceneModel->getDiagram());
- QMT_CHECK(end_other_object);
- other_end_pos = end_other_object->getPos();
+ DObject *endOtherObject = m_diagramSceneModel->getDiagramController()->findElement<DObject>(otherEnd, m_diagramSceneModel->getDiagram());
+ QMT_CHECK(endOtherObject);
+ otherEndPos = endOtherObject->getPos();
}
- return calcEndPoint(end, other_end_pos, nearest_intermediate_point_index);
+ return calcEndPoint(end, otherEndPos, nearestIntermediatePointIndex);
}
-QPointF RelationItem::calcEndPoint(const Uid &end, const QPointF &other_end_pos, int nearest_intermediate_point_index)
+QPointF RelationItem::calcEndPoint(const Uid &end, const QPointF &otherEndPos, int nearestIntermediatePointIndex)
{
- QGraphicsItem *end_item = m_diagramSceneModel->getGraphicsItem(end);
- QMT_CHECK(end_item);
- IIntersectionable *end_object_item = dynamic_cast<IIntersectionable *>(end_item);
- QPointF end_pos;
- if (end_object_item) {
- DObject *end_object = m_diagramSceneModel->getDiagramController()->findElement<DObject>(end, m_diagramSceneModel->getDiagram());
- QMT_CHECK(end_object);
- bool prefer_axis = false;
- QPointF other_pos;
- if (nearest_intermediate_point_index >= 0 && nearest_intermediate_point_index < m_relation->getIntermediatePoints().size()) {
- other_pos = m_relation->getIntermediatePoints().at(nearest_intermediate_point_index).getPos();
- prefer_axis = true;
+ QGraphicsItem *endItem = m_diagramSceneModel->getGraphicsItem(end);
+ QMT_CHECK(endItem);
+ IIntersectionable *endObjectItem = dynamic_cast<IIntersectionable *>(endItem);
+ QPointF endPos;
+ if (endObjectItem) {
+ DObject *endObject = m_diagramSceneModel->getDiagramController()->findElement<DObject>(end, m_diagramSceneModel->getDiagram());
+ QMT_CHECK(endObject);
+ bool preferAxis = false;
+ QPointF otherPos;
+ if (nearestIntermediatePointIndex >= 0 && nearestIntermediatePointIndex < m_relation->getIntermediatePoints().size()) {
+ otherPos = m_relation->getIntermediatePoints().at(nearestIntermediatePointIndex).getPos();
+ preferAxis = true;
} else {
- other_pos = other_end_pos;
+ otherPos = otherEndPos;
}
bool ok = false;
- QLineF direct_line(end_object->getPos(), other_pos);
- if (prefer_axis) {
+ QLineF directLine(endObject->getPos(), otherPos);
+ if (preferAxis) {
{
- QPointF axis_direction = GeometryUtilities::calcPrimaryAxisDirection(direct_line);
- QLineF axis(other_pos, other_pos + axis_direction);
- QPointF projection = GeometryUtilities::calcProjection(axis, end_object->getPos());
- QLineF projected_line(projection, other_pos);
- ok = end_object_item->intersectShapeWithLine(projected_line, &end_pos);
+ QPointF axisDirection = GeometryUtilities::calcPrimaryAxisDirection(directLine);
+ QLineF axis(otherPos, otherPos + axisDirection);
+ QPointF projection = GeometryUtilities::calcProjection(axis, endObject->getPos());
+ QLineF projectedLine(projection, otherPos);
+ ok = endObjectItem->intersectShapeWithLine(projectedLine, &endPos);
}
if (!ok) {
- QPointF axis_direction = GeometryUtilities::calcSecondaryAxisDirection(direct_line);
- QLineF axis(other_pos, other_pos + axis_direction);
- QPointF projection = GeometryUtilities::calcProjection(axis, end_object->getPos());
- QLineF projected_line(projection, other_pos);
- ok = end_object_item->intersectShapeWithLine(projected_line, &end_pos);
+ QPointF axisDirection = GeometryUtilities::calcSecondaryAxisDirection(directLine);
+ QLineF axis(otherPos, otherPos + axisDirection);
+ QPointF projection = GeometryUtilities::calcProjection(axis, endObject->getPos());
+ QLineF projectedLine(projection, otherPos);
+ ok = endObjectItem->intersectShapeWithLine(projectedLine, &endPos);
}
}
if (!ok) {
- ok = end_object_item->intersectShapeWithLine(direct_line, &end_pos);
+ ok = endObjectItem->intersectShapeWithLine(directLine, &endPos);
}
if (!ok) {
- end_pos = end_item->pos();
+ endPos = endItem->pos();
}
} else {
- end_pos = end_item->pos();
+ endPos = endItem->pos();
}
- return end_pos;
+ return endPos;
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.h
index 1ca0029b4134cc7ec92facb410a93f88990807e6..4434a14583230ed678ddafcef94588cc0e8349b4 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/relationitem.h
@@ -61,7 +61,7 @@ class RelationItem :
class ArrowConfigurator;
public:
- RelationItem(DRelation *relation, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent = 0);
+ RelationItem(DRelation *relation, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
~RelationItem();
@@ -81,29 +81,29 @@ public:
void moveDelta(const QPointF &delta);
- void alignItemPositionToRaster(double raster_width, double raster_height);
+ void alignItemPositionToRaster(double rasterWidth, double rasterHeight);
public:
bool isSecondarySelected() const;
- void setSecondarySelected(bool secondary_selected);
+ void setSecondarySelected(bool secondarySelected);
bool isFocusSelected() const;
- void setFocusSelected(bool focus_selected);
+ void setFocusSelected(bool focusSelected);
public:
QPointF getHandlePos(int index);
- void insertHandle(int before_index, const QPointF &pos);
+ void insertHandle(int beforeIndex, const QPointF &pos);
void deleteHandle(int index);
void setHandlePos(int index, const QPointF &pos);
- void alignHandleToRaster(int index, double raster_width, double raster_height);
+ void alignHandleToRaster(int index, double rasterWidth, double rasterHeight);
public:
@@ -125,9 +125,9 @@ private:
const Style *getAdaptedStyle();
- QPointF calcEndPoint(const Uid &end, const Uid &other_end, int nearest_intermediate_point_index);
+ QPointF calcEndPoint(const Uid &end, const Uid &otherEnd, int nearestIntermediatePointIndex);
- QPointF calcEndPoint(const Uid &end, const QPointF &other_end_pos, int nearest_intermediate_point_index);
+ QPointF calcEndPoint(const Uid &end, const QPointF &otherEndPos, int nearestIntermediatePointIndex);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp
index 4109d1703b8095656d41f9fecdedd32a824019dd..dbef8e07966fdd1ebe9be778bbd4d11e864fa0b8 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp
@@ -57,14 +57,14 @@ StereotypeDisplayVisitor::~StereotypeDisplayVisitor()
}
-void StereotypeDisplayVisitor::setModelController(ModelController *model_controller)
+void StereotypeDisplayVisitor::setModelController(ModelController *modelController)
{
- m_modelController = model_controller;
+ m_modelController = modelController;
}
-void StereotypeDisplayVisitor::setStereotypeController(StereotypeController *stereotype_controller)
+void StereotypeDisplayVisitor::setStereotypeController(StereotypeController *stereotypeController)
{
- m_stereotypeController = stereotype_controller;
+ m_stereotypeController = stereotypeController;
}
StereotypeIcon::Display StereotypeDisplayVisitor::getStereotypeIconDisplay() const
@@ -87,39 +87,39 @@ StereotypeIcon::Display StereotypeDisplayVisitor::getStereotypeIconDisplay() con
void StereotypeDisplayVisitor::visitDObject(const DObject *object)
{
- DObject::StereotypeDisplay stereotype_display = object->getStereotypeDisplay();
+ DObject::StereotypeDisplay stereotypeDisplay = object->getStereotypeDisplay();
m_stereotypeIconId = m_stereotypeController->findStereotypeIconId(m_stereotypeIconElement, object->getStereotypes());
- if (m_stereotypeIconId.isEmpty() && stereotype_display == DObject::STEREOTYPE_ICON) {
- stereotype_display = DObject::STEREOTYPE_LABEL;
- } else if (!m_stereotypeIconId.isEmpty() && stereotype_display == DObject::STEREOTYPE_SMART) {
- StereotypeIcon stereotype_icon = m_stereotypeController->findStereotypeIcon(m_stereotypeIconId);
- StereotypeIcon::Display icon_display = stereotype_icon.getDisplay();
- switch (icon_display) {
+ if (m_stereotypeIconId.isEmpty() && stereotypeDisplay == DObject::STEREOTYPE_ICON) {
+ stereotypeDisplay = DObject::STEREOTYPE_LABEL;
+ } else if (!m_stereotypeIconId.isEmpty() && stereotypeDisplay == DObject::STEREOTYPE_SMART) {
+ StereotypeIcon stereotypeIcon = m_stereotypeController->findStereotypeIcon(m_stereotypeIconId);
+ StereotypeIcon::Display iconDisplay = stereotypeIcon.getDisplay();
+ switch (iconDisplay) {
case StereotypeIcon::DISPLAY_NONE:
- stereotype_display = DObject::STEREOTYPE_NONE;
+ stereotypeDisplay = DObject::STEREOTYPE_NONE;
break;
case StereotypeIcon::DISPLAY_LABEL:
- stereotype_display = DObject::STEREOTYPE_LABEL;
+ stereotypeDisplay = DObject::STEREOTYPE_LABEL;
break;
case StereotypeIcon::DISPLAY_DECORATION:
- stereotype_display = DObject::STEREOTYPE_DECORATION;
+ stereotypeDisplay = DObject::STEREOTYPE_DECORATION;
break;
case StereotypeIcon::DISPLAY_ICON:
- stereotype_display = DObject::STEREOTYPE_ICON;
+ stereotypeDisplay = DObject::STEREOTYPE_ICON;
break;
case StereotypeIcon::DISPLAY_SMART:
- stereotype_display = m_stereotypeSmartDisplay;
+ stereotypeDisplay = m_stereotypeSmartDisplay;
break;
}
}
- if (stereotype_display == DObject::STEREOTYPE_SMART) {
- stereotype_display = DObject::STEREOTYPE_LABEL;
+ if (stereotypeDisplay == DObject::STEREOTYPE_SMART) {
+ stereotypeDisplay = DObject::STEREOTYPE_LABEL;
}
- if (stereotype_display == DObject::STEREOTYPE_ICON && m_shapeIconId.isEmpty()) {
+ if (stereotypeDisplay == DObject::STEREOTYPE_ICON && m_shapeIconId.isEmpty()) {
m_shapeIconId = m_stereotypeIconId;
}
- m_stereotypeDisplay = stereotype_display;
+ m_stereotypeDisplay = stereotypeDisplay;
}
void StereotypeDisplayVisitor::visitDPackage(const DPackage *package)
@@ -132,12 +132,12 @@ void StereotypeDisplayVisitor::visitDPackage(const DPackage *package)
void StereotypeDisplayVisitor::visitDClass(const DClass *klass)
{
m_stereotypeIconElement = StereotypeIcon::ELEMENT_CLASS;
- MClass *model_klass = m_modelController->findObject<MClass>(klass->getModelUid());
- bool has_members = false;
- if (!model_klass->getMembers().isEmpty() && klass->getShowAllMembers()) {
- has_members = true;
+ MClass *modelKlass = m_modelController->findObject<MClass>(klass->getModelUid());
+ bool hasMembers = false;
+ if (!modelKlass->getMembers().isEmpty() && klass->getShowAllMembers()) {
+ hasMembers = true;
}
- m_stereotypeSmartDisplay = has_members ? DObject::STEREOTYPE_DECORATION : DObject::STEREOTYPE_ICON;
+ m_stereotypeSmartDisplay = hasMembers ? DObject::STEREOTYPE_DECORATION : DObject::STEREOTYPE_ICON;
visitDObject(klass);
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/stereotypedisplayvisitor.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/stereotypedisplayvisitor.h
index e44b63207b8203ac57539de11d4345a0ab829eae..f3712fdcdd4e1d1218ebc788a2693a71bd07fbbe 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/items/stereotypedisplayvisitor.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/items/stereotypedisplayvisitor.h
@@ -52,9 +52,9 @@ public:
public:
- void setModelController(ModelController *model_controller);
+ void setModelController(ModelController *modelController);
- void setStereotypeController(StereotypeController *stereotype_controller);
+ void setStereotypeController(StereotypeController *stereotypeController);
DObject::StereotypeDisplay getStereotypeDisplay() const { return m_stereotypeDisplay; }
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.cpp
index a23c02f494bc576a6d4278aa8f3f20144f5698bc..af8594e9f9d7dd4b444d27ff8f715f6d44bad98b 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.cpp
@@ -72,28 +72,28 @@ LatchController::~LatchController()
delete m_horizontalAlignLine;
}
-void LatchController::setDiagramSceneModel(DiagramSceneModel *diagram_scene_model)
+void LatchController::setDiagramSceneModel(DiagramSceneModel *diagramSceneModel)
{
- m_diagramSceneModel = diagram_scene_model;
+ m_diagramSceneModel = diagramSceneModel;
}
-void LatchController::addToGraphicsScene(QGraphicsScene *graphics_scene)
+void LatchController::addToGraphicsScene(QGraphicsScene *graphicsScene)
{
- QMT_CHECK(graphics_scene);
- graphics_scene->addItem(m_horizontalAlignLine);
- graphics_scene->addItem(m_verticalAlignLine);
+ QMT_CHECK(graphicsScene);
+ graphicsScene->addItem(m_horizontalAlignLine);
+ graphicsScene->addItem(m_verticalAlignLine);
}
-void LatchController::removeFromGraphicsScene(QGraphicsScene *graphics_scene)
+void LatchController::removeFromGraphicsScene(QGraphicsScene *graphicsScene)
{
- Q_UNUSED(graphics_scene); // avoid warning in release mode
+ Q_UNUSED(graphicsScene); // avoid warning in release mode
if (m_verticalAlignLine->scene()) {
- QMT_CHECK(graphics_scene == m_verticalAlignLine->scene());
+ QMT_CHECK(graphicsScene == m_verticalAlignLine->scene());
m_verticalAlignLine->scene()->removeItem(m_verticalAlignLine);
}
if (m_horizontalAlignLine->scene()) {
- QMT_CHECK(graphics_scene == m_horizontalAlignLine->scene());
+ QMT_CHECK(graphicsScene == m_horizontalAlignLine->scene());
m_horizontalAlignLine->scene()->removeItem(m_horizontalAlignLine);
}
}
@@ -119,51 +119,51 @@ void LatchController::mouseMoveEventLatching(QGraphicsSceneMouseEvent *event)
return;
}
- ILatchable *palped_latchable = dynamic_cast<ILatchable *>(m_diagramSceneModel->getFocusItem());
- if (!palped_latchable) {
+ ILatchable *palpedLatchable = dynamic_cast<ILatchable *>(m_diagramSceneModel->getFocusItem());
+ if (!palpedLatchable) {
return;
}
- ILatchable::Action horiz_action = ILatchable::MOVE;
- ILatchable::Action vert_action = ILatchable::MOVE;
+ ILatchable::Action horizAction = ILatchable::MOVE;
+ ILatchable::Action vertAction = ILatchable::MOVE;
- QList<ILatchable::Latch> palped_horizontals = palped_latchable->getHorizontalLatches(horiz_action, true);
- QList<ILatchable::Latch> palped_verticals = palped_latchable->getVerticalLatches(vert_action, true);
+ QList<ILatchable::Latch> palpedHorizontals = palpedLatchable->getHorizontalLatches(horizAction, true);
+ QList<ILatchable::Latch> palpedVerticals = palpedLatchable->getVerticalLatches(vertAction, true);
- qreal horiz_min_dist = 10.0;
- ILatchable::Latch best_horiz_latch;
- bool found_best_horiz = false;
- qreal vert_min_dist = 10.0;
- ILatchable::Latch best_vert_latch;
- bool found_best_vert = false;
+ qreal horizMinDist = 10.0;
+ ILatchable::Latch bestHorizLatch;
+ bool foundBestHoriz = false;
+ qreal vertMinDist = 10.0;
+ ILatchable::Latch bestVertLatch;
+ bool foundBestVert = false;
foreach (QGraphicsItem *item, m_diagramSceneModel->getGraphicsItems()) {
if (item != m_diagramSceneModel->getFocusItem() && !m_diagramSceneModel->isSelectedItem(item)) {
if (ILatchable *latchable = dynamic_cast<ILatchable *>(item)) {
- QList<ILatchable::Latch> horizontals = latchable->getHorizontalLatches(horiz_action, false);
- foreach (const ILatchable::Latch &palped_latch, palped_horizontals) {
+ QList<ILatchable::Latch> horizontals = latchable->getHorizontalLatches(horizAction, false);
+ foreach (const ILatchable::Latch &palpedLatch, palpedHorizontals) {
foreach (const ILatchable::Latch &latch, horizontals) {
- if (palped_latch.m_latchType == latch.m_latchType) {
+ if (palpedLatch.m_latchType == latch.m_latchType) {
// calculate distance and minimal distance with sign because this is needed later to move the objects
- qreal dist = latch.m_pos - palped_latch.m_pos;
- if (qAbs(dist) < qAbs(horiz_min_dist)) {
- horiz_min_dist = dist;
- best_horiz_latch = latch;
- found_best_horiz = true;
+ qreal dist = latch.m_pos - palpedLatch.m_pos;
+ if (qAbs(dist) < qAbs(horizMinDist)) {
+ horizMinDist = dist;
+ bestHorizLatch = latch;
+ foundBestHoriz = true;
}
}
}
}
- QList<ILatchable::Latch> verticals = latchable->getVerticalLatches(vert_action, false);
- foreach (const ILatchable::Latch &palped_latch, palped_verticals) {
+ QList<ILatchable::Latch> verticals = latchable->getVerticalLatches(vertAction, false);
+ foreach (const ILatchable::Latch &palpedLatch, palpedVerticals) {
foreach (const ILatchable::Latch &latch, verticals) {
- if (palped_latch.m_latchType == latch.m_latchType) {
+ if (palpedLatch.m_latchType == latch.m_latchType) {
// calculate distance and minimal distance with sign because this is needed later to move the objects
- qreal dist = latch.m_pos - palped_latch.m_pos;
- if (qAbs(dist) < qAbs(vert_min_dist)) {
- vert_min_dist = dist;
- best_vert_latch = latch;
- found_best_vert = true;
+ qreal dist = latch.m_pos - palpedLatch.m_pos;
+ if (qAbs(dist) < qAbs(vertMinDist)) {
+ vertMinDist = dist;
+ bestVertLatch = latch;
+ foundBestVert = true;
}
}
}
@@ -172,16 +172,16 @@ void LatchController::mouseMoveEventLatching(QGraphicsSceneMouseEvent *event)
}
}
- if (found_best_horiz) {
- switch (best_horiz_latch.m_latchType) {
+ if (foundBestHoriz) {
+ switch (bestHorizLatch.m_latchType) {
case ILatchable::LEFT:
case ILatchable::RIGHT:
case ILatchable::HCENTER:
- m_verticalAlignLine->setLine(best_horiz_latch.m_pos, best_horiz_latch.m_otherPos1, best_horiz_latch.m_otherPos2);
+ m_verticalAlignLine->setLine(bestHorizLatch.m_pos, bestHorizLatch.m_otherPos1, bestHorizLatch.m_otherPos2);
m_verticalAlignLine->setVisible(true);
m_foundHorizontalLatch = true;
- m_horizontalLatch = best_horiz_latch;
- m_horizontalDist = horiz_min_dist;
+ m_horizontalLatch = bestHorizLatch;
+ m_horizontalDist = horizMinDist;
break;
case ILatchable::NONE:
case ILatchable::TOP:
@@ -194,16 +194,16 @@ void LatchController::mouseMoveEventLatching(QGraphicsSceneMouseEvent *event)
m_verticalAlignLine->setVisible(false);
}
- if (found_best_vert) {
- switch (best_vert_latch.m_latchType) {
+ if (foundBestVert) {
+ switch (bestVertLatch.m_latchType) {
case ILatchable::TOP:
case ILatchable::BOTTOM:
case ILatchable::VCENTER:
- m_horizontalAlignLine->setLine(best_vert_latch.m_pos, best_vert_latch.m_otherPos1, best_vert_latch.m_otherPos2);
+ m_horizontalAlignLine->setLine(bestVertLatch.m_pos, bestVertLatch.m_otherPos1, bestVertLatch.m_otherPos2);
m_horizontalAlignLine->setVisible(true);
m_foundVerticalLatch = true;
- m_verticalLatch = best_vert_latch;
- m_verticalDist = vert_min_dist;
+ m_verticalLatch = bestVertLatch;
+ m_verticalDist = vertMinDist;
break;
case ILatchable::NONE:
case ILatchable::LEFT:
@@ -228,12 +228,12 @@ void LatchController::mouseReleaseEventLatching(QGraphicsSceneMouseEvent *event)
case ILatchable::HCENTER:
foreach (QGraphicsItem *item, m_diagramSceneModel->getSelectedItems()) {
DElement *element = m_diagramSceneModel->getElement(item);
- if (DObject *selected_object = dynamic_cast<DObject *>(element)) {
- m_diagramSceneModel->getDiagramController()->startUpdateElement(selected_object, m_diagramSceneModel->getDiagram(), DiagramController::UPDATE_GEOMETRY);
- QPointF new_pos = selected_object->getPos();
- new_pos.setX(new_pos.x() + m_horizontalDist);
- selected_object->setPos(new_pos);
- m_diagramSceneModel->getDiagramController()->finishUpdateElement(selected_object, m_diagramSceneModel->getDiagram(), false);
+ if (DObject *selectedObject = dynamic_cast<DObject *>(element)) {
+ m_diagramSceneModel->getDiagramController()->startUpdateElement(selectedObject, m_diagramSceneModel->getDiagram(), DiagramController::UPDATE_GEOMETRY);
+ QPointF newPos = selectedObject->getPos();
+ newPos.setX(newPos.x() + m_horizontalDist);
+ selectedObject->setPos(newPos);
+ m_diagramSceneModel->getDiagramController()->finishUpdateElement(selectedObject, m_diagramSceneModel->getDiagram(), false);
}
}
break;
@@ -253,12 +253,12 @@ void LatchController::mouseReleaseEventLatching(QGraphicsSceneMouseEvent *event)
case ILatchable::VCENTER:
foreach (QGraphicsItem *item, m_diagramSceneModel->getSelectedItems()) {
DElement *element = m_diagramSceneModel->getElement(item);
- if (DObject *selected_object = dynamic_cast<DObject *>(element)) {
- m_diagramSceneModel->getDiagramController()->startUpdateElement(selected_object, m_diagramSceneModel->getDiagram(), DiagramController::UPDATE_GEOMETRY);
- QPointF new_pos = selected_object->getPos();
- new_pos.setY(new_pos.y() + m_verticalDist);
- selected_object->setPos(new_pos);
- m_diagramSceneModel->getDiagramController()->finishUpdateElement(selected_object, m_diagramSceneModel->getDiagram(), false);
+ if (DObject *selectedObject = dynamic_cast<DObject *>(element)) {
+ m_diagramSceneModel->getDiagramController()->startUpdateElement(selectedObject, m_diagramSceneModel->getDiagram(), DiagramController::UPDATE_GEOMETRY);
+ QPointF newPos = selectedObject->getPos();
+ newPos.setY(newPos.y() + m_verticalDist);
+ selectedObject->setPos(newPos);
+ m_diagramSceneModel->getDiagramController()->finishUpdateElement(selectedObject, m_diagramSceneModel->getDiagram(), false);
}
}
break;
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.h
index cec665a4dbec62da21e88689e08f5b19caf64c5e..40379f26d3b6782fea480f83defe7ab57f1efa0f 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/latchcontroller.h
@@ -61,13 +61,13 @@ public:
public:
- void setDiagramSceneModel(DiagramSceneModel *diagram_scene_model);
+ void setDiagramSceneModel(DiagramSceneModel *diagramSceneModel);
public:
- void addToGraphicsScene(QGraphicsScene *graphics_scene);
+ void addToGraphicsScene(QGraphicsScene *graphicsScene);
- void removeFromGraphicsScene(QGraphicsScene *graphics_scene);
+ void removeFromGraphicsScene(QGraphicsScene *graphicsScene);
void mousePressEventLatching(QGraphicsSceneMouseEvent *event);
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp
index 6f73267d5876006fb916d56910593679bd39a971..efdb07bc9ced6204d43b04e8370126491758dee6 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.cpp
@@ -45,9 +45,9 @@ class AlignButtonsItem::AlignButtonItem :
public QGraphicsRectItem
{
public:
- AlignButtonItem(IAlignable::AlignType align_type, const QString &identifier, IAlignable *alignable, QGraphicsItem *parent)
+ AlignButtonItem(IAlignable::AlignType alignType, const QString &identifier, IAlignable *alignable, QGraphicsItem *parent)
: QGraphicsRectItem(parent),
- m_alignType(align_type),
+ m_alignType(alignType),
m_identifier(identifier),
m_alignable(alignable),
m_pixmapItem(new QGraphicsPixmapItem(this))
@@ -138,49 +138,49 @@ void AlignButtonsItem::clear()
m_alignItems.clear();
}
-void AlignButtonsItem::addButton(IAlignable::AlignType align_type, const QString &identifier, qreal pos)
+void AlignButtonsItem::addButton(IAlignable::AlignType alignType, const QString &identifier, qreal pos)
{
- AlignButtonItem *item = new AlignButtonItem(align_type, identifier, m_alignable, this);
- switch (align_type) {
+ AlignButtonItem *item = new AlignButtonItem(alignType, identifier, m_alignable, this);
+ switch (alignType) {
case IAlignable::ALIGN_LEFT:
{
- static const QPixmap align_left_pixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-left.png")).scaled(NORMAL_PIXMAP_WIDTH, NORMAL_PIXMAP_HEIGHT, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
- item->setPixmap(align_left_pixmap);
+ static const QPixmap alignLeftPixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-left.png")).scaled(NORMAL_PIXMAP_WIDTH, NORMAL_PIXMAP_HEIGHT, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+ item->setPixmap(alignLeftPixmap);
item->setPos(pos - INNER_BORDER - 3.0, 0); // subtract additional shift of image within pixmap
break;
}
case IAlignable::ALIGN_RIGHT:
{
- static const QPixmap align_right_pixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-right.png")).scaled(NORMAL_PIXMAP_WIDTH, NORMAL_PIXMAP_HEIGHT, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
- item->setPixmap(align_right_pixmap);
+ static const QPixmap alignRightPixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-right.png")).scaled(NORMAL_PIXMAP_WIDTH, NORMAL_PIXMAP_HEIGHT, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+ item->setPixmap(alignRightPixmap);
item->setPos(pos - item->boundingRect().width() + INNER_BORDER + 3.0, 0);
break;
}
case IAlignable::ALIGN_TOP:
{
- static const QPixmap align_top_pixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-top.png")).scaled(NORMAL_PIXMAP_WIDTH, NORMAL_PIXMAP_HEIGHT, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
- item->setPixmap(align_top_pixmap);
+ static const QPixmap alignTopPixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-top.png")).scaled(NORMAL_PIXMAP_WIDTH, NORMAL_PIXMAP_HEIGHT, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+ item->setPixmap(alignTopPixmap);
item->setPos(0, pos - INNER_BORDER - 3.0);
break;
}
case IAlignable::ALIGN_BOTTOM:
{
- static const QPixmap align_bottom_pixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-bottom.png")).scaled(NORMAL_PIXMAP_WIDTH, NORMAL_PIXMAP_HEIGHT, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
- item->setPixmap(align_bottom_pixmap);
+ static const QPixmap alignBottomPixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-bottom.png")).scaled(NORMAL_PIXMAP_WIDTH, NORMAL_PIXMAP_HEIGHT, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+ item->setPixmap(alignBottomPixmap);
item->setPos(0, pos - item->boundingRect().height() + INNER_BORDER + 3.0);
break;
}
case IAlignable::ALIGN_HCENTER:
{
- static const QPixmap align_horizontal_pixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-horizontal.png")).scaled(NORMAL_PIXMAP_WIDTH, NORMAL_PIXMAP_HEIGHT, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
- item->setPixmap(align_horizontal_pixmap);
+ static const QPixmap alignHorizontalPixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-horizontal.png")).scaled(NORMAL_PIXMAP_WIDTH, NORMAL_PIXMAP_HEIGHT, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+ item->setPixmap(alignHorizontalPixmap);
item->setPos(pos - item->boundingRect().center().x(), 0);
break;
}
case IAlignable::ALIGN_VCENTER:
{
- static const QPixmap align_vertical_pixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-vertical.png")).scaled(NORMAL_PIXMAP_WIDTH, NORMAL_PIXMAP_HEIGHT, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
- item->setPixmap(align_vertical_pixmap);
+ static const QPixmap alignVerticalPixmap = QPixmap(QStringLiteral(":/modelinglib/25x25/align-vertical.png")).scaled(NORMAL_PIXMAP_WIDTH, NORMAL_PIXMAP_HEIGHT, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+ item->setPixmap(alignVerticalPixmap);
item->setPos(0, pos - item->boundingRect().center().y());
break;
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.h
index 9ed62a365fb8e8ae1caaed561d00f6f86ad6777f..97f6e1b47ec6f8210cb6783389306066966872b4 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignbuttonsitem.h
@@ -74,7 +74,7 @@ public:
void clear();
- void addButton(IAlignable::AlignType align_type, const QString &identifier, qreal pos);
+ void addButton(IAlignable::AlignType alignType, const QString &identifier, qreal pos);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignlineitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignlineitem.cpp
index 1089a7b561149052617967d44258e820e322229f..2fa0542f6dfc4c85805597b65cd56680eb07d1ff 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignlineitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignlineitem.cpp
@@ -56,20 +56,20 @@ void AlignLineItem::setLine(qreal pos)
setLine(pos, 0.0, 0.0);
}
-void AlignLineItem::setLine(qreal pos, qreal other_pos1, qreal other_pos2)
+void AlignLineItem::setLine(qreal pos, qreal otherPos1, qreal otherPos2)
{
- QRectF scene_rect = scene()->sceneRect();
+ QRectF sceneRect = scene()->sceneRect();
switch (m_direction) {
case HORIZONTAL:
- m_alignLine->setLine(scene_rect.left() + 1.0, pos, scene_rect.right() - 1.0, pos);
- m_highlightLine->setLine(other_pos1, pos, other_pos2, pos);
+ m_alignLine->setLine(sceneRect.left() + 1.0, pos, sceneRect.right() - 1.0, pos);
+ m_highlightLine->setLine(otherPos1, pos, otherPos2, pos);
break;
case VERTICAL:
- m_alignLine->setLine(pos, scene_rect.top() + 1.0, pos, scene_rect.bottom() - 1.0);
- m_highlightLine->setLine(pos, other_pos1, pos, other_pos2);
+ m_alignLine->setLine(pos, sceneRect.top() + 1.0, pos, sceneRect.bottom() - 1.0);
+ m_highlightLine->setLine(pos, otherPos1, pos, otherPos2);
break;
}
- m_highlightLine->setVisible(other_pos1 - other_pos2 != 0);
+ m_highlightLine->setVisible(otherPos1 - otherPos2 != 0);
}
QRectF AlignLineItem::boundingRect() const
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignlineitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignlineitem.h
index e9dd0022710d5261229a11c6e2a82addffd14479..6b0c05a816398be3646c57381c82afa1291944ef 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignlineitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/alignlineitem.h
@@ -55,7 +55,7 @@ public:
void setLine(qreal pos);
- void setLine(qreal pos, qreal other_pos1, qreal other_pos2);
+ void setLine(qreal pos, qreal otherPos1, qreal otherPos2);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/arrowitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/arrowitem.cpp
index 290993453d06b16623ffca11d67480a287141d3f..dfc1ba58236872cc86f8d7ccdda234e773a067c0 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/arrowitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/arrowitem.cpp
@@ -91,17 +91,17 @@ public:
}
}
- void setArrowSize(double arrow_size)
+ void setArrowSize(double arrowSize)
{
- if (m_arrowSize != arrow_size) {
- m_arrowSize = arrow_size;
+ if (m_arrowSize != arrowSize) {
+ m_arrowSize = arrowSize;
}
}
- void setDiamondSize(double diamond_size)
+ void setDiamondSize(double diamondSize)
{
- if (m_diamondSize != diamond_size) {
- m_diamondSize = diamond_size;
+ if (m_diamondSize != diamondSize) {
+ m_diamondSize = diamondSize;
}
}
@@ -187,28 +187,28 @@ public:
void update(const Style *style)
{
- bool has_arrow = false;
- bool has_diamond = false;
+ bool hasArrow = false;
+ bool hasDiamond = false;
switch (m_head) {
case ArrowItem::HEAD_NONE:
break;
case ArrowItem::HEAD_OPEN:
case ArrowItem::HEAD_TRIANGLE:
case ArrowItem::HEAD_FILLED_TRIANGLE:
- has_arrow = true;
+ hasArrow = true;
break;
case ArrowItem::HEAD_DIAMOND:
case ArrowItem::HEAD_FILLED_DIAMOND:
- has_diamond = true;
+ hasDiamond = true;
break;
case ArrowItem::HEAD_DIAMOND_FILLED_TRIANGLE:
case ArrowItem::HEAD_FILLED_DIAMOND_FILLED_TRIANGLE:
- has_arrow = true;
- has_diamond = true;
+ hasArrow = true;
+ hasDiamond = true;
break;
}
- if (has_arrow) {
+ if (hasArrow) {
if (!m_arrowItem) {
m_arrowItem = new ArrowItem::GraphicsPathItem(this);
}
@@ -229,7 +229,7 @@ public:
if (m_head != ArrowItem::HEAD_OPEN) {
path.closeSubpath();
}
- if (has_diamond) {
+ if (hasDiamond) {
path.translate(-calcDiamondLength(), 0.0);
}
m_arrowItem->setPath(path);
@@ -239,7 +239,7 @@ public:
m_arrowItem = 0;
}
- if (has_diamond) {
+ if (hasDiamond) {
if (!m_diamondItem) {
m_diamondItem = new ArrowItem::GraphicsPathItem(this);
}
@@ -329,17 +329,17 @@ void ArrowItem::setShaft(ArrowItem::Shaft shaft)
}
}
-void ArrowItem::setArrowSize(double arrow_size)
+void ArrowItem::setArrowSize(double arrowSize)
{
- if (m_arrowSize != arrow_size) {
- m_arrowSize = arrow_size;
+ if (m_arrowSize != arrowSize) {
+ m_arrowSize = arrowSize;
}
}
-void ArrowItem::setDiamondSize(double diamond_size)
+void ArrowItem::setDiamondSize(double diamondSize)
{
- if (m_diamondSize != diamond_size) {
- m_diamondSize = diamond_size;
+ if (m_diamondSize != diamondSize) {
+ m_diamondSize = diamondSize;
}
}
@@ -464,42 +464,42 @@ void ArrowItem::updateShaft(const Style *style)
m_shaftItem->setPen(pen);
}
-void ArrowItem::updateHead(GraphicsHeadItem **head_item, Head head, const Style *style)
+void ArrowItem::updateHead(GraphicsHeadItem **headItem, Head head, const Style *style)
{
if (head == HEAD_NONE) {
- if (*head_item) {
- if ((*head_item)->scene()) {
- (*head_item)->scene()->removeItem(*head_item);
+ if (*headItem) {
+ if ((*headItem)->scene()) {
+ (*headItem)->scene()->removeItem(*headItem);
}
- delete *head_item;
- *head_item = 0;
+ delete *headItem;
+ *headItem = 0;
}
return;
}
- if (!*head_item) {
- *head_item = new GraphicsHeadItem(this);
+ if (!*headItem) {
+ *headItem = new GraphicsHeadItem(this);
}
- (*head_item)->setArrowSize(m_arrowSize);
- (*head_item)->setDiamondSize(m_diamondSize);
- (*head_item)->setHead(head);
- (*head_item)->update(style);
+ (*headItem)->setArrowSize(m_arrowSize);
+ (*headItem)->setDiamondSize(m_diamondSize);
+ (*headItem)->setHead(head);
+ (*headItem)->update(style);
}
-void ArrowItem::updateHeadGeometry(GraphicsHeadItem **head_item, const QPointF &pos, const QPointF &other_pos)
+void ArrowItem::updateHeadGeometry(GraphicsHeadItem **headItem, const QPointF &pos, const QPointF &otherPos)
{
- if (!*head_item) {
+ if (!*headItem) {
return;
}
- (*head_item)->setPos(pos);
+ (*headItem)->setPos(pos);
- QVector2D direction_vector(pos - other_pos);
- direction_vector.normalize();
- double angle = qAcos(direction_vector.x()) * 180.0 / 3.1415926535;
- if (direction_vector.y() > 0.0) {
+ QVector2D directionVector(pos - otherPos);
+ directionVector.normalize();
+ double angle = qAcos(directionVector.x()) * 180.0 / 3.1415926535;
+ if (directionVector.y() > 0.0) {
angle = -angle;
}
- (*head_item)->setRotation(-angle);
+ (*headItem)->setRotation(-angle);
}
void ArrowItem::updateGeometry()
@@ -512,10 +512,10 @@ void ArrowItem::updateGeometry()
QPainterPath path;
if (m_startHeadItem) {
- QVector2D start_direction_vector(m_points[1] - m_points[0]);
- start_direction_vector.normalize();
- start_direction_vector *= m_startHeadItem->calcHeadLength();
- path.moveTo(m_points[0] + start_direction_vector.toPointF());
+ QVector2D startDirectionVector(m_points[1] - m_points[0]);
+ startDirectionVector.normalize();
+ startDirectionVector *= m_startHeadItem->calcHeadLength();
+ path.moveTo(m_points[0] + startDirectionVector.toPointF());
} else {
path.moveTo(m_points[0]);
}
@@ -525,10 +525,10 @@ void ArrowItem::updateGeometry()
}
if (m_endHeadItem) {
- QVector2D end_direction_vector(m_points[m_points.size() - 1] - m_points[m_points.size() - 2]);
- end_direction_vector.normalize();
- end_direction_vector *= m_endHeadItem->calcHeadLength();
- path.lineTo(m_points[m_points.size() - 1] - end_direction_vector.toPointF());
+ QVector2D endDirectionVector(m_points[m_points.size() - 1] - m_points[m_points.size() - 2]);
+ endDirectionVector.normalize();
+ endDirectionVector *= m_endHeadItem->calcHeadLength();
+ path.lineTo(m_points[m_points.size() - 1] - endDirectionVector.toPointF());
} else {
path.lineTo(m_points[m_points.size() - 1]);
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/arrowitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/arrowitem.h
index 60dc15db1515a8c9b0832b4ba1e774408db427af..704e08cd84ee532e47d613b1c374e874187597b9 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/arrowitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/arrowitem.h
@@ -79,9 +79,9 @@ public:
void setShaft(Shaft shaft);
- void setArrowSize(double arrow_size);
+ void setArrowSize(double arrowSize);
- void setDiamondSize(double diamond_size);
+ void setDiamondSize(double diamondSize);
void setStartHead(Head head);
@@ -115,9 +115,9 @@ private:
void updateShaft(const Style *style);
- void updateHead(GraphicsHeadItem **head_item, Head head, const Style *style);
+ void updateHead(GraphicsHeadItem **headItem, Head head, const Style *style);
- void updateHeadGeometry(GraphicsHeadItem **head_item, const QPointF &pos, const QPointF &other_pos);
+ void updateHeadGeometry(GraphicsHeadItem **headItem, const QPointF &pos, const QPointF &otherPos);
void updateGeometry();
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/contextlabelitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/contextlabelitem.cpp
index 5515b0162d6a3cb5f764e35172161b2bcb7b75df..9d4261bde83fdb5641785287438a107cafea259a 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/contextlabelitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/contextlabelitem.cpp
@@ -44,10 +44,10 @@ ContextLabelItem::~ContextLabelItem()
{
}
-void ContextLabelItem::setMaxWidth(double max_width)
+void ContextLabelItem::setMaxWidth(double maxWidth)
{
- if (m_maxWidth != max_width) {
- m_maxWidth = max_width;
+ if (m_maxWidth != maxWidth) {
+ m_maxWidth = maxWidth;
update();
}
}
@@ -77,12 +77,12 @@ void ContextLabelItem::update()
{
setText(QString(QStringLiteral("(from %1)")).arg(m_context));
if (m_maxWidth > 0.0) {
- double context_width = boundingRect().width();
- if (context_width > m_maxWidth) {
+ double contextWidth = boundingRect().width();
+ if (contextWidth > m_maxWidth) {
setText(QString(QStringLiteral("(%1)")).arg(m_context));
- context_width = boundingRect().width();
+ contextWidth = boundingRect().width();
}
- if (context_width > m_maxWidth) {
+ if (contextWidth > m_maxWidth) {
QFontMetricsF metrics(font());
setText(metrics.elidedText(QString(QStringLiteral("(%1)")).arg(m_context), Qt::ElideMiddle, m_maxWidth));
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/contextlabelitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/contextlabelitem.h
index 6c42cc51493018d120cd6910373bdd54f0c86aa5..b5a39ead48b235f37ee8be45020d356c811a3128 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/contextlabelitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/contextlabelitem.h
@@ -46,7 +46,7 @@ public:
public:
- void setMaxWidth(double max_width);
+ void setMaxWidth(double maxWidth);
void resetMaxWidth();
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/customiconitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/customiconitem.cpp
index bd8c972524f0e6b36b5c1af48c3da59a6d1e1dc8..eeb17d9346f1ff43edba60733aa2fcd2f0240696 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/customiconitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/customiconitem.cpp
@@ -40,9 +40,9 @@
namespace qmt {
-CustomIconItem::CustomIconItem(DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent)
+CustomIconItem::CustomIconItem(DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent)
: QGraphicsItem(parent),
- m_diagramSceneModel(diagram_scene_model),
+ m_diagramSceneModel(diagramSceneModel),
m_baseSize(20, 20),
m_actualSize(20, 20)
{
@@ -52,24 +52,24 @@ CustomIconItem::~CustomIconItem()
{
}
-void CustomIconItem::setStereotypeIconId(const QString &stereotype_icon_id)
+void CustomIconItem::setStereotypeIconId(const QString &stereotypeIconId)
{
- if (m_stereotypeIconId != stereotype_icon_id) {
- m_stereotypeIconId = stereotype_icon_id;
+ if (m_stereotypeIconId != stereotypeIconId) {
+ m_stereotypeIconId = stereotypeIconId;
m_stereotypeIcon = m_diagramSceneModel->getStereotypeController()->findStereotypeIcon(m_stereotypeIconId);
m_baseSize = QSizeF(m_stereotypeIcon.getWidth(), m_stereotypeIcon.getHeight());
m_actualSize = m_baseSize;
}
}
-void CustomIconItem::setBaseSize(const QSizeF &base_size)
+void CustomIconItem::setBaseSize(const QSizeF &baseSize)
{
- m_baseSize = base_size;
+ m_baseSize = baseSize;
}
-void CustomIconItem::setActualSize(const QSizeF &actual_size)
+void CustomIconItem::setActualSize(const QSizeF &actualSize)
{
- m_actualSize = actual_size;
+ m_actualSize = actualSize;
}
void CustomIconItem::setBrush(const QBrush &brush)
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/customiconitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/customiconitem.h
index f08fcf1d2a78016593bce581583c86281eb6777a..98ecc7701c02a2ae2610a32af08f41c49d8092e0 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/customiconitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/customiconitem.h
@@ -51,17 +51,17 @@ class CustomIconItem :
public:
- CustomIconItem(DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent = 0);
+ CustomIconItem(DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
~CustomIconItem();
public:
- void setStereotypeIconId(const QString &stereotype_icon_id);
+ void setStereotypeIconId(const QString &stereotypeIconId);
- void setBaseSize(const QSizeF &base_size);
+ void setBaseSize(const QSizeF &baseSize);
- void setActualSize(const QSizeF &actual_size);
+ void setActualSize(const QSizeF &actualSize);
void setBrush(const QBrush &brush);
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.cpp
index 4d0b57f57a030ef20ebdd51f673bfc9593b9b9c3..3e588c34188fce9c4afa80a3b090aef074d8af37 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.cpp
@@ -61,20 +61,20 @@ public:
public:
- GraphicsHandleItem(int point_index, PathSelectionItem *parent)
+ GraphicsHandleItem(int pointIndex, PathSelectionItem *parent)
: QGraphicsRectItem(parent),
m_owner(parent),
- m_pointIndex(point_index),
+ m_pointIndex(pointIndex),
m_selection(NOT_SELECTED)
{
}
public:
- void setPointSize(const QSizeF &point_size)
+ void setPointSize(const QSizeF &pointSize)
{
- if (m_pointSize != point_size) {
- m_pointSize = point_size;
+ if (m_pointSize != pointSize) {
+ m_pointSize = pointSize;
update();
}
}
@@ -192,12 +192,12 @@ QPainterPath PathSelectionItem::shape() const
for (int i = 0; i < m_handles.size(); ++i) {
polygon.append(m_handles.at(i)->pos());
}
- QPainterPath polygon_path;
- polygon_path.addPolygon(polygon);
+ QPainterPath polygonPath;
+ polygonPath.addPolygon(polygon);
QPainterPathStroker ps;
ps.setWidth(16.0);
- polygon_path = ps.createStroke(polygon_path);
- shape.addPath(polygon_path);
+ polygonPath = ps.createStroke(polygonPath);
+ shape.addPath(polygonPath);
return shape;
}
@@ -221,20 +221,20 @@ QList<QPointF> PathSelectionItem::getPoints() const
void PathSelectionItem::setPoints(const QList<QPointF> &points)
{
prepareGeometryChange();
- int point_index = 0;
+ int pointIndex = 0;
foreach (const QPointF &point, points) {
GraphicsHandleItem *handle;
- if (point_index >= m_handles.size()) {
- handle = new GraphicsHandleItem(point_index, this);
+ if (pointIndex >= m_handles.size()) {
+ handle = new GraphicsHandleItem(pointIndex, this);
handle->setPointSize(m_pointSize);
m_handles.append(handle);
} else {
- handle = m_handles.at(point_index);
+ handle = m_handles.at(pointIndex);
}
handle->setPos(point);
- ++point_index;
+ ++pointIndex;
}
- while (m_handles.size() > point_index) {
+ while (m_handles.size() > pointIndex) {
m_handles.last()->scene()->removeItem(m_handles.last());
delete m_handles.last();
m_handles.removeLast();
@@ -242,10 +242,10 @@ void PathSelectionItem::setPoints(const QList<QPointF> &points)
update();
}
-void PathSelectionItem::setSecondarySelected(bool secondary_selected)
+void PathSelectionItem::setSecondarySelected(bool secondarySelected)
{
- if (m_secondarySelected != secondary_selected) {
- m_secondarySelected = secondary_selected;
+ if (m_secondarySelected != secondarySelected) {
+ m_secondarySelected = secondarySelected;
update();
}
}
@@ -272,34 +272,34 @@ void PathSelectionItem::update()
int i = 0;
foreach (GraphicsHandleItem *handle, m_handles) {
handle->setPointSize(m_pointSize);
- bool is_end_point = (i == 0 || i == m_handles.size() - 1);
+ bool isEndPoint = (i == 0 || i == m_handles.size() - 1);
handle->setSelection(m_secondarySelected
- ? (is_end_point ? GraphicsHandleItem::NOT_SELECTED : GraphicsHandleItem::SECONDARY_SELECTED)
+ ? (isEndPoint ? GraphicsHandleItem::NOT_SELECTED : GraphicsHandleItem::SECONDARY_SELECTED)
: GraphicsHandleItem::SELECTED);
++i;
}
}
-void PathSelectionItem::moveHandle(int point_index, const QPointF &delta_move, HandleStatus handle_status, HandleQualifier handle_qualifier)
+void PathSelectionItem::moveHandle(int pointIndex, const QPointF &deltaMove, HandleStatus handleStatus, HandleQualifier handleQualifier)
{
- Q_UNUSED(handle_status);
+ Q_UNUSED(handleStatus);
- switch (handle_qualifier) {
+ switch (handleQualifier) {
case NONE:
{
- if (handle_status == PRESS) {
- m_originalHandlePos = m_windable->getHandlePos(point_index);
+ if (handleStatus == PRESS) {
+ m_originalHandlePos = m_windable->getHandlePos(pointIndex);
}
- QPointF new_pos = m_originalHandlePos + delta_move;
- m_windable->setHandlePos(point_index, new_pos);
- if (handle_status == RELEASE) {
- m_windable->alignHandleToRaster(point_index, RASTER_WIDTH, RASTER_HEIGHT);
+ QPointF newPos = m_originalHandlePos + deltaMove;
+ m_windable->setHandlePos(pointIndex, newPos);
+ if (handleStatus == RELEASE) {
+ m_windable->alignHandleToRaster(pointIndex, RASTER_WIDTH, RASTER_HEIGHT);
}
break;
}
case DELETE_HANDLE:
- if (handle_status == PRESS) {
- m_windable->deleteHandle(point_index);
+ if (handleStatus == PRESS) {
+ m_windable->deleteHandle(pointIndex);
}
break;
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.h
index ce85ca82c8f10d96665f81ccc7c06b1678cf8f9b..465ca9917c5ccee210deed5f9f99a1b9221e3556 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/pathselectionitem.h
@@ -81,7 +81,7 @@ public:
void setPoints(const QList<QPointF> &points);
- void setSecondarySelected(bool secondary_selected);
+ void setSecondarySelected(bool secondarySelected);
protected:
@@ -91,7 +91,7 @@ private:
void update();
- void moveHandle(int point_index, const QPointF &delta_move, HandleStatus handle_status, HandleQualifier handle_qualifier);
+ void moveHandle(int pointIndex, const QPointF &deltaMove, HandleStatus handleStatus, HandleQualifier handleQualifier);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/rectangularselectionitem.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/rectangularselectionitem.cpp
index fe88722df5693c205087755d389ca34139b486ab..6413f60549287862499a28182cbea0ce567bb080 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/rectangularselectionitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/rectangularselectionitem.cpp
@@ -58,11 +58,11 @@ public:
setBrush(QBrush(Qt::black));
}
- void setSecondarySelected(bool secondary_selected)
+ void setSecondarySelected(bool secondarySelected)
{
- if (secondary_selected != m_secondarySelected) {
- m_secondarySelected = secondary_selected;
- if (secondary_selected) {
+ if (secondarySelected != m_secondarySelected) {
+ m_secondarySelected = secondarySelected;
+ if (secondarySelected) {
setPen(QPen(Qt::lightGray));
setBrush(Qt::NoBrush);
@@ -112,9 +112,9 @@ private:
};
-RectangularSelectionItem::RectangularSelectionItem(IResizable *item_resizer, QGraphicsItem *parent)
+RectangularSelectionItem::RectangularSelectionItem(IResizable *itemResizer, QGraphicsItem *parent)
: QGraphicsItem(parent),
- m_itemResizer(item_resizer),
+ m_itemResizer(itemResizer),
m_pointSize(QSizeF(9.0, 9.0)),
m_points(8),
m_showBorder(false),
@@ -161,9 +161,9 @@ void RectangularSelectionItem::setPointSize(const QSizeF &size)
}
}
-void RectangularSelectionItem::setShowBorder(bool show_border)
+void RectangularSelectionItem::setShowBorder(bool showBorder)
{
- m_showBorder = show_border;
+ m_showBorder = showBorder;
}
void RectangularSelectionItem::setFreedom(Freedom freedom)
@@ -171,10 +171,10 @@ void RectangularSelectionItem::setFreedom(Freedom freedom)
m_freedom = freedom;
}
-void RectangularSelectionItem::setSecondarySelected(bool secondary_selected)
+void RectangularSelectionItem::setSecondarySelected(bool secondarySelected)
{
- if (secondary_selected != m_secondarySelected) {
- m_secondarySelected = secondary_selected;
+ if (secondarySelected != m_secondarySelected) {
+ m_secondarySelected = secondarySelected;
update();
}
}
@@ -219,15 +219,15 @@ void RectangularSelectionItem::update()
m_points[i]->setSecondarySelected(m_secondarySelected);
m_points[i]->setVisible(visible);
}
- double horiz_center = (m_rect.left() + m_rect.right()) * 0.5;
- double vert_center = (m_rect.top() + m_rect.bottom()) * 0.5;
+ double horizCenter = (m_rect.left() + m_rect.right()) * 0.5;
+ double vertCenter = (m_rect.top() + m_rect.bottom()) * 0.5;
m_points[0]->setPos(pos() + m_rect.topLeft());
- m_points[1]->setPos(pos() + QPointF(horiz_center, m_rect.top()));
+ m_points[1]->setPos(pos() + QPointF(horizCenter, m_rect.top()));
m_points[2]->setPos(pos() + m_rect.topRight());
- m_points[3]->setPos(pos() + QPointF(m_rect.left(), vert_center));
- m_points[4]->setPos(pos() + QPointF(m_rect.right(), vert_center));
+ m_points[3]->setPos(pos() + QPointF(m_rect.left(), vertCenter));
+ m_points[4]->setPos(pos() + QPointF(m_rect.right(), vertCenter));
m_points[5]->setPos(pos() + m_rect.bottomLeft());
- m_points[6]->setPos(pos() + QPointF(horiz_center, m_rect.bottom()));
+ m_points[6]->setPos(pos() + QPointF(horizCenter, m_rect.bottom()));
m_points[7]->setPos(pos() + m_rect.bottomRight());
if (m_showBorder) {
@@ -249,11 +249,11 @@ void RectangularSelectionItem::update()
}
}
-void RectangularSelectionItem::moveHandle(Handle handle, const QPointF &delta_move, HandleStatus handle_status, HandleQualifier handle_qualifier)
+void RectangularSelectionItem::moveHandle(Handle handle, const QPointF &deltaMove, HandleStatus handleStatus, HandleQualifier handleQualifier)
{
- Q_UNUSED(handle_qualifier);
+ Q_UNUSED(handleQualifier);
- if (handle_status == PRESS) {
+ if (handleStatus == PRESS) {
m_originalResizePos = m_itemResizer->getPos();
m_originalResizeRect = m_itemResizer->getRect();
}
@@ -289,34 +289,34 @@ void RectangularSelectionItem::moveHandle(Handle handle, const QPointF &delta_mo
return;
}
- QSizeF minimum_size = m_itemResizer->getMinimumSize();
+ QSizeF minimumSize = m_itemResizer->getMinimumSize();
- QPointF top_left_delta;
- QPointF bottom_right_delta;
+ QPointF topLeftDelta;
+ QPointF bottomRightDelta;
// calculate movements of corners
if (m_freedom == FREEDOM_KEEP_RATIO) {
- qreal minimum_length = qSqrt(minimum_size.width() * minimum_size.width() + minimum_size.height() * minimum_size.height());
- QPointF v(minimum_size.width() / minimum_length, minimum_size.height() / minimum_length);
- qreal delta_length = qSqrt(delta_move.x() * delta_move.x() + delta_move.y() * delta_move.y());
+ qreal minimumLength = qSqrt(minimumSize.width() * minimumSize.width() + minimumSize.height() * minimumSize.height());
+ QPointF v(minimumSize.width() / minimumLength, minimumSize.height() / minimumLength);
+ qreal deltaLength = qSqrt(deltaMove.x() * deltaMove.x() + deltaMove.y() * deltaMove.y());
switch (handle) {
case HANDLE_TOP_LEFT:
- if (delta_move.x() > 0 && delta_move.y() > 0) {
- top_left_delta = v * delta_length;
- } else if (delta_move.x() < 0 && delta_move.y() < 0) {
- top_left_delta = -(v * delta_length);
+ if (deltaMove.x() > 0 && deltaMove.y() > 0) {
+ topLeftDelta = v * deltaLength;
+ } else if (deltaMove.x() < 0 && deltaMove.y() < 0) {
+ topLeftDelta = -(v * deltaLength);
}
break;
case HANDLE_TOP:
QMT_CHECK(false);
break;
case HANDLE_TOP_RIGHT:
- if (delta_move.x() > 0 && delta_move.y() < 0) {
- top_left_delta = QPointF(0.0, -(v.x() * delta_length));
- bottom_right_delta = QPointF(v.y() * delta_length, 0.0);
- } else if (delta_move.x() < 0 && delta_move.y() > 0) {
- top_left_delta = QPointF(0.0, v.x() * delta_length);
- bottom_right_delta = QPointF(-(v.y() * delta_length), 0.0);
+ if (deltaMove.x() > 0 && deltaMove.y() < 0) {
+ topLeftDelta = QPointF(0.0, -(v.x() * deltaLength));
+ bottomRightDelta = QPointF(v.y() * deltaLength, 0.0);
+ } else if (deltaMove.x() < 0 && deltaMove.y() > 0) {
+ topLeftDelta = QPointF(0.0, v.x() * deltaLength);
+ bottomRightDelta = QPointF(-(v.y() * deltaLength), 0.0);
}
break;
case HANDLE_LEFT:
@@ -326,66 +326,66 @@ void RectangularSelectionItem::moveHandle(Handle handle, const QPointF &delta_mo
QMT_CHECK(false);
break;
case HANDLE_BOTTOM_LEFT:
- if (delta_move.x() < 0 && delta_move.y() > 0) {
- top_left_delta = QPointF(-(v.x() * delta_length), 0.0);
- bottom_right_delta = QPointF(0.0, v.y() * delta_length);
- } else if (delta_move.x() > 0 && delta_move.y() < 0) {
- top_left_delta = QPointF(v.x() * delta_length, 0.0);
- bottom_right_delta = QPointF(0.0, -(v.y() * delta_length));
+ if (deltaMove.x() < 0 && deltaMove.y() > 0) {
+ topLeftDelta = QPointF(-(v.x() * deltaLength), 0.0);
+ bottomRightDelta = QPointF(0.0, v.y() * deltaLength);
+ } else if (deltaMove.x() > 0 && deltaMove.y() < 0) {
+ topLeftDelta = QPointF(v.x() * deltaLength, 0.0);
+ bottomRightDelta = QPointF(0.0, -(v.y() * deltaLength));
}
break;
case HANDLE_BOTTOM:
QMT_CHECK(false);
break;
case HANDLE_BOTTOM_RIGHT:
- if (delta_move.x() > 0 && delta_move.y() > 0) {
- bottom_right_delta = v * delta_length;
- } else if (delta_move.x() < 0 && delta_move.y() < 0) {
- bottom_right_delta = -(v * delta_length);
+ if (deltaMove.x() > 0 && deltaMove.y() > 0) {
+ bottomRightDelta = v * deltaLength;
+ } else if (deltaMove.x() < 0 && deltaMove.y() < 0) {
+ bottomRightDelta = -(v * deltaLength);
}
break;
}
} else {
switch (handle) {
case HANDLE_TOP_LEFT:
- top_left_delta = delta_move;
+ topLeftDelta = deltaMove;
break;
case HANDLE_TOP:
- top_left_delta = QPointF(0.0, delta_move.y());
+ topLeftDelta = QPointF(0.0, deltaMove.y());
break;
case HANDLE_TOP_RIGHT:
- top_left_delta = QPointF(0, delta_move.y());
- bottom_right_delta = QPointF(delta_move.x(), 0.0);
+ topLeftDelta = QPointF(0, deltaMove.y());
+ bottomRightDelta = QPointF(deltaMove.x(), 0.0);
break;
case HANDLE_LEFT:
- top_left_delta = QPointF(delta_move.x(), 0.0);
+ topLeftDelta = QPointF(deltaMove.x(), 0.0);
break;
case HANDLE_RIGHT:
- bottom_right_delta = QPointF(delta_move.x(), 0.0);
+ bottomRightDelta = QPointF(deltaMove.x(), 0.0);
break;
case HANDLE_BOTTOM_LEFT:
- top_left_delta = QPointF(delta_move.x(), 0.0);
- bottom_right_delta = QPointF(0.0, delta_move.y());
+ topLeftDelta = QPointF(deltaMove.x(), 0.0);
+ bottomRightDelta = QPointF(0.0, deltaMove.y());
break;
case HANDLE_BOTTOM:
- bottom_right_delta = QPointF(0.0, delta_move.y());
+ bottomRightDelta = QPointF(0.0, deltaMove.y());
break;
case HANDLE_BOTTOM_RIGHT:
- bottom_right_delta = delta_move;
+ bottomRightDelta = deltaMove;
break;
}
}
- QRectF new_rect = m_originalResizeRect.adjusted(top_left_delta.x(), top_left_delta.y(), bottom_right_delta.x(), bottom_right_delta.y());
- QSizeF size_delta = minimum_size - new_rect.size();
+ QRectF newRect = m_originalResizeRect.adjusted(topLeftDelta.x(), topLeftDelta.y(), bottomRightDelta.x(), bottomRightDelta.y());
+ QSizeF sizeDelta = minimumSize - newRect.size();
// correct horizontal resize against minimum width
switch (handle) {
case HANDLE_TOP_LEFT:
case HANDLE_LEFT:
case HANDLE_BOTTOM_LEFT:
- if (size_delta.width() > 0.0) {
- top_left_delta.setX(top_left_delta.x() - size_delta.width());
+ if (sizeDelta.width() > 0.0) {
+ topLeftDelta.setX(topLeftDelta.x() - sizeDelta.width());
}
break;
case HANDLE_TOP:
@@ -394,8 +394,8 @@ void RectangularSelectionItem::moveHandle(Handle handle, const QPointF &delta_mo
case HANDLE_TOP_RIGHT:
case HANDLE_RIGHT:
case HANDLE_BOTTOM_RIGHT:
- if (size_delta.width() > 0.0) {
- bottom_right_delta.setX(bottom_right_delta.x() + size_delta.width());
+ if (sizeDelta.width() > 0.0) {
+ bottomRightDelta.setX(bottomRightDelta.x() + sizeDelta.width());
}
break;
}
@@ -405,8 +405,8 @@ void RectangularSelectionItem::moveHandle(Handle handle, const QPointF &delta_mo
case HANDLE_TOP_LEFT:
case HANDLE_TOP:
case HANDLE_TOP_RIGHT:
- if (size_delta.height() > 0.0) {
- top_left_delta.setY(top_left_delta.y() - size_delta.height());
+ if (sizeDelta.height() > 0.0) {
+ topLeftDelta.setY(topLeftDelta.y() - sizeDelta.height());
}
break;
case HANDLE_LEFT:
@@ -415,15 +415,15 @@ void RectangularSelectionItem::moveHandle(Handle handle, const QPointF &delta_mo
case HANDLE_BOTTOM_LEFT:
case HANDLE_BOTTOM:
case HANDLE_BOTTOM_RIGHT:
- if (size_delta.height() > 0.0) {
- bottom_right_delta.setY(bottom_right_delta.y() + size_delta.height());
+ if (sizeDelta.height() > 0.0) {
+ bottomRightDelta.setY(bottomRightDelta.y() + sizeDelta.height());
}
break;
}
- m_itemResizer->setPosAndRect(m_originalResizePos, m_originalResizeRect, top_left_delta, bottom_right_delta);
+ m_itemResizer->setPosAndRect(m_originalResizePos, m_originalResizeRect, topLeftDelta, bottomRightDelta);
- if (handle_status == RELEASE) {
+ if (handleStatus == RELEASE) {
IResizable::Side horiz = IResizable::SIDE_NONE;
IResizable::Side vert = IResizable::SIDE_NONE;
switch (handle) {
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/rectangularselectionitem.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/rectangularselectionitem.h
index 469fcd41ccae566c6362fc0509b6728ddb20ed3f..fb97b289db4d8369a191338bf7494f90c66e2c2b 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/rectangularselectionitem.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/rectangularselectionitem.h
@@ -86,7 +86,7 @@ public:
public:
- RectangularSelectionItem(IResizable *item_resizer, QGraphicsItem *parent = 0);
+ RectangularSelectionItem(IResizable *itemResizer, QGraphicsItem *parent = 0);
~RectangularSelectionItem();
@@ -110,7 +110,7 @@ public:
bool getShowBorder() const { return m_showBorder; }
- void setShowBorder(bool show_border);
+ void setShowBorder(bool showBorder);
Freedom getFreedom() const { return m_freedom; }
@@ -118,13 +118,13 @@ public:
bool isSecondarySelected() const { return m_secondarySelected; }
- void setSecondarySelected(bool secondary_selected);
+ void setSecondarySelected(bool secondarySelected);
private:
void update();
- void moveHandle(Handle handle, const QPointF &delta_move, HandleStatus handle_status, HandleQualifier handle_qualifier);
+ void moveHandle(Handle handle, const QPointF &deltaMove, HandleStatus handleStatus, HandleQualifier handleQualifier);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.cpp
index a8b20c3f9d89646490bc8689dd439d9a917b2f69..29c2eb03c3c4a76e43f0bfe02a4e9ef263b50013 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.cpp
@@ -45,10 +45,10 @@
namespace qmt {
-RelationStarter::RelationStarter(IRelationable *owner, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent)
+RelationStarter::RelationStarter(IRelationable *owner, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent)
: QGraphicsRectItem(parent),
m_owner(owner),
- m_diagramSceneModel(diagram_scene_model),
+ m_diagramSceneModel(diagramSceneModel),
m_currentPreviewArrow(0)
{
setBrush(QBrush(QColor(192, 192, 192)));
@@ -78,7 +78,7 @@ void RelationStarter::paint(QPainter *painter, const QStyleOptionGraphicsItem *o
painter->restore();
}
-void RelationStarter::addArrow(const QString &id, ArrowItem::Shaft shaft, ArrowItem::Head end_head, ArrowItem::Head start_head)
+void RelationStarter::addArrow(const QString &id, ArrowItem::Shaft shaft, ArrowItem::Head endHead, ArrowItem::Head startHead)
{
QMT_CHECK(!id.isEmpty());
prepareGeometryChange();
@@ -86,8 +86,8 @@ void RelationStarter::addArrow(const QString &id, ArrowItem::Shaft shaft, ArrowI
arrow->setArrowSize(10.0);
arrow->setDiamondSize(15.0);
arrow->setShaft(shaft);
- arrow->setStartHead(start_head);
- arrow->setEndHead(end_head);
+ arrow->setStartHead(startHead);
+ arrow->setEndHead(endHead);
arrow->setPoints(QList<QPointF>() << QPointF(0.0, 10.0) << QPointF(15.0, 0.0));
arrow->setPos(6.0, m_arrows.size() * 20.0 + 8.0);
arrow->update(m_diagramSceneModel->getStyleController()->getRelationStarterStyle());
@@ -154,11 +154,11 @@ void RelationStarter::keyPressEvent(QKeyEvent *event)
}
}
-void RelationStarter::updateCurrentPreviewArrow(const QPointF &head_point)
+void RelationStarter::updateCurrentPreviewArrow(const QPointF &headPoint)
{
prepareGeometryChange();
m_currentPreviewArrow->setPoints(QList<QPointF>() << m_owner->getRelationStartPos()
- << m_currentPreviewArrowIntermediatePoints << head_point);
+ << m_currentPreviewArrowIntermediatePoints << headPoint);
m_currentPreviewArrow->update(m_diagramSceneModel->getStyleController()->getRelationStarterStyle());
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.h
index cee4c9e788aaa019de242f4807ed8ba1b2ce35c9..bb5e86047dbcf055ed1996d0562a67d2c8291e9f 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/relationstarter.h
@@ -48,7 +48,7 @@ class RelationStarter :
public QGraphicsRectItem
{
public:
- RelationStarter(IRelationable *owner, DiagramSceneModel *diagram_scene_model, QGraphicsItem *parent = 0);
+ RelationStarter(IRelationable *owner, DiagramSceneModel *diagramSceneModel, QGraphicsItem *parent = 0);
~RelationStarter();
@@ -60,7 +60,7 @@ public:
public:
- void addArrow(const QString &id, ArrowItem::Shaft shaft, ArrowItem::Head end_head, ArrowItem::Head start_head = ArrowItem::HEAD_NONE);
+ void addArrow(const QString &id, ArrowItem::Shaft shaft, ArrowItem::Head endHead, ArrowItem::Head startHead = ArrowItem::HEAD_NONE);
protected:
@@ -74,7 +74,7 @@ protected:
private:
- void updateCurrentPreviewArrow(const QPointF &head_point);
+ void updateCurrentPreviewArrow(const QPointF &headPoint);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/templateparameterbox.cpp b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/templateparameterbox.cpp
index 368ff22abf1f931bd0c6b846b95325591bf29358..ad4394e72195c4875058f82b1f052a5a82c9e9b4 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/templateparameterbox.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/templateparameterbox.cpp
@@ -63,39 +63,39 @@ void TemplateParameterBox::setTextBrush(const QBrush &brush)
}
}
-void TemplateParameterBox::setTemplateParameters(const QList<QString> &template_parameters)
+void TemplateParameterBox::setTemplateParameters(const QList<QString> &templateParameters)
{
- if (m_templateParameters != template_parameters) {
- m_templateParameters = template_parameters;
+ if (m_templateParameters != templateParameters) {
+ m_templateParameters = templateParameters;
updateText();
}
}
-void TemplateParameterBox::setBreakLines(bool break_lines)
+void TemplateParameterBox::setBreakLines(bool breakLines)
{
- if (break_lines != m_breakLines) {
- m_breakLines = break_lines;
+ if (breakLines != m_breakLines) {
+ m_breakLines = breakLines;
updateText();
}
}
void TemplateParameterBox::updateText()
{
- QString template_text;
+ QString templateText;
bool first = true;
foreach (const QString ¶meter, m_templateParameters) {
if (!first) {
if (m_breakLines) {
- template_text += QLatin1Char('\n');
+ templateText += QLatin1Char('\n');
} else {
- template_text += QStringLiteral(", ");
+ templateText += QStringLiteral(", ");
}
}
- template_text += parameter;
+ templateText += parameter;
first = false;
}
- if (template_text != m_parametersText->text()) {
- m_parametersText->setText(template_text);
+ if (templateText != m_parametersText->text()) {
+ m_parametersText->setText(templateText);
update();
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/templateparameterbox.h b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/templateparameterbox.h
index d77129e54aceb8469da9de7bdb01f85b70df1c56..80359c20044dc3aa038029636b7aacc6f94534bf 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/templateparameterbox.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_scene/parts/templateparameterbox.h
@@ -49,9 +49,9 @@ public:
void setTextBrush(const QBrush &brush);
- void setTemplateParameters(const QList<QString> &template_parameters);
+ void setTemplateParameters(const QList<QString> &templateParameters);
- void setBreakLines(bool break_lines);
+ void setBreakLines(bool breakLines);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.cpp b/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.cpp
index be69da46008498429e2f657afcfff4246324c23c..607db1d3cd4fae2fb94d66ab02bfce72de348d65 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.cpp
@@ -46,7 +46,7 @@ namespace qmt {
class DiagramsManager::ManagedDiagram {
public:
- ManagedDiagram(DiagramSceneModel *diagram_scene_model, const QString &diagram_name);
+ ManagedDiagram(DiagramSceneModel *diagramSceneModel, const QString &diagramName);
~ManagedDiagram();
@@ -62,9 +62,9 @@ private:
QString m_diagramName;
};
-DiagramsManager::ManagedDiagram::ManagedDiagram(DiagramSceneModel *diagram_scene_model, const QString &diagram_name)
- : m_diagramSceneModel(diagram_scene_model),
- m_diagramName(diagram_name)
+DiagramsManager::ManagedDiagram::ManagedDiagram(DiagramSceneModel *diagramSceneModel, const QString &diagramName)
+ : m_diagramSceneModel(diagramSceneModel),
+ m_diagramName(diagramName)
{
}
@@ -100,67 +100,67 @@ void DiagramsManager::setModel(TreeModel *model)
}
}
-void DiagramsManager::setDiagramsView(DiagramsViewInterface *diagrams_view)
+void DiagramsManager::setDiagramsView(DiagramsViewInterface *diagramsView)
{
- m_diagramsView = diagrams_view;
+ m_diagramsView = diagramsView;
}
-void DiagramsManager::setDiagramController(DiagramController *diagram_controller)
+void DiagramsManager::setDiagramController(DiagramController *diagramController)
{
if (m_diagramController) {
connect(m_diagramController, 0, this, 0);
}
- m_diagramController = diagram_controller;
- if (diagram_controller) {
- connect(diagram_controller, SIGNAL(diagramAboutToBeRemoved(const MDiagram*)), this, SLOT(removeDiagram(const MDiagram*)));
+ m_diagramController = diagramController;
+ if (diagramController) {
+ connect(diagramController, SIGNAL(diagramAboutToBeRemoved(const MDiagram*)), this, SLOT(removeDiagram(const MDiagram*)));
}
}
-void DiagramsManager::setDiagramSceneController(DiagramSceneController *diagram_scene_controller)
+void DiagramsManager::setDiagramSceneController(DiagramSceneController *diagramSceneController)
{
- m_diagramSceneController = diagram_scene_controller;
+ m_diagramSceneController = diagramSceneController;
}
-void DiagramsManager::setStyleController(StyleController *style_controller)
+void DiagramsManager::setStyleController(StyleController *styleController)
{
- m_styleController = style_controller;
+ m_styleController = styleController;
}
-void DiagramsManager::setStereotypeController(StereotypeController *stereotype_controller)
+void DiagramsManager::setStereotypeController(StereotypeController *stereotypeController)
{
- m_stereotypeController = stereotype_controller;
+ m_stereotypeController = stereotypeController;
}
DiagramSceneModel *DiagramsManager::bindDiagramSceneModel(MDiagram *diagram)
{
if (!m_diagramUidToManagedDiagramMap.contains(diagram->getUid())) {
- DiagramSceneModel *diagram_scene_model = new DiagramSceneModel();
- diagram_scene_model->setDiagramController(m_diagramController);
- diagram_scene_model->setDiagramSceneController(m_diagramSceneController);
- diagram_scene_model->setStyleController(m_styleController);
- diagram_scene_model->setStereotypeController(m_stereotypeController);
- diagram_scene_model->setDiagram(diagram);
- connect(diagram_scene_model, SIGNAL(diagramSceneActivated(const MDiagram*)), this, SIGNAL(diagramActivated(const MDiagram*)));
- connect(diagram_scene_model, SIGNAL(selectionChanged(const MDiagram*)), this, SIGNAL(diagramSelectionChanged(const MDiagram*)));
- ManagedDiagram *managed_diagram = new ManagedDiagram(diagram_scene_model, diagram->getName());
- m_diagramUidToManagedDiagramMap.insert(diagram->getUid(), managed_diagram);
+ DiagramSceneModel *diagramSceneModel = new DiagramSceneModel();
+ diagramSceneModel->setDiagramController(m_diagramController);
+ diagramSceneModel->setDiagramSceneController(m_diagramSceneController);
+ diagramSceneModel->setStyleController(m_styleController);
+ diagramSceneModel->setStereotypeController(m_stereotypeController);
+ diagramSceneModel->setDiagram(diagram);
+ connect(diagramSceneModel, SIGNAL(diagramSceneActivated(const MDiagram*)), this, SIGNAL(diagramActivated(const MDiagram*)));
+ connect(diagramSceneModel, SIGNAL(selectionChanged(const MDiagram*)), this, SIGNAL(diagramSelectionChanged(const MDiagram*)));
+ ManagedDiagram *managedDiagram = new ManagedDiagram(diagramSceneModel, diagram->getName());
+ m_diagramUidToManagedDiagramMap.insert(diagram->getUid(), managedDiagram);
}
return getDiagramSceneModel(diagram);
}
DiagramSceneModel *DiagramsManager::getDiagramSceneModel(const MDiagram *diagram) const
{
- const ManagedDiagram *managed_diagram = m_diagramUidToManagedDiagramMap.value(diagram->getUid());
- QMT_CHECK(managed_diagram);
- return managed_diagram->getDiagramSceneModel();
+ const ManagedDiagram *managedDiagram = m_diagramUidToManagedDiagramMap.value(diagram->getUid());
+ QMT_CHECK(managedDiagram);
+ return managedDiagram->getDiagramSceneModel();
}
void DiagramsManager::unbindDiagramSceneModel(const MDiagram *diagram)
{
QMT_CHECK(diagram);
- ManagedDiagram *managed_diagram = m_diagramUidToManagedDiagramMap.take(diagram->getUid());
- QMT_CHECK(managed_diagram);
- delete managed_diagram;
+ ManagedDiagram *managedDiagram = m_diagramUidToManagedDiagramMap.take(diagram->getUid());
+ QMT_CHECK(managedDiagram);
+ delete managedDiagram;
}
void DiagramsManager::openDiagram(MDiagram *diagram)
@@ -173,8 +173,8 @@ void DiagramsManager::openDiagram(MDiagram *diagram)
void DiagramsManager::removeDiagram(const MDiagram *diagram)
{
if (diagram) {
- ManagedDiagram *managed_diagram = m_diagramUidToManagedDiagramMap.value(diagram->getUid());
- if (managed_diagram) {
+ ManagedDiagram *managedDiagram = m_diagramUidToManagedDiagramMap.value(diagram->getUid());
+ if (managedDiagram) {
if (m_diagramsView) {
// closeDiagram() must call unbindDiagramSceneModel()
m_diagramsView->closeDiagram(diagram);
@@ -199,9 +199,9 @@ void DiagramsManager::onDataChanged(const QModelIndex &topleft, const QModelInde
QModelIndex index = m_model->index(row, 0, topleft.parent());
MDiagram *diagram = dynamic_cast<MDiagram *>(m_model->getElement(index));
if (diagram) {
- ManagedDiagram *managed_diagram = m_diagramUidToManagedDiagramMap.value(diagram->getUid());
- if (managed_diagram && managed_diagram->getDiagramName() != diagram->getName()) {
- managed_diagram->setDiagramName(diagram->getName());
+ ManagedDiagram *managedDiagram = m_diagramUidToManagedDiagramMap.value(diagram->getUid());
+ if (managedDiagram && managedDiagram->getDiagramName() != diagram->getName()) {
+ managedDiagram->setDiagramName(diagram->getName());
if (m_diagramsView) {
m_diagramsView->onDiagramRenamed(diagram);
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.h b/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.h
index 1ac19bedeb370fb5cfa85eda4637e112a2ee8b19..c0435a09f3c5256a6f3981be51c0fc77356fb024 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_ui/diagramsmanager.h
@@ -83,15 +83,15 @@ public:
void setModel(TreeModel *model);
- void setDiagramsView(DiagramsViewInterface *diagrams_view);
+ void setDiagramsView(DiagramsViewInterface *diagramsView);
- void setDiagramController(DiagramController *diagram_controller);
+ void setDiagramController(DiagramController *diagramController);
- void setDiagramSceneController(DiagramSceneController *diagram_scene_controller);
+ void setDiagramSceneController(DiagramSceneController *diagramSceneController);
- void setStyleController(StyleController *style_controller);
+ void setStyleController(StyleController *styleController);
- void setStereotypeController(StereotypeController *stereotype_controller);
+ void setStereotypeController(StereotypeController *stereotypeController);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.cpp b/src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.cpp
index 0667df962fc3aa223ff8f28a060734e9fa9bb26f..4f19973c4efdb81c0774e8f7b8c84141075a5465 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.cpp
@@ -52,9 +52,9 @@ SceneInspector::~SceneInspector()
{
}
-void SceneInspector::setDiagramsManager(DiagramsManager *diagrams_manager)
+void SceneInspector::setDiagramsManager(DiagramsManager *diagramsManager)
{
- m_diagramsManager = diagrams_manager;
+ m_diagramsManager = diagramsManager;
}
QSizeF SceneInspector::getRasterSize() const
@@ -64,10 +64,10 @@ QSizeF SceneInspector::getRasterSize() const
QSizeF SceneInspector::getMinimalSize(const DElement *element, const MDiagram *diagram) const
{
- DiagramSceneModel *diagram_scene_model = m_diagramsManager->getDiagramSceneModel(diagram);
- QMT_CHECK(diagram_scene_model);
- if (diagram_scene_model) {
- const QGraphicsItem *item = diagram_scene_model->getGraphicsItem(const_cast<DElement *>(element));
+ DiagramSceneModel *diagramSceneModel = m_diagramsManager->getDiagramSceneModel(diagram);
+ QMT_CHECK(diagramSceneModel);
+ if (diagramSceneModel) {
+ const QGraphicsItem *item = diagramSceneModel->getGraphicsItem(const_cast<DElement *>(element));
QMT_CHECK(item);
if (item) {
if (const IResizable *resizable = dynamic_cast<const IResizable *>(item)) {
@@ -81,10 +81,10 @@ QSizeF SceneInspector::getMinimalSize(const DElement *element, const MDiagram *d
IMoveable *SceneInspector::getMoveable(const DElement *element, const MDiagram *diagram) const
{
- DiagramSceneModel *diagram_scene_model = m_diagramsManager->getDiagramSceneModel(diagram);
- QMT_CHECK(diagram_scene_model);
- if (diagram_scene_model) {
- QGraphicsItem *item = diagram_scene_model->getGraphicsItem(const_cast<DElement *>(element));
+ DiagramSceneModel *diagramSceneModel = m_diagramsManager->getDiagramSceneModel(diagram);
+ QMT_CHECK(diagramSceneModel);
+ if (diagramSceneModel) {
+ QGraphicsItem *item = diagramSceneModel->getGraphicsItem(const_cast<DElement *>(element));
QMT_CHECK(item);
if (item) {
if (IMoveable *moveable = dynamic_cast<IMoveable *>(item)) {
@@ -98,10 +98,10 @@ IMoveable *SceneInspector::getMoveable(const DElement *element, const MDiagram *
IResizable *SceneInspector::getResizable(const DElement *element, const MDiagram *diagram) const
{
- DiagramSceneModel *diagram_scene_model = m_diagramsManager->getDiagramSceneModel(diagram);
- QMT_CHECK(diagram_scene_model);
- if (diagram_scene_model) {
- QGraphicsItem *item = diagram_scene_model->getGraphicsItem(const_cast<DElement *>(element));
+ DiagramSceneModel *diagramSceneModel = m_diagramsManager->getDiagramSceneModel(diagram);
+ QMT_CHECK(diagramSceneModel);
+ if (diagramSceneModel) {
+ QGraphicsItem *item = diagramSceneModel->getGraphicsItem(const_cast<DElement *>(element));
QMT_CHECK(item);
if (item) {
if (IResizable *resizeable = dynamic_cast<IResizable *>(item)) {
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.h b/src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.h
index a80f080ddd9377ae4a8f85d08c07713d5934ec7a..ace6b11e1059df5f855af8e23ed126697f97d2cc 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_ui/sceneinspector.h
@@ -49,7 +49,7 @@ public:
public:
- void setDiagramsManager(DiagramsManager *diagrams_manager);
+ void setDiagramsManager(DiagramsManager *diagramsManager);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.cpp b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.cpp
index 4a022f2493cc13a822636143c18c03952da8dcf8..3bb18bdb049d9f14cce687021e178a8d746c940b 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.cpp
@@ -56,24 +56,24 @@ DiagramsView::~DiagramsView()
{
}
-void DiagramsView::setDiagramsManager(DiagramsManager *diagrams_manager)
+void DiagramsView::setDiagramsManager(DiagramsManager *diagramsManager)
{
- m_diagramsManager = diagrams_manager;
+ m_diagramsManager = diagramsManager;
}
void DiagramsView::openDiagram(MDiagram *diagram)
{
QMT_CHECK(diagram);
- DiagramView *diagram_view = m_diagramViews.value(diagram->getUid());
- if (!diagram_view) {
- DiagramSceneModel *diagram_scene_model = m_diagramsManager->bindDiagramSceneModel(diagram);
- DiagramView *diagram_view = new DiagramView(this);
- diagram_view->setDiagramSceneModel(diagram_scene_model);
- int tab_index = addTab(diagram_view, diagram->getName());
- setCurrentIndex(tab_index);
- m_diagramViews.insert(diagram->getUid(), diagram_view);
+ DiagramView *diagramView = m_diagramViews.value(diagram->getUid());
+ if (!diagramView) {
+ DiagramSceneModel *diagramSceneModel = m_diagramsManager->bindDiagramSceneModel(diagram);
+ DiagramView *diagramView = new DiagramView(this);
+ diagramView->setDiagramSceneModel(diagramSceneModel);
+ int tabIndex = addTab(diagramView, diagram->getName());
+ setCurrentIndex(tabIndex);
+ m_diagramViews.insert(diagram->getUid(), diagramView);
} else {
- setCurrentWidget(diagram_view);
+ setCurrentWidget(diagramView);
}
emit someDiagramOpened(!m_diagramViews.isEmpty());
}
@@ -84,10 +84,10 @@ void DiagramsView::closeDiagram(const MDiagram *diagram)
return;
}
- DiagramView *diagram_view = m_diagramViews.value(diagram->getUid());
- if (diagram_view) {
- removeTab(indexOf(diagram_view));
- delete diagram_view;
+ DiagramView *diagramView = m_diagramViews.value(diagram->getUid());
+ if (diagramView) {
+ removeTab(indexOf(diagramView));
+ delete diagramView;
m_diagramViews.remove(diagram->getUid());
}
emit someDiagramOpened(!m_diagramViews.isEmpty());
@@ -96,24 +96,24 @@ void DiagramsView::closeDiagram(const MDiagram *diagram)
void DiagramsView::closeAllDiagrams()
{
for (int i = count() - 1; i >= 0; --i) {
- DiagramView *diagram_view = dynamic_cast<DiagramView *>(widget(i));
- if (diagram_view) {
+ DiagramView *diagramView = dynamic_cast<DiagramView *>(widget(i));
+ if (diagramView) {
removeTab(i);
- delete diagram_view;
+ delete diagramView;
}
}
m_diagramViews.clear();
emit someDiagramOpened(!m_diagramViews.isEmpty());
}
-void DiagramsView::onCurrentChanged(int tab_index)
+void DiagramsView::onCurrentChanged(int tabIndex)
{
- emit currentDiagramChanged(getDiagram(tab_index));
+ emit currentDiagramChanged(getDiagram(tabIndex));
}
-void DiagramsView::onTabCloseRequested(int tab_index)
+void DiagramsView::onTabCloseRequested(int tabIndex)
{
- emit diagramCloseRequested(getDiagram(tab_index));
+ emit diagramCloseRequested(getDiagram(tabIndex));
}
void DiagramsView::onDiagramRenamed(const MDiagram *diagram)
@@ -121,24 +121,24 @@ void DiagramsView::onDiagramRenamed(const MDiagram *diagram)
if (!diagram) {
return;
}
- DiagramView *diagram_view = m_diagramViews.value(diagram->getUid());
- if (diagram_view) {
- setTabText(indexOf(diagram_view), diagram->getName());
+ DiagramView *diagramView = m_diagramViews.value(diagram->getUid());
+ if (diagramView) {
+ setTabText(indexOf(diagramView), diagram->getName());
}
}
-MDiagram *DiagramsView::getDiagram(int tab_index) const
+MDiagram *DiagramsView::getDiagram(int tabIndex) const
{
- DiagramView *diagram_view = dynamic_cast<DiagramView *>(widget(tab_index));
- return getDiagram(diagram_view);
+ DiagramView *diagramView = dynamic_cast<DiagramView *>(widget(tabIndex));
+ return getDiagram(diagramView);
}
-MDiagram *DiagramsView::getDiagram(DiagramView *diagram_view) const
+MDiagram *DiagramsView::getDiagram(DiagramView *diagramView) const
{
- if (!diagram_view || diagram_view->getDiagramSceneModel()) {
+ if (!diagramView || diagramView->getDiagramSceneModel()) {
return 0;
}
- return diagram_view->getDiagramSceneModel()->getDiagram();
+ return diagramView->getDiagramSceneModel()->getDiagram();
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.h b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.h
index 331887228babd793048e8fafa5e830b3b3727666..d2b913ff0942228c886d0b49a712aa017b250e28 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramsview.h
@@ -70,7 +70,7 @@ signals:
public:
- void setDiagramsManager(DiagramsManager *diagrams_manager);
+ void setDiagramsManager(DiagramsManager *diagramsManager);
public slots:
@@ -84,15 +84,15 @@ public slots:
private slots:
- void onCurrentChanged(int tab_index);
+ void onCurrentChanged(int tabIndex);
- void onTabCloseRequested(int tab_index);
+ void onTabCloseRequested(int tabIndex);
private:
- MDiagram *getDiagram(int tab_index) const;
+ MDiagram *getDiagram(int tabIndex) const;
- MDiagram *getDiagram(DiagramView * diagram_view) const;
+ MDiagram *getDiagram(DiagramView * diagramView) const;
private:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramview.cpp b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramview.cpp
index 54095f5a921abad686ee3bc8e0992337c06c15fe..af9dda234a3da75c065e6f93b6d9ebb381d0c325 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramview.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramview.cpp
@@ -63,11 +63,11 @@ DiagramSceneModel *DiagramView::getDiagramSceneModel() const
return m_diagramSceneModel;
}
-void DiagramView::setDiagramSceneModel(DiagramSceneModel *diagram_scene_model)
+void DiagramView::setDiagramSceneModel(DiagramSceneModel *diagramSceneModel)
{
setScene(0);
- m_diagramSceneModel = diagram_scene_model;
- if (diagram_scene_model)
+ m_diagramSceneModel = diagramSceneModel;
+ if (diagramSceneModel)
setScene(m_diagramSceneModel->getGraphicsScene());
}
@@ -75,10 +75,10 @@ void DiagramView::dragEnterEvent(QDragEnterEvent *event)
{
if (event->mimeData()->hasFormat(QLatin1String(MIME_TYPE_MODEL_ELEMENTS))) {
bool accept = false;
- QDataStream data_stream(event->mimeData()->data(QLatin1String(MIME_TYPE_MODEL_ELEMENTS)));
- while (data_stream.status() == QDataStream::Ok) {
+ QDataStream dataStream(event->mimeData()->data(QLatin1String(MIME_TYPE_MODEL_ELEMENTS)));
+ while (dataStream.status() == QDataStream::Ok) {
QString key;
- data_stream >> key;
+ dataStream >> key;
if (!key.isEmpty()) {
if (m_diagramSceneModel->getDiagramSceneController()->isAddingAllowed(Uid(key), m_diagramSceneModel->getDiagram())) {
accept = true;
@@ -88,12 +88,12 @@ void DiagramView::dragEnterEvent(QDragEnterEvent *event)
event->setAccepted(accept);
} else if (event->mimeData()->hasFormat(QLatin1String(MIME_TYPE_NEW_MODEL_ELEMENTS))) {
bool accept = false;
- QDataStream data_stream(event->mimeData()->data(QLatin1String(MIME_TYPE_NEW_MODEL_ELEMENTS)));
- while (data_stream.status() == QDataStream::Ok) {
- QString new_element_id;
- data_stream >> new_element_id;
- if (!new_element_id.isEmpty()) {
- // TODO ask a factory if new_element_id is a known type
+ QDataStream dataStream(event->mimeData()->data(QLatin1String(MIME_TYPE_NEW_MODEL_ELEMENTS)));
+ while (dataStream.status() == QDataStream::Ok) {
+ QString newElementId;
+ dataStream >> newElementId;
+ if (!newElementId.isEmpty()) {
+ // TODO ask a factory if newElementId is a known type
accept = true;
}
}
@@ -117,10 +117,10 @@ void DiagramView::dropEvent(QDropEvent *event)
{
event->setDropAction(Qt::MoveAction);
if (event->mimeData()->hasFormat(QLatin1String(MIME_TYPE_MODEL_ELEMENTS))) {
- QDataStream data_stream(event->mimeData()->data(QLatin1String(MIME_TYPE_MODEL_ELEMENTS)));
- while (data_stream.status() == QDataStream::Ok) {
+ QDataStream dataStream(event->mimeData()->data(QLatin1String(MIME_TYPE_MODEL_ELEMENTS)));
+ while (dataStream.status() == QDataStream::Ok) {
QString key;
- data_stream >> key;
+ dataStream >> key;
if (!key.isEmpty()) {
if (m_diagramSceneModel->getDiagramSceneController()->isAddingAllowed(Uid(key), m_diagramSceneModel->getDiagram())) {
m_diagramSceneModel->getDiagramSceneController()->addExistingModelElement(Uid(key), mapToScene(event->pos()), m_diagramSceneModel->getDiagram());
@@ -129,15 +129,15 @@ void DiagramView::dropEvent(QDropEvent *event)
}
event->accept();
} else if (event->mimeData()->hasFormat(QLatin1String(MIME_TYPE_NEW_MODEL_ELEMENTS))) {
- QDataStream data_stream(event->mimeData()->data(QLatin1String(MIME_TYPE_NEW_MODEL_ELEMENTS)));
- while (data_stream.status() == QDataStream::Ok) {
- QString new_element_id;
+ QDataStream dataStream(event->mimeData()->data(QLatin1String(MIME_TYPE_NEW_MODEL_ELEMENTS)));
+ while (dataStream.status() == QDataStream::Ok) {
+ QString newElementId;
QString name;
QString stereotype;
- data_stream >> new_element_id >> name >> stereotype;
- if (!new_element_id.isEmpty()) {
+ dataStream >> newElementId >> name >> stereotype;
+ if (!newElementId.isEmpty()) {
QPointF pos = mapToScene(event->pos());
- m_diagramSceneModel->getDiagramSceneController()->dropNewElement(new_element_id, name, stereotype, m_diagramSceneModel->findTopmostElement(pos), pos, m_diagramSceneModel->getDiagram());
+ m_diagramSceneModel->getDiagramSceneController()->dropNewElement(newElementId, name, stereotype, m_diagramSceneModel->findTopmostElement(pos), pos, m_diagramSceneModel->getDiagram());
}
}
event->accept();
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramview.h b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramview.h
index 0eb82738d2d0b7064cd4d0aa02817274b883d969..a0fc84954162134365ad00ad79b92ecdf4e1e6a8 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramview.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/diagramview.h
@@ -55,7 +55,7 @@ public:
DiagramSceneModel *getDiagramSceneModel() const;
- void setDiagramSceneModel(DiagramSceneModel *diagram_scene_model);
+ void setDiagramSceneModel(DiagramSceneModel *diagramSceneModel);
protected:
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.cpp b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.cpp
index 7d57147f94bb3fbce712306042dd1710a10d9179..889315c4cd078dea9a6b15420e6a7c0c736ee74c 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.cpp
+++ b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.cpp
@@ -52,24 +52,24 @@ StackedDiagramsView::~StackedDiagramsView()
{
}
-void StackedDiagramsView::setDiagramsManager(DiagramsManager *diagrams_manager)
+void StackedDiagramsView::setDiagramsManager(DiagramsManager *diagramsManager)
{
- m_diagramsManager = diagrams_manager;
+ m_diagramsManager = diagramsManager;
}
void StackedDiagramsView::openDiagram(MDiagram *diagram)
{
QMT_CHECK(diagram);
- DiagramView *diagram_view = m_diagramViews.value(diagram->getUid());
- if (!diagram_view) {
- DiagramSceneModel *diagram_scene_model = m_diagramsManager->bindDiagramSceneModel(diagram);
- DiagramView *diagram_view = new DiagramView(this);
- diagram_view->setDiagramSceneModel(diagram_scene_model);
- int tab_index = addWidget(diagram_view);
- setCurrentIndex(tab_index);
- m_diagramViews.insert(diagram->getUid(), diagram_view);
+ DiagramView *diagramView = m_diagramViews.value(diagram->getUid());
+ if (!diagramView) {
+ DiagramSceneModel *diagramSceneModel = m_diagramsManager->bindDiagramSceneModel(diagram);
+ DiagramView *diagramView = new DiagramView(this);
+ diagramView->setDiagramSceneModel(diagramSceneModel);
+ int tabIndex = addWidget(diagramView);
+ setCurrentIndex(tabIndex);
+ m_diagramViews.insert(diagram->getUid(), diagramView);
} else {
- setCurrentWidget(diagram_view);
+ setCurrentWidget(diagramView);
}
emit someDiagramOpened(!m_diagramViews.isEmpty());
}
@@ -80,10 +80,10 @@ void StackedDiagramsView::closeDiagram(const MDiagram *diagram)
return;
}
- DiagramView *diagram_view = m_diagramViews.value(diagram->getUid());
- if (diagram_view) {
- removeWidget(diagram_view);
- delete diagram_view;
+ DiagramView *diagramView = m_diagramViews.value(diagram->getUid());
+ if (diagramView) {
+ removeWidget(diagramView);
+ delete diagramView;
m_diagramViews.remove(diagram->getUid());
}
emit someDiagramOpened(!m_diagramViews.isEmpty());
@@ -92,19 +92,19 @@ void StackedDiagramsView::closeDiagram(const MDiagram *diagram)
void StackedDiagramsView::closeAllDiagrams()
{
for (int i = count() - 1; i >= 0; --i) {
- DiagramView *diagram_view = dynamic_cast<DiagramView *>(widget(i));
- if (diagram_view) {
- removeWidget(diagram_view);
- delete diagram_view;
+ DiagramView *diagramView = dynamic_cast<DiagramView *>(widget(i));
+ if (diagramView) {
+ removeWidget(diagramView);
+ delete diagramView;
}
}
m_diagramViews.clear();
emit someDiagramOpened(!m_diagramViews.isEmpty());
}
-void StackedDiagramsView::onCurrentChanged(int tab_index)
+void StackedDiagramsView::onCurrentChanged(int tabIndex)
{
- emit currentDiagramChanged(getDiagram(tab_index));
+ emit currentDiagramChanged(getDiagram(tabIndex));
}
void StackedDiagramsView::onDiagramRenamed(const MDiagram *diagram)
@@ -114,18 +114,18 @@ void StackedDiagramsView::onDiagramRenamed(const MDiagram *diagram)
// nothing to do!
}
-MDiagram *StackedDiagramsView::getDiagram(int tab_index) const
+MDiagram *StackedDiagramsView::getDiagram(int tabIndex) const
{
- DiagramView *diagram_view = dynamic_cast<DiagramView *>(widget(tab_index));
- return getDiagram(diagram_view);
+ DiagramView *diagramView = dynamic_cast<DiagramView *>(widget(tabIndex));
+ return getDiagram(diagramView);
}
-MDiagram *StackedDiagramsView::getDiagram(DiagramView *diagram_view) const
+MDiagram *StackedDiagramsView::getDiagram(DiagramView *diagramView) const
{
- if (!diagram_view || !diagram_view->getDiagramSceneModel()) {
+ if (!diagramView || !diagramView->getDiagramSceneModel()) {
return 0;
}
- return diagram_view->getDiagramSceneModel()->getDiagram();
+ return diagramView->getDiagramSceneModel()->getDiagram();
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.h b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.h
index 86f8e8cd929540fecc069d1bf715257f5f549578..7f0b5d445cb16edbeaa8313941e9ae94fe412388 100644
--- a/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.h
+++ b/src/libs/3rdparty/modeling/qmt/diagram_widgets_ui/stackeddiagramsview.h
@@ -70,7 +70,7 @@ signals:
public:
- void setDiagramsManager(DiagramsManager *diagrams_manager);
+ void setDiagramsManager(DiagramsManager *diagramsManager);
public slots:
@@ -84,13 +84,13 @@ public slots:
private slots:
- void onCurrentChanged(int tab_index);
+ void onCurrentChanged(int tabIndex);
private:
- MDiagram *getDiagram(int tab_index) const;
+ MDiagram *getDiagram(int tabIndex) const;
- MDiagram *getDiagram(DiagramView * diagram_view) const;
+ MDiagram *getDiagram(DiagramView * diagramView) const;
private:
diff --git a/src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.cpp b/src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.cpp
index 3105240b3cb8b04636c3a466115ad83417c4c56f..5ab5c5617686e4aef31ce742ac788c96eec2c026 100644
--- a/src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.cpp
+++ b/src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.cpp
@@ -181,10 +181,10 @@ void DocumentController::copyDiagram(const MDiagram *diagram)
m_diagramsManager->getDiagramSceneModel(diagram)->copyToClipboard();
}
-void DocumentController::pasteIntoModel(MObject *model_object)
+void DocumentController::pasteIntoModel(MObject *modelObject)
{
- if (model_object) {
- m_modelController->pasteElements(model_object, *m_modelClipboard);
+ if (modelObject) {
+ m_modelController->pasteElements(modelObject, *m_modelClipboard);
}
}
@@ -218,83 +218,83 @@ void DocumentController::selectAllOnDiagram(MDiagram *diagram)
MPackage *DocumentController::createNewPackage(MPackage *parent)
{
- MPackage *new_package = new MPackage();
- new_package->setName(tr("New Package"));
- m_modelController->addObject(parent, new_package);
- return new_package;
+ MPackage *newPackage = new MPackage();
+ newPackage->setName(tr("New Package"));
+ m_modelController->addObject(parent, newPackage);
+ return newPackage;
}
MClass *DocumentController::createNewClass(MPackage *parent)
{
- MClass *new_class = new MClass();
- new_class->setName(tr("New Class"));
- m_modelController->addObject(parent, new_class);
- return new_class;
+ MClass *newClass = new MClass();
+ newClass->setName(tr("New Class"));
+ m_modelController->addObject(parent, newClass);
+ return newClass;
}
MComponent *DocumentController::createNewComponent(MPackage *parent)
{
- MComponent *new_component = new MComponent();
- new_component->setName(tr("New Component"));
- m_modelController->addObject(parent, new_component);
- return new_component;
+ MComponent *newComponent = new MComponent();
+ newComponent->setName(tr("New Component"));
+ m_modelController->addObject(parent, newComponent);
+ return newComponent;
}
MCanvasDiagram *DocumentController::createNewCanvasDiagram(MPackage *parent)
{
- MCanvasDiagram *new_diagram = new MCanvasDiagram();
+ MCanvasDiagram *newDiagram = new MCanvasDiagram();
if (!m_diagramSceneController->findDiagramBySearchId(parent, parent->getName())) {
- new_diagram->setName(parent->getName());
+ newDiagram->setName(parent->getName());
} else {
- new_diagram->setName(tr("New Diagram"));
+ newDiagram->setName(tr("New Diagram"));
}
- m_modelController->addObject(parent, new_diagram);
- return new_diagram;
+ m_modelController->addObject(parent, newDiagram);
+ return newDiagram;
}
MDiagram *DocumentController::findRootDiagram()
{
FindRootDiagramVisitor visitor;
m_modelController->getRootPackage()->accept(&visitor);
- MDiagram *root_diagram = visitor.getDiagram();
- return root_diagram;
+ MDiagram *rootDiagram = visitor.getDiagram();
+ return rootDiagram;
}
MDiagram *DocumentController::findOrCreateRootDiagram()
{
- MDiagram *root_diagram = findRootDiagram();
- if (!root_diagram) {
- root_diagram = createNewCanvasDiagram(m_modelController->getRootPackage());
- m_modelController->startUpdateObject(root_diagram);
+ MDiagram *rootDiagram = findRootDiagram();
+ if (!rootDiagram) {
+ rootDiagram = createNewCanvasDiagram(m_modelController->getRootPackage());
+ m_modelController->startUpdateObject(rootDiagram);
if (m_projectController->getProject()->hasFileName()) {
- root_diagram->setName(NameController::convertFileNameToElementName(m_projectController->getProject()->getFileName()));
+ rootDiagram->setName(NameController::convertFileNameToElementName(m_projectController->getProject()->getFileName()));
}
- m_modelController->finishUpdateObject(root_diagram, false);
+ m_modelController->finishUpdateObject(rootDiagram, false);
}
- return root_diagram;
+ return rootDiagram;
}
-void DocumentController::createNewProject(const QString &file_name)
+void DocumentController::createNewProject(const QString &fileName)
{
m_diagramsManager->removeAllDiagrams();
m_treeModel->setModelController(0);
m_modelController->setRootPackage(0);
m_undoController->reset();
- m_projectController->newProject(file_name);
+ m_projectController->newProject(fileName);
m_treeModel->setModelController(m_modelController);
m_modelController->setRootPackage(m_projectController->getProject()->getRootPackage());
}
-void DocumentController::loadProject(const QString &file_name)
+void DocumentController::loadProject(const QString &fileName)
{
m_diagramsManager->removeAllDiagrams();
m_treeModel->setModelController(0);
m_modelController->setRootPackage(0);
m_undoController->reset();
- m_projectController->newProject(file_name);
+ m_projectController->newProject(fileName);
m_projectController->load();
m_treeModel->setModelController(m_modelController);
diff --git a/src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.h b/src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.h
index 3a173b14e5ac16e68b735229cac2ca46be41fa9e..1171ce1a2f3475b7763d611446b55cdd963f421d 100644
--- a/src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.h
+++ b/src/libs/3rdparty/modeling/qmt/document_controller/documentcontroller.h
@@ -72,9 +72,9 @@ signals:
void changed();
- void modelClipboardChanged(bool is_empty);
+ void modelClipboardChanged(bool isEmpty);
- void diagramClipboardChanged(bool is_empty);
+ void diagramClipboardChanged(bool isEmpty);
public:
@@ -122,7 +122,7 @@ public:
void copyDiagram(const MDiagram *diagram);
- void pasteIntoModel(MObject *model_object);
+ void pasteIntoModel(MObject *modelObject);
void pasteIntoDiagram(MDiagram *diagram);
@@ -152,9 +152,9 @@ public:
public:
- void createNewProject(const QString &file_name);
+ void createNewProject(const QString &fileName);
- void loadProject(const QString &file_name);
+ void loadProject(const QString &fileName);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/exceptions.cpp b/src/libs/3rdparty/modeling/qmt/infrastructure/exceptions.cpp
index 9ce571cd84ac7a46a13a4cdccf4bf7b1caa9891b..56c45358a54852e644104b9c3fcc8b8e082e290e 100644
--- a/src/libs/3rdparty/modeling/qmt/infrastructure/exceptions.cpp
+++ b/src/libs/3rdparty/modeling/qmt/infrastructure/exceptions.cpp
@@ -33,8 +33,8 @@
namespace qmt {
-Exception::Exception(const QString &err_msg)
- : m_errorMessage(err_msg)
+Exception::Exception(const QString &errMsg)
+ : m_errorMessage(errMsg)
{
}
diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/exceptions.h b/src/libs/3rdparty/modeling/qmt/infrastructure/exceptions.h
index eae7dbbd902f538bb22e420754c0698a75eed287..2473cef13d96a50b8b076bb190a887789e97f51a 100644
--- a/src/libs/3rdparty/modeling/qmt/infrastructure/exceptions.h
+++ b/src/libs/3rdparty/modeling/qmt/infrastructure/exceptions.h
@@ -39,11 +39,11 @@ namespace qmt {
class Exception
{
public:
- Exception(const QString &err_msg);
+ Exception(const QString &errMsg);
QString getErrorMsg() const { return m_errorMessage; }
- void setErrorMsg(const QString &err_msg) { m_errorMessage = err_msg; }
+ void setErrorMsg(const QString &errMsg) { m_errorMessage = errMsg; }
private:
QString m_errorMessage;
diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.cpp b/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.cpp
index 245a3079ee900b585c7ff22fba321be1c75fd89a..631ee124b1469c1bc35332a5261f62139ffee025 100644
--- a/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.cpp
+++ b/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.cpp
@@ -56,22 +56,22 @@ GeometryUtilities::GeometryUtilities()
{
}
-QLineF GeometryUtilities::stretch(const QLineF &line, double p1_extension, double p2_extension)
+QLineF GeometryUtilities::stretch(const QLineF &line, double p1Extension, double p2Extension)
{
QLineF direction = line.unitVector();
- QPointF stretched_p1 = line.p1() - (direction.p2() - direction.p1()) * p1_extension;
- QPointF stretched_p2 = line.p2() + (direction.p2() - direction.p1()) * p2_extension;
- return QLineF(stretched_p1, stretched_p2);
+ QPointF stretchedP1 = line.p1() - (direction.p2() - direction.p1()) * p1Extension;
+ QPointF stretchedP2 = line.p2() + (direction.p2() - direction.p1()) * p2Extension;
+ return QLineF(stretchedP1, stretchedP2);
}
-bool GeometryUtilities::intersect(const QPolygonF &polygon, const QLineF &line, QPointF *intersection_point, QLineF *intersection_line)
+bool GeometryUtilities::intersect(const QPolygonF &polygon, const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine)
{
for (int i = 0; i <= polygon.size() - 2; ++i) {
- QLineF polygon_line(polygon.at(i), polygon.at(i+1));
- QLineF::IntersectType intersection_type = polygon_line.intersect(line, intersection_point);
- if (intersection_type == QLineF::BoundedIntersection) {
- if (intersection_line) {
- *intersection_line = polygon_line;
+ QLineF polygonLine(polygon.at(i), polygon.at(i+1));
+ QLineF::IntersectType intersectionType = polygonLine.intersect(line, intersectionPoint);
+ if (intersectionType == QLineF::BoundedIntersection) {
+ if (intersectionLine) {
+ *intersectionLine = polygonLine;
}
return true;
}
@@ -93,7 +93,7 @@ struct Candidate {
}
-bool GeometryUtilities::placeRectAtLine(const QRectF &rect, const QLineF &line, double line_offset, double distance, const QLineF &intersection_line, QPointF *placement, Side *horizontal_aligned_side)
+bool GeometryUtilities::placeRectAtLine(const QRectF &rect, const QLineF &line, double lineOffset, double distance, const QLineF &intersectionLine, QPointF *placement, Side *horizontalAlignedSide)
{
QMT_CHECK(placement);
@@ -107,49 +107,49 @@ bool GeometryUtilities::placeRectAtLine(const QRectF &rect, const QLineF &line,
<< Candidate(QVector2D(rect.bottomRight() - rect.topRight()), rect.topRight() - rect.topLeft(), SIDE_RIGHT)
<< Candidate(QVector2D(rect.topRight() - rect.bottomRight()), rect.bottomRight() - rect.topLeft(), SIDE_RIGHT);
- QVector<QVector2D> rect_edge_vectors;
- rect_edge_vectors << QVector2D(rect.topLeft() - rect.topLeft())
+ QVector<QVector2D> rectEdgeVectors;
+ rectEdgeVectors << QVector2D(rect.topLeft() - rect.topLeft())
<< QVector2D(rect.topRight() - rect.topLeft())
<< QVector2D(rect.bottomLeft() - rect.topLeft())
<< QVector2D(rect.bottomRight() -rect.topLeft());
- QVector2D direction_vector(line.p2() - line.p1());
- direction_vector.normalize();
+ QVector2D directionVector(line.p2() - line.p1());
+ directionVector.normalize();
- QVector2D side_vector(direction_vector.y(), -direction_vector.x());
+ QVector2D sideVector(directionVector.y(), -directionVector.x());
- QVector2D intersection_vector(intersection_line.p2() - intersection_line.p1());
- intersection_vector.normalize();
+ QVector2D intersectionVector(intersectionLine.p2() - intersectionLine.p1());
+ intersectionVector.normalize();
- QVector2D outside_vector = QVector2D(intersection_vector.y(), -intersection_vector.x());
- double p = QVector2D::dotProduct(direction_vector, outside_vector);
+ QVector2D outsideVector = QVector2D(intersectionVector.y(), -intersectionVector.x());
+ double p = QVector2D::dotProduct(directionVector, outsideVector);
if (p < 0.0) {
- outside_vector = outside_vector * -1.0;
+ outsideVector = outsideVector * -1.0;
}
- double smallest_a = -1.0;
- QPointF rect_translation;
+ double smallestA = -1.0;
+ QPointF rectTranslation;
Side side = SIDE_UNSPECIFIED;
- int best_sign = 0;
+ int bestSign = 0;
foreach (const Candidate &candidate, candidates) {
- // solve equation a * direction_vector + candidate.first = b * intersection_vector to find smallest a
- double r = direction_vector.x() * intersection_vector.y() - direction_vector.y() * intersection_vector.x();
+ // solve equation a * directionVector + candidate.first = b * intersectionVector to find smallest a
+ double r = directionVector.x() * intersectionVector.y() - directionVector.y() * intersectionVector.x();
if (r <= -1e-5 || r >= 1e-5) {
- double a = (candidate.first.y() * intersection_vector.x() - candidate.first.x() * intersection_vector.y()) / r;
- if (a >= 0.0 && (smallest_a < 0.0 || a < smallest_a)) {
+ double a = (candidate.first.y() * intersectionVector.x() - candidate.first.x() * intersectionVector.y()) / r;
+ if (a >= 0.0 && (smallestA < 0.0 || a < smallestA)) {
// verify that all rectangle edges lay outside of shape (by checking for positiv projection to intersection)
bool ok = true;
int sign = 0;
- QVector2D rect_origin_vector = direction_vector * a - QVector2D(candidate.second);
- foreach (const QVector2D &rect_edge_vector, rect_edge_vectors) {
- QVector2D edge_vector = rect_origin_vector + rect_edge_vector;
- double aa = QVector2D::dotProduct(outside_vector, edge_vector);
+ QVector2D rectOriginVector = directionVector * a - QVector2D(candidate.second);
+ foreach (const QVector2D &rectEdgeVector, rectEdgeVectors) {
+ QVector2D edgeVector = rectOriginVector + rectEdgeVector;
+ double aa = QVector2D::dotProduct(outsideVector, edgeVector);
if (aa < 0.0) {
ok = false;
break;
}
- int s = sgn(QVector2D::dotProduct(side_vector, edge_vector));
+ int s = sgn(QVector2D::dotProduct(sideVector, edgeVector));
if (s) {
if (sign) {
if (s != sign) {
@@ -162,41 +162,41 @@ bool GeometryUtilities::placeRectAtLine(const QRectF &rect, const QLineF &line,
}
}
if (ok) {
- smallest_a = a;
- rect_translation = candidate.second;
+ smallestA = a;
+ rectTranslation = candidate.second;
side = candidate.third;
- best_sign = sign;
+ bestSign = sign;
}
}
}
}
- if (horizontal_aligned_side) {
+ if (horizontalAlignedSide) {
// convert side into a horizontal side depending on placement relative to direction vector
switch (side) {
case SIDE_TOP:
- side = best_sign == -1 ? SIDE_RIGHT : SIDE_LEFT;
+ side = bestSign == -1 ? SIDE_RIGHT : SIDE_LEFT;
break;
case SIDE_BOTTOM:
- side = best_sign == -1 ? SIDE_LEFT : SIDE_RIGHT;
+ side = bestSign == -1 ? SIDE_LEFT : SIDE_RIGHT;
break;
default:
break;
}
- *horizontal_aligned_side = side;
+ *horizontalAlignedSide = side;
}
- if (smallest_a < 0.0) {
+ if (smallestA < 0.0) {
return false;
}
- *placement = line.p1() + (direction_vector * (smallest_a + line_offset)).toPointF() + (side_vector * (best_sign * distance)).toPointF() - rect_translation;
+ *placement = line.p1() + (directionVector * (smallestA + lineOffset)).toPointF() + (sideVector * (bestSign * distance)).toPointF() - rectTranslation;
return true;
}
double GeometryUtilities::calcAngle(const QLineF &line)
{
- QVector2D direction_vector(line.p2() - line.p1());
- direction_vector.normalize();
- double angle = qAcos(direction_vector.x()) * 180.0 / 3.1415926535;
- if (direction_vector.y() > 0.0) {
+ QVector2D directionVector(line.p2() - line.p1());
+ directionVector.normalize();
+ double angle = qAcos(directionVector.x()) * 180.0 / 3.1415926535;
+ if (directionVector.y() > 0.0) {
angle = -angle;
}
return angle;
@@ -215,12 +215,12 @@ double GeometryUtilities::calcDistancePointToLine(const QPointF &point, const QL
{
QVector2D p(point);
QVector2D a(line.p1());
- QVector2D direction_vector(line.p2() - line.p1());
- qreal r = -((a - p) & direction_vector) / direction_vector.lengthSquared();
+ QVector2D directionVector(line.p2() - line.p1());
+ qreal r = -((a - p) & directionVector) / directionVector.lengthSquared();
if (r < 0.0 || r > 1.0) {
return std::numeric_limits<float>::quiet_NaN();
}
- qreal d = (a + r * direction_vector - p).length();
+ qreal d = (a + r * directionVector - p).length();
return d;
}
@@ -228,9 +228,9 @@ QPointF GeometryUtilities::calcProjection(const QLineF &line, const QPointF &poi
{
QVector2D p(point);
QVector2D a(line.p1());
- QVector2D direction_vector(line.p2() - line.p1());
- qreal r = -((a - p) & direction_vector) / direction_vector.lengthSquared();
- return (a + r * direction_vector).toPointF();
+ QVector2D directionVector(line.p2() - line.p1());
+ qreal r = -((a - p) & directionVector) / directionVector.lengthSquared();
+ return (a + r * directionVector).toPointF();
}
QPointF GeometryUtilities::calcPrimaryAxisDirection(const QLineF &line)
@@ -271,20 +271,20 @@ QPointF GeometryUtilities::calcSecondaryAxisDirection(const QLineF &line)
}
}
-void GeometryUtilities::adjustPosAndRect(QPointF *pos, QRectF *rect, const QPointF &top_left_delta, const QPointF &bottom_right_delta, const QPointF &relative_alignment)
+void GeometryUtilities::adjustPosAndRect(QPointF *pos, QRectF *rect, const QPointF &topLeftDelta, const QPointF &bottomRightDelta, const QPointF &relativeAlignment)
{
- *pos += QPointF(top_left_delta.x() * (1.0 - relative_alignment.x()) + bottom_right_delta.x() * relative_alignment.x(),
- top_left_delta.y() * (1.0 - relative_alignment.y()) + bottom_right_delta.y() * relative_alignment.y());
- rect->adjust(top_left_delta.x() * relative_alignment.x() - bottom_right_delta.x() * relative_alignment.x(),
- top_left_delta.y() * relative_alignment.y() - bottom_right_delta.y() * relative_alignment.y(),
- bottom_right_delta.x() * (1.0 - relative_alignment.x()) - top_left_delta.x() * (1.0 - relative_alignment.x()),
- bottom_right_delta.y() * (1.0 - relative_alignment.y()) - top_left_delta.y() * (1.0 - relative_alignment.y()));
+ *pos += QPointF(topLeftDelta.x() * (1.0 - relativeAlignment.x()) + bottomRightDelta.x() * relativeAlignment.x(),
+ topLeftDelta.y() * (1.0 - relativeAlignment.y()) + bottomRightDelta.y() * relativeAlignment.y());
+ rect->adjust(topLeftDelta.x() * relativeAlignment.x() - bottomRightDelta.x() * relativeAlignment.x(),
+ topLeftDelta.y() * relativeAlignment.y() - bottomRightDelta.y() * relativeAlignment.y(),
+ bottomRightDelta.x() * (1.0 - relativeAlignment.x()) - topLeftDelta.x() * (1.0 - relativeAlignment.x()),
+ bottomRightDelta.y() * (1.0 - relativeAlignment.y()) - topLeftDelta.y() * (1.0 - relativeAlignment.y()));
}
-QSizeF GeometryUtilities::ensureMinimumRasterSize(const QSizeF &size, double raster_width, double raster_height)
+QSizeF GeometryUtilities::ensureMinimumRasterSize(const QSizeF &size, double rasterWidth, double rasterHeight)
{
- double width = int(size.width() / raster_width + 0.99999) * raster_width;
- double height = int(size.height() / raster_height + 0.99999) * raster_height;
+ double width = int(size.width() / rasterWidth + 0.99999) * rasterWidth;
+ double height = int(size.height() / rasterHeight + 0.99999) * rasterHeight;
return QSizeF(width, height);
}
diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.h b/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.h
index 0e586b81a60e86c0ddc325d2e9aa01f3286bc721..2671518b1597c7b823840676bfca39629226563b 100644
--- a/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.h
+++ b/src/libs/3rdparty/modeling/qmt/infrastructure/geometryutilities.h
@@ -61,11 +61,11 @@ public:
public:
- static QLineF stretch(const QLineF &line, double p1_extension, double p2_extension);
+ static QLineF stretch(const QLineF &line, double p1Extension, double p2Extension);
- static bool intersect(const QPolygonF &polygon, const QLineF &line, QPointF *intersection_point, QLineF *intersection_line = 0);
+ static bool intersect(const QPolygonF &polygon, const QLineF &line, QPointF *intersectionPoint, QLineF *intersectionLine = 0);
- static bool placeRectAtLine(const QRectF &rect, const QLineF &line, double line_offset, double distance, const QLineF &intersection_line, QPointF *placement, Side *horizontal_aligned_side);
+ static bool placeRectAtLine(const QRectF &rect, const QLineF &line, double lineOffset, double distance, const QLineF &intersectionLine, QPointF *placement, Side *horizontalAlignedSide);
static double calcAngle(const QLineF &line);
@@ -77,10 +77,10 @@ public:
static QPointF calcSecondaryAxisDirection(const QLineF &line);
- static void adjustPosAndRect(QPointF *pos, QRectF *rect, const QPointF &top_left_delta, const QPointF &bottom_right_delta,
- const QPointF &relative_alignment);
+ static void adjustPosAndRect(QPointF *pos, QRectF *rect, const QPointF &topLeftDelta, const QPointF &bottomRightDelta,
+ const QPointF &relativeAlignment);
- static QSizeF ensureMinimumRasterSize(const QSizeF &size, double raster_width, double raster_height);
+ static QSizeF ensureMinimumRasterSize(const QSizeF &size, double rasterWidth, double rasterHeight);
};
}
diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/handle.h b/src/libs/3rdparty/modeling/qmt/infrastructure/handle.h
index 8bca1fa900ff52d8ba3d81e1e553605b434f2ae9..d5bbb1c40693dc54b7d11dafa0ac67050228af07 100644
--- a/src/libs/3rdparty/modeling/qmt/infrastructure/handle.h
+++ b/src/libs/3rdparty/modeling/qmt/infrastructure/handle.h
@@ -88,7 +88,7 @@ bool operator==(const Handle<T> &lhs, const Handle<U> &rhs)
}
template<class T>
-Handle<T> make_handle(T *t)
+Handle<T> makeHandle(T *t)
{
return Handle<T>(t);
}
diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/handles.h b/src/libs/3rdparty/modeling/qmt/infrastructure/handles.h
index 88a4bc583b96f1f1eddf77ce4b860b01d738a99c..8401c5f0f690cf92da3d15899318bf4501612b43 100644
--- a/src/libs/3rdparty/modeling/qmt/infrastructure/handles.h
+++ b/src/libs/3rdparty/modeling/qmt/infrastructure/handles.h
@@ -53,7 +53,7 @@ public:
public:
- explicit Handles(bool take_ownership = false) : m_takeOwnership(take_ownership) { }
+ explicit Handles(bool takeOwnership = false) : m_takeOwnership(takeOwnership) { }
Handles(const Handles<T> &rhs)
: m_handleList(rhs.m_handleList),
@@ -61,9 +61,9 @@ public:
{
}
- Handles(const Handles<T> &rhs, bool take_ownership)
+ Handles(const Handles<T> &rhs, bool takeOwnership)
: m_handleList(rhs.m_handleList),
- m_takeOwnership(take_ownership)
+ m_takeOwnership(takeOwnership)
{
if (m_takeOwnership && rhs.m_takeOwnership) {
const_cast<Handles<T> &>(rhs).m_handleList.clear();
@@ -201,18 +201,18 @@ public:
m_handleList.append(Handle<T>(t));
}
- void insert(int before_index, const Uid &uid)
+ void insert(int beforeIndex, const Uid &uid)
{
- QMT_CHECK(before_index >= 0 && before_index <= m_handleList.size());
+ QMT_CHECK(beforeIndex >= 0 && beforeIndex <= m_handleList.size());
QMT_CHECK(uid.isValid());
- m_handleList.insert(before_index, Handle<T>(uid));
+ m_handleList.insert(beforeIndex, Handle<T>(uid));
}
- void insert(int before_index, T *t)
+ void insert(int beforeIndex, T *t)
{
- QMT_CHECK(before_index >= 0 && before_index <= m_handleList.size());
+ QMT_CHECK(beforeIndex >= 0 && beforeIndex <= m_handleList.size());
QMT_CHECK(t);
- m_handleList.insert(before_index, Handle<T>(t));
+ m_handleList.insert(beforeIndex, Handle<T>(t));
}
void remove(int index)
diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/ioexceptions.cpp b/src/libs/3rdparty/modeling/qmt/infrastructure/ioexceptions.cpp
index 06c74225e5825ee6438b08d1e81d1010715aba32..f652f82f60cb12c1c8798dd80707c3fa2befb979 100644
--- a/src/libs/3rdparty/modeling/qmt/infrastructure/ioexceptions.cpp
+++ b/src/libs/3rdparty/modeling/qmt/infrastructure/ioexceptions.cpp
@@ -32,45 +32,45 @@
namespace qmt {
-IOException::IOException(const QString &error_msg)
- : Exception(error_msg)
+IOException::IOException(const QString &errorMsg)
+ : Exception(errorMsg)
{
}
-FileIOException::FileIOException(const QString &error_msg, const QString &file_name, int line_number)
- : IOException(error_msg),
- m_fileName(file_name),
- m_lineNumber(line_number)
+FileIOException::FileIOException(const QString &errorMsg, const QString &fileName, int lineNumber)
+ : IOException(errorMsg),
+ m_fileName(fileName),
+ m_lineNumber(lineNumber)
{
}
-FileNotFoundException::FileNotFoundException(const QString &file_name)
- : FileIOException(QStringLiteral("file not found"), file_name)
+FileNotFoundException::FileNotFoundException(const QString &fileName)
+ : FileIOException(QStringLiteral("file not found"), fileName)
{
}
-FileCreationException::FileCreationException(const QString &file_name)
- : FileIOException(QStringLiteral("unable to create file"), file_name)
+FileCreationException::FileCreationException(const QString &fileName)
+ : FileIOException(QStringLiteral("unable to create file"), fileName)
{
}
-FileWriteError::FileWriteError(const QString &file_name, int line_number)
- : FileIOException(QStringLiteral("writing to file failed"), file_name, line_number)
+FileWriteError::FileWriteError(const QString &fileName, int lineNumber)
+ : FileIOException(QStringLiteral("writing to file failed"), fileName, lineNumber)
{
}
-FileReadError::FileReadError(const QString &file_name, int line_number)
- : FileIOException(QStringLiteral("reading from file failed"), file_name, line_number)
+FileReadError::FileReadError(const QString &fileName, int lineNumber)
+ : FileIOException(QStringLiteral("reading from file failed"), fileName, lineNumber)
{
}
-IllegalXmlFile::IllegalXmlFile(const QString &file_name, int line_number)
- : FileIOException(QStringLiteral("illegal xml file"), file_name, line_number)
+IllegalXmlFile::IllegalXmlFile(const QString &fileName, int lineNumber)
+ : FileIOException(QStringLiteral("illegal xml file"), fileName, lineNumber)
{
}
-UnknownFileVersion::UnknownFileVersion(int version, const QString &file_name, int line_number)
- : FileIOException(QString(QStringLiteral("unable to handle file version %1")).arg(version), file_name, line_number)
+UnknownFileVersion::UnknownFileVersion(int version, const QString &fileName, int lineNumber)
+ : FileIOException(QString(QStringLiteral("unable to handle file version %1")).arg(version), fileName, lineNumber)
{
}
diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/ioexceptions.h b/src/libs/3rdparty/modeling/qmt/infrastructure/ioexceptions.h
index 796b5ee327731e94c2f345899555fc7c2d41c0a3..9abeb3a09085786b101fcc9f9d49d2f4c473f345 100644
--- a/src/libs/3rdparty/modeling/qmt/infrastructure/ioexceptions.h
+++ b/src/libs/3rdparty/modeling/qmt/infrastructure/ioexceptions.h
@@ -40,14 +40,14 @@ class IOException :
public Exception
{
public:
- explicit IOException(const QString &error_msg);
+ explicit IOException(const QString &errorMsg);
};
class FileIOException :
public IOException
{
public:
- explicit FileIOException(const QString &error_msg, const QString &file_name = QString::null, int line_number = -1);
+ explicit FileIOException(const QString &errorMsg, const QString &fileName = QString::null, int lineNumber = -1);
QString getFileName() const { return m_fileName; }
@@ -62,42 +62,42 @@ class FileNotFoundException :
public FileIOException
{
public:
- explicit FileNotFoundException(const QString &file_name);
+ explicit FileNotFoundException(const QString &fileName);
};
class FileCreationException :
public FileIOException
{
public:
- explicit FileCreationException(const QString &file_name);
+ explicit FileCreationException(const QString &fileName);
};
class FileWriteError :
public FileIOException
{
public:
- explicit FileWriteError(const QString &file_name, int line_number = -1);
+ explicit FileWriteError(const QString &fileName, int lineNumber = -1);
};
class FileReadError :
public FileIOException
{
public:
- explicit FileReadError(const QString &file_name, int line_number = -1);
+ explicit FileReadError(const QString &fileName, int lineNumber = -1);
};
class IllegalXmlFile :
public FileIOException
{
public:
- IllegalXmlFile(const QString &file_name, int line_number = -1);
+ IllegalXmlFile(const QString &fileName, int lineNumber = -1);
};
class UnknownFileVersion :
public FileIOException
{
public:
- UnknownFileVersion(int version, const QString &file_name, int line_number = -1);
+ UnknownFileVersion(int version, const QString &fileName, int lineNumber = -1);
};
}
diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/qcompressedfile.cpp b/src/libs/3rdparty/modeling/qmt/infrastructure/qcompressedfile.cpp
index dec4fbe790e71a88554c84fc9c106aeb72a125db..58470c916752ac31e5cdf0ef079dfdc8175419e1 100644
--- a/src/libs/3rdparty/modeling/qmt/infrastructure/qcompressedfile.cpp
+++ b/src/libs/3rdparty/modeling/qmt/infrastructure/qcompressedfile.cpp
@@ -44,9 +44,9 @@ QCompressedDevice::QCompressedDevice(QObject *parent)
{
}
-QCompressedDevice::QCompressedDevice(QIODevice *target_device, QObject *parent)
+QCompressedDevice::QCompressedDevice(QIODevice *targetDevice, QObject *parent)
: QIODevice(parent),
- m_targetDevice(target_device),
+ m_targetDevice(targetDevice),
m_bytesInBuffer(0),
m_indexInBuffer(0)
{
@@ -57,9 +57,9 @@ QCompressedDevice::~QCompressedDevice()
flush();
}
-void QCompressedDevice::setTargetDevice(QIODevice *target_device)
+void QCompressedDevice::setTargetDevice(QIODevice *targetDevice)
{
- m_targetDevice = target_device;
+ m_targetDevice = targetDevice;
}
void QCompressedDevice::close()
@@ -75,14 +75,14 @@ qint64 QCompressedDevice::readData(char *data, qint64 maxlen)
QMT_CHECK(m_targetDevice->openMode() == QIODevice::ReadOnly);
if (m_bytesInBuffer == 0) {
- QByteArray compressed_buffer;
- int compressed_len = 0;
- if (m_targetDevice->read((char *) &compressed_len, sizeof(int)) != sizeof(int)) {
+ QByteArray compressedBuffer;
+ int compressedLen = 0;
+ if (m_targetDevice->read((char *) &compressedLen, sizeof(int)) != sizeof(int)) {
return -1;
}
- compressed_buffer.resize(compressed_len);
- qint64 compressed_bytes = m_targetDevice->read(compressed_buffer.data(), compressed_len);
- m_buffer = qUncompress((const uchar *) compressed_buffer.data(), compressed_bytes);
+ compressedBuffer.resize(compressedLen);
+ qint64 compressedBytes = m_targetDevice->read(compressedBuffer.data(), compressedLen);
+ m_buffer = qUncompress((const uchar *) compressedBuffer.data(), compressedBytes);
m_bytesInBuffer = m_buffer.size();
if (m_bytesInBuffer == 0) {
return 0;
@@ -104,12 +104,12 @@ qint64 QCompressedDevice::writeData(const char *data, qint64 len)
m_buffer.append(data, len);
if (m_buffer.size() > 1024*1024) {
- QByteArray compressed_buffer = qCompress(m_buffer);
- int compressed_len = (int) compressed_buffer.size();
- if (m_targetDevice->write((const char *) &compressed_len, sizeof(int)) != sizeof(int)) {
+ QByteArray compressedBuffer = qCompress(m_buffer);
+ int compressedLen = (int) compressedBuffer.size();
+ if (m_targetDevice->write((const char *) &compressedLen, sizeof(int)) != sizeof(int)) {
return -1;
}
- if (m_targetDevice->write(compressed_buffer.data(), compressed_len) != compressed_buffer.size()) {
+ if (m_targetDevice->write(compressedBuffer.data(), compressedLen) != compressedBuffer.size()) {
return -1;
}
m_buffer.clear();
@@ -122,12 +122,12 @@ qint64 QCompressedDevice::flush()
if (openMode() == QIODevice::WriteOnly && m_buffer.size() > 0) {
QMT_CHECK(m_targetDevice->isOpen());
QMT_CHECK(m_targetDevice->openMode() == QIODevice::WriteOnly);
- QByteArray compressed_buffer = qCompress(m_buffer);
- int compressed_len = (int) compressed_buffer.size();
- if (m_targetDevice->write((const char *) &compressed_len, sizeof(int)) != sizeof(int)) {
+ QByteArray compressedBuffer = qCompress(m_buffer);
+ int compressedLen = (int) compressedBuffer.size();
+ if (m_targetDevice->write((const char *) &compressedLen, sizeof(int)) != sizeof(int)) {
return -1;
}
- return m_targetDevice->write(compressed_buffer.data(), compressed_len);
+ return m_targetDevice->write(compressedBuffer.data(), compressedLen);
}
return 0;
}
diff --git a/src/libs/3rdparty/modeling/qmt/infrastructure/qcompressedfile.h b/src/libs/3rdparty/modeling/qmt/infrastructure/qcompressedfile.h
index 0130b667d263b2dfbb981cf35186daf7caa430dc..77942370d37afd6581a70f390b983ee26745be28 100644
--- a/src/libs/3rdparty/modeling/qmt/infrastructure/qcompressedfile.h
+++ b/src/libs/3rdparty/modeling/qmt/infrastructure/qcompressedfile.h
@@ -45,7 +45,7 @@ public:
explicit QCompressedDevice(QObject *parent = 0);
- explicit QCompressedDevice(QIODevice *target_device, QObject *parent = 0);
+ explicit QCompressedDevice(QIODevice *targetDevice, QObject *parent = 0);
~QCompressedDevice();
@@ -53,7 +53,7 @@ public:
QIODevice *targetDevice() const { return m_targetDevice; }
- void setTargetDevice(QIODevice *target_device);
+ void setTargetDevice(QIODevice *targetDevice);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/model/mclass.cpp b/src/libs/3rdparty/modeling/qmt/model/mclass.cpp
index 7ae9b58e056e28d324d985f53e1114d527364a87..b4810fe428905a3d370a011b47b10efaf907fdf4 100644
--- a/src/libs/3rdparty/modeling/qmt/model/mclass.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model/mclass.cpp
@@ -65,14 +65,14 @@ MClass &MClass::operator=(const MClass &rhs)
return *this;
}
-void MClass::setNamespace(const QString &name_space)
+void MClass::setNamespace(const QString &nameSpace)
{
- m_namespace = name_space;
+ m_namespace = nameSpace;
}
-void MClass::setTemplateParameters(const QList<QString> &template_parameters)
+void MClass::setTemplateParameters(const QList<QString> &templateParameters)
{
- m_templateParameters = template_parameters;
+ m_templateParameters = templateParameters;
}
void MClass::setMembers(const QList<MClassMember> &members)
@@ -85,9 +85,9 @@ void MClass::addMember(const MClassMember &member)
m_members.append(member);
}
-void MClass::insertMember(int before_index, const MClassMember &member)
+void MClass::insertMember(int beforeIndex, const MClassMember &member)
{
- m_members.insert(before_index, member);
+ m_members.insert(beforeIndex, member);
}
void MClass::removeMember(const Uid &uid)
diff --git a/src/libs/3rdparty/modeling/qmt/model/mclass.h b/src/libs/3rdparty/modeling/qmt/model/mclass.h
index 47d5a3aa08b82c32fc4f53f9c30a541e637069d2..98276be0da6afafdae5a24bbd7febf83514fe679 100644
--- a/src/libs/3rdparty/modeling/qmt/model/mclass.h
+++ b/src/libs/3rdparty/modeling/qmt/model/mclass.h
@@ -58,11 +58,11 @@ public:
QString getNamespace() const { return m_namespace; }
- void setNamespace(const QString &name_space);
+ void setNamespace(const QString &nameSpace);
QList<QString> getTemplateParameters() const { return m_templateParameters; }
- void setTemplateParameters(const QList<QString> &template_parameters);
+ void setTemplateParameters(const QList<QString> &templateParameters);
QList<MClassMember> getMembers() const { return m_members; }
@@ -70,7 +70,7 @@ public:
void addMember(const MClassMember &member);
- void insertMember(int before_index, const MClassMember &member);
+ void insertMember(int beforeIndex, const MClassMember &member);
void removeMember(const Uid &uid);
diff --git a/src/libs/3rdparty/modeling/qmt/model/mclassmember.cpp b/src/libs/3rdparty/modeling/qmt/model/mclassmember.cpp
index 5e7dcdf13edb158bb734ba293fce926ab53b4d16..14aaba3015d19cec24f535a7d593283b8a3fa28a 100644
--- a/src/libs/3rdparty/modeling/qmt/model/mclassmember.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model/mclassmember.cpp
@@ -32,9 +32,9 @@
namespace qmt {
-MClassMember::MClassMember(MemberType member_type)
+MClassMember::MClassMember(MemberType memberType)
: m_visibility(VISIBILITY_UNDEFINED),
- m_memberType(member_type)
+ m_memberType(memberType)
{
}
@@ -97,9 +97,9 @@ void MClassMember::setVisibility(MClassMember::Visibility visibility)
m_visibility = visibility;
}
-void MClassMember::setMemberType(MClassMember::MemberType member_type)
+void MClassMember::setMemberType(MClassMember::MemberType memberType)
{
- m_memberType = member_type;
+ m_memberType = memberType;
}
void MClassMember::setProperties(Properties properties)
diff --git a/src/libs/3rdparty/modeling/qmt/model/mclassmember.h b/src/libs/3rdparty/modeling/qmt/model/mclassmember.h
index 4be21de3a899f04145f71b454ba58421200202e4..7d7059b4ec086a0002ad6e4e8b4c633b6f9eaf3d 100644
--- a/src/libs/3rdparty/modeling/qmt/model/mclassmember.h
+++ b/src/libs/3rdparty/modeling/qmt/model/mclassmember.h
@@ -75,7 +75,7 @@ public:
public:
- MClassMember(MemberType member_type = MEMBER_UNDEFINED);
+ MClassMember(MemberType memberType = MEMBER_UNDEFINED);
MClassMember(const MClassMember &rhs);
@@ -111,7 +111,7 @@ public:
MemberType getMemberType() const { return m_memberType; }
- void setMemberType(MemberType member_type);
+ void setMemberType(MemberType memberType);
Properties getProperties() const { return m_properties; }
diff --git a/src/libs/3rdparty/modeling/qmt/model/mdiagram.cpp b/src/libs/3rdparty/modeling/qmt/model/mdiagram.cpp
index 3b3c06494d69516583baa218e541c432d07402ae..0fa2862586e3a76a24b33061ebadd488ca92d61b 100644
--- a/src/libs/3rdparty/modeling/qmt/model/mdiagram.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model/mdiagram.cpp
@@ -91,11 +91,11 @@ void MDiagram::addDiagramElement(DElement *element)
m_elements.append(element);
}
-void MDiagram::insertDiagramElement(int before_element, DElement *element)
+void MDiagram::insertDiagramElement(int beforeElement, DElement *element)
{
- QMT_CHECK(before_element >= 0 && before_element <= m_elements.size());
+ QMT_CHECK(beforeElement >= 0 && beforeElement <= m_elements.size());
- m_elements.insert(before_element, element);
+ m_elements.insert(beforeElement, element);
}
void MDiagram::removeDiagramElement(int index)
@@ -113,9 +113,9 @@ void MDiagram::removeDiagramElement(DElement *element)
removeDiagramElement(m_elements.indexOf(element));
}
-void MDiagram::setLastModified(const QDateTime &last_modified)
+void MDiagram::setLastModified(const QDateTime &lastModified)
{
- m_lastModified = last_modified;
+ m_lastModified = lastModified;
}
void MDiagram::setLastModifiedToNow()
diff --git a/src/libs/3rdparty/modeling/qmt/model/mdiagram.h b/src/libs/3rdparty/modeling/qmt/model/mdiagram.h
index 4938d5e3f8cb0ed5ac14f3ecfc9ccbd16312fad9..96029f1b96fc8ade861173f3a5bd349a63bc6005 100644
--- a/src/libs/3rdparty/modeling/qmt/model/mdiagram.h
+++ b/src/libs/3rdparty/modeling/qmt/model/mdiagram.h
@@ -64,7 +64,7 @@ public:
void addDiagramElement(DElement *element);
- void insertDiagramElement(int before_element, DElement *element);
+ void insertDiagramElement(int beforeElement, DElement *element);
void removeDiagramElement(int index);
@@ -72,7 +72,7 @@ public:
QDateTime getLastModified() const { return m_lastModified; }
- void setLastModified(const QDateTime &last_modified);
+ void setLastModified(const QDateTime &lastModified);
void setLastModifiedToNow();
diff --git a/src/libs/3rdparty/modeling/qmt/model/mitem.cpp b/src/libs/3rdparty/modeling/qmt/model/mitem.cpp
index 5c9b8dbc2a3f7736b5436077ca0a1cacbe88ad2d..96cbd931caf50145c435dbb223c733e799a07b14 100644
--- a/src/libs/3rdparty/modeling/qmt/model/mitem.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model/mitem.cpp
@@ -52,14 +52,14 @@ void MItem::setVariety(const QString &variety)
m_variety = variety;
}
-void MItem::setVarietyEditable(bool variety_editable)
+void MItem::setVarietyEditable(bool varietyEditable)
{
- m_varietyEditable = variety_editable;
+ m_varietyEditable = varietyEditable;
}
-void MItem::setShapeEditable(bool shape_editable)
+void MItem::setShapeEditable(bool shapeEditable)
{
- m_shapeEditable = shape_editable;
+ m_shapeEditable = shapeEditable;
}
void MItem::accept(MVisitor *visitor)
diff --git a/src/libs/3rdparty/modeling/qmt/model/mitem.h b/src/libs/3rdparty/modeling/qmt/model/mitem.h
index bbc8c3d50c08efad140754f5389fc85a8c335d4f..c6a0fdd375b6cde895cbcc588d203b979ca2e316 100644
--- a/src/libs/3rdparty/modeling/qmt/model/mitem.h
+++ b/src/libs/3rdparty/modeling/qmt/model/mitem.h
@@ -53,11 +53,11 @@ public:
bool isVarietyEditable() const { return m_varietyEditable; }
- void setVarietyEditable(bool variety_editable);
+ void setVarietyEditable(bool varietyEditable);
bool isShapeEditable() const { return m_shapeEditable; }
- void setShapeEditable(bool shape_editable);
+ void setShapeEditable(bool shapeEditable);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/model/mobject.cpp b/src/libs/3rdparty/modeling/qmt/model/mobject.cpp
index 8770d4bba4661e9af6b8cc4d435190708996c214..50884def3a1485d8e6637064cd7ac6dd1d0ea714 100644
--- a/src/libs/3rdparty/modeling/qmt/model/mobject.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model/mobject.cpp
@@ -95,16 +95,16 @@ void MObject::addChild(MObject *child)
child->setOwner(this);
}
-void MObject::insertChild(int before_index, const Uid &uid)
+void MObject::insertChild(int beforeIndex, const Uid &uid)
{
- m_children.insert(before_index, uid);
+ m_children.insert(beforeIndex, uid);
}
-void MObject::insertChild(int before_index, MObject *child)
+void MObject::insertChild(int beforeIndex, MObject *child)
{
QMT_CHECK(child);
QMT_CHECK(child->getOwner() == 0);
- m_children.insert(before_index, child);
+ m_children.insert(beforeIndex, child);
child->setOwner(this);
}
@@ -167,12 +167,12 @@ void MObject::addRelation(MRelation *relation)
m_relations.add(relation);
}
-void MObject::insertRelation(int before_index, MRelation *relation)
+void MObject::insertRelation(int beforeIndex, MRelation *relation)
{
QMT_CHECK(relation);
QMT_CHECK(relation->getOwner() == 0);
relation->setOwner(this);
- m_relations.insert(before_index, relation);
+ m_relations.insert(beforeIndex, relation);
}
void MObject::removeRelation(MRelation *relation)
diff --git a/src/libs/3rdparty/modeling/qmt/model/mobject.h b/src/libs/3rdparty/modeling/qmt/model/mobject.h
index 479960d9894f7a6233e05be207b3b1173929634f..7336993f3da3adf886b664de055990376bb65bc4 100644
--- a/src/libs/3rdparty/modeling/qmt/model/mobject.h
+++ b/src/libs/3rdparty/modeling/qmt/model/mobject.h
@@ -71,9 +71,9 @@ public:
void addChild(MObject *child);
- void insertChild(int before_index, const Uid &uid);
+ void insertChild(int beforeIndex, const Uid &uid);
- void insertChild(int before_index, MObject *child);
+ void insertChild(int beforeIndex, MObject *child);
void removeChild(const Uid &uid);
@@ -91,7 +91,7 @@ public:
void addRelation(MRelation *relation);
- void insertRelation(int before_index, MRelation *relation);
+ void insertRelation(int beforeIndex, MRelation *relation);
void removeRelation(MRelation *relation);
diff --git a/src/libs/3rdparty/modeling/qmt/model/msourceexpansion.cpp b/src/libs/3rdparty/modeling/qmt/model/msourceexpansion.cpp
index 5b664b5eee57de7933101bb5d0e804801173060e..aacff20d8faf3a47790bfa195751576af2568ef4 100644
--- a/src/libs/3rdparty/modeling/qmt/model/msourceexpansion.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model/msourceexpansion.cpp
@@ -62,15 +62,15 @@ MSourceExpansion &MSourceExpansion::operator=(const MSourceExpansion &rhs)
MSourceExpansion *MSourceExpansion::clone(const MElement &rhs) const
{
- MSourceExpansion *right_expansion = dynamic_cast<MSourceExpansion *>(rhs.getExpansion());
- QMT_CHECK(right_expansion);
- MSourceExpansion *expansion = new MSourceExpansion(*right_expansion);
+ MSourceExpansion *rightExpansion = dynamic_cast<MSourceExpansion *>(rhs.getExpansion());
+ QMT_CHECK(rightExpansion);
+ MSourceExpansion *expansion = new MSourceExpansion(*rightExpansion);
return expansion;
}
-void MSourceExpansion::setSourceId(const QString &source_id)
+void MSourceExpansion::setSourceId(const QString &sourceId)
{
- m_sourceId = source_id;
+ m_sourceId = sourceId;
}
void MSourceExpansion::setTransient(bool transient)
diff --git a/src/libs/3rdparty/modeling/qmt/model/msourceexpansion.h b/src/libs/3rdparty/modeling/qmt/model/msourceexpansion.h
index 6c7a8e6b24a0006fbc90dfa0f0f555a60c7ffd04..c8da31b5f3aa1ae39a55e6d7ed4baf0ee784b007 100644
--- a/src/libs/3rdparty/modeling/qmt/model/msourceexpansion.h
+++ b/src/libs/3rdparty/modeling/qmt/model/msourceexpansion.h
@@ -56,7 +56,7 @@ public:
QString getSourceId() const { return m_sourceId; }
- void setSourceId(const QString &source_id);
+ void setSourceId(const QString &sourceId);
bool isTransient() const { return m_transient; }
diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mclonevisitor.cpp b/src/libs/3rdparty/modeling/qmt/model_controller/mclonevisitor.cpp
index 8b8462b160e8afcacd6a0f19256da9030141199b..98a2b9ff231b4f998a994042351924fb95a1d90f 100644
--- a/src/libs/3rdparty/modeling/qmt/model_controller/mclonevisitor.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model_controller/mclonevisitor.cpp
@@ -98,8 +98,8 @@ void MCloneVisitor::visitMDiagram(const MDiagram *diagram)
foreach (const DElement *element, diagram->getDiagramElements()) {
DCloneDeepVisitor visitor;
element->accept(&visitor);
- DElement *cloned_element = visitor.getCloned();
- cloned->addDiagramElement(cloned_element);
+ DElement *clonedElement = visitor.getCloned();
+ cloned->addDiagramElement(clonedElement);
}
visitMObject(diagram);
}
@@ -172,9 +172,9 @@ void MCloneDeepVisitor::visitMObject(const MObject *object)
if (handle.hasTarget()) {
MCloneDeepVisitor visitor;
handle.getTarget()->accept(&visitor);
- MObject *cloned_child = dynamic_cast<MObject *>(visitor.getCloned());
- QMT_CHECK(cloned_child);
- cloned->addChild(cloned_child);
+ MObject *clonedChild = dynamic_cast<MObject *>(visitor.getCloned());
+ QMT_CHECK(clonedChild);
+ cloned->addChild(clonedChild);
} else {
cloned->addChild(handle.getUid());
}
@@ -183,9 +183,9 @@ void MCloneDeepVisitor::visitMObject(const MObject *object)
if (handle.hasTarget()) {
MCloneDeepVisitor visitor;
handle.getTarget()->accept(&visitor);
- MRelation *cloned_relation = dynamic_cast<MRelation *>(visitor.getCloned());
- QMT_CHECK(cloned_relation);
- cloned->addRelation(cloned_relation);
+ MRelation *clonedRelation = dynamic_cast<MRelation *>(visitor.getCloned());
+ QMT_CHECK(clonedRelation);
+ cloned->addRelation(clonedRelation);
} else {
cloned->addRelation(handle.getUid());
}
@@ -224,8 +224,8 @@ void MCloneDeepVisitor::visitMDiagram(const MDiagram *diagram)
foreach (const DElement *element, diagram->getDiagramElements()) {
DCloneDeepVisitor visitor;
element->accept(&visitor);
- DElement *cloned_element = visitor.getCloned();
- cloned->addDiagramElement(cloned_element);
+ DElement *clonedElement = visitor.getCloned();
+ cloned->addDiagramElement(clonedElement);
}
visitMObject(diagram);
}
diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/mflatassignmentvisitor.cpp b/src/libs/3rdparty/modeling/qmt/model_controller/mflatassignmentvisitor.cpp
index cf334e28acf0e77c4c34bdbce6cf5b55e41caabe..5483c02f0c4ebc81fc02c584a85e7305e258cf33 100644
--- a/src/libs/3rdparty/modeling/qmt/model_controller/mflatassignmentvisitor.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model_controller/mflatassignmentvisitor.cpp
@@ -59,9 +59,9 @@ void MFlatAssignmentVisitor::visitMElement(const MElement *element)
void MFlatAssignmentVisitor::visitMObject(const MObject *object)
{
visitMElement(object);
- MObject *target_object = dynamic_cast<MObject *>(m_target);
- QMT_CHECK(target_object);
- target_object->setName(object->getName());
+ MObject *targetObject = dynamic_cast<MObject *>(m_target);
+ QMT_CHECK(targetObject);
+ targetObject->setName(object->getName());
}
void MFlatAssignmentVisitor::visitMPackage(const MPackage *package)
@@ -72,11 +72,11 @@ void MFlatAssignmentVisitor::visitMPackage(const MPackage *package)
void MFlatAssignmentVisitor::visitMClass(const MClass *klass)
{
visitMObject(klass);
- MClass *target_class = dynamic_cast<MClass *>(m_target);
- QMT_CHECK(target_class);
- target_class->setNamespace(klass->getNamespace());
- target_class->setTemplateParameters(klass->getTemplateParameters());
- target_class->setMembers(klass->getMembers());
+ MClass *targetClass = dynamic_cast<MClass *>(m_target);
+ QMT_CHECK(targetClass);
+ targetClass->setNamespace(klass->getNamespace());
+ targetClass->setTemplateParameters(klass->getTemplateParameters());
+ targetClass->setMembers(klass->getMembers());
}
void MFlatAssignmentVisitor::visitMComponent(const MComponent *component)
@@ -97,27 +97,27 @@ void MFlatAssignmentVisitor::visitMCanvasDiagram(const MCanvasDiagram *diagram)
void MFlatAssignmentVisitor::visitMItem(const MItem *item)
{
visitMObject(item);
- MItem *target_item = dynamic_cast<MItem *>(m_target);
- QMT_CHECK(target_item);
- target_item->setVarietyEditable(item->isVarietyEditable());
- target_item->setVariety(item->getVariety());
- target_item->setShapeEditable(item->isShapeEditable());
+ MItem *targetItem = dynamic_cast<MItem *>(m_target);
+ QMT_CHECK(targetItem);
+ targetItem->setVarietyEditable(item->isVarietyEditable());
+ targetItem->setVariety(item->getVariety());
+ targetItem->setShapeEditable(item->isShapeEditable());
}
void MFlatAssignmentVisitor::visitMRelation(const MRelation *relation)
{
visitMElement(relation);
- MRelation *target_relation = dynamic_cast<MRelation *>(m_target);
- QMT_CHECK(target_relation);
- target_relation->setName(relation->getName());
+ MRelation *targetRelation = dynamic_cast<MRelation *>(m_target);
+ QMT_CHECK(targetRelation);
+ targetRelation->setName(relation->getName());
}
void MFlatAssignmentVisitor::visitMDependency(const MDependency *dependency)
{
visitMRelation(dependency);
- MDependency *target_dependency = dynamic_cast<MDependency *>(m_target);
- QMT_CHECK(target_dependency);
- target_dependency->setDirection(dependency->getDirection());
+ MDependency *targetDependency = dynamic_cast<MDependency *>(m_target);
+ QMT_CHECK(targetDependency);
+ targetDependency->setDirection(dependency->getDirection());
}
void MFlatAssignmentVisitor::visitMInheritance(const MInheritance *inheritance)
@@ -128,10 +128,10 @@ void MFlatAssignmentVisitor::visitMInheritance(const MInheritance *inheritance)
void MFlatAssignmentVisitor::visitMAssociation(const MAssociation *association)
{
visitMRelation(association);
- MAssociation *target_association = dynamic_cast<MAssociation *>(m_target);
- QMT_CHECK(target_association);
- target_association->setA(association->getA());
- target_association->setB(association->getB());
+ MAssociation *targetAssociation = dynamic_cast<MAssociation *>(m_target);
+ QMT_CHECK(targetAssociation);
+ targetAssociation->setA(association->getA());
+ targetAssociation->setB(association->getB());
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.cpp b/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.cpp
index 990026ca0bb612e62ca87d2eccf4eb9ebb2eecf1..6a439e9f089d454b976871e980dfe6116885bdc7 100644
--- a/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.cpp
@@ -69,9 +69,9 @@ class ModelController::UpdateObjectCommand :
public UndoCommand
{
public:
- UpdateObjectCommand(ModelController *model_controller, MObject *object)
+ UpdateObjectCommand(ModelController *modelController, MObject *object)
: UndoCommand(tr("Change Object")),
- m_modelController(model_controller),
+ m_modelController(modelController),
m_object(0)
{
MCloneVisitor visitor;
@@ -87,11 +87,11 @@ public:
bool mergeWith(const UndoCommand *other)
{
- const UpdateObjectCommand *update_command = dynamic_cast<const UpdateObjectCommand *>(other);
- if (!update_command) {
+ const UpdateObjectCommand *updateCommand = dynamic_cast<const UpdateObjectCommand *>(other);
+ if (!updateCommand) {
return false;
}
- if (m_object->getUid() != update_command->m_object->getUid()) {
+ if (m_object->getUid() != updateCommand->m_object->getUid()) {
return false;
}
// the last update is a complete update of all changes...
@@ -125,14 +125,14 @@ private:
row = object->getOwner()->getChildren().indexOf(object);
}
emit m_modelController->beginUpdateObject(row, parent);
- MCloneVisitor clone_visitor;
- object->accept(&clone_visitor);
- MObject *new_object = dynamic_cast<MObject *>(clone_visitor.getCloned());
- QMT_CHECK(new_object);
- MFlatAssignmentVisitor assign_visitor(object);
- m_object->accept(&assign_visitor);
+ MCloneVisitor cloneVisitor;
+ object->accept(&cloneVisitor);
+ MObject *newObject = dynamic_cast<MObject *>(cloneVisitor.getCloned());
+ QMT_CHECK(newObject);
+ MFlatAssignmentVisitor assignVisitor(object);
+ m_object->accept(&assignVisitor);
delete m_object;
- m_object = new_object;
+ m_object = newObject;
emit m_modelController->endUpdateObject(row, parent);
emit m_modelController->modified();
m_modelController->verifyModelIntegrity();
@@ -150,9 +150,9 @@ class ModelController::UpdateRelationCommand :
public UndoCommand
{
public:
- UpdateRelationCommand(ModelController *model_controller, MRelation *relation)
+ UpdateRelationCommand(ModelController *modelController, MRelation *relation)
: UndoCommand(tr("Change Relation")),
- m_modelController(model_controller),
+ m_modelController(modelController),
m_relation(0)
{
MCloneVisitor visitor;
@@ -168,11 +168,11 @@ public:
bool mergeWith(const UndoCommand *other)
{
- const UpdateRelationCommand *update_command = dynamic_cast<const UpdateRelationCommand *>(other);
- if (!update_command) {
+ const UpdateRelationCommand *updateCommand = dynamic_cast<const UpdateRelationCommand *>(other);
+ if (!updateCommand) {
return false;
}
- if (m_relation->getUid() != update_command->m_relation->getUid()) {
+ if (m_relation->getUid() != updateCommand->m_relation->getUid()) {
return false;
}
// the last update is a complete update of all changes...
@@ -202,14 +202,14 @@ private:
QMT_CHECK(owner);
int row = owner->getRelations().indexOf(relation);
emit m_modelController->beginUpdateRelation(row, owner);
- MCloneVisitor clone_visitor;
- relation->accept(&clone_visitor);
- MRelation *new_relation = dynamic_cast<MRelation *>(clone_visitor.getCloned());
- QMT_CHECK(new_relation);
- MFlatAssignmentVisitor assign_visitor(relation);
- m_relation->accept(&assign_visitor);
+ MCloneVisitor cloneVisitor;
+ relation->accept(&cloneVisitor);
+ MRelation *newRelation = dynamic_cast<MRelation *>(cloneVisitor.getCloned());
+ QMT_CHECK(newRelation);
+ MFlatAssignmentVisitor assignVisitor(relation);
+ m_relation->accept(&assignVisitor);
delete m_relation;
- m_relation = new_relation;
+ m_relation = newRelation;
emit m_modelController->endUpdateRelation(row, owner);
emit m_modelController->modified();
m_modelController->verifyModelIntegrity();
@@ -227,9 +227,9 @@ class ModelController::AddElementsCommand :
public UndoCommand
{
public:
- AddElementsCommand(ModelController *model_controller, const QString &command_label)
- : UndoCommand(command_label),
- m_modelController(model_controller)
+ AddElementsCommand(ModelController *modelController, const QString &commandLabel)
+ : UndoCommand(commandLabel),
+ m_modelController(modelController)
{
}
@@ -240,12 +240,12 @@ public:
}
}
- void add(ElementType elements_type, const Uid &object_key, const Uid &owner_key)
+ void add(ElementType elementsType, const Uid &objectKey, const Uid &ownerKey)
{
Clone clone;
- clone.m_elementType = elements_type;
- clone.m_elementKey = object_key;
- clone.m_ownerKey = owner_key;
+ clone.m_elementType = elementsType;
+ clone.m_elementKey = objectKey;
+ clone.m_ownerKey = ownerKey;
clone.m_indexOfElement = -1;
m_clonedElements.append(clone);
}
@@ -364,9 +364,9 @@ class ModelController::RemoveElementsCommand :
public UndoCommand
{
public:
- RemoveElementsCommand(ModelController *model_controller, const QString &command_label)
- : UndoCommand(command_label),
- m_modelController(model_controller)
+ RemoveElementsCommand(ModelController *modelController, const QString &commandLabel)
+ : UndoCommand(commandLabel),
+ m_modelController(modelController)
{
}
@@ -514,9 +514,9 @@ class ModelController::MoveObjectCommand :
public UndoCommand
{
public:
- MoveObjectCommand(ModelController *model_controller, MObject *object)
+ MoveObjectCommand(ModelController *modelController, MObject *object)
: UndoCommand(tr("Move Object")),
- m_modelController(model_controller),
+ m_modelController(modelController),
m_objectKey(object->getUid()),
m_ownerKey(object->getOwner()->getUid()),
m_indexOfElement(object->getOwner()->getChildren().indexOf(object))
@@ -547,16 +547,16 @@ private:
{
MObject *object = m_modelController->findObject(m_objectKey);
QMT_CHECK(object);
- MObject *former_owner = object->getOwner();
- int former_row = former_owner->getChildren().indexOf(object);
- emit m_modelController->beginMoveObject(former_row, former_owner);
- former_owner->decontrolChild(object);
- MObject *new_owner = m_modelController->findObject(m_ownerKey);
- new_owner->insertChild(m_indexOfElement, object);
- int new_row = m_indexOfElement;
- m_ownerKey = former_owner->getUid();
- m_indexOfElement = former_row;
- emit m_modelController->endMoveObject(new_row, new_owner);
+ MObject *formerOwner = object->getOwner();
+ int formerRow = formerOwner->getChildren().indexOf(object);
+ emit m_modelController->beginMoveObject(formerRow, formerOwner);
+ formerOwner->decontrolChild(object);
+ MObject *newOwner = m_modelController->findObject(m_ownerKey);
+ newOwner->insertChild(m_indexOfElement, object);
+ int newRow = m_indexOfElement;
+ m_ownerKey = formerOwner->getUid();
+ m_indexOfElement = formerRow;
+ emit m_modelController->endMoveObject(newRow, newOwner);
emit m_modelController->modified();
m_modelController->verifyModelIntegrity();
}
@@ -578,9 +578,9 @@ class ModelController::MoveRelationCommand :
public UndoCommand
{
public:
- MoveRelationCommand(ModelController *model_controller, MRelation *relation)
+ MoveRelationCommand(ModelController *modelController, MRelation *relation)
: UndoCommand(tr("Move Relation")),
- m_modelController(model_controller),
+ m_modelController(modelController),
m_relationKey(relation->getUid()),
m_ownerKey(relation->getOwner()->getUid()),
m_indexOfElement(relation->getOwner()->getRelations().indexOf(relation))
@@ -611,16 +611,16 @@ private:
{
MRelation *relation = m_modelController->findRelation(m_relationKey);
QMT_CHECK(relation);
- MObject *former_owner = relation->getOwner();
- int former_row = former_owner->getRelations().indexOf(relation);
- emit m_modelController->beginMoveRelation(former_row, former_owner);
- former_owner->decontrolRelation(relation);
- MObject *new_owner = m_modelController->findObject(m_ownerKey);
- new_owner->insertRelation(m_indexOfElement, relation);
- int new_row = m_indexOfElement;
- m_ownerKey = former_owner->getUid();
- m_indexOfElement = former_row;
- emit m_modelController->endMoveRelation(new_row, new_owner);
+ MObject *formerOwner = relation->getOwner();
+ int formerRow = formerOwner->getRelations().indexOf(relation);
+ emit m_modelController->beginMoveRelation(formerRow, formerOwner);
+ formerOwner->decontrolRelation(relation);
+ MObject *newOwner = m_modelController->findObject(m_ownerKey);
+ newOwner->insertRelation(m_indexOfElement, relation);
+ int newRow = m_indexOfElement;
+ m_ownerKey = formerOwner->getUid();
+ m_indexOfElement = formerRow;
+ emit m_modelController->endMoveRelation(newRow, newOwner);
emit m_modelController->modified();
m_modelController->verifyModelIntegrity();
}
@@ -651,18 +651,18 @@ ModelController::~ModelController()
delete m_rootPackage;
}
-void ModelController::setRootPackage(MPackage *root_package)
+void ModelController::setRootPackage(MPackage *rootPackage)
{
startResetModel();
unmapObject(m_rootPackage);
- m_rootPackage = root_package;
+ m_rootPackage = rootPackage;
mapObject(m_rootPackage);
finishResetModel(false);
}
-void ModelController::setUndoController(UndoController *undo_controller)
+void ModelController::setUndoController(UndoController *undoController)
{
- m_undoController = undo_controller;
+ m_undoController = undoController;
}
Uid ModelController::getOwnerKey(const MElement *element) const
@@ -719,23 +719,23 @@ MObject *ModelController::findObject(const Uid &key) const
return m_objectsMap.value(key);
}
-void ModelController::addObject(MPackage *parent_package, MObject *object)
+void ModelController::addObject(MPackage *parentPackage, MObject *object)
{
- QMT_CHECK(parent_package);
+ QMT_CHECK(parentPackage);
QMT_CHECK(object);
- int row = parent_package->getChildren().size();
+ int row = parentPackage->getChildren().size();
if (!m_resettingModel) {
- emit beginInsertObject(row, parent_package);
+ emit beginInsertObject(row, parentPackage);
}
mapObject(object);
if (m_undoController) {
- AddElementsCommand *undo_command = new AddElementsCommand(this, tr("Add Object"));
- m_undoController->push(undo_command);
- undo_command->add(TYPE_OBJECT, object->getUid(), parent_package->getUid());
+ AddElementsCommand *undoCommand = new AddElementsCommand(this, tr("Add Object"));
+ m_undoController->push(undoCommand);
+ undoCommand->add(TYPE_OBJECT, object->getUid(), parentPackage->getUid());
}
- parent_package->addChild(object);
+ parentPackage->addChild(object);
if (!m_resettingModel) {
- emit endInsertObject(row, parent_package);
+ emit endInsertObject(row, parentPackage);
emit modified();
}
verifyModelIntegrity();
@@ -756,9 +756,9 @@ void ModelController::removeObject(MObject *object)
emit beginRemoveObject(row, owner);
}
if (m_undoController) {
- RemoveElementsCommand *undo_command = new RemoveElementsCommand(this, tr("Delete Object"));
- m_undoController->push(undo_command);
- undo_command->add(object, object->getOwner());
+ RemoveElementsCommand *undoCommand = new RemoveElementsCommand(this, tr("Delete Object"));
+ m_undoController->push(undoCommand);
+ undoCommand->add(object, object->getOwner());
}
unmapObject(object);
owner->removeChild(object);
@@ -822,29 +822,29 @@ void ModelController::finishUpdateObject(MObject *object, bool cancelled)
verifyModelIntegrity();
}
-void ModelController::moveObject(MPackage *new_owner, MObject *object)
+void ModelController::moveObject(MPackage *newOwner, MObject *object)
{
- QMT_CHECK(new_owner);
+ QMT_CHECK(newOwner);
QMT_CHECK(object);
QMT_CHECK(object != m_rootPackage);
- if (new_owner != object->getOwner()) {
- int former_row = 0;
- MObject *former_owner = object->getOwner();
- QMT_CHECK(former_owner);
- former_row = former_owner->getChildren().indexOf(object);
+ if (newOwner != object->getOwner()) {
+ int formerRow = 0;
+ MObject *formerOwner = object->getOwner();
+ QMT_CHECK(formerOwner);
+ formerRow = formerOwner->getChildren().indexOf(object);
if (!m_resettingModel) {
- emit beginMoveObject(former_row, former_owner);
+ emit beginMoveObject(formerRow, formerOwner);
}
if (m_undoController) {
- MoveObjectCommand *undo_command = new MoveObjectCommand(this, object);
- m_undoController->push(undo_command);
+ MoveObjectCommand *undoCommand = new MoveObjectCommand(this, object);
+ m_undoController->push(undoCommand);
}
- former_owner->decontrolChild(object);
- new_owner->addChild(object);
- int row = new_owner->getChildren().indexOf(object);
+ formerOwner->decontrolChild(object);
+ newOwner->addChild(object);
+ int row = newOwner->getChildren().indexOf(object);
if (!m_resettingModel) {
- emit endMoveObject(row, new_owner);
+ emit endMoveObject(row, newOwner);
emit modified();
}
}
@@ -869,9 +869,9 @@ void ModelController::addRelation(MObject *owner, MRelation *relation)
}
mapRelation(relation);
if (m_undoController) {
- AddElementsCommand *undo_command = new AddElementsCommand(this, tr("Add Relation"));
- m_undoController->push(undo_command);
- undo_command->add(TYPE_RELATION, relation->getUid(), owner->getUid());
+ AddElementsCommand *undoCommand = new AddElementsCommand(this, tr("Add Relation"));
+ m_undoController->push(undoCommand);
+ undoCommand->add(TYPE_RELATION, relation->getUid(), owner->getUid());
}
owner->addRelation(relation);
if (!m_resettingModel) {
@@ -891,9 +891,9 @@ void ModelController::removeRelation(MRelation *relation)
emit beginRemoveRelation(row, owner);
}
if (m_undoController) {
- RemoveElementsCommand *undo_command = new RemoveElementsCommand(this, tr("Delete Relation"));
- m_undoController->push(undo_command);
- undo_command->add(relation, owner);
+ RemoveElementsCommand *undoCommand = new RemoveElementsCommand(this, tr("Delete Relation"));
+ m_undoController->push(undoCommand);
+ undoCommand->add(relation, owner);
}
unmapRelation(relation);
owner->removeRelation(relation);
@@ -933,28 +933,28 @@ void ModelController::finishUpdateRelation(MRelation *relation, bool cancelled)
verifyModelIntegrity();
}
-void ModelController::moveRelation(MObject *new_owner, MRelation *relation)
+void ModelController::moveRelation(MObject *newOwner, MRelation *relation)
{
- QMT_CHECK(new_owner);
+ QMT_CHECK(newOwner);
QMT_CHECK(relation);
- if (new_owner != relation->getOwner()) {
- int former_row = 0;
- MObject *former_owner = relation->getOwner();
- QMT_CHECK(former_owner);
- former_row = former_owner->getRelations().indexOf(relation);
+ if (newOwner != relation->getOwner()) {
+ int formerRow = 0;
+ MObject *formerOwner = relation->getOwner();
+ QMT_CHECK(formerOwner);
+ formerRow = formerOwner->getRelations().indexOf(relation);
if (!m_resettingModel) {
- emit beginMoveRelation(former_row, former_owner);
+ emit beginMoveRelation(formerRow, formerOwner);
}
if (m_undoController) {
- MoveRelationCommand *undo_command = new MoveRelationCommand(this, relation);
- m_undoController->push(undo_command);
+ MoveRelationCommand *undoCommand = new MoveRelationCommand(this, relation);
+ m_undoController->push(undoCommand);
}
- former_owner->decontrolRelation(relation);
- new_owner->addRelation(relation);
- int row = new_owner->getRelations().indexOf(relation);
+ formerOwner->decontrolRelation(relation);
+ newOwner->addRelation(relation);
+ int row = newOwner->getRelations().indexOf(relation);
if (!m_resettingModel) {
- emit endMoveRelation(row, new_owner);
+ emit endMoveRelation(row, newOwner);
emit modified();
}
}
@@ -967,74 +967,74 @@ QList<MRelation *> ModelController::findRelationsOfObject(const MObject *object)
return m_objectRelationsMap.values(object->getUid());
}
-MContainer ModelController::cutElements(const MSelection &model_selection)
+MContainer ModelController::cutElements(const MSelection &modelSelection)
{
- // PERFORM avoid duplicate call of simplify(model_selection)
- MContainer copied_elements = copyElements(model_selection);
- deleteElements(model_selection, tr("Cut"));
- return copied_elements;
+ // PERFORM avoid duplicate call of simplify(modelSelection)
+ MContainer copiedElements = copyElements(modelSelection);
+ deleteElements(modelSelection, tr("Cut"));
+ return copiedElements;
}
-MContainer ModelController::copyElements(const MSelection &model_selection)
+MContainer ModelController::copyElements(const MSelection &modelSelection)
{
- MReferences simplified_selection = simplify(model_selection);
- MContainer copied_elements;
- foreach (MElement *element, simplified_selection.getElements()) {
+ MReferences simplifiedSelection = simplify(modelSelection);
+ MContainer copiedElements;
+ foreach (MElement *element, simplifiedSelection.getElements()) {
MCloneDeepVisitor visitor;
element->accept(&visitor);
- MElement *cloned_element = visitor.getCloned();
- copied_elements.submit(cloned_element);
+ MElement *clonedElement = visitor.getCloned();
+ copiedElements.submit(clonedElement);
}
- return copied_elements;
+ return copiedElements;
}
-void ModelController::pasteElements(MObject *owner, const MContainer &model_container)
+void ModelController::pasteElements(MObject *owner, const MContainer &modelContainer)
{
// clone all elements and renew their keys
- QHash<Uid, Uid> renewed_keys;
- QList<MElement *> cloned_elements;
- foreach (MElement *element, model_container.getElements()) {
+ QHash<Uid, Uid> renewedKeys;
+ QList<MElement *> clonedElements;
+ foreach (MElement *element, modelContainer.getElements()) {
MCloneDeepVisitor visitor;
element->accept(&visitor);
- MElement *cloned_element = visitor.getCloned();
- renewElementKey(cloned_element, &renewed_keys);
- cloned_elements.append(cloned_element);
+ MElement *clonedElement = visitor.getCloned();
+ renewElementKey(clonedElement, &renewedKeys);
+ clonedElements.append(clonedElement);
}
// fix all keys referencing between pasting elements
- foreach (MElement *cloned_element, cloned_elements) {
- updateRelationKeys(cloned_element, renewed_keys);
+ foreach (MElement *clonedElement, clonedElements) {
+ updateRelationKeys(clonedElement, renewedKeys);
}
if (m_undoController) {
m_undoController->beginMergeSequence(tr("Paste"));
}
// insert all elements
bool added = false;
- foreach (MElement *cloned_element, cloned_elements) {
- if (MObject *object = dynamic_cast<MObject *>(cloned_element)) {
- MObject *object_owner = owner;
+ foreach (MElement *clonedElement, clonedElements) {
+ if (MObject *object = dynamic_cast<MObject *>(clonedElement)) {
+ MObject *objectOwner = owner;
if (!dynamic_cast<MPackage*>(owner)) {
- object_owner = owner->getOwner();
+ objectOwner = owner->getOwner();
}
- QMT_CHECK(dynamic_cast<MPackage*>(object_owner));
- int row = object_owner->getChildren().size();
- emit beginInsertObject(row, object_owner);
+ QMT_CHECK(dynamic_cast<MPackage*>(objectOwner));
+ int row = objectOwner->getChildren().size();
+ emit beginInsertObject(row, objectOwner);
mapObject(object);
if (m_undoController) {
- AddElementsCommand *undo_command = new AddElementsCommand(this, tr("Paste"));
- m_undoController->push(undo_command);
- undo_command->add(TYPE_OBJECT, object->getUid(), object_owner->getUid());
+ AddElementsCommand *undoCommand = new AddElementsCommand(this, tr("Paste"));
+ m_undoController->push(undoCommand);
+ undoCommand->add(TYPE_OBJECT, object->getUid(), objectOwner->getUid());
}
- object_owner->insertChild(row, object);
- emit endInsertObject(row, object_owner);
+ objectOwner->insertChild(row, object);
+ emit endInsertObject(row, objectOwner);
added = true;
- } else if (MRelation *relation = dynamic_cast<MRelation *>(cloned_element)) {
+ } else if (MRelation *relation = dynamic_cast<MRelation *>(clonedElement)) {
int row = owner->getRelations().size();
emit beginInsertRelation(row, owner);
mapRelation(relation);
if (m_undoController) {
- AddElementsCommand *undo_command = new AddElementsCommand(this, tr("Paste"));
- m_undoController->push(undo_command);
- undo_command->add(TYPE_RELATION, relation->getUid(), owner->getUid());
+ AddElementsCommand *undoCommand = new AddElementsCommand(this, tr("Paste"));
+ m_undoController->push(undoCommand);
+ undoCommand->add(TYPE_RELATION, relation->getUid(), owner->getUid());
}
owner->addRelation(relation);
emit endInsertRelation(row, owner);
@@ -1050,22 +1050,22 @@ void ModelController::pasteElements(MObject *owner, const MContainer &model_cont
}
}
-void ModelController::deleteElements(const MSelection &model_selection)
+void ModelController::deleteElements(const MSelection &modelSelection)
{
- deleteElements(model_selection, tr("Delete"));
+ deleteElements(modelSelection, tr("Delete"));
}
-void ModelController::deleteElements(const MSelection &model_selection, const QString &command_label)
+void ModelController::deleteElements(const MSelection &modelSelection, const QString &commandLabel)
{
- MReferences simplified_selection = simplify(model_selection);
- if (simplified_selection.getElements().isEmpty()) {
+ MReferences simplifiedSelection = simplify(modelSelection);
+ if (simplifiedSelection.getElements().isEmpty()) {
return;
}
if (m_undoController) {
- m_undoController->beginMergeSequence(command_label);
+ m_undoController->beginMergeSequence(commandLabel);
}
bool removed = false;
- foreach (MElement *element, simplified_selection.getElements()) {
+ foreach (MElement *element, simplifiedSelection.getElements()) {
// element may have been deleted indirectly by predecessor element in loop
if ((element = findElement(element->getUid()))) {
if (MObject *object = dynamic_cast<MObject *>(element)) {
@@ -1074,9 +1074,9 @@ void ModelController::deleteElements(const MSelection &model_selection, const QS
int row = owner->getChildren().indexOf(object);
emit beginRemoveObject(row, owner);
if (m_undoController) {
- RemoveElementsCommand *cut_command = new RemoveElementsCommand(this, command_label);
- m_undoController->push(cut_command);
- cut_command->add(element, owner);
+ RemoveElementsCommand *cutCommand = new RemoveElementsCommand(this, commandLabel);
+ m_undoController->push(cutCommand);
+ cutCommand->add(element, owner);
}
unmapObject(object);
owner->removeChild(object);
@@ -1087,9 +1087,9 @@ void ModelController::deleteElements(const MSelection &model_selection, const QS
int row = owner->getRelations().indexOf(relation);
emit beginRemoveRelation(row, owner);
if (m_undoController) {
- RemoveElementsCommand *cut_command = new RemoveElementsCommand(this, command_label);
- m_undoController->push(cut_command);
- cut_command->add(element, owner);
+ RemoveElementsCommand *cutCommand = new RemoveElementsCommand(this, commandLabel);
+ m_undoController->push(cutCommand);
+ cutCommand->add(element, owner);
}
unmapRelation(relation);
owner->removeRelation(relation);
@@ -1117,55 +1117,55 @@ void ModelController::removeRelatedRelations(MObject *object)
QMT_CHECK(m_objectRelationsMap.values(object->getUid()).isEmpty());
}
-void ModelController::renewElementKey(MElement *element, QHash<Uid, Uid> *renewed_keys)
+void ModelController::renewElementKey(MElement *element, QHash<Uid, Uid> *renewedKeys)
{
if (element) {
- MElement *other_element = findObject(element->getUid());
- if (other_element) {
- QMT_CHECK(other_element != element);
+ MElement *otherElement = findObject(element->getUid());
+ if (otherElement) {
+ QMT_CHECK(otherElement != element);
}
if (m_objectsMap.contains(element->getUid()) || m_relationsMap.contains(element->getUid())) {
- Uid old_key = element->getUid();
+ Uid oldKey = element->getUid();
element->renewUid();
- Uid new_key = element->getUid();
- renewed_keys->insert(old_key, new_key);
+ Uid newKey = element->getUid();
+ renewedKeys->insert(oldKey, newKey);
}
MObject *object = dynamic_cast<MObject *>(element);
if (object) {
foreach (const Handle<MObject> &child, object->getChildren()) {
- renewElementKey(child.getTarget(), renewed_keys);
+ renewElementKey(child.getTarget(), renewedKeys);
}
foreach (const Handle<MRelation> &relation, object->getRelations()) {
- renewElementKey(relation.getTarget(), renewed_keys);
+ renewElementKey(relation.getTarget(), renewedKeys);
}
}
}
}
-void ModelController::updateRelationKeys(MElement *element, const QHash<Uid, Uid> &renewed_keys)
+void ModelController::updateRelationKeys(MElement *element, const QHash<Uid, Uid> &renewedKeys)
{
if (MObject *object = dynamic_cast<MObject *>(element)) {
foreach (const Handle<MRelation> &handle, object->getRelations()) {
- updateRelationEndKeys(handle.getTarget(), renewed_keys);
+ updateRelationEndKeys(handle.getTarget(), renewedKeys);
}
foreach (const Handle<MObject> &child, object->getChildren()) {
- updateRelationKeys(child.getTarget(), renewed_keys);
+ updateRelationKeys(child.getTarget(), renewedKeys);
}
} else if (MRelation *relation = dynamic_cast<MRelation *>(element)) {
- updateRelationEndKeys(relation, renewed_keys);
+ updateRelationEndKeys(relation, renewedKeys);
}
}
-void ModelController::updateRelationEndKeys(MRelation *relation, const QHash<Uid, Uid> &renewed_keys)
+void ModelController::updateRelationEndKeys(MRelation *relation, const QHash<Uid, Uid> &renewedKeys)
{
if (relation) {
- Uid new_end_a_key = renewed_keys.value(relation->getEndA(), Uid::getInvalidUid());
- if (new_end_a_key.isValid()) {
- relation->setEndA(new_end_a_key);
+ Uid newEndAKey = renewedKeys.value(relation->getEndA(), Uid::getInvalidUid());
+ if (newEndAKey.isValid()) {
+ relation->setEndA(newEndAKey);
}
- Uid new_end_b_key = renewed_keys.value(relation->getEndB(), Uid::getInvalidUid());
- if (new_end_b_key.isValid()) {
- relation->setEndB(new_end_b_key);
+ Uid newEndBKey = renewedKeys.value(relation->getEndB(), Uid::getInvalidUid());
+ if (newEndBKey.isValid()) {
+ relation->setEndB(newEndBKey);
}
}
}
@@ -1226,20 +1226,20 @@ void ModelController::unmapRelation(MRelation *relation)
}
}
-MReferences ModelController::simplify(const MSelection &model_selection)
+MReferences ModelController::simplify(const MSelection &modelSelection)
{
- // PERFORM improve performance by using a set of Uid build from model_selection
+ // PERFORM improve performance by using a set of Uid build from modelSelection
MReferences references;
- foreach (const MSelection::Index &index, model_selection.getIndices()) {
+ foreach (const MSelection::Index &index, modelSelection.getIndices()) {
MElement *element = findElement(index.getElementKey());
QMT_CHECK(element);
- // if any (grand-)parent of element is in model_selection then ignore element
+ // if any (grand-)parent of element is in modelSelection then ignore element
bool ignore = false;
MObject *owner = element->getOwner();
while (owner) {
- Uid owner_key = owner->getUid();
- foreach (const MSelection::Index &index, model_selection.getIndices()) {
- if (index.getElementKey() == owner_key) {
+ Uid ownerKey = owner->getUid();
+ foreach (const MSelection::Index &index, modelSelection.getIndices()) {
+ if (index.getElementKey() == ownerKey) {
ignore = true;
break;
}
@@ -1262,63 +1262,63 @@ void ModelController::verifyModelIntegrity() const
#ifndef QT_NO_DEBUG
QMT_CHECK(m_rootPackage);
- QHash<Uid, const MObject *> objects_map;
- QHash<Uid, const MRelation *> relations_map;
- QMultiHash<Uid, MRelation *> object_relations_map;
- verifyModelIntegrity(m_rootPackage, &objects_map, &relations_map, &object_relations_map);
+ QHash<Uid, const MObject *> objectsMap;
+ QHash<Uid, const MRelation *> relationsMap;
+ QMultiHash<Uid, MRelation *> objectRelationsMap;
+ verifyModelIntegrity(m_rootPackage, &objectsMap, &relationsMap, &objectRelationsMap);
- QMT_CHECK(objects_map.size() == m_objectsMap.size());
+ QMT_CHECK(objectsMap.size() == m_objectsMap.size());
foreach (const MObject *object, m_objectsMap) {
QMT_CHECK(object);
QMT_CHECK(m_objectsMap.contains(object->getUid()));
- QMT_CHECK(objects_map.contains(object->getUid()));
+ QMT_CHECK(objectsMap.contains(object->getUid()));
}
- QMT_CHECK(relations_map.size() == m_relationsMap.size());
+ QMT_CHECK(relationsMap.size() == m_relationsMap.size());
foreach (const MRelation *relation, m_relationsMap) {
QMT_CHECK(relation);
QMT_CHECK(m_relationsMap.contains(relation->getUid()));
- QMT_CHECK(relations_map.contains(relation->getUid()));
+ QMT_CHECK(relationsMap.contains(relation->getUid()));
}
- QMT_CHECK(object_relations_map.size() == m_objectRelationsMap.size());
+ QMT_CHECK(objectRelationsMap.size() == m_objectRelationsMap.size());
for (QMultiHash<Uid, MRelation *>::const_iterator it = m_objectRelationsMap.cbegin(); it != m_objectRelationsMap.cend(); ++it) {
- QMT_CHECK(object_relations_map.contains(it.key(), it.value()));
+ QMT_CHECK(objectRelationsMap.contains(it.key(), it.value()));
}
#endif
#endif
}
-void ModelController::verifyModelIntegrity(const MObject *object, QHash<Uid, const MObject *> *objects_map,
- QHash<Uid, const MRelation *> *relations_map,
- QMultiHash<Uid, MRelation *> *object_relations_map) const
+void ModelController::verifyModelIntegrity(const MObject *object, QHash<Uid, const MObject *> *objectsMap,
+ QHash<Uid, const MRelation *> *relationsMap,
+ QMultiHash<Uid, MRelation *> *objectRelationsMap) const
{
#ifndef QT_NO_DEBUG
QMT_CHECK(object);
- QMT_CHECK(!objects_map->contains(object->getUid()));
- objects_map->insert(object->getUid(), object);
+ QMT_CHECK(!objectsMap->contains(object->getUid()));
+ objectsMap->insert(object->getUid(), object);
foreach (const Handle<MRelation> &handle, object->getRelations()) {
MRelation *relation = handle.getTarget();
if (relation) {
- QMT_CHECK(!relations_map->contains(relation->getUid()));
- relations_map->insert(relation->getUid(), relation);
+ QMT_CHECK(!relationsMap->contains(relation->getUid()));
+ relationsMap->insert(relation->getUid(), relation);
QMT_CHECK(findObject(relation->getEndA()));
QMT_CHECK(findObject(relation->getEndB()));
- QMT_CHECK(!object_relations_map->contains(relation->getEndA(), relation));
- object_relations_map->insert(relation->getEndA(), relation);
- QMT_CHECK(!object_relations_map->contains(relation->getEndB(), relation));
- object_relations_map->insert(relation->getEndB(), relation);
+ QMT_CHECK(!objectRelationsMap->contains(relation->getEndA(), relation));
+ objectRelationsMap->insert(relation->getEndA(), relation);
+ QMT_CHECK(!objectRelationsMap->contains(relation->getEndB(), relation));
+ objectRelationsMap->insert(relation->getEndB(), relation);
}
}
foreach (const Handle<MObject> &handle, object->getChildren()) {
- MObject *child_object = handle.getTarget();
- if (child_object) {
- verifyModelIntegrity(child_object, objects_map, relations_map, object_relations_map);
+ MObject *childObject = handle.getTarget();
+ if (childObject) {
+ verifyModelIntegrity(childObject, objectsMap, relationsMap, objectRelationsMap);
}
}
#else
Q_UNUSED(object);
- Q_UNUSED(objects_map);
- Q_UNUSED(relations_map);
- Q_UNUSED(object_relations_map);
+ Q_UNUSED(objectsMap);
+ Q_UNUSED(relationsMap);
+ Q_UNUSED(objectRelationsMap);
#endif
}
diff --git a/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.h b/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.h
index c42e79eb273cf103b95edeb1a851ccd1cebd25d5..529748da708938f042b25b51ec90ffc77c0f6cd2 100644
--- a/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.h
+++ b/src/libs/3rdparty/modeling/qmt/model_controller/modelcontroller.h
@@ -95,9 +95,9 @@ signals:
void endRemoveObject(int row, const MObject *owner);
- void beginMoveObject(int former_row, const MObject *former_owner);
+ void beginMoveObject(int formerRow, const MObject *formerOwner);
- void endMoveObject(int new_row, const MObject *new_owner);
+ void endMoveObject(int newRow, const MObject *newOwner);
void beginUpdateRelation(int row, const MObject *owner);
@@ -111,13 +111,13 @@ signals:
void endRemoveRelation(int row, const MObject *owner);
- void beginMoveRelation(int former_row, const MObject *former_owner);
+ void beginMoveRelation(int formerRow, const MObject *formerOwner);
- void endMoveRelation(int new_row, const MObject *new_owner);
+ void endMoveRelation(int newRow, const MObject *newOwner);
- void packageNameChanged(MPackage *package, const QString &old_package_name);
+ void packageNameChanged(MPackage *package, const QString &oldPackageName);
- void relationEndChanged(MRelation *relation, MObject *end_object);
+ void relationEndChanged(MRelation *relation, MObject *endObject);
void modified();
@@ -125,11 +125,11 @@ public:
MPackage *getRootPackage() const { return m_rootPackage; }
- void setRootPackage(MPackage *root_package);
+ void setRootPackage(MPackage *rootPackage);
UndoController *getUndoController() const { return m_undoController; }
- void setUndoController(UndoController *undo_controller);
+ void setUndoController(UndoController *undoController);
public:
@@ -155,7 +155,7 @@ public:
template<class T>
T *findObject(const Uid &key) const { return dynamic_cast<T *>(findObject(key)); }
- void addObject(MPackage *parent_package, MObject *object);
+ void addObject(MPackage *parentPackage, MObject *object);
void removeObject(MObject *object);
@@ -163,7 +163,7 @@ public:
void finishUpdateObject(MObject *object, bool cancelled);
- void moveObject(MPackage *new_owner, MObject *object);
+ void moveObject(MPackage *newOwner, MObject *object);
public:
@@ -180,7 +180,7 @@ public:
void finishUpdateRelation(MRelation *relation, bool cancelled);
- void moveRelation(MObject *new_owner, MRelation *relation);
+ void moveRelation(MObject *newOwner, MRelation *relation);
public:
@@ -188,17 +188,17 @@ public:
public:
- MContainer cutElements(const MSelection &model_selection);
+ MContainer cutElements(const MSelection &modelSelection);
- MContainer copyElements(const MSelection &model_selection);
+ MContainer copyElements(const MSelection &modelSelection);
- void pasteElements(MObject *owner, const MContainer &model_container);
+ void pasteElements(MObject *owner, const MContainer &modelContainer);
- void deleteElements(const MSelection &model_selection);
+ void deleteElements(const MSelection &modelSelection);
private:
- void deleteElements(const MSelection &model_selection, const QString &command_label);
+ void deleteElements(const MSelection &modelSelection, const QString &commandLabel);
void removeRelatedRelations(MObject *object);
@@ -210,11 +210,11 @@ public:
private:
- void renewElementKey(MElement *element, QHash<Uid, Uid> *renewed_keys);
+ void renewElementKey(MElement *element, QHash<Uid, Uid> *renewedKeys);
- void updateRelationKeys(MElement *element, const QHash<Uid, Uid> &renewed_keys);
+ void updateRelationKeys(MElement *element, const QHash<Uid, Uid> &renewedKeys);
- void updateRelationEndKeys(MRelation *relation, const QHash<Uid, Uid> &renewed_keys);
+ void updateRelationEndKeys(MRelation *relation, const QHash<Uid, Uid> &renewedKeys);
void mapObject(MObject *object);
@@ -224,13 +224,13 @@ private:
void unmapRelation(MRelation *relation);
- MReferences simplify(const MSelection &model_selection);
+ MReferences simplify(const MSelection &modelSelection);
void verifyModelIntegrity() const;
- void verifyModelIntegrity(const MObject *object, QHash<Uid, const MObject *> *objects_map, QHash<Uid,
- const MRelation *> *relations_map,
- QMultiHash<Uid, MRelation *> *object_relations_map) const;
+ void verifyModelIntegrity(const MObject *object, QHash<Uid, const MObject *> *objectsMap, QHash<Uid,
+ const MRelation *> *relationsMap,
+ QMultiHash<Uid, MRelation *> *objectRelationsMap) const;
private:
diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/sortedtreemodel.cpp b/src/libs/3rdparty/modeling/qmt/model_ui/sortedtreemodel.cpp
index 86656b4641be352a0e6ee10cfd2cb84906f0dd84..987d71fa2376fb2d90076d20e43fe7e80c981794 100644
--- a/src/libs/3rdparty/modeling/qmt/model_ui/sortedtreemodel.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model_ui/sortedtreemodel.cpp
@@ -53,20 +53,20 @@ SortedTreeModel::~SortedTreeModel()
}
-void SortedTreeModel::setTreeModel(TreeModel *tree_model)
+void SortedTreeModel::setTreeModel(TreeModel *treeModel)
{
- m_treeModel = tree_model;
- setSourceModel(tree_model);
+ m_treeModel = treeModel;
+ setSourceModel(treeModel);
startDelayedSortTimer();
}
bool SortedTreeModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
{
- TreeModel::ItemType left_item_type = (TreeModel::ItemType) sourceModel()->data(left, TreeModel::ROLE_ITEM_TYPE).toInt();
- TreeModel::ItemType right_item_type = (TreeModel::ItemType) sourceModel()->data(right, TreeModel::ROLE_ITEM_TYPE).toInt();
- if (left_item_type < right_item_type) {
+ TreeModel::ItemType leftItemType = (TreeModel::ItemType) sourceModel()->data(left, TreeModel::ROLE_ITEM_TYPE).toInt();
+ TreeModel::ItemType rightItemType = (TreeModel::ItemType) sourceModel()->data(right, TreeModel::ROLE_ITEM_TYPE).toInt();
+ if (leftItemType < rightItemType) {
return true;
- } else if (left_item_type > right_item_type) {
+ } else if (leftItemType > rightItemType) {
return false;
} else {
QVariant l = sourceModel()->data(left);
diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/sortedtreemodel.h b/src/libs/3rdparty/modeling/qmt/model_ui/sortedtreemodel.h
index 1c7fcc4e43a81d53f29493813651a32ef5017881..76b65b5b9562217dc6c1d7ed51992d0fed8812db 100644
--- a/src/libs/3rdparty/modeling/qmt/model_ui/sortedtreemodel.h
+++ b/src/libs/3rdparty/modeling/qmt/model_ui/sortedtreemodel.h
@@ -56,7 +56,7 @@ public:
TreeModel *getTreeModel() const { return m_treeModel; }
- void setTreeModel(TreeModel *tree_model);
+ void setTreeModel(TreeModel *treeModel);
protected:
diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/treemodel.cpp b/src/libs/3rdparty/modeling/qmt/model_ui/treemodel.cpp
index 0e6ce3d5b611b802bdba083a3b3b3bcfd36e7928..00d94e327672e5a1f3fae2bc6b87e3afbbd9072b 100644
--- a/src/libs/3rdparty/modeling/qmt/model_ui/treemodel.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model_ui/treemodel.cpp
@@ -81,8 +81,8 @@ class TreeModel::ItemFactory :
public MConstVisitor
{
public:
- ItemFactory(TreeModel *tree_model)
- : m_treeModel(tree_model),
+ ItemFactory(TreeModel *treeModel)
+ : m_treeModel(treeModel),
m_item(0)
{
QMT_CHECK(m_treeModel);
@@ -214,8 +214,8 @@ class TreeModel::ItemUpdater :
public MConstVisitor
{
public:
- ItemUpdater(TreeModel *tree_model, ModelItem *item)
- : m_treeModel(tree_model),
+ ItemUpdater(TreeModel *treeModel, ModelItem *item)
+ : m_treeModel(treeModel),
m_item(item)
{
QMT_CHECK(m_treeModel);
@@ -349,13 +349,13 @@ TreeModel::~TreeModel()
clear();
}
-void TreeModel::setModelController(ModelController *model_controller)
+void TreeModel::setModelController(ModelController *modelController)
{
- if (m_modelController != model_controller) {
+ if (m_modelController != modelController) {
if (m_modelController) {
disconnect(m_modelController, 0, this, 0);
}
- m_modelController = model_controller;
+ m_modelController = modelController;
if (m_modelController) {
connect(m_modelController, SIGNAL(beginResetModel()), this, SLOT(onBeginResetModel()));
connect(m_modelController, SIGNAL(endResetModel()), this, SLOT(onEndResetModel()));
@@ -383,14 +383,14 @@ void TreeModel::setModelController(ModelController *model_controller)
}
}
-void TreeModel::setStereotypeController(StereotypeController *stereotype_controller)
+void TreeModel::setStereotypeController(StereotypeController *stereotypeController)
{
- m_stereotypeController = stereotype_controller;
+ m_stereotypeController = stereotypeController;
}
-void TreeModel::setStyleController(StyleController *style_controller)
+void TreeModel::setStyleController(StyleController *styleController)
{
- m_styleController = style_controller;
+ m_styleController = styleController;
}
MElement *TreeModel::getElement(const QModelIndex &index) const
@@ -401,17 +401,17 @@ MElement *TreeModel::getElement(const QModelIndex &index) const
QStandardItem *item = itemFromIndex(index);
if (item) {
if (item->parent()) {
- ModelItem *parent_model_item = dynamic_cast<ModelItem *>(item->parent());
- QMT_CHECK(parent_model_item);
- const MObject *parent_object = m_itemToObjectMap.value(parent_model_item);
- QMT_CHECK(parent_object);
- if (parent_object) {
- if (index.row() >= 0 && index.row() < parent_object->getChildren().size()) {
- element = parent_object->getChildren().at(index.row());
+ ModelItem *parentModelItem = dynamic_cast<ModelItem *>(item->parent());
+ QMT_CHECK(parentModelItem);
+ const MObject *parentObject = m_itemToObjectMap.value(parentModelItem);
+ QMT_CHECK(parentObject);
+ if (parentObject) {
+ if (index.row() >= 0 && index.row() < parentObject->getChildren().size()) {
+ element = parentObject->getChildren().at(index.row());
QMT_CHECK(element);
- } else if (index.row() >= parent_object->getChildren().size()
- && index.row() < parent_object->getChildren().size() + parent_object->getRelations().size()) {
- element = parent_object->getRelations().at(index.row() - parent_object->getChildren().size());
+ } else if (index.row() >= parentObject->getChildren().size()
+ && index.row() < parentObject->getChildren().size() + parentObject->getRelations().size()) {
+ element = parentObject->getRelations().at(index.row() - parentObject->getChildren().size());
QMT_CHECK(element);
} else {
QMT_CHECK(false);
@@ -433,15 +433,15 @@ QModelIndex TreeModel::getIndex(const MElement *element) const
QMT_CHECK(element == m_modelController->getRootPackage());
return index(0, 0);
}
- MObject *parent_object = object->getOwner();
- ModelItem *item = m_objectToItemMap.value(parent_object);
+ MObject *parentObject = object->getOwner();
+ ModelItem *item = m_objectToItemMap.value(parentObject);
if (!item) {
QMT_CHECK(false);
return QModelIndex();
}
- QModelIndex parent_index = indexFromItem(item);
- int row = parent_object->getChildren().indexOf(object);
- return index(row, 0, parent_index);
+ QModelIndex parentIndex = indexFromItem(item);
+ int row = parentObject->getChildren().indexOf(object);
+ return index(row, 0, parentIndex);
} else if (const MRelation *relation = dynamic_cast<const MRelation *>(element)) {
QMT_CHECK(relation->getOwner());
MObject *owner = relation->getOwner();
@@ -450,9 +450,9 @@ QModelIndex TreeModel::getIndex(const MElement *element) const
QMT_CHECK(false);
return QModelIndex();
}
- QModelIndex parent_index = indexFromItem(item);
+ QModelIndex parentIndex = indexFromItem(item);
int row = owner->getChildren().size() + owner->getRelations().indexOf(relation);
- return index(row, 0, parent_index);
+ return index(row, 0, parentIndex);
}
return QModelIndex();
}
@@ -487,11 +487,11 @@ void TreeModel::onEndResetModel()
{
QMT_CHECK(m_busy == RESET_MODEL);
clear();
- MPackage *root_package = m_modelController->getRootPackage();
- if (m_modelController && root_package) {
- m_rootItem = createItem(root_package);
+ MPackage *rootPackage = m_modelController->getRootPackage();
+ if (m_modelController && rootPackage) {
+ m_rootItem = createItem(rootPackage);
appendRow(m_rootItem);
- createChildren(root_package, m_rootItem);
+ createChildren(rootPackage, m_rootItem);
QStandardItemModel::endResetModel();
}
m_busy = NOT_BUSY;
@@ -508,27 +508,27 @@ void TreeModel::onBeginUpdateObject(int row, const MObject *parent)
void TreeModel::onEndUpdateObject(int row, const MObject *parent)
{
QMT_CHECK(m_busy == UPDATE_ELEMENT);
- QModelIndex parent_index;
+ QModelIndex parentIndex;
if (parent) {
QMT_CHECK(m_objectToItemMap.contains(parent));
- ModelItem *parent_item = m_objectToItemMap.value(parent);
- QMT_CHECK(parent_item);
- parent_index = indexFromItem(parent_item);
+ ModelItem *parentItem = m_objectToItemMap.value(parent);
+ QMT_CHECK(parentItem);
+ parentIndex = indexFromItem(parentItem);
}
// reflect updated element in standard item
- QModelIndex element_index = this->index(row, 0, parent_index);
- MElement *element = getElement(element_index);
+ QModelIndex elementIndex = this->index(row, 0, parentIndex);
+ MElement *element = getElement(elementIndex);
if (element) {
MObject *object = dynamic_cast<MObject *>(element);
if (object) {
- ModelItem *item = dynamic_cast<ModelItem *>(itemFromIndex(element_index));
+ ModelItem *item = dynamic_cast<ModelItem *>(itemFromIndex(elementIndex));
QMT_CHECK(item);
ItemUpdater visitor(this, item);
element->accept(&visitor);
}
}
m_busy = NOT_BUSY;
- emit dataChanged(this->index(row, 0, parent_index), this->index(row, 0, parent_index));
+ emit dataChanged(this->index(row, 0, parentIndex), this->index(row, 0, parentIndex));
}
void TreeModel::onBeginInsertObject(int row, const MObject *parent)
@@ -542,11 +542,11 @@ void TreeModel::onBeginInsertObject(int row, const MObject *parent)
void TreeModel::onEndInsertObject(int row, const MObject *parent)
{
QMT_CHECK(m_busy == INSERT_ELEMENT);
- ModelItem *parent_item =m_objectToItemMap.value(parent);
- QMT_CHECK(parent_item);
+ ModelItem *parentItem =m_objectToItemMap.value(parent);
+ QMT_CHECK(parentItem);
MObject *object = parent->getChildren().at(row);
ModelItem *item = createItem(object);
- parent_item->insertRow(row, item);
+ parentItem->insertRow(row, item);
createChildren(object, item);
m_busy = NOT_BUSY;
}
@@ -560,9 +560,9 @@ void TreeModel::onBeginRemoveObject(int row, const MObject *parent)
if (object) {
removeObjectFromItemMap(object);
}
- ModelItem *parent_item = m_objectToItemMap.value(parent);
- QMT_CHECK(parent_item);
- parent_item->removeRow(row);
+ ModelItem *parentItem = m_objectToItemMap.value(parent);
+ QMT_CHECK(parentItem);
+ parentItem->removeRow(row);
}
void TreeModel::onEndRemoveObject(int row, const MObject *parent)
@@ -573,28 +573,28 @@ void TreeModel::onEndRemoveObject(int row, const MObject *parent)
m_busy = NOT_BUSY;
}
-void TreeModel::onBeginMoveObject(int former_row, const MObject *former_owner)
+void TreeModel::onBeginMoveObject(int formerRow, const MObject *formerOwner)
{
QMT_CHECK(m_busy == NOT_BUSY);
m_busy = MOVE_ELEMENT;
- QMT_CHECK(former_owner);
- MObject *object = former_owner->getChildren().at(former_row);
+ QMT_CHECK(formerOwner);
+ MObject *object = formerOwner->getChildren().at(formerRow);
if (object) {
removeObjectFromItemMap(object);
}
- ModelItem *parent_item = m_objectToItemMap.value(former_owner);
- QMT_CHECK(parent_item);
- parent_item->removeRow(former_row);
+ ModelItem *parentItem = m_objectToItemMap.value(formerOwner);
+ QMT_CHECK(parentItem);
+ parentItem->removeRow(formerRow);
}
void TreeModel::onEndMoveObject(int row, const MObject *owner)
{
QMT_CHECK(m_busy == MOVE_ELEMENT);
- ModelItem *parent_item =m_objectToItemMap.value(owner);
- QMT_CHECK(parent_item);
+ ModelItem *parentItem =m_objectToItemMap.value(owner);
+ QMT_CHECK(parentItem);
MObject *object = owner->getChildren().at(row);
ModelItem *item = createItem(object);
- parent_item->insertRow(row, item);
+ parentItem->insertRow(row, item);
createChildren(object, item);
m_busy = NOT_BUSY;
}
@@ -613,25 +613,25 @@ void TreeModel::onEndUpdateRelation(int row, const MObject *parent)
QMT_CHECK(m_busy == UPDATE_RELATION);
QMT_CHECK(m_objectToItemMap.contains(parent));
- ModelItem *parent_item = m_objectToItemMap.value(parent);
- QMT_CHECK(parent_item);
- QModelIndex parent_index = indexFromItem(parent_item);
+ ModelItem *parentItem = m_objectToItemMap.value(parent);
+ QMT_CHECK(parentItem);
+ QModelIndex parentIndex = indexFromItem(parentItem);
// reflect updated relation in standard item
row += parent->getChildren().size();
- QModelIndex element_index = this->index(row, 0, parent_index);
- MElement *element = getElement(element_index);
+ QModelIndex elementIndex = this->index(row, 0, parentIndex);
+ MElement *element = getElement(elementIndex);
if (element) {
MRelation *relation = dynamic_cast<MRelation *>(element);
if (relation) {
- ModelItem *item = dynamic_cast<ModelItem *>(itemFromIndex(element_index));
+ ModelItem *item = dynamic_cast<ModelItem *>(itemFromIndex(elementIndex));
QMT_CHECK(item);
ItemUpdater visitor(this, item);
element->accept(&visitor);
}
}
m_busy = NOT_BUSY;
- emit dataChanged(this->index(row, 0, parent_index), this->index(row, 0, parent_index));
+ emit dataChanged(this->index(row, 0, parentIndex), this->index(row, 0, parentIndex));
}
void TreeModel::onBeginInsertRelation(int row, const MObject *parent)
@@ -646,11 +646,11 @@ void TreeModel::onEndInsertRelation(int row, const MObject *parent)
{
QMT_CHECK(parent);
QMT_CHECK(m_busy == INSERT_RELATION);
- ModelItem *parent_item =m_objectToItemMap.value(parent);
- QMT_CHECK(parent_item);
+ ModelItem *parentItem =m_objectToItemMap.value(parent);
+ QMT_CHECK(parentItem);
MRelation *relation = parent->getRelations().at(row);
ModelItem *item = createItem(relation);
- parent_item->insertRow(parent->getChildren().size() + row, item);
+ parentItem->insertRow(parent->getChildren().size() + row, item);
m_busy = NOT_BUSY;
}
@@ -660,9 +660,9 @@ void TreeModel::onBeginRemoveRelation(int row, const MObject *parent)
QMT_CHECK(m_busy == NOT_BUSY);
m_busy = REMOVE_RELATION;
QMT_CHECK(parent->getRelations().at(row));
- ModelItem *parent_item = m_objectToItemMap.value(parent);
- QMT_CHECK(parent_item);
- parent_item->removeRow(parent->getChildren().size() + row);
+ ModelItem *parentItem = m_objectToItemMap.value(parent);
+ QMT_CHECK(parentItem);
+ parentItem->removeRow(parent->getChildren().size() + row);
}
void TreeModel::onEndRemoveRelation(int row, const MObject *parent)
@@ -673,46 +673,46 @@ void TreeModel::onEndRemoveRelation(int row, const MObject *parent)
m_busy = NOT_BUSY;
}
-void TreeModel::onBeginMoveRelation(int former_row, const MObject *former_owner)
+void TreeModel::onBeginMoveRelation(int formerRow, const MObject *formerOwner)
{
QMT_CHECK(m_busy == NOT_BUSY);
m_busy = MOVE_ELEMENT;
- QMT_CHECK(former_owner);
- QMT_CHECK(former_owner->getRelations().at(former_row));
- ModelItem *parent_item = m_objectToItemMap.value(former_owner);
- QMT_CHECK(parent_item);
- parent_item->removeRow(former_owner->getChildren().size() + former_row);
+ QMT_CHECK(formerOwner);
+ QMT_CHECK(formerOwner->getRelations().at(formerRow));
+ ModelItem *parentItem = m_objectToItemMap.value(formerOwner);
+ QMT_CHECK(parentItem);
+ parentItem->removeRow(formerOwner->getChildren().size() + formerRow);
}
void TreeModel::onEndMoveRelation(int row, const MObject *owner)
{
QMT_CHECK(owner);
QMT_CHECK(m_busy == MOVE_ELEMENT);
- ModelItem *parent_item =m_objectToItemMap.value(owner);
- QMT_CHECK(parent_item);
+ ModelItem *parentItem =m_objectToItemMap.value(owner);
+ QMT_CHECK(parentItem);
MRelation *relation = owner->getRelations().at(row);
ModelItem *item = createItem(relation);
- parent_item->insertRow(owner->getChildren().size() + row, item);
+ parentItem->insertRow(owner->getChildren().size() + row, item);
m_busy = NOT_BUSY;
}
-void TreeModel::onRelationEndChanged(MRelation *relation, MObject *end_object)
+void TreeModel::onRelationEndChanged(MRelation *relation, MObject *endObject)
{
- Q_UNUSED(end_object);
+ Q_UNUSED(endObject);
QMT_CHECK(m_busy == NOT_BUSY);
MObject *parent = relation->getOwner();
QMT_CHECK(parent);
QMT_CHECK(m_objectToItemMap.contains(parent));
- ModelItem *parent_item = m_objectToItemMap.value(parent);
- QMT_CHECK(parent_item);
- QModelIndex parent_index = indexFromItem(parent_item);
+ ModelItem *parentItem = m_objectToItemMap.value(parent);
+ QMT_CHECK(parentItem);
+ QModelIndex parentIndex = indexFromItem(parentItem);
int row = parent->getChildren().size() + relation->getOwner()->getRelations().indexOf(relation);
- QModelIndex element_index = this->index(row, 0, parent_index);
- QMT_CHECK(element_index.isValid());
+ QModelIndex elementIndex = this->index(row, 0, parentIndex);
+ QMT_CHECK(elementIndex.isValid());
- ModelItem *item = dynamic_cast<ModelItem *>(itemFromIndex(element_index));
+ ModelItem *item = dynamic_cast<ModelItem *>(itemFromIndex(elementIndex));
QMT_CHECK(item);
QString label = createRelationLabel(relation);
@@ -720,7 +720,7 @@ void TreeModel::onRelationEndChanged(MRelation *relation, MObject *end_object)
item->setText(label);
}
- emit dataChanged(this->index(row, 0, parent_index), this->index(row, 0, parent_index));
+ emit dataChanged(this->index(row, 0, parentIndex), this->index(row, 0, parentIndex));
}
void TreeModel::onModelDataChanged(const QModelIndex &topleft, const QModelIndex &bottomright)
@@ -749,24 +749,24 @@ TreeModel::ModelItem *TreeModel::createItem(const MElement *element)
return visitor.getProduct();
}
-void TreeModel::createChildren(const MObject *parent_object, ModelItem *parent_item)
+void TreeModel::createChildren(const MObject *parentObject, ModelItem *parentItem)
{
- QMT_CHECK(!m_objectToItemMap.contains(parent_object));
- m_objectToItemMap.insert(parent_object, parent_item);
- QMT_CHECK(!m_itemToObjectMap.contains(parent_item));
- m_itemToObjectMap.insert(parent_item, parent_object);
- foreach (const Handle<MObject> &object, parent_object->getChildren()) {
+ QMT_CHECK(!m_objectToItemMap.contains(parentObject));
+ m_objectToItemMap.insert(parentObject, parentItem);
+ QMT_CHECK(!m_itemToObjectMap.contains(parentItem));
+ m_itemToObjectMap.insert(parentItem, parentObject);
+ foreach (const Handle<MObject> &object, parentObject->getChildren()) {
if (object.hasTarget()) {
ModelItem *item = createItem(object.getTarget());
- parent_item->appendRow(item);
+ parentItem->appendRow(item);
createChildren(object.getTarget(), item);
}
}
- foreach (const Handle<MRelation> &handle, parent_object->getRelations()) {
+ foreach (const Handle<MRelation> &handle, parentObject->getRelations()) {
if (handle.hasTarget()) {
MRelation *relation = handle.getTarget();
ModelItem *item = createItem(relation);
- parent_item->appendRow(item);
+ parentItem->appendRow(item);
}
}
}
@@ -815,20 +815,20 @@ QString TreeModel::createRelationLabel(const MRelation *relation)
name += relation->getName();
name += QStringLiteral(": ");
}
- if (MObject *end_a = m_modelController->findObject(relation->getEndA())) {
- name += createObjectLabel(end_a);
+ if (MObject *endA = m_modelController->findObject(relation->getEndA())) {
+ name += createObjectLabel(endA);
}
name += QStringLiteral(" - ");
- if (MObject *end_b = m_modelController->findObject(relation->getEndB())) {
- name += createObjectLabel(end_b);
+ if (MObject *endB = m_modelController->findObject(relation->getEndB())) {
+ name += createObjectLabel(endB);
}
return name;
}
-QIcon TreeModel::createIcon(StereotypeIcon::Element stereotype_icon_element, StyleEngine::ElementType style_element_type, const QStringList &stereotypes, const QString &default_icon_path)
+QIcon TreeModel::createIcon(StereotypeIcon::Element stereotypeIconElement, StyleEngine::ElementType styleElementType, const QStringList &stereotypes, const QString &defaultIconPath)
{
- const Style *style = m_styleController->adaptStyle(style_element_type);
- return m_stereotypeController->createIcon(stereotype_icon_element, stereotypes, default_icon_path, style,
+ const Style *style = m_styleController->adaptStyle(styleElementType);
+ return m_stereotypeController->createIcon(stereotypeIconElement, stereotypes, defaultIconPath, style,
QSize(48, 48), QMarginsF(3.0, 2.0, 3.0, 4.0));
}
diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/treemodel.h b/src/libs/3rdparty/modeling/qmt/model_ui/treemodel.h
index cc5f65b21de452d14272ab159891222973c1f5b6..997bf94524c176eec25417527c7115fe89169899 100644
--- a/src/libs/3rdparty/modeling/qmt/model_ui/treemodel.h
+++ b/src/libs/3rdparty/modeling/qmt/model_ui/treemodel.h
@@ -87,15 +87,15 @@ public:
ModelController *getModelController() const { return m_modelController; }
- void setModelController(ModelController *model_controller);
+ void setModelController(ModelController *modelController);
StereotypeController *getStereotypeController() const { return m_stereotypeController; }
- void setStereotypeController(StereotypeController *stereotype_controller);
+ void setStereotypeController(StereotypeController *stereotypeController);
StyleController *getStyleController() const { return m_styleController; }
- void setStyleController(StyleController *style_controller);
+ void setStyleController(StyleController *styleController);
MElement *getElement(const QModelIndex &index) const;
@@ -127,7 +127,7 @@ private slots:
void onEndRemoveObject(int row, const MObject *parent);
- void onBeginMoveObject(int former_row, const MObject *former_owner);
+ void onBeginMoveObject(int formerRow, const MObject *formerOwner);
void onEndMoveObject(int row, const MObject *owner);
@@ -143,11 +143,11 @@ private slots:
void onEndRemoveRelation(int row, const MObject *parent);
- void onBeginMoveRelation(int former_row, const MObject *former_owner);
+ void onBeginMoveRelation(int formerRow, const MObject *formerOwner);
void onEndMoveRelation(int row, const MObject *owner);
- void onRelationEndChanged(MRelation *relation, MObject *end_object);
+ void onRelationEndChanged(MRelation *relation, MObject *endObject);
void onModelDataChanged(const QModelIndex &topleft, const QModelIndex &bottomright);
@@ -157,7 +157,7 @@ private:
ModelItem *createItem(const MElement *element);
- void createChildren(const MObject *parent_object, ModelItem *parent_item);
+ void createChildren(const MObject *parentObject, ModelItem *parentItem);
void removeObjectFromItemMap(const MObject *object);
@@ -165,7 +165,7 @@ private:
QString createRelationLabel(const MRelation *relation);
- QIcon createIcon(StereotypeIcon::Element stereotype_icon_element, StyleEngine::ElementType style_element_type, const QStringList &stereotypes, const QString &default_icon_path);
+ QIcon createIcon(StereotypeIcon::Element stereotypeIconElement, StyleEngine::ElementType styleElementType, const QStringList &stereotypes, const QString &defaultIconPath);
private:
enum Busy {
diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.cpp b/src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.cpp
index 389fb713ed7bd7f90334681539cf4900992c8f58..9f346a12097c6cccce9635bc90bdbe51203c18a3 100644
--- a/src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.cpp
@@ -53,14 +53,14 @@ TreeModelManager::~TreeModelManager()
{
}
-void TreeModelManager::setTreeModel(TreeModel *tree_model)
+void TreeModelManager::setTreeModel(TreeModel *treeModel)
{
- m_treeModel = tree_model;
+ m_treeModel = treeModel;
}
-void TreeModelManager::setModelTreeView(ModelTreeViewInterface *model_tree_view)
+void TreeModelManager::setModelTreeView(ModelTreeViewInterface *modelTreeView)
{
- m_modelTreeView = model_tree_view;
+ m_modelTreeView = modelTreeView;
}
bool TreeModelManager::isRootPackageSelected() const
@@ -106,16 +106,16 @@ MPackage *TreeModelManager::getSelectedPackage() const
MSelection TreeModelManager::getSelectedObjects() const
{
- MSelection model_selection;
+ MSelection modelSelection;
foreach (const QModelIndex &index, m_modelTreeView->getSelectedSourceModelIndexes()) {
MElement *element = m_treeModel->getElement(index);
if (MObject *object = dynamic_cast<MObject *>(element)) {
- model_selection.append(object->getUid(), m_treeModel->getModelController()->getOwnerKey(object));
+ modelSelection.append(object->getUid(), m_treeModel->getModelController()->getOwnerKey(object));
} else if (MRelation *relation = dynamic_cast<MRelation *>(element)) {
- model_selection.append(relation->getUid(), m_treeModel->getModelController()->getOwnerKey(relation));
+ modelSelection.append(relation->getUid(), m_treeModel->getModelController()->getOwnerKey(relation));
}
}
- return model_selection;
+ return modelSelection;
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.h b/src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.h
index fcd36fa88d355d5a9c3b93ce4f1485380c6e8dc9..6822e804d4cb33836b3a5ecec5832583d17e5de8 100644
--- a/src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.h
+++ b/src/libs/3rdparty/modeling/qmt/model_ui/treemodelmanager.h
@@ -60,11 +60,11 @@ public:
TreeModel *getTreeModel() const { return m_treeModel; }
- void setTreeModel(TreeModel *tree_model);
+ void setTreeModel(TreeModel *treeModel);
ModelTreeViewInterface *getModelTreeView() const { return m_modelTreeView; }
- void setModelTreeView(ModelTreeViewInterface *model_tree_view);
+ void setModelTreeView(ModelTreeViewInterface *modelTreeView);
public:
diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
index 0200cd95e0ea5f2f4f387164375592c3ef9e76f2..c1fd01097428f0aa8b0f329e42c14fa58e551f63 100644
--- a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
@@ -272,32 +272,32 @@ void ClassMembersEdit::Cursor::skipWhitespacesFromRight()
QString ClassMembersEdit::Cursor::preparse(const QString &text)
{
- QString parsed_text;
+ QString parsedText;
if (!text.isEmpty()) {
- QChar last_char = QLatin1Char(' ');
- bool in_c_comment = false;
- bool in_cpp_comment = false;
+ QChar lastChar = QLatin1Char(' ');
+ bool inCComment = false;
+ bool inCppComment = false;
foreach (const QChar &c, text) {
- if (!in_c_comment && !in_cpp_comment && last_char == QLatin1Char('/') && c == QLatin1Char('/')) {
- in_cpp_comment = true;
- last_char = QLatin1Char('\n');
- } else if (!in_c_comment && !in_cpp_comment && last_char == QLatin1Char('/') && c == QLatin1Char('*')) {
- in_c_comment = true;
- last_char = QLatin1Char(' ');
- } else if (in_c_comment && !in_cpp_comment && last_char == QLatin1Char('*') && c == QLatin1Char('/')) {
- in_c_comment = false;
- } else if (!in_c_comment && in_cpp_comment && c == QLatin1Char('\n')) {
- in_cpp_comment = false;
- } else if (in_c_comment || in_cpp_comment) {
+ if (!inCComment && !inCppComment && lastChar == QLatin1Char('/') && c == QLatin1Char('/')) {
+ inCppComment = true;
+ lastChar = QLatin1Char('\n');
+ } else if (!inCComment && !inCppComment && lastChar == QLatin1Char('/') && c == QLatin1Char('*')) {
+ inCComment = true;
+ lastChar = QLatin1Char(' ');
+ } else if (inCComment && !inCppComment && lastChar == QLatin1Char('*') && c == QLatin1Char('/')) {
+ inCComment = false;
+ } else if (!inCComment && inCppComment && c == QLatin1Char('\n')) {
+ inCppComment = false;
+ } else if (inCComment || inCppComment) {
// ignore char
} else {
- parsed_text += last_char;
- last_char = c;
+ parsedText += lastChar;
+ lastChar = c;
}
}
- parsed_text += last_char;
+ parsedText += lastChar;
}
- return parsed_text;
+ return parsedText;
}
@@ -371,14 +371,14 @@ void ClassMembersEdit::onTextChanged()
QString ClassMembersEdit::build(const QList<MClassMember> &members)
{
- MClassMember::Visibility current_visibility = MClassMember::VISIBILITY_UNDEFINED;
- QString current_group;
+ MClassMember::Visibility currentVisibility = MClassMember::VISIBILITY_UNDEFINED;
+ QString currentGroup;
QString text;
foreach (const MClassMember &member, members) {
- bool add_newline = false;
- bool add_space = false;
- if (member.getVisibility() != current_visibility) {
+ bool addNewline = false;
+ bool addSpace = false;
+ if (member.getVisibility() != currentVisibility) {
if (member.getVisibility() != MClassMember::VISIBILITY_UNDEFINED) {
QString vis;
switch (member.getVisibility()) {
@@ -410,22 +410,22 @@ QString ClassMembersEdit::build(const QList<MClassMember> &members)
text += QStringLiteral("\n");
}
text += vis;
- add_newline = true;
- add_space = true;
+ addNewline = true;
+ addSpace = true;
}
- current_visibility = member.getVisibility();
+ currentVisibility = member.getVisibility();
}
- if (member.getGroup() != current_group) {
- if (add_space) {
+ if (member.getGroup() != currentGroup) {
+ if (addSpace) {
text += QStringLiteral(" ");
} else if (!text.isEmpty()) {
text += QStringLiteral("\n");
}
text += QString(QStringLiteral("[%1]")).arg(member.getGroup());
- add_newline = true;
- current_group = member.getGroup();
+ addNewline = true;
+ currentGroup = member.getGroup();
}
- if (add_newline) {
+ if (addNewline) {
text += QStringLiteral("\n");
}
@@ -471,8 +471,8 @@ QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok)
*ok = true;
QList<MClassMember> members;
MClassMember member;
- MClassMember::Visibility current_visibility = MClassMember::VISIBILITY_UNDEFINED;
- QString current_group;
+ MClassMember::Visibility currentVisibility = MClassMember::VISIBILITY_UNDEFINED;
+ QString currentGroup;
Cursor cursor(text);
while (cursor.isValid() && *ok) {
@@ -484,35 +484,35 @@ QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok)
QString word = cursor.readWord().toLower();
for (;;) {
if (word == QStringLiteral("public")) {
- current_visibility = MClassMember::VISIBILITY_PUBLIC;
+ currentVisibility = MClassMember::VISIBILITY_PUBLIC;
word = cursor.readWord().toLower();
} else if (word == QStringLiteral("protected")) {
- current_visibility = MClassMember::VISIBILITY_PROTECTED;
+ currentVisibility = MClassMember::VISIBILITY_PROTECTED;
word = cursor.readWord().toLower();
} else if (word == QStringLiteral("private")) {
- current_visibility = MClassMember::VISIBILITY_PRIVATE;
+ currentVisibility = MClassMember::VISIBILITY_PRIVATE;
word = cursor.readWord().toLower();
} else if (word == QStringLiteral("signals")) {
- current_visibility = MClassMember::VISIBILITY_SIGNALS;
+ currentVisibility = MClassMember::VISIBILITY_SIGNALS;
word = cursor.readWord().toLower();
} else if (word == QStringLiteral("slots")) {
- switch (current_visibility) {
+ switch (currentVisibility) {
case MClassMember::VISIBILITY_PRIVATE:
- current_visibility = MClassMember::VISIBILITY_PRIVATE_SLOTS;
+ currentVisibility = MClassMember::VISIBILITY_PRIVATE_SLOTS;
break;
case MClassMember::VISIBILITY_PROTECTED:
- current_visibility = MClassMember::VISIBILITY_PROTECTED_SLOTS;
+ currentVisibility = MClassMember::VISIBILITY_PROTECTED_SLOTS;
break;
case MClassMember::VISIBILITY_PUBLIC:
- current_visibility = MClassMember::VISIBILITY_PUBLIC_SLOTS;
+ currentVisibility = MClassMember::VISIBILITY_PUBLIC_SLOTS;
break;
default:
- current_visibility = MClassMember::VISIBILITY_PRIVATE_SLOTS;
+ currentVisibility = MClassMember::VISIBILITY_PRIVATE_SLOTS;
break;
}
word = cursor.readWord().toLower();
} else if (word == QStringLiteral("[")) {
- current_group = cursor.readUntil(QStringLiteral("]"));
+ currentGroup = cursor.readUntil(QStringLiteral("]"));
word = cursor.readWord().toLower();
} else if (word == QStringLiteral("<<")) {
QString stereotypes = cursor.readUntil(QStringLiteral(">>"));
@@ -522,13 +522,13 @@ QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok)
} else if (word == QStringLiteral("virtual")) {
member.setProperties(member.getProperties() | MClassMember::PROPERTY_VIRTUAL);
word = cursor.readWord().toLower();
- } else if (word == QStringLiteral("signal") || word == QStringLiteral("q_signal")) {
+ } else if (word == QStringLiteral("signal") || word == QStringLiteral("qSignal")) {
member.setProperties(member.getProperties() | MClassMember::PROPERTY_QSIGNAL);
word = cursor.readWord().toLower();
- } else if (word == QStringLiteral("slot") || word == QStringLiteral("q_slot")) {
+ } else if (word == QStringLiteral("slot") || word == QStringLiteral("qSlot")) {
member.setProperties(member.getProperties() | MClassMember::PROPERTY_QSLOT);
word = cursor.readWord().toLower();
- } else if (word == QStringLiteral("invokable") || word == QStringLiteral("q_invokable")) {
+ } else if (word == QStringLiteral("invokable") || word == QStringLiteral("qInvokable")) {
member.setProperties(member.getProperties() | MClassMember::PROPERTY_QINVOKABLE);
} else if (word == QStringLiteral(":")) {
word = cursor.readWord().toLower();
@@ -537,13 +537,13 @@ QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok)
break;
}
}
- member.setVisibility(current_visibility);
- member.setGroup(current_group);
+ member.setVisibility(currentVisibility);
+ member.setGroup(currentGroup);
if (word != QStringLiteral("\n")) {
- int declaration_start = cursor.getPosition();
+ int declarationStart = cursor.getPosition();
cursor.skipUntilOrNewline(QStringLiteral(";"));
- int next_line_position = cursor.getPosition();
- cursor.setPosition(next_line_position - 1);
+ int nextLinePosition = cursor.getPosition();
+ cursor.setPosition(nextLinePosition - 1);
word = cursor.readWordFromRight().toLower();
if (word == QStringLiteral(";")) {
word = cursor.readWordFromRight().toLower();
@@ -568,8 +568,8 @@ QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok)
break;
}
}
- int declaration_stop = cursor.getPosition();
- QString declaration = cursor.extractSubstr(declaration_start, declaration_stop).trimmed();
+ int declarationStop = cursor.getPosition();
+ QString declaration = cursor.extractSubstr(declarationStart, declarationStop).trimmed();
if (!cursor.isValid()) {
break;
}
@@ -582,7 +582,7 @@ QList<MClassMember> ClassMembersEdit::parse(const QString &text, bool *ok)
}
members.append(member);
}
- cursor.setPosition(next_line_position);
+ cursor.setPosition(nextLinePosition);
if (cursor.atEnd()) {
return members;
}
diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.cpp b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.cpp
index b7f0abb62b9e374f93060349231c17ebea162cbc..0370d561b88d81aef89a5410a677fac953f21a86 100644
--- a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.cpp
@@ -94,9 +94,9 @@ void ModelTreeView::setTreeModel(SortedTreeModel *model)
QTreeView::setModel(model);
}
-void ModelTreeView::setElementTasks(IElementTasks *element_tasks)
+void ModelTreeView::setElementTasks(IElementTasks *elementTasks)
{
- m_elementTasks = element_tasks;
+ m_elementTasks = elementTasks;
}
QModelIndex ModelTreeView::mapToSourceModelIndex(const QModelIndex &index) const
@@ -109,25 +109,25 @@ void ModelTreeView::selectFromSourceModelIndex(const QModelIndex &index)
if (!index.isValid()) {
return;
}
- QModelIndex sorted_index = m_sortedTreeModel->mapFromSource(index);
- scrollTo(sorted_index);
- setCurrentIndex(sorted_index);
+ QModelIndex sortedIndex = m_sortedTreeModel->mapFromSource(index);
+ scrollTo(sortedIndex);
+ setCurrentIndex(sortedIndex);
if (selectionModel()) {
- selectionModel()->select(sorted_index, QItemSelectionModel::ClearAndSelect);
+ selectionModel()->select(sortedIndex, QItemSelectionModel::ClearAndSelect);
}
}
-void ModelTreeView::startDrag(Qt::DropActions supported_actions)
+void ModelTreeView::startDrag(Qt::DropActions supportedActions)
{
- Q_UNUSED(supported_actions);
+ Q_UNUSED(supportedActions);
- TreeModel *tree_model = m_sortedTreeModel->getTreeModel();
- QMT_CHECK(tree_model);
+ TreeModel *treeModel = m_sortedTreeModel->getTreeModel();
+ QMT_CHECK(treeModel);
- QByteArray drag_data;
- QDataStream data_stream(&drag_data, QIODevice::WriteOnly);
+ QByteArray dragData;
+ QDataStream dataStream(&dragData, QIODevice::WriteOnly);
- QIcon drag_icon;
+ QIcon dragIcon;
QModelIndexList indexes;
if (selectionModel()) {
@@ -137,31 +137,31 @@ void ModelTreeView::startDrag(Qt::DropActions supported_actions)
}
if (!indexes.isEmpty()) {
foreach (const QModelIndex &index, indexes) {
- MElement *element = tree_model->getElement(index);
+ MElement *element = treeModel->getElement(index);
if (element) {
- data_stream << element->getUid().toString();
- if (drag_icon.isNull()) {
- QIcon icon = tree_model->getIcon(index);
+ dataStream << element->getUid().toString();
+ if (dragIcon.isNull()) {
+ QIcon icon = treeModel->getIcon(index);
if (!icon.isNull()) {
- drag_icon = icon;
+ dragIcon = icon;
}
}
}
}
}
- QMimeData *mime_data = new QMimeData;
- mime_data->setData(QStringLiteral("text/model-elements"), drag_data);
+ QMimeData *mimeData = new QMimeData;
+ mimeData->setData(QStringLiteral("text/model-elements"), dragData);
- if (drag_icon.isNull()) {
- drag_icon = QIcon(QStringLiteral(":/modelinglib/48x48/generic.png"));
+ if (dragIcon.isNull()) {
+ dragIcon = QIcon(QStringLiteral(":/modelinglib/48x48/generic.png"));
}
QPixmap pixmap(48, 48);
- pixmap = drag_icon.pixmap(48, 48);
+ pixmap = dragIcon.pixmap(48, 48);
QDrag *drag = new QDrag(this);
- drag->setMimeData(mime_data);
+ drag->setMimeData(mimeData);
drag->setHotSpot(QPoint(pixmap.width()/2, pixmap.height()/2));
drag->setPixmap(pixmap);
@@ -178,22 +178,22 @@ void ModelTreeView::dragMoveEvent(QDragMoveEvent *event)
{
QTreeView::dragMoveEvent(event);
bool accept = false;
- QModelIndex drop_index = indexAt(event->pos());
- QModelIndex drop_source_model_index = m_sortedTreeModel->mapToSource(drop_index);
- if (drop_source_model_index.isValid()) {
- TreeModel *tree_model = m_sortedTreeModel->getTreeModel();
- QMT_CHECK(tree_model);
- MElement *model_element = tree_model->getElement(drop_source_model_index);
- if (dynamic_cast<MObject*>(model_element)) {
+ QModelIndex dropIndex = indexAt(event->pos());
+ QModelIndex dropSourceModelIndex = m_sortedTreeModel->mapToSource(dropIndex);
+ if (dropSourceModelIndex.isValid()) {
+ TreeModel *treeModel = m_sortedTreeModel->getTreeModel();
+ QMT_CHECK(treeModel);
+ MElement *modelElement = treeModel->getElement(dropSourceModelIndex);
+ if (dynamic_cast<MObject*>(modelElement)) {
accept = true;
}
- if (m_autoDelayIndex == drop_index) {
+ if (m_autoDelayIndex == dropIndex) {
if (m_autoDelayStartTime.elapsed() > 1000) {
- setExpanded(drop_index, !isExpanded(drop_index));
+ setExpanded(dropIndex, !isExpanded(dropIndex));
m_autoDelayStartTime.start();
}
} else {
- m_autoDelayIndex = drop_index;
+ m_autoDelayIndex = dropIndex;
m_autoDelayStartTime = QTime::currentTime();
m_autoDelayStartTime.start();
}
@@ -211,30 +211,30 @@ void ModelTreeView::dropEvent(QDropEvent *event)
bool accept = false;
event->setDropAction(Qt::MoveAction);
if (event->mimeData()->hasFormat(QStringLiteral("text/model-elements"))) {
- QModelIndex drop_index = indexAt(event->pos());
- QModelIndex drop_source_model_index = m_sortedTreeModel->mapToSource(drop_index);
- if (drop_source_model_index.isValid()) {
- TreeModel *tree_model = m_sortedTreeModel->getTreeModel();
- QMT_CHECK(tree_model);
- MElement *target_model_element = tree_model->getElement(drop_source_model_index);
- if (MObject *target_model_object = dynamic_cast<MObject *>(target_model_element)) {
- QDataStream data_stream(event->mimeData()->data(QStringLiteral("text/model-elements")));
- while (data_stream.status() == QDataStream::Ok) {
+ QModelIndex dropIndex = indexAt(event->pos());
+ QModelIndex dropSourceModelIndex = m_sortedTreeModel->mapToSource(dropIndex);
+ if (dropSourceModelIndex.isValid()) {
+ TreeModel *treeModel = m_sortedTreeModel->getTreeModel();
+ QMT_CHECK(treeModel);
+ MElement *targetModelElement = treeModel->getElement(dropSourceModelIndex);
+ if (MObject *targetModelObject = dynamic_cast<MObject *>(targetModelElement)) {
+ QDataStream dataStream(event->mimeData()->data(QStringLiteral("text/model-elements")));
+ while (dataStream.status() == QDataStream::Ok) {
QString key;
- data_stream >> key;
+ dataStream >> key;
if (!key.isEmpty()) {
- MElement *model_element = tree_model->getModelController()->findElement(Uid(key));
- if (model_element) {
- if (MObject *model_object = dynamic_cast<MObject*>(model_element)) {
- if (MPackage *target_model_package = dynamic_cast<MPackage*>(target_model_object)) {
- tree_model->getModelController()->moveObject(target_model_package, model_object);
- } else if ((target_model_package = dynamic_cast<MPackage *>(target_model_object->getOwner()))) {
- tree_model->getModelController()->moveObject(target_model_package, model_object);
+ MElement *modelElement = treeModel->getModelController()->findElement(Uid(key));
+ if (modelElement) {
+ if (MObject *modelObject = dynamic_cast<MObject*>(modelElement)) {
+ if (MPackage *targetModelPackage = dynamic_cast<MPackage*>(targetModelObject)) {
+ treeModel->getModelController()->moveObject(targetModelPackage, modelObject);
+ } else if ((targetModelPackage = dynamic_cast<MPackage *>(targetModelObject->getOwner()))) {
+ treeModel->getModelController()->moveObject(targetModelPackage, modelObject);
} else {
QMT_CHECK(false);
}
- } else if (MRelation *model_relation = dynamic_cast<MRelation *>(model_element)) {
- tree_model->getModelController()->moveRelation(target_model_object, model_relation);
+ } else if (MRelation *modelRelation = dynamic_cast<MRelation *>(modelElement)) {
+ treeModel->getModelController()->moveRelation(targetModelObject, modelRelation);
}
}
}
@@ -255,32 +255,32 @@ void ModelTreeView::focusInEvent(QFocusEvent *event)
void ModelTreeView::contextMenuEvent(QContextMenuEvent *event)
{
QModelIndex index = indexAt(event->pos());
- QModelIndex source_model_index = m_sortedTreeModel->mapToSource(index);
- if (source_model_index.isValid()) {
- TreeModel *tree_model = m_sortedTreeModel->getTreeModel();
- QMT_CHECK(tree_model);
- MElement *melement = tree_model->getElement(source_model_index);
+ QModelIndex sourceModelIndex = m_sortedTreeModel->mapToSource(index);
+ if (sourceModelIndex.isValid()) {
+ TreeModel *treeModel = m_sortedTreeModel->getTreeModel();
+ QMT_CHECK(treeModel);
+ MElement *melement = treeModel->getElement(sourceModelIndex);
QMT_CHECK(melement);
QMenu menu;
- bool add_separator = false;
+ bool addSeparator = false;
if (m_elementTasks->hasClassDefinition(melement)) {
menu.addAction(new ContextMenuAction(tr("Show Definition"), QStringLiteral("showDefinition"), &menu));
- add_separator = true;
+ addSeparator = true;
}
if (m_elementTasks->hasDiagram(melement)) {
menu.addAction(new ContextMenuAction(tr("Open Diagram"), QStringLiteral("openDiagram"), &menu));
- add_separator = true;
+ addSeparator = true;
}
if (melement->getOwner()) {
- if (add_separator) {
+ if (addSeparator) {
menu.addSeparator();
}
menu.addAction(new ContextMenuAction(tr("Delete"), QStringLiteral("delete"), QKeySequence(Qt::CTRL + Qt::Key_D), &menu));
}
- QAction *selected_action = menu.exec(event->globalPos());
- if (selected_action) {
- ContextMenuAction *action = dynamic_cast<ContextMenuAction *>(selected_action);
+ QAction *selectedAction = menu.exec(event->globalPos());
+ if (selectedAction) {
+ ContextMenuAction *action = dynamic_cast<ContextMenuAction *>(selectedAction);
QMT_CHECK(action);
if (action->getId() == QStringLiteral("showDefinition")) {
m_elementTasks->openClassDefinition(melement);
diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.h b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.h
index 200099e90c36d77800629323260ea2759475aca2..1ae765aaa5a197463bdcc9fc9f7e6ff9ade6831a 100644
--- a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.h
+++ b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/modeltreeview.h
@@ -70,7 +70,7 @@ public:
void setTreeModel(SortedTreeModel *model);
- void setElementTasks(IElementTasks *element_tasks);
+ void setElementTasks(IElementTasks *elementTasks);
public:
@@ -80,7 +80,7 @@ public:
protected:
- void startDrag(Qt::DropActions supported_actions);
+ void startDrag(Qt::DropActions supportedActions);
void dragEnterEvent(QDragEnterEvent *event);
diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/palettebox.cpp b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/palettebox.cpp
index 8ae6aa30503c5f4d7e6df672a526baf30e2c7206..e9103406124d2c4262d49e7755793f336ba6addd 100644
--- a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/palettebox.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/palettebox.cpp
@@ -140,7 +140,7 @@ void PaletteBox::mousePressEvent(QMouseEvent *event)
void PaletteBox::keyPressEvent(QKeyEvent *event)
{
- bool is_known_key = false;
+ bool isKnownKey = false;
switch (event->key()) {
case Qt::Key_Left:
if (m_currentIndex <= 0) {
@@ -148,7 +148,7 @@ void PaletteBox::keyPressEvent(QKeyEvent *event)
} else {
setCurrentIndex(m_currentIndex - 1);
}
- is_known_key = true;
+ isKnownKey = true;
break;
case Qt::Key_Right:
if (m_currentIndex < 0 || m_currentIndex >= m_brushes.size() - 1) {
@@ -156,10 +156,10 @@ void PaletteBox::keyPressEvent(QKeyEvent *event)
} else {
setCurrentIndex(m_currentIndex + 1);
}
- is_known_key = true;
+ isKnownKey = true;
break;
}
- if (is_known_key && m_currentIndex >= 0 && m_currentIndex < m_brushes.size()) {
+ if (isKnownKey && m_currentIndex >= 0 && m_currentIndex < m_brushes.size()) {
emit activated(m_currentIndex);
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.cpp b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.cpp
index 0e760b12bb637d6f52c4db6c33fef8cfa4561c15..66f0a9161ceff3402a03fe709d58e1f407413b56 100644
--- a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.cpp
@@ -60,13 +60,13 @@ PropertiesView::~PropertiesView()
{
}
-void PropertiesView::setModelController(ModelController *model_controller)
+void PropertiesView::setModelController(ModelController *modelController)
{
- if (m_modelController != model_controller) {
+ if (m_modelController != modelController) {
if (m_modelController) {
disconnect(m_modelController, 0, this, 0);
}
- m_modelController = model_controller;
+ m_modelController = modelController;
if (m_modelController) {
connect(m_modelController, SIGNAL(beginResetModel()), this, SLOT(onBeginResetModel()));
connect(m_modelController, SIGNAL(endResetModel()), this, SLOT(onEndResetModel()));
@@ -94,15 +94,15 @@ void PropertiesView::setModelController(ModelController *model_controller)
}
}
-void PropertiesView::setDiagramController(DiagramController *diagram_controller)
+void PropertiesView::setDiagramController(DiagramController *diagramController)
{
- if (m_diagramController != diagram_controller) {
+ if (m_diagramController != diagramController) {
if (m_diagramController) {
disconnect(m_diagramController, 0, this, 0);
m_diagramController = 0;
}
- m_diagramController = diagram_controller;
- if (diagram_controller) {
+ m_diagramController = diagramController;
+ if (diagramController) {
connect(m_diagramController, SIGNAL(beginResetAllDiagrams()), this, SLOT(onBeginResetAllDiagrams()));
connect(m_diagramController, SIGNAL(endResetAllDiagrams()), this, SLOT(onEndResetAllDiagrams()));
@@ -119,22 +119,22 @@ void PropertiesView::setDiagramController(DiagramController *diagram_controller)
}
}
-void PropertiesView::setStereotypeController(StereotypeController *stereotype_controller)
+void PropertiesView::setStereotypeController(StereotypeController *stereotypeController)
{
- m_stereotypeController = stereotype_controller;
+ m_stereotypeController = stereotypeController;
}
-void PropertiesView::setStyleController(StyleController *style_controller)
+void PropertiesView::setStyleController(StyleController *styleController)
{
- m_styleController = style_controller;
+ m_styleController = styleController;
}
-void PropertiesView::setSelectedModelElements(const QList<MElement *> &model_elements)
+void PropertiesView::setSelectedModelElements(const QList<MElement *> &modelElements)
{
- QMT_CHECK(model_elements.size() > 0);
+ QMT_CHECK(modelElements.size() > 0);
- if (m_selectedModelElements != model_elements) {
- m_selectedModelElements = model_elements;
+ if (m_selectedModelElements != modelElements) {
+ m_selectedModelElements = modelElements;
m_selectedDiagramElements.clear();
m_selectedDiagram = 0;
m_mview.reset(new MView(this));
@@ -143,13 +143,13 @@ void PropertiesView::setSelectedModelElements(const QList<MElement *> &model_ele
}
}
-void PropertiesView::setSelectedDiagramElements(const QList<DElement *> &diagram_elements, MDiagram *diagram)
+void PropertiesView::setSelectedDiagramElements(const QList<DElement *> &diagramElements, MDiagram *diagram)
{
- QMT_CHECK(diagram_elements.size() > 0);
+ QMT_CHECK(diagramElements.size() > 0);
QMT_CHECK(diagram);
- if (m_selectedDiagramElements != diagram_elements || m_selectedDiagram != diagram) {
- m_selectedDiagramElements = diagram_elements;
+ if (m_selectedDiagramElements != diagramElements || m_selectedDiagram != diagram) {
+ m_selectedDiagramElements = diagramElements;
m_selectedDiagram = diagram;
m_selectedModelElements.clear();
m_mview.reset(new MView(this));
@@ -228,10 +228,10 @@ void PropertiesView::onEndRemoveObject(int row, const MObject *parent)
Q_UNUSED(parent);
}
-void PropertiesView::onBeginMoveObject(int former_row, const MObject *former_owner)
+void PropertiesView::onBeginMoveObject(int formerRow, const MObject *formerOwner)
{
- Q_UNUSED(former_row);
- Q_UNUSED(former_owner);
+ Q_UNUSED(formerRow);
+ Q_UNUSED(formerOwner);
}
void PropertiesView::onEndMoveObject(int row, const MObject *owner)
@@ -282,10 +282,10 @@ void PropertiesView::onEndRemoveRelation(int row, const MObject *parent)
Q_UNUSED(parent);
}
-void PropertiesView::onBeginMoveRelation(int former_row, const MObject *former_owner)
+void PropertiesView::onBeginMoveRelation(int formerRow, const MObject *formerOwner)
{
- Q_UNUSED(former_row);
- Q_UNUSED(former_owner);
+ Q_UNUSED(formerRow);
+ Q_UNUSED(formerOwner);
}
void PropertiesView::onEndMoveRelation(int row, const MObject *owner)
@@ -296,9 +296,9 @@ void PropertiesView::onEndMoveRelation(int row, const MObject *owner)
}
}
-void PropertiesView::onRelationEndChanged(MRelation *relation, MObject *end_object)
+void PropertiesView::onRelationEndChanged(MRelation *relation, MObject *endObject)
{
- Q_UNUSED(end_object);
+ Q_UNUSED(endObject);
if (relation && m_selectedModelElements.contains(relation)) {
m_mview->update(m_selectedModelElements);
}
@@ -369,48 +369,48 @@ void PropertiesView::onEndRemoveElement(int row, const MDiagram *diagram)
Q_UNUSED(diagram);
}
-void PropertiesView::beginUpdate(MElement *model_element)
+void PropertiesView::beginUpdate(MElement *modelElement)
{
- QMT_CHECK(model_element);
+ QMT_CHECK(modelElement);
- if (MObject *object = dynamic_cast<MObject *>(model_element)) {
+ if (MObject *object = dynamic_cast<MObject *>(modelElement)) {
m_modelController->startUpdateObject(object);
- } else if (MRelation *relation = dynamic_cast<MRelation *>(model_element)) {
+ } else if (MRelation *relation = dynamic_cast<MRelation *>(modelElement)) {
m_modelController->startUpdateRelation(relation);
} else {
QMT_CHECK(false);
}
}
-void PropertiesView::endUpdate(MElement *model_element, bool cancelled)
+void PropertiesView::endUpdate(MElement *modelElement, bool cancelled)
{
- QMT_CHECK(model_element);
+ QMT_CHECK(modelElement);
- if (MObject *object = dynamic_cast<MObject *>(model_element)) {
+ if (MObject *object = dynamic_cast<MObject *>(modelElement)) {
m_modelController->finishUpdateObject(object, cancelled);
- } else if (MRelation *relation = dynamic_cast<MRelation *>(model_element)) {
+ } else if (MRelation *relation = dynamic_cast<MRelation *>(modelElement)) {
m_modelController->finishUpdateRelation(relation, cancelled);
} else {
QMT_CHECK(false);
}
}
-void PropertiesView::beginUpdate(DElement *diagram_element)
+void PropertiesView::beginUpdate(DElement *diagramElement)
{
- QMT_CHECK(diagram_element);
+ QMT_CHECK(diagramElement);
QMT_CHECK(m_selectedDiagram != 0);
- QMT_CHECK(m_diagramController->findElement(diagram_element->getUid(), m_selectedDiagram) == diagram_element);
+ QMT_CHECK(m_diagramController->findElement(diagramElement->getUid(), m_selectedDiagram) == diagramElement);
- m_diagramController->startUpdateElement(diagram_element, m_selectedDiagram, DiagramController::UPDATE_MINOR);
+ m_diagramController->startUpdateElement(diagramElement, m_selectedDiagram, DiagramController::UPDATE_MINOR);
}
-void PropertiesView::endUpdate(DElement *diagram_element, bool cancelled)
+void PropertiesView::endUpdate(DElement *diagramElement, bool cancelled)
{
- QMT_CHECK(diagram_element);
+ QMT_CHECK(diagramElement);
QMT_CHECK(m_selectedDiagram != 0);
- QMT_CHECK(m_diagramController->findElement(diagram_element->getUid(), m_selectedDiagram) == diagram_element);
+ QMT_CHECK(m_diagramController->findElement(diagramElement->getUid(), m_selectedDiagram) == diagramElement);
- m_diagramController->finishUpdateElement(diagram_element, m_selectedDiagram, cancelled);
+ m_diagramController->finishUpdateElement(diagramElement, m_selectedDiagram, cancelled);
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.h b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.h
index 622cb6686a5d385c56f94beadb8c77f8a9878f72..0fee285f7a6fa53f1ead4876125fcf93151fcb8a 100644
--- a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.h
+++ b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesview.h
@@ -74,31 +74,31 @@ public:
ModelController *getModelController() const { return m_modelController; }
- void setModelController(ModelController *model_controller);
+ void setModelController(ModelController *modelController);
DiagramController *getDiagramController() const { return m_diagramController; }
- void setDiagramController(DiagramController *diagram_controller);
+ void setDiagramController(DiagramController *diagramController);
StereotypeController *getStereotypeController() const { return m_stereotypeController; }
- void setStereotypeController(StereotypeController *stereotype_controller);
+ void setStereotypeController(StereotypeController *stereotypeController);
StyleController *getStyleController() const { return m_styleController; }
- void setStyleController(StyleController *style_controller);
+ void setStyleController(StyleController *styleController);
public:
QList<MElement *> getSelectedModelElements() const { return m_selectedModelElements; }
- void setSelectedModelElements(const QList<MElement *> &model_elements);
+ void setSelectedModelElements(const QList<MElement *> &modelElements);
QList<DElement *> getSelectedDiagramElements() const { return m_selectedDiagramElements; }
MDiagram *getSelectedDiagram() const { return m_selectedDiagram; }
- void setSelectedDiagramElements(const QList<DElement *> &diagram_elements, MDiagram *diagram);
+ void setSelectedDiagramElements(const QList<DElement *> &diagramElements, MDiagram *diagram);
void clearSelection();
@@ -126,7 +126,7 @@ private slots:
void onEndRemoveObject(int row, const MObject *parent);
- void onBeginMoveObject(int former_row, const MObject *former_owner);
+ void onBeginMoveObject(int formerRow, const MObject *formerOwner);
void onEndMoveObject(int row, const MObject *owner);
@@ -142,11 +142,11 @@ private slots:
void onEndRemoveRelation(int row, const MObject *parent);
- void onBeginMoveRelation(int former_row, const MObject *former_owner);
+ void onBeginMoveRelation(int formerRow, const MObject *formerOwner);
void onEndMoveRelation(int row, const MObject *owner);
- void onRelationEndChanged(MRelation *relation, MObject *end_object);
+ void onRelationEndChanged(MRelation *relation, MObject *endObject);
private slots:
@@ -172,13 +172,13 @@ private slots:
private:
- void beginUpdate(MElement *model_element);
+ void beginUpdate(MElement *modelElement);
- void endUpdate(MElement *model_element, bool cancelled);
+ void endUpdate(MElement *modelElement, bool cancelled);
- void beginUpdate(DElement *diagram_element);
+ void beginUpdate(DElement *diagramElement);
- void endUpdate(DElement *diagram_element, bool cancelled);
+ void endUpdate(DElement *diagramElement, bool cancelled);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.cpp
index 66b495c130bca9c8a63f09ba67246d7203a0b00e..e06067ae425cc63effc9350fea78e36f87b32e1c 100644
--- a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.cpp
+++ b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.cpp
@@ -141,9 +141,9 @@ static MAssociationEnd::Kind translateIndexToAssociationKind(int index)
return map[index];
}
-static int translateVisualPrimaryRoleToIndex(DObject::VisualPrimaryRole visual_role)
+static int translateVisualPrimaryRoleToIndex(DObject::VisualPrimaryRole visualRole)
{
- switch (visual_role) {
+ switch (visualRole) {
case DObject::PRIMARY_ROLE_NORMAL:
return 0;
case DObject::PRIMARY_ROLE_CUSTOM1:
@@ -176,9 +176,9 @@ static DObject::VisualPrimaryRole translateIndexToVisualPrimaryRole(int index)
return map[index];
}
-static int translateVisualSecondaryRoleToIndex(DObject::VisualSecondaryRole visual_role)
+static int translateVisualSecondaryRoleToIndex(DObject::VisualSecondaryRole visualRole)
{
- switch (visual_role) {
+ switch (visualRole) {
case DObject::SECONDARY_ROLE_NONE:
return 0;
case DObject::SECONDARY_ROLE_LIGHTER:
@@ -204,9 +204,9 @@ static DObject::VisualSecondaryRole translateIndexToVisualSecondaryRole(int inde
return map[index];
}
-static int translateStereotypeDisplayToIndex(DObject::StereotypeDisplay stereotype_display)
+static int translateStereotypeDisplayToIndex(DObject::StereotypeDisplay stereotypeDisplay)
{
- switch (stereotype_display) {
+ switch (stereotypeDisplay) {
case DObject::STEREOTYPE_NONE:
return 1;
case DObject::STEREOTYPE_LABEL:
@@ -234,9 +234,9 @@ static DObject::StereotypeDisplay translateIndexToStereotypeDisplay(int index)
return map[index];
}
-static int translateTemplateDisplayToIndex(DClass::TemplateDisplay template_display)
+static int translateTemplateDisplayToIndex(DClass::TemplateDisplay templateDisplay)
{
- switch (template_display) {
+ switch (templateDisplay) {
case DClass::TEMPLATE_SMART:
return 0;
case DClass::TEMPLATE_BOX:
@@ -258,9 +258,9 @@ static DClass::TemplateDisplay translateIndexToTemplateDisplay(int index)
return map[index];
}
-static int translateAnnotationVisualRoleToIndex(DAnnotation::VisualRole visual_role)
+static int translateAnnotationVisualRoleToIndex(DAnnotation::VisualRole visualRole)
{
- switch (visual_role) {
+ switch (visualRole) {
case DAnnotation::ROLE_NORMAL:
return 0;
case DAnnotation::ROLE_TITLE:
@@ -288,8 +288,8 @@ static DAnnotation::VisualRole translateIndexToAnnotationVisualRole(int index)
}
-PropertiesView::MView::MView(PropertiesView *properties_view)
- : m_propertiesView(properties_view),
+PropertiesView::MView::MView(PropertiesView *propertiesView)
+ : m_propertiesView(propertiesView),
m_diagram(0),
m_stereotypesController(new StereotypesController(this)),
m_topWidget(0),
@@ -341,39 +341,39 @@ PropertiesView::MView::~MView()
{
}
-void PropertiesView::MView::update(QList<MElement *> &model_elements)
+void PropertiesView::MView::update(QList<MElement *> &modelElements)
{
- QMT_CHECK(model_elements.size() > 0);
+ QMT_CHECK(modelElements.size() > 0);
- m_modelElements = model_elements;
+ m_modelElements = modelElements;
m_diagramElements.clear();
m_diagram = 0;
- model_elements.at(0)->accept(this);
+ modelElements.at(0)->accept(this);
}
-void PropertiesView::MView::update(QList<DElement *> &diagram_elements, MDiagram *diagram)
+void PropertiesView::MView::update(QList<DElement *> &diagramElements, MDiagram *diagram)
{
- QMT_CHECK(diagram_elements.size() > 0);
+ QMT_CHECK(diagramElements.size() > 0);
QMT_CHECK(diagram);
- m_diagramElements = diagram_elements;
+ m_diagramElements = diagramElements;
m_diagram = diagram;
m_modelElements.clear();
- foreach (DElement *delement, diagram_elements) {
- bool appended_melement = false;
+ foreach (DElement *delement, diagramElements) {
+ bool appendedMelement = false;
if (delement->getModelUid().isValid()) {
MElement *melement = m_propertiesView->getModelController()->findElement(delement->getModelUid());
if (melement) {
m_modelElements.append(melement);
- appended_melement = true;
+ appendedMelement = true;
}
}
- if (!appended_melement) {
+ if (!appendedMelement) {
// ensure that indices within m_diagramElements match indices into m_modelElements
m_modelElements.append(0);
}
}
- diagram_elements.at(0)->accept(this);
+ diagramElements.at(0)->accept(this);
}
void PropertiesView::MView::edit()
@@ -399,9 +399,9 @@ void PropertiesView::MView::visitMElement(const MElement *element)
connect(m_stereotypeComboBox, SIGNAL(activated(QString)), this, SLOT(onStereotypesChanged(QString)));
}
if (!m_stereotypeComboBox->hasFocus()) {
- QList<QString> stereotype_list;
- if (haveSameValue(m_modelElements, &MElement::getStereotypes, &stereotype_list)) {
- QString stereotypes = m_stereotypesController->toString(stereotype_list);
+ QList<QString> stereotypeList;
+ if (haveSameValue(m_modelElements, &MElement::getStereotypes, &stereotypeList)) {
+ QString stereotypes = m_stereotypesController->toString(stereotypeList);
m_stereotypeComboBox->setEnabled(true);
if (stereotypes != m_stereotypeComboBox->currentText()) {
m_stereotypeComboBox->setCurrentText(stereotypes);
@@ -425,21 +425,21 @@ void PropertiesView::MView::visitMObject(const MObject *object)
{
visitMElement(object);
QList<MObject *> selection = filter<MObject>(m_modelElements);
- bool is_single_selection = selection.size() == 1;
+ bool isSingleSelection = selection.size() == 1;
if (m_elementNameLineEdit == 0) {
m_elementNameLineEdit = new QLineEdit(m_topWidget);
m_topLayout->addRow(tr("Name:"), m_elementNameLineEdit);
connect(m_elementNameLineEdit, SIGNAL(textChanged(QString)), this, SLOT(onObjectNameChanged(QString)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if (object->getName() != m_elementNameLineEdit->text() && !m_elementNameLineEdit->hasFocus()) {
m_elementNameLineEdit->setText(object->getName());
}
} else {
m_elementNameLineEdit->clear();
}
- if (m_elementNameLineEdit->isEnabled() != is_single_selection) {
- m_elementNameLineEdit->setEnabled(is_single_selection);
+ if (m_elementNameLineEdit->isEnabled() != isSingleSelection) {
+ m_elementNameLineEdit->setEnabled(isSingleSelection);
}
#ifdef SHOW_DEBUG_PROPERTIES
@@ -471,18 +471,18 @@ void PropertiesView::MView::visitMClass(const MClass *klass)
setTitle<MClass>(m_modelElements, tr("Class"), tr("Classes"));
visitMObject(klass);
QList<MClass *> selection = filter<MClass>(m_modelElements);
- bool is_single_selection = selection.size() == 1;
+ bool isSingleSelection = selection.size() == 1;
if (m_namespaceLineEdit == 0) {
m_namespaceLineEdit = new QLineEdit(m_topWidget);
m_topLayout->addRow(tr("Namespace:"), m_namespaceLineEdit);
connect(m_namespaceLineEdit, SIGNAL(textEdited(QString)), this, SLOT(onNamespaceChanged(QString)));
}
if (!m_namespaceLineEdit->hasFocus()) {
- QString name_space;
- if (haveSameValue(m_modelElements, &MClass::getNamespace, &name_space)) {
+ QString nameSpace;
+ if (haveSameValue(m_modelElements, &MClass::getNamespace, &nameSpace)) {
m_namespaceLineEdit->setEnabled(true);
- if (name_space != m_namespaceLineEdit->text()) {
- m_namespaceLineEdit->setText(name_space);
+ if (nameSpace != m_namespaceLineEdit->text()) {
+ m_namespaceLineEdit->setText(nameSpace);
}
} else {
m_namespaceLineEdit->clear();
@@ -494,18 +494,18 @@ void PropertiesView::MView::visitMClass(const MClass *klass)
m_topLayout->addRow(tr("Template:"), m_templateParametersLineEdit);
connect(m_templateParametersLineEdit, SIGNAL(textChanged(QString)), this, SLOT(onTemplateParametersChanged(QString)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if (!m_templateParametersLineEdit->hasFocus()) {
- QList<QString> template_parameters = splitTemplateParameters(m_templateParametersLineEdit->text());
- if (klass->getTemplateParameters() != template_parameters) {
+ QList<QString> templateParameters = splitTemplateParameters(m_templateParametersLineEdit->text());
+ if (klass->getTemplateParameters() != templateParameters) {
m_templateParametersLineEdit->setText(formatTemplateParameters(klass->getTemplateParameters()));
}
}
} else {
m_templateParametersLineEdit->clear();
}
- if (m_templateParametersLineEdit->isEnabled() != is_single_selection) {
- m_templateParametersLineEdit->setEnabled(is_single_selection);
+ if (m_templateParametersLineEdit->isEnabled() != isSingleSelection) {
+ m_templateParametersLineEdit->setEnabled(isSingleSelection);
}
if (m_classMembersStatusLabel == 0) {
QMT_CHECK(!m_classMembersParseButton);
@@ -519,8 +519,8 @@ void PropertiesView::MView::visitMClass(const MClass *klass)
m_topLayout->addRow(QStringLiteral(""), layout);
connect(m_classMembersParseButton, SIGNAL(clicked()), this, SLOT(onParseClassMembers()));
}
- if (m_classMembersParseButton->isEnabled() != is_single_selection) {
- m_classMembersParseButton->setEnabled(is_single_selection);
+ if (m_classMembersParseButton->isEnabled() != isSingleSelection) {
+ m_classMembersParseButton->setEnabled(isSingleSelection);
}
if (m_classMembersEdit == 0) {
m_classMembersEdit = new ClassMembersEdit(m_topWidget);
@@ -529,15 +529,15 @@ void PropertiesView::MView::visitMClass(const MClass *klass)
connect(m_classMembersEdit, SIGNAL(membersChanged(QList<MClassMember>&)), this, SLOT(onClassMembersChanged(QList<MClassMember>&)));
connect(m_classMembersEdit, SIGNAL(statusChanged(bool)), this, SLOT(onClassMembersStatusChanged(bool)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if (klass->getMembers() != m_classMembersEdit->getMembers() && !m_classMembersEdit->hasFocus()) {
m_classMembersEdit->setMembers(klass->getMembers());
}
} else {
m_classMembersEdit->clear();
}
- if (m_classMembersEdit->isEnabled() != is_single_selection) {
- m_classMembersEdit->setEnabled(is_single_selection);
+ if (m_classMembersEdit->isEnabled() != isSingleSelection) {
+ m_classMembersEdit->setEnabled(isSingleSelection);
}
}
@@ -571,22 +571,22 @@ void PropertiesView::MView::visitMItem(const MItem *item)
setTitle<MItem>(item, m_modelElements, tr("Item"), tr("Items"));
visitMObject(item);
QList<MItem *> selection = filter<MItem>(m_modelElements);
- bool is_single_selection = selection.size() == 1;
+ bool isSingleSelection = selection.size() == 1;
if (item->isVarietyEditable()) {
if (m_itemVarietyEdit == 0) {
m_itemVarietyEdit = new QLineEdit(m_topWidget);
m_topLayout->addRow(tr("Variety:"), m_itemVarietyEdit);
connect(m_itemVarietyEdit, SIGNAL(textChanged(QString)), this, SLOT(onItemVarietyChanged(QString)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if (item->getVariety() != m_itemVarietyEdit->text() && !m_itemVarietyEdit->hasFocus()) {
m_itemVarietyEdit->setText(item->getVariety());
}
} else {
m_itemVarietyEdit->clear();
}
- if (m_itemVarietyEdit->isEnabled() != is_single_selection) {
- m_itemVarietyEdit->setEnabled(is_single_selection);
+ if (m_itemVarietyEdit->isEnabled() != isSingleSelection) {
+ m_itemVarietyEdit->setEnabled(isSingleSelection);
}
}
}
@@ -595,28 +595,28 @@ void PropertiesView::MView::visitMRelation(const MRelation *relation)
{
visitMElement(relation);
QList<MRelation *> selection = filter<MRelation>(m_modelElements);
- bool is_single_selection = selection.size() == 1;
+ bool isSingleSelection = selection.size() == 1;
if (m_elementNameLineEdit == 0) {
m_elementNameLineEdit = new QLineEdit(m_topWidget);
m_topLayout->addRow(tr("Name:"), m_elementNameLineEdit);
connect(m_elementNameLineEdit, SIGNAL(textChanged(QString)), this, SLOT(onRelationNameChanged(QString)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if (relation->getName() != m_elementNameLineEdit->text() && !m_elementNameLineEdit->hasFocus()) {
m_elementNameLineEdit->setText(relation->getName());
}
} else {
m_elementNameLineEdit->clear();
}
- if (m_elementNameLineEdit->isEnabled() != is_single_selection) {
- m_elementNameLineEdit->setEnabled(is_single_selection);
+ if (m_elementNameLineEdit->isEnabled() != isSingleSelection) {
+ m_elementNameLineEdit->setEnabled(isSingleSelection);
}
- MObject *end_a_object = m_propertiesView->getModelController()->findObject(relation->getEndA());
- QMT_CHECK(end_a_object);
- setEndAName(tr("End A: %1").arg(end_a_object->getName()));
- MObject *end_b_object = m_propertiesView->getModelController()->findObject(relation->getEndB());
- QMT_CHECK(end_b_object);
- setEndBName(tr("End B: %1").arg(end_b_object->getName()));
+ MObject *endAObject = m_propertiesView->getModelController()->findObject(relation->getEndA());
+ QMT_CHECK(endAObject);
+ setEndAName(tr("End A: %1").arg(endAObject->getName()));
+ MObject *endBObject = m_propertiesView->getModelController()->findObject(relation->getEndB());
+ QMT_CHECK(endBObject);
+ setEndBName(tr("End B: %1").arg(endBObject->getName()));
}
void PropertiesView::MView::visitMDependency(const MDependency *dependency)
@@ -624,14 +624,14 @@ void PropertiesView::MView::visitMDependency(const MDependency *dependency)
setTitle<MDependency>(m_modelElements, tr("Dependency"), tr("Dependencies"));
visitMRelation(dependency);
QList<MDependency *> selection = filter<MDependency>(m_modelElements);
- bool is_single_selection = selection.size() == 1;
+ bool isSingleSelection = selection.size() == 1;
if (m_directionSelector == 0) {
m_directionSelector = new QComboBox(m_topWidget);
m_directionSelector->addItems(QStringList() << QStringLiteral("->") << QStringLiteral("<-") << QStringLiteral("<->"));
m_topLayout->addRow(tr("Direction:"), m_directionSelector);
connect(m_directionSelector, SIGNAL(activated(int)), this, SLOT(onDependencyDirectionChanged(int)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if ((!isValidDirectionIndex(m_directionSelector->currentIndex()) || dependency->getDirection() != translateIndexToDirection(m_directionSelector->currentIndex()))
&& !m_directionSelector->hasFocus()) {
m_directionSelector->setCurrentIndex(translateDirectionToIndex(dependency->getDirection()));
@@ -639,19 +639,19 @@ void PropertiesView::MView::visitMDependency(const MDependency *dependency)
} else {
m_directionSelector->setCurrentIndex(-1);
}
- if (m_directionSelector->isEnabled() != is_single_selection) {
- m_directionSelector->setEnabled(is_single_selection);
+ if (m_directionSelector->isEnabled() != isSingleSelection) {
+ m_directionSelector->setEnabled(isSingleSelection);
}
}
void PropertiesView::MView::visitMInheritance(const MInheritance *inheritance)
{
setTitle<MInheritance>(m_modelElements, tr("Inheritance"), tr("Inheritances"));
- MObject *derived_class = m_propertiesView->getModelController()->findObject(inheritance->getDerived());
- QMT_CHECK(derived_class);
- setEndAName(tr("Derived class: %1").arg(derived_class->getName()));
- MObject *base_class = m_propertiesView->getModelController()->findObject(inheritance->getBase());
- setEndBName(tr("Base class: %1").arg(base_class->getName()));
+ MObject *derivedClass = m_propertiesView->getModelController()->findObject(inheritance->getDerived());
+ QMT_CHECK(derivedClass);
+ setEndAName(tr("Derived class: %1").arg(derivedClass->getName()));
+ MObject *baseClass = m_propertiesView->getModelController()->findObject(inheritance->getBase());
+ setEndBName(tr("Base class: %1").arg(baseClass->getName()));
visitMRelation(inheritance);
}
@@ -660,7 +660,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
setTitle<MAssociation>(m_modelElements, tr("Association"), tr("Associations"));
visitMRelation(association);
QList<MAssociation *> selection = filter<MAssociation>(m_modelElements);
- bool is_single_selection = selection.size() == 1;
+ bool isSingleSelection = selection.size() == 1;
if (m_endALabel == 0) {
m_endALabel = new QLabel(QStringLiteral("<b>") + m_endAName + QStringLiteral("</b>"));
m_topLayout->addRow(m_endALabel);
@@ -670,45 +670,45 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
m_topLayout->addRow(tr("Role:"), m_endAEndName);
connect(m_endAEndName, SIGNAL(textChanged(QString)), this, SLOT(onAssociationEndANameChanged(QString)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if (association->getA().getName() != m_endAEndName->text() && !m_endAEndName->hasFocus()) {
m_endAEndName->setText(association->getA().getName());
}
} else {
m_endAEndName->clear();
}
- if (m_endAEndName->isEnabled() != is_single_selection) {
- m_endAEndName->setEnabled(is_single_selection);
+ if (m_endAEndName->isEnabled() != isSingleSelection) {
+ m_endAEndName->setEnabled(isSingleSelection);
}
if (m_endACardinality == 0) {
m_endACardinality = new QLineEdit(m_topWidget);
m_topLayout->addRow(tr("Cardinality:"), m_endACardinality);
connect(m_endACardinality, SIGNAL(textChanged(QString)), this, SLOT(onAssociationEndACardinalityChanged(QString)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if (association->getA().getCardinality() != m_endACardinality->text() && !m_endACardinality->hasFocus()) {
m_endACardinality->setText(association->getA().getCardinality());
}
} else {
m_endACardinality->clear();
}
- if (m_endACardinality->isEnabled() != is_single_selection) {
- m_endACardinality->setEnabled(is_single_selection);
+ if (m_endACardinality->isEnabled() != isSingleSelection) {
+ m_endACardinality->setEnabled(isSingleSelection);
}
if (m_endANavigable == 0) {
m_endANavigable = new QCheckBox(tr("Navigable"), m_topWidget);
m_topLayout->addRow(QString(), m_endANavigable);
connect(m_endANavigable, SIGNAL(clicked(bool)), this, SLOT(onAssociationEndANavigableChanged(bool)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if (association->getA().isNavigable() != m_endANavigable->isChecked()) {
m_endANavigable->setChecked(association->getA().isNavigable());
}
} else {
m_endANavigable->setChecked(false);
}
- if (m_endANavigable->isEnabled() != is_single_selection) {
- m_endANavigable->setEnabled(is_single_selection);
+ if (m_endANavigable->isEnabled() != isSingleSelection) {
+ m_endANavigable->setEnabled(isSingleSelection);
}
if (m_endAKind == 0) {
m_endAKind = new QComboBox(m_topWidget);
@@ -716,7 +716,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
m_topLayout->addRow(tr("Relationship:"), m_endAKind);
connect(m_endAKind, SIGNAL(activated(int)), this, SLOT(onAssociationEndAKindChanged(int)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if ((!isValidAssociationKindIndex(m_endAKind->currentIndex()) || association->getA().getKind() != translateIndexToAssociationKind(m_endAKind->currentIndex()))
&& !m_endAKind->hasFocus()) {
m_endAKind->setCurrentIndex(translateAssociationKindToIndex(association->getA().getKind()));
@@ -724,8 +724,8 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
} else {
m_endAKind->setCurrentIndex(-1);
}
- if (m_endAKind->isEnabled() != is_single_selection) {
- m_endAKind->setEnabled(is_single_selection);
+ if (m_endAKind->isEnabled() != isSingleSelection) {
+ m_endAKind->setEnabled(isSingleSelection);
}
if (m_endBLabel == 0) {
@@ -737,45 +737,45 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
m_topLayout->addRow(tr("Role:"), m_endBEndName);
connect(m_endBEndName, SIGNAL(textChanged(QString)), this, SLOT(onAssociationEndBNameChanged(QString)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if (association->getB().getName() != m_endBEndName->text() && !m_endBEndName->hasFocus()) {
m_endBEndName->setText(association->getB().getName());
}
} else {
m_endBEndName->clear();
}
- if (m_endBEndName->isEnabled() != is_single_selection) {
- m_endBEndName->setEnabled(is_single_selection);
+ if (m_endBEndName->isEnabled() != isSingleSelection) {
+ m_endBEndName->setEnabled(isSingleSelection);
}
if (m_endBCardinality == 0) {
m_endBCardinality = new QLineEdit(m_topWidget);
m_topLayout->addRow(tr("Cardinality:"), m_endBCardinality);
connect(m_endBCardinality, SIGNAL(textChanged(QString)), this, SLOT(onAssociationEndBCardinalityChanged(QString)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if (association->getB().getCardinality() != m_endBCardinality->text() && !m_endBCardinality->hasFocus()) {
m_endBCardinality->setText(association->getB().getCardinality());
}
} else {
m_endBCardinality->clear();
}
- if (m_endBCardinality->isEnabled() != is_single_selection) {
- m_endBCardinality->setEnabled(is_single_selection);
+ if (m_endBCardinality->isEnabled() != isSingleSelection) {
+ m_endBCardinality->setEnabled(isSingleSelection);
}
if (m_endBNavigable == 0) {
m_endBNavigable = new QCheckBox(tr("Navigable"), m_topWidget);
m_topLayout->addRow(QString(), m_endBNavigable);
connect(m_endBNavigable, SIGNAL(clicked(bool)), this, SLOT(onAssociationEndBNavigableChanged(bool)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if (association->getB().isNavigable() != m_endBNavigable->isChecked()) {
m_endBNavigable->setChecked(association->getB().isNavigable());
}
} else {
m_endBNavigable->setChecked(false);
}
- if (m_endBNavigable->isEnabled() != is_single_selection) {
- m_endBNavigable->setEnabled(is_single_selection);
+ if (m_endBNavigable->isEnabled() != isSingleSelection) {
+ m_endBNavigable->setEnabled(isSingleSelection);
}
if (m_endBKind == 0) {
m_endBKind = new QComboBox(m_topWidget);
@@ -783,7 +783,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
m_topLayout->addRow(tr("Relationship:"), m_endBKind);
connect(m_endBKind, SIGNAL(activated(int)), this, SLOT(onAssociationEndBKindChanged(int)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if ((!isValidAssociationKindIndex(m_endAKind->currentIndex()) || association->getB().getKind() != translateIndexToAssociationKind(m_endBKind->currentIndex()))
&& !m_endBKind->hasFocus()) {
m_endBKind->setCurrentIndex(translateAssociationKindToIndex(association->getB().getKind()));
@@ -791,8 +791,8 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
} else {
m_endBKind->setCurrentIndex(-1);
}
- if (m_endBKind->isEnabled() != is_single_selection) {
- m_endBKind->setEnabled(is_single_selection);
+ if (m_endBKind->isEnabled() != isSingleSelection) {
+ m_endBKind->setEnabled(isSingleSelection);
}
}
@@ -839,9 +839,9 @@ void PropertiesView::MView::visitDObject(const DObject *object)
connect(m_autoSizedCheckbox, SIGNAL(clicked(bool)), this, SLOT(onAutoSizedChanged(bool)));
}
if (!m_autoSizedCheckbox->hasFocus()) {
- bool auto_sized;
- if (haveSameValue(m_diagramElements, &DObject::hasAutoSize, &auto_sized)) {
- m_autoSizedCheckbox->setChecked(auto_sized);
+ bool autoSized;
+ if (haveSameValue(m_diagramElements, &DObject::hasAutoSize, &autoSized)) {
+ m_autoSizedCheckbox->setChecked(autoSized);
} else {
m_autoSizedCheckbox->setChecked(false);
}
@@ -857,20 +857,20 @@ void PropertiesView::MView::visitDObject(const DObject *object)
connect(m_visualPrimaryRoleSelector, SIGNAL(activated(int)), this, SLOT(onVisualPrimaryRoleChanged(int)));
}
if (!m_visualPrimaryRoleSelector->hasFocus()) {
- StereotypeDisplayVisitor stereotype_display_visitor;
- stereotype_display_visitor.setModelController(m_propertiesView->getModelController());
- stereotype_display_visitor.setStereotypeController(m_propertiesView->getStereotypeController());
- object->accept(&stereotype_display_visitor);
- QString shape_id = stereotype_display_visitor.getShapeIconId();
- QColor base_color;
- if (!shape_id.isEmpty()) {
- StereotypeIcon stereotype_icon = m_propertiesView->getStereotypeController()->findStereotypeIcon(shape_id);
- base_color = stereotype_icon.getBaseColor();
+ StereotypeDisplayVisitor stereotypeDisplayVisitor;
+ stereotypeDisplayVisitor.setModelController(m_propertiesView->getModelController());
+ stereotypeDisplayVisitor.setStereotypeController(m_propertiesView->getStereotypeController());
+ object->accept(&stereotypeDisplayVisitor);
+ QString shapeId = stereotypeDisplayVisitor.getShapeIconId();
+ QColor baseColor;
+ if (!shapeId.isEmpty()) {
+ StereotypeIcon stereotypeIcon = m_propertiesView->getStereotypeController()->findStereotypeIcon(shapeId);
+ baseColor = stereotypeIcon.getBaseColor();
}
- setPrimaryRolePalette(m_styleElementType, DObject::PRIMARY_ROLE_NORMAL, base_color);
- DObject::VisualPrimaryRole visual_primary_role;
- if (haveSameValue(m_diagramElements, &DObject::getVisualPrimaryRole, &visual_primary_role)) {
- m_visualPrimaryRoleSelector->setCurrentIndex(translateVisualPrimaryRoleToIndex(visual_primary_role));
+ setPrimaryRolePalette(m_styleElementType, DObject::PRIMARY_ROLE_NORMAL, baseColor);
+ DObject::VisualPrimaryRole visualPrimaryRole;
+ if (haveSameValue(m_diagramElements, &DObject::getVisualPrimaryRole, &visualPrimaryRole)) {
+ m_visualPrimaryRoleSelector->setCurrentIndex(translateVisualPrimaryRoleToIndex(visualPrimaryRole));
} else {
m_visualPrimaryRoleSelector->setCurrentIndex(-1);
}
@@ -884,9 +884,9 @@ void PropertiesView::MView::visitDObject(const DObject *object)
connect(m_visualSecondaryRoleSelector, SIGNAL(activated(int)), this, SLOT(onVisualSecondaryRoleChanged(int)));
}
if (!m_visualSecondaryRoleSelector->hasFocus()) {
- DObject::VisualSecondaryRole visual_secondary_role;
- if (haveSameValue(m_diagramElements, &DObject::getVisualSecondaryRole, &visual_secondary_role)) {
- m_visualSecondaryRoleSelector->setCurrentIndex(translateVisualSecondaryRoleToIndex(visual_secondary_role));
+ DObject::VisualSecondaryRole visualSecondaryRole;
+ if (haveSameValue(m_diagramElements, &DObject::getVisualSecondaryRole, &visualSecondaryRole)) {
+ m_visualSecondaryRoleSelector->setCurrentIndex(translateVisualSecondaryRoleToIndex(visualSecondaryRole));
} else {
m_visualSecondaryRoleSelector->setCurrentIndex(-1);
}
@@ -912,9 +912,9 @@ void PropertiesView::MView::visitDObject(const DObject *object)
connect(m_stereotypeDisplaySelector, SIGNAL(activated(int)), this, SLOT(onStereotypeDisplayChanged(int)));
}
if (!m_stereotypeDisplaySelector->hasFocus()) {
- DObject::StereotypeDisplay stereotype_display;
- if (haveSameValue(m_diagramElements, &DObject::getStereotypeDisplay, &stereotype_display)) {
- m_stereotypeDisplaySelector->setCurrentIndex(translateStereotypeDisplayToIndex(stereotype_display));
+ DObject::StereotypeDisplay stereotypeDisplay;
+ if (haveSameValue(m_diagramElements, &DObject::getStereotypeDisplay, &stereotypeDisplay)) {
+ m_stereotypeDisplaySelector->setCurrentIndex(translateStereotypeDisplayToIndex(stereotypeDisplay));
} else {
m_stereotypeDisplaySelector->setCurrentIndex(-1);
}
@@ -949,9 +949,9 @@ void PropertiesView::MView::visitDClass(const DClass *klass)
connect(m_templateDisplaySelector, SIGNAL(activated(int)), this, SLOT(onTemplateDisplayChanged(int)));
}
if (!m_templateDisplaySelector->hasFocus()) {
- DClass::TemplateDisplay template_display;
- if (haveSameValue(m_diagramElements, &DClass::getTemplateDisplay, &template_display)) {
- m_templateDisplaySelector->setCurrentIndex(translateTemplateDisplayToIndex(template_display));
+ DClass::TemplateDisplay templateDisplay;
+ if (haveSameValue(m_diagramElements, &DClass::getTemplateDisplay, &templateDisplay)) {
+ m_templateDisplaySelector->setCurrentIndex(translateTemplateDisplayToIndex(templateDisplay));
} else {
m_templateDisplaySelector->setCurrentIndex(-1);
}
@@ -962,9 +962,9 @@ void PropertiesView::MView::visitDClass(const DClass *klass)
connect(m_showAllMembersCheckbox, SIGNAL(clicked(bool)), this, SLOT(onShowAllMembersChanged(bool)));
}
if (!m_showAllMembersCheckbox->hasFocus()) {
- bool show_all_members;
- if (haveSameValue(m_diagramElements, &DClass::getShowAllMembers, &show_all_members)) {
- m_showAllMembersCheckbox->setChecked(show_all_members);
+ bool showAllMembers;
+ if (haveSameValue(m_diagramElements, &DClass::getShowAllMembers, &showAllMembers)) {
+ m_showAllMembersCheckbox->setChecked(showAllMembers);
} else {
m_showAllMembersCheckbox->setChecked(false);
}
@@ -983,9 +983,9 @@ void PropertiesView::MView::visitDComponent(const DComponent *component)
connect(m_plainShapeCheckbox, SIGNAL(clicked(bool)), this, SLOT(onPlainShapeChanged(bool)));
}
if (!m_plainShapeCheckbox->hasFocus()) {
- bool plain_shape;
- if (haveSameValue(m_diagramElements, &DComponent::getPlainShape, &plain_shape)) {
- m_plainShapeCheckbox->setChecked(plain_shape);
+ bool plainShape;
+ if (haveSameValue(m_diagramElements, &DComponent::getPlainShape, &plainShape)) {
+ m_plainShapeCheckbox->setChecked(plainShape);
} else {
m_plainShapeCheckbox->setChecked(false);
}
@@ -1006,22 +1006,22 @@ void PropertiesView::MView::visitDItem(const DItem *item)
setStyleElementType(StyleEngine::TYPE_ITEM);
visitDObject(item);
QList<DItem *> selection = filter<DItem>(m_diagramElements);
- bool is_single_selection = selection.size() == 1;
+ bool isSingleSelection = selection.size() == 1;
if (item->isShapeEditable()) {
if (m_itemShapeEdit == 0) {
m_itemShapeEdit = new QLineEdit(m_topWidget);
m_topLayout->addRow(tr("Shape:"), m_itemShapeEdit);
connect(m_itemShapeEdit, SIGNAL(textChanged(QString)), this, SLOT(onItemShapeChanged(QString)));
}
- if (is_single_selection) {
+ if (isSingleSelection) {
if (item->getShape() != m_itemShapeEdit->text() && !m_itemShapeEdit->hasFocus()) {
m_itemShapeEdit->setText(item->getShape());
}
} else {
m_itemShapeEdit->clear();
}
- if (m_itemShapeEdit->isEnabled() != is_single_selection) {
- m_itemShapeEdit->setEnabled(is_single_selection);
+ if (m_itemShapeEdit->isEnabled() != isSingleSelection) {
+ m_itemShapeEdit->setEnabled(isSingleSelection);
}
}
}
@@ -1059,9 +1059,9 @@ void PropertiesView::MView::visitDAnnotation(const DAnnotation *annotation)
connect(m_annotationAutoWidthCheckbox, SIGNAL(clicked(bool)), this, SLOT(onAutoWidthChanged(bool)));
}
if (!m_annotationAutoWidthCheckbox->hasFocus()) {
- bool auto_sized;
- if (haveSameValue(m_diagramElements, &DAnnotation::hasAutoSize, &auto_sized)) {
- m_annotationAutoWidthCheckbox->setChecked(auto_sized);
+ bool autoSized;
+ if (haveSameValue(m_diagramElements, &DAnnotation::hasAutoSize, &autoSized)) {
+ m_annotationAutoWidthCheckbox->setChecked(autoSized);
} else {
m_annotationAutoWidthCheckbox->setChecked(false);
}
@@ -1073,9 +1073,9 @@ void PropertiesView::MView::visitDAnnotation(const DAnnotation *annotation)
connect(m_annotationVisualRoleSelector, SIGNAL(activated(int)), this, SLOT(onAnnotationVisualRoleChanged(int)));
}
if (!m_annotationVisualRoleSelector->hasFocus()) {
- DAnnotation::VisualRole visual_role;
- if (haveSameValue(m_diagramElements, &DAnnotation::getVisualRole, &visual_role)) {
- m_annotationVisualRoleSelector->setCurrentIndex(translateAnnotationVisualRoleToIndex(visual_role));
+ DAnnotation::VisualRole visualRole;
+ if (haveSameValue(m_diagramElements, &DAnnotation::getVisualRole, &visualRole)) {
+ m_annotationVisualRoleSelector->setCurrentIndex(translateAnnotationVisualRoleToIndex(visualRole));
} else {
m_annotationVisualRoleSelector->setCurrentIndex(-1);
}
@@ -1099,15 +1099,15 @@ void PropertiesView::MView::onObjectNameChanged(const QString &name)
assignModelElement<MObject, QString>(m_modelElements, SELECTION_SINGLE, name, &MObject::getName, &MObject::setName);
}
-void PropertiesView::MView::onNamespaceChanged(const QString &name_space)
+void PropertiesView::MView::onNamespaceChanged(const QString &nameSpace)
{
- assignModelElement<MClass, QString>(m_modelElements, SELECTION_MULTI, name_space, &MClass::getNamespace, &MClass::setNamespace);
+ assignModelElement<MClass, QString>(m_modelElements, SELECTION_MULTI, nameSpace, &MClass::getNamespace, &MClass::setNamespace);
}
-void PropertiesView::MView::onTemplateParametersChanged(const QString &template_parameters)
+void PropertiesView::MView::onTemplateParametersChanged(const QString &templateParameters)
{
- QList<QString> template_parameters_list = splitTemplateParameters(template_parameters);
- assignModelElement<MClass, QList<QString> >(m_modelElements, SELECTION_SINGLE, template_parameters_list, &MClass::getTemplateParameters, &MClass::setTemplateParameters);
+ QList<QString> templateParametersList = splitTemplateParameters(templateParameters);
+ assignModelElement<MClass, QList<QString> >(m_modelElements, SELECTION_SINGLE, templateParametersList, &MClass::getTemplateParameters, &MClass::setTemplateParameters);
}
void PropertiesView::MView::onClassMembersStatusChanged(bool valid)
@@ -1124,9 +1124,9 @@ void PropertiesView::MView::onParseClassMembers()
m_classMembersEdit->reparse();
}
-void PropertiesView::MView::onClassMembersChanged(QList<MClassMember> &class_members)
+void PropertiesView::MView::onClassMembersChanged(QList<MClassMember> &classMembers)
{
- assignModelElement<MClass, QList<MClassMember> >(m_modelElements, SELECTION_SINGLE, class_members, &MClass::getMembers, &MClass::setMembers);
+ assignModelElement<MClass, QList<MClassMember> >(m_modelElements, SELECTION_SINGLE, classMembers, &MClass::getMembers, &MClass::setMembers);
}
void PropertiesView::MView::onItemVarietyChanged(const QString &variety)
@@ -1139,9 +1139,9 @@ void PropertiesView::MView::onRelationNameChanged(const QString &name)
assignModelElement<MRelation, QString>(m_modelElements, SELECTION_SINGLE, name, &MRelation::getName, &MRelation::setName);
}
-void PropertiesView::MView::onDependencyDirectionChanged(int direction_index)
+void PropertiesView::MView::onDependencyDirectionChanged(int directionIndex)
{
- MDependency::Direction direction = translateIndexToDirection(direction_index);
+ MDependency::Direction direction = translateIndexToDirection(directionIndex);
assignModelElement<MDependency, MDependency::Direction>(m_modelElements, SELECTION_SINGLE, direction, &MDependency::getDirection, &MDependency::setDirection);
}
@@ -1160,9 +1160,9 @@ void PropertiesView::MView::onAssociationEndANavigableChanged(bool navigable)
assignEmbeddedModelElement<MAssociation, MAssociationEnd, bool>(m_modelElements, SELECTION_SINGLE, navigable, &MAssociation::getA, &MAssociation::setA, &MAssociationEnd::isNavigable, &MAssociationEnd::setNavigable);
}
-void PropertiesView::MView::onAssociationEndAKindChanged(int kind_index)
+void PropertiesView::MView::onAssociationEndAKindChanged(int kindIndex)
{
- MAssociationEnd::Kind kind = translateIndexToAssociationKind(kind_index);
+ MAssociationEnd::Kind kind = translateIndexToAssociationKind(kindIndex);
assignEmbeddedModelElement<MAssociation, MAssociationEnd, MAssociationEnd::Kind>(m_modelElements, SELECTION_SINGLE, kind, &MAssociation::getA, &MAssociation::setA, &MAssociationEnd::getKind, &MAssociationEnd::setKind);
}
@@ -1181,54 +1181,54 @@ void PropertiesView::MView::onAssociationEndBNavigableChanged(bool navigable)
assignEmbeddedModelElement<MAssociation, MAssociationEnd, bool>(m_modelElements, SELECTION_SINGLE, navigable, &MAssociation::getB, &MAssociation::setB, &MAssociationEnd::isNavigable, &MAssociationEnd::setNavigable);
}
-void PropertiesView::MView::onAssociationEndBKindChanged(int kind_index)
+void PropertiesView::MView::onAssociationEndBKindChanged(int kindIndex)
{
- MAssociationEnd::Kind kind = translateIndexToAssociationKind(kind_index);
+ MAssociationEnd::Kind kind = translateIndexToAssociationKind(kindIndex);
assignEmbeddedModelElement<MAssociation, MAssociationEnd, MAssociationEnd::Kind>(m_modelElements, SELECTION_SINGLE, kind, &MAssociation::getB, &MAssociation::setB, &MAssociationEnd::getKind, &MAssociationEnd::setKind);
}
-void PropertiesView::MView::onAutoSizedChanged(bool auto_sized)
+void PropertiesView::MView::onAutoSizedChanged(bool autoSized)
{
- assignModelElement<DObject, bool>(m_diagramElements, SELECTION_MULTI, auto_sized, &DObject::hasAutoSize, &DObject::setAutoSize);
+ assignModelElement<DObject, bool>(m_diagramElements, SELECTION_MULTI, autoSized, &DObject::hasAutoSize, &DObject::setAutoSize);
}
-void PropertiesView::MView::onVisualPrimaryRoleChanged(int visual_role_index)
+void PropertiesView::MView::onVisualPrimaryRoleChanged(int visualRoleIndex)
{
- DObject::VisualPrimaryRole visual_role = translateIndexToVisualPrimaryRole(visual_role_index);
- assignModelElement<DObject, DObject::VisualPrimaryRole>(m_diagramElements, SELECTION_MULTI, visual_role, &DObject::getVisualPrimaryRole, &DObject::setVisualPrimaryRole);
+ DObject::VisualPrimaryRole visualRole = translateIndexToVisualPrimaryRole(visualRoleIndex);
+ assignModelElement<DObject, DObject::VisualPrimaryRole>(m_diagramElements, SELECTION_MULTI, visualRole, &DObject::getVisualPrimaryRole, &DObject::setVisualPrimaryRole);
}
-void PropertiesView::MView::onVisualSecondaryRoleChanged(int visual_role_index)
+void PropertiesView::MView::onVisualSecondaryRoleChanged(int visualRoleIndex)
{
- DObject::VisualSecondaryRole visual_role = translateIndexToVisualSecondaryRole(visual_role_index);
- assignModelElement<DObject, DObject::VisualSecondaryRole>(m_diagramElements, SELECTION_MULTI, visual_role, &DObject::getVisualSecondaryRole, &DObject::setVisualSecondaryRole);
+ DObject::VisualSecondaryRole visualRole = translateIndexToVisualSecondaryRole(visualRoleIndex);
+ assignModelElement<DObject, DObject::VisualSecondaryRole>(m_diagramElements, SELECTION_MULTI, visualRole, &DObject::getVisualSecondaryRole, &DObject::setVisualSecondaryRole);
}
-void PropertiesView::MView::onVisualEmphasizedChanged(bool visual_emphasized)
+void PropertiesView::MView::onVisualEmphasizedChanged(bool visualEmphasized)
{
- assignModelElement<DObject, bool>(m_diagramElements, SELECTION_MULTI, visual_emphasized, &DObject::isVisualEmphasized, &DObject::setVisualEmphasized);
+ assignModelElement<DObject, bool>(m_diagramElements, SELECTION_MULTI, visualEmphasized, &DObject::isVisualEmphasized, &DObject::setVisualEmphasized);
}
-void PropertiesView::MView::onStereotypeDisplayChanged(int stereotype_display_index)
+void PropertiesView::MView::onStereotypeDisplayChanged(int stereotypeDisplayIndex)
{
- DObject::StereotypeDisplay stereotype_display = translateIndexToStereotypeDisplay(stereotype_display_index);
- assignModelElement<DObject, DObject::StereotypeDisplay>(m_diagramElements, SELECTION_MULTI, stereotype_display, &DObject::getStereotypeDisplay, &DObject::setStereotypeDisplay);
+ DObject::StereotypeDisplay stereotypeDisplay = translateIndexToStereotypeDisplay(stereotypeDisplayIndex);
+ assignModelElement<DObject, DObject::StereotypeDisplay>(m_diagramElements, SELECTION_MULTI, stereotypeDisplay, &DObject::getStereotypeDisplay, &DObject::setStereotypeDisplay);
}
-void PropertiesView::MView::onTemplateDisplayChanged(int template_display_index)
+void PropertiesView::MView::onTemplateDisplayChanged(int templateDisplayIndex)
{
- DClass::TemplateDisplay template_display = translateIndexToTemplateDisplay(template_display_index);
- assignModelElement<DClass, DClass::TemplateDisplay>(m_diagramElements, SELECTION_MULTI, template_display, &DClass::getTemplateDisplay, &DClass::setTemplateDisplay);
+ DClass::TemplateDisplay templateDisplay = translateIndexToTemplateDisplay(templateDisplayIndex);
+ assignModelElement<DClass, DClass::TemplateDisplay>(m_diagramElements, SELECTION_MULTI, templateDisplay, &DClass::getTemplateDisplay, &DClass::setTemplateDisplay);
}
-void PropertiesView::MView::onShowAllMembersChanged(bool show_all_members)
+void PropertiesView::MView::onShowAllMembersChanged(bool showAllMembers)
{
- assignModelElement<DClass, bool>(m_diagramElements, SELECTION_MULTI, show_all_members, &DClass::getShowAllMembers, &DClass::setShowAllMembers);
+ assignModelElement<DClass, bool>(m_diagramElements, SELECTION_MULTI, showAllMembers, &DClass::getShowAllMembers, &DClass::setShowAllMembers);
}
-void PropertiesView::MView::onPlainShapeChanged(bool plain_shape)
+void PropertiesView::MView::onPlainShapeChanged(bool plainShape)
{
- assignModelElement<DComponent, bool>(m_diagramElements, SELECTION_MULTI, plain_shape, &DComponent::getPlainShape, &DComponent::setPlainShape);
+ assignModelElement<DComponent, bool>(m_diagramElements, SELECTION_MULTI, plainShape, &DComponent::getPlainShape, &DComponent::setPlainShape);
}
void PropertiesView::MView::onItemShapeChanged(const QString &shape)
@@ -1236,15 +1236,15 @@ void PropertiesView::MView::onItemShapeChanged(const QString &shape)
assignModelElement<DItem, QString>(m_diagramElements, SELECTION_SINGLE, shape, &DItem::getShape, &DItem::setShape);
}
-void PropertiesView::MView::onAutoWidthChanged(bool auto_widthed)
+void PropertiesView::MView::onAutoWidthChanged(bool autoWidthed)
{
- assignModelElement<DAnnotation, bool>(m_diagramElements, SELECTION_MULTI, auto_widthed, &DAnnotation::hasAutoSize, &DAnnotation::setAutoSize);
+ assignModelElement<DAnnotation, bool>(m_diagramElements, SELECTION_MULTI, autoWidthed, &DAnnotation::hasAutoSize, &DAnnotation::setAutoSize);
}
-void PropertiesView::MView::onAnnotationVisualRoleChanged(int visual_role_index)
+void PropertiesView::MView::onAnnotationVisualRoleChanged(int visualRoleIndex)
{
- DAnnotation::VisualRole visual_role = translateIndexToAnnotationVisualRole((visual_role_index));
- assignModelElement<DAnnotation, DAnnotation::VisualRole>(m_diagramElements, SELECTION_MULTI, visual_role, &DAnnotation::getVisualRole, &DAnnotation::setVisualRole);
+ DAnnotation::VisualRole visualRole = translateIndexToAnnotationVisualRole((visualRoleIndex));
+ assignModelElement<DAnnotation, DAnnotation::VisualRole>(m_diagramElements, SELECTION_MULTI, visualRole, &DAnnotation::getVisualRole, &DAnnotation::setVisualRole);
}
void PropertiesView::MView::prepare()
@@ -1266,14 +1266,14 @@ void PropertiesView::MView::prepare()
}
template<class T, class V>
-void PropertiesView::MView::setTitle(const QList<V *> &elements, const QString &singular_title, const QString &plural_title)
+void PropertiesView::MView::setTitle(const QList<V *> &elements, const QString &singularTitle, const QString &pluralTitle)
{
QList<T *> filtered = filter<T>(elements);
if (filtered.size() == elements.size()) {
if (elements.size() == 1) {
- m_propertiesTitle = singular_title;
+ m_propertiesTitle = singularTitle;
} else {
- m_propertiesTitle = plural_title;
+ m_propertiesTitle = pluralTitle;
}
} else {
m_propertiesTitle = tr("Multi-Selection");
@@ -1281,24 +1281,24 @@ void PropertiesView::MView::setTitle(const QList<V *> &elements, const QString &
}
template<class T, class V>
-void PropertiesView::MView::setTitle(const MItem *item, const QList<V *> &elements, const QString &singular_title, const QString &plural_title)
+void PropertiesView::MView::setTitle(const MItem *item, const QList<V *> &elements, const QString &singularTitle, const QString &pluralTitle)
{
if (m_propertiesTitle.isEmpty()) {
QList<T *> filtered = filter<T>(elements);
if (filtered.size() == elements.size()) {
if (elements.size() == 1) {
if (item && !item->isVarietyEditable()) {
- QString stereotype_icon_id = m_propertiesView->getStereotypeController()->findStereotypeIconId(StereotypeIcon::ELEMENT_ITEM, QStringList() << item->getVariety());
- if (!stereotype_icon_id.isEmpty()) {
- StereotypeIcon stereotype_icon = m_propertiesView->getStereotypeController()->findStereotypeIcon(stereotype_icon_id);
- m_propertiesTitle = stereotype_icon.getTitle();
+ QString stereotypeIconId = m_propertiesView->getStereotypeController()->findStereotypeIconId(StereotypeIcon::ELEMENT_ITEM, QStringList() << item->getVariety());
+ if (!stereotypeIconId.isEmpty()) {
+ StereotypeIcon stereotypeIcon = m_propertiesView->getStereotypeController()->findStereotypeIcon(stereotypeIconId);
+ m_propertiesTitle = stereotypeIcon.getTitle();
}
}
if (m_propertiesTitle.isEmpty()) {
- m_propertiesTitle = singular_title;
+ m_propertiesTitle = singularTitle;
}
} else {
- m_propertiesTitle = plural_title;
+ m_propertiesTitle = pluralTitle;
}
} else {
m_propertiesTitle = tr("Multi-Selection");
@@ -1306,66 +1306,66 @@ void PropertiesView::MView::setTitle(const MItem *item, const QList<V *> &elemen
}
}
-void PropertiesView::MView::setStereotypeIconElement(StereotypeIcon::Element stereotype_element)
+void PropertiesView::MView::setStereotypeIconElement(StereotypeIcon::Element stereotypeElement)
{
if (m_stereotypeElement == StereotypeIcon::ELEMENT_ANY) {
- m_stereotypeElement = stereotype_element;
+ m_stereotypeElement = stereotypeElement;
}
}
-void PropertiesView::MView::setStyleElementType(StyleEngine::ElementType element_type)
+void PropertiesView::MView::setStyleElementType(StyleEngine::ElementType elementType)
{
if (m_styleElementType == StyleEngine::TYPE_OTHER) {
- m_styleElementType = element_type;
+ m_styleElementType = elementType;
}
}
-void PropertiesView::MView::setPrimaryRolePalette(StyleEngine::ElementType element_type, DObject::VisualPrimaryRole visual_primary_role, const QColor &base_color)
+void PropertiesView::MView::setPrimaryRolePalette(StyleEngine::ElementType elementType, DObject::VisualPrimaryRole visualPrimaryRole, const QColor &baseColor)
{
- int index = translateVisualPrimaryRoleToIndex(visual_primary_role);
- const Style *style = m_propertiesView->getStyleController()->adaptObjectStyle(element_type, ObjectVisuals(visual_primary_role, DObject::SECONDARY_ROLE_NONE, false, base_color, 0));
+ int index = translateVisualPrimaryRoleToIndex(visualPrimaryRole);
+ const Style *style = m_propertiesView->getStyleController()->adaptObjectStyle(elementType, ObjectVisuals(visualPrimaryRole, DObject::SECONDARY_ROLE_NONE, false, baseColor, 0));
m_visualPrimaryRoleSelector->setBrush(index, style->getFillBrush());
m_visualPrimaryRoleSelector->setLinePen(index, style->getLinePen());
}
-void PropertiesView::MView::setEndAName(const QString &end_a_name)
+void PropertiesView::MView::setEndAName(const QString &endAName)
{
if (m_endAName.isEmpty()) {
- m_endAName = end_a_name;
+ m_endAName = endAName;
}
}
-void PropertiesView::MView::setEndBName(const QString &end_b_name)
+void PropertiesView::MView::setEndBName(const QString &endBName)
{
if (m_endBName.isEmpty()) {
- m_endBName = end_b_name;
+ m_endBName = endBName;
}
}
-QList<QString> PropertiesView::MView::splitTemplateParameters(const QString &template_parameters)
+QList<QString> PropertiesView::MView::splitTemplateParameters(const QString &templateParameters)
{
- QList<QString> template_parameters_list;
- foreach (const QString ¶meter, template_parameters.split(QLatin1Char(','))) {
+ QList<QString> templateParametersList;
+ foreach (const QString ¶meter, templateParameters.split(QLatin1Char(','))) {
const QString &p = parameter.trimmed();
if (!p.isEmpty()) {
- template_parameters_list.append(p);
+ templateParametersList.append(p);
}
}
- return template_parameters_list;
+ return templateParametersList;
}
-QString PropertiesView::MView::formatTemplateParameters(const QList<QString> &template_parameters_list)
+QString PropertiesView::MView::formatTemplateParameters(const QList<QString> &templateParametersList)
{
- QString template_paramters;
+ QString templateParamters;
bool first = true;
- foreach (const QString ¶meter, template_parameters_list) {
+ foreach (const QString ¶meter, templateParametersList) {
if (!first) {
- template_paramters += QStringLiteral(", ");
+ templateParamters += QStringLiteral(", ");
}
- template_paramters += parameter;
+ templateParamters += parameter;
first = false;
}
- return template_paramters;
+ return templateParamters;
}
template<class T, class V>
@@ -1382,24 +1382,24 @@ QList<T *> PropertiesView::MView::filter(const QList<V *> &elements)
}
template<class T, class V, class BASE>
-bool PropertiesView::MView::haveSameValue(const QList<BASE *> &base_elements, V (T::*getter)() const, V *value)
+bool PropertiesView::MView::haveSameValue(const QList<BASE *> &baseElements, V (T::*getter)() const, V *value)
{
- QList<T *> elements = filter<T>(base_elements);
+ QList<T *> elements = filter<T>(baseElements);
QMT_CHECK(!elements.isEmpty());
V candidate = V(); // avoid warning of reading uninitialized variable
- bool have_candidate = false;
+ bool haveCandidate = false;
foreach (T *element, elements) {
- if (!have_candidate) {
+ if (!haveCandidate) {
candidate = ((*element).*getter)();
- have_candidate = true;
+ haveCandidate = true;
} else {
if (candidate != ((*element).*getter)()) {
return false;
}
}
}
- QMT_CHECK(have_candidate);
- if (!have_candidate) {
+ QMT_CHECK(haveCandidate);
+ if (!haveCandidate) {
return false;
}
if (value) {
@@ -1409,10 +1409,10 @@ bool PropertiesView::MView::haveSameValue(const QList<BASE *> &base_elements, V
}
template<class T, class V, class BASE>
-void PropertiesView::MView::assignModelElement(const QList<BASE *> &base_elements, SelectionType selection_type, const V &value, V (T::*getter)() const, void (T::*setter)(const V &))
+void PropertiesView::MView::assignModelElement(const QList<BASE *> &baseElements, SelectionType selectionType, const V &value, V (T::*getter)() const, void (T::*setter)(const V &))
{
- QList<T *> elements = filter<T>(base_elements);
- if ((selection_type == SELECTION_SINGLE && elements.size() == 1) || selection_type == SELECTION_MULTI) {
+ QList<T *> elements = filter<T>(baseElements);
+ if ((selectionType == SELECTION_SINGLE && elements.size() == 1) || selectionType == SELECTION_MULTI) {
foreach (T *element, elements) {
if (value != ((*element).*getter)()) {
m_propertiesView->beginUpdate(element);
@@ -1424,10 +1424,10 @@ void PropertiesView::MView::assignModelElement(const QList<BASE *> &base_element
}
template<class T, class V, class BASE>
-void PropertiesView::MView::assignModelElement(const QList<BASE *> &base_elements, SelectionType selection_type, const V &value, V (T::*getter)() const, void (T::*setter)(V))
+void PropertiesView::MView::assignModelElement(const QList<BASE *> &baseElements, SelectionType selectionType, const V &value, V (T::*getter)() const, void (T::*setter)(V))
{
- QList<T *> elements = filter<T>(base_elements);
- if ((selection_type == SELECTION_SINGLE && elements.size() == 1) || selection_type == SELECTION_MULTI) {
+ QList<T *> elements = filter<T>(baseElements);
+ if ((selectionType == SELECTION_SINGLE && elements.size() == 1) || selectionType == SELECTION_MULTI) {
foreach (T *element, elements) {
if (value != ((*element).*getter)()) {
m_propertiesView->beginUpdate(element);
@@ -1439,15 +1439,15 @@ void PropertiesView::MView::assignModelElement(const QList<BASE *> &base_element
}
template<class T, class E, class V, class BASE>
-void PropertiesView::MView::assignEmbeddedModelElement(const QList<BASE *> &base_elements, SelectionType selection_type, const V &value, E (T::*getter)() const, void (T::*setter)(const E &), V (E::*v_getter)() const, void (E::*v_setter)(const V &))
+void PropertiesView::MView::assignEmbeddedModelElement(const QList<BASE *> &baseElements, SelectionType selectionType, const V &value, E (T::*getter)() const, void (T::*setter)(const E &), V (E::*vGetter)() const, void (E::*vSetter)(const V &))
{
- QList<T *> elements = filter<T>(base_elements);
- if ((selection_type == SELECTION_SINGLE && elements.size() == 1) || selection_type == SELECTION_MULTI) {
+ QList<T *> elements = filter<T>(baseElements);
+ if ((selectionType == SELECTION_SINGLE && elements.size() == 1) || selectionType == SELECTION_MULTI) {
foreach (T *element, elements) {
E embedded = ((*element).*getter)();
- if (value != (embedded.*v_getter)()) {
+ if (value != (embedded.*vGetter)()) {
m_propertiesView->beginUpdate(element);
- (embedded.*v_setter)(value);
+ (embedded.*vSetter)(value);
((*element).*setter)(embedded);
m_propertiesView->endUpdate(element, false);
}
@@ -1456,15 +1456,15 @@ void PropertiesView::MView::assignEmbeddedModelElement(const QList<BASE *> &base
}
template<class T, class E, class V, class BASE>
-void PropertiesView::MView::assignEmbeddedModelElement(const QList<BASE *> &base_elements, SelectionType selection_type, const V &value, E (T::*getter)() const, void (T::*setter)(const E &), V (E::*v_getter)() const, void (E::*v_setter)(V))
+void PropertiesView::MView::assignEmbeddedModelElement(const QList<BASE *> &baseElements, SelectionType selectionType, const V &value, E (T::*getter)() const, void (T::*setter)(const E &), V (E::*vGetter)() const, void (E::*vSetter)(V))
{
- QList<T *> elements = filter<T>(base_elements);
- if ((selection_type == SELECTION_SINGLE && elements.size() == 1) || selection_type == SELECTION_MULTI) {
+ QList<T *> elements = filter<T>(baseElements);
+ if ((selectionType == SELECTION_SINGLE && elements.size() == 1) || selectionType == SELECTION_MULTI) {
foreach (T *element, elements) {
E embedded = ((*element).*getter)();
- if (value != (embedded.*v_getter)()) {
+ if (value != (embedded.*vGetter)()) {
m_propertiesView->beginUpdate(element);
- (embedded.*v_setter)(value);
+ (embedded.*vSetter)(value);
((*element).*setter)(embedded);
m_propertiesView->endUpdate(element, false);
}
diff --git a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.h b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.h
index 9c3488e694c0e0ac9ea0296ada0f33a72cc6afe9..30f12557367217acddca0cef73b997f21c572f79 100644
--- a/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.h
+++ b/src/libs/3rdparty/modeling/qmt/model_widgets_ui/propertiesviewmview.h
@@ -72,7 +72,7 @@ class QMT_EXPORT PropertiesView::MView :
public:
- MView(PropertiesView *properties_view);
+ MView(PropertiesView *propertiesView);
~MView();
@@ -136,9 +136,9 @@ public:
public:
- void update(QList<MElement *> &model_elements);
+ void update(QList<MElement *> &modelElements);
- void update(QList<DElement *> &diagram_elements, MDiagram *diagram);
+ void update(QList<DElement *> &diagramElements, MDiagram *diagram);
void edit();
@@ -148,21 +148,21 @@ private slots:
void onObjectNameChanged(const QString &name);
- void onNamespaceChanged(const QString &name_space);
+ void onNamespaceChanged(const QString &nameSpace);
- void onTemplateParametersChanged(const QString &template_parameters);
+ void onTemplateParametersChanged(const QString &templateParameters);
void onClassMembersStatusChanged(bool valid);
void onParseClassMembers();
- void onClassMembersChanged(QList<MClassMember> &class_members);
+ void onClassMembersChanged(QList<MClassMember> &classMembers);
void onItemVarietyChanged(const QString &variety);
void onRelationNameChanged(const QString &name);
- void onDependencyDirectionChanged(int direction_index);
+ void onDependencyDirectionChanged(int directionIndex);
void onAssociationEndANameChanged(const QString &name);
@@ -170,7 +170,7 @@ private slots:
void onAssociationEndANavigableChanged(bool navigable);
- void onAssociationEndAKindChanged(int kind_index);
+ void onAssociationEndAKindChanged(int kindIndex);
void onAssociationEndBNameChanged(const QString &name);
@@ -178,53 +178,53 @@ private slots:
void onAssociationEndBNavigableChanged(bool navigable);
- void onAssociationEndBKindChanged(int kind_index);
+ void onAssociationEndBKindChanged(int kindIndex);
- void onAutoSizedChanged(bool auto_sized);
+ void onAutoSizedChanged(bool autoSized);
- void onVisualPrimaryRoleChanged(int visual_role_index);
+ void onVisualPrimaryRoleChanged(int visualRoleIndex);
- void onVisualSecondaryRoleChanged(int visual_role_index);
+ void onVisualSecondaryRoleChanged(int visualRoleIndex);
- void onVisualEmphasizedChanged(bool visual_emphasized);
+ void onVisualEmphasizedChanged(bool visualEmphasized);
- void onStereotypeDisplayChanged(int stereotype_display_index);
+ void onStereotypeDisplayChanged(int stereotypeDisplayIndex);
- void onTemplateDisplayChanged(int template_display_index);
+ void onTemplateDisplayChanged(int templateDisplayIndex);
- void onShowAllMembersChanged(bool show_all_members);
+ void onShowAllMembersChanged(bool showAllMembers);
- void onPlainShapeChanged(bool plain_shape);
+ void onPlainShapeChanged(bool plainShape);
void onItemShapeChanged(const QString &shape);
- void onAutoWidthChanged(bool auto_widthed);
+ void onAutoWidthChanged(bool autoWidthed);
- void onAnnotationVisualRoleChanged(int visual_role_index);
+ void onAnnotationVisualRoleChanged(int visualRoleIndex);
private:
void prepare();
template<class T, class V>
- void setTitle(const QList<V *> &elements, const QString &singular_title, const QString &plural_title);
+ void setTitle(const QList<V *> &elements, const QString &singularTitle, const QString &pluralTitle);
template<class T, class V>
- void setTitle(const MItem *item, const QList<V *> &elements, const QString &singular_title, const QString &plural_title);
+ void setTitle(const MItem *item, const QList<V *> &elements, const QString &singularTitle, const QString &pluralTitle);
- void setStereotypeIconElement(StereotypeIcon::Element stereotype_element);
+ void setStereotypeIconElement(StereotypeIcon::Element stereotypeElement);
- void setStyleElementType(StyleEngine::ElementType element_type);
+ void setStyleElementType(StyleEngine::ElementType elementType);
- void setPrimaryRolePalette(StyleEngine::ElementType element_type, DObject::VisualPrimaryRole visual_primary_role, const QColor &base_color);
+ void setPrimaryRolePalette(StyleEngine::ElementType elementType, DObject::VisualPrimaryRole visualPrimaryRole, const QColor &baseColor);
- void setEndAName(const QString &end_a_name);
+ void setEndAName(const QString &endAName);
- void setEndBName(const QString &end_b_name);
+ void setEndBName(const QString &endBName);
- QList<QString> splitTemplateParameters(const QString &template_parameters);
+ QList<QString> splitTemplateParameters(const QString &templateParameters);
- QString formatTemplateParameters(const QList<QString> &template_parameters_list);
+ QString formatTemplateParameters(const QList<QString> &templateParametersList);
enum SelectionType {
SELECTION_SINGLE,
@@ -235,19 +235,19 @@ private:
QList<T *> filter(const QList<V *> &elements);
template<class T, class V, class BASE>
- bool haveSameValue(const QList<BASE *> &base_elements, V (T::*getter)() const, V *value);
+ bool haveSameValue(const QList<BASE *> &baseElements, V (T::*getter)() const, V *value);
template<class T, class V, class BASE>
- void assignModelElement(const QList<BASE *> &base_elements, SelectionType selection_type, const V &value, V (T::*getter)() const, void (T::*setter)(const V &));
+ void assignModelElement(const QList<BASE *> &baseElements, SelectionType selectionType, const V &value, V (T::*getter)() const, void (T::*setter)(const V &));
template<class T, class V, class BASE>
- void assignModelElement(const QList<BASE *> &base_elements, SelectionType selection_type, const V &value, V (T::*getter)() const, void (T::*setter)(V));
+ void assignModelElement(const QList<BASE *> &baseElements, SelectionType selectionType, const V &value, V (T::*getter)() const, void (T::*setter)(V));
template<class T, class E, class V, class BASE>
- void assignEmbeddedModelElement(const QList<BASE *> &base_elements, SelectionType selection_type, const V &value, E (T::*getter)() const, void (T::*setter)(const E &), V (E::*v_getter)() const, void (E::*v_setter)(const V &));
+ void assignEmbeddedModelElement(const QList<BASE *> &baseElements, SelectionType selectionType, const V &value, E (T::*getter)() const, void (T::*setter)(const E &), V (E::*vGetter)() const, void (E::*vSetter)(const V &));
template<class T, class E, class V, class BASE>
- void assignEmbeddedModelElement(const QList<BASE *> &base_elements, SelectionType selection_type, const V &value, E (T::*getter)() const, void (T::*setter)(const E &), V (E::*v_getter)() const, void (E::*v_setter)(V));
+ void assignEmbeddedModelElement(const QList<BASE *> &baseElements, SelectionType selectionType, const V &value, E (T::*getter)() const, void (T::*setter)(const E &), V (E::*vGetter)() const, void (E::*vSetter)(V));
private:
PropertiesView *m_propertiesView;
diff --git a/src/libs/3rdparty/modeling/qmt/project/project.cpp b/src/libs/3rdparty/modeling/qmt/project/project.cpp
index c021126813b8f7e24d3b8fcbb0ca4790cdaba4e8..ce51a993a5f80e9bab295dfc141a84662c373eaf 100644
--- a/src/libs/3rdparty/modeling/qmt/project/project.cpp
+++ b/src/libs/3rdparty/modeling/qmt/project/project.cpp
@@ -51,14 +51,14 @@ bool Project::hasFileName() const
return !m_fileName.isEmpty();
}
-void Project::setFileName(const QString &file_name)
+void Project::setFileName(const QString &fileName)
{
- m_fileName = file_name;
+ m_fileName = fileName;
}
-void Project::setRootPackage(MPackage *root_package)
+void Project::setRootPackage(MPackage *rootPackage)
{
- m_rootPackage = root_package;
+ m_rootPackage = rootPackage;
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/project/project.h b/src/libs/3rdparty/modeling/qmt/project/project.h
index 6a8399f558e5a7e04cbaba4a19189f185264b865..efdf8b510fa49cc6000dd1c747a20e762e499af9 100644
--- a/src/libs/3rdparty/modeling/qmt/project/project.h
+++ b/src/libs/3rdparty/modeling/qmt/project/project.h
@@ -56,11 +56,11 @@ public:
QString getFileName() const { return m_fileName; }
- void setFileName(const QString &file_name);
+ void setFileName(const QString &fileName);
MPackage *getRootPackage() const { return m_rootPackage; }
- void setRootPackage(MPackage *root_package);
+ void setRootPackage(MPackage *rootPackage);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.cpp b/src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.cpp
index f315d5a7fe7e21d72c4824bbfc84e654f22e24ca..6887925fb247123b759312d08d2a5660aed1d2a9 100644
--- a/src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.cpp
+++ b/src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.cpp
@@ -60,22 +60,22 @@ ProjectController::~ProjectController()
{
}
-void ProjectController::newProject(const QString &file_name)
+void ProjectController::newProject(const QString &fileName)
{
m_project.reset(new Project());
- MPackage *root_package = new MPackage();
- root_package->setName(tr("Model"));
- m_project->setRootPackage(root_package);
- m_project->setFileName(file_name);
+ MPackage *rootPackage = new MPackage();
+ rootPackage->setName(tr("Model"));
+ m_project->setRootPackage(rootPackage);
+ m_project->setFileName(fileName);
m_isModified = false;
emit fileNameChanged(m_project->getFileName());
emit changed();
}
-void ProjectController::setFileName(const QString &file_name)
+void ProjectController::setFileName(const QString &fileName)
{
- if (file_name != m_project->getFileName()) {
- m_project->setFileName(file_name);
+ if (fileName != m_project->getFileName()) {
+ m_project->setFileName(fileName);
setModified();
emit fileNameChanged(m_project->getFileName());
}
@@ -114,9 +114,9 @@ void ProjectController::save()
emit changed();
}
-void ProjectController::saveAs(const QString &file_name)
+void ProjectController::saveAs(const QString &fileName)
{
- setFileName(file_name);
+ setFileName(fileName);
save();
}
diff --git a/src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.h b/src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.h
index 7d3d609aace01d97251fc4d04b4683c0eb3abb06..aa41c965fe9c4b776da969409beeaffa51a70a16 100644
--- a/src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.h
+++ b/src/libs/3rdparty/modeling/qmt/project_controller/projectcontroller.h
@@ -72,7 +72,7 @@ signals:
void changed();
- void fileNameChanged(const QString &file_name);
+ void fileNameChanged(const QString &fileName);
public:
@@ -82,9 +82,9 @@ public:
public slots:
- void newProject(const QString &file_name);
+ void newProject(const QString &fileName);
- void setFileName(const QString &file_name);
+ void setFileName(const QString &fileName);
void setModified();
@@ -92,7 +92,7 @@ public slots:
void save();
- void saveAs(const QString &file_name);
+ void saveAs(const QString &fileName);
private:
QScopedPointer<Project> m_project;
diff --git a/src/libs/3rdparty/modeling/qmt/serializer/diagramserializer.cpp b/src/libs/3rdparty/modeling/qmt/serializer/diagramserializer.cpp
index bf0b684add8e1aa022c3441aac73765895ded922..1345d8806f4908399892a7ad8235db62bb6d948f 100644
--- a/src/libs/3rdparty/modeling/qmt/serializer/diagramserializer.cpp
+++ b/src/libs/3rdparty/modeling/qmt/serializer/diagramserializer.cpp
@@ -81,33 +81,33 @@ QARK_ACCESS_SPECIALIZE(QXmlInArchive, QXmlOutArchive, DElement)
// functions for backward compatibility to old visual role
static DObject::VisualPrimaryRole getVisualRole(const DObject &object)
{
- DObject::VisualPrimaryRole visual_role = object.getVisualPrimaryRole();
- if (visual_role == DObject::DEPRECATED_PRIMARY_ROLE_DARKER
- || visual_role == DObject::DEPRECATED_PRIMARY_ROLE_LIGHTER
- || visual_role == DObject::DEPRECATED_PRIMARY_ROLE_OUTLINE
- || visual_role == DObject::DEPRECATED_PRIMARY_ROLE_SOFTEN) {
+ DObject::VisualPrimaryRole visualRole = object.getVisualPrimaryRole();
+ if (visualRole == DObject::DEPRECATED_PRIMARY_ROLE_DARKER
+ || visualRole == DObject::DEPRECATED_PRIMARY_ROLE_LIGHTER
+ || visualRole == DObject::DEPRECATED_PRIMARY_ROLE_OUTLINE
+ || visualRole == DObject::DEPRECATED_PRIMARY_ROLE_SOFTEN) {
QMT_CHECK(false);
- visual_role = DObject::PRIMARY_ROLE_NORMAL;
+ visualRole = DObject::PRIMARY_ROLE_NORMAL;
}
- return visual_role;
+ return visualRole;
}
-static void setVisualRole(DObject &object, DObject::VisualPrimaryRole visual_role)
+static void setVisualRole(DObject &object, DObject::VisualPrimaryRole visualRole)
{
- if (visual_role == DObject::DEPRECATED_PRIMARY_ROLE_DARKER) {
+ if (visualRole == DObject::DEPRECATED_PRIMARY_ROLE_DARKER) {
object.setVisualPrimaryRole(DObject::PRIMARY_ROLE_NORMAL);
object.setVisualSecondaryRole(DObject::SECONDARY_ROLE_DARKER);
- } else if (visual_role == DObject::DEPRECATED_PRIMARY_ROLE_LIGHTER) {
+ } else if (visualRole == DObject::DEPRECATED_PRIMARY_ROLE_LIGHTER) {
object.setVisualPrimaryRole(DObject::PRIMARY_ROLE_NORMAL);
object.setVisualSecondaryRole(DObject::SECONDARY_ROLE_LIGHTER);
- } else if (visual_role == DObject::DEPRECATED_PRIMARY_ROLE_OUTLINE) {
+ } else if (visualRole == DObject::DEPRECATED_PRIMARY_ROLE_OUTLINE) {
object.setVisualPrimaryRole(DObject::PRIMARY_ROLE_NORMAL);
object.setVisualSecondaryRole(DObject::SECONDARY_ROLE_OUTLINE);
- } else if (visual_role == DObject::DEPRECATED_PRIMARY_ROLE_SOFTEN) {
+ } else if (visualRole == DObject::DEPRECATED_PRIMARY_ROLE_SOFTEN) {
object.setVisualPrimaryRole(DObject::PRIMARY_ROLE_NORMAL);
object.setVisualSecondaryRole(DObject::SECONDARY_ROLE_SOFTEN);
} else {
- object.setVisualPrimaryRole(visual_role);
+ object.setVisualPrimaryRole(visualRole);
}
}
@@ -319,13 +319,13 @@ QARK_REGISTER_TYPE_NAME(DAssociationEnd, "DAssociationEnd")
QARK_ACCESS_SERIALIZE(DAssociationEnd)
template<class Archive>
-inline void Access<Archive, DAssociationEnd>::serialize(Archive &archive, DAssociationEnd &association_end)
+inline void Access<Archive, DAssociationEnd>::serialize(Archive &archive, DAssociationEnd &associationEnd)
{
- archive || tag(association_end)
- || attr(QStringLiteral("name"), association_end, &DAssociationEnd::getName, &DAssociationEnd::setName)
- || attr(QStringLiteral("cradinality"), association_end, &DAssociationEnd::getCardinality, &DAssociationEnd::setCardinatlity)
- || attr(QStringLiteral("navigable"), association_end, &DAssociationEnd::isNavigable, &DAssociationEnd::setNavigable)
- || attr(QStringLiteral("kind"), association_end, &DAssociationEnd::getKind, &DAssociationEnd::setKind)
+ archive || tag(associationEnd)
+ || attr(QStringLiteral("name"), associationEnd, &DAssociationEnd::getName, &DAssociationEnd::setName)
+ || attr(QStringLiteral("cradinality"), associationEnd, &DAssociationEnd::getCardinality, &DAssociationEnd::setCardinatlity)
+ || attr(QStringLiteral("navigable"), associationEnd, &DAssociationEnd::isNavigable, &DAssociationEnd::setNavigable)
+ || attr(QStringLiteral("kind"), associationEnd, &DAssociationEnd::getKind, &DAssociationEnd::setKind)
|| end;
}
diff --git a/src/libs/3rdparty/modeling/qmt/serializer/modelserializer.cpp b/src/libs/3rdparty/modeling/qmt/serializer/modelserializer.cpp
index e1a697d7fe18abab2b398bc71cb44d856e342a9d..6e0c866eba76f0feb339c57475d3286bace505cb 100644
--- a/src/libs/3rdparty/modeling/qmt/serializer/modelserializer.cpp
+++ b/src/libs/3rdparty/modeling/qmt/serializer/modelserializer.cpp
@@ -83,12 +83,12 @@ QARK_REGISTER_DERIVED_CLASS(QXmlInArchive, QXmlOutArchive, MSourceExpansion, MEx
QARK_ACCESS_SERIALIZE(MSourceExpansion)
template<class Archive>
-inline void Access<Archive, MSourceExpansion>::serialize(Archive &archive, MSourceExpansion &source_expansion)
+inline void Access<Archive, MSourceExpansion>::serialize(Archive &archive, MSourceExpansion &sourceExpansion)
{
- archive || tag(source_expansion)
- || base<MExpansion>(source_expansion)
- || attr(QStringLiteral("source"), source_expansion, &MSourceExpansion::getSourceId, &MSourceExpansion::setSourceId)
- || attr(QStringLiteral("transient"), source_expansion, &MSourceExpansion::isTransient, &MSourceExpansion::setTransient)
+ archive || tag(sourceExpansion)
+ || base<MExpansion>(sourceExpansion)
+ || attr(QStringLiteral("source"), sourceExpansion, &MSourceExpansion::getSourceId, &MSourceExpansion::setSourceId)
+ || attr(QStringLiteral("transient"), sourceExpansion, &MSourceExpansion::isTransient, &MSourceExpansion::setTransient)
|| end;
}
@@ -336,13 +336,13 @@ QARK_REGISTER_TYPE_NAME(MAssociationEnd, "MAssociationEnd")
QARK_ACCESS_SERIALIZE(MAssociationEnd)
template<class Archive>
-inline void Access<Archive, MAssociationEnd>::serialize(Archive &archive, MAssociationEnd &association_end)
+inline void Access<Archive, MAssociationEnd>::serialize(Archive &archive, MAssociationEnd &associationEnd)
{
- archive || tag(association_end)
- || attr(QStringLiteral("name"), association_end, &MAssociationEnd::getName, &MAssociationEnd::setName)
- || attr(QStringLiteral("cardinality"), association_end, &MAssociationEnd::getCardinality, &MAssociationEnd::setCardinality)
- || attr(QStringLiteral("navigable"), association_end, &MAssociationEnd::isNavigable, &MAssociationEnd::setNavigable)
- || attr(QStringLiteral("kind"), association_end, &MAssociationEnd::getKind, &MAssociationEnd::setKind)
+ archive || tag(associationEnd)
+ || attr(QStringLiteral("name"), associationEnd, &MAssociationEnd::getName, &MAssociationEnd::setName)
+ || attr(QStringLiteral("cardinality"), associationEnd, &MAssociationEnd::getCardinality, &MAssociationEnd::setCardinality)
+ || attr(QStringLiteral("navigable"), associationEnd, &MAssociationEnd::isNavigable, &MAssociationEnd::setNavigable)
+ || attr(QStringLiteral("kind"), associationEnd, &MAssociationEnd::getKind, &MAssociationEnd::setKind)
|| end;
}
diff --git a/src/libs/3rdparty/modeling/qmt/serializer/projectserializer.cpp b/src/libs/3rdparty/modeling/qmt/serializer/projectserializer.cpp
index 05e06337484f8d34507d3187881e5e915847f727..e5dbaf4da38116ff45b7890923c5b1e060500b7b 100644
--- a/src/libs/3rdparty/modeling/qmt/serializer/projectserializer.cpp
+++ b/src/libs/3rdparty/modeling/qmt/serializer/projectserializer.cpp
@@ -79,26 +79,26 @@ ProjectSerializer::~ProjectSerializer()
{
}
-void ProjectSerializer::save(const QString &file_name, const Project *project)
+void ProjectSerializer::save(const QString &fileName, const Project *project)
{
QMT_CHECK(project);
- QFile file(file_name);
+ QFile file(fileName);
if (!file.open(QIODevice::WriteOnly)) {
- throw FileCreationException(file_name);
+ throw FileCreationException(fileName);
}
- QIODevice *xml_device = &file;
+ QIODevice *xmlDevice = &file;
#ifdef USE_COMPRESSED_FILES
qmt::QCompressedDevice compressor(&file);
if (!compressor.open(QIODevice::WriteOnly)) {
throw IOException("Unable to create compressed file");
}
- xml_device = &compressor;
+ xmlDevice = &compressor;
#endif
- QXmlStreamWriter writer(xml_device);
+ QXmlStreamWriter writer(xmlDevice);
write(&writer, project);
#ifdef USE_COMPRESSED_FILES
@@ -117,26 +117,26 @@ QByteArray ProjectSerializer::save(const Project *project)
return buffer;
}
-void ProjectSerializer::load(const QString &file_name, Project *project)
+void ProjectSerializer::load(const QString &fileName, Project *project)
{
QMT_CHECK(project);
- QFile file(file_name);
+ QFile file(fileName);
if (!file.open(QIODevice::ReadOnly)) {
- throw FileNotFoundException(file_name);
+ throw FileNotFoundException(fileName);
}
- QIODevice *xml_device = &file;
+ QIODevice *xmlDevice = &file;
#ifdef USE_COMPRESSED_FILES
qmt::QCompressedDevice uncompressor(&file);
if (!uncompressor.open(QIODevice::ReadOnly)) {
throw IOException("Unable to access compressed file");
}
- xml_device = &uncompressor;
+ xmlDevice = &uncompressor;
#endif
- QXmlStreamReader reader(xml_device);
+ QXmlStreamReader reader(xmlDevice);
try {
qark::QXmlInArchive archive(reader);
@@ -146,9 +146,9 @@ void ProjectSerializer::load(const QString &file_name, Project *project)
archive >> qark::end;
archive.endDocument();
} catch (const qark::QXmlInArchive::FileFormatException &) {
- throw FileIOException(QStringLiteral("illegal file format"), file_name);
+ throw FileIOException(QStringLiteral("illegal file format"), fileName);
} catch (...) {
- throw FileIOException(QStringLiteral("serialization error"), file_name);
+ throw FileIOException(QStringLiteral("serialization error"), fileName);
}
#ifdef USE_COMPRESSED_FILES
diff --git a/src/libs/3rdparty/modeling/qmt/serializer/projectserializer.h b/src/libs/3rdparty/modeling/qmt/serializer/projectserializer.h
index 065f73cc4dd27334a5ae448a28aac17d3dfb3378..6f014393e80160562cd236e78a8391ac1d2ae7e6 100644
--- a/src/libs/3rdparty/modeling/qmt/serializer/projectserializer.h
+++ b/src/libs/3rdparty/modeling/qmt/serializer/projectserializer.h
@@ -55,11 +55,11 @@ public:
public:
- void save(const QString &file_name, const Project *project);
+ void save(const QString &fileName, const Project *project);
QByteArray save(const Project *project);
- void load(const QString &file_name, Project *project);
+ void load(const QString &fileName, Project *project);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.cpp b/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.cpp
index 646a369ebd66c04351557120e7b1f39a797a2e2f..a4270999516a5e007897a2a8208b906e96b14116 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.cpp
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.cpp
@@ -82,15 +82,15 @@ struct IconShape::IconShapePrivate {
PathShape *IconShape::IconShapePrivate::getActivePath()
{
- PathShape *path_shape = 0;
+ PathShape *pathShape = 0;
if (m_shapes.count() > 0) {
- path_shape = dynamic_cast<PathShape *>(m_shapes.last());
+ pathShape = dynamic_cast<PathShape *>(m_shapes.last());
}
- if (path_shape == 0) {
- path_shape = new PathShape();
- m_shapes.append(path_shape);
+ if (pathShape == 0) {
+ pathShape = new PathShape();
+ m_shapes.append(pathShape);
}
- return path_shape;
+ return pathShape;
}
@@ -142,9 +142,9 @@ void IconShape::addEllipse(const ShapePointF ¢er, const ShapeSizeF &radius)
d->m_shapes.append(new EllipseShape(center, radius));
}
-void IconShape::addArc(const ShapePointF ¢er, const ShapeSizeF &radius, qreal start_angle, qreal span_angle)
+void IconShape::addArc(const ShapePointF ¢er, const ShapeSizeF &radius, qreal startAngle, qreal spanAngle)
{
- d->m_shapes.append(new ArcShape(center, radius, start_angle, span_angle));
+ d->m_shapes.append(new ArcShape(center, radius, startAngle, spanAngle));
}
void IconShape::moveTo(const ShapePointF &pos)
@@ -162,9 +162,9 @@ void IconShape::arcMoveTo(const ShapePointF ¢er, const ShapeSizeF &radius, q
d->getActivePath()->arcMoveTo(center, radius, angle);
}
-void IconShape::arcTo(const ShapePointF ¢er, const ShapeSizeF &radius, qreal start_angle, qreal sweep_length)
+void IconShape::arcTo(const ShapePointF ¢er, const ShapeSizeF &radius, qreal startAngle, qreal sweepLength)
{
- d->getActivePath()->arcTo(center, radius, start_angle, sweep_length);
+ d->getActivePath()->arcTo(center, radius, startAngle, sweepLength);
}
void IconShape::closePath()
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.h b/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.h
index 8ac0aebd1ed1df0ec680698adbae5ab6422dbced..387708b553876a4f1f79a5e7a33f58ebfbcbca4f 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.h
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/iconshape.h
@@ -76,7 +76,7 @@ public:
void addEllipse(const ShapePointF ¢er, const ShapeSizeF &radius);
- void addArc(const ShapePointF ¢er, const ShapeSizeF &radius, qreal start_angle, qreal span_angle);
+ void addArc(const ShapePointF ¢er, const ShapeSizeF &radius, qreal startAngle, qreal spanAngle);
void moveTo(const ShapePointF &pos);
@@ -84,7 +84,7 @@ public:
void arcMoveTo(const ShapePointF ¢er, const ShapeSizeF &radius, qreal angle);
- void arcTo(const ShapePointF ¢er, const ShapeSizeF &radius, qreal start_angle, qreal sweep_length);
+ void arcTo(const ShapePointF ¢er, const ShapeSizeF &radius, qreal startAngle, qreal sweepLength);
void closePath();
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapepaintvisitor.cpp b/src/libs/3rdparty/modeling/qmt/stereotype/shapepaintvisitor.cpp
index 3fa1082d8aa48565239c3510a203dc3dd08e1889..0782f5239937f156927b4533fb04b9cf86de9792 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/shapepaintvisitor.cpp
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/shapepaintvisitor.cpp
@@ -34,82 +34,82 @@
namespace qmt {
-ShapePaintVisitor::ShapePaintVisitor(QPainter *painter, const QPointF &scaled_origin, const QSizeF &original_size, const QSizeF &base_size, const QSizeF &size)
+ShapePaintVisitor::ShapePaintVisitor(QPainter *painter, const QPointF &scaledOrigin, const QSizeF &originalSize, const QSizeF &baseSize, const QSizeF &size)
: m_painter(painter),
- m_scaledOrigin(scaled_origin),
- m_originalSize(original_size),
- m_baseSize(base_size),
+ m_scaledOrigin(scaledOrigin),
+ m_originalSize(originalSize),
+ m_baseSize(baseSize),
m_size(size)
{
}
-void ShapePaintVisitor::visitLine(const LineShape *shape_line)
+void ShapePaintVisitor::visitLine(const LineShape *shapeLine)
{
- QPointF p1 = shape_line->getPos1().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size);
- QPointF p2 = shape_line->getPos2().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size);
+ QPointF p1 = shapeLine->getPos1().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size);
+ QPointF p2 = shapeLine->getPos2().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size);
m_painter->save();
m_painter->setRenderHint(QPainter::Antialiasing, p1.x() != p2.x() && p1.y() != p2.y());
m_painter->drawLine(p1, p2);
m_painter->restore();
}
-void ShapePaintVisitor::visitRect(const RectShape *shape_rect)
+void ShapePaintVisitor::visitRect(const RectShape *shapeRect)
{
m_painter->save();
m_painter->setRenderHint(QPainter::Antialiasing, false);
- m_painter->drawRect(QRectF(shape_rect->getPos().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size),
- shape_rect->getSize().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size)));
+ m_painter->drawRect(QRectF(shapeRect->getPos().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size),
+ shapeRect->getSize().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size)));
m_painter->restore();
}
-void ShapePaintVisitor::visitRoundedRect(const RoundedRectShape *shape_rounded_rect)
+void ShapePaintVisitor::visitRoundedRect(const RoundedRectShape *shapeRoundedRect)
{
- qreal radius_x = shape_rounded_rect->getRadius().mapScaledTo(0, m_originalSize.width(), m_baseSize.width(), m_size.width());
- qreal radius_y = shape_rounded_rect->getRadius().mapScaledTo(0, m_originalSize.height(), m_baseSize.height(), m_size.height());
+ qreal radiusX = shapeRoundedRect->getRadius().mapScaledTo(0, m_originalSize.width(), m_baseSize.width(), m_size.width());
+ qreal radiusY = shapeRoundedRect->getRadius().mapScaledTo(0, m_originalSize.height(), m_baseSize.height(), m_size.height());
m_painter->save();
m_painter->setRenderHint(QPainter::Antialiasing, true);
- m_painter->drawRoundedRect(QRectF(shape_rounded_rect->getPos().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size),
- shape_rounded_rect->getSize().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size)),
- radius_x, radius_y);
+ m_painter->drawRoundedRect(QRectF(shapeRoundedRect->getPos().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size),
+ shapeRoundedRect->getSize().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size)),
+ radiusX, radiusY);
m_painter->restore();
}
-void ShapePaintVisitor::visitCircle(const CircleShape *shape_circle)
+void ShapePaintVisitor::visitCircle(const CircleShape *shapeCircle)
{
m_painter->save();
m_painter->setRenderHint(QPainter::Antialiasing, true);
- m_painter->drawEllipse(shape_circle->getCenter().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size),
- shape_circle->getRadius().mapScaledTo(m_scaledOrigin.x(), m_originalSize.width(), m_baseSize.width(), m_size.width()),
- shape_circle->getRadius().mapScaledTo(m_scaledOrigin.y(), m_originalSize.height(), m_baseSize.height(), m_size.height()));
+ m_painter->drawEllipse(shapeCircle->getCenter().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size),
+ shapeCircle->getRadius().mapScaledTo(m_scaledOrigin.x(), m_originalSize.width(), m_baseSize.width(), m_size.width()),
+ shapeCircle->getRadius().mapScaledTo(m_scaledOrigin.y(), m_originalSize.height(), m_baseSize.height(), m_size.height()));
m_painter->restore();
}
-void ShapePaintVisitor::visitEllipse(const EllipseShape *shape_ellipse)
+void ShapePaintVisitor::visitEllipse(const EllipseShape *shapeEllipse)
{
- QSizeF radius = shape_ellipse->getRadius().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size);
+ QSizeF radius = shapeEllipse->getRadius().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size);
m_painter->save();
m_painter->setRenderHint(QPainter::Antialiasing, true);
- m_painter->drawEllipse(shape_ellipse->getCenter().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size),
+ m_painter->drawEllipse(shapeEllipse->getCenter().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size),
radius.width(), radius.height());
m_painter->restore();
}
-void ShapePaintVisitor::visitArc(const ArcShape *shape_arc)
+void ShapePaintVisitor::visitArc(const ArcShape *shapeArc)
{
- QSizeF radius = shape_arc->getRadius().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size);
+ QSizeF radius = shapeArc->getRadius().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size);
m_painter->save();
m_painter->setRenderHint(QPainter::Antialiasing, true);
- m_painter->drawArc(QRectF(shape_arc->getCenter().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size) - QPointF(radius.width(), radius.height()), radius * 2.0),
- shape_arc->getStartAngle() * 16, shape_arc->getSpanAngle() * 16);
+ m_painter->drawArc(QRectF(shapeArc->getCenter().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size) - QPointF(radius.width(), radius.height()), radius * 2.0),
+ shapeArc->getStartAngle() * 16, shapeArc->getSpanAngle() * 16);
m_painter->restore();
}
-void ShapePaintVisitor::visitPath(const PathShape *shape_path)
+void ShapePaintVisitor::visitPath(const PathShape *shapePath)
{
m_painter->save();
m_painter->setRenderHint(QPainter::Antialiasing, true);
QPainterPath path;
- foreach (const PathShape::Element &element, shape_path->getElements()) {
+ foreach (const PathShape::Element &element, shapePath->getElements()) {
switch (element.m_elementType) {
case PathShape::TYPE_NONE:
// nothing to do
@@ -146,56 +146,56 @@ void ShapePaintVisitor::visitPath(const PathShape *shape_path)
}
-ShapeSizeVisitor::ShapeSizeVisitor(const QPointF &scaled_origin, const QSizeF &original_size, const QSizeF &base_size, const QSizeF &size)
- : m_scaledOrigin(scaled_origin),
- m_originalSize(original_size),
- m_baseSize(base_size),
+ShapeSizeVisitor::ShapeSizeVisitor(const QPointF &scaledOrigin, const QSizeF &originalSize, const QSizeF &baseSize, const QSizeF &size)
+ : m_scaledOrigin(scaledOrigin),
+ m_originalSize(originalSize),
+ m_baseSize(baseSize),
m_size(size)
{
}
-void ShapeSizeVisitor::visitLine(const LineShape *shape_line)
+void ShapeSizeVisitor::visitLine(const LineShape *shapeLine)
{
- m_boundingRect |= QRectF(shape_line->getPos1().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size),
- shape_line->getPos2().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size));
+ m_boundingRect |= QRectF(shapeLine->getPos1().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size),
+ shapeLine->getPos2().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size));
}
-void ShapeSizeVisitor::visitRect(const RectShape *shape_rect)
+void ShapeSizeVisitor::visitRect(const RectShape *shapeRect)
{
- m_boundingRect |= QRectF(shape_rect->getPos().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size),
- shape_rect->getSize().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size));
+ m_boundingRect |= QRectF(shapeRect->getPos().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size),
+ shapeRect->getSize().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size));
}
-void ShapeSizeVisitor::visitRoundedRect(const RoundedRectShape *shape_rounded_rect)
+void ShapeSizeVisitor::visitRoundedRect(const RoundedRectShape *shapeRoundedRect)
{
- m_boundingRect |= QRectF(shape_rounded_rect->getPos().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size),
- shape_rounded_rect->getSize().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size));
+ m_boundingRect |= QRectF(shapeRoundedRect->getPos().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size),
+ shapeRoundedRect->getSize().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size));
}
-void ShapeSizeVisitor::visitCircle(const CircleShape *shape_circle)
+void ShapeSizeVisitor::visitCircle(const CircleShape *shapeCircle)
{
- QSizeF radius = QSizeF(shape_circle->getRadius().mapScaledTo(m_scaledOrigin.x(), m_originalSize.width(), m_baseSize.width(), m_size.width()),
- shape_circle->getRadius().mapScaledTo(m_scaledOrigin.y(), m_originalSize.height(), m_baseSize.height(), m_size.height()));
- m_boundingRect |= QRectF(shape_circle->getCenter().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size) - QPointF(radius.width(), radius.height()), radius * 2.0);
+ QSizeF radius = QSizeF(shapeCircle->getRadius().mapScaledTo(m_scaledOrigin.x(), m_originalSize.width(), m_baseSize.width(), m_size.width()),
+ shapeCircle->getRadius().mapScaledTo(m_scaledOrigin.y(), m_originalSize.height(), m_baseSize.height(), m_size.height()));
+ m_boundingRect |= QRectF(shapeCircle->getCenter().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size) - QPointF(radius.width(), radius.height()), radius * 2.0);
}
-void ShapeSizeVisitor::visitEllipse(const EllipseShape *shape_ellipse)
+void ShapeSizeVisitor::visitEllipse(const EllipseShape *shapeEllipse)
{
- QSizeF radius = shape_ellipse->getRadius().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size);
- m_boundingRect |= QRectF(shape_ellipse->getCenter().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size) - QPointF(radius.width(), radius.height()), radius * 2.0);
+ QSizeF radius = shapeEllipse->getRadius().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size);
+ m_boundingRect |= QRectF(shapeEllipse->getCenter().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size) - QPointF(radius.width(), radius.height()), radius * 2.0);
}
-void ShapeSizeVisitor::visitArc(const ArcShape *shape_arc)
+void ShapeSizeVisitor::visitArc(const ArcShape *shapeArc)
{
// TODO this is the max bound rect; not the minimal one
- QSizeF radius = shape_arc->getRadius().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size);
- m_boundingRect |= QRectF(shape_arc->getCenter().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size) - QPointF(radius.width(), radius.height()), radius * 2.0);
+ QSizeF radius = shapeArc->getRadius().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size);
+ m_boundingRect |= QRectF(shapeArc->getCenter().mapScaledTo(m_scaledOrigin, m_originalSize, m_baseSize, m_size) - QPointF(radius.width(), radius.height()), radius * 2.0);
}
-void ShapeSizeVisitor::visitPath(const PathShape *shape_path)
+void ShapeSizeVisitor::visitPath(const PathShape *shapePath)
{
QPainterPath path;
- foreach (const PathShape::Element &element, shape_path->getElements()) {
+ foreach (const PathShape::Element &element, shapePath->getElements()) {
switch (element.m_elementType) {
case PathShape::TYPE_NONE:
// nothing to do
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapepaintvisitor.h b/src/libs/3rdparty/modeling/qmt/stereotype/shapepaintvisitor.h
index ca2fb4d0e543a41dadb1c9e0cd8c973d5a598de2..dd7afe23b3c3079e8c82c4adfb98d478bc3a2b86 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/shapepaintvisitor.h
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/shapepaintvisitor.h
@@ -45,24 +45,24 @@ class QMT_EXPORT ShapePaintVisitor
: public ShapeConstVisitor {
public:
- ShapePaintVisitor(QPainter *painter, const QPointF &scaled_origin, const QSizeF &original_size,
- const QSizeF &base_size, const QSizeF &size);
+ ShapePaintVisitor(QPainter *painter, const QPointF &scaledOrigin, const QSizeF &originalSize,
+ const QSizeF &baseSize, const QSizeF &size);
public:
- void visitLine(const LineShape *shape_line);
+ void visitLine(const LineShape *shapeLine);
- void visitRect(const RectShape *shape_rect);
+ void visitRect(const RectShape *shapeRect);
- void visitRoundedRect(const RoundedRectShape *shape_rounded_rect);
+ void visitRoundedRect(const RoundedRectShape *shapeRoundedRect);
- void visitCircle(const CircleShape *shape_circle);
+ void visitCircle(const CircleShape *shapeCircle);
- void visitEllipse(const EllipseShape *shape_ellipse);
+ void visitEllipse(const EllipseShape *shapeEllipse);
- void visitArc(const ArcShape *shape_arc);
+ void visitArc(const ArcShape *shapeArc);
- void visitPath(const PathShape *shape_path);
+ void visitPath(const PathShape *shapePath);
private:
@@ -83,8 +83,8 @@ class QMT_EXPORT ShapeSizeVisitor
: public ShapeConstVisitor {
public:
- ShapeSizeVisitor(const QPointF &scaled_origin, const QSizeF &original_size,
- const QSizeF &base_size, const QSizeF &size);
+ ShapeSizeVisitor(const QPointF &scaledOrigin, const QSizeF &originalSize,
+ const QSizeF &baseSize, const QSizeF &size);
public:
@@ -92,19 +92,19 @@ public:
public:
- void visitLine(const LineShape *shape_line);
+ void visitLine(const LineShape *shapeLine);
- void visitRect(const RectShape *shape_rect);
+ void visitRect(const RectShape *shapeRect);
- void visitRoundedRect(const RoundedRectShape *shape_rounded_rect);
+ void visitRoundedRect(const RoundedRectShape *shapeRoundedRect);
- void visitCircle(const CircleShape *shape_circle);
+ void visitCircle(const CircleShape *shapeCircle);
- void visitEllipse(const EllipseShape *shape_ellipse);
+ void visitEllipse(const EllipseShape *shapeEllipse);
- void visitArc(const ArcShape *shape_arc);
+ void visitArc(const ArcShape *shapeArc);
- void visitPath(const PathShape *shape_path);
+ void visitPath(const PathShape *shapePath);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapes.cpp b/src/libs/3rdparty/modeling/qmt/stereotype/shapes.cpp
index 1f76f9efa2341912815d888a6f0111173da8509b..c830daf2d8c34612961ac425a9e380e9efca0a96 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/shapes.cpp
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/shapes.cpp
@@ -168,13 +168,13 @@ void PathShape::arcMoveTo(const ShapePointF ¢er, const ShapeSizeF &radius, q
m_elements.append(element);
}
-void PathShape::arcTo(const ShapePointF ¢er, const ShapeSizeF &radius, qreal start_angle, qreal sweep_length)
+void PathShape::arcTo(const ShapePointF ¢er, const ShapeSizeF &radius, qreal startAngle, qreal sweepLength)
{
Element element(TYPE_ARCTO);
element.m_position = center;
element.m_size = radius;
- element.m_angle1 = start_angle;
- element.m_angle2 = sweep_length;
+ element.m_angle1 = startAngle;
+ element.m_angle2 = sweepLength;
m_elements.append(element);
}
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapes.h b/src/libs/3rdparty/modeling/qmt/stereotype/shapes.h
index 72f7851a7129e38a14e5a70a40d68e64e7390149..02406a439294ef2fe94e5184103d4583b3151bdb 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/shapes.h
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/shapes.h
@@ -243,11 +243,11 @@ public:
{
}
- ArcShape(const ShapePointF ¢er, const ShapeSizeF &radius, qreal start_angle, qreal span_angle)
+ ArcShape(const ShapePointF ¢er, const ShapeSizeF &radius, qreal startAngle, qreal spanAngle)
: m_center(center),
m_radius(radius),
- m_startAngle(start_angle),
- m_spanAngle(span_angle)
+ m_startAngle(startAngle),
+ m_spanAngle(spanAngle)
{
}
@@ -336,7 +336,7 @@ public:
void arcMoveTo(const ShapePointF ¢er, const ShapeSizeF &radius, qreal angle);
- void arcTo(const ShapePointF ¢er, const ShapeSizeF &radius, qreal start_angle, qreal sweep_length);
+ void arcTo(const ShapePointF ¢er, const ShapeSizeF &radius, qreal startAngle, qreal sweepLength);
void close();
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.cpp b/src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.cpp
index 0ae42d3e460fd4ddc61ac99e9a634a3a61278754..a8c3ec3862dbb60c9d0a65c95a5d96db0fddb458 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.cpp
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.cpp
@@ -37,12 +37,12 @@ qreal ShapeValueF::mapTo(qreal origin, qreal size) const
return mapScaledTo(origin, size, size, size);
}
-qreal ShapeValueF::mapScaledTo(qreal scaled_origin, qreal original_size, qreal actual_size) const
+qreal ShapeValueF::mapScaledTo(qreal scaledOrigin, qreal originalSize, qreal actualSize) const
{
- return mapScaledTo(scaled_origin, original_size, original_size, actual_size);
+ return mapScaledTo(scaledOrigin, originalSize, originalSize, actualSize);
}
-qreal ShapeValueF::mapScaledTo(qreal scaled_origin, qreal original_size, qreal base_size, qreal actual_size) const
+qreal ShapeValueF::mapScaledTo(qreal scaledOrigin, qreal originalSize, qreal baseSize, qreal actualSize) const
{
qreal v = 0.0;
switch (m_unit) {
@@ -50,27 +50,27 @@ qreal ShapeValueF::mapScaledTo(qreal scaled_origin, qreal original_size, qreal b
v = m_value;
break;
case UNIT_RELATIVE:
- v = original_size != 0 ? (m_value * base_size / original_size) : m_value;
+ v = originalSize != 0 ? (m_value * baseSize / originalSize) : m_value;
break;
case UNIT_SCALED:
- v = original_size != 0 ? (m_value * actual_size / original_size) : m_value;
+ v = originalSize != 0 ? (m_value * actualSize / originalSize) : m_value;
break;
case UNIT_PERCENTAGE:
- v = m_value * actual_size;
+ v = m_value * actualSize;
break;
}
switch (m_origin) {
case ORIGIN_SMART:
- v = scaled_origin + v;
+ v = scaledOrigin + v;
break;
case ORIGIN_TOP_OR_LEFT:
- v = scaled_origin + v;
+ v = scaledOrigin + v;
break;
case ORIGIN_BOTTOM_OR_RIGHT:
- v = actual_size - v;
+ v = actualSize - v;
break;
case ORIGIN_CENTER:
- v = actual_size * 0.5 + v;
+ v = actualSize * 0.5 + v;
break;
}
return v;
@@ -85,17 +85,17 @@ QPointF ShapePointF::mapTo(const QPointF &origin, const QSizeF &size) const
return QPointF(x, y);
}
-QPointF ShapePointF::mapScaledTo(const QPointF &scaled_origin, const QSizeF &original_size, const QSizeF &actual_size) const
+QPointF ShapePointF::mapScaledTo(const QPointF &scaledOrigin, const QSizeF &originalSize, const QSizeF &actualSize) const
{
- qreal x = m_x.mapScaledTo(scaled_origin.x(), original_size.width(), actual_size.width());
- qreal y = m_y.mapScaledTo(scaled_origin.y(), original_size.height(), actual_size.height());
+ qreal x = m_x.mapScaledTo(scaledOrigin.x(), originalSize.width(), actualSize.width());
+ qreal y = m_y.mapScaledTo(scaledOrigin.y(), originalSize.height(), actualSize.height());
return QPointF(x, y);
}
-QPointF ShapePointF::mapScaledTo(const QPointF &scaled_origin, const QSizeF &original_size, const QSizeF &base_size, const QSizeF &actual_size) const
+QPointF ShapePointF::mapScaledTo(const QPointF &scaledOrigin, const QSizeF &originalSize, const QSizeF &baseSize, const QSizeF &actualSize) const
{
- qreal x = m_x.mapScaledTo(scaled_origin.x(), original_size.width(), base_size.width(), actual_size.width());
- qreal y = m_y.mapScaledTo(scaled_origin.y(), original_size.height(), base_size.height(), actual_size.height());
+ qreal x = m_x.mapScaledTo(scaledOrigin.x(), originalSize.width(), baseSize.width(), actualSize.width());
+ qreal y = m_y.mapScaledTo(scaledOrigin.y(), originalSize.height(), baseSize.height(), actualSize.height());
return QPointF(x, y);
}
@@ -106,17 +106,17 @@ QSizeF ShapeSizeF::mapTo(const QPointF &origin, const QSizeF &size) const
return QSizeF(w, h);
}
-QSizeF ShapeSizeF::mapScaledTo(const QPointF &scaled_origin, const QSizeF &original_size, const QSizeF &actual_size) const
+QSizeF ShapeSizeF::mapScaledTo(const QPointF &scaledOrigin, const QSizeF &originalSize, const QSizeF &actualSize) const
{
- qreal w = m_width.mapScaledTo(scaled_origin.x(), original_size.width(), actual_size.width());
- qreal h = m_height.mapScaledTo(scaled_origin.y(), original_size.height(), actual_size.height());
+ qreal w = m_width.mapScaledTo(scaledOrigin.x(), originalSize.width(), actualSize.width());
+ qreal h = m_height.mapScaledTo(scaledOrigin.y(), originalSize.height(), actualSize.height());
return QSizeF(w, h);
}
-QSizeF ShapeSizeF::mapScaledTo(const QPointF &scaled_origin, const QSizeF &original_size, const QSizeF &base_size, const QSizeF &actual_size) const
+QSizeF ShapeSizeF::mapScaledTo(const QPointF &scaledOrigin, const QSizeF &originalSize, const QSizeF &baseSize, const QSizeF &actualSize) const
{
- qreal w = m_width.mapScaledTo(scaled_origin.x(), original_size.width(), base_size.width(), actual_size.width());
- qreal h = m_height.mapScaledTo(scaled_origin.y(), original_size.height(), base_size.height(), actual_size.height());
+ qreal w = m_width.mapScaledTo(scaledOrigin.x(), originalSize.width(), baseSize.width(), actualSize.width());
+ qreal h = m_height.mapScaledTo(scaledOrigin.y(), originalSize.height(), baseSize.height(), actualSize.height());
return QSizeF(w, h);
}
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.h b/src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.h
index c099c20efa52d50d04a556946a779b2aac249f89..85af25e9b1a93f03cc88d6cd0a7278d4621d5f09 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.h
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/shapevalue.h
@@ -95,9 +95,9 @@ public:
qreal mapTo(qreal origin, qreal size) const;
- qreal mapScaledTo(qreal scaled_origin, qreal original_size, qreal actual_size) const;
+ qreal mapScaledTo(qreal scaledOrigin, qreal originalSize, qreal actualSize) const;
- qreal mapScaledTo(qreal scaled_origin, qreal original_size, qreal base_size, qreal actual_size) const;
+ qreal mapScaledTo(qreal scaledOrigin, qreal originalSize, qreal baseSize, qreal actualSize) const;
private:
@@ -136,9 +136,9 @@ public:
QPointF mapTo(const QPointF &origin, const QSizeF &size) const;
- QPointF mapScaledTo(const QPointF &scaled_origin, const QSizeF &original_size, const QSizeF &actual_size) const;
+ QPointF mapScaledTo(const QPointF &scaledOrigin, const QSizeF &originalSize, const QSizeF &actualSize) const;
- QPointF mapScaledTo(const QPointF &scaled_origin, const QSizeF &original_size, const QSizeF &base_size, const QSizeF &actual_size) const;
+ QPointF mapScaledTo(const QPointF &scaledOrigin, const QSizeF &originalSize, const QSizeF &baseSize, const QSizeF &actualSize) const;
private:
@@ -175,9 +175,9 @@ public:
QSizeF mapTo(const QPointF &origin, const QSizeF &size) const;
- QSizeF mapScaledTo(const QPointF &scaled_origin, const QSizeF &original_size, const QSizeF &actual_size) const;
+ QSizeF mapScaledTo(const QPointF &scaledOrigin, const QSizeF &originalSize, const QSizeF &actualSize) const;
- QSizeF mapScaledTo(const QPointF &scaled_origin, const QSizeF &original_size, const QSizeF &base_size, const QSizeF &actual_size) const;
+ QSizeF mapScaledTo(const QPointF &scaledOrigin, const QSizeF &originalSize, const QSizeF &baseSize, const QSizeF &actualSize) const;
private:
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/shapevisitor.h b/src/libs/3rdparty/modeling/qmt/stereotype/shapevisitor.h
index 3af085c7991947adb1173dbb191db9c1728426ab..d75c53aee407c1c291d4ca13d0a27f1b5549c6ea 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/shapevisitor.h
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/shapevisitor.h
@@ -49,19 +49,19 @@ public:
public:
- virtual void visitLine(LineShape *shape_line) = 0;
+ virtual void visitLine(LineShape *shapeLine) = 0;
- virtual void visitRect(RectShape *shape_rect) = 0;
+ virtual void visitRect(RectShape *shapeRect) = 0;
- virtual void visitRoundedRect(RoundedRectShape *shape_rounded_rect) = 0;
+ virtual void visitRoundedRect(RoundedRectShape *shapeRoundedRect) = 0;
- virtual void visitCircle(CircleShape *shape_circle) = 0;
+ virtual void visitCircle(CircleShape *shapeCircle) = 0;
- virtual void visitEllipse(EllipseShape *shape_ellipse) = 0;
+ virtual void visitEllipse(EllipseShape *shapeEllipse) = 0;
- virtual void visitArc(ArcShape *shape_arc) = 0;
+ virtual void visitArc(ArcShape *shapeArc) = 0;
- virtual void visitPath(PathShape *shape_path) = 0;
+ virtual void visitPath(PathShape *shapePath) = 0;
};
@@ -73,19 +73,19 @@ public:
public:
- virtual void visitLine(const LineShape *shape_line) = 0;
+ virtual void visitLine(const LineShape *shapeLine) = 0;
- virtual void visitRect(const RectShape *shape_rect) = 0;
+ virtual void visitRect(const RectShape *shapeRect) = 0;
- virtual void visitRoundedRect(const RoundedRectShape *shape_rounded_rect) = 0;
+ virtual void visitRoundedRect(const RoundedRectShape *shapeRoundedRect) = 0;
- virtual void visitCircle(const CircleShape *shape_circle) = 0;
+ virtual void visitCircle(const CircleShape *shapeCircle) = 0;
- virtual void visitEllipse(const EllipseShape *shape_ellipse) = 0;
+ virtual void visitEllipse(const EllipseShape *shapeEllipse) = 0;
- virtual void visitArc(const ArcShape *shape_arc) = 0;
+ virtual void visitArc(const ArcShape *shapeArc) = 0;
- virtual void visitPath(const PathShape *shape_path) = 0;
+ virtual void visitPath(const PathShape *shapePath) = 0;
};
}
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.cpp b/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.cpp
index 27718a16bca3ec9d01dfb642e8d42eee7cd5f459..9072b087d83051a6c6452071a63d04f68caf0433 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.cpp
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.cpp
@@ -78,11 +78,11 @@ QList<Toolbar> StereotypeController::getToolbars() const
return d->m_toolbars;
}
-QList<QString> StereotypeController::getKnownStereotypes(StereotypeIcon::Element stereotype_element) const
+QList<QString> StereotypeController::getKnownStereotypes(StereotypeIcon::Element stereotypeElement) const
{
QSet<QString> stereotypes;
foreach (const StereotypeIcon &icon, d->m_iconIdToStereotypeIconsMap.values()) {
- if (icon.getElements().isEmpty() || icon.getElements().contains(stereotype_element)) {
+ if (icon.getElements().isEmpty() || icon.getElements().contains(stereotypeElement)) {
stereotypes += icon.getStereotypes();
}
}
@@ -103,92 +103,92 @@ QString StereotypeController::findStereotypeIconId(StereotypeIcon::Element eleme
return QString();
}
-QList<QString> StereotypeController::filterStereotypesByIconId(const QString &stereotype_icon_id, const QList<QString> &stereotypes) const
+QList<QString> StereotypeController::filterStereotypesByIconId(const QString &stereotypeIconId, const QList<QString> &stereotypes) const
{
- if (!d->m_iconIdToStereotypeIconsMap.contains(stereotype_icon_id)) {
+ if (!d->m_iconIdToStereotypeIconsMap.contains(stereotypeIconId)) {
return stereotypes;
}
- QList<QString> filtered_stereotypes = stereotypes;
- foreach (const QString &stereotype, d->m_iconIdToStereotypeIconsMap.value(stereotype_icon_id).getStereotypes()) {
- filtered_stereotypes.removeAll(stereotype);
+ QList<QString> filteredStereotypes = stereotypes;
+ foreach (const QString &stereotype, d->m_iconIdToStereotypeIconsMap.value(stereotypeIconId).getStereotypes()) {
+ filteredStereotypes.removeAll(stereotype);
}
- return filtered_stereotypes;
+ return filteredStereotypes;
}
-StereotypeIcon StereotypeController::findStereotypeIcon(const QString &stereotype_icon_id)
+StereotypeIcon StereotypeController::findStereotypeIcon(const QString &stereotypeIconId)
{
- QMT_CHECK(d->m_iconIdToStereotypeIconsMap.contains(stereotype_icon_id));
- return d->m_iconIdToStereotypeIconsMap.value(stereotype_icon_id);
+ QMT_CHECK(d->m_iconIdToStereotypeIconsMap.contains(stereotypeIconId));
+ return d->m_iconIdToStereotypeIconsMap.value(stereotypeIconId);
}
-QIcon StereotypeController::createIcon(StereotypeIcon::Element element, const QList<QString> &stereotypes, const QString &default_icon_path,
+QIcon StereotypeController::createIcon(StereotypeIcon::Element element, const QList<QString> &stereotypes, const QString &defaultIconPath,
const Style *style, const QSize &size, const QMarginsF &margins)
{
- // TODO implement cache with key build from element, stereotypes, default_icon_path, style, size and margins
+ // TODO implement cache with key build from element, stereotypes, defaultIconPath, style, size and margins
// TODO implement unique id for style which can be used as key
// TODO fix rendering of icon which negativ extension of bounding box (e.g. stereotype "component")
QIcon icon;
- QString stereotype_icon_id = findStereotypeIconId(element, stereotypes);
- if (!stereotype_icon_id.isEmpty()) {
- StereotypeIcon stereotype_icon = findStereotypeIcon(stereotype_icon_id);
+ QString stereotypeIconId = findStereotypeIconId(element, stereotypes);
+ if (!stereotypeIconId.isEmpty()) {
+ StereotypeIcon stereotypeIcon = findStereotypeIcon(stereotypeIconId);
qreal width = size.width() - margins.left() - margins.right();
qreal height = size.height() - margins.top() - margins.bottom();
- qreal ratio_width = height * stereotype_icon.getWidth() / stereotype_icon.getHeight();
- qreal ratio_height = width * stereotype_icon.getHeight() / stereotype_icon.getWidth();
- if (ratio_width > width) {
- height = ratio_height;
- } else if (ratio_height > height) {
- width = ratio_width;
+ qreal ratioWidth = height * stereotypeIcon.getWidth() / stereotypeIcon.getHeight();
+ qreal ratioHeight = width * stereotypeIcon.getHeight() / stereotypeIcon.getWidth();
+ if (ratioWidth > width) {
+ height = ratioHeight;
+ } else if (ratioHeight > height) {
+ width = ratioWidth;
}
- QSizeF shape_size(width, height);
-
- ShapeSizeVisitor size_visitor(QPointF(0.0, 0.0),
- QSizeF(stereotype_icon.getWidth(), stereotype_icon.getHeight()),
- shape_size, shape_size);
- stereotype_icon.getIconShape().visitShapes(&size_visitor);
- QRectF icon_bounding_rect = size_visitor.getBoundingRect();
- QPixmap pixmap(icon_bounding_rect.width() + margins.left() + margins.right(), icon_bounding_rect.height() + margins.top() + margins.bottom());
+ QSizeF shapeSize(width, height);
+
+ ShapeSizeVisitor sizeVisitor(QPointF(0.0, 0.0),
+ QSizeF(stereotypeIcon.getWidth(), stereotypeIcon.getHeight()),
+ shapeSize, shapeSize);
+ stereotypeIcon.getIconShape().visitShapes(&sizeVisitor);
+ QRectF iconBoundingRect = sizeVisitor.getBoundingRect();
+ QPixmap pixmap(iconBoundingRect.width() + margins.left() + margins.right(), iconBoundingRect.height() + margins.top() + margins.bottom());
pixmap.fill(Qt::transparent);
QPainter painter(&pixmap);
painter.setBrush(Qt::NoBrush);
- painter.translate(-icon_bounding_rect.topLeft() + QPointF(margins.left(), margins.top()));
- QPen line_pen = style->getLinePen();
- line_pen.setWidthF(2.0);
- painter.setPen(line_pen);
+ painter.translate(-iconBoundingRect.topLeft() + QPointF(margins.left(), margins.top()));
+ QPen linePen = style->getLinePen();
+ linePen.setWidthF(2.0);
+ painter.setPen(linePen);
painter.setBrush(style->getFillBrush());
ShapePaintVisitor visitor(&painter, QPointF(0.0, 0.0),
- QSizeF(stereotype_icon.getWidth(), stereotype_icon.getHeight()),
- shape_size, shape_size);
- stereotype_icon.getIconShape().visitShapes(&visitor);
-
- QPixmap icon_pixmap(size);
- icon_pixmap.fill(Qt::transparent);
- QPainter icon_painter(&icon_pixmap);
- icon_painter.drawPixmap((icon_pixmap.width() - pixmap.width()) / 2, (icon_pixmap.width() - pixmap.height()) / 2, pixmap);
- icon = QIcon(icon_pixmap);
+ QSizeF(stereotypeIcon.getWidth(), stereotypeIcon.getHeight()),
+ shapeSize, shapeSize);
+ stereotypeIcon.getIconShape().visitShapes(&visitor);
+
+ QPixmap iconPixmap(size);
+ iconPixmap.fill(Qt::transparent);
+ QPainter iconPainter(&iconPixmap);
+ iconPainter.drawPixmap((iconPixmap.width() - pixmap.width()) / 2, (iconPixmap.width() - pixmap.height()) / 2, pixmap);
+ icon = QIcon(iconPixmap);
}
- if (icon.isNull() && !default_icon_path.isEmpty()) {
- icon = QIcon(default_icon_path);
+ if (icon.isNull() && !defaultIconPath.isEmpty()) {
+ icon = QIcon(defaultIconPath);
}
return icon;
}
-void StereotypeController::addStereotypeIcon(const StereotypeIcon &stereotype_icon)
+void StereotypeController::addStereotypeIcon(const StereotypeIcon &stereotypeIcon)
{
- if (stereotype_icon.getElements().isEmpty()) {
- foreach (const QString &stereotype, stereotype_icon.getStereotypes()) {
- d->m_stereotypeToIconIdMap.insert(qMakePair(StereotypeIcon::ELEMENT_ANY, stereotype), stereotype_icon.getId());
+ if (stereotypeIcon.getElements().isEmpty()) {
+ foreach (const QString &stereotype, stereotypeIcon.getStereotypes()) {
+ d->m_stereotypeToIconIdMap.insert(qMakePair(StereotypeIcon::ELEMENT_ANY, stereotype), stereotypeIcon.getId());
}
} else {
- foreach (StereotypeIcon::Element element, stereotype_icon.getElements()) {
- foreach (const QString &stereotype, stereotype_icon.getStereotypes()) {
- d->m_stereotypeToIconIdMap.insert(qMakePair(element, stereotype), stereotype_icon.getId());
+ foreach (StereotypeIcon::Element element, stereotypeIcon.getElements()) {
+ foreach (const QString &stereotype, stereotypeIcon.getStereotypes()) {
+ d->m_stereotypeToIconIdMap.insert(qMakePair(element, stereotype), stereotypeIcon.getId());
}
}
}
- d->m_iconIdToStereotypeIconsMap.insert(stereotype_icon.getId(), stereotype_icon);
+ d->m_iconIdToStereotypeIconsMap.insert(stereotypeIcon.getId(), stereotypeIcon);
}
void StereotypeController::addToolbar(const Toolbar &toolbar)
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.h b/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.h
index a225b7558fbe3e790fb61153c14e3fd2a2c3fee9..f99a4205358c6ed1f426a45ea7ab1bbfc07bfc3c 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.h
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/stereotypecontroller.h
@@ -63,22 +63,22 @@ public:
QList<Toolbar> getToolbars() const;
- QList<QString> getKnownStereotypes(StereotypeIcon::Element stereotype_element) const;
+ QList<QString> getKnownStereotypes(StereotypeIcon::Element stereotypeElement) const;
public:
QString findStereotypeIconId(StereotypeIcon::Element element, const QList<QString> &stereotypes) const;
- QList<QString> filterStereotypesByIconId(const QString &stereotype_icon_id, const QList<QString> &stereotypes) const;
+ QList<QString> filterStereotypesByIconId(const QString &stereotypeIconId, const QList<QString> &stereotypes) const;
- StereotypeIcon findStereotypeIcon(const QString &stereotype_icon_id);
+ StereotypeIcon findStereotypeIcon(const QString &stereotypeIconId);
- QIcon createIcon(StereotypeIcon::Element element, const QList<QString> &stereotypes, const QString &default_icon_path,
+ QIcon createIcon(StereotypeIcon::Element element, const QList<QString> &stereotypes, const QString &defaultIconPath,
const Style *style, const QSize &size, const QMarginsF &margins);
public:
- void addStereotypeIcon(const StereotypeIcon &stereotype_icon);
+ void addStereotypeIcon(const StereotypeIcon &stereotypeIcon);
void addToolbar(const Toolbar &toolbar);
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypeicon.cpp b/src/libs/3rdparty/modeling/qmt/stereotype/stereotypeicon.cpp
index c3ce2c96052f50652683d9d2db2a8e98332d2149..be30bbc6638fbd64e7a0971498f359eed8012fe7 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypeicon.cpp
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/stereotypeicon.cpp
@@ -85,19 +85,19 @@ void StereotypeIcon::setHeight(qreal height)
m_height = height;
}
-void StereotypeIcon::setMinWidth(qreal min_width)
+void StereotypeIcon::setMinWidth(qreal minWidth)
{
- m_minWidth = min_width;
+ m_minWidth = minWidth;
}
-void StereotypeIcon::setMinHeight(qreal min_height)
+void StereotypeIcon::setMinHeight(qreal minHeight)
{
- m_minHeight = min_height;
+ m_minHeight = minHeight;
}
-void StereotypeIcon::setSizeLock(StereotypeIcon::SizeLock size_lock)
+void StereotypeIcon::setSizeLock(StereotypeIcon::SizeLock sizeLock)
{
- m_sizeLock = size_lock;
+ m_sizeLock = sizeLock;
}
void StereotypeIcon::setDisplay(StereotypeIcon::Display display)
@@ -105,19 +105,19 @@ void StereotypeIcon::setDisplay(StereotypeIcon::Display display)
m_display = display;
}
-void StereotypeIcon::setTextAlignment(StereotypeIcon::TextAlignment text_alignment)
+void StereotypeIcon::setTextAlignment(StereotypeIcon::TextAlignment textAlignment)
{
- m_textAlignment = text_alignment;
+ m_textAlignment = textAlignment;
}
-void StereotypeIcon::setBaseColor(const QColor &base_color)
+void StereotypeIcon::setBaseColor(const QColor &baseColor)
{
- m_baseColor = base_color;
+ m_baseColor = baseColor;
}
-void StereotypeIcon::setIconShape(const IconShape &icon_shape)
+void StereotypeIcon::setIconShape(const IconShape &iconShape)
{
- m_iconShape = icon_shape;
+ m_iconShape = iconShape;
}
} // namespace qmt
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypeicon.h b/src/libs/3rdparty/modeling/qmt/stereotype/stereotypeicon.h
index 319777b2179c7af471afe55eb6db91e606a688e7..1135ee185841218435fc752e6e44951a3b0af5f3 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/stereotypeicon.h
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/stereotypeicon.h
@@ -111,17 +111,17 @@ public:
qreal getMinWidth() const { return m_minWidth; }
- void setMinWidth(qreal min_width);
+ void setMinWidth(qreal minWidth);
bool hasMinHeight() const { return m_minHeight > 0; }
qreal getMinHeight() const { return m_minHeight; }
- void setMinHeight(qreal min_height);
+ void setMinHeight(qreal minHeight);
SizeLock getSizeLock() const { return m_sizeLock; }
- void setSizeLock(SizeLock size_lock);
+ void setSizeLock(SizeLock sizeLock);
Display getDisplay() const { return m_display; }
@@ -129,15 +129,15 @@ public:
TextAlignment getTextAlignment() const { return m_textAlignment; }
- void setTextAlignment(TextAlignment text_alignment);
+ void setTextAlignment(TextAlignment textAlignment);
QColor getBaseColor() const { return m_baseColor; }
- void setBaseColor(const QColor &base_color);
+ void setBaseColor(const QColor &baseColor);
IconShape getIconShape() const { return m_iconShape; }
- void setIconShape(const IconShape &icon_shape);
+ void setIconShape(const IconShape &iconShape);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/stereotype/toolbar.h b/src/libs/3rdparty/modeling/qmt/stereotype/toolbar.h
index af9c4e2dec88da5d3f61c3df661f0188f4417984..85a407681bd785096b543934a3627ecd44d881d7 100644
--- a/src/libs/3rdparty/modeling/qmt/stereotype/toolbar.h
+++ b/src/libs/3rdparty/modeling/qmt/stereotype/toolbar.h
@@ -54,10 +54,10 @@ public:
{
}
- Tool(const QString &name, const QString &element_type, const QString &stereotype = QString::null)
+ Tool(const QString &name, const QString &elementType, const QString &stereotype = QString::null)
: m_toolType(TOOLTYPE_TOOL),
m_name(name),
- m_elementType(element_type),
+ m_elementType(elementType),
m_stereotype(stereotype)
{
}
diff --git a/src/libs/3rdparty/modeling/qmt/style/defaultstyle.cpp b/src/libs/3rdparty/modeling/qmt/style/defaultstyle.cpp
index 6fd17383453ed84914f39c7e7d502d12d0791818..a0f5a51ab410359bb042f791b760489e35c93f6f 100644
--- a/src/libs/3rdparty/modeling/qmt/style/defaultstyle.cpp
+++ b/src/libs/3rdparty/modeling/qmt/style/defaultstyle.cpp
@@ -35,30 +35,30 @@ namespace qmt {
DefaultStyle::DefaultStyle()
: Style(GlobalStyle)
{
- QPen line_pen;
- line_pen.setColor("black");
- line_pen.setWidth(1);
- setLinePen(line_pen);
- setOuterLinePen(line_pen);
- setInnerLinePen(line_pen);
- setExtraLinePen(line_pen);
+ QPen linePen;
+ linePen.setColor("black");
+ linePen.setWidth(1);
+ setLinePen(linePen);
+ setOuterLinePen(linePen);
+ setInnerLinePen(linePen);
+ setExtraLinePen(linePen);
setTextBrush(QBrush(QColor("black")));
setFillBrush(QBrush(QColor("yellow")));
setExtraFillBrush(QBrush(QColor("white")));
- QFont normal_font;
+ QFont normalFont;
// TODO the standard font family is "MS Shell Dlg 2" which is not good for small fonts in diagrams
- //normal_font.setFamily(QStringLiteral("ModelEditor"));
- //normal_font.setPointSizeF(9.0);
- normal_font.setPixelSize(11);
- setNormalFont(normal_font);
- QFont small_font(normal_font);
- //small_font.setPointSizeF(normal_font.pointSizeF() * 0.80);
- small_font.setPixelSize(9);
- setSmallFont(small_font);
- QFont header_font(normal_font);
- //header_font.setPointSizeF(normal_font.pointSizeF() * 1.4);
- header_font.setPixelSize(16);
- setHeaderFont(header_font);
+ //normalFont.setFamily(QStringLiteral("ModelEditor"));
+ //normalFont.setPointSizeF(9.0);
+ normalFont.setPixelSize(11);
+ setNormalFont(normalFont);
+ QFont smallFont(normalFont);
+ //smallFont.setPointSizeF(normalFont.pointSizeF() * 0.80);
+ smallFont.setPixelSize(9);
+ setSmallFont(smallFont);
+ QFont headerFont(normalFont);
+ //headerFont.setPointSizeF(normalFont.pointSizeF() * 1.4);
+ headerFont.setPixelSize(16);
+ setHeaderFont(headerFont);
}
DefaultStyle::~DefaultStyle()
diff --git a/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp b/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp
index 6577ba495cf480de93ea65182d8f7b04e942e0e9..43f05d765b5f7f073334221aed230b7473fd25b5 100644
--- a/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp
+++ b/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.cpp
@@ -55,9 +55,9 @@ struct ObjectStyleKey {
{
}
- ObjectStyleKey(StyleEngine::ElementType element_type, const ObjectVisuals &object_visuals)
- : m_elementType(element_type),
- m_objectVisuals(object_visuals)
+ ObjectStyleKey(StyleEngine::ElementType elementType, const ObjectVisuals &objectVisuals)
+ : m_elementType(elementType),
+ m_objectVisuals(objectVisuals)
{
}
@@ -65,9 +65,9 @@ struct ObjectStyleKey {
ObjectVisuals m_objectVisuals;
};
-uint qHash(const ObjectStyleKey &style_key)
+uint qHash(const ObjectStyleKey &styleKey)
{
- return ::qHash(style_key.m_elementType) ^ qHash(style_key.m_objectVisuals);
+ return ::qHash(styleKey.m_elementType) ^ qHash(styleKey.m_objectVisuals);
}
bool operator==(const ObjectStyleKey &lhs, const ObjectStyleKey &rhs)
@@ -77,10 +77,10 @@ bool operator==(const ObjectStyleKey &lhs, const ObjectStyleKey &rhs)
struct RelationStyleKey {
- RelationStyleKey(StyleEngine::ElementType element_type = StyleEngine::TYPE_OTHER,
- DObject::VisualPrimaryRole visual_primary_role = DObject::PRIMARY_ROLE_NORMAL)
- : m_elementType(element_type),
- m_visualPrimaryRole(visual_primary_role)
+ RelationStyleKey(StyleEngine::ElementType elementType = StyleEngine::TYPE_OTHER,
+ DObject::VisualPrimaryRole visualPrimaryRole = DObject::PRIMARY_ROLE_NORMAL)
+ : m_elementType(elementType),
+ m_visualPrimaryRole(visualPrimaryRole)
{
}
@@ -88,8 +88,8 @@ struct RelationStyleKey {
DObject::VisualPrimaryRole m_visualPrimaryRole;
};
-uint qHash(const RelationStyleKey &style_key) {
- return ::qHash(style_key.m_elementType) ^ ::qHash(style_key.m_visualPrimaryRole);
+uint qHash(const RelationStyleKey &styleKey) {
+ return ::qHash(styleKey.m_elementType) ^ ::qHash(styleKey.m_visualPrimaryRole);
}
bool operator==(const RelationStyleKey &lhs, const RelationStyleKey &rhs)
@@ -99,16 +99,16 @@ bool operator==(const RelationStyleKey &lhs, const RelationStyleKey &rhs)
struct AnnotationStyleKey {
- AnnotationStyleKey(DAnnotation::VisualRole visual_role = DAnnotation::ROLE_NORMAL)
- : m_visualRole(visual_role)
+ AnnotationStyleKey(DAnnotation::VisualRole visualRole = DAnnotation::ROLE_NORMAL)
+ : m_visualRole(visualRole)
{
}
DAnnotation::VisualRole m_visualRole;
};
-uint qHash(const AnnotationStyleKey &style_key) {
- return ::qHash(style_key.m_visualRole);
+uint qHash(const AnnotationStyleKey &styleKey) {
+ return ::qHash(styleKey.m_visualRole);
}
bool operator==(const AnnotationStyleKey &lhs, const AnnotationStyleKey &rhs)
@@ -123,8 +123,8 @@ struct BoundaryStyleKey {
}
};
-uint qHash(const BoundaryStyleKey &style_key) {
- Q_UNUSED(style_key);
+uint qHash(const BoundaryStyleKey &styleKey) {
+ Q_UNUSED(styleKey);
return 1;
}
@@ -150,84 +150,84 @@ DefaultStyleEngine::~DefaultStyleEngine()
qDeleteAll(m_boundaryStyleMap);
}
-const Style *DefaultStyleEngine::applyStyle(const Style *base_style, StyleEngine::ElementType element_type, const StyleEngine::Parameters *parameters)
+const Style *DefaultStyleEngine::applyStyle(const Style *baseStyle, StyleEngine::ElementType elementType, const StyleEngine::Parameters *parameters)
{
- switch (element_type) {
+ switch (elementType) {
case TYPE_ANNOTATION:
- return applyAnnotationStyle(base_style, DAnnotation::ROLE_NORMAL, parameters);
+ return applyAnnotationStyle(baseStyle, DAnnotation::ROLE_NORMAL, parameters);
case TYPE_BOUNDARY:
- return applyBoundaryStyle(base_style, parameters);
+ return applyBoundaryStyle(baseStyle, parameters);
case TYPE_RELATION:
break;
case TYPE_CLASS:
case TYPE_COMPONENT:
case TYPE_ITEM:
case TYPE_PACKAGE:
- return applyObjectStyle(base_style, element_type, ObjectVisuals(DObject::PRIMARY_ROLE_NORMAL, DObject::SECONDARY_ROLE_NONE, false, QColor(), 0), parameters);
+ return applyObjectStyle(baseStyle, elementType, ObjectVisuals(DObject::PRIMARY_ROLE_NORMAL, DObject::SECONDARY_ROLE_NONE, false, QColor(), 0), parameters);
case TYPE_OTHER:
break;
}
- return base_style;
+ return baseStyle;
}
-const Style *DefaultStyleEngine::applyObjectStyle(const Style *base_style, StyleEngine::ElementType element_type, const ObjectVisuals &object_visuals, const StyleEngine::Parameters *parameters)
+const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, StyleEngine::ElementType elementType, const ObjectVisuals &objectVisuals, const StyleEngine::Parameters *parameters)
{
- ObjectStyleKey key(element_type, object_visuals);
- const Style *derived_style = m_objectStyleMap.value(key);
- if (!derived_style) {
- int line_width = 1;
-
- QColor fill_color = getFillColor(element_type, object_visuals);
- QColor line_color = getLineColor(element_type, object_visuals);
- QColor text_color = getTextColor(element_type, object_visuals);
-
- QFont normal_font = base_style->getNormalFont();
- QFont header_font = base_style->getNormalFont();
- if (object_visuals.isEmphasized()) {
- line_width = 2;
- header_font.setBold(true);
+ ObjectStyleKey key(elementType, objectVisuals);
+ const Style *derivedStyle = m_objectStyleMap.value(key);
+ if (!derivedStyle) {
+ int lineWidth = 1;
+
+ QColor fillColor = getFillColor(elementType, objectVisuals);
+ QColor lineColor = getLineColor(elementType, objectVisuals);
+ QColor textColor = getTextColor(elementType, objectVisuals);
+
+ QFont normalFont = baseStyle->getNormalFont();
+ QFont headerFont = baseStyle->getNormalFont();
+ if (objectVisuals.isEmphasized()) {
+ lineWidth = 2;
+ headerFont.setBold(true);
}
- Style *style = new Style(base_style->getType());
- QPen line_pen = base_style->getLinePen();
- line_pen.setColor(line_color);
- line_pen.setWidth(line_width);
- style->setLinePen(line_pen);
- style->setInnerLinePen(line_pen);
- style->setOuterLinePen(line_pen);
- style->setExtraLinePen(line_pen);
- style->setTextBrush(QBrush(text_color));
- if (object_visuals.getVisualSecondaryRole() == DObject::SECONDARY_ROLE_OUTLINE) {
+ Style *style = new Style(baseStyle->getType());
+ QPen linePen = baseStyle->getLinePen();
+ linePen.setColor(lineColor);
+ linePen.setWidth(lineWidth);
+ style->setLinePen(linePen);
+ style->setInnerLinePen(linePen);
+ style->setOuterLinePen(linePen);
+ style->setExtraLinePen(linePen);
+ style->setTextBrush(QBrush(textColor));
+ if (objectVisuals.getVisualSecondaryRole() == DObject::SECONDARY_ROLE_OUTLINE) {
style->setFillBrush(QBrush(Qt::white));
} else {
if (!parameters->suppressGradients()) {
- QLinearGradient fill_gradient(0.0, 0.0, 0.0, 1.0);
- fill_gradient.setCoordinateMode(QGradient::ObjectBoundingMode);
- fill_gradient.setColorAt(0.0, fill_color.lighter(110));
- fill_gradient.setColorAt(1.0, fill_color.darker(110));
- style->setFillBrush(QBrush(fill_gradient));
+ QLinearGradient fillGradient(0.0, 0.0, 0.0, 1.0);
+ fillGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
+ fillGradient.setColorAt(0.0, fillColor.lighter(110));
+ fillGradient.setColorAt(1.0, fillColor.darker(110));
+ style->setFillBrush(QBrush(fillGradient));
} else {
- style->setFillBrush(QBrush(fill_color));
+ style->setFillBrush(QBrush(fillColor));
}
}
- if (object_visuals.getVisualSecondaryRole() == DObject::SECONDARY_ROLE_OUTLINE) {
+ if (objectVisuals.getVisualSecondaryRole() == DObject::SECONDARY_ROLE_OUTLINE) {
style->setExtraFillBrush(QBrush(Qt::white));
} else {
- style->setExtraFillBrush(QBrush(fill_color.darker(120)));
+ style->setExtraFillBrush(QBrush(fillColor.darker(120)));
}
- style->setNormalFont(normal_font);
- style->setSmallFont(base_style->getSmallFont());
- style->setHeaderFont(header_font);
+ style->setNormalFont(normalFont);
+ style->setSmallFont(baseStyle->getSmallFont());
+ style->setHeaderFont(headerFont);
m_objectStyleMap.insert(key, style);
- derived_style = style;
+ derivedStyle = style;
}
- return derived_style;
+ return derivedStyle;
}
-const Style *DefaultStyleEngine::applyObjectStyle(const Style *base_style, const StyledObject &styled_object, const Parameters *parameters)
+const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, const StyledObject &styledObject, const Parameters *parameters)
{
- ElementType element_type = getObjectType(styled_object.getObject());
+ ElementType elementType = getObjectType(styledObject.getObject());
struct DepthProperties {
DepthProperties()
@@ -237,10 +237,10 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *base_style, const
{
}
- DepthProperties(ElementType element_type, DObject::VisualPrimaryRole visual_primary_role, DObject::VisualSecondaryRole visual_secondary_role)
- : m_elementType(element_type),
- m_visualPrimaryRole(visual_primary_role),
- m_visualSecondaryRole(visual_secondary_role)
+ DepthProperties(ElementType elementType, DObject::VisualPrimaryRole visualPrimaryRole, DObject::VisualSecondaryRole visualSecondaryRole)
+ : m_elementType(elementType),
+ m_visualPrimaryRole(visualPrimaryRole),
+ m_visualSecondaryRole(visualSecondaryRole)
{
}
@@ -250,35 +250,35 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *base_style, const
};
// find colliding elements which best match visual appearance of styled object
- DObject::VisualPrimaryRole styled_visual_primary_role = styled_object.getObjectVisuals().getVisualPrimaryRole();
- DObject::VisualSecondaryRole styled_visual_secondary_role = styled_object.getObjectVisuals().getVisualSecondaryRole();
+ DObject::VisualPrimaryRole styledVisualPrimaryRole = styledObject.getObjectVisuals().getVisualPrimaryRole();
+ DObject::VisualSecondaryRole styledVisualSecondaryRole = styledObject.getObjectVisuals().getVisualSecondaryRole();
QHash<int, DepthProperties> depths;
- foreach (const DObject *colliding_object, styled_object.getCollidingObjects()) {
- int colliding_depth = colliding_object->getDepth();
- if (colliding_depth < styled_object.getObject()->getDepth()) {
- ElementType colliding_element_type = getObjectType(colliding_object);
- DObject::VisualPrimaryRole colliding_visual_primary_role = colliding_object->getVisualPrimaryRole();
- DObject::VisualSecondaryRole colliding_visual_secondary_role = colliding_object->getVisualSecondaryRole();
- if (!depths.contains(colliding_depth)) {
- depths.insert(colliding_depth, DepthProperties(colliding_element_type, colliding_visual_primary_role, colliding_visual_secondary_role));
+ foreach (const DObject *collidingObject, styledObject.getCollidingObjects()) {
+ int collidingDepth = collidingObject->getDepth();
+ if (collidingDepth < styledObject.getObject()->getDepth()) {
+ ElementType collidingElementType = getObjectType(collidingObject);
+ DObject::VisualPrimaryRole collidingVisualPrimaryRole = collidingObject->getVisualPrimaryRole();
+ DObject::VisualSecondaryRole collidingVisualSecondaryRole = collidingObject->getVisualSecondaryRole();
+ if (!depths.contains(collidingDepth)) {
+ depths.insert(collidingDepth, DepthProperties(collidingElementType, collidingVisualPrimaryRole, collidingVisualSecondaryRole));
} else {
- bool update_properties = false;
- DepthProperties properties = depths.value(colliding_depth);
- if (properties.m_elementType != element_type && colliding_element_type == element_type) {
- properties.m_elementType = colliding_element_type;
- properties.m_visualPrimaryRole = colliding_visual_primary_role;
- properties.m_visualSecondaryRole = colliding_visual_secondary_role;
- update_properties = true;
- } else if (properties.m_elementType == element_type && colliding_element_type == element_type) {
- if ((properties.m_visualPrimaryRole != styled_visual_primary_role || properties.m_visualSecondaryRole != styled_visual_secondary_role)
- && colliding_visual_primary_role == styled_visual_primary_role && colliding_visual_secondary_role == styled_visual_secondary_role) {
- properties.m_visualPrimaryRole = colliding_visual_primary_role;
- properties.m_visualSecondaryRole = colliding_visual_secondary_role;
- update_properties = true;
+ bool updateProperties = false;
+ DepthProperties properties = depths.value(collidingDepth);
+ if (properties.m_elementType != elementType && collidingElementType == elementType) {
+ properties.m_elementType = collidingElementType;
+ properties.m_visualPrimaryRole = collidingVisualPrimaryRole;
+ properties.m_visualSecondaryRole = collidingVisualSecondaryRole;
+ updateProperties = true;
+ } else if (properties.m_elementType == elementType && collidingElementType == elementType) {
+ if ((properties.m_visualPrimaryRole != styledVisualPrimaryRole || properties.m_visualSecondaryRole != styledVisualSecondaryRole)
+ && collidingVisualPrimaryRole == styledVisualPrimaryRole && collidingVisualSecondaryRole == styledVisualSecondaryRole) {
+ properties.m_visualPrimaryRole = collidingVisualPrimaryRole;
+ properties.m_visualSecondaryRole = collidingVisualSecondaryRole;
+ updateProperties = true;
}
}
- if (update_properties) {
- depths.insert(colliding_depth, properties);
+ if (updateProperties) {
+ depths.insert(collidingDepth, properties);
}
}
}
@@ -289,7 +289,7 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *base_style, const
qSort(keys);
foreach (int d, keys) {
DepthProperties properties = depths.value(d);
- if (properties.m_elementType == element_type && areStackingRoles(properties.m_visualPrimaryRole, properties.m_visualSecondaryRole, styled_visual_primary_role, styled_visual_secondary_role)) {
+ if (properties.m_elementType == elementType && areStackingRoles(properties.m_visualPrimaryRole, properties.m_visualSecondaryRole, styledVisualPrimaryRole, styledVisualSecondaryRole)) {
++depth;
} else {
depth = 0;
@@ -297,153 +297,153 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *base_style, const
}
}
- return applyObjectStyle(base_style, element_type,
- ObjectVisuals(styled_visual_primary_role,
- styled_visual_secondary_role,
- styled_object.getObjectVisuals().isEmphasized(),
- styled_object.getObjectVisuals().getBaseColor(),
+ return applyObjectStyle(baseStyle, elementType,
+ ObjectVisuals(styledVisualPrimaryRole,
+ styledVisualSecondaryRole,
+ styledObject.getObjectVisuals().isEmphasized(),
+ styledObject.getObjectVisuals().getBaseColor(),
depth),
parameters);
}
-const Style *DefaultStyleEngine::applyRelationStyle(const Style *base_style, const StyledRelation &styled_relation, const Parameters *parameters)
+const Style *DefaultStyleEngine::applyRelationStyle(const Style *baseStyle, const StyledRelation &styledRelation, const Parameters *parameters)
{
Q_UNUSED(parameters);
- ElementType element_type = getObjectType(styled_relation.getEndA());
- RelationStyleKey key(element_type, styled_relation.getEndA() ? styled_relation.getEndA()->getVisualPrimaryRole() : DObject::PRIMARY_ROLE_NORMAL);
- const Style *derived_style = m_relationStyleMap.value(key);
- if (!derived_style) {
- Style *style = new Style(base_style->getType());
+ ElementType elementType = getObjectType(styledRelation.getEndA());
+ RelationStyleKey key(elementType, styledRelation.getEndA() ? styledRelation.getEndA()->getVisualPrimaryRole() : DObject::PRIMARY_ROLE_NORMAL);
+ const Style *derivedStyle = m_relationStyleMap.value(key);
+ if (!derivedStyle) {
+ Style *style = new Style(baseStyle->getType());
- const DObject *object = styled_relation.getEndA();
- ObjectVisuals object_visuals(object ? object->getVisualPrimaryRole() : DObject::PRIMARY_ROLE_NORMAL,
+ const DObject *object = styledRelation.getEndA();
+ ObjectVisuals objectVisuals(object ? object->getVisualPrimaryRole() : DObject::PRIMARY_ROLE_NORMAL,
object ? object->getVisualSecondaryRole() : DObject::SECONDARY_ROLE_NONE,
object ? object->isVisualEmphasized() : false,
Qt::black, // TODO STyledRelation should get an EndAObjectVisuals
object ? object->getDepth() : 0);
- QColor line_color = getLineColor(getObjectType(object), object_visuals);
- QColor fill_color = line_color;
-
- QPen line_pen = base_style->getLinePen();
- line_pen.setWidth(1);
- line_pen.setColor(line_color);
- style->setLinePen(line_pen);
- QBrush text_brush = base_style->getTextBrush();
- text_brush.setColor(QColor("black"));
- style->setTextBrush(text_brush);
- QBrush brush = base_style->getFillBrush();
- brush.setColor(fill_color);
+ QColor lineColor = getLineColor(getObjectType(object), objectVisuals);
+ QColor fillColor = lineColor;
+
+ QPen linePen = baseStyle->getLinePen();
+ linePen.setWidth(1);
+ linePen.setColor(lineColor);
+ style->setLinePen(linePen);
+ QBrush textBrush = baseStyle->getTextBrush();
+ textBrush.setColor(QColor("black"));
+ style->setTextBrush(textBrush);
+ QBrush brush = baseStyle->getFillBrush();
+ brush.setColor(fillColor);
brush.setStyle(Qt::SolidPattern);
style->setFillBrush(brush);
- style->setNormalFont(base_style->getNormalFont());
- style->setSmallFont(base_style->getSmallFont());
- style->setHeaderFont(base_style->getHeaderFont());
+ style->setNormalFont(baseStyle->getNormalFont());
+ style->setSmallFont(baseStyle->getSmallFont());
+ style->setHeaderFont(baseStyle->getHeaderFont());
m_relationStyleMap.insert(key, style);
- derived_style = style;
+ derivedStyle = style;
}
- return derived_style;
+ return derivedStyle;
}
-const Style *DefaultStyleEngine::applyAnnotationStyle(const Style *base_style, const DAnnotation *annotation, const Parameters *parameters)
+const Style *DefaultStyleEngine::applyAnnotationStyle(const Style *baseStyle, const DAnnotation *annotation, const Parameters *parameters)
{
- DAnnotation::VisualRole visual_role = annotation ? annotation->getVisualRole() : DAnnotation::ROLE_NORMAL;
- return applyAnnotationStyle(base_style, visual_role, parameters);
+ DAnnotation::VisualRole visualRole = annotation ? annotation->getVisualRole() : DAnnotation::ROLE_NORMAL;
+ return applyAnnotationStyle(baseStyle, visualRole, parameters);
}
-const Style *DefaultStyleEngine::applyBoundaryStyle(const Style *base_style, const DBoundary *boundary, const Parameters *parameters)
+const Style *DefaultStyleEngine::applyBoundaryStyle(const Style *baseStyle, const DBoundary *boundary, const Parameters *parameters)
{
Q_UNUSED(boundary);
- return applyBoundaryStyle(base_style, parameters);
+ return applyBoundaryStyle(baseStyle, parameters);
}
-const Style *DefaultStyleEngine::applyAnnotationStyle(const Style *base_style, DAnnotation::VisualRole visual_role, const StyleEngine::Parameters *parameters)
+const Style *DefaultStyleEngine::applyAnnotationStyle(const Style *baseStyle, DAnnotation::VisualRole visualRole, const StyleEngine::Parameters *parameters)
{
Q_UNUSED(parameters);
- AnnotationStyleKey key(visual_role);
- const Style *derived_style = m_annotationStyleMap.value(key);
- if (!derived_style) {
- Style *style = new Style(base_style->getType());
- QFont normal_font;
- QBrush text_brush = base_style->getTextBrush();
- switch (visual_role) {
+ AnnotationStyleKey key(visualRole);
+ const Style *derivedStyle = m_annotationStyleMap.value(key);
+ if (!derivedStyle) {
+ Style *style = new Style(baseStyle->getType());
+ QFont normalFont;
+ QBrush textBrush = baseStyle->getTextBrush();
+ switch (visualRole) {
case DAnnotation::ROLE_NORMAL:
- normal_font = base_style->getNormalFont();
+ normalFont = baseStyle->getNormalFont();
break;
case DAnnotation::ROLE_TITLE:
- normal_font = base_style->getHeaderFont();
+ normalFont = baseStyle->getHeaderFont();
break;
case DAnnotation::ROLE_SUBTITLE:
- normal_font = base_style->getNormalFont();
- normal_font.setItalic(true);
+ normalFont = baseStyle->getNormalFont();
+ normalFont.setItalic(true);
break;
case DAnnotation::ROLE_EMPHASIZED:
- normal_font = base_style->getNormalFont();
- normal_font.setBold(true);
+ normalFont = baseStyle->getNormalFont();
+ normalFont.setBold(true);
break;
case DAnnotation::ROLE_SOFTEN:
- normal_font = base_style->getNormalFont();
- text_brush.setColor(Qt::gray);
+ normalFont = baseStyle->getNormalFont();
+ textBrush.setColor(Qt::gray);
break;
case DAnnotation::ROLE_FOOTNOTE:
- normal_font = base_style->getSmallFont();
+ normalFont = baseStyle->getSmallFont();
break;
}
- style->setNormalFont(normal_font);
- style->setTextBrush(text_brush);
+ style->setNormalFont(normalFont);
+ style->setTextBrush(textBrush);
m_annotationStyleMap.insert(key, style);
- derived_style = style;
+ derivedStyle = style;
}
- return derived_style;
+ return derivedStyle;
}
-const Style *DefaultStyleEngine::applyBoundaryStyle(const Style *base_style, const StyleEngine::Parameters *parameters)
+const Style *DefaultStyleEngine::applyBoundaryStyle(const Style *baseStyle, const StyleEngine::Parameters *parameters)
{
Q_UNUSED(parameters);
BoundaryStyleKey key;
- const Style *derived_style = m_boundaryStyleMap.value(key);
- if (!derived_style) {
- Style *style = new Style(base_style->getType());
- style->setNormalFont(base_style->getNormalFont());
- style->setTextBrush(base_style->getTextBrush());
+ const Style *derivedStyle = m_boundaryStyleMap.value(key);
+ if (!derivedStyle) {
+ Style *style = new Style(baseStyle->getType());
+ style->setNormalFont(baseStyle->getNormalFont());
+ style->setTextBrush(baseStyle->getTextBrush());
m_boundaryStyleMap.insert(key, style);
- derived_style = style;
+ derivedStyle = style;
}
- return derived_style;
+ return derivedStyle;
}
DefaultStyleEngine::ElementType DefaultStyleEngine::getObjectType(const DObject *object)
{
- ElementType element_type;
+ ElementType elementType;
if (dynamic_cast<const DPackage *>(object)) {
- element_type = TYPE_PACKAGE;
+ elementType = TYPE_PACKAGE;
} else if (dynamic_cast<const DComponent *>(object)) {
- element_type = TYPE_COMPONENT;
+ elementType = TYPE_COMPONENT;
} else if (dynamic_cast<const DClass *>(object)) {
- element_type = TYPE_CLASS;
+ elementType = TYPE_CLASS;
} else if (dynamic_cast<const DItem *>(object)) {
- element_type = TYPE_ITEM;
+ elementType = TYPE_ITEM;
} else {
- element_type = TYPE_OTHER;
+ elementType = TYPE_OTHER;
}
- return element_type;
+ return elementType;
}
-bool DefaultStyleEngine::areStackingRoles(DObject::VisualPrimaryRole rhs_primary_role, DObject::VisualSecondaryRole rhs_secondary_role,
- DObject::VisualPrimaryRole lhs_primary_role, DObject::VisualSecondaryRole lhs_secondary_rols)
+bool DefaultStyleEngine::areStackingRoles(DObject::VisualPrimaryRole rhsPrimaryRole, DObject::VisualSecondaryRole rhsSecondaryRole,
+ DObject::VisualPrimaryRole lhsPrimaryRole, DObject::VisualSecondaryRole lhsSecondaryRols)
{
- switch (rhs_secondary_role) {
+ switch (rhsSecondaryRole) {
case DObject::SECONDARY_ROLE_NONE:
case DObject::SECONDARY_ROLE_LIGHTER:
case DObject::SECONDARY_ROLE_DARKER:
- switch (lhs_secondary_rols) {
+ switch (lhsSecondaryRols) {
case DObject::SECONDARY_ROLE_NONE:
case DObject::SECONDARY_ROLE_LIGHTER:
case DObject::SECONDARY_ROLE_DARKER:
- return lhs_primary_role == rhs_primary_role;
+ return lhsPrimaryRole == rhsPrimaryRole;
break;
case DObject::SECONDARY_ROLE_SOFTEN:
case DObject::SECONDARY_ROLE_OUTLINE:
@@ -456,38 +456,38 @@ bool DefaultStyleEngine::areStackingRoles(DObject::VisualPrimaryRole rhs_primary
return true;
}
-QColor DefaultStyleEngine::getBaseColor(ElementType element_type, ObjectVisuals object_visuals)
+QColor DefaultStyleEngine::getBaseColor(ElementType elementType, ObjectVisuals objectVisuals)
{
- if (object_visuals.getVisualSecondaryRole() == DObject::SECONDARY_ROLE_OUTLINE) {
+ if (objectVisuals.getVisualSecondaryRole() == DObject::SECONDARY_ROLE_OUTLINE) {
return QColor("#FFFFFF");
}
- QColor base_color;
+ QColor baseColor;
- if (object_visuals.getVisualPrimaryRole() == DObject::PRIMARY_ROLE_NORMAL) {
- if (object_visuals.getBaseColor().isValid()) {
- base_color = object_visuals.getBaseColor();
+ if (objectVisuals.getVisualPrimaryRole() == DObject::PRIMARY_ROLE_NORMAL) {
+ if (objectVisuals.getBaseColor().isValid()) {
+ baseColor = objectVisuals.getBaseColor();
} else {
- switch (element_type) {
+ switch (elementType) {
case TYPE_PACKAGE:
- base_color = QColor("#7C98AD");
+ baseColor = QColor("#7C98AD");
break;
case TYPE_COMPONENT:
- base_color = QColor("#A0A891");
+ baseColor = QColor("#A0A891");
break;
case TYPE_CLASS:
- base_color = QColor("#E5A858");
+ baseColor = QColor("#E5A858");
break;
case TYPE_ITEM:
- base_color = QColor("#B995C6");
+ baseColor = QColor("#B995C6");
break;
default:
- base_color = QColor("#BF7D65");
+ baseColor = QColor("#BF7D65");
break;
}
}
} else {
- static QColor custom_colors[] = {
+ static QColor customColors[] = {
QColor("#EE8E99").darker(110), // ROLE_CUSTOM1,
QColor("#80AF47").lighter(130), // ROLE_CUSTOM2,
QColor("#FFA15B").lighter(100), // ROLE_CUSTOM3,
@@ -495,80 +495,80 @@ QColor DefaultStyleEngine::getBaseColor(ElementType element_type, ObjectVisuals
QColor("#FFE14B") // ROLE_CUSTOM5,
};
- int index = (int) object_visuals.getVisualPrimaryRole() - (int) DObject::PRIMARY_ROLE_CUSTOM1;
+ int index = (int) objectVisuals.getVisualPrimaryRole() - (int) DObject::PRIMARY_ROLE_CUSTOM1;
QMT_CHECK(index >= 0 && index <= 4);
- base_color = custom_colors[index];
+ baseColor = customColors[index];
}
- switch (object_visuals.getVisualSecondaryRole()) {
+ switch (objectVisuals.getVisualSecondaryRole()) {
case DObject::SECONDARY_ROLE_NONE:
break;
case DObject::SECONDARY_ROLE_LIGHTER:
- base_color = base_color.lighter(110);
+ baseColor = baseColor.lighter(110);
break;
case DObject::SECONDARY_ROLE_DARKER:
- base_color = base_color.darker(120);
+ baseColor = baseColor.darker(120);
break;
case DObject::SECONDARY_ROLE_SOFTEN:
- base_color = base_color.lighter(300);
+ baseColor = baseColor.lighter(300);
break;
case DObject::SECONDARY_ROLE_OUTLINE:
QMT_CHECK(false);
break;
}
- return base_color;
+ return baseColor;
}
-QColor DefaultStyleEngine::getLineColor(ElementType element_type, const ObjectVisuals &object_visuals)
+QColor DefaultStyleEngine::getLineColor(ElementType elementType, const ObjectVisuals &objectVisuals)
{
- QColor line_color;
- if (object_visuals.getVisualSecondaryRole() == DObject::SECONDARY_ROLE_OUTLINE) {
- line_color = Qt::black;
- } else if (object_visuals.getVisualSecondaryRole() == DObject::SECONDARY_ROLE_SOFTEN) {
- line_color = Qt::gray;
+ QColor lineColor;
+ if (objectVisuals.getVisualSecondaryRole() == DObject::SECONDARY_ROLE_OUTLINE) {
+ lineColor = Qt::black;
+ } else if (objectVisuals.getVisualSecondaryRole() == DObject::SECONDARY_ROLE_SOFTEN) {
+ lineColor = Qt::gray;
} else {
- line_color = getBaseColor(element_type, object_visuals).darker(200).lighter(150).darker(100 + object_visuals.getDepth() * 10);
+ lineColor = getBaseColor(elementType, objectVisuals).darker(200).lighter(150).darker(100 + objectVisuals.getDepth() * 10);
}
- return line_color;
+ return lineColor;
}
-QColor DefaultStyleEngine::getFillColor(ElementType element_type, const ObjectVisuals &object_visuals)
+QColor DefaultStyleEngine::getFillColor(ElementType elementType, const ObjectVisuals &objectVisuals)
{
- QColor fill_color;
- if (object_visuals.getVisualSecondaryRole() == DObject::SECONDARY_ROLE_OUTLINE) {
- fill_color = Qt::white;
+ QColor fillColor;
+ if (objectVisuals.getVisualSecondaryRole() == DObject::SECONDARY_ROLE_OUTLINE) {
+ fillColor = Qt::white;
} else {
- fill_color = getBaseColor(element_type, object_visuals).lighter(150).darker(100 + object_visuals.getDepth() * 10);
+ fillColor = getBaseColor(elementType, objectVisuals).lighter(150).darker(100 + objectVisuals.getDepth() * 10);
}
- return fill_color;
+ return fillColor;
}
QColor DefaultStyleEngine::getTextColor(const DObject *object, int depth)
{
Q_UNUSED(depth);
- QColor text_color;
- DObject::VisualPrimaryRole visual_role = object ? object->getVisualPrimaryRole() : DObject::PRIMARY_ROLE_NORMAL;
- if (visual_role == DObject::DEPRECATED_PRIMARY_ROLE_SOFTEN) {
- text_color = Qt::gray;
+ QColor textColor;
+ DObject::VisualPrimaryRole visualRole = object ? object->getVisualPrimaryRole() : DObject::PRIMARY_ROLE_NORMAL;
+ if (visualRole == DObject::DEPRECATED_PRIMARY_ROLE_SOFTEN) {
+ textColor = Qt::gray;
} else {
- text_color = Qt::black;
+ textColor = Qt::black;
}
- return text_color;
+ return textColor;
}
-QColor DefaultStyleEngine::getTextColor(ElementType element_type, const ObjectVisuals &object_visuals)
+QColor DefaultStyleEngine::getTextColor(ElementType elementType, const ObjectVisuals &objectVisuals)
{
- Q_UNUSED(element_type);
+ Q_UNUSED(elementType);
- QColor text_color;
- if (object_visuals.getVisualSecondaryRole() == DObject::SECONDARY_ROLE_SOFTEN) {
- text_color = Qt::gray;
+ QColor textColor;
+ if (objectVisuals.getVisualSecondaryRole() == DObject::SECONDARY_ROLE_SOFTEN) {
+ textColor = Qt::gray;
} else {
- text_color = Qt::black;
+ textColor = Qt::black;
}
- return text_color;
+ return textColor;
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.h b/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.h
index a5ee8c39a3bf93864e8c97823db45fa67bab038a..b5b40ce892d5df4ced70046750164a7bf313905c 100644
--- a/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.h
+++ b/src/libs/3rdparty/modeling/qmt/style/defaultstyleengine.h
@@ -64,37 +64,37 @@ public:
public:
- const Style *applyStyle(const Style *base_style, ElementType element_type, const Parameters *parameters);
+ const Style *applyStyle(const Style *baseStyle, ElementType elementType, const Parameters *parameters);
- const Style *applyObjectStyle(const Style *base_style, ElementType element_type, const ObjectVisuals &object_visuals, const Parameters *parameters);
+ const Style *applyObjectStyle(const Style *baseStyle, ElementType elementType, const ObjectVisuals &objectVisuals, const Parameters *parameters);
- const Style *applyObjectStyle(const Style *base_style, const StyledObject &styled_object, const Parameters *parameters);
+ const Style *applyObjectStyle(const Style *baseStyle, const StyledObject &styledObject, const Parameters *parameters);
- const Style *applyRelationStyle(const Style *base_style, const StyledRelation &styled_relation, const Parameters *parameters);
+ const Style *applyRelationStyle(const Style *baseStyle, const StyledRelation &styledRelation, const Parameters *parameters);
- const Style *applyAnnotationStyle(const Style *base_style, const DAnnotation *annotation, const Parameters *parameters);
+ const Style *applyAnnotationStyle(const Style *baseStyle, const DAnnotation *annotation, const Parameters *parameters);
- const Style *applyBoundaryStyle(const Style *base_style, const DBoundary *boundary, const Parameters *parameters);
+ const Style *applyBoundaryStyle(const Style *baseStyle, const DBoundary *boundary, const Parameters *parameters);
private:
- const Style *applyAnnotationStyle(const Style *base_style, DAnnotation::VisualRole visual_role, const Parameters *parameters);
+ const Style *applyAnnotationStyle(const Style *baseStyle, DAnnotation::VisualRole visualRole, const Parameters *parameters);
- const Style *applyBoundaryStyle(const Style *base_style, const Parameters *parameters);
+ const Style *applyBoundaryStyle(const Style *baseStyle, const Parameters *parameters);
ElementType getObjectType(const DObject *object);
- bool areStackingRoles(DObject::VisualPrimaryRole rhs_primary_role, DObject::VisualSecondaryRole rhs_secondary_role, DObject::VisualPrimaryRole lhs_primary_role, DObject::VisualSecondaryRole lhs_secondary_rols);
+ bool areStackingRoles(DObject::VisualPrimaryRole rhsPrimaryRole, DObject::VisualSecondaryRole rhsSecondaryRole, DObject::VisualPrimaryRole lhsPrimaryRole, DObject::VisualSecondaryRole lhsSecondaryRols);
- QColor getBaseColor(ElementType element_type, ObjectVisuals object_visuals);
+ QColor getBaseColor(ElementType elementType, ObjectVisuals objectVisuals);
- QColor getLineColor(ElementType element_type, const ObjectVisuals &object_visuals);
+ QColor getLineColor(ElementType elementType, const ObjectVisuals &objectVisuals);
- QColor getFillColor(ElementType element_type, const ObjectVisuals &object_visuals);
+ QColor getFillColor(ElementType elementType, const ObjectVisuals &objectVisuals);
QColor getTextColor(const DObject *object, int depth);
- QColor getTextColor(ElementType element_type, const ObjectVisuals &object_visuals);
+ QColor getTextColor(ElementType elementType, const ObjectVisuals &objectVisuals);
private:
diff --git a/src/libs/3rdparty/modeling/qmt/style/objectvisuals.cpp b/src/libs/3rdparty/modeling/qmt/style/objectvisuals.cpp
index 6ff01227d9e2caba8d73e0baa07896d13ae9b66f..3f01b904a3b13ebb13ea8446972201f497ea90df 100644
--- a/src/libs/3rdparty/modeling/qmt/style/objectvisuals.cpp
+++ b/src/libs/3rdparty/modeling/qmt/style/objectvisuals.cpp
@@ -42,13 +42,13 @@ ObjectVisuals::ObjectVisuals()
{
}
-ObjectVisuals::ObjectVisuals(DObject::VisualPrimaryRole visual_primary_role,
- DObject::VisualSecondaryRole visual_secondary_role,
- bool emphasized, const QColor &base_color, int depth)
- : m_visualPrimaryRole(visual_primary_role),
- m_visualSecondaryRole(visual_secondary_role),
+ObjectVisuals::ObjectVisuals(DObject::VisualPrimaryRole visualPrimaryRole,
+ DObject::VisualSecondaryRole visualSecondaryRole,
+ bool emphasized, const QColor &baseColor, int depth)
+ : m_visualPrimaryRole(visualPrimaryRole),
+ m_visualSecondaryRole(visualSecondaryRole),
m_emphasized(emphasized),
- m_baseColor(base_color),
+ m_baseColor(baseColor),
m_depth(depth)
{
}
@@ -57,14 +57,14 @@ ObjectVisuals::~ObjectVisuals()
{
}
-void ObjectVisuals::setVisualPrimaryRole(DObject::VisualPrimaryRole visual_primary_role)
+void ObjectVisuals::setVisualPrimaryRole(DObject::VisualPrimaryRole visualPrimaryRole)
{
- m_visualPrimaryRole = visual_primary_role;
+ m_visualPrimaryRole = visualPrimaryRole;
}
-void ObjectVisuals::setVisualSecondaryRole(DObject::VisualSecondaryRole visual_secondary_role)
+void ObjectVisuals::setVisualSecondaryRole(DObject::VisualSecondaryRole visualSecondaryRole)
{
- m_visualSecondaryRole = visual_secondary_role;
+ m_visualSecondaryRole = visualSecondaryRole;
}
void ObjectVisuals::setEmphasized(bool emphasized)
@@ -72,9 +72,9 @@ void ObjectVisuals::setEmphasized(bool emphasized)
m_emphasized = emphasized;
}
-void ObjectVisuals::setBaseColor(const QColor &base_color)
+void ObjectVisuals::setBaseColor(const QColor &baseColor)
{
- m_baseColor = base_color;
+ m_baseColor = baseColor;
}
void ObjectVisuals::setDepth(int depth)
@@ -91,13 +91,13 @@ bool operator==(const ObjectVisuals &lhs, const ObjectVisuals &rhs)
&& lhs.getDepth() == rhs.getDepth();
}
-uint qHash(const ObjectVisuals &object_visuals)
+uint qHash(const ObjectVisuals &objectVisuals)
{
- return ::qHash((int) object_visuals.getVisualPrimaryRole())
- ^ ::qHash((int) object_visuals.getVisualSecondaryRole())
- ^ ::qHash(object_visuals.isEmphasized())
- ^ ::qHash(object_visuals.getBaseColor().rgb())
- ^ ::qHash(object_visuals.getDepth());
+ return ::qHash((int) objectVisuals.getVisualPrimaryRole())
+ ^ ::qHash((int) objectVisuals.getVisualSecondaryRole())
+ ^ ::qHash(objectVisuals.isEmphasized())
+ ^ ::qHash(objectVisuals.getBaseColor().rgb())
+ ^ ::qHash(objectVisuals.getDepth());
}
} // namespace qmt
diff --git a/src/libs/3rdparty/modeling/qmt/style/objectvisuals.h b/src/libs/3rdparty/modeling/qmt/style/objectvisuals.h
index fd2a863c87a980f59c6e25a03282a6e08dfd48c4..21d88cff6c58219ec2c6f166edeb7720a8355dab 100644
--- a/src/libs/3rdparty/modeling/qmt/style/objectvisuals.h
+++ b/src/libs/3rdparty/modeling/qmt/style/objectvisuals.h
@@ -41,20 +41,20 @@ class QMT_EXPORT ObjectVisuals
{
public:
ObjectVisuals();
- ObjectVisuals(DObject::VisualPrimaryRole visual_primary_role,
- DObject::VisualSecondaryRole visual_secondary_role,
- bool emphasized, const QColor &base_color, int depth);
+ ObjectVisuals(DObject::VisualPrimaryRole visualPrimaryRole,
+ DObject::VisualSecondaryRole visualSecondaryRole,
+ bool emphasized, const QColor &baseColor, int depth);
~ObjectVisuals();
public:
DObject::VisualPrimaryRole getVisualPrimaryRole() const { return m_visualPrimaryRole; }
- void setVisualPrimaryRole(DObject::VisualPrimaryRole visual_primary_role);
+ void setVisualPrimaryRole(DObject::VisualPrimaryRole visualPrimaryRole);
DObject::VisualSecondaryRole getVisualSecondaryRole() const { return m_visualSecondaryRole; }
- void setVisualSecondaryRole(DObject::VisualSecondaryRole visual_secondary_role);
+ void setVisualSecondaryRole(DObject::VisualSecondaryRole visualSecondaryRole);
bool isEmphasized() const { return m_emphasized; }
@@ -62,7 +62,7 @@ public:
QColor getBaseColor() const { return m_baseColor; }
- void setBaseColor(const QColor &base_color);
+ void setBaseColor(const QColor &baseColor);
int getDepth() const { return m_depth; }
@@ -83,7 +83,7 @@ private:
bool operator==(const ObjectVisuals &lhs, const ObjectVisuals &rhs);
-uint qHash(const ObjectVisuals &object_visuals);
+uint qHash(const ObjectVisuals &objectVisuals);
} // namespace qmt
diff --git a/src/libs/3rdparty/modeling/qmt/style/relationstarterstyle.cpp b/src/libs/3rdparty/modeling/qmt/style/relationstarterstyle.cpp
index 004d83ae90f7f8c05a6812a1db64117466bd2187..5f54fe0d392e421038f218e5c80fd30aa4eed1bc 100644
--- a/src/libs/3rdparty/modeling/qmt/style/relationstarterstyle.cpp
+++ b/src/libs/3rdparty/modeling/qmt/style/relationstarterstyle.cpp
@@ -35,24 +35,24 @@ namespace qmt {
RelationStarterStyle::RelationStarterStyle()
: Style(GlobalStyle)
{
- QPen line_pen;
- line_pen.setColor("black");
- line_pen.setWidth(1);
- setLinePen(line_pen);
- setOuterLinePen(line_pen);
- setInnerLinePen(line_pen);
- setExtraLinePen(line_pen);
+ QPen linePen;
+ linePen.setColor("black");
+ linePen.setWidth(1);
+ setLinePen(linePen);
+ setOuterLinePen(linePen);
+ setInnerLinePen(linePen);
+ setExtraLinePen(linePen);
setTextBrush(QBrush(QColor("black")));
setFillBrush(QBrush(QColor("black")));
setExtraFillBrush(QBrush(QColor("white")));
- QFont normal_font;
- setNormalFont(normal_font);
- QFont small_font;
- small_font.setPointSizeF(QFont().pointSizeF() * 0.80);
- setSmallFont(small_font);
- QFont header_font;
- header_font.setPointSizeF(QFont().pointSizeF() * 1.25);
- setHeaderFont(header_font);
+ QFont normalFont;
+ setNormalFont(normalFont);
+ QFont smallFont;
+ smallFont.setPointSizeF(QFont().pointSizeF() * 0.80);
+ setSmallFont(smallFont);
+ QFont headerFont;
+ headerFont.setPointSizeF(QFont().pointSizeF() * 1.25);
+ setHeaderFont(headerFont);
}
diff --git a/src/libs/3rdparty/modeling/qmt/style/stylecontroller.cpp b/src/libs/3rdparty/modeling/qmt/style/stylecontroller.cpp
index e9ba782d1e29b728bb2544e1a855c5ab9ac19ec2..b8db01c6f580256d0d8d3779f5d9e2e5a1629ff2 100644
--- a/src/libs/3rdparty/modeling/qmt/style/stylecontroller.cpp
+++ b/src/libs/3rdparty/modeling/qmt/style/stylecontroller.cpp
@@ -43,8 +43,8 @@ class StyleController::Parameters :
public StyleEngine::Parameters
{
public:
- Parameters(StyleController *style_controller)
- : m_styleController(style_controller)
+ Parameters(StyleController *styleController)
+ : m_styleController(styleController)
{
}
@@ -72,21 +72,21 @@ StyleController::~StyleController()
{
}
-void StyleController::setSuppressGradients(bool suppress_gradients)
+void StyleController::setSuppressGradients(bool suppressGradients)
{
- m_suppressGradients = suppress_gradients;
+ m_suppressGradients = suppressGradients;
}
-const Style *StyleController::adaptStyle(StyleEngine::ElementType element_type)
+const Style *StyleController::adaptStyle(StyleEngine::ElementType elementType)
{
Parameters parameters(this);
- return m_defaultStyleEngine->applyStyle(m_defaultStyle.data(), element_type, ¶meters);
+ return m_defaultStyleEngine->applyStyle(m_defaultStyle.data(), elementType, ¶meters);
}
-const Style *StyleController::adaptObjectStyle(StyleEngine::ElementType element_type, const ObjectVisuals &object_visuals)
+const Style *StyleController::adaptObjectStyle(StyleEngine::ElementType elementType, const ObjectVisuals &objectVisuals)
{
Parameters parameters(this);
- return m_defaultStyleEngine->applyObjectStyle(m_defaultStyle.data(), element_type, object_visuals, ¶meters);
+ return m_defaultStyleEngine->applyObjectStyle(m_defaultStyle.data(), elementType, objectVisuals, ¶meters);
}
const Style *StyleController::adaptObjectStyle(const StyledObject &object)
diff --git a/src/libs/3rdparty/modeling/qmt/style/stylecontroller.h b/src/libs/3rdparty/modeling/qmt/style/stylecontroller.h
index ff9ce4d42d7cf6be42d9f48cbeb9694e8f5e23f3..3823747f9b10b1ae83d107b35ba68bc0c4b2a36a 100644
--- a/src/libs/3rdparty/modeling/qmt/style/stylecontroller.h
+++ b/src/libs/3rdparty/modeling/qmt/style/stylecontroller.h
@@ -67,13 +67,13 @@ public:
bool getSuppressGradients() const { return m_suppressGradients; }
- void setSuppressGradients(bool suppress_gradients);
+ void setSuppressGradients(bool suppressGradients);
public:
- const Style *adaptStyle(StyleEngine::ElementType element_type);
+ const Style *adaptStyle(StyleEngine::ElementType elementType);
- const Style *adaptObjectStyle(StyleEngine::ElementType element_type, const ObjectVisuals &object_visuals);
+ const Style *adaptObjectStyle(StyleEngine::ElementType elementType, const ObjectVisuals &objectVisuals);
const Style *adaptObjectStyle(const StyledObject &object);
diff --git a/src/libs/3rdparty/modeling/qmt/style/styledobject.cpp b/src/libs/3rdparty/modeling/qmt/style/styledobject.cpp
index 8f889e17b855e6667473c1fd46533ca5e07fb8fa..fbd9c7a3269815da024e8e2f06a25e6727073447 100644
--- a/src/libs/3rdparty/modeling/qmt/style/styledobject.cpp
+++ b/src/libs/3rdparty/modeling/qmt/style/styledobject.cpp
@@ -32,10 +32,10 @@
namespace qmt {
-StyledObject::StyledObject(const DObject *object, const ObjectVisuals &object_visuals, const QList<const DObject *> &colliding_objects)
+StyledObject::StyledObject(const DObject *object, const ObjectVisuals &objectVisuals, const QList<const DObject *> &collidingObjects)
: m_object(object),
- m_objectVisuals(object_visuals),
- m_collidingObjects(colliding_objects)
+ m_objectVisuals(objectVisuals),
+ m_collidingObjects(collidingObjects)
{
}
diff --git a/src/libs/3rdparty/modeling/qmt/style/styledobject.h b/src/libs/3rdparty/modeling/qmt/style/styledobject.h
index f5d6c62c35892734357bcba084828048a659ded3..ff8e0c85c44346ebfb28e1684d5d97e928746c2d 100644
--- a/src/libs/3rdparty/modeling/qmt/style/styledobject.h
+++ b/src/libs/3rdparty/modeling/qmt/style/styledobject.h
@@ -43,7 +43,7 @@ class DObject;
class QMT_EXPORT StyledObject
{
public:
- StyledObject(const DObject *object, const ObjectVisuals &object_visuals, const QList<const DObject *> &colliding_objects);
+ StyledObject(const DObject *object, const ObjectVisuals &objectVisuals, const QList<const DObject *> &collidingObjects);
~StyledObject();
diff --git a/src/libs/3rdparty/modeling/qmt/style/styledrelation.cpp b/src/libs/3rdparty/modeling/qmt/style/styledrelation.cpp
index 762930e91f3022b5746e4bf84cab0602552cbe52..e0cee5bd81bffae6fb45830c94b6d0f103a3e62b 100644
--- a/src/libs/3rdparty/modeling/qmt/style/styledrelation.cpp
+++ b/src/libs/3rdparty/modeling/qmt/style/styledrelation.cpp
@@ -32,10 +32,10 @@
namespace qmt {
-StyledRelation::StyledRelation(const DRelation *relation, const DObject *end_a, const DObject *end_b)
+StyledRelation::StyledRelation(const DRelation *relation, const DObject *endA, const DObject *endB)
: m_relation(relation),
- m_endA(end_a),
- m_endB(end_b)
+ m_endA(endA),
+ m_endB(endB)
{
}
diff --git a/src/libs/3rdparty/modeling/qmt/style/styledrelation.h b/src/libs/3rdparty/modeling/qmt/style/styledrelation.h
index efb54f902a2d816646c6e3f79998ef0ff0b4b937..5a1c92fbe0db93d3c329b975e1a3984b297f870a 100644
--- a/src/libs/3rdparty/modeling/qmt/style/styledrelation.h
+++ b/src/libs/3rdparty/modeling/qmt/style/styledrelation.h
@@ -42,7 +42,7 @@ class DObject;
class QMT_EXPORT StyledRelation
{
public:
- StyledRelation(const DRelation *relation, const DObject *end_a, const DObject *end_b);
+ StyledRelation(const DRelation *relation, const DObject *endA, const DObject *endB);
~StyledRelation();
diff --git a/src/libs/3rdparty/modeling/qmt/style/styleengine.h b/src/libs/3rdparty/modeling/qmt/style/styleengine.h
index 4735cc3eecff9950abc3d6cc648cb311d8ee7094..cbc4d3180c0cab89136209f67cd054d8225c327e 100644
--- a/src/libs/3rdparty/modeling/qmt/style/styleengine.h
+++ b/src/libs/3rdparty/modeling/qmt/style/styleengine.h
@@ -76,17 +76,17 @@ public:
public:
- virtual const Style *applyStyle(const Style *base_style, ElementType element_type, const Parameters *) = 0;
+ virtual const Style *applyStyle(const Style *baseStyle, ElementType elementType, const Parameters *) = 0;
- virtual const Style *applyObjectStyle(const Style *base_style, ElementType element_type, const ObjectVisuals &object_visuals, const Parameters *parameters) = 0;
+ virtual const Style *applyObjectStyle(const Style *baseStyle, ElementType elementType, const ObjectVisuals &objectVisuals, const Parameters *parameters) = 0;
- virtual const Style *applyObjectStyle(const Style *base_style, const StyledObject &, const Parameters *) = 0;
+ virtual const Style *applyObjectStyle(const Style *baseStyle, const StyledObject &, const Parameters *) = 0;
- virtual const Style *applyRelationStyle(const Style *base_style, const StyledRelation &, const Parameters *) = 0;
+ virtual const Style *applyRelationStyle(const Style *baseStyle, const StyledRelation &, const Parameters *) = 0;
- virtual const Style *applyAnnotationStyle(const Style *base_style, const DAnnotation *, const Parameters *) = 0;
+ virtual const Style *applyAnnotationStyle(const Style *baseStyle, const DAnnotation *, const Parameters *) = 0;
- virtual const Style *applyBoundaryStyle(const Style *base_style, const DBoundary *, const Parameters *) = 0;
+ virtual const Style *applyBoundaryStyle(const Style *baseStyle, const DBoundary *, const Parameters *) = 0;
};
}
diff --git a/src/libs/3rdparty/modeling/qmt/tasks/alignonrastervisitor.cpp b/src/libs/3rdparty/modeling/qmt/tasks/alignonrastervisitor.cpp
index b13d4efbd6dbeadcbc17e1f7c561e3fd7c2aa25b..f7ed5d1aa2c82d4264d59a1a7d7492b578e6a7b9 100644
--- a/src/libs/3rdparty/modeling/qmt/tasks/alignonrastervisitor.cpp
+++ b/src/libs/3rdparty/modeling/qmt/tasks/alignonrastervisitor.cpp
@@ -63,14 +63,14 @@ AlignOnRasterVisitor::~AlignOnRasterVisitor()
{
}
-void AlignOnRasterVisitor::setDiagramController(DiagramController *diagram_controller)
+void AlignOnRasterVisitor::setDiagramController(DiagramController *diagramController)
{
- m_diagramController = diagram_controller;
+ m_diagramController = diagramController;
}
-void AlignOnRasterVisitor::setSceneInspector(ISceneInspector *scene_inspector)
+void AlignOnRasterVisitor::setSceneInspector(ISceneInspector *sceneInspector)
{
- m_sceneInspector = scene_inspector;
+ m_sceneInspector = sceneInspector;
}
void AlignOnRasterVisitor::setDiagram(MDiagram *diagram)
diff --git a/src/libs/3rdparty/modeling/qmt/tasks/alignonrastervisitor.h b/src/libs/3rdparty/modeling/qmt/tasks/alignonrastervisitor.h
index 01fa228837e74bd4a63cdeee029ecc1036beb4dd..659ecfb22ed37450c17a31b0c47696c2bbd8aa78 100644
--- a/src/libs/3rdparty/modeling/qmt/tasks/alignonrastervisitor.h
+++ b/src/libs/3rdparty/modeling/qmt/tasks/alignonrastervisitor.h
@@ -50,9 +50,9 @@ public:
public:
- void setDiagramController(DiagramController *diagram_controller);
+ void setDiagramController(DiagramController *diagramController);
- void setSceneInspector(ISceneInspector *scene_inspector);
+ void setSceneInspector(ISceneInspector *sceneInspector);
void setDiagram(MDiagram *diagram);
diff --git a/src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.cpp b/src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.cpp
index 40deb71e825fa739fbeb0ab5af147391787d234a..0a8d74a2c51050fe1e9e70864d33272acef25488 100644
--- a/src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.cpp
+++ b/src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.cpp
@@ -69,14 +69,14 @@
namespace qmt {
namespace {
-static VoidElementTasks dummy_element_tasks;
+static VoidElementTasks dummyElementTasks;
}
DiagramSceneController::DiagramSceneController(QObject *parent)
: QObject(parent),
m_modelController(0),
m_diagramController(0),
- m_elementTasks(&dummy_element_tasks),
+ m_elementTasks(&dummyElementTasks),
m_sceneInspector(0)
{
}
@@ -85,49 +85,49 @@ DiagramSceneController::~DiagramSceneController()
{
}
-void DiagramSceneController::setModelController(ModelController *model_controller)
+void DiagramSceneController::setModelController(ModelController *modelController)
{
- if (m_modelController == model_controller) {
+ if (m_modelController == modelController) {
return;
}
if (m_modelController) {
disconnect(m_modelController, 0, this, 0);
m_modelController = 0;
}
- if (model_controller) {
- m_modelController = model_controller;
+ if (modelController) {
+ m_modelController = modelController;
}
}
-void DiagramSceneController::setDiagramController(DiagramController *diagram_controller)
+void DiagramSceneController::setDiagramController(DiagramController *diagramController)
{
- if (m_diagramController == diagram_controller) {
+ if (m_diagramController == diagramController) {
return;
}
if (m_diagramController) {
disconnect(m_diagramController, 0, this, 0);
m_diagramController = 0;
}
- if (diagram_controller) {
- m_diagramController = diagram_controller;
+ if (diagramController) {
+ m_diagramController = diagramController;
}
}
-void DiagramSceneController::setElementTasks(IElementTasks *element_tasks)
+void DiagramSceneController::setElementTasks(IElementTasks *elementTasks)
{
- m_elementTasks = element_tasks;
+ m_elementTasks = elementTasks;
}
-void DiagramSceneController::setSceneInspector(ISceneInspector *scene_inspector)
+void DiagramSceneController::setSceneInspector(ISceneInspector *sceneInspector)
{
- m_sceneInspector = scene_inspector;
+ m_sceneInspector = sceneInspector;
}
void DiagramSceneController::deleteFromDiagram(const DSelection &dselection, MDiagram *diagram)
{
if (!dselection.isEmpty()) {
MSelection mselection;
- DSelection remaining_dselection;
+ DSelection remainingDselection;
foreach (const DSelection::Index &index, dselection.getIndices()) {
DElement *delement = m_diagramController->findElement(index.getElementKey(), diagram);
QMT_CHECK(delement);
@@ -138,11 +138,11 @@ void DiagramSceneController::deleteFromDiagram(const DSelection &dselection, MDi
mselection.append(melement->getUid(), melement->getOwner()->getUid());
}
} else {
- remaining_dselection.append(index);
+ remainingDselection.append(index);
}
}
- if (!remaining_dselection.isEmpty()) {
- m_diagramController->deleteElements(remaining_dselection, diagram);
+ if (!remainingDselection.isEmpty()) {
+ m_diagramController->deleteElements(remainingDselection, diagram);
}
if (!mselection.isEmpty()) {
m_modelController->deleteElements(mselection);
@@ -150,26 +150,26 @@ void DiagramSceneController::deleteFromDiagram(const DSelection &dselection, MDi
}
}
-void DiagramSceneController::createDependency(DObject *end_a_object, DObject *end_b_object, const QList<QPointF> &intermediate_points, MDiagram *diagram)
+void DiagramSceneController::createDependency(DObject *endAObject, DObject *endBObject, const QList<QPointF> &intermediatePoints, MDiagram *diagram)
{
m_diagramController->getUndoController()->beginMergeSequence(tr("Create Dependency"));
- MObject *end_a_model_object = m_modelController->findObject<MObject>(end_a_object->getModelUid());
- QMT_CHECK(end_a_model_object);
- MObject *end_b_model_object = m_modelController->findObject<MObject>(end_b_object->getModelUid());
- QMT_CHECK(end_b_model_object);
+ MObject *endAModelObject = m_modelController->findObject<MObject>(endAObject->getModelUid());
+ QMT_CHECK(endAModelObject);
+ MObject *endBModelObject = m_modelController->findObject<MObject>(endBObject->getModelUid());
+ QMT_CHECK(endBModelObject);
- if (end_a_model_object == end_b_model_object) {
+ if (endAModelObject == endBModelObject) {
return;
}
- MDependency *model_dependency = new MDependency();
- model_dependency->setEndA(end_a_model_object->getUid());
- model_dependency->setEndB(end_b_model_object->getUid());
- model_dependency->setDirection(MDependency::A_TO_B);
- m_modelController->addRelation(end_a_model_object, model_dependency);
+ MDependency *modelDependency = new MDependency();
+ modelDependency->setEndA(endAModelObject->getUid());
+ modelDependency->setEndB(endBModelObject->getUid());
+ modelDependency->setDirection(MDependency::A_TO_B);
+ m_modelController->addRelation(endAModelObject, modelDependency);
- DRelation *relation = addRelation(model_dependency, intermediate_points, diagram);
+ DRelation *relation = addRelation(modelDependency, intermediatePoints, diagram);
m_diagramController->getUndoController()->endMergeSequence();
@@ -178,25 +178,25 @@ void DiagramSceneController::createDependency(DObject *end_a_object, DObject *en
}
}
-void DiagramSceneController::createInheritance(DClass *derived_class, DClass *base_class, const QList<QPointF> &intermediate_points, MDiagram *diagram)
+void DiagramSceneController::createInheritance(DClass *derivedClass, DClass *baseClass, const QList<QPointF> &intermediatePoints, MDiagram *diagram)
{
m_diagramController->getUndoController()->beginMergeSequence(tr("Create Inheritance"));
- MClass *derived_model_class = m_modelController->findObject<MClass>(derived_class->getModelUid());
- QMT_CHECK(derived_model_class);
- MClass *base_model_class = m_modelController->findObject<MClass>(base_class->getModelUid());
- QMT_CHECK(base_model_class);
+ MClass *derivedModelClass = m_modelController->findObject<MClass>(derivedClass->getModelUid());
+ QMT_CHECK(derivedModelClass);
+ MClass *baseModelClass = m_modelController->findObject<MClass>(baseClass->getModelUid());
+ QMT_CHECK(baseModelClass);
- if (derived_model_class == base_model_class) {
+ if (derivedModelClass == baseModelClass) {
return;
}
- MInheritance *model_inheritance = new MInheritance();
- model_inheritance->setDerived(derived_model_class->getUid());
- model_inheritance->setBase(base_model_class->getUid());
- m_modelController->addRelation(derived_model_class, model_inheritance);
+ MInheritance *modelInheritance = new MInheritance();
+ modelInheritance->setDerived(derivedModelClass->getUid());
+ modelInheritance->setBase(baseModelClass->getUid());
+ m_modelController->addRelation(derivedModelClass, modelInheritance);
- DRelation *relation = addRelation(model_inheritance, intermediate_points, diagram);
+ DRelation *relation = addRelation(modelInheritance, intermediatePoints, diagram);
m_diagramController->getUndoController()->endMergeSequence();
@@ -205,29 +205,29 @@ void DiagramSceneController::createInheritance(DClass *derived_class, DClass *ba
}
}
-void DiagramSceneController::createAssociation(DClass *end_a_class, DClass *end_b_class, const QList<QPointF> &intermediate_points, MDiagram *diagram)
+void DiagramSceneController::createAssociation(DClass *endAClass, DClass *endBClass, const QList<QPointF> &intermediatePoints, MDiagram *diagram)
{
m_diagramController->getUndoController()->beginMergeSequence(tr("Create Association"));
- MClass *end_a_model_object = m_modelController->findObject<MClass>(end_a_class->getModelUid());
- QMT_CHECK(end_a_model_object);
- MClass *end_b_model_object = m_modelController->findObject<MClass>(end_b_class->getModelUid());
- QMT_CHECK(end_b_model_object);
+ MClass *endAModelObject = m_modelController->findObject<MClass>(endAClass->getModelUid());
+ QMT_CHECK(endAModelObject);
+ MClass *endBModelObject = m_modelController->findObject<MClass>(endBClass->getModelUid());
+ QMT_CHECK(endBModelObject);
// TODO allow self assignment with just one intermediate point and a nice round arrow
- if (end_a_model_object == end_b_model_object && intermediate_points.count() < 2) {
+ if (endAModelObject == endBModelObject && intermediatePoints.count() < 2) {
return;
}
- MAssociation *model_association = new MAssociation();
- model_association->setEndA(end_a_model_object->getUid());
- MAssociationEnd end_a = model_association->getA();
- end_a.setNavigable(true);
- model_association->setA(end_a);
- model_association->setEndB(end_b_model_object->getUid());
- m_modelController->addRelation(end_a_model_object, model_association);
+ MAssociation *modelAssociation = new MAssociation();
+ modelAssociation->setEndA(endAModelObject->getUid());
+ MAssociationEnd endA = modelAssociation->getA();
+ endA.setNavigable(true);
+ modelAssociation->setA(endA);
+ modelAssociation->setEndB(endBModelObject->getUid());
+ m_modelController->addRelation(endAModelObject, modelAssociation);
- DRelation *relation = addRelation(model_association, intermediate_points, diagram);
+ DRelation *relation = addRelation(modelAssociation, intermediatePoints, diagram);
m_diagramController->getUndoController()->endMergeSequence();
@@ -236,136 +236,136 @@ void DiagramSceneController::createAssociation(DClass *end_a_class, DClass *end_
}
}
-bool DiagramSceneController::isAddingAllowed(const Uid &model_element_key, MDiagram *diagram)
+bool DiagramSceneController::isAddingAllowed(const Uid &modelElementKey, MDiagram *diagram)
{
- MElement *model_element = m_modelController->findElement(model_element_key);
- QMT_CHECK(model_element);
- if (m_diagramController->hasDelegate(model_element, diagram)) {
+ MElement *modelElement = m_modelController->findElement(modelElementKey);
+ QMT_CHECK(modelElement);
+ if (m_diagramController->hasDelegate(modelElement, diagram)) {
return false;
}
- if (MRelation *model_relation = dynamic_cast<MRelation *>(model_element)) {
- MObject *end_a_model_object = m_modelController->findObject(model_relation->getEndA());
- QMT_CHECK(end_a_model_object);
- DObject *end_a_diagram_object = m_diagramController->findDelegate<DObject>(end_a_model_object, diagram);
- if (!end_a_diagram_object) {
+ if (MRelation *modelRelation = dynamic_cast<MRelation *>(modelElement)) {
+ MObject *endAModelObject = m_modelController->findObject(modelRelation->getEndA());
+ QMT_CHECK(endAModelObject);
+ DObject *endADiagramObject = m_diagramController->findDelegate<DObject>(endAModelObject, diagram);
+ if (!endADiagramObject) {
return false;
}
- MObject *end_b_model_object = m_modelController->findObject(model_relation->getEndB());
- QMT_CHECK(end_b_model_object);
- DObject *end_b_diagram_object = m_diagramController->findDelegate<DObject>(end_b_model_object, diagram);
- if (!end_b_diagram_object) {
+ MObject *endBModelObject = m_modelController->findObject(modelRelation->getEndB());
+ QMT_CHECK(endBModelObject);
+ DObject *endBDiagramObject = m_diagramController->findDelegate<DObject>(endBModelObject, diagram);
+ if (!endBDiagramObject) {
return false;
}
}
return true;
}
-void DiagramSceneController::addExistingModelElement(const Uid &model_element_key, const QPointF &pos, MDiagram *diagram)
+void DiagramSceneController::addExistingModelElement(const Uid &modelElementKey, const QPointF &pos, MDiagram *diagram)
{
- DElement *element = addModelElement(model_element_key, pos, diagram);
+ DElement *element = addModelElement(modelElementKey, pos, diagram);
if (element) {
emit elementAdded(element, diagram);
}
}
-void DiagramSceneController::dropNewElement(const QString &new_element_id, const QString &name, const QString &stereotype, DElement *top_most_element_at_pos, const QPointF &pos, MDiagram *diagram)
+void DiagramSceneController::dropNewElement(const QString &newElementId, const QString &name, const QString &stereotype, DElement *topMostElementAtPos, const QPointF &pos, MDiagram *diagram)
{
- if (new_element_id == QLatin1String(ELEMENT_TYPE_ANNOTATION)) {
+ if (newElementId == QLatin1String(ELEMENT_TYPE_ANNOTATION)) {
DAnnotation *annotation = new DAnnotation();
annotation->setText(QStringLiteral(""));
annotation->setPos(pos - QPointF(10.0, 10.0));
m_diagramController->addElement(annotation, diagram);
alignOnRaster(annotation, diagram);
emit newElementCreated(annotation, diagram);
- } else if (new_element_id == QLatin1String(ELEMENT_TYPE_BOUNDARY)) {
+ } else if (newElementId == QLatin1String(ELEMENT_TYPE_BOUNDARY)) {
DBoundary *boundary = new DBoundary();
boundary->setPos(pos);
m_diagramController->addElement(boundary, diagram);
alignOnRaster(boundary, diagram);
emit newElementCreated(boundary, diagram);
} else {
- MPackage *parent_package = findSuitableParentPackage(top_most_element_at_pos, diagram);
- MObject *new_object = 0;
- QString new_name;
- if (new_element_id == QLatin1String(ELEMENT_TYPE_PACKAGE)) {
+ MPackage *parentPackage = findSuitableParentPackage(topMostElementAtPos, diagram);
+ MObject *newObject = 0;
+ QString newName;
+ if (newElementId == QLatin1String(ELEMENT_TYPE_PACKAGE)) {
MPackage *package = new MPackage();
- new_name = tr("New Package");
+ newName = tr("New Package");
if (!stereotype.isEmpty()) {
package->setStereotypes(QStringList() << stereotype);
}
- new_object = package;
- } else if (new_element_id == QLatin1String(ELEMENT_TYPE_COMPONENT)) {
+ newObject = package;
+ } else if (newElementId == QLatin1String(ELEMENT_TYPE_COMPONENT)) {
MComponent *component = new MComponent();
- new_name = tr("New Component");
+ newName = tr("New Component");
if (!stereotype.isEmpty()) {
component->setStereotypes(QStringList() << stereotype);
}
- new_object = component;
- } else if (new_element_id == QLatin1String(ELEMENT_TYPE_CLASS)) {
+ newObject = component;
+ } else if (newElementId == QLatin1String(ELEMENT_TYPE_CLASS)) {
MClass *klass = new MClass();
- new_name = tr("New Class");
+ newName = tr("New Class");
if (!stereotype.isEmpty()) {
klass->setStereotypes(QStringList() << stereotype);
}
- new_object = klass;
- } else if (new_element_id == QLatin1String(ELEMENT_TYPE_ITEM)) {
+ newObject = klass;
+ } else if (newElementId == QLatin1String(ELEMENT_TYPE_ITEM)) {
MItem *item = new MItem();
- new_name = tr("New Item");
+ newName = tr("New Item");
if (!stereotype.isEmpty()) {
item->setVariety(stereotype);
item->setVarietyEditable(false);
}
- new_object = item;
+ newObject = item;
}
- if (new_object) {
+ if (newObject) {
if (!name.isEmpty()) {
- new_name = tr("New %1").arg(name);
+ newName = tr("New %1").arg(name);
}
- new_object->setName(new_name);
- dropNewModelElement(new_object, parent_package, pos, diagram);
+ newObject->setName(newName);
+ dropNewModelElement(newObject, parentPackage, pos, diagram);
}
}
}
-void DiagramSceneController::dropNewModelElement(MObject *model_object, MPackage *parent_package, const QPointF &pos, MDiagram *diagram)
+void DiagramSceneController::dropNewModelElement(MObject *modelObject, MPackage *parentPackage, const QPointF &pos, MDiagram *diagram)
{
m_modelController->getUndoController()->beginMergeSequence(tr("Drop Element"));
- m_modelController->addObject(parent_package, model_object);
- DElement *element = addObject(model_object, pos, diagram);
+ m_modelController->addObject(parentPackage, modelObject);
+ DElement *element = addObject(modelObject, pos, diagram);
m_modelController->getUndoController()->endMergeSequence();
if (element) {
emit newElementCreated(element, diagram);
}
}
-MPackage *DiagramSceneController::findSuitableParentPackage(DElement *topmost_diagram_element, MDiagram *diagram)
+MPackage *DiagramSceneController::findSuitableParentPackage(DElement *topmostDiagramElement, MDiagram *diagram)
{
- MPackage *parent_package = 0;
- if (DPackage *diagram_package = dynamic_cast<DPackage *>(topmost_diagram_element)) {
- parent_package = m_modelController->findObject<MPackage>(diagram_package->getModelUid());
- } else if (DObject *diagram_object = dynamic_cast<DObject *>(topmost_diagram_element)) {
- MObject *model_object = m_modelController->findObject(diagram_object->getModelUid());
- if (model_object) {
- parent_package = dynamic_cast<MPackage *>(model_object->getOwner());
+ MPackage *parentPackage = 0;
+ if (DPackage *diagramPackage = dynamic_cast<DPackage *>(topmostDiagramElement)) {
+ parentPackage = m_modelController->findObject<MPackage>(diagramPackage->getModelUid());
+ } else if (DObject *diagramObject = dynamic_cast<DObject *>(topmostDiagramElement)) {
+ MObject *modelObject = m_modelController->findObject(diagramObject->getModelUid());
+ if (modelObject) {
+ parentPackage = dynamic_cast<MPackage *>(modelObject->getOwner());
}
}
- if (parent_package == 0 && diagram != 0) {
- parent_package = dynamic_cast<MPackage *>(diagram->getOwner());
+ if (parentPackage == 0 && diagram != 0) {
+ parentPackage = dynamic_cast<MPackage *>(diagram->getOwner());
}
- if (parent_package == 0) {
- parent_package = m_modelController->getRootPackage();
+ if (parentPackage == 0) {
+ parentPackage = m_modelController->getRootPackage();
}
- return parent_package;
+ return parentPackage;
}
-MDiagram *DiagramSceneController::findDiagramBySearchId(MPackage *package, const QString &diagram_name)
+MDiagram *DiagramSceneController::findDiagramBySearchId(MPackage *package, const QString &diagramName)
{
- QString diagram_search_id = NameController::calcElementNameSearchId(diagram_name);
+ QString diagramSearchId = NameController::calcElementNameSearchId(diagramName);
foreach (const Handle<MObject> &handle, package->getChildren()) {
if (handle.hasTarget()) {
if (MDiagram *diagram = dynamic_cast<MDiagram *>(handle.getTarget())) {
- if (NameController::calcElementNameSearchId(diagram->getName()) == diagram_search_id) {
+ if (NameController::calcElementNameSearchId(diagram->getName()) == diagramSearchId) {
return diagram;
}
}
@@ -376,62 +376,62 @@ MDiagram *DiagramSceneController::findDiagramBySearchId(MPackage *package, const
namespace {
-static QPointF alignObjectLeft(DObject *object, DObject *other_object)
+static QPointF alignObjectLeft(DObject *object, DObject *otherObject)
{
qreal left = object->getPos().x() + object->getRect().left();
- QPointF pos = other_object->getPos();
- qreal other_left = pos.x() + other_object->getRect().left();
- qreal delta = other_left - left;
+ QPointF pos = otherObject->getPos();
+ qreal otherLeft = pos.x() + otherObject->getRect().left();
+ qreal delta = otherLeft - left;
pos.setX(pos.x() - delta);
return pos;
}
-static QPointF alignObjectRight(DObject *object, DObject *other_object)
+static QPointF alignObjectRight(DObject *object, DObject *otherObject)
{
qreal right = object->getPos().x() + object->getRect().right();
- QPointF pos = other_object->getPos();
- qreal other_right = pos.x() + other_object->getRect().right();
- qreal delta = other_right - right;
+ QPointF pos = otherObject->getPos();
+ qreal otherRight = pos.x() + otherObject->getRect().right();
+ qreal delta = otherRight - right;
pos.setX(pos.x() - delta);
return pos;
}
-static QPointF alignObjectHCenter(DObject *object, DObject *other_object)
+static QPointF alignObjectHCenter(DObject *object, DObject *otherObject)
{
qreal center = object->getPos().x();
- QPointF pos = other_object->getPos();
- qreal other_center = pos.x();
- qreal delta = other_center - center;
+ QPointF pos = otherObject->getPos();
+ qreal otherCenter = pos.x();
+ qreal delta = otherCenter - center;
pos.setX(pos.x() - delta);
return pos;
}
-static QPointF alignObjectTop(DObject *object, DObject *other_object)
+static QPointF alignObjectTop(DObject *object, DObject *otherObject)
{
qreal top = object->getPos().y() + object->getRect().top();
- QPointF pos = other_object->getPos();
- qreal other_top = pos.y() + other_object->getRect().top();
- qreal delta = other_top - top;
+ QPointF pos = otherObject->getPos();
+ qreal otherTop = pos.y() + otherObject->getRect().top();
+ qreal delta = otherTop - top;
pos.setY(pos.y() - delta);
return pos;
}
-static QPointF alignObjectBottom(DObject *object, DObject *other_object)
+static QPointF alignObjectBottom(DObject *object, DObject *otherObject)
{
qreal bottom = object->getPos().y() + object->getRect().bottom();
- QPointF pos = other_object->getPos();
- qreal other_bottom = pos.y() + other_object->getRect().bottom();
- qreal delta = other_bottom - bottom;
+ QPointF pos = otherObject->getPos();
+ qreal otherBottom = pos.y() + otherObject->getRect().bottom();
+ qreal delta = otherBottom - bottom;
pos.setY(pos.y() - delta);
return pos;
}
-static QPointF alignObjectVCenter(DObject *object, DObject *other_object)
+static QPointF alignObjectVCenter(DObject *object, DObject *otherObject)
{
qreal center = object->getPos().y();
- QPointF pos = other_object->getPos();
- qreal other_center = pos.y();
- qreal delta = other_center - center;
+ QPointF pos = otherObject->getPos();
+ qreal otherCenter = pos.y();
+ qreal delta = otherCenter - center;
pos.setY(pos.y() - delta);
return pos;
}
@@ -496,60 +496,60 @@ void DiagramSceneController::alignVCenter(DObject *object, const DSelection &sel
alignPosition(object, selection, alignObjectVCenter, diagram);
}
-void DiagramSceneController::alignWidth(DObject *object, const DSelection &selection, const QSizeF &minimum_size, MDiagram *diagram)
+void DiagramSceneController::alignWidth(DObject *object, const DSelection &selection, const QSizeF &minimumSize, MDiagram *diagram)
{
- alignSize(object, selection, minimum_size, alignObjectWidth, diagram);
+ alignSize(object, selection, minimumSize, alignObjectWidth, diagram);
}
-void DiagramSceneController::alignHeight(DObject *object, const DSelection &selection, const QSizeF &minimum_size, MDiagram *diagram)
+void DiagramSceneController::alignHeight(DObject *object, const DSelection &selection, const QSizeF &minimumSize, MDiagram *diagram)
{
- alignSize(object, selection, minimum_size, alignObjectHeight, diagram);
+ alignSize(object, selection, minimumSize, alignObjectHeight, diagram);
}
-void DiagramSceneController::alignSize(DObject *object, const DSelection &selection, const QSizeF &minimum_size, MDiagram *diagram)
+void DiagramSceneController::alignSize(DObject *object, const DSelection &selection, const QSizeF &minimumSize, MDiagram *diagram)
{
- alignSize(object, selection, minimum_size, alignObjectSize, diagram);
+ alignSize(object, selection, minimumSize, alignObjectSize, diagram);
}
void DiagramSceneController::alignPosition(DObject *object, const DSelection &selection, QPointF (*aligner)(DObject *, DObject *), MDiagram *diagram)
{
foreach (const DSelection::Index &index, selection.getIndices()) {
DElement *element = m_diagramController->findElement(index.getElementKey(), diagram);
- if (DObject *selected_object = dynamic_cast<DObject *>(element)) {
- if (selected_object != object) {
- QPointF new_pos = aligner(object, selected_object);
- if (new_pos != selected_object->getPos()) {
- m_diagramController->startUpdateElement(selected_object, diagram, DiagramController::UPDATE_GEOMETRY);
- selected_object->setPos(new_pos);
- m_diagramController->finishUpdateElement(selected_object, diagram, false);
+ if (DObject *selectedObject = dynamic_cast<DObject *>(element)) {
+ if (selectedObject != object) {
+ QPointF newPos = aligner(object, selectedObject);
+ if (newPos != selectedObject->getPos()) {
+ m_diagramController->startUpdateElement(selectedObject, diagram, DiagramController::UPDATE_GEOMETRY);
+ selectedObject->setPos(newPos);
+ m_diagramController->finishUpdateElement(selectedObject, diagram, false);
}
}
}
}
}
-void DiagramSceneController::alignSize(DObject *object, const DSelection &selection, const QSizeF &minimum_size, QRectF (*aligner)(DObject *, const QSizeF &), MDiagram *diagram)
+void DiagramSceneController::alignSize(DObject *object, const DSelection &selection, const QSizeF &minimumSize, QRectF (*aligner)(DObject *, const QSizeF &), MDiagram *diagram)
{
QSizeF size;
- if (object->getRect().width() < minimum_size.width()) {
- size.setWidth(minimum_size.width());
+ if (object->getRect().width() < minimumSize.width()) {
+ size.setWidth(minimumSize.width());
} else {
size.setWidth(object->getRect().width());
}
- if (object->getRect().height() < minimum_size.height()) {
- size.setHeight(minimum_size.height());
+ if (object->getRect().height() < minimumSize.height()) {
+ size.setHeight(minimumSize.height());
} else {
size.setHeight(object->getRect().height());
}
foreach (const DSelection::Index &index, selection.getIndices()) {
DElement *element = m_diagramController->findElement(index.getElementKey(), diagram);
- if (DObject *selected_object = dynamic_cast<DObject *>(element)) {
- QRectF new_rect = aligner(selected_object, size);
- if (new_rect != selected_object->getRect()) {
- m_diagramController->startUpdateElement(selected_object, diagram, DiagramController::UPDATE_GEOMETRY);
- selected_object->setAutoSize(false);
- selected_object->setRect(new_rect);
- m_diagramController->finishUpdateElement(selected_object, diagram, false);
+ if (DObject *selectedObject = dynamic_cast<DObject *>(element)) {
+ QRectF newRect = aligner(selectedObject, size);
+ if (newRect != selectedObject->getRect()) {
+ m_diagramController->startUpdateElement(selectedObject, diagram, DiagramController::UPDATE_GEOMETRY);
+ selectedObject->setAutoSize(false);
+ selectedObject->setRect(newRect);
+ m_diagramController->finishUpdateElement(selectedObject, diagram, false);
}
}
}
@@ -564,59 +564,59 @@ void DiagramSceneController::alignOnRaster(DElement *element, MDiagram *diagram)
element->accept(&visitor);
}
-DElement *DiagramSceneController::addModelElement(const Uid &model_element_key, const QPointF &pos, MDiagram *diagram)
+DElement *DiagramSceneController::addModelElement(const Uid &modelElementKey, const QPointF &pos, MDiagram *diagram)
{
DElement *element = 0;
- if (MObject *model_object = m_modelController->findObject(model_element_key)) {
- element = addObject(model_object, pos, diagram);
- } else if (MRelation *model_relation = m_modelController->findRelation(model_element_key)) {
- element = addRelation(model_relation, QList<QPointF>(), diagram);
+ if (MObject *modelObject = m_modelController->findObject(modelElementKey)) {
+ element = addObject(modelObject, pos, diagram);
+ } else if (MRelation *modelRelation = m_modelController->findRelation(modelElementKey)) {
+ element = addRelation(modelRelation, QList<QPointF>(), diagram);
} else {
QMT_CHECK(false);
}
return element;
}
-DObject *DiagramSceneController::addObject(MObject *model_object, const QPointF &pos, MDiagram *diagram)
+DObject *DiagramSceneController::addObject(MObject *modelObject, const QPointF &pos, MDiagram *diagram)
{
- QMT_CHECK(model_object);
+ QMT_CHECK(modelObject);
- if (m_diagramController->hasDelegate(model_object, diagram)) {
+ if (m_diagramController->hasDelegate(modelObject, diagram)) {
return 0;
}
m_diagramController->getUndoController()->beginMergeSequence(tr("Add Element"));
DFactory factory;
- model_object->accept(&factory);
- DObject *diagram_object = dynamic_cast<DObject *>(factory.getProduct());
- QMT_CHECK(diagram_object);
- diagram_object->setPos(pos);
- m_diagramController->addElement(diagram_object, diagram);
- alignOnRaster(diagram_object, diagram);
+ modelObject->accept(&factory);
+ DObject *diagramObject = dynamic_cast<DObject *>(factory.getProduct());
+ QMT_CHECK(diagramObject);
+ diagramObject->setPos(pos);
+ m_diagramController->addElement(diagramObject, diagram);
+ alignOnRaster(diagramObject, diagram);
// add all relations between any other element on diagram and new element
foreach (DElement *delement, diagram->getDiagramElements()) {
- if (delement != diagram_object) {
+ if (delement != diagramObject) {
DObject *dobject = dynamic_cast<DObject *>(delement);
if (dobject) {
MObject *mobject = m_modelController->findObject(dobject->getModelUid());
if (mobject) {
foreach (const Handle<MRelation> &handle, mobject->getRelations()) {
if (handle.hasTarget()
- && ((handle.getTarget()->getEndA() == model_object->getUid()
+ && ((handle.getTarget()->getEndA() == modelObject->getUid()
&& handle.getTarget()->getEndB() == mobject->getUid())
|| (handle.getTarget()->getEndA() == mobject->getUid()
- && handle.getTarget()->getEndB() == model_object->getUid()))) {
+ && handle.getTarget()->getEndB() == modelObject->getUid()))) {
addRelation(handle.getTarget(), QList<QPointF>(), diagram);
}
}
- foreach (const Handle<MRelation> &handle, model_object->getRelations()) {
+ foreach (const Handle<MRelation> &handle, modelObject->getRelations()) {
if (handle.hasTarget()
- && ((handle.getTarget()->getEndA() == model_object->getUid()
+ && ((handle.getTarget()->getEndA() == modelObject->getUid()
&& handle.getTarget()->getEndB() == mobject->getUid())
|| (handle.getTarget()->getEndA() == mobject->getUid()
- && handle.getTarget()->getEndB() == model_object->getUid()))) {
+ && handle.getTarget()->getEndB() == modelObject->getUid()))) {
addRelation(handle.getTarget(), QList<QPointF>(), diagram);
}
}
@@ -626,48 +626,48 @@ DObject *DiagramSceneController::addObject(MObject *model_object, const QPointF
}
// add all self relations
- foreach (const Handle<MRelation> &handle, model_object->getRelations()) {
+ foreach (const Handle<MRelation> &handle, modelObject->getRelations()) {
if (handle.hasTarget ()
- && handle.getTarget()->getEndA() == model_object->getUid()
- && handle.getTarget()->getEndB() == model_object->getUid()) {
+ && handle.getTarget()->getEndA() == modelObject->getUid()
+ && handle.getTarget()->getEndB() == modelObject->getUid()) {
addRelation(handle.getTarget(), QList<QPointF>(), diagram);
}
}
m_diagramController->getUndoController()->endMergeSequence();
- return diagram_object;
+ return diagramObject;
}
-DRelation *DiagramSceneController::addRelation(MRelation *model_relation, const QList<QPointF> &intermediate_points, MDiagram *diagram)
+DRelation *DiagramSceneController::addRelation(MRelation *modelRelation, const QList<QPointF> &intermediatePoints, MDiagram *diagram)
{
- QMT_CHECK(model_relation);
+ QMT_CHECK(modelRelation);
- if (m_diagramController->hasDelegate(model_relation, diagram)) {
+ if (m_diagramController->hasDelegate(modelRelation, diagram)) {
return 0;
}
DFactory factory;
- model_relation->accept(&factory);
- DRelation *diagram_relation = dynamic_cast<DRelation *>(factory.getProduct());
- QMT_CHECK(diagram_relation);
-
- MObject *end_a_model_object = m_modelController->findObject(model_relation->getEndA());
- QMT_CHECK(end_a_model_object);
- DObject *end_a_diagram_object = m_diagramController->findDelegate<DObject>(end_a_model_object, diagram);
- QMT_CHECK(end_a_diagram_object);
- diagram_relation->setEndA(end_a_diagram_object->getUid());
-
- MObject *end_b_model_object = m_modelController->findObject(model_relation->getEndB());
- QMT_CHECK(end_b_model_object);
- DObject *end_b_diagram_object = m_diagramController->findDelegate<DObject>(end_b_model_object, diagram);
- QMT_CHECK(end_b_diagram_object);
- diagram_relation->setEndB(end_b_diagram_object->getUid());
-
- QList<DRelation::IntermediatePoint> relation_points;
- if (end_a_diagram_object->getUid() == end_b_diagram_object->getUid() && intermediate_points.isEmpty()) {
+ modelRelation->accept(&factory);
+ DRelation *diagramRelation = dynamic_cast<DRelation *>(factory.getProduct());
+ QMT_CHECK(diagramRelation);
+
+ MObject *endAModelObject = m_modelController->findObject(modelRelation->getEndA());
+ QMT_CHECK(endAModelObject);
+ DObject *endADiagramObject = m_diagramController->findDelegate<DObject>(endAModelObject, diagram);
+ QMT_CHECK(endADiagramObject);
+ diagramRelation->setEndA(endADiagramObject->getUid());
+
+ MObject *endBModelObject = m_modelController->findObject(modelRelation->getEndB());
+ QMT_CHECK(endBModelObject);
+ DObject *endBDiagramObject = m_diagramController->findDelegate<DObject>(endBModelObject, diagram);
+ QMT_CHECK(endBDiagramObject);
+ diagramRelation->setEndB(endBDiagramObject->getUid());
+
+ QList<DRelation::IntermediatePoint> relationPoints;
+ if (endADiagramObject->getUid() == endBDiagramObject->getUid() && intermediatePoints.isEmpty()) {
// create some intermediate points for self-relation
- QRectF rect = end_a_diagram_object->getRect().translated(end_a_diagram_object->getPos());
+ QRectF rect = endADiagramObject->getRect().translated(endADiagramObject->getPos());
static const qreal EDGE_RADIUS = 30.0;
qreal w = rect.width() * 0.25;
if (w > EDGE_RADIUS) {
@@ -680,20 +680,20 @@ DRelation *DiagramSceneController::addRelation(MRelation *model_relation, const
QPointF i1(rect.x() - EDGE_RADIUS, rect.bottom() - h);
QPointF i2(rect.x() - EDGE_RADIUS, rect.bottom() + EDGE_RADIUS);
QPointF i3(rect.x() + w, rect.bottom() + EDGE_RADIUS);
- relation_points.append(DRelation::IntermediatePoint(i1));
- relation_points.append(DRelation::IntermediatePoint(i2));
- relation_points.append(DRelation::IntermediatePoint(i3));
+ relationPoints.append(DRelation::IntermediatePoint(i1));
+ relationPoints.append(DRelation::IntermediatePoint(i2));
+ relationPoints.append(DRelation::IntermediatePoint(i3));
} else {
- foreach (const QPointF &intermediate_point, intermediate_points) {
- relation_points.append(DRelation::IntermediatePoint(intermediate_point));
+ foreach (const QPointF &intermediatePoint, intermediatePoints) {
+ relationPoints.append(DRelation::IntermediatePoint(intermediatePoint));
}
}
- diagram_relation->setIntermediatePoints(relation_points);
+ diagramRelation->setIntermediatePoints(relationPoints);
- m_diagramController->addElement(diagram_relation, diagram);
- alignOnRaster(diagram_relation, diagram);
+ m_diagramController->addElement(diagramRelation, diagram);
+ alignOnRaster(diagramRelation, diagram);
- return diagram_relation;
+ return diagramRelation;
}
}
diff --git a/src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.h b/src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.h
index 662204528e6f41318d7316c0543377a9995a497c..eb29d7125d345545868283210fd65e65f036508f 100644
--- a/src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.h
+++ b/src/libs/3rdparty/modeling/qmt/tasks/diagramscenecontroller.h
@@ -77,19 +77,19 @@ public:
ModelController *getModelController() const { return m_modelController; }
- void setModelController(ModelController *model_controller);
+ void setModelController(ModelController *modelController);
DiagramController *getDiagramController() const { return m_diagramController; }
- void setDiagramController(DiagramController *diagram_controller);
+ void setDiagramController(DiagramController *diagramController);
IElementTasks *getElementTasks() const { return m_elementTasks; }
- void setElementTasks(IElementTasks *element_tasks);
+ void setElementTasks(IElementTasks *elementTasks);
ISceneInspector *getSceneInspector() const { return m_sceneInspector; }
- void setSceneInspector(ISceneInspector *scene_inspector);
+ void setSceneInspector(ISceneInspector *sceneInspector);
public:
@@ -97,25 +97,25 @@ public:
public:
- void createDependency(DObject *end_a_object, DObject *end_b_object, const QList<QPointF> &intermediate_points, MDiagram *diagram);
+ void createDependency(DObject *endAObject, DObject *endBObject, const QList<QPointF> &intermediatePoints, MDiagram *diagram);
- void createInheritance(DClass *derived_class, DClass *base_class, const QList<QPointF> &intermediate_points, MDiagram *diagram);
+ void createInheritance(DClass *derivedClass, DClass *baseClass, const QList<QPointF> &intermediatePoints, MDiagram *diagram);
- void createAssociation(DClass *end_a_class, DClass *end_b_class, const QList<QPointF> &intermediate_points, MDiagram *diagram);
+ void createAssociation(DClass *endAClass, DClass *endBClass, const QList<QPointF> &intermediatePoints, MDiagram *diagram);
- bool isAddingAllowed(const Uid &model_element_key, MDiagram *diagram);
+ bool isAddingAllowed(const Uid &modelElementKey, MDiagram *diagram);
- void addExistingModelElement(const Uid &model_element_key, const QPointF &pos, MDiagram *diagram);
+ void addExistingModelElement(const Uid &modelElementKey, const QPointF &pos, MDiagram *diagram);
- void dropNewElement(const QString &new_element_id, const QString &name, const QString &stereotype, DElement *top_most_element_at_pos, const QPointF &pos, MDiagram *diagram);
+ void dropNewElement(const QString &newElementId, const QString &name, const QString &stereotype, DElement *topMostElementAtPos, const QPointF &pos, MDiagram *diagram);
- void dropNewModelElement(MObject *model_object, MPackage *parent_package, const QPointF &pos, MDiagram *diagram);
+ void dropNewModelElement(MObject *modelObject, MPackage *parentPackage, const QPointF &pos, MDiagram *diagram);
public:
- MPackage *findSuitableParentPackage(DElement *topmost_diagram_element, MDiagram *diagram);
+ MPackage *findSuitableParentPackage(DElement *topmostDiagramElement, MDiagram *diagram);
- MDiagram *findDiagramBySearchId(MPackage *package, const QString &diagram_name);
+ MDiagram *findDiagramBySearchId(MPackage *package, const QString &diagramName);
public:
@@ -131,11 +131,11 @@ public:
void alignVCenter(DObject *object, const DSelection &selection, MDiagram *diagram);
- void alignWidth(DObject *object, const DSelection &selection, const QSizeF &minimum_size, MDiagram *diagram);
+ void alignWidth(DObject *object, const DSelection &selection, const QSizeF &minimumSize, MDiagram *diagram);
- void alignHeight(DObject *object, const DSelection &selection, const QSizeF &minimum_size, MDiagram *diagram);
+ void alignHeight(DObject *object, const DSelection &selection, const QSizeF &minimumSize, MDiagram *diagram);
- void alignSize(DObject *object, const DSelection &selection, const QSizeF &minimum_size, MDiagram *diagram);
+ void alignSize(DObject *object, const DSelection &selection, const QSizeF &minimumSize, MDiagram *diagram);
void distributeHorizontal(DObject *object, const DSelection &selection, MDiagram *diagram);
@@ -145,17 +145,17 @@ public:
private:
- void alignPosition(DObject *object, const DSelection &selection, QPointF (*aligner)(DObject *object, DObject *other_object), MDiagram *diagram);
+ void alignPosition(DObject *object, const DSelection &selection, QPointF (*aligner)(DObject *object, DObject *otherObject), MDiagram *diagram);
- void alignSize(DObject *object, const DSelection &selection, const QSizeF &minimum_size, QRectF (*aligner)(DObject *, const QSizeF &), MDiagram *diagram);
+ void alignSize(DObject *object, const DSelection &selection, const QSizeF &minimumSize, QRectF (*aligner)(DObject *, const QSizeF &), MDiagram *diagram);
void alignOnRaster(DElement *element, MDiagram *diagram);
- DElement *addModelElement(const Uid &model_element_key, const QPointF &pos, MDiagram *diagram);
+ DElement *addModelElement(const Uid &modelElementKey, const QPointF &pos, MDiagram *diagram);
- DObject *addObject(MObject *model_object, const QPointF &pos, MDiagram *diagram);
+ DObject *addObject(MObject *modelObject, const QPointF &pos, MDiagram *diagram);
- DRelation *addRelation(MRelation *model_relation, const QList<QPointF> &intermediate_points, MDiagram *diagram);
+ DRelation *addRelation(MRelation *modelRelation, const QList<QPointF> &intermediatePoints, MDiagram *diagram);
private:
diff --git a/src/libs/3rdparty/modeling/qstringparser/qstringparser.cpp b/src/libs/3rdparty/modeling/qstringparser/qstringparser.cpp
index a02722a0d695f475ff594e39a573aeb034f8de25..f08e5365e82fa6328220d3c4242c039b9998e5d1 100644
--- a/src/libs/3rdparty/modeling/qstringparser/qstringparser.cpp
+++ b/src/libs/3rdparty/modeling/qstringparser/qstringparser.cpp
@@ -101,7 +101,7 @@ bool QStringParser::Parser::scan(int *i, int *index)
bool QStringParser::Parser::scan(double *d, int *index)
{
- int start_index = *index;
+ int startIndex = *index;
// skip whitespaces
while (*index < m_source.length() && m_source.at(*index).isSpace()) {
++(*index);
@@ -145,7 +145,7 @@ bool QStringParser::Parser::scan(double *d, int *index)
}
}
bool ok = false;
- *d = m_source.mid(start_index, *index - start_index).toDouble(&ok);
+ *d = m_source.mid(startIndex, *index - startIndex).toDouble(&ok);
return ok;
}
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/access.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/access.h
index 88f96121a7315c17fd98376b58ea01c4d28a8de4..51a0c60df600b259fd30de53b8979efb505aaa4d 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/access.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/access.h
@@ -38,12 +38,12 @@ class Access {
public:
static void save(Archive &archive, const T &t)
{
- serialize_helper(archive, const_cast<T &>(t));
+ serializeHelper(archive, const_cast<T &>(t));
}
static void load(Archive &archive, T &t)
{
- serialize_helper(archive, t);
+ serializeHelper(archive, t);
}
static void serialize(Archive &archive, T &t);
@@ -80,7 +80,7 @@ void serialize(Archive &archive, T &t)
}
template<class Archive, class T>
-void serialize_helper(Archive &archive, T &t)
+void serializeHelper(Archive &archive, T &t)
{
serialize(archive, t);
}
@@ -99,8 +99,8 @@ void serialize_helper(Archive &archive, T &t)
template<class Archive> \
class Access<Archive, TYPE> { \
public: \
- static inline void save(Archive &archive, const TYPE &t) { serialize_helper(archive, const_cast<TYPE &>(t)); } \
- static inline void load(Archive &archive, TYPE &t) { serialize_helper(archive, t); } \
+ static inline void save(Archive &archive, const TYPE &t) { serializeHelper(archive, const_cast<TYPE &>(t)); } \
+ static inline void load(Archive &archive, TYPE &t) { serializeHelper(archive, t); } \
static inline void serialize(Archive &archive, TYPE &); \
};
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/archivebasics.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/archivebasics.h
index 0ac075784d9285189453060ad990b1b6f5084ed7..4cadd82866db587b4c317872e8766d38e5a04921 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/archivebasics.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/archivebasics.h
@@ -64,11 +64,11 @@ public:
}
template<typename T>
- T getUserData(const QString &key, const T &default_value)
+ T getUserData(const QString &key, const T &defaultValue)
{
// gcc 4.8.2 fails to compile if the following 2 statements are written in one expression
//return m_userData.value(key, data).value<T>();
- QVariant v = m_userData.value(key, default_value);
+ QVariant v = m_userData.value(key, defaultValue);
return v.value<T>();
}
@@ -84,7 +84,7 @@ public:
}
private:
- Flag::mask_type m_flags;
+ Flag::maskType m_flags;
QHash<QString, QVariant> m_userData;
};
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/attribute.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/attribute.h
index 059bbf5bfdc41bb968ae72c99ede8faae88ff1e4..bcd526f807cf8f5941956a80b28bd989f8bd62cb 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/attribute.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/attribute.h
@@ -40,14 +40,14 @@ namespace qark {
template<typename T>
class Attr {
public:
- Attr(const QString &qualified_name, T *value)
- : m_qualifiedName(qualified_name),
+ Attr(const QString &qualifiedName, T *value)
+ : m_qualifiedName(qualifiedName),
m_value(value)
{
}
- Attr(const QString &qualified_name, T *value, const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ Attr(const QString &qualifiedName, T *value, const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_value(value),
m_parameters(parameters)
{
@@ -66,42 +66,42 @@ private:
};
template<typename T>
-Attr<T * const> attr(const QString &qualified_name, T * const &value)
+Attr<T * const> attr(const QString &qualifiedName, T * const &value)
{
- return Attr<T * const>(qualified_name, &value);
+ return Attr<T * const>(qualifiedName, &value);
}
template<typename T>
-Attr<T * const> attr(const QString &qualified_name, T * const &value, const Parameters ¶meters)
+Attr<T * const> attr(const QString &qualifiedName, T * const &value, const Parameters ¶meters)
{
- return Attr<T * const>(qualified_name, &value, parameters);
+ return Attr<T * const>(qualifiedName, &value, parameters);
}
template<typename T>
-Attr<T> attr(const QString &qualified_name, T &value)
+Attr<T> attr(const QString &qualifiedName, T &value)
{
- return Attr<T>(qualified_name, &value);
+ return Attr<T>(qualifiedName, &value);
}
template<typename T>
-Attr<T> attr(const QString &qualified_name, T &value, const Parameters ¶meters)
+Attr<T> attr(const QString &qualifiedName, T &value, const Parameters ¶meters)
{
- return Attr<T>(qualified_name, &value, parameters);
+ return Attr<T>(qualifiedName, &value, parameters);
}
template<class U, typename T>
class GetterAttr {
public:
- GetterAttr(const QString &qualified_name, const U &u, T (U::*getter)() const)
- : m_qualifiedName(qualified_name),
+ GetterAttr(const QString &qualifiedName, const U &u, T (U::*getter)() const)
+ : m_qualifiedName(qualifiedName),
m_u(u),
m_getter(getter)
{
}
- GetterAttr(const QString &qualified_name, const U &u, T (U::*getter)() const, const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ GetterAttr(const QString &qualifiedName, const U &u, T (U::*getter)() const, const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_u(u),
m_getter(getter),
m_parameters(parameters)
@@ -124,30 +124,30 @@ private:
};
template<class U, typename T>
-GetterAttr<U, T> attr(const QString &qualified_name, const U &u, T (U::*getter)() const)
+GetterAttr<U, T> attr(const QString &qualifiedName, const U &u, T (U::*getter)() const)
{
- return GetterAttr<U, T>(qualified_name, u, getter);
+ return GetterAttr<U, T>(qualifiedName, u, getter);
}
template<class U, typename T>
-GetterAttr<U, T> attr(const QString &qualified_name, const U &u, T (U::*getter)() const, const Parameters ¶meters)
+GetterAttr<U, T> attr(const QString &qualifiedName, const U &u, T (U::*getter)() const, const Parameters ¶meters)
{
- return GetterAttr<U, T>(qualified_name, u, getter, parameters);
+ return GetterAttr<U, T>(qualifiedName, u, getter, parameters);
}
template<class U, typename T>
class SetterAttr {
public:
- SetterAttr(const QString &qualified_name, U &u, void (U::*setter)(T))
- : m_qualifiedName(qualified_name),
+ SetterAttr(const QString &qualifiedName, U &u, void (U::*setter)(T))
+ : m_qualifiedName(qualifiedName),
m_u(u),
m_setter(setter)
{
}
- SetterAttr(const QString &qualified_name, U &u, void (U::*setter)(T), const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ SetterAttr(const QString &qualifiedName, U &u, void (U::*setter)(T), const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_u(u),
m_setter(setter),
m_parameters(parameters)
@@ -170,31 +170,31 @@ private:
};
template<class U, typename T>
-SetterAttr<U, T> attr(const QString &qualified_name, U &u, void (U::*setter)(T))
+SetterAttr<U, T> attr(const QString &qualifiedName, U &u, void (U::*setter)(T))
{
- return SetterAttr<U, T>(qualified_name, u, setter);
+ return SetterAttr<U, T>(qualifiedName, u, setter);
}
template<class U, typename T>
-SetterAttr<U, T> attr(const QString &qualified_name, U &u, void (U::*setter)(T), const Parameters ¶meters)
+SetterAttr<U, T> attr(const QString &qualifiedName, U &u, void (U::*setter)(T), const Parameters ¶meters)
{
- return SetterAttr<U, T>(qualified_name, u, setter, parameters);
+ return SetterAttr<U, T>(qualifiedName, u, setter, parameters);
}
template<class U, typename T, typename V>
class GetterSetterAttr {
public:
- GetterSetterAttr(const QString &qualified_name, U &u, T (U::*getter)() const, void (U::*setter)(V))
- : m_qualifiedName(qualified_name),
+ GetterSetterAttr(const QString &qualifiedName, U &u, T (U::*getter)() const, void (U::*setter)(V))
+ : m_qualifiedName(qualifiedName),
m_u(u),
m_getter(getter),
m_setter(setter)
{
}
- GetterSetterAttr(const QString &qualified_name, U &u, T (U::*getter)() const, void (U::*setter)(V), const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ GetterSetterAttr(const QString &qualifiedName, U &u, T (U::*getter)() const, void (U::*setter)(V), const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_u(u),
m_getter(getter),
m_setter(setter),
@@ -221,32 +221,32 @@ private:
};
template<class U, typename T, typename V>
-GetterSetterAttr<U, T, V> attr(const QString &qualified_name, U &u, T (U::*getter)() const, void (U::*setter)(V))
+GetterSetterAttr<U, T, V> attr(const QString &qualifiedName, U &u, T (U::*getter)() const, void (U::*setter)(V))
{
- return GetterSetterAttr<U, T, V>(qualified_name, u, getter, setter);
+ return GetterSetterAttr<U, T, V>(qualifiedName, u, getter, setter);
}
template<class U, typename T, typename V>
-GetterSetterAttr<U, T, V> attr(const QString &qualified_name, U &u, T (U::*getter)() const, void (U::*setter)(V), const Parameters ¶meters)
+GetterSetterAttr<U, T, V> attr(const QString &qualifiedName, U &u, T (U::*getter)() const, void (U::*setter)(V), const Parameters ¶meters)
{
- return GetterSetterAttr<U, T, V>(qualified_name, u, getter, setter, parameters);
+ return GetterSetterAttr<U, T, V>(qualifiedName, u, getter, setter, parameters);
}
template<class U, typename T>
class GetFuncAttr {
public:
- GetFuncAttr(const QString &qualified_name, U &u, T (*get_func)(const U &))
- : m_qualifiedName(qualified_name),
+ GetFuncAttr(const QString &qualifiedName, U &u, T (*getFunc)(const U &))
+ : m_qualifiedName(qualifiedName),
m_u(u),
- m_getFunc(get_func)
+ m_getFunc(getFunc)
{
}
- GetFuncAttr(const QString &qualified_name, U &u, T (*get_func)(const U &), const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ GetFuncAttr(const QString &qualifiedName, U &u, T (*getFunc)(const U &), const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_u(u),
- m_getFunc(get_func),
+ m_getFunc(getFunc),
m_parameters(parameters)
{
}
@@ -267,32 +267,32 @@ private:
};
template<class U, typename T>
-GetFuncAttr<U, T> attr(const QString &qualified_name, const U &u, T (*get_func)(const U &))
+GetFuncAttr<U, T> attr(const QString &qualifiedName, const U &u, T (*getFunc)(const U &))
{
- return GetFuncAttr<U, T>(qualified_name, u, get_func);
+ return GetFuncAttr<U, T>(qualifiedName, u, getFunc);
}
template<class U, typename T>
-GetFuncAttr<U, T> attr(const QString &qualified_name, const U &u, T (*get_func)(const U &), const Parameters ¶meters)
+GetFuncAttr<U, T> attr(const QString &qualifiedName, const U &u, T (*getFunc)(const U &), const Parameters ¶meters)
{
- return GetFuncAttr<U, T>(qualified_name, u, get_func, parameters);
+ return GetFuncAttr<U, T>(qualifiedName, u, getFunc, parameters);
}
template<class U, typename T>
class SetFuncAttr {
public:
- SetFuncAttr(const QString &qualified_name, U &u, void (*set_func)(U &, T))
- : m_qualifiedName(qualified_name),
+ SetFuncAttr(const QString &qualifiedName, U &u, void (*setFunc)(U &, T))
+ : m_qualifiedName(qualifiedName),
m_u(u),
- m_setFunc(set_func)
+ m_setFunc(setFunc)
{
}
- SetFuncAttr(const QString &qualified_name, U &u, void (*set_func)(U &, T), const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ SetFuncAttr(const QString &qualifiedName, U &u, void (*setFunc)(U &, T), const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_u(u),
- m_setFunc(set_func),
+ m_setFunc(setFunc),
m_parameters(parameters)
{
}
@@ -313,34 +313,34 @@ private:
};
template<class U, typename T>
-SetFuncAttr<U, T> attr(const QString &qualified_name, U &u, void (*set_func)(U &, T))
+SetFuncAttr<U, T> attr(const QString &qualifiedName, U &u, void (*setFunc)(U &, T))
{
- return SetFuncAttr<U, T>(qualified_name, u, set_func);
+ return SetFuncAttr<U, T>(qualifiedName, u, setFunc);
}
template<class U, typename T>
-SetFuncAttr<U, T> attr(const QString &qualified_name, U &u, void (*set_func)(U &, T), const Parameters ¶meters)
+SetFuncAttr<U, T> attr(const QString &qualifiedName, U &u, void (*setFunc)(U &, T), const Parameters ¶meters)
{
- return SetFuncAttr<U, T>(qualified_name, u, set_func, parameters);
+ return SetFuncAttr<U, T>(qualifiedName, u, setFunc, parameters);
}
template<class U, typename T, typename V>
class GetSetFuncAttr {
public:
- GetSetFuncAttr(const QString &qualified_name, U &u, T (*get_func)(const U &), void (*set_func)(U &, V))
- : m_qualifiedName(qualified_name),
+ GetSetFuncAttr(const QString &qualifiedName, U &u, T (*getFunc)(const U &), void (*setFunc)(U &, V))
+ : m_qualifiedName(qualifiedName),
m_u(u),
- m_getFunc(get_func),
- m_setFunc(set_func)
+ m_getFunc(getFunc),
+ m_setFunc(setFunc)
{
}
- GetSetFuncAttr(const QString &qualified_name, U &u, T (*get_func)(const U &), void (*set_func)(U &, V), const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ GetSetFuncAttr(const QString &qualifiedName, U &u, T (*getFunc)(const U &), void (*setFunc)(U &, V), const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_u(u),
- m_getFunc(get_func),
- m_setFunc(set_func),
+ m_getFunc(getFunc),
+ m_setFunc(setFunc),
m_parameters(parameters)
{
}
@@ -364,15 +364,15 @@ private:
};
template<class U, typename T, typename V>
-GetSetFuncAttr<U, T, V> attr(const QString &qualified_name, U &u, T (*get_func)(const U &), void (*set_func)(U &, V))
+GetSetFuncAttr<U, T, V> attr(const QString &qualifiedName, U &u, T (*getFunc)(const U &), void (*setFunc)(U &, V))
{
- return GetSetFuncAttr<U, T, V>(qualified_name, u, get_func, set_func);
+ return GetSetFuncAttr<U, T, V>(qualifiedName, u, getFunc, setFunc);
}
template<class U, typename T, typename V>
-GetSetFuncAttr<U, T, V> attr(const QString &qualified_name, U &u, T (*get_func)(const U &), void (*set_func)(U &, V), const Parameters ¶meters)
+GetSetFuncAttr<U, T, V> attr(const QString &qualifiedName, U &u, T (*getFunc)(const U &), void (*setFunc)(U &, V), const Parameters ¶meters)
{
- return GetSetFuncAttr<U, T, V>(qualified_name, u, get_func, set_func, parameters);
+ return GetSetFuncAttr<U, T, V>(qualifiedName, u, getFunc, setFunc, parameters);
}
}
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/baseclass.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/baseclass.h
index ad6aa9970eacf5cd2497f939e1ffeb123bdcd99b..efc9ef7b7e03740a8c204fb13cf245b3fba49a07 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/baseclass.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/baseclass.h
@@ -42,14 +42,14 @@ namespace qark {
template<class BASE, class DERIVED>
class Base {
public:
- Base(const QString &qualified_name, DERIVED &obj)
- : m_qualifiedName(qualified_name),
+ Base(const QString &qualifiedName, DERIVED &obj)
+ : m_qualifiedName(qualifiedName),
m_base(obj)
{
}
- Base(const QString &qualified_name, DERIVED &obj, const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ Base(const QString &qualifiedName, DERIVED &obj, const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_base(obj),
m_parameters(parameters)
{
@@ -70,39 +70,39 @@ private:
};
template<class BASE, class DERIVED>
-Base<BASE, DERIVED> base(const QString &qualified_name, DERIVED &obj)
+Base<BASE, DERIVED> base(const QString &qualifiedName, DERIVED &obj)
{
- return Base<BASE, DERIVED>(qualified_name, obj);
+ return Base<BASE, DERIVED>(qualifiedName, obj);
}
template<class BASE, class DERIVED>
-Base<BASE, DERIVED> base(const QString &qualified_name, DERIVED &obj, const Parameters ¶meters)
+Base<BASE, DERIVED> base(const QString &qualifiedName, DERIVED &obj, const Parameters ¶meters)
{
- return Base<BASE, DERIVED>(qualified_name, obj, parameters);
+ return Base<BASE, DERIVED>(qualifiedName, obj, parameters);
}
template<class BASE, class DERIVED>
-Base<BASE, DERIVED> base(const QString &qualified_name, DERIVED *&obj)
+Base<BASE, DERIVED> base(const QString &qualifiedName, DERIVED *&obj)
{
- return Base<BASE, DERIVED>(qualified_name, *obj);
+ return Base<BASE, DERIVED>(qualifiedName, *obj);
}
template<class BASE, class DERIVED>
-Base<BASE, DERIVED> base(const QString &qualified_name, DERIVED *&obj, const Parameters ¶meters)
+Base<BASE, DERIVED> base(const QString &qualifiedName, DERIVED *&obj, const Parameters ¶meters)
{
- return Base<BASE, DERIVED>(qualified_name, *obj, parameters);
+ return Base<BASE, DERIVED>(qualifiedName, *obj, parameters);
}
template<class BASE, class DERIVED>
Base<BASE, DERIVED> base(DERIVED &obj)
{
- return Base<BASE, DERIVED>(QString(QStringLiteral("base-%1")).arg(get_type_uid<BASE>()), obj);
+ return Base<BASE, DERIVED>(QString(QStringLiteral("base-%1")).arg(getTypeUid<BASE>()), obj);
}
template<class BASE, class DERIVED>
Base<BASE, DERIVED> base(DERIVED &obj, const Parameters ¶meters)
{
- return Base<BASE, DERIVED>(QString(QStringLiteral("base-%1")).arg(get_type_uid<BASE>()), obj, parameters);
+ return Base<BASE, DERIVED>(QString(QStringLiteral("base-%1")).arg(getTypeUid<BASE>()), obj, parameters);
}
}
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/flag.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/flag.h
index f8e6fcbc3cc28659207c96fe781f0b2522b0c578..8757e8bb185e2868f56b144dad31f3ebd03e1e20 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/flag.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/flag.h
@@ -35,15 +35,15 @@ namespace qark {
class Flag {
public:
- typedef unsigned int mask_type;
+ typedef unsigned int maskType;
explicit Flag() : m_mask(m_nextMask) { m_nextMask *= 2; }
- mask_type getMask() const { return m_mask; }
+ maskType getMask() const { return m_mask; }
private:
- static mask_type m_nextMask;
- mask_type m_mask;
+ static maskType m_nextMask;
+ maskType m_mask;
};
}
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/loadingrefmap.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/loadingrefmap.h
index ad116635e4da759a39c22b92514041fc6cd140c7..8868ac7e11bc44ba9e45901e1563b66fd24d366c 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/loadingrefmap.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/loadingrefmap.h
@@ -61,13 +61,13 @@ public:
private:
- typedef ObjectId key_type;
- typedef void * value_type;
- typedef QMap<key_type, value_type> map_type;
+ typedef ObjectId keyType;
+ typedef void * valueType;
+ typedef QMap<keyType, valueType> mapType;
private:
- map_type m_references;
+ mapType m_references;
};
}
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/savingrefmap.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/savingrefmap.h
index b06c9ea2961369c975e9f6b16f610abb19aae4c2..a5c358999af0fee828c7689175e9da0ce7aaacc3 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/savingrefmap.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/impl/savingrefmap.h
@@ -74,21 +74,21 @@ public:
private:
- bool hasRef(const void *address, const char *type_name);
+ bool hasRef(const void *address, const char *typeName);
- bool hasDefinedRef(const void *address, const char *type_name);
+ bool hasDefinedRef(const void *address, const char *typeName);
- ObjectId getRef(const void *address, const char *type_name, bool define);
+ ObjectId getRef(const void *address, const char *typeName, bool define);
private:
- typedef QPair<const void *, const char *> key_type;
- typedef QPair<ObjectId, bool> value_type;
- typedef QMap<key_type, value_type> map_type;
+ typedef QPair<const void *, const char *> keyType;
+ typedef QPair<ObjectId, bool> valueType;
+ typedef QMap<keyType, valueType> mapType;
private:
- map_type m_references;
+ mapType m_references;
ObjectId m_nextRef;
};
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/parameters.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/parameters.h
index 19403883566f22d0e417260f6adb625aa7f3e024..4e0013938a869851332782f0a326ebda48480c19 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/parameters.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/parameters.h
@@ -62,7 +62,7 @@ public:
private:
- Flag::mask_type m_flags;
+ Flag::maskType m_flags;
};
}
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmlinarchive.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmlinarchive.h
index a8c06f3f5c5ed7f82b9603b96e8c987345e8b25b..faece5b1552a0a264adc8c1a81dbc3af7093d243 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmlinarchive.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmlinarchive.h
@@ -63,8 +63,8 @@ public:
{
};
- static const bool in_archive = true;
- static const bool out_archive = false;
+ static const bool inArchive = true;
+ static const bool outArchive = false;
private:
@@ -72,12 +72,12 @@ private:
class Node {
public:
- typedef QList<Node *> children_type;
+ typedef QList<Node *> childrenType;
public:
virtual ~Node() { qDeleteAll(m_children); }
- const children_type &getChildren() const { return m_children; }
+ const childrenType &getChildren() const { return m_children; }
virtual QString getQualifiedName() const = 0;
@@ -86,7 +86,7 @@ private:
void append(Node *node) { m_children.push_back(node); }
private:
- children_type m_children;
+ childrenType m_children;
};
class TagNode :
@@ -385,11 +385,11 @@ public:
{
Node *node = m_nodeStack.pop();
if (m_nodeStack.empty()) {
- XmlTag xml_tag = readTag();
- if (xml_tag.m_tagName != node->getQualifiedName() || xml_tag.m_endTag) {
+ XmlTag xmlTag = readTag();
+ if (xmlTag.m_tagName != node->getQualifiedName() || xmlTag.m_endTag) {
throw FileFormatException();
}
- node->accept(*this, xml_tag);
+ node->accept(*this, xmlTag);
delete node;
}
}
@@ -518,10 +518,10 @@ public:
};
struct ReferenceTag {
- explicit ReferenceTag(ReferenceKind k = NULLPOINTER, const QString &string = QLatin1String("")) : kind(k), type_name(string) { }
+ explicit ReferenceTag(ReferenceKind k = NULLPOINTER, const QString &string = QLatin1String("")) : kind(k), typeName(string) { }
ReferenceKind kind;
- QString type_name;
+ QString typeName;
};
ReferenceTag readReferenceTag()
@@ -578,22 +578,22 @@ private:
void readChildren(Node *node) {
for (;;) {
- XmlTag xml_tag = readTag();
- if (xml_tag.m_endTag) {
- if (xml_tag.m_tagName != node->getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (xmlTag.m_endTag) {
+ if (xmlTag.m_tagName != node->getQualifiedName()) {
throw FileFormatException();
}
return;
} else {
- bool found_tag = false;
- for (Node::children_type::const_iterator it = node->getChildren().begin(); it != node->getChildren().end(); ++it) {
- if ((*it)->getQualifiedName() == xml_tag.m_tagName) {
- found_tag = true;
- (*it)->accept(*this, xml_tag);
+ bool foundTag = false;
+ for (Node::childrenType::const_iterator it = node->getChildren().begin(); it != node->getChildren().end(); ++it) {
+ if ((*it)->getQualifiedName() == xmlTag.m_tagName) {
+ foundTag = true;
+ (*it)->accept(*this, xmlTag);
}
}
- if (!found_tag) {
- skipUntilEndOfTag(xml_tag);
+ if (!foundTag) {
+ skipUntilEndOfTag(xmlTag);
}
}
}
@@ -622,8 +622,8 @@ private:
void visit(BaseNode<T, U> *node, const XmlTag &)
{
load(*this, node->getBase().getBase(), node->getBase().getParameters());
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getBase().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getBase().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -632,8 +632,8 @@ private:
void visit(AttrNode<T> *node, const XmlTag &)
{
load(*this, *node->getAttribute().getValue(), node->getAttribute().getParameters());
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getAttribute().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getAttribute().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -644,8 +644,8 @@ private:
T value;
load(*this, value, node->getAttribute().getParameters());
(node->getAttribute().getObject().*(node->getAttribute().getSetter()))(value);
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getAttribute().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getAttribute().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -656,8 +656,8 @@ private:
T value;
load(*this, value, node->getAttribute().getParameters());
(node->getAttribute().getObject().*(node->getAttribute().getSetter()))(value);
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getAttribute().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getAttribute().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -668,8 +668,8 @@ private:
V value;
load(*this, value, node->getAttribute().getParameters());
(node->getAttribute().getObject().*(node->getAttribute().getSetter()))(value);
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getAttribute().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getAttribute().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -680,8 +680,8 @@ private:
V value;
load(*this, value, node->getAttribute().getParameters());
(node->getAttribute().getObject().*(node->getAttribute().getSetter()))(value);
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getAttribute().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getAttribute().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -692,8 +692,8 @@ private:
T value;
load(*this, value, node->getAttribute().getParameters());
(node->getAttribute().getSetFunc())(node->getAttribute().getObject(), value);
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getAttribute().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getAttribute().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -704,8 +704,8 @@ private:
T value;
load(*this, value, node->getAttribute().getParameters());
(node->getAttribute().getSetFunc())(node->getAttribute().getObject(), value);
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getAttribute().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getAttribute().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -716,8 +716,8 @@ private:
V value;
load(*this, value, node->getAttribute().getParameters());
(node->getAttribute().getSetFunc())(node->getAttribute().getObject(), value);
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getAttribute().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getAttribute().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -728,8 +728,8 @@ private:
V value;
load(*this, value, node->getAttribute().getParameters());
(node->getAttribute().getSetFunc())(node->getAttribute().getObject(), value);
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getAttribute().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getAttribute().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -744,8 +744,8 @@ private:
*node->getReference().getValue() = value;
m_currentRefNode = 0;
}
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getReference().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getReference().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -760,8 +760,8 @@ private:
(node->getReference().getObject().*(node->getReference().getSetter()))(value);
m_currentRefNode = 0;
}
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getReference().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getReference().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -776,8 +776,8 @@ private:
(node->getReference().getObject().*(node->getReference().getSetter()))(value);
m_currentRefNode = 0;
}
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getReference().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getReference().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -792,8 +792,8 @@ private:
(node->getReference().getObject().*(node->getReference().getSetter()))(value);
m_currentRefNode = 0;
}
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getReference().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getReference().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -808,8 +808,8 @@ private:
(node->getReference().getObject().*(node->getReference().getSetter()))(value);
m_currentRefNode = 0;
}
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getReference().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getReference().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -824,8 +824,8 @@ private:
(node->getReference().getSetFunc())(node->getReference().getObject(), value);
m_currentRefNode = 0;
}
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getReference().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getReference().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -840,8 +840,8 @@ private:
(node->getReference().getSetFunc())(node->getReference().getObject(), value);
m_currentRefNode = 0;
}
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getReference().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getReference().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -856,8 +856,8 @@ private:
(node->getReference().getSetFunc())(node->getReference().getObject(), value);
m_currentRefNode = 0;
}
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getReference().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getReference().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -872,8 +872,8 @@ private:
(node->getReference().getSetFunc())(node->getReference().getObject(), value);
m_currentRefNode = 0;
}
- XmlTag xml_tag = readTag();
- if (!xml_tag.m_endTag || xml_tag.m_tagName != node->getReference().getQualifiedName()) {
+ XmlTag xmlTag = readTag();
+ if (!xmlTag.m_endTag || xmlTag.m_tagName != node->getReference().getQualifiedName()) {
throw FileFormatException();
}
}
@@ -882,7 +882,7 @@ private:
inline XmlTag readTag();
- inline void skipUntilEndOfTag(const XmlTag &xml_tag);
+ inline void skipUntilEndOfTag(const XmlTag &xmlTag);
private:
QXmlStreamReader &m_stream;
@@ -895,22 +895,22 @@ private:
QXmlInArchive::XmlTag QXmlInArchive::readTag()
{
- XmlTag xml_tag;
+ XmlTag xmlTag;
if (m_endTagWasRead) {
if (m_stream.tokenType() != QXmlStreamReader::EndElement) {
throw FileFormatException();
}
- xml_tag.m_tagName = m_stream.name().toString();
- xml_tag.m_endTag = true;
+ xmlTag.m_tagName = m_stream.name().toString();
+ xmlTag.m_endTag = true;
m_endTagWasRead = false;
- return xml_tag;
+ return xmlTag;
}
while (!m_stream.atEnd()) {
switch (m_stream.readNext()) {
case QXmlStreamReader::StartElement:
- xml_tag.m_tagName = m_stream.name().toString();
+ xmlTag.m_tagName = m_stream.name().toString();
foreach (const QXmlStreamAttribute &attribute, m_stream.attributes()) {
if (attribute.name() == QLatin1String("id")) {
bool ok = false;
@@ -918,17 +918,17 @@ QXmlInArchive::XmlTag QXmlInArchive::readTag()
if (!ok) {
throw FileFormatException();
}
- xml_tag.m_id = impl::ObjectId(id);
+ xmlTag.m_id = impl::ObjectId(id);
} else {
- xml_tag.m_attributes.insert(attribute.name().toString(), attribute.value().toString());
+ xmlTag.m_attributes.insert(attribute.name().toString(), attribute.value().toString());
}
}
- return xml_tag;
+ return xmlTag;
case QXmlStreamReader::EndElement:
- xml_tag.m_tagName = m_stream.name().toString();
- xml_tag.m_endTag = true;
- return xml_tag;
+ xmlTag.m_tagName = m_stream.name().toString();
+ xmlTag.m_endTag = true;
+ return xmlTag;
case QXmlStreamReader::Comment:
// intentionally left blank
break;
@@ -944,7 +944,7 @@ QXmlInArchive::XmlTag QXmlInArchive::readTag()
throw FileFormatException();
}
-void QXmlInArchive::skipUntilEndOfTag(const XmlTag &xml_tag)
+void QXmlInArchive::skipUntilEndOfTag(const XmlTag &xmlTag)
{
if (m_endTagWasRead) {
throw FileFormatException();
@@ -958,7 +958,7 @@ void QXmlInArchive::skipUntilEndOfTag(const XmlTag &xml_tag)
case QXmlStreamReader::EndElement:
--depth;
if (depth == 0) {
- if (m_stream.name().toString() != xml_tag.m_tagName) {
+ if (m_stream.name().toString() != xmlTag.m_tagName) {
throw FileFormatException();
}
return;
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmloutarchive.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmloutarchive.h
index 5f07df7ebe6089f83e28e645c77543b6465d4572..9a183733cfd5645d5e2c28191fdb51f3eb02453f 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmloutarchive.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/qxmloutarchive.h
@@ -59,8 +59,8 @@ public:
{
};
- static const bool in_archive = false;
- static const bool out_archive = true;
+ static const bool inArchive = false;
+ static const bool outArchive = true;
public:
@@ -327,10 +327,10 @@ public:
m_stream.writeStartElement(QLatin1String("instance"));
}
- void beginInstance(const QString &type_uid)
+ void beginInstance(const QString &typeUid)
{
m_stream.writeStartElement(QLatin1String("instance"));
- m_stream.writeAttribute(QLatin1String("type"), type_uid);
+ m_stream.writeAttribute(QLatin1String("type"), typeUid);
}
void endInstance()
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/reference.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/reference.h
index c11f8a8f530af9e18d0bcc00ec645d7a2aa71516..f4dbc6ab970dd788c92112a877d418c44c80b77d 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/reference.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/reference.h
@@ -40,14 +40,14 @@ namespace qark {
template<typename T>
class Ref {
public:
- Ref(const QString &qualified_name, T *value)
- : m_qualifiedName(qualified_name),
+ Ref(const QString &qualifiedName, T *value)
+ : m_qualifiedName(qualifiedName),
m_value(value)
{
}
- Ref(const QString &qualified_name, T *value, const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ Ref(const QString &qualifiedName, T *value, const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_value(value),
m_parameters(parameters)
{
@@ -66,42 +66,42 @@ private:
};
template<typename T>
-Ref<T * const> ref(const QString &qualified_name, T * const &value)
+Ref<T * const> ref(const QString &qualifiedName, T * const &value)
{
- return Ref<T * const>(qualified_name, &value);
+ return Ref<T * const>(qualifiedName, &value);
}
template<typename T>
-Ref<T * const> ref(const QString &qualified_name, T * const &value, const Parameters ¶meters)
+Ref<T * const> ref(const QString &qualifiedName, T * const &value, const Parameters ¶meters)
{
- return Ref<T * const>(qualified_name, &value, parameters);
+ return Ref<T * const>(qualifiedName, &value, parameters);
}
template<typename T>
-Ref<T *> ref(const QString &qualified_name, T *&value)
+Ref<T *> ref(const QString &qualifiedName, T *&value)
{
- return Ref<T *>(qualified_name, &value);
+ return Ref<T *>(qualifiedName, &value);
}
template<typename T>
-Ref<T *> ref(const QString &qualified_name, T *&value, const Parameters ¶meters)
+Ref<T *> ref(const QString &qualifiedName, T *&value, const Parameters ¶meters)
{
- return Ref<T *>(qualified_name, &value, parameters);
+ return Ref<T *>(qualifiedName, &value, parameters);
}
template<class U, typename T>
class GetterRef {
public:
- GetterRef(const QString &qualified_name, const U &u, T (U::*getter)() const)
- : m_qualifiedName(qualified_name),
+ GetterRef(const QString &qualifiedName, const U &u, T (U::*getter)() const)
+ : m_qualifiedName(qualifiedName),
m_u(u),
m_getter(getter)
{
}
- GetterRef(const QString &qualified_name, const U &u, T (U::*getter)() const, const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ GetterRef(const QString &qualifiedName, const U &u, T (U::*getter)() const, const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_u(u),
m_getter(getter),
m_parameters(parameters)
@@ -124,30 +124,30 @@ private:
};
template<class U, typename T>
-GetterRef<U, T *> ref(const QString &qualified_name, const U &u, T *(U::*getter)() const)
+GetterRef<U, T *> ref(const QString &qualifiedName, const U &u, T *(U::*getter)() const)
{
- return GetterRef<U, T *>(qualified_name, u, getter);
+ return GetterRef<U, T *>(qualifiedName, u, getter);
}
template<class U, typename T>
-GetterRef<U, T *> ref(const QString &qualified_name, const U &u, T *(U::*getter)() const, const Parameters ¶meters)
+GetterRef<U, T *> ref(const QString &qualifiedName, const U &u, T *(U::*getter)() const, const Parameters ¶meters)
{
- return GetterRef<U, T *>(qualified_name, u, getter, parameters);
+ return GetterRef<U, T *>(qualifiedName, u, getter, parameters);
}
template<class U, typename T>
class SetterRef {
public:
- SetterRef(const QString &qualified_name, U &u, void (U::*setter)(T))
- : m_qualifiedName(qualified_name),
+ SetterRef(const QString &qualifiedName, U &u, void (U::*setter)(T))
+ : m_qualifiedName(qualifiedName),
m_u(u),
m_setter(setter)
{
}
- SetterRef(const QString &qualified_name, U &u, void (U::*setter)(T), const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ SetterRef(const QString &qualifiedName, U &u, void (U::*setter)(T), const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_u(u),
m_setter(setter),
m_parameters(parameters)
@@ -170,43 +170,43 @@ private:
};
template<class U, class T>
-SetterRef<U, T *> ref(const QString &qualified_name, U &u, void (U::*setter)(T *))
+SetterRef<U, T *> ref(const QString &qualifiedName, U &u, void (U::*setter)(T *))
{
- return SetterRef<U, T *>(qualified_name, u, setter);
+ return SetterRef<U, T *>(qualifiedName, u, setter);
}
template<class U, class T>
-SetterRef<U, T *> ref(const QString &qualified_name, U &u, void (U::*setter)(T *), const Parameters ¶meters)
+SetterRef<U, T *> ref(const QString &qualifiedName, U &u, void (U::*setter)(T *), const Parameters ¶meters)
{
- return SetterRef<U, T *>(qualified_name, u, setter, parameters);
+ return SetterRef<U, T *>(qualifiedName, u, setter, parameters);
}
template<class U, class T>
-SetterRef<U, T * const &> ref(const QString &qualified_name, U &u, void (U::*setter)(T * const &))
+SetterRef<U, T * const &> ref(const QString &qualifiedName, U &u, void (U::*setter)(T * const &))
{
- return SetterRef<U, T * const &>(qualified_name, u, setter);
+ return SetterRef<U, T * const &>(qualifiedName, u, setter);
}
template<class U, class T>
-SetterRef<U, T * const &> ref(const QString &qualified_name, U &u, void (U::*setter)(T * const &), const Parameters ¶meters)
+SetterRef<U, T * const &> ref(const QString &qualifiedName, U &u, void (U::*setter)(T * const &), const Parameters ¶meters)
{
- return SetterRef<U, T * const &>(qualified_name, u, setter, parameters);
+ return SetterRef<U, T * const &>(qualifiedName, u, setter, parameters);
}
template<class U, typename T, typename V>
class GetterSetterRef {
public:
- GetterSetterRef(const QString &qualified_name, U &u, T (U::*getter)() const, void (U::*setter)(V))
- : m_qualifiedName(qualified_name),
+ GetterSetterRef(const QString &qualifiedName, U &u, T (U::*getter)() const, void (U::*setter)(V))
+ : m_qualifiedName(qualifiedName),
m_u(u),
m_getter(getter),
m_setter(setter)
{
}
- GetterSetterRef(const QString &qualified_name, U &u, T (U::*getter)() const, void (U::*setter)(V), const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ GetterSetterRef(const QString &qualifiedName, U &u, T (U::*getter)() const, void (U::*setter)(V), const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_u(u),
m_getter(getter),
m_setter(setter),
@@ -233,44 +233,44 @@ private:
};
template<class U, typename T, typename V>
-GetterSetterRef<U, T *, V *> ref(const QString &qualified_name, U &u, T *(U::*getter)() const, void (U::*setter)(V *))
+GetterSetterRef<U, T *, V *> ref(const QString &qualifiedName, U &u, T *(U::*getter)() const, void (U::*setter)(V *))
{
- return GetterSetterRef<U, T *, V *>(qualified_name, u, getter, setter);
+ return GetterSetterRef<U, T *, V *>(qualifiedName, u, getter, setter);
}
template<class U, typename T, typename V>
-GetterSetterRef<U, T *, V *> ref(const QString &qualified_name, U &u, T *(U::*getter)() const, void (U::*setter)(V *), const Parameters ¶meters)
+GetterSetterRef<U, T *, V *> ref(const QString &qualifiedName, U &u, T *(U::*getter)() const, void (U::*setter)(V *), const Parameters ¶meters)
{
- return GetterSetterRef<U, T *, V *>(qualified_name, u, getter, setter, parameters);
+ return GetterSetterRef<U, T *, V *>(qualifiedName, u, getter, setter, parameters);
}
template<class U, typename T, typename V>
-GetterSetterRef<U, T *, V * const &> ref(const QString &qualified_name, U &u, T *(U::*getter)() const, void (U::*setter)(V * const &))
+GetterSetterRef<U, T *, V * const &> ref(const QString &qualifiedName, U &u, T *(U::*getter)() const, void (U::*setter)(V * const &))
{
- return GetterSetterRef<U, T *, V * const &>(qualified_name, u, getter, setter);
+ return GetterSetterRef<U, T *, V * const &>(qualifiedName, u, getter, setter);
}
template<class U, typename T, typename V>
-GetterSetterRef<U, T *, V * const &> ref(const QString &qualified_name, U &u, T *(U::*getter)() const, void (U::*setter)(V * const &), const Parameters ¶meters)
+GetterSetterRef<U, T *, V * const &> ref(const QString &qualifiedName, U &u, T *(U::*getter)() const, void (U::*setter)(V * const &), const Parameters ¶meters)
{
- return GetterSetterRef<U, T *, V * const &>(qualified_name, u, getter, setter, parameters);
+ return GetterSetterRef<U, T *, V * const &>(qualifiedName, u, getter, setter, parameters);
}
template<class U, typename T>
class GetFuncRef {
public:
- GetFuncRef(const QString &qualified_name, const U &u, T (*get_func)(const U &))
- : m_qualifiedName(qualified_name),
+ GetFuncRef(const QString &qualifiedName, const U &u, T (*getFunc)(const U &))
+ : m_qualifiedName(qualifiedName),
m_u(u),
- m_getFunc(get_func)
+ m_getFunc(getFunc)
{
}
- GetFuncRef(const QString &qualified_name, const U &u, T (*get_func)(const U &), const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ GetFuncRef(const QString &qualifiedName, const U &u, T (*getFunc)(const U &), const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_u(u),
- m_getFunc(get_func),
+ m_getFunc(getFunc),
m_parameters(parameters)
{
}
@@ -291,32 +291,32 @@ private:
};
template<class U, typename T>
-GetFuncRef<U, T *> ref(const QString &qualified_name, const U &u, T *(*get_func)(const U &))
+GetFuncRef<U, T *> ref(const QString &qualifiedName, const U &u, T *(*getFunc)(const U &))
{
- return GetFuncRef<U, T *>(qualified_name, u, get_func);
+ return GetFuncRef<U, T *>(qualifiedName, u, getFunc);
}
template<class U, typename T>
-GetFuncRef<U, T *> ref(const QString &qualified_name, const U &u, T *(*get_func)(const U &), const Parameters ¶meters)
+GetFuncRef<U, T *> ref(const QString &qualifiedName, const U &u, T *(*getFunc)(const U &), const Parameters ¶meters)
{
- return GetFuncRef<U, T *>(qualified_name, u, get_func, parameters);
+ return GetFuncRef<U, T *>(qualifiedName, u, getFunc, parameters);
}
template<class U, typename T>
class SetFuncRef {
public:
- SetFuncRef(const QString &qualified_name, U &u, void (*set_func)(U &, T))
- : m_qualifiedName(qualified_name),
+ SetFuncRef(const QString &qualifiedName, U &u, void (*setFunc)(U &, T))
+ : m_qualifiedName(qualifiedName),
m_u(u),
- m_setFunc(set_func)
+ m_setFunc(setFunc)
{
}
- SetFuncRef(const QString &qualified_name, U &u, void (*set_func)(U &, T), const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ SetFuncRef(const QString &qualifiedName, U &u, void (*setFunc)(U &, T), const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_u(u),
- m_setFunc(set_func),
+ m_setFunc(setFunc),
m_parameters(parameters)
{
}
@@ -337,46 +337,46 @@ private:
};
template<class U, class T>
-SetFuncRef<U, T *> ref(const QString &qualified_name, U &u, void (*set_func)(U &, T *))
+SetFuncRef<U, T *> ref(const QString &qualifiedName, U &u, void (*setFunc)(U &, T *))
{
- return SetFuncRef<U, T *>(qualified_name, u, set_func);
+ return SetFuncRef<U, T *>(qualifiedName, u, setFunc);
}
template<class U, class T>
-SetFuncRef<U, T *> ref(const QString &qualified_name, U &u, void (*set_func)(U &, T *), const Parameters ¶meters)
+SetFuncRef<U, T *> ref(const QString &qualifiedName, U &u, void (*setFunc)(U &, T *), const Parameters ¶meters)
{
- return SetFuncRef<U, T *>(qualified_name, u, set_func, parameters);
+ return SetFuncRef<U, T *>(qualifiedName, u, setFunc, parameters);
}
template<class U, class T>
-SetFuncRef<U, T * const &> ref(const QString &qualified_name, U &u, void (*set_func)(U &, T * const &))
+SetFuncRef<U, T * const &> ref(const QString &qualifiedName, U &u, void (*setFunc)(U &, T * const &))
{
- return SetFuncRef<U, T * const &>(qualified_name, u, set_func);
+ return SetFuncRef<U, T * const &>(qualifiedName, u, setFunc);
}
template<class U, class T>
-SetFuncRef<U, T * const &> ref(const QString &qualified_name, U &u, void (*set_func)(U &, T * const &), const Parameters ¶meters)
+SetFuncRef<U, T * const &> ref(const QString &qualifiedName, U &u, void (*setFunc)(U &, T * const &), const Parameters ¶meters)
{
- return SetFuncRef<U, T * const &>(qualified_name, u, set_func, parameters);
+ return SetFuncRef<U, T * const &>(qualifiedName, u, setFunc, parameters);
}
template<class U, typename T, typename V>
class GetSetFuncRef {
public:
- GetSetFuncRef(const QString &qualified_name, U &u, T (*get_func)(const U &), void (*set_func)(U &, V))
- : m_qualifiedName(qualified_name),
+ GetSetFuncRef(const QString &qualifiedName, U &u, T (*getFunc)(const U &), void (*setFunc)(U &, V))
+ : m_qualifiedName(qualifiedName),
m_u(u),
- m_getFunc(get_func),
- m_setFunc(set_func)
+ m_getFunc(getFunc),
+ m_setFunc(setFunc)
{
}
- GetSetFuncRef(const QString &qualified_name, U &u, T (*get_func)(const U &), void (*set_func)(U &, V), const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ GetSetFuncRef(const QString &qualifiedName, U &u, T (*getFunc)(const U &), void (*setFunc)(U &, V), const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_u(u),
- m_getFunc(get_func),
- m_setFunc(set_func),
+ m_getFunc(getFunc),
+ m_setFunc(setFunc),
m_parameters(parameters)
{
}
@@ -400,27 +400,27 @@ private:
};
template<class U, typename T, typename V>
-GetSetFuncRef<U, T *, V *> ref(const QString &qualified_name, U &u, T *(*get_func)(const U &), void (*set_func)(U &, V *))
+GetSetFuncRef<U, T *, V *> ref(const QString &qualifiedName, U &u, T *(*getFunc)(const U &), void (*setFunc)(U &, V *))
{
- return GetSetFuncRef<U, T *, V *>(qualified_name, u, get_func, set_func);
+ return GetSetFuncRef<U, T *, V *>(qualifiedName, u, getFunc, setFunc);
}
template<class U, typename T, typename V>
-GetSetFuncRef<U, T *, V *> ref(const QString &qualified_name, U &u, T *(*get_func)(const U &), void (*set_func)(U &, V *), const Parameters ¶meters)
+GetSetFuncRef<U, T *, V *> ref(const QString &qualifiedName, U &u, T *(*getFunc)(const U &), void (*setFunc)(U &, V *), const Parameters ¶meters)
{
- return GetSetFuncRef<U, T *, V *>(qualified_name, u, get_func, set_func, parameters);
+ return GetSetFuncRef<U, T *, V *>(qualifiedName, u, getFunc, setFunc, parameters);
}
template<class U, typename T, typename V>
-GetSetFuncRef<U, T *, V * const &> ref(const QString &qualified_name, U &u, T *(*get_func)(const U &), void (*set_func)(U &, V * const &))
+GetSetFuncRef<U, T *, V * const &> ref(const QString &qualifiedName, U &u, T *(*getFunc)(const U &), void (*setFunc)(U &, V * const &))
{
- return GetSetFuncRef<U, T *, V * const &>(qualified_name, u, get_func, set_func);
+ return GetSetFuncRef<U, T *, V * const &>(qualifiedName, u, getFunc, setFunc);
}
template<class U, typename T, typename V>
-GetSetFuncRef<U, T *, V * const &> ref(const QString &qualified_name, U &u, T *(*get_func)(const U &), void (*set_func)(U &, V * const &), const Parameters ¶meters)
+GetSetFuncRef<U, T *, V * const &> ref(const QString &qualifiedName, U &u, T *(*getFunc)(const U &), void (*setFunc)(U &, V * const &), const Parameters ¶meters)
{
- return GetSetFuncRef<U, T *, V * const &>(qualified_name, u, get_func, set_func, parameters);
+ return GetSetFuncRef<U, T *, V * const &>(qualifiedName, u, getFunc, setFunc, parameters);
}
}
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize.h
index f471d3460f9b6547afb684dd2c374c83a98d5aba..1285911222827aaccc29b8d81f4c81cb0e6701b2 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize.h
@@ -64,13 +64,13 @@ inline Archive &operator>>(Archive &archive, T &t)
}
template<class Archive, class T>
-typename std::enable_if<Archive::out_archive, Archive &>::type operator||(Archive &archive, T &t)
+typename std::enable_if<Archive::outArchive, Archive &>::type operator||(Archive &archive, T &t)
{
return archive << t;
}
template<class Archive, class T>
-typename std::enable_if<Archive::in_archive, Archive &>::type operator||(Archive &archive, T &t)
+typename std::enable_if<Archive::inArchive, Archive &>::type operator||(Archive &archive, T &t)
{
return archive >> t;
}
@@ -90,13 +90,13 @@ inline Archive &operator>>(Archive &archive, T (*f)())
}
template<class Archive, class T>
-typename std::enable_if<Archive::out_archive, Archive &>::type operator||(Archive &archive, T (*f)())
+typename std::enable_if<Archive::outArchive, Archive &>::type operator||(Archive &archive, T (*f)())
{
return archive << f;
}
template<class Archive, class T>
-typename std::enable_if<Archive::in_archive, Archive &>::type operator||(Archive &archive, T (*f)())
+typename std::enable_if<Archive::inArchive, Archive &>::type operator||(Archive &archive, T (*f)())
{
return archive >> f;
}
@@ -116,13 +116,13 @@ inline Archive &operator>>(Archive &archive, const Tag &tag)
}
template<class Archive>
-typename std::enable_if<Archive::out_archive, Archive &>::type operator||(Archive &archive, const Tag &tag)
+typename std::enable_if<Archive::outArchive, Archive &>::type operator||(Archive &archive, const Tag &tag)
{
return archive << tag;
}
template<class Archive>
-typename std::enable_if<Archive::in_archive, Archive &>::type operator||(Archive &archive, const Tag &tag)
+typename std::enable_if<Archive::inArchive, Archive &>::type operator||(Archive &archive, const Tag &tag)
{
return archive >> tag;
}
@@ -142,13 +142,13 @@ inline Archive &operator>>(Archive &archive, const Object<T> &object)
}
template<class Archive, class T>
-typename std::enable_if<Archive::out_archive, Archive &>::type operator||(Archive &archive, const Object<T> &object)
+typename std::enable_if<Archive::outArchive, Archive &>::type operator||(Archive &archive, const Object<T> &object)
{
return archive << object;
}
template<class Archive, class T>
-typename std::enable_if<Archive::in_archive, Archive &>::type operator||(Archive &archive, const Object<T> &object)
+typename std::enable_if<Archive::inArchive, Archive &>::type operator||(Archive &archive, const Object<T> &object)
{
return archive >> object;
}
@@ -168,13 +168,13 @@ inline Archive &operator>>(Archive &archive, const End &end)
}
template<class Archive>
-typename std::enable_if<Archive::out_archive, Archive &>::type operator||(Archive &archive, const End &end)
+typename std::enable_if<Archive::outArchive, Archive &>::type operator||(Archive &archive, const End &end)
{
return archive << end;
}
template<class Archive>
-typename std::enable_if<Archive::in_archive, Archive &>::type operator||(Archive &archive, const End &end)
+typename std::enable_if<Archive::inArchive, Archive &>::type operator||(Archive &archive, const End &end)
{
return archive >> end;
}
@@ -196,13 +196,13 @@ Archive &operator>>(Archive &archive, const Base<T, U> &base)
}
template<class Archive, class T, class U>
-typename std::enable_if<Archive::out_archive, Archive &>::type operator||(Archive &archive, const Base<T, U> &base)
+typename std::enable_if<Archive::outArchive, Archive &>::type operator||(Archive &archive, const Base<T, U> &base)
{
return archive << base;
}
template<class Archive, class T, class U>
-typename std::enable_if<Archive::in_archive, Archive &>::type operator||(Archive &archive, const Base<T, U> &base)
+typename std::enable_if<Archive::inArchive, Archive &>::type operator||(Archive &archive, const Base<T, U> &base)
{
return archive >> base;
}
@@ -224,13 +224,13 @@ Archive &operator>>(Archive &archive, const Attr<T> &attr)
}
template<class Archive, typename T>
-typename std::enable_if<Archive::out_archive, Archive &>::type operator||(Archive &archive, const Attr<T> &attr)
+typename std::enable_if<Archive::outArchive, Archive &>::type operator||(Archive &archive, const Attr<T> &attr)
{
return archive << attr;
}
template<class Archive, typename T>
-typename std::enable_if<Archive::in_archive, Archive &>::type operator||(Archive &archive, const Attr<T> &attr)
+typename std::enable_if<Archive::inArchive, Archive &>::type operator||(Archive &archive, const Attr<T> &attr)
{
return archive >> attr;
}
@@ -296,13 +296,13 @@ Archive &operator>>(Archive &archive, const GetterSetterAttr<U, T, V> &attr)
}
template<class Archive, class U, typename T, typename V>
-typename std::enable_if<Archive::out_archive, Archive &>::type operator||(Archive &archive, const GetterSetterAttr<U, T, V> &attr)
+typename std::enable_if<Archive::outArchive, Archive &>::type operator||(Archive &archive, const GetterSetterAttr<U, T, V> &attr)
{
return archive << attr;
}
template<class Archive, class U, typename T, typename V>
-typename std::enable_if<Archive::in_archive, Archive &>::type operator||(Archive &archive, const GetterSetterAttr<U, T, V> &attr)
+typename std::enable_if<Archive::inArchive, Archive &>::type operator||(Archive &archive, const GetterSetterAttr<U, T, V> &attr)
{
return archive >> attr;
}
@@ -340,13 +340,13 @@ Archive &operator>>(Archive &archive, const GetSetFuncAttr<U, T, V> &attr)
}
template<class Archive, class U, typename T, typename V>
-typename std::enable_if<Archive::out_archive, Archive &>::type operator||(Archive &archive, const GetSetFuncAttr<U, T, V> &attr)
+typename std::enable_if<Archive::outArchive, Archive &>::type operator||(Archive &archive, const GetSetFuncAttr<U, T, V> &attr)
{
return archive << attr;
}
template<class Archive, class U, typename T, typename V>
-typename std::enable_if<Archive::in_archive, Archive &>::type operator||(Archive &archive, const GetSetFuncAttr<U, T, V> &attr)
+typename std::enable_if<Archive::inArchive, Archive &>::type operator||(Archive &archive, const GetSetFuncAttr<U, T, V> &attr)
{
return archive >> attr;
}
@@ -377,7 +377,7 @@ Archive &operator>>(Archive &archive, const Ref<T> &ref)
}
template<class Archive, typename T>
-typename std::enable_if<Archive::out_archive, Archive &>::type operator||(Archive &archive, const Ref<T *> &ref)
+typename std::enable_if<Archive::outArchive, Archive &>::type operator||(Archive &archive, const Ref<T *> &ref)
{
archive.beginReference(ref);
save(archive, *ref.getValue(), ref.getParameters());
@@ -386,7 +386,7 @@ typename std::enable_if<Archive::out_archive, Archive &>::type operator||(Archiv
}
template<class Archive, typename T>
-typename std::enable_if<Archive::in_archive, Archive &>::type operator||(Archive &archive, const Ref<T> &ref)
+typename std::enable_if<Archive::inArchive, Archive &>::type operator||(Archive &archive, const Ref<T> &ref)
{
return archive >> ref;
}
@@ -424,13 +424,13 @@ Archive &operator>>(Archive &archive, const GetterSetterRef<U, T, V> &ref)
}
template<class Archive, class U, typename T, typename V>
-typename std::enable_if<Archive::out_archive, Archive &>::type operator||(Archive &archive, const GetterSetterRef<U, T, V> &ref)
+typename std::enable_if<Archive::outArchive, Archive &>::type operator||(Archive &archive, const GetterSetterRef<U, T, V> &ref)
{
return archive << ref;
}
template<class Archive, class U, typename T, typename V>
-typename std::enable_if<Archive::in_archive, Archive &>::type operator||(Archive &archive, const GetterSetterRef<U, T, V> &ref)
+typename std::enable_if<Archive::inArchive, Archive &>::type operator||(Archive &archive, const GetterSetterRef<U, T, V> &ref)
{
return archive >> ref;
}
@@ -468,13 +468,13 @@ Archive &operator>>(Archive &archive, const GetSetFuncRef<U, T, V> &ref)
}
template<class Archive, class U, typename T, typename V>
-typename std::enable_if<Archive::out_archive, Archive &>::type operator||(Archive &archive, const GetSetFuncRef<U, T, V> &ref)
+typename std::enable_if<Archive::outArchive, Archive &>::type operator||(Archive &archive, const GetSetFuncRef<U, T, V> &ref)
{
return archive << ref;
}
template<class Archive, class U, typename T, typename V>
-typename std::enable_if<Archive::in_archive, Archive &>::type operator||(Archive &archive, const GetSetFuncRef<U, T, V> &ref)
+typename std::enable_if<Archive::inArchive, Archive &>::type operator||(Archive &archive, const GetSetFuncRef<U, T, V> &ref)
{
return archive >> ref;
}
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_basic.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_basic.h
index 05d3e82d481c23e1d04bbe0ccdfccfc51e1942f9..ff2029497b6423e54bcb77143d23ede81b2d59e5 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_basic.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_basic.h
@@ -118,17 +118,17 @@ inline void load(Archive &archive, QRectF &point, const Parameters &)
// QDateTime
template<class Archive>
-inline void save(Archive &archive, const QDateTime &date_time, const Parameters &)
+inline void save(Archive &archive, const QDateTime &dateTime, const Parameters &)
{
- archive << date_time.toMSecsSinceEpoch();
+ archive << dateTime.toMSecsSinceEpoch();
}
template<class Archive>
-inline void load(Archive &archive, QDateTime &date_time, const Parameters &)
+inline void load(Archive &archive, QDateTime &dateTime, const Parameters &)
{
qint64 t;
archive >> t;
- date_time = QDateTime::fromMSecsSinceEpoch(t);
+ dateTime = QDateTime::fromMSecsSinceEpoch(t);
}
}
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_pointer.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_pointer.h
index d90633a08bf0c2a4b90a49ba53f946f078a60487..e08a9e86a0191c37527db68333c086d72c091320 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_pointer.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/serialize_pointer.h
@@ -46,15 +46,15 @@ inline void save(Archive &archive, T *p, const Parameters &)
} else {
if (typeid(*p) == typeid(T)) {
archive.beginInstance();
- registry::save_pointer<Archive, T, T>(archive, p);
+ registry::savePointer<Archive, T, T>(archive, p);
archive.endInstance();
} else {
- archive.beginInstance(get_type_uid(*p));
- typename registry::TypeRegistry<Archive, T>::type_info type_data = get_type_info<Archive, T>(*p);
- if (type_data.save_func == 0) {
- throw unregistered_type();
+ archive.beginInstance(getTypeUid(*p));
+ typename registry::TypeRegistry<Archive, T>::typeInfo typeData = getTypeInfo<Archive, T>(*p);
+ if (typeData.m_saveFunc == 0) {
+ throw unregisteredType();
} else {
- type_data.save_func(archive, p);
+ typeData.m_saveFunc(archive, p);
}
archive.endInstance();
}
@@ -68,8 +68,8 @@ inline void save(Archive &archive, T *p, const Parameters &)
template<class Archive, class T>
void load(Archive &archive, T *&p, const Parameters &)
{
- typename Archive::ReferenceTag ref_tag = archive.readReferenceTag();
- switch (ref_tag.kind) {
+ typename Archive::ReferenceTag refTag = archive.readReferenceTag();
+ switch (refTag.kind) {
case Archive::NULLPOINTER:
p = 0;
break;
@@ -77,19 +77,19 @@ void load(Archive &archive, T *&p, const Parameters &)
archive.read(p);
break;
case Archive::INSTANCE:
- if (ref_tag.type_name.isEmpty()) {
- registry::load_non_virtual_pointer<Archive,T>(archive, p);
+ if (refTag.typeName.isEmpty()) {
+ registry::loadNonVirtualPointer<Archive,T>(archive, p);
} else {
- typename registry::TypeRegistry<Archive, T>::type_info type_data = get_type_info<Archive, T>(ref_tag.type_name);
- if (type_data.load_func == 0) {
- throw unregistered_type();
+ typename registry::TypeRegistry<Archive, T>::typeInfo typeData = getTypeInfo<Archive, T>(refTag.typeName);
+ if (typeData.m_loadFunc == 0) {
+ throw unregisteredType();
} else {
- type_data.load_func(archive, p);
+ typeData.m_loadFunc(archive, p);
}
}
break;
}
- archive.readReferenceEndTag(ref_tag.kind);
+ archive.readReferenceEndTag(refTag.kind);
}
}
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/tag.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/tag.h
index 3284ee1cbf963faa5fcadb29e964258635951150..5c1cb23a12935e74a1d0e3f0da8e72d88e0878cb 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/tag.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/tag.h
@@ -41,13 +41,13 @@ namespace qark {
class Tag {
public:
- explicit Tag(const QString &qualified_name)
- : m_qualifiedName(qualified_name)
+ explicit Tag(const QString &qualifiedName)
+ : m_qualifiedName(qualifiedName)
{
}
- Tag(const QString &qualified_name, const Parameters ¶meters)
- : m_qualifiedName(qualified_name),
+ Tag(const QString &qualifiedName, const Parameters ¶meters)
+ : m_qualifiedName(qualifiedName),
m_parameters(parameters)
{
}
@@ -67,14 +67,14 @@ class Object :
public Tag
{
public:
- Object(const QString &qualified_name, T *object)
- : Tag(qualified_name),
+ Object(const QString &qualifiedName, T *object)
+ : Tag(qualifiedName),
m_object(object)
{
}
- Object(const QString &qualified_name, T *object, const Parameters ¶meters)
- : Tag(qualified_name, parameters),
+ Object(const QString &qualifiedName, T *object, const Parameters ¶meters)
+ : Tag(qualifiedName, parameters),
m_object(object)
{
}
@@ -86,48 +86,48 @@ private:
};
-inline Tag tag(const QString &qualified_name)
+inline Tag tag(const QString &qualifiedName)
{
- return Tag(qualified_name);
+ return Tag(qualifiedName);
}
-inline Tag tag(const QString &qualified_name, const Parameters ¶meters)
+inline Tag tag(const QString &qualifiedName, const Parameters ¶meters)
{
- return Tag(qualified_name, parameters);
+ return Tag(qualifiedName, parameters);
}
-inline Tag tag(const char *qualified_name)
+inline Tag tag(const char *qualifiedName)
{
- return Tag(QLatin1String(qualified_name));
+ return Tag(QLatin1String(qualifiedName));
}
-inline Tag tag(const char *qualified_name, const Parameters ¶meters)
+inline Tag tag(const char *qualifiedName, const Parameters ¶meters)
{
- return Tag(QLatin1String(qualified_name), parameters);
+ return Tag(QLatin1String(qualifiedName), parameters);
}
template<class T>
inline Object<T> tag(T &object)
{
- return Object<T>(get_type_uid<T>(), &object);
+ return Object<T>(getTypeUid<T>(), &object);
}
template<class T>
inline Object<T> tag(T &object, const Parameters ¶meters)
{
- return Object<T>(get_type_uid<T>(), &object, parameters);
+ return Object<T>(getTypeUid<T>(), &object, parameters);
}
template<class T>
-inline Object<T> tag(const QString &qualified_name, T &object)
+inline Object<T> tag(const QString &qualifiedName, T &object)
{
- return Object<T>(qualified_name, &object);
+ return Object<T>(qualifiedName, &object);
}
template<class T>
-inline Object<T> tag(const QString &qualified_name, T &object, const Parameters ¶meters)
+inline Object<T> tag(const QString &qualifiedName, T &object, const Parameters ¶meters)
{
- return Object<T>(qualified_name, &object, parameters);
+ return Object<T>(qualifiedName, &object, parameters);
}
diff --git a/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h b/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h
index 89955c7bc894142dcf070040fdda5d3b98ba5af9..3ae5044f44a9c6c678b0b55ed467e392ba52c42e 100644
--- a/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h
+++ b/src/libs/3rdparty/modeling/qtserialization/inc/qark/typeregistry.h
@@ -45,12 +45,12 @@
namespace qark {
-class unregistered_type :
+class unregisteredType :
public std::exception
{
};
-class abstract_type :
+class abstractType :
public std::exception
{
};
@@ -63,18 +63,18 @@ template<int N>
class TypeNameMaps {
public:
- typedef QHash<QString, QString> map_type;
+ typedef QHash<QString, QString> mapType;
public:
- static map_type &get_name_to_uid_map() { return *typeid_name_to_uid_map; }
+ static mapType &getNameToUidMap() { return *typeidNameToUidMap; }
- static map_type &get_uid_to_name_map() { return *typeid_uid_to_name_map; }
+ static mapType &getUidToNameMap() { return *typeidUidToNameMap; }
#if !defined(QT_NO_DEBUG)
- static bool has_name_to_uid_map() { return typeid_name_to_uid_map != 0; }
+ static bool hasNameToUidMap() { return typeidNameToUidMap != 0; }
- static bool has_uid_to_name_map() { return typeid_uid_to_name_map != 0; }
+ static bool hasUidToNameMap() { return typeidUidToNameMap != 0; }
#endif
protected:
@@ -82,28 +82,28 @@ protected:
static void init()
{
static bool initialized = false;
- static map_type name_to_uid_map;
- static map_type uid_to_name_map;
+ static mapType nameToUidMap;
+ static mapType uidToNameMap;
if (!initialized) {
- typeid_name_to_uid_map = &name_to_uid_map;
- typeid_uid_to_name_map = &uid_to_name_map;
+ typeidNameToUidMap = &nameToUidMap;
+ typeidUidToNameMap = &uidToNameMap;
initialized = true;
}
}
private:
- static map_type *typeid_name_to_uid_map;
+ static mapType *typeidNameToUidMap;
- static map_type *typeid_uid_to_name_map;
+ static mapType *typeidUidToNameMap;
};
template<int N>
-typename TypeNameMaps<N>::map_type *TypeNameMaps<N>::typeid_name_to_uid_map;
+typename TypeNameMaps<N>::mapType *TypeNameMaps<N>::typeidNameToUidMap;
template<int N>
-typename TypeNameMaps<N>::map_type *TypeNameMaps<N>::typeid_uid_to_name_map;
+typename TypeNameMaps<N>::mapType *TypeNameMaps<N>::typeidUidToNameMap;
template<class T>
@@ -121,10 +121,10 @@ private:
static int __init(const QString &name)
{
base::init();
- QMT_CHECK(!base::get_name_to_uid_map().contains(QLatin1String(typeid(T).name())) || base::get_name_to_uid_map().value(QLatin1String(typeid(T).name())) == name);
- QMT_CHECK(!base::get_uid_to_name_map().contains(name) || base::get_uid_to_name_map().value(name) == QLatin1String(typeid(T).name()));
- base::get_name_to_uid_map().insert(QLatin1String(typeid(T).name()), name);
- base::get_uid_to_name_map().insert(name, QLatin1String(typeid(T).name()));
+ QMT_CHECK(!base::getNameToUidMap().contains(QLatin1String(typeid(T).name())) || base::getNameToUidMap().value(QLatin1String(typeid(T).name())) == name);
+ QMT_CHECK(!base::getUidToNameMap().contains(name) || base::getUidToNameMap().value(name) == QLatin1String(typeid(T).name()));
+ base::getNameToUidMap().insert(QLatin1String(typeid(T).name()), name);
+ base::getUidToNameMap().insert(name, QLatin1String(typeid(T).name()));
return 0;
}
};
@@ -135,61 +135,61 @@ template<class Archive, class BASE>
class TypeRegistry {
public:
- struct type_info {
+ struct typeInfo {
- typedef Archive &(*save_func_type)(Archive &, BASE * const &p);
- typedef Archive &(*load_func_type)(Archive &, BASE * &p);
+ typedef Archive &(*saveFuncType)(Archive &, BASE * const &p);
+ typedef Archive &(*loadFuncType)(Archive &, BASE * &p);
- explicit type_info()
- : save_func(0),
- load_func(0)
+ explicit typeInfo()
+ : m_saveFunc(0),
+ m_loadFunc(0)
{
}
- explicit type_info(save_func_type sfunc, load_func_type lfunc)
- : save_func(sfunc),
- load_func(lfunc)
+ explicit typeInfo(saveFuncType sfunc, loadFuncType lfunc)
+ : m_saveFunc(sfunc),
+ m_loadFunc(lfunc)
{
}
- bool operator==(const type_info &rhs) const
+ bool operator==(const typeInfo &rhs) const
{
- return save_func == rhs.save_func && load_func == rhs.load_func;
+ return m_saveFunc == rhs.m_saveFunc && m_loadFunc == rhs.m_loadFunc;
}
- save_func_type save_func;
- load_func_type load_func;
+ saveFuncType m_saveFunc;
+ loadFuncType m_loadFunc;
};
- typedef QHash<QString, type_info> map_type;
+ typedef QHash<QString, typeInfo> mapType;
public:
- static map_type &get_map() { return *map; }
+ static mapType &getMap() { return *map; }
#if !defined(QT_NO_DEBUG)
- static bool has_map() { return map != 0; }
+ static bool hasMap() { return map != 0; }
#endif
protected:
static void init() {
static bool initialized = false;
- static map_type the_map;
+ static mapType theMap;
if (!initialized) {
- map = &the_map;
+ map = &theMap;
initialized = true;
}
}
private:
- static map_type *map;
+ static mapType *map;
};
template<class Archive, class BASE>
-typename TypeRegistry<Archive, BASE>::map_type *TypeRegistry<Archive,BASE>::map;
+typename TypeRegistry<Archive, BASE>::mapType *TypeRegistry<Archive,BASE>::map;
template<class Archive, class BASE, class DERIVED>
@@ -199,26 +199,26 @@ class DerivedTypeRegistry :
typedef TypeRegistry<Archive, BASE> base;
- typedef Archive &(*save_func_type)(Archive &, BASE * const &);
+ typedef Archive &(*saveFuncType)(Archive &, BASE * const &);
- typedef Archive &(*load_func_type)(Archive &, BASE * &);
+ typedef Archive &(*loadFuncType)(Archive &, BASE * &);
private:
static int __static_init;
private:
- static int __init(save_func_type sfunc, load_func_type lfunc)
+ static int __init(saveFuncType sfunc, loadFuncType lfunc)
{
base::init();
- QMT_CHECK(!base::get_map().contains(QLatin1String(typeid(DERIVED).name())) || base::get_map().value(QLatin1String(typeid(DERIVED).name())) == typename base::type_info(sfunc, lfunc));
- base::get_map().insert(QLatin1String(typeid(DERIVED).name()), typename base::type_info(sfunc, lfunc));
+ QMT_CHECK(!base::getMap().contains(QLatin1String(typeid(DERIVED).name())) || base::getMap().value(QLatin1String(typeid(DERIVED).name())) == typename base::typeInfo(sfunc, lfunc));
+ base::getMap().insert(QLatin1String(typeid(DERIVED).name()), typename base::typeInfo(sfunc, lfunc));
return 0;
}
};
template<class Archive, class BASE, class DERIVED>
-Archive &save_pointer(Archive &ar, BASE * const &p)
+Archive &savePointer(Archive &ar, BASE * const &p)
{
DERIVED &t = dynamic_cast<DERIVED &>(*p);
save(ar, t, Parameters());
@@ -226,7 +226,7 @@ Archive &save_pointer(Archive &ar, BASE * const &p)
}
template<class Archive, class BASE, class DERIVED>
-Archive &load_pointer(Archive &ar, BASE *&p)
+Archive &loadPointer(Archive &ar, BASE *&p)
{
DERIVED *t = new DERIVED();
load(ar, *t, Parameters());
@@ -235,79 +235,79 @@ Archive &load_pointer(Archive &ar, BASE *&p)
}
template<class Archive, class T>
-typename std::enable_if<!std::is_abstract<T>::value, void>::type load_non_virtual_pointer(Archive &archive, T *&p)
+typename std::enable_if<!std::is_abstract<T>::value, void>::type loadNonVirtualPointer(Archive &archive, T *&p)
{
- registry::load_pointer<Archive, T, T>(archive, p);
+ registry::loadPointer<Archive, T, T>(archive, p);
}
template<class Archive, class T>
-typename std::enable_if<std::is_abstract<T>::value, void>::type load_non_virtual_pointer(Archive &archive, T *&p)
+typename std::enable_if<std::is_abstract<T>::value, void>::type loadNonVirtualPointer(Archive &archive, T *&p)
{
(void) archive;
(void) p;
- throw abstract_type();
+ throw abstractType();
}
-inline QString demangle_typename(const char *mangled_name)
+inline QString demangleTypename(const char *mangledName)
{
- // TODO convert compiler specific mangled_name into human readable type name
- return QLatin1String(mangled_name);
+ // TODO convert compiler specific mangledName into human readable type name
+ return QLatin1String(mangledName);
}
-inline QString flatten_typename(const char *type_name)
+inline QString flattenTypename(const char *typeName)
{
// convert C++ type name into simple identifier (no extra characters)
- return QString(QLatin1String(type_name)).replace(QChar(QLatin1Char(':')), QLatin1String("-"));
+ return QString(QLatin1String(typeName)).replace(QChar(QLatin1Char(':')), QLatin1String("-"));
}
}
template<class T>
-QString get_type_uid()
+QString getTypeUid()
{
-#if !defined(QT_NO_DEBUG) // avoid warning about unused function ::has_name_to_uid_map in Qt >= 5.5
- QMT_CHECK_X((registry::TypeNameRegistry<T>::has_name_to_uid_map()), "get_type_uid<T>()", "type maps are not correctly initialized");
- QMT_CHECK_X((registry::TypeNameRegistry<T>::get_name_to_uid_map().contains(QLatin1String(typeid(T).name()))), "get_type_uid<T>()",
- qPrintable(QString(QLatin1String("type with typeid %1 is not registered. Use QARK_REGISTER_TYPE or QARK_REGISTER_TYPE_NAME.")).arg(registry::demangle_typename(typeid(T).name()))));
+#if !defined(QT_NO_DEBUG) // avoid warning about unused function ::hasNameToUidMap in Qt >= 5.5
+ QMT_CHECK_X((registry::TypeNameRegistry<T>::hasNameToUidMap()), "getTypeUid<T>()", "type maps are not correctly initialized");
+ QMT_CHECK_X((registry::TypeNameRegistry<T>::getNameToUidMap().contains(QLatin1String(typeid(T).name()))), "getTypeUid<T>()",
+ qPrintable(QString(QLatin1String("type with typeid %1 is not registered. Use QARK_REGISTER_TYPE or QARK_REGISTER_TYPE_NAME.")).arg(registry::demangleTypename(typeid(T).name()))));
#endif
- return registry::TypeNameRegistry<T>::get_name_to_uid_map().value(QLatin1String(typeid(T).name()));
+ return registry::TypeNameRegistry<T>::getNameToUidMap().value(QLatin1String(typeid(T).name()));
}
template<class T>
-QString get_type_uid(const T &t)
+QString getTypeUid(const T &t)
{
Q_UNUSED(t);
-#if !defined(QT_NO_DEBUG) // avoid warning about unused function ::has_name_to_uid_map in Qt >= 5.5
- QMT_CHECK_X((registry::TypeNameRegistry<T>::has_name_to_uid_map()), "get_type_uid<T>()", "type maps are not correctly initialized");
- QMT_CHECK_X((registry::TypeNameRegistry<T>::get_name_to_uid_map().contains(QLatin1String(typeid(t).name()))), "get_type_uid<T>()",
- qPrintable(QString(QLatin1String("type with typeid %1 is not registered. Use QARK_REGISTER_TYPE or QARK_REGISTER_TYPE_NAME.")).arg(registry::demangle_typename(typeid(t).name()))));
+#if !defined(QT_NO_DEBUG) // avoid warning about unused function ::hasNameToUidMap in Qt >= 5.5
+ QMT_CHECK_X((registry::TypeNameRegistry<T>::hasNameToUidMap()), "getTypeUid<T>()", "type maps are not correctly initialized");
+ QMT_CHECK_X((registry::TypeNameRegistry<T>::getNameToUidMap().contains(QLatin1String(typeid(t).name()))), "getTypeUid<T>()",
+ qPrintable(QString(QLatin1String("type with typeid %1 is not registered. Use QARK_REGISTER_TYPE or QARK_REGISTER_TYPE_NAME.")).arg(registry::demangleTypename(typeid(t).name()))));
#endif
- return registry::TypeNameRegistry<T>::get_name_to_uid_map().value(QLatin1String(typeid(t).name()));
+ return registry::TypeNameRegistry<T>::getNameToUidMap().value(QLatin1String(typeid(t).name()));
}
template<class Archive, class T>
-typename registry::TypeRegistry<Archive, T>::type_info get_type_info(const T &t)
+typename registry::TypeRegistry<Archive, T>::typeInfo getTypeInfo(const T &t)
{
Q_UNUSED(t);
-#if !defined(QT_NO_DEBUG) // avoid warning about unused function ::has_name_to_uid_map in Qt >= 5.5
- QMT_CHECK_X((registry::TypeRegistry<Archive,T>::has_map()),
- qPrintable(QString(QLatin1String("TypeRegistry<Archive, %1>::get_type_info(const T&)")).arg(get_type_uid<T>())),
- qPrintable(QString(QLatin1String("%1 is not a registered base class. Declare your derived classes with QARK_REGISTER_DERIVED_CLASS.")).arg(get_type_uid<T>())));
+#if !defined(QT_NO_DEBUG) // avoid warning about unused function ::hasNameToUidMap in Qt >= 5.5
+ QMT_CHECK_X((registry::TypeRegistry<Archive,T>::hasMap()),
+ qPrintable(QString(QLatin1String("TypeRegistry<Archive, %1>::getTypeInfo(const T&)")).arg(getTypeUid<T>())),
+ qPrintable(QString(QLatin1String("%1 is not a registered base class. Declare your derived classes with QARK_REGISTER_DERIVED_CLASS.")).arg(getTypeUid<T>())));
#endif
- return registry::TypeRegistry<Archive,T>::get_map()[QLatin1String(typeid(t).name())];
+ return registry::TypeRegistry<Archive,T>::getMap()[QLatin1String(typeid(t).name())];
}
template<class Archive, class T>
-typename registry::TypeRegistry<Archive,T>::type_info get_type_info(const QString &uid)
+typename registry::TypeRegistry<Archive,T>::typeInfo getTypeInfo(const QString &uid)
{
-#if !defined(QT_NO_DEBUG) // avoid warning about unused function ::has_name_to_uid_map in Qt >= 5.5
- QMT_CHECK_X((registry::TypeNameRegistry<T>::has_uid_to_name_map()), "get_type_info<T>(const QString &)", "type maps are not correctly initialized");
- QMT_CHECK_X((registry::TypeRegistry<Archive,T>::has_map()),
- qPrintable(QString(QLatin1String("TypeRegistry<Archive, %1>::get_type_info(const QString &)")).arg(get_type_uid<T>())),
- qPrintable(QString(QLatin1String("%1 is not a registered base class. Declare your derived classes with QARK_REGISTER_DERIVED_CLASS.")).arg(get_type_uid<T>())));
+#if !defined(QT_NO_DEBUG) // avoid warning about unused function ::hasNameToUidMap in Qt >= 5.5
+ QMT_CHECK_X((registry::TypeNameRegistry<T>::hasUidToNameMap()), "getTypeInfo<T>(const QString &)", "type maps are not correctly initialized");
+ QMT_CHECK_X((registry::TypeRegistry<Archive,T>::hasMap()),
+ qPrintable(QString(QLatin1String("TypeRegistry<Archive, %1>::getTypeInfo(const QString &)")).arg(getTypeUid<T>())),
+ qPrintable(QString(QLatin1String("%1 is not a registered base class. Declare your derived classes with QARK_REGISTER_DERIVED_CLASS.")).arg(getTypeUid<T>())));
#endif
- return registry::TypeRegistry<Archive,T>::get_map().value(registry::TypeNameRegistry<T>::get_uid_to_name_map().value(uid));
+ return registry::TypeRegistry<Archive,T>::getMap().value(registry::TypeNameRegistry<T>::getUidToNameMap().value(uid));
}
}
@@ -321,18 +321,18 @@ typename registry::TypeRegistry<Archive,T>::type_info get_type_info(const QStrin
#define QARK_REGISTER_TYPE(T) \
template<> \
- int qark::registry::TypeNameRegistry<T>::__static_init = qark::registry::TypeNameRegistry<T>::__init(qark::registry::flatten_typename(QARK_TYPE_STRING(T)));
+ int qark::registry::TypeNameRegistry<T>::__static_init = qark::registry::TypeNameRegistry<T>::__init(qark::registry::flattenTypename(QARK_TYPE_STRING(T)));
#define QARK_REGISTER_DERIVED_CLASS(INARCHIVE, OUTARCHIVE, DERIVED, BASE) \
template<> \
int qark::registry::DerivedTypeRegistry<INARCHIVE,BASE,DERIVED>::__static_init = \
- qark::registry::DerivedTypeRegistry<INARCHIVE, BASE, DERIVED>::__init(0, qark::registry::load_pointer<INARCHIVE, BASE, DERIVED>); \
+ qark::registry::DerivedTypeRegistry<INARCHIVE, BASE, DERIVED>::__init(0, qark::registry::loadPointer<INARCHIVE, BASE, DERIVED>); \
template<> \
int qark::registry::DerivedTypeRegistry<OUTARCHIVE, BASE, DERIVED>::__static_init = \
- qark::registry::DerivedTypeRegistry<OUTARCHIVE, BASE, DERIVED>::__init(qark::registry::save_pointer<OUTARCHIVE, BASE, DERIVED>, 0); \
+ qark::registry::DerivedTypeRegistry<OUTARCHIVE, BASE, DERIVED>::__init(qark::registry::savePointer<OUTARCHIVE, BASE, DERIVED>, 0); \
template<> \
int qark::registry::DerivedTypeRegistry<OUTARCHIVE, typename std::add_const<BASE>::type, typename std::add_const<DERIVED>::type>::__static_init = \
qark::registry::DerivedTypeRegistry<OUTARCHIVE, typename std::add_const<BASE>::type, typename std::add_const<DERIVED>::type>:: \
- __init(qark::registry::save_pointer<OUTARCHIVE, typename std::add_const<BASE>::type, typename std::add_const<DERIVED>::type>, 0);
+ __init(qark::registry::savePointer<OUTARCHIVE, typename std::add_const<BASE>::type, typename std::add_const<DERIVED>::type>, 0);
#endif // QARK_TYPEREGISTRY_H
diff --git a/src/libs/3rdparty/modeling/qtserialization/src/flag.cpp b/src/libs/3rdparty/modeling/qtserialization/src/flag.cpp
index 51171a3d985ab360fd450a77edf4ec9e9b25652b..98a5f48974f1ff5d4e763f1a34246d83caa08b65 100644
--- a/src/libs/3rdparty/modeling/qtserialization/src/flag.cpp
+++ b/src/libs/3rdparty/modeling/qtserialization/src/flag.cpp
@@ -32,6 +32,6 @@
namespace qark {
-Flag::mask_type Flag::m_nextMask = 1;
+Flag::maskType Flag::m_nextMask = 1;
}
diff --git a/src/libs/3rdparty/modeling/qtserialization/src/savingrefmap.cpp b/src/libs/3rdparty/modeling/qtserialization/src/savingrefmap.cpp
index 57129e17daab5c9bf5e68c6f77850678b6619696..a51272a981d142ab379ceecd2028f28eaaaf2c8d 100644
--- a/src/libs/3rdparty/modeling/qtserialization/src/savingrefmap.cpp
+++ b/src/libs/3rdparty/modeling/qtserialization/src/savingrefmap.cpp
@@ -37,7 +37,7 @@ namespace impl {
int SavingRefMap::countDanglingReferences()
{
int dangling = 0;
- for (map_type::const_iterator it = m_references.begin(); it != m_references.end(); ++it) {
+ for (mapType::const_iterator it = m_references.begin(); it != m_references.end(); ++it) {
if (!it.value().second) {
++dangling;
}
@@ -45,24 +45,24 @@ int SavingRefMap::countDanglingReferences()
return dangling;
}
-bool SavingRefMap::hasRef(const void *address, const char *type_name)
+bool SavingRefMap::hasRef(const void *address, const char *typeName)
{
- return m_references.find(key_type(address, type_name)) != m_references.end();
+ return m_references.find(keyType(address, typeName)) != m_references.end();
}
-bool SavingRefMap::hasDefinedRef(const void *address, const char *type_name)
+bool SavingRefMap::hasDefinedRef(const void *address, const char *typeName)
{
- map_type::const_iterator it = m_references.find(key_type(address, type_name));
+ mapType::const_iterator it = m_references.find(keyType(address, typeName));
if (it == m_references.end()) {
return false;
}
return it.value().second;
}
-ObjectId SavingRefMap::getRef(const void *address, const char *type_name, bool define)
+ObjectId SavingRefMap::getRef(const void *address, const char *typeName, bool define)
{
- key_type k = key_type(address, type_name);
- map_type::iterator it = m_references.find(k);
+ keyType k = keyType(address, typeName);
+ mapType::iterator it = m_references.find(k);
if (it != m_references.end()) {
if (define) {
it.value().second = true;
@@ -70,7 +70,7 @@ ObjectId SavingRefMap::getRef(const void *address, const char *type_name, bool d
return it.value().first;
}
ObjectId id = m_nextRef++;
- m_references[k] = value_type(id, define);
+ m_references[k] = valueType(id, define);
return id;
}