kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Qt4's qglobal.h defined TRUE and FALSE. Qt5 does not do it anymore. Replace it with true and false.

Browse Source 
158f39ec78

This change is Qt4/Qt5 neutral.
This commit is contained in:
Mateusz Skowroński
2015-12-21 06:15:07 +01:00
committed by wmayer
parent db345cb624
commit 7d0e892d36
96 changed files with 560 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Base/FileInfo.h
View File

@@ -70,9 +70,9 @@ public:
/// Convert the path name into a UCS-2 encoded wide string format.
std::wstring toStdWString() const;
/** Returns the file's extension name.
* If complete is TRUE (the default), extension() returns the string of all
* If complete is true (the default), extension() returns the string of all
* characters in the file name after (but not including) the first '.' character.
* If complete is FALSE, extension() returns the string of all characters in
* If complete is false, extension() returns the string of all characters in
* the file name after (but not including) the last '.' character.
* Example:
*@code
@@ -111,7 +111,7 @@ public:
/** @name Directory management*/
//@{
/// Creates a directory. Returns TRUE if successful; otherwise returns FALSE.
/// Creates a directory. Returns true if successful; otherwise returns false.
bool createDirectory( void ) const;
/// Get a list of the directory content
std::vector<Base::FileInfo> getDirectoryContent(void) const;

18
src/Base/Tools2D.cpp
View File

@@ -107,16 +107,16 @@ bool BoundBox2D::Intersect(const Line2D &rclLine) const
bool BoundBox2D::Intersect(const BoundBox2D &rclBB) const
{
//// compare bb2-points to this
//if (Contains (Vector2D (rclBB.fMinX, rclBB.fMinY))) return TRUE;
//if (Contains (Vector2D (rclBB.fMaxX, rclBB.fMinY))) return TRUE;
//if (Contains (Vector2D (rclBB.fMaxX, rclBB.fMaxY))) return TRUE;
//if (Contains (Vector2D (rclBB.fMinX, rclBB.fMaxY))) return TRUE;
//if (Contains (Vector2D (rclBB.fMinX, rclBB.fMinY))) return true;
//if (Contains (Vector2D (rclBB.fMaxX, rclBB.fMinY))) return true;
//if (Contains (Vector2D (rclBB.fMaxX, rclBB.fMaxY))) return true;
//if (Contains (Vector2D (rclBB.fMinX, rclBB.fMaxY))) return true;
//
//// compare this-points to bb2
//if (rclBB.Contains (Vector2D (fMinX, fMinY))) return TRUE;
//if (rclBB.Contains (Vector2D (fMaxX, fMinY))) return TRUE;
//if (rclBB.Contains (Vector2D (fMaxX, fMaxY))) return TRUE;
//if (rclBB.Contains (Vector2D (fMinX, fMaxY))) return TRUE;
//if (rclBB.Contains (Vector2D (fMinX, fMinY))) return true;
//if (rclBB.Contains (Vector2D (fMaxX, fMinY))) return true;
//if (rclBB.Contains (Vector2D (fMaxX, fMaxY))) return true;
//if (rclBB.Contains (Vector2D (fMinX, fMaxY))) return true;
if (fMinX < rclBB.fMaxX &&
rclBB.fMinX < fMaxX &&
@@ -222,7 +222,7 @@ bool Line2D::Intersect (const Line2D& rclLine, Vector2D &rclV) const
rclV.fY = m1 * rclV.fX + b1;
}
return true; /*** RETURN TRUE (intersection) **********/
return true; /*** RETURN true (intersection) **********/
}
bool Line2D::Intersect (const Vector2D &rclV, double eps) const