Rename calendar to organizer, for all organizer related instances

Also update various project files and defines where required.
author: Chris Adams <christopher.adams@nokia.com> 2010-05-12 14:16:59 +1000
committer: Chris Adams <christopher.adams@nokia.com> 2010-05-12 14:16:59 +1000
commit: 1db11748b4ceeddb6c1913256b1250c665bdc82f (patch)
tree: 86eef9dfe7ed262078b9a0b8a67575acf2bb4494
parent: a519d8afd026458d65279c5cad377f23b848bdd7 (diff)
137 files changed, 399 insertions, 171 deletions
diff --git a/configure b/configure
index 463776f6da..7e07293989 100755
--- a/configure
+++ b/configure
@@ -97,7 +97,7 @@ QMAKE_CACHE="$shadowpath/.qmake.cache"
 LIB_PATH="lib"
 BIN_PATH="bin"
 MAC_SDK=
-MOBILITY_MODULES="bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors calendar"
+MOBILITY_MODULES="bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors organizer"
 MOBILITY_MODULES_UNPARSED=
 QMKSPEC=
 OS="other"
@@ -131,7 +131,7 @@ usage()
     echo "-modules <list> ... Restrict list of modules to build (default all supported)"
     echo "                    Choose from: bearer contacts location publishsubscribe"
     echo "                    messaging multimedia systeminfo serviceframework versit"
-    echo "                    sensors calendar"
+    echo "                    sensors organizer"
     echo "                    Modules should be separated by a space and surrounded"
     echo "                    by double quotation. If a"
     echo "                    selected module depends on other modules dependencies"
@@ -208,7 +208,7 @@ while [ "$#" -gt 0 ]; do
             MOBILITY_MODULES=
             for m in $MOBILITY_MODULES_UNPARSED; do
                 case "$m" in
-                    bearer|contacts|location|messaging|multimedia|publishsubscribe|serviceframework|systeminfo|versit|sensors|calendar)
+                    bearer|contacts|location|messaging|multimedia|publishsubscribe|serviceframework|systeminfo|versit|sensors|organizer)
                         MOBILITY_MODULES="$MOBILITY_MODULES $m";
                         ;;
                     *)
@@ -463,7 +463,7 @@ fi
 
 # It's a lot easier to make qmake do the dependency checking...
 echo "mobility_modules = $MOBILITY_MODULES" >> "$CONFIG_IN"
-echo "contains(mobility_modules,versit): mobility_modules *= contacts calendar" >> "$CONFIG_IN"
+echo "contains(mobility_modules,versit): mobility_modules *= contacts organizer" >> "$CONFIG_IN"
 echo "maemo5|maemo6:contains(maemo-icd_enabled, no): mobility_modules -= bearer" >> "$CONFIG_IN"
 
 # If libicd-network-wlan-dev.h is not present, use own copy.
@@ -505,19 +505,19 @@ for module in $MOBILITY_MODULES; do
             $relpath/bin/syncheaders $shadowpath/include/QtmMessaging $relpath/src/messaging
             ;;
         versit)
-            #versit implies contacts & calendar
+            #versit implies contacts & organizer
             $relpath/bin/syncheaders $shadowpath/include/QtmVersit $relpath/src/versit
             $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts
             $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/details
             $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/requests
             $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/filters
-            $relpath/bin/syncheaders $shadowpath/include/QtmCalendar $relpath/src/calendar
+            $relpath/bin/syncheaders $shadowpath/include/QtmOrganizer $relpath/src/organizer
             ;;
         sensors)
             $relpath/bin/syncheaders $shadowpath/include/QtmSensors $relpath/src/sensors
             ;;
-        calendar)
-            $relpath/bin/syncheaders $shadowpath/include/QtmCalendar $relpath/src/calendar
+        organizer)
+            $relpath/bin/syncheaders $shadowpath/include/QtmOrganizer $relpath/src/organizer
             ;;
         *)
             echo "Cannot generate headers for $module"
diff --git a/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp b/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp
new file mode 100644
index 0000000000..f172fafe19
--- /dev/null
+++ b/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmobilityglobal.h"
+#include "qtorganizer.h"
+
+#include <QDebug>
+#include <QCoreApplication>
+#include <QObject>
+#include <QTimer>
+
+QTM_USE_NAMESPACE
+
+static void snippets();
+
+int main(int argc, char* argv[])
+{
+    snippets();
+    return 0;
+}
+
+void snippets()
+{
+    //! [Instantiating the default manager for the platform]
+    QOrganizerItemManager defaultManager;
+    //! [Instantiating the default manager for the platform]
+
+    //! [Instantiating a specific manager]
+    QOrganizerItemManager specificManager("KCal");
+    //! [Instantiating a specific manager]
+
+    //! [Creating a recurrent event]
+    QOrganizerEvent recEvent;
+    /*recEvent.setRecurrence(7pm to 8pm every wednesday for three months);*/
+    recEvent.setPriority(QOrganizerItem::HighPriority);
+    recEvent.setLocation("Meeting Room 8");
+    recEvent.setDescription("A meeting every wednesday to discuss the vitally important topic of marshmallows");
+    recEvent.setLabel("Marshmallow Conference");
+    defaultManager.saveItem(&recEvent);
+    //! [Creating a recurrent event]
+
+    //! [Retrieving occurrences of a particular recurrent event within a time period]
+    // XXX TODO: make this more convenient.
+    // QOIM::itemInstances(item, startDateTime, endDateTime, count) ?
+    // QOI::instanceFilter(start, end) ?
+    QOrganizerItemDetailFilter dfil;
+    dfil.setDetailDefinition(QOrganizerItemParentInfo::DefinitionName, QOrganizerItemParentInfo::FieldParentId);
+    dfil.setValue(recEvent.id());
+
+    QOrganizerItemPeriodFilter pfil;
+    pfil.setStartDate(QDateTime::current(), endOfThisMonth());
+
+    QOrganizerItemIntersectionFilter ifil;
+    ifil << dfil << pfil;
+
+    QList<QOrganizerItem> instances = defaultManager.itemInstances(ifil);
+    //! [Retrieving occurrences of a particular recurrent event within a time period]
+
+    //! [Retrieving the next 5 occurrences of a particular recurrent event]
+    // XXX TODO: make this more convenient.
+    // QOIM::itemInstances(item, startDateTime, endDateTime, count) ?
+    //! [Retrieving the next 5 occurrences of a particular recurrent event]
+
+    //! [Retrieving the next 10 occurrences of any item (Agenda View)]
+    // XXX TODO: make this more convenient.
+    // QOIM::itemInstances(count) ?
+    //! [Retrieving the next 10 occurrences of any item (Agenda View)]
+
+    //! [Creating a non-recurrent entry]
+    // a default constructed journal will have it's date/time set to the current date/time.
+    QOrganizerJournal journal;
+    journal.setNote("The conference went well.  We all agree that marshmallows are awesome, "\
+                    "but we were unable to reach any agreement as to how we could possibly "\
+                    "increase our intake of marshmallows.  Several action points were assigned "\
+                    "to various members of the group; I have been tasked with finding a good "\
+                    "recipe that combines both marshmallows and chocolate, by next Wednesday.");
+    defaultManager.saveItem(&journal);
+    //! [Creating a non-recurrent entry]
+
+
+    //! [Editing a non-recurrent entry]
+    QOrganizerItemNote recipe;
+    recipe.setNote("Serves: 8.  Ingredients: 500g Milk Chocolate, 500g Marshmallows.  Step 1: Put the marshmallows into 8 separate bowls.  Step 2: Melt the chocolate.  Step 3: Pour the chocolate over the marshmallows in the bowls.  Step 4: Put the bowls into the refrigerator for 20 minutes; serve chilled.");
+    journal.saveDetail(&recipe);
+    defaultManager.saveItem(&journal);
+    //! [Editing a non-recurrent entry]
+
+    //! [Retrieving any entry (not occurrence) which matches a search criteria]
+    // XXX TODO: make this more convenient.
+    // QOrganizerItemLocation::matchLocationName("Meeting Room 8") ?
+    QOrganizerItemDetailFilter locationFilter;
+    locationFilter.setDetailDefinition(QOrganizerItemLocation::DefinitionName, QOrganizerItemLocation::FieldLocationName);
+    locationFilter.setValue("Meeting Room 8");
+    QList<QOrganizerItem> entries = defaultManager.items(locationFilter);
+    //! [Retrieving any entry (not occurrence) which matches a search criteria]
+
+    //! [Creating an exception to a particular recurrent event]
+    QOrganizerItemEventTimeRange newTime;
+    newTime.setStartDateTime("6pm");
+    newTime.setEndDateTime("8pm");
+    QOrganizerItemNote newNote;
+    newNote.setNote("The next meeting will go for an hour longer (starting one "\
+                    "hour earlier than usual), since we have scheduled one hour"\
+                    "to taste the results of the recipe that I will be presenting "\
+                    "at the meeting.");
+
+    // the following line should be made simpler via QOIM::itemInstances(item, startDateTime, endDateTime, count)...
+    QOrganizerEventOccurrence nextMarshmallowMeeting = QOrganizerEventOccurrence(defaultManager.itemInstances(dfil).first());
+    nextMarshmallowMeeting.saveDetail(&newTime);
+    nextMarshmallowMeeting.saveDetail(&newNote);
+    defaultManager.saveItem(&nextMarshmallowMeeting);
+    //! [Creating an exception to a particular recurrent event]
+}
+
diff --git a/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.pro b/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.pro
new file mode 100644
index 0000000000..aeb2d00e83
--- /dev/null
+++ b/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.pro
@@ -0,0 +1,24 @@
+######################################################################
+#
+# Simple example of how to use the contacts API
+#
+######################################################################
+
+TEMPLATE = lib
+TARGET = qtorganizerdocsample
+include(../../../../common.pri)
+INCLUDEPATH += ../../../../src/global \
+               ../../../../src/organizer
+
+DESTDIR = $$QT_MOBILITY_BUILD_TREE/lib
+QMAKE_RPATHDIR+=$$OUTPUT_DIR/lib
+
+CONFIG += mobility console
+MOBILITY = organizer
+
+SOURCES += qtorganizerdocsample.cpp
+
+symbian {
+    TARGET.EPOCALLOWDLLDATA = 1
+    MMP_RULES+="EXPORTUNFROZEN"
+}
diff --git a/doc/src/snippets/snippets.pro b/doc/src/snippets/snippets.pro
index 9cea12fc2e..7d26be12f4 100644
--- a/doc/src/snippets/snippets.pro
+++ b/doc/src/snippets/snippets.pro
@@ -3,4 +3,5 @@ include(../../../staticconfig.pri)
 TEMPLATE = subdirs
 contains(mobility_modules,contacts): SUBDIRS += qtcontactsdocsample
 contains(mobility_modules,versit): SUBDIRS += qtversitdocsample
+contains(mobility_modules,organizer): SUBDIRS += qtorganizerdocsample
 contains(mobility_modules,sensors): SUBDIRS += sensors
diff --git a/examples/examples.pro b/examples/examples.pro
index 5d8339702f..35b87ddbbe 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -92,6 +92,6 @@ contains(mobility_modules,sensors) {
     SUBDIRS += sensors
 }
 
-# Calendar
+# Organizer
 SUBDIRS += qmlcalendar
 
