summaryrefslogtreecommitdiffstats
path: root/src/gallery/symbian
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallery/symbian')
-rw-r--r--src/gallery/symbian/qdocumentgallery_symbian.cpp4
-rw-r--r--src/gallery/symbian/qgallerymdsutility.cpp4
-rw-r--r--src/gallery/symbian/qgallerymdsutility_p.h4
-rw-r--r--src/gallery/symbian/qmdegallerycategoryresultset.cpp4
-rw-r--r--src/gallery/symbian/qmdegallerycategoryresultset_p.h4
-rw-r--r--src/gallery/symbian/qmdegalleryitemresultset.cpp4
-rw-r--r--src/gallery/symbian/qmdegalleryitemresultset_p.h4
-rw-r--r--src/gallery/symbian/qmdegalleryqueryresultset.cpp4
-rw-r--r--src/gallery/symbian/qmdegalleryqueryresultset_p.h4
-rw-r--r--src/gallery/symbian/qmdegalleryresultset.cpp4
-rw-r--r--src/gallery/symbian/qmdegalleryresultset_p.h4
-rw-r--r--src/gallery/symbian/qmdegallerytyperesultset.cpp4
-rw-r--r--src/gallery/symbian/qmdegallerytyperesultset_p.h4
-rw-r--r--src/gallery/symbian/qmdesession.cpp4
-rw-r--r--src/gallery/symbian/qmdesession_p.h4
15 files changed, 30 insertions, 30 deletions
diff --git a/src/gallery/symbian/qdocumentgallery_symbian.cpp b/src/gallery/symbian/qdocumentgallery_symbian.cpp
index 277ea7b..130355d 100644
--- a/src/gallery/symbian/qdocumentgallery_symbian.cpp
+++ b/src/gallery/symbian/qdocumentgallery_symbian.cpp
@@ -57,7 +57,7 @@
#include "qmdegallerycategoryresultset_p.h"
#include "qmdesession_p.h"
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
class QDocumentGalleryPrivate : public QAbstractGalleryPrivate
{
@@ -187,4 +187,4 @@ QGalleryAbstractResponse* QDocumentGallery::createResponse(QGalleryAbstractReque
}
}
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
diff --git a/src/gallery/symbian/qgallerymdsutility.cpp b/src/gallery/symbian/qgallerymdsutility.cpp
index 4821304..9d5a69e 100644
--- a/src/gallery/symbian/qgallerymdsutility.cpp
+++ b/src/gallery/symbian/qgallerymdsutility.cpp
@@ -54,7 +54,7 @@
#include <e32des8.h>
#include <QFileInfo>
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
QDocumentGalleryMDSUtility::QDocumentGalleryMDSUtility()
{
@@ -3738,4 +3738,4 @@ int QDocumentGalleryMDSUtility::AddMetadataFilter(CMdELogicCondition &rootCond,
return conditionError;
}
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
diff --git a/src/gallery/symbian/qgallerymdsutility_p.h b/src/gallery/symbian/qgallerymdsutility_p.h
index b6f5187..b5f0e50 100644
--- a/src/gallery/symbian/qgallerymdsutility_p.h
+++ b/src/gallery/symbian/qgallerymdsutility_p.h
@@ -64,7 +64,7 @@
#include <mdequery.h>
#include <e32std.h>
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
class QDocumentGalleryMDSUtility
{
@@ -209,6 +209,6 @@ private:
};
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
#endif // QDOCUMENTGALLERYMDSUTILITY_H
diff --git a/src/gallery/symbian/qmdegallerycategoryresultset.cpp b/src/gallery/symbian/qmdegallerycategoryresultset.cpp
index 2bc6bc6..8f03591 100644
--- a/src/gallery/symbian/qmdegallerycategoryresultset.cpp
+++ b/src/gallery/symbian/qmdegallerycategoryresultset.cpp
@@ -50,7 +50,7 @@
#include <mdeconstants.h>
#include <mdeobjectdef.h>
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
namespace
{
@@ -728,4 +728,4 @@ void QMDEGalleryCategoryResultSet::HandleQueryCompleted(CMdEQuery &, TInt aError
}
}
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
diff --git a/src/gallery/symbian/qmdegallerycategoryresultset_p.h b/src/gallery/symbian/qmdegallerycategoryresultset_p.h
index 6185d0d..315164c 100644
--- a/src/gallery/symbian/qmdegallerycategoryresultset_p.h
+++ b/src/gallery/symbian/qmdegallerycategoryresultset_p.h
@@ -62,7 +62,7 @@
#include <mdeobjectquery.h>
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
class QMdeSession;
@@ -136,6 +136,6 @@ private:
};
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
#endif
diff --git a/src/gallery/symbian/qmdegalleryitemresultset.cpp b/src/gallery/symbian/qmdegalleryitemresultset.cpp
index 5afdbfe..ce6c6d7 100644
--- a/src/gallery/symbian/qmdegalleryitemresultset.cpp
+++ b/src/gallery/symbian/qmdegalleryitemresultset.cpp
@@ -47,7 +47,7 @@
#include "qdocumentgallery.h"
#include "qgalleryitemrequest.h"
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
QMDEGalleryItemResultSet::QMDEGalleryItemResultSet(QMdeSession *session, QObject *parent)
:QMDEGalleryResultSet(parent)
@@ -180,4 +180,4 @@ void QMDEGalleryItemResultSet::cleanupResultSet()
m_cleaned = true;
}
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
diff --git a/src/gallery/symbian/qmdegalleryitemresultset_p.h b/src/gallery/symbian/qmdegalleryitemresultset_p.h
index d791332..3b573ff 100644
--- a/src/gallery/symbian/qmdegalleryitemresultset_p.h
+++ b/src/gallery/symbian/qmdegalleryitemresultset_p.h
@@ -57,7 +57,7 @@
#include <mdesession.h>
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
class QGalleryItemRequest;
@@ -103,6 +103,6 @@ private:
RArray<TItemId> m_currentObjectIDs;
};
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
#endif // QMDEGALLERYITEMRESULTSET_H
diff --git a/src/gallery/symbian/qmdegalleryqueryresultset.cpp b/src/gallery/symbian/qmdegalleryqueryresultset.cpp
index 10a198e..6aa6bdf 100644
--- a/src/gallery/symbian/qmdegalleryqueryresultset.cpp
+++ b/src/gallery/symbian/qmdegalleryqueryresultset.cpp
@@ -47,7 +47,7 @@
#include "qdocumentgallery.h"
#include "qgalleryqueryrequest.h"
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
QMDEGalleryQueryResultSet::QMDEGalleryQueryResultSet(QMdeSession *session, QObject *parent)
:QMDEGalleryResultSet(parent)
@@ -356,4 +356,4 @@ void QMDEGalleryQueryResultSet::handleUpdatedResults()
m_currentObjectIDs = m_updatedObjectIDs;
}
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
diff --git a/src/gallery/symbian/qmdegalleryqueryresultset_p.h b/src/gallery/symbian/qmdegalleryqueryresultset_p.h
index ff77fb8..ff085a1 100644
--- a/src/gallery/symbian/qmdegalleryqueryresultset_p.h
+++ b/src/gallery/symbian/qmdegalleryqueryresultset_p.h
@@ -58,7 +58,7 @@
#include <mdequery.h>
#include <mdesession.h>
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
class QGalleryQueryRequest;
@@ -122,6 +122,6 @@ private:
bool m_query_running;
};
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
#endif // QMDEGALLERYQUERYRESULTSET_H
diff --git a/src/gallery/symbian/qmdegalleryresultset.cpp b/src/gallery/symbian/qmdegalleryresultset.cpp
index 74ad66b..392950c 100644
--- a/src/gallery/symbian/qmdegalleryresultset.cpp
+++ b/src/gallery/symbian/qmdegalleryresultset.cpp
@@ -49,7 +49,7 @@
#include <mdeobject.h>
#include <mdeobjectdef.h>
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
QMDEGalleryResultSet::QMDEGalleryResultSet(QObject *parent)
: QGalleryResultSet(parent)
@@ -219,4 +219,4 @@ bool QMDEGalleryResultSet::fetch(int index)
return isValid;
}
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
diff --git a/src/gallery/symbian/qmdegalleryresultset_p.h b/src/gallery/symbian/qmdegalleryresultset_p.h
index 087e7ad..62eb587 100644
--- a/src/gallery/symbian/qmdegalleryresultset_p.h
+++ b/src/gallery/symbian/qmdegalleryresultset_p.h
@@ -64,7 +64,7 @@
class CMdEObject;
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
class QMdeSession;
@@ -126,5 +126,5 @@ protected:
};
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
#endif // QMDEGALLERYRESULTSET_H
diff --git a/src/gallery/symbian/qmdegallerytyperesultset.cpp b/src/gallery/symbian/qmdegallerytyperesultset.cpp
index 7fa6333..bcdfc8f 100644
--- a/src/gallery/symbian/qmdegallerytyperesultset.cpp
+++ b/src/gallery/symbian/qmdegallerytyperesultset.cpp
@@ -47,7 +47,7 @@
//API
#include "qgallerytyperequest.h"
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
QMDEGalleryTypeResultSet::QMDEGalleryTypeResultSet(QMdeSession *session, QGalleryTypeRequest *request)
@@ -214,4 +214,4 @@ void QMDEGalleryTypeResultSet::HandleQueryCompleted(CMdEQuery &aQuery, TInt aErr
}
}
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
diff --git a/src/gallery/symbian/qmdegallerytyperesultset_p.h b/src/gallery/symbian/qmdegallerytyperesultset_p.h
index fd90b5c..4c8dd51 100644
--- a/src/gallery/symbian/qmdegallerytyperesultset_p.h
+++ b/src/gallery/symbian/qmdegallerytyperesultset_p.h
@@ -59,7 +59,7 @@
#include <mdequery.h>
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
class QGalleryTypeRequest;
@@ -101,5 +101,5 @@ private:
int m_currentIndex;
};
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
#endif // QMDEGALLERYTYPERESULTSET_H
diff --git a/src/gallery/symbian/qmdesession.cpp b/src/gallery/symbian/qmdesession.cpp
index beb253f..bd9e4fa 100644
--- a/src/gallery/symbian/qmdesession.cpp
+++ b/src/gallery/symbian/qmdesession.cpp
@@ -48,7 +48,7 @@
#include <mdeconstants.h>
#include <e32base.h>
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
QMdeSession::QMdeSession(QObject *parent)
:QObject(parent)
@@ -251,4 +251,4 @@ void QMdeSession::RemoveTrackedResultSet( QMDEGalleryResultSet* aResultSet )
}
}
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
diff --git a/src/gallery/symbian/qmdesession_p.h b/src/gallery/symbian/qmdesession_p.h
index 1ba4f4c..ac86b0a 100644
--- a/src/gallery/symbian/qmdesession_p.h
+++ b/src/gallery/symbian/qmdesession_p.h
@@ -64,7 +64,7 @@
#include <mdequery.h>
#include <e32std.h>
-QT_BEGIN_NAMESPACE
+QT_ADDON_GALLERY_BEGIN_NAMESPACE
class QGalleryAbstractResponse;
@@ -122,6 +122,6 @@ private:
RPointerArray<QMDEGalleryResultSet> m_resultSetList;
};
-QT_END_NAMESPACE
+QT_ADDON_GALLERY_END_NAMESPACE
#endif // QMDESESSION_H