kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #19921 from mosfet80/QT_CLEAN

Browse Source 
REMOVE old QT<= 5.14 code
This commit is contained in:
Chris Hennes
2025-03-11 20:54:59 +00:00
committed by GitHub
parent 6de034bf84 8709e1f5a9
commit be8b92182c
57 changed files with 41 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Base/CMakeLists.txt
View File

@@ -221,7 +221,6 @@ SET(FreeCADBase_CPP_SRCS
PyExport.cpp
PyObjectBase.cpp
PythonTypeExt.cpp
QtTools.cpp
Reader.cpp
Rotation.cpp
RotationPyImp.cpp
@@ -289,7 +288,6 @@ SET(FreeCADBase_HPP_SRCS
PyObjectBase.h
PyWrapParseTupleAndKeywords.h
PythonTypeExt.h
QtTools.h
Reader.h
Rotation.h
ServiceProvider.h

37
src/Base/QtTools.cpp
View File

@@ -1,37 +0,0 @@
/***************************************************************************
* Copyright (c) 2022 Werner Mayer <wmayer[at]users.sourceforge.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library 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 Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#include "PreCompiled.h"
#include "QtTools.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
namespace Qt
{
BaseExport QTextStream& endl(QTextStream& stream)
{
return stream << QLatin1Char('\n') << flush;
}
} // namespace Qt
#endif

55
src/Base/QtTools.h
View File

@@ -1,55 +0,0 @@
/***************************************************************************
* Copyright (c) 2022 Werner Mayer <wmayer[at]users.sourceforge.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library 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 Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#ifndef BASE_QTTOOLS_H
#define BASE_QTTOOLS_H
#include <QtGlobal>
#include <QString>
#include <FCGlobal.h>
// Suppress warning about 'SkipEmptyParts' not being used
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-variable"
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
#endif
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
#include <QTextStream>
namespace Qt
{
BaseExport QTextStream& endl(QTextStream& stream);
static auto SkipEmptyParts = QString::SkipEmptyParts;
} // namespace Qt
#endif
#if defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
#endif // BASE_QTTOOLS_H