Synchronise with v3.13

[kconfig-frontends] / frontends / qconf / qconf.cc

diff --git a/frontends/qconf/qconf.cc b/frontends/qconf/qconf.cc
index d8d61ba9cb775ba880afdf7cce23dd30ca86425f..65eeeb44e86c48a1bfa1fc9ed54bb22565301e0a 100644 (file)
--- a/frontends/qconf/qconf.cc
+++ b/frontends/qconf/qconf.cc
@@ -6,6 +6,7 @@
 #include <qglobal.h>
 
 #if QT_VERSION < 0x040000
+#include <stddef.h>
 #include <qmainwindow.h>
 #include <qvbox.h>
 #include <qvaluelist.h>
@@ -46,21 +47,6 @@
 #include "qconf.h"
 
 #include "qconf.moc"
-#define WANTS_xpm_symbol_yes
-#define WANTS_xpm_symbol_mod
-#define WANTS_xpm_symbol_no
-#define WANTS_xpm_choice_yes
-#define WANTS_xpm_choice_no
-#define WANTS_xpm_menu
-#define WANTS_xpm_menu_inv
-#define WANTS_xpm_menuback
-#define WANTS_xpm_void
-#define WANTS_xpm_back
-#define WANTS_xpm_load
-#define WANTS_xpm_save
-#define WANTS_xpm_single_view
-#define WANTS_xpm_split_view
-#define WANTS_xpm_tree_view
 #include "images.h"
 
 #ifdef _
@@ -83,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.
  */