New file structure separating view classes from model classes. Deleted

.ui file.

apps/opencs/CMakeLists.txt

@@ -72,12 +72,10 @@ opencs_units_noqt (view/tools
     subviews
     )
 
-opencs_units (settings
+opencs_units (view/settings
     customblock
     proxyblock
-    settingcontainer
     groupbox
-    settingsitem
     abstractblock
     settingwidget
     itemblock
@@ -90,7 +88,12 @@ opencs_units (settings
     editorpage
     )
 
-opencs_units_noqt (settings
+opencs_units (model/settings
+    settingcontainer
+    settingsitem
+    )
+
+opencs_units_noqt (model/settings
     support
     usersettings
     )

apps/opencs/settings/usersettingsdialog.ui

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>UserSettingsDialog</class>
- <widget class="QDialog" name="UserSettingsDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>638</width>
-    <height>478</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <widget class="QDialogButtonBox" name="buttonBox">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>440</y>
-     <width>621</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <property name="standardButtons">
-    <set>QDialogButtonBox::Close</set>
-   </property>
-  </widget>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>UserSettingsDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>UserSettingsDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

apps/opencs/view/doc/view.cpp

@@ -11,7 +11,7 @@
 #include "../../model/doc/document.hpp"
 #include "../world/subviews.hpp"
 #include "../tools/subviews.hpp"
-#include "../../settings/usersettingsdialog.hpp"
+#include "../settings/usersettingsdialog.hpp"
 #include "viewmanager.hpp"
 #include "operations.hpp"
 #include "subview.hpp"

apps/opencs/view/settings/abstractblock.hpp

@@ -5,7 +5,7 @@
 #include <QList>
 
 #include "settingwidget.hpp"
-#include "settingsitem.hpp"
+#include "../../model/settings/settingsitem.hpp"
 #include "groupbox.hpp"
 
 namespace CsSettings

apps/opencs/view/settings/abstractwidget.hpp

@@ -2,7 +2,7 @@
 #define ABSTRACTWIDGET_HPP
 
 #include <QWidget>
-#include "support.hpp"
+#include "../../model/settings/support.hpp"
 
 class QLayout;
 

apps/opencs/view/settings/blankpage.cpp

@@ -13,7 +13,7 @@
 #include <QPlastiqueStyle>
 #endif
 
-#include "usersettings.hpp"
+#include "../../model/settings/usersettings.hpp"
 #include "groupblock.hpp"
 #include "toggleblock.hpp"
 

apps/opencs/view/settings/editorpage.cpp

@@ -13,7 +13,7 @@
 #include <QPlastiqueStyle>
 #endif
 
-#include "usersettings.hpp"
+#include "../../model/settings/usersettings.hpp"
 #include "groupblock.hpp"
 #include "toggleblock.hpp"
 

apps/opencs/view/settings/usersettingsdialog.cpp

@@ -12,7 +12,7 @@
 
 #include "blankpage.hpp"
 #include "editorpage.hpp"
-#include "support.hpp"
+#include "../../model/settings/support.hpp"
 
 #include "settingwidget.hpp"
 #include <QDebug>

apps/opencs/view/settings/usersettingsdialog.hpp

@@ -5,8 +5,8 @@
 #include <QStackedWidget>
 
 #include <components/files/configurationmanager.hpp>
-#include "usersettings.hpp"
-#include "support.hpp"
+#include "../../model/settings/usersettings.hpp"
+#include "../../model/settings/support.hpp"
 
 class QHBoxLayout;
 class AbstractWidget;