New structure.
--HG-- branch : feature
|
@ -19,9 +19,9 @@ CONFIG += c++11 precompile_header
|
||||||
#DEFINES += ...
|
#DEFINES += ...
|
||||||
|
|
||||||
# Precompiled headers (PCH)
|
# Precompiled headers (PCH)
|
||||||
PRECOMPILED_HEADER = stable.h
|
PRECOMPILED_HEADER = src/stable.h
|
||||||
win32-msvc* {
|
win32-msvc* {
|
||||||
PRECOMPILED_SOURCE = stable.cpp
|
PRECOMPILED_SOURCE = src/stable.cpp
|
||||||
}
|
}
|
||||||
|
|
||||||
# directory for executable file
|
# directory for executable file
|
||||||
|
@ -39,34 +39,34 @@ RCC_DIR = rcc
|
||||||
# files created uic
|
# files created uic
|
||||||
UI_DIR = uic
|
UI_DIR = uic
|
||||||
|
|
||||||
include(container/container.pri)
|
include(src/container/container.pri)
|
||||||
include(dialogs/dialogs.pri)
|
include(src/dialogs/dialogs.pri)
|
||||||
include(exception/exception.pri)
|
include(src/exception/exception.pri)
|
||||||
include(geometry/geometry.pri)
|
include(src/geometry/geometry.pri)
|
||||||
include(tools/tools.pri)
|
include(src/tools/tools.pri)
|
||||||
include(widgets/widgets.pri)
|
include(src/widgets/widgets.pri)
|
||||||
include(xml/xml.pri)
|
include(src/xml/xml.pri)
|
||||||
|
|
||||||
SOURCES += main.cpp\
|
SOURCES += src/main.cpp \
|
||||||
mainwindow.cpp \
|
src/mainwindow.cpp \
|
||||||
tablewindow.cpp \
|
src/tablewindow.cpp \
|
||||||
stable.cpp
|
src/stable.cpp
|
||||||
|
|
||||||
HEADERS += mainwindow.h \
|
HEADERS += src/mainwindow.h \
|
||||||
options.h \
|
src/options.h \
|
||||||
tablewindow.h \
|
src/tablewindow.h \
|
||||||
stable.h \
|
src/stable.h \
|
||||||
version.h
|
src/version.h
|
||||||
|
|
||||||
FORMS += mainwindow.ui \
|
FORMS += src/mainwindow.ui \
|
||||||
tablewindow.ui
|
src/tablewindow.ui
|
||||||
|
|
||||||
RESOURCES += \
|
RESOURCES += \
|
||||||
icon.qrc \
|
share/resources/icon.qrc \
|
||||||
cursor.qrc
|
share/resources/cursor.qrc
|
||||||
|
|
||||||
TRANSLATIONS += translations/valentina_ru.ts \
|
TRANSLATIONS += share/translations/valentina_ru.ts \
|
||||||
translations/valentina_uk.ts
|
share/translations/valentina_uk.ts
|
||||||
|
|
||||||
CONFIG(debug, debug|release){
|
CONFIG(debug, debug|release){
|
||||||
# Debug
|
# Debug
|
||||||
|
@ -80,7 +80,7 @@ CONFIG(debug, debug|release){
|
||||||
-Og -Wall -Wextra -pedantic -Weffc++ -Woverloaded-virtual -Wctor-dtor-privacy \
|
-Og -Wall -Wextra -pedantic -Weffc++ -Woverloaded-virtual -Wctor-dtor-privacy \
|
||||||
-Wnon-virtual-dtor -Wold-style-cast -Wconversion -Winit-self \
|
-Wnon-virtual-dtor -Wold-style-cast -Wconversion -Winit-self \
|
||||||
-Wunreachable-code -Wcast-align -Wcast-qual -Wdisabled-optimization -Wfloat-equal \
|
-Wunreachable-code -Wcast-align -Wcast-qual -Wdisabled-optimization -Wfloat-equal \
|
||||||
-Wformat -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k\
|
-Wformat -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k \
|
||||||
-Winvalid-pch -Wunsafe-loop-optimizations -Wlong-long -Wmissing-format-attribute \
|
-Winvalid-pch -Wunsafe-loop-optimizations -Wlong-long -Wmissing-format-attribute \
|
||||||
-Wmissing-include-dirs -Wpacked -Wredundant-decls \
|
-Wmissing-include-dirs -Wpacked -Wredundant-decls \
|
||||||
-Wswitch-default -Wswitch-enum -Wuninitialized -Wunused-parameter -Wvariadic-macros \
|
-Wswitch-default -Wswitch-enum -Wuninitialized -Wunused-parameter -Wvariadic-macros \
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
SOURCES += \
|
|
||||||
container/vpointf.cpp \
|
|
||||||
container/vincrementtablerow.cpp \
|
|
||||||
container/vcontainer.cpp \
|
|
||||||
container/calculator.cpp \
|
|
||||||
container/vstandarttablerow.cpp
|
|
||||||
|
|
||||||
HEADERS += \
|
|
||||||
container/vpointf.h \
|
|
||||||
container/vincrementtablerow.h \
|
|
||||||
container/vcontainer.h \
|
|
||||||
container/calculator.h \
|
|
||||||
container/vstandarttablerow.h
|
|
|
@ -1,62 +0,0 @@
|
||||||
HEADERS += \
|
|
||||||
dialogs/dialogtriangle.h \
|
|
||||||
dialogs/dialogtool.h \
|
|
||||||
dialogs/dialogsplinepath.h \
|
|
||||||
dialogs/dialogspline.h \
|
|
||||||
dialogs/dialogsinglepoint.h \
|
|
||||||
dialogs/dialogshoulderpoint.h \
|
|
||||||
dialogs/dialogs.h \
|
|
||||||
dialogs/dialogpointofintersection.h \
|
|
||||||
dialogs/dialogpointofcontact.h \
|
|
||||||
dialogs/dialognormal.h \
|
|
||||||
dialogs/dialoglineintersect.h \
|
|
||||||
dialogs/dialogline.h \
|
|
||||||
dialogs/dialogincrements.h \
|
|
||||||
dialogs/dialoghistory.h \
|
|
||||||
dialogs/dialogheight.h \
|
|
||||||
dialogs/dialogendline.h \
|
|
||||||
dialogs/dialogdetail.h \
|
|
||||||
dialogs/dialogbisector.h \
|
|
||||||
dialogs/dialogarc.h \
|
|
||||||
dialogs/dialogalongline.h
|
|
||||||
|
|
||||||
SOURCES += \
|
|
||||||
dialogs/dialogtriangle.cpp \
|
|
||||||
dialogs/dialogtool.cpp \
|
|
||||||
dialogs/dialogsplinepath.cpp \
|
|
||||||
dialogs/dialogspline.cpp \
|
|
||||||
dialogs/dialogsinglepoint.cpp \
|
|
||||||
dialogs/dialogshoulderpoint.cpp \
|
|
||||||
dialogs/dialogpointofintersection.cpp \
|
|
||||||
dialogs/dialogpointofcontact.cpp \
|
|
||||||
dialogs/dialognormal.cpp \
|
|
||||||
dialogs/dialoglineintersect.cpp \
|
|
||||||
dialogs/dialogline.cpp \
|
|
||||||
dialogs/dialogincrements.cpp \
|
|
||||||
dialogs/dialoghistory.cpp \
|
|
||||||
dialogs/dialogheight.cpp \
|
|
||||||
dialogs/dialogendline.cpp \
|
|
||||||
dialogs/dialogdetail.cpp \
|
|
||||||
dialogs/dialogbisector.cpp \
|
|
||||||
dialogs/dialogarc.cpp \
|
|
||||||
dialogs/dialogalongline.cpp
|
|
||||||
|
|
||||||
FORMS += \
|
|
||||||
dialogs/dialogtriangle.ui \
|
|
||||||
dialogs/dialogsplinepath.ui \
|
|
||||||
dialogs/dialogspline.ui \
|
|
||||||
dialogs/dialogsinglepoint.ui \
|
|
||||||
dialogs/dialogshoulderpoint.ui \
|
|
||||||
dialogs/dialogpointofintersection.ui \
|
|
||||||
dialogs/dialogpointofcontact.ui \
|
|
||||||
dialogs/dialognormal.ui \
|
|
||||||
dialogs/dialoglineintersect.ui \
|
|
||||||
dialogs/dialogline.ui \
|
|
||||||
dialogs/dialogincrements.ui \
|
|
||||||
dialogs/dialoghistory.ui \
|
|
||||||
dialogs/dialogheight.ui \
|
|
||||||
dialogs/dialogendline.ui \
|
|
||||||
dialogs/dialogdetail.ui \
|
|
||||||
dialogs/dialogbisector.ui \
|
|
||||||
dialogs/dialogarc.ui \
|
|
||||||
dialogs/dialogalongline.ui
|
|
|
@ -1,17 +0,0 @@
|
||||||
HEADERS += \
|
|
||||||
exception/vexceptionwrongparameterid.h \
|
|
||||||
exception/vexceptionuniqueid.h \
|
|
||||||
exception/vexceptionobjecterror.h \
|
|
||||||
exception/vexceptionemptyparameter.h \
|
|
||||||
exception/vexceptionconversionerror.h \
|
|
||||||
exception/vexceptionbadid.h \
|
|
||||||
exception/vexception.h
|
|
||||||
|
|
||||||
SOURCES += \
|
|
||||||
exception/vexceptionwrongparameterid.cpp \
|
|
||||||
exception/vexceptionuniqueid.cpp \
|
|
||||||
exception/vexceptionobjecterror.cpp \
|
|
||||||
exception/vexceptionemptyparameter.cpp \
|
|
||||||
exception/vexceptionconversionerror.cpp \
|
|
||||||
exception/vexceptionbadid.cpp \
|
|
||||||
exception/vexception.cpp
|
|
|
@ -1,15 +0,0 @@
|
||||||
HEADERS += \
|
|
||||||
geometry/vsplinepoint.h \
|
|
||||||
geometry/vsplinepath.h \
|
|
||||||
geometry/vspline.h \
|
|
||||||
geometry/vnodedetail.h \
|
|
||||||
geometry/vdetail.h \
|
|
||||||
geometry/varc.h
|
|
||||||
|
|
||||||
SOURCES += \
|
|
||||||
geometry/vsplinepoint.cpp \
|
|
||||||
geometry/vsplinepath.cpp \
|
|
||||||
geometry/vspline.cpp \
|
|
||||||
geometry/vnodedetail.cpp \
|
|
||||||
geometry/vdetail.cpp \
|
|
||||||
geometry/varc.cpp
|
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 454 B After Width: | Height: | Size: 454 B |
Before Width: | Height: | Size: 716 B After Width: | Height: | Size: 716 B |
Before Width: | Height: | Size: 649 B After Width: | Height: | Size: 649 B |
Before Width: | Height: | Size: 893 B After Width: | Height: | Size: 893 B |
Before Width: | Height: | Size: 808 B After Width: | Height: | Size: 808 B |
Before Width: | Height: | Size: 736 B After Width: | Height: | Size: 736 B |
Before Width: | Height: | Size: 925 B After Width: | Height: | Size: 925 B |
Before Width: | Height: | Size: 864 B After Width: | Height: | Size: 864 B |
Before Width: | Height: | Size: 655 B After Width: | Height: | Size: 655 B |
Before Width: | Height: | Size: 255 B After Width: | Height: | Size: 255 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 689 B After Width: | Height: | Size: 689 B |
Before Width: | Height: | Size: 441 B After Width: | Height: | Size: 441 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 857 B After Width: | Height: | Size: 857 B |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 603 B After Width: | Height: | Size: 603 B |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 525 B After Width: | Height: | Size: 525 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 944 B After Width: | Height: | Size: 944 B |
Before Width: | Height: | Size: 754 B After Width: | Height: | Size: 754 B |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 977 B After Width: | Height: | Size: 977 B |
Before Width: | Height: | Size: 652 B After Width: | Height: | Size: 652 B |
Before Width: | Height: | Size: 520 B After Width: | Height: | Size: 520 B |
Before Width: | Height: | Size: 676 B After Width: | Height: | Size: 676 B |
Before Width: | Height: | Size: 683 B After Width: | Height: | Size: 683 B |
Before Width: | Height: | Size: 375 B After Width: | Height: | Size: 375 B |
Before Width: | Height: | Size: 771 B After Width: | Height: | Size: 771 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.4 KiB |
13
src/container/container.pri
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
SOURCES += \
|
||||||
|
src/container/vpointf.cpp \
|
||||||
|
src/container/vincrementtablerow.cpp \
|
||||||
|
src/container/vcontainer.cpp \
|
||||||
|
src/container/calculator.cpp \
|
||||||
|
src/container/vstandarttablerow.cpp
|
||||||
|
|
||||||
|
HEADERS += \
|
||||||
|
src/container/vpointf.h \
|
||||||
|
src/container/vincrementtablerow.h \
|
||||||
|
src/container/vcontainer.h \
|
||||||
|
src/container/calculator.h \
|
||||||
|
src/container/vstandarttablerow.h
|