aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2012-07-21 20:42:54 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2012-07-21 20:42:54 +0200
commit39b7067233f0ecbf431e1f75bb34088b7bc026a5 (patch)
treef866f9348ff4be016ed8b5cbbd30a31df21eac7e /src
parent0e6baa86a0009341a3cc7d0e256b314adf7d82b4 (diff)
downloadqxmpp-39b7067233f0ecbf431e1f75bb34088b7bc026a5.tar.gz
add explicit copy constructor for QXmppDataForm::Media
Diffstat (limited to 'src')
-rw-r--r--src/base/QXmppDataForm.cpp8
-rw-r--r--src/base/QXmppDataForm.h2
2 files changed, 10 insertions, 0 deletions
diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp
index 11d07992..2eccc94b 100644
--- a/src/base/QXmppDataForm.cpp
+++ b/src/base/QXmppDataForm.cpp
@@ -76,6 +76,14 @@ QXmppDataForm::Media::~Media()
{
}
+/// Assigns \a other to this media.
+
+QXmppDataForm::Media& QXmppDataForm::Media::operator=(const QXmppDataForm::Media &other)
+{
+ d = other.d;
+ return *this;
+}
+
/// Returns media's height.
int QXmppDataForm::Media::height() const
diff --git a/src/base/QXmppDataForm.h b/src/base/QXmppDataForm.h
index ca249bc8..e9f56196 100644
--- a/src/base/QXmppDataForm.h
+++ b/src/base/QXmppDataForm.h
@@ -55,6 +55,8 @@ public:
Media(const QXmppDataForm::Media &other);
~Media();
+ QXmppDataForm::Media& operator=(const QXmppDataForm::Media &other);
+
int height() const;
void setHeight(int height);