From aabcae9066b6b2d6bd8974e3031a35864887a42c Mon Sep 17 00:00:00 2001 From: dismine Date: Sat, 22 Nov 2014 23:26:04 +0200 Subject: [PATCH] Changes in project structure. --HG-- branch : develop --- src/app/container/container.pri | 52 +++++++++---------- src/app/container/variables.h | 14 ++--- .../container/{ => variables}/varclength.cpp | 0 .../container/{ => variables}/varclength.h | 0 .../{ => variables}/vcurvelength.cpp | 0 .../container/{ => variables}/vcurvelength.h | 0 .../{ => variables}/vcurvelength_p.h | 0 .../container/{ => variables}/vincrement.cpp | 0 .../container/{ => variables}/vincrement.h | 0 .../container/{ => variables}/vincrement_p.h | 0 .../{ => variables}/vinternalvariable.cpp | 0 .../{ => variables}/vinternalvariable.h | 0 .../{ => variables}/vinternalvariable_p.h | 0 .../container/{ => variables}/vlineangle.cpp | 0 .../container/{ => variables}/vlineangle.h | 0 .../container/{ => variables}/vlineangle_p.h | 0 .../container/{ => variables}/vlinelength.cpp | 0 .../container/{ => variables}/vlinelength.h | 0 .../container/{ => variables}/vlinelength_p.h | 0 .../{ => variables}/vmeasurement.cpp | 0 .../container/{ => variables}/vmeasurement.h | 0 .../{ => variables}/vmeasurement_p.h | 0 .../{ => variables}/vsplinelength.cpp | 0 .../container/{ => variables}/vsplinelength.h | 0 .../container/{ => variables}/vvariable.cpp | 0 src/app/container/{ => variables}/vvariable.h | 0 .../container/{ => variables}/vvariable_p.h | 0 27 files changed, 33 insertions(+), 33 deletions(-) rename src/app/container/{ => variables}/varclength.cpp (100%) rename src/app/container/{ => variables}/varclength.h (100%) rename src/app/container/{ => variables}/vcurvelength.cpp (100%) rename src/app/container/{ => variables}/vcurvelength.h (100%) rename src/app/container/{ => variables}/vcurvelength_p.h (100%) rename src/app/container/{ => variables}/vincrement.cpp (100%) rename src/app/container/{ => variables}/vincrement.h (100%) rename src/app/container/{ => variables}/vincrement_p.h (100%) rename src/app/container/{ => variables}/vinternalvariable.cpp (100%) rename src/app/container/{ => variables}/vinternalvariable.h (100%) rename src/app/container/{ => variables}/vinternalvariable_p.h (100%) rename src/app/container/{ => variables}/vlineangle.cpp (100%) rename src/app/container/{ => variables}/vlineangle.h (100%) rename src/app/container/{ => variables}/vlineangle_p.h (100%) rename src/app/container/{ => variables}/vlinelength.cpp (100%) rename src/app/container/{ => variables}/vlinelength.h (100%) rename src/app/container/{ => variables}/vlinelength_p.h (100%) rename src/app/container/{ => variables}/vmeasurement.cpp (100%) rename src/app/container/{ => variables}/vmeasurement.h (100%) rename src/app/container/{ => variables}/vmeasurement_p.h (100%) rename src/app/container/{ => variables}/vsplinelength.cpp (100%) rename src/app/container/{ => variables}/vsplinelength.h (100%) rename src/app/container/{ => variables}/vvariable.cpp (100%) rename src/app/container/{ => variables}/vvariable.h (100%) rename src/app/container/{ => variables}/vvariable_p.h (100%) diff --git a/src/app/container/container.pri b/src/app/container/container.pri index 2c1e50367..5fc52a738 100644 --- a/src/app/container/container.pri +++ b/src/app/container/container.pri @@ -1,35 +1,35 @@ SOURCES += \ container/vcontainer.cpp \ container/calculator.cpp \ - container/vmeasurement.cpp \ - container/vincrement.cpp \ - container/vvariable.cpp \ - container/vinternalvariable.cpp \ - container/vlineangle.cpp \ - container/varclength.cpp \ - container/vcurvelength.cpp \ - container/vlinelength.cpp \ - container/vsplinelength.cpp \ + container/variables/vmeasurement.cpp \ + container/variables/vincrement.cpp \ + container/variables/vvariable.cpp \ + container/variables/vinternalvariable.cpp \ + container/variables/vlineangle.cpp \ + container/variables/varclength.cpp \ + container/variables/vcurvelength.cpp \ + container/variables/vlinelength.cpp \ + container/variables/vsplinelength.cpp \ container/vformula.cpp - + HEADERS += \ container/vcontainer.h \ container/calculator.h \ - container/vmeasurement.h \ - container/vincrement.h \ - container/vvariable.h \ - container/vinternalvariable.h \ - container/vlineangle.h \ + container/variables/vmeasurement.h \ + container/variables/vincrement.h \ + container/variables/vvariable.h \ + container/variables/vinternalvariable.h \ + container/variables/vlineangle.h \ container/variables.h \ - container/vcurvelength.h \ - container/varclength.h \ - container/vlinelength.h \ - container/vsplinelength.h \ - container/vinternalvariable_p.h \ - container/vvariable_p.h \ - container/vincrement_p.h \ - container/vcurvelength_p.h \ - container/vlineangle_p.h \ - container/vlinelength_p.h \ - container/vmeasurement_p.h \ + container/variables/vcurvelength.h \ + container/variables/varclength.h \ + container/variables/vlinelength.h \ + container/variables/vsplinelength.h \ + container/variables/vinternalvariable_p.h \ + container/variables/vvariable_p.h \ + container/variables/vincrement_p.h \ + container/variables/vcurvelength_p.h \ + container/variables/vlineangle_p.h \ + container/variables/vlinelength_p.h \ + container/variables/vmeasurement_p.h \ container/vformula.h diff --git a/src/app/container/variables.h b/src/app/container/variables.h index 24a3ee606..b87530c5b 100644 --- a/src/app/container/variables.h +++ b/src/app/container/variables.h @@ -29,12 +29,12 @@ #ifndef VARIABLES_H #define VARIABLES_H -#include "vinternalvariable.h" -#include "vmeasurement.h" -#include "vincrement.h" -#include "varclength.h" -#include "vsplinelength.h" -#include "vlinelength.h" -#include "vlineangle.h" +#include "variables/vinternalvariable.h" +#include "variables/vmeasurement.h" +#include "variables/vincrement.h" +#include "variables/varclength.h" +#include "variables/vsplinelength.h" +#include "variables/vlinelength.h" +#include "variables/vlineangle.h" #endif // VARIABLES_H diff --git a/src/app/container/varclength.cpp b/src/app/container/variables/varclength.cpp similarity index 100% rename from src/app/container/varclength.cpp rename to src/app/container/variables/varclength.cpp diff --git a/src/app/container/varclength.h b/src/app/container/variables/varclength.h similarity index 100% rename from src/app/container/varclength.h rename to src/app/container/variables/varclength.h diff --git a/src/app/container/vcurvelength.cpp b/src/app/container/variables/vcurvelength.cpp similarity index 100% rename from src/app/container/vcurvelength.cpp rename to src/app/container/variables/vcurvelength.cpp diff --git a/src/app/container/vcurvelength.h b/src/app/container/variables/vcurvelength.h similarity index 100% rename from src/app/container/vcurvelength.h rename to src/app/container/variables/vcurvelength.h diff --git a/src/app/container/vcurvelength_p.h b/src/app/container/variables/vcurvelength_p.h similarity index 100% rename from src/app/container/vcurvelength_p.h rename to src/app/container/variables/vcurvelength_p.h diff --git a/src/app/container/vincrement.cpp b/src/app/container/variables/vincrement.cpp similarity index 100% rename from src/app/container/vincrement.cpp rename to src/app/container/variables/vincrement.cpp diff --git a/src/app/container/vincrement.h b/src/app/container/variables/vincrement.h similarity index 100% rename from src/app/container/vincrement.h rename to src/app/container/variables/vincrement.h diff --git a/src/app/container/vincrement_p.h b/src/app/container/variables/vincrement_p.h similarity index 100% rename from src/app/container/vincrement_p.h rename to src/app/container/variables/vincrement_p.h diff --git a/src/app/container/vinternalvariable.cpp b/src/app/container/variables/vinternalvariable.cpp similarity index 100% rename from src/app/container/vinternalvariable.cpp rename to src/app/container/variables/vinternalvariable.cpp diff --git a/src/app/container/vinternalvariable.h b/src/app/container/variables/vinternalvariable.h similarity index 100% rename from src/app/container/vinternalvariable.h rename to src/app/container/variables/vinternalvariable.h diff --git a/src/app/container/vinternalvariable_p.h b/src/app/container/variables/vinternalvariable_p.h similarity index 100% rename from src/app/container/vinternalvariable_p.h rename to src/app/container/variables/vinternalvariable_p.h diff --git a/src/app/container/vlineangle.cpp b/src/app/container/variables/vlineangle.cpp similarity index 100% rename from src/app/container/vlineangle.cpp rename to src/app/container/variables/vlineangle.cpp diff --git a/src/app/container/vlineangle.h b/src/app/container/variables/vlineangle.h similarity index 100% rename from src/app/container/vlineangle.h rename to src/app/container/variables/vlineangle.h diff --git a/src/app/container/vlineangle_p.h b/src/app/container/variables/vlineangle_p.h similarity index 100% rename from src/app/container/vlineangle_p.h rename to src/app/container/variables/vlineangle_p.h diff --git a/src/app/container/vlinelength.cpp b/src/app/container/variables/vlinelength.cpp similarity index 100% rename from src/app/container/vlinelength.cpp rename to src/app/container/variables/vlinelength.cpp diff --git a/src/app/container/vlinelength.h b/src/app/container/variables/vlinelength.h similarity index 100% rename from src/app/container/vlinelength.h rename to src/app/container/variables/vlinelength.h diff --git a/src/app/container/vlinelength_p.h b/src/app/container/variables/vlinelength_p.h similarity index 100% rename from src/app/container/vlinelength_p.h rename to src/app/container/variables/vlinelength_p.h diff --git a/src/app/container/vmeasurement.cpp b/src/app/container/variables/vmeasurement.cpp similarity index 100% rename from src/app/container/vmeasurement.cpp rename to src/app/container/variables/vmeasurement.cpp diff --git a/src/app/container/vmeasurement.h b/src/app/container/variables/vmeasurement.h similarity index 100% rename from src/app/container/vmeasurement.h rename to src/app/container/variables/vmeasurement.h diff --git a/src/app/container/vmeasurement_p.h b/src/app/container/variables/vmeasurement_p.h similarity index 100% rename from src/app/container/vmeasurement_p.h rename to src/app/container/variables/vmeasurement_p.h diff --git a/src/app/container/vsplinelength.cpp b/src/app/container/variables/vsplinelength.cpp similarity index 100% rename from src/app/container/vsplinelength.cpp rename to src/app/container/variables/vsplinelength.cpp diff --git a/src/app/container/vsplinelength.h b/src/app/container/variables/vsplinelength.h similarity index 100% rename from src/app/container/vsplinelength.h rename to src/app/container/variables/vsplinelength.h diff --git a/src/app/container/vvariable.cpp b/src/app/container/variables/vvariable.cpp similarity index 100% rename from src/app/container/vvariable.cpp rename to src/app/container/variables/vvariable.cpp diff --git a/src/app/container/vvariable.h b/src/app/container/variables/vvariable.h similarity index 100% rename from src/app/container/vvariable.h rename to src/app/container/variables/vvariable.h diff --git a/src/app/container/vvariable_p.h b/src/app/container/variables/vvariable_p.h similarity index 100% rename from src/app/container/vvariable_p.h rename to src/app/container/variables/vvariable_p.h