removed unused includes

these files don't use the debug.h and also don't contain commented out debug code

diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index 556b79ce802fae22cfd9765681ee0fae303a0b65..2a9eefac2fed9a853e7f7a772bcdbda866f8840d 100644 (file)
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -30,7 +30,6 @@
 
 #include "insets/InsetBibtex.h"
 
-#include "support/debug.h"
 #include "support/ExceptionMessage.h"
 #include "support/FileName.h"
 #include "support/filetools.h" // changeExtension

diff --git a/src/frontends/qt4/GuiCompareHistory.cpp b/src/frontends/qt4/GuiCompareHistory.cpp
index 711cd51dcbaea2f21ec40dd70a909c03f32285ba..a659629938937334f7aaca25358b3dca8ac58d77 100644 (file)
--- a/src/frontends/qt4/GuiCompareHistory.cpp
+++ b/src/frontends/qt4/GuiCompareHistory.cpp
@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <support/debug.h>
 
 #include "GuiCompareHistory.h"
 

diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp
index 7ef1a1a5794339143d40c9dd0d04b7b617c99290..0ed10fa7c116eb0bd9807cf352ed80342b62edb2 100644 (file)
--- a/src/frontends/qt4/GuiCompleter.cpp
+++ b/src/frontends/qt4/GuiCompleter.cpp
@@ -25,7 +25,6 @@
 #include "version.h"
 
 #include "support/lassert.h"
-#include "support/debug.h"
 
 #include <QApplication>
 #include <QHeaderView>

diff --git a/src/frontends/qt4/GuiDialog.cpp b/src/frontends/qt4/GuiDialog.cpp
index 1797aeee5fec27f8362f9d98919bd5c6223510b0..e20c3bc66e45652efdc5a9bd87f4a2dafb5cfffb 100644 (file)
--- a/src/frontends/qt4/GuiDialog.cpp
+++ b/src/frontends/qt4/GuiDialog.cpp
@@ -15,8 +15,6 @@
 #include "GuiView.h"
 #include "qt_helpers.h"
 
-#include "support/debug.h"
-
 #include <QCloseEvent>
 
 using namespace std;

diff --git a/src/frontends/qt4/GuiInfo.cpp b/src/frontends/qt4/GuiInfo.cpp
index dcc5ee9855cbc53dfe052b3692794650686e6cee..f640ee30c5616ac03378e99094f1a39121019984 100644 (file)
--- a/src/frontends/qt4/GuiInfo.cpp
+++ b/src/frontends/qt4/GuiInfo.cpp
@@ -22,7 +22,6 @@
 
 #include "insets/InsetInfo.h"
 
-#include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 

diff --git a/src/frontends/qt4/GuiLine.cpp b/src/frontends/qt4/GuiLine.cpp
index 4ab2da8c942291efe06d70afa43e01b19475121d..ddf1a9ac76f28887e36233907bdd605ceed8eb28 100644 (file)
--- a/src/frontends/qt4/GuiLine.cpp
+++ b/src/frontends/qt4/GuiLine.cpp
@@ -21,7 +21,6 @@
 
 #include "insets/InsetLine.h"
 
-#include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 

diff --git a/src/frontends/qt4/GuiListings.cpp b/src/frontends/qt4/GuiListings.cpp
index 6591b5550c8c896e5ace0211ae2c9091f7b1dd26..b6f3ec7f7db509772a9651b64d08e34daf4376fc 100644 (file)
--- a/src/frontends/qt4/GuiListings.cpp
+++ b/src/frontends/qt4/GuiListings.cpp
@@ -21,7 +21,6 @@
 #include "insets/InsetListingsParams.h"
 
 #include "support/convert.h"
-#include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 

diff --git a/src/frontends/qt4/GuiParagraph.cpp b/src/frontends/qt4/GuiParagraph.cpp
index 6cad13767308076f0881beec28e7ee244d43d5a6..a42972a6b1177f5169a64760b048f29c7366b5e0 100644 (file)
--- a/src/frontends/qt4/GuiParagraph.cpp
+++ b/src/frontends/qt4/GuiParagraph.cpp
@@ -28,7 +28,6 @@
 #include "ParagraphParameters.h"
 #include "Spacing.h"
 
-#include "support/debug.h"
 #include "support/gettext.h"
 
 #include <QCheckBox>

diff --git a/src/frontends/qt4/GuiPrintNomencl.cpp b/src/frontends/qt4/GuiPrintNomencl.cpp
index 1e41e3e93b1e508b467e14dc6f033640c947320d..b287d44eb6a23b2030140cbfef430eb287ca74a2 100644 (file)
--- a/src/frontends/qt4/GuiPrintNomencl.cpp
+++ b/src/frontends/qt4/GuiPrintNomencl.cpp
@@ -21,7 +21,6 @@
 
 #include "insets/InsetNomencl.h"
 
-#include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 

diff --git a/src/frontends/qt4/GuiSelectionManager.cpp b/src/frontends/qt4/GuiSelectionManager.cpp
index d3d2b01f410f9204cfb9054e33808411b88f973a..8b1d031b2f70ddee37f26c8f5178de39567fb58c 100644 (file)
--- a/src/frontends/qt4/GuiSelectionManager.cpp
+++ b/src/frontends/qt4/GuiSelectionManager.cpp
@@ -16,8 +16,6 @@
 
 #include "GuiSelectionManager.h"
 
-#include "support/debug.h"
-
 #include <QAbstractListModel>
 #include <QItemSelection>
 #include <QListView>

diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index 79706d41c5c01cdd41acfcded4118884bf90ce56..1f6edf33cfff35b587783f101826916801705b9e 100644 (file)
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -32,7 +32,6 @@
 #include "insets/InsetTabular.h"
 
 #include "support/convert.h"
-#include "support/debug.h"
 
 #include <QCheckBox>
 #include <QPushButton>

diff --git a/src/frontends/qt4/GuiThesaurus.cpp b/src/frontends/qt4/GuiThesaurus.cpp
index c28fdf113e9f1ab5960df05d1b68b7ed174d3826..27fb97cb0dee8bb8c8c077bbe206c7727c1fb4a7 100644 (file)
--- a/src/frontends/qt4/GuiThesaurus.cpp
+++ b/src/frontends/qt4/GuiThesaurus.cpp
@@ -24,7 +24,6 @@
 #include "lyxfind.h"
 #include "WordLangTuple.h"
 
-#include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 

diff --git a/src/frontends/qt4/GuiToc.cpp b/src/frontends/qt4/GuiToc.cpp
index 9711bb68f6c8be99d9c71f82dc97f4dc35c32ab0..19fed71cec49fd7c4944622a6fe6a20c8e3a04cd 100644 (file)
--- a/src/frontends/qt4/GuiToc.cpp
+++ b/src/frontends/qt4/GuiToc.cpp
@@ -23,7 +23,6 @@
 #include "BufferParams.h"
 #include "FuncRequest.h"
 
-#include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 

diff --git a/src/frontends/qt4/InsetParamsDialog.cpp b/src/frontends/qt4/InsetParamsDialog.cpp
index f76427d68d7c56d810d00fe4763d133305e12f8b..f90d8006701ddb6e92ff489f01cd6168bf5c84e2 100644 (file)
--- a/src/frontends/qt4/InsetParamsDialog.cpp
+++ b/src/frontends/qt4/InsetParamsDialog.cpp
@@ -39,7 +39,6 @@
 #include "FuncStatus.h"
 #include "LyX.h"
 
-#include "support/debug.h"
 #include "support/lstrings.h"
 
 using namespace std;

diff --git a/src/frontends/qt4/ui/BoxUi.ui b/src/frontends/qt4/ui/BoxUi.ui
index 9a6fd9a3ea8cacb260470fdcfab684c22e372946..867aa712c28a640c016b94e76d2337d8afca447e 100644 (file)
--- a/src/frontends/qt4/ui/BoxUi.ui
+++ b/src/frontends/qt4/ui/BoxUi.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>BoxUi</class>
  <widget class="QWidget" name="BoxUi">
@@ -15,13 +16,121 @@
   <property name="sizeGripEnabled" stdset="0">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>9</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="typeLA">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="text">
+      <string>&amp;Decoration:</string>
+     </property>
+     <property name="buddy">
+      <cstring>typeCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="typeCO">
+     <property name="toolTip">
+      <string>Supported box types</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="innerBoxLA">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="text">
+      <string>Inner Bo&amp;x:</string>
+     </property>
+     <property name="buddy">
+      <cstring>innerBoxCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="innerBoxCO">
+     <property name="toolTip">
+      <string>Inner box -- needed for fixed width &amp; line breaks</string>
+     </property>
+     <item>
+      <property name="text">
+       <string>None</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Parbox</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Minipage</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QCheckBox" name="widthCB">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="text">
+      <string>&amp;Width:</string>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+     <property name="tristate">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="widthED">
+     <property name="toolTip">
+      <string>Width value</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="LengthCombo" name="widthUnitsLC"/>
+   </item>
+   <item row="3" column="0">
+    <widget class="QCheckBox" name="heightCB">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="text">
+      <string>&amp;Height:</string>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+     <property name="tristate">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QLineEdit" name="heightED">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="toolTip">
+      <string>Height value</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2">
+    <widget class="LengthCombo" name="heightUnitsLC">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
    <item row="4" column="0" colspan="2">
     <widget class="QCheckBox" name="pagebreakCB">
      <property name="toolTip">
@@ -181,117 +290,6 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="2">
-    <widget class="LengthCombo" name="heightUnitsLC">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QCheckBox" name="heightCB">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="text">
-      <string>&amp;Height:</string>
-     </property>
-     <property name="checked">
-      <bool>false</bool>
-     </property>
-     <property name="tristate">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="innerBoxLA">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="text">
-      <string>Inner Bo&amp;x:</string>
-     </property>
-     <property name="buddy">
-      <cstring>innerBoxCO</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2">
-    <widget class="LengthCombo" name="widthUnitsLC"/>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="typeLA">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="text">
-      <string>&amp;Decoration:</string>
-     </property>
-     <property name="buddy">
-      <cstring>typeCO</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="widthLA">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="text">
-      <string>&amp;Width:</string>
-     </property>
-     <property name="buddy">
-      <cstring>widthED</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QLineEdit" name="heightED">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="toolTip">
-      <string>Height value</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QLineEdit" name="widthED">
-     <property name="toolTip">
-      <string>Width value</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" colspan="2">
-    <widget class="QComboBox" name="innerBoxCO">
-     <property name="toolTip">
-      <string>Inner box -- needed for fixed width &amp; line breaks</string>
-     </property>
-     <item>
-      <property name="text">
-       <string>None</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Parbox</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Minipage</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="2">
-    <widget class="QComboBox" name="typeCO">
-     <property name="toolTip">
-      <string>Supported box types</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -350,5 +348,37 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>widthCB</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>widthED</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>37</x>
+     <y>70</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>124</x>
+     <y>70</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>widthCB</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>widthUnitsLC</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>37</x>
+     <y>70</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>217</x>
+     <y>70</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>