1 files changed, 60 insertions, 60 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index a80d8fd..85d9bac 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -53,4 +53,4 @@ MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
     readConfig( cfg );
-    isStreaming = false;
-    isSeekable = true;
+    streaming = false;
+    seekable = true;
 }
@@ -64,6 +64,6 @@ void MediaPlayerState::readConfig( Config& cfg ) {
     cfg.setGroup("Options");
-    isFullscreen = cfg.readBoolEntry( "FullScreen" );
-    isScaled = cfg.readBoolEntry( "Scaling" );
-    isLooping = cfg.readBoolEntry( "Looping" );
-    isShuffled = cfg.readBoolEntry( "Shuffle" );
+    fullscreen = cfg.readBoolEntry( "FullScreen" );
+    scaled = cfg.readBoolEntry( "Scaling" );
+    looping = cfg.readBoolEntry( "Looping" );
+    shuffled = cfg.readBoolEntry( "Shuffle" );
     usePlaylist = cfg.readBoolEntry( "UsePlayList" );
@@ -71,5 +71,5 @@ void MediaPlayerState::readConfig( Config& cfg ) {
     usePlaylist = TRUE;
-    isPlaying = FALSE;
-    isStreaming = FALSE;
-    isPaused = FALSE;
+    playing = FALSE;
+    streaming = FALSE;
+    paused = FALSE;
     curPosition = 0;
@@ -82,6 +82,6 @@ void MediaPlayerState::writeConfig( Config& cfg ) const {
     cfg.setGroup( "Options" );
-    cfg.writeEntry( "FullScreen", isFullscreen );
-    cfg.writeEntry( "Scaling", isScaled );
-    cfg.writeEntry( "Looping", isLooping );
-    cfg.writeEntry( "Shuffle", isShuffled );
+    cfg.writeEntry( "FullScreen", fullscreen );
+    cfg.writeEntry( "Scaling", scaled );
+    cfg.writeEntry( "Looping", looping );
+    cfg.writeEntry( "Shuffle", shuffled );
     cfg.writeEntry( "UsePlayList", usePlaylist );
@@ -94,24 +94,24 @@ void MediaPlayerState::writeConfig( Config& cfg ) const {
 
-bool MediaPlayerState::streaming() const {
-    return isStreaming;
+bool MediaPlayerState::isStreaming() const {
+    return streaming;
 }
 
-bool MediaPlayerState::seekable() const {
-    return isSeekable;
+bool MediaPlayerState::isSeekable() const {
+    return seekable;
 }
 
-bool MediaPlayerState::fullscreen() const {
-    return isFullscreen;
+bool MediaPlayerState::isFullscreen() const {
+    return fullscreen;
 }
 
-bool MediaPlayerState::scaled() const {
-    return isScaled;
+bool MediaPlayerState::isScaled() const {
+    return scaled;
 }
 
-bool MediaPlayerState::looping() const {
-    return isLooping;
+bool MediaPlayerState::isLooping() const {
+    return looping;
 }
 
-bool MediaPlayerState::shuffled() const {
-    return isShuffled;
+bool MediaPlayerState::isShuffled() const {
+    return shuffled;
 }
@@ -119,3 +119,3 @@ bool MediaPlayerState::shuffled() const {
 
-bool MediaPlayerState::playlist() const {
+bool MediaPlayerState::isUsingPlaylist() const {
     return usePlaylist;
@@ -123,12 +123,12 @@ bool MediaPlayerState::playlist() const {
 
-bool MediaPlayerState::paused() const {
-    return isPaused;
+bool MediaPlayerState::isPaused() const {
+    return paused;
 }
 
-bool MediaPlayerState::playing() const {
-    return isPlaying;
+bool MediaPlayerState::isPlaying() const {
+    return playing;
 }
 
-bool MediaPlayerState::stop() const {
-    return isStoped;
+bool MediaPlayerState::isStop() const {
+    return stoped;
 }
@@ -150,6 +150,6 @@ void MediaPlayerState::setIsStreaming( bool b ) {
 
-    if ( isStreaming == b ) {
+    if ( streaming == b ) {
         return;
     }
-    isStreaming = b;
+    streaming = b;
 }
@@ -161,3 +161,3 @@ void MediaPlayerState::setIsSeekable( bool b ) {
     // }
-    isSeekable = b;
+    seekable = b;
     emit isSeekableToggled(b);
@@ -167,6 +167,6 @@ void MediaPlayerState::setIsSeekable( bool b ) {
 void MediaPlayerState::setFullscreen( bool b ) {
-    if ( isFullscreen == b ) {
+    if ( fullscreen == b ) {
         return;
     }
-    isFullscreen = b;
+    fullscreen = b;
     emit fullscreenToggled(b);
@@ -176,6 +176,6 @@ void MediaPlayerState::setFullscreen( bool b ) {
 void MediaPlayerState::setBlanked( bool b ) {
-    if ( isBlanked == b ) {
+    if ( blanked == b ) {
         return;
     }
-    isBlanked = b;
+    blanked = b;
     emit blankToggled(b);
@@ -185,6 +185,6 @@ void MediaPlayerState::setBlanked( bool b ) {
 void MediaPlayerState::setScaled( bool b ) {
-    if ( isScaled == b ) {
+    if ( scaled == b ) {
         return;
     }
-    isScaled = b;
+    scaled = b;
     emit scaledToggled(b);
@@ -193,6 +193,6 @@ void MediaPlayerState::setScaled( bool b ) {
 void MediaPlayerState::setLooping( bool b ) {
-    if ( isLooping    == b ) {
+    if ( looping    == b ) {
         return;
     }
-    isLooping = b;
+    looping = b;
     emit loopingToggled(b);
@@ -201,6 +201,6 @@ void MediaPlayerState::setLooping( bool b ) {
 void MediaPlayerState::setShuffled( bool b ) {
-    if ( isShuffled   == b ) {
+    if ( shuffled   == b ) {
         return;
     }
-    isShuffled = b;
+    shuffled = b;
     emit shuffledToggled(b);
@@ -217,4 +217,4 @@ void MediaPlayerState::setPlaylist( bool b ) {
 void MediaPlayerState::setPaused( bool b ) {
-      if ( isPaused  == b ) {
-          isPaused = FALSE;
+      if ( paused  == b ) {
+          paused = FALSE;
           emit pausedToggled(FALSE);
@@ -222,3 +222,3 @@ void MediaPlayerState::setPaused( bool b ) {
       }
-     isPaused = b;
+     paused = b;
      emit pausedToggled(b);
@@ -227,7 +227,7 @@ void MediaPlayerState::setPaused( bool b ) {
 void MediaPlayerState::setPlaying( bool b ) {
-    if ( isPlaying  == b ) {
+    if ( playing  == b ) {
         return;
     }
-    isPlaying = b;
-    isStoped = !b;
+    playing = b;
+    stoped = !b;
     emit playingToggled(b);
@@ -236,6 +236,6 @@ void MediaPlayerState::setPlaying( bool b ) {
 void MediaPlayerState::setStop( bool b ) {
-    if ( isStoped  == b ) {
+    if ( stoped  == b ) {
         return;
     }
-    isStoped = b;
+    stoped = b;
     emit stopToggled(b);
@@ -305,3 +305,3 @@ void MediaPlayerState::setAudio() {
 void MediaPlayerState::toggleFullscreen() {
-    setFullscreen( !isFullscreen );
+    setFullscreen( !fullscreen );
 }
@@ -309,3 +309,3 @@ void MediaPlayerState::toggleFullscreen() {
 void MediaPlayerState::toggleScaled() {
-    setScaled( !isScaled);
+    setScaled( !scaled);
 }
@@ -313,3 +313,3 @@ void MediaPlayerState::toggleScaled() {
 void MediaPlayerState::toggleLooping() {
-    setLooping( !isLooping);
+    setLooping( !looping);
 }
@@ -317,3 +317,3 @@ void MediaPlayerState::toggleLooping() {
 void MediaPlayerState::toggleShuffled() {
-    setShuffled( !isShuffled);
+    setShuffled( !shuffled);
 }
@@ -325,3 +325,3 @@ void MediaPlayerState::togglePlaylist() {
 void MediaPlayerState::togglePaused() {
-    setPaused( !isPaused);
+    setPaused( !paused);
 }
@@ -329,3 +329,3 @@ void MediaPlayerState::togglePaused() {
 void MediaPlayerState::togglePlaying() {
-    setPlaying( !isPlaying);
+    setPlaying( !playing);
 }
@@ -333,3 +333,3 @@ void MediaPlayerState::togglePlaying() {
 void MediaPlayerState::toggleBlank() {
-    setBlanked( !isBlanked);
+    setBlanked( !blanked);
 }