summaryrefslogtreecommitdiff
path: root/noncore
authorerik <erik>2007-01-31 22:23:27 (UTC)
committer erik <erik>2007-01-31 22:23:27 (UTC)
commit73edac572d9ac9cfd18cc1254fc2019563d55f16 (patch) (side-by-side diff)
treea420b341ce2bcb4a049c76935544b8bce2a0a853 /noncore
parented5fba8cdb27174427b2e7780508bafa05536ca1 (diff)
downloadopie-73edac572d9ac9cfd18cc1254fc2019563d55f16.zip
opie-73edac572d9ac9cfd18cc1254fc2019563d55f16.tar.gz
opie-73edac572d9ac9cfd18cc1254fc2019563d55f16.tar.bz2
A few files that dereference pointers w/out checking that the pointer is
valid.
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistselection.cpp35
-rw-r--r--noncore/settings/networksettings2/editconnection.cpp5
-rw-r--r--noncore/settings/networksettings2/opietooth2/Opietooth.cpp2
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
@@ -50,14 +50,6 @@ 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 );
@@ -68,15 +60,10 @@ 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 ) {
@@ -94,7 +81,7 @@ void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) {
const DocLnk *PlayListSelection::current() {
PlayListSelectionItem *item = (PlayListSelectionItem *)selectedItem();
if ( item )
- return item->file();
+ return item->file();
return NULL;
}
@@ -120,7 +107,7 @@ void PlayListSelection::removeSelected() {
void PlayListSelection::moveSelectedUp() {
QListViewItem *item = selectedItem();
if ( item && item->itemAbove() )
- item->itemAbove()->moveItem( item );
+ item->itemAbove()->moveItem( item );
ensureItemVisible( selectedItem() );
}
@@ -138,7 +125,7 @@ bool PlayListSelection::prev() {
if ( item && item->itemAbove() )
setSelected( item->itemAbove(), TRUE );
else
- return FALSE;
+ return FALSE;
ensureItemVisible( selectedItem() );
return TRUE;
}
@@ -148,7 +135,7 @@ bool PlayListSelection::next() {
if ( item && item->itemBelow() )
setSelected( item->itemBelow(), TRUE );
else
- return FALSE;
+ return FALSE;
ensureItemVisible( selectedItem() );
return TRUE;
}
@@ -159,7 +146,7 @@ bool PlayListSelection::first() {
if ( item )
setSelected( item, TRUE );
else
- return FALSE;
+ return FALSE;
ensureItemVisible( selectedItem() );
return TRUE;
}
@@ -169,27 +156,27 @@ 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;
+ }
}
@@ -206,6 +193,4 @@ void PlayListSelection::setSelectedItem(const QString &strk ) {
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
@@ -245,12 +245,13 @@ 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;
}
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
@@ -444,7 +444,7 @@ int OTScan::getDevice( OTPeer *& Peer,
bool IsUp = 0;
unsigned int i;
- if( ! OT->isEnabled() ) {
+ if( ! OT || ! OT->isEnabled() ) {
QMessageBox::warning( 0,
tr("Scanning problem"),
tr("Bluetooth not enabled" )