X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Tools.cpp;h=42ddf7318fdcc02e4f6521763f192386bd5dc4b9;hb=6f77dfcd9833cdba0c583e6218350f1f7043eb8b;hp=95a219c6ae9bd3b5bede0e4c26eb7b7c9139b026;hpb=cd9217d7e87997ec8bc150a6d8c389e742ca0f84;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Tools.cpp b/src/XGUI/XGUI_Tools.cpp index 95a219c6a..42ddf7318 100644 --- a/src/XGUI/XGUI_Tools.cpp +++ b/src/XGUI/XGUI_Tools.cpp @@ -1,7 +1,12 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> + #include "XGUI_Tools.h" #include #include +#include +#include +#include #include #include @@ -33,12 +38,6 @@ QString file(const QString& path, bool withExt) return QFileInfo(fPath).completeBaseName(); } -//****************************************************************** -QString extension(const QString& path, bool full) -{ - return full ? QFileInfo(path).completeSuffix() : QFileInfo(path).suffix(); -} - //****************************************************************** QString addSlash(const QString& path) { @@ -49,12 +48,6 @@ QString addSlash(const QString& path) return res; } -//****************************************************************** -QRect makeRect(const int x1, const int y1, const int x2, const int y2) -{ - return QRect(qMin(x1, x2), qMin(y1, y2), qAbs(x2 - x1), qAbs(y2 - y1)); -} - //****************************************************************** bool isModelObject(FeaturePtr theFeature) { @@ -76,9 +69,11 @@ std::string featureInfo(FeaturePtr theFeature) if (theFeature->data()) { return theFeature; } else { - ObjectPtr aObject = boost::dynamic_pointer_cast(theFeature); + ObjectPtr aObject = std::dynamic_pointer_cast(theFeature); return aObject->featureRef(); } }*/ + + }