-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 13 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 12 |
2 files changed, 15 insertions, 10 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 8dbfb3d..7bf3a19 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp @@ -49,10 +49,13 @@ #include "audiowidget.h" #include "mediaplayerstate.h" #include "playlistwidget.h" -static const int xo = -2; // movable x offset -static const int yo = 22; // movable y offset +namespace +{ + +const int xo = -2; // movable x offset +const int yo = 22; // movable y offset struct MediaButton { bool isToggle, isHeld, isDown; }; @@ -75,18 +78,18 @@ const char * const skin_mask_file_names[10] = { "play", "stop", "next", "prev", "up", "down", "loop", "playlist", "forward", "back" }; - -static void changeTextColor( QWidget * w) { +void changeTextColor( QWidget * w) { QPalette p = w->palette(); p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); w->setPalette( p ); } -static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); +const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); +} AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index b7305fe..a0aed62 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp @@ -52,12 +52,13 @@ # include <qgfxraster_qws.h> #endif +namespace +{ - -static const int xo = 2; // movable x offset -static const int yo = 0; // movable y offset +const int xo = 2; // movable x offset +const int yo = 0; // movable y offset struct MediaButton { bool isToggle, isHeld, isDown; @@ -72,14 +73,15 @@ MediaButton videoButtons[] = { { FALSE, FALSE, FALSE }, // volDown { TRUE, FALSE, FALSE } // fullscreen }; -const char *skinV_mask_file_names[7] = { +const char * const skinV_mask_file_names[7] = { "stop","play","back","fwd","up","down","full" }; -static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton)); +const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton)); +} VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) { |