← Back to branch summary

~ubuntu-branches/ubuntu/wily/marble/wily-proposed

« back to all changes in this revision

Viewing changes to src/lib/marble/geodata/data/GeoDataStyleSelector.cpp

  • Committer: Package Import Robot
  • Author(s): Scarlett Clark, Jonathan Riddell, Scarlett Clark
  • Date: 2014-07-24 23:38:32 UTC
  • mfrom: (1.5.2)
  • Revision ID: package-import@ubuntu.com-20140724233832-7v4421t4khrhw487
Tags: 4:4.13.90-0ubuntu1
[ Jonathan Riddell ]
* Switch to libmarblewidget19 for new soversion

[ Scarlett Clark ]
* New upstream beta release
* Update: do_not_install_private_headers. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib/marble/geodata/data/GeoDataStyleSelector.cpp
19
19
 
20
20
class GeoDataStyleSelectorPrivate
21
21
{
22
 
  public:
23
 
    const char* nodeType() const
24
 
    {
25
 
        return GeoDataTypes::GeoDataStyleSelectorType;
26
 
    }
27
 
 
28
 
    /// The style id.
29
 
    QString  m_styleId;
30
22
};
31
23
 
32
 
 
33
24
GeoDataStyleSelector::GeoDataStyleSelector()
34
25
    : d( new GeoDataStyleSelectorPrivate )
35
26
{
52
43
    return *this;
53
44
}
54
45
 
 
46
bool GeoDataStyleSelector::operator==( const GeoDataStyleSelector &other ) const
 
47
{
 
48
    return GeoDataObject::equals( other );
 
49
}
 
50
 
 
51
bool GeoDataStyleSelector::operator!=( const GeoDataStyleSelector &other ) const
 
52
{
 
53
    return !this->operator==( other );
 
54
}
 
55
 
55
56
const char* GeoDataStyleSelector::nodeType() const
56
57
{
57
 
    return d->nodeType();
58
 
}
59
 
 
60
 
void GeoDataStyleSelector::setStyleId( const QString &value )
61
 
{
62
 
    d->m_styleId = value;
63
 
}
64
 
 
65
 
QString GeoDataStyleSelector::styleId() const
66
 
{
67
 
    return d->m_styleId;
 
58
    return GeoDataTypes::GeoDataStyleSelectorType;
68
59
}
69
60
 
70
61
void GeoDataStyleSelector::pack( QDataStream& stream ) const
71
62
{
72
63
    GeoDataObject::pack( stream );
73
 
 
74
 
    stream << d->m_styleId;
75
64
}
76
65
 
77
66
void GeoDataStyleSelector::unpack( QDataStream& stream )
78
67
{
79
68
    GeoDataObject::unpack( stream );
80
 
 
81
 
    stream >> d->m_styleId;
82
69
}
83
70
 
84
71
}