From f872f64e4de04c07b01eb795b4bcbc333f56a77a Mon Sep 17 00:00:00 2001 From: Kevin Krammer Date: Mon, 21 Jan 2013 21:18:58 +0100 Subject: [PATCH] Ported lcd number --- lib/declarativelcdnumber.cpp | 29 ----------------------------- lib/declarativelcdnumber_p.h | 36 ------------------------------------ lib/declarativewidgetsdocument.cpp | 4 ++-- lib/lib.pro | 2 -- 4 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 lib/declarativelcdnumber.cpp delete mode 100644 lib/declarativelcdnumber_p.h diff --git a/lib/declarativelcdnumber.cpp b/lib/declarativelcdnumber.cpp deleted file mode 100644 index 4c8d30b..0000000 --- a/lib/declarativelcdnumber.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 "declarativelcdnumber_p.h" - -DeclarativeLCDNumber::DeclarativeLCDNumber(QObject *parent) - : DeclarativeWidgetProxy(parent) -{ - connectAllSignals(m_proxiedObject, this); -} - -CUSTOM_METAOBJECT(DeclarativeLCDNumber, QLCDNumber) diff --git a/lib/declarativelcdnumber_p.h b/lib/declarativelcdnumber_p.h deleted file mode 100644 index 05a2706..0000000 --- a/lib/declarativelcdnumber_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 DECLARATIVELCDNUMBER_P_H -#define DECLARATIVELCDNUMBER_P_H - -#include "declarativewidgetproxy_p.h" - -#include - -class DeclarativeLCDNumber : public DeclarativeWidgetProxy -{ - DECLARATIVE_OBJECT - - public: - explicit DeclarativeLCDNumber(QObject *parent = 0); -}; - -#endif diff --git a/lib/declarativewidgetsdocument.cpp b/lib/declarativewidgetsdocument.cpp index 83582ed..d18069e 100644 --- a/lib/declarativewidgetsdocument.cpp +++ b/lib/declarativewidgetsdocument.cpp @@ -34,7 +34,6 @@ #include "declarativehboxlayout_p.h" #include "declarativeinputdialog_p.h" #include "declarativeitemviewextension_p.h" -#include "declarativelcdnumber_p.h" #include "declarativemainwindowextension_p.h" #include "declarativemenubarextension_p.h" #include "declarativemenuextension_p.h" @@ -67,6 +66,7 @@ #include #include #include +#include #include #include #include @@ -109,7 +109,6 @@ DeclarativeWidgetsDocument::DeclarativeWidgetsDocument(const QUrl &url, QObject qmlRegisterType("QtGui", 1, 0, "DeclarativeContextProperty"); qmlRegisterType("QtGui", 1, 0, "DeclarativeView"); qmlRegisterType("QtGui", 1, 0, "Label"); - qmlRegisterType("QtGui", 1, 0, "LCDNumber"); qmlRegisterType("QtGui", 1, 0, "ProgressBar"); qmlRegisterType(); qmlRegisterType(); @@ -152,6 +151,7 @@ DeclarativeWidgetsDocument::DeclarativeWidgetsDocument(const QUrl &url, QObject qmlRegisterExtendedType("QtGui", 1, 0, "InputDialog"); qmlRegisterExtendedType("QtGui", 1, 0, "Label"); qmlRegisterExtendedType("QtGui", 1, 0, "LineEdit"); + qmlRegisterExtendedType("QtGui", 1, 0, "LCDNumber"); qmlRegisterExtendedType("QtGui", 1, 0, "ListView"); qmlRegisterExtendedType("QtGui", 1, 0, "MainWindow"); qmlRegisterExtendedType("QtGui", 1, 0, "Menu"); diff --git a/lib/lib.pro b/lib/lib.pro index 6aed520..7419fbf 100644 --- a/lib/lib.pro +++ b/lib/lib.pro @@ -22,7 +22,6 @@ HEADERS = \ declarativeitemviewextension_p.h \ declarativelayoutextension.h \ declarativelayoutproxy_p.h \ - declarativelcdnumber_p.h \ declarativemainwindowextension_p.h \ declarativemenubarextension_p.h \ declarativemenuextension_p.h \ @@ -63,7 +62,6 @@ SOURCES = \ declarativeinputdialog.cpp \ declarativeitemviewextension.cpp \ declarativelayoutextension.cpp \ - declarativelcdnumber.cpp \ declarativemainwindowextension.cpp \ declarativemenubarextension.cpp \ declarativemenuextension.cpp \ -- 1.7.2.5