From f7c2b8777d95dc1a13bdfcb104ee87db32980749 Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@netcitadel.com>
Date: Sat, 12 Jun 2010 01:57:00 +0000
Subject: [PATCH] * fixed SF bug #3013743 "UI build warnings"

---
 build_num                              | 2 +-
 doc/ChangeLog                          | 2 ++
 src/gui/ClusterInterfaceWidget.ui      | 2 +-
 src/gui/InterfaceEditorWidget.ui       | 2 +-
 src/gui/InterfacesTabWidget.ui         | 4 ++--
 src/gui/carpoptionsdialog_q.ui         | 2 +-
 src/gui/clustermembersdialog_q.ui      | 2 +-
 src/gui/conntrackoptionsdialog_q.ui    | 2 +-
 src/gui/dnsnamedialog_q.ui             | 2 +-
 src/gui/findobjectwidget_q.ui          | 2 +-
 src/gui/findwhereusedwidget_q.ui       | 2 +-
 src/gui/heartbeatoptionsdialog_q.ui    | 2 +-
 src/gui/icmpservicedialog_q.ui         | 2 +-
 src/gui/iosacladvanceddialog_q.ui      | 2 +-
 src/gui/ipcopadvanceddialog_q.ui       | 2 +-
 src/gui/ipcoposadvanceddialog_q.ui     | 2 +-
 src/gui/ipfadvanceddialog_q.ui         | 2 +-
 src/gui/ipfwadvanceddialog_q.ui        | 2 +-
 src/gui/ipservicedialog_q.ui           | 2 +-
 src/gui/linksysadvanceddialog_q.ui     | 2 +-
 src/gui/linux24advanceddialog_q.ui     | 2 +-
 src/gui/linux24ifaceoptsdialog_q.ui    | 2 +-
 src/gui/objectmanipulator_q.ui         | 2 +-
 src/gui/openaisoptionsdialog_q.ui      | 2 +-
 src/gui/openbsdifaceoptsdialog_q.ui    | 2 +-
 src/gui/pfadvanceddialog_q.ui          | 2 +-
 src/gui/pfsyncoptionsdialog_q.ui       | 2 +-
 src/gui/pixadvanceddialog_q.ui         | 2 +-
 src/gui/pixfailoveroptionsdialog_q.ui  | 2 +-
 src/gui/pixosifaceoptsdialog_q.ui      | 2 +-
 src/gui/procurveacladvanceddialog_q.ui | 2 +-
 src/gui/ruleoptionsdialog_q.ui         | 2 +-
 src/gui/vlanonlyifaceoptsdialog_q.ui   | 2 +-
 src/gui/vrrpoptionsdialog_q.ui         | 2 +-
 34 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/build_num b/build_num
index 2376ef690..d0494dfce 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 2975
+#define BUILD_NUM 2976
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 6921bd521..cca1f78ad 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,7 @@
 2010-06-11  Vadim Kurland  <vadim@vk.crocodile.org>
 
+	* fixed SF bug #3013743 "UI build warnings"
+
 	* longtextdialog_q.ui, objconflictresolutiondialog_q.ui: fixed
 	SF bug #3013735 "invalid pixmap properties during make". Fixed
 	uic warnings.
diff --git a/src/gui/ClusterInterfaceWidget.ui b/src/gui/ClusterInterfaceWidget.ui
index 9154bf959..2e35049bd 100644
--- a/src/gui/ClusterInterfaceWidget.ui
+++ b/src/gui/ClusterInterfaceWidget.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
-    <layout class="QGridLayout" name="gridLayout">
+    <layout class="QGridLayout" name="gridLayout_118">
      <item row="0" column="0">
       <widget class="QLabel" name="label_1">
        <property name="text">
diff --git a/src/gui/InterfaceEditorWidget.ui b/src/gui/InterfaceEditorWidget.ui
index 732288dbf..2432a890a 100644
--- a/src/gui/InterfaceEditorWidget.ui
+++ b/src/gui/InterfaceEditorWidget.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QGridLayout" name="gridLayout">
+    <layout class="QGridLayout" name="gridLayout_117">
      <item row="0" column="0">
       <widget class="QLabel" name="label_1">
        <property name="text">
diff --git a/src/gui/InterfacesTabWidget.ui b/src/gui/InterfacesTabWidget.ui
index 670d9ec1f..ae91923d6 100644
--- a/src/gui/InterfacesTabWidget.ui
+++ b/src/gui/InterfacesTabWidget.ui
@@ -13,12 +13,12 @@
   <property name="windowTitle">
    <string>TabWidget</string>
   </property>
