Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drop foreach() compat

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-10-27 12:46:07 +03:00
parent 2b29e03a1c
commit 923648946b
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/KatieConfig.cmake
View file

@ -136,7 +136,7 @@ if(NOT KATIE_FOUND)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
endif() endif()
set(compat_definitions -DQT_NAMESPACE_COMPAT -DQT_FOREACH_COMPAT) set(compat_definitions -DQT_NAMESPACE_COMPAT)
set(KATIE_DEFINITIONS ${KATIE_DEFINITIONS} ${compat_definitions}) set(KATIE_DEFINITIONS ${KATIE_DEFINITIONS} ${compat_definitions})
set(QT_DEFINITIONS ${KATIE_DEFINITIONS}) set(QT_DEFINITIONS ${KATIE_DEFINITIONS})
set(QT4_DEFINITIONS ${KATIE_DEFINITIONS}) set(QT4_DEFINITIONS ${KATIE_DEFINITIONS})

18
src/core/global/qglobal.h
View file

@ -626,26 +626,8 @@ typedef uint Flags;
#endif /* Q_NO_TYPESAFE_FLAGS */ #endif /* Q_NO_TYPESAFE_FLAGS */
#ifdef QT_FOREACH_COMPAT
template <typename T>
class QForeachContainer {
public:
inline QForeachContainer(const T& t) : c(t) { }
inline typename T::const_iterator begin() { return c.begin(); }
inline typename T::const_iterator end() { return c.end(); }
private:
const T c;
};
#define Q_FOREACH(variable, container) \
for (variable: QForeachContainer<Q_TYPEOF(container)>(container))
#else // QT_FOREACH_COMPAT
#define Q_FOREACH(variable, container) for (variable: container) #define Q_FOREACH(variable, container) for (variable: container)
#endif // QT_FOREACH_COMPAT
#define Q_FOREVER for(;;) #define Q_FOREVER for(;;)
#ifndef QT_NO_KEYWORDS #ifndef QT_NO_KEYWORDS
# ifndef foreach # ifndef foreach