Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-04 23:25:32 -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

22
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -57,6 +57,7 @@
#include "gui/connect/ConnectFriendWizard.h"
#include "util/rsversion.h"
#include "settings/rsettingswin.h"
#include "settings/rsharesettings.h"
#include <sstream>
#include <iomanip>
@ -121,12 +122,11 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
/* Invoke the Qt Designer generated QObject setup routine */
ui.setupUi(this);
/* Create RshareSettings object */
_settings = new RshareSettings();
if (_settings->value(QString::fromUtf8("FirstRun"), true).toBool())
RshareSettings settings;
if (settings.value(QString::fromUtf8("FirstRun"), true).toBool())
{
_settings->setValue(QString::fromUtf8("FirstRun"), false);
settings.setValue(QString::fromUtf8("FirstRun"), false);
QuickStartWizard *qstartWizard = new QuickStartWizard(this);
qstartWizard->exec();
}
@ -287,8 +287,9 @@ MainWindow::~MainWindow()
delete peerstatus;
delete natstatus;
delete ratesstatus;
delete _settings;
#ifdef UNFINISHED
MessengerWindow::releaseInstance();
messengerWindow = NULL;
#ifdef UNFINISHED
delete applicationWindow;
#endif
}
@ -580,8 +581,9 @@ void MainWindow::createActions()
*/
void MainWindow::doQuit()
{
RshareSettings settings;
if(!_settings->value(QString::fromUtf8("doQuit"), false).toBool())
if(!settings.value(QString::fromUtf8("doQuit"), false).toBool())
{
QString queryWrn;
queryWrn.clear();
@ -609,7 +611,9 @@ void MainWindow::closeEvent(QCloseEvent *e)
{
static bool firstTime = true;
if(!_settings->value(QString::fromUtf8("ClosetoTray"), false).toBool())
RshareSettings settings;
if(!settings.value(QString::fromUtf8("ClosetoTray"), false).toBool())
{
if (trayIcon->isVisible()) {
if (firstTime)