diff --git a/examples/qmlcalendar/qmlcalendar.pro b/examples/qmlcalendar/qmlcalendar.pro
index fb298b163a..83e970f3a3 100644
--- a/examples/qmlcalendar/qmlcalendar.pro
+++ b/examples/qmlcalendar/qmlcalendar.pro
@@ -2,11 +2,11 @@ TEMPLATE = app
 TARGET = qmlcalendar
 
 # CONFIG += mobility
-# MOBILITY = calendar versit
+# MOBILITY = organizer versit
 DEPENDPATH += .
 INCLUDEPATH += . \
     ../../include \
-    ../../src/calendar \
+    ../../src/organizer \
     ../../src/versit
 QT += declarative
 QT += script
diff --git a/src/global/qmobilityglobal.h b/src/global/qmobilityglobal.h
index 712884bc6f..a22ea8a0dc 100644
--- a/src/global/qmobilityglobal.h
+++ b/src/global/qmobilityglobal.h
@@ -125,10 +125,10 @@
 #      else
 #        define Q_SENSORS_EXPORT Q_DECL_IMPORT
 #      endif
-#      if defined(QT_BUILD_CALENDAR_LIB)
-#        define Q_CALENDAR_EXPORT Q_DECL_EXPORT
+#      if defined(QT_BUILD_ORGANIZER_LIB)
+#        define Q_ORGANIZER_EXPORT Q_DECL_EXPORT
 #      else
-#        define Q_CALENDAR_EXPORT Q_DECL_IMPORT
+#        define Q_ORGANIZER_EXPORT Q_DECL_IMPORT
 #      endif
 #    elif defined(QT_DLL) /* use a Qt DLL library */
 #      define Q_BEARER_EXPORT Q_DECL_IMPORT
@@ -141,7 +141,7 @@
 #      define Q_SERVICEFW_EXPORT Q_DECL_IMPORT
 #      define Q_SYSINFO_EXPORT Q_DECL_IMPORT
 #      define Q_SENSORS_EXPORT Q_DECL_IMPORT
-#      define Q_CALENDAR_EXPORT Q_DECL_IMPORT
+#      define Q_ORGANIZER_EXPORT Q_DECL_IMPORT
 #    endif
 #  else
 #  endif
@@ -157,7 +157,7 @@
 #      define Q_SERVICEFW_EXPORT Q_DECL_EXPORT
 #      define Q_SYSINFO_EXPORT Q_DECL_EXPORT
 #      define Q_SENSORS_EXPORT Q_DECL_EXPORT
-#      define Q_CALENDAR_EXPORT Q_DECL_EXPORT
+#      define Q_ORGANIZER_EXPORT Q_DECL_EXPORT
 #    else
 #      define Q_BEARER_EXPORT
 #      define Q_PUBLISHSUBSCRIBE_EXPORT
@@ -169,7 +169,7 @@
 #      define Q_SERVICEFW_EXPORT
 #      define Q_SYSINFO_EXPORT
 #      define Q_SENSORS_EXPORT
-#      define Q_CALENDAR_EXPORT
+#      define Q_ORGANIZER_EXPORT
 #    endif
 #  endif
 #endif
diff --git a/src/calendar/details/details.pri b/src/organizer/details/details.pri
index b1c435554d..5657f140c6 100644
--- a/src/calendar/details/details.pri
+++ b/src/organizer/details/details.pri
@@ -13,7 +13,6 @@ PUBLIC_HEADERS += \
     details/qorganizeritemrsvpinfo.h \
     details/qorganizeritemtimestamp.h \
     details/qorganizeritemtype.h \
-    details/qorganizeritemgeolocation.h \
     details/qorganizeritemjournaltimerange.h \
     details/qorganizeritemeventtimerange.h \
     details/qorganizeritemtodoprogress.h \
diff --git a/src/calendar/details/qorganizeritemattendee.h b/src/organizer/details/qorganizeritemattendee.h
index 28fca9e0b3..42f6b62ce5 100644
--- a/src/calendar/details/qorganizeritemattendee.h
+++ b/src/organizer/details/qorganizeritemattendee.h
@@ -44,14 +44,14 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemAttendee : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemAttendee : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
@@ -60,7 +60,7 @@ public:
     const char* FieldAttendeeContactUri;
     const char* FieldParticipationStatus;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemAttendee, "Attendee")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemAttendee, "Attendee")
     Q_DECLARE_LATIN1_CONSTANT(FieldAttendeeDisplayLabel, "AttendeeDisplayLabel");
     Q_DECLARE_LATIN1_CONSTANT(FieldAttendeeContactUri, "AttendeeContactUri");
     Q_DECLARE_LATIN1_CONSTANT(FieldAttendeeParticipationStatus, "AttendeeParticipationStatus");
diff --git a/src/calendar/details/qorganizeritemdescription.h b/src/organizer/details/qorganizeritemdescription.h
index 90b973c62d..60591a3e43 100644
--- a/src/calendar/details/qorganizeritemdescription.h
+++ b/src/organizer/details/qorganizeritemdescription.h
@@ -44,21 +44,21 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemDescription : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemDescription : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
     const char* DefinitionName;
     const char* FieldDescription;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemDescription, "Description")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemDescription, "Description")
     Q_DECLARE_LATIN1_CONSTANT(FieldDescription, "Description");
 #endif
 
diff --git a/src/calendar/details/qorganizeritemdetails.cpp b/src/organizer/details/qorganizeritemdetails.cpp
index 3e111e9522..3e111e9522 100644
--- a/src/calendar/details/qorganizeritemdetails.cpp
+++ b/src/organizer/details/qorganizeritemdetails.cpp
diff --git a/src/calendar/details/qorganizeritemdetails.h b/src/organizer/details/qorganizeritemdetails.h
index 4296b8182d..5b0c2a89a1 100644
--- a/src/calendar/details/qorganizeritemdetails.h
+++ b/src/organizer/details/qorganizeritemdetails.h
@@ -43,7 +43,7 @@
 #define QORGANIZERITEMDETAILS_H
 
 // this file includes all of the leaf detail classes
-// provided by the Qt Calendar API.
+// provided by the Qt Organizer API.
 
 #include "qorganizeritemattendee.h"
 #include "qorganizeritemdescription.h"
diff --git a/src/calendar/details/qorganizeritemdisplaylabel.h b/src/organizer/details/qorganizeritemdisplaylabel.h
index ed74584708..beab676e99 100644
--- a/src/calendar/details/qorganizeritemdisplaylabel.h
+++ b/src/organizer/details/qorganizeritemdisplaylabel.h
@@ -45,20 +45,20 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemDisplayLabel : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemDisplayLabel : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
     const char* DefinitionName;
     const char* FieldLabel;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemDisplayLabel, "DisplayLabel")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemDisplayLabel, "DisplayLabel")
     Q_DECLARE_LATIN1_CONSTANT(FieldLabel, "Label");
 #endif
 
diff --git a/src/calendar/details/qorganizeritemenddatetime.h b/src/organizer/details/qorganizeritemenddatetime.h
index 58e9597c05..58e9597c05 100644
--- a/src/calendar/details/qorganizeritemenddatetime.h
+++ b/src/organizer/details/qorganizeritemenddatetime.h
diff --git a/src/calendar/details/qorganizeritemeventtimerange.h b/src/organizer/details/qorganizeritemeventtimerange.h
index 24f35d7463..1364c1249b 100644
--- a/src/calendar/details/qorganizeritemeventtimerange.h
+++ b/src/organizer/details/qorganizeritemeventtimerange.h
@@ -44,14 +44,14 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemEventTimeRange : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemEventTimeRange : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
@@ -59,7 +59,7 @@ public:
     const char* FieldStartDateTime;
     const char* FieldEndDateTime;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemEventTimeRange, "EventTimeRange")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemEventTimeRange, "EventTimeRange")
     Q_DECLARE_LATIN1_CONSTANT(FieldStartDateTime, "StartDateTime");
     Q_DECLARE_LATIN1_CONSTANT(FieldEndDateTime, "EndDateTime");
 #endif
diff --git a/src/calendar/details/qorganizeritemguid.h b/src/organizer/details/qorganizeritemguid.h
index ce56dee9a9..fc5f8340a9 100644
--- a/src/calendar/details/qorganizeritemguid.h
+++ b/src/organizer/details/qorganizeritemguid.h
@@ -45,21 +45,21 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemGuid : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemGuid : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
     const char* DefinitionName;
     const char* FieldGuid;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemGuid, "Guid")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemGuid, "Guid")
     Q_DECLARE_LATIN1_CONSTANT(FieldGuid, "Guid");
 #endif
 
diff --git a/src/calendar/details/qorganizeritemjournaltimerange.h b/src/organizer/details/qorganizeritemjournaltimerange.h
index f0d53d730a..138a8e11d5 100644
--- a/src/calendar/details/qorganizeritemjournaltimerange.h
+++ b/src/organizer/details/qorganizeritemjournaltimerange.h
@@ -44,21 +44,21 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemJournalTimeRange : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemJournalTimeRange : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
     const char* DefinitionName;
     const char* FieldEntryDateTime;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemJournalTimeRange, "JournalTimeRange")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemJournalTimeRange, "JournalTimeRange")
     Q_DECLARE_LATIN1_CONSTANT(FieldEntryDateTime, "EntryDateTime");
 #endif
 
diff --git a/src/calendar/details/qorganizeritemlocation.h b/src/organizer/details/qorganizeritemlocation.h
index f579d78482..d9d832ad26 100644
--- a/src/calendar/details/qorganizeritemlocation.h
+++ b/src/organizer/details/qorganizeritemlocation.h
@@ -45,14 +45,14 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemLocation : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemLocation : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
@@ -61,7 +61,7 @@ public:
     const char* FieldAddress;
     const char* FieldLocationName;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemLocation, "Location")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemLocation, "Location")
     Q_DECLARE_LATIN1_CONSTANT(FieldGeoLocation, "GeoLocation");
     Q_DECLARE_LATIN1_CONSTANT(FieldAddress, "Address");
     Q_DECLARE_LATIN1_CONSTANT(FieldLocationName, "LocationName");
diff --git a/src/calendar/details/qorganizeritemnote.h b/src/organizer/details/qorganizeritemnote.h
index b6c521b375..3623e16854 100644
--- a/src/calendar/details/qorganizeritemnote.h
+++ b/src/organizer/details/qorganizeritemnote.h
@@ -44,21 +44,21 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemNote : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemNote : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
     const char* DefinitionName;
     const char* FieldNote;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemNote, "Note")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemNote, "Note")
     Q_DECLARE_LATIN1_CONSTANT(FieldNote, "Note");
 #endif
 
diff --git a/src/calendar/details/qorganizeritemparticipation.h b/src/organizer/details/qorganizeritemparticipation.h
index 109126c04c..a046ef6bd2 100644
--- a/src/calendar/details/qorganizeritemparticipation.h
+++ b/src/organizer/details/qorganizeritemparticipation.h
@@ -44,14 +44,14 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemParticipation : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemParticipation : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
@@ -59,7 +59,7 @@ public:
     const char* FieldParticipationRole;
     const char* FieldParticipationStatus;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemParticipation, "Participation")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemParticipation, "Participation")
     Q_DECLARE_LATIN1_CONSTANT(FieldParticipationRole, "ParticipationRole");
     Q_DECLARE_LATIN1_CONSTANT(FieldParticipationStatus, "ParticipationStatus");
 #endif
