7 files changed, 120 insertions, 120 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index a52319b..7c2b007 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -174,7 +174,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     setLength( mediaPlayerState->length() );
     setPosition( mediaPlayerState->position() );
-    setLooping( mediaPlayerState->fullscreen() );
+    setLooping( mediaPlayerState->isFullscreen() );
     //    setPaused( mediaPlayerState->paused() );
-    setPlaying( mediaPlayerState->playing() );
+    setPlaying( mediaPlayerState->isPlaying() );
 
 }
@@ -432,8 +432,8 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                 switch (i) {
                 case AudioPlay:
-                    if( mediaPlayerState->paused() ) {
+                    if( mediaPlayerState->isPaused() ) {
                         mediaPlayerState->setPaused( FALSE );
                         return;
-                    } else if( !mediaPlayerState->paused() ) {
+                    } else if( !mediaPlayerState->isPaused() ) {
                         mediaPlayerState->setPaused( TRUE );
                         return;
@@ -514,5 +514,5 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
           break;
       case Key_Space: {
-          if(mediaPlayerState->playing()) {
+          if(mediaPlayerState->isPlaying()) {
               //                toggleButton(1);
               mediaPlayerState->setPlaying(FALSE);
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 1f19b30..8136ff1 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -75,5 +75,5 @@ MediaPlayer::~MediaPlayer() {
 
 void MediaPlayer::pauseCheck( bool b ) {
-     if ( b && !mediaPlayerState->playing() ) {
+     if ( b && !mediaPlayerState->isPlaying() ) {
          mediaPlayerState->setPaused( FALSE );
      }
@@ -90,5 +90,5 @@ void MediaPlayer::setPlaying( bool play ) {
     }
 
-    if ( mediaPlayerState->paused() ) {
+    if ( mediaPlayerState->isPaused() ) {
         mediaPlayerState->setPaused( FALSE );
         return;
@@ -112,9 +112,9 @@ void MediaPlayer::setPlaying( bool play ) {
         // since there is no selected file in the playlist, but a selected file in the file list,
         // so we remember and shutoff
-        l = mediaPlayerState->looping();
+        l = mediaPlayerState->isLooping();
         if(l) {
             mediaPlayerState->setLooping( false );
         }
-        r = mediaPlayerState->shuffled();
+        r = mediaPlayerState->isShuffled();
         mediaPlayerState->setShuffled( false );
 
@@ -151,5 +151,5 @@ void MediaPlayer::prev() {
         if ( playList->prev() ) {
             play();
-        } else if ( mediaPlayerState->looping() ) {
+        } else if ( mediaPlayerState->isLooping() ) {
             if ( playList->last() ) {
                 play();
@@ -167,5 +167,5 @@ void MediaPlayer::next() {
         if ( playList->next() ) {
             play();
-        } else if ( mediaPlayerState->looping() ) {
+        } else if ( mediaPlayerState->isLooping() ) {
             if ( playList->first() ) {
                 play();
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
@@ -52,6 +52,6 @@ MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
     Config cfg( "OpiePlayer" );
     readConfig( cfg );
-    isStreaming = false;
-    isSeekable = true;
+    streaming = false;
+    seekable = true;
 }
 
@@ -63,14 +63,14 @@ MediaPlayerState::~MediaPlayerState() {
 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" );
     videoGamma = cfg.readNumEntry( "VideoGamma" );
     usePlaylist = TRUE;
-    isPlaying = FALSE;
-    isStreaming = FALSE;
-    isPaused = FALSE;
+    playing = FALSE;
+    streaming = FALSE;
+    paused = FALSE;
     curPosition = 0;
     curLength = 0;
@@ -81,8 +81,8 @@ void MediaPlayerState::readConfig( Config& cfg ) {
 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 );
     cfg.writeEntry( "VideoGamma",  videoGamma );
@@ -93,43 +93,43 @@ 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;
 }
 
 
-bool MediaPlayerState::playlist() const {
+bool MediaPlayerState::isUsingPlaylist() const {
     return usePlaylist;
 }
 
-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;
 }
 
@@ -149,8 +149,8 @@ char MediaPlayerState::view() const {
 void MediaPlayerState::setIsStreaming( bool b ) {
 
-    if ( isStreaming == b ) {
+    if ( streaming == b ) {
         return;
     }
-    isStreaming = b;
+    streaming = b;
 }
 
@@ -160,5 +160,5 @@ void MediaPlayerState::setIsSeekable( bool b ) {
     //    return;
     // }
-    isSeekable = b;
+    seekable = b;
     emit isSeekableToggled(b);
 }
@@ -166,8 +166,8 @@ void MediaPlayerState::setIsSeekable( bool b ) {
 
 void MediaPlayerState::setFullscreen( bool b ) {
-    if ( isFullscreen == b ) {
+    if ( fullscreen == b ) {
         return;
     }
-    isFullscreen = b;
+    fullscreen = b;
     emit fullscreenToggled(b);
 }
@@ -175,8 +175,8 @@ void MediaPlayerState::setFullscreen( bool b ) {
 
 void MediaPlayerState::setBlanked( bool b ) {
-    if ( isBlanked == b ) {
+    if ( blanked == b ) {
         return;
     }
-    isBlanked = b;
+    blanked = b;
     emit blankToggled(b);
 }
@@ -184,24 +184,24 @@ void MediaPlayerState::setBlanked( bool b ) {
 
 void MediaPlayerState::setScaled( bool b ) {
-    if ( isScaled == b ) {
+    if ( scaled == b ) {
         return;
     }
-    isScaled = b;
+    scaled = b;
     emit scaledToggled(b);
 }
 
 void MediaPlayerState::setLooping( bool b ) {
-    if ( isLooping    == b ) {
+    if ( looping    == b ) {
         return;
     }
-    isLooping = b;
+    looping = b;
     emit loopingToggled(b);
 }
 
 void MediaPlayerState::setShuffled( bool b ) {
-    if ( isShuffled   == b ) {
+    if ( shuffled   == b ) {
         return;
     }
-    isShuffled = b;
+    shuffled = b;
     emit shuffledToggled(b);
 }
@@ -216,27 +216,27 @@ void MediaPlayerState::setPlaylist( bool b ) {
 
 void MediaPlayerState::setPaused( bool b ) {
-      if ( isPaused  == b ) {
-          isPaused = FALSE;
+      if ( paused  == b ) {
+          paused = FALSE;
           emit pausedToggled(FALSE);
           return;
       }
-     isPaused = b;
+     paused = b;
      emit pausedToggled(b);
 }
 
 void MediaPlayerState::setPlaying( bool b ) {
-    if ( isPlaying  == b ) {
+    if ( playing  == b ) {
         return;
     }
-    isPlaying = b;
-    isStoped = !b;
+    playing = b;
+    stoped = !b;
     emit playingToggled(b);
 }
 
 void MediaPlayerState::setStop( bool b ) {
-    if ( isStoped  == b ) {
+    if ( stoped  == b ) {
         return;
     }
-    isStoped = b;
+    stoped = b;
     emit stopToggled(b);
 }
@@ -304,17 +304,17 @@ void MediaPlayerState::setAudio() {
 
 void MediaPlayerState::toggleFullscreen() {
-    setFullscreen( !isFullscreen );
+    setFullscreen( !fullscreen );
 }
 
 void MediaPlayerState::toggleScaled() {
-    setScaled( !isScaled);
+    setScaled( !scaled);
 }
 
 void MediaPlayerState::toggleLooping() {
-    setLooping( !isLooping);
+    setLooping( !looping);
 }
 
 void MediaPlayerState::toggleShuffled() {
-    setShuffled( !isShuffled);
+    setShuffled( !shuffled);
 }
 
@@ -324,13 +324,13 @@ void MediaPlayerState::togglePlaylist() {
 
 void MediaPlayerState::togglePaused() {
-    setPaused( !isPaused);
+    setPaused( !paused);
 }
 
 void MediaPlayerState::togglePlaying() {
-    setPlaying( !isPlaying);
+    setPlaying( !playing);
 }
 
 void MediaPlayerState::toggleBlank() {
-    setBlanked( !isBlanked);
+    setBlanked( !blanked);
 }
 
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h
index f9c1eeb..4e837e3 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.h
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h
@@ -51,14 +51,14 @@ public:
     ~MediaPlayerState();
 
-    bool streaming() const;
-    bool seekable() const;
-    bool fullscreen() const;
-    bool scaled() const;
-    bool looping() const;
-    bool shuffled() const;
-    bool playlist() const;
-    bool paused() const;
-    bool playing() const;
-    bool stop() const;
+    bool isStreaming() const;
+    bool isSeekable() const;
+    bool isFullscreen() const;
+    bool isScaled() const;
+    bool isLooping() const;
+    bool isShuffled() const;
+    bool isUsingPlaylist() const;
+    bool isPaused() const;
+    bool isPlaying() const;
+    bool isStop() const;
     long position() const;
     long length() const;
@@ -120,15 +120,15 @@ signals:
 
 private:
-    bool isStreaming;
-    bool isSeekable;
-    bool isFullscreen;
-    bool isScaled;
-    bool isBlanked;
-    bool isLooping;
-    bool isShuffled;
+    bool streaming;
+    bool seekable;
+    bool fullscreen;
+    bool scaled;
+    bool blanked;
+    bool looping;
+    bool shuffled;
     bool usePlaylist;
-    bool isPaused;
-    bool isPlaying;
-    bool isStoped;
+    bool paused;
+    bool playing;
+    bool stoped;
     long curPosition;
     long curLength;
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 593f072..d1506db 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -177,7 +177,7 @@ PlayListWidget::~PlayListWidget() {
 
 void PlayListWidget::initializeStates() {
-    d->tbPlay->setOn( mediaPlayerState->playing() );
-    d->tbLoop->setOn( mediaPlayerState->looping() );
-    d->tbShuffle->setOn( mediaPlayerState->shuffled() );
+    d->tbPlay->setOn( mediaPlayerState->isPlaying() );
+    d->tbLoop->setOn( mediaPlayerState->isLooping() );
+    d->tbShuffle->setOn( mediaPlayerState->isShuffled() );
     setPlaylist( true );
 }
@@ -210,5 +210,5 @@ void PlayListWidget::writeDefaultPlaylist() {
 void PlayListWidget::addToSelection( const DocLnk& lnk ) {
     d->setDocumentUsed = FALSE;
-    if ( mediaPlayerState->playlist() ) {
+    if ( mediaPlayerState->isUsingPlaylist() ) {
         if( QFileInfo( lnk.file() ).exists() ||
             lnk.file().left(4) == "http" ) {
@@ -429,5 +429,5 @@ const DocLnk *PlayListWidget::current() { // this is fugly
       {
 //      qDebug("playlist");
-          if ( mediaPlayerState->playlist() ) {
+          if ( mediaPlayerState->isUsingPlaylist() ) {
               return d->selectedFiles->current();
           } else if ( d->setDocumentUsed && d->current ) {
@@ -444,6 +444,6 @@ const DocLnk *PlayListWidget::current() { // this is fugly
 
 bool PlayListWidget::prev() {
-    if ( mediaPlayerState->playlist() ) {
-        if ( mediaPlayerState->shuffled() ) {
+    if ( mediaPlayerState->isUsingPlaylist() ) {
+        if ( mediaPlayerState->isShuffled() ) {
             const DocLnk *cur = current();
             int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
@@ -459,5 +459,5 @@ bool PlayListWidget::prev() {
         } else {
             if ( !d->selectedFiles->prev() ) {
-                if ( mediaPlayerState->looping() ) {
+                if ( mediaPlayerState->isLooping() ) {
                     return d->selectedFiles->last();
                 } else {
@@ -468,5 +468,5 @@ bool PlayListWidget::prev() {
         }
     } else {
-        return mediaPlayerState->looping();
+        return mediaPlayerState->isLooping();
   }
 }
@@ -475,10 +475,10 @@ bool PlayListWidget::prev() {
 bool PlayListWidget::next() {
 //qDebug("<<<<<<<<<<<<next()");
- if ( mediaPlayerState->playlist() ) {
-        if ( mediaPlayerState->shuffled() ) {
+ if ( mediaPlayerState->isUsingPlaylist() ) {
+        if ( mediaPlayerState->isShuffled() ) {
             return prev();
         } else {
             if ( !d->selectedFiles->next() ) {
-                if ( mediaPlayerState->looping() ) {
+                if ( mediaPlayerState->isLooping() ) {
                     return d->selectedFiles->first();
                 } else {
@@ -489,5 +489,5 @@ bool PlayListWidget::next() {
         }
     } else {
-        return mediaPlayerState->looping();
+        return mediaPlayerState->isLooping();
     }
 }
@@ -495,16 +495,16 @@ bool PlayListWidget::next() {
 
 bool PlayListWidget::first() {
-    if ( mediaPlayerState->playlist() )
+    if ( mediaPlayerState->isUsingPlaylist() )
         return d->selectedFiles->first();
     else
-        return mediaPlayerState->looping();
+        return mediaPlayerState->isLooping();
 }
 
 
 bool PlayListWidget::last() {
-    if ( mediaPlayerState->playlist() )
+    if ( mediaPlayerState->isUsingPlaylist() )
         return d->selectedFiles->last();
     else
-        return mediaPlayerState->looping();
+        return mediaPlayerState->isLooping();
 }
 
@@ -1090,5 +1090,5 @@ void PlayListWidget::pmViewActivated(int index) {
     {
         mediaPlayerState->toggleFullscreen();
-        bool b=mediaPlayerState->fullscreen();
+        bool b=mediaPlayerState->isFullscreen();
         pmView->setItemChecked( index, b);
         Config cfg( "OpiePlayer" );
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 3a757f0..c435241 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -145,6 +145,6 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
     setLength( mediaPlayerState->length() );
     setPosition( mediaPlayerState->position() );
-    setFullscreen( mediaPlayerState->fullscreen() );
-    setPlaying( mediaPlayerState->playing() );
+    setFullscreen( mediaPlayerState->isFullscreen() );
+    setPlaying( mediaPlayerState->isPlaying() );
 }
 
@@ -259,5 +259,5 @@ void VideoWidget::updateSlider( long i, long max ) {
     int width = slider->width();
     int val = int((double)i * width / max);
-    if ( !mediaPlayerState->fullscreen() && !videoSliderBeingMoved ) {
+    if ( !mediaPlayerState->isFullscreen() && !videoSliderBeingMoved ) {
         if ( slider->value() != val ) {
             slider->setValue( val );
@@ -328,9 +328,9 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
 
                 case VideoPlay: {
-                    if( mediaPlayerState->paused() ) {
+                    if( mediaPlayerState->isPaused() ) {
                         setToggleButton( i, FALSE );
                         mediaPlayerState->setPaused( FALSE );
                         return;
-                    } else if( !mediaPlayerState->paused() ) {
+                    } else if( !mediaPlayerState->isPaused() ) {
                         setToggleButton( i, TRUE );
                         mediaPlayerState->setPaused( TRUE );
@@ -358,5 +358,5 @@ void VideoWidget::mousePressEvent( QMouseEvent *event ) {
 
 void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
-    if ( mediaPlayerState->fullscreen() ) {
+    if ( mediaPlayerState->isFullscreen() ) {
         mediaPlayerState->setFullscreen( FALSE );
         makeVisible();
@@ -377,5 +377,5 @@ void VideoWidget::showEvent( QShowEvent* ) {
 
 void VideoWidget::makeVisible() {
-    if ( mediaPlayerState->fullscreen() ) {
+    if ( mediaPlayerState->isFullscreen() ) {
         setBackgroundMode( QWidget::NoBackground );
         showFullScreen();
@@ -404,5 +404,5 @@ void VideoWidget::makeVisible() {
         }
 
-        if ( !mediaPlayerState->seekable()  ) {
+        if ( !mediaPlayerState->isSeekable()  ) {
             if( !slider->isHidden()) {
                 slider->hide();
@@ -428,5 +428,5 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
     QPainter p( this );
 
-    if ( mediaPlayerState->fullscreen() ) {
+    if ( mediaPlayerState->isFullscreen() ) {
         // Clear the background
         p.setBrush( QBrush( Qt::black ) );
@@ -475,5 +475,5 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
           break;
       case Key_Space: {
-          if(mediaPlayerState->playing()) {
+          if(mediaPlayerState->isPlaying()) {
               mediaPlayerState->setPlaying(FALSE);
           } else {
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index f6289d7..71e08a6 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -181,5 +181,5 @@ long XineControl::position() {
     long emitPos = (long)m_position;
     emit positionChanged( emitPos );
-    if( mediaPlayerState->playing() ) {
+    if( mediaPlayerState->isPlaying() ) {
     // needs to be stopped the media is stopped
         QTimer::singleShot( 1000, this, SLOT( position() ) );