diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-13 13:15:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-13 13:15:14 -0600 |
| commit | 735d75d6ce19269dc5faa00abc8f88ff30ce2f23 (patch) | |
| tree | 4e85ad9cc0479892232125234c6b71c4f17ac611 /kivio | |
| parent | b180811d9a814c638032f77aaf02e84a3126328c (diff) | |
| download | koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.tar.gz koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.zip | |
Fix inadvertent TQt string conversions
This closes Bug 782
Diffstat (limited to 'kivio')
| -rw-r--r-- | kivio/kiviopart/kiviosdk/kivio_common.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kivio/kiviopart/kiviosdk/kivio_common.cpp b/kivio/kiviopart/kiviosdk/kivio_common.cpp index 3dd8b428..8bb5bcb9 100644 --- a/kivio/kiviopart/kiviosdk/kivio_common.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_common.cpp @@ -308,7 +308,7 @@ void XmlWriteDouble( TQDomElement &e, const TQString &att, const double &val ) } -#define WHICH_TQUAD( vertex, hitPos ) \ +#define WHICH_QUAD( vertex, hitPos ) \ ( (vertex.x() > hitPos->x()) ? ((vertex.y() > hitPos->y()) ? 1 : 4 ) : ((vertex.y() > hitPos->y())?2:3)) #define X_INTERCEPT( point1, point2, hitY ) \ @@ -341,13 +341,13 @@ bool PointInPoly( KoPoint *points, int numPoints, KoPoint *hitPos ) edge = 0; - quad = WHICH_TQUAD( points[ edge ], hitPos ); + quad = WHICH_QUAD( points[ edge ], hitPos ); total = 0; // count of absolute sectors crossed // Loop through all the vertices do { next = (edge + 1) % numPoints; - next_quad = WHICH_TQUAD( points[ next ], hitPos ); + next_quad = WHICH_QUAD( points[ next ], hitPos ); // Calculate how many quads have been crossed delta = next_quad - quad; |