This isn't 3rdparty code, this is ours.

So move it out of 3rdparty/, and add the correct license header.
KDAB · Jun 16, 2015 · a22ad19 · a22ad19
1 parent d164ce7
commit a22ad19
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 4 deletions.
diff --git a/plugins/widgetinspector/CMakeLists.txt b/plugins/widgetinspector/CMakeLists.txt
@@ -10,8 +10,7 @@ set(gammaray_widgetinspector_plugin_srcs
   overlaywidget.cpp
   widgettreemodel.cpp
   paintbufferreplaywidget.cpp
-
-  ${CMAKE_SOURCE_DIR}/3rdparty/other/modelutils.cpp
+  modelutils.cpp
 )
 
 if(HAVE_PRIVATE_QT_HEADERS)

diff --git a/3rdparty/other/modelutils.cpp → plugins/widgetinspector/modelutils.cpp b/3rdparty/other/modelutils.cpp → plugins/widgetinspector/modelutils.cpp
@@ -1,3 +1,31 @@
+/*
+  modelutils.cpp
+
+  This file is part of GammaRay, the Qt application inspection and
+  manipulation tool.
+
+  Copyright (C) 2010-2015 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
+  Author: Kevin Funk <kevin.funk@kdab.com>
+
+  Licensees holding valid commercial KDAB GammaRay licenses may use this file in
+  accordance with GammaRay Commercial License Agreement provided with the Software.
+
+  Contact info@kdab.com if any conditions of this licensing are not clear to you.
+
+  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 2 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/>.
+*/
+
 #include "modelutils.h"
 
 #include <QAbstractItemModel>

diff --git a/3rdparty/other/modelutils.h → plugins/widgetinspector/modelutils.h b/3rdparty/other/modelutils.h → plugins/widgetinspector/modelutils.h
@@ -7,6 +7,11 @@
   Copyright (C) 2010-2015 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
   Author: Kevin Funk <kevin.funk@kdab.com>
 
+  Licensees holding valid commercial KDAB GammaRay licenses may use this file in
+  accordance with GammaRay Commercial License Agreement provided with the Software.
+
+  Contact info@kdab.com if any conditions of this licensing are not clear to you.
+
   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 2 of the License, or

diff --git a/plugins/widgetinspector/widgetinspectorserver.cpp b/plugins/widgetinspector/widgetinspectorserver.cpp
@@ -30,6 +30,7 @@
 #include "paintbufferviewer.h"
 #include "widgettreemodel.h"
 #include "paintbuffermodel.h"
+#include "modelutils.h"
 
 #include "core/propertycontroller.h"
 #include "core/metaobject.h"
@@ -45,8 +46,6 @@
 #include "common/objectmodel.h"
 #include "common/paths.h"
 
-#include "other/modelutils.h"
-
 #include <QAbstractItemView>
 #include <QApplication>
 #include <QComboBox>