remove Organizer prefixes from qml type names.

5 files changed, 55 insertions, 55 deletions

diff --git a/plugins/declarative/organizer/organizer.pro b/plugins/declarative/organizer/organizer.pro
index fa58d4f14d..dcf1e59051 100644
--- a/plugins/declarative/organizer/organizer.pro
+++ b/plugins/declarative/organizer/organizer.pro
@@ -37,8 +37,8 @@ HEADERS += qdeclarativeorganizermodel_p.h \
            qdeclarativeopenmetaobject_p.h \
            qdeclarativeorganizeritemfilter_p.h \
            qdeclarativeorganizeritemmetaobject_p.h \
-           qdeclarativeorganizeritemrecurrencerule_p.h \
-           qdeclarativeorganizeritemcollection_p.h \
+           qdeclarativeorganizerrecurrencerule_p.h \
+           qdeclarativeorganizercollection_p.h \
            qdeclarativeorganizeritemsortorder_p.h \
            qdeclarativeorganizeritemfetchhint_p.h
 
diff --git a/plugins/declarative/organizer/plugin.cpp b/plugins/declarative/organizer/plugin.cpp
index eaf9e8fae5..3e31fde991 100644
--- a/plugins/declarative/organizer/plugin.cpp
+++ b/plugins/declarative/organizer/plugin.cpp
@@ -47,10 +47,10 @@
 #include "qdeclarativeorganizeritem_p.h"
 #include "qdeclarativeorganizeritemdetail_p.h"
 #include "qdeclarativeorganizeritemfilter_p.h"
-#include "qdeclarativeorganizeritemrecurrencerule_p.h"
+#include "qdeclarativeorganizerrecurrencerule_p.h"
 #include "qdeclarativeorganizeritemfetchhint_p.h"
 #include "qdeclarativeorganizeritemsortorder_p.h"
-#include "qdeclarativeorganizeritemcollection_p.h"
+#include "qdeclarativeorganizercollection_p.h"
 
 QT_USE_NAMESPACE
 
@@ -64,50 +64,50 @@ public:
         Q_ASSERT(uri == QLatin1String("QtMobility.organizer"));
         qmlRegisterType<QDeclarativeOrganizerModel>(uri, 1, 1, "OrganizerModel");
         qmlRegisterType<QDeclarativeOrganizerItem>(uri, 1, 1, "OrganizerItem");
-        qmlRegisterType<QDeclarativeOrganizerItemRecurrenceRule>(uri, 1, 1, "OrganizerItemRecurrenceRule");
-        qmlRegisterType<QDeclarativeOrganizerItemFetchHint>(uri, 1, 1, "OrganizerItemFetchHint");
-        qmlRegisterType<QDeclarativeOrganizerItemSortOrder>(uri, 1, 1, "OrganizerItemSortOrder");
-        qmlRegisterType<QDeclarativeOrganizerCollection>(uri, 1, 1, "OrganizerCollection");
+        qmlRegisterType<QDeclarativeOrganizerRecurrenceRule>(uri, 1, 1, "RecurrenceRule");
+        qmlRegisterType<QDeclarativeOrganizerItemFetchHint>(uri, 1, 1, "FetchHint");
+        qmlRegisterType<QDeclarativeOrganizerItemSortOrder>(uri, 1, 1, "SortOrder");
+        qmlRegisterType<QDeclarativeOrganizerCollection>(uri, 1, 1, "Collection");
 
         //items
         qmlRegisterType<QDeclarativeOrganizerItem>(uri, 1, 1, "OrganizerItem");
-        qmlRegisterType<QDeclarativeOrganizerEvent>(uri, 1, 1, "OrganizerEvent");
-        qmlRegisterType<QDeclarativeOrganizerEventOccurrence>(uri, 1, 1, "OrganizerEventOccurrence");
-        qmlRegisterType<QDeclarativeOrganizerJournal>(uri, 1, 1, "OrganizerJournal");
-        qmlRegisterType<QDeclarativeOrganizerNote>(uri, 1, 1, "OrganizerNote");
-        qmlRegisterType<QDeclarativeOrganizerTodo>(uri, 1, 1, "OrganizerTodo");
-        qmlRegisterType<QDeclarativeOrganizerTodoOccurrence>(uri, 1, 1, "OrganizerTodoOccurrence");
+        qmlRegisterType<QDeclarativeOrganizerEvent>(uri, 1, 1, "Event");
+        qmlRegisterType<QDeclarativeOrganizerEventOccurrence>(uri, 1, 1, "EventOccurrence");
+        qmlRegisterType<QDeclarativeOrganizerJournal>(uri, 1, 1, "Journal");
+        qmlRegisterType<QDeclarativeOrganizerNote>(uri, 1, 1, "Note");
+        qmlRegisterType<QDeclarativeOrganizerTodo>(uri, 1, 1, "Todo");
+        qmlRegisterType<QDeclarativeOrganizerTodoOccurrence>(uri, 1, 1, "TodoOccurrence");
 
         //details
