diff options
author | Jan Arne Petersen <jan.petersen@kdab.com> | 2013-08-21 11:09:23 +0200 |
---|---|---|
committer | Andy Nichols <andy.nichols@digia.com> | 2013-08-22 11:54:04 +0200 |
commit | 7d87285e237700b66b537d3d349eb101f2f38f78 (patch) | |
tree | d42c191fb876ddf2d1108d2124ab759790d5c208 /src/compositor/global | |
parent | 6129b75ded703dda1080067b6a614e1f44cc292d (diff) |
Remove unused QtWayland::Object
Change-Id: I671a22602b1590a8ff5a7055cc2d9c6ca29a691f
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/compositor/global')
-rw-r--r-- | src/compositor/global/global.pri | 1 | ||||
-rw-r--r-- | src/compositor/global/qwaylandobject.h | 69 |
2 files changed, 0 insertions, 70 deletions
diff --git a/src/compositor/global/global.pri b/src/compositor/global/global.pri index f187619e5..9cbd62d89 100644 --- a/src/compositor/global/global.pri +++ b/src/compositor/global/global.pri @@ -2,7 +2,6 @@ INCLUDEPATH += global/ HEADERS += \ global/qwaylandexport.h \ - global/qwaylandobject.h \ global/qwaylandresourcecollection.h SOURCES += \ diff --git a/src/compositor/global/qwaylandobject.h b/src/compositor/global/qwaylandobject.h deleted file mode 100644 index 9b3450397..000000000 --- a/src/compositor/global/qwaylandobject.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Compositor. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef WAYLAND_OBJECT_H -#define WAYLAND_OBJECT_H - -#include <wayland-server.h> -#include <string.h> - -#include <QtCompositor/qwaylandexport.h> - -QT_BEGIN_NAMESPACE - -namespace QtWayland { - -template <typename T> -class Object : public T -{ -public: - typedef T Base; - - Object() { memset(this, 0, sizeof(T)); } - - const T *base() const { return this; } - T *base() { return this; } -}; - -} - -QT_END_NAMESPACE - -#endif //WAYLAND_OBJECT_H |