Changeset 651 for trunk/src/gui/inputmethod

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/inputmethod/qcoefepinputcontext_p.h (modified) (5 diffs)
• src/gui/inputmethod/qcoefepinputcontext_s60.cpp (modified) (10 diffs)
• src/gui/inputmethod/qinputcontext.cpp (modified) (1 diff)
• src/gui/inputmethod/qinputcontext.h (modified) (1 diff)
• src/gui/inputmethod/qinputcontext_p.h (modified) (1 diff)
• src/gui/inputmethod/qinputcontextfactory.cpp (modified) (1 diff)
• src/gui/inputmethod/qinputcontextfactory.h (modified) (1 diff)
• src/gui/inputmethod/qinputcontextplugin.cpp (modified) (1 diff)
• src/gui/inputmethod/qinputcontextplugin.h (modified) (1 diff)
• src/gui/inputmethod/qmacinputcontext_mac.cpp (modified) (1 diff)
• src/gui/inputmethod/qmacinputcontext_p.h (modified) (1 diff)
• src/gui/inputmethod/qwininputcontext_p.h (modified) (1 diff)
• src/gui/inputmethod/qwininputcontext_win.cpp (modified) (1 diff)
• src/gui/inputmethod/qwsinputcontext_p.h (modified) (1 diff)
• src/gui/inputmethod/qwsinputcontext_qws.cpp (modified) (1 diff)
• src/gui/inputmethod/qximinputcontext_p.h (modified) (1 diff)
• src/gui/inputmethod/qximinputcontext_x11.cpp (modified) (1 diff)

trunk/src/gui/inputmethod/qcoefepinputcontext_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -58 +58 @@
 #include "qinputcontext.h"
 #include <qhash.h>
+
 #include <private/qcore_symbian_p.h>
 #include <private/qt_s60_p.h>
@@ -92 +93 @@
     TCoeInputCapabilities inputCapabilities();
 
+
+
+
 private:
     void commitCurrentString(bool triggeredBySymbian);
@@ -99 +103 @@
     void queueInputCapabilitiesChanged();
     bool needsInputPanel();
+
 
 private Q_SLOTS:
@@ -149 +154 @@
     int m_longPress;
     int m_cursorPos;
+
+
 };
 

trunk/src/gui/inputmethod/qcoefepinputcontext_s60.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -73 +73 @@
       m_pointerHandler(0),
       m_longPress(0),
-      m_cursorPos(0)
+      m_cursorPos(0),
+      m_hasTempPreeditString(false)
 {
     m_fepState->SetObjectProvider(this);
@@ -101 +102 @@
 void QCoeFepInputContext::reset()
 {
-    CCoeFep* fep = CCoeEnv::Static()->Fep();
-    if (fep)
-        fep->CancelTransaction();
+    commitCurrentString(false);
 }
 
@@ -201 +200 @@
         return false;
 
-    if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
+    switch (event->type()) {
+    case QEvent::KeyPress:
+        commitTemporaryPreeditString();
+        // fall through intended
+    case QEvent::KeyRelease:
         const QKeyEvent *keyEvent = static_cast<const QKeyEvent *>(event);
         switch (keyEvent->key()) {
@@ -224 +227 @@
             break;
         }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -252 +270 @@
 
     return false;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -310 +345 @@
 {
     using namespace Qt;
+
+
 
     bool numbersOnly = hints & ImhDigitsOnly || hints & ImhFormattedNumbersOnly
@@ -502 +539 @@
         return;
 
+
+
     m_cursorPos = w->inputMethodQuery(Qt::ImCursorPosition).toInt();
     
@@ -600 +639 @@
     if (!w)
         return;
+
+
 
     int pos = aCursorSelection.iAnchorPos;
@@ -720 +761 @@
     sendEvent(event);
 
+
     m_longPress = 0;
 

trunk/src/gui/inputmethod/qinputcontext.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/inputmethod/qinputcontext.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/inputmethod/qinputcontext_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/inputmethod/qinputcontextfactory.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/inputmethod/qinputcontextfactory.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/inputmethod/qinputcontextplugin.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/inputmethod/qinputcontextplugin.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/inputmethod/qmacinputcontext_mac.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/inputmethod/qmacinputcontext_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/inputmethod/qwininputcontext_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/inputmethod/qwininputcontext_win.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/inputmethod/qwsinputcontext_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/inputmethod/qwsinputcontext_qws.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/inputmethod/qximinputcontext_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/inputmethod/qximinputcontext_x11.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])