Fixing package conflicts.

4 files changed, 5 insertions, 5 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
@@ -38,15 +38,15 @@ Calibrate::Calibrate(QWidget* parent, const char * name, WFlags wf) :
     showCross = TRUE;
     const int offset = 30;
     QRect desk = qApp->desktop()->geometry();
     setGeometry( 0, 0, desk.width(), desk.height() );
     if ( desk.height() < 250 ) {
 	int w = desk.height()/3;
-	logo.convertFromImage(Resource::loadImage("opielogo").smoothScale(w,w));
+	logo.convertFromImage(Resource::loadImage("launcher/launcher/opielogo").smoothScale(w,w));
     } else {
-	logo = Resource::loadPixmap( "opielogo" );
+	logo = Resource::loadPixmap( "launcher/launcher/opielogo" );
     }
     cd.screenPoints[QWSPointerCalibrationData::TopLeft] = QPoint( offset, offset );
     cd.screenPoints[QWSPointerCalibrationData::BottomLeft] = QPoint( offset, qt_screen->deviceHeight() - offset );
     cd.screenPoints[QWSPointerCalibrationData::BottomRight] = QPoint( qt_screen->deviceWidth() - offset, qt_screen->deviceHeight() - offset );
     cd.screenPoints[QWSPointerCalibrationData::TopRight] = QPoint( qt_screen->deviceWidth() - offset, offset );
     cd.screenPoints[QWSPointerCalibrationData::Center] = QPoint( qt_screen->deviceWidth()/2, qt_screen->deviceHeight()/2 );
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
@@ -52,13 +52,13 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
 {
     qDebug("starting playlistselector");
 // #ifdef USE_PLAYLIST_BACKGROUND
 //    setStaticBackground( TRUE );
 //      setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) );
 
-    setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) );
+    setBackgroundPixmap( Resource::loadPixmap( "launcher/launcher/opielogo" ) );
 // #endif
 //      addColumn("Title",236);
 //      setAllColumnsShowFocus( TRUE );
      addColumn( tr( "Playlist Selection" ) );
     header()->hide();
     setSorting( -1, FALSE );
@@ -70,13 +70,13 @@ PlayListSelection::~PlayListSelection() {
 
 
 // #ifdef USE_PLAYLIST_BACKGROUND
 void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) {
 //  qDebug("drawBackground");
    p->fillRect( r, QBrush( white ) );
-      QImage logo = Resource::loadImage( "opielogo" );
+      QImage logo = Resource::loadImage( "launcher/launcher/opielogo" );
         if ( !logo.isNull() )
       p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo );
 }
 // #endif
 
 
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index ecb13bc..27c4cf5 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -63,13 +63,13 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
 
     
     QHBoxLayout *hb1 = new QHBoxLayout( vb );
     hb1->setSpacing( 2 );
 
     QLabel *palmtopLogo = new QLabel( this );
-    QImage logo1 = Resource::loadImage( "opielogo" );
+    QImage logo1 = Resource::loadImage( "launcher/launcher/opielogo" );
     logo1 = logo1.smoothScale( 50, 55 );
     QPixmap logo1Pixmap;
     logo1Pixmap.convertFromImage( logo1 );
     palmtopLogo->setPixmap( logo1Pixmap );
     palmtopLogo->setFixedSize( 60, 60 );
     hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft );
diff --git a/pics/opielogo.png b/pics/launcher/opielogo.png
index 0adc183..0adc183 100644
--- a/pics/opielogo.png
+++ b/pics/launcher/opielogo.png