diff options
| author | Marius Kintel <marius@kintel.net> | 2011-08-28 02:35:08 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-08-28 02:35:08 (GMT) |
| commit | 79efff37fedec1d0e19004eec26267a462b15eb5 (patch) | |
| tree | 8732670546ffc5fee2a47e187e7c76800bec395d /src/dxfdata.cc | |
| parent | 2fe2f37fbc51321ffe8b4f1e85e3ad3921e2c5e5 (diff) | |
bugfix: Importing all layers was broken
Diffstat (limited to 'src/dxfdata.cc')
| -rw-r--r-- | src/dxfdata.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/dxfdata.cc b/src/dxfdata.cc index 78ab454..7bf4364 100644 --- a/src/dxfdata.cc +++ b/src/dxfdata.cc @@ -48,7 +48,7 @@ DxfData::DxfData() } /*! - Reads a layer from the given file, or all layers if layename.isNull() + Reads a layer from the given file, or all layers if layername.isEmpty() */ DxfData::DxfData(double fn, double fs, double fa, QString filename, QString layername, double xorigin, double yorigin, double scale) { @@ -74,7 +74,7 @@ DxfData::DxfData(double fn, double fs, double fa, QString filename, QString laye if (!in_entities_section && !in_blocks_section) \ break; \ if (in_entities_section && \ - !(layername.isNull() || layername == layer)) \ + !(layername.isEmpty() || layername == layer)) \ break; \ grid.align(_p1x, _p1y); \ grid.align(_p2x, _p2y); \ @@ -249,7 +249,7 @@ DxfData::DxfData(double fn, double fs, double fa, QString filename, QString laye } } else if (mode == "DIMENSION" && - (layername.isNull() || layername == layer)) { + (layername.isEmpty() || layername == layer)) { this->dims.append(Dim()); this->dims.last().type = dimtype; for (int i = 0; i < 7; i++) @@ -268,7 +268,7 @@ DxfData::DxfData(double fn, double fs, double fa, QString filename, QString laye else if (mode == "ENDSEC") { } else if (in_blocks_section || (in_entities_section && - (layername.isNull() || layername == layer))) { + (layername.isEmpty() || layername == layer))) { unsupported_entities_list[mode]++; } mode = data; @@ -357,7 +357,7 @@ DxfData::DxfData(double fn, double fs, double fa, QString filename, QString laye QHashIterator<QString, int> i(unsupported_entities_list); while (i.hasNext()) { i.next(); - if (layername.isNull()) { + if (layername.isEmpty()) { PRINTA("WARNING: Unsupported DXF Entity `%1' (%2x) in `%3'.", i.key(), QString::number(i.value()), filename); } else { |