| -rw-r--r-- | noncore/multimedia/opieplayer2/playlistselection.cpp | 35 | ||||
| -rw-r--r-- | noncore/settings/networksettings2/editconnection.cpp | 5 | ||||
| -rw-r--r-- | noncore/settings/networksettings2/opietooth2/Opietooth.cpp | 2 |
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 @@ -52,10 +52,2 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *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" ) ); @@ -70,3 +62,2 @@ PlayListSelection::~PlayListSelection() { -// #ifdef USE_PLAYLIST_BACKGROUND void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { @@ -74,7 +65,3 @@ void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { 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 @@ -96,3 +83,3 @@ const DocLnk *PlayListSelection::current() { if ( item ) - return item->file(); + return item->file(); return NULL; @@ -122,3 +109,3 @@ void PlayListSelection::moveSelectedUp() { if ( item && item->itemAbove() ) - item->itemAbove()->moveItem( item ); + item->itemAbove()->moveItem( item ); ensureItemVisible( selectedItem() ); @@ -140,3 +127,3 @@ bool PlayListSelection::prev() { else - return FALSE; + return FALSE; ensureItemVisible( selectedItem() ); @@ -150,3 +137,3 @@ bool PlayListSelection::next() { else - return FALSE; + return FALSE; ensureItemVisible( selectedItem() ); @@ -161,3 +148,3 @@ bool PlayListSelection::first() { else - return FALSE; + return FALSE; ensureItemVisible( selectedItem() ); @@ -171,3 +158,3 @@ bool PlayListSelection::last() { while ( ( item = item->nextSibling() ) ) - prevItem = item; + prevItem = item; if ( prevItem ) @@ -175,3 +162,3 @@ bool PlayListSelection::last() { else - return FALSE; + return FALSE; ensureItemVisible( selectedItem() ); @@ -182,3 +169,2 @@ void PlayListSelection::unSelect() { - //QListViewItem *item = selectedItem(); setSelected( currentItem(), FALSE); @@ -189,5 +175,6 @@ void PlayListSelection::writeCurrent( Config& cfg ) { QListViewItem *item = selectedItem(); - if ( item ) + if ( item ) { cfg.writeEntry("current", item->text(0) ); - odebug << item->text(0) << oendl; + odebug << item->text(0) << oendl; + } @@ -208,4 +195,2 @@ void PlayListSelection::setSelectedItem(const QString &strk ) { } -// 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 @@ -247,3 +247,4 @@ void EditNetworkSetup::setNetworkSetup( NetworkSetup * NC ) { // 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( @@ -252,3 +253,3 @@ void EditNetworkSetup::setNetworkSetup( NetworkSetup * NC ) { tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ). - arg(NNI->nodeClass()->name()) ); + arg(pluginName) ); return; 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 @@ -446,3 +446,3 @@ int OTScan::getDevice( OTPeer *& Peer, - if( ! OT->isEnabled() ) { + if( ! OT || ! OT->isEnabled() ) { QMessageBox::warning( 0, |