--- a/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/ut_cntsqlsearch.h	Fri Sep 17 08:34:34 2010 +0300
+++ b/plugins/contacts/symbian/contactsmodel/tsrc/cntplsql_qt/ut_cntsqlsearch.h	Mon Oct 04 01:37:06 2010 +0300
@@ -1,43 +1,18 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Retrieves the character map for each of the numeric keys.
+*/
 
 #ifndef UT_CNTSQLSEARCH_H
 #define UT_CNTSQLSEARCH_H
@@ -45,6 +20,8 @@
 #include <QObject>
 
 class CntSqlSearch;
+class C12keyKeyMap;
+class CQwertyKeyMap;
 
 class UT_CntSqlSearch : public QObject                 
 {
@@ -69,6 +46,7 @@
 
 private slots: //test methods
 
+    void testCompareTwoColumnsWithModifiedPattern();
     void testPredictiveSearch();
     void testSelectQweryTable();
     void testSelectTableView();
@@ -78,7 +56,7 @@
     void testExactMatchSearchQwerty();
     void testIntersectionSearch();
     void testSearchTokensFromOneTable();
-    void testCompareTwoColumnsWithModifiedPattern();   
+    //void testCompareTwoColumnsWithModifiedPattern();   
     void testModifiedMatchColumns();
     void testExactMatch();
     void testExactMatchQwerty();
@@ -95,7 +73,9 @@
     
 private:
  
-    CntSqlSearch* mCntSqlSearch;  
+    C12keyKeyMap* m12KeyKeyMap;
+    CQwertyKeyMap* mQwertyKeyMap;
+    CntSqlSearch* mCntSqlSearch; 
 };
 
 #endif // UT_CNTSQLSEARCH_H