-  <widget class="QWidget" name="tab">
+  <widget class="QWidget" name="tab_1">
    <attribute name="title">
     <string>Tab 1</string>
    </attribute>
   </widget>
-  <widget class="QWidget" name="tab">
+  <widget class="QWidget" name="tab_2">
    <attribute name="title">
     <string>Tab 2</string>
    </attribute>
diff --git a/src/gui/carpoptionsdialog_q.ui b/src/gui/carpoptionsdialog_q.ui
index c8bc42409..8e9c1ca17 100644
--- a/src/gui/carpoptionsdialog_q.ui
+++ b/src/gui/carpoptionsdialog_q.ui
@@ -78,7 +78,7 @@
        <iconset resource="MainRes.qrc" >
         <normaloff>:/Icons/Options</normaloff>:/Icons/Options</iconset>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout" >
+      <layout class="QGridLayout" name="gridLayout_108" >
        <item row="0" column="1" >
         <spacer>
          <property name="orientation" >
diff --git a/src/gui/clustermembersdialog_q.ui b/src/gui/clustermembersdialog_q.ui
index 7aba1bd3b..cde0c588a 100644
--- a/src/gui/clustermembersdialog_q.ui
+++ b/src/gui/clustermembersdialog_q.ui
@@ -187,7 +187,7 @@
          <property name="frameShadow" >
           <enum>QFrame::Plain</enum>
          </property>
-         <layout class="QGridLayout" name="gridLayout" >
+         <layout class="QGridLayout" name="gridLayout_129" >
           <item row="0" column="0" >
            <widget class="QToolButton" name="buttonAdd" >
             <property name="enabled" >
diff --git a/src/gui/conntrackoptionsdialog_q.ui b/src/gui/conntrackoptionsdialog_q.ui
index b1a9eec04..29f13a471 100644
--- a/src/gui/conntrackoptionsdialog_q.ui
+++ b/src/gui/conntrackoptionsdialog_q.ui
@@ -79,7 +79,7 @@
       <attribute name="title">
        <string>conntrack Parameters</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout">
+      <layout class="QGridLayout" name="gridLayout_110">
        <item row="0" column="0" colspan="3">
         <widget class="QCheckBox" name="use_unicast">
          <property name="text">
diff --git a/src/gui/dnsnamedialog_q.ui b/src/gui/dnsnamedialog_q.ui
index 2506dcdff..ecb056477 100644
--- a/src/gui/dnsnamedialog_q.ui
+++ b/src/gui/dnsnamedialog_q.ui
@@ -12,7 +12,7 @@
   <property name="windowTitle" >
    <string>DNS Name</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
+  <layout class="QGridLayout" name="gridLayout_101" >
    <item row="0" column="0" >
     <widget class="QFrame" name="frame7" >
      <property name="frameShape" >
diff --git a/src/gui/findobjectwidget_q.ui b/src/gui/findobjectwidget_q.ui
index 9d52cd74c..4e46b113a 100644
--- a/src/gui/findobjectwidget_q.ui
+++ b/src/gui/findobjectwidget_q.ui
@@ -109,7 +109,7 @@
      <property name="title">
       <string> Replace object </string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
+     <layout class="QGridLayout" name="gridLayout_119">
       <item row="0" column="0">
        <widget class="FWObjectDropArea" name="replaceDropArea" native="true">
         <property name="sizePolicy">
diff --git a/src/gui/findwhereusedwidget_q.ui b/src/gui/findwhereusedwidget_q.ui
index d0e18420d..0869088c8 100644
--- a/src/gui/findwhereusedwidget_q.ui
+++ b/src/gui/findwhereusedwidget_q.ui
@@ -30,7 +30,7 @@
      <property name="title" >
       <string>Object:</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout" >
+     <layout class="QGridLayout" name="gridLayout_107" >
       <item row="0" column="0" >
        <widget class="FWObjectDropArea" native="1" name="dropArea" >
         <property name="sizePolicy" >
diff --git a/src/gui/heartbeatoptionsdialog_q.ui b/src/gui/heartbeatoptionsdialog_q.ui
index a3972d059..4f1cfa4f8 100644
--- a/src/gui/heartbeatoptionsdialog_q.ui
+++ b/src/gui/heartbeatoptionsdialog_q.ui
@@ -78,7 +78,7 @@
        <iconset resource="MainRes.qrc" >
         <normaloff>:/Icons/Options</normaloff>:/Icons/Options</iconset>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout" >
