feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Remove ComponentVersion::major/minor.

Browse Source 
They are unusable on linux as there are commonly-included macros
of the same name.
This commit is contained in:
Christian Kamm
2010-11-12 14:15:21 +01:00
parent 5723a73ba5
commit 657dee02e0
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/qmljs/qmljscomponentversion.cpp
View File

@@ -56,19 +56,19 @@ namespace QmlJS {
bool operator<(const ComponentVersion &lhs, const ComponentVersion &rhs)
{
return lhs.major() < rhs.major()
|| (lhs.major() == rhs.major() && lhs.minor() < rhs.minor());
return lhs.majorVersion() < rhs.majorVersion()
|| (lhs.majorVersion() == rhs.majorVersion() && lhs.minorVersion() < rhs.minorVersion());
}
bool operator<=(const ComponentVersion &lhs, const ComponentVersion &rhs)
{
return lhs.major() < rhs.major()
|| (lhs.major() == rhs.major() && lhs.minor() <= rhs.minor());
return lhs.majorVersion() < rhs.majorVersion()
|| (lhs.majorVersion() == rhs.majorVersion() && lhs.minorVersion() <= rhs.minorVersion());
}
bool operator==(const ComponentVersion &lhs, const ComponentVersion &rhs)
{
return lhs.major() == rhs.major() && lhs.minor() == rhs.minor();
return lhs.majorVersion() == rhs.majorVersion() && lhs.minorVersion() == rhs.minorVersion();
}
bool operator!=(const ComponentVersion &lhs, const ComponentVersion &rhs)

7
src/libs/qmljs/qmljscomponentversion.h
View File

@@ -46,13 +46,6 @@ public:
ComponentVersion(int major, int minor);
~ComponentVersion();
int major() const
{ return _major; }
int minor() const
{ return _minor; }
// something in the GNU headers introduces the major() and minor() defines,
// use these two to disambiguate when necessary
int majorVersion() const
{ return _major; }
int minorVersion() const