aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve stable.h.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-01-06 18:50:27 +02:00
parent 3599577b83
commit 2ba1a5db5e
24 changed files with 504 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/puzzle/stable.h
View File

@ -57,7 +57,15 @@
# include <QtWidgets>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
@ -65,6 +73,10 @@
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/

2
src/app/puzzle/vpsettings.cpp
View File

@ -57,8 +57,6 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutLineWidth, (QLatin1String(
int cachedLineWidth = -1;
} // namespace
Q_DECLARE_METATYPE(QMarginsF)
//---------------------------------------------------------------------------------------------------------------------
VPSettings::VPSettings(Format format, Scope scope, const QString &organization, const QString &application,
QObject *parent)

14
src/app/tape/stable.h
View File

@ -57,7 +57,15 @@
# include <QtWidgets>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
@ -65,6 +73,10 @@
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/

10
src/app/valentina/stable.h
View File

@ -39,9 +39,9 @@
#include <csignal>
/*In all cases we need include core header for getting defined values*/
//#ifdef QT_CORE_LIB
//# include <QtCore>
//#endif
#ifdef QT_CORE_LIB
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
@ -73,6 +73,10 @@
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/

21
src/libs/fervor/stable.h
View File

@ -38,19 +38,32 @@
/* Add C++ includes here */
#ifdef QT_CORE_LIB
#include <QtCore>
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#ifdef QT_XML_LIB
# include <QtXml>
#endif
//In Windows you can't use those headers in all modes.
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
# include <QtWidgets>
# endif
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
@ -58,6 +71,10 @@
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/

21
src/libs/ifc/stable.h
View File

@ -38,19 +38,32 @@
/* Add C++ includes here */
#ifdef QT_CORE_LIB
#include <QtCore>
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#ifdef QT_XML_LIB
# include <QtXml>
#endif
//In Windows you can't use those headers in all modes.
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
# include <QtWidgets>
# endif
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
@ -58,6 +71,10 @@
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/

37
src/libs/qmuparser/stable.h
View File

@ -35,9 +35,44 @@
/* Add C++ includes here */
#ifdef QT_CORE_LIB
#include <QtCore>
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#ifdef QT_XML_LIB
# include <QtXml>
#endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
# include <QtWidgets>
# endif
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
#endif/*Q_OS_WIN*/
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif
#endif // STABLE_H

34
src/libs/vdxf/stable.h
View File

@ -40,13 +40,45 @@
/* Add C++ includes here */
#ifdef QT_CORE_LIB
#include <QtCore>
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#ifdef QT_XML_LIB
# include <QtXml>
#endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
# include <QtWidgets>
# endif
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/
#endif // STABLE_H

21
src/libs/vformat/stable.h
View File

@ -38,19 +38,32 @@
/* Add C++ includes here */
#ifdef QT_CORE_LIB
#include <QtCore>
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#ifdef QT_XML_LIB
# include <QtXml>
#endif
//In Windows you can't use those headers in all modes.
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
# include <QtWidgets>
# endif
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
@ -58,6 +71,10 @@
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/

34
src/libs/vgeometry/stable.h
View File

@ -38,13 +38,45 @@
/* Add C++ includes here */
#ifdef QT_CORE_LIB
#include <QtCore>
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#ifdef QT_XML_LIB
# include <QtXml>
#endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
# include <QtWidgets>
# endif
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/
#endif // STABLE_H

38
src/libs/vlayout/stable.h
View File

@ -38,9 +38,45 @@
/* Add C++ includes here */
#ifdef QT_CORE_LIB
#include <QtCore>
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#ifdef QT_XML_LIB
# include <QtXml>
#endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
# include <QtWidgets>
# endif
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/
#endif // STABLE_H

34
src/libs/vmisc/stable.h
View File

@ -38,17 +38,45 @@
/* Add C++ includes here */
#ifdef QT_CORE_LIB
#include <QtCore>
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#ifdef QT_GUI_LIB
# include <QtWidgets>
#ifdef QT_XML_LIB
# include <QtXml>
#endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
# include <QtWidgets>
# endif
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/
#endif // STABLE_H

2
src/libs/vmisc/vcommonsettings.cpp
View File

@ -68,8 +68,6 @@ const qreal VCommonSettings::defaultScrollingAcceleration = 1.3;
const qreal VCommonSettings::scrollingAccelerationMin = 1.0;
const qreal VCommonSettings::scrollingAccelerationMax = 10.0;
Q_DECLARE_METATYPE(QMarginsF) // NOLINT
namespace
{
Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPathsIndividualMeasurements, (QLatin1String("paths/individual_measurements"))) // NOLINT

2
src/libs/vmisc/vvalentinasettings.cpp
View File

@ -46,8 +46,6 @@
#include "../vlayout/vbank.h"
#include "qglobal.h"
Q_DECLARE_METATYPE(QMarginsF)
namespace
{
Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingConfigurationLabelLanguage, // NOLINT

34
src/libs/vobj/stable.h
View File

@ -38,13 +38,45 @@
/* Add C++ includes here */
#ifdef QT_CORE_LIB
#include <QtCore>
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#ifdef QT_XML_LIB
# include <QtXml>
#endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
# include <QtWidgets>
# endif
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/
#endif // STABLE_H

34
src/libs/vpatterndb/stable.h
View File

@ -38,13 +38,45 @@
/* Add C++ includes here */
#ifdef QT_CORE_LIB
#include <QtCore>
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#ifdef QT_XML_LIB
# include <QtXml>
#endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
# include <QtWidgets>
# endif
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/
#endif // STABLE_H

36
src/libs/vpropertyexplorer/stable.h
View File

@ -34,6 +34,42 @@
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#ifdef QT_XML_LIB
# include <QtXml>
#endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
# include <QtWidgets>
# endif
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/
#endif // STABLE_H

38
src/libs/vtest/stable.h
View File

@ -38,13 +38,49 @@
/* Add C++ includes here */
#ifdef QT_CORE_LIB
#include <QtCore>
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#ifdef QT_XML_LIB
# include <QtXml>
#endif
#ifdef QT_TESTLIB_LIB
# include <QtTest>
#endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
# include <QtWidgets>
# endif
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/
#endif // STABLE_H

10
src/libs/vtools/stable.h
View File

@ -39,9 +39,9 @@
#include <csignal>
/*In all cases we need include core header for getting defined values*/
//#ifdef QT_CORE_LIB
//# include <QtCore>
//#endif
#ifdef QT_CORE_LIB
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
@ -73,6 +73,10 @@
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/

34
src/libs/vwidgets/stable.h
View File

@ -38,13 +38,45 @@
/* Add C++ includes here */
#ifdef QT_CORE_LIB
#include <QtCore>
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#ifdef QT_XML_LIB
# include <QtXml>
#endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
# include <QtWidgets>
# endif
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/
#endif // STABLE_H

8
src/test/CollectionTest/stable.h
View File

@ -51,6 +51,10 @@
# include <QtXml>
#endif
#ifdef QT_TESTLIB_LIB
# include <QtTest>
#endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
@ -73,6 +77,10 @@
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/

42
src/test/ParserTest/stable.h
View File

@ -38,9 +38,49 @@
/* Add C++ includes here */
#ifdef QT_CORE_LIB
#include <QtCore>
# include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#ifdef QT_XML_LIB
# include <QtXml>
#endif
#ifdef QT_TESTLIB_LIB
# include <QtTest>
#endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
# include <QtWidgets>
# endif
# ifdef QT_SVG_LIB
# include <QtSvg/QtSvg>
# endif
# ifdef QT_PRINTSUPPORT_LIB
# include <QtPrintSupport>
# endif
//Build doesn't work, if include this headers on Windows.
# ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns>
# endif
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif
#endif // STABLE_H

8
src/test/TranslationsTest/stable.h
View File

@ -51,6 +51,10 @@
# include <QtXml>
#endif
#ifdef QT_TESTLIB_LIB
# include <QtTest>
#endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
@ -73,6 +77,10 @@
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/

8
src/test/ValentinaTest/stable.h
View File

@ -51,6 +51,10 @@
# include <QtXml>
#endif
#ifdef QT_TESTLIB_LIB
# include <QtTest>
#endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
# ifdef QT_WIDGETS_LIB
@ -73,6 +77,10 @@
# ifdef QT_NETWORK_LIB
# include <QtNetwork>
# endif
# ifdef QT_CONCURRENT_LIB
# include <QtConcurrent>
# endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/