From 5153e997d1a279f1a21fa1a624cc9129ce88686c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 21 Dec 2016 14:02:55 +0200 Subject: [PATCH] Fix warning "using-directive shall not be used.". --HG-- branch : develop --- src/app/valentina/core/vformulaproperty.cpp | 10 +- .../valentina/core/vformulapropertyeditor.cpp | 4 +- .../core/vtooloptionspropertybrowser.cpp | 251 +++++++++--------- src/libs/qmuparser/qmuparser.cpp | 2 - src/libs/qmuparser/qmuparserbase.cpp | 4 +- src/libs/qmuparser/qmuparsertest.cpp | 2 - src/libs/vpatterndb/calculator.cpp | 4 +- .../vpatterndb/vtranslatemeasurements.cpp | 119 ++++----- src/libs/vpatterndb/vtranslatevars.cpp | 46 ++-- .../plugins/Vector3d/vvector3dproperty.cpp | 22 +- .../plugins/vboolproperty.cpp | 17 +- .../plugins/vcolorproperty.cpp | 18 +- .../plugins/vcolorpropertyeditor.cpp | 18 +- .../plugins/vemptyproperty.cpp | 22 +- .../plugins/venumproperty.cpp | 30 +-- .../plugins/vfileproperty.cpp | 36 ++- .../plugins/vfilepropertyeditor.cpp | 32 ++- .../plugins/vlinecolorproperty.cpp | 26 +- .../plugins/vlinetypeproperty.cpp | 24 +- .../plugins/vnumberproperty.cpp | 51 ++-- .../plugins/vobjectproperty.cpp | 26 +- .../plugins/vpointfproperty.cpp | 20 +- .../plugins/vshortcutproperty.cpp | 23 +- .../plugins/vshortcutpropertyeditor.cpp | 18 +- .../plugins/vstringproperty.cpp | 15 +- .../plugins/vwidgetproperty.cpp | 14 +- src/libs/vpropertyexplorer/vproperty.cpp | 90 +++---- .../vpropertyexplorer/vpropertydelegate.cpp | 22 +- .../vpropertyfactorymanager.cpp | 25 +- .../vpropertyexplorer/vpropertyformview.cpp | 36 ++- .../vpropertyexplorer/vpropertyformwidget.cpp | 32 ++- src/libs/vpropertyexplorer/vpropertymodel.cpp | 52 ++-- src/libs/vpropertyexplorer/vpropertyset.cpp | 44 ++- .../vpropertyexplorer/vpropertytreeview.cpp | 14 +- .../vpropertyexplorer/vserializedproperty.cpp | 12 +- .../vstandardpropertyfactory.cpp | 9 +- src/test/ParserTest/main.cpp | 5 +- 37 files changed, 562 insertions(+), 633 deletions(-) diff --git a/src/app/valentina/core/vformulaproperty.cpp b/src/app/valentina/core/vformulaproperty.cpp index 0b61498ac..0cf7da219 100644 --- a/src/app/valentina/core/vformulaproperty.cpp +++ b/src/app/valentina/core/vformulaproperty.cpp @@ -37,22 +37,20 @@ enum class ChildType : char {Invalid = 0, Value = 1, Formula = 2}; -using namespace VPE; - //--------------------------------------------------------------------------------------------------------------------- VFormulaProperty::VFormulaProperty(const QString &name) : VProperty(name, static_cast(VFormula::FormulaTypeId())) { - d_ptr->type = Property::Complex; + d_ptr->type = VPE::Property::Complex; - VStringProperty* tmpValue = new VStringProperty(tr("Value")); + VPE::VStringProperty* tmpValue = new VPE::VStringProperty(tr("Value")); addChild(tmpValue); tmpValue->setUpdateBehaviour(true, false); tmpValue->setReadOnly(true); tmpValue->setOsSeparator(qApp->Settings()->GetOsSeparator()); tmpValue->setTypeForParent(static_cast(ChildType::Value)); - VStringProperty* tmpFormula = new VStringProperty(tr("Formula")); + VPE::VStringProperty* tmpFormula = new VPE::VStringProperty(tr("Formula")); addChild(tmpFormula); tmpFormula->setClearButtonEnable(true); tmpFormula->setUpdateBehaviour(true, false); @@ -143,7 +141,7 @@ QString VFormulaProperty::type() const } //--------------------------------------------------------------------------------------------------------------------- -VProperty *VFormulaProperty::clone(bool include_children, VProperty *container) const +VPE::VProperty *VFormulaProperty::clone(bool include_children, VProperty *container) const { if (!container) { diff --git a/src/app/valentina/core/vformulapropertyeditor.cpp b/src/app/valentina/core/vformulapropertyeditor.cpp index 0100c8741..ad894f790 100644 --- a/src/app/valentina/core/vformulapropertyeditor.cpp +++ b/src/app/valentina/core/vformulapropertyeditor.cpp @@ -39,8 +39,6 @@ #include "../vpropertyexplorer/vproperty.h" #include "../vtools/dialogs/support/dialogeditwrongformula.h" -using namespace VPE; - // VFormulaPropertyEditor //--------------------------------------------------------------------------------------------------------------------- VFormulaPropertyEditor::VFormulaPropertyEditor(QWidget *parent) @@ -100,7 +98,7 @@ void VFormulaPropertyEditor::onToolButtonClicked() TextLabel->setText(formula.getStringValue()); delete tmpWidget; emit dataChangedByUser(formula, this); - UserChangeEvent *event = new UserChangeEvent(); + VPE::UserChangeEvent *event = new VPE::UserChangeEvent(); QCoreApplication::postEvent ( this, event ); } } diff --git a/src/app/valentina/core/vtooloptionspropertybrowser.cpp b/src/app/valentina/core/vtooloptionspropertybrowser.cpp index 0d1f90cfc..2703d6644 100644 --- a/src/app/valentina/core/vtooloptionspropertybrowser.cpp +++ b/src/app/valentina/core/vtooloptionspropertybrowser.cpp @@ -43,16 +43,14 @@ #include #include -using namespace VPE; - //--------------------------------------------------------------------------------------------------------------------- VToolOptionsPropertyBrowser::VToolOptionsPropertyBrowser(QDockWidget *parent) :QObject(parent), PropertyModel(nullptr), formView(nullptr), currentItem(nullptr), - propertyToId(QMap()), - idToProperty(QMap()) + propertyToId(QMap()), + idToProperty(QMap()) { - PropertyModel = new VPropertyModel(this); - formView = new VPropertyFormView(PropertyModel, parent); + PropertyModel = new VPE::VPropertyModel(this); + formView = new VPE::VPropertyFormView(PropertyModel, parent); formView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); QScrollArea *scroll = new QScrollArea(parent); @@ -61,7 +59,8 @@ VToolOptionsPropertyBrowser::VToolOptionsPropertyBrowser(QDockWidget *parent) parent->setWidget(scroll); - connect(PropertyModel, &VPropertyModel::onDataChangedByEditor, this, &VToolOptionsPropertyBrowser::userChangedData); + connect(PropertyModel, &VPE::VPropertyModel::onDataChangedByEditor, this, + &VToolOptionsPropertyBrowser::userChangedData); } //--------------------------------------------------------------------------------------------------------------------- @@ -339,9 +338,9 @@ void VToolOptionsPropertyBrowser::RefreshOptions() } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::userChangedData(VProperty *property) +void VToolOptionsPropertyBrowser::userChangedData(VPE::VProperty *property) { - VProperty *prop = property; + VPE::VProperty *prop = property; if (!propertyToId.contains(prop)) { if (!propertyToId.contains(prop->getParent()))// Maybe we know parent @@ -526,7 +525,7 @@ void VToolOptionsPropertyBrowser::AddPropertyFormula(const QString &propertyName template void VToolOptionsPropertyBrowser::AddPropertyObjectName(Tool *i, const QString &propertyName, bool readOnly) { - auto itemName = new VStringProperty(propertyName); + auto itemName = new VPE::VStringProperty(propertyName); itemName->setClearButtonEnable(true); itemName->setValue(i->name()); itemName->setReadOnly(readOnly); @@ -537,7 +536,7 @@ void VToolOptionsPropertyBrowser::AddPropertyObjectName(Tool *i, const QString & template void VToolOptionsPropertyBrowser::AddPropertyPointName1(Tool *i, const QString &propertyName) { - VStringProperty *itemName = new VStringProperty(propertyName); + VPE::VStringProperty *itemName = new VPE::VStringProperty(propertyName); itemName->setClearButtonEnable(true); itemName->setValue(i->nameP1()); AddProperty(itemName, AttrName1); @@ -547,7 +546,7 @@ void VToolOptionsPropertyBrowser::AddPropertyPointName1(Tool *i, const QString & template void VToolOptionsPropertyBrowser::AddPropertyPointName2(Tool *i, const QString &propertyName) { - VStringProperty *itemName = new VStringProperty(propertyName); + VPE::VStringProperty *itemName = new VPE::VStringProperty(propertyName); itemName->setClearButtonEnable(true); itemName->setValue(i->nameP2()); AddProperty(itemName, AttrName2); @@ -557,7 +556,7 @@ void VToolOptionsPropertyBrowser::AddPropertyPointName2(Tool *i, const QString & template void VToolOptionsPropertyBrowser::AddPropertyOperationSuffix(Tool *i, const QString &propertyName, bool readOnly) { - auto itemSuffix = new VStringProperty(propertyName); + auto itemSuffix = new VPE::VStringProperty(propertyName); itemSuffix->setClearButtonEnable(true); itemSuffix->setValue(i->Suffix()); itemSuffix->setReadOnly(readOnly); @@ -568,7 +567,7 @@ void VToolOptionsPropertyBrowser::AddPropertyOperationSuffix(Tool *i, const QStr template void VToolOptionsPropertyBrowser::AddPropertyCrossPoint(Tool *i, const QString &propertyName) { - VEnumProperty* itemProperty = new VEnumProperty(propertyName); + VPE::VEnumProperty* itemProperty = new VPE::VEnumProperty(propertyName); itemProperty->setLiterals(QStringList()<< tr("First point") << tr("Second point")); itemProperty->setValue(static_cast(i->GetCrossCirclesPoint())-1); AddProperty(itemProperty, AttrCrossPoint); @@ -578,7 +577,7 @@ void VToolOptionsPropertyBrowser::AddPropertyCrossPoint(Tool *i, const QString & template void VToolOptionsPropertyBrowser::AddPropertyVCrossPoint(Tool *i, const QString &propertyName) { - auto itemProperty = new VEnumProperty(propertyName); + auto itemProperty = new VPE::VEnumProperty(propertyName); itemProperty->setLiterals(QStringList()<< tr("Highest point") << tr("Lowest point")); itemProperty->setValue(static_cast(i->GetVCrossPoint())-1); AddProperty(itemProperty, AttrVCrossPoint); @@ -588,7 +587,7 @@ void VToolOptionsPropertyBrowser::AddPropertyVCrossPoint(Tool *i, const QString template void VToolOptionsPropertyBrowser::AddPropertyHCrossPoint(Tool *i, const QString &propertyName) { - auto itemProperty = new VEnumProperty(propertyName); + auto itemProperty = new VPE::VEnumProperty(propertyName); itemProperty->setLiterals(QStringList()<< tr("Leftmost point") << tr("Rightmost point")); itemProperty->setValue(static_cast(i->GetHCrossPoint())-1); AddProperty(itemProperty, AttrHCrossPoint); @@ -598,7 +597,7 @@ void VToolOptionsPropertyBrowser::AddPropertyHCrossPoint(Tool *i, const QString template void VToolOptionsPropertyBrowser::AddPropertyAxisType(Tool *i, const QString &propertyName) { - auto itemProperty = new VEnumProperty(propertyName); + auto itemProperty = new VPE::VEnumProperty(propertyName); itemProperty->setLiterals(QStringList()<< tr("Vertical axis") << tr("Horizontal axis")); itemProperty->setValue(static_cast(i->GetAxisType())-1); AddProperty(itemProperty, AttrAxisType); @@ -609,9 +608,9 @@ template void VToolOptionsPropertyBrowser::AddPropertyLineType(Tool *i, const QString &propertyName, const QMap &styles) { - VLineTypeProperty *lineTypeProperty = new VLineTypeProperty(propertyName); + VPE::VLineTypeProperty *lineTypeProperty = new VPE::VLineTypeProperty(propertyName); lineTypeProperty->setStyles(styles); - const qint32 index = VLineTypeProperty::IndexOfStyle(styles, i->getLineType()); + const qint32 index = VPE::VLineTypeProperty::IndexOfStyle(styles, i->getLineType()); if (index == -1) { qWarning()<<"Can't find line style" << i->getLineType()<<"in list"; @@ -625,9 +624,9 @@ template void VToolOptionsPropertyBrowser::AddPropertyLineColor(Tool *i, const QString &propertyName, const QMap &colors, const QString &id) { - VLineColorProperty *lineColorProperty = new VLineColorProperty(propertyName); + VPE::VLineColorProperty *lineColorProperty = new VPE::VLineColorProperty(propertyName); lineColorProperty->setColors(colors); - const qint32 index = VLineColorProperty::IndexOfColor(colors, i->GetLineColor()); + const qint32 index = VPE::VLineColorProperty::IndexOfColor(colors, i->GetLineColor()); if (index == -1) { qWarning()<<"Can't find line style" << i->GetLineColor()<<"in list"; @@ -835,7 +834,7 @@ void VToolOptionsPropertyBrowser::SetAxisType(const QVariant &value) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::AddProperty(VProperty *property, const QString &id) +void VToolOptionsPropertyBrowser::AddProperty(VPE::VProperty *property, const QString &id) { propertyToId[property] = id; idToProperty[id] = property; @@ -843,11 +842,11 @@ void VToolOptionsPropertyBrowser::AddProperty(VProperty *property, const QString } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolSinglePoint(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolSinglePoint(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; switch (PropertiesList().indexOf(id)) @@ -865,11 +864,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolSinglePoint(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolEndLine(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolEndLine(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolEndLine *i = qgraphicsitem_cast(currentItem); @@ -898,11 +897,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolEndLine(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolAlongLine(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolAlongLine(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolAlongLine *i = qgraphicsitem_cast(currentItem); @@ -928,11 +927,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolAlongLine(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolArc(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolArc(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolArc *i = qgraphicsitem_cast(currentItem); @@ -958,11 +957,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolArc(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolArcWithLength(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolArcWithLength(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolArcWithLength *i = qgraphicsitem_cast(currentItem); @@ -988,11 +987,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolArcWithLength(VProperty *propert } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolBisector(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolBisector(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolBisector *i = qgraphicsitem_cast(currentItem); @@ -1018,11 +1017,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolBisector(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolTrueDarts(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolTrueDarts(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; switch (PropertiesList().indexOf(id)) @@ -1040,11 +1039,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolTrueDarts(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolCutArc(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolCutArc(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolCutArc *i = qgraphicsitem_cast(currentItem); @@ -1064,11 +1063,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolCutArc(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolCutSpline(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolCutSpline(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolCutSpline *i = qgraphicsitem_cast(currentItem); @@ -1088,11 +1087,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolCutSpline(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolCutSplinePath(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolCutSplinePath(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolCutSplinePath *i = qgraphicsitem_cast(currentItem); @@ -1112,11 +1111,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolCutSplinePath(VProperty *propert } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolHeight(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolHeight(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolHeight *i = qgraphicsitem_cast(currentItem); @@ -1139,11 +1138,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolHeight(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolLine(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolLine(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolLine *i = qgraphicsitem_cast(currentItem); @@ -1163,11 +1162,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolLine(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolLineIntersect(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolLineIntersect(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; switch (PropertiesList().indexOf(id)) @@ -1182,11 +1181,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolLineIntersect(VProperty *propert } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolNormal(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolNormal(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolNormal *i = qgraphicsitem_cast(currentItem); @@ -1215,11 +1214,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolNormal(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolPointOfContact(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolPointOfContact(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolPointOfContact *i = qgraphicsitem_cast(currentItem); @@ -1239,11 +1238,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointOfContact(VProperty *proper } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersection(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersection(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; switch (PropertiesList().indexOf(id)) @@ -1258,11 +1257,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersection(VProperty *p } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersectionArcs(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersectionArcs(VPE::VProperty *property) { SCASSERT(property != nullptr) - const QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + const QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; switch (PropertiesList().indexOf(id)) @@ -1272,7 +1271,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersectionArcs(VPropert break; case 28: // AttrCrossPoint { - const QVariant value = property->data(VProperty::DPC_Data, Qt::EditRole); + const QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::EditRole); SetCrossCirclesPoint(value); break; } @@ -1283,11 +1282,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersectionArcs(VPropert } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersectionCircles(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersectionCircles(VPE::VProperty *property) { SCASSERT(property != nullptr) - const QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + const QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolPointOfIntersectionCircles *i = qgraphicsitem_cast(currentItem); @@ -1299,7 +1298,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersectionCircles(VProp break; case 28: // AttrCrossPoint { - const QVariant value = property->data(VProperty::DPC_Data, Qt::EditRole); + const QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::EditRole); SetCrossCirclesPoint(value); break; } @@ -1316,11 +1315,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersectionCircles(VProp } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersectionCurves(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersectionCurves(VPE::VProperty *property) { SCASSERT(property != nullptr) - const QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + const QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; switch (PropertiesList().indexOf(id)) @@ -1330,13 +1329,13 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersectionCurves(VPrope break; case 34: // AttrVCrossPoint { - const QVariant value = property->data(VProperty::DPC_Data, Qt::EditRole); + const QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::EditRole); SetVCrossCurvesPoint(value); break; } case 35: // AttrHCrossPoint { - const QVariant value = property->data(VProperty::DPC_Data, Qt::EditRole); + const QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::EditRole); SetHCrossCurvesPoint(value); break; } @@ -1347,11 +1346,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointOfIntersectionCurves(VPrope } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolPointFromCircleAndTangent(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolPointFromCircleAndTangent(VPE::VProperty *property) { SCASSERT(property != nullptr) - const QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + const QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolPointFromCircleAndTangent *i = qgraphicsitem_cast(currentItem); @@ -1366,7 +1365,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointFromCircleAndTangent(VPrope break; case 28: // AttrCrossPoint { - const QVariant value = property->data(VProperty::DPC_Data, Qt::EditRole); + const QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::EditRole); SetCrossCirclesPoint(value); break; } @@ -1377,11 +1376,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointFromCircleAndTangent(VPrope } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolPointFromArcAndTangent(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolPointFromArcAndTangent(VPE::VProperty *property) { SCASSERT(property != nullptr) - const QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + const QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; switch (PropertiesList().indexOf(id)) @@ -1391,7 +1390,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointFromArcAndTangent(VProperty break; case 28: // AttrCrossPoint { - const QVariant value = property->data(VProperty::DPC_Data, Qt::EditRole); + const QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::EditRole); SetCrossCirclesPoint(value); break; } @@ -1402,11 +1401,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolPointFromArcAndTangent(VProperty } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolShoulderPoint(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolShoulderPoint(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolShoulderPoint *i = qgraphicsitem_cast(currentItem); @@ -1432,11 +1431,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolShoulderPoint(VProperty *propert } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolSpline(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolSpline(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; auto i = qgraphicsitem_cast(currentItem); @@ -1488,11 +1487,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolSpline(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolCubicBezier(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolCubicBezier(VPE::VProperty *property) { SCASSERT(property != nullptr) - const QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + const QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; auto i = qgraphicsitem_cast(currentItem); @@ -1513,11 +1512,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolCubicBezier(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolSplinePath(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolSplinePath(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolSplinePath *i = qgraphicsitem_cast(currentItem); @@ -1537,11 +1536,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolSplinePath(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolCubicBezierPath(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolCubicBezierPath(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolCubicBezierPath *i = qgraphicsitem_cast(currentItem); @@ -1561,11 +1560,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolCubicBezierPath(VProperty *prope } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolTriangle(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolTriangle(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; switch (PropertiesList().indexOf(id)) @@ -1580,11 +1579,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolTriangle(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolLineIntersectAxis(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolLineIntersectAxis(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolLineIntersectAxis *i = qgraphicsitem_cast(currentItem); @@ -1610,11 +1609,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolLineIntersectAxis(VProperty *pro } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolCurveIntersectAxis(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolCurveIntersectAxis(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolCurveIntersectAxis *i = qgraphicsitem_cast(currentItem); @@ -1640,11 +1639,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolCurveIntersectAxis(VProperty *pr } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolRotation(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolRotation(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolRotation *i = qgraphicsitem_cast(currentItem); @@ -1664,11 +1663,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolRotation(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolMove(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolMove(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolMove *i = qgraphicsitem_cast(currentItem); @@ -1691,11 +1690,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolMove(VProperty *property) } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolFlippingByLine(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolFlippingByLine(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; switch (PropertiesList().indexOf(id)) @@ -1710,18 +1709,18 @@ void VToolOptionsPropertyBrowser::ChangeDataToolFlippingByLine(VProperty *proper } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolFlippingByAxis(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolFlippingByAxis(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; switch (PropertiesList().indexOf(id)) { case 39: // AttrAxisType { - const QVariant value = property->data(VProperty::DPC_Data, Qt::EditRole); + const QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::EditRole); SetAxisType(value); break; } @@ -1735,11 +1734,11 @@ void VToolOptionsPropertyBrowser::ChangeDataToolFlippingByAxis(VProperty *proper } //--------------------------------------------------------------------------------------------------------------------- -void VToolOptionsPropertyBrowser::ChangeDataToolEllipticalArc(VProperty *property) +void VToolOptionsPropertyBrowser::ChangeDataToolEllipticalArc(VPE::VProperty *property) { SCASSERT(property != nullptr) - QVariant value = property->data(VProperty::DPC_Data, Qt::DisplayRole); + QVariant value = property->data(VPE::VProperty::DPC_Data, Qt::DisplayRole); const QString id = propertyToId[property]; VToolEllipticalArc *i = qgraphicsitem_cast(currentItem); @@ -1779,7 +1778,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolSinglePoint(QGraphicsItem *item AddPropertyObjectName(i, tr("Point label")); - VPointFProperty* itemPosition = new VPointFProperty(tr("Position")); + VPE::VPointFProperty* itemPosition = new VPE::VPointFProperty(tr("Position")); itemPosition->setValue(i->pos()); AddProperty(itemPosition, QLatin1String("position")); } @@ -1941,7 +1940,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolNormal(QGraphicsItem *item) AddPropertyLineType(i, tr("Line type"), VAbstractTool::LineStylesPics()); AddPropertyLineColor(i, tr("Line color"), VAbstractTool::ColorsList(), AttrLineColor); - VDoubleProperty* itemAngle = new VDoubleProperty(tr("Additional angle degrees")); + VPE::VDoubleProperty* itemAngle = new VPE::VDoubleProperty(tr("Additional angle degrees")); itemAngle->setValue(i->GetAngle()); itemAngle->setSetting("Min", -360); itemAngle->setSetting("Max", 360); @@ -2223,12 +2222,12 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolEndLine() idToProperty[AttrName]->setValue(i->name()); { - const qint32 index = VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); + const qint32 index = VPE::VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); idToProperty[AttrTypeLine]->setValue(index); } { - const qint32 index = VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); + const qint32 index = VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); idToProperty[AttrLineColor]->setValue(index); } @@ -2248,12 +2247,12 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolAlongLine() idToProperty[AttrName]->setValue(i->name()); { - const qint32 index = VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); + const qint32 index = VPE::VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); idToProperty[AttrTypeLine]->setValue(index); } { - const qint32 index = VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); + const qint32 index = VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); idToProperty[AttrLineColor]->setValue(index); } @@ -2279,7 +2278,7 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolArc() valueSecondAngle.setValue(i->GetFormulaF2()); idToProperty[AttrAngle2]->setValue(valueSecondAngle); - const qint32 index = VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); + const qint32 index = VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); idToProperty[AttrColor]->setValue(index); } @@ -2300,7 +2299,7 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolArcWithLength() valueLength.setValue(i->GetFormulaLength()); idToProperty[AttrLength]->setValue(valueLength); - const qint32 index = VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); + const qint32 index = VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); idToProperty[AttrColor]->setValue(index); } @@ -2316,12 +2315,12 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolBisector() idToProperty[AttrLength]->setValue(valueFormula); { - const qint32 index = VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); + const qint32 index = VPE::VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); idToProperty[AttrTypeLine]->setValue(index); } { - const qint32 index = VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); + const qint32 index = VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); idToProperty[AttrLineColor]->setValue(index); } } @@ -2379,12 +2378,12 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolHeight() idToProperty[AttrName]->setValue(i->name()); { - const qint32 index = VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); + const qint32 index = VPE::VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); idToProperty[AttrTypeLine]->setValue(index); } { - const qint32 index = VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); + const qint32 index = VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); idToProperty[AttrLineColor]->setValue(index); } } @@ -2395,12 +2394,12 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolLine() VToolLine *i = qgraphicsitem_cast(currentItem); { - const qint32 index = VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); + const qint32 index = VPE::VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); idToProperty[AttrTypeLine]->setValue(index); } { - const qint32 index = VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); + const qint32 index = VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); idToProperty[AttrLineColor]->setValue(index); } } @@ -2427,12 +2426,12 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolNormal() idToProperty[AttrAngle]->setValue( i->GetAngle()); { - const qint32 index = VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); + const qint32 index = VPE::VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); idToProperty[AttrTypeLine]->setValue(index); } { - const qint32 index = VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); + const qint32 index = VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); idToProperty[AttrLineColor]->setValue(index); } } @@ -2527,12 +2526,12 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolShoulderPoint() idToProperty[AttrName]->setValue(i->name()); { - const qint32 index = VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); + const qint32 index = VPE::VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); idToProperty[AttrTypeLine]->setValue(index); } { - const qint32 index = VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); + const qint32 index = VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); idToProperty[AttrLineColor]->setValue(index); } } @@ -2577,7 +2576,8 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolSpline() length2.setValue(length2F); idToProperty[AttrLength2]->setValue(length2); - idToProperty[AttrColor]->setValue(VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor())); + idToProperty[AttrColor]->setValue(VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), + i->GetLineColor())); } //--------------------------------------------------------------------------------------------------------------------- @@ -2586,7 +2586,8 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolCubicBezier() auto i = qgraphicsitem_cast(currentItem); idToProperty[AttrName]->setValue(i->name()); - idToProperty[AttrColor]->setValue(VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor())); + idToProperty[AttrColor]->setValue(VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), + i->GetLineColor())); } //--------------------------------------------------------------------------------------------------------------------- @@ -2595,7 +2596,8 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolSplinePath() auto i = qgraphicsitem_cast(currentItem); idToProperty[AttrName]->setValue(i->name()); - idToProperty[AttrColor]->setValue(VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor())); + idToProperty[AttrColor]->setValue(VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), + i->GetLineColor())); } //--------------------------------------------------------------------------------------------------------------------- @@ -2604,7 +2606,8 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolCubicBezierPath() auto i = qgraphicsitem_cast(currentItem); idToProperty[AttrName]->setValue(i->name()); - idToProperty[AttrColor]->setValue(VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor())); + idToProperty[AttrColor]->setValue(VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), + i->GetLineColor())); } //--------------------------------------------------------------------------------------------------------------------- @@ -2622,12 +2625,12 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolLineIntersectAxis() idToProperty[AttrName]->setValue(i->name()); { - const qint32 index = VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); + const qint32 index = VPE::VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); idToProperty[AttrTypeLine]->setValue(index); } { - const qint32 index = VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); + const qint32 index = VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); idToProperty[AttrLineColor]->setValue(index); } @@ -2643,12 +2646,12 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolCurveIntersectAxis() idToProperty[AttrName]->setValue(i->name()); { - const qint32 index = VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); + const qint32 index = VPE::VLineTypeProperty::IndexOfStyle(VAbstractTool::LineStylesPics(), i->getLineType()); idToProperty[AttrTypeLine]->setValue(index); } { - const qint32 index = VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); + const qint32 index = VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); idToProperty[AttrLineColor]->setValue(index); } @@ -2723,7 +2726,7 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolEllipticalArc() valueFormulaRotationAngle.setValue(i->GetFormulaRotationAngle()); idToProperty[AttrRotationAngle]->setValue(valueFormulaRotationAngle); - const qint32 index = VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); + const qint32 index = VPE::VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); idToProperty[AttrColor]->setValue(index); } diff --git a/src/libs/qmuparser/qmuparser.cpp b/src/libs/qmuparser/qmuparser.cpp index 807104844..707d35271 100644 --- a/src/libs/qmuparser/qmuparser.cpp +++ b/src/libs/qmuparser/qmuparser.cpp @@ -33,8 +33,6 @@ #include "qmuparsererror.h" #include "../vmisc/vmath.h" -using namespace std; - /** * @file * @brief Implementation of the standard floating point QmuParser. diff --git a/src/libs/qmuparser/qmuparserbase.cpp b/src/libs/qmuparser/qmuparserbase.cpp index 0facdfd49..04994717c 100644 --- a/src/libs/qmuparser/qmuparserbase.cpp +++ b/src/libs/qmuparser/qmuparserbase.cpp @@ -36,8 +36,6 @@ #include "qmudef.h" #include "../vmisc/vmath.h" -using namespace std; - /** * @file * @brief This file contains the basic implementation of the muparser engine. @@ -396,7 +394,7 @@ void QmuParserBase::SetExpr(const QString &a_sExpr) { // Check locale compatibility std::locale loc; - if (m_pTokenReader->GetArgSep()==std::use_facet >(loc).decimal_point()) + if (m_pTokenReader->GetArgSep()==std::use_facet >(loc).decimal_point()) { Error(ecLOCALE); } diff --git a/src/libs/qmuparser/qmuparsertest.cpp b/src/libs/qmuparser/qmuparsertest.cpp index 84cdb1128..e20d56c6f 100644 --- a/src/libs/qmuparser/qmuparsertest.cpp +++ b/src/libs/qmuparser/qmuparsertest.cpp @@ -41,8 +41,6 @@ #include "qmuparsererror.h" #include "../vmisc/vmath.h" -using namespace std; - /** * @file * @brief This file contains the implementation of parser test cases. diff --git a/src/libs/vpatterndb/calculator.cpp b/src/libs/vpatterndb/calculator.cpp index c17d5351b..0ab8c11f8 100644 --- a/src/libs/vpatterndb/calculator.cpp +++ b/src/libs/vpatterndb/calculator.cpp @@ -36,8 +36,6 @@ #include "../vmisc/def.h" #include "../qmuparser/qmuparsererror.h" -using namespace qmu; - //--------------------------------------------------------------------------------------------------------------------- /** * @brief Calculator class wraper for QMuParser. Make easy initialization math parser. @@ -142,7 +140,7 @@ void Calculator::InitVariables(const QHash &vars, const QMap()), - guiTexts(QMap()), - descriptions(QMap()), + :measurements(QMap()), + guiTexts(QMap()), + descriptions(QMap()), numbers(QMap()), formulas(QMap()) { @@ -60,7 +58,7 @@ VTranslateMeasurements::~VTranslateMeasurements() bool VTranslateMeasurements::MeasurementsFromUser(QString &newFormula, int position, const QString &token, int &bias) const { - QMap::const_iterator i = measurements.constBegin(); + QMap::const_iterator i = measurements.constBegin(); while (i != measurements.constEnd()) { if (token == i.value().translate()) @@ -166,8 +164,9 @@ void VTranslateMeasurements::InitMeasurements() } //--------------------------------------------------------------------------------------------------------------------- -void VTranslateMeasurements::InitMeasurement(const QString &name, const QmuTranslation &m, const QmuTranslation &g, - const QmuTranslation &d, const QString &number, const QString &formula) +void VTranslateMeasurements::InitMeasurement(const QString &name, const qmu::QmuTranslation &m, + const qmu::QmuTranslation &g, const qmu::QmuTranslation &d, + const QString &number, const QString &formula) { measurements.insert(name, m); guiTexts.insert(name, g); @@ -176,16 +175,16 @@ void VTranslateMeasurements::InitMeasurement(const QString &name, const QmuTrans formulas.insert(name, formula); } -#define translate(context, source, disambiguation) QmuTranslation::translate((context), (source), (disambiguation)) +#define translate(context, source, disambiguation) qmu::QmuTranslation::translate((context), (source), (disambiguation)) //--------------------------------------------------------------------------------------------------------------------- void VTranslateMeasurements::InitGroupA() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "height", @@ -357,9 +356,9 @@ void VTranslateMeasurements::InitGroupB() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "width_shoulder", @@ -404,9 +403,9 @@ void VTranslateMeasurements::InitGroupC() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "indent_neck_back", @@ -437,9 +436,9 @@ void VTranslateMeasurements::InitGroupD() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "hand_palm_length", @@ -482,9 +481,9 @@ void VTranslateMeasurements::InitGroupE() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "foot_width", @@ -521,9 +520,9 @@ void VTranslateMeasurements::InitGroupF() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "head_circ", @@ -576,9 +575,9 @@ void VTranslateMeasurements::InitGroupG() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "neck_mid_circ", @@ -928,9 +927,9 @@ void VTranslateMeasurements::InitGroupH() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "neck_front_to_waist_f", @@ -1233,9 +1232,9 @@ void VTranslateMeasurements::InitGroupI() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "shoulder_length", @@ -1344,9 +1343,9 @@ void VTranslateMeasurements::InitGroupJ() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "bustpoint_to_bustpoint", @@ -1425,9 +1424,9 @@ void VTranslateMeasurements::InitGroupK() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "shoulder_tip_to_waist_front", @@ -1529,9 +1528,9 @@ void VTranslateMeasurements::InitGroupL() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "arm_shoulder_tip_to_wrist_bent", @@ -1697,9 +1696,9 @@ void VTranslateMeasurements::InitGroupM() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "leg_crotch_to_floor", @@ -1808,9 +1807,9 @@ void VTranslateMeasurements::InitGroupN() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "crotch_length", @@ -1880,9 +1879,9 @@ void VTranslateMeasurements::InitGroupO() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "neck_back_to_waist_front", @@ -1996,9 +1995,9 @@ void VTranslateMeasurements::InitGroupP() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "neck_back_to_bust_front", @@ -2098,9 +2097,9 @@ void VTranslateMeasurements::InitGroupQ() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation m; - QmuTranslation g; - QmuTranslation d; + qmu::QmuTranslation m; + qmu::QmuTranslation g; + qmu::QmuTranslation d; //================================================================================================================= m = translate("VTranslateMeasurements", "dart_width_shoulder", diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp index 51dca3fe9..17b71bafe 100644 --- a/src/libs/vpatterndb/vtranslatevars.cpp +++ b/src/libs/vpatterndb/vtranslatevars.cpp @@ -44,19 +44,17 @@ #include "../vmisc/vabstractapplication.h" #include "vtranslatemeasurements.h" -using namespace qmu; - //--------------------------------------------------------------------------------------------------------------------- VTranslateVars::VTranslateVars() :VTranslateMeasurements(), - PMSystemNames(QMap()), - PMSystemAuthors(QMap()), - PMSystemBooks(QMap()), - variables(QMap()), - functions(QMap()), - postfixOperators(QMap()), - placeholders(QMap()), - stDescriptions(QMap()) + PMSystemNames(QMap()), + PMSystemAuthors(QMap()), + PMSystemBooks(QMap()), + variables(QMap()), + functions(QMap()), + postfixOperators(QMap()), + placeholders(QMap()), + stDescriptions(QMap()) { InitPatternMakingSystems(); InitVariables(); @@ -69,16 +67,16 @@ VTranslateVars::VTranslateVars() VTranslateVars::~VTranslateVars() {} -#define translate(context, source, disambiguation) QmuTranslation::translate((context), (source), (disambiguation)) +#define translate(context, source, disambiguation) qmu::QmuTranslation::translate((context), (source), (disambiguation)) //--------------------------------------------------------------------------------------------------------------------- void VTranslateVars::InitPatternMakingSystems() { //Note. We can't use here function and variables because lupdate tool doesn't see string in variables and doesn't //mark such string to translation. - QmuTranslation name; - QmuTranslation author; - QmuTranslation book; + qmu::QmuTranslation name; + qmu::QmuTranslation author; + qmu::QmuTranslation book; //================================================================================================================= name = translate("VTranslateVars", "Bunka", "System name"); @@ -448,8 +446,8 @@ void VTranslateVars::InitPlaceholder() #undef translate //--------------------------------------------------------------------------------------------------------------------- -void VTranslateVars::InitSystem(const QString &code, const QmuTranslation &name, const QmuTranslation &author, - const QmuTranslation &book) +void VTranslateVars::InitSystem(const QString &code, const qmu::QmuTranslation &name, const qmu::QmuTranslation &author, + const qmu::QmuTranslation &book) { PMSystemNames.insert(code, name); PMSystemAuthors.insert(code, author); @@ -519,10 +517,10 @@ void VTranslateVars::BiasTokens(int position, int bias, QMap &toke */ bool VTranslateVars::VariablesFromUser(QString &newFormula, int position, const QString &token, int &bias) const { - QMap::const_iterator i = variables.constBegin(); + QMap::const_iterator i = variables.constBegin(); while (i != variables.constEnd()) { - const QmuTranslation &var = i.value(); + const qmu::QmuTranslation &var = i.value(); if (token.indexOf( var.translate() ) == 0) { newFormula.replace(position, var.translate().length(), i.key()); @@ -547,7 +545,7 @@ bool VTranslateVars::VariablesFromUser(QString &newFormula, int position, const */ bool VTranslateVars::PostfixOperatorsFromUser(QString &newFormula, int position, const QString &token, int &bias) const { - QMap::const_iterator i = postfixOperators.constBegin(); + QMap::const_iterator i = postfixOperators.constBegin(); while (i != postfixOperators.constEnd()) { if (token == i.value().translate()) @@ -572,7 +570,7 @@ bool VTranslateVars::PostfixOperatorsFromUser(QString &newFormula, int position, */ bool VTranslateVars::FunctionsFromUser(QString &newFormula, int position, const QString &token, int &bias) const { - QMap::const_iterator i = functions.constBegin(); + QMap::const_iterator i = functions.constBegin(); while (i != functions.constEnd()) { if (token == i.value().translate()) @@ -597,7 +595,7 @@ bool VTranslateVars::FunctionsFromUser(QString &newFormula, int position, const */ bool VTranslateVars::VariablesToUser(QString &newFormula, int position, const QString &token, int &bias) const { - QMap::const_iterator i = variables.constBegin(); + QMap::const_iterator i = variables.constBegin(); while (i != variables.constEnd()) { if (token.indexOf( i.key() ) == 0) @@ -729,7 +727,7 @@ QString VTranslateVars::FormulaFromUser(const QString &formula, bool osSeparator } QString newFormula = formula;// Local copy for making changes - QmuTokenParser *cal = new QmuTokenParser(formula, osSeparator);// Eval formula + qmu::QmuTokenParser *cal = new qmu::QmuTokenParser(formula, osSeparator);// Eval formula QMap tokens = cal->GetTokens();// Tokens (variables, measurements) QMap numbers = cal->GetNumbers();// All numbers in expression for changing decimal separator delete cal; @@ -850,7 +848,7 @@ QString VTranslateVars::FormulaToUser(const QString &formula, bool osSeparator) QMap numbers; try { - QmuTokenParser *cal = new QmuTokenParser(formula, false);// Eval formula + qmu::QmuTokenParser *cal = new qmu::QmuTokenParser(formula, false);// Eval formula tokens = cal->GetTokens();// Tokens (variables, measurements) numbers = cal->GetNumbers();// All numbers in expression for changing decimal separator delete cal; @@ -979,7 +977,7 @@ void VTranslateVars::Retranslate() } //--------------------------------------------------------------------------------------------------------------------- -QMap VTranslateVars::GetFunctions() const +QMap VTranslateVars::GetFunctions() const { return functions; } diff --git a/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.cpp b/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.cpp index fd24a78c3..ed4316d5b 100644 --- a/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.cpp @@ -20,8 +20,6 @@ #include "vvector3dproperty.h" -using namespace VPE; - #include #include #include @@ -30,7 +28,7 @@ using namespace VPE; #include "../../vproperty_p.h" #include "../vnumberproperty.h" -QVector3DProperty::QVector3DProperty(const QString& name) +VPE::QVector3DProperty::QVector3DProperty(const QString& name) : VProperty(name, QVariant::String) // todo: QVariant::Vector3D?? { QVariant tmpFloat(0); tmpFloat.convert(QVariant::Double); @@ -42,7 +40,7 @@ QVector3DProperty::QVector3DProperty(const QString& name) //! Get the data how it should be displayed -QVariant QVector3DProperty::data (int column, int role) const +QVariant VPE::QVector3DProperty::data (int column, int role) const { if (column == DPC_Data && Qt::DisplayRole == role) { @@ -56,7 +54,7 @@ QVariant QVector3DProperty::data (int column, int role) const } //! Returns item flags -Qt::ItemFlags QVector3DProperty::flags(int column) const +Qt::ItemFlags VPE::QVector3DProperty::flags(int column) const { if (column == DPC_Name || column == DPC_Data) { @@ -68,7 +66,7 @@ Qt::ItemFlags QVector3DProperty::flags(int column) const //! Returns the Vector3d -Vector3D QVector3DProperty::getVector() const +VPE::Vector3D VPE::QVector3DProperty::getVector() const { Vector3D tmpVect; @@ -85,12 +83,12 @@ Vector3D QVector3DProperty::getVector() const } //! Sets the Vector3d -void QVector3DProperty::setVector(const Vector3D &vect) +void VPE::QVector3DProperty::setVector(const Vector3D &vect) { setVector(vect.X, vect.Y, vect.Z); } -void QVector3DProperty::setVector(double x, double y, double z) +void VPE::QVector3DProperty::setVector(double x, double y, double z) { if (d_ptr->Children.count() < 3) { @@ -105,12 +103,12 @@ void QVector3DProperty::setVector(double x, double y, double z) d_ptr->Children.at(2)->setValue(tmpZ); } -QString QVector3DProperty::type() const +QString VPE::QVector3DProperty::type() const { return "vector3d"; } -VProperty* QVector3DProperty::clone(bool include_children, VProperty* container) const +VPE::VProperty* VPE::QVector3DProperty::clone(bool include_children, VProperty* container) const { if (!container) { @@ -130,7 +128,7 @@ VProperty* QVector3DProperty::clone(bool include_children, VProperty* container) return VProperty::clone(false, container); // Child } -void QVector3DProperty::setValue(const QVariant &value) +void VPE::QVector3DProperty::setValue(const QVariant &value) { QStringList tmpStrings = value.toString().split(","); if (tmpStrings.count() == 3) @@ -140,7 +138,7 @@ void QVector3DProperty::setValue(const QVariant &value) } -QVariant QVector3DProperty::getValue() const +QVariant VPE::QVector3DProperty::getValue() const { Vector3D tmpVect = getVector(); return QString("%1,%2,%3").arg(QString::number(tmpVect.X), QString::number(tmpVect.Y), QString::number(tmpVect.Z)); diff --git a/src/libs/vpropertyexplorer/plugins/vboolproperty.cpp b/src/libs/vpropertyexplorer/plugins/vboolproperty.cpp index 6d14192c7..2e776c036 100644 --- a/src/libs/vpropertyexplorer/plugins/vboolproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vboolproperty.cpp @@ -25,12 +25,11 @@ #include "../vproperty_p.h" -using namespace VPE; -QVariant VBoolProperty::TrueText; -QVariant VBoolProperty::FalseText; +QVariant VPE::VBoolProperty::TrueText; +QVariant VPE::VBoolProperty::FalseText; -VBoolProperty::VBoolProperty(const QString& name) : +VPE::VBoolProperty::VBoolProperty(const QString& name) : VProperty(name, QVariant::Bool) { d_ptr->VariantValue.setValue(false); @@ -49,7 +48,7 @@ VBoolProperty::VBoolProperty(const QString& name) : //! Get the data how it should be displayed -QVariant VBoolProperty::data (int column, int role) const +QVariant VPE::VBoolProperty::data (int column, int role) const { if (column == DPC_Data && (Qt::DisplayRole == role || Qt::EditRole == role)) { @@ -63,7 +62,7 @@ QVariant VBoolProperty::data (int column, int role) const return VProperty::data(column, role); } -bool VBoolProperty::setData(const QVariant &data, int role) +bool VPE::VBoolProperty::setData(const QVariant &data, int role) { if (Qt::CheckStateRole == role) { @@ -75,7 +74,7 @@ bool VBoolProperty::setData(const QVariant &data, int role) } //! Returns item flags -Qt::ItemFlags VBoolProperty::flags(int column) const +Qt::ItemFlags VPE::VBoolProperty::flags(int column) const { if (column == DPC_Data) { @@ -85,12 +84,12 @@ Qt::ItemFlags VBoolProperty::flags(int column) const return VProperty::flags(column); } -QString VBoolProperty::type() const +QString VPE::VBoolProperty::type() const { return "bool"; } -VProperty *VBoolProperty::clone(bool include_children, VProperty *container) const +VPE::VProperty *VPE::VBoolProperty::clone(bool include_children, VProperty *container) const { return VProperty::clone(include_children, container ? container : new VBoolProperty(getName())); } diff --git a/src/libs/vpropertyexplorer/plugins/vcolorproperty.cpp b/src/libs/vpropertyexplorer/plugins/vcolorproperty.cpp index 948a2879d..b68175186 100644 --- a/src/libs/vpropertyexplorer/plugins/vcolorproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vcolorproperty.cpp @@ -31,16 +31,14 @@ class QAbstractItemDelegate; class QStyleOptionViewItem; -using namespace VPE; - -VColorProperty::VColorProperty(const QString &name) : +VPE::VColorProperty::VColorProperty(const QString &name) : VProperty(name, QVariant::Color) { } //! Get the data how it should be displayed -QVariant VColorProperty::data (int column, int role) const +QVariant VPE::VColorProperty::data (int column, int role) const { if (column == DPC_Data && (Qt::DisplayRole == role)) { @@ -59,8 +57,8 @@ QVariant VColorProperty::data (int column, int role) const } //! Returns an editor widget, or NULL if it doesn't supply one -QWidget* VColorProperty::createEditor(QWidget* parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) +QWidget* VPE::VColorProperty::createEditor(QWidget* parent, const QStyleOptionViewItem& options, + const QAbstractItemDelegate* delegate) { Q_UNUSED(options) Q_UNUSED(delegate) @@ -72,7 +70,7 @@ QWidget* VColorProperty::createEditor(QWidget* parent, const QStyleOptionViewIte } //! Sets the property's data to the editor (returns false, if the standard delegate should do that) -bool VColorProperty::setEditorData(QWidget* editor) +bool VPE::VColorProperty::setEditorData(QWidget* editor) { VColorPropertyEditor* tmpWidget = qobject_cast(editor); if (tmpWidget) @@ -86,7 +84,7 @@ bool VColorProperty::setEditorData(QWidget* editor) } //! Gets the data from the widget -QVariant VColorProperty::getEditorData(const QWidget *editor) const +QVariant VPE::VColorProperty::getEditorData(const QWidget *editor) const { const VColorPropertyEditor* tmpWidget = qobject_cast(editor); if (tmpWidget) @@ -97,12 +95,12 @@ QVariant VColorProperty::getEditorData(const QWidget *editor) const return QVariant(); } -QString VColorProperty::type() const +QString VPE::VColorProperty::type() const { return "color"; } -VProperty *VColorProperty::clone(bool include_children, VProperty *container) const +VPE::VProperty *VPE::VColorProperty::clone(bool include_children, VProperty *container) const { return VProperty::clone(include_children, container ? container : new VColorProperty(getName())); } diff --git a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.cpp b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.cpp index cc68925f0..5ee58279f 100644 --- a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.cpp +++ b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.cpp @@ -35,9 +35,7 @@ class QHBoxLayout; -using namespace VPE; - -VColorPropertyEditor::VColorPropertyEditor(QWidget *parent) +VPE::VColorPropertyEditor::VColorPropertyEditor(QWidget *parent) : QWidget(parent), Color(), ToolButton(nullptr), TextLabel(nullptr), ColorLabel(nullptr), Spacer(nullptr) { setAutoFillBackground(true); @@ -75,7 +73,7 @@ VColorPropertyEditor::VColorPropertyEditor(QWidget *parent) //ColorLabel->hide(); // for now, we just use the standard display and only add the button } -void VColorPropertyEditor::SetColor(const QColor& color_) +void VPE::VColorPropertyEditor::SetColor(const QColor& color_) { if (Color != color_) { @@ -85,7 +83,7 @@ void VColorPropertyEditor::SetColor(const QColor& color_) } } -QPixmap VColorPropertyEditor::GetColorPixmap(const QColor& color, quint32 size) +QPixmap VPE::VColorPropertyEditor::GetColorPixmap(const QColor& color, quint32 size) { QImage tmpImgage(static_cast(size), static_cast(size), QImage::Format_ARGB32_Premultiplied); tmpImgage.fill(static_cast(color.rgb())); @@ -93,12 +91,12 @@ QPixmap VColorPropertyEditor::GetColorPixmap(const QColor& color, quint32 size) // todo: support alpha channel } -QString VColorPropertyEditor::GetColorString(const QColor& color) +QString VPE::VColorPropertyEditor::GetColorString(const QColor& color) { return QString("[%1, %2, %3] (%4)").arg(color.red()).arg(color.green()).arg(color.blue()).arg(color.alpha()); } -void VColorPropertyEditor::onToolButtonClicked() +void VPE::VColorPropertyEditor::onToolButtonClicked() { bool ok = false; QRgb oldRgba = Color.rgba(); @@ -112,7 +110,7 @@ void VColorPropertyEditor::onToolButtonClicked() } } -bool VColorPropertyEditor::eventFilter(QObject *obj, QEvent *ev) +bool VPE::VColorPropertyEditor::eventFilter(QObject *obj, QEvent *ev) { if (obj == ToolButton && ev->type() == QEvent::KeyPress) { @@ -125,12 +123,12 @@ bool VColorPropertyEditor::eventFilter(QObject *obj, QEvent *ev) } -VColorPropertyEditor::~VColorPropertyEditor() +VPE::VColorPropertyEditor::~VColorPropertyEditor() { // } -QColor VColorPropertyEditor::GetColor() const +QColor VPE::VColorPropertyEditor::GetColor() const { return Color; } diff --git a/src/libs/vpropertyexplorer/plugins/vemptyproperty.cpp b/src/libs/vpropertyexplorer/plugins/vemptyproperty.cpp index b1e71c06a..924c191da 100644 --- a/src/libs/vpropertyexplorer/plugins/vemptyproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vemptyproperty.cpp @@ -35,27 +35,25 @@ namespace VPE { class VPropertyPrivate; } // namespace VPE -using namespace VPE; - -VEmptyProperty::VEmptyProperty(const QString& name) +VPE::VEmptyProperty::VEmptyProperty(const QString& name) : VProperty(name, QVariant::Invalid) { } -VEmptyProperty::VEmptyProperty(VPropertyPrivate *d) +VPE::VEmptyProperty::VEmptyProperty(VPropertyPrivate *d) : VProperty(d) { } -VEmptyProperty::~VEmptyProperty() +VPE::VEmptyProperty::~VEmptyProperty() { // } //! Get the data how it should be displayed -QVariant VEmptyProperty::data (int column, int role) const +QVariant VPE::VEmptyProperty::data (int column, int role) const { if (column == DPC_Data && (Qt::DisplayRole == role || Qt::EditRole == role)) { @@ -74,8 +72,8 @@ QVariant VEmptyProperty::data (int column, int role) const } //! Returns an editor widget, or NULL if it doesn't supply one -QWidget* VEmptyProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) +QWidget* VPE::VEmptyProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, + const QAbstractItemDelegate* delegate) { Q_UNUSED(options) Q_UNUSED(parent) @@ -86,7 +84,7 @@ QWidget* VEmptyProperty::createEditor(QWidget * parent, const QStyleOptionViewIt //! Gets the data from the widget -QVariant VEmptyProperty::getEditorData(const QWidget *editor) const +QVariant VPE::VEmptyProperty::getEditorData(const QWidget *editor) const { Q_UNUSED(editor) @@ -94,19 +92,19 @@ QVariant VEmptyProperty::getEditorData(const QWidget *editor) const } //! Returns item flags -Qt::ItemFlags VEmptyProperty::flags(int column) const +Qt::ItemFlags VPE::VEmptyProperty::flags(int column) const { Q_UNUSED(column) return Qt::ItemIsEnabled | Qt::ItemIsSelectable; } -QString VEmptyProperty::type() const +QString VPE::VEmptyProperty::type() const { return "empty"; } -VProperty* VEmptyProperty::clone(bool include_children, VProperty* container) const +VPE::VProperty* VPE::VEmptyProperty::clone(bool include_children, VProperty* container) const { return VProperty::clone(include_children, container ? container : new VEmptyProperty(getName())); } diff --git a/src/libs/vpropertyexplorer/plugins/venumproperty.cpp b/src/libs/vpropertyexplorer/plugins/venumproperty.cpp index 4851d2086..02d2b37c4 100644 --- a/src/libs/vpropertyexplorer/plugins/venumproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/venumproperty.cpp @@ -30,9 +30,7 @@ class QAbstractItemDelegate; class QStyleOptionViewItem; -using namespace VPE; - -VEnumProperty::VEnumProperty(const QString& name) +VPE::VEnumProperty::VEnumProperty(const QString& name) : VProperty(name, QVariant::Int), EnumerationLiterals() { VProperty::d_ptr->VariantValue = 0; @@ -41,7 +39,7 @@ VEnumProperty::VEnumProperty(const QString& name) //! Get the data how it should be displayed -QVariant VEnumProperty::data (int column, int role) const +QVariant VPE::VEnumProperty::data (int column, int role) const { if (EnumerationLiterals.empty()) { @@ -69,8 +67,8 @@ QVariant VEnumProperty::data (int column, int role) const //! Returns an editor widget, or NULL if it doesn't supply one -QWidget* VEnumProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) +QWidget* VPE::VEnumProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, + const QAbstractItemDelegate* delegate) { Q_UNUSED(options) Q_UNUSED(delegate) @@ -87,7 +85,7 @@ QWidget* VEnumProperty::createEditor(QWidget * parent, const QStyleOptionViewIte } //! Gets the data from the widget -QVariant VEnumProperty::getEditorData(const QWidget *editor) const +QVariant VPE::VEnumProperty::getEditorData(const QWidget *editor) const { const QComboBox* tmpEditor = qobject_cast(editor); if (tmpEditor) @@ -99,19 +97,19 @@ QVariant VEnumProperty::getEditorData(const QWidget *editor) const } //! Sets the enumeration literals -void VEnumProperty::setLiterals(const QStringList& literals) +void VPE::VEnumProperty::setLiterals(const QStringList& literals) { EnumerationLiterals = literals; } //! Get the settings. This function has to be implemented in a subclass in order to have an effect -QStringList VEnumProperty::getLiterals() const +QStringList VPE::VEnumProperty::getLiterals() const { return EnumerationLiterals; } //! Sets the value of the property -void VEnumProperty::setValue(const QVariant& value) +void VPE::VEnumProperty::setValue(const QVariant& value) { int tmpIndex = value.toInt(); @@ -129,17 +127,17 @@ void VEnumProperty::setValue(const QVariant& value) } } -QString VEnumProperty::type() const +QString VPE::VEnumProperty::type() const { return "enum"; } -VProperty* VEnumProperty::clone(bool include_children, VProperty* container) const +VPE::VProperty* VPE::VEnumProperty::clone(bool include_children, VProperty* container) const { return VProperty::clone(include_children, container ? container : new VEnumProperty(getName())); } -void VEnumProperty::setSetting(const QString& key, const QVariant& value) +void VPE::VEnumProperty::setSetting(const QString& key, const QVariant& value) { if (key == "literals") { @@ -147,7 +145,7 @@ void VEnumProperty::setSetting(const QString& key, const QVariant& value) } } -QVariant VEnumProperty::getSetting(const QString& key) const +QVariant VPE::VEnumProperty::getSetting(const QString& key) const { if (key == "literals") { @@ -157,12 +155,12 @@ QVariant VEnumProperty::getSetting(const QString& key) const return VProperty::getSetting(key); } -QStringList VEnumProperty::getSettingKeys() const +QStringList VPE::VEnumProperty::getSettingKeys() const { return QStringList("literals"); } -void VEnumProperty::currentIndexChanged(int index) +void VPE::VEnumProperty::currentIndexChanged(int index) { Q_UNUSED(index) UserChangeEvent *event = new UserChangeEvent(); diff --git a/src/libs/vpropertyexplorer/plugins/vfileproperty.cpp b/src/libs/vpropertyexplorer/plugins/vfileproperty.cpp index 7fb301912..9406b3e7b 100644 --- a/src/libs/vpropertyexplorer/plugins/vfileproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vfileproperty.cpp @@ -31,45 +31,43 @@ class QStyleOptionViewItem; -using namespace VPE; - -VFileProperty::VFileProperty(const QString& name) +VPE::VFileProperty::VFileProperty(const QString& name) : VProperty(new VFilePropertyPrivate(name, QVariant::String)) { } -VFileProperty::~VFileProperty() +VPE::VFileProperty::~VFileProperty() { // } -void VFileProperty::setFileFilters(const QString& filefilters) +void VPE::VFileProperty::setFileFilters(const QString& filefilters) { static_cast(d_ptr)->FileFilters = filefilters; } -QString VFileProperty::getFileFilters() const +QString VPE::VFileProperty::getFileFilters() const { return static_cast(d_ptr)->FileFilters; } -void VFileProperty::setFile(const QString& file) +void VPE::VFileProperty::setFile(const QString& file) { d_ptr->VariantValue.setValue(file); } -QString VFileProperty::getFile() const +QString VPE::VFileProperty::getFile() const { return d_ptr->VariantValue.toString(); } -QVariant VFileProperty::data (int column, int role) const +QVariant VPE::VFileProperty::data (int column, int role) const { if (column == DPC_Data && (Qt::DisplayRole == role || Qt::EditRole == role)) { @@ -81,7 +79,7 @@ QVariant VFileProperty::data (int column, int role) const } -QWidget* VFileProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, +QWidget* VPE::VFileProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, const QAbstractItemDelegate* delegate) { Q_UNUSED(options) @@ -100,7 +98,7 @@ QWidget* VFileProperty::createEditor(QWidget * parent, const QStyleOptionViewIte } -bool VFileProperty::setEditorData(QWidget* editor) +bool VPE::VFileProperty::setEditorData(QWidget* editor) { VFileEditWidget* tmpWidget = qobject_cast(editor); if (tmpWidget) @@ -114,7 +112,7 @@ bool VFileProperty::setEditorData(QWidget* editor) } -QVariant VFileProperty::getEditorData(const QWidget *editor) const +QVariant VPE::VFileProperty::getEditorData(const QWidget *editor) const { const VFileEditWidget* tmpWidget = qobject_cast(editor); if (tmpWidget) @@ -125,7 +123,7 @@ QVariant VFileProperty::getEditorData(const QWidget *editor) const return QVariant(); } -void VFileProperty::setSetting(const QString& key, const QVariant& value) +void VPE::VFileProperty::setSetting(const QString& key, const QVariant& value) { if (key == "FileFilters") { @@ -137,7 +135,7 @@ void VFileProperty::setSetting(const QString& key, const QVariant& value) } } -QVariant VFileProperty::getSetting(const QString& key) const +QVariant VPE::VFileProperty::getSetting(const QString& key) const { if (key == "FileFilters") { @@ -151,28 +149,28 @@ QVariant VFileProperty::getSetting(const QString& key) const return VProperty::getSetting(key); } -QStringList VFileProperty::getSettingKeys() const +QStringList VPE::VFileProperty::getSettingKeys() const { return QStringList("FileFilters") << "Directory"; } -QString VFileProperty::type() const +QString VPE::VFileProperty::type() const { return "file"; } -VProperty* VFileProperty::clone(bool include_children, VProperty* container) const +VPE::VProperty* VPE::VFileProperty::clone(bool include_children, VProperty* container) const { return VProperty::clone(include_children, container ? container : new VFileProperty(getName())); } -bool VFileProperty::isDirectory() const +bool VPE::VFileProperty::isDirectory() const { return static_cast(d_ptr)->Directory; } -void VFileProperty::setDirectory(bool is_directory) +void VPE::VFileProperty::setDirectory(bool is_directory) { static_cast(d_ptr)->Directory = is_directory; } diff --git a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp index 942c976b8..1a8a6f94d 100644 --- a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp +++ b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.cpp @@ -45,9 +45,7 @@ class QDragMoveEvent; class QDropEvent; class QHBoxLayout; -using namespace VPE; - -VFileEditWidget::VFileEditWidget(QWidget *parent, bool is_directory) +VPE::VFileEditWidget::VFileEditWidget(QWidget *parent, bool is_directory) : QWidget(parent), CurrentFilePath(), ToolButton(nullptr), FileLineEdit(nullptr), FileDialogFilter(), FilterList(), Directory(is_directory) { @@ -79,13 +77,13 @@ VFileEditWidget::VFileEditWidget(QWidget *parent, bool is_directory) } -VFileEditWidget::~VFileEditWidget() +VPE::VFileEditWidget::~VFileEditWidget() { // nothing needs to be done here } -void VFileEditWidget::setFile(const QString &value, bool emit_signal) +void VPE::VFileEditWidget::setFile(const QString &value, bool emit_signal) { if (CurrentFilePath != value) { @@ -101,24 +99,24 @@ void VFileEditWidget::setFile(const QString &value, bool emit_signal) } -void VFileEditWidget::setFilter(const QString &dialog_filter, const QStringList& filter_list) +void VPE::VFileEditWidget::setFilter(const QString &dialog_filter, const QStringList& filter_list) { FileDialogFilter = dialog_filter; FilterList = filter_list; } -void VFileEditWidget::setDirectory(bool dir) +void VPE::VFileEditWidget::setDirectory(bool dir) { Directory = dir; } -QString VFileEditWidget::getFile() const +QString VPE::VFileEditWidget::getFile() const { return CurrentFilePath; } -void VFileEditWidget::onToolButtonClicked() +void VPE::VFileEditWidget::onToolButtonClicked() { QString filepath = (Directory ? QFileDialog::getExistingDirectory(0, tr("Directory"), CurrentFilePath) : QFileDialog::getOpenFileName(0, tr("Open File"), CurrentFilePath, @@ -130,7 +128,7 @@ void VFileEditWidget::onToolButtonClicked() } -bool VFileEditWidget::eventFilter(QObject *obj, QEvent *ev) +bool VPE::VFileEditWidget::eventFilter(QObject *obj, QEvent *ev) { if (ev->type() == QEvent::DragEnter || ev->type() == QEvent::Drop) { @@ -170,13 +168,13 @@ bool VFileEditWidget::eventFilter(QObject *obj, QEvent *ev) return QWidget::eventFilter(obj, ev); } -bool VFileEditWidget::isDirectory() +bool VPE::VFileEditWidget::isDirectory() { return Directory; } -void VFileEditWidget::dragEnterEvent(QDragEnterEvent* event) +void VPE::VFileEditWidget::dragEnterEvent(QDragEnterEvent* event) { QString tmpFileName; if (checkMimeData(event->mimeData(), tmpFileName)) @@ -187,18 +185,18 @@ void VFileEditWidget::dragEnterEvent(QDragEnterEvent* event) } // cppcheck-suppress unusedFunction -void VFileEditWidget::dragMoveEvent(QDragMoveEvent* event) +void VPE::VFileEditWidget::dragMoveEvent(QDragMoveEvent* event) { event->acceptProposedAction(); } // cppcheck-suppress unusedFunction -void VFileEditWidget::dragLeaveEvent(QDragLeaveEvent* event) +void VPE::VFileEditWidget::dragLeaveEvent(QDragLeaveEvent* event) { event->accept(); } -void VFileEditWidget::dropEvent(QDropEvent* event) +void VPE::VFileEditWidget::dropEvent(QDropEvent* event) { QString tmpFileName; if (checkMimeData(event->mimeData(), tmpFileName)) @@ -212,7 +210,7 @@ void VFileEditWidget::dropEvent(QDropEvent* event) } -bool VFileEditWidget::checkMimeData(const QMimeData* data, QString& file) const +bool VPE::VFileEditWidget::checkMimeData(const QMimeData* data, QString& file) const { if (data->hasUrls()) { @@ -235,7 +233,7 @@ bool VFileEditWidget::checkMimeData(const QMimeData* data, QString& file) const return false; } -bool VFileEditWidget::checkFileFilter(const QString& file) const +bool VPE::VFileEditWidget::checkFileFilter(const QString& file) const { if (FilterList.isEmpty()) { diff --git a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.cpp b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.cpp index 968b0f792..970a8e590 100644 --- a/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vlinecolorproperty.cpp @@ -45,16 +45,14 @@ class QAbstractItemDelegate; class QStyleOptionViewItem; -using namespace VPE; - -VLineColorProperty::VLineColorProperty(const QString &name) +VPE::VLineColorProperty::VLineColorProperty(const QString &name) : VProperty(name, QVariant::Int), colors(), indexList() { VProperty::d_ptr->VariantValue = 0; VProperty::d_ptr->VariantValue.convert(QVariant::Int); } -QVariant VLineColorProperty::data(int column, int role) const +QVariant VPE::VLineColorProperty::data(int column, int role) const { if (colors.empty()) { @@ -82,8 +80,8 @@ QVariant VLineColorProperty::data(int column, int role) const } } -QWidget *VLineColorProperty::createEditor(QWidget *parent, const QStyleOptionViewItem &options, - const QAbstractItemDelegate *delegate) +QWidget *VPE::VLineColorProperty::createEditor(QWidget *parent, const QStyleOptionViewItem &options, + const QAbstractItemDelegate *delegate) { Q_UNUSED(options) Q_UNUSED(delegate) @@ -113,7 +111,7 @@ QWidget *VLineColorProperty::createEditor(QWidget *parent, const QStyleOptionVie return VProperty::d_ptr->editor; } -QVariant VLineColorProperty::getEditorData(const QWidget *editor) const +QVariant VPE::VLineColorProperty::getEditorData(const QWidget *editor) const { const QComboBox* tmpEditor = qobject_cast(editor); if (tmpEditor) @@ -124,7 +122,7 @@ QVariant VLineColorProperty::getEditorData(const QWidget *editor) const return QVariant(0); } -void VLineColorProperty::setColors(const QMap &colors) +void VPE::VLineColorProperty::setColors(const QMap &colors) { this->colors = colors; indexList.clear(); @@ -137,12 +135,12 @@ void VLineColorProperty::setColors(const QMap &colors) } // cppcheck-suppress unusedFunction -QMap VLineColorProperty::getColors() const +QMap VPE::VLineColorProperty::getColors() const { return colors; } -void VLineColorProperty::setValue(const QVariant &value) +void VPE::VLineColorProperty::setValue(const QVariant &value) { int tmpIndex = value.toInt(); @@ -160,17 +158,17 @@ void VLineColorProperty::setValue(const QVariant &value) } } -QString VLineColorProperty::type() const +QString VPE::VLineColorProperty::type() const { return QStringLiteral("lineColor"); } -VProperty *VLineColorProperty::clone(bool include_children, VProperty *container) const +VPE::VProperty *VPE::VLineColorProperty::clone(bool include_children, VProperty *container) const { return VProperty::clone(include_children, container ? container : new VLineColorProperty(getName())); } -int VLineColorProperty::IndexOfColor(const QMap &colors, const QString &color) +int VPE::VLineColorProperty::IndexOfColor(const QMap &colors, const QString &color) { QVector indexList; QMap::const_iterator i = colors.constBegin(); @@ -182,7 +180,7 @@ int VLineColorProperty::IndexOfColor(const QMap &colors, const return indexList.indexOf(color); } -void VLineColorProperty::currentIndexChanged(int index) +void VPE::VLineColorProperty::currentIndexChanged(int index) { Q_UNUSED(index) UserChangeEvent *event = new UserChangeEvent(); diff --git a/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.cpp b/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.cpp index 2aa93e811..277281ee6 100644 --- a/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vlinetypeproperty.cpp @@ -42,16 +42,14 @@ class QAbstractItemDelegate; class QStyleOptionViewItem; -using namespace VPE; - -VLineTypeProperty::VLineTypeProperty(const QString &name) +VPE::VLineTypeProperty::VLineTypeProperty(const QString &name) : VProperty(name, QVariant::Int), styles(), indexList() { VProperty::d_ptr->VariantValue = 0; VProperty::d_ptr->VariantValue.convert(QVariant::Int); } -QVariant VLineTypeProperty::data(int column, int role) const +QVariant VPE::VLineTypeProperty::data(int column, int role) const { if (styles.empty()) { @@ -79,7 +77,7 @@ QVariant VLineTypeProperty::data(int column, int role) const } } -QWidget *VLineTypeProperty::createEditor(QWidget *parent, const QStyleOptionViewItem &options, +QWidget *VPE::VLineTypeProperty::createEditor(QWidget *parent, const QStyleOptionViewItem &options, const QAbstractItemDelegate *delegate) { Q_UNUSED(options) @@ -106,7 +104,7 @@ QWidget *VLineTypeProperty::createEditor(QWidget *parent, const QStyleOptionView return VProperty::d_ptr->editor; } -QVariant VLineTypeProperty::getEditorData(const QWidget *editor) const +QVariant VPE::VLineTypeProperty::getEditorData(const QWidget *editor) const { const QComboBox* tmpEditor = qobject_cast(editor); if (tmpEditor) @@ -117,7 +115,7 @@ QVariant VLineTypeProperty::getEditorData(const QWidget *editor) const return QVariant(0); } -void VLineTypeProperty::setStyles(const QMap &styles) +void VPE::VLineTypeProperty::setStyles(const QMap &styles) { this->styles = styles; indexList.clear(); @@ -130,12 +128,12 @@ void VLineTypeProperty::setStyles(const QMap &styles) } // cppcheck-suppress unusedFunction -QMap VLineTypeProperty::getStyles() const +QMap VPE::VLineTypeProperty::getStyles() const { return styles; } -void VLineTypeProperty::setValue(const QVariant &value) +void VPE::VLineTypeProperty::setValue(const QVariant &value) { int tmpIndex = value.toInt(); @@ -153,17 +151,17 @@ void VLineTypeProperty::setValue(const QVariant &value) } } -QString VLineTypeProperty::type() const +QString VPE::VLineTypeProperty::type() const { return QStringLiteral("lineType"); } -VProperty *VLineTypeProperty::clone(bool include_children, VProperty *container) const +VPE::VProperty *VPE::VLineTypeProperty::clone(bool include_children, VProperty *container) const { return VProperty::clone(include_children, container ? container : new VLineTypeProperty(getName())); } -int VLineTypeProperty::IndexOfStyle(const QMap &styles, const QString &style) +int VPE::VLineTypeProperty::IndexOfStyle(const QMap &styles, const QString &style) { QVector indexList; QMap::const_iterator i = styles.constBegin(); @@ -175,7 +173,7 @@ int VLineTypeProperty::IndexOfStyle(const QMap &styles, const QS return indexList.indexOf(style); } -void VLineTypeProperty::currentIndexChanged(int index) +void VPE::VLineTypeProperty::currentIndexChanged(int index) { Q_UNUSED(index) UserChangeEvent *event = new UserChangeEvent(); diff --git a/src/libs/vpropertyexplorer/plugins/vnumberproperty.cpp b/src/libs/vpropertyexplorer/plugins/vnumberproperty.cpp index be1102820..cfeef02ce 100644 --- a/src/libs/vpropertyexplorer/plugins/vnumberproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vnumberproperty.cpp @@ -33,13 +33,10 @@ class QAbstractItemDelegate; class QStyleOptionViewItem; -using namespace VPE; +const int VPE::VIntegerProperty::StandardMin = -1000000; +const int VPE::VIntegerProperty::StandardMax = 1000000; - -const int VIntegerProperty::StandardMin = -1000000; -const int VIntegerProperty::StandardMax = 1000000; - -VIntegerProperty::VIntegerProperty(const QString& name, const QMap& settings) +VPE::VIntegerProperty::VIntegerProperty(const QString& name, const QMap& settings) : VProperty(name, QVariant::Int), minValue(StandardMin), maxValue(StandardMax), singleStep(1.0) { VProperty::setSettings(settings); @@ -47,7 +44,7 @@ VIntegerProperty::VIntegerProperty(const QString& name, const QMapVariantValue.convert(QVariant::Int); } -VIntegerProperty::VIntegerProperty(const QString &name) +VPE::VIntegerProperty::VIntegerProperty(const QString &name) : VProperty(name), minValue(StandardMin), maxValue(StandardMax), singleStep(1.0) { VProperty::d_ptr->VariantValue.setValue(0); @@ -55,8 +52,8 @@ VIntegerProperty::VIntegerProperty(const QString &name) } //! Returns an editor widget, or NULL if it doesn't supply one -QWidget* VIntegerProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) +QWidget* VPE::VIntegerProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, + const QAbstractItemDelegate* delegate) { Q_UNUSED(options) Q_UNUSED(delegate) @@ -76,7 +73,7 @@ QWidget* VIntegerProperty::createEditor(QWidget * parent, const QStyleOptionView } //! Gets the data from the widget -QVariant VIntegerProperty::getEditorData(const QWidget *editor) const +QVariant VPE::VIntegerProperty::getEditorData(const QWidget *editor) const { const QSpinBox* tmpEditor = qobject_cast(editor); if (tmpEditor) @@ -87,7 +84,7 @@ QVariant VIntegerProperty::getEditorData(const QWidget *editor) const return QVariant(0); } -void VIntegerProperty::setSetting(const QString& key, const QVariant& value) +void VPE::VIntegerProperty::setSetting(const QString& key, const QVariant& value) { if (key == QLatin1String("Min")) { @@ -103,7 +100,7 @@ void VIntegerProperty::setSetting(const QString& key, const QVariant& value) } } -QVariant VIntegerProperty::getSetting(const QString& key) const +QVariant VPE::VIntegerProperty::getSetting(const QString& key) const { if (key == QLatin1String("Min")) { @@ -121,31 +118,31 @@ QVariant VIntegerProperty::getSetting(const QString& key) const return VProperty::getSetting(key); } -QStringList VIntegerProperty::getSettingKeys() const +QStringList VPE::VIntegerProperty::getSettingKeys() const { return (QStringList("Min") << "Max" << "Step"); } -QString VIntegerProperty::type() const +QString VPE::VIntegerProperty::type() const { return "integer"; } -VProperty* VIntegerProperty::clone(bool include_children, VProperty* container) const +VPE::VProperty* VPE::VIntegerProperty::clone(bool include_children, VProperty* container) const { return VProperty::clone(include_children, container ? container : new VIntegerProperty(getName())); } -void VIntegerProperty::valueChanged(int i) +void VPE::VIntegerProperty::valueChanged(int i) { Q_UNUSED(i) UserChangeEvent *event = new UserChangeEvent(); QCoreApplication::postEvent ( VProperty::d_ptr->editor, event ); } -const double VDoubleProperty::StandardPrecision = 5; +const double VPE::VDoubleProperty::StandardPrecision = 5; -VDoubleProperty::VDoubleProperty(const QString& name, const QMap& settings) +VPE::VDoubleProperty::VDoubleProperty(const QString& name, const QMap& settings) : VIntegerProperty(name), Precision(static_cast(StandardPrecision)) { VProperty::setSettings(settings); @@ -154,7 +151,7 @@ VDoubleProperty::VDoubleProperty(const QString& name, const QMapPropertyVariantType = QVariant::Double; } -VDoubleProperty::VDoubleProperty(const QString &name) +VPE::VDoubleProperty::VDoubleProperty(const QString &name) : VIntegerProperty(name), Precision(static_cast(StandardPrecision)) { VProperty::d_ptr->VariantValue.setValue(0); @@ -163,8 +160,8 @@ VDoubleProperty::VDoubleProperty(const QString &name) } //! Returns an editor widget, or NULL if it doesn't supply one -QWidget* VDoubleProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) +QWidget* VPE::VDoubleProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, + const QAbstractItemDelegate* delegate) { Q_UNUSED(options) Q_UNUSED(delegate) @@ -184,7 +181,7 @@ QWidget* VDoubleProperty::createEditor(QWidget * parent, const QStyleOptionViewI } //! Gets the data from the widget -QVariant VDoubleProperty::getEditorData(const QWidget *editor) const +QVariant VPE::VDoubleProperty::getEditorData(const QWidget *editor) const { const QDoubleSpinBox* tmpEditor = qobject_cast(editor); if (tmpEditor) @@ -195,7 +192,7 @@ QVariant VDoubleProperty::getEditorData(const QWidget *editor) const return QVariant(0); } -void VDoubleProperty::setSetting(const QString& key, const QVariant& value) +void VPE::VDoubleProperty::setSetting(const QString& key, const QVariant& value) { if (key == QLatin1String("Min")) { @@ -215,7 +212,7 @@ void VDoubleProperty::setSetting(const QString& key, const QVariant& value) } } -QVariant VDoubleProperty::getSetting(const QString& key) const +QVariant VPE::VDoubleProperty::getSetting(const QString& key) const { if (key == QLatin1String("Min")) { @@ -237,17 +234,17 @@ QVariant VDoubleProperty::getSetting(const QString& key) const return VProperty::getSetting(key); } -QStringList VDoubleProperty::getSettingKeys() const +QStringList VPE::VDoubleProperty::getSettingKeys() const { return (QStringList("Min") << "Max" << "Step" << "Precision"); } -QString VDoubleProperty::type() const +QString VPE::VDoubleProperty::type() const { return "double"; } -VProperty* VDoubleProperty::clone(bool include_children, VProperty* container) const +VPE::VProperty* VPE::VDoubleProperty::clone(bool include_children, VProperty* container) const { return VIntegerProperty::clone(include_children, container ? container : new VDoubleProperty(getName())); } diff --git a/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp b/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp index ab3839f70..f269b38ab 100644 --- a/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vobjectproperty.cpp @@ -30,9 +30,7 @@ class QAbstractItemDelegate; class QStyleOptionViewItem; -using namespace VPE; - -VObjectProperty::VObjectProperty(const QString& name) +VPE::VObjectProperty::VObjectProperty(const QString& name) : VProperty(name, QVariant::Int), objects() { VProperty::d_ptr->VariantValue = 0; @@ -40,7 +38,7 @@ VObjectProperty::VObjectProperty(const QString& name) } //! Get the data how it should be displayed -QVariant VObjectProperty::data (int column, int role) const +QVariant VPE::VObjectProperty::data (int column, int role) const { if (objects.empty()) { @@ -62,7 +60,7 @@ QVariant VObjectProperty::data (int column, int role) const } //! Returns an editor widget, or NULL if it doesn't supply one -QWidget* VObjectProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, +QWidget* VPE::VObjectProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, const QAbstractItemDelegate* delegate) { Q_UNUSED(options) @@ -79,7 +77,7 @@ QWidget* VObjectProperty::createEditor(QWidget * parent, const QStyleOptionViewI return VProperty::d_ptr->editor; } -bool VObjectProperty::setEditorData(QWidget *editor) +bool VPE::VObjectProperty::setEditorData(QWidget *editor) { if (!editor) { @@ -106,7 +104,7 @@ bool VObjectProperty::setEditorData(QWidget *editor) } //! Gets the data from the widget -QVariant VObjectProperty::getEditorData(const QWidget *editor) const +QVariant VPE::VObjectProperty::getEditorData(const QWidget *editor) const { const QComboBox* tmpEditor = qobject_cast(editor); if (tmpEditor) @@ -119,20 +117,20 @@ QVariant VObjectProperty::getEditorData(const QWidget *editor) const //! Sets the objects list // cppcheck-suppress unusedFunction -void VObjectProperty::setObjectsList(const QMap &objects) +void VPE::VObjectProperty::setObjectsList(const QMap &objects) { this->objects = objects; } //! Get the settings. This function has to be implemented in a subclass in order to have an effect // cppcheck-suppress unusedFunction -QMap VObjectProperty::getObjects() const +QMap VPE::VObjectProperty::getObjects() const { return objects; } //! Sets the value of the property -void VObjectProperty::setValue(const QVariant& value) +void VPE::VObjectProperty::setValue(const QVariant& value) { VProperty::d_ptr->VariantValue = value; VProperty::d_ptr->VariantValue.convert(QVariant::UInt); @@ -143,24 +141,24 @@ void VObjectProperty::setValue(const QVariant& value) } } -QString VObjectProperty::type() const +QString VPE::VObjectProperty::type() const { return "objectList"; } -VProperty* VObjectProperty::clone(bool include_children, VProperty* container) const +VPE::VProperty* VPE::VObjectProperty::clone(bool include_children, VProperty* container) const { return VProperty::clone(include_children, container ? container : new VObjectProperty(getName())); } -void VObjectProperty::currentIndexChanged(int index) +void VPE::VObjectProperty::currentIndexChanged(int index) { Q_UNUSED(index) UserChangeEvent *event = new UserChangeEvent(); QCoreApplication::postEvent ( VProperty::d_ptr->editor, event ); } -void VObjectProperty::FillList(QComboBox *box, const QMap &list) const +void VPE::VObjectProperty::FillList(QComboBox *box, const QMap &list) const { box->clear(); diff --git a/src/libs/vpropertyexplorer/plugins/vpointfproperty.cpp b/src/libs/vpropertyexplorer/plugins/vpointfproperty.cpp index 4074beacb..d6030c933 100644 --- a/src/libs/vpropertyexplorer/plugins/vpointfproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vpointfproperty.cpp @@ -20,8 +20,6 @@ #include "vpointfproperty.h" -using namespace VPE; - #include #include #include @@ -49,7 +47,7 @@ VPE::VPointFProperty::VPointFProperty(const QString &name) setValue(QPointF()); } -QVariant VPointFProperty::data(int column, int role) const +QVariant VPE::VPointFProperty::data(int column, int role) const { if (column == DPC_Data && Qt::DisplayRole == role) { @@ -59,7 +57,7 @@ QVariant VPointFProperty::data(int column, int role) const return VProperty::data(column, role); } -Qt::ItemFlags VPointFProperty::flags(int column) const +Qt::ItemFlags VPE::VPointFProperty::flags(int column) const { if (column == DPC_Name || column == DPC_Data) { @@ -69,7 +67,7 @@ Qt::ItemFlags VPointFProperty::flags(int column) const return Qt::NoItemFlags; } -QPointF VPointFProperty::getPointF() const +QPointF VPE::VPointFProperty::getPointF() const { QPointF tmpValue; @@ -84,12 +82,12 @@ QPointF VPointFProperty::getPointF() const return tmpValue; } -void VPointFProperty::setPointF(const QPointF &point) +void VPE::VPointFProperty::setPointF(const QPointF &point) { setPointF(point.x(), point.y()); } -void VPointFProperty::setPointF(qreal x, qreal y) +void VPE::VPointFProperty::setPointF(qreal x, qreal y) { if (d_ptr->Children.count() < 2) { @@ -106,12 +104,12 @@ void VPointFProperty::setPointF(qreal x, qreal y) d_ptr->Children.at(1)->setValue(tmpY); } -QString VPointFProperty::type() const +QString VPE::VPointFProperty::type() const { return "pointF"; } -VProperty *VPointFProperty::clone(bool include_children, VProperty *container) const +VPE::VProperty *VPE::VPointFProperty::clone(bool include_children, VProperty *container) const { if (!container) { @@ -131,13 +129,13 @@ VProperty *VPointFProperty::clone(bool include_children, VProperty *container) c return VProperty::clone(false, container); // Child } -void VPointFProperty::setValue(const QVariant &value) +void VPE::VPointFProperty::setValue(const QVariant &value) { QPointF tmpPoint = value.toPointF(); setPointF(tmpPoint); } -QVariant VPointFProperty::getValue() const +QVariant VPE::VPointFProperty::getValue() const { QPointF tmpValue = getPointF(); return QString("%1,%2").arg(QString::number(tmpValue.x()), QString::number(tmpValue.y())); diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.cpp b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.cpp index 811569d39..74d86f3d9 100644 --- a/src/libs/vpropertyexplorer/plugins/vshortcutproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vshortcutproperty.cpp @@ -30,21 +30,18 @@ class QStyleOptionViewItem; - -using namespace VPE; - -VShortcutProperty::VShortcutProperty(const QString& name) +VPE::VShortcutProperty::VShortcutProperty(const QString& name) : VProperty(name, QVariant::String) { } -VShortcutProperty::~VShortcutProperty() +VPE::VShortcutProperty::~VShortcutProperty() { // } -QVariant VShortcutProperty::data (int column, int role) const +QVariant VPE::VShortcutProperty::data (int column, int role) const { if (column == DPC_Data && (Qt::DisplayRole == role || Qt::EditRole == role)) { @@ -55,8 +52,8 @@ QVariant VShortcutProperty::data (int column, int role) const } -QWidget* VShortcutProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) +QWidget* VPE::VShortcutProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, + const QAbstractItemDelegate* delegate) { Q_UNUSED(options) @@ -70,7 +67,7 @@ QWidget* VShortcutProperty::createEditor(QWidget * parent, const QStyleOptionVie } -bool VShortcutProperty::setEditorData(QWidget* editor) +bool VPE::VShortcutProperty::setEditorData(QWidget* editor) { VShortcutEditWidget* tmpWidget = qobject_cast(editor); if (tmpWidget) @@ -84,7 +81,7 @@ bool VShortcutProperty::setEditorData(QWidget* editor) } -QVariant VShortcutProperty::getEditorData(const QWidget *editor) const +QVariant VPE::VShortcutProperty::getEditorData(const QWidget *editor) const { const VShortcutEditWidget* tmpWidget = qobject_cast(editor); if (tmpWidget) @@ -96,17 +93,17 @@ QVariant VShortcutProperty::getEditorData(const QWidget *editor) const } -QString VShortcutProperty::type() const +QString VPE::VShortcutProperty::type() const { return "shortcut"; } -VProperty* VShortcutProperty::clone(bool include_children, VProperty* container) const +VPE::VProperty* VPE::VShortcutProperty::clone(bool include_children, VProperty* container) const { return VProperty::clone(include_children, container ? container : new VShortcutProperty(getName())); } -void VShortcutProperty::setValue(const QVariant &value) +void VPE::VShortcutProperty::setValue(const QVariant &value) { VProperty::setValue(QKeySequence::fromString(value.toString()).toString()); } diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp index 7137d40ae..93e2426df 100644 --- a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp +++ b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.cpp @@ -30,9 +30,7 @@ class QHBoxLayout; class QKeyEvent; -using namespace VPE; - -VShortcutEditWidget::VShortcutEditWidget(QWidget *parent) +VPE::VShortcutEditWidget::VShortcutEditWidget(QWidget *parent) : QWidget(parent), CurrentKeySequence(), LineEdit(nullptr) { // Create the line edit widget @@ -51,12 +49,12 @@ VShortcutEditWidget::VShortcutEditWidget(QWidget *parent) } -VShortcutEditWidget::~VShortcutEditWidget() +VPE::VShortcutEditWidget::~VShortcutEditWidget() { // nothing needs to be done here } -bool VShortcutEditWidget::eventFilter(QObject *obj, QEvent *event) +bool VPE::VShortcutEditWidget::eventFilter(QObject *obj, QEvent *event) { if (obj == LineEdit) { @@ -82,23 +80,23 @@ bool VShortcutEditWidget::eventFilter(QObject *obj, QEvent *event) return QWidget::eventFilter(obj, event); } -QString VShortcutEditWidget::getShortcutAsString() const +QString VPE::VShortcutEditWidget::getShortcutAsString() const { return CurrentKeySequence.toString(); } // cppcheck-suppress unusedFunction -QKeySequence VShortcutEditWidget::getShortcut() +QKeySequence VPE::VShortcutEditWidget::getShortcut() { return CurrentKeySequence; } -void VShortcutEditWidget::setShortcut(const QString &shortcut, bool emit_signal) +void VPE::VShortcutEditWidget::setShortcut(const QString &shortcut, bool emit_signal) { setShortcut(QKeySequence::fromString(shortcut), emit_signal); } -void VShortcutEditWidget::setShortcut(const QKeySequence &shortcut, bool emit_signal) +void VPE::VShortcutEditWidget::setShortcut(const QKeySequence &shortcut, bool emit_signal) { if (shortcut != CurrentKeySequence) { @@ -111,7 +109,7 @@ void VShortcutEditWidget::setShortcut(const QKeySequence &shortcut, bool emit_si } } -void VShortcutEditWidget::onTextEdited(const QString &text) +void VPE::VShortcutEditWidget::onTextEdited(const QString &text) { setShortcut(text, true); } diff --git a/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp b/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp index 1fd2774ca..0b2a82707 100644 --- a/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vstringproperty.cpp @@ -35,9 +35,6 @@ class QAbstractItemDelegate; class QStyleOptionViewItem; -using namespace VPE; - - VPE::VStringProperty::VStringProperty(const QString &name, const QMap &settings) : VProperty(name, QVariant::String), readOnly(false), typeForParent(0), clearButton(false), m_osSeparator(false) { @@ -89,12 +86,12 @@ void VPE::VStringProperty::setReadOnly(bool readOnly) this->readOnly = readOnly; } -void VStringProperty::setOsSeparator(bool separator) +void VPE::VStringProperty::setOsSeparator(bool separator) { m_osSeparator = separator; } -void VStringProperty::setClearButtonEnable(bool value) +void VPE::VStringProperty::setClearButtonEnable(bool value) { this->clearButton = value; } @@ -142,23 +139,23 @@ VPE::VProperty *VPE::VStringProperty::clone(bool include_children, VPE::VPropert return VProperty::clone(include_children, container ? container : new VStringProperty(getName(), getSettings())); } -void VStringProperty::UpdateParent(const QVariant &value) +void VPE::VStringProperty::UpdateParent(const QVariant &value) { emit childChanged(value, typeForParent); } // cppcheck-suppress unusedFunction -int VStringProperty::getTypeForParent() const +int VPE::VStringProperty::getTypeForParent() const { return typeForParent; } -void VStringProperty::setTypeForParent(int value) +void VPE::VStringProperty::setTypeForParent(int value) { typeForParent = value; } -bool VStringProperty::eventFilter(QObject *object, QEvent *event) +bool VPE::VStringProperty::eventFilter(QObject *object, QEvent *event) { if (QLineEdit *textEdit = qobject_cast(object)) { diff --git a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.cpp b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.cpp index 985626b90..856a91e71 100644 --- a/src/libs/vpropertyexplorer/plugins/vwidgetproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vwidgetproperty.cpp @@ -28,24 +28,22 @@ #include "vemptyproperty.h" #include "../vproperty.h" -using namespace VPE; - -VWidgetProperty::VWidgetProperty(const QString& name, QWidget* widget) +VPE::VWidgetProperty::VWidgetProperty(const QString& name, QWidget* widget) : VEmptyProperty(new VWidgetPropertyPrivate(name, QVariant::Invalid, widget)) { } -VWidgetProperty::~VWidgetProperty() +VPE::VWidgetProperty::~VWidgetProperty() { // } -QWidget *VWidgetProperty::getWidget() const +QWidget *VPE::VWidgetProperty::getWidget() const { return static_cast(d_ptr)->Widget.data(); } -void VWidgetProperty::setWidget(QWidget* widget) +void VPE::VWidgetProperty::setWidget(QWidget* widget) { VWidgetPropertyPrivate* tmpDPtr = static_cast(d_ptr); QWidget* tmpOldWidget = tmpDPtr->Widget.data(); @@ -58,12 +56,12 @@ void VWidgetProperty::setWidget(QWidget* widget) } -QString VWidgetProperty::type() const +QString VPE::VWidgetProperty::type() const { return "widget"; } -VProperty* VWidgetProperty::clone(bool include_children, VProperty* container) const +VPE::VProperty* VPE::VWidgetProperty::clone(bool include_children, VProperty* container) const { /* todo: This is a tricky one to clone... don't know what would be the best way to do so... Maybe serialize the * widget somehow? diff --git a/src/libs/vpropertyexplorer/vproperty.cpp b/src/libs/vpropertyexplorer/vproperty.cpp index 9ba92349d..de53c9ac3 100644 --- a/src/libs/vpropertyexplorer/vproperty.cpp +++ b/src/libs/vpropertyexplorer/vproperty.cpp @@ -38,22 +38,20 @@ class QModelIndex; class QPainter; class QStyleOptionViewItem; -using namespace VPE; - //! Standard constructor, takes a name and a parent property as argument -VProperty::VProperty(const QString& name, QVariant::Type type) +VPE::VProperty::VProperty(const QString& name, QVariant::Type type) : QObject(), d_ptr(new VPropertyPrivate(name, type)) { } -VProperty::VProperty(VPropertyPrivate *d) +VPE::VProperty::VProperty(VPropertyPrivate *d) : d_ptr(d) { } -VProperty::~VProperty() +VPE::VProperty::~VProperty() { setParent(nullptr); @@ -66,13 +64,13 @@ VProperty::~VProperty() delete d_ptr; } -QString VProperty::type() const +QString VPE::VProperty::type() const { return "string"; } //! Get the data how it should be displayed -QVariant VProperty::data (int column, int role) const +QVariant VPE::VProperty::data (int column, int role) const { if (column == DPC_Name && Qt::DisplayRole == role) { @@ -90,7 +88,7 @@ QVariant VProperty::data (int column, int role) const return QVariant(); } -bool VProperty::setData(const QVariant &data, int role) +bool VPE::VProperty::setData(const QVariant &data, int role) { bool tmpResult = false; if (Qt::EditRole == role) @@ -102,8 +100,8 @@ bool VProperty::setData(const QVariant &data, int role) return tmpResult; } -bool VProperty::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index, - const QAbstractItemDelegate *delegate) const +bool VPE::VProperty::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index, + const QAbstractItemDelegate *delegate) const { Q_UNUSED(painter) Q_UNUSED(option) @@ -114,8 +112,8 @@ bool VProperty::paint(QPainter *painter, const QStyleOptionViewItem &option, con } //! Returns an editor widget, or NULL if it doesn't supply one -QWidget* VProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, - const QAbstractItemDelegate* delegate) +QWidget* VPE::VProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& options, + const QAbstractItemDelegate* delegate) { Q_UNUSED(options) Q_UNUSED(delegate) @@ -129,7 +127,7 @@ QWidget* VProperty::createEditor(QWidget * parent, const QStyleOptionViewItem& o return d_ptr->editor; } -bool VProperty::setEditorData(QWidget* editor) +bool VPE::VProperty::setEditorData(QWidget* editor) { if (!editor) { @@ -150,7 +148,7 @@ bool VProperty::setEditorData(QWidget* editor) } //! Gets the data from the widget -QVariant VProperty::getEditorData(const QWidget* editor) const +QVariant VPE::VProperty::getEditorData(const QWidget* editor) const { if (!editor) { @@ -168,7 +166,7 @@ QVariant VProperty::getEditorData(const QWidget* editor) const } //! Returns item flags -Qt::ItemFlags VProperty::flags(int column) const +Qt::ItemFlags VPE::VProperty::flags(int column) const { if (column == DPC_Name) { @@ -183,7 +181,7 @@ Qt::ItemFlags VProperty::flags(int column) const } -void VProperty::setValue(const QVariant &value) +void VPE::VProperty::setValue(const QVariant &value) { d_ptr->VariantValue = value; d_ptr->VariantValue.convert(static_cast(d_ptr->PropertyVariantType)); @@ -193,60 +191,60 @@ void VProperty::setValue(const QVariant &value) } } -QVariant VProperty::getValue() const +QVariant VPE::VProperty::getValue() const { return d_ptr->VariantValue; } // cppcheck-suppress unusedFunction -QString VProperty::serialize() const +QString VPE::VProperty::serialize() const { return getValue().toString(); } -void VProperty::deserialize(const QString& value) +void VPE::VProperty::deserialize(const QString& value) { setValue(QVariant(value)); } -void VProperty::setName(const QString& name) +void VPE::VProperty::setName(const QString& name) { d_ptr->Name = name; } -QString VProperty::getName() const +QString VPE::VProperty::getName() const { return d_ptr->Name; } -void VProperty::setDescription(const QString& desc) +void VPE::VProperty::setDescription(const QString& desc) { d_ptr->Description = desc; } -QString VProperty::getDescription() const +QString VPE::VProperty::getDescription() const { return d_ptr->Description; } //! Returns a reference to the list of children -QList& VProperty::getChildren() +QList& VPE::VProperty::getChildren() { return d_ptr->Children; } //! Returns a reference to the list of children -const QList& VProperty::getChildren() const +const QList& VPE::VProperty::getChildren() const { return d_ptr->Children; } //! Returns the child at a certain row -VProperty* VProperty::getChild(int row) const +VPE::VProperty* VPE::VProperty::getChild(int row) const { if (row >= 0 && row < getRowCount()) { @@ -257,19 +255,19 @@ VProperty* VProperty::getChild(int row) const } //! Gets the number of children -int VProperty::getRowCount() const +int VPE::VProperty::getRowCount() const { return d_ptr->Children.count(); } //! Gets the parent of this property -VProperty* VProperty::getParent() const +VPE::VProperty* VPE::VProperty::getParent() const { return d_ptr->Parent; } //! Sets the parent of this property -void VProperty::setParent(VProperty* parent) +void VPE::VProperty::setParent(VProperty* parent) { if (d_ptr->Parent == parent) { @@ -290,7 +288,7 @@ void VProperty::setParent(VProperty* parent) } } -int VProperty::addChild(VProperty *child) +int VPE::VProperty::addChild(VProperty *child) { if (child && child->getParent() != this) { @@ -309,7 +307,7 @@ int VProperty::addChild(VProperty *child) } //! Removes a child from the children list -void VProperty::removeChild(VProperty* child) +void VPE::VProperty::removeChild(VProperty* child) { d_ptr->Children.removeAll(child); @@ -320,32 +318,32 @@ void VProperty::removeChild(VProperty* child) } //! Returns the row the child has -int VProperty::getChildRow(VProperty* child) const +int VPE::VProperty::getChildRow(VProperty* child) const { return d_ptr->Children.indexOf(child); } //! Returns whether the views have to update the parent of this property if it changes -bool VProperty::getUpdateParent() const +bool VPE::VProperty::getUpdateParent() const { return d_ptr->UpdateParent; } //! Returns whether the views have to update the children of this property if it changes -bool VProperty::getUpdateChildren() const +bool VPE::VProperty::getUpdateChildren() const { return d_ptr->UpdateChildren; } //! Sets whether the views should update Parents or children after this property changes -void VProperty::setUpdateBehaviour(bool update_parent, bool update_children) +void VPE::VProperty::setUpdateBehaviour(bool update_parent, bool update_children) { d_ptr->UpdateParent = update_parent; d_ptr->UpdateChildren = update_children; } -void VProperty::setSettings(const QMap& settings) +void VPE::VProperty::setSettings(const QMap& settings) { QMap::const_iterator tmpIterator = settings.constBegin(); for (; tmpIterator != settings.constEnd(); ++tmpIterator) @@ -354,7 +352,7 @@ void VProperty::setSettings(const QMap& settings) } } -QMap VProperty::getSettings() const +QMap VPE::VProperty::getSettings() const { QMap tmpResult; @@ -365,26 +363,26 @@ QMap VProperty::getSettings() const return tmpResult; } -void VProperty::setSetting(const QString& key, const QVariant& value) +void VPE::VProperty::setSetting(const QString& key, const QVariant& value) { Q_UNUSED(key) Q_UNUSED(value) // Not needed in the Standard property } -QVariant VProperty::getSetting(const QString& key) const +QVariant VPE::VProperty::getSetting(const QString& key) const { // Not needed in the Standard property Q_UNUSED(key) return QVariant(); } -QStringList VProperty::getSettingKeys() const +QStringList VPE::VProperty::getSettingKeys() const { return QStringList(); } -VProperty* VProperty::clone(bool include_children, VProperty* container) const +VPE::VProperty* VPE::VProperty::clone(bool include_children, VProperty* container) const { if (!container) { @@ -407,28 +405,28 @@ VProperty* VProperty::clone(bool include_children, VProperty* container) const return container; } -Property VProperty::propertyType() const +VPE::Property VPE::VProperty::propertyType() const { return d_ptr->type; } -void VProperty::setPropertyType(const Property &type) +void VPE::VProperty::setPropertyType(const Property &type) { d_ptr->type = type; } -void VProperty::UpdateParent(const QVariant &value) +void VPE::VProperty::UpdateParent(const QVariant &value) { Q_UNUSED(value) } -void VProperty::ValueChildChanged(const QVariant &value, int typeForParent) +void VPE::VProperty::ValueChildChanged(const QVariant &value, int typeForParent) { Q_UNUSED(value) Q_UNUSED(typeForParent) } -UserChangeEvent::~UserChangeEvent() +VPE::UserChangeEvent::~UserChangeEvent() {} VPE::VPropertyPrivate::~VPropertyPrivate() diff --git a/src/libs/vpropertyexplorer/vpropertydelegate.cpp b/src/libs/vpropertyexplorer/vpropertydelegate.cpp index b2aa21a37..6bac9501e 100644 --- a/src/libs/vpropertyexplorer/vpropertydelegate.cpp +++ b/src/libs/vpropertyexplorer/vpropertydelegate.cpp @@ -36,20 +36,18 @@ class QStyleOptionViewItem; class QWidget; -using namespace VPE; - -VPropertyDelegate::VPropertyDelegate(QObject *parent) : +VPE::VPropertyDelegate::VPropertyDelegate(QObject *parent) : QStyledItemDelegate(parent), RowHeight(0), AddRowHeight(false) { } -VPropertyDelegate::~VPropertyDelegate() +VPE::VPropertyDelegate::~VPropertyDelegate() { // } -QWidget* VPropertyDelegate::createEditor (QWidget* parent, const QStyleOptionViewItem& option, - const QModelIndex& index) const +QWidget* VPE::VPropertyDelegate::createEditor (QWidget* parent, const QStyleOptionViewItem& option, + const QModelIndex& index) const { QWidget* tmpWidget = nullptr; if (index.isValid()) @@ -63,7 +61,7 @@ QWidget* VPropertyDelegate::createEditor (QWidget* parent, const QStyleOptionVie //! Sets the index data to the editor -void VPropertyDelegate::setEditorData (QWidget * editor, const QModelIndex & index) const +void VPE::VPropertyDelegate::setEditorData (QWidget * editor, const QModelIndex & index) const { bool done = false; if (index.isValid() && editor) @@ -79,7 +77,8 @@ void VPropertyDelegate::setEditorData (QWidget * editor, const QModelIndex & ind } //! Updates the index data -void VPropertyDelegate::setModelData (QWidget * editor, QAbstractItemModel * model, const QModelIndex & index) const +void VPE::VPropertyDelegate::setModelData (QWidget * editor, QAbstractItemModel * model, + const QModelIndex & index) const { QVariant tmpData; if (index.isValid() && editor) @@ -96,7 +95,7 @@ void VPropertyDelegate::setModelData (QWidget * editor, QAbstractItemModel * mod model->setData(index, tmpData); } -QSize VPropertyDelegate::sizeHint (const QStyleOptionViewItem& option, const QModelIndex& index) const +QSize VPE::VPropertyDelegate::sizeHint (const QStyleOptionViewItem& option, const QModelIndex& index) const { QSize tmpStandardSizeHint = QStyledItemDelegate::sizeHint(option, index); tmpStandardSizeHint.setHeight(tmpStandardSizeHint.height() + 1); @@ -109,13 +108,14 @@ QSize VPropertyDelegate::sizeHint (const QStyleOptionViewItem& option, const QMo return tmpStandardSizeHint; } -void VPropertyDelegate::setRowHeight(int height, bool add_to_standard) +void VPE::VPropertyDelegate::setRowHeight(int height, bool add_to_standard) { RowHeight = height; AddRowHeight = add_to_standard; } -void VPropertyDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const +void VPE::VPropertyDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, + const QModelIndex& index ) const { bool done = false; if (index.isValid() && index.column() == 1) diff --git a/src/libs/vpropertyexplorer/vpropertyfactorymanager.cpp b/src/libs/vpropertyexplorer/vpropertyfactorymanager.cpp index 6b7edf89e..0fdc1ad09 100644 --- a/src/libs/vpropertyexplorer/vpropertyfactorymanager.cpp +++ b/src/libs/vpropertyexplorer/vpropertyfactorymanager.cpp @@ -30,18 +30,15 @@ #include "vpropertyfactorymanager_p.h" #include "vstandardpropertyfactory.h" -using namespace VPE; +VPE::VPropertyFactoryManager* VPE::VPropertyFactoryManager::DefaultManager = NULL; - -VPropertyFactoryManager* VPropertyFactoryManager::DefaultManager = NULL; - -VPropertyFactoryManager::VPropertyFactoryManager(QObject *parent) +VPE::VPropertyFactoryManager::VPropertyFactoryManager(QObject *parent) : QObject(parent), d_ptr(new VPropertyFactoryManagerPrivate()) { } -VPropertyFactoryManager::~VPropertyFactoryManager() +VPE::VPropertyFactoryManager::~VPropertyFactoryManager() { // Delete all factories QList tmpFactories = d_ptr->Factories.values(); @@ -60,7 +57,7 @@ VPropertyFactoryManager::~VPropertyFactoryManager() } } -void VPropertyFactoryManager::registerFactory(const QString& type, VAbstractPropertyFactory* factory) +void VPE::VPropertyFactoryManager::registerFactory(const QString& type, VAbstractPropertyFactory* factory) { if (type.isEmpty()) { @@ -73,7 +70,7 @@ void VPropertyFactoryManager::registerFactory(const QString& type, VAbstractProp d_ptr->Factories[type] = factory; } -void VPropertyFactoryManager::unregisterFactory(VAbstractPropertyFactory* factory, const QString& type, +void VPE::VPropertyFactoryManager::unregisterFactory(VAbstractPropertyFactory* factory, const QString& type, bool delete_if_unused) { if (!factory) @@ -109,19 +106,19 @@ void VPropertyFactoryManager::unregisterFactory(VAbstractPropertyFactory* factor } } -bool VPropertyFactoryManager::isRegistered(VAbstractPropertyFactory* factory) +bool VPE::VPropertyFactoryManager::isRegistered(VAbstractPropertyFactory* factory) { return (!d_ptr->Factories.key(factory, QString()).isEmpty()); } -VAbstractPropertyFactory* VPropertyFactoryManager::getFactory(const QString& type) +VPE::VAbstractPropertyFactory* VPE::VPropertyFactoryManager::getFactory(const QString& type) { return d_ptr->Factories.value(type, NULL); } -VProperty* VPropertyFactoryManager::createProperty(const QString& type, const QString& name, const QString& description, - const QString &default_value) +VPE::VProperty* VPE::VPropertyFactoryManager::createProperty(const QString& type, const QString& name, + const QString& description, const QString &default_value) { VAbstractPropertyFactory* tmpFactory = getFactory(type); VProperty* tmpResult = NULL; @@ -144,7 +141,7 @@ VProperty* VPropertyFactoryManager::createProperty(const QString& type, const QS } // cppcheck-suppress unusedFunction -VPropertyFactoryManager *VPropertyFactoryManager::getDefaultManager() +VPE::VPropertyFactoryManager *VPE::VPropertyFactoryManager::getDefaultManager() { if (!DefaultManager) { @@ -156,7 +153,7 @@ VPropertyFactoryManager *VPropertyFactoryManager::getDefaultManager() } // cppcheck-suppress unusedFunction -QStringList VPropertyFactoryManager::getSupportedTypes() +QStringList VPE::VPropertyFactoryManager::getSupportedTypes() { return d_ptr->Factories.keys(); } diff --git a/src/libs/vpropertyexplorer/vpropertyformview.cpp b/src/libs/vpropertyexplorer/vpropertyformview.cpp index f83db5897..e22851bf4 100644 --- a/src/libs/vpropertyexplorer/vpropertyformview.cpp +++ b/src/libs/vpropertyexplorer/vpropertyformview.cpp @@ -33,32 +33,30 @@ class QModelIndex; class QShowEvent; class QWidget; -using namespace VPE; - -VPropertyFormView::VPropertyFormView(QWidget* parent) +VPE::VPropertyFormView::VPropertyFormView(QWidget* parent) : VPropertyFormWidget(new VPropertyFormViewPrivate(), parent) { // } -VPropertyFormView::VPropertyFormView(VPropertyModel* model, QWidget *parent) +VPE::VPropertyFormView::VPropertyFormView(VPropertyModel* model, QWidget *parent) : VPropertyFormWidget(new VPropertyFormViewPrivate(), parent) { setModel(model); } -VPropertyFormView::VPropertyFormView(VPropertySet* property_set, QWidget *parent) +VPE::VPropertyFormView::VPropertyFormView(VPropertySet* property_set, QWidget *parent) : VPropertyFormWidget(new VPropertyFormViewPrivate(), parent) { setPropertySet(property_set); } -VPropertyFormView::~VPropertyFormView() +VPE::VPropertyFormView::~VPropertyFormView() { // Nothing to do } -void VPropertyFormView::build() +void VPE::VPropertyFormView::build() { VPropertyFormWidget::build(); @@ -66,7 +64,7 @@ void VPropertyFormView::build() connectPropertyFormWidget(this); } -void VPropertyFormView::setModel(VPropertyModel *model) +void VPE::VPropertyFormView::setModel(VPropertyModel *model) { // Remove old model or set removeModelAndSet(); @@ -92,7 +90,7 @@ void VPropertyFormView::setModel(VPropertyModel *model) updatePropertyList(); } -void VPropertyFormView::setPropertySet(VPropertySet* property_set) +void VPE::VPropertyFormView::setPropertySet(VPropertySet* property_set) { // Remove old model or set removeModelAndSet(); @@ -109,7 +107,7 @@ void VPropertyFormView::setPropertySet(VPropertySet* property_set) updatePropertyList(); } -void VPropertyFormView::rowsRemoved(const QModelIndex &parent, int start, int end) +void VPE::VPropertyFormView::rowsRemoved(const QModelIndex &parent, int start, int end) { // todo: Only rebuild the neccessary parts Q_UNUSED(parent) @@ -118,7 +116,7 @@ void VPropertyFormView::rowsRemoved(const QModelIndex &parent, int start, int en updatePropertyList(); } -void VPropertyFormView::rowsInserted(const QModelIndex &parent, int start, int end) //-V524 +void VPE::VPropertyFormView::rowsInserted(const QModelIndex &parent, int start, int end) //-V524 { // todo: Only rebuild the neccessary parts Q_UNUSED(parent) @@ -127,18 +125,18 @@ void VPropertyFormView::rowsInserted(const QModelIndex &parent, int start, int e updatePropertyList(); } -void VPropertyFormView::modelReset() +void VPE::VPropertyFormView::modelReset() { updatePropertyList(); } -void VPropertyFormView::modelDestroyed() +void VPE::VPropertyFormView::modelDestroyed() { removeModelAndSet(); updatePropertyList(); } -void VPropertyFormView::dataChanged(const QModelIndex &top_left, const QModelIndex &bottom_right) +void VPE::VPropertyFormView::dataChanged(const QModelIndex &top_left, const QModelIndex &bottom_right) { Q_UNUSED(top_left) Q_UNUSED(bottom_right) @@ -149,7 +147,7 @@ void VPropertyFormView::dataChanged(const QModelIndex &top_left, const QModelInd // todo: handle data changes } -void VPropertyFormView::dataSubmitted(VProperty *property) +void VPE::VPropertyFormView::dataSubmitted(VProperty *property) { VPropertyModel* tmpModel = static_cast(d_ptr)->Model; @@ -161,7 +159,7 @@ void VPropertyFormView::dataSubmitted(VProperty *property) } } -void VPropertyFormView::showEvent(QShowEvent *event) +void VPE::VPropertyFormView::showEvent(QShowEvent *event) { Q_UNUSED(event) if (static_cast(d_ptr)->NeedsRebuild) @@ -171,7 +169,7 @@ void VPropertyFormView::showEvent(QShowEvent *event) static_cast(d_ptr)->NeedsRebuild = false; } -void VPropertyFormView::updatePropertyList() +void VPE::VPropertyFormView::updatePropertyList() { VPropertyModel* tmpModel = static_cast(d_ptr)->Model; VPropertySet* tmpSet = static_cast(d_ptr)->PropertySet; @@ -195,7 +193,7 @@ void VPropertyFormView::updatePropertyList() static_cast(d_ptr)->NeedsRebuild = true; } -void VPropertyFormView::removeModelAndSet() +void VPE::VPropertyFormView::removeModelAndSet() { if (static_cast(d_ptr)->Model) { @@ -208,7 +206,7 @@ void VPropertyFormView::removeModelAndSet() static_cast(d_ptr)->PropertySet = nullptr; } -void VPropertyFormView::connectPropertyFormWidget(VPropertyFormWidget *widget) +void VPE::VPropertyFormView::connectPropertyFormWidget(VPropertyFormWidget *widget) { if (!widget) { diff --git a/src/libs/vpropertyexplorer/vpropertyformwidget.cpp b/src/libs/vpropertyexplorer/vpropertyformwidget.cpp index b442d5cb2..f694737e8 100644 --- a/src/libs/vpropertyexplorer/vpropertyformwidget.cpp +++ b/src/libs/vpropertyexplorer/vpropertyformwidget.cpp @@ -38,9 +38,7 @@ class QKeyEvent; -using namespace VPE; - -VPropertyFormWidget::VPropertyFormWidget(const QString &title, const QString &description, +VPE::VPropertyFormWidget::VPropertyFormWidget(const QString &title, const QString &description, const QList& properties, QWidget *parent) : QGroupBox(title, parent), d_ptr(new VPropertyFormWidgetPrivate(properties)) { @@ -49,7 +47,7 @@ VPropertyFormWidget::VPropertyFormWidget(const QString &title, const QString &de setWhatsThis(description); } -VPropertyFormWidget::VPropertyFormWidget(VProperty *parent_property, QWidget *parent) +VPE::VPropertyFormWidget::VPropertyFormWidget(VProperty *parent_property, QWidget *parent) : QGroupBox(parent), d_ptr(new VPropertyFormWidgetPrivate()) { if (parent_property) @@ -62,8 +60,8 @@ VPropertyFormWidget::VPropertyFormWidget(VProperty *parent_property, QWidget *pa } } -VPropertyFormWidget::VPropertyFormWidget(VPropertyFormWidgetPrivate *d_pointer, QWidget *parent, const QString &title, - const QString &description) +VPE::VPropertyFormWidget::VPropertyFormWidget(VPropertyFormWidgetPrivate *d_pointer, QWidget *parent, + const QString &title, const QString &description) : QGroupBox(title, parent), d_ptr(d_pointer) { build(); @@ -71,13 +69,13 @@ VPropertyFormWidget::VPropertyFormWidget(VPropertyFormWidgetPrivate *d_pointer, setWhatsThis(description); } -VPropertyFormWidget::~VPropertyFormWidget() +VPE::VPropertyFormWidget::~VPropertyFormWidget() { delete d_ptr; } -void VPropertyFormWidget::build() +void VPE::VPropertyFormWidget::build() { // Clear the old content, delete old widgets d_ptr->EditorWidgets.clear(); @@ -160,7 +158,7 @@ void VPropertyFormWidget::build() } } -void VPropertyFormWidget::buildEditor(VProperty* property, QFormLayout* formLayout, Property type) +void VPE::VPropertyFormWidget::buildEditor(VProperty* property, QFormLayout* formLayout, Property type) { // Add property (no child properties) // Create the editor (if it doesn't work, create empty widget) @@ -194,7 +192,7 @@ void VPropertyFormWidget::buildEditor(VProperty* property, QFormLayout* formLayo d_ptr->EditorWidgets.append(VPropertyFormWidgetPrivate::SEditorWidget(tmpEditor)); } -void VPropertyFormWidget::commitData() +void VPE::VPropertyFormWidget::commitData() { for (int i = 0; i < d_ptr->Properties.count(); ++i) { @@ -202,7 +200,7 @@ void VPropertyFormWidget::commitData() } } -void VPropertyFormWidget::loadData() +void VPE::VPropertyFormWidget::loadData() { for (int i = 0; i < d_ptr->Properties.count(); ++i) { @@ -210,7 +208,7 @@ void VPropertyFormWidget::loadData() } } -void VPropertyFormWidget::commitData(int row) +void VPE::VPropertyFormWidget::commitData(int row) { if (row < 0 || row >= d_ptr->EditorWidgets.count() || row >= d_ptr->Properties.count()) { @@ -249,7 +247,7 @@ void VPropertyFormWidget::commitData(int row) } } -void VPropertyFormWidget::loadData(int row) +void VPE::VPropertyFormWidget::loadData(int row) { if (row < 0 || row >= d_ptr->EditorWidgets.count() || row >= d_ptr->Properties.count()) { @@ -268,7 +266,7 @@ void VPropertyFormWidget::loadData(int row) } } -void VPropertyFormWidget::setCommitBehaviour(bool auto_commit) +void VPE::VPropertyFormWidget::setCommitBehaviour(bool auto_commit) { d_ptr->UpdateEditors = auto_commit; @@ -282,7 +280,7 @@ void VPropertyFormWidget::setCommitBehaviour(bool auto_commit) } } -QList VPropertyFormWidget::getChildPropertyFormWidgets() const +QList VPE::VPropertyFormWidget::getChildPropertyFormWidgets() const { QList tmpResult; foreach(const VPropertyFormWidgetPrivate::SEditorWidget& tmpEditorWidget, d_ptr->EditorWidgets) @@ -296,7 +294,7 @@ QList VPropertyFormWidget::getChildPropertyFormWidgets() return tmpResult; } -bool VPropertyFormWidget::eventFilter(QObject *object, QEvent *event) +bool VPE::VPropertyFormWidget::eventFilter(QObject *object, QEvent *event) { if (!d_ptr->UpdateEditors) { @@ -354,7 +352,7 @@ bool VPropertyFormWidget::eventFilter(QObject *object, QEvent *event) return false; } -void VPropertyFormWidget::commitData(const QWidget *editor) +void VPE::VPropertyFormWidget::commitData(const QWidget *editor) { if (!editor) { diff --git a/src/libs/vpropertyexplorer/vpropertymodel.cpp b/src/libs/vpropertyexplorer/vpropertymodel.cpp index 95d6978e0..04eb66d7a 100644 --- a/src/libs/vpropertyexplorer/vpropertymodel.cpp +++ b/src/libs/vpropertyexplorer/vpropertymodel.cpp @@ -25,29 +25,27 @@ #include "vproperty.h" #include "vpropertyset.h" -using namespace VPE; - #include "vpropertymodel_p.h" -VPropertyModel::VPropertyModel(VPropertyModelPrivate *d, QObject *parent) +VPE::VPropertyModel::VPropertyModel(VPropertyModelPrivate *d, QObject *parent) : QAbstractItemModel(parent), d_ptr(d) { } -VPropertyModel::VPropertyModel(QObject * parent) : +VPE::VPropertyModel::VPropertyModel(QObject * parent) : QAbstractItemModel(parent), d_ptr(new VPropertyModelPrivate()) { } -VPropertyModel::~VPropertyModel() +VPE::VPropertyModel::~VPropertyModel() { delete d_ptr->Properties; delete d_ptr; } //! Adds the property to the model and attaches it to the parentid -bool VPropertyModel::addProperty(VProperty* property, const QString& id, const QString &parentid, bool emitsignals) +bool VPE::VPropertyModel::addProperty(VProperty* property, const QString& id, const QString &parentid, bool emitsignals) { if (!property) { @@ -78,8 +76,8 @@ bool VPropertyModel::addProperty(VProperty* property, const QString& id, const Q } //! Creates a property and adds it to the model -VProperty* VPropertyModel::createProperty(const QString& id, const QString& name, const QString& parentid, - const QVariant& data) +VPE::VProperty* VPE::VPropertyModel::createProperty(const QString& id, const QString& name, const QString& parentid, + const QVariant& data) { VProperty* tmpProp = new VProperty(name); tmpProp->setValue(data); @@ -92,13 +90,13 @@ VProperty* VPropertyModel::createProperty(const QString& id, const QString& name } //! Gets a property by it's ID -VProperty* VPropertyModel::getProperty(const QString& id) +VPE::VProperty* VPE::VPropertyModel::getProperty(const QString& id) { return d_ptr->Properties != nullptr ? d_ptr->Properties->getProperty(id) : nullptr; } //! Returns the model index at row/column -QModelIndex VPropertyModel::index(int row, int column, const QModelIndex& parent) const +QModelIndex VPE::VPropertyModel::index(int row, int column, const QModelIndex& parent) const { if (d_ptr->Properties == nullptr || (parent.isValid() && parent.column() > 1)) { @@ -127,7 +125,7 @@ QModelIndex VPropertyModel::index(int row, int column, const QModelIndex& parent } //! Returns the parent of one model index -QModelIndex VPropertyModel::parent ( const QModelIndex & index ) const +QModelIndex VPE::VPropertyModel::parent ( const QModelIndex & index ) const { if (!index.isValid()) { @@ -155,7 +153,7 @@ QModelIndex VPropertyModel::parent ( const QModelIndex & index ) const } //! Returns the item flags for the given index -Qt::ItemFlags VPropertyModel::flags (const QModelIndex& index) const +Qt::ItemFlags VPE::VPropertyModel::flags (const QModelIndex& index) const { VProperty* tmpProperty = getProperty(index); if (!tmpProperty) @@ -167,7 +165,7 @@ Qt::ItemFlags VPropertyModel::flags (const QModelIndex& index) const } //! Sets the role data for the item at index to value -bool VPropertyModel::setData (const QModelIndex& index, const QVariant& value, int role) +bool VPE::VPropertyModel::setData (const QModelIndex& index, const QVariant& value, int role) { VProperty* tmpProperty = getProperty(index); if (index.column() == 1 && tmpProperty) @@ -191,7 +189,7 @@ bool VPropertyModel::setData (const QModelIndex& index, const QVariant& value, i //! Returns the data of an model index -QVariant VPropertyModel::data ( const QModelIndex & index, int role ) const +QVariant VPE::VPropertyModel::data ( const QModelIndex & index, int role ) const { VProperty* tmpProperty = getProperty(index); if (!tmpProperty) @@ -203,7 +201,7 @@ QVariant VPropertyModel::data ( const QModelIndex & index, int role ) const } -QVariant VPropertyModel::headerData (int section, Qt::Orientation orientation, int role) const +QVariant VPE::VPropertyModel::headerData (int section, Qt::Orientation orientation, int role) const { if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { @@ -227,7 +225,7 @@ QVariant VPropertyModel::headerData (int section, Qt::Orientation orientation, i //! Returns the number of rows -int VPropertyModel::rowCount ( const QModelIndex & parent ) const +int VPE::VPropertyModel::rowCount ( const QModelIndex & parent ) const { if (parent.isValid()) { @@ -249,7 +247,7 @@ int VPropertyModel::rowCount ( const QModelIndex & parent ) const //! Returns the number of columns -int VPropertyModel::columnCount ( const QModelIndex & parent) const +int VPE::VPropertyModel::columnCount ( const QModelIndex & parent) const { Q_UNUSED(parent) return 2; @@ -257,7 +255,7 @@ int VPropertyModel::columnCount ( const QModelIndex & parent) const //! Gets a property by its ModelIndex -VProperty* VPropertyModel::getProperty(const QModelIndex &index) const +VPE::VProperty* VPE::VPropertyModel::getProperty(const QModelIndex &index) const { if (index.isValid()) { @@ -271,12 +269,12 @@ VProperty* VPropertyModel::getProperty(const QModelIndex &index) const return nullptr; } -QString VPropertyModel::getPropertyID(const VProperty *prop) const +QString VPE::VPropertyModel::getPropertyID(const VProperty *prop) const { return d_ptr->Properties != nullptr ? d_ptr->Properties->getPropertyID(prop) : QString(); } -QModelIndex VPropertyModel::getIndexFromProperty(VProperty* property, int column) const +QModelIndex VPE::VPropertyModel::getIndexFromProperty(VProperty* property, int column) const { if (!property || column > columnCount() || column < 0) { @@ -295,7 +293,7 @@ QModelIndex VPropertyModel::getIndexFromProperty(VProperty* property, int column } -void VPropertyModel::onDataChangedByModel(VProperty* property) +void VPE::VPropertyModel::onDataChangedByModel(VProperty* property) { QModelIndex tmpIndex = getIndexFromProperty(property, 1); if (tmpIndex.isValid()) @@ -305,17 +303,17 @@ void VPropertyModel::onDataChangedByModel(VProperty* property) } } -const VPropertySet *VPropertyModel::getPropertySet() const +const VPE::VPropertySet *VPE::VPropertyModel::getPropertySet() const { return d_ptr->Properties; } -void VPropertyModel::clear(bool emit_signals) +void VPE::VPropertyModel::clear(bool emit_signals) { setPropertySet(nullptr, emit_signals); } -VPropertySet *VPropertyModel::takePropertySet(VPropertySet *new_property_set, bool emit_signals) +VPE::VPropertySet *VPE::VPropertyModel::takePropertySet(VPropertySet *new_property_set, bool emit_signals) { VPropertySet* tmpOldPropertySet = d_ptr->Properties; @@ -332,13 +330,13 @@ VPropertySet *VPropertyModel::takePropertySet(VPropertySet *new_property_set, bo return tmpOldPropertySet; } -void VPropertyModel::setPropertySet(VPropertySet *property_set, bool emit_signals) +void VPE::VPropertyModel::setPropertySet(VPropertySet *property_set, bool emit_signals) { VPropertySet* tmpOldPropertySet = takePropertySet(property_set, emit_signals); delete tmpOldPropertySet; } -VProperty *VPropertyModel::takeProperty(const QString &id) +VPE::VProperty *VPE::VPropertyModel::takeProperty(const QString &id) { QModelIndex tmpIndex = getIndexFromProperty(getProperty(id)); if (d_ptr->Properties && tmpIndex.isValid()) @@ -352,7 +350,7 @@ VProperty *VPropertyModel::takeProperty(const QString &id) return nullptr; } -void VPropertyModel::removeProperty(const QString &id) +void VPE::VPropertyModel::removeProperty(const QString &id) { QModelIndex tmpIndex = getIndexFromProperty(getProperty(id)); if (d_ptr->Properties && tmpIndex.isValid()) diff --git a/src/libs/vpropertyexplorer/vpropertyset.cpp b/src/libs/vpropertyexplorer/vpropertyset.cpp index dd9503792..77775b855 100644 --- a/src/libs/vpropertyexplorer/vpropertyset.cpp +++ b/src/libs/vpropertyexplorer/vpropertyset.cpp @@ -25,19 +25,17 @@ #include #include -using namespace VPE; - #include "vproperty.h" #include "vpropertyset_p.h" -VPropertySet::VPropertySet() +VPE::VPropertySet::VPropertySet() : d_ptr(new VPropertySetPrivate()) { } -VPropertySet::~VPropertySet() +VPE::VPropertySet::~VPropertySet() { // Delete all the properties clear(true); @@ -45,7 +43,7 @@ VPropertySet::~VPropertySet() delete d_ptr; } -bool VPropertySet::addProperty(VProperty *property, const QString &id, const QString &parentid) +bool VPE::VPropertySet::addProperty(VProperty *property, const QString &id, const QString &parentid) { // Check if the property to add is not a null pointer if (!property) @@ -57,7 +55,7 @@ bool VPropertySet::addProperty(VProperty *property, const QString &id, const QSt return addProperty(property, id, tmpParent); } -bool VPropertySet::addProperty(VProperty *property, const QString &id, VProperty *parent_property) +bool VPE::VPropertySet::addProperty(VProperty *property, const QString &id, VProperty *parent_property) { // Check if the property to add is not a null pointer if (!property) @@ -92,7 +90,7 @@ bool VPropertySet::addProperty(VProperty *property, const QString &id, VProperty return true; } -bool VPropertySet::hasProperty(VProperty *property) const +bool VPE::VPropertySet::hasProperty(VProperty *property) const { if (!property) { @@ -102,12 +100,12 @@ bool VPropertySet::hasProperty(VProperty *property) const return hasProperty(property, NULL); } -VProperty *VPropertySet::getProperty(const QString &id) const +VPE::VProperty *VPE::VPropertySet::getProperty(const QString &id) const { return d_ptr->Properties.value(id, NULL); } -VProperty *VPropertySet::takeProperty(const QString &id) +VPE::VProperty *VPE::VPropertySet::takeProperty(const QString &id) { VProperty* tmpProp = getProperty(id); removeProperty(tmpProp, false); @@ -116,13 +114,13 @@ VProperty *VPropertySet::takeProperty(const QString &id) return tmpProp; } -void VPropertySet::removeProperty(const QString &id) +void VPE::VPropertySet::removeProperty(const QString &id) { VProperty* tmpProp = takeProperty(id); delete tmpProp; } -void VPropertySet::removeProperty(VProperty* prop, bool delete_property) +void VPE::VPropertySet::removeProperty(VProperty* prop, bool delete_property) { // Remove all the children removePropertyFromSet(prop); @@ -139,12 +137,12 @@ void VPropertySet::removeProperty(VProperty* prop, bool delete_property) } } -int VPropertySet::count() const +int VPE::VPropertySet::count() const { return d_ptr->Properties.count(); } -void VPropertySet::clear(bool delete_properties) +void VPE::VPropertySet::clear(bool delete_properties) { d_ptr->Properties.clear(); while (!d_ptr->RootProperties.isEmpty()) @@ -157,7 +155,7 @@ void VPropertySet::clear(bool delete_properties) } } -QString VPropertySet::getPropertyID(const VProperty *prop, bool look_for_parent_id) const +QString VPE::VPropertySet::getPropertyID(const VProperty *prop, bool look_for_parent_id) const { QString tmpResult; const VProperty* tmpCurrentProp = prop; @@ -185,27 +183,27 @@ QString VPropertySet::getPropertyID(const VProperty *prop, bool look_for_parent_ } // cppcheck-suppress unusedFunction -const QMap &VPropertySet::getPropertiesMap() const +const QMap &VPE::VPropertySet::getPropertiesMap() const { return d_ptr->Properties; } -const QList &VPropertySet::getRootProperties() const +const QList &VPE::VPropertySet::getRootProperties() const { return d_ptr->RootProperties; } -VProperty *VPropertySet::getRootProperty(int row) const +VPE::VProperty *VPE::VPropertySet::getRootProperty(int row) const { return d_ptr->RootProperties.value(row, NULL); } -int VPropertySet::getRootPropertyCount() const +int VPE::VPropertySet::getRootPropertyCount() const { return d_ptr->RootProperties.count(); } -VPropertySet* VPropertySet::clone() const +VPE::VPropertySet* VPE::VPropertySet::clone() const { VPropertySet* tmpResult = new VPropertySet(); @@ -216,7 +214,7 @@ VPropertySet* VPropertySet::clone() const return tmpResult; } -bool VPropertySet::hasProperty(VProperty *property, VProperty *parent) const +bool VPE::VPropertySet::hasProperty(VProperty *property, VProperty *parent) const { if (!property) { @@ -239,8 +237,8 @@ bool VPropertySet::hasProperty(VProperty *property, VProperty *parent) const return false; } -void VPropertySet::cloneProperty(VProperty* property_to_clone, VProperty *parent_property, - VPropertySet *output_set) const +void VPE::VPropertySet::cloneProperty(VProperty* property_to_clone, VProperty *parent_property, + VPropertySet *output_set) const { if (!output_set || !property_to_clone || !hasProperty(property_to_clone)) { @@ -259,7 +257,7 @@ void VPropertySet::cloneProperty(VProperty* property_to_clone, VProperty *parent } } -void VPropertySet::removePropertyFromSet(VProperty *prop) +void VPE::VPropertySet::removePropertyFromSet(VProperty *prop) { // Remove all the children foreach(VProperty* tmpChild, prop->getChildren()) diff --git a/src/libs/vpropertyexplorer/vpropertytreeview.cpp b/src/libs/vpropertyexplorer/vpropertytreeview.cpp index 761dfdbd8..fbf38a1ea 100644 --- a/src/libs/vpropertyexplorer/vpropertytreeview.cpp +++ b/src/libs/vpropertyexplorer/vpropertytreeview.cpp @@ -29,15 +29,13 @@ class QWidget; -using namespace VPE; - -VPropertyTreeView::VPropertyTreeView(QWidget *parent) +VPE::VPropertyTreeView::VPropertyTreeView(QWidget *parent) : QTreeView(parent), d_ptr(new VPropertyTreeViewPrivate()) { init(); } -VPropertyTreeView::VPropertyTreeView(VPropertyModel *model, QWidget *parent) +VPE::VPropertyTreeView::VPropertyTreeView(VPropertyModel *model, QWidget *parent) : QTreeView(parent), d_ptr(new VPropertyTreeViewPrivate()) { init(); @@ -48,7 +46,7 @@ VPropertyTreeView::VPropertyTreeView(VPropertyModel *model, QWidget *parent) } } -VPropertyTreeView::VPropertyTreeView(VPropertyTreeViewPrivate *d, bool init_, QWidget *parent) +VPE::VPropertyTreeView::VPropertyTreeView(VPropertyTreeViewPrivate *d, bool init_, QWidget *parent) : QTreeView(parent), d_ptr(d) { if (init_) @@ -57,18 +55,18 @@ VPropertyTreeView::VPropertyTreeView(VPropertyTreeViewPrivate *d, bool init_, QW } } -VPropertyTreeView::~VPropertyTreeView() +VPE::VPropertyTreeView::~VPropertyTreeView() { delete d_ptr; } -void VPropertyTreeView::setRowHeight(int height, bool add_to_standard) +void VPE::VPropertyTreeView::setRowHeight(int height, bool add_to_standard) { d_ptr->PropertyDelegate->setRowHeight(height, add_to_standard); } -void VPropertyTreeView::init() +void VPE::VPropertyTreeView::init() { setAlternatingRowColors(true); setUniformRowHeights(true); diff --git a/src/libs/vpropertyexplorer/vserializedproperty.cpp b/src/libs/vpropertyexplorer/vserializedproperty.cpp index 2afd6e729..d94e8eea0 100644 --- a/src/libs/vpropertyexplorer/vserializedproperty.cpp +++ b/src/libs/vpropertyexplorer/vserializedproperty.cpp @@ -26,16 +26,14 @@ #include "vproperty.h" #include "vpropertyset.h" -using namespace VPE; - -VSerializedProperty::VSerializedProperty() +VPE::VSerializedProperty::VSerializedProperty() : ID(), Type(), Value(), Children() {} /*! Creates a new VSerializedProperty from an existing property */ -VSerializedProperty::VSerializedProperty(const VProperty* property, const VPropertySet* set) +VPE::VSerializedProperty::VSerializedProperty(const VProperty* property, const VPropertySet* set) : ID(), Type(property ? property->type() : QString()), Value(property ? property->getValue() : QVariant()), Children() { @@ -47,19 +45,19 @@ VSerializedProperty::VSerializedProperty(const VProperty* property, const VPrope } } -VSerializedProperty::VSerializedProperty(const VProperty *property, const QString &id, const VPropertySet *set) +VPE::VSerializedProperty::VSerializedProperty(const VProperty *property, const QString &id, const VPropertySet *set) : ID(id), Type(property ? property->type() : QString()), Value(property ? property->getValue() : QVariant()), Children() { initChildren(property, set); } -VSerializedProperty::VSerializedProperty(const QString &id, const QString &type, const QVariant &value) +VPE::VSerializedProperty::VSerializedProperty(const QString &id, const QString &type, const QVariant &value) : ID(id), Type(type), Value(value), Children() { } -void VSerializedProperty::initChildren(const VProperty *property, const VPropertySet *set) +void VPE::VSerializedProperty::initChildren(const VProperty *property, const VPropertySet *set) { if (property && set) { diff --git a/src/libs/vpropertyexplorer/vstandardpropertyfactory.cpp b/src/libs/vpropertyexplorer/vstandardpropertyfactory.cpp index cdb143368..fa6d4dc42 100644 --- a/src/libs/vpropertyexplorer/vstandardpropertyfactory.cpp +++ b/src/libs/vpropertyexplorer/vstandardpropertyfactory.cpp @@ -31,15 +31,12 @@ #include "plugins/vshortcutproperty.h" #include "vpropertyfactorymanager.h" - -using namespace VPE; - -VStandardPropertyFactory::VStandardPropertyFactory() +VPE::VStandardPropertyFactory::VStandardPropertyFactory() : VAbstractPropertyFactory() { } -VStandardPropertyFactory::VStandardPropertyFactory(VPropertyFactoryManager *manager) +VPE::VStandardPropertyFactory::VStandardPropertyFactory(VPropertyFactoryManager *manager) : VAbstractPropertyFactory() { if (manager) @@ -57,7 +54,7 @@ VStandardPropertyFactory::VStandardPropertyFactory(VPropertyFactoryManager *mana } } -VProperty *VStandardPropertyFactory::createProperty(const QString &type, const QString &name) +VPE::VProperty *VPE::VStandardPropertyFactory::createProperty(const QString &type, const QString &name) { if (type == QString("string")) { diff --git a/src/test/ParserTest/main.cpp b/src/test/ParserTest/main.cpp index 05e562d5c..a3c1b76a7 100644 --- a/src/test/ParserTest/main.cpp +++ b/src/test/ParserTest/main.cpp @@ -31,9 +31,6 @@ #include #include "../qmuparser/qmuparsertest.h" -using namespace qmu; -using namespace Test; - //--------------------------------------------------------------------------------------------------------------------- void testMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) { @@ -64,7 +61,7 @@ int main(int argc, char *argv[]) { QCoreApplication a(argc, argv); qInstallMessageHandler(testMessageOutput); - QmuParserTester pt; + qmu::Test::QmuParserTester pt; QTimer::singleShot(0, &pt, SLOT(Run())); return a.exec(); }