Remove Qt4 code in Global/ and Engine/

Engine/AppManager.cpp

@@ -143,10 +143,6 @@
 
 #include "AppManagerPrivate.h" // include breakpad after Engine, because it includes /usr/include/AssertMacros.h on OS X which defines a check(x) macro, which conflicts with boost
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_DECLARE_METATYPE(QAbstractSocket::SocketState)
-#endif
-
 NATRON_NAMESPACE_ENTER
 
 AppManager* AppManager::_instance = 0;
@@ -326,14 +322,6 @@ AppManager::loadFromArgs(const CLArgs& cl)
 #endif
 #endif
 
-    // Ensure Qt knows C-strings are UTF-8 before creating the QApplication for argv
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    // be forward compatible: source code is UTF-8, and Qt5 assumes UTF-8 by default
-    QTextCodec::setCodecForCStrings( QTextCodec::codecForName("UTF-8") );
-    QTextCodec::setCodecForTr( QTextCodec::codecForName("UTF-8") );
-#endif
-
-
     // This needs to be done BEFORE creating qApp because
     // on Linux, X11 will create a context that would corrupt
     // the XUniqueContext created by Qt
@@ -2036,18 +2024,10 @@ AppManager::registerPlugin(const QString& resourcesPath,
                            int minor,
                            bool isDeprecated)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     QRecursiveMutex* pluginMutex = nullptr;
-#else
-    QMutex* pluginMutex = 0;
-#endif
 
     if (mustCreateMutex) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
         pluginMutex = new QRecursiveMutex();
-#else
-        pluginMutex = new QMutex(QMutex::Recursive);
-#endif
     }
     Plugin* plugin = new Plugin(binary, resourcesPath, pluginID, pluginLabel, pluginIconPath, groupIconPath, groups, pluginMutex, major, minor,
                                 isReader, isWriter, isDeprecated);
@@ -2529,9 +2509,6 @@ AppManager::registerEngineMetaTypes() const
     qRegisterMetaType<ViewSpec>("ViewSpec");
     qRegisterMetaType<NodePtr>("NodePtr");
     qRegisterMetaType<std::list<double> >("std::list<double>");
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    qRegisterMetaType<QAbstractSocket::SocketState>("SocketState");
-#endif
 }
 
 void
@@ -3035,11 +3012,7 @@ AppManager::initPython()
     }
     // Set QT_API for QtPy
     // https://github.com/spyder-ide/qtpy
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    qputenv("QT_API", "pyside");
-#else
     qputenv("QT_API", "pyside2");
-#endif
 } // AppManager::initPython
 
 void

Engine/AppManagerPrivate.cpp

@@ -282,10 +282,8 @@ AppManagerPrivate::AppManagerPrivate()
 
     runningThreadsCount = 0;
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) && defined(__NATRON_LINUX__)
+#if defined(__NATRON_LINUX__)
     onWayland = qEnvironmentVariableIsSet("WAYLAND_DISPLAY") && !qEnvironmentVariableIsSet("NATRON_DISABLE_WAYLAND");
-#else
-    onWayland = false;
 #endif
 }
 
