Fixed compile on Linux.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4624 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-09-29 09:52:01 +00:00
parent 29c090fb44
commit b3bcfe9d30
4 changed files with 7 additions and 7 deletions

View File

@ -202,12 +202,12 @@ bool p3HistoryMgr::loadList(std::list<RsItem*>& load)
if (NULL != (rskv = dynamic_cast<RsConfigKeyValueSet*>(*it))) {
for (std::list<RsTlvKeyValue>::const_iterator kit = rskv->tlvkvs.pairs.begin(); kit != rskv->tlvkvs.pairs.end(); kit++) {
if (kit->key == "PUBLIC_ENABLE") {
mPublicEnable = (kit->value == "TRUE") ? TRUE : FALSE;
mPublicEnable = (kit->value == "TRUE") ? true : false;
continue;
}
if (kit->key == "PRIVATE_ENABLE") {
mPrivateEnable = (kit->value == "TRUE") ? TRUE : FALSE;
mPrivateEnable = (kit->value == "TRUE") ? true : false;
continue;
}

View File

@ -204,7 +204,7 @@ PopupChatDialog::PopupChatDialog(const std::string &id, const QString &name, QWi
ui.chattextEdit->installEventFilter(this);
// add offline chat messages
onPrivateChatChanged(NOTIFY_LIST_PRIVATE_OUTGOING_CHAT, NOTIFY_TYPE_ADD, true);
onPrivateChatChanged(NOTIFY_LIST_PRIVATE_OUTGOING_CHAT, NOTIFY_TYPE_ADD);
#ifdef RS_RELEASE_VERSION
ui.attachPictureButton->setVisible(false);
@ -482,7 +482,7 @@ void PopupChatDialog::activate()
}
}
void PopupChatDialog::onPrivateChatChanged(int list, int type, bool initial /*= false*/)
void PopupChatDialog::onPrivateChatChanged(int list, int type)
{
if (list == NOTIFY_LIST_PRIVATE_OUTGOING_CHAT) {
switch (type) {

View File

@ -119,7 +119,7 @@ private:
void addAttachment(std::string,int flag);
void processSettings(bool bLoad);
void onPrivateChatChanged(int list, int type, bool initial = false);
void onPrivateChatChanged(int list, int type);
QAction *actionTextBold;
QAction *actionTextUnderline;

View File

@ -61,7 +61,7 @@ static bool isSmall(const QSize &size)
return false;
}
void AvatarWidget::resizeEvent(QResizeEvent *event)
void AvatarWidget::resizeEvent(QResizeEvent */*event*/)
{
if (mFrameType == NO_FRAME) {
return;
@ -81,7 +81,7 @@ void AvatarWidget::resizeEvent(QResizeEvent *event)
refreshStatus();
}
void AvatarWidget::mouseReleaseEvent(QMouseEvent *event)
void AvatarWidget::mouseReleaseEvent(QMouseEvent */*event*/)
{
if (mFlag.isOwnId) {
QByteArray ba;