From cababbfc378df3d6883d13eba49568c434f8d6f1 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 15 Jun 2015 14:43:41 +0300 Subject: [PATCH] New static library VMisc. --HG-- branch : feature --- share/translations.pro | 3 +- src/app/app.pro | 12 ++- src/app/core/vapplication.cpp | 2 +- .../app/dialogstandardmeasurements.cpp | 2 +- src/app/dialogs/tools/dialogtool.h | 2 +- src/app/mainwindow.cpp | 2 +- src/app/options.h | 2 +- src/app/tools/drawTools/vtoolpoint.cpp | 2 +- src/app/tools/vdatatool.h | 2 +- src/app/undocommands/vundocommand.h | 2 +- src/app/visualization/visualization.h | 2 +- src/app/visualization/vsimplecurve.h | 2 +- src/app/widgets/doubledelegate.cpp | 2 +- src/app/widgets/vmaingraphicsscene.h | 2 +- src/app/xml/vstandardmeasurements.cpp | 1 + src/libs/ifc/exception/vexception.cpp | 4 +- src/libs/ifc/ifc.pro | 1 - src/libs/ifc/xml/vdomdocument.h | 2 +- src/libs/ifc/xml/vtoolrecord.h | 2 +- src/libs/libs.pro | 3 +- src/libs/vgeometry/vgeometry.pro | 1 - src/libs/vlayout/vlayout.pro | 1 - src/libs/vlayout/vposition.cpp | 2 +- src/libs/vlayout/vposter.cpp | 2 +- src/{utils => libs/vmisc}/def.cpp | 0 src/{utils => libs/vmisc}/def.h | 0 src/{utils => libs/vmisc}/logging.h | 0 src/libs/vmisc/stable.cpp | 30 ++++++ src/libs/vmisc/stable.h | 52 +++++++++ src/{utils => libs/vmisc}/vmath.h | 0 src/libs/vmisc/vmisc.pri | 12 +++ src/libs/vmisc/vmisc.pro | 101 ++++++++++++++++++ src/libs/vobj/vobj.pro | 1 - .../vpatterndb/variables/vinternalvariable.h | 2 +- src/libs/vpatterndb/vcontainer.cpp | 2 +- src/libs/vpatterndb/vnodedetail.h | 2 +- src/libs/vpatterndb/vpatterndb.pro | 1 - src/libs/vpatterndb/vtranslatevars.cpp | 2 +- src/utils/utils.pri | 7 -- 39 files changed, 232 insertions(+), 38 deletions(-) rename src/{utils => libs/vmisc}/def.cpp (100%) rename src/{utils => libs/vmisc}/def.h (100%) rename src/{utils => libs/vmisc}/logging.h (100%) create mode 100644 src/libs/vmisc/stable.cpp create mode 100644 src/libs/vmisc/stable.h rename src/{utils => libs/vmisc}/vmath.h (100%) create mode 100644 src/libs/vmisc/vmisc.pri create mode 100644 src/libs/vmisc/vmisc.pro delete mode 100644 src/utils/utils.pri diff --git a/share/translations.pro b/share/translations.pro index 45cdae4fe..7ea6a416b 100644 --- a/share/translations.pro +++ b/share/translations.pro @@ -15,7 +15,8 @@ DEPENDPATH += \ ../src/libs/vobj \ ../src/libs/vlayout \ ../src/libs/vgeometry \ - ../src/libs/vpatterndb + ../src/libs/vpatterndb \ + ../src/libs/vmisc include(../src/app/app.pri) include(../src/libs/qmuparser/qmuparser.pri) diff --git a/src/app/app.pro b/src/app/app.pro index 193aa596f..50d1eeab9 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -46,7 +46,6 @@ UI_DIR = uic # Suport subdirectories. Just better project code tree. include(app.pri) -include(../utils/utils.pri) # This include path help promoute VMainGraphicsView on main window. Without it compiler can't find path to custom view INCLUDEPATH += "$${PWD}/widgets" @@ -600,7 +599,7 @@ DEPENDPATH += $$PWD/../libs/vgeometry win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vgeometry/$${DESTDIR}/vgeometry.lib else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vgeometry/$${DESTDIR}/libvgeometry.a -#VPatternDB staic library +#VPatternDB static library unix|win32: LIBS += -L$$OUT_PWD/../libs/vpatterndb/$${DESTDIR}/ -lvpatterndb INCLUDEPATH += $$PWD/../libs/vpatterndb @@ -609,6 +608,15 @@ DEPENDPATH += $$PWD/../libs/vpatterndb win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vpatterndb/$${DESTDIR}/vpatterndb.lib else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vpatterndb/$${DESTDIR}/libvpatterndb.a +#VMisc static library +unix|win32: LIBS += -L$$OUT_PWD/../libs/vmisc/$${DESTDIR}/ -lvmisc + +INCLUDEPATH += $$PWD/../libs/vmisc +DEPENDPATH += $$PWD/../libs/vmisc + +win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vmisc/$${DESTDIR}/vmisc.lib +else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vmisc/$${DESTDIR}/libvmisc.a + noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { diff --git a/src/app/core/vapplication.cpp b/src/app/core/vapplication.cpp index e88a8e4cd..a404b9a55 100644 --- a/src/app/core/vapplication.cpp +++ b/src/app/core/vapplication.cpp @@ -34,7 +34,7 @@ #include "../libs/ifc/exception/vexceptionwrongid.h" #include "vmaingraphicsview.h" #include "../version.h" -#include "../../utils/logging.h" +#include "../vmisc/logging.h" #include #include diff --git a/src/app/dialogs/app/dialogstandardmeasurements.cpp b/src/app/dialogs/app/dialogstandardmeasurements.cpp index 2cd149854..cb8793ba7 100644 --- a/src/app/dialogs/app/dialogstandardmeasurements.cpp +++ b/src/app/dialogs/app/dialogstandardmeasurements.cpp @@ -32,7 +32,7 @@ #include "../../core/vapplication.h" #include "../../core/vsettings.h" #include "../../libs/vpatterndb/vcontainer.h" -#include "../../utils/logging.h" +#include "../vmisc/logging.h" #include #include diff --git a/src/app/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h index c7e703eb7..a39adb095 100644 --- a/src/app/dialogs/tools/dialogtool.h +++ b/src/app/dialogs/tools/dialogtool.h @@ -30,7 +30,7 @@ #define DIALOGTOOL_H #include "../../core/vapplication.h" -#include "../../utils/logging.h" +#include "../vmisc/logging.h" #include "../../widgets/vmaingraphicsscene.h" #include "../../visualization/visualization.h" #include "../../xml/vpattern.h" diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 5d9f7f15c..385ff8712 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -44,7 +44,7 @@ #include "vtooloptionspropertybrowser.h" #include "options.h" #include "../libs/ifc/xml/vpatternconverter.h" -#include "../../utils/logging.h" +#include "../vmisc/logging.h" #include #include diff --git a/src/app/options.h b/src/app/options.h index b51c193fb..41e50a80d 100644 --- a/src/app/options.h +++ b/src/app/options.h @@ -32,7 +32,7 @@ #include "../libs/ifc/ifcdef.h" #include "../libs/vgeometry/vgeometrydef.h" #include "../libs/qmuparser/qmudef.h" -#include "../../utils/def.h" +#include "../vmisc/def.h" #ifdef Q_OS_WIN32 # if defined( Q_CC_MSVC ) // MSVC USED diff --git a/src/app/tools/drawTools/vtoolpoint.cpp b/src/app/tools/drawTools/vtoolpoint.cpp index d25bb9f07..5e8c522c2 100644 --- a/src/app/tools/drawTools/vtoolpoint.cpp +++ b/src/app/tools/drawTools/vtoolpoint.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vtoolpoint.h" -#include "../../utils/logging.h" +#include "../vmisc/logging.h" #include "../../libs/vgeometry/vpointf.h" #include "../../visualization/vgraphicssimpletextitem.h" #include "../../undocommands/movelabel.h" diff --git a/src/app/tools/vdatatool.h b/src/app/tools/vdatatool.h index 645f9be4f..de97a8ee6 100644 --- a/src/app/tools/vdatatool.h +++ b/src/app/tools/vdatatool.h @@ -30,7 +30,7 @@ #define VDATATOOL_H #include "../libs/vpatterndb/vcontainer.h" -#include "../../utils/logging.h" +#include "../vmisc/logging.h" Q_DECLARE_LOGGING_CATEGORY(vTool) diff --git a/src/app/undocommands/vundocommand.h b/src/app/undocommands/vundocommand.h index 562ede74d..dc86281f8 100644 --- a/src/app/undocommands/vundocommand.h +++ b/src/app/undocommands/vundocommand.h @@ -32,7 +32,7 @@ #include #include -#include "../../utils/logging.h" +#include "../vmisc/logging.h" #include "../xml/vpattern.h" Q_DECLARE_LOGGING_CATEGORY(vUndo) diff --git a/src/app/visualization/visualization.h b/src/app/visualization/visualization.h index 3f9a414b9..56b141fa6 100644 --- a/src/app/visualization/visualization.h +++ b/src/app/visualization/visualization.h @@ -34,7 +34,7 @@ #include "../core/vapplication.h" #include "../widgets/vmaingraphicsscene.h" -#include "../../utils/logging.h" +#include "../vmisc/logging.h" #include "../../libs/vpatterndb/vcontainer.h" Q_DECLARE_LOGGING_CATEGORY(vVis) diff --git a/src/app/visualization/vsimplecurve.h b/src/app/visualization/vsimplecurve.h index 4c2b6ff80..c098e3660 100644 --- a/src/app/visualization/vsimplecurve.h +++ b/src/app/visualization/vsimplecurve.h @@ -31,7 +31,7 @@ #include #include "../libs/vgeometry/vabstractcurve.h" -#include "../../utils/def.h" +#include "../vmisc/def.h" enum class SimpleCurvePoint : char { FirstPoint, ForthPoint }; diff --git a/src/app/widgets/doubledelegate.cpp b/src/app/widgets/doubledelegate.cpp index c883dfeb3..be1927642 100644 --- a/src/app/widgets/doubledelegate.cpp +++ b/src/app/widgets/doubledelegate.cpp @@ -28,7 +28,7 @@ #include "doubledelegate.h" #include -#include "../../utils/def.h" +#include "../vmisc/def.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/widgets/vmaingraphicsscene.h b/src/app/widgets/vmaingraphicsscene.h index dec5e3523..4e2a441ce 100644 --- a/src/app/widgets/vmaingraphicsscene.h +++ b/src/app/widgets/vmaingraphicsscene.h @@ -30,7 +30,7 @@ #define VMAINGRAPHICSSCENE_H #include -#include "../../utils/def.h" +#include "../vmisc/def.h" /** * @brief The VMainGraphicsScene class main scene. diff --git a/src/app/xml/vstandardmeasurements.cpp b/src/app/xml/vstandardmeasurements.cpp index 5cf706ac0..41193656a 100644 --- a/src/app/xml/vstandardmeasurements.cpp +++ b/src/app/xml/vstandardmeasurements.cpp @@ -29,6 +29,7 @@ #include "vstandardmeasurements.h" #include #include "../core/vapplication.h" +#include "../../libs/vmisc/def.h" const QString VStandardMeasurements::TagDescription = QStringLiteral("description"); const QString VStandardMeasurements::TagId = QStringLiteral("id"); diff --git a/src/libs/ifc/exception/vexception.cpp b/src/libs/ifc/exception/vexception.cpp index 837ac6c47..1c621b2c5 100644 --- a/src/libs/ifc/exception/vexception.cpp +++ b/src/libs/ifc/exception/vexception.cpp @@ -27,8 +27,8 @@ *************************************************************************/ #include "vexception.h" -#include "../../../utils/logging.h" -#include "../../../utils/def.h" +#include "../vmisc/logging.h" +#include "../vmisc/def.h" #include #include diff --git a/src/libs/ifc/ifc.pro b/src/libs/ifc/ifc.pro index 10ed6b39f..b0adbb445 100644 --- a/src/libs/ifc/ifc.pro +++ b/src/libs/ifc/ifc.pro @@ -31,7 +31,6 @@ CONFIG -= debug_and_release debug_and_release_target DEFINES += QT_MESSAGELOGCONTEXT include(ifc.pri) -include(../../utils/utils.pri) # This is static library so no need in "make install" diff --git a/src/libs/ifc/xml/vdomdocument.h b/src/libs/ifc/xml/vdomdocument.h index f23214dae..20d78c8eb 100644 --- a/src/libs/ifc/xml/vdomdocument.h +++ b/src/libs/ifc/xml/vdomdocument.h @@ -34,7 +34,7 @@ #include #include "ifcdef.h" -#include "../../../utils/logging.h" +#include "../vmisc/logging.h" Q_DECLARE_LOGGING_CATEGORY(vXML) diff --git a/src/libs/ifc/xml/vtoolrecord.h b/src/libs/ifc/xml/vtoolrecord.h index dd927a999..f1823fc3f 100644 --- a/src/libs/ifc/xml/vtoolrecord.h +++ b/src/libs/ifc/xml/vtoolrecord.h @@ -29,7 +29,7 @@ #ifndef VTOOLRECORD_H #define VTOOLRECORD_H -#include "../../utils/def.h" +#include "../vmisc/def.h" #include diff --git a/src/libs/libs.pro b/src/libs/libs.pro index 92bfad3c8..4d31c3064 100644 --- a/src/libs/libs.pro +++ b/src/libs/libs.pro @@ -6,6 +6,7 @@ SUBDIRS = \ vobj \ vlayout \ vgeometry \ - vpatterndb + vpatterndb \ + vmisc vgeometry.depends = ifc diff --git a/src/libs/vgeometry/vgeometry.pro b/src/libs/vgeometry/vgeometry.pro index 4c8e26eb0..43e050a5a 100644 --- a/src/libs/vgeometry/vgeometry.pro +++ b/src/libs/vgeometry/vgeometry.pro @@ -25,7 +25,6 @@ CONFIG -= debug_and_release debug_and_release_target DEFINES += QT_MESSAGELOGCONTEXT include(vgeometry.pri) -include(../../utils/utils.pri) # This is static library so no need in "make install" diff --git a/src/libs/vlayout/vlayout.pro b/src/libs/vlayout/vlayout.pro index d152d8b08..2d45800a7 100644 --- a/src/libs/vlayout/vlayout.pro +++ b/src/libs/vlayout/vlayout.pro @@ -27,7 +27,6 @@ CONFIG -= debug_and_release debug_and_release_target DEFINES += QT_MESSAGELOGCONTEXT include(vlayout.pri) -include(../../utils/utils.pri) # This is static library so no need in "make install" diff --git a/src/libs/vlayout/vposition.cpp b/src/libs/vlayout/vposition.cpp index f100965bf..80a06df4e 100644 --- a/src/libs/vlayout/vposition.cpp +++ b/src/libs/vlayout/vposition.cpp @@ -27,7 +27,7 @@ *************************************************************************/ #include "vposition.h" -#include "../../utils/def.h" +#include "../vmisc/def.h" #include #include diff --git a/src/libs/vlayout/vposter.cpp b/src/libs/vlayout/vposter.cpp index 461fb59f3..212e5dd1c 100644 --- a/src/libs/vlayout/vposter.cpp +++ b/src/libs/vlayout/vposter.cpp @@ -35,7 +35,7 @@ # include #endif -#include "../../utils/def.h" +#include "../vmisc/def.h" //--------------------------------------------------------------------------------------------------------------------- VPoster::VPoster(const QPrinter *printer) diff --git a/src/utils/def.cpp b/src/libs/vmisc/def.cpp similarity index 100% rename from src/utils/def.cpp rename to src/libs/vmisc/def.cpp diff --git a/src/utils/def.h b/src/libs/vmisc/def.h similarity index 100% rename from src/utils/def.h rename to src/libs/vmisc/def.h diff --git a/src/utils/logging.h b/src/libs/vmisc/logging.h similarity index 100% rename from src/utils/logging.h rename to src/libs/vmisc/logging.h diff --git a/src/libs/vmisc/stable.cpp b/src/libs/vmisc/stable.cpp new file mode 100644 index 000000000..a42d3fd7c --- /dev/null +++ b/src/libs/vmisc/stable.cpp @@ -0,0 +1,30 @@ +/************************************************************************ + ** + ** @file stable.cpp + ** @author Roman Telezhynskyi + ** @date 10 12, 2014 + ** + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013-2015 Valentina project + ** All Rights Reserved. + ** + ** Valentina is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + *************************************************************************/ + +// Build the precompiled headers. +#include "stable.h" diff --git a/src/libs/vmisc/stable.h b/src/libs/vmisc/stable.h new file mode 100644 index 000000000..495de51b1 --- /dev/null +++ b/src/libs/vmisc/stable.h @@ -0,0 +1,52 @@ +/************************************************************************ + ** + ** @file stable.h + ** @author Roman Telezhynskyi + ** @date 10 12, 2014 + ** + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013-2015 Valentina project + ** All Rights Reserved. + ** + ** Valentina is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + *************************************************************************/ + +#ifndef STABLE_H +#define STABLE_H + +/* I like to include this pragma too, so the build log indicates if pre-compiled headers were in use. */ +#ifndef __clang__ +#pragma message("Compiling precompiled headers for VMisc library.\n") +#endif + +/* Add C includes here */ + +#if defined __cplusplus +/* Add C++ includes here */ + +#ifdef QT_CORE_LIB +#include +#endif + +#ifdef QT_GUI_LIB +# include +#endif + +#endif/*__cplusplus*/ + +#endif // STABLE_H diff --git a/src/utils/vmath.h b/src/libs/vmisc/vmath.h similarity index 100% rename from src/utils/vmath.h rename to src/libs/vmisc/vmath.h diff --git a/src/libs/vmisc/vmisc.pri b/src/libs/vmisc/vmisc.pri new file mode 100644 index 000000000..b098d9842 --- /dev/null +++ b/src/libs/vmisc/vmisc.pri @@ -0,0 +1,12 @@ +# ADD TO EACH PATH $$PWD VARIABLE!!!!!! +# This need for corect working file translations.pro + +SOURCES += \ + $$PWD/stable.cpp \ + $$PWD/def.cpp + +HEADERS += \ + $$PWD/stable.h \ + $$PWD/def.h \ + $$PWD/logging.h \ + $$PWD/vmath.h diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro new file mode 100644 index 000000000..b3f21da35 --- /dev/null +++ b/src/libs/vmisc/vmisc.pro @@ -0,0 +1,101 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2015-06-15T14:07:14 +# +#------------------------------------------------- + +# File with common stuff for whole project +include(../../../Valentina.pri) + +# Name of library +TARGET = vmisc + +# We want to create a library +TEMPLATE = lib + +CONFIG += \ + staticlib \# Making static library + c++11 # We use C++11 standard + +# Use out-of-source builds (shadow builds) +CONFIG -= debug_and_release debug_and_release_target + +# Since Qt 5.4.0 the source code location is recorded only in debug builds. +# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT. +DEFINES += QT_MESSAGELOGCONTEXT + +include(vmisc.pri) + +# This is static library so no need in "make install" + +# directory for executable file +DESTDIR = bin + +# files created moc +MOC_DIR = moc + +# objecs files +OBJECTS_DIR = obj + +# Set using ccache. Function enable_ccache() defined in Valentina.pri. +$$enable_ccache() + +# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +$$set_PCH() + +CONFIG(debug, debug|release){ + # Debug mode + unix { + #Turn on compilers warnings. + *-g++{ + QMAKE_CXXFLAGS += \ + # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + + noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer + # do nothing + } else { + #gcc’s 4.8.0 Address Sanitizer + #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/ + QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer + QMAKE_LFLAGS += -fsanitize=address + } + } + clang*{ + QMAKE_CXXFLAGS += \ + # Key -isystem disable checking errors in system headers. + -isystem "$${OUT_PWD}/$${MOC_DIR}" \ + $$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. + + # -isystem key works only for headers. In some cases it's not enough. But we can't delete these warnings and + # want them in global list. Compromise decision delete them from local list. + QMAKE_CXXFLAGS -= \ + -Wmissing-prototypes + } + } else { + *-g++{ + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + } + } + +}else{ + # Release mode + DEFINES += V_NO_ASSERT + !unix:*-g++{ + QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll + } + + noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols + # do nothing + } else { + !macx:!win32-msvc*{ + # Turn on debug symbols in release mode on Unix systems. + # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. + QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 + QMAKE_CFLAGS_RELEASE += -g -gdwarf-3 + QMAKE_LFLAGS_RELEASE = + } + } +} diff --git a/src/libs/vobj/vobj.pro b/src/libs/vobj/vobj.pro index 2ba59ae2c..f23693def 100644 --- a/src/libs/vobj/vobj.pro +++ b/src/libs/vobj/vobj.pro @@ -25,7 +25,6 @@ CONFIG -= debug_and_release debug_and_release_target DEFINES += QT_MESSAGELOGCONTEXT include(vobj.pri) -include(../../utils/utils.pri) # This is static library so no need in "make install" diff --git a/src/libs/vpatterndb/variables/vinternalvariable.h b/src/libs/vpatterndb/variables/vinternalvariable.h index 9c8e61c50..1eb8d3fc3 100644 --- a/src/libs/vpatterndb/variables/vinternalvariable.h +++ b/src/libs/vpatterndb/variables/vinternalvariable.h @@ -31,7 +31,7 @@ #include #include -#include "../../utils/def.h" +#include "../vmisc/def.h" class VInternalVariableData; diff --git a/src/libs/vpatterndb/vcontainer.cpp b/src/libs/vpatterndb/vcontainer.cpp index cfb5194f7..eb9d4e3d8 100644 --- a/src/libs/vpatterndb/vcontainer.cpp +++ b/src/libs/vpatterndb/vcontainer.cpp @@ -29,7 +29,7 @@ #include "vcontainer.h" #include "../vgeometry/varc.h" #include "../vgeometry/vsplinepath.h" -#include "../../utils/logging.h" +#include "../vmisc/logging.h" #include "vtranslatevars.h" #include diff --git a/src/libs/vpatterndb/vnodedetail.h b/src/libs/vpatterndb/vnodedetail.h index 14bef930c..a229440f3 100644 --- a/src/libs/vpatterndb/vnodedetail.h +++ b/src/libs/vpatterndb/vnodedetail.h @@ -32,7 +32,7 @@ #include #include -#include "../../utils/def.h" +#include "../vmisc/def.h" class VNodeDetailData; diff --git a/src/libs/vpatterndb/vpatterndb.pro b/src/libs/vpatterndb/vpatterndb.pro index 82cb7256e..8ab08defb 100644 --- a/src/libs/vpatterndb/vpatterndb.pro +++ b/src/libs/vpatterndb/vpatterndb.pro @@ -25,7 +25,6 @@ CONFIG -= debug_and_release debug_and_release_target DEFINES += QT_MESSAGELOGCONTEXT include(vpatterndb.pri) -include(../../utils/utils.pri) # This is static library so no need in "make install" diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp index 4f10fe0f1..8e934bf5e 100644 --- a/src/libs/vpatterndb/vtranslatevars.cpp +++ b/src/libs/vpatterndb/vtranslatevars.cpp @@ -28,7 +28,7 @@ #include "vtranslatevars.h" #include "calculator.h" -#include "../../utils/def.h" +#include "../vmisc/def.h" #include "../vgeometry/vgeometrydef.h" using namespace qmu; diff --git a/src/utils/utils.pri b/src/utils/utils.pri deleted file mode 100644 index 6cb4394d2..000000000 --- a/src/utils/utils.pri +++ /dev/null @@ -1,7 +0,0 @@ -HEADERS += \ - $$PWD/logging.h \ - $$PWD/vmath.h \ - $$PWD/def.h - -SOURCES += \ - $$PWD/def.cpp