From: Michal Malý Date: Thu, 12 Mar 2015 23:43:28 +0000 (+0100) Subject: Do not register SignalViewPtr as a QMetaType and remove metatypes.h X-Git-Tag: 0.4b~6 X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=9dd401b2efec1e70305c4f8e4d841a70f073cc1a;p=anyanka.git Do not register SignalViewPtr as a QMetaType and remove metatypes.h --- diff --git a/Anyanka.pro b/Anyanka.pro index a66944b..d820f22 100644 --- a/Anyanka.pro +++ b/Anyanka.pro @@ -76,7 +76,6 @@ HEADERS += \ locallogger.h \ gui/graphview.h \ signalcontroller.h \ - metatypes.h \ integratedpeak.h \ sequence.h \ sequenceselectormodel.h \ diff --git a/main.cpp b/main.cpp index be923d3..a16616b 100644 --- a/main.cpp +++ b/main.cpp @@ -38,7 +38,7 @@ int main(int argc, char *argv[]) #ifndef _MSC_VER #warning Revisit the metatype shared_ptr registration #endif - qRegisterMetaType>(); + //qRegisterMetaType>(); Logger::initializeGlobal(); Logger::setPrintLevel(Logger::Level::DEBUG); diff --git a/metatypes.h b/metatypes.h deleted file mode 100644 index 67fd43e..0000000 --- a/metatypes.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - Copyright (c) 2013 Michal Malý - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. -*/ - - -#ifndef METATYPES_H -#define METATYPES_H - -#include - -class SignalView; -typedef std::shared_ptr SignalViewPtr; -Q_DECLARE_METATYPE(SignalViewPtr); - -#endif // METATYPES_H