Index: Source/WebCore/platform/PlatformKeyboardEvent.h |
diff --git a/Source/WebCore/platform/PlatformKeyboardEvent.h b/Source/WebCore/platform/PlatformKeyboardEvent.h |
index bf0a43f2438f7a696a00180d714c78edd8cc4397..893d30ed5eea85eaec3dd134e20e2525eb6ccd1e 100644 |
--- a/Source/WebCore/platform/PlatformKeyboardEvent.h |
+++ b/Source/WebCore/platform/PlatformKeyboardEvent.h |
@@ -38,25 +38,6 @@ |
OBJC_CLASS NSEvent; |
#endif |
-#if PLATFORM(GTK) |
-typedef struct _GdkEventKey GdkEventKey; |
-#include "CompositionResults.h" |
-#endif |
- |
-#if PLATFORM(QT) |
-QT_BEGIN_NAMESPACE |
-class QKeyEvent; |
-QT_END_NAMESPACE |
-#endif |
- |
-#if PLATFORM(BLACKBERRY) |
-namespace BlackBerry { |
-namespace Platform { |
-class KeyboardEvent; |
-} |
-} |
-#endif |
- |
namespace WebCore { |
class PlatformKeyboardEvent : public PlatformEvent { |
@@ -70,15 +51,6 @@ namespace WebCore { |
, m_autoRepeat(false) |
, m_isKeypad(false) |
, m_isSystemKey(false) |
-#if PLATFORM(BLACKBERRY) |
- , m_unmodifiedCharacter(0) |
-#endif |
-#if PLATFORM(GTK) |
- , m_gdkEventKey(0) |
-#endif |
-#if PLATFORM(QT) |
- , m_qtEvent(0) |
-#endif |
{ |
} |
@@ -127,41 +99,6 @@ namespace WebCore { |
static bool currentCapsLockState(); |
static void getCurrentModifierState(bool& shiftKey, bool& ctrlKey, bool& altKey, bool& metaKey); |
- |
-#if PLATFORM(BLACKBERRY) |
- unsigned unmodifiedCharacter() const { return m_unmodifiedCharacter; } |
-#endif |
- |
-#if PLATFORM(MAC) |
- NSEvent* macEvent() const { return m_macEvent.get(); } |
-#endif |
- |
-#if PLATFORM(WIN) |
- PlatformKeyboardEvent(HWND, WPARAM, LPARAM, Type, bool); |
-#endif |
- |
-#if PLATFORM(GTK) |
- PlatformKeyboardEvent(GdkEventKey*, const CompositionResults&); |
- GdkEventKey* gdkEventKey() const { return m_gdkEventKey; } |
- const CompositionResults& compositionResults() const { return m_compositionResults; } |
- |
- // Used by WebKit2 |
- static String keyIdentifierForGdkKeyCode(unsigned); |
- static int windowsKeyCodeForGdkKeyCode(unsigned); |
- static String singleCharacterString(unsigned); |
-#endif |
- |
-#if PLATFORM(QT) |
- PlatformKeyboardEvent(QKeyEvent*); |
- QKeyEvent* qtEvent() const { return m_qtEvent; } |
- uint32_t nativeModifiers() const; |
- uint32_t nativeScanCode() const; |
-#endif |
- |
-#if PLATFORM(BLACKBERRY) |
- PlatformKeyboardEvent(const BlackBerry::Platform::KeyboardEvent&); |
-#endif |
- |
protected: |
String m_text; |
String m_unmodifiedText; |
@@ -172,29 +109,8 @@ namespace WebCore { |
bool m_autoRepeat; |
bool m_isKeypad; |
bool m_isSystemKey; |
- |
-#if PLATFORM(BLACKBERRY) |
- unsigned m_unmodifiedCharacter; |
-#endif |
- |
-#if PLATFORM(MAC) |
- RetainPtr<NSEvent> m_macEvent; |
-#endif |
-#if PLATFORM(GTK) |
- GdkEventKey* m_gdkEventKey; |
- CompositionResults m_compositionResults; |
-#endif |
-#if PLATFORM(QT) |
- QKeyEvent* m_qtEvent; |
-#endif |
}; |
-#if PLATFORM(QT) |
-// Used by WebKit2. |
-String keyIdentifierForQtKeyCode(int keyCode); |
-int windowsKeyCodeForKeyEvent(unsigned int keycode, bool isKeypad = false); |
-#endif |
- |
} // namespace WebCore |
#endif // PlatformKeyboardEvent_h |