* Cleanup.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28240 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-10-19 13:17:29 +00:00
parent bfc4ee026d
commit ab42853558
2 changed files with 49 additions and 44 deletions

View File

@ -1,12 +1,12 @@
/* /*
* Copyright (c) 2008, Haiku, Inc. * Copyright 2008, Haiku, Inc.
* Distributed under the terms of the MIT license. * Distributed under the terms of the MIT license.
* *
*/ */
#ifndef _INPUT_H #ifndef _INPUT_H
#define _INPUT_H #define _INPUT_H
#include <BeBuild.h> #include <BeBuild.h>
#include <Messenger.h> #include <Messenger.h>
#include <SupportDefs.h> #include <SupportDefs.h>
@ -45,33 +45,32 @@ status_t watch_input_devices(BMessenger target, bool start);
class BInputDevice { class BInputDevice {
public: public:
~BInputDevice(); ~BInputDevice();
const char* Name() const; const char* Name() const;
input_device_type Type() const; input_device_type Type() const;
bool IsRunning() const; bool IsRunning() const;
status_t Start(); status_t Start();
status_t Stop(); status_t Stop();
status_t Control(uint32 code, BMessage* message); status_t Control(uint32 code, BMessage* message);
static status_t Start(input_device_type type); static status_t Start(input_device_type type);
static status_t Stop(input_device_type type); static status_t Stop(input_device_type type);
static status_t Control(input_device_type type, static status_t Control(input_device_type type, uint32 code,
uint32 code,
BMessage* message); BMessage* message);
private:
friend BInputDevice* find_input_device(const char* name);
friend status_t get_input_devices(BList* list);
BInputDevice(); private:
void _SetNameAndType(const char* name, friend BInputDevice* find_input_device(const char* name);
input_device_type type); friend status_t get_input_devices(BList* list);
char* fName; BInputDevice();
input_device_type fType; void _SetNameAndType(const char* name,
uint32 _reserved[4]; input_device_type type);
char* fName;
input_device_type fType;
uint32 _reserved[4];
}; };
#endif #endif // _INPUT_H

View File

@ -1,9 +1,15 @@
/*
* Copyright 2004-2008, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ADD_ON_MONITOR_HANDLER_H #ifndef _ADD_ON_MONITOR_HANDLER_H
#define _ADD_ON_MONITOR_HANDLER_H #define _ADD_ON_MONITOR_HANDLER_H
#include <list> #include <list>
#include "NodeMonitorHandler.h" #include "NodeMonitorHandler.h"
namespace BPrivate { namespace BPrivate {
namespace Storage { namespace Storage {
@ -19,33 +25,33 @@ struct add_on_directory_info {
}; };
class AddOnMonitorHandler : public NodeMonitorHandler { class AddOnMonitorHandler : public NodeMonitorHandler {
private:
typedef NodeMonitorHandler inherited;
public: public:
AddOnMonitorHandler(const char * name = "AddOnMonitorHandler"); AddOnMonitorHandler(const char* name = NULL);
virtual ~AddOnMonitorHandler(); virtual ~AddOnMonitorHandler();
virtual void MessageReceived(BMessage * msg); virtual void MessageReceived(BMessage* msg);
// supply the add on directories here, in the order you want them checked // supply the add-on directories here, in the order you want them checked
virtual status_t AddDirectory(const node_ref * nref); virtual status_t AddDirectory(const node_ref* nref);
protected: protected:
// hooks for subclass // hooks for subclass
virtual void AddOnCreated(const add_on_entry_info * entry_info); virtual void AddOnCreated(const add_on_entry_info* entryInfo);
virtual void AddOnEnabled(const add_on_entry_info * entry_info); virtual void AddOnEnabled(const add_on_entry_info* entryInfo);
virtual void AddOnDisabled(const add_on_entry_info * entry_info); virtual void AddOnDisabled(const add_on_entry_info* entryInfo);
virtual void AddOnRemoved(const add_on_entry_info * entry_info); virtual void AddOnRemoved(const add_on_entry_info* entryInfo);
protected: protected:
virtual void EntryCreated(const char *name, ino_t directory, virtual void EntryCreated(const char* name, ino_t directory,
dev_t device, ino_t node); dev_t device, ino_t node);
virtual void EntryRemoved(ino_t directory, dev_t device, ino_t node); virtual void EntryRemoved(ino_t directory, dev_t device, ino_t node);
virtual void EntryMoved(const char *name, ino_t from_directory, virtual void EntryMoved(const char* name, ino_t fromDirectory,
ino_t to_directory, dev_t device, ino_t node); ino_t toDirectory, dev_t device, ino_t node);
private: private:
void _HandlePulse(); typedef NodeMonitorHandler inherited;
void _HandlePulse();
std::list<add_on_directory_info> fDirectories; std::list<add_on_directory_info> fDirectories;
std::list<add_on_entry_info> fPendingEntries; std::list<add_on_entry_info> fPendingEntries;
@ -58,4 +64,4 @@ private:
using namespace BPrivate::Storage; using namespace BPrivate::Storage;
#endif // _ADD_ON_MONITOR_HANDLER_H #endif // _ADD_ON_MONITOR_HANDLER_H