core: merged define and constructor headers

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

app/common/constructors.h

@@ -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 <http://www.gnu.org/licenses/>.
-
-***/
-
-#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

app/common/define.h

@@ -49,4 +49,21 @@ OLIVE_NAMESPACE_EXIT
 
 #define OLIVE_NS_ARG(x, y) QArgument<OLIVE_NAMESPACE::x>(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