[vidalia-svn] r1279: Creating a static VidaliaSettings object makes a static-link (trunk/src)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2006-10-04 00:29:12 -0400 (Wed, 04 Oct 2006)
New Revision: 1279

Modified:
   trunk/src/vidalia.cpp
   trunk/src/vidalia.h
Log:
Creating a static VidaliaSettings object makes a static-linked Qt 4.1.4 sad.
Let's not make static-linked Qt 4.1.4 sad.


Modified: trunk/src/vidalia.cpp
===================================================================
--- trunk/src/vidalia.cpp	2006-10-04 03:20:25 UTC (rev 1278)
+++ trunk/src/vidalia.cpp	2006-10-04 04:29:12 UTC (rev 1279)
@@ -45,7 +45,6 @@
 QMap<QString, QString> Vidalia::_args; /**< List of command-line arguments.  */
 QString Vidalia::_style;               /**< The current GUI style.           */
 QString Vidalia::_language;            /**< The current language.            */
-VidaliaSettings Vidalia::_settings;    /**< Vidalia's configurable settings. */
 HelpBrowser*  Vidalia::_help = 0;      /**< Vidalia's help system.           */
 TorControl* Vidalia::_torControl = 0;  /**< Main TorControl object.          */
 
@@ -61,7 +60,7 @@
 
   /* Check if we're supposed to reset our config before proceeding. */
   if (_args.contains(ARG_RESET)) {
-    _settings.reset();
+    VidaliaSettings::reset();
   }
 
   /** Translate the GUI to the appropriate language. */
@@ -192,7 +191,8 @@
 {
   /* If the language code is empty, use the previously-saved setting */
   if (languageCode.isEmpty()) {
-    languageCode = _settings.getLanguageCode();
+    VidaliaSettings settings;
+    languageCode = settings.getLanguageCode();
   }
   /* Translate into the desired langauge */
   if (LanguageSupport::translate(languageCode)) {
@@ -211,7 +211,8 @@
 {
   /* If no style was specified, use the previously-saved setting */
   if (styleKey.isEmpty()) {
-    styleKey = _settings.getInterfaceStyle();
+    VidaliaSettings settings;
+    styleKey = settings.getInterfaceStyle();
   }
   /* Apply the specified GUI style */
   if (QApplication::setStyle(styleKey)) {

Modified: trunk/src/vidalia.h
===================================================================
--- trunk/src/vidalia.h	2006-10-04 03:20:25 UTC (rev 1278)
+++ trunk/src/vidalia.h	2006-10-04 04:29:12 UTC (rev 1279)
@@ -106,7 +106,6 @@
   static QMap<QString, QString> _args; /**< List of command-line arguments.  */
   static QString _style;               /**< The current GUI style.           */
   static QString _language;            /**< The current language.            */
-  static VidaliaSettings _settings;    /**< Vidalia's configurable settings. */
 
   static TorControl* _torControl;      /**< Vidalia's main TorControl object.*/
   static HelpBrowser* _help;           /**< Vidalia's configurable settings. */