[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/kdelibs-phonon/phonon
From: Matthias Kretz <kretz () kde ! org>
Date: 2006-01-28 21:15:15
Message-ID: 1138482915.988456.18644.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 503350 by mkretz:
convert-kurl
M +2 -2 DESIGN/design.xmi
M +2 -2 DESIGN/layered architecture.xmi
M +1 -1 ifaces/backend.h
M +3 -3 ifaces/mediaobject.h
M +3 -3 mediaobject.cpp
M +3 -3 mediaobject.h
M +2 -2 simpleplayer.cpp
M +2 -2 simpleplayer.h
M +1 -1 tests/fakebackend/backend.h
M +2 -2 tests/fakebackend/mediaobject.cpp
M +4 -4 tests/fakebackend/mediaobject.h
M +1 -1 tests/mediaobjecttest.h
M +1 -1 tests/statetest.cpp
M +2 -2 tests/statetest.h
M +1 -1 ui/factory.h
M +1 -1 ui/tests/testwidget.cpp
--- branches/work/kdelibs-phonon/phonon/DESIGN/design.xmi #503349:503350
@@ -11494,7 +11494,7 @@
</codeblockwithcomments>
<cppheaderclassdeclarationblock parent_id="38650" \
tag="classDeclarationBlock" canDelete="false" > <header>
- <cppcodedocumentation tag="" text="Class KURL&#010;" />
+ <cppcodedocumentation tag="" text="Class KUrl&#010;" />
</header>
<textblocks>
<hierarchicalcodeblock tag="publicBlock" canDelete="false" >
@@ -11518,7 +11518,7 @@
<cppcodedocumentation tag="" indentLevel="1" text="Constructors" />
</header>
<textblocks>
- <codeblockwithcomments tag="emptyconstructor" writeOutText="false" \
indentLevel="1" text="KURL ( ) { }" > + <codeblockwithcomments \
tag="emptyconstructor" writeOutText="false" indentLevel="1" text="KUrl ( ) { }" > \
<header>
<cppcodedocumentation tag="" indentLevel="1" text="Empty \
Constructor" /> </header>
--- branches/work/kdelibs-phonon/phonon/DESIGN/layered architecture.xmi \
#503349:503350 @@ -4503,7 +4503,7 @@
</codeblockwithcomments>
<cppheaderclassdeclarationblock parent_id="33795" \
tag="classDeclarationBlock" canDelete="false" > <header>
- <cppcodedocumentation tag="" writeOutText="false" text="Class \
KURL&#010;" /> + <cppcodedocumentation tag="" writeOutText="false" \
text="Class KUrl&#010;" /> </header>
<textblocks>
<hierarchicalcodeblock tag="publicBlock" canDelete="false" >
@@ -4527,7 +4527,7 @@
<cppcodedocumentation tag="" writeOutText="false" indentLevel="1" \
text="Constructors" /> </header>
<textblocks>
- <codeblockwithcomments tag="emptyconstructor" writeOutText="false" \
indentLevel="1" text="KURL ( ) { }" > + <codeblockwithcomments \
tag="emptyconstructor" writeOutText="false" indentLevel="1" text="KUrl ( ) { }" > \
<header>
<cppcodedocumentation tag="" indentLevel="1" text="Empty \
Constructor" /> </header>
--- branches/work/kdelibs-phonon/phonon/ifaces/backend.h #503349:503350
@@ -24,7 +24,7 @@
#include <kmimetype.h>
#include <kdelibs_export.h>
-class KURL;
+class KUrl;
namespace Phonon
{
--- branches/work/kdelibs-phonon/phonon/ifaces/mediaobject.h #503349:503350
@@ -21,7 +21,7 @@
#include "abstractmediaproducer.h"
-class KURL;
+class KUrl;
namespace Phonon
{
@@ -45,7 +45,7 @@
*
* @param url The URL to the media data.
*/
- virtual KURL url() const = 0;
+ virtual KUrl url() const = 0;
/**
* Get the total time (in milliseconds) of the file currently being played.
*
@@ -59,7 +59,7 @@
virtual long aboutToFinishTime() const = 0;
// Attributes Setters:
- virtual void setUrl( const KURL& url ) = 0;
+ virtual void setUrl( const KUrl& url ) = 0;
virtual void setAboutToFinishTime( long newAboutToFinishTime ) = 0;
protected:
--- branches/work/kdelibs-phonon/phonon/mediaobject.cpp #503349:503350
@@ -31,13 +31,13 @@
: aboutToFinishTime( 0 )
{ }
- KURL url;
+ KUrl url;
long aboutToFinishTime;
};
PHONON_HEIR_IMPL( MediaObject, AbstractMediaProducer )
-KURL MediaObject::url() const
+KUrl MediaObject::url() const
{
return m_iface ? m_iface->url() : d->url;
}
@@ -57,7 +57,7 @@
return m_iface ? m_iface->aboutToFinishTime() : d->aboutToFinishTime;
}
-void MediaObject::setUrl( const KURL& url )
+void MediaObject::setUrl( const KUrl& url )
{
if( iface() )
{
--- branches/work/kdelibs-phonon/phonon/mediaobject.h #503349:503350
@@ -24,7 +24,7 @@
#include <kdelibs_export.h>
#include "phonondefs.h"
-class KURL;
+class KUrl;
namespace Phonon
{
@@ -61,7 +61,7 @@
*
* \return The currently used URL to the media data
*/
- KURL url() const;
+ KUrl url() const;
/**
* Get the total time (in milliseconds) of the file currently being played.
*
@@ -91,7 +91,7 @@
*
* \param url The URL to the media data.
*/
- void setUrl( const KURL& url );
+ void setUrl( const KUrl& url );
/**
* Sets the time in milliseconds the aboutToFinish signal is emitted
--- branches/work/kdelibs-phonon/phonon/simpleplayer.cpp #503349:503350
@@ -40,7 +40,7 @@
MediaObject * player;
AudioPath * path;
AudioOutput * output;
- KURL url;
+ KUrl url;
State state;
float volume;
long time;
@@ -64,7 +64,7 @@
delete d->output;
}
-void SimplePlayer::play( const KURL & url )
+void SimplePlayer::play( const KUrl & url )
{
if( d->player )
{
--- branches/work/kdelibs-phonon/phonon/simpleplayer.h #503349:503350
@@ -24,7 +24,7 @@
#include "state.h"
#include <kdelibs_export.h>
-class KURL;
+class KUrl;
namespace Phonon
{
@@ -36,7 +36,7 @@
SimplePlayer( QObject * parent = 0 );
~SimplePlayer();
- void play( const KURL & url );
+ void play( const KUrl & url );
void pause();
void stop();
--- branches/work/kdelibs-phonon/phonon/tests/fakebackend/backend.h #503349:503350
@@ -22,7 +22,7 @@
#include "../../ifaces/backend.h"
-class KURL;
+class KUrl;
namespace Phonon
{
--- branches/work/kdelibs-phonon/phonon/tests/fakebackend/mediaobject.cpp \
#503349:503350 @@ -41,7 +41,7 @@
kdDebug() << k_funcinfo << endl;
}
-KURL MediaObject::url() const
+KUrl MediaObject::url() const
{
kdDebug() << k_funcinfo << endl;
return m_url;
@@ -59,7 +59,7 @@
return m_aboutToFinishTime;
}
-void MediaObject::setUrl( const KURL& url )
+void MediaObject::setUrl( const KUrl& url )
{
kdDebug() << k_funcinfo << endl;
stop();
--- branches/work/kdelibs-phonon/phonon/tests/fakebackend/mediaobject.h \
#503349:503350 @@ -23,7 +23,7 @@
#include "../../ifaces/mediaobject.h"
#include <kurl.h>
-class KURL;
+class KUrl;
namespace Phonon
{
@@ -35,11 +35,11 @@
public:
MediaObject( QObject* parent );
virtual ~MediaObject();
- virtual KURL url() const;
+ virtual KUrl url() const;
virtual long totalTime() const;
//virtual long remainingTime() const;
virtual long aboutToFinishTime() const;
- virtual void setUrl( const KURL& url );
+ virtual void setUrl( const KUrl& url );
virtual void setAboutToFinishTime( long newAboutToFinishTime );
virtual void play();
@@ -58,7 +58,7 @@
void aboutToFinishTimeout();
private:
- KURL m_url;
+ KUrl m_url;
long m_aboutToFinishTime;
QTimer* m_aboutToFinishTimer;
QTimer* m_finishTimer;
--- branches/work/kdelibs-phonon/phonon/tests/mediaobjecttest.h #503349:503350
@@ -43,7 +43,7 @@
void cleanupTestCase();
private:
- KURL m_url;
+ KUrl m_url;
Phonon::MediaObject* m_media;
QSignalSpy* m_spy;
};
--- branches/work/kdelibs-phonon/phonon/tests/statetest.cpp #503349:503350
@@ -28,7 +28,7 @@
void StateTester::initTestCase()
{
- m_url = new KURL( getenv( "PHONON_TESTURL" ) );
+ m_url = new KUrl( getenv( "PHONON_TESTURL" ) );
}
void StateTester::run()
--- branches/work/kdelibs-phonon/phonon/tests/statetest.h #503349:503350
@@ -24,7 +24,7 @@
#include <phonon/state.h>
-class KURL;
+class KUrl;
namespace Phonon
{
@@ -48,7 +48,7 @@
void wrongStateChange();
Phonon::MediaObject* player;
- KURL* m_url;
+ KUrl* m_url;
};
#endif // STATETEST_H
--- branches/work/kdelibs-phonon/phonon/ui/factory.h #503349:503350
@@ -23,7 +23,7 @@
#include <QObject>
#include <kdelibs_export.h>
-class KURL;
+class KUrl;
namespace Phonon
{
--- branches/work/kdelibs-phonon/phonon/ui/tests/testwidget.cpp #503349:503350
@@ -172,7 +172,7 @@
{
delete m_media;
m_media = new MediaObject( this );
- m_media->setUrl( KURL( file ) );
+ m_media->setUrl( KUrl( file ) );
m_media->setTickInterval( 100 );
m_media->addAudioPath( path );
if( m_media->hasVideo() && BackendCapabilities::self()->supportsVideo() )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic