From 9e531f113fbca51739ac6e2cf4eed7005b005c8f Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Fri, 26 Dec 2008 01:04:28 +0100
Subject: [PATCH] Fix compile warnings

---
 src/common/identity.cpp                           | 2 +-
 src/common/identity.h                             | 2 +-
 src/core/coreidentity.h                           | 4 ++--
 src/qtui/settingspages/identitiessettingspage.cpp | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/identity.cpp b/src/common/identity.cpp
index aee2e4a8..43ddac15 100644
--- a/src/common/identity.cpp
+++ b/src/common/identity.cpp
@@ -184,7 +184,7 @@ void Identity::setQuitReason(const QString &reason) {
 
 /***  ***/
 
-void Identity::update(const Identity &other) {
+void Identity::copyFrom(const Identity &other) {
   for(int idx = staticMetaObject.propertyOffset(); idx < staticMetaObject.propertyCount(); idx++) {
     QMetaProperty metaProp = staticMetaObject.property(idx);
     Q_ASSERT(metaProp.isValid());
diff --git a/src/common/identity.h b/src/common/identity.h
index 829094ac..86eafb43 100644
--- a/src/common/identity.h
+++ b/src/common/identity.h
@@ -106,7 +106,7 @@ public slots:
   void setPartReason(const QString &reason);
   void setQuitReason(const QString &reason);
 
-  void update(const Identity &other);
+  void copyFrom(const Identity &other);
 
 signals:
   void idSet(IdentityId id);
diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h
index 8033030f..0f135778 100644
--- a/src/core/coreidentity.h
+++ b/src/core/coreidentity.h
@@ -77,9 +77,9 @@ public:
   inline const QSslCertificate &sslCert() const { return _sslCert; }
   inline void setSslCert(const QSslCertificate &cert) { _sslCert = cert; }
   void setSslCert(const QByteArray &encoded);
-#endif HAVE_SSL
+#endif /* HAVE_SSL */
 
-  CoreIdentity& CoreIdentity::operator=(const CoreIdentity &identity);
+  CoreIdentity& operator=(const CoreIdentity &identity);
 
 private:
 #ifdef HAVE_SSL
diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp
index 788df96d..8b6280dd 100644
--- a/src/qtui/settingspages/identitiessettingspage.cpp
+++ b/src/qtui/settingspages/identitiessettingspage.cpp
@@ -241,7 +241,7 @@ void IdentitiesSettingsPage::clientIdentityUpdated() {
   if(identity->identityName() != clientIdentity->identityName())
     renameIdentity(identity->id(), clientIdentity->identityName());
 
-  identity->update(*clientIdentity);
+  identity->copyFrom(*clientIdentity);
 
   if(identity->id() == currentId)
     displayIdentity(identity, true);
@@ -381,7 +381,7 @@ void IdentitiesSettingsPage::on_addIdentity_clicked() {
 #endif
     if(dlg.duplicateId() != 0) {
       // duplicate
-      newId->update(*identities[dlg.duplicateId()]);
+      newId->copyFrom(*identities[dlg.duplicateId()]);
       newId->setId(id);
     }
     newId->setIdentityName(dlg.identityName());
-- 
2.20.1