grass.diff

Martin Dobias, 2007-05-01 02:08 PM

Download (978 Bytes)

View differences:

qgsgrass.cpp (working copy)
985 985
    return true;
986 986
}
987 987

  
988
// GRASS version constants have been changed on 26.4.2007
989
// http://freegis.org/cgi-bin/viewcvs.cgi/grass6/include/version.h.in.diff?r1=1.4&r2=1.5
990
// The following lines workaround this change
991

  
988 992
int QgsGrass::versionMajor()
989 993
{
994
#ifdef GRASS_VERSION_MAJOR
995
    return GRASS_VERSION_MAJOR;
996
#else
990 997
    return QString(GRASS_VERSION_MAJOR).toInt();
998
#endif
991 999
}
992 1000
int QgsGrass::versionMinor()
993 1001
{
1002
#ifdef GRASS_VERSION_MINOR
1003
    return GRASS_VERSION_MINOR;
1004
#else
994 1005
    return QString(GRASS_VERSION_MINOR).toInt();
1006
#endif
995 1007
}
996 1008
int QgsGrass::versionRelease()
997 1009
{
1010
#ifdef GRASS_VERSION_RELEASE
1011
    #define QUOTE(x)  #x
1012
    return QString(QUOTE(GRASS_VERSION_RELEASE)).toInt();
1013
#else
998 1014
    return QString(GRASS_VERSION_RELEASE).toInt();
1015
#endif
999 1016
}
1000 1017
QString QgsGrass::versionString()
1001 1018
{