Permalink
Browse files

Renamed emu* to TouchControlOverlay. The abbreviation is tco, where n…

…eeded.

Also fixed up some build configuration issues with release and simulator.
  • Loading branch information...
1 parent cf522b9 commit 35e5e0a52249f1f629afffed52a8bf3355460138 Artem Simonov committed Oct 25, 2011
View
Oops, something went wrong.
View
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>emulate</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>?name?</key>
- <value></value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.append_environment</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.buildArguments</key>
- <value></value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.buildCommand</key>
- <value>make</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.buildLocation</key>
- <value>${workspace_loc:/emulate/Device-Release}</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.contents</key>
- <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
- <value>false</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableFullBuild</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.stopOnError</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
- <triggers>full,incremental,</triggers>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.cdt.core.cnature</nature>
- <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
- <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
- <nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
- <nature>org.eclipse.cdt.core.ccnature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>TouchControlOverlay</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+ <triggers>full,incremental,</triggers>
+ <arguments>
+ <dictionary>
+ <key>?name?</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.append_environment</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildArguments</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildCommand</key>
+ <value>make</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildLocation</key>
+ <value>${workspace_loc:/emulate/Simulator}</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.contents</key>
+ <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+ <value>false</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+ <value>false</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableFullBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.stopOnError</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+ <value>true</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+ <triggers>full,incremental,</triggers>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.cdt.core.cnature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+ <nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
+ <nature>org.eclipse.cdt.core.ccnature</nature>
+ </natures>
+</projectDescription>
View
@@ -21,14 +21,14 @@
#include "window.h"
class Control;
-class EmulationContext;
+class TCOContext;
class ConfigWindow : public EmulationWindow
{
public:
static ConfigWindow *createConfigWindow(screen_context_t context, screen_window_t parent=0);
- void runEventLoop(EmulationContext *emuContext);
+ void runEventLoop(TCOContext *emuContext);
protected:
ConfigWindow(screen_context_t screenContext, screen_window_t parent=0)
@@ -37,7 +37,7 @@ class ConfigWindow : public EmulationWindow
{}
private:
- screen_buffer_t draw(EmulationContext *emuContext);
+ screen_buffer_t draw(TCOContext *emuContext);
Control *m_selected;
};
@@ -22,13 +22,13 @@
#include <libxml/tree.h>
class Control;
-class EmulationContext;
+class TCOContext;
class ControlFactory
{
public:
- static Control *createControl(EmulationContext *context, int type, int x, int y, int w, int h, std::stringstream &ss);
- static Control *createControl(EmulationContext *context, xmlNode *node);
+ static Control *createControl(TCOContext *context, int type, int x, int y, int w, int h, std::stringstream &ss);
+ static Control *createControl(TCOContext *context, xmlNode *node);
};
#endif /* CONTROLFACTORY_H_ */
View
@@ -17,8 +17,8 @@
#ifndef EVENTDISPATCHER_H_
#define EVENTDISPATCHER_H_
-#include "emulate.h"
-#include "emulate_priv.h"
+#include "touchcontroloverlay.h"
+#include "touchcontroloverlay_priv.h"
class EventDispatcher
{
@@ -32,7 +32,7 @@ class EventDispatcher
class TapDispatcher : public EventDispatcher
{
public:
- typedef EmulationContext::HandleTapFunc Callback;
+ typedef TCOContext::HandleTapFunc Callback;
TapDispatcher(Callback callback)
: m_callback(callback)
@@ -46,11 +46,11 @@ class TapDispatcher : public EventDispatcher
class KeyEventDispatcher : public EventDispatcher
{
public:
- typedef EmulationContext::HandleKeyFunc Callback;
+ typedef TCOContext::HandleKeyFunc Callback;
enum KeyEventType {
- KEY_DOWN = EMU_KB_DOWN,
- KEY_UP = EMU_KB_UP
+ KEY_DOWN = TCO_KB_DOWN,
+ KEY_UP = TCO_KB_UP
};
struct KeyEvent {
@@ -79,11 +79,11 @@ class KeyEventDispatcher : public EventDispatcher
class DPadEventDispatcher : public EventDispatcher
{
public:
- typedef EmulationContext::HandleDPadFunc Callback;
+ typedef TCOContext::HandleDPadFunc Callback;
enum KeyEventType {
- DPAD_DOWN = EMU_KB_DOWN,
- DPAD_UP = EMU_KB_UP
+ DPAD_DOWN = TCO_KB_DOWN,
+ DPAD_UP = TCO_KB_UP
};
struct DPadEvent {
int angle;
@@ -102,7 +102,7 @@ class DPadEventDispatcher : public EventDispatcher
class TouchAreaEventDispatcher : public EventDispatcher
{
public:
- typedef EmulationContext::HandleTouchFunc Callback;
+ typedef TCOContext::HandleTouchFunc Callback;
struct TouchAreaEvent {
int dx;
@@ -121,11 +121,11 @@ class TouchAreaEventDispatcher : public EventDispatcher
class MouseButtonEventDispatcher : public EventDispatcher
{
public:
- typedef EmulationContext::HandleMouseButtonFunc Callback;
+ typedef TCOContext::HandleMouseButtonFunc Callback;
enum KeyEventType {
- MOUSE_DOWN = EMU_MOUSE_BUTTON_DOWN,
- MOUSE_UP = EMU_MOUSE_BUTTON_UP
+ MOUSE_DOWN = TCO_MOUSE_BUTTON_DOWN,
+ MOUSE_UP = TCO_MOUSE_BUTTON_UP
};
struct MouseButtonEvent {
@@ -149,7 +149,7 @@ class MouseButtonEventDispatcher : public EventDispatcher
class TouchScreenEventDispatcher : public EventDispatcher
{
public:
- typedef EmulationContext::HandleTouchScreenFunc Callback;
+ typedef TCOContext::HandleTouchScreenFunc Callback;
TouchScreenEventDispatcher(Callback callback)
: m_callback(callback)
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef EMULATE_PRIV_H_
-#define EMULATE_PRIV_H_
+#ifndef TOUCHCONTROLOVERLAY_PRIV_H_
+#define TOUCHCONTROLOVERLAY_PRIV_H_
#include <map>
#include <vector>
@@ -25,9 +25,9 @@
class Control;
class ConfigWindow;
-struct emu_callbacks;
+struct tco_callbacks;
-class EmulationContext
+class TCOContext
{
public:
typedef int(*HandleKeyFunc)(int sym, int mod, int scancode, uint16_t unicode, int event);
@@ -37,8 +37,8 @@ class EmulationContext
typedef int(*HandleTapFunc)();
typedef int(*HandleTouchScreenFunc)(int x, int y, int tap, int hold);
- EmulationContext(screen_context_t context, emu_callbacks callbacks);
- ~EmulationContext();
+ TCOContext(screen_context_t context, tco_callbacks callbacks);
+ ~TCOContext();
int showLabels(screen_window_t window);
@@ -75,4 +75,4 @@ class EmulationContext
HandleTouchScreenFunc m_handleTouchScreenFunc;
};
-#endif /* EMULATE_PRIV_H_ */
+#endif /* TOUCHCONTROLOVERLAY_PRIV_H_ */
Oops, something went wrong.

0 comments on commit 35e5e0a

Please sign in to comment.