mirror of
https://github.com/vgough/encfs.git
synced 2025-06-26 15:01:57 +02:00
separate RenameOp definition from implementation to avoid gcc 4.3 errors
git-svn-id: http://encfs.googlecode.com/svn/trunk@31 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
parent
ff1c0828d8
commit
9bee8d7355
@ -190,8 +190,19 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
~RenameOp()
|
||||
~RenameOp();
|
||||
|
||||
operator bool () const
|
||||
{
|
||||
return renameList;
|
||||
}
|
||||
|
||||
bool apply();
|
||||
void undo();
|
||||
};
|
||||
|
||||
RenameOp::~RenameOp()
|
||||
{
|
||||
if(renameList)
|
||||
{
|
||||
// got a bunch of decoded filenames sitting in memory.. do a little
|
||||
@ -203,15 +214,10 @@ public:
|
||||
it->newPName.assign( it->newPName.size(), ' ' );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
operator bool () const
|
||||
{
|
||||
return renameList;
|
||||
}
|
||||
|
||||
bool apply()
|
||||
{
|
||||
bool RenameOp::apply()
|
||||
{
|
||||
try
|
||||
{
|
||||
while(last != renameList->end())
|
||||
@ -244,10 +250,10 @@ public:
|
||||
err.log( _RLWarningChannel );
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void undo()
|
||||
{
|
||||
void RenameOp::undo()
|
||||
{
|
||||
rDebug("in undoRename");
|
||||
|
||||
if(last == renameList->begin())
|
||||
@ -282,8 +288,7 @@ public:
|
||||
};
|
||||
|
||||
rWarning("Undo rename count: %i", undoCount);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
DirNode::DirNode(EncFS_Context *_ctx,
|
||||
const string &sourceDir, const shared_ptr<Config> &_config)
|
||||
|
Loading…
x
Reference in New Issue
Block a user