projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1adc002
)
Fix compile warnings
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Fri, 26 Dec 2008 00:04:28 +0000
(
01:04
+0100)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Fri, 26 Dec 2008 00:05:03 +0000
(
01:05
+0100)
src/common/identity.cpp
patch
|
blob
|
history
src/common/identity.h
patch
|
blob
|
history
src/core/coreidentity.h
patch
|
blob
|
history
src/qtui/settingspages/identitiessettingspage.cpp
patch
|
blob
|
history
diff --git
a/src/common/identity.cpp
b/src/common/identity.cpp
index
aee2e4a
..
43ddac1
100644
(file)
--- 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());
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
829094a
..
86eafb4
100644
(file)
--- 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 setPartReason(const QString &reason);
void setQuitReason(const QString &reason);
- void
update
(const Identity &other);
+ void
copyFrom
(const Identity &other);
signals:
void idSet(IdentityId id);
signals:
void idSet(IdentityId id);
diff --git
a/src/core/coreidentity.h
b/src/core/coreidentity.h
index
8033030
..
0f13577
100644
(file)
--- 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);
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
private:
#ifdef HAVE_SSL
diff --git
a/src/qtui/settingspages/identitiessettingspage.cpp
b/src/qtui/settingspages/identitiessettingspage.cpp
index
788df96
..
8b6280d
100644
(file)
--- 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());
if(identity->identityName() != clientIdentity->identityName())
renameIdentity(identity->id(), clientIdentity->identityName());
- identity->
update
(*clientIdentity);
+ identity->
copyFrom
(*clientIdentity);
if(identity->id() == currentId)
displayIdentity(identity, true);
if(identity->id() == currentId)
displayIdentity(identity, true);
@@
-381,7
+381,7
@@
void IdentitiesSettingsPage::on_addIdentity_clicked() {
#endif
if(dlg.duplicateId() != 0) {
// duplicate
#endif
if(dlg.duplicateId() != 0) {
// duplicate
- newId->
update
(*identities[dlg.duplicateId()]);
+ newId->
copyFrom
(*identities[dlg.duplicateId()]);
newId->setId(id);
}
newId->setIdentityName(dlg.identityName());
newId->setId(id);
}
newId->setIdentityName(dlg.identityName());