From 014cc2a0fbb5f9655f778c0a1e0436f62f10c0c0 Mon Sep 17 00:00:00 2001 From: Kevin Krammer Date: Mon, 21 Jan 2013 21:08:52 +0100 Subject: [PATCH] Ported date edit --- lib/declarativedateedit.cpp | 29 ----------------------------- lib/declarativedateedit_p.h | 36 ------------------------------------ lib/declarativewidgetsdocument.cpp | 3 +-- lib/lib.pro | 2 -- 4 files changed, 1 insertions(+), 69 deletions(-) delete mode 100644 lib/declarativedateedit.cpp delete mode 100644 lib/declarativedateedit_p.h diff --git a/lib/declarativedateedit.cpp b/lib/declarativedateedit.cpp deleted file mode 100644 index 5c05b07..0000000 --- a/lib/declarativedateedit.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 "declarativedateedit_p.h" - -DeclarativeDateEdit::DeclarativeDateEdit(QObject *parent) - : DeclarativeWidgetProxy(parent) -{ - connectAllSignals(m_proxiedObject, this); -} - -CUSTOM_METAOBJECT(DeclarativeDateEdit, QDateEdit) diff --git a/lib/declarativedateedit_p.h b/lib/declarativedateedit_p.h deleted file mode 100644 index be9a32e..0000000 --- a/lib/declarativedateedit_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 DECLARATIVEDATEEDIT_P_H -#define DECLARATIVEDATEEDIT_P_H - -#include "declarativewidgetproxy_p.h" - -#include - -class DeclarativeDateEdit : public DeclarativeWidgetProxy -{ - DECLARATIVE_OBJECT - - public: - explicit DeclarativeDateEdit(QObject *parent = 0); -}; - -#endif diff --git a/lib/declarativewidgetsdocument.cpp b/lib/declarativewidgetsdocument.cpp index 28eaff7..a9302e5 100644 --- a/lib/declarativewidgetsdocument.cpp +++ b/lib/declarativewidgetsdocument.cpp @@ -26,7 +26,6 @@ #include "declarativebuttongroupextension_p.h" #include "declarativecalendarwidget_p.h" #include "declarativecolordialog_p.h" -#include "declarativedateedit_p.h" #include "declarativedatetimeedit_p.h" #include "declarativedeclarativecontext_p.h" #include "declarativedeclarativeview_p.h" @@ -107,7 +106,6 @@ DeclarativeWidgetsDocument::DeclarativeWidgetsDocument(const QUrl &url, QObject // widgets qmlRegisterType("QtGui", 1, 0, "CalendarWidget"); qmlRegisterType("QtGui", 1, 0, "CheckBox"); - qmlRegisterType("QtGui", 1, 0, "DateEdit"); qmlRegisterType("QtGui", 1, 0, "DateTimeEdit"); qmlRegisterType("QtGui", 1, 0, "DeclarativeContext"); qmlRegisterType("QtGui", 1, 0, "DeclarativeContextProperty"); @@ -145,6 +143,7 @@ DeclarativeWidgetsDocument::DeclarativeWidgetsDocument(const QUrl &url, QObject qmlRegisterExtendedType("QtGui", 1, 0, "ColorDialog"); qmlRegisterExtendedType("QtGui", 1, 0, "ColumnView"); qmlRegisterExtendedType("QtGui", 1, 0, "CommandLinkButton"); + qmlRegisterExtendedType("QtGui", 1, 0, "DateEdit"); qmlRegisterExtendedType("QtGui", 1, 0, "Dialog"); qmlRegisterExtendedType("QtGui", 1, 0, "DialogButtonBox"); qmlRegisterExtendedType("QtGui", 1, 0, "DoubleSpinBox"); diff --git a/lib/lib.pro b/lib/lib.pro index 578cc05..24ac35b 100644 --- a/lib/lib.pro +++ b/lib/lib.pro @@ -12,7 +12,6 @@ HEADERS = \ declarativebuttongroupextension_p.h \ declarativecalendarwidget_p.h \ declarativecolordialog_p.h \ - declarativedateedit_p.h \ declarativedatetimeedit_p.h \ declarativedeclarativecontext_p.h \ declarativedeclarativeview_p.h \ @@ -60,7 +59,6 @@ SOURCES = \ declarativebuttongroupextension.cpp \ declarativecalendarwidget.cpp \ declarativecolordialog.cpp \ - declarativedateedit.cpp \ declarativedatetimeedit.cpp \ declarativedeclarativecontext.cpp \ declarativedeclarativeview.cpp \ -- 1.7.2.5