diff --git a/declarativeimports/CMakeLists.txt b/declarativeimports/CMakeLists.txt index 08430949a..aad7fef4e 100644 --- a/declarativeimports/CMakeLists.txt +++ b/declarativeimports/CMakeLists.txt @@ -1,7 +1,7 @@ add_subdirectory(core) add_subdirectory(draganddrop) -add_subdirectory(graphicslayouts) -add_subdirectory(graphicswidgets) +#add_subdirectory(graphicslayouts) +#add_subdirectory(graphicswidgets) add_subdirectory(krunnermodel) add_subdirectory(qtextracomponents) add_subdirectory(plasmacomponents) diff --git a/declarativeimports/graphicslayouts/CMakeLists.txt b/declarativeimports/graphicslayouts/CMakeLists.txt deleted file mode 100644 index 81ec17bc9..000000000 --- a/declarativeimports/graphicslayouts/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -project(graphicslayoutsbindings) - -set(graphicslayoutsbindings_SRCS - graphicslayoutsbindingsplugin.cpp - gridlayout.cpp - linearlayout.cpp - ) - -INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - ${KDE4_INCLUDES} -) - -qt4_automoc(${graphicslayoutsbindings_SRCS}) - - -add_library(graphicslayoutsbindingsplugin SHARED ${graphicslayoutsbindings_SRCS}) -target_link_libraries(graphicslayoutsbindingsplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}) - -install(TARGETS graphicslayoutsbindingsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/graphicslayouts) -install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/graphicslayouts) diff --git a/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.cpp b/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.cpp deleted file mode 100644 index 6a502ec44..000000000 --- a/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2009 by Alan Alpert - * Copyright 2010 by Ménard Alexis - * Copyright 2010 by Marco Martin - - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2, 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 Library General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "graphicslayoutsbindingsplugin.h" - -#include - -#include "gridlayout.h" -#include "linearlayout.h" - - -void GraphicsLayoutsBindingsPlugin::registerTypes(const char *uri) -{ - Q_ASSERT(uri == QLatin1String("org.kde.plasma.graphicslayouts")); - - qmlRegisterInterface("QGraphicsLayoutItem"); - qmlRegisterInterface("QGraphicsLayout"); - qmlRegisterType(uri,4,7,"QGraphicsLinearLayoutStretchItem"); - qmlRegisterType(uri,4,7,"QGraphicsLinearLayout"); - qmlRegisterType(uri,4,7,"QGraphicsGridLayout"); -} - - -#include "graphicslayoutsbindingsplugin.moc" - diff --git a/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.h b/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.h deleted file mode 100644 index 8c5539752..000000000 --- a/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2009 by Alan Alpert - * Copyright 2010 by Ménard Alexis - * Copyright 2010 by Marco Martin - - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2, 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 Library General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef GRAPHICSLAYOUTSBINDINGSPLUGIN_H -#define GRAPHICSLAYOUTSBINDINGSPLUGIN_H - -#include - - -class GraphicsLayoutsBindingsPlugin : public QDeclarativeExtensionPlugin -{ - Q_OBJECT - -public: - void registerTypes(const char *uri); -}; - -Q_EXPORT_PLUGIN2(graphicslayoutsbindingsplugin, GraphicsLayoutsBindingsPlugin) - -#endif diff --git a/declarativeimports/graphicslayouts/gridlayout.cpp b/declarativeimports/graphicslayouts/gridlayout.cpp deleted file mode 100644 index 88983a245..000000000 --- a/declarativeimports/graphicslayouts/gridlayout.cpp +++ /dev/null @@ -1,189 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $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 Nokia Corporation 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$ -** -****************************************************************************/ - -#include "gridlayout.h" - -#include -#include - -GridLayoutAttached::GridLayoutAttached(QObject *parent) -: QObject(parent), m_row(-1), m_column(-1), m_rowspan(1), m_colspan(1), m_alignment(-1), m_rowStretch(-1), - m_colStretch(-1), m_rowSpacing(-1), m_colSpacing(-1), m_rowPrefHeight(-1), m_rowMaxHeight(-1), m_rowMinHeight(-1), - m_rowFixHeight(-1), m_colPrefwidth(-1), m_colMaxwidth(-1), m_colMinwidth(-1), m_colFixwidth(-1) -{ -} - -void GridLayoutAttached::setAlignment(Qt::Alignment a) -{ - if (m_alignment != a) { - m_alignment = a; - emit alignmentChanged(reinterpret_cast(parent()), m_alignment); - } -} - -QHash GraphicsGridLayoutObject::attachedProperties; - -GraphicsGridLayoutObject::GraphicsGridLayoutObject(QObject *parent) -: QObject(parent) -{ -} - -GraphicsGridLayoutObject::~GraphicsGridLayoutObject() -{ -} - -void GraphicsGridLayoutObject::addWidget(QGraphicsWidget *widget) -{ - //use attached properties - if (QObject *obj = attachedProperties.value(qobject_cast(widget))) { - int row = static_cast(obj)->row(); - int column = static_cast(obj)->column(); - int rowSpan = static_cast(obj)->rowSpan(); - int columnSpan = static_cast(obj)->columnSpan(); - if (row == -1 || column == -1) { - qWarning() << "Must set row and column for an item in a grid layout"; - return; - } - addItem(widget, row, column, rowSpan, columnSpan); - } -} - -void GraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item) -{ - //use attached properties - if (GridLayoutAttached *obj = attachedProperties.value(item)) { - int row = obj->row(); - int column = obj->column(); - int rowSpan = obj->rowSpan(); - int columnSpan = obj->columnSpan(); - Qt::Alignment alignment = obj->alignment(); - - if (row == -1 || column == -1) { - qWarning() << "Must set row and column for an item in a grid layout"; - return; - } - - if (obj->rowSpacing() != -1) - setRowSpacing(row, obj->rowSpacing()); - if (obj->columnSpacing() != -1) - setColumnSpacing(column, obj->columnSpacing()); - if (obj->rowStretchFactor() != -1) - setRowStretchFactor(row, obj->rowStretchFactor()); - if (obj->columnStretchFactor() != -1) - setColumnStretchFactor(column, obj->columnStretchFactor()); - if (obj->rowPreferredHeight() != -1) - setRowPreferredHeight(row, obj->rowPreferredHeight()); - if (obj->rowMaximumHeight() != -1) - setRowMaximumHeight(row, obj->rowMaximumHeight()); - if (obj->rowMinimumHeight() != -1) - setRowMinimumHeight(row, obj->rowMinimumHeight()); - if (obj->rowFixedHeight() != -1) - setRowFixedHeight(row, obj->rowFixedHeight()); - if (obj->columnPreferredWidth() != -1) - setColumnPreferredWidth(row, obj->columnPreferredWidth()); - if (obj->columnMaximumWidth() != -1) - setColumnMaximumWidth(row, obj->columnMaximumWidth()); - if (obj->columnMinimumWidth() != -1) - setColumnMinimumWidth(row, obj->columnMinimumWidth()); - if (obj->columnFixedWidth() != -1) - setColumnFixedWidth(row, obj->columnFixedWidth()); - - addItem(item, row, column, rowSpan, columnSpan); - - if (alignment != -1) - setAlignment(item, alignment); - QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*, Qt::Alignment)), - this, SLOT(updateAlignment(QGraphicsLayoutItem*, Qt::Alignment))); - } -} - -void GraphicsGridLayoutObject::removeAt(int index) -{ - QGraphicsLayoutItem *item = itemAt(index); - if (item) { - GridLayoutAttached *obj = attachedProperties.value(item); - obj->disconnect(this); - attachedProperties.remove(item); - } - QGraphicsGridLayout::removeAt(index); -} - -void GraphicsGridLayoutObject::clearChildren() -{ - // do not delete the removed items; they will be deleted by the QML engine - while (count() > 0) - removeAt(count()-1); -} - -qreal GraphicsGridLayoutObject::spacing() const -{ - if (verticalSpacing() == horizontalSpacing()) - return verticalSpacing(); - return -1; -} - -qreal GraphicsGridLayoutObject::contentsMargin() const -{ - qreal a, b, c, d; - getContentsMargins(&a, &b, &c, &d); - if (a == b && a == c && a == d) - return a; - return -1; -} - -void GraphicsGridLayoutObject::setContentsMargin(qreal m) -{ - setContentsMargins(m, m, m, m); -} - -void GraphicsGridLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment) -{ - QGraphicsGridLayout::setAlignment(item, alignment); -} - -GridLayoutAttached *GraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj) -{ - GridLayoutAttached *rv = new GridLayoutAttached(obj); - if (qobject_cast(obj)) - attachedProperties.insert(qobject_cast(obj), rv); - return rv; -} - -#include "gridlayout.moc" diff --git a/declarativeimports/graphicslayouts/gridlayout.h b/declarativeimports/graphicslayouts/gridlayout.h deleted file mode 100644 index 335ae5d48..000000000 --- a/declarativeimports/graphicslayouts/gridlayout.h +++ /dev/null @@ -1,217 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $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 Nokia Corporation 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 GRIDLAYOUT_H -#define GRIDLAYOUT_H - -#include - -#include -#include -#include - -class GridLayoutAttached; -class GraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout -{ - Q_OBJECT - Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem) - - Q_PROPERTY(QDeclarativeListProperty children READ children) - Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing) - Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin) - Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing) - Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing) - Q_CLASSINFO("DefaultProperty", "children") - -public: - GraphicsGridLayoutObject(QObject * = 0); - ~GraphicsGridLayoutObject(); - - QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); } - - qreal spacing() const; - qreal contentsMargin() const; - void setContentsMargin(qreal); - - void removeAt(int index); - - static GridLayoutAttached *qmlAttachedProperties(QObject *); - -private slots: - void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment); - -private: - friend class GraphicsLayoutAttached; - - void addWidget(QGraphicsWidget *); - void clearChildren(); - void addLayoutItem(QGraphicsLayoutItem *); - - static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) { - static_cast(prop->object)->addLayoutItem(item); - } - - static void children_clear(QDeclarativeListProperty *prop) { - static_cast(prop->object)->clearChildren(); - } - - static int children_count(QDeclarativeListProperty *prop) { - return static_cast(prop->object)->count(); - } - - static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) { - return static_cast(prop->object)->itemAt(index); - } - - static QHash attachedProperties; -}; - - -class GridLayoutAttached : public QObject -{ - Q_OBJECT - - Q_PROPERTY(int row READ row WRITE setRow) - Q_PROPERTY(int column READ column WRITE setColumn) - - Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan) - Q_PROPERTY(int columnSpan READ columnSpan WRITE setColumnSpan) - Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment) - - Q_PROPERTY(int rowStretchFactor READ rowStretchFactor WRITE setRowStretchFactor) - Q_PROPERTY(int columnStretchFactor READ columnStretchFactor WRITE setColumnStretchFactor) - Q_PROPERTY(int rowSpacing READ rowSpacing WRITE setRowSpacing) - Q_PROPERTY(int columnSpacing READ columnSpacing WRITE setColumnSpacing) - - Q_PROPERTY(int rowPreferredHeight READ rowPreferredHeight WRITE setRowPreferredHeight) - Q_PROPERTY(int rowMinimumHeight READ rowMinimumHeight WRITE setRowMinimumHeight) - Q_PROPERTY(int rowMaximumHeight READ rowMaximumHeight WRITE setRowMaximumHeight) - Q_PROPERTY(int rowFixedHeight READ rowFixedHeight WRITE setRowFixedHeight) - - Q_PROPERTY(int columnPreferredWidth READ columnPreferredWidth WRITE setColumnPreferredWidth) - Q_PROPERTY(int columnMaximumWidth READ columnMaximumWidth WRITE setColumnMaximumWidth) - Q_PROPERTY(int columnMinimumWidth READ columnMinimumWidth WRITE setColumnMinimumWidth) - Q_PROPERTY(int columnFixedWidth READ columnFixedWidth WRITE setColumnFixedWidth) - -public: - GridLayoutAttached(QObject *parent); - - int row() const { return m_row; } - void setRow(int r) { m_row = r; } - - int column() const { return m_column; } - void setColumn(int c) { m_column = c; } - - int rowSpan() const { return m_rowspan; } - void setRowSpan(int rs) { m_rowspan = rs; } - - int columnSpan() const { return m_colspan; } - void setColumnSpan(int cs) { m_colspan = cs; } - - Qt::Alignment alignment() const { return m_alignment; } - void setAlignment(Qt::Alignment a); - - int rowStretchFactor() const { return m_rowStretch; } - void setRowStretchFactor(int f) { m_rowStretch = f; } - int columnStretchFactor() const { return m_colStretch; } - void setColumnStretchFactor(int f) { m_colStretch = f; } - - int rowSpacing() const { return m_rowSpacing; } - void setRowSpacing(int s) { m_rowSpacing = s; } - int columnSpacing() const { return m_colSpacing; } - void setColumnSpacing(int s) { m_colSpacing = s; } - - int rowPreferredHeight() const { return m_rowPrefHeight; } - void setRowPreferredHeight(int s) { m_rowPrefHeight = s; } - - int rowMaximumHeight() const { return m_rowMaxHeight; } - void setRowMaximumHeight(int s) { m_rowMaxHeight = s; } - - int rowMinimumHeight() const { return m_rowMinHeight; } - void setRowMinimumHeight(int s) { m_rowMinHeight = s; } - - int rowFixedHeight() const { return m_rowFixHeight; } - void setRowFixedHeight(int s) { m_rowFixHeight = s; } - - int columnPreferredWidth() const { return m_colPrefwidth; } - void setColumnPreferredWidth(int s) { m_colPrefwidth = s; } - - int columnMaximumWidth() const { return m_colMaxwidth; } - void setColumnMaximumWidth(int s) { m_colMaxwidth = s; } - - int columnMinimumWidth() const { return m_colMinwidth; } - void setColumnMinimumWidth(int s) { m_colMinwidth = s; } - - int columnFixedWidth() const { return m_colFixwidth; } - void setColumnFixedWidth(int s) { m_colFixwidth = s; } - -signals: - void alignmentChanged(QGraphicsLayoutItem*, Qt::Alignment); - -private: - int m_row; - int m_column; - - int m_rowspan; - int m_colspan; - Qt::Alignment m_alignment; - - int m_rowStretch; - int m_colStretch; - int m_rowSpacing; - int m_colSpacing; - - int m_rowPrefHeight; - int m_rowMaxHeight; - int m_rowMinHeight; - int m_rowFixHeight; - - int m_colPrefwidth; - int m_colMaxwidth; - int m_colMinwidth; - int m_colFixwidth; -}; - - -QML_DECLARE_TYPE(GraphicsGridLayoutObject) -QML_DECLARE_TYPEINFO(GraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES) - -#endif - diff --git a/declarativeimports/graphicslayouts/linearlayout.cpp b/declarativeimports/graphicslayouts/linearlayout.cpp deleted file mode 100644 index 02ac4cb27..000000000 --- a/declarativeimports/graphicslayouts/linearlayout.cpp +++ /dev/null @@ -1,175 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $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 Nokia Corporation 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$ -** -****************************************************************************/ - -#include "linearlayout.h" - -#include -#include - -LinearLayoutAttached::LinearLayoutAttached(QObject *parent) -: QObject(parent), m_stretch(1), m_alignment(Qt::AlignTop), m_spacing(0) -{ -} - -void LinearLayoutAttached::setStretchFactor(int f) -{ - if (m_stretch != f) { - m_stretch = f; - emit stretchChanged(reinterpret_cast(parent()), m_stretch); - } -} - -void LinearLayoutAttached::setSpacing(int s) -{ - if (m_spacing != s) { - m_spacing = s; - emit spacingChanged(reinterpret_cast(parent()), m_spacing); - } -} - -void LinearLayoutAttached::setAlignment(Qt::Alignment a) -{ - if (m_alignment != a) { - m_alignment = a; - emit alignmentChanged(reinterpret_cast(parent()), m_alignment); - } -} - -GraphicsLinearLayoutStretchItemObject::GraphicsLinearLayoutStretchItemObject(QObject *parent) - : QObject(parent) -{ -} - -QSizeF GraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const -{ - Q_UNUSED(which); - Q_UNUSED(constraint); - return QSizeF(); -} - - -GraphicsLinearLayoutObject::GraphicsLinearLayoutObject(QObject *parent) -: QObject(parent) -{ -} - -GraphicsLinearLayoutObject::~GraphicsLinearLayoutObject() -{ -} - -void GraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item) -{ - insertItem(index, item); - - if (LinearLayoutAttached *obj = attachedProperties.value(item)) { - setStretchFactor(item, obj->stretchFactor()); - setAlignment(item, obj->alignment()); - updateSpacing(item, obj->spacing()); - QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)), - this, SLOT(updateStretch(QGraphicsLayoutItem*,int))); - QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)), - this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment))); - QObject::connect(obj, SIGNAL(spacingChanged(QGraphicsLayoutItem*,int)), - this, SLOT(updateSpacing(QGraphicsLayoutItem*,int))); - } -} - -void GraphicsLinearLayoutObject::removeAt(int index) -{ - QGraphicsLayoutItem *item = itemAt(index); - if (item) { - LinearLayoutAttached *obj = attachedProperties.value(item); - obj->disconnect(this); - attachedProperties.remove(item); - } - QGraphicsLinearLayout::removeAt(index); -} - -void GraphicsLinearLayoutObject::clearChildren() -{ - // do not delete the removed items; they will be deleted by the QML engine - while (count() > 0) - removeAt(count()-1); -} - -qreal GraphicsLinearLayoutObject::contentsMargin() const -{ - qreal a, b, c, d; - getContentsMargins(&a, &b, &c, &d); - if (a == b && a == c && a == d) - return a; - return -1; -} - -void GraphicsLinearLayoutObject::setContentsMargin(qreal m) -{ - setContentsMargins(m, m, m, m); -} - -void GraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch) -{ - QGraphicsLinearLayout::setStretchFactor(item, stretch); -} - -void GraphicsLinearLayoutObject::updateSpacing(QGraphicsLayoutItem* item, int spacing) -{ - for (int i=0; i < count(); i++){ - if (itemAt(i) == item) { - QGraphicsLinearLayout::setItemSpacing(i, spacing); - return; - } - } -} - -void GraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment) -{ - QGraphicsLinearLayout::setAlignment(item, alignment); -} - -QHash GraphicsLinearLayoutObject::attachedProperties; -LinearLayoutAttached *GraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj) -{ - LinearLayoutAttached *rv = new LinearLayoutAttached(obj); - if (qobject_cast(obj)) - attachedProperties.insert(qobject_cast(obj), rv); - return rv; -} - -#include "linearlayout.moc" diff --git a/declarativeimports/graphicslayouts/linearlayout.h b/declarativeimports/graphicslayouts/linearlayout.h deleted file mode 100644 index 875d2e51e..000000000 --- a/declarativeimports/graphicslayouts/linearlayout.h +++ /dev/null @@ -1,152 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $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 Nokia Corporation 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 LINEARLAYOUT_H -#define LINEARLAYOUT_H - -#include - -#include -#include -#include - -class GraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem -{ - Q_OBJECT - Q_INTERFACES(QGraphicsLayoutItem) -public: - GraphicsLinearLayoutStretchItemObject(QObject *parent = 0); - - virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const; -}; - - -class LinearLayoutAttached; -class GraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout -{ - Q_OBJECT - Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem) - - Q_PROPERTY(QDeclarativeListProperty children READ children) - Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation) - Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing) - Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin) - Q_CLASSINFO("DefaultProperty", "children") -public: - GraphicsLinearLayoutObject(QObject * = 0); - ~GraphicsLinearLayoutObject(); - - QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); } - - qreal contentsMargin() const; - void setContentsMargin(qreal); - - void removeAt(int index); - - static LinearLayoutAttached *qmlAttachedProperties(QObject *); - -private slots: - void updateStretch(QGraphicsLayoutItem*,int); - void updateSpacing(QGraphicsLayoutItem*,int); - void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment); - -private: - friend class LinearLayoutAttached; - - void clearChildren(); - void insertLayoutItem(int, QGraphicsLayoutItem *); - - static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) { - static_cast(prop->object)->insertLayoutItem(-1, item); - } - - static void children_clear(QDeclarativeListProperty *prop) { - static_cast(prop->object)->clearChildren(); - } - - static int children_count(QDeclarativeListProperty *prop) { - return static_cast(prop->object)->count(); - } - - static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) { - return static_cast(prop->object)->itemAt(index); - } - - static QHash attachedProperties; -}; - - -class LinearLayoutAttached : public QObject -{ - Q_OBJECT - - Q_PROPERTY(int stretchFactor READ stretchFactor WRITE setStretchFactor NOTIFY stretchChanged) - Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged) - Q_PROPERTY(int spacing READ spacing WRITE setSpacing NOTIFY spacingChanged) - -public: - LinearLayoutAttached(QObject *parent); - - int stretchFactor() const { return m_stretch; } - void setStretchFactor(int f); - Qt::Alignment alignment() const { return m_alignment; } - void setAlignment(Qt::Alignment a); - int spacing() const { return m_spacing; } - void setSpacing(int s); - -signals: - void stretchChanged(QGraphicsLayoutItem*, int); - void alignmentChanged(QGraphicsLayoutItem*, Qt::Alignment); - void spacingChanged(QGraphicsLayoutItem*, int); - -private: - int m_stretch; - Qt::Alignment m_alignment; - int m_spacing; -}; - - -QML_DECLARE_TYPE(GraphicsLinearLayoutStretchItemObject) -QML_DECLARE_TYPE(GraphicsLinearLayoutObject) -QML_DECLARE_TYPEINFO(GraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES) - -#endif - - diff --git a/declarativeimports/graphicslayouts/qmldir b/declarativeimports/graphicslayouts/qmldir deleted file mode 100644 index 7d011655f..000000000 --- a/declarativeimports/graphicslayouts/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -plugin graphicslayoutsbindingsplugin - diff --git a/declarativeimports/graphicswidgets/CMakeLists.txt b/declarativeimports/graphicswidgets/CMakeLists.txt deleted file mode 100644 index 27f6d07e6..000000000 --- a/declarativeimports/graphicswidgets/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -project(graphicswidgetsbindings) - -set(graphicswidgetsbindings_SRCS - graphicswidgetsbindingsplugin.cpp - declarativetabbar.cpp - ) - -INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - ${KDE4_INCLUDES} -) - -qt4_automoc(${graphicswidgetsbindings_SRCS}) - - -add_library(graphicswidgetsbindingsplugin SHARED ${graphicswidgetsbindings_SRCS}) -target_link_libraries(graphicswidgetsbindingsplugin ${KDE4_PLASMA_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}) - -install(TARGETS graphicswidgetsbindingsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/graphicswidgets) -install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/graphicswidgets) diff --git a/declarativeimports/graphicswidgets/declarativetabbar.cpp b/declarativeimports/graphicswidgets/declarativetabbar.cpp deleted file mode 100644 index 10532e18e..000000000 --- a/declarativeimports/graphicswidgets/declarativetabbar.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/*************************************************************************** - * Copyright 2010 Marco Martin * - * * - * 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, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * - ***************************************************************************/ - - -#include "declarativetabbar.h" - -TabBarAttached::TabBarAttached(QObject *parent) - : QObject(parent) -{ -} - -void TabBarAttached::setTabText(const QString &text) -{ - if (text == m_tabText) - return; - - m_tabText = text; - emit tabTextChanged(reinterpret_cast(parent()), m_tabText); -} - -QString TabBarAttached::tabText()const -{ - return m_tabText; -} - -DeclarativeTabBar::DeclarativeTabBar(QObject *parent) - : Plasma::TabBar(qobject_cast(parent)) -{} - -DeclarativeTabBar::~DeclarativeTabBar() -{} - -void DeclarativeTabBar::updateTabText(QGraphicsLayoutItem *item, const QString &text) -{ - for (int i=0; i < count(); ++i) { - if (item == tabAt(i)) { - setTabText(i, text); - break; - } - } -} - -QHash DeclarativeTabBar::m_attachedProperties; - -TabBarAttached *DeclarativeTabBar::qmlAttachedProperties(QObject *obj) -{ - // ### This is not allowed - you must attach to any object - if (!qobject_cast(obj)) { - return 0; - } - - TabBarAttached *attached = new TabBarAttached(obj); - m_attachedProperties.insert(qobject_cast(obj), attached); - return attached; -} - -#include "declarativetabbar.moc" - diff --git a/declarativeimports/graphicswidgets/declarativetabbar.h b/declarativeimports/graphicswidgets/declarativetabbar.h deleted file mode 100644 index cf8151fb2..000000000 --- a/declarativeimports/graphicswidgets/declarativetabbar.h +++ /dev/null @@ -1,105 +0,0 @@ -/*************************************************************************** - * Copyright 2010 Marco Martin * - * * - * 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, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * - ***************************************************************************/ - - -#ifndef DECLARATIVETABBAR -#define DECLARATIVETABBAR - -#include -#include - -#include "plasma/widgets/tabbar.h" - -class TabBarAttached : public QObject -{ - Q_OBJECT - - Q_PROPERTY(QString tabText READ tabText WRITE setTabText NOTIFY tabTextChanged) - -public: - TabBarAttached(QObject *parent); - - void setTabText(const QString& text); - QString tabText() const; - -Q_SIGNALS: - void tabTextChanged(QGraphicsLayoutItem*, const QString&); - -private: - QString m_tabText; -}; - -class DeclarativeTabBar : public Plasma::TabBar -{ - Q_OBJECT - - Q_PROPERTY(KTabBar *nativeWidget READ nativeWidget) - Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex) - Q_PROPERTY(int count READ count) - Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet) - Q_PROPERTY(bool tabBarShown READ isTabBarShown WRITE setTabBarShown) - - Q_PROPERTY(QDeclarativeListProperty children READ children) - Q_CLASSINFO("DefaultProperty", "children") - -public: - DeclarativeTabBar(QObject *parent = 0); - ~DeclarativeTabBar(); - - QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); } - - static TabBarAttached *qmlAttachedProperties(QObject *); - -private Q_SLOTS: - void updateTabText(QGraphicsLayoutItem *, const QString&); - -private: - static QHash m_attachedProperties; - - static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) { - QString text; - DeclarativeTabBar *tabBar = static_cast(prop->object); - if (TabBarAttached *obj = m_attachedProperties.value(item)) { - text = obj->tabText(); - QObject::connect(obj, SIGNAL(tabTextChanged(QGraphicsLayoutItem*,int)), - tabBar, SLOT(updateTabText(QGraphicsLayoutItem*,int))); - } - tabBar->addTab(text, item); - } - - static void children_clear(QDeclarativeListProperty *prop) { - DeclarativeTabBar *tabBar = static_cast(prop->object); - for (int i=0; i < tabBar->count(); ++i) { - tabBar->removeTab(0); - } - } - - static int children_count(QDeclarativeListProperty *prop) { - return static_cast(prop->object)->count(); - } - - static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) { - return static_cast(prop->object)->tabAt(index); - } -}; - -QML_DECLARE_TYPE(DeclarativeTabBar) -QML_DECLARE_TYPEINFO(DeclarativeTabBar, QML_HAS_ATTACHED_PROPERTIES) - -#endif diff --git a/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp b/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp deleted file mode 100644 index 72bf7f828..000000000 --- a/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright 2009 by Alan Alpert - * Copyright 2010 by Ménard Alexis - * Copyright 2010 by Marco Martin - - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2, 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 Library General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "graphicswidgetsbindingsplugin.h" - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "declarativetabbar.h" - -SignalPlotter::SignalPlotter(QGraphicsItem *parent) - : Plasma::SignalPlotter(parent) -{} - -SignalPlotter::~SignalPlotter() -{} - -void SignalPlotter::addSample(const QVariantList &samples) -{ - QList doubleSamples; - foreach (const QVariant &sampleItem, samples) { - doubleSamples << sampleItem.toDouble(); - } - if (plotColors().size() == doubleSamples.size()) { - Plasma::SignalPlotter::addSample(doubleSamples); - } -} - -void GraphicsWidgetsBindingsPlugin::registerTypes(const char *uri) -{ - Q_ASSERT(uri == QLatin1String("org.kde.plasma.graphicswidgets")); - qmlRegisterType(uri, 0, 1, "TabBar"); - qmlRegisterType(uri, 0, 1, "SignalPlotter"); - - qmlRegisterType(uri, 0, 1, "BusyWidget"); - qmlRegisterType(uri, 0, 1, "CheckBox"); - qmlRegisterType(uri, 0, 1, "ComboBox"); - qmlRegisterType(uri, 0, 1, "FlashingLabel"); - qmlRegisterType(uri, 0, 1, "Frame"); - qmlRegisterType(uri, 0, 1, "GroupBox"); - qmlRegisterType(uri, 0, 1, "IconWidget"); - qmlRegisterType(uri, 0, 1, "ItemBackground"); - qmlRegisterType(uri, 0, 1, "Label"); - qmlRegisterType(uri, 0, 1, "LineEdit"); - qmlRegisterType(uri, 0, 1, "Meter"); - qmlRegisterType(uri, 0, 1, "PushButton"); - qmlRegisterType(uri, 0, 1, "RadioButton"); - qmlRegisterType(uri, 0, 1, "ScrollBar"); - qmlRegisterType(uri, 0, 1, "ScrollWidget"); - qmlRegisterType(uri, 0, 1, "Separator"); - qmlRegisterType(uri, 0, 1, "Slider"); - qmlRegisterType(uri, 0, 1, "SpinBox"); - qmlRegisterType(uri, 0, 1, "SvgWidget"); - qmlRegisterType(uri, 0, 1, "TextBrowser"); - qmlRegisterType(uri, 0, 1, "TextEdit"); - qmlRegisterType(uri, 0, 1, "ToolButton"); - qmlRegisterType(uri, 0, 1, "TreeView"); - qmlRegisterType(uri, 0, 1, "VideoWidget"); - qmlRegisterType(uri, 0, 1, "WebView"); -} - - -#include "graphicswidgetsbindingsplugin.moc" - diff --git a/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.h b/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.h deleted file mode 100644 index 46a9f5d81..000000000 --- a/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2009 by Alan Alpert - * Copyright 2010 by Ménard Alexis - * Copyright 2010 by Marco Martin - - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2, 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 Library General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef GRAPHICSWIDGETSBINDINGSPLUGIN_H -#define GRAPHICSWIDGETSBINDINGSPLUGIN_H - -#include - -#include - -class SignalPlotter : public Plasma::SignalPlotter -{ - Q_OBJECT - -public: - SignalPlotter(QGraphicsItem *parent = 0); - ~SignalPlotter(); - Q_INVOKABLE void addSample(const QVariantList &samples); -}; - -class GraphicsWidgetsBindingsPlugin : public QDeclarativeExtensionPlugin -{ - Q_OBJECT - -public: - void registerTypes(const char *uri); -}; - -Q_EXPORT_PLUGIN2(graphicswidgetsbindingsplugin, GraphicsWidgetsBindingsPlugin) - -#endif diff --git a/declarativeimports/graphicswidgets/qmldir b/declarativeimports/graphicswidgets/qmldir deleted file mode 100644 index 20c0e32dc..000000000 --- a/declarativeimports/graphicswidgets/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -plugin graphicswidgetsbindingsplugin - diff --git a/plasma/runnercontext.cpp b/plasma/runnercontext.cpp index e3072c4c7..5e8f406bb 100644 --- a/plasma/runnercontext.cpp +++ b/plasma/runnercontext.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include "abstractrunner.h" #include "querymatch.h"