diff --git a/app/common/CMakeLists.txt b/app/common/CMakeLists.txt index e08078af0..3fd83b995 100644 --- a/app/common/CMakeLists.txt +++ b/app/common/CMakeLists.txt @@ -21,7 +21,6 @@ set(OLIVE_SOURCES common/cancelableobject.h common/channellayout.h common/clamp.h - common/constructors.h common/crashhandler.h common/crashhandler.cpp common/debug.h diff --git a/app/common/constructors.h b/app/common/constructors.h deleted file mode 100644 index 07743c41c..000000000 --- a/app/common/constructors.h +++ /dev/null @@ -1,47 +0,0 @@ -/*** - - Olive - Non-Linear Video Editor - Copyright (C) 2019 Olive Team - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -***/ - -#ifndef CONSTRUCTORS_H -#define CONSTRUCTORS_H - -#include "common/define.h" - -OLIVE_NAMESPACE_ENTER - -/** - * Copy/move deleters. Similar to Q_DISABLE_COPY_MOVE, et al. but those functions are not present in Qt < 5.13 so we - * use our own functions for portability. - */ - -#define DISABLE_COPY(Class) \ - Class(const Class &) = delete;\ - Class &operator=(const Class &) = delete; - -#define DISABLE_MOVE(Class) \ - Class(Class &&) = delete; \ - Class &operator=(Class &&) = delete; - -#define DISABLE_COPY_MOVE(Class) \ - DISABLE_COPY(Class) \ - DISABLE_MOVE(Class) - -OLIVE_NAMESPACE_EXIT - -#endif // CONSTRUCTORS_H diff --git a/app/common/define.h b/app/common/define.h index 294388c17..405f34615 100644 --- a/app/common/define.h +++ b/app/common/define.h @@ -49,4 +49,21 @@ OLIVE_NAMESPACE_EXIT #define OLIVE_NS_ARG(x, y) QArgument(MACRO_VAL_AS_STR(OLIVE_NAMESPACE) "::" #x, y) +/** + * Copy/move deleters. Similar to Q_DISABLE_COPY_MOVE, et al. but those functions are not present in Qt < 5.13 so we + * use our own functions for portability. + */ + +#define DISABLE_COPY(Class) \ + Class(const Class &) = delete;\ + Class &operator=(const Class &) = delete; + +#define DISABLE_MOVE(Class) \ + Class(Class &&) = delete; \ + Class &operator=(Class &&) = delete; + +#define DISABLE_COPY_MOVE(Class) \ + DISABLE_COPY(Class) \ + DISABLE_MOVE(Class) + #endif // OLIVECOMMONDEFINE_H