author | kergoth <kergoth> | 2002-03-18 21:26:21 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-03-18 21:26:21 (UTC) |
commit | e6d3c651634eee7ff54675cc060ae94bd3ef41bd (patch) (unidiff) | |
tree | e11c8c4f4728dc3d93a2439cf92aa8972c6d9d4e /core | |
parent | 0a553fa7c46beb00d2a852ecf61233569b5a5e4e (diff) | |
download | opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.zip opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.tar.gz opie-e6d3c651634eee7ff54675cc060ae94bd3ef41bd.tar.bz2 |
Fixing package conflicts.
-rw-r--r-- | core/apps/calibrate/calibrate.cpp | 4 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistselection.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp index c0ec933..945749b 100644 --- a/core/apps/calibrate/calibrate.cpp +++ b/core/apps/calibrate/calibrate.cpp | |||
@@ -43,5 +43,5 @@ Calibrate::Calibrate(QWidget* parent, const char * name, WFlags wf) : | |||
43 | int w = desk.height()/3; | 43 | int w = desk.height()/3; |
44 | logo.convertFromImage(Resource::loadImage("opielogo").smoothScale(w,w)); | 44 | logo.convertFromImage(Resource::loadImage("launcher/launcher/opielogo").smoothScale(w,w)); |
45 | } else { | 45 | } else { |
46 | logo = Resource::loadPixmap( "opielogo" ); | 46 | logo = Resource::loadPixmap( "launcher/launcher/opielogo" ); |
47 | } | 47 | } |
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp index 47fc731..b5d8b78 100644 --- a/core/multimedia/opieplayer/playlistselection.cpp +++ b/core/multimedia/opieplayer/playlistselection.cpp | |||
@@ -57,3 +57,3 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) | |||
57 | 57 | ||
58 | setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) ); | 58 | setBackgroundPixmap( Resource::loadPixmap( "launcher/launcher/opielogo" ) ); |
59 | // #endif | 59 | // #endif |
@@ -75,3 +75,3 @@ void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { | |||
75 | p->fillRect( r, QBrush( white ) ); | 75 | p->fillRect( r, QBrush( white ) ); |
76 | QImage logo = Resource::loadImage( "opielogo" ); | 76 | QImage logo = Resource::loadImage( "launcher/launcher/opielogo" ); |
77 | if ( !logo.isNull() ) | 77 | if ( !logo.isNull() ) |