projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed renaming issue for queries
[quassel.git]
/
src
/
common
/
settings.cpp
diff --git
a/src/common/settings.cpp
b/src/common/settings.cpp
index
0563ff7
..
d6ebb80
100644
(file)
--- a/
src/common/settings.cpp
+++ b/
src/common/settings.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
7 by the Quassel IRC Team
*
+ * Copyright (C) 2005-0
8 by the Quassel Project
*
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-18,21
+18,30
@@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <QCoreApplication>
#include <QSettings>
#include <QStringList>
#include <QDebug>
#ifdef Q_WS_QWS
#include <Qtopia>
#include <QSettings>
#include <QStringList>
#include <QDebug>
#ifdef Q_WS_QWS
#include <Qtopia>
-#include <QCoreApplication>
#endif
#include "settings.h"
#endif
#include "settings.h"
-Settings::Settings(QString g) : group(g) {
+Settings::Settings(QString g, QString applicationName)
+
+#ifdef Q_WS_MAC
+ : QSettings(QCoreApplication::organizationDomain(), applicationName),
+#else
+ : QSettings(QCoreApplication::organizationName(), applicationName),
+#endif
+ group(g)
+{
+/* we need to call the constructor immediately in order to set the path...
#ifndef Q_WS_QWS
#ifndef Q_WS_QWS
- QSettings();
+ QSettings(
QCoreApplication::organizationName(), applicationName
);
#else
// FIXME sandboxDir() is not currently working correctly...
//if(Qtopia::sandboxDir().isEmpty()) QSettings();
#else
// FIXME sandboxDir() is not currently working correctly...
//if(Qtopia::sandboxDir().isEmpty()) QSettings();
@@
-44,9
+53,10
@@
Settings::Settings(QString g) : group(g) {
QSettings(sandboxPath + "/etc/QuasselIRC.conf", QSettings::IniFormat);
qDebug() << sandboxPath + "/etc/QuasselIRC.conf";
} else {
QSettings(sandboxPath + "/etc/QuasselIRC.conf", QSettings::IniFormat);
qDebug() << sandboxPath + "/etc/QuasselIRC.conf";
} else {
- QSettings();
+ QSettings(
QCoreApplication::organizationName(), applicationName
);
}
#endif
}
#endif
+*/
}
Settings::~Settings() {
}
Settings::~Settings() {