load notex textures from a builtin vfs

[xonotic/netradiant.git] / radiant / commands.h

diff --git a/radiant/commands.h b/radiant/commands.h
index 677f08549a20213ad64a1423e30008cca7d0d6ff..5f264d238e56091092cf1ed99c7006675ac1fde6 100644 (file)
--- a/radiant/commands.h
+++ b/radiant/commands.h
@@ -1,54 +1,62 @@
 /*
-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_COMMANDS_H)
+#if !defined( INCLUDED_COMMANDS_H )
 #define INCLUDED_COMMANDS_H
 
 #include "gtkutil/accelerator.h"
 
 
-const Accelerator& GlobalShortcuts_insert(const char* name, const Accelerator& accelerator);
-void GlobalShortcuts_register(const char* name, int type); // 1 = command, 2 = toggle
+const Accelerator &GlobalShortcuts_insert(const char *name, const Accelerator &accelerator);
+
+void GlobalShortcuts_register(const char *name, int type); // 1 = command, 2 = toggle
 void GlobalShortcuts_reportUnregistered();
 
-class CommandVisitor
-{
+class CommandVisitor {
 public:
-  virtual void visit(const char* name, Accelerator& accelerator) = 0;
+    virtual void visit(const char *name, Accelerator &accelerator) = 0;
 };
 
-void GlobalCommands_insert(const char* name, const Callback& callback, const Accelerator& accelerator = accelerator_null());
-const Command& GlobalCommands_find(const char* name);
+void GlobalCommands_insert(const char *name, const Callback<void()> &callback,
+                           const Accelerator &accelerator = accelerator_null());
+
+const Command &GlobalCommands_find(const char *name);
+
+void GlobalToggles_insert(const char *name, const Callback<void()> &callback,
+                          const Callback<void(const Callback<void(bool)> &)> &exportCallback,
+                          const Accelerator &accelerator = accelerator_null());
 
-void GlobalToggles_insert(const char* name, const Callback& callback, const BoolExportCallback& exportCallback, const Accelerator& accelerator = accelerator_null());
-const Toggle& GlobalToggles_find(const char* name);
+const Toggle &GlobalToggles_find(const char *name);
 
-void GlobalKeyEvents_insert(const char* name, const Accelerator& accelerator, const Callback& keyDown, const Callback& keyUp);
-const KeyEvent& GlobalKeyEvents_find(const char* name);
+void GlobalKeyEvents_insert(const char *name, const Accelerator &accelerator, const Callback<void()> &keyDown,
+                            const Callback<void()> &keyUp);
+
+const KeyEvent &GlobalKeyEvents_find(const char *name);
 
 
 void DoCommandListDlg();
 
-void LoadCommandMap(const char* path);
-void SaveCommandMap(const char* path);
+void LoadCommandMap(const char *path);
+
+void SaveCommandMap(const char *path);
 
 
 #endif