my own uncrustify run
This commit is contained in:
Rudolf Polzer
@@ -1,25 +1,25 @@
|
||||
/*
|
||||
Copyright (C) 2001-2006, William Joseph.
|
||||
All Rights Reserved.
|
||||
Copyright (C) 2001-2006, William Joseph.
|
||||
All Rights Reserved.
|
||||
|
||||
This file is part of GtkRadiant.
|
||||
This file is part of GtkRadiant.
|
||||
|
||||
GtkRadiant is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
GtkRadiant is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
GtkRadiant is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
GtkRadiant is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GtkRadiant; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GtkRadiant; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#if !defined(INCLUDED_MODULESYSTEM_MODULESMAP_H)
|
||||
#if !defined( INCLUDED_MODULESYSTEM_MODULESMAP_H )
|
||||
#define INCLUDED_MODULESYSTEM_MODULESMAP_H
|
||||
|
||||
#include "modulesystem.h"
|
||||
@@ -30,123 +30,106 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
template<typename Type>
|
||||
class ModulesMap : public Modules<Type>
|
||||
{
|
||||
typedef std::map<CopiedString, Module*> modules_t;
|
||||
modules_t m_modules;
|
||||
typedef std::map<CopiedString, Module*> modules_t;
|
||||
modules_t m_modules;
|
||||
public:
|
||||
~ModulesMap()
|
||||
{
|
||||
for(modules_t::iterator i = m_modules.begin(); i != m_modules.end(); ++i)
|
||||
{
|
||||
(*i).second->release();
|
||||
}
|
||||
}
|
||||
~ModulesMap(){
|
||||
for ( modules_t::iterator i = m_modules.begin(); i != m_modules.end(); ++i )
|
||||
{
|
||||
( *i ).second->release();
|
||||
}
|
||||
}
|
||||
|
||||
typedef modules_t::const_iterator iterator;
|
||||
typedef modules_t::const_iterator iterator;
|
||||
|
||||
iterator begin() const
|
||||
{
|
||||
return m_modules.begin();
|
||||
}
|
||||
iterator end() const
|
||||
{
|
||||
return m_modules.end();
|
||||
}
|
||||
iterator begin() const {
|
||||
return m_modules.begin();
|
||||
}
|
||||
iterator end() const {
|
||||
return m_modules.end();
|
||||
}
|
||||
|
||||
void insert(const char* name, Module& module)
|
||||
{
|
||||
module.capture();
|
||||
if(globalModuleServer().getError())
|
||||
{
|
||||
module.release();
|
||||
globalModuleServer().setError(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_modules.insert(modules_t::value_type(name, &module));
|
||||
}
|
||||
}
|
||||
void insert( const char* name, Module& module ){
|
||||
module.capture();
|
||||
if ( globalModuleServer().getError() ) {
|
||||
module.release();
|
||||
globalModuleServer().setError( false );
|
||||
}
|
||||
else
|
||||
{
|
||||
m_modules.insert( modules_t::value_type( name, &module ) );
|
||||
}
|
||||
}
|
||||
|
||||
Type* find(const char* name)
|
||||
{
|
||||
modules_t::iterator i = m_modules.find(name);
|
||||
if(i != m_modules.end())
|
||||
{
|
||||
return static_cast<Type*>(Module_getTable(*(*i).second));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
Type* find( const char* name ){
|
||||
modules_t::iterator i = m_modules.find( name );
|
||||
if ( i != m_modules.end() ) {
|
||||
return static_cast<Type*>( Module_getTable( *( *i ).second ) );
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
Type* findModule(const char* name)
|
||||
{
|
||||
return find(name);
|
||||
}
|
||||
void foreachModule(const typename Modules<Type>::Visitor& visitor)
|
||||
{
|
||||
for(modules_t::iterator i = m_modules.begin(); i != m_modules.end(); ++i)
|
||||
{
|
||||
visitor.visit((*i).first.c_str(), *static_cast<const Type*>(Module_getTable(*(*i).second)));
|
||||
}
|
||||
}
|
||||
Type* findModule( const char* name ){
|
||||
return find( name );
|
||||
}
|
||||
void foreachModule( const typename Modules<Type>::Visitor& visitor ){
|
||||
for ( modules_t::iterator i = m_modules.begin(); i != m_modules.end(); ++i )
|
||||
{
|
||||
visitor.visit( ( *i ).first.c_str(), *static_cast<const Type*>( Module_getTable( *( *i ).second ) ) );
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
template<typename Type>
|
||||
class InsertModules : public ModuleServer::Visitor
|
||||
{
|
||||
ModulesMap<Type>& m_modules;
|
||||
ModulesMap<Type>& m_modules;
|
||||
public:
|
||||
InsertModules(ModulesMap<Type>& modules)
|
||||
: m_modules(modules)
|
||||
{
|
||||
}
|
||||
void visit(const char* name, Module& module) const
|
||||
{
|
||||
m_modules.insert(name, module);
|
||||
}
|
||||
InsertModules( ModulesMap<Type>& modules )
|
||||
: m_modules( modules ){
|
||||
}
|
||||
void visit( const char* name, Module& module ) const {
|
||||
m_modules.insert( name, module );
|
||||
}
|
||||
};
|
||||
|
||||
template<typename Type>
|
||||
class ModulesRef
|
||||
{
|
||||
ModulesMap<Type> m_modules;
|
||||
ModulesMap<Type> m_modules;
|
||||
public:
|
||||
ModulesRef(const char* names)
|
||||
{
|
||||
if(!globalModuleServer().getError())
|
||||
{
|
||||
if(string_equal(names, "*"))
|
||||
{
|
||||
InsertModules<Type> visitor(m_modules);
|
||||
globalModuleServer().foreachModule(typename Type::Name(), typename Type::Version(), visitor);
|
||||
}
|
||||
else
|
||||
{
|
||||
StringTokeniser tokeniser(names);
|
||||
for(;;)
|
||||
{
|
||||
const char* name = tokeniser.getToken();
|
||||
if(string_empty(name))
|
||||
{
|
||||
break;
|
||||
}
|
||||
Module* module = globalModuleServer().findModule(typename Type::Name(), typename Type::Version(), name);
|
||||
if(module == 0)
|
||||
{
|
||||
globalModuleServer().setError(true);
|
||||
globalErrorStream() << "ModulesRef::initialise: type=" << makeQuoted(typename Type::Name()) << " version=" << makeQuoted(typename Type::Version()) << " name=" << makeQuoted(name) << " - not found\n";
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_modules.insert(name, *module);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
ModulesMap<Type>& get()
|
||||
{
|
||||
return m_modules;
|
||||
}
|
||||
ModulesRef( const char* names ){
|
||||
if ( !globalModuleServer().getError() ) {
|
||||
if ( string_equal( names, "*" ) ) {
|
||||
InsertModules<Type> visitor( m_modules );
|
||||
globalModuleServer().foreachModule( typename Type::Name(), typename Type::Version(), visitor );
|
||||
}
|
||||
else
|
||||
{
|
||||
StringTokeniser tokeniser( names );
|
||||
for (;; )
|
||||
{
|
||||
const char* name = tokeniser.getToken();
|
||||
if ( string_empty( name ) ) {
|
||||
break;
|
||||
}
|
||||
Module* module = globalModuleServer().findModule( typename Type::Name(), typename Type::Version(), name );
|
||||
if ( module == 0 ) {
|
||||
globalModuleServer().setError( true );
|
||||
globalErrorStream() << "ModulesRef::initialise: type=" << makeQuoted( typename Type::Name() ) << " version=" << makeQuoted( typename Type::Version() ) << " name=" << makeQuoted( name ) << " - not found\n";
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_modules.insert( name, *module );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
ModulesMap<Type>& get(){
|
||||
return m_modules;
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user