# HG changeset patch # User hgs # Date 1277830717 -19800 # Node ID d05738f029363259ff8331300ed3df0fa7b7cea0 # Parent 4a2987baf8f76857cd09d46efb057ae707510b1c 201025_03 diff -r 4a2987baf8f7 -r d05738f02936 searchui/searchapplication/inc/search.h --- a/searchui/searchapplication/inc/search.h Mon Jun 28 11:03:15 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2009 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: search application main class. - * - */ - -#ifndef SEARCHAPPLICATION_H -#define SEARCHAPPLICATION_H - -#include "search_global.h" - -#include - -class QStateMachine; - -/** - * @ingroup group_searchsearchlication - * @brief Search application main class. - * - * Loads a runtime from a runtime provider plugin. Manages - * the runtime execution. - * - * @lib ?library - * @since S60 ?S60_version - */ -class Search : public QObject - { -Q_OBJECT - -public: - - /** - * Constructor. - * @since S60 ?S60_version. - * @param aParent Parent object. - */ - Search(QObject* aParent = 0); - - /** - * Destructor. - * @since S60 ?S60_version. - */ - virtual ~Search(); - -private: - - Q_DISABLE_COPY(Search) - -signals: - - /** - * Emitted when the search application needs to exit. - * @since S60 ?S60_version. - */ - void exit(); - -public slots: - - /** - * Starts the runtime. - * @since S60 ?S60_version. - */ - void start(); - - /** - * Stops the runtime. - * @since S60 ?S60_version. - */ - void stop(); - -private slots: - - /** - * Called after the runtime has started. - * @since S60 ?S60_version. - */ - void handleRuntimeStarted(); - - /** - * Called after the runtime has stopped. - * @since S60 ?S60_version. - */ - void handleRuntimeStopped(); - - /** - * Called after the runtime has faulted. - * @since S60 ?S60_version. - */ - void handleRuntimeFaulted(); - -private: - - /** - * Runtime. - */ - QStateMachine* mRuntime; - }; - -#endif//SEARCHAPPLICATION_H diff -r 4a2987baf8f7 -r d05738f02936 searchui/searchapplication/inc/searchapplication.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/searchui/searchapplication/inc/searchapplication.h Tue Jun 29 22:28:37 2010 +0530 @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2009 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: search application main class. + * + */ + +#ifndef SEARCHAPPLICATION_H +#define SEARCHAPPLICATION_H + +#include "search_global.h" + +#include + +class QStateMachine; + +/** + * @ingroup group_searchsearchlication + * @brief Search application main class. + * + * Loads a runtime from a runtime provider plugin. Manages + * the runtime execution. + * + * @lib ?library + * @since S60 ?S60_version + */ +class SearchApplication : public QObject + { +Q_OBJECT + +public: + + /** + * Constructor. + * @since S60 ?S60_version. + * @param aParent Parent object. + */ + SearchApplication(QObject* aParent = 0); + + /** + * Destructor. + * @since S60 ?S60_version. + */ + virtual ~SearchApplication(); + +private: + + Q_DISABLE_COPY(SearchApplication) + +signals: + + /** + * Emitted when the search application needs to exit. + * @since S60 ?S60_version. + */ + void exit(); + +public slots: + + /** + * Starts the runtime. + * @since S60 ?S60_version. + */ + void start(); + + /** + * Stops the runtime. + * @since S60 ?S60_version. + */ + void stop(); + +private slots: + + /** + * Called after the runtime has started. + * @since S60 ?S60_version. + */ + void handleRuntimeStarted(); + + /** + * Called after the runtime has stopped. + * @since S60 ?S60_version. + */ + void handleRuntimeStopped(); + + /** + * Called after the runtime has faulted. + * @since S60 ?S60_version. + */ + void handleRuntimeFaulted(); + +private: + + /** + * Runtime. + */ + QStateMachine* mRuntime; + }; + +#endif//SEARCHAPPLICATION_H diff -r 4a2987baf8f7 -r d05738f02936 searchui/searchapplication/src/main.cpp --- a/searchui/searchapplication/src/main.cpp Mon Jun 28 11:03:15 2010 +0530 +++ b/searchui/searchapplication/src/main.cpp Tue Jun 29 22:28:37 2010 +0530 @@ -15,7 +15,7 @@ * */ -#include "search.h" +#include "searchapplication.h" #include "search_global.h" #include @@ -59,7 +59,7 @@ notesTranslator.load("notes_" + lang, path); app.installTranslator(¬esTranslator); PERF_APP_LAUNCH_END("Search Component Cunstructions starts"); - Search search; + SearchApplication search; PERF_APP_LAUNCH_END("Search Component Cunstructions Ends"); #ifdef ROM QDir::setCurrent("Z:/"); diff -r 4a2987baf8f7 -r d05738f02936 searchui/searchapplication/src/search.cpp --- a/searchui/searchapplication/src/search.cpp Mon Jun 28 11:03:15 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,122 +0,0 @@ -/* - * Copyright (c) 2009 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: Search application main class. - * - */ - -#include "search.h" -#include -#include -#include - -// --------------------------------------------------------------------------- -// Search::Search -// --------------------------------------------------------------------------- -// -Search::Search(QObject* aParent) : - QObject(aParent), mRuntime(NULL) - { - SEARCH_FUNC_ENTRY("SEARCH::Search::Search"); - - SearchRuntimeProvider *interface = new SearchRuntimeProvider(); - mRuntime = interface->createPlugin(); - if (mRuntime) - { - mRuntime->setParent(this); - connect(mRuntime, SIGNAL(started()),this, SLOT(handleRuntimeStarted())); - connect(mRuntime, SIGNAL(stopped()),this, SLOT(handleRuntimeStopped())); - connect(mRuntime, SIGNAL(faulted()),this, SLOT(handleRuntimeFaulted())); - } - SEARCH_FUNC_EXIT("SEARCH::Search::Search"); - } - -// --------------------------------------------------------------------------- -// Search::~Search() -// --------------------------------------------------------------------------- -// -Search::~Search() - { - if (mRuntime) - { - disconnect(mRuntime, SIGNAL(started()), this, - SLOT(handleRuntimeStarted())); - disconnect(mRuntime, SIGNAL(stopped()), this, - SLOT(handleRuntimeStopped())); - disconnect(mRuntime, SIGNAL(faulted()), this, - SLOT(handleRuntimeFaulted())); - - delete mRuntime; - } - } - -// --------------------------------------------------------------------------- -// Search::start() -// --------------------------------------------------------------------------- -// -void Search::start() - { - SEARCH_FUNC_ENTRY("SEARCH::Search::start"); - - if (mRuntime) - { - mRuntime->start(); - } - else - { - emit exit(); - } - - SEARCH_FUNC_EXIT("SEARCH::Search::start"); - } - -// --------------------------------------------------------------------------- -// Search::stop() -// --------------------------------------------------------------------------- -// -void Search::stop() - { - SEARCH_FUNC_ENTRY("SEARCH::Search::stop"); - if (mRuntime) - { - mRuntime->stop(); - } - - SEARCH_FUNC_EXIT("SEARCH::Search::stop"); - } - -// --------------------------------------------------------------------------- -// Search::handleRuntimeStarted() -// --------------------------------------------------------------------------- -// -void Search::handleRuntimeStarted() - { - } - -// --------------------------------------------------------------------------- -// Search::handleRuntimeStopped() -// --------------------------------------------------------------------------- -// -void Search::handleRuntimeStopped() - { - emit exit(); - } - -// --------------------------------------------------------------------------- -// Search::handleRuntimeFaulted() -// --------------------------------------------------------------------------- -// -void Search::handleRuntimeFaulted() - { - emit exit(); - } diff -r 4a2987baf8f7 -r d05738f02936 searchui/searchapplication/src/searchapplication.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/searchui/searchapplication/src/searchapplication.cpp Tue Jun 29 22:28:37 2010 +0530 @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2009 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: Search application main class. + * + */ + +#include "searchapplication.h" +#include +#include +#include + +// --------------------------------------------------------------------------- +// SearchApplication::SearchApplication +// --------------------------------------------------------------------------- +// +SearchApplication::SearchApplication(QObject* aParent) : + QObject(aParent), mRuntime(NULL) + { + SEARCH_FUNC_ENTRY("SEARCH::SearchApplication::SearchApplication"); + + SearchRuntimeProvider *interface = new SearchRuntimeProvider(); + mRuntime = interface->createPlugin(); + if (mRuntime) + { + mRuntime->setParent(this); + connect(mRuntime, SIGNAL(started()),this, SLOT(handleRuntimeStarted())); + connect(mRuntime, SIGNAL(stopped()),this, SLOT(handleRuntimeStopped())); + connect(mRuntime, SIGNAL(faulted()),this, SLOT(handleRuntimeFaulted())); + } + SEARCH_FUNC_EXIT("SEARCH::SearchApplication::SearchApplication"); + } + +// --------------------------------------------------------------------------- +// SearchApplication::~SearchApplication() +// --------------------------------------------------------------------------- +// +SearchApplication::~SearchApplication() + { + if (mRuntime) + { + disconnect(mRuntime, SIGNAL(started()), this, + SLOT(handleRuntimeStarted())); + disconnect(mRuntime, SIGNAL(stopped()), this, + SLOT(handleRuntimeStopped())); + disconnect(mRuntime, SIGNAL(faulted()), this, + SLOT(handleRuntimeFaulted())); + + delete mRuntime; + } + } + +// --------------------------------------------------------------------------- +// SearchApplication::start() +// --------------------------------------------------------------------------- +// +void SearchApplication::start() + { + SEARCH_FUNC_ENTRY("SEARCH::Search::start"); + + if (mRuntime) + { + mRuntime->start(); + } + else + { + emit exit(); + } + + SEARCH_FUNC_EXIT("SEARCH::Search::start"); + } + +// --------------------------------------------------------------------------- +// SearchApplication::stop() +// --------------------------------------------------------------------------- +// +void SearchApplication::stop() + { + SEARCH_FUNC_ENTRY("SEARCH::Search::stop"); + if (mRuntime) + { + mRuntime->stop(); + } + + SEARCH_FUNC_EXIT("SEARCH::Search::stop"); + } + +// --------------------------------------------------------------------------- +// SearchApplication::handleRuntimeStarted() +// --------------------------------------------------------------------------- +// +void SearchApplication::handleRuntimeStarted() + { + } + +// --------------------------------------------------------------------------- +// SearchApplication::handleRuntimeStopped() +// --------------------------------------------------------------------------- +// +void SearchApplication::handleRuntimeStopped() + { + emit exit(); + } + +// --------------------------------------------------------------------------- +// SearchApplication::handleRuntimeFaulted() +// --------------------------------------------------------------------------- +// +void SearchApplication::handleRuntimeFaulted() + { + emit exit(); + }