summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/3rdparty/phonon/mmf/abstractplayer.cpp2
-rw-r--r--src/3rdparty/phonon/mmf/audiooutput.cpp2
-rw-r--r--src/3rdparty/phonon/mmf/audioplayer.cpp4
-rw-r--r--src/3rdparty/phonon/mmf/backend.cpp2
-rw-r--r--src/3rdparty/phonon/mmf/mediaobject.cpp4
-rw-r--r--src/3rdparty/phonon/mmf/mmf_videoplayer.cpp16
-rw-r--r--src/3rdparty/phonon/mmf/mmfphonondebug/objectdump.cpp8
-rw-r--r--src/3rdparty/phonon/mmf/mmfphonondebug/objecttree.cpp4
-rw-r--r--src/3rdparty/phonon/mmf/videooutput.cpp2
9 files changed, 22 insertions, 22 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractplayer.cpp b/src/3rdparty/phonon/mmf/abstractplayer.cpp
index c6f0f6b..6ed5d51 100644
--- a/src/3rdparty/phonon/mmf/abstractplayer.cpp
+++ b/src/3rdparty/phonon/mmf/abstractplayer.cpp
@@ -30,7 +30,7 @@ using namespace Phonon::MMF;
//-----------------------------------------------------------------------------
MMF::AbstractPlayer::AbstractPlayer()
- : m_videoOutput(NULL)
+ : m_videoOutput(0)
, m_tickInterval(DefaultTickInterval)
, m_transitionTime(0)
, m_prefinishMark(0)
diff --git a/src/3rdparty/phonon/mmf/audiooutput.cpp b/src/3rdparty/phonon/mmf/audiooutput.cpp
index 20130ad..8c8c330 100644
--- a/src/3rdparty/phonon/mmf/audiooutput.cpp
+++ b/src/3rdparty/phonon/mmf/audiooutput.cpp
@@ -36,7 +36,7 @@ using namespace Phonon::MMF;
MMF::AudioOutput::AudioOutput(Backend *, QObject *parent) : MediaNode(parent)
, m_volume(InitialVolume)
- , m_observer(NULL)
+ , m_observer(0)
{
}
diff --git a/src/3rdparty/phonon/mmf/audioplayer.cpp b/src/3rdparty/phonon/mmf/audioplayer.cpp
index 17294a7..09fdca0 100644
--- a/src/3rdparty/phonon/mmf/audioplayer.cpp
+++ b/src/3rdparty/phonon/mmf/audioplayer.cpp
@@ -30,14 +30,14 @@ using namespace Phonon::MMF;
// Constructor / destructor
//-----------------------------------------------------------------------------
-MMF::AudioPlayer::AudioPlayer() : m_player(NULL)
+MMF::AudioPlayer::AudioPlayer() : m_player(0)
{
construct();
}
MMF::AudioPlayer::AudioPlayer(const AbstractPlayer& player)
: AbstractMediaPlayer(player)
- , m_player(NULL)
+ , m_player(0)
{
construct();
}
diff --git a/src/3rdparty/phonon/mmf/backend.cpp b/src/3rdparty/phonon/mmf/backend.cpp
index 7a9141d..0a9130c 100644
--- a/src/3rdparty/phonon/mmf/backend.cpp
+++ b/src/3rdparty/phonon/mmf/backend.cpp
@@ -56,7 +56,7 @@ QObject *Backend::createObject(BackendInterface::Class c, QObject *parent, const
TRACE_CONTEXT(Backend::createObject, EBackend);
TRACE_ENTRY("class %d", c);
- QObject* result = NULL;
+ QObject* result = 0;
switch (c) {
case AudioOutputClass:
diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp
index de0de59..5a5540c 100644
--- a/src/3rdparty/phonon/mmf/mediaobject.cpp
+++ b/src/3rdparty/phonon/mmf/mediaobject.cpp
@@ -267,9 +267,9 @@ void MMF::MediaObject::createPlayer(const MediaSource &source)
break;
}
- AbstractPlayer* newPlayer = NULL;
+ AbstractPlayer* newPlayer = 0;
- // Construct newPlayer using oldPlayer (if not NULL) in order to copy
+ // Construct newPlayer using oldPlayer (if not 0) in order to copy
// parameters (volume, prefinishMark, transitionTime) which may have
// been set on oldPlayer.
diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp
index 0c47ece..8a38b76 100644
--- a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp
+++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp
@@ -40,9 +40,9 @@ using namespace Phonon::MMF;
//-----------------------------------------------------------------------------
MMF::VideoPlayer::VideoPlayer()
- : m_wsSession(NULL)
- , m_screenDevice(NULL)
- , m_window(NULL)
+ : m_wsSession(0)
+ , m_screenDevice(0)
+ , m_window(0)
, m_totalTime(0)
, m_mmfOutputChangePending(false)
{
@@ -51,9 +51,9 @@ MMF::VideoPlayer::VideoPlayer()
MMF::VideoPlayer::VideoPlayer(const AbstractPlayer& player)
: AbstractMediaPlayer(player)
- , m_wsSession(NULL)
- , m_screenDevice(NULL)
- , m_window(NULL)
+ , m_wsSession(0)
+ , m_screenDevice(0)
+ , m_window(0)
, m_totalTime(0)
, m_mmfOutputChangePending(false)
{
@@ -66,7 +66,7 @@ void MMF::VideoPlayer::construct()
TRACE_ENTRY_0();
if (!m_videoOutput) {
- m_dummyVideoOutput.reset(new VideoOutput(NULL));
+ m_dummyVideoOutput.reset(new VideoOutput(0));
}
videoOutput().setObserver(this);
@@ -382,7 +382,7 @@ void MMF::VideoPlayer::videoOutputChanged()
// Lazily construct a dummy output if needed here
if (!m_videoOutput and m_dummyVideoOutput.isNull()) {
- m_dummyVideoOutput.reset(new VideoOutput(NULL));
+ m_dummyVideoOutput.reset(new VideoOutput(0));
}
videoOutput().setObserver(this);
diff --git a/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump.cpp b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump.cpp
index 50c6bf8..ef2b81c 100644
--- a/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump.cpp
+++ b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump.cpp
@@ -278,7 +278,7 @@ void QVisitorPrivate::setIndent(unsigned indent)
void QVisitorPrivate::visitNode(const QObject& object)
{
QObject* const objectParent = object.parent();
- Node* const nodeParent = objectParent ? findNode(objectParent) : NULL;
+ Node* const nodeParent = objectParent ? findNode(objectParent) : 0;
// Create a new node and store in scoped pointer for exception safety
Node* node = new Node;
@@ -309,13 +309,13 @@ void QVisitorPrivate::visitComplete()
QList<bool> branches;
static const bool isLastChild = true;
dumpRecursive(*m_root, branches, isLastChild);
- m_root.reset(NULL);
+ m_root.reset(0);
}
QVisitorPrivate::Node* QVisitorPrivate::findNode(const QObject* object) const
{
Hash::const_iterator i = m_hash.find(object);
- return (m_hash.end() == i) ? NULL : *i;
+ return (m_hash.end() == i) ? 0 : *i;
}
QByteArray QVisitorPrivate::branchBuffer
@@ -390,7 +390,7 @@ void QVisitorPrivate::dumpNode
// No annotations - just dump the object pointer
const bool isNodeLine = true;
QByteArray buffer = branchBuffer(branches, isNodeLine, isLastChild);
- qDebug() << NULL; // TODO
+ qDebug() << 0; // TODO
}
else {
// Dump annotations
diff --git a/src/3rdparty/phonon/mmf/mmfphonondebug/objecttree.cpp b/src/3rdparty/phonon/mmf/mmfphonondebug/objecttree.cpp
index f9d1c93..5053b2d 100644
--- a/src/3rdparty/phonon/mmf/mmfphonondebug/objecttree.cpp
+++ b/src/3rdparty/phonon/mmf/mmfphonondebug/objecttree.cpp
@@ -26,7 +26,7 @@ namespace ObjectTree
{
DepthFirstConstIterator::DepthFirstConstIterator()
- : m_pointee(NULL)
+ : m_pointee(0)
{
}
@@ -72,7 +72,7 @@ void DepthFirstConstIterator::backtrack()
}
else {
// Reached end of search
- m_pointee = NULL;
+ m_pointee = 0;
}
}
diff --git a/src/3rdparty/phonon/mmf/videooutput.cpp b/src/3rdparty/phonon/mmf/videooutput.cpp
index 642de97..e51fbcf 100644
--- a/src/3rdparty/phonon/mmf/videooutput.cpp
+++ b/src/3rdparty/phonon/mmf/videooutput.cpp
@@ -42,7 +42,7 @@ using namespace Phonon::MMF;
MMF::VideoOutput::VideoOutput(QWidget* parent)
: QWidget(parent)
- , m_observer(NULL)
+ , m_observer(0)
{
TRACE_CONTEXT(VideoOutput::VideoOutput, EVideoInternal);
TRACE_ENTRY("parent 0x%08x", parent);
generated by cgit v0.12 at 2025-02-07 02:15:40 (GMT)