Hello community, here is the log from the commit of package akonadiconsole for openSUSE:Factory checked in at 2019-04-27 11:57:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadiconsole (Old) and /work/SRC/openSUSE:Factory/.akonadiconsole.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadiconsole" Sat Apr 27 11:57:53 2019 rev:30 rq:696176 version:19.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadiconsole/akonadiconsole.changes 2019-03-11 13:41:07.285631820 +0100 +++ /work/SRC/openSUSE:Factory/.akonadiconsole.new.5536/akonadiconsole.changes 2019-04-27 11:57:56.543837509 +0200 @@ -1,0 +2,33 @@ +Sat Apr 20 06:51:51 UTC 2019 - [email protected] + +- Update to 19.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.04.0.php +- No code changes since 19.03.90 + +------------------------------------------------------------------- +Tue Apr 09 20:54:37 UTC 2019 - [email protected] + +- Update to 19.03.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/announce-applications-19.04-rc.php +- Changes since 19.03.80: + * No code changes since 19.03.80 + +------------------------------------------------------------------- +Wed Mar 27 06:40:54 UTC 2019 - [email protected] + +- Update to 19.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/announce-applications-19.04-beta.php +- Changes since 18.12.3: + * Calendar browsing model: add UID column + * Remove "Calendar", in favour of "Calendar/Tasks" + * Remove deprecated methods + * Remove old include + * Adapt to new api + +------------------------------------------------------------------- Old: ---- akonadiconsole-18.12.3.tar.xz New: ---- akonadiconsole-19.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadiconsole.spec ++++++ --- /var/tmp/diff_new_pack.cHzrgy/_old 2019-04-27 11:57:57.095837092 +0200 +++ /var/tmp/diff_new_pack.cHzrgy/_new 2019-04-27 11:57:57.095837092 +0200 @@ -20,7 +20,7 @@ # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Name: akonadiconsole -Version: 18.12.3 +Version: 19.04.0 Release: 0 Summary: Management and debugging console for akonadi License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ akonadiconsole-18.12.3.tar.xz -> akonadiconsole-19.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/.gitignore new/akonadiconsole-19.04.0/.gitignore --- old/akonadiconsole-18.12.3/.gitignore 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/.gitignore 2019-04-08 13:47:11.000000000 +0200 @@ -16,6 +16,6 @@ Makefile avail random_seed -/build/ +/build*/ CMakeLists.txt.user* *.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/CMakeLists.txt new/akonadiconsole-19.04.0/CMakeLists.txt --- old/akonadiconsole-18.12.3/CMakeLists.txt 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/CMakeLists.txt 2019-04-08 13:47:11.000000000 +0200 @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.1) -set(KDEPIM_VERSION_NUMBER "5.10.3") +cmake_minimum_required(VERSION 3.5) +set(KDEPIM_VERSION_NUMBER "5.11.0") project(akonadiconsole VERSION ${KDEPIM_VERSION_NUMBER}) -set(KF5_VERSION "5.51.0") +set(KF5_MIN_VERSION "5.56.0") -find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) +find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(ECMInstallIcons) @@ -27,7 +27,7 @@ # Do NOT add quote -set(KDEPIM_DEV_VERSION) +set(KDEPIM_DEV_VERSION ) # add an extra space if(DEFINED KDEPIM_DEV_VERSION) @@ -40,38 +40,38 @@ set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") -set(AKONADI_CONTACT_VERSION "5.10.3") -set(CALENDARSUPPORT_LIB_VERSION_LIB "5.10.3") -set(AKONADI_VERSION "5.10.3") -set(AKONADI_SEARCH_VERSION "5.10.3") +set(AKONADI_CONTACT_VERSION "5.11.0") +set(CALENDARSUPPORT_LIB_VERSION_LIB "5.11.0") +set(AKONADI_VERSION "5.11.0") +set(AKONADI_SEARCH_VERSION "5.11.0") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") -set(QT_REQUIRED_VERSION "5.9.0") +set(QT_REQUIRED_VERSION "5.10.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) -set(MESSAGELIB_LIB_VERSION_LIB "5.10.3") -set(LIBKDEPIM_LIB_VERSION_LIB "5.10.3") -set(KCALENDARCORE_LIB_VERSION "5.10.3") -set(KCONTACTS_LIB_VERSION "5.10.3") -set(KMIME_LIB_VERSION "5.10.3") +set(MESSAGELIB_LIB_VERSION_LIB "5.11.0") +set(LIBKDEPIM_LIB_VERSION_LIB "5.11.0") +set(KCALENDARCORE_LIB_VERSION "5.11.0") +set(KCONTACTS_LIB_VERSION "5.11.0") +set(KMIME_LIB_VERSION "5.11.0") # Find KF5 package -find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5DocTools ${KF5_VERSION} REQUIRED) -find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5ItemModels ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5TextWidgets ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5Crash ${KF5_VERSION} REQUIRED) -find_package(KF5Completion ${KF5_VERSION} REQUIRED) -find_package(KF5ItemViews ${KF5_VERSION} REQUIRED) -find_package(KF5KIO ${KF5_VERSION} REQUIRED) +find_package(KF5Completion ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5DocTools ${KF5_MIN_VERSION} REQUIRED) +find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5ItemModels ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5Crash ${KF5_MIN_VERSION} REQUIRED) +find_package(KF5Completion ${KF5_MIN_VERSION} REQUIRED) +find_package(KF5ItemViews ${KF5_MIN_VERSION} REQUIRED) +find_package(KF5KIO ${KF5_MIN_VERSION} REQUIRED) # Find KdepimLibs Package find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/COPYING.DOC new/akonadiconsole-19.04.0/COPYING.DOC --- old/akonadiconsole-18.12.3/COPYING.DOC 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/COPYING.DOC 2019-04-08 13:47:11.000000000 +0200 @@ -355,7 +355,7 @@ of the GNU Free Documentation License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. See -http://www.gnu.org/copyleft/. +https://www.gnu.org/copyleft/. Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered version of this diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/autotests/jobtrackermodeltest.cpp new/akonadiconsole-19.04.0/autotests/jobtrackermodeltest.cpp --- old/akonadiconsole-18.12.3/autotests/jobtrackermodeltest.cpp 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/autotests/jobtrackermodeltest.cpp 2019-04-08 13:47:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <[email protected]> + Copyright (C) 2017-2019 Montel Laurent <[email protected]> Copyright (c) 2017 David Faure <[email protected]> This program is free software; you can redistribute it and/or modify it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/autotests/jobtrackermodeltest.h new/akonadiconsole-19.04.0/autotests/jobtrackermodeltest.h --- old/akonadiconsole-18.12.3/autotests/jobtrackermodeltest.h 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/autotests/jobtrackermodeltest.h 2019-04-08 13:47:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <[email protected]> + Copyright (C) 2017-2019 Montel Laurent <[email protected]> Copyright (c) 2017 David Faure <[email protected]> This program is free software; you can redistribute it and/or modify it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/autotests/jobtrackersearchwidgettest.cpp new/akonadiconsole-19.04.0/autotests/jobtrackersearchwidgettest.cpp --- old/akonadiconsole-18.12.3/autotests/jobtrackersearchwidgettest.cpp 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/autotests/jobtrackersearchwidgettest.cpp 2019-04-08 13:47:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <[email protected]> + Copyright (C) 2017-2019 Montel Laurent <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/autotests/jobtrackersearchwidgettest.h new/akonadiconsole-19.04.0/autotests/jobtrackersearchwidgettest.h --- old/akonadiconsole-18.12.3/autotests/jobtrackersearchwidgettest.h 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/autotests/jobtrackersearchwidgettest.h 2019-04-08 13:47:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <[email protected]> + Copyright (C) 2017-2019 Montel Laurent <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/autotests/jobtrackertest.cpp new/akonadiconsole-19.04.0/autotests/jobtrackertest.cpp --- old/akonadiconsole-18.12.3/autotests/jobtrackertest.cpp 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/autotests/jobtrackertest.cpp 2019-04-08 13:47:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <[email protected]> + Copyright (C) 2017-2019 Montel Laurent <[email protected]> Copyright (c) 2017 David Faure <[email protected]> This program is free software; you can redistribute it and/or modify it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/autotests/jobtrackertest.h new/akonadiconsole-19.04.0/autotests/jobtrackertest.h --- old/akonadiconsole-18.12.3/autotests/jobtrackertest.h 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/autotests/jobtrackertest.h 2019-04-08 13:47:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <[email protected]> + Copyright (C) 2017-2019 Montel Laurent <[email protected]> Copyright (c) 2017 David Faure <[email protected]> This program is free software; you can redistribute it and/or modify it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/src/akonadibrowsermodel.cpp new/akonadiconsole-19.04.0/src/akonadibrowsermodel.cpp --- old/akonadiconsole-18.12.3/src/akonadibrowsermodel.cpp 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/src/akonadibrowsermodel.cpp 2019-04-08 13:47:11.000000000 +0200 @@ -179,7 +179,7 @@ CalendarState() { m_collectionHeaders << QStringLiteral("Collection"); - m_itemHeaders << QStringLiteral("Summary") << QStringLiteral("DateTime start") << QStringLiteral("DateTime End") << QStringLiteral("Type"); + m_itemHeaders << QStringLiteral("UID") << QStringLiteral("Summary") << QStringLiteral("DateTime start") << QStringLiteral("DateTime End") << QStringLiteral("Type"); } virtual ~CalendarState() {} @@ -195,17 +195,15 @@ const IncidencePtr incidence = item.payload<IncidencePtr>(); switch (column) { case 0: - return incidence->summary(); - break; + return incidence->uid(); case 1: - return incidence->dtStart().toString(); - break; + return incidence->summary(); case 2: - return incidence->dateTime(KCalCore::Incidence::RoleEnd).toString(); - break; + return incidence->dtStart().toString(); case 3: + return incidence->dateTime(KCalCore::Incidence::RoleEnd).toString(); + case 4: return incidence->typeStr(); - break; default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/src/browserwidget.cpp new/akonadiconsole-19.04.0/src/browserwidget.cpp --- old/akonadiconsole-18.12.3/src/browserwidget.cpp 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/src/browserwidget.cpp 2019-04-08 13:47:11.000000000 +0200 @@ -45,7 +45,6 @@ #include <AkonadiWidgets/entitytreeview.h> #include <AkonadiWidgets/etmviewstatesaver.h> #include <AkonadiCore/favoritecollectionsmodel.h> -#include <AkonadiCore/quotacolorproxymodel.h> #include <AkonadiCore/tagmodel.h> #include <AkonadiCore/statisticsproxymodel.h> #include <AkonadiCore/tagdeletejob.h> @@ -167,11 +166,8 @@ statisticsProxyModel->setToolTipEnabled(true); statisticsProxyModel->setSourceModel(collectionFilter); - Akonadi::QuotaColorProxyModel *quotaProxyModel = new Akonadi::QuotaColorProxyModel(this); - quotaProxyModel->setWarningThreshold(50.0); - quotaProxyModel->setSourceModel(statisticsProxyModel); - mCollectionView->setModel(quotaProxyModel); + mCollectionView->setModel(statisticsProxyModel); Akonadi::SelectionProxyModel *selectionProxyModel = new Akonadi::SelectionProxyModel(mCollectionView->selectionModel(), this); selectionProxyModel->setSourceModel(mBrowserModel); @@ -200,7 +196,6 @@ itemUi.modelBox->addItem(QStringLiteral("Generic")); itemUi.modelBox->addItem(QStringLiteral("Mail")); itemUi.modelBox->addItem(QStringLiteral("Contacts")); - itemUi.modelBox->addItem(QStringLiteral("Calendar")); itemUi.modelBox->addItem(QStringLiteral("Calendar/Tasks")); connect(itemUi.modelBox, static_cast<void (KComboBox::*)(int)>(&KComboBox::activated), this, &BrowserWidget::modelChanged); QTimer::singleShot(0, this, &BrowserWidget::modelChanged); @@ -212,7 +207,7 @@ connect(itemUi.itemView, SIGNAL(clicked(QModelIndex)), SLOT(itemActivated(QModelIndex))); splitter3->addWidget(itemViewParent); - itemViewParent->layout()->setMargin(0); + itemViewParent->layout()->setContentsMargins(0, 0, 0, 0); QWidget *contentViewParent = new QWidget(this); contentUi.setupUi(contentViewParent); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/src/jobtrackerfilterproxymodel.cpp new/akonadiconsole-19.04.0/src/jobtrackerfilterproxymodel.cpp --- old/akonadiconsole-18.12.3/src/jobtrackerfilterproxymodel.cpp 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/src/jobtrackerfilterproxymodel.cpp 2019-04-08 13:47:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <[email protected]> + Copyright (C) 2017-2019 Montel Laurent <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/src/jobtrackerfilterproxymodel.h new/akonadiconsole-19.04.0/src/jobtrackerfilterproxymodel.h --- old/akonadiconsole-18.12.3/src/jobtrackerfilterproxymodel.h 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/src/jobtrackerfilterproxymodel.h 2019-04-08 13:47:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <[email protected]> + Copyright (C) 2017-2019 Montel Laurent <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/src/jobtrackersearchwidget.cpp new/akonadiconsole-19.04.0/src/jobtrackersearchwidget.cpp --- old/akonadiconsole-18.12.3/src/jobtrackersearchwidget.cpp 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/src/jobtrackersearchwidget.cpp 2019-04-08 13:47:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <[email protected]> + Copyright (C) 2017-2019 Montel Laurent <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as @@ -27,7 +27,7 @@ { QHBoxLayout *mainLayout = new QHBoxLayout(this); mainLayout->setObjectName(QStringLiteral("mainlayout")); - mainLayout->setMargin(0); + mainLayout->setContentsMargins(0, 0, 0, 0); mSearchLineEdit = new QLineEdit(this); mSearchLineEdit->setObjectName(QStringLiteral("searchline")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/src/jobtrackersearchwidget.h new/akonadiconsole-19.04.0/src/jobtrackersearchwidget.h --- old/akonadiconsole-18.12.3/src/jobtrackersearchwidget.h 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/src/jobtrackersearchwidget.h 2019-04-08 13:47:11.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <[email protected]> + Copyright (C) 2017-2019 Montel Laurent <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/src/notificationfiltermodel.cpp new/akonadiconsole-19.04.0/src/notificationfiltermodel.cpp --- old/akonadiconsole-18.12.3/src/notificationfiltermodel.cpp 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/src/notificationfiltermodel.cpp 2019-04-08 13:47:11.000000000 +0200 @@ -16,7 +16,7 @@ * 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, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "notificationfiltermodel.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.12.3/src/notificationfiltermodel.h new/akonadiconsole-19.04.0/src/notificationfiltermodel.h --- old/akonadiconsole-18.12.3/src/notificationfiltermodel.h 2019-02-24 12:50:27.000000000 +0100 +++ new/akonadiconsole-19.04.0/src/notificationfiltermodel.h 2019-04-08 13:47:11.000000000 +0200 @@ -15,7 +15,7 @@ * 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, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef NOTIFICATIONFILTERMODEL_H
