← Back to branch summary

~ubuntu-branches/ubuntu/vivid/regina-normal/vivid-proposed

« back to all changes in this revision

Viewing changes to engine/surfaces/sfcombination.h

  • Committer: Package Import Robot
  • Author(s): Ben Burton
  • Date: 2011-09-10 07:17:25 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: package-import@ubuntu.com-20110910071725-97n90tywdq60w2cr
Tags: 4.90-1
http://bugs.debian.org/556318
http://bugs.debian.org/624882
* New upstream release!
* The user interface has been ported from KDE3 to KDE4 (closes: #556318).
  Re-enabled the GUI as a result.
* The build system has been ported from autotools to cmake.
* The new upstream release builds fine on amd64 (closes: #624882).
* Moved the users' handbook into regina-normal-doc.
* Upgraded several suggests/recommends.  Upgraded regina-normal-mpi to
  depend on mpi-default-bin, and regina-normal to depend on both graphviz
  and regina-normal-doc (which the GUI expends to be present).  Upgraded
  regina-normal to recommend gap.
* Bumped standards-version to 3.9.2.0 (no changes required).

Show diffs side-by-side

added added

removed removed

Lines of Context:
engine/surfaces/sfcombination.h
4
4
 *  Regina - A Normal Surface Theory Calculator                           *
5
5
 *  Computational Engine                                                  *
6
6
 *                                                                        *
7
 
 *  Copyright (c) 1999-2009, Ben Burton                                   *
 
7
 *  Copyright (c) 1999-2011, Ben Burton                                   *
8
8
 *  For further details contact Ben Burton (bab@debian.org).              *
9
9
 *                                                                        *
10
10
 *  This program is free software; you can redistribute it and/or         *
26
26
 
27
27
/* end stub */
28
28
 
29
 
/*! \file sfcombination.h
 
29
/*! \file surfaces/sfcombination.h
30
30
 *  \brief Contains a normal surface filter that simply combines other
31
31
 *  filters.
32
32
 */
36
36
#define __SFCOMBINATION_H
37
37
#endif
38
38
 
 
39
#include "regina-core.h"
39
40
#include "surfaces/nsurfacefilter.h"
40
41
 
41
42
namespace regina {
56
57
 * accepted if this is an \a and filter and rejected if this is an \a or
57
58
 * filter.
58
59
 */
59
 
class NSurfaceFilterCombination : public NSurfaceFilter {
 
60
class REGINA_API NSurfaceFilterCombination : public NSurfaceFilter {
60
61
    public:
61
62
        static const int filterID;
62
63
 
122
123
    return usesAnd;
123
124
}
124
125
inline void NSurfaceFilterCombination::setUsesAnd(bool value) {
 
126
    ChangeEventSpan span(this);
125
127
    usesAnd = value;
126
 
    fireChangedEvent();
127
128
}
128
129
 
129
130
inline void NSurfaceFilterCombination::writeTextLong(std::ostream& o) const {