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
@@ -20,51 +20,51 @@
 
 #include "calibrate.h"
 
 #include <qpe/resource.h>
 
 #include <qapplication.h>
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 
 #include <qpainter.h>
 #include <qtimer.h>
 #include <qwindowsystem_qws.h>
 #include <qgfx_qws.h>
 
 
 Calibrate::Calibrate(QWidget* parent, const char * name, WFlags wf) :
     QDialog( parent, name, TRUE, wf | WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop )
 {
     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 );
     goodcd = cd;
     reset();
 
     timer = new QTimer( this );
     connect( timer, SIGNAL(timeout()), this, SLOT(timeout()) );
 }
 
 Calibrate::~Calibrate()
 {
     store();
 }
 
 void Calibrate::show()
 {
     grabMouse();
     QWSServer::mouseHandler()->getCalibration(&goodcd);
     QWSServer::mouseHandler()->clearCalibration();
     QDialog::show();
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
@@ -34,67 +34,67 @@ class PlayListSelectionItem : public QListViewItem {
 public:
     PlayListSelectionItem( QListView *parent, const DocLnk *f ) : QListViewItem( parent ), fl( f ) {
   setText( 0, f->name() );
   setPixmap( 0, f->pixmap() );
     }
 
     ~PlayListSelectionItem() {
     };
 
     const DocLnk *file() const { return fl; }
 
 private:
     const DocLnk *fl;
 };
 
 
 PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
     : QListView( parent, 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 );
 }
 
 
 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
 
 
 void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) {
     if ( event->state() == QMouseEvent::LeftButton ) {
   QListViewItem *currentItem = selectedItem();
   QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) );
   if ( currentItem && currentItem->itemAbove() == itemUnder )
       moveSelectedUp();
   else if ( currentItem && currentItem->itemBelow() == itemUnder )
       moveSelectedDown();
     }
 }
 
 
 const DocLnk *PlayListSelection::current() {
     PlayListSelectionItem *item = (PlayListSelectionItem *)selectedItem();
     if ( item )
   return item->file();
     return NULL;
 }
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
@@ -45,49 +45,49 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
 	QString v;
 	t >> v; t >> v; t >> v;
 	v = v.left( 20 );
 	kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " ) + v + "<p>";
 	t >> v;
 	kernelVersionString += tr( "Compiled by: " ) + v;
 	file.close();
     }
 
     QString palmtopVersionString;
     palmtopVersionString = tr( "<b>Opie</b><p>Version: " ) + QPE_VERSION + "<p>";
 #ifdef QPE_VENDOR
     QString builder = QPE_VENDOR;
 #else
     QString builder = "Unknown";
 #endif    
     palmtopVersionString += tr( "Compiled by: " ) + builder + "<p>";
     palmtopVersionString += tr( "Built on: " ) + __DATE__;
 
     
     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 );
     
     QLabel *palmtopVersion = new QLabel( this );
     palmtopVersion->setText( palmtopVersionString  );
     hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft );
 
     
     QHBoxLayout *hb2 = new QHBoxLayout( vb );
     hb1->setSpacing( 2 );
     
     QLabel *linuxLogo = new QLabel( this );
 
     // Need to do this extra qpainter code with this image becuase for some
     // reason it doesn't alpha belnd if directly converted to a pixmap
     QPixmap logo2Pixmap( 60, 60 );
     QColor bgColor = colorGroup().background();
     QPainter painter( &logo2Pixmap );
     painter.fillRect( QRect( 0, 0, 60, 60 ), QBrush( bgColor ) );
     QImage logo2 = Resource::loadImage( "tux-logo" );
diff --git a/pics/opielogo.png b/pics/launcher/opielogo.png
index 0adc183..0adc183 100644
--- a/pics/opielogo.png
+++ b/pics/launcher/opielogo.png