← Back to branch summary

~ubuntu-branches/ubuntu/vivid/manaplus/vivid-proposed

« back to all changes in this revision

Viewing changes to src/gui/models/typelistmodel.h

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2014-09-30 18:10:18 UTC
  • mfrom: (1.1.35)
  • Revision ID: package-import@ubuntu.com-20140930181018-pb73a0ogw29tjv8k
Tags: 1.4.9.27-1
* New upstream release.
* Bump Standards-Version to 3.9.6 (no changes required).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/models/typelistmodel.h
37
37
         * Used to get number of line in the list
38
38
         */
39
39
        int getNumberOfElements() override final A_WARN_UNUSED
40
 
#ifdef EATHENA_SUPPORT
 
40
#if defined(EATHENA_SUPPORT) && defined(TMWA_SUPPORT)
41
41
        { return 3; }
 
42
#elif defined(EATHENA_SUPPORT)
 
43
        { return 1; }
42
44
#else
43
45
        { return 2; }
44
46
#endif
49
51
        std::string getElementAt(int elementIndex)
50
52
                                 override final A_WARN_UNUSED
51
53
        {
 
54
#ifdef TMWA_SUPPORT
52
55
            if (elementIndex == 0)
53
56
                return "TmwAthena";
54
57
            else if (elementIndex == 1)
56
59
#ifdef EATHENA_SUPPORT
57
60
            else if (elementIndex == 2)
58
61
                return "eAthena";
59
 
#endif
60
 
            else
 
62
#endif  // EATHENA_SUPPORT
 
63
            else
 
64
#else   // TMWA_SUPPORT
 
65
#ifdef EATHENA_SUPPORT
 
66
            if (elementIndex == 0)
 
67
                return "eAthena";
 
68
            else
 
69
#endif  // EATHENA_SUPPORT
 
70
#endif  // TMWA_SUPPORT
61
71
                return "Unknown";
62
72
        }
63
73
};