← Back to branch summary

~ubuntu-branches/debian/sid/monopd/sid

« back to all changes in this revision

Viewing changes to src/cardgroup.cpp

  • Committer: Package Import Robot
  • Author(s): Markus Koschany
  • Date: 2014-02-28 15:39:47 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20140228153947-1a5z05x3alj61wx1
Tags: 0.9.5-1
* Imported Upstream version 0.9.5.
  - Add support for IPv6 and systemd.
* Update watch file and point to the new upstream location
  at tuxfamily.org.
* Drop all patches. Merged upstream.
* debian/control:
  - Drop libcapsinetwork-dev from Build-Depends.
    Essential features of libcapsinetwork were merged into monopd and
    IPv6 support was added.
  - Add pkg-config to Build-Depends.
  - Add libsystemd-daemon-dev [linux-any] to Build-Depends.
  - Update homepage field and point to gtkatlantic.gradator.net.
* Add monopd.service and monopd.socket file and support systemd.
* Update monopd.6 man page.
* Use dh-systemd helper.
* Update debian/copyright. Add new BSD license.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cardgroup.cpp
30
30
        while (!m_cards.empty()) { delete *m_cards.begin(); m_cards.erase(m_cards.begin()); }
31
31
}
32
32
 
33
 
Card *CardGroup::newCard(unsigned int id, const std::string name)
 
33
Card *CardGroup::newCard(int id, const std::string name)
34
34
{
35
35
        Card *card = new Card(this, id);
36
36
        card->setProperty("name", name, m_game);
49
49
 
50
50
                // Remove first card
51
51
                m_cards.erase(m_cards.begin());
52
 
        
 
52
 
53
53
                // Reinsert it at the back
54
54
                m_cards.push_back(card);
55
55
        }
57
57
        return card;
58
58
}
59
59
 
60
 
Card *CardGroup::findCard(unsigned int id)
 
60
Card *CardGroup::findCard(int id)
61
61
{
62
62
        Card *card = 0;
63
63
        for (std::vector<Card *>::iterator it = m_cards.begin() ; it != m_cards.end() && (card = *it) ; ++it)