From f4aeff48cdc3e1cb9578b338696401ebcb1376d5 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 15 Jun 2015 16:59:19 +0300 Subject: [PATCH] Move classes VGraphicsSimpleTextItem and VControlPointSpline to library VWidgets. --HG-- branch : feature --- src/app/visualization/visualization.pri | 4 ---- .../vwidgets}/vcontrolpointspline.cpp | 0 .../visualization => libs/vwidgets}/vcontrolpointspline.h | 4 ++-- .../vwidgets}/vgraphicssimpletextitem.cpp | 1 + .../vwidgets}/vgraphicssimpletextitem.h | 2 +- src/libs/vwidgets/vwidgets.pri | 8 ++++++-- src/libs/vwidgets/vwidgets.pro | 2 ++ 7 files changed, 12 insertions(+), 9 deletions(-) rename src/{app/visualization => libs/vwidgets}/vcontrolpointspline.cpp (100%) rename src/{app/visualization => libs/vwidgets}/vcontrolpointspline.h (98%) rename src/{app/visualization => libs/vwidgets}/vgraphicssimpletextitem.cpp (99%) rename src/{app/visualization => libs/vwidgets}/vgraphicssimpletextitem.h (99%) diff --git a/src/app/visualization/visualization.pri b/src/app/visualization/visualization.pri index cca79ad52..fd25ef5d7 100644 --- a/src/app/visualization/visualization.pri +++ b/src/app/visualization/visualization.pri @@ -2,8 +2,6 @@ # This need for corect working file translations.pro HEADERS += \ - $$PWD/vgraphicssimpletextitem.h \ - $$PWD/vcontrolpointspline.h \ $$PWD/visline.h \ $$PWD/vistoolline.h \ $$PWD/vistoolendline.h \ @@ -33,8 +31,6 @@ HEADERS += \ $$PWD/vistoolarcwithlength.h SOURCES += \ - $$PWD/vgraphicssimpletextitem.cpp \ - $$PWD/vcontrolpointspline.cpp \ $$PWD/visline.cpp \ $$PWD/vistoolline.cpp \ $$PWD/vistoolendline.cpp \ diff --git a/src/app/visualization/vcontrolpointspline.cpp b/src/libs/vwidgets/vcontrolpointspline.cpp similarity index 100% rename from src/app/visualization/vcontrolpointspline.cpp rename to src/libs/vwidgets/vcontrolpointspline.cpp diff --git a/src/app/visualization/vcontrolpointspline.h b/src/libs/vwidgets/vcontrolpointspline.h similarity index 98% rename from src/app/visualization/vcontrolpointspline.h rename to src/libs/vwidgets/vcontrolpointspline.h index 9b3f8ac17..0b0a73134 100644 --- a/src/app/visualization/vcontrolpointspline.h +++ b/src/libs/vwidgets/vcontrolpointspline.h @@ -31,8 +31,8 @@ #include #include -#include "../libs/vgeometry/vsplinepath.h" -#include "../libs/vmisc/def.h" +#include "../vgeometry/vsplinepath.h" +#include "../vmisc/def.h" /** * @brief The VControlPointSpline class control spline point. diff --git a/src/app/visualization/vgraphicssimpletextitem.cpp b/src/libs/vwidgets/vgraphicssimpletextitem.cpp similarity index 99% rename from src/app/visualization/vgraphicssimpletextitem.cpp rename to src/libs/vwidgets/vgraphicssimpletextitem.cpp index 330281502..a87aa40cd 100644 --- a/src/app/visualization/vgraphicssimpletextitem.cpp +++ b/src/libs/vwidgets/vgraphicssimpletextitem.cpp @@ -33,6 +33,7 @@ #include #include #include +#include //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/visualization/vgraphicssimpletextitem.h b/src/libs/vwidgets/vgraphicssimpletextitem.h similarity index 99% rename from src/app/visualization/vgraphicssimpletextitem.h rename to src/libs/vwidgets/vgraphicssimpletextitem.h index 65a268b70..7df21d074 100644 --- a/src/app/visualization/vgraphicssimpletextitem.h +++ b/src/libs/vwidgets/vgraphicssimpletextitem.h @@ -31,7 +31,7 @@ #include #include -#include "../libs/vmisc/def.h" +#include "../vmisc/def.h" /** * @brief The VGraphicsSimpleTextItem class pointer label. diff --git a/src/libs/vwidgets/vwidgets.pri b/src/libs/vwidgets/vwidgets.pri index 0ddb4e7cc..d750ea70f 100644 --- a/src/libs/vwidgets/vwidgets.pri +++ b/src/libs/vwidgets/vwidgets.pri @@ -8,7 +8,9 @@ SOURCES += \ $$PWD/vmaingraphicsscene.cpp \ $$PWD/vmaingraphicsview.cpp \ $$PWD/vsimplecurve.cpp \ - $$PWD/vwidgetpopup.cpp + $$PWD/vwidgetpopup.cpp \ + $$PWD/vcontrolpointspline.cpp \ + $$PWD/vgraphicssimpletextitem.cpp HEADERS += \ $$PWD/stable.h \ @@ -17,4 +19,6 @@ HEADERS += \ $$PWD/vmaingraphicsscene.h \ $$PWD/vmaingraphicsview.h \ $$PWD/vsimplecurve.h \ - $$PWD/vwidgetpopup.h + $$PWD/vwidgetpopup.h \ + $$PWD/vcontrolpointspline.h \ + $$PWD/vgraphicssimpletextitem.h diff --git a/src/libs/vwidgets/vwidgets.pro b/src/libs/vwidgets/vwidgets.pro index 28b9e641f..ad7a64b08 100644 --- a/src/libs/vwidgets/vwidgets.pro +++ b/src/libs/vwidgets/vwidgets.pro @@ -7,6 +7,8 @@ # File with common stuff for whole project include(../../../Valentina.pri) +QT += widgets + # Name of the library TARGET = vwidgets