diff -r 627c4a0fd0e7 -r c3690ec91ef8 src/hbcore/inputfw/hbinputpredictionengine.h
--- a/src/hbcore/inputfw/hbinputpredictionengine.h	Fri Jun 11 13:58:22 2010 +0300
+++ b/src/hbcore/inputfw/hbinputpredictionengine.h	Wed Jun 23 18:33:25 2010 +0300
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#ifndef HB_PREDICTION_ENGINE_H
-#define HB_PREDICTION_ENGINE_H
+#ifndef HB_INPUT_PREDICTION_ENGINE_H
+#define HB_INPUT_PREDICTION_ENGINE_H
 
 #include <QStringList>
 #include <QKeyEvent>
@@ -74,20 +74,20 @@
 
 public:
     virtual QList<HbInputLanguage> languages() const = 0;
-    virtual void setWord(const QString& word, HbPredictionCallback* callback = 0) = 0;
-    virtual void updateCandidates(int& bestGuessLocation, bool& noMoreCandidates) = 0;
-    virtual bool updateCandidates(int& bestGuessLocation) = 0;
-    virtual void appendKeyPress(const int keycode, const Qt::KeyboardModifiers modifiers, const HbTextCase textCase = HbTextCaseNone, HbPredictionCallback* callback = 0) = 0;
-    virtual void deleteKeyPress(HbPredictionCallback* callback = 0) = 0;
+    virtual void setWord(const QString &word, HbPredictionCallback *callback = 0) = 0;
+    virtual void updateCandidates(int &bestGuessLocation, bool &noMoreCandidates) = 0;
+    virtual bool updateCandidates(int &bestGuessLocation) = 0;
+    virtual void appendKeyPress(const int keycode, const Qt::KeyboardModifiers modifiers, const HbTextCase textCase = HbTextCaseNone, HbPredictionCallback *callback = 0) = 0;
+    virtual void deleteKeyPress(HbPredictionCallback *callback = 0) = 0;
     virtual void commit(const QString &word = QString()) = 0;
     virtual void clear() = 0;
-    virtual void addUsedWord(const QString& word) = 0;
+    virtual void addUsedWord(const QString &word) = 0;
     virtual HbInputPredictionFeature features() const = 0;
     virtual QString vendorIdString() const = 0;
     virtual QString engineVersion() const = 0;
-    virtual bool supportsKeyboardType(const HbInputLanguage& language, HbKeyboardType keyboard) const = 0;
+    virtual bool supportsKeyboardType(const HbInputLanguage &language, HbKeyboardType keyboard) const = 0;
 
-    virtual HbUserDictionary* userDictionary() const;
+    virtual HbUserDictionary *userDictionary() const;
     virtual void setExtraUserDictionary(int id);
     virtual void setExtraUserDictionaries(const QList<int>& idList);
     virtual bool setLanguage(const HbInputLanguage &language, HbInputModeType inputMode = HbInputModeNone);
@@ -111,16 +111,16 @@
     };
 
 public:
-    virtual void setCandidateList(QStringList* candidateList) = 0;
+    virtual void setCandidateList(QStringList *candidateList) = 0;
     virtual QStringList candidateList() = 0;
     virtual QStringList candidates() = 0;
     virtual int inputLength() = 0;
-    virtual void appendCharacter(const QChar character, const HbTextCase textCase = HbTextCaseNone, HbPredictionCallback* callback = 0) = 0;
+    virtual void appendCharacter(const QChar character, const HbTextCase textCase = HbTextCaseNone, HbPredictionCallback *callback = 0) = 0;
 
-    virtual QStringList nextWordCandidateList(HbPredictionCallback* callback = 0);
+    virtual QStringList nextWordCandidateList(HbPredictionCallback *callback = 0);
     virtual bool setErrorCorrectionLevel(HbErrorCorrectionLevel level);
     virtual HbErrorCorrectionLevel errorCorrectionLevel() const;
-    virtual bool setSecondaryLanguage(const HbInputLanguage& language);
+    virtual bool setSecondaryLanguage(const HbInputLanguage &language);
     virtual HbInputLanguage secondaryLanguage() const;
     virtual QString currentWord() const;
     virtual bool enableFeature(HbInputPredictionFeature feature);
@@ -142,7 +142,7 @@
 
     virtual QStringList getCandidates(int startIndex, int count) = 0;
     virtual bool selectCandidate(int index) = 0;
-    virtual bool selectCandidate(const QString& candidate) = 0;
+    virtual bool selectCandidate(const QString &candidate) = 0;
     virtual bool candidateExist(int index) = 0;
 
     virtual bool pressKey(const int keycode, const Qt::KeyboardModifiers modifiers, const int textCase = 0) = 0;
@@ -152,6 +152,6 @@
     virtual bool inlineSpelling(int idx, QString &out) = 0;
 };
 
-#endif // HB_PREDICTION_ENGINE
+#endif // HB_INPUT_PREDICTION_ENGINE_H
 
 // End of file