summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--opencv-qt-integration-2/README.md1
-rw-r--r--opencv-qt-integration-2/moc_ImageApp.cpp118
3 files changed, 2 insertions, 120 deletions
diff --git a/.gitignore b/.gitignore
index 86be5ab..d1c0d5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,8 @@
*.o
*.so
*.app
-moc_*.[cpp,o]
+moc_*.cpp
+moc_*.o
.qmake.stash
Makefile
diff --git a/opencv-qt-integration-2/README.md b/opencv-qt-integration-2/README.md
index c6d222b..f96093a 100644
--- a/opencv-qt-integration-2/README.md
+++ b/opencv-qt-integration-2/README.md
@@ -10,7 +10,6 @@ To compile and run the code, you need to have Qt 5 installed on your computer. T
- Mac OS X Mavericks
- Qt 5.3.0
- OpenCV 3.0.0
- - Python 3.4.1
Compiling
---------
diff --git a/opencv-qt-integration-2/moc_ImageApp.cpp b/opencv-qt-integration-2/moc_ImageApp.cpp
deleted file mode 100644
index 7ad3b6b..0000000
--- a/opencv-qt-integration-2/moc_ImageApp.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/****************************************************************************
-** Meta object code from reading C++ file 'ImageApp.h'
-**
-** Created by: The Qt Meta Object Compiler version 67 (Qt 5.3.0)
-**
-** WARNING! All changes made in this file will be lost!
-*****************************************************************************/
-
-#include "ImageApp.h"
-#include <QtCore/qbytearray.h>
-#include <QtCore/qmetatype.h>
-#if !defined(Q_MOC_OUTPUT_REVISION)
-#error "The header file 'ImageApp.h' doesn't include <QObject>."
-#elif Q_MOC_OUTPUT_REVISION != 67
-#error "This file was generated using the moc from 5.3.0. It"
-#error "cannot be used with the include files from this version of Qt."
-#error "(The moc has changed too much.)"
-#endif
-
-QT_BEGIN_MOC_NAMESPACE
-struct qt_meta_stringdata_ImageApp_t {
- QByteArrayData data[5];
- char stringdata[51];
-};
-#define QT_MOC_LITERAL(idx, ofs, len) \
- Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
- qptrdiff(offsetof(qt_meta_stringdata_ImageApp_t, stringdata) + ofs \
- - idx * sizeof(QByteArrayData)) \
- )
-static const qt_meta_stringdata_ImageApp_t qt_meta_stringdata_ImageApp = {
- {
-QT_MOC_LITERAL(0, 0, 8),
-QT_MOC_LITERAL(1, 9, 17),
-QT_MOC_LITERAL(2, 27, 0),
-QT_MOC_LITERAL(3, 28, 7),
-QT_MOC_LITERAL(4, 36, 14)
- },
- "ImageApp\0showOriginalImage\0\0doCanny\0"
- "doGaussianBlur"
-};
-#undef QT_MOC_LITERAL
-
-static const uint qt_meta_data_ImageApp[] = {
-
- // content:
- 7, // revision
- 0, // classname
- 0, 0, // classinfo
- 3, 14, // methods
- 0, 0, // properties
- 0, 0, // enums/sets
- 0, 0, // constructors
- 0, // flags
- 0, // signalCount
-
- // slots: name, argc, parameters, tag, flags
- 1, 0, 29, 2, 0x08 /* Private */,
- 3, 0, 30, 2, 0x08 /* Private */,
- 4, 0, 31, 2, 0x08 /* Private */,
-
- // slots: parameters
- QMetaType::Void,
- QMetaType::Void,
- QMetaType::Void,
-
- 0 // eod
-};
-
-void ImageApp::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
-{
- if (_c == QMetaObject::InvokeMetaMethod) {
- ImageApp *_t = static_cast<ImageApp *>(_o);
- switch (_id) {
- case 0: _t->showOriginalImage(); break;
- case 1: _t->doCanny(); break;
- case 2: _t->doGaussianBlur(); break;
- default: ;
- }
- }
- Q_UNUSED(_a);
-}
-
-const QMetaObject ImageApp::staticMetaObject = {
- { &QWidget::staticMetaObject, qt_meta_stringdata_ImageApp.data,
- qt_meta_data_ImageApp, qt_static_metacall, 0, 0}
-};
-
-
-const QMetaObject *ImageApp::metaObject() const
-{
- return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
-}
-
-void *ImageApp::qt_metacast(const char *_clname)
-{
- if (!_clname) return 0;
- if (!strcmp(_clname, qt_meta_stringdata_ImageApp.stringdata))
- return static_cast<void*>(const_cast< ImageApp*>(this));
- return QWidget::qt_metacast(_clname);
-}
-
-int ImageApp::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
-{
- _id = QWidget::qt_metacall(_c, _id, _a);
- if (_id < 0)
- return _id;
- if (_c == QMetaObject::InvokeMetaMethod) {
- if (_id < 3)
- qt_static_metacall(this, _c, _id, _a);
- _id -= 3;
- } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
- if (_id < 3)
- *reinterpret_cast<int*>(_a[0]) = -1;
- _id -= 3;
- }
- return _id;
-}
-QT_END_MOC_NAMESPACE