Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 06:36:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed more QSettings references

Browse source
This commit is contained in:
Atlante45 2015-01-18 19:29:27 -08:00
parent c2b7ff1b54
commit 967028e5cf
12 changed files with 40 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
assignment-client/src/AssignmentClient.cpp
View file

@ -9,10 +9,11 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include <QtCore/QProcess> #include <QProcess>
#include <QtCore/qsharedmemory.h> #include <QSettings>
#include <QtCore/QThread> #include <QSharedMemory>
#include <QtCore/QTimer> #include <QThread>
#include <QTimer>
#include <AccountManager.h> #include <AccountManager.h>
#include <AddressManager.h> #include <AddressManager.h>

21
domain-server/src/DomainServer.cpp
View file

@ -13,21 +13,22 @@
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#include <QtCore/QDir> #include <QDir>
#include <QtCore/QJsonDocument> #include <QJsonDocument>
#include <QtCore/QJsonObject> #include <QJsonObject>
#include <QtCore/QJsonArray> #include <QJsonArray>
#include <QtCore/QProcess> #include <QProcess>
#include <QtCore/qsharedmemory.h> #include <QSharedMemory>
#include <QtCore/QStandardPaths> #include <QStandardPaths>
#include <QtCore/QTimer> #include <QTimer>
#include <QtCore/QUrlQuery> #include <QUrlQuery>
#include <AccountManager.h> #include <AccountManager.h>
#include <HifiConfigVariantMap.h> #include <HifiConfigVariantMap.h>
#include <HTTPConnection.h> #include <HTTPConnection.h>
#include <LogUtils.h> #include <LogUtils.h>
#include <PacketHeaders.h> #include <PacketHeaders.h>
#include <Settings.h>
#include <SharedUtil.h> #include <SharedUtil.h>
#include <ShutdownEventListener.h> #include <ShutdownEventListener.h>
#include <UUID.h> #include <UUID.h>
@ -1943,7 +1944,7 @@ Headers DomainServer::setupCookieHeadersFromProfileReply(QNetworkReply* profileR
void DomainServer::loadExistingSessionsFromSettings() { void DomainServer::loadExistingSessionsFromSettings() {
// read data for existing web sessions into memory so existing sessions can be leveraged // read data for existing web sessions into memory so existing sessions can be leveraged
QSettings domainServerSettings; Settings domainServerSettings;
domainServerSettings.beginGroup(DS_SETTINGS_SESSIONS_GROUP); domainServerSettings.beginGroup(DS_SETTINGS_SESSIONS_GROUP);
foreach(const QString& uuidKey, domainServerSettings.childKeys()) { foreach(const QString& uuidKey, domainServerSettings.childKeys()) {

1
interface/src/Application.h
View file

@ -19,7 +19,6 @@
#include <QImage> #include <QImage>
#include <QPointer> #include <QPointer>
#include <QSet> #include <QSet>
#include <QSettings>
#include <QStringList> #include <QStringList>
#include <QUndoStack> #include <QUndoStack>

2
interface/src/LODManager.h
View file

@ -12,8 +12,6 @@
#ifndef hifi_LODManager_h #ifndef hifi_LODManager_h
#define hifi_LODManager_h #define hifi_LODManager_h
#include <QSettings>
#include <DependencyManager.h> #include <DependencyManager.h>
#include <OctreeConstants.h> #include <OctreeConstants.h>
#include <SharedUtil.h> #include <SharedUtil.h>

6
interface/src/main.cpp
View file

@ -8,13 +8,15 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include "Application.h"
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
#include <QSettings>
#include <QTranslator> #include <QTranslator>
#include <SharedUtil.h> #include <SharedUtil.h>
#include "Application.h"
int main(int argc, const char * argv[]) { int main(int argc, const char * argv[]) {
QElapsedTimer startupTime; QElapsedTimer startupTime;
startupTime.start(); startupTime.start();

1
interface/src/ui/RearMirrorTools.h
View file

@ -15,7 +15,6 @@
#include "InterfaceConfig.h" #include "InterfaceConfig.h"
#include <QGLWidget> #include <QGLWidget>
#include <QSettings>
enum ZoomLevel { enum ZoomLevel {
HEAD, HEAD,

6
libraries/metavoxels/src/MetavoxelUtil.cpp
View file

@ -19,11 +19,11 @@
#include <QMetaType> #include <QMetaType>
#include <QPushButton> #include <QPushButton>
#include <QScriptEngine> #include <QScriptEngine>
#include <QSettings>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QtDebug> #include <QtDebug>
#include <GLMHelpers.h> #include <GLMHelpers.h>
#include <Settings.h>
#include "MetavoxelUtil.h" #include "MetavoxelUtil.h"
#include "ScriptCache.h" #include "ScriptCache.h"
@ -492,7 +492,7 @@ QUrlEditor::QUrlEditor(QWidget* parent) :
setInsertPolicy(InsertAtTop); setInsertPolicy(InsertAtTop);
// populate initial URL list from settings // populate initial URL list from settings
addItems(QSettings().value("editorURLs").toStringList()); addItems(Settings().value("editorURLs").toStringList());
connect(this, SIGNAL(activated(const QString&)), SLOT(updateURL(const QString&))); connect(this, SIGNAL(activated(const QString&)), SLOT(updateURL(const QString&)));
connect(model(), SIGNAL(rowsInserted(const QModelIndex&,int,int)), SLOT(updateSettings())); connect(model(), SIGNAL(rowsInserted(const QModelIndex&,int,int)), SLOT(updateSettings()));
@ -512,7 +512,7 @@ void QUrlEditor::updateSettings() {
for (int i = 0, size = qMin(MAX_STORED_URLS, count()); i < size; i++) { for (int i = 0, size = qMin(MAX_STORED_URLS, count()); i < size; i++) {
urls.append(itemText(i)); urls.append(itemText(i));
} }
QSettings().setValue("editorURLs", urls); Settings().setValue("editorURLs", urls);
} }
BaseVec3Editor::BaseVec3Editor(QWidget* parent) : QWidget(parent) { BaseVec3Editor::BaseVec3Editor(QWidget* parent) : QWidget(parent) {

6
libraries/metavoxels/src/Spanner.cpp
View file

@ -17,12 +17,12 @@
#include <QItemEditorFactory> #include <QItemEditorFactory>
#include <QMessageBox> #include <QMessageBox>
#include <QPushButton> #include <QPushButton>
#include <QSettings>
#include <QThread> #include <QThread>
#include <glm/gtx/transform.hpp> #include <glm/gtx/transform.hpp>
#include <GeometryUtil.h> #include <GeometryUtil.h>
#include <Settings.h>
#include "MetavoxelData.h" #include "MetavoxelData.h"
#include "Spanner.h" #include "Spanner.h"
@ -606,7 +606,7 @@ static int getHeightfieldSize(int size) {
} }
void HeightfieldHeightEditor::select() { void HeightfieldHeightEditor::select() {
QSettings settings; Settings settings;
QString result = QFileDialog::getOpenFileName(this, "Select Height Image", settings.value("heightDir").toString(), QString result = QFileDialog::getOpenFileName(this, "Select Height Image", settings.value("heightDir").toString(),
"Images (*.png *.jpg *.bmp *.raw *.mdr)"); "Images (*.png *.jpg *.bmp *.raw *.mdr)");
if (result.isNull()) { if (result.isNull()) {
@ -916,7 +916,7 @@ void HeightfieldColorEditor::setColor(const HeightfieldColorPointer& color) {
} }
void HeightfieldColorEditor::select() { void HeightfieldColorEditor::select() {
QSettings settings; Settings settings;
QString result = QFileDialog::getOpenFileName(this, "Select Color Image", settings.value("heightDir").toString(), QString result = QFileDialog::getOpenFileName(this, "Select Color Image", settings.value("heightDir").toString(),
"Images (*.png *.jpg *.bmp)"); "Images (*.png *.jpg *.bmp)");
if (result.isNull()) { if (result.isNull()) {

8
libraries/networking/src/AccountManager.cpp
View file

@ -21,6 +21,8 @@
#include <QtNetwork/QNetworkRequest> #include <QtNetwork/QNetworkRequest>
#include <qthread.h> #include <qthread.h>
#include <Settings.h>
#include "NodeList.h" #include "NodeList.h"
#include "PacketHeaders.h" #include "PacketHeaders.h"
#include "RSAKeypairGenerator.h" #include "RSAKeypairGenerator.h"
@ -88,7 +90,7 @@ void AccountManager::logout() {
connect(&_accountInfo, &DataServerAccountInfo::balanceChanged, this, &AccountManager::accountInfoBalanceChanged); connect(&_accountInfo, &DataServerAccountInfo::balanceChanged, this, &AccountManager::accountInfoBalanceChanged);
if (_shouldPersistToSettingsFile) { if (_shouldPersistToSettingsFile) {
QSettings settings; Settings settings;
settings.beginGroup(ACCOUNTS_GROUP); settings.beginGroup(ACCOUNTS_GROUP);
QString keyURLString(_authURL.toString().replace("//", DOUBLE_SLASH_SUBSTITUTE)); QString keyURLString(_authURL.toString().replace("//", DOUBLE_SLASH_SUBSTITUTE));
@ -127,7 +129,7 @@ void AccountManager::setAuthURL(const QUrl& authURL) {
if (_shouldPersistToSettingsFile) { if (_shouldPersistToSettingsFile) {
// check if there are existing access tokens to load from settings // check if there are existing access tokens to load from settings
QSettings settings; Settings settings;
settings.beginGroup(ACCOUNTS_GROUP); settings.beginGroup(ACCOUNTS_GROUP);
foreach(const QString& key, settings.allKeys()) { foreach(const QString& key, settings.allKeys()) {
@ -322,7 +324,7 @@ void AccountManager::passErrorToCallback(QNetworkReply* requestReply) {
void AccountManager::persistAccountToSettings() { void AccountManager::persistAccountToSettings() {
if (_shouldPersistToSettingsFile) { if (_shouldPersistToSettingsFile) {
// store this access token into the local settings // store this access token into the local settings
QSettings localSettings; Settings localSettings;
localSettings.beginGroup(ACCOUNTS_GROUP); localSettings.beginGroup(ACCOUNTS_GROUP);
localSettings.setValue(_authURL.toString().replace("//", DOUBLE_SLASH_SUBSTITUTE), localSettings.setValue(_authURL.toString().replace("//", DOUBLE_SLASH_SUBSTITUTE),
QVariant::fromValue(_accountInfo)); QVariant::fromValue(_accountInfo));

5
libraries/networking/src/AddressManager.cpp
View file

@ -17,6 +17,7 @@
#include <QStringList> #include <QStringList>
#include <GLMHelpers.h> #include <GLMHelpers.h>
#include <Settings.h>
#include <UUID.h> #include <UUID.h>
#include "NodeList.h" #include "NodeList.h"
@ -51,7 +52,7 @@ const QString SETTINGS_CURRENT_ADDRESS_KEY = "address";
void AddressManager::loadSettings(const QString& lookupString) { void AddressManager::loadSettings(const QString& lookupString) {
if (lookupString.isEmpty()) { if (lookupString.isEmpty()) {
QSettings settings; Settings settings;
settings.beginGroup(ADDRESS_MANAGER_SETTINGS_GROUP); settings.beginGroup(ADDRESS_MANAGER_SETTINGS_GROUP);
handleLookupString(settings.value(SETTINGS_CURRENT_ADDRESS_KEY).toString()); handleLookupString(settings.value(SETTINGS_CURRENT_ADDRESS_KEY).toString());
} else { } else {
@ -60,7 +61,7 @@ void AddressManager::loadSettings(const QString& lookupString) {
} }
void AddressManager::storeCurrentAddress() { void AddressManager::storeCurrentAddress() {
QSettings settings; Settings settings;
settings.beginGroup(ADDRESS_MANAGER_SETTINGS_GROUP); settings.beginGroup(ADDRESS_MANAGER_SETTINGS_GROUP);
settings.setValue(SETTINGS_CURRENT_ADDRESS_KEY, currentAddress()); settings.setValue(SETTINGS_CURRENT_ADDRESS_KEY, currentAddress());

1
libraries/networking/src/NodeList.h
View file

@ -23,7 +23,6 @@
#include <QtCore/QElapsedTimer> #include <QtCore/QElapsedTimer>
#include <QtCore/QMutex> #include <QtCore/QMutex>
#include <QtCore/QSet> #include <QtCore/QSet>
#include <QtCore/QSettings>
#include <QtCore/QSharedPointer> #include <QtCore/QSharedPointer>
#include <QtNetwork/QHostAddress> #include <QtNetwork/QHostAddress>
#include <QtNetwork/QUdpSocket> #include <QtNetwork/QUdpSocket>

6
libraries/octree/src/JurisdictionMap.cpp
View file

@ -9,9 +9,9 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include <QtCore/QSettings> #include <QSettings>
#include <QtCore/QString> #include <QString>
#include <QtCore/QStringList> #include <QStringList>
#include <QDebug> #include <QDebug>
#include <PacketHeaders.h> #include <PacketHeaders.h>