Mercurial Repositories > eric / file diff

--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py	Mon Aug 12 19:41:53 2013 +0200
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py	Mon Aug 12 22:21:53 2013 +0200
@@ -67,7 +67,7 @@
         self.singlesBoxLayout = QVBoxLayout(self.singlesBox)
         self.singlesBoxLayout.setObjectName("singlesBoxLayout")
         self.singlesBoxLayout.setSpacing(6)
-        self.singlesBoxLayout.setMargin(6)
+        self.singlesBoxLayout.setContentsMargins(6, 6, 6, 6)
         self.singlesBox.setLayout(self.singlesBoxLayout)
         self.singlesView = QScrollArea(self.singlesBox)
         self.singlesView.setObjectName("singlesView")
@@ -78,14 +78,14 @@
         self.singlesItemsBox.setObjectName("singlesItemsBox")
         self.singlesItemsBox.setMinimumWidth(1000)
         self.singlesItemsBoxLayout = QVBoxLayout(self.singlesItemsBox)
-        self.singlesItemsBoxLayout.setMargin(6)
+        self.singlesItemsBoxLayout.setContentsMargins(6, 6, 6, 6)
         self.singlesItemsBoxLayout.setSpacing(6)
         self.singlesItemsBox.setLayout(self.singlesItemsBoxLayout)
         self.singlesEntries = []
         self.__addSinglesLine()
         
         hlayout0 = QHBoxLayout()
-        hlayout0.setMargin(0)
+        hlayout0.setContentsMargins(0, 0, 0, 0)
         hlayout0.setSpacing(6)
         hlayout0.setObjectName("hlayout0")
         self.moreSinglesButton = QPushButton(self.trUtf8("Additional Entries"),
@@ -101,7 +101,7 @@
         self.rangesBoxLayout = QVBoxLayout(self.rangesBox)
         self.rangesBoxLayout.setObjectName("rangesBoxLayout")
         self.rangesBoxLayout.setSpacing(6)
-        self.rangesBoxLayout.setMargin(6)
+        self.rangesBoxLayout.setContentsMargins(6, 6, 6, 6)
         self.rangesBox.setLayout(self.rangesBoxLayout)
         self.rangesView = QScrollArea(self.rangesBox)
         self.rangesView.setObjectName("rangesView")
@@ -112,14 +112,14 @@
         self.rangesItemsBox.setObjectName("rangesItemsBox")
         self.rangesItemsBox.setMinimumWidth(1000)
         self.rangesItemsBoxLayout = QVBoxLayout(self.rangesItemsBox)
-        self.rangesItemsBoxLayout.setMargin(6)
+        self.rangesItemsBoxLayout.setContentsMargins(6, 6, 6, 6)
         self.rangesItemsBoxLayout.setSpacing(6)
         self.rangesItemsBox.setLayout(self.rangesItemsBoxLayout)
         self.rangesEntries = []
         self.__addRangesLine()
         
         hlayout1 = QHBoxLayout()
-        hlayout1.setMargin(0)
+        hlayout1.setContentsMargins(0, 0, 0, 0)
         hlayout1.setSpacing(6)
         hlayout1.setObjectName("hlayout1")
         self.moreRangesButton = QPushButton(self.trUtf8("Additional Entries"),
@@ -329,7 +329,7 @@
         """
         hbox = QWidget(self.singlesItemsBox)
         hboxLayout = QHBoxLayout(hbox)
-        hboxLayout.setMargin(0)
+        hboxLayout.setContentsMargins(0, 0, 0, 0)
         hboxLayout.setSpacing(6)
         hbox.setLayout(hboxLayout)
         cb1 = QComboBox(hbox)
@@ -373,7 +373,7 @@
         """
         hbox = QWidget(self.rangesItemsBox)
         hboxLayout = QHBoxLayout(hbox)
-        hboxLayout.setMargin(0)
+        hboxLayout.setContentsMargins(0, 0, 0, 0)
         hboxLayout.setSpacing(6)
         hbox.setLayout(hboxLayout)
         cb1 = QComboBox(hbox)