Fixed GCC 4 warnings.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19055 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,22 +1,27 @@
|
|||||||
//----------------------------------------------------------------------
|
/*
|
||||||
// This software is part of the OpenBeOS distribution and is covered
|
* Copyright 2003-2006, Haiku Inc.
|
||||||
// by the OpenBeOS license.
|
* Distributed under the terms of the MIT License.
|
||||||
//---------------------------------------------------------------------
|
*
|
||||||
|
* Authors:
|
||||||
|
* Ingo Weinhold, [email protected]
|
||||||
|
*/
|
||||||
#ifndef _DISK_DEVICE_PRIVATE_H
|
#ifndef _DISK_DEVICE_PRIVATE_H
|
||||||
#define _DISK_DEVICE_PRIVATE_H
|
#define _DISK_DEVICE_PRIVATE_H
|
||||||
|
|
||||||
|
|
||||||
#include <DiskDeviceDefs.h>
|
#include <DiskDeviceDefs.h>
|
||||||
#include <DiskDeviceVisitor.h>
|
#include <DiskDeviceVisitor.h>
|
||||||
|
|
||||||
class BMessenger;
|
class BMessenger;
|
||||||
class BPath;
|
class BPath;
|
||||||
|
|
||||||
|
|
||||||
namespace BPrivate {
|
namespace BPrivate {
|
||||||
|
|
||||||
// PartitionFilter
|
// PartitionFilter
|
||||||
class PartitionFilter {
|
class PartitionFilter {
|
||||||
public:
|
public:
|
||||||
|
virtual ~PartitionFilter();
|
||||||
virtual bool Filter(BPartition *partition, int32 level) = 0;
|
virtual bool Filter(BPartition *partition, int32 level) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
//----------------------------------------------------------------------
|
/*
|
||||||
// This software is part of the OpenBeOS distribution and is covered
|
* Copyright 2003-2006, Haiku Inc.
|
||||||
// by the OpenBeOS license.
|
* Distributed under the terms of the MIT License.
|
||||||
//---------------------------------------------------------------------
|
*
|
||||||
|
* Authors:
|
||||||
|
* Ingo Weinhold, [email protected]
|
||||||
|
*/
|
||||||
|
|
||||||
#include <new>
|
|
||||||
using namespace std;
|
|
||||||
|
|
||||||
#include <DiskDevice.h>
|
#include <DiskDevice.h>
|
||||||
#include <DiskDeviceList.h>
|
#include <DiskDeviceList.h>
|
||||||
@@ -15,6 +16,9 @@ using namespace std;
|
|||||||
#include <ObjectLocker.h>
|
#include <ObjectLocker.h>
|
||||||
#include <Partition.h>
|
#include <Partition.h>
|
||||||
|
|
||||||
|
#include <new>
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
using BPrivate::BObjectLocker;
|
using BPrivate::BObjectLocker;
|
||||||
|
|
||||||
// constructor
|
// constructor
|
||||||
@@ -612,7 +616,7 @@ BDiskDeviceList::_StopWatching()
|
|||||||
void
|
void
|
||||||
BDiskDeviceList::_MountPointMoved(BMessage *message)
|
BDiskDeviceList::_MountPointMoved(BMessage *message)
|
||||||
{
|
{
|
||||||
if (BDiskDevice *device = _UpdateDevice(message)) {
|
if (_UpdateDevice(message) != NULL) {
|
||||||
if (BPartition *partition = _FindPartition(message))
|
if (BPartition *partition = _FindPartition(message))
|
||||||
MountPointMoved(partition);
|
MountPointMoved(partition);
|
||||||
}
|
}
|
||||||
@@ -625,7 +629,7 @@ BDiskDeviceList::_MountPointMoved(BMessage *message)
|
|||||||
void
|
void
|
||||||
BDiskDeviceList::_PartitionMounted(BMessage *message)
|
BDiskDeviceList::_PartitionMounted(BMessage *message)
|
||||||
{
|
{
|
||||||
if (BDiskDevice *device = _UpdateDevice(message)) {
|
if (_UpdateDevice(message) != NULL) {
|
||||||
if (BPartition *partition = _FindPartition(message))
|
if (BPartition *partition = _FindPartition(message))
|
||||||
PartitionMounted(partition);
|
PartitionMounted(partition);
|
||||||
}
|
}
|
||||||
@@ -638,7 +642,7 @@ BDiskDeviceList::_PartitionMounted(BMessage *message)
|
|||||||
void
|
void
|
||||||
BDiskDeviceList::_PartitionUnmounted(BMessage *message)
|
BDiskDeviceList::_PartitionUnmounted(BMessage *message)
|
||||||
{
|
{
|
||||||
if (BDiskDevice *device = _UpdateDevice(message)) {
|
if (_UpdateDevice(message) != NULL) {
|
||||||
if (BPartition *partition = _FindPartition(message))
|
if (BPartition *partition = _FindPartition(message))
|
||||||
PartitionUnmounted(partition);
|
PartitionUnmounted(partition);
|
||||||
}
|
}
|
||||||
@@ -651,7 +655,7 @@ BDiskDeviceList::_PartitionUnmounted(BMessage *message)
|
|||||||
void
|
void
|
||||||
BDiskDeviceList::_PartitionInitialized(BMessage *message)
|
BDiskDeviceList::_PartitionInitialized(BMessage *message)
|
||||||
{
|
{
|
||||||
if (BDiskDevice *device = _UpdateDevice(message)) {
|
if (_UpdateDevice(message) != NULL) {
|
||||||
if (BPartition *partition = _FindPartition(message))
|
if (BPartition *partition = _FindPartition(message))
|
||||||
PartitionInitialized(partition);
|
PartitionInitialized(partition);
|
||||||
}
|
}
|
||||||
@@ -664,7 +668,7 @@ BDiskDeviceList::_PartitionInitialized(BMessage *message)
|
|||||||
void
|
void
|
||||||
BDiskDeviceList::_PartitionResized(BMessage *message)
|
BDiskDeviceList::_PartitionResized(BMessage *message)
|
||||||
{
|
{
|
||||||
if (BDiskDevice *device = _UpdateDevice(message)) {
|
if (_UpdateDevice(message) != NULL) {
|
||||||
if (BPartition *partition = _FindPartition(message))
|
if (BPartition *partition = _FindPartition(message))
|
||||||
PartitionResized(partition);
|
PartitionResized(partition);
|
||||||
}
|
}
|
||||||
@@ -677,7 +681,7 @@ BDiskDeviceList::_PartitionResized(BMessage *message)
|
|||||||
void
|
void
|
||||||
BDiskDeviceList::_PartitionMoved(BMessage *message)
|
BDiskDeviceList::_PartitionMoved(BMessage *message)
|
||||||
{
|
{
|
||||||
if (BDiskDevice *device = _UpdateDevice(message)) {
|
if (_UpdateDevice(message) != NULL) {
|
||||||
if (BPartition *partition = _FindPartition(message))
|
if (BPartition *partition = _FindPartition(message))
|
||||||
PartitionMoved(partition);
|
PartitionMoved(partition);
|
||||||
}
|
}
|
||||||
@@ -690,7 +694,7 @@ BDiskDeviceList::_PartitionMoved(BMessage *message)
|
|||||||
void
|
void
|
||||||
BDiskDeviceList::_PartitionCreated(BMessage *message)
|
BDiskDeviceList::_PartitionCreated(BMessage *message)
|
||||||
{
|
{
|
||||||
if (BDiskDevice *device = _UpdateDevice(message)) {
|
if (_UpdateDevice(message) != NULL) {
|
||||||
if (BPartition *partition = _FindPartition(message))
|
if (BPartition *partition = _FindPartition(message))
|
||||||
PartitionCreated(partition);
|
PartitionCreated(partition);
|
||||||
}
|
}
|
||||||
@@ -718,7 +722,7 @@ BDiskDeviceList::_PartitionDeleted(BMessage *message)
|
|||||||
void
|
void
|
||||||
BDiskDeviceList::_PartitionDefragmented(BMessage *message)
|
BDiskDeviceList::_PartitionDefragmented(BMessage *message)
|
||||||
{
|
{
|
||||||
if (BDiskDevice *device = _UpdateDevice(message)) {
|
if (_UpdateDevice(message) != NULL) {
|
||||||
if (BPartition *partition = _FindPartition(message))
|
if (BPartition *partition = _FindPartition(message))
|
||||||
PartitionDefragmented(partition);
|
PartitionDefragmented(partition);
|
||||||
}
|
}
|
||||||
@@ -731,7 +735,7 @@ BDiskDeviceList::_PartitionDefragmented(BMessage *message)
|
|||||||
void
|
void
|
||||||
BDiskDeviceList::_PartitionRepaired(BMessage *message)
|
BDiskDeviceList::_PartitionRepaired(BMessage *message)
|
||||||
{
|
{
|
||||||
if (BDiskDevice *device = _UpdateDevice(message)) {
|
if (_UpdateDevice(message) != NULL) {
|
||||||
if (BPartition *partition = _FindPartition(message))
|
if (BPartition *partition = _FindPartition(message))
|
||||||
PartitionRepaired(partition);
|
PartitionRepaired(partition);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,23 @@
|
|||||||
//----------------------------------------------------------------------
|
/*
|
||||||
// This software is part of the OpenBeOS distribution and is covered
|
* Copyright 2003-2006, Haiku Inc.
|
||||||
// by the OpenBeOS license.
|
* Distributed under the terms of the MIT License.
|
||||||
//---------------------------------------------------------------------
|
*
|
||||||
|
* Authors:
|
||||||
|
* Ingo Weinhold, [email protected]
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include <DiskDevicePrivate.h>
|
#include <DiskDevicePrivate.h>
|
||||||
#include <DiskDevice.h>
|
#include <DiskDevice.h>
|
||||||
#include <Partition.h>
|
#include <Partition.h>
|
||||||
|
|
||||||
// PartitionFilterVisitor
|
|
||||||
|
PartitionFilter::~PartitionFilter()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// #pragma mark - PartitionFilterVisitor
|
||||||
|
|
||||||
// constructor
|
// constructor
|
||||||
PartitionFilterVisitor::PartitionFilterVisitor(BDiskDeviceVisitor *visitor,
|
PartitionFilterVisitor::PartitionFilterVisitor(BDiskDeviceVisitor *visitor,
|
||||||
|
|||||||
Reference in New Issue
Block a user