diff --git a/src/calendar/details/qorganizeritempriority.h b/src/organizer/details/qorganizeritempriority.h
index 4b6f4d56de..ca04242fe9 100644
--- a/src/calendar/details/qorganizeritempriority.h
+++ b/src/organizer/details/qorganizeritempriority.h
@@ -46,21 +46,21 @@
 #include <QtDebug>
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemPriority : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemPriority : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
     const char* DefinitionName;
     const char* FieldPriority;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemPriority, "Priority")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemPriority, "Priority")
     Q_DECLARE_LATIN1_CONSTANT(FieldPriority, "Priority");
 #endif
 
diff --git a/src/calendar/details/qorganizeritemprovenance.h b/src/organizer/details/qorganizeritemprovenance.h
index 8e62e40edb..de99037e6a 100644
--- a/src/calendar/details/qorganizeritemprovenance.h
+++ b/src/organizer/details/qorganizeritemprovenance.h
@@ -45,14 +45,14 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemProvenance : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemProvenance : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
@@ -60,7 +60,7 @@ public:
     const char* FieldReceivedFrom;
     const char* FieldTimestamp;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemProvenance, "Provenance")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemProvenance, "Provenance")
     Q_DECLARE_LATIN1_CONSTANT(FieldReceivedFrom, "ReceivedFrom");
     Q_DECLARE_LATIN1_CONSTANT(FieldTimestamp, "Timestamp");
 #endif
diff --git a/src/calendar/details/qorganizeritemrsvpinfo.h b/src/organizer/details/qorganizeritemrsvpinfo.h
index 66faf29bb9..0fe6048ccb 100644
--- a/src/calendar/details/qorganizeritemrsvpinfo.h
+++ b/src/organizer/details/qorganizeritemrsvpinfo.h
@@ -44,14 +44,14 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemRsvpInfo : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemRsvpInfo : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
@@ -60,7 +60,7 @@ public:
     const char* FieldContactUri;
     const char* FieldResponseDate;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemRsvpInfo, "RsvpInfo")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemRsvpInfo, "RsvpInfo")
     Q_DECLARE_LATIN1_CONSTANT(FieldDeadline, "Deadline");
     Q_DECLARE_LATIN1_CONSTANT(FieldContactUri, "ContactUri");
     Q_DECLARE_LATIN1_CONSTANT(FieldResponseDate, "ResponseDate");
diff --git a/src/calendar/details/qorganizeritemtimestamp.h b/src/organizer/details/qorganizeritemtimestamp.h
index e611682392..f547337633 100644
--- a/src/calendar/details/qorganizeritemtimestamp.h
+++ b/src/organizer/details/qorganizeritemtimestamp.h
@@ -44,14 +44,14 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemTimestamp : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemTimestamp : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
@@ -59,7 +59,7 @@ public:
     const char* FieldModificationTimestamp;
     const char* FieldCreationTimestamp;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemTimestamp, "Timestamp")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemTimestamp, "Timestamp")
     Q_DECLARE_LATIN1_CONSTANT(FieldModificationTimestamp, "ModificationTimestamp");
     Q_DECLARE_LATIN1_CONSTANT(FieldCreationTimestamp, "CreationTimestamp");
 #endif
diff --git a/src/calendar/details/qorganizeritemtodoprogress.h b/src/organizer/details/qorganizeritemtodoprogress.h
index 87e010c9a8..5e277dfa93 100644
--- a/src/calendar/details/qorganizeritemtodoprogress.h
+++ b/src/organizer/details/qorganizeritemtodoprogress.h
@@ -44,14 +44,14 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemTodoProgress : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemTodoProgress : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
@@ -61,7 +61,7 @@ public:
     const char* FieldPercentageComplete;
     const char* FieldStatus;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemTodoProgress, "TodoProgress")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemTodoProgress, "TodoProgress")
     Q_DECLARE_LATIN1_CONSTANT(FieldStartedDateTime, "StartDateTime");
     Q_DECLARE_LATIN1_CONSTANT(FieldFinishedDateTime, "FinishedDateTime");
     Q_DECLARE_LATIN1_CONSTANT(FieldPercentageComplete, "PercentageComplete");
diff --git a/src/calendar/details/qorganizeritemtodotimerange.h b/src/organizer/details/qorganizeritemtodotimerange.h
index 0646a4c60d..4e1e862ffb 100644
--- a/src/calendar/details/qorganizeritemtodotimerange.h
+++ b/src/organizer/details/qorganizeritemtodotimerange.h
@@ -44,14 +44,14 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemTodoTimeRange : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemTodoTimeRange : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
@@ -59,7 +59,7 @@ public:
     const char* FieldDueDateTime;
     const char* FieldNotBeforeDateTime;
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemTodoTimeRange, "TodoTimeRange")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemTodoTimeRange, "TodoTimeRange")
     Q_DECLARE_LATIN1_CONSTANT(FieldDueDateTime, "DueDateTime");
     Q_DECLARE_LATIN1_CONSTANT(FieldNotBeforeDateTime, "NotBeforeDateTime");
 #endif
diff --git a/src/calendar/details/qorganizeritemtype.h b/src/organizer/details/qorganizeritemtype.h
index fa6805a234..885b2901c9 100644
--- a/src/calendar/details/qorganizeritemtype.h
+++ b/src/organizer/details/qorganizeritemtype.h
@@ -44,14 +44,14 @@
 
 #include <QString>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
 
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_CALENDAR_EXPORT QOrganizerItemType : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemType : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
@@ -64,7 +64,7 @@ public:
     const char* TypeNote;
     // etc?
 #else
-    Q_DECLARE_CUSTOM_CALENDAR_DETAIL(QOrganizerItemType, "Type")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemType, "Type")
     Q_DECLARE_LATIN1_CONSTANT(FieldType, "Type");
     Q_DECLARE_LATIN1_CONSTANT(TypeEvent, "Event");
     Q_DECLARE_LATIN1_CONSTANT(TypeTodo, "Todo");
