3 files changed, 14 insertions, 28 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistselection.cpp b/noncore/multimedia/opieplayer2/playlistselection.cpp
index 678ebdf..780d705 100644
--- a/noncore/multimedia/opieplayer2/playlistselection.cpp
+++ b/noncore/multimedia/opieplayer2/playlistselection.cpp
@@ -49,16 +49,8 @@ private:
 PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
     : QListView( parent, name )
 {
 //    odebug << "starting playlistselector" << oendl; 
-// #ifdef USE_PLAYLIST_BACKGROUND
-//    setStaticBackground( TRUE );
-//      setBackgroundPixmap( Resource::loadPixmap( "opieplayer/background" ) );
-
-//      setBackgroundPixmap( Resource::loadPixmap( "launcher/opielogo" ) );
-// #endif
-//      addColumn("Title",236);
-//      setAllColumnsShowFocus( TRUE );
      addColumn( tr( "Playlist Selection" ) );
     header()->hide();
     setSorting( -1, FALSE );
 }
@@ -67,17 +59,12 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
 PlayListSelection::~PlayListSelection() {
 }
 
 
-// #ifdef USE_PLAYLIST_BACKGROUND
 void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) {
 //  odebug << "drawBackground" << oendl; 
    p->fillRect( r, QBrush( white ) );
-//        QImage logo = Resource::loadImage( "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 ) {
@@ -93,9 +80,9 @@ void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) {
 
 const DocLnk *PlayListSelection::current() {
     PlayListSelectionItem *item = (PlayListSelectionItem *)selectedItem();
     if ( item )
-  return item->file();
+        return item->file();
     return NULL;
 }
 
 
@@ -119,9 +106,9 @@ void PlayListSelection::removeSelected() {
 
 void PlayListSelection::moveSelectedUp() {
     QListViewItem *item = selectedItem();
     if ( item && item->itemAbove() )
-  item->itemAbove()->moveItem( item );
+        item->itemAbove()->moveItem( item );
     ensureItemVisible( selectedItem() );
 }
 
 
@@ -137,9 +124,9 @@ bool PlayListSelection::prev() {
     QListViewItem *item = selectedItem();
     if ( item && item->itemAbove() )
         setSelected( item->itemAbove(), TRUE );
     else
-  return FALSE;
+        return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
@@ -147,9 +134,9 @@ bool PlayListSelection::next() {
     QListViewItem *item = selectedItem();
     if ( item && item->itemBelow() )
         setSelected( item->itemBelow(), TRUE );
     else
-  return FALSE;
+        return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
@@ -158,9 +145,9 @@ bool PlayListSelection::first() {
     QListViewItem *item = firstChild();
     if ( item )
         setSelected( item, TRUE );
     else
-  return FALSE;
+        return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
@@ -168,29 +155,29 @@ bool PlayListSelection::first() {
 bool PlayListSelection::last() {
     QListViewItem *prevItem = NULL;
     QListViewItem *item = firstChild();
     while ( ( item = item->nextSibling() ) )
-  prevItem = item;
+        prevItem = item;
     if ( prevItem )
         setSelected( prevItem, TRUE );
     else
-  return FALSE;
+        return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
 void PlayListSelection::unSelect()
 {
-    //QListViewItem *item = selectedItem();
     setSelected( currentItem(), FALSE);
 }
 
 void PlayListSelection::writeCurrent( Config& cfg ) {
     cfg.setGroup("PlayList");
     QListViewItem *item = selectedItem();
-    if ( item )
+    if ( item ) {
         cfg.writeEntry("current", item->text(0) );
-    odebug << item->text(0) << oendl; 
+        odebug << item->text(0) << oendl;
+    }
 
 }
 
 void  PlayListSelection::setSelectedItem(const QString &strk ) {
@@ -205,7 +192,5 @@ void  PlayListSelection::setSelectedItem(const QString &strk ) {
             ensureItemVisible( it.current() );
             return;
         }
     }
-//     setSelected( item, TRUE );
-//     ensureItemVisible( selectedItem() );
 }
diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp
index a9bef65..d948fb9 100644
--- a/noncore/settings/networksettings2/editconnection.cpp
+++ b/noncore/settings/networksettings2/editconnection.cpp
@@ -244,14 +244,15 @@ void EditNetworkSetup::setNetworkSetup( NetworkSetup * NC ) {
           }
 
           if( ! Found ) {
             // this means that this level is NOT present in collection
-            // probably INCOMPATIBEL collection OR Missing plugin
+            // probably INCOMPATIBLE collection OR Missing plugin
+	    QString pluginName = NNI ? NNI->nodeClass()->name() : "";
             QMessageBox::warning(
                 0, 
                 tr( "Error presentig NetworkSetup" ),
                 tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ).
-                    arg(NNI->nodeClass()->name()) );
+                    arg(pluginName) );
             return;
           }
 
           // it now contains selected radio
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
index fc30bf8..e23fc9c 100644
--- a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
+++ b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
@@ -443,9 +443,9 @@ int OTScan::getDevice( OTPeer *& Peer,
                        QWidget* Parent ) {
       bool IsUp = 0;
       unsigned int i;
 
-      if( ! OT->isEnabled() ) {
+      if( ! OT || ! OT->isEnabled() ) {
         QMessageBox::warning( 0,
             tr("Scanning problem"),
             tr("Bluetooth not enabled" )
         );