+      <layout class="QGridLayout" name="gridLayout_111" >
        <item row="0" column="0" colspan="4" >
         <widget class="QCheckBox" name="use_unicast" >
          <property name="toolTip" >
diff --git a/src/gui/icmpservicedialog_q.ui b/src/gui/icmpservicedialog_q.ui
index 92333db46..61023d330 100644
--- a/src/gui/icmpservicedialog_q.ui
+++ b/src/gui/icmpservicedialog_q.ui
@@ -21,7 +21,7 @@
   <property name="windowTitle" >
    <string>ICMP</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
+  <layout class="QGridLayout" name="gridLayout_100" >
    <item row="0" column="0" >
     <widget class="QFrame" name="frame7" >
      <property name="frameShape" >
diff --git a/src/gui/iosacladvanceddialog_q.ui b/src/gui/iosacladvanceddialog_q.ui
index a04b5c804..a2cec6d8b 100644
--- a/src/gui/iosacladvanceddialog_q.ui
+++ b/src/gui/iosacladvanceddialog_q.ui
@@ -524,7 +524,7 @@ First, create temporary access list to permit connections from the management su
          <property name="title">
           <string>Built-in installer</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout">
+         <layout class="QGridLayout" name="gridLayout_125">
           <item row="0" column="0">
            <widget class="QLabel" name="textLabel1_2">
             <property name="text">
diff --git a/src/gui/ipcopadvanceddialog_q.ui b/src/gui/ipcopadvanceddialog_q.ui
index 67aeb209d..583318dd7 100644
--- a/src/gui/ipcopadvanceddialog_q.ui
+++ b/src/gui/ipcopadvanceddialog_q.ui
@@ -370,7 +370,7 @@ with this address:</string>
          <property name="title" >
           <string>Built-in installer</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout" >
+         <layout class="QGridLayout" name="gridLayout_102" >
           <item row="0" column="0" >
            <widget class="QLabel" name="label556" >
             <property name="text" >
diff --git a/src/gui/ipcoposadvanceddialog_q.ui b/src/gui/ipcoposadvanceddialog_q.ui
index 6c7a8ead5..c9f97a0da 100644
--- a/src/gui/ipcoposadvanceddialog_q.ui
+++ b/src/gui/ipcoposadvanceddialog_q.ui
@@ -750,7 +750,7 @@
       <attribute name="title" >
        <string>Path</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout" >
+      <layout class="QGridLayout" name="gridLayout_123" >
        <item row="0" column="1" >
         <spacer>
          <property name="orientation" >
diff --git a/src/gui/ipfadvanceddialog_q.ui b/src/gui/ipfadvanceddialog_q.ui
index c37a17098..8749f8da5 100644
--- a/src/gui/ipfadvanceddialog_q.ui
+++ b/src/gui/ipfadvanceddialog_q.ui
@@ -725,7 +725,7 @@ with this address:</string>
          <property name="title" >
           <string>External install script</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout" >
+         <layout class="QGridLayout" name="gridLayout_127" >
           <item row="0" column="0" >
            <layout class="QHBoxLayout" name="horizontalLayout" >
             <item>
diff --git a/src/gui/ipfwadvanceddialog_q.ui b/src/gui/ipfwadvanceddialog_q.ui
index e00b22c2e..64e93fa97 100644
--- a/src/gui/ipfwadvanceddialog_q.ui
+++ b/src/gui/ipfwadvanceddialog_q.ui
@@ -317,7 +317,7 @@ with this address:</string>
          <property name="title" >
           <string>Built-in installer</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout" >
+         <layout class="QGridLayout" name="gridLayout_104" >
           <item row="0" column="0" >
            <widget class="QLabel" name="label556" >
             <property name="text" >
diff --git a/src/gui/ipservicedialog_q.ui b/src/gui/ipservicedialog_q.ui
index 5f8f7bf2d..d9a92a79f 100644
--- a/src/gui/ipservicedialog_q.ui
+++ b/src/gui/ipservicedialog_q.ui
@@ -239,7 +239,7 @@
           <property name="frameShadow" >
            <enum>QFrame::Raised</enum>
           </property>
-          <layout class="QGridLayout" name="gridLayout" >
+          <layout class="QGridLayout" name="gridLayout_121" >
            <property name="topMargin" >
             <number>2</number>
            </property>
diff --git a/src/gui/linksysadvanceddialog_q.ui b/src/gui/linksysadvanceddialog_q.ui
index e393e92cc..b8dc68aca 100644
--- a/src/gui/linksysadvanceddialog_q.ui
+++ b/src/gui/linksysadvanceddialog_q.ui
@@ -77,7 +77,7 @@
       <attribute name="title" >
        <string>Path</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout" >
