summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp11
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h3
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp6
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h14
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp11
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h3
6 files changed, 24 insertions, 24 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 4db444a..cd5bea4 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -113,10 +113,5 @@ AudioWidget::~AudioWidget() {
-const MediaWidget::SkinButtonInfo *AudioWidget::skinInfo()
+MediaWidget::GUIInfo AudioWidget::guiInfo()
{
- return ::skinInfo;
-}
-
-const uint AudioWidget::buttonCount()
-{
- return ::buttonCount;
+ return GUIInfo( QString::null /* infix */, ::skinInfo, ::buttonCount );
}
@@ -176,3 +171,3 @@ void AudioWidget::loadSkin()
{
- loadDefaultSkin( ::skinInfo, ::buttonCount );
+ loadDefaultSkin( guiInfo() );
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 75d4857..53dbb88 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -58,4 +58,3 @@ public:
- static const MediaWidget::SkinButtonInfo *skinInfo();
- static const uint buttonCount();
+ static MediaWidget::GUIInfo guiInfo();
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index ab2ec50..c0106d4 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -66,6 +66,6 @@ MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo,
-void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix )
+void MediaWidget::loadDefaultSkin( const GUIInfo &guiInfo )
{
- Skin skin( fileNameInfix );
- loadSkin( skinInfo, buttonCount, skin );
+ Skin skin( guiInfo.fileNameInfix );
+ loadSkin( guiInfo.buttonInfo, guiInfo.buttonCount, skin );
}
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 4599637..64483d8 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -82,2 +82,14 @@ public:
+ struct GUIInfo
+ {
+ GUIInfo() : buttonInfo( 0 ), buttonCount( 0 ) {}
+ GUIInfo( const QString &_fileNameInfix, const SkinButtonInfo *_buttonInfo, const uint _buttonCount )
+ : fileNameInfix( _fileNameInfix ), buttonInfo( _buttonInfo ), buttonCount( _buttonCount )
+ {}
+
+ QString fileNameInfix;
+ const SkinButtonInfo *buttonInfo;
+ const uint buttonCount;
+ };
+
MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 );
@@ -107,3 +119,3 @@ protected:
- void loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix = QString::null );
+ void loadDefaultSkin( const GUIInfo &guiInfo );
void loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const Skin &skin );
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 058730f..2a345e3 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -101,10 +101,5 @@ VideoWidget::~VideoWidget()
-const MediaWidget::SkinButtonInfo *VideoWidget::skinInfo()
+MediaWidget::GUIInfo VideoWidget::guiInfo()
{
- return ::skinInfo;
-}
-
-const uint VideoWidget::buttonCount()
-{
- return ::buttonCount;
+ return GUIInfo( "V" /* infix */, ::skinInfo, ::buttonCount );
}
@@ -169,3 +164,3 @@ void VideoWidget::loadSkin()
{
- loadDefaultSkin( ::skinInfo, ::buttonCount, "V" );
+ loadDefaultSkin( guiInfo() );
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 80e9356..84bc964 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -52,4 +52,3 @@ public:
- static const MediaWidget::SkinButtonInfo *skinInfo();
- static const uint buttonCount();
+ static MediaWidget::GUIInfo guiInfo();