[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48884] branches/soc-2012-swiss_cheese/ intern/touch: Renaming files more appropriately
Nicholas Rishel
rishel.nick at gmail.com
Fri Jul 13 09:13:28 CEST 2012
Revision: 48884
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48884
Author: nicholas_rishel
Date: 2012-07-13 07:13:27 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Renaming files more appropriately
adds TOUCH_API.cpp
several little things
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/intern/touch/CMakeLists.txt
branches/soc-2012-swiss_cheese/intern/touch/TOUCH_API.h
Added Paths:
-----------
branches/soc-2012-swiss_cheese/intern/touch/TOUCH_Manager.h
branches/soc-2012-swiss_cheese/intern/touch/intern/TOUCH_API.cpp
branches/soc-2012-swiss_cheese/intern/touch/intern/TOUCH_Manager.cpp
Removed Paths:
-------------
branches/soc-2012-swiss_cheese/intern/touch/TOUCH_touch.h
branches/soc-2012-swiss_cheese/intern/touch/intern/TOUCH_touch.cpp
Modified: branches/soc-2012-swiss_cheese/intern/touch/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/intern/touch/CMakeLists.txt 2012-07-13 06:07:28 UTC (rev 48883)
+++ branches/soc-2012-swiss_cheese/intern/touch/CMakeLists.txt 2012-07-13 07:13:27 UTC (rev 48884)
@@ -33,11 +33,12 @@
)
set(SRC
- intern/TOUCH_Touch.cpp
+ intern/TOUCH_Manager.cpp
+ intern/TOUCH_API.cpp
TOUCH_API.h
TOUCH_Types.h
- TOUCH_touch.h
+ TOUCH_Manager.h
)
blender_add_lib(bf_intern_touch "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2012-swiss_cheese/intern/touch/TOUCH_API.h
===================================================================
--- branches/soc-2012-swiss_cheese/intern/touch/TOUCH_API.h 2012-07-13 06:07:28 UTC (rev 48883)
+++ branches/soc-2012-swiss_cheese/intern/touch/TOUCH_API.h 2012-07-13 07:13:27 UTC (rev 48884)
@@ -32,7 +32,7 @@
#ifndef __TOUCH_API_H__
#define __TOUCH_API_H__
-#include "TOUCH_touch.h"
+#include "TOUCH_Manager.h"
#ifdef __cplusplus
extern "C" {
Copied: branches/soc-2012-swiss_cheese/intern/touch/TOUCH_Manager.h (from rev 48882, branches/soc-2012-swiss_cheese/intern/touch/TOUCH_touch.h)
===================================================================
--- branches/soc-2012-swiss_cheese/intern/touch/TOUCH_Manager.h (rev 0)
+++ branches/soc-2012-swiss_cheese/intern/touch/TOUCH_Manager.h 2012-07-13 07:13:27 UTC (rev 48884)
@@ -0,0 +1,63 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Nicholas Rishel
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file touch/TOUCH_Manager.h
+ * \ingroup TOUCH
+ */
+
+#ifndef __TOUCH_TOUCH_H__
+#define __TOUCH_TOUCH_H__
+
+#include "TOUCH_Types.h"
+
+class TOUCH_Manager
+{
+public:
+ /**
+ * Constructor.
+ */
+ TOUCH_Manager();
+
+ /**
+ * Destructor.
+ */
+ ~TOUCH_Manager();
+
+ void TOUCH_RegisterArea(STR_String context);
+ void TOUCH_RegisterRegion(STR_String context);
+ void TOUCH_RegisterData(STR_String context);
+
+ void TOUCH_AddTouchEvent(TOUCH_event_info event);
+
+private:
+ char checkRegisteredArea(STR_String area);
+ char checkRegisteredRegion(STR_String region);
+ char checkRegisteredData(STR_String data);
+
+};
+
+#endif /* __TOUCH_TOUCH_H__ */
Deleted: branches/soc-2012-swiss_cheese/intern/touch/TOUCH_touch.h
===================================================================
--- branches/soc-2012-swiss_cheese/intern/touch/TOUCH_touch.h 2012-07-13 06:07:28 UTC (rev 48883)
+++ branches/soc-2012-swiss_cheese/intern/touch/TOUCH_touch.h 2012-07-13 07:13:27 UTC (rev 48884)
@@ -1,49 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program 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.
- *
- * This program 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 this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2012 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Nicholas Rishel
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file touch/TOUCH_touch.h
- * \ingroup TOUCH
- */
-
-#ifndef __TOUCH_TOUCH_H__
-#define __TOUCH_TOUCH_H__
-
-#include "TOUCH_Types.h"
-
-void TOUCH_InitManager();
-
-void TOUCH_RegisterArea(STR_String context);
-void TOUCH_RegisterRegion(STR_String context);
-void TOUCH_RegisterData(STR_String context);
-
-void TOUCH_AddTouchEvent(TOUCH_event_info event);
-
-char checkRegisteredArea(STR_String area);
-char checkRegisteredRegion(STR_String region);
-char checkRegisteredData(STR_String data);
-
-#endif /* __TOUCH_TOUCH_H__ */
Added: branches/soc-2012-swiss_cheese/intern/touch/intern/TOUCH_API.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/intern/touch/intern/TOUCH_API.cpp (rev 0)
+++ branches/soc-2012-swiss_cheese/intern/touch/intern/TOUCH_API.cpp 2012-07-13 07:13:27 UTC (rev 48884)
@@ -0,0 +1,57 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Nicholas Rishel
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file touch/intern/TOUCH_API.cpp
+ * \ingroup TOUCH
+ */
+
+#include "TOUCH_API.h"
+
+extern void TOUCH_InitManager()
+{
+ //TODO
+}
+
+extern void TOUCH_RegisterArea(STR_String context)
+{
+ //TODO
+}
+
+extern void TOUCH_RegisterRegion(STR_String context)
+{
+ //TODO
+}
+
+extern void TOUCH_RegisterData(STR_String context)
+{
+ //TODO
+}
+
+extern void TOUCH_AddTouchEvent(TOUCH_event_info event)
+{
+ //TODO
+}
Copied: branches/soc-2012-swiss_cheese/intern/touch/intern/TOUCH_Manager.cpp (from rev 48882, branches/soc-2012-swiss_cheese/intern/touch/intern/TOUCH_touch.cpp)
===================================================================
--- branches/soc-2012-swiss_cheese/intern/touch/intern/TOUCH_Manager.cpp (rev 0)
+++ branches/soc-2012-swiss_cheese/intern/touch/intern/TOUCH_Manager.cpp 2012-07-13 07:13:27 UTC (rev 48884)
@@ -0,0 +1,77 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Nicholas Rishel
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file touch/intern/TOUCH_Manager.cpp
+ * \ingroup TOUCH
+ */
+
+#include "TOUCH_Manager.h"
+
+TOUCH_Manager::TOUCH_Manager()
+{
+ //TODO
+}
+
+TOUCH_Manager::~TOUCH_Manager()
+{
+ //TODO
+}
+
+void TOUCH_Manager::TOUCH_RegisterArea(STR_String context)
+{
+ //TODO
+}
+
+void TOUCH_Manager::TOUCH_RegisterRegion(STR_String context)
+{
+ //TODO
+}
+
+void TOUCH_Manager::TOUCH_RegisterData(STR_String context)
+{
+ //TODO
+}
+
+void TOUCH_Manager::TOUCH_AddTouchEvent(TOUCH_event_info event)
+{
+ //TODO
+}
+
+char checkRegisteredArea(STR_String area)
+{
+ //TODO
+}
+
+char checkRegisteredRegion(STR_String region)
+{
+ //TODO
+}
+
+char checkRegisteredData(STR_String data)
+{
+ //TODO
+}
Deleted: branches/soc-2012-swiss_cheese/intern/touch/intern/TOUCH_touch.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/intern/touch/intern/TOUCH_touch.cpp 2012-07-13 06:07:28 UTC (rev 48883)
+++ branches/soc-2012-swiss_cheese/intern/touch/intern/TOUCH_touch.cpp 2012-07-13 07:13:27 UTC (rev 48884)
@@ -1,40 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program 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.
- *
- * This program 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 this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2012 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Nicholas Rishel
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file touch/intern/TOUCH_touch.cpp
- * \ingroup TOUCH
- */
-
-#include "TOUCH_touch.h"
-
-void TOUCH_InitManager(){};
-
-void TOUCH_RegisterArea(STR_String context){};
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list