diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-02-18 21:16:38 +0000 |
|---|---|---|
| committer | Jabiertxof <jabier.arraiza@marker.es> | 2019-02-20 15:35:31 +0000 |
| commit | 2aeeb785bf3f166eb9128b72267605bc6535e17f (patch) | |
| tree | 23001a2d0b1805449f4bfd92916ed04d05381f80 /src/style.cpp | |
| parent | Fix compiling issues (diff) | |
| download | inkscape-2aeeb785bf3f166eb9128b72267605bc6535e17f.tar.gz inkscape-2aeeb785bf3f166eb9128b72267605bc6535e17f.zip | |
Merge from master
Diffstat (limited to 'src/style.cpp')
| -rw-r--r-- | src/style.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/style.cpp b/src/style.cpp index 87ae6cf2c..305952248 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -478,7 +478,7 @@ SPStyle::~SPStyle() { fill_ps_changed_connection.disconnect(); stroke_ps_changed_connection.disconnect(); -// The following should be moved into SPIPaint and SPIFilter + // The following should be moved into SPIPaint and SPIFilter if (fill.value.href) { fill_ps_modified_connection.disconnect(); } @@ -501,10 +501,7 @@ SPStyle::~SPStyle() { // std::cout << "SPStyle::~SPStyle(): Exit\n" << std::endl; } -const std::vector<SPIBase *> SPStyle::properties() -{ - return this->_properties; -} +const std::vector<SPIBase *> SPStyle::properties() { return this->_properties; } void SPStyle::clear(SPAttributeEnum id) { |