Some namespace cleanup.

This commit is contained in:
Jim Evins
2016-03-27 00:14:38 -04:00
parent 5b7e031c52
commit 7559544b06
156 changed files with 9732 additions and 10126 deletions
+10 -10
View File
@@ -372,7 +372,7 @@
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_23">
<item>
<widget class="glabels::ColorButton" name="textColorButton">
<widget class="ColorButton" name="textColorButton">
<property name="text">
<string/>
</property>
@@ -451,7 +451,7 @@
</spacer>
</item>
<item>
<widget class="glabels::FieldButton" name="textInsertFieldButton">
<widget class="FieldButton" name="textInsertFieldButton">
<property name="text">
<string/>
</property>
@@ -539,7 +539,7 @@
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_22">
<item>
<widget class="glabels::ColorButton" name="barcodeColorButton">
<widget class="ColorButton" name="barcodeColorButton">
<property name="text">
<string/>
</property>
@@ -679,7 +679,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_16">
<item>
<widget class="glabels::FieldButton" name="barcodeFieldButton">
<widget class="FieldButton" name="barcodeFieldButton">
<property name="text">
<string/>
</property>
@@ -802,7 +802,7 @@
</widget>
</item>
<item row="1" column="1">
<widget class="glabels::FieldButton" name="imageFieldButton">
<widget class="FieldButton" name="imageFieldButton">
<property name="text">
<string/>
</property>
@@ -889,7 +889,7 @@
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_21">
<item>
<widget class="glabels::ColorButton" name="lineColorButton">
<widget class="ColorButton" name="lineColorButton">
<property name="text">
<string/>
</property>
@@ -950,7 +950,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="glabels::ColorButton" name="fillColorButton">
<widget class="ColorButton" name="fillColorButton">
<property name="text">
<string/>
</property>
@@ -1373,7 +1373,7 @@
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_24">
<item>
<widget class="glabels::ColorButton" name="shadowColorButton">
<widget class="ColorButton" name="shadowColorButton">
<property name="text">
<string/>
</property>
@@ -1433,7 +1433,7 @@
</widget>
<customwidgets>
<customwidget>
<class>glabels::ColorButton</class>
<class>ColorButton</class>
<extends>QPushButton</extends>
<header>ColorButton.h</header>
<slots>
@@ -1441,7 +1441,7 @@
</slots>
</customwidget>
<customwidget>
<class>glabels::FieldButton</class>
<class>FieldButton</class>
<extends>QPushButton</extends>
<header>FieldButton.h</header>
<slots>
+2 -2
View File
@@ -26,7 +26,7 @@
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<widget class="glabels::Preview" name="preview" native="true">
<widget class="Preview" name="preview" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@@ -453,7 +453,7 @@
</widget>
<customwidgets>
<customwidget>
<class>glabels::Preview</class>
<class>Preview</class>
<extends>QWidget</extends>
<header>Preview.h</header>
<container>1</container>
+2 -2
View File
@@ -29,7 +29,7 @@
<item row="0" column="4">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="glabels::SimplePreview" name="preview">
<widget class="SimplePreview" name="preview">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -356,7 +356,7 @@
</widget>
<customwidgets>
<customwidget>
<class>glabels::SimplePreview</class>
<class>SimplePreview</class>
<extends>QGraphicsView</extends>
<header>SimplePreview.h</header>
<container>1</container>
+2 -2
View File
@@ -134,7 +134,7 @@
</layout>
</item>
<item>
<widget class="glabels::TemplatePicker" name="templatePicker">
<widget class="TemplatePicker" name="templatePicker">
<property name="showDropIndicator" stdset="0">
<bool>false</bool>
</property>
@@ -182,7 +182,7 @@
</widget>
<customwidgets>
<customwidget>
<class>glabels::TemplatePicker</class>
<class>TemplatePicker</class>
<extends>QListWidget</extends>
<header>TemplatePicker.h</header>
</customwidget>