diff --git a/src/calendar/draft.txt b/src/organizer/draft.txt
index 62cdd4f3ea..62cdd4f3ea 100644
--- a/src/calendar/draft.txt
+++ b/src/organizer/draft.txt
diff --git a/src/calendar/engines/engines.pri b/src/organizer/engines/engines.pri
index 72dd88aa8c..72dd88aa8c 100644
--- a/src/calendar/engines/engines.pri
+++ b/src/organizer/engines/engines.pri
diff --git a/src/calendar/engines/qorganizeriteminvalidbackend.cpp b/src/organizer/engines/qorganizeriteminvalidbackend.cpp
index 2d5346fb6f..2d5346fb6f 100644
--- a/src/calendar/engines/qorganizeriteminvalidbackend.cpp
+++ b/src/organizer/engines/qorganizeriteminvalidbackend.cpp
diff --git a/src/calendar/engines/qorganizeriteminvalidbackend_p.h b/src/organizer/engines/qorganizeriteminvalidbackend_p.h
index a31ef47c39..a31ef47c39 100644
--- a/src/calendar/engines/qorganizeriteminvalidbackend_p.h
+++ b/src/organizer/engines/qorganizeriteminvalidbackend_p.h
diff --git a/src/calendar/engines/qorganizeritemmemorybackend.cpp b/src/organizer/engines/qorganizeritemmemorybackend.cpp
index df3fd1f0e1..df3fd1f0e1 100644
--- a/src/calendar/engines/qorganizeritemmemorybackend.cpp
+++ b/src/organizer/engines/qorganizeritemmemorybackend.cpp
diff --git a/src/calendar/engines/qorganizeritemmemorybackend_p.h b/src/organizer/engines/qorganizeritemmemorybackend_p.h
index f991b897f9..f991b897f9 100644
--- a/src/calendar/engines/qorganizeritemmemorybackend_p.h
+++ b/src/organizer/engines/qorganizeritemmemorybackend_p.h
diff --git a/src/calendar/filters/filters.pri b/src/organizer/filters/filters.pri
index 4eef09153e..4eef09153e 100644
--- a/src/calendar/filters/filters.pri
+++ b/src/organizer/filters/filters.pri
diff --git a/src/calendar/filters/qorganizeritemchangelogfilter.cpp b/src/organizer/filters/qorganizeritemchangelogfilter.cpp
index 9c585b4128..9c585b4128 100644
--- a/src/calendar/filters/qorganizeritemchangelogfilter.cpp
+++ b/src/organizer/filters/qorganizeritemchangelogfilter.cpp
diff --git a/src/calendar/filters/qorganizeritemchangelogfilter.h b/src/organizer/filters/qorganizeritemchangelogfilter.h
index 7fd1296945..3f9cea6c8f 100644
--- a/src/calendar/filters/qorganizeritemchangelogfilter.h
+++ b/src/organizer/filters/qorganizeritemchangelogfilter.h
@@ -49,7 +49,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemChangeLogFilterPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemChangeLogFilter: public QOrganizerItemFilter
+class Q_ORGANIZER_EXPORT QOrganizerItemChangeLogFilter: public QOrganizerItemFilter
 {
 public:
     enum EventType {
diff --git a/src/calendar/filters/qorganizeritemchangelogfilter_p.h b/src/organizer/filters/qorganizeritemchangelogfilter_p.h
index f7acdd3774..f7acdd3774 100644
--- a/src/calendar/filters/qorganizeritemchangelogfilter_p.h
+++ b/src/organizer/filters/qorganizeritemchangelogfilter_p.h
diff --git a/src/calendar/filters/qorganizeritemdetailfilter.cpp b/src/organizer/filters/qorganizeritemdetailfilter.cpp
index bf6d8ee2eb..bf6d8ee2eb 100644
--- a/src/calendar/filters/qorganizeritemdetailfilter.cpp
+++ b/src/organizer/filters/qorganizeritemdetailfilter.cpp
diff --git a/src/calendar/filters/qorganizeritemdetailfilter.h b/src/organizer/filters/qorganizeritemdetailfilter.h
index 9dac77ab11..e5be57b11e 100644
--- a/src/calendar/filters/qorganizeritemdetailfilter.h
+++ b/src/organizer/filters/qorganizeritemdetailfilter.h
@@ -47,7 +47,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemDetailFilterPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemDetailFilter : public QOrganizerItemFilter
+class Q_ORGANIZER_EXPORT QOrganizerItemDetailFilter : public QOrganizerItemFilter
 {
 public:
     QOrganizerItemDetailFilter();
diff --git a/src/calendar/filters/qorganizeritemdetailfilter_p.h b/src/organizer/filters/qorganizeritemdetailfilter_p.h
index 7c0e2053c9..7c0e2053c9 100644
--- a/src/calendar/filters/qorganizeritemdetailfilter_p.h
+++ b/src/organizer/filters/qorganizeritemdetailfilter_p.h
diff --git a/src/calendar/filters/qorganizeritemdetailrangefilter.cpp b/src/organizer/filters/qorganizeritemdetailrangefilter.cpp
index 2b3148eac1..2b3148eac1 100644
--- a/src/calendar/filters/qorganizeritemdetailrangefilter.cpp
+++ b/src/organizer/filters/qorganizeritemdetailrangefilter.cpp
diff --git a/src/calendar/filters/qorganizeritemdetailrangefilter.h b/src/organizer/filters/qorganizeritemdetailrangefilter.h
index 0b7ec57f3f..59d6770b38 100644
--- a/src/calendar/filters/qorganizeritemdetailrangefilter.h
+++ b/src/organizer/filters/qorganizeritemdetailrangefilter.h
@@ -47,7 +47,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemDetailRangeFilterPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemDetailRangeFilter : public QOrganizerItemFilter
+class Q_ORGANIZER_EXPORT QOrganizerItemDetailRangeFilter : public QOrganizerItemFilter
 {
 public:
     QOrganizerItemDetailRangeFilter();
diff --git a/src/calendar/filters/qorganizeritemdetailrangefilter_p.h b/src/organizer/filters/qorganizeritemdetailrangefilter_p.h
index 63a8291585..63a8291585 100644
--- a/src/calendar/filters/qorganizeritemdetailrangefilter_p.h
+++ b/src/organizer/filters/qorganizeritemdetailrangefilter_p.h
diff --git a/src/calendar/filters/qorganizeritemfilters.h b/src/organizer/filters/qorganizeritemfilters.h
index 172329107f..8fa4f6bb84 100644
--- a/src/calendar/filters/qorganizeritemfilters.h
+++ b/src/organizer/filters/qorganizeritemfilters.h
@@ -43,7 +43,7 @@
 #define QORGANIZERITEMFILTERS_H
 
 // this file includes all of the leaf filter classes
-// provided by the Qt Calendar API.
+// provided by the Qt Organizer API.
 
 #include "qorganizeritemunionfilter.h"
 #include "qorganizeritemchangelogfilter.h"
diff --git a/src/calendar/filters/qorganizeritemintersectionfilter.cpp b/src/organizer/filters/qorganizeritemintersectionfilter.cpp
index f8242ecb12..f8242ecb12 100644
--- a/src/calendar/filters/qorganizeritemintersectionfilter.cpp
+++ b/src/organizer/filters/qorganizeritemintersectionfilter.cpp
diff --git a/src/calendar/filters/qorganizeritemintersectionfilter.h b/src/organizer/filters/qorganizeritemintersectionfilter.h
index 274379a056..67840ca843 100644
--- a/src/calendar/filters/qorganizeritemintersectionfilter.h
+++ b/src/organizer/filters/qorganizeritemintersectionfilter.h
@@ -47,7 +47,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemIntersectionFilterPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemIntersectionFilter : public QOrganizerItemFilter
+class Q_ORGANIZER_EXPORT QOrganizerItemIntersectionFilter : public QOrganizerItemFilter
 {
 public:
 
diff --git a/src/calendar/filters/qorganizeritemintersectionfilter_p.h b/src/organizer/filters/qorganizeritemintersectionfilter_p.h
index ddc55e9f3b..ddc55e9f3b 100644
--- a/src/calendar/filters/qorganizeritemintersectionfilter_p.h
+++ b/src/organizer/filters/qorganizeritemintersectionfilter_p.h
diff --git a/src/calendar/filters/qorganizeriteminvalidfilter.cpp b/src/organizer/filters/qorganizeriteminvalidfilter.cpp
index b1d4803716..b1d4803716 100644
--- a/src/calendar/filters/qorganizeriteminvalidfilter.cpp
+++ b/src/organizer/filters/qorganizeriteminvalidfilter.cpp
diff --git a/src/calendar/filters/qorganizeriteminvalidfilter.h b/src/organizer/filters/qorganizeriteminvalidfilter.h
index bfdcaa35ed..dcfe7428c0 100644
--- a/src/calendar/filters/qorganizeriteminvalidfilter.h
+++ b/src/organizer/filters/qorganizeriteminvalidfilter.h
@@ -47,7 +47,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemInvalidFilterPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemInvalidFilter : public QOrganizerItemFilter
+class Q_ORGANIZER_EXPORT QOrganizerItemInvalidFilter : public QOrganizerItemFilter
 {
 public:
     QOrganizerItemInvalidFilter();
diff --git a/src/calendar/filters/qorganizeritemlocalidfilter.cpp b/src/organizer/filters/qorganizeritemlocalidfilter.cpp
index 3dd2a6e06c..3dd2a6e06c 100644
--- a/src/calendar/filters/qorganizeritemlocalidfilter.cpp
+++ b/src/organizer/filters/qorganizeritemlocalidfilter.cpp
diff --git a/src/calendar/filters/qorganizeritemlocalidfilter.h b/src/organizer/filters/qorganizeritemlocalidfilter.h
index d6ae11b3fd..54bbde89f1 100644
--- a/src/calendar/filters/qorganizeritemlocalidfilter.h
+++ b/src/organizer/filters/qorganizeritemlocalidfilter.h
@@ -48,7 +48,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemLocalIdFilterPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemLocalIdFilter : public QOrganizerItemFilter
+class Q_ORGANIZER_EXPORT QOrganizerItemLocalIdFilter : public QOrganizerItemFilter
 {
 public:
     QOrganizerItemLocalIdFilter();
diff --git a/src/calendar/filters/qorganizeritemlocalidfilter_p.h b/src/organizer/filters/qorganizeritemlocalidfilter_p.h
index aba81cc8c9..aba81cc8c9 100644
--- a/src/calendar/filters/qorganizeritemlocalidfilter_p.h
+++ b/src/organizer/filters/qorganizeritemlocalidfilter_p.h
diff --git a/src/calendar/filters/qorganizeritemunionfilter.cpp b/src/organizer/filters/qorganizeritemunionfilter.cpp
index 439e9ae4ea..439e9ae4ea 100644
--- a/src/calendar/filters/qorganizeritemunionfilter.cpp
+++ b/src/organizer/filters/qorganizeritemunionfilter.cpp
diff --git a/src/calendar/filters/qorganizeritemunionfilter.h b/src/organizer/filters/qorganizeritemunionfilter.h
index 593699ee95..4f11425e64 100644
--- a/src/calendar/filters/qorganizeritemunionfilter.h
+++ b/src/organizer/filters/qorganizeritemunionfilter.h
@@ -47,7 +47,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemUnionFilterPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemUnionFilter : public QOrganizerItemFilter
+class Q_ORGANIZER_EXPORT QOrganizerItemUnionFilter : public QOrganizerItemFilter
 {
 public:
 
diff --git a/src/calendar/filters/qorganizeritemunionfilter_p.h b/src/organizer/filters/qorganizeritemunionfilter_p.h
index d7b80a422d..d7b80a422d 100644
--- a/src/calendar/filters/qorganizeritemunionfilter_p.h
+++ b/src/organizer/filters/qorganizeritemunionfilter_p.h
diff --git a/src/calendar/items/items.pri b/src/organizer/items/items.pri
index e90b208f13..44c2f4b1c6 100644
--- a/src/calendar/items/items.pri
+++ b/src/organizer/items/items.pri
@@ -1,6 +1,6 @@
 INCLUDEPATH += items
 
-PUBLIC_HEADERS += \
+PUBLIC_HEADERS += items/qorganizeritems.h \
     items/qorganizerevent.h \
     items/qorganizereventoccurrence.h \
     items/qorganizerjournal.h \
diff --git a/src/calendar/items/qorganizerevent.cpp b/src/organizer/items/qorganizerevent.cpp
index 202679607d..73fbae318f 100644
--- a/src/calendar/items/qorganizerevent.cpp
+++ b/src/organizer/items/qorganizerevent.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qorganizerevent.h"
-#include "qtorganizeritem.h"
+#include "qtorganizer.h"
 
 QTM_USE_NAMESPACE
 
diff --git a/src/calendar/items/qorganizerevent.h b/src/organizer/items/qorganizerevent.h
index e33ad7dc00..2b845a8ff0 100644
--- a/src/calendar/items/qorganizerevent.h
+++ b/src/organizer/items/qorganizerevent.h
@@ -42,12 +42,12 @@
 #ifndef QORGANIZEREVENT_H
 #define QORGANIZEREVENT_H
 
-#include "qtorganizeritem.h"
+#include "qtorganizer.h"
 #include "qorganizeritemrecurrence.h" // XXX TODO: is this a detail?
 
 QTM_BEGIN_NAMESPACE
 
-class Q_CALENDAR_EXPORT QOrganizerEvent : public QOrganizerItem
+class Q_ORGANIZER_EXPORT QOrganizerEvent : public QOrganizerItem
 {
 public:
     QOrganizerEvent();
diff --git a/src/calendar/items/qorganizereventoccurrence.cpp b/src/organizer/items/qorganizereventoccurrence.cpp
index 9d0e3e31ec..9d0e3e31ec 100644
--- a/src/calendar/items/qorganizereventoccurrence.cpp
+++ b/src/organizer/items/qorganizereventoccurrence.cpp
diff --git a/src/calendar/items/qorganizereventoccurrence.h b/src/organizer/items/qorganizereventoccurrence.h
index 1a956ca117..3b60eddf80 100644
--- a/src/calendar/items/qorganizereventoccurrence.h
+++ b/src/organizer/items/qorganizereventoccurrence.h
@@ -42,11 +42,11 @@
 #ifndef QORGANIZEREVENTOCCURRENCE_H
 #define QORGANIZEREVENTOCCURRENCE_H
 
-#include "qtorganizeritem.h"
+#include "qtorganizer.h"
 
 QTM_BEGIN_NAMESPACE
 
-class Q_CALENDAR_EXPORT QOrganizerEventOccurrence : public QOrganizerItem
+class Q_ORGANIZER_EXPORT QOrganizerEventOccurrence : public QOrganizerItem
 {
 public:
     QOrganizerEventOccurrence();
diff --git a/src/organizer/items/qorganizeritems.h b/src/organizer/items/qorganizeritems.h
new file mode 100644
index 0000000000..c30c456385
--- /dev/null
+++ b/src/organizer/items/qorganizeritems.h
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QORGANIZERITEMS_H
+#define QORGANIZERITEMS_H
+
+// this file includes all of the organizer item
+// leaf classes that are included in the public API
+
+#include "qorganizerevent.h"
+#include "qorganizereventoccurrence.h"
+#include "qorganizerjournal.h"
+#include "qorganizertodo.h"
+#include "qorganizertodooccurrence.h"
+
+#endif
+
diff --git a/src/calendar/items/qorganizerjournal.cpp b/src/organizer/items/qorganizerjournal.cpp
index d8873ca1cb..d8873ca1cb 100644
--- a/src/calendar/items/qorganizerjournal.cpp
+++ b/src/organizer/items/qorganizerjournal.cpp
diff --git a/src/calendar/items/qorganizerjournal.h b/src/organizer/items/qorganizerjournal.h
index 3c09f374ed..1ad550a306 100644
--- a/src/calendar/items/qorganizerjournal.h
+++ b/src/organizer/items/qorganizerjournal.h
@@ -42,11 +42,11 @@
 #ifndef QORGANIZERJOURNAL_H
 #define QORGANIZERJOURNAL_H
 
-#include "qtorganizeritem.h"
+#include "qtorganizer.h"
 
 QTM_BEGIN_NAMESPACE
 
-class Q_CALENDAR_EXPORT QOrganizerJournal : public QOrganizerItem
+class Q_ORGANIZER_EXPORT QOrganizerJournal : public QOrganizerItem
 {
 public:
     QOrganizerJournal();
diff --git a/src/calendar/items/qorganizernote.cpp b/src/organizer/items/qorganizernote.cpp
index 92756c4ef5..92756c4ef5 100644
--- a/src/calendar/items/qorganizernote.cpp
+++ b/src/organizer/items/qorganizernote.cpp
diff --git a/src/calendar/items/qorganizernote.h b/src/organizer/items/qorganizernote.h
index 87a2dde95d..8f34408159 100644
--- a/src/calendar/items/qorganizernote.h
+++ b/src/organizer/items/qorganizernote.h
@@ -42,11 +42,11 @@
 #ifndef QORGANIZERNOTE_H
 #define QORGANIZERNOTE_H
 
-#include "qtorganizeritem.h"
+#include "qtorganizer.h"
 
 QTM_BEGIN_NAMESPACE
 
-class Q_CALENDAR_EXPORT QOrganizerNote : public QOrganizerItem
+class Q_ORGANIZER_EXPORT QOrganizerNote : public QOrganizerItem
 {
 public:
     QOrganizerNote();
diff --git a/src/calendar/items/qorganizertodo.cpp b/src/organizer/items/qorganizertodo.cpp
index 93b33ee84f..9d04f569e6 100644
--- a/src/calendar/items/qorganizertodo.cpp
+++ b/src/organizer/items/qorganizertodo.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qorganizertodo.h"
-#include "qtorganizeritem.h"
+#include "qtorganizer.h"
 
 QTM_USE_NAMESPACE
 
diff --git a/src/calendar/items/qorganizertodo.h b/src/organizer/items/qorganizertodo.h
index c1cb01abd4..d6cfd0fb3d 100644
--- a/src/calendar/items/qorganizertodo.h
+++ b/src/organizer/items/qorganizertodo.h
@@ -42,11 +42,11 @@
 #ifndef QORGANIZERTODO_H
 #define QORGANIZERTODO_H
 
-#include "qtorganizeritem.h"
+#include "qtorganizer.h"
 #include "qorganizeritemrecurrence.h"
 QTM_BEGIN_NAMESPACE
 
-class Q_CALENDAR_EXPORT QOrganizerTodo : public QOrganizerItem
+class Q_ORGANIZER_EXPORT QOrganizerTodo : public QOrganizerItem
 {
 public:
     QOrganizerTodo();
diff --git a/src/calendar/items/qorganizertodooccurrence.cpp b/src/organizer/items/qorganizertodooccurrence.cpp
index d03c76357e..d03c76357e 100644
--- a/src/calendar/items/qorganizertodooccurrence.cpp
+++ b/src/organizer/items/qorganizertodooccurrence.cpp
diff --git a/src/calendar/items/qorganizertodooccurrence.h b/src/organizer/items/qorganizertodooccurrence.h
index b381a72a18..dc3952b304 100644
--- a/src/calendar/items/qorganizertodooccurrence.h
+++ b/src/organizer/items/qorganizertodooccurrence.h
@@ -42,11 +42,11 @@
 #ifndef QORGANIZERTODOOCCURRENCE_H
 #define QORGANIZERTODOOCCURRENCE_H
 
-#include "qtorganizeritem.h"
+#include "qtorganizer.h"
 
 QTM_BEGIN_NAMESPACE
 
-class Q_CALENDAR_EXPORT QOrganizerTodoOccurrence : public QOrganizerItem
+class Q_ORGANIZER_EXPORT QOrganizerTodoOccurrence : public QOrganizerItem
 {
 public:
     QOrganizerTodoOccurrence();
diff --git a/src/calendar/calendar.pro b/src/organizer/organizer.pro
index d89cb05d62..85ea139084 100644
--- a/src/calendar/calendar.pro
+++ b/src/organizer/organizer.pro
@@ -1,11 +1,11 @@
 # #####################################################################
-# Calendar Mobility API
+# Organizer Mobility API
 # #####################################################################
 TEMPLATE = lib
 
 # Target gets fixed up in common.pri
-TARGET = QtCalendar
-DEFINES += QT_BUILD_CALENDAR_LIB \
+TARGET = QtOrganizer
+DEFINES += QT_BUILD_ORGANIZER_LIB \
     QT_MAKEDLL \
     QT_ASCII_CAST_WARNINGS
 include(../../common.pri)
@@ -30,8 +30,8 @@ PUBLIC_HEADERS += qorganizeritemabstractrequest.h \
     qorganizeritemmanagerenginefactory.h \
     qorganizeritemsortorder.h \
     qorganizeritemrecurrence.h \
-    qtorganizeritemsglobal.h \
-    qtorganizeritem.h
+    qtorganizerglobal.h \
+    qtorganizer.h
 PRIVATE_HEADERS += qorganizeritemmanager_p.h \
     qorganizeritemabstractrequest_p.h \
     qorganizeritemchangeset_p.h \
@@ -67,11 +67,11 @@ symbian {
         -TCB
     TARGET.UID3 = 0x2002AC7A
     
-    # ## Calendar
+    # ## Organizer
     # Main library
-    CALENDAR_DEPLOYMENT.sources = QtCalendar.dll
-    CALENDAR_DEPLOYMENT.path = \sys\bin
-    DEPLOYMENT += CALENDAR_DEPLOYMENT
+    ORGANIZER_DEPLOYMENT.sources = QtOrganizer.dll
+    ORGANIZER_DEPLOYMENT.path = \sys\bin
+    DEPLOYMENT += ORGANIZER_DEPLOYMENT
     deploy.path = $$EPOCROOT
     exportheaders.sources = $$PUBLIC_HEADERS
     exportheaders.path = epoc32/include
diff --git a/src/calendar/qorganizer.cpp b/src/organizer/qorganizer.cpp
index dc05725e94..c71f61ef51 100644
--- a/src/calendar/qorganizer.cpp
+++ b/src/organizer/qorganizer.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 
 QTM_USE_NAMESPACE
 
diff --git a/src/calendar/qorganizeritem.cpp b/src/organizer/qorganizeritem.cpp
index 7ca649bf21..7ca649bf21 100644
--- a/src/calendar/qorganizeritem.cpp
+++ b/src/organizer/qorganizeritem.cpp
diff --git a/src/calendar/qorganizeritem.h b/src/organizer/qorganizeritem.h
index ee5e0f8035..764cf39618 100644
--- a/src/calendar/qorganizeritem.h
+++ b/src/organizer/qorganizeritem.h
@@ -50,14 +50,7 @@
 #include <QDateTime>
 #include <QSharedDataPointer>
 
-#include "qtorganizeritemsglobal.h"
-
-#include "qorganizeritemdetail.h"
-#include "qorganizeritemdetaildefinition.h"
-#include "qorganizeritemdisplaylabel.h"
-#include "qorganizeritemtype.h"
-#include "qorganizeritemnote.h"
-#include "qorganizeritemid.h"
+#include "qtorganizer.h"
 
 QTM_BEGIN_NAMESPACE
 
@@ -65,7 +58,7 @@ class QOrganizerItemManager;
 class QOrganizerItemData;
 class QOrganizerItemName;
 
-class Q_CALENDAR_EXPORT QOrganizerItem
+class Q_ORGANIZER_EXPORT QOrganizerItem
 {
 public:
     QOrganizerItem();
@@ -175,9 +168,9 @@ protected:
     QSharedDataPointer<QOrganizerItemData> d;
 };
 
-Q_CALENDAR_EXPORT uint qHash(const QOrganizerItem& key);
+Q_ORGANIZER_EXPORT uint qHash(const QOrganizerItem& key);
 #ifndef QT_NO_DEBUG_STREAM
-Q_CALENDAR_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItem& organizeritem);
+Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItem& organizeritem);
 #endif
 
 QTM_END_NAMESPACE
diff --git a/src/calendar/qorganizeritem_p.h b/src/organizer/qorganizeritem_p.h
index b1abdf2488..924deae8ea 100644
--- a/src/calendar/qorganizeritem_p.h
+++ b/src/organizer/qorganizeritem_p.h
@@ -59,7 +59,7 @@
 #include <QDateTime>
 #include <QMultiHash>
 
-#include "qtorganizeritem.h"
+#include "qtorganizer.h"
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/calendar/qorganizeritemabstractrequest.cpp b/src/organizer/qorganizeritemabstractrequest.cpp
index c4906217dd..c4906217dd 100644
--- a/src/calendar/qorganizeritemabstractrequest.cpp
+++ b/src/organizer/qorganizeritemabstractrequest.cpp
diff --git a/src/calendar/qorganizeritemabstractrequest.h b/src/organizer/qorganizeritemabstractrequest.h
index 0ae55fbfd8..5345f797c8 100644
--- a/src/calendar/qorganizeritemabstractrequest.h
+++ b/src/organizer/qorganizeritemabstractrequest.h
@@ -49,7 +49,7 @@ QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemManagerEngine;
 class QOrganizerItemAbstractRequestPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemAbstractRequest : public QObject
+class Q_ORGANIZER_EXPORT QOrganizerItemAbstractRequest : public QObject
 {
     Q_OBJECT
 
diff --git a/src/calendar/qorganizeritemabstractrequest_p.h b/src/organizer/qorganizeritemabstractrequest_p.h
index 6221ba486d..6221ba486d 100644
--- a/src/calendar/qorganizeritemabstractrequest_p.h
+++ b/src/organizer/qorganizeritemabstractrequest_p.h
diff --git a/src/calendar/qorganizeritemchangeset.cpp b/src/organizer/qorganizeritemchangeset.cpp
index 9546f79d93..9546f79d93 100644
--- a/src/calendar/qorganizeritemchangeset.cpp
+++ b/src/organizer/qorganizeritemchangeset.cpp
diff --git a/src/calendar/qorganizeritemchangeset.h b/src/organizer/qorganizeritemchangeset.h
index 39293ce143..62bfdcf8e1 100644
--- a/src/calendar/qorganizeritemchangeset.h
+++ b/src/organizer/qorganizeritemchangeset.h
@@ -43,7 +43,7 @@
 #ifndef QORGANIZERITEMCHANGESET_H
 #define QORGANIZERITEMCHANGESET_H
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemid.h"
 
 #include <QSet>
@@ -54,7 +54,7 @@ QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemManagerEngine;
 class QOrganizerItemChangeSetData;
-class Q_CALENDAR_EXPORT QOrganizerItemChangeSet
+class Q_ORGANIZER_EXPORT QOrganizerItemChangeSet
 {
 public:
     QOrganizerItemChangeSet();
diff --git a/src/calendar/qorganizeritemchangeset_p.h b/src/organizer/qorganizeritemchangeset_p.h
index fe15ef7123..ebe38720a1 100644
--- a/src/calendar/qorganizeritemchangeset_p.h
+++ b/src/organizer/qorganizeritemchangeset_p.h
@@ -54,7 +54,7 @@
 // We mean it.
 //
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include <QSharedData>
 #include <QSet>
 #include <QPair>
diff --git a/src/calendar/qorganizeritemdetail.cpp b/src/organizer/qorganizeritemdetail.cpp
index c8e406ee75..c8e406ee75 100644
--- a/src/calendar/qorganizeritemdetail.cpp
+++ b/src/organizer/qorganizeritemdetail.cpp
diff --git a/src/calendar/qorganizeritemdetail.h b/src/organizer/qorganizeritemdetail.h
index 6b56fe625d..1c8eb46436 100644
--- a/src/calendar/qorganizeritemdetail.h
+++ b/src/organizer/qorganizeritemdetail.h
@@ -43,7 +43,7 @@
 #ifndef QORGANIZERITEMDETAIL_H
 #define QORGANIZERITEMDETAIL_H
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 
 #include <QSharedDataPointer>
 #include <QStringList>
@@ -52,7 +52,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemDetailPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerItemDetail
 {
 public:
     QOrganizerItemDetail();
@@ -149,21 +149,21 @@ private:
     QSharedDataPointer<QOrganizerItemDetailPrivate> d;
 };
 
-Q_CALENDAR_EXPORT uint qHash(const QOrganizerItemDetail& key);
+Q_ORGANIZER_EXPORT uint qHash(const QOrganizerItemDetail& key);
 #ifndef QT_NO_DEBUG_STREAM
-Q_CALENDAR_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemDetail& detail);
+Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemDetail& detail);
 #endif
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QOrganizerItemDetail::AccessConstraints);
 
-#define Q_DECLARE_CUSTOM_CALENDAR_DETAIL(className, definitionNameString) \
+#define Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(className, definitionNameString) \
     className() : QOrganizerItemDetail(DefinitionName.latin1()) {} \
     className(const QOrganizerItemDetail& field) : QOrganizerItemDetail(field, DefinitionName.latin1()) {} \
     className& operator=(const QOrganizerItemDetail& other) {assign(other, DefinitionName.latin1()); return *this;} \
     \
     Q_DECLARE_LATIN1_CONSTANT(DefinitionName, definitionNameString);
 
-#define Q_IMPLEMENT_CUSTOM_CALENDAR_DETAIL(className, definitionNameString) \
+#define Q_IMPLEMENT_CUSTOM_ORGANIZER_DETAIL(className, definitionNameString) \
     Q_DEFINE_LATIN1_CONSTANT(className::DefinitionName, definitionNameString)
 
 QTM_END_NAMESPACE
diff --git a/src/calendar/qorganizeritemdetail_p.h b/src/organizer/qorganizeritemdetail_p.h
index 8ee60bcd1f..8ee60bcd1f 100644
--- a/src/calendar/qorganizeritemdetail_p.h
+++ b/src/organizer/qorganizeritemdetail_p.h
diff --git a/src/calendar/qorganizeritemdetaildefinition.cpp b/src/organizer/qorganizeritemdetaildefinition.cpp
index fe901718ea..fe901718ea 100644
--- a/src/calendar/qorganizeritemdetaildefinition.cpp
+++ b/src/organizer/qorganizeritemdetaildefinition.cpp
diff --git a/src/calendar/qorganizeritemdetaildefinition.h b/src/organizer/qorganizeritemdetaildefinition.h
index aaeb27428e..1b8a6c25d6 100644
--- a/src/calendar/qorganizeritemdetaildefinition.h
+++ b/src/organizer/qorganizeritemdetaildefinition.h
@@ -48,13 +48,13 @@
 #include <QSharedDataPointer>
 #include <QVariant>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetailfielddefinition.h"
 
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemDetailDefinitionData;
-class Q_CALENDAR_EXPORT QOrganizerItemDetailDefinition
+class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinition
 {
     friend class QOrganizerItemManager;
 
diff --git a/src/calendar/qorganizeritemdetaildefinition_p.h b/src/organizer/qorganizeritemdetaildefinition_p.h
index 534a000880..534a000880 100644
--- a/src/calendar/qorganizeritemdetaildefinition_p.h
+++ b/src/organizer/qorganizeritemdetaildefinition_p.h
diff --git a/src/calendar/qorganizeritemdetailfielddefinition.cpp b/src/organizer/qorganizeritemdetailfielddefinition.cpp
index fdc4f2b890..fdc4f2b890 100644
--- a/src/calendar/qorganizeritemdetailfielddefinition.cpp
+++ b/src/organizer/qorganizeritemdetailfielddefinition.cpp
diff --git a/src/calendar/qorganizeritemdetailfielddefinition.h b/src/organizer/qorganizeritemdetailfielddefinition.h
index e304c5b410..605ea4cacb 100644
--- a/src/calendar/qorganizeritemdetailfielddefinition.h
+++ b/src/organizer/qorganizeritemdetailfielddefinition.h
@@ -46,12 +46,12 @@
 #include <QVariant>
 #include <QSharedDataPointer>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemDetailFieldDefinitionPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemDetailFieldDefinition
+class Q_ORGANIZER_EXPORT QOrganizerItemDetailFieldDefinition
 {
 public:
     QOrganizerItemDetailFieldDefinition();
diff --git a/src/calendar/qorganizeritemdetailfielddefinition_p.h b/src/organizer/qorganizeritemdetailfielddefinition_p.h
index 852cfc5fb0..852cfc5fb0 100644
--- a/src/calendar/qorganizeritemdetailfielddefinition_p.h
+++ b/src/organizer/qorganizeritemdetailfielddefinition_p.h
diff --git a/src/calendar/qorganizeritemfetchhint.cpp b/src/organizer/qorganizeritemfetchhint.cpp
index 138d485d3c..138d485d3c 100644
--- a/src/calendar/qorganizeritemfetchhint.cpp
+++ b/src/organizer/qorganizeritemfetchhint.cpp
diff --git a/src/calendar/qorganizeritemfetchhint.h b/src/organizer/qorganizeritemfetchhint.h
index ae22a31455..5d8055dc5d 100644
--- a/src/calendar/qorganizeritemfetchhint.h
+++ b/src/organizer/qorganizeritemfetchhint.h
@@ -46,13 +46,13 @@
 #include <QList>
 #include <QSharedData>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemdetaildefinition.h"
 
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemFetchHintPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemFetchHint {
+class Q_ORGANIZER_EXPORT QOrganizerItemFetchHint {
 public:
     QOrganizerItemFetchHint();
     QOrganizerItemFetchHint(const QOrganizerItemFetchHint& other);
diff --git a/src/calendar/qorganizeritemfetchhint_p.h b/src/organizer/qorganizeritemfetchhint_p.h
index 85091d38e7..85091d38e7 100644
--- a/src/calendar/qorganizeritemfetchhint_p.h
+++ b/src/organizer/qorganizeritemfetchhint_p.h
diff --git a/src/calendar/qorganizeritemfilter.cpp b/src/organizer/qorganizeritemfilter.cpp
index 97edee8d9d..97edee8d9d 100644
--- a/src/calendar/qorganizeritemfilter.cpp
+++ b/src/organizer/qorganizeritemfilter.cpp
diff --git a/src/calendar/qorganizeritemfilter.h b/src/organizer/qorganizeritemfilter.h
index 697a4019f0..98d294cddb 100644
--- a/src/calendar/qorganizeritemfilter.h
+++ b/src/organizer/qorganizeritemfilter.h
@@ -47,7 +47,7 @@
 #include <QDateTime>
 #include <QSharedData>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 
 QTM_BEGIN_NAMESPACE
 
@@ -59,7 +59,7 @@ QTM_BEGIN_NAMESPACE
     friend class Class##Private;
 
 class QOrganizerItemFilterPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemFilter
+class Q_ORGANIZER_EXPORT QOrganizerItemFilter
 {
 public:
     QOrganizerItemFilter();
@@ -105,8 +105,8 @@ protected:
     QSharedDataPointer<QOrganizerItemFilterPrivate> d_ptr;
 };
 
-const Q_CALENDAR_EXPORT QOrganizerItemFilter operator&(const QOrganizerItemFilter& left, const QOrganizerItemFilter& right);
-const Q_CALENDAR_EXPORT QOrganizerItemFilter operator|(const QOrganizerItemFilter& left, const QOrganizerItemFilter& right);
+const Q_ORGANIZER_EXPORT QOrganizerItemFilter operator&(const QOrganizerItemFilter& left, const QOrganizerItemFilter& right);
+const Q_ORGANIZER_EXPORT QOrganizerItemFilter operator|(const QOrganizerItemFilter& left, const QOrganizerItemFilter& right);
 
 QTM_END_NAMESPACE
 
diff --git a/src/calendar/qorganizeritemfilter_p.h b/src/organizer/qorganizeritemfilter_p.h
index 4dc16a4c96..4dc16a4c96 100644
--- a/src/calendar/qorganizeritemfilter_p.h
+++ b/src/organizer/qorganizeritemfilter_p.h
diff --git a/src/calendar/qorganizeritemid.cpp b/src/organizer/qorganizeritemid.cpp
index 74bcc86009..74bcc86009 100644
--- a/src/calendar/qorganizeritemid.cpp
+++ b/src/organizer/qorganizeritemid.cpp
diff --git a/src/calendar/qorganizeritemid.h b/src/organizer/qorganizeritemid.h
index 8d525b64cd..85dbfb2acf 100644
--- a/src/calendar/qorganizeritemid.h
+++ b/src/organizer/qorganizeritemid.h
@@ -45,14 +45,14 @@
 #include <QString>
 #include <QSharedDataPointer>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 
 QTM_BEGIN_NAMESPACE
 
 typedef quint32 QOrganizerItemLocalId;
 
 class QOrganizerItemIdPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemId
+class Q_ORGANIZER_EXPORT QOrganizerItemId
 {
 public:
     QOrganizerItemId();
@@ -75,9 +75,9 @@ private:
     QSharedDataPointer<QOrganizerItemIdPrivate> d;
 };
 
-Q_CALENDAR_EXPORT uint qHash(const QOrganizerItemId& key);
+Q_ORGANIZER_EXPORT uint qHash(const QOrganizerItemId& key);
 #ifndef QT_NO_DEBUG_STREAM
-Q_CALENDAR_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemId& id);
+Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemId& id);
 #endif
 
 QTM_END_NAMESPACE
diff --git a/src/calendar/qorganizeritemid_p.h b/src/organizer/qorganizeritemid_p.h
index a34c5f9e07..a34c5f9e07 100644
--- a/src/calendar/qorganizeritemid_p.h
+++ b/src/organizer/qorganizeritemid_p.h
diff --git a/src/calendar/qorganizeritemmanager.cpp b/src/organizer/qorganizeritemmanager.cpp
index b8446eef88..f60c1d14d0 100644
--- a/src/calendar/qorganizeritemmanager.cpp
+++ b/src/organizer/qorganizeritemmanager.cpp
@@ -113,9 +113,9 @@ QStringList QOrganizerItemManager::availableManagers()
     ret.append(QOrganizerItemManagerData::m_engines.keys());
 
     // now swizzle the default engine to pole position
-#if defined(Q_CALENDAR_DEFAULT_ENGINE)
-    if (ret.removeAll(QLatin1String(makename(Q_CALENDAR_DEFAULT_ENGINE)))) {
-        ret.prepend(QLatin1String(makename(Q_CALENDAR_DEFAULT_ENGINE)));
+#if defined(Q_ORGANIZER_DEFAULT_ENGINE)
+    if (ret.removeAll(QLatin1String(makename(Q_ORGANIZER_DEFAULT_ENGINE)))) {
+        ret.prepend(QLatin1String(makename(Q_ORGANIZER_DEFAULT_ENGINE)));
     }
 #endif
 
diff --git a/src/calendar/qorganizeritemmanager.h b/src/organizer/qorganizeritemmanager.h
index 4011aacc7c..c123db198c 100644
--- a/src/calendar/qorganizeritemmanager.h
+++ b/src/organizer/qorganizeritemmanager.h
@@ -51,7 +51,7 @@
 #include <QList>
 #include <QDateTime>
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritem.h"
 #include "qorganizeritemid.h"
 #include "qorganizeritemsortorder.h"
@@ -63,7 +63,7 @@ class QOrganizerItemFilter;
 class QOrganizerItemAction;
 
 class QOrganizerItemManagerData;
-class Q_CALENDAR_EXPORT QOrganizerItemManager : public QObject
+class Q_ORGANIZER_EXPORT QOrganizerItemManager : public QObject
 {
     Q_OBJECT
 
diff --git a/src/calendar/qorganizeritemmanager_p.cpp b/src/organizer/qorganizeritemmanager_p.cpp
index 61c5a1c5c1..61c5a1c5c1 100644
--- a/src/calendar/qorganizeritemmanager_p.cpp
+++ b/src/organizer/qorganizeritemmanager_p.cpp
diff --git a/src/calendar/qorganizeritemmanager_p.h b/src/organizer/qorganizeritemmanager_p.h
index 4ef0481203..4ef0481203 100644
--- a/src/calendar/qorganizeritemmanager_p.h
+++ b/src/organizer/qorganizeritemmanager_p.h
diff --git a/src/calendar/qorganizeritemmanagerengine.cpp b/src/organizer/qorganizeritemmanagerengine.cpp
index b95a339180..b95a339180 100644
--- a/src/calendar/qorganizeritemmanagerengine.cpp
+++ b/src/organizer/qorganizeritemmanagerengine.cpp
diff --git a/src/calendar/qorganizeritemmanagerengine.h b/src/organizer/qorganizeritemmanagerengine.h
index 2819a7c2a2..643ebd7ae8 100644
--- a/src/calendar/qorganizeritemmanagerengine.h
+++ b/src/organizer/qorganizeritemmanagerengine.h
@@ -71,7 +71,7 @@ class QOrganizerItemDetailDefinitionSaveRequest;
 class QOrganizerItemDetailDefinitionRemoveRequest;
 class QOrganizerItemDetailDefinitionFetchRequest;
 
-class Q_CALENDAR_EXPORT QOrganizerItemManagerEngine : public QObject
+class Q_ORGANIZER_EXPORT QOrganizerItemManagerEngine : public QObject
 {
     Q_OBJECT
 
diff --git a/src/calendar/qorganizeritemmanagerenginefactory.cpp b/src/organizer/qorganizeritemmanagerenginefactory.cpp
index 2f3ae47be5..2f3ae47be5 100644
--- a/src/calendar/qorganizeritemmanagerenginefactory.cpp
+++ b/src/organizer/qorganizeritemmanagerenginefactory.cpp
diff --git a/src/calendar/qorganizeritemmanagerenginefactory.h b/src/organizer/qorganizeritemmanagerenginefactory.h
index 4028b74677..6637b70b36 100644
--- a/src/calendar/qorganizeritemmanagerenginefactory.h
+++ b/src/organizer/qorganizeritemmanagerenginefactory.h
@@ -52,7 +52,7 @@
 QTM_BEGIN_NAMESPACE
 /* Backend plugin API interface, creates engines for us */
 class QOrganizerItemManagerEngine;
-class Q_CALENDAR_EXPORT QOrganizerItemManagerEngineFactory
+class Q_ORGANIZER_EXPORT QOrganizerItemManagerEngineFactory
 {
 public:
     // engine factory functions
@@ -64,8 +64,8 @@ public:
 QTM_END_NAMESPACE
 
 QT_BEGIN_NAMESPACE
-#define QT_CALENDAR_BACKEND_INTERFACE "com.nokia.qt.mobility.organizeritems.enginefactory/1.0"
-Q_DECLARE_INTERFACE(QtMobility::QOrganizerItemManagerEngineFactory, QT_CALENDAR_BACKEND_INTERFACE);
+#define QT_ORGANIZER_BACKEND_INTERFACE "com.nokia.qt.mobility.organizeritems.enginefactory/1.0"
+Q_DECLARE_INTERFACE(QtMobility::QOrganizerItemManagerEngineFactory, QT_ORGANIZER_BACKEND_INTERFACE);
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/calendar/qorganizeritemrecurrence.cpp b/src/organizer/qorganizeritemrecurrence.cpp
index 61ab497aa3..61ab497aa3 100644
--- a/src/calendar/qorganizeritemrecurrence.cpp
+++ b/src/organizer/qorganizeritemrecurrence.cpp
diff --git a/src/calendar/qorganizeritemrecurrence.h b/src/organizer/qorganizeritemrecurrence.h
index b7729c67d8..bef3ce1dff 100644
--- a/src/calendar/qorganizeritemrecurrence.h
+++ b/src/organizer/qorganizeritemrecurrence.h
@@ -49,7 +49,7 @@
 class QDateTime;
 class QOrganizerItemRecurrencePrivate;
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 
 QTM_BEGIN_NAMESPACE
 
@@ -57,7 +57,7 @@ QTM_BEGIN_NAMESPACE
  * This is based on RDATE in iCalendar.
  */
 
-class Q_CALENDAR_EXPORT QOrganizerItemRecurrence
+class Q_ORGANIZER_EXPORT QOrganizerItemRecurrence
 {
 public:
     QOrganizerItemRecurrence();
diff --git a/src/calendar/qorganizeritemrecurrencedates.cpp b/src/organizer/qorganizeritemrecurrencedates.cpp
index 61ab497aa3..61ab497aa3 100644
--- a/src/calendar/qorganizeritemrecurrencedates.cpp
+++ b/src/organizer/qorganizeritemrecurrencedates.cpp
diff --git a/src/calendar/qorganizeritemrecurrencedates.h b/src/organizer/qorganizeritemrecurrencedates.h
index e73eab6c92..e73eab6c92 100644
--- a/src/calendar/qorganizeritemrecurrencedates.h
+++ b/src/organizer/qorganizeritemrecurrencedates.h
diff --git a/src/calendar/qorganizeritemrecurrencerule.cpp b/src/organizer/qorganizeritemrecurrencerule.cpp
index 61ab497aa3..61ab497aa3 100644
--- a/src/calendar/qorganizeritemrecurrencerule.cpp
+++ b/src/organizer/qorganizeritemrecurrencerule.cpp
diff --git a/src/calendar/qorganizeritemrecurrencerule.h b/src/organizer/qorganizeritemrecurrencerule.h
index e990ee7fa7..e990ee7fa7 100644
--- a/src/calendar/qorganizeritemrecurrencerule.h
+++ b/src/organizer/qorganizeritemrecurrencerule.h
diff --git a/src/calendar/qorganizeritemsortorder.cpp b/src/organizer/qorganizeritemsortorder.cpp
index e3ea2995d0..e3ea2995d0 100644
--- a/src/calendar/qorganizeritemsortorder.cpp
+++ b/src/organizer/qorganizeritemsortorder.cpp
diff --git a/src/calendar/qorganizeritemsortorder.h b/src/organizer/qorganizeritemsortorder.h
index 9e924573fb..9a734c25a1 100644
--- a/src/calendar/qorganizeritemsortorder.h
+++ b/src/organizer/qorganizeritemsortorder.h
@@ -42,7 +42,7 @@
 #ifndef QORGANIZERITEMSORTORDER_H
 #define QORGANIZERITEMSORTORDER_H
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 
 #include <QString>
 #include <QSharedData>
@@ -51,7 +51,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemSortOrderPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemSortOrder
+class Q_ORGANIZER_EXPORT QOrganizerItemSortOrder
 {
 public:
     QOrganizerItemSortOrder();
diff --git a/src/calendar/qorganizeritemsortorder_p.h b/src/organizer/qorganizeritemsortorder_p.h
index 53f067fe4f..53f067fe4f 100644
--- a/src/calendar/qorganizeritemsortorder_p.h
+++ b/src/organizer/qorganizeritemsortorder_p.h
diff --git a/src/calendar/qtorganizeritem.h b/src/organizer/qtorganizer.h
index c3edc69def..e53253126c 100644
--- a/src/calendar/qtorganizeritem.h
+++ b/src/organizer/qtorganizer.h
@@ -45,12 +45,11 @@
 // this file includes all of the public header files
 // provided by the Qt Organizer Item API
 
-#include "qtorganizeritemsglobal.h"                   // global exports
+#include "qtorganizerglobal.h"                   // global exports
 #include "qorganizeritemabstractrequest.h"            // asynchronous request
 #include "qorganizeritemdetail.h"                     // organizeritem detail
 #include "qorganizeritemdetaildefinition.h"           // detail definition
 #include "qorganizeritemdetailfielddefinition.h"      // field in a detail definition
-#include "qorganizeritemdetails.h"                    // leaf detail classes
 #include "qorganizeritemfetchhint.h"                  // fetch hint class
 #include "qorganizeritemfilter.h"                     // organizeritem filter
 #include "qorganizeritem.h"                           // organizeritem
@@ -60,4 +59,9 @@
 #include "qorganizeritemmanagerenginefactory.h"       // manage backend instantiator
 #include "qorganizeritemsortorder.h"                  // organizeritem sorting
 
+#include "qorganizeritems.h"                          // item derived classes
+#include "qorganizeritemdetails.h"                    // detail derived classes
+#include "qorganizeritemrequests.h"                   // request derived classes
+#include "qorganizeritemfilters.h"                    // detail derived classes
+
 #endif
diff --git a/src/calendar/qtorganizeritemsglobal.h b/src/organizer/qtorganizerglobal.h
index 827fdf0399..827fdf0399 100644
--- a/src/calendar/qtorganizeritemsglobal.h
+++ b/src/organizer/qtorganizerglobal.h
diff --git a/src/calendar/requests/qorganizeritemdetaildefinitionfetchrequest.cpp b/src/organizer/requests/qorganizeritemdetaildefinitionfetchrequest.cpp
index 38eb18ee15..38eb18ee15 100644
--- a/src/calendar/requests/qorganizeritemdetaildefinitionfetchrequest.cpp
+++ b/src/organizer/requests/qorganizeritemdetaildefinitionfetchrequest.cpp
diff --git a/src/calendar/requests/qorganizeritemdetaildefinitionfetchrequest.h b/src/organizer/requests/qorganizeritemdetaildefinitionfetchrequest.h
index 70fb255dc8..68995483d7 100644
--- a/src/calendar/requests/qorganizeritemdetaildefinitionfetchrequest.h
+++ b/src/organizer/requests/qorganizeritemdetaildefinitionfetchrequest.h
@@ -42,7 +42,7 @@
 #ifndef QORGANIZERITEMDETAILDEFINITIONFETCHREQUEST_H
 #define QORGANIZERITEMDETAILDEFINITIONFETCHREQUEST_H
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemabstractrequest.h"
 #include "qorganizeritemdetaildefinition.h"
 
@@ -52,7 +52,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemDetailDefinitionFetchRequestPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemDetailDefinitionFetchRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionFetchRequest : public QOrganizerItemAbstractRequest
 {
     Q_OBJECT
 
diff --git a/src/calendar/requests/qorganizeritemdetaildefinitionremoverequest.cpp b/src/organizer/requests/qorganizeritemdetaildefinitionremoverequest.cpp
index 5c342e4c48..5c342e4c48 100644
--- a/src/calendar/requests/qorganizeritemdetaildefinitionremoverequest.cpp
+++ b/src/organizer/requests/qorganizeritemdetaildefinitionremoverequest.cpp
diff --git a/src/calendar/requests/qorganizeritemdetaildefinitionremoverequest.h b/src/organizer/requests/qorganizeritemdetaildefinitionremoverequest.h
index f3b08c344f..57688ab614 100644
--- a/src/calendar/requests/qorganizeritemdetaildefinitionremoverequest.h
+++ b/src/organizer/requests/qorganizeritemdetaildefinitionremoverequest.h
@@ -42,7 +42,7 @@
 #ifndef QORGANIZERITEMDETAILDEFINITIONREMOVEREQUEST_H
 #define QORGANIZERITEMDETAILDEFINITIONREMOVEREQUEST_H
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemabstractrequest.h"
 
 #include <QStringList>
@@ -50,7 +50,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemDetailDefinitionRemoveRequestPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemDetailDefinitionRemoveRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionRemoveRequest : public QOrganizerItemAbstractRequest
 {
     Q_OBJECT
 
diff --git a/src/calendar/requests/qorganizeritemdetaildefinitionsaverequest.cpp b/src/organizer/requests/qorganizeritemdetaildefinitionsaverequest.cpp
index f07b3fce8c..f07b3fce8c 100644
--- a/src/calendar/requests/qorganizeritemdetaildefinitionsaverequest.cpp
+++ b/src/organizer/requests/qorganizeritemdetaildefinitionsaverequest.cpp
diff --git a/src/calendar/requests/qorganizeritemdetaildefinitionsaverequest.h b/src/organizer/requests/qorganizeritemdetaildefinitionsaverequest.h
index 9354048e97..b040516edc 100644
--- a/src/calendar/requests/qorganizeritemdetaildefinitionsaverequest.h
+++ b/src/organizer/requests/qorganizeritemdetaildefinitionsaverequest.h
@@ -42,7 +42,7 @@
 #ifndef QORGANIZERITEMDETAILDEFINITIONSAVEREQUEST_H
 #define QORGANIZERITEMDETAILDEFINITIONSAVEREQUEST_H
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemabstractrequest.h"
 #include "qorganizeritemdetaildefinition.h"
 
@@ -52,7 +52,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemDetailDefinitionSaveRequestPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemDetailDefinitionSaveRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionSaveRequest : public QOrganizerItemAbstractRequest
 {
     Q_OBJECT
 
diff --git a/src/calendar/requests/qorganizeritemfetchrequest.cpp b/src/organizer/requests/qorganizeritemfetchrequest.cpp
index eebe023707..eebe023707 100644
--- a/src/calendar/requests/qorganizeritemfetchrequest.cpp
+++ b/src/organizer/requests/qorganizeritemfetchrequest.cpp
diff --git a/src/calendar/requests/qorganizeritemfetchrequest.h b/src/organizer/requests/qorganizeritemfetchrequest.h
index 55d3e461dd..4c4cd5a0cf 100644
--- a/src/calendar/requests/qorganizeritemfetchrequest.h
+++ b/src/organizer/requests/qorganizeritemfetchrequest.h
@@ -42,7 +42,7 @@
 #ifndef QORGANIZERITEMFETCHREQUEST_H
 #define QORGANIZERITEMFETCHREQUEST_H
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemabstractrequest.h"
 #include "qorganizeritemsortorder.h"
 #include "qorganizeritemfilter.h"
@@ -55,7 +55,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemFetchRequestPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemFetchRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemFetchRequest : public QOrganizerItemAbstractRequest
 {
     Q_OBJECT
 
diff --git a/src/calendar/requests/qorganizeriteminstancefetchrequest.cpp b/src/organizer/requests/qorganizeriteminstancefetchrequest.cpp
index 921516d71d..921516d71d 100644
--- a/src/calendar/requests/qorganizeriteminstancefetchrequest.cpp
+++ b/src/organizer/requests/qorganizeriteminstancefetchrequest.cpp
diff --git a/src/calendar/requests/qorganizeriteminstancefetchrequest.h b/src/organizer/requests/qorganizeriteminstancefetchrequest.h
index d89e35c01d..e9d172a7ed 100644
--- a/src/calendar/requests/qorganizeriteminstancefetchrequest.h
+++ b/src/organizer/requests/qorganizeriteminstancefetchrequest.h
@@ -42,7 +42,7 @@
 #ifndef QORGANIZERITEMINSTANCEFETCHREQUEST_H
 #define QORGANIZERITEMINSTANCEFETCHREQUEST_H
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemabstractrequest.h"
 #include "qorganizeritemsortorder.h"
 #include "qorganizeritemfilter.h"
@@ -55,7 +55,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemInstanceFetchRequestPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemInstanceFetchRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemInstanceFetchRequest : public QOrganizerItemAbstractRequest
 {
     Q_OBJECT
 
diff --git a/src/calendar/requests/qorganizeritemlocalidfetchrequest.cpp b/src/organizer/requests/qorganizeritemlocalidfetchrequest.cpp
index 236e315a8d..236e315a8d 100644
--- a/src/calendar/requests/qorganizeritemlocalidfetchrequest.cpp
+++ b/src/organizer/requests/qorganizeritemlocalidfetchrequest.cpp
diff --git a/src/calendar/requests/qorganizeritemlocalidfetchrequest.h b/src/organizer/requests/qorganizeritemlocalidfetchrequest.h
index 6e5799a9f2..6ff265bbaf 100644
--- a/src/calendar/requests/qorganizeritemlocalidfetchrequest.h
+++ b/src/organizer/requests/qorganizeritemlocalidfetchrequest.h
@@ -42,7 +42,7 @@
 #ifndef QORGANIZERITEMIDFETCHREQUEST_H
 #define QORGANIZERITEMIDFETCHREQUEST_H
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemabstractrequest.h"
 #include "qorganizeritemsortorder.h"
 #include "qorganizeritemfilter.h"
@@ -53,7 +53,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemLocalIdFetchRequestPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemLocalIdFetchRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemLocalIdFetchRequest : public QOrganizerItemAbstractRequest
 {
     Q_OBJECT
 
diff --git a/src/calendar/requests/qorganizeritemremoverequest.cpp b/src/organizer/requests/qorganizeritemremoverequest.cpp
index 94631b19f5..94631b19f5 100644
--- a/src/calendar/requests/qorganizeritemremoverequest.cpp
+++ b/src/organizer/requests/qorganizeritemremoverequest.cpp
diff --git a/src/calendar/requests/qorganizeritemremoverequest.h b/src/organizer/requests/qorganizeritemremoverequest.h
index a1db705619..599da9bc55 100644
--- a/src/calendar/requests/qorganizeritemremoverequest.h
+++ b/src/organizer/requests/qorganizeritemremoverequest.h
@@ -42,7 +42,7 @@
 #ifndef QORGANIZERITEMREMOVEREQUEST_H
 #define QORGANIZERITEMREMOVEREQUEST_H
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemabstractrequest.h"
 #include "qorganizeritemfilter.h"
 
@@ -51,7 +51,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemRemoveRequestPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemRemoveRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemRemoveRequest : public QOrganizerItemAbstractRequest
 {
     Q_OBJECT
 
diff --git a/src/calendar/requests/qorganizeritemrequests.h b/src/organizer/requests/qorganizeritemrequests.h
index 0db7bd49f3..0db7bd49f3 100644
--- a/src/calendar/requests/qorganizeritemrequests.h
+++ b/src/organizer/requests/qorganizeritemrequests.h
diff --git a/src/calendar/requests/qorganizeritemrequests_p.h b/src/organizer/requests/qorganizeritemrequests_p.h
index d11a89ff9b..782fedb7f6 100644
--- a/src/calendar/requests/qorganizeritemrequests_p.h
+++ b/src/organizer/requests/qorganizeritemrequests_p.h
@@ -57,7 +57,7 @@
 #include "qorganizeritemfilter.h"
 #include "qorganizeritemsortorder.h"
 #include "qorganizeritem.h"
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 
 #include <QStringList>
 #include <QList>
diff --git a/src/calendar/requests/qorganizeritemsaverequest.cpp b/src/organizer/requests/qorganizeritemsaverequest.cpp
index 8f194f0235..8f194f0235 100644
--- a/src/calendar/requests/qorganizeritemsaverequest.cpp
+++ b/src/organizer/requests/qorganizeritemsaverequest.cpp
diff --git a/src/calendar/requests/qorganizeritemsaverequest.h b/src/organizer/requests/qorganizeritemsaverequest.h
index c2060009c4..e56bf1cd55 100644
--- a/src/calendar/requests/qorganizeritemsaverequest.h
+++ b/src/organizer/requests/qorganizeritemsaverequest.h
@@ -42,7 +42,7 @@
 #ifndef QORGANIZERITEMSAVEREQUEST_H
 #define QORGANIZERITEMSAVEREQUEST_H
 
-#include "qtorganizeritemsglobal.h"
+#include "qtorganizerglobal.h"
 #include "qorganizeritemabstractrequest.h"
 #include "qorganizeritem.h"
 
@@ -51,7 +51,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemSaveRequestPrivate;
-class Q_CALENDAR_EXPORT QOrganizerItemSaveRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemSaveRequest : public QOrganizerItemAbstractRequest
 {
     Q_OBJECT
 
diff --git a/src/calendar/requests/requests.pri b/src/organizer/requests/requests.pri
index cd0d31c2eb..cd0d31c2eb 100644
--- a/src/calendar/requests/requests.pri
+++ b/src/organizer/requests/requests.pri
diff --git a/src/src.pro b/src/src.pro
index 48b2ef4b76..cd798583f8 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -28,12 +28,12 @@ contains(mobility_modules,publishsubscribe) {
 contains(mobility_modules,systeminfo): SUBDIRS += systeminfo
 contains(mobility_modules,versit): SUBDIRS += versit
 contains(mobility_modules,sensors): SUBDIRS += sensors
-contains(mobility_modules,calendar): SUBDIRS += calendar
+contains(mobility_modules,organizer): SUBDIRS += organizer
 
-# Versit depends on Contacts & Calendar
+# Versit depends on Contacts & Organizer
 versit.subdir=versit
 versit.target=sub-versit
-versit.depends=contacts calendar
+versit.depends=contacts organizer
 
 contains(qmf_enabled, yes)|wince*|win32|symbian|maemo5 {
     contains(mobility_modules,messaging) {
author	Chris Adams <christopher.adams@nokia.com>	2010-05-12 14:16:59 +1000
committer	Chris Adams <christopher.adams@nokia.com>	2010-05-12 14:16:59 +1000
commit	1db11748b4ceeddb6c1913256b1250c665bdc82f (patch)
tree	86eef9dfe7ed262078b9a0b8a67575acf2bb4494
parent	a519d8afd026458d65279c5cad377f23b848bdd7 (diff)