am ecbf3f2c: Merge "Fix indentations."

* commit 'ecbf3f2cbc517b175fcf5252db61a815ea578978':
  Fix indentations.
main
Ken Wakasa 2012-01-05 19:30:46 -08:00 committed by Android Git Automerger
commit 91a97fa83c
8 changed files with 20 additions and 21 deletions

View File

@ -27,7 +27,6 @@ namespace latinime {
class ProximityInfo;
class Correction {
public:
typedef enum {
TRAVERSE_ALL_ON_TERMINAL,
@ -95,6 +94,7 @@ public:
inline int getTreeParentIndex(const int index) const {
return mCorrectionStates[index].mParentIndex;
}
private:
inline void incrementInputIndex();
inline void incrementOutputIndex();

View File

@ -29,9 +29,7 @@ namespace latinime {
class TerminalAttributes;
class UnigramDictionary {
public:
// Mask and flags for children address type selection.
static const int MASK_GROUP_ADDRESS_TYPE = 0xC0;
static const int FLAG_GROUP_ADDRESS_TYPE_NOADDRESS = 0x00;
@ -85,7 +83,6 @@ public:
virtual ~UnigramDictionary();
private:
void getWordSuggestions(ProximityInfo *proximityInfo, const int *xcoordinates,
const int *ycoordinates, const int *codes, const int inputLength,
const int flags, Correction *correction, WordsPriorityQueuePool *queuePool);

View File

@ -126,6 +126,7 @@ public:
mSuggestions.pop();
}
}
private:
struct wordComparator {
bool operator ()(SuggestedWord * left, SuggestedWord * right) {

View File

@ -43,6 +43,7 @@ public:
WordsPriorityQueue* getSubQueue2() {
return mSubQueue2;
}
private:
WordsPriorityQueue *mMasterQueue;
WordsPriorityQueue *mSubQueue1;