Refactor: Move more settings-related files to src/settings

For #168

Author: svetter

PAL.pro

@@ -69,6 +69,7 @@ SOURCES += \
 	src/db/tables/photos_table.cpp \
 	src/db/tables/ranges_table.cpp \
 	src/db/tables/regions_table.cpp \
+	src/db/tables/settings_table.cpp \
 	src/db/tables/trips_table.cpp \
 	src/dialogs/add_hiker_dialog.cpp \
 	src/dialogs/country_dialog.cpp \
@@ -86,6 +87,7 @@ SOURCES += \
 	src/main/ascent_filter_bar.cpp \
 	src/main/main.cpp \
 	src/main/main_window.cpp \
+	src/settings/project_settings.cpp \
 	src/settings/project_settings_window.cpp \
 	src/settings/settings.cpp \
 	src/settings/settings_window.cpp \
@@ -121,9 +123,7 @@ HEADERS += \
 	src/db/database.h \
 	src/db/db_error.h \
 	src/db/normal_table.h \
-	src/db/project_settings.h \
 	src/db/row_index.h \
-	src/db/settings_table.h \
 	src/db/table.h \
 	src/db/table_buffer.h \
 	src/db/tables/ascents_table.h \
@@ -134,6 +134,7 @@ HEADERS += \
 	src/db/tables/photos_table.h \
 	src/db/tables/ranges_table.h \
 	src/db/tables/regions_table.h \
+	src/db/tables/settings_table.h \
 	src/db/tables/trips_table.h \
 	src/dialogs/add_hiker_dialog.h \
 	src/dialogs/ascent_dialog.h \
@@ -151,6 +152,7 @@ HEADERS += \
 	src/main/ascent_filter_bar.h \
 	src/main/item_types_handler.h \
 	src/main/main_window.h \
+	src/settings/project_settings.h \
 	src/settings/project_settings_window.h \
 	src/settings/settings.h \
 	src/settings/settings_window.h \

src/comp_tables/composite_column.h

@@ -26,7 +26,7 @@
 
 #include "src/comp_tables/filter.h"
 #include "src/db/column.h"
-#include "src/db/project_settings.h"
+#include "src/settings/project_settings.h"
 
 #include <QString>
 #include <QVariant>

src/db/database.h

@@ -31,7 +31,6 @@
 #include "src/data/region.h"
 #include "src/data/range.h"
 #include "src/data/country.h"
-#include "src/db/project_settings.h"
 #include "src/db/tables/ascents_table.h"
 #include "src/db/tables/countries_table.h"
 #include "src/db/tables/hikers_table.h"
@@ -41,6 +40,7 @@
 #include "src/db/tables/ranges_table.h"
 #include "src/db/tables/regions_table.h"
 #include "src/db/tables/trips_table.h"
+#include "src/settings/project_settings.h"
 
 #include <QStatusBar>
 #include <QSqlQuery>

src/db/settings_table.h src/db/tables/settings_table.h

@@ -25,7 +25,7 @@
 #define PROJECT_SETTINGS_H
 
 #include "src/db/table.h"
-#include "src/db/settings_table.h"
+#include "src/db/tables/settings_table.h"
 
 #include <QString>
 #include <QVariant>