diff --git a/src/app/core/core.pri b/src/app/core/core.pri index ffccc7e44..401024d03 100644 --- a/src/app/core/core.pri +++ b/src/app/core/core.pri @@ -3,7 +3,6 @@ HEADERS += \ $$PWD/vapplication.h \ - $$PWD/vsettings.h \ $$PWD/vformula.h \ $$PWD/vformulaproperty.h \ $$PWD/vformulapropertyeditor.h \ @@ -11,7 +10,6 @@ HEADERS += \ SOURCES += \ $$PWD/vapplication.cpp \ - $$PWD/vsettings.cpp \ $$PWD/vformula.cpp \ $$PWD/vformulaproperty.cpp \ $$PWD/vformulapropertyeditor.cpp \ diff --git a/src/app/core/vformula.cpp b/src/app/core/vformula.cpp index 5f1185cbd..3cdca81f7 100644 --- a/src/app/core/vformula.cpp +++ b/src/app/core/vformula.cpp @@ -30,7 +30,7 @@ #include "../libs/vpatterndb/calculator.h" #include "../libs/vpatterndb/vcontainer.h" #include "../core/vapplication.h" -#include "../core/vsettings.h" +#include "../libs/vmisc/vsettings.h" #include //VFormula diff --git a/src/app/dialogs/app/configpages/communitypage.cpp b/src/app/dialogs/app/configpages/communitypage.cpp index ac27f05e5..f770e9ff9 100644 --- a/src/app/dialogs/app/configpages/communitypage.cpp +++ b/src/app/dialogs/app/configpages/communitypage.cpp @@ -29,7 +29,7 @@ #include "communitypage.h" #include "../../../options.h" #include "../../../core/vapplication.h" -#include "../../../core/vsettings.h" +#include "../../../../libs/vmisc/vsettings.h" #include #include #include diff --git a/src/app/dialogs/app/configpages/configurationpage.cpp b/src/app/dialogs/app/configpages/configurationpage.cpp index 3ed823254..b394ab1d1 100644 --- a/src/app/dialogs/app/configpages/configurationpage.cpp +++ b/src/app/dialogs/app/configpages/configurationpage.cpp @@ -29,7 +29,7 @@ #include "configurationpage.h" #include "../../../options.h" #include "../../../core/vapplication.h" -#include "../../../core/vsettings.h" +#include "../../../../libs/vmisc/vsettings.h" #include #include #include diff --git a/src/app/dialogs/app/configpages/pathpage.cpp b/src/app/dialogs/app/configpages/pathpage.cpp index cad72ef13..4ffe3cd6a 100644 --- a/src/app/dialogs/app/configpages/pathpage.cpp +++ b/src/app/dialogs/app/configpages/pathpage.cpp @@ -29,7 +29,7 @@ #include "pathpage.h" #include "../../../options.h" #include "../../../core/vapplication.h" -#include "../../../core/vsettings.h" +#include "../../../../libs/vmisc/vsettings.h" #include #include #include diff --git a/src/app/dialogs/app/configpages/patternpage.cpp b/src/app/dialogs/app/configpages/patternpage.cpp index 32e01b72d..a5a522bbc 100644 --- a/src/app/dialogs/app/configpages/patternpage.cpp +++ b/src/app/dialogs/app/configpages/patternpage.cpp @@ -29,7 +29,7 @@ #include "patternpage.h" #include "../../../options.h" #include "../../../core/vapplication.h" -#include "../../../core/vsettings.h" +#include "../../../../libs/vmisc/vsettings.h" #include "../../../../libs/vwidgets/vmaingraphicsview.h" #include #include diff --git a/src/app/dialogs/app/dialogincrements.cpp b/src/app/dialogs/app/dialogincrements.cpp index 90ee3e4a0..4841a4705 100644 --- a/src/app/dialogs/app/dialogincrements.cpp +++ b/src/app/dialogs/app/dialogincrements.cpp @@ -33,7 +33,7 @@ #include "../../libs/vwidgets/vwidgetpopup.h" #include "../../xml/vstandardmeasurements.h" #include "../../xml/vindividualmeasurements.h" -#include "../../core/vsettings.h" +#include "../../libs/vmisc/vsettings.h" #include #include diff --git a/src/app/dialogs/app/dialogindividualmeasurements.cpp b/src/app/dialogs/app/dialogindividualmeasurements.cpp index 3fcc132f7..7ee0ba41a 100644 --- a/src/app/dialogs/app/dialogindividualmeasurements.cpp +++ b/src/app/dialogs/app/dialogindividualmeasurements.cpp @@ -30,7 +30,7 @@ #include "ui_dialogindividualmeasurements.h" #include "../../xml/vindividualmeasurements.h" #include "../../core/vapplication.h" -#include "../../core/vsettings.h" +#include "../../libs/vmisc/vsettings.h" #include "../../libs/vpatterndb/vcontainer.h" #include diff --git a/src/app/dialogs/app/dialoglayoutsettings.cpp b/src/app/dialogs/app/dialoglayoutsettings.cpp index c72b7f2ca..7f8cb65f8 100644 --- a/src/app/dialogs/app/dialoglayoutsettings.cpp +++ b/src/app/dialogs/app/dialoglayoutsettings.cpp @@ -30,7 +30,7 @@ #include "ui_dialoglayoutsettings.h" #include "../../core/vapplication.h" #include "../../libs/ifc/xml/vdomdocument.h" -#include "../../core/vsettings.h" +#include "../../libs/vmisc/vsettings.h" #include "../../libs/vlayout/vlayoutgenerator.h" #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) diff --git a/src/app/dialogs/app/dialogsavelayout.cpp b/src/app/dialogs/app/dialogsavelayout.cpp index a26a7e1d2..c0cc09bc3 100644 --- a/src/app/dialogs/app/dialogsavelayout.cpp +++ b/src/app/dialogs/app/dialogsavelayout.cpp @@ -30,7 +30,7 @@ #include "ui_dialogsavelayout.h" #include "../../options.h" #include "../../core/vapplication.h" -#include "../../core/vsettings.h" +#include "../../libs/vmisc/vsettings.h" #include #include diff --git a/src/app/dialogs/app/dialogstandardmeasurements.cpp b/src/app/dialogs/app/dialogstandardmeasurements.cpp index cb8793ba7..bc76284ab 100644 --- a/src/app/dialogs/app/dialogstandardmeasurements.cpp +++ b/src/app/dialogs/app/dialogstandardmeasurements.cpp @@ -30,7 +30,7 @@ #include "ui_dialogstandardmeasurements.h" #include "../../xml/vstandardmeasurements.h" #include "../../core/vapplication.h" -#include "../../core/vsettings.h" +#include "../../libs/vmisc/vsettings.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../vmisc/logging.h" diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 201e1a3f0..7adae9c6a 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -39,7 +39,7 @@ #include "xml/vindividualmeasurements.h" #include "core/vapplication.h" #include "../libs/vmisc/undoevent.h" -#include "core/vsettings.h" +#include "../libs/vmisc/vsettings.h" #include "undocommands/renamepp.h" #include "core/vtooloptionspropertybrowser.h" #include "options.h" diff --git a/src/app/tools/vabstracttool.cpp b/src/app/tools/vabstracttool.cpp index 2611126c1..f85c369f9 100644 --- a/src/app/tools/vabstracttool.cpp +++ b/src/app/tools/vabstracttool.cpp @@ -38,7 +38,7 @@ #include "../libs/vgeometry/vpointf.h" #include "../undocommands/savetooloptions.h" #include "../libs/vwidgets/vmaingraphicsview.h" -#include "../core/vsettings.h" +#include "../libs/vmisc/vsettings.h" const QString VAbstractTool::AttrType = QStringLiteral("type"); const QString VAbstractTool::AttrMx = QStringLiteral("mx"); diff --git a/src/app/xml/vpattern.cpp b/src/app/xml/vpattern.cpp index b0333bdd4..1ec85ab58 100644 --- a/src/app/xml/vpattern.cpp +++ b/src/app/xml/vpattern.cpp @@ -39,7 +39,7 @@ #include "../libs/ifc/exception/vexceptionundo.h" #include "../libs/ifc/xml/vpatternconverter.h" #include "../libs/vmisc/undoevent.h" -#include "../core/vsettings.h" +#include "../libs/vmisc/vsettings.h" #include "vstandardmeasurements.h" #include "vindividualmeasurements.h" #include "../../libs/qmuparser/qmuparsererror.h" diff --git a/src/libs/vmisc/vmisc.pri b/src/libs/vmisc/vmisc.pri index f75d3197a..658e0d301 100644 --- a/src/libs/vmisc/vmisc.pri +++ b/src/libs/vmisc/vmisc.pri @@ -6,7 +6,8 @@ SOURCES += \ $$PWD/def.cpp \ $$PWD/undoevent.cpp \ $$PWD/backport/qcommandlineoption.cpp \ - $$PWD/backport/qcommandlineparser.cpp + $$PWD/backport/qcommandlineparser.cpp \ + $$PWD/vsettings.cpp HEADERS += \ $$PWD/stable.h \ @@ -15,4 +16,5 @@ HEADERS += \ $$PWD/vmath.h \ $$PWD/undoevent.h \ $$PWD/backport/qcommandlineoption.h \ - $$PWD/backport/qcommandlineparser.h + $$PWD/backport/qcommandlineparser.h \ + $$PWD/vsettings.h diff --git a/src/app/core/vsettings.cpp b/src/libs/vmisc/vsettings.cpp similarity index 100% rename from src/app/core/vsettings.cpp rename to src/libs/vmisc/vsettings.cpp diff --git a/src/app/core/vsettings.h b/src/libs/vmisc/vsettings.h similarity index 100% rename from src/app/core/vsettings.h rename to src/libs/vmisc/vsettings.h