From: Kevin Krammer Date: Wed, 9 Jan 2013 09:43:10 +0000 (+0100) Subject: Don't need DeclarativeLabel any more X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=5eca890d9d13f51f4d8c1b2711bbe61c86932bee;p=konrad%2FDeclarativeWidgets.git Don't need DeclarativeLabel any more Works with normal widget extension --- diff --git a/lib/declarativelabel.cpp b/lib/declarativelabel.cpp deleted file mode 100644 index fc94f36..0000000 --- a/lib/declarativelabel.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* - Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com - Author: Kevin Krammer, krake@kdab.com - Author: Tobias Koenig, tokoe@kdab.com - - 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 "declarativelabel_p.h" - -DeclarativeLabel::DeclarativeLabel(QObject *parent) - : DeclarativeWidgetProxy(parent) -{ - connectAllSignals(m_proxiedObject, this); -} - -CUSTOM_METAOBJECT(DeclarativeLabel, QLabel) diff --git a/lib/declarativelabel_p.h b/lib/declarativelabel_p.h deleted file mode 100644 index 8d643e7..0000000 --- a/lib/declarativelabel_p.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com - Author: Kevin Krammer, krake@kdab.com - Author: Tobias Koenig, tokoe@kdab.com - - 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 DECLARATIVELABEL_P_H -#define DECLARATIVELABEL_P_H - -#include "declarativewidgetproxy_p.h" - -#include - -class DeclarativeLabel : public DeclarativeWidgetProxy -{ - DECLARATIVE_OBJECT - - public: - explicit DeclarativeLabel(QObject *parent = 0); -}; - -#endif diff --git a/lib/lib.pro b/lib/lib.pro index 5630e8a..0ebdd05 100644 --- a/lib/lib.pro +++ b/lib/lib.pro @@ -31,7 +31,6 @@ HEADERS = \ declarativegroupbox_p.h \ declarativehboxlayout_p.h \ declarativeinputdialog_p.h \ - declarativelabel_p.h \ declarativelayoutextension.h \ declarativelayoutproxy_p.h \ declarativelcdnumber_p.h \ @@ -99,7 +98,6 @@ SOURCES = \ declarativegroupbox.cpp \ declarativehboxlayout.cpp \ declarativeinputdialog.cpp \ - declarativelabel.cpp \ declarativelayoutextension.cpp \ declarativelcdnumber.cpp \ declarativelineedit.cpp \