1 files changed, 10 insertions, 10 deletions
diff --git a/util/locale_database/testlocales/localewidget.cpp b/util/locale_database/testlocales/localewidget.cpp
index c35c3dc1d8..df8a3c28ab 100644
--- a/util/locale_database/testlocales/localewidget.cpp
+++ b/util/locale_database/testlocales/localewidget.cpp
@@ -26,26 +26,26 @@ public:
 class EditorFactory : public QItemEditorFactory
 {
 public:
-    EditorFactory() {
-        static DoubleEditorCreator double_editor_creator;
-        registerEditor(QVariant::Double, &double_editor_creator);
+    EditorFactory()
+    {
+        // registerEditor() assumes ownership of the creator.
+        registerEditor(QVariant::Double, new DoubleEditorCreator);
     }
 };
 
 LocaleWidget::LocaleWidget(QWidget *parent)
-    : QWidget(parent)
+    : QWidget(parent),
+      m_model(new LocaleModel(this)),
+      m_view(new QTableView(this))
 {
-    m_model = new LocaleModel(this);
-    m_view = new QTableView(this);
-
     QStyledItemDelegate *delegate = qobject_cast<QStyledItemDelegate*>(m_view->itemDelegate());
     Q_ASSERT(delegate != 0);
-    static EditorFactory editor_factory;
-    delegate->setItemEditorFactory(&editor_factory);
+    static EditorFactory editorFactory;
+    delegate->setItemEditorFactory(&editorFactory);
 
     m_view->setModel(m_model);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_view);
 }