--- a/src/hbcore/inputfw/hbinputmethod.h	Thu Jul 15 14:03:49 2010 +0100
+++ b/src/hbcore/inputfw/hbinputmethod.h	Thu Jul 22 16:36:53 2010 +0100
@@ -46,51 +46,55 @@
     HbInputMethod();
     virtual ~HbInputMethod();
 
-    static bool initializeFramework(QApplication& app);
+    static bool initializeFramework(QApplication &app);
     static void forceUnfocus();
-    static HbInputMethod* activeInputMethod();
+    static HbInputMethod *activeInputMethod();
     static QList<HbInputMethodDescriptor> listCustomInputMethods();
+    static QList<HbInputMethodDescriptor> listCustomInputMethods(Qt::Orientation orientation, const HbInputLanguage &language);
+    static HbInputMethodDescriptor defaultInputMethod(Qt::Orientation orientation);
 
     virtual void focusReceived();
     virtual void focusLost(bool focusSwitch = true);
 
     bool isActiveMethod() const;
 
-    HbInputFocusObject* focusObject() const;
-    void setFocusObject(HbInputFocusObject* focusObject);
+    HbInputFocusObject *focusObject() const;
+    void setFocusObject(HbInputFocusObject *focusObject);
 
     void lockFocus();
     void unlockFocus();
 
     // From QInputContext (do not override).
-    void widgetDestroyed(QWidget* widget);
-    void setFocusWidget(QWidget* widget);
+    void widgetDestroyed(QWidget *widget);
+    void setFocusWidget(QWidget *widget);
 
     HbInputState inputState() const;
 
-    bool activateState(const HbInputState& state);
+    bool activateState(const HbInputState &state);
     void updateState();
     void editorRootState(HbInputState &result) const;
     bool automaticTextCaseNeeded() const;
     bool activateInputMethod(const HbInputMethodDescriptor &inputMethod);
 
 protected:
-    virtual void inputStateActivated(const HbInputState& newState);
+    virtual void inputStateActivated(const HbInputState &newState);
     virtual void inputLanguageChanged(const HbInputLanguage &newLanguage);
-    virtual void secondaryInputLanguageChanged(const HbInputLanguage &newLanguage);  
+    virtual void secondaryInputLanguageChanged(const HbInputLanguage &newLanguage);
     bool stateChangeInProgress() const;
 
     HbInputLanguage activeLanguage() const;
 
     bool modeAllowedInEditor(HbInputModeType mode) const;
-    void inputStateToEditor(const HbInputState& source);
+    void inputStateToEditor(const HbInputState &source);
 
     void constructLatinState(HbInputState &result) const;
 
+    HbInputMethodDescriptor descriptor() const;
+
 public slots:
     void globalInputLanguageChanged(const HbInputLanguage &newLanguage);
     void globalSecondaryInputLanguageChanged(const HbInputLanguage &newLanguage);
-    void activeKeyboardChanged(HbKeyboardType newKeyboard);     
+    void activeKeyboardChanged(HbKeyboardType newKeyboard);
     void orientationChanged(Qt::Orientation orientation);
     virtual void orientationAboutToChange();
     void editorDeleted(QObject *obj);