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
@@ -1,211 +1,196 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "playlistselection.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qheader.h>
 
 /* STD */
 #include <stdlib.h>
 
 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 )
 {
 //    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 );
 }
 
 
 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 ) {
   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 item->file();
     return NULL;
 }
 
 
 void PlayListSelection::addToSelection( const DocLnk &lnk ) {
     PlayListSelectionItem *item = new PlayListSelectionItem( this, new DocLnk( lnk ) );
     QListViewItem *current = selectedItem();
     if ( current )
         item->moveItem( current );
     setSelected( item, TRUE );
     ensureItemVisible( selectedItem() );
 }
 
 
 void PlayListSelection::removeSelected() {
     QListViewItem *item = selectedItem();
     delete item;
     setSelected( currentItem(), TRUE );
     ensureItemVisible( selectedItem() );
 }
 
 
 void PlayListSelection::moveSelectedUp() {
     QListViewItem *item = selectedItem();
     if ( item && item->itemAbove() )
-  item->itemAbove()->moveItem( item );
+        item->itemAbove()->moveItem( item );
     ensureItemVisible( selectedItem() );
 }
 
 
 void PlayListSelection::moveSelectedDown() {
     QListViewItem *item = selectedItem();
     if ( item && item->itemBelow() )
         item->moveItem( item->itemBelow() );
     ensureItemVisible( selectedItem() );
 }
 
 
 bool PlayListSelection::prev() {
     QListViewItem *item = selectedItem();
     if ( item && item->itemAbove() )
         setSelected( item->itemAbove(), TRUE );
     else
-  return FALSE;
+        return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
 bool PlayListSelection::next() {
     QListViewItem *item = selectedItem();
     if ( item && item->itemBelow() )
         setSelected( item->itemBelow(), TRUE );
     else
-  return FALSE;
+        return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
 
 bool PlayListSelection::first() {
     QListViewItem *item = firstChild();
     if ( item )
         setSelected( item, TRUE );
     else
-  return FALSE;
+        return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
 
 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 ) {
 
     unSelect();
     QListViewItemIterator it( this );
     for ( ; it.current(); ++it ) {
 //        odebug << it.current()->text(0) << oendl; 
         if( strk == it.current()->text(0)) {
 //             odebug << "We have a match "+strk << oendl; 
             setSelected( it.current(), TRUE);
             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
@@ -184,134 +184,135 @@ NetworkSetup * EditNetworkSetup::getTmpCollection( void ) {
           NNI = 0;
         } else {
           // already in list -> copy pointer
           TmpCollection.append( NNI );
           NNI = SelectedNodes->next();
         }
 
         // go deeper to next level
         // this level is can be a new controller
         // or an item
         it = it->firstChild();
       }
 
       TmpIsValid = 1;
       return &(TmpCollection);
 }
 
 // pass a NetworkSetup NetworkSetup to be edited
 void EditNetworkSetup::setNetworkSetup( NetworkSetup * NC ) {
       ANetNodeInstance * NNI;
       ANetNode * NN;
 
       SelectedNodes = NC;
       Name_LE->setText( NC->name() );
       NNI = NC->first();
 
       // show configure tabl
       Tab_TB->setCurrentPage( 1 );
 
       // valid colledction
       Tab_TB->setTabEnabled( Setup_FRM, FALSE );
       Setup_FRM->setEnabled( FALSE );
 
       // select items in collection
       QListViewItem * it = Nodes_LV->firstChild();
       bool Found;
 
       TmpIsValid = 0;
 
       while ( it ) {
         NN = (*Mapping)[it];
         if( NN == 0 ) {
           // this item is a controller -> 
           // has radio items as children -> 
           // find selected one 
           it = it->firstChild();
           Found = 0;
           while( it ) {
             if( NNI && it->text(0) == NNI->nodeClass()->name() ) {
               // this radio is part of the collection
               ((QCheckListItem *)it)->setOn( 1 );
               updateGUI( it, NNI->nodeClass() );
               // check its children
               Found = 1;
               it = it->firstChild();
               NNI = SelectedNodes->next();
               // do not bother to check other items
               break;
             }
             it = it->nextSibling();
           }
 
           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
           NN = (*Mapping)[it];
         } else {
           // automatic selection 
           if( NNI == 0 ||  it->text(0) != NNI->nodeClass()->name() ) {
             // should exist and be the same
             if( NNI ) {
               QMessageBox::warning(
                   0, 
                   tr( "Error presentig NetworkSetup" ),
                   tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ).
                       arg(NNI->nodeClass()->name()) );
             } else {
               QMessageBox::warning(
                   0, 
                   tr( "Error presentig NetworkSetup" ),
                   tr( "<p>Missing NetworkSetup\"<i>%1</i>\"</p>" ).
                       arg(it->text(0)) );
             }
             return;
           }
           it = it->firstChild();
         }
       }
 }
 
 // get result of editing (either new OR updated collection
 NetworkSetup * EditNetworkSetup::networkSetup( void ) {
 
       if( SelectedNodes == 0 ) {
         // new collection 
         SelectedNodes = new NetworkSetup;
       }
 
       // clean out old entries
       SelectedNodes->clear();
 
       // transfer 
       for( QListIterator<ANetNodeInstance> it(TmpCollection);
            it.current();
            ++it ) {
         SelectedNodes->append( it.current() );
       }
 
       if( TmpCollection.isModified() )
         SelectedNodes->setModified( 1 );
 
       if( SelectedNodes->name() != Name_LE->text() ) {
         SelectedNodes->setName( Name_LE->text() );
         SelectedNodes->setModified( 1 );
       }
 
       return SelectedNodes;
 }
 
 // Build device tree -> start 
 void EditNetworkSetup::buildFullTree( void ) {
     ANetNode * NN;
 
     // toplevel item
     MyQCheckListItem * TheTop = new MyQCheckListItem( 
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
@@ -383,129 +383,129 @@ OTScan::OTScan( QWidget * parent, OTIcons * _IC ) :
       Current = 0;
       SelectedPeer = 0;
       SelectedChannel = 0;
 
       StrengthTimer = new QTimer( this );
       connect( StrengthTimer,
                SIGNAL( timeout()),
                this,
                SLOT( SLOT_UpdateStrength())
              );
 
       connect( OT,
                SIGNAL( detectedPeer( OTPeer *, bool )),
                this,
                SLOT( SLOT_NewPeer( OTPeer *, bool ))
              );
       connect( OT,
                SIGNAL( finishedDetecting()),
                this,
                SLOT( SLOT_FinishedDetecting())
              );
 
       // populate with peers we already know about
       const PeerVector & P = OT->peers();
       for( unsigned int i = 0;
            i < P.count();
            i ++ ) {
         SLOT_NewPeer( P[i], TRUE );
       }
 
       // populate State fram
       { QHBoxLayout * H =new QHBoxLayout( State_Frm );
 
         Paired_Led = new OLedBox( green, State_Frm );
         QLabel * L1 = new QLabel( tr( "Paired" ), State_Frm );
 
         H->addWidget( Paired_Led );
         H->addWidget( L1 );
         H->addStretch( 1 );
       }
 }
 
 OTScan::~OTScan() {
       if( MyIcons )
         delete Icons;
       OTGateway::releaseOTGateway();
 
       // send all peers that we do not care about states
       QListViewItem * Lit = DetectedPeers_LV->firstChild();
       while( Lit ) {
         ((PeerLVI *)Lit)->peer()->stopFindingOutState( );
         Lit = Lit->nextSibling();
       }
 }
 
 // static scan dialog function
 int OTScan::getDevice( OTPeer *& Peer, 
                        int & Channel, 
                        OTGateway * OT,
                        const UUIDVector & Filter,
                        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" )
         );
         return QDialog::Rejected;
       }
 
       // check if bluetooth is up
       OTDriverList & DL = OT->getDriverList();
       for( i = 0;
            i < DL.count();
            i ++ ) {
         if( DL[i]->isUp() ) {
           // one device that is up found
           IsUp = 1;
           break;
         }
       }
 
       // use this driver
       OT->setScanWith( OT->driver(i) );
 
       // create dialog
       QDialog * Dlg = new QDialog( Parent, 0, TRUE );
       QVBoxLayout * V = new QVBoxLayout( Dlg );
       OTScan * Scn = new OTScan( Dlg );
 
       connect( Scn,
                SIGNAL( selected() ),
                Dlg,
                SLOT( accept() )
              );
 
       if( Filter ) {
         Scn->setScanFilter( Filter );
       }
 
       V->addWidget( Scn );
       Dlg->setCaption( tr("Scan Neighbourhood" ) );
       Dlg->showMaximized();
       int rv = Dlg->exec();
 
       if( rv == QDialog::Accepted ) {
         // get peer
         Peer = Scn->selectedPeer();
         if( Peer == 0 ) {
           // no peer selected
           rv = QDialog::Rejected;
         } else {
           Channel = Scn->selectedChannel();
         }
       }
 
       delete Dlg;
 
       return rv;
 }
 
 void OTScan::setScanFilter( const UUIDVector & V ) {
       Filter = V;
 }
 
 void OTScan::resetScanFilter( void ) {
       Filter.truncate(0);