+      <layout class="QGridLayout" name="gridLayout_130" >
        <item row="0" column="1" >
         <spacer>
          <property name="orientation" >
diff --git a/src/gui/linux24advanceddialog_q.ui b/src/gui/linux24advanceddialog_q.ui
index 0e56ba4e0..7da7d66af 100644
--- a/src/gui/linux24advanceddialog_q.ui
+++ b/src/gui/linux24advanceddialog_q.ui
@@ -754,7 +754,7 @@
       <attribute name="title">
        <string>Path</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout">
+      <layout class="QGridLayout" name="gridLayout_105">
        <property name="leftMargin">
         <number>12</number>
        </property>
diff --git a/src/gui/linux24ifaceoptsdialog_q.ui b/src/gui/linux24ifaceoptsdialog_q.ui
index c42317710..6136b00d8 100644
--- a/src/gui/linux24ifaceoptsdialog_q.ui
+++ b/src/gui/linux24ifaceoptsdialog_q.ui
@@ -141,7 +141,7 @@
          </property>
          <widget class="QWidget" name="page_0" />
          <widget class="QWidget" name="page_1" >
-          <layout class="QGridLayout" name="gridLayout" >
+          <layout class="QGridLayout" name="gridLayout_115" >
            <item row="0" column="0" >
             <widget class="QLabel" name="vlan_label" >
              <property name="enabled" >
diff --git a/src/gui/objectmanipulator_q.ui b/src/gui/objectmanipulator_q.ui
index ebefc3c21..ef5bdcbed 100644
--- a/src/gui/objectmanipulator_q.ui
+++ b/src/gui/objectmanipulator_q.ui
@@ -21,7 +21,7 @@
   <property name="windowTitle" >
    <string>Tree of Objects</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
+  <layout class="QGridLayout" name="gridLayout_103" >
    <property name="verticalSpacing" >
     <number>2</number>
    </property>
diff --git a/src/gui/openaisoptionsdialog_q.ui b/src/gui/openaisoptionsdialog_q.ui
index 54593ffeb..c7c682bd1 100644
--- a/src/gui/openaisoptionsdialog_q.ui
+++ b/src/gui/openaisoptionsdialog_q.ui
@@ -78,7 +78,7 @@
        <iconset resource="MainRes.qrc" >
         <normaloff>:/Icons/Options</normaloff>:/Icons/Options</iconset>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout" >
+      <layout class="QGridLayout" name="gridLayout_112" >
        <item row="0" column="0" >
         <widget class="QLabel" name="label" >
          <property name="text" >
diff --git a/src/gui/openbsdifaceoptsdialog_q.ui b/src/gui/openbsdifaceoptsdialog_q.ui
index c5220b553..64480d14e 100644
--- a/src/gui/openbsdifaceoptsdialog_q.ui
+++ b/src/gui/openbsdifaceoptsdialog_q.ui
@@ -141,7 +141,7 @@
          </property>
          <widget class="QWidget" name="page_0" />
          <widget class="QWidget" name="page_1" >
-          <layout class="QGridLayout" name="gridLayout" >
+          <layout class="QGridLayout" name="gridLayout_106" >
            <item row="0" column="0" >
             <widget class="QLabel" name="vlan_label" >
              <property name="enabled" >
diff --git a/src/gui/pfadvanceddialog_q.ui b/src/gui/pfadvanceddialog_q.ui
index 179e4aee9..322aeccc1 100644
--- a/src/gui/pfadvanceddialog_q.ui
+++ b/src/gui/pfadvanceddialog_q.ui
@@ -1565,7 +1565,7 @@ with this address:</string>
          <property name="title">
           <string>Built-in installer</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout">
+         <layout class="QGridLayout" name="gridLayout_128">
           <item row="0" column="0">
            <widget class="QLabel" name="label556">
             <property name="text">
diff --git a/src/gui/pfsyncoptionsdialog_q.ui b/src/gui/pfsyncoptionsdialog_q.ui
index f353d5409..e0c062f8a 100644
--- a/src/gui/pfsyncoptionsdialog_q.ui
+++ b/src/gui/pfsyncoptionsdialog_q.ui
@@ -78,7 +78,7 @@
        <iconset resource="MainRes.qrc" >
         <normaloff>:/Icons/Options</normaloff>:/Icons/Options</iconset>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout" >
+      <layout class="QGridLayout" name="gridLayout_113" >
        <item row="0" column="0" >
         <widget class="QLabel" name="label" >
          <property name="sizePolicy" >
