Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-13 11:32:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed settings to local variable, no more as pointer on all classes.

Browse source 
RshareSettings settings;
settings.value(...);

It should lower memory usage and removes memory leaks.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2886 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-05-11 20:02:52 +00:00
parent 2f8d21ab76
commit 0c46da0dd2
52 changed files with 310 additions and 428 deletions
Download patch file Download diff file Expand all files Collapse all files

41
retroshare-gui/src/gui/PeersDialog.cpp
View file

@ -32,6 +32,7 @@
#include "rsiface/rsstatus.h"
#include "rsiface/rsmsgs.h"
#include "rsiface/rsnotify.h"
#include "settings/rsharesettings.h"
#include "chat/PopupChatDialog.h"
#include "msgs/ChanMsgDialog.h"
@ -100,9 +101,6 @@ PeersDialog::PeersDialog(QWidget *parent)
/* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this);
/* Create RshareSettings object */
_settings = new RshareSettings();
last_status_send_time = 0 ;
@ -176,8 +174,9 @@ PeersDialog::PeersDialog(QWidget *parent)
QString::fromUtf8("blue"));
QStringList him;
if (_settings->value(QString::fromUtf8("GroupChat_History"), true).toBool())
RshareSettings settings;
if (settings.value(QString::fromUtf8("GroupChat_History"), true).toBool())
{
historyKeeper.getMessages(him, "", "THIS", 8);
foreach(QString mess, him)
@ -231,6 +230,16 @@ PeersDialog::PeersDialog(QWidget *parent)
#endif
}
PeersDialog::~PeersDialog ()
{
std::map<std::string, PopupChatDialog *>::iterator it;
for (it = chatDialogs.begin(); it != chatDialogs.end(); it++) {
if (it->second) {
delete (it->second);
}
}
}
void PeersDialog::pasteLink()
{
ui.lineEdit->insertHtml(RSLinkClipboard::toHtml()) ;
@ -1025,7 +1034,7 @@ void PeersDialog::insertChat()
count ++;
}
if (_settings->value(QString::fromUtf8("Emoteicons_GroupChat"), true).toBool())
if (settings.value(QString::fromUtf8("Emoteicons_GroupChat"), true).toBool())
{
QHashIterator<QString, QString> i(smileys);
while(i.hasNext())
@ -1849,16 +1858,16 @@ void PeersDialog::setCurrentFileName(const QString &fileName)
////play sound when recv a message
void PeersDialog::playsound(){
_settings = new RshareSettings();
_settings->beginGroup("Sound");
_settings->beginGroup("SoundFilePath");
QString OnlineSound= _settings->value("NewChatMessage","").toString();
_settings->endGroup();
_settings->beginGroup("Enable");
bool flag= _settings->value("NewChatMessage",false).toBool();
_settings->endGroup();
_settings->endGroup();
RshareSettings settings;
settings.beginGroup("Sound");
settings.beginGroup("SoundFilePath");
QString OnlineSound= settings.value("NewChatMessage","").toString();
settings.endGroup();
settings.beginGroup("Enable");
bool flag= settings.value("NewChatMessage",false).toBool();
settings.endGroup();
settings.endGroup();
if(!OnlineSound.isEmpty()&&flag)
if(QSound::isAvailable())
QSound::play(OnlineSound);
QSound::play(OnlineSound);
}