@@ -607,13 +605,10 @@ AppManagerPrivate::cleanUpCacheDiskStructure(const QString & cachePath, bool isT
 
     QDir cacheFolder(cachePath);
 
-#   if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    QtCompat::removeRecursively(cachePath);
-#   else
     if ( cacheFolder.exists() ) {
         cacheFolder.removeRecursively();
     }
-#endif
+
     if ( !cacheFolder.exists() ) {
         bool success = cacheFolder.mkpath( QChar::fromLatin1('.') );
         if (!success) {

Engine/CurvePrivate.h

@@ -29,9 +29,7 @@
 #include "Global/Macros.h"
 
 #include <QtCore/QMutex>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
 #include <QtCore/QRecursiveMutex>
-#endif
 
 #include "Engine/Variant.h"
 #include "Engine/Knob.h"
@@ -66,11 +64,8 @@ struct CurvePrivate
     CurveTypeEnum type;
     double xMin, xMax;
     double yMin, yMax;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     mutable QRecursiveMutex _lock;
-#else
-    mutable QMutex _lock; //< the plug-ins can call getValueAt at any moment and we must make sure the user is not playing around
-#endif
+
     bool isParametric;
     bool isPeriodic;
 
@@ -86,22 +81,14 @@ struct CurvePrivate
         , xMax(std::numeric_limits<double>::infinity())
         , yMin(-std::numeric_limits<double>::infinity())
         , yMax(std::numeric_limits<double>::infinity())
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
         , _lock()
-#else
-        , _lock(QMutex::Recursive)
-#endif
         , isParametric(false)
         , isPeriodic(false)
     {
     }
 
     CurvePrivate(const CurvePrivate & other)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
         : _lock()
-#else
-        : _lock(QMutex::Recursive)
-#endif
     {
         *this = other;
     }

Engine/EffectInstancePrivate.cpp

@@ -423,11 +423,7 @@ EffectInstance::Implementation::Implementation(EffectInstance* publicInterface)
     , metadata()
     , runningClipPreferences(false)
     , overlaysViewport(0)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     , attachedContextsMutex()
-#else
-    , attachedContextsMutex(QMutex::Recursive)
-#endif
     , attachedContexts()
     , mainInstance(0)
     , isDoingInstanceSafeRender(false)
@@ -457,11 +453,7 @@ EffectInstance::Implementation::Implementation(const Implementation& other)
 , metadata(other.metadata)
 , runningClipPreferences(other.runningClipPreferences)
 , overlaysViewport(other.overlaysViewport)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
 , attachedContextsMutex()
-#else
-, attachedContextsMutex(QMutex::Recursive)
-#endif
 , attachedContexts()
 , mainInstance(other._publicInterface)
 , isDoingInstanceSafeRender(false)

Engine/EffectInstancePrivate.h

@@ -37,9 +37,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QWaitCondition>
 #include <QtCore/QMutex>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
 #include <QtCore/QRecursiveMutex>
-#endif
 
 #include "Global/GlobalDefines.h"
 
@@ -227,11 +225,8 @@ class EffectInstance::Implementation
 
     // set during interact actions on main-thread
     OverlaySupport* overlaysViewport;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     mutable QRecursiveMutex attachedContextsMutex;
-#else
-    mutable QMutex attachedContextsMutex;
-#endif
+
     // A list of context that are currently attached (i.e attachOpenGLContext() has been called on them but not yet dettachOpenGLContext).
     // If a plug-in returns false to supportsConcurrentOpenGLRenders() then whenever trying to attach a context, we take a lock in attachOpenGLContext
     // that is released in dettachOpenGLContext so that there can only be a single attached OpenGL context at any time.

Engine/FileSystemModel.cpp

@@ -769,11 +769,7 @@ Qt::ItemFlags
 FileSystemModel::flags(const QModelIndex &index) const
 {
     if ( !index.isValid() ) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
         return Qt::ItemFlags();
-#else
-        return 0;
-#endif
     }
 
     // Our model is read only.

Engine/Knob.cpp

@@ -4902,11 +4902,7 @@ struct KnobHolder::KnobHolderPrivate
         , isDequeingValuesSet(false)
         , paramsEditLevel(eMultipleParamsEditOff)
         , paramsEditRecursionLevel(0)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
         , evaluationBlockedMutex()
-#else
-        , evaluationBlockedMutex(QMutex::Recursive)
-#endif
         , evaluationBlocked(0)
         , canCurrentlySetValue(true)
         , knobChanged()
@@ -4934,11 +4930,7 @@ struct KnobHolder::KnobHolderPrivate
     , isDequeingValuesSet(other.isDequeingValuesSet)
     , paramsEditLevel(other.paramsEditLevel)
     , paramsEditRecursionLevel(other.paramsEditRecursionLevel)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     , evaluationBlockedMutex()
-#else
-    , evaluationBlockedMutex(QMutex::Recursive)
-#endif
     , evaluationBlocked(0)
     , canCurrentlySetValue(other.canCurrentlySetValue)
     , knobChanged()

Engine/Knob.h

@@ -37,9 +37,7 @@
 #include <QtCore/QMutex>
 #include <QtCore/QString>
 #include <QtCore/QCoreApplication>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
 #include <QtCore/QRecursiveMutex>
-#endif
 
 #include "Engine/Variant.h"
 #include "Engine/AppManager.h" // for AppManager::createKnob
@@ -2245,11 +2243,8 @@ class Knob
     typedef std::shared_ptr<QueuedSetValueAtTime> QueuedSetValueAtTimePtr;
 
     ///Here is all the stuff we couldn't get rid of the template parameter
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     mutable QRecursiveMutex _valueMutex;
-#else
-    mutable QMutex _valueMutex; //< protects _values & _guiValues & _defaultValues & ExprResults
-#endif
+
     std::vector<T> _values, _guiValues;
 
     struct DefaultValue
@@ -2263,19 +2258,13 @@ class Knob
     //Only for double and int
     mutable QReadWriteLock _minMaxMutex;
     std::vector<T>  _minimums, _maximums, _displayMins, _displayMaxs;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     mutable QRecursiveMutex _setValuesQueueMutex;
-#else
-    mutable QMutex _setValuesQueueMutex;
-#endif
+
     std::list<std::shared_ptr<QueuedSetValue> > _setValuesQueue;
 
     ///this flag is to avoid recursive setValue calls
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     mutable QRecursiveMutex _setValueRecursionLevelMutex;
-#else
-    mutable QMutex _setValueRecursionLevelMutex;
-#endif
+
     int _setValueRecursionLevel;
 };
 

Engine/KnobImpl.h

@@ -101,31 +101,19 @@ Knob<T>::Knob(KnobHolder*  holder,
               int dimension,
               bool declaredByPlugin )
     : KnobHelper(holder, description, dimension, declaredByPlugin)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     , _valueMutex()
-#else
-    , _valueMutex(QMutex::Recursive)
-#endif
     , _values(dimension)
     , _guiValues(dimension)
     , _defaultValues(dimension)
     , _exprRes(dimension)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     , _minMaxMutex()
-#else
-    , _minMaxMutex(QReadWriteLock::Recursive)
-#endif
     , _minimums(dimension)
     , _maximums(dimension)
     , _displayMins(dimension)
     , _displayMaxs(dimension)
     , _setValuesQueueMutex()
     , _setValuesQueue()
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     , _setValueRecursionLevelMutex()
-#else
-    , _setValueRecursionLevelMutex(QMutex::Recursive)
-#endif
     , _setValueRecursionLevel(0)
 {
     initMinMax();

Engine/NodeGroup.cpp

@@ -1055,11 +1055,8 @@ NodeCollection::getParallelRenderArgs(std::map<NodePtr, ParallelRenderArgsPtr>&
 
 struct NodeGroupPrivate
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     mutable QRecursiveMutex nodesLock;
-#else
-    mutable QMutex nodesLock; // protects inputs & outputs
-#endif
+
     std::vector<NodeWPtr> inputs, guiInputs;
     NodesWList outputs, guiOutputs;
     bool isDeactivatingGroup;
@@ -1068,11 +1065,7 @@ struct NodeGroupPrivate
     KnobButtonPtr exportAsTemplate, convertToGroup;
 
     NodeGroupPrivate()
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     : nodesLock()
-#else
-    : nodesLock(QMutex::Recursive)
-#endif
     , inputs()
     , guiInputs()
     , outputs()

Engine/NodePrivate.h

@@ -173,11 +173,7 @@ struct Node::Implementation
         , mustQuitPreview(0)
         , mustQuitPreviewMutex()
         , mustQuitPreviewCond()
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
         , renderInstancesSharedMutex()
-#else
-        , renderInstancesSharedMutex(QMutex::Recursive)
-#endif
         , knobsAge(0)
         , knobsAgeMutex()
         , masterNodeMutex()

Engine/OfxHost.cpp

@@ -1122,12 +1122,9 @@ OfxHost::clearPluginsLoadedCache()
     if ( QFile::exists(oldOfxCache) ) {
         QFile::remove(oldOfxCache);
     }
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    QtCompat::removeRecursively( getOFXCacheDirPath() );
-#else
+
     QDir OFXCacheDir( getOFXCacheDirPath() );
     OFXCacheDir.removeRecursively();
-#endif
 }
 
 void
@@ -1535,11 +1532,8 @@ OfxHost::mutexCreate(OfxMutexHandle *mutex,
 
     // suite functions should not throw
     try {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
         QRecursiveMutex* m = new QRecursiveMutex();
-#else
-        QMutex* m = new QMutex(QMutex::Recursive);
-#endif
+
         for (int i = 0; i < lockCount; ++i) {
             m->lock();
         }

Engine/Plugin.cpp

@@ -178,11 +178,7 @@ Plugin::getGrouping() const
     return _grouping;
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
 QRecursiveMutex*
-#else
-QMutex*
-#endif
 Plugin::getPluginLock() const
 {
     return _lock;