diff mbox

xconfig: Fix the filename for GUI settings

Message ID 1381083691.2788.28.camel@deadeye.wl.decadent.org.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Ben Hutchings Oct. 6, 2013, 6:21 p.m. UTC
Currently the qconf program invoked by 'make xconfig' stores GUI
settings in the file ~/.config/Unknown\ Organization.conf.  This name
is apparently generated by the QSettings class when no organisation
or application name are specified.

This is obviously not a sensible filename (nor does it seem sensible
that these QSettings parameters are optional!).  Pass the names
'kernel.org' and 'qconf', resuling in the filename
~/.config/kernel.org/qconf.conf.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 scripts/kconfig/qconf.cc | 5 +++++
 scripts/kconfig/qconf.h  | 1 +
 2 files changed, 6 insertions(+)

Comments

Yann E. MORIN Oct. 8, 2013, 9:33 p.m. UTC | #1
Ben, All,

On 2013-10-06 19:21 +0100, Ben Hutchings spake thusly:
> Currently the qconf program invoked by 'make xconfig' stores GUI
> settings in the file ~/.config/Unknown\ Organization.conf.  This name
> is apparently generated by the QSettings class when no organisation
> or application name are specified.
> 
> This is obviously not a sensible filename (nor does it seem sensible
> that these QSettings parameters are optional!).  Pass the names
> 'kernel.org' and 'qconf', resuling in the filename
> ~/.config/kernel.org/qconf.conf.

I'll take this in my tree for 3.13. Thanks!

Regards,
Yann E. MORIN.

> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> ---
>  scripts/kconfig/qconf.cc | 5 +++++
>  scripts/kconfig/qconf.h  | 1 +
>  2 files changed, 6 insertions(+)
> 
> diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
> index 1500c38..9d3b04b 100644
> --- a/scripts/kconfig/qconf.cc
> +++ b/scripts/kconfig/qconf.cc
> @@ -69,6 +69,11 @@ static inline QString qgettext(const QString& str)
>  	return QString::fromLocal8Bit(gettext(str.latin1()));
>  }
>  
> +ConfigSettings::ConfigSettings()
> +	: QSettings("kernel.org", "qconf")
> +{
> +}
> +
>  /**
>   * Reads a list of integer values from the application settings.
>   */
> diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
> index 3715b3e..bde0c6b 100644
> --- a/scripts/kconfig/qconf.h
> +++ b/scripts/kconfig/qconf.h
> @@ -32,6 +32,7 @@ class ConfigMainWindow;
>  
>  class ConfigSettings : public QSettings {
>  public:
> +	ConfigSettings();
>  	Q3ValueList<int> readSizes(const QString& key, bool *ok);
>  	bool writeSizes(const QString& key, const Q3ValueList<int>& value);
>  };
> 
> -- 
> Ben Hutchings
> Who are all these weirdos? - David Bowie, reading IRC for the first time
diff mbox

Patch

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 1500c38..9d3b04b 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -69,6 +69,11 @@  static inline QString qgettext(const QString& str)
 	return QString::fromLocal8Bit(gettext(str.latin1()));
 }
 
+ConfigSettings::ConfigSettings()
+	: QSettings("kernel.org", "qconf")
+{
+}
+
 /**
  * Reads a list of integer values from the application settings.
  */
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index 3715b3e..bde0c6b 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -32,6 +32,7 @@  class ConfigMainWindow;
 
 class ConfigSettings : public QSettings {
 public:
+	ConfigSettings();
 	Q3ValueList<int> readSizes(const QString& key, bool *ok);
 	bool writeSizes(const QString& key, const Q3ValueList<int>& value);
 };