diff --git a/src/gui/pixadvanceddialog_q.ui b/src/gui/pixadvanceddialog_q.ui
index 7c438b6fa..2d763dd3c 100644
--- a/src/gui/pixadvanceddialog_q.ui
+++ b/src/gui/pixadvanceddialog_q.ui
@@ -385,7 +385,7 @@
          <property name="title">
           <string>Built-in installer</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout">
+         <layout class="QGridLayout" name="gridLayout_124">
           <item row="0" column="0">
            <widget class="QLabel" name="textLabel1_2">
             <property name="text">
diff --git a/src/gui/pixfailoveroptionsdialog_q.ui b/src/gui/pixfailoveroptionsdialog_q.ui
index 507220286..b3b0b5a24 100644
--- a/src/gui/pixfailoveroptionsdialog_q.ui
+++ b/src/gui/pixfailoveroptionsdialog_q.ui
@@ -78,7 +78,7 @@
        <iconset resource="MainRes.qrc" >
         <normaloff>:/Icons/Options</normaloff>:/Icons/Options</iconset>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout" >
+      <layout class="QGridLayout" name="gridLayout_109" >
        <item row="0" column="1" >
         <spacer>
          <property name="orientation" >
diff --git a/src/gui/pixosifaceoptsdialog_q.ui b/src/gui/pixosifaceoptsdialog_q.ui
index 623703ae5..af334e1bb 100644
--- a/src/gui/pixosifaceoptsdialog_q.ui
+++ b/src/gui/pixosifaceoptsdialog_q.ui
@@ -141,7 +141,7 @@
          </property>
          <widget class="QWidget" name="page_blank" />
          <widget class="QWidget" name="page_vlan" >
-          <layout class="QGridLayout" name="gridLayout" >
+          <layout class="QGridLayout" name="gridLayout_116" >
            <item row="0" column="0" >
             <widget class="QLabel" name="vlan_label" >
              <property name="enabled" >
diff --git a/src/gui/procurveacladvanceddialog_q.ui b/src/gui/procurveacladvanceddialog_q.ui
index 642723570..f526d043c 100644
--- a/src/gui/procurveacladvanceddialog_q.ui
+++ b/src/gui/procurveacladvanceddialog_q.ui
@@ -488,7 +488,7 @@ First, create temporary access list to permit connections from the management su
          <property name="title">
           <string>Built-in installer</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout">
+         <layout class="QGridLayout" name="gridLayout_126">
           <item row="0" column="0">
            <widget class="QLabel" name="textLabel1_2">
             <property name="text">
diff --git a/src/gui/ruleoptionsdialog_q.ui b/src/gui/ruleoptionsdialog_q.ui
index c47d58182..cdc287641 100644
--- a/src/gui/ruleoptionsdialog_q.ui
+++ b/src/gui/ruleoptionsdialog_q.ui
@@ -1705,7 +1705,7 @@
           <attribute name="title">
            <string>TCP</string>
           </attribute>
-          <layout class="QGridLayout" name="gridLayout">
+          <layout class="QGridLayout" name="gridLayout_122">
            <property name="spacing">
             <number>12</number>
            </property>
diff --git a/src/gui/vlanonlyifaceoptsdialog_q.ui b/src/gui/vlanonlyifaceoptsdialog_q.ui
index 5026a9760..95f074c3a 100644
--- a/src/gui/vlanonlyifaceoptsdialog_q.ui
+++ b/src/gui/vlanonlyifaceoptsdialog_q.ui
@@ -85,7 +85,7 @@
        <iconset resource="MainRes.qrc" >
         <normaloff>:/Icons/Options</normaloff>:/Icons/Options</iconset>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout" >
+      <layout class="QGridLayout" name="gridLayout_114" >
        <item row="0" column="0" >
         <spacer>
          <property name="orientation" >
diff --git a/src/gui/vrrpoptionsdialog_q.ui b/src/gui/vrrpoptionsdialog_q.ui
index 1c53ad749..c176db84d 100644
--- a/src/gui/vrrpoptionsdialog_q.ui
+++ b/src/gui/vrrpoptionsdialog_q.ui
@@ -78,7 +78,7 @@
        <iconset>
         <normaloff>:/Icons/Options</normaloff>:/Icons/Options</iconset>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout" >
+      <layout class="QGridLayout" name="gridLayout_120" >
        <item row="0" column="0" colspan="3" >
         <widget class="QCheckBox" name="vrrp_over_ipsec_ah" >
          <property name="text" >