-        qmlRegisterType<QDeclarativeOrganizerItemDetail>(uri, 1, 1, "OrganizerItemDetail");
-        qmlRegisterType<QDeclarativeOrganizerEventTime>(uri, 1, 1, "OrganizerEventTime");
-        qmlRegisterType<QDeclarativeOrganizerItemDescription>(uri, 1, 1, "OrganizerItemDescription");
-        qmlRegisterType<QDeclarativeOrganizerItemDisplayLabel>(uri, 1, 1, "OrganizerItemDisplayLabel");
-        qmlRegisterType<QDeclarativeOrganizerItemGuid>(uri, 1, 1, "OrganizerItemGuid");
-        qmlRegisterType<QDeclarativeOrganizerItemParent>(uri, 1, 1, "OrganizerItemParent");
-        qmlRegisterType<QDeclarativeOrganizerItemLocation>(uri, 1, 1, "OrganizerItemLocation");
-        qmlRegisterType<QDeclarativeOrganizerItemPriority>(uri, 1, 1, "OrganizerItemPriority");
-        qmlRegisterType<QDeclarativeOrganizerItemRecurrence>(uri, 1, 1, "OrganizerItemRecurrence");
-        qmlRegisterType<QDeclarativeOrganizerItemReminder>(uri, 1, 1, "OrganizerItemReminder");
-        qmlRegisterType<QDeclarativeOrganizerItemAudibleReminder>(uri, 1, 1, "OrganizerItemAudibleReminder");
-        qmlRegisterType<QDeclarativeOrganizerItemVisualReminder>(uri, 1, 1, "OrganizerItemVisualReminder");
-        qmlRegisterType<QDeclarativeOrganizerItemEmailReminder>(uri, 1, 1, "OrganizerItemEmailReminder");
-        qmlRegisterType<QDeclarativeOrganizerItemTimestamp>(uri, 1, 1, "OrganizerItemTimestamp");
-        qmlRegisterType<QDeclarativeOrganizerItemType>(uri, 1, 1, "OrganizerItemType");
-        qmlRegisterType<QDeclarativeOrganizerJournalTime>(uri, 1, 1, "OrganizerJournalTime");
-        qmlRegisterType<QDeclarativeOrganizerTodoProgress>(uri, 1, 1, "OrganizerTodoProgress");
-        qmlRegisterType<QDeclarativeOrganizerTodoTime>(uri, 1, 1, "OrganizerTodoTime");
+        qmlRegisterType<QDeclarativeOrganizerItemDetail>(uri, 1, 1, "Detail");
+        qmlRegisterType<QDeclarativeOrganizerEventTime>(uri, 1, 1, "EventTime");
+        qmlRegisterType<QDeclarativeOrganizerItemDescription>(uri, 1, 1, "Description");
+        qmlRegisterType<QDeclarativeOrganizerItemDisplayLabel>(uri, 1, 1, "DisplayLabel");
+        qmlRegisterType<QDeclarativeOrganizerItemGuid>(uri, 1, 1, "Guid");
+        qmlRegisterType<QDeclarativeOrganizerItemParent>(uri, 1, 1, "ItemParent");
+        qmlRegisterType<QDeclarativeOrganizerItemLocation>(uri, 1, 1, "Location");
+        qmlRegisterType<QDeclarativeOrganizerItemPriority>(uri, 1, 1, "Priority");
+        qmlRegisterType<QDeclarativeOrganizerItemRecurrence>(uri, 1, 1, "Recurrence");
+        qmlRegisterType<QDeclarativeOrganizerItemReminder>(uri, 1, 1, "Reminder");
+        qmlRegisterType<QDeclarativeOrganizerItemAudibleReminder>(uri, 1, 1, "AudibleReminder");
+        qmlRegisterType<QDeclarativeOrganizerItemVisualReminder>(uri, 1, 1, "VisualReminder");
+        qmlRegisterType<QDeclarativeOrganizerItemEmailReminder>(uri, 1, 1, "EmailReminder");
+        qmlRegisterType<QDeclarativeOrganizerItemTimestamp>(uri, 1, 1, "Timestamp");
+        qmlRegisterType<QDeclarativeOrganizerItemType>(uri, 1, 1, "ItemType");
+        qmlRegisterType<QDeclarativeOrganizerJournalTime>(uri, 1, 1, "JournalTime");
+        qmlRegisterType<QDeclarativeOrganizerTodoProgress>(uri, 1, 1, "TodoProgress");
+        qmlRegisterType<QDeclarativeOrganizerTodoTime>(uri, 1, 1, "TodoTime");
 
         //filters
-        qmlRegisterType<QDeclarativeOrganizerItemFilter>(uri, 1, 1, "OrganizerItemFilter");
-        qmlRegisterType<QDeclarativeOrganizerItemChangelogFilter>(uri, 1, 1, "OrganizerItemChangelogFilter");
-        qmlRegisterType<QDeclarativeOrganizerItemCollectionFilter>(uri, 1, 1, "OrganizerItemCollectionFilter");
-        qmlRegisterType<QDeclarativeOrganizerItemDetailFilter>(uri, 1, 1, "OrganizerItemDetailFilter");
-        qmlRegisterType<QDeclarativeOrganizerItemDetailRangeFilter>(uri, 1, 1, "OrganizerItemDetailRangeFilter");
-        qmlRegisterType<QDeclarativeOrganizerItemLocalIdFilter>(uri, 1, 1, "OrganizerItemLocalIdFilter");
-        qmlRegisterType<QDeclarativeOrganizerItemIntersectionFilter>(uri, 1, 1, "OrganizerItemIntersectionFilter");
-        qmlRegisterType<QDeclarativeOrganizerItemUnionFilter>(uri, 1, 1, "OrganizerItemUnionFilter");
-        qmlRegisterType<QDeclarativeOrganizerItemInvalidFilter>(uri, 1, 1, "OrganizerItemInvalidFilter");
+        qmlRegisterType<QDeclarativeOrganizerItemFilter>(uri, 1, 1, "Filter");
+        qmlRegisterType<QDeclarativeOrganizerItemChangelogFilter>(uri, 1, 1, "ChangelogFilter");
+        qmlRegisterType<QDeclarativeOrganizerItemCollectionFilter>(uri, 1, 1, "CollectionFilter");
+        qmlRegisterType<QDeclarativeOrganizerItemDetailFilter>(uri, 1, 1, "DetailFilter");
+        qmlRegisterType<QDeclarativeOrganizerItemDetailRangeFilter>(uri, 1, 1, "DetailRangeFilter");
+        qmlRegisterType<QDeclarativeOrganizerItemLocalIdFilter>(uri, 1, 1, "LocalIdFilter");
+        qmlRegisterType<QDeclarativeOrganizerItemIntersectionFilter>(uri, 1, 1, "IntersectionFilter");
+        qmlRegisterType<QDeclarativeOrganizerItemUnionFilter>(uri, 1, 1, "UnionFilter");
+        qmlRegisterType<QDeclarativeOrganizerItemInvalidFilter>(uri, 1, 1, "InvalidFilter");
     }
 };
 
diff --git a/plugins/declarative/organizer/qdeclarativeorganizeritemcollection_p.h b/plugins/declarative/organizer/qdeclarativeorganizercollection_p.h
index 15c5a8f35d..15c5a8f35d 100644
--- a/plugins/declarative/organizer/qdeclarativeorganizeritemcollection_p.h
+++ b/plugins/declarative/organizer/qdeclarativeorganizercollection_p.h
diff --git a/plugins/declarative/organizer/qdeclarativeorganizeritemdetail_p.h b/plugins/declarative/organizer/qdeclarativeorganizeritemdetail_p.h
index 51c159bb6c..82cadc13e7 100644
--- a/plugins/declarative/organizer/qdeclarativeorganizeritemdetail_p.h
+++ b/plugins/declarative/organizer/qdeclarativeorganizeritemdetail_p.h
@@ -46,7 +46,7 @@
 #include <QVariant>
 #include "qorganizeritemdetail.h"
 #include "qorganizeritemdetails.h"
-#include "qdeclarativeorganizeritemrecurrencerule_p.h"
+#include "qdeclarativeorganizerrecurrencerule_p.h"
 
 QTM_USE_NAMESPACE;
 
@@ -323,8 +323,8 @@ QML_DECLARE_TYPE(QDeclarativeOrganizerItemPriority)
 class QDeclarativeOrganizerItemRecurrence : public QDeclarativeOrganizerItemDetail
 {
     Q_OBJECT
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeOrganizerItemRecurrenceRule> recurrenceRules READ recurrenceRules NOTIFY recurrenceRulesChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeOrganizerItemRecurrenceRule> exceptionRules READ exceptionRules NOTIFY exceptionRulesChanged)
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeOrganizerRecurrenceRule> recurrenceRules READ recurrenceRules NOTIFY recurrenceRulesChanged)
+    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeOrganizerRecurrenceRule> exceptionRules READ exceptionRules NOTIFY exceptionRulesChanged)
     Q_PROPERTY(QVariantList recurrenceDates READ recurrenceDates WRITE setRecurrenceDates NOTIFY valueChanged)
     Q_PROPERTY(QVariantList exceptionDates  READ exceptionDates WRITE setExceptionDates NOTIFY valueChanged)
 public:
@@ -336,14 +336,14 @@ public:
         connect(this, SIGNAL(exceptionRulesChanged()), SLOT(_saveExceptionRules()));
     }
 
-    QDeclarativeListProperty<QDeclarativeOrganizerItemRecurrenceRule> recurrenceRules()
+    QDeclarativeListProperty<QDeclarativeOrganizerRecurrenceRule> recurrenceRules()
     {
-        return QDeclarativeListProperty<QDeclarativeOrganizerItemRecurrenceRule>(this, m_recurrenceRules);
+        return QDeclarativeListProperty<QDeclarativeOrganizerRecurrenceRule>(this, m_recurrenceRules);
     }
 
-    QDeclarativeListProperty<QDeclarativeOrganizerItemRecurrenceRule> exceptionRules()
+    QDeclarativeListProperty<QDeclarativeOrganizerRecurrenceRule> exceptionRules()
     {
-        return QDeclarativeListProperty<QDeclarativeOrganizerItemRecurrenceRule>(this, m_exceptionRules);
+        return QDeclarativeListProperty<QDeclarativeOrganizerRecurrenceRule>(this, m_exceptionRules);
     }
 
     QVariantList recurrenceDates() const
@@ -375,7 +375,7 @@ private slots:
     void _saveRecurrenceRules()
     {
         QSet<QOrganizerRecurrenceRule> rules;
-        foreach (const QDeclarativeOrganizerItemRecurrenceRule* r, m_recurrenceRules) {
+        foreach (const QDeclarativeOrganizerRecurrenceRule* r, m_recurrenceRules) {
             rules << r->rule();
         }
         m_detail.setValue(QOrganizerItemRecurrence::FieldRecurrenceRules, QVariant::fromValue(rules));
@@ -385,7 +385,7 @@ private slots:
     void _saveExceptionRules()
     {
         QSet<QOrganizerRecurrenceRule> rules;
-        foreach (const QDeclarativeOrganizerItemRecurrenceRule* r, m_exceptionRules) {
+        foreach (const QDeclarativeOrganizerRecurrenceRule* r, m_exceptionRules) {
             rules << r->rule();
         }
         m_detail.setValue(QOrganizerItemRecurrence::FieldExceptionRules, QVariant::fromValue(rules));
@@ -394,8 +394,8 @@ private slots:
     }
 
 private:
-    QList<QDeclarativeOrganizerItemRecurrenceRule*>   m_recurrenceRules;
-    QList<QDeclarativeOrganizerItemRecurrenceRule*>   m_exceptionRules;
+    QList<QDeclarativeOrganizerRecurrenceRule*>   m_recurrenceRules;
+    QList<QDeclarativeOrganizerRecurrenceRule*>   m_exceptionRules;
 };
 QML_DECLARE_TYPE(QDeclarativeOrganizerItemRecurrence)
 
diff --git a/plugins/declarative/organizer/qdeclarativeorganizeritemrecurrencerule_p.h b/plugins/declarative/organizer/qdeclarativeorganizerrecurrencerule_p.h
index ba80a33d4c..e9599c974d 100644
--- a/plugins/declarative/organizer/qdeclarativeorganizeritemrecurrencerule_p.h
+++ b/plugins/declarative/organizer/qdeclarativeorganizerrecurrencerule_p.h
@@ -49,7 +49,7 @@
 
 QTM_USE_NAMESPACE
 
-class QDeclarativeOrganizerItemRecurrenceRule : public QObject
+class QDeclarativeOrganizerRecurrenceRule : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(Frequency frequency READ frequency WRITE setFrequency NOTIFY valueChanged)
@@ -69,7 +69,7 @@ class QDeclarativeOrganizerItemRecurrenceRule : public QObject
     Q_ENUMS(LimitType)
 public:
 
-    QDeclarativeOrganizerItemRecurrenceRule(QObject* parent = 0)
+    QDeclarativeOrganizerRecurrenceRule(QObject* parent = 0)
         :QObject(parent)
     {
     }
@@ -267,6 +267,6 @@ signals:
 private:
     QOrganizerRecurrenceRule m_rule;
 };
-QML_DECLARE_TYPE(QDeclarativeOrganizerItemRecurrenceRule)
+QML_DECLARE_TYPE(QDeclarativeOrganizerRecurrenceRule)
 
 #endif