summaryrefslogtreecommitdiff
path: root/src/csgterm.h
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-09-03 04:30:48 (GMT)
committerMarius Kintel <marius@kintel.net>2011-09-03 04:30:48 (GMT)
commitacfd1e1b19eeffc62f66f9ff52605303fd0eb2d5 (patch)
tree5d23bd8744d23d6f9542c0d03b5048fdb8a141cf /src/csgterm.h
parent6f632190a05417d44193e3b16a7b3000b2cc1145 (diff)
More de-Qt-ify
Diffstat (limited to 'src/csgterm.h')
-rw-r--r--src/csgterm.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/csgterm.h b/src/csgterm.h
index b0fffe4..2a89ef1 100644
--- a/src/csgterm.h
+++ b/src/csgterm.h
@@ -1,8 +1,8 @@
#ifndef CSGTERM_H_
#define CSGTERM_H_
-#include <QString>
-#include <QVector>
+#include <string>
+#include <vector>
#include "polyset.h"
class CSGTerm
@@ -17,14 +17,14 @@ public:
type_e type;
PolySet *polyset;
- QString label;
+ std::string label;
CSGTerm *left;
CSGTerm *right;
double m[16];
double color[4];
int refcounter;
- CSGTerm(PolySet *polyset, const double matrix[16], const double color[4], QString label);
+ CSGTerm(PolySet *polyset, const double matrix[16], const double color[4], const std::string &label);
CSGTerm(type_e type, CSGTerm *left, CSGTerm *right);
CSGTerm *normalize();
@@ -32,23 +32,23 @@ public:
CSGTerm *link();
void unlink();
- QString dump();
+ std::string dump();
};
class CSGChain
{
public:
- QVector<PolySet*> polysets;
- QVector<double*> matrices;
- QVector<double*> colors;
- QVector<CSGTerm::type_e> types;
- QVector<QString> labels;
+ std::vector<PolySet*> polysets;
+ std::vector<double*> matrices;
+ std::vector<double*> colors;
+ std::vector<CSGTerm::type_e> types;
+ std::vector<std::string> labels;
CSGChain();
- void add(PolySet *polyset, double *m, double *color, CSGTerm::type_e type, QString label);
+ void add(PolySet *polyset, double *m, double *color, CSGTerm::type_e type, std::string label);
void import(CSGTerm *term, CSGTerm::type_e type = CSGTerm::TYPE_UNION);
- QString dump();
+ std::string dump();
BoundingBox getBoundingBox() const;
};
contact: Jan Huwald // Impressum