author | simon <simon> | 2002-12-09 14:10:58 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 14:10:58 (UTC) |
commit | fffd954b4ea3c124a37cab9af99b248986029436 (patch) (side-by-side diff) | |
tree | f5ae7f123b7e50957c7682cbb8b3c7144aadf71b /noncore | |
parent | 17f319bb44feb947a26be333a4c7e6fef7020c87 (diff) | |
download | opie-fffd954b4ea3c124a37cab9af99b248986029436.zip opie-fffd954b4ea3c124a37cab9af99b248986029436.tar.gz opie-fffd954b4ea3c124a37cab9af99b248986029436.tar.bz2 |
- oops, buttonType is a bad name for a variable, given its redundancy
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 3b33209..6e9c14a 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp @@ -90,3 +90,3 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye Button button; - button.buttonType = skinInfo[ i ].buttonType; + button.type = skinInfo[ i ].type; buttons.push_back( button ); @@ -389,3 +389,3 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { buttons[i].isHeld = FALSE; - if ( buttons[i].buttonType != ToggleButton ) { + if ( buttons[i].type != ToggleButton ) { setToggleButton( i, FALSE ); diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index e0f2cf1..9fb3499 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h @@ -41,5 +41,5 @@ public: { - Button() : buttonType( NormalButton ), isHeld( false ), isDown( false ) {} + Button() : type( NormalButton ), isHeld( false ), isDown( false ) {} - ButtonType buttonType : 1; + ButtonType type : 1; bool isHeld : 1; @@ -53,3 +53,3 @@ public: const char *fileName; - ButtonType buttonType; + ButtonType type; }; diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 23acfa3..380c703 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp @@ -74,3 +74,3 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye Button toggleButton = defaultButton; - toggleButton.buttonType = ToggleButton; + toggleButton.type = ToggleButton; @@ -298,3 +298,3 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { buttons[i].isHeld = FALSE; - if ( buttons[i].buttonType != ToggleButton ) { + if ( buttons[i].type != ToggleButton ) { setToggleButton( i, FALSE ); |