use different global config

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/kernel/qcoreapplication.cpp b/src/core/kernel/qcoreapplication.cpp
index 4ea2bf6..9ee6f50 100644 (file)
--- a/src/core/kernel/qcoreapplication.cpp
+++ b/src/core/kernel/qcoreapplication.cpp
@@ -160,15 +160,15 @@ Q_CORE_EXPORT bool qt_locale_initialized = false;
 
 
 /*
-  Create an instance of Trolltech.conf. This ensures that the settings will not
+  Create an instance of Katie.conf. This ensures that the settings will not
   be thrown out of QSetting's cache for unused settings.
   */
 #ifndef QT_NO_SETTINGS
-Q_GLOBAL_STATIC_WITH_ARGS(QSettings, staticTrolltechConf, (QSettings::UserScope, QLatin1String("Trolltech")))
+Q_GLOBAL_STATIC_WITH_ARGS(QSettings, staticKatieConf, (QSettings::UserScope, QLatin1String("Katie")))
 
-QSettings *QCoreApplicationPrivate::trolltechConf()
+QSettings *QCoreApplicationPrivate::staticConf()
 {
-    return staticTrolltechConf();
+    return staticKatieConf();
 }
 #endif
 

diff --git a/src/core/kernel/qcoreapplication_p.h b/src/core/kernel/qcoreapplication_p.h
index 9193edd..31912ea 100644 (file)
--- a/src/core/kernel/qcoreapplication_p.h
+++ b/src/core/kernel/qcoreapplication_p.h
@@ -112,7 +112,7 @@ public:
     static inline bool testAttribute(uint flag)
         { return attribs & (1 << flag); }
 #ifndef QT_NO_SETTINGS
-    static QSettings *trolltechConf();
+    static QSettings *staticConf();
 #endif
 };
 

diff --git a/src/core/plugin/qfactoryloader.cpp b/src/core/plugin/qfactoryloader.cpp
index bb09b91..dd30574 100644 (file)
--- a/src/core/plugin/qfactoryloader.cpp
+++ b/src/core/plugin/qfactoryloader.cpp
@@ -93,7 +93,7 @@ QFactoryLoader::QFactoryLoader(const char *iid,
 }
 
 
-void QFactoryLoader::updateDir(const QString &pluginDir, QSettings& settings)
+void QFactoryLoader::updateDir(const QString &pluginDir, QSettings *settings)
 {
     Q_D(QFactoryLoader);
     QString path = pluginDir + d->suffix;
@@ -109,7 +109,7 @@ void QFactoryLoader::updateDir(const QString &pluginDir, QSettings& settings)
             qDebug() << "QFactoryLoader::QFactoryLoader() looking at" << fileName;
         }
         library = QLibraryPrivate::findOrCreate(QFileInfo(fileName).canonicalFilePath());
-        if (!library->isPlugin(&settings)) {
+        if (!library->isPlugin(settings)) {
             if (qt_debug_component()) {
                 qDebug() << library->errorString;
                 qDebug() << "         not a plugin";
@@ -123,7 +123,7 @@ void QFactoryLoader::updateDir(const QString &pluginDir, QSettings& settings)
                          .arg(QString::fromLatin1(d->iid.constData()))
                          .arg(fileName);
         QStringList reg, keys;
-        reg = settings.value(regkey).toStringList();
+        reg = settings->value(regkey).toStringList();
         if (reg.count() && library->lastModified == reg[0]) {
             keys = reg;
             keys.removeFirst();
@@ -150,7 +150,7 @@ void QFactoryLoader::updateDir(const QString &pluginDir, QSettings& settings)
             reg.clear();
             reg << library->lastModified;
             reg += keys;
-            settings.setValue(regkey, reg);
+            settings->setValue(regkey, reg);
         }
         if (qt_debug_component()) {
             qDebug() << "keys" << keys;
@@ -189,14 +189,13 @@ void QFactoryLoader::update()
 #ifdef QT_SHARED
     Q_D(QFactoryLoader);
     QStringList paths = QCoreApplication::libraryPaths();
-    QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
     for (int i = 0; i < paths.count(); ++i) {
         const QString &pluginDir = paths.at(i);
         // Already loaded, skip it...
         if (d->loadedPaths.contains(pluginDir))
             continue;
         d->loadedPaths << pluginDir;
-        updateDir(pluginDir, settings);
+        updateDir(pluginDir, QCoreApplicationPrivate::staticConf());
     }
 #else
     Q_D(QFactoryLoader);

diff --git a/src/core/plugin/qfactoryloader_p.h b/src/core/plugin/qfactoryloader_p.h
index 7210664..7ceffe3 100644 (file)
--- a/src/core/plugin/qfactoryloader_p.h
+++ b/src/core/plugin/qfactoryloader_p.h
@@ -74,7 +74,7 @@ public:
 #endif
 
     void update();
-    void updateDir(const QString &pluginDir, QSettings& settings);
+    void updateDir(const QString &pluginDir, QSettings *settings);
 
     static void refreshAll();
 };

diff --git a/src/core/plugin/qlibrary.cpp b/src/core/plugin/qlibrary.cpp
index 6f48d76..8c4e94f 100644 (file)
--- a/src/core/plugin/qlibrary.cpp
+++ b/src/core/plugin/qlibrary.cpp
@@ -565,7 +565,7 @@ bool QLibraryPrivate::isPlugin(QSettings *settings)
     QStringList reg;
 #ifndef QT_NO_SETTINGS
     if (!settings) {
-        settings = QCoreApplicationPrivate::trolltechConf();
+        settings = QCoreApplicationPrivate::staticConf();
     }
     reg = settings->value(regkey).toStringList();
 #endif

diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/gui/dialogs/qcolordialog.cpp
index 2801e79..fcbc04f 100644 (file)
--- a/src/gui/dialogs/qcolordialog.cpp
+++ b/src/gui/dialogs/qcolordialog.cpp
@@ -1399,7 +1399,7 @@ void QColorDialogPrivate::init(const QColor &initial)
 
 #ifndef QT_NO_SETTINGS
     if (!customSet) {
-        QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
+        QSettings settings(QSettings::UserScope, QLatin1String("Katie"));
         for (int i = 0; i < 2*8; ++i) {
             QVariant v = settings.value(QLatin1String("Qt/customColors/") + QString::number(i));
             if (v.isValid()) {
@@ -1820,7 +1820,7 @@ QColorDialog::~QColorDialog()
 
 #ifndef QT_NO_SETTINGS
     if (!customSet) {
-        QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
+        QSettings settings(QSettings::UserScope, QLatin1String("Katie"));
         for (int i = 0; i < 2*8; ++i)
             settings.setValue(QLatin1String("Qt/customColors/") + QString::number(i), cusrgb[i]);
     }

diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index f5f7946..f424873 100644 (file)
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -331,7 +331,7 @@ QFileDialog::~QFileDialog()
 {
     Q_D(QFileDialog);
 #ifndef QT_NO_SETTINGS
-    QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
+    QSettings settings(QSettings::UserScope, QLatin1String("Katie"));
     settings.beginGroup(QLatin1String("Qt"));
     settings.setValue(QLatin1String("filedialog"), saveState());
 #endif
@@ -2029,7 +2029,7 @@ void QFileDialogPrivate::init(const QString &directory, const QString &nameFilte
     q->setFileMode(fileMode);
 
 #ifndef QT_NO_SETTINGS
-    QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
+    QSettings settings(QSettings::UserScope, QLatin1String("Katie"));
     settings.beginGroup(QLatin1String("Qt"));
     if (!directory.isEmpty())
         setLastVisitedDirectory(workingDirectory(directory));

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 51cf424..c5f8f2b 100644 (file)
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -708,7 +708,7 @@ bool QApplicationPrivate::x11_apply_settings()
         return true;
     }
 
-    QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
+    QSettings settings(QSettings::UserScope, QLatin1String("Katie"));
 
     settings.beginGroup(QLatin1String("Qt"));
 
@@ -1667,7 +1667,7 @@ void qt_init(QApplicationPrivate *priv, int,
         // read some non-GUI settings when not using the X server...
 
         if (QApplication::desktopSettingsAware()) {
-            QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
+            QSettings settings(QSettings::UserScope, QLatin1String("Katie"));
             settings.beginGroup(QLatin1String("Qt"));
 
             // read library (ie. plugin) path list

diff --git a/src/gui/painting/qprintengine_ps.cpp b/src/gui/painting/qprintengine_ps.cpp
index 261c8cd..834271d 100644 (file)
--- a/src/gui/painting/qprintengine_ps.cpp
+++ b/src/gui/painting/qprintengine_ps.cpp
@@ -178,7 +178,7 @@ QPSPrintEnginePrivate::QPSPrintEnginePrivate(QPrinter::PrinterMode m)
     firstPage = true;
 
 #ifndef QT_NO_SETTINGS
-    QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
+    QSettings settings(QSettings::UserScope, QLatin1String("Katie"));
     settings.beginGroup(QLatin1String("Qt"));
     embedFonts = settings.value(QLatin1String("embedFonts"), true).toBool();
 #else

diff --git a/src/network/socket/qlocalserver_tcp.cpp b/src/network/socket/qlocalserver_tcp.cpp
index 150a2d1..7e10f94 100644 (file)
--- a/src/network/socket/qlocalserver_tcp.cpp
+++ b/src/network/socket/qlocalserver_tcp.cpp
@@ -67,7 +67,7 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName)
     else
         fullServerName = prefix + requestedServerName;
 
-    QSettings settings(QLatin1String("Trolltech"), QLatin1String("Qt"));
+    QSettings settings(QLatin1String("Katie"), QLatin1String("Qt"));
     if (settings.contains(fullServerName)) {
         qWarning("QLocalServer::listen: server name is already in use.");
         tcpServer.close();
@@ -80,7 +80,7 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName)
 
 void QLocalServerPrivate::closeServer()
 {
-    QSettings settings(QLatin1String("Trolltech"), QLatin1String("Qt"));
+    QSettings settings(QLatin1String("Katie"), QLatin1String("Qt"));
     if (fullServerName == QLatin1String("QLocalServer"))
         settings.setValue(fullServerName, QVariant());
     else
@@ -119,7 +119,7 @@ bool QLocalServerPrivate::removeServer(const QString &name)
     else
         serverName = prefix + name;
 
-    QSettings settings(QLatin1String("Trolltech"), QLatin1String("Qt"));
+    QSettings settings(QLatin1String("Katie"), QLatin1String("Qt"));
     if (settings.contains(serverName))
         settings.remove(serverName);
 

diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp
index 693d38f..4ae89a6 100644 (file)
--- a/src/network/socket/qlocalsocket_tcp.cpp
+++ b/src/network/socket/qlocalsocket_tcp.cpp
@@ -235,7 +235,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode)
     else
         d->fullServerName = prefix + name;
 
-    QSettings settings(QLatin1String("Trolltech"), QLatin1String("Qt"));
+    QSettings settings(QLatin1String("Katie"), QLatin1String("Qt"));
     bool ok;
     const quint16 port = settings.value(d->fullServerName).toUInt(&ok);
     if (!ok) {

diff --git a/src/scripttools/debugging/qscriptenginedebugger.cpp b/src/scripttools/debugging/qscriptenginedebugger.cpp
index 424101b..4d61180 100644 (file)
--- a/src/scripttools/debugging/qscriptenginedebugger.cpp
+++ b/src/scripttools/debugging/qscriptenginedebugger.cpp
@@ -308,7 +308,7 @@ QScriptEngineDebuggerPrivate::~QScriptEngineDebuggerPrivate()
     delete frontend;
 #ifndef QT_NO_MAINWINDOW
     if (standardWindow) {
-        QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
+        QSettings settings(QSettings::UserScope, QLatin1String("Katie"));
         QByteArray geometry = standardWindow->saveGeometry();
         settings.setValue(QLatin1String("Qt/scripttools/debugging/mainWindowGeometry"), geometry);
         QByteArray state = standardWindow->saveState();
@@ -595,7 +595,7 @@ QMainWindow *QScriptEngineDebugger::standardWindow() const
 
     win->setWindowTitle(tr("Qt Script Debugger"));
 
-    QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
+    QSettings settings(QSettings::UserScope, QLatin1String("Katie"));
     QVariant geometry = settings.value(QLatin1String("Qt/scripttools/debugging/mainWindowGeometry"));
     if (geometry.isValid())
         win->restoreGeometry(geometry.toByteArray());

diff --git a/src/tools/designer/qdesigner.cpp b/src/tools/designer/qdesigner.cpp
index a0f44ec..7139df8 100644 (file)
--- a/src/tools/designer/qdesigner.cpp
+++ b/src/tools/designer/qdesigner.cpp
@@ -86,7 +86,7 @@ QDesigner::QDesigner(int &argc, char **argv)
     : QApplication(argc, argv),
       m_workbench(0), m_suppressNewFormShow(false)
 {
-    setOrganizationName(QLatin1String("Trolltech"));
+    setOrganizationName(QLatin1String("Katie"));
     setApplicationName(QLatin1String(designerApplicationName));
     QDesignerComponents::initializeResources();
 

diff --git a/src/tools/qtconfig/mainwindow.cpp b/src/tools/qtconfig/mainwindow.cpp
index 883761f..8e94ea0 100644 (file)
--- a/src/tools/qtconfig/mainwindow.cpp
+++ b/src/tools/qtconfig/mainwindow.cpp
@@ -216,7 +216,7 @@ MainWindow::MainWindow()
                                    Qt::ToolTipRole);
     ui->guiStyleCombo->addItems(gstyles);
 
-    QSettings settings(QLatin1String("Trolltech"));
+    QSettings settings(QLatin1String("Katie"));
     settings.beginGroup(QLatin1String("Qt"));
 
     QString currentstyle = settings.value(QLatin1String("style")).toString();
@@ -383,7 +383,7 @@ void MainWindow::fileSave()
     statusBar()->showMessage(tr("Saving changes..."));
 
     {
-        QSettings settings(QLatin1String("Trolltech"));
+        QSettings settings(QLatin1String("Katie"));
         settings.beginGroup(QLatin1String("Qt"));
         QFontDatabase db;
         QFont font = db.font(ui->fontFamilyCombo->currentText(),