* Missing <Debug.h> include.
* Automatic whitespace cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38616 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
a0077c2456
commit
1bddf9cad1
|
@ -38,6 +38,7 @@ All rights reserved.
|
||||||
#define _NU_MODEL_H
|
#define _NU_MODEL_H
|
||||||
|
|
||||||
#include <AppFileInfo.h>
|
#include <AppFileInfo.h>
|
||||||
|
#include <Debug.h>
|
||||||
#include <Mime.h>
|
#include <Mime.h>
|
||||||
#include <StorageDefs.h>
|
#include <StorageDefs.h>
|
||||||
#include <String.h>
|
#include <String.h>
|
||||||
|
@ -113,8 +114,8 @@ class Model {
|
||||||
|
|
||||||
BNode *Node() const;
|
BNode *Node() const;
|
||||||
// returns null if not Open
|
// returns null if not Open
|
||||||
void GetPath(BPath *) const;
|
void GetPath(BPath *) const;
|
||||||
void GetEntry(BEntry *) const;
|
void GetEntry(BEntry *) const;
|
||||||
|
|
||||||
const char *MimeType() const;
|
const char *MimeType() const;
|
||||||
const char *PreferredAppSignature() const;
|
const char *PreferredAppSignature() const;
|
||||||
|
@ -258,7 +259,7 @@ class ModelNodeLazyOpener {
|
||||||
// and have close up model when done, etc.
|
// and have close up model when done, etc.
|
||||||
public:
|
public:
|
||||||
// consider failing when open does not succeed
|
// consider failing when open does not succeed
|
||||||
|
|
||||||
ModelNodeLazyOpener(Model *model, bool writable = false, bool openLater = true);
|
ModelNodeLazyOpener(Model *model, bool writable = false, bool openLater = true);
|
||||||
~ModelNodeLazyOpener();
|
~ModelNodeLazyOpener();
|
||||||
|
|
||||||
|
@ -339,14 +340,14 @@ Model::StatBuf() const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inline IconSource
|
inline IconSource
|
||||||
Model::IconFrom() const
|
Model::IconFrom() const
|
||||||
{
|
{
|
||||||
return (IconSource)fIconFrom;
|
return (IconSource)fIconFrom;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inline void
|
inline void
|
||||||
Model::SetIconFrom(IconSource from)
|
Model::SetIconFrom(IconSource from)
|
||||||
{
|
{
|
||||||
fIconFrom = from;
|
fIconFrom = from;
|
||||||
|
@ -470,21 +471,21 @@ ModelNodeLazyOpener::~ModelNodeLazyOpener()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inline bool
|
inline bool
|
||||||
ModelNodeLazyOpener::IsOpen() const
|
ModelNodeLazyOpener::IsOpen() const
|
||||||
{
|
{
|
||||||
return fModel->IsNodeOpen();
|
return fModel->IsNodeOpen();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inline bool
|
inline bool
|
||||||
ModelNodeLazyOpener::IsOpenForWriting() const
|
ModelNodeLazyOpener::IsOpenForWriting() const
|
||||||
{
|
{
|
||||||
return fModel->IsNodeOpenForWriting();
|
return fModel->IsNodeOpenForWriting();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inline bool
|
inline bool
|
||||||
ModelNodeLazyOpener::IsOpen(bool forWriting) const
|
ModelNodeLazyOpener::IsOpen(bool forWriting) const
|
||||||
{
|
{
|
||||||
return forWriting ? fModel->IsNodeOpenForWriting() : fModel->IsNodeOpen();
|
return forWriting ? fModel->IsNodeOpenForWriting() : fModel->IsNodeOpen();
|
||||||
|
@ -498,7 +499,7 @@ ModelNodeLazyOpener::TargetModel() const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
inline status_t
|
inline status_t
|
||||||
ModelNodeLazyOpener::OpenNode(bool writable)
|
ModelNodeLazyOpener::OpenNode(bool writable)
|
||||||
{
|
{
|
||||||
if (writable) {
|
if (writable) {
|
||||||
|
@ -506,7 +507,7 @@ ModelNodeLazyOpener::OpenNode(bool writable)
|
||||||
return fModel->OpenNode(true);
|
return fModel->OpenNode(true);
|
||||||
} else if (!fModel->IsNodeOpen())
|
} else if (!fModel->IsNodeOpen())
|
||||||
return fModel->OpenNode();
|
return fModel->OpenNode();
|
||||||
|
|
||||||
return B_OK;
|
return B_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue