--- a/messagingapp/conf/messaging_conf.pro Tue Sep 07 13:28:39 2010 +0530
+++ b/messagingapp/conf/messaging_conf.pro Tue Sep 14 12:19:12 2010 +0530
@@ -23,8 +23,7 @@
symbian{
BLD_INF_RULES.prj_exports += \
"$${LITERAL_HASH}include <platform_paths.hrh>" \
- "messaging.confml APP_LAYER_CONFML(messaging.confml)" \
- "CI_messaging.confml APP_LAYER_CONFML(CI_messaging.confml)" \
+ "messaging.confml APP_LAYER_CONFML(messaging.confml)" \
"messaging_101F87EB.crml APP_LAYER_CRML(messaging_101F87EB.crml)" \
"messaging_101F87EC.crml APP_LAYER_CRML(messaging_101F87EC.crml)" \
"messaging_101F87ED.crml APP_LAYER_CRML(messaging_101F87ED.crml)" \
--- a/messagingapp/msgui/unifiedviewer/inc/unifiedviewer.h Tue Sep 07 13:28:39 2010 +0530
+++ b/messagingapp/msgui/unifiedviewer/inc/unifiedviewer.h Tue Sep 14 12:19:12 2010 +0530
@@ -18,15 +18,17 @@
#ifndef UNIFIED_VIEWER_H
#define UNIFIED_VIEWER_H
-#ifdef BUILD_UNI_VIEWER_DLL
-#define UNI_VIEWER_DLL Q_DECL_EXPORT
+#ifdef MSGUI_UNIT_TEST
+ #define UNI_VIEWER_DLL
#else
-#define UNI_VIEWER_DLL Q_DECL_IMPORT
+ #ifdef BUILD_UNI_VIEWER_DLL
+ #define UNI_VIEWER_DLL Q_DECL_EXPORT
+ #else
+ #define UNI_VIEWER_DLL Q_DECL_IMPORT
+ #endif
#endif
-#include <sqldb.h>
#include "msgbaseview.h"
-
#include "convergedmessage.h"
class UniViewerFeeder;
@@ -58,7 +60,7 @@
/**
* Populates the content on the widget
*/
- void populateContent(const qint32 messageId, bool update, int msgCount, qint64 conversationId=-1);
+ void populateContent(const qint32 messageId, bool update, int msgCount, qint64 conversationId = -1);
/**
* Event handler
@@ -158,7 +160,7 @@
* Owned
*/
UniContentsWidget* mContentsWidget;
-
+
/**
* Conversation ID
*/
@@ -173,12 +175,18 @@
* Message id
*/
qint32 mMessageId;
-
+
/**
* Message count
*/
int mMsgCount;
+#ifdef MSGUI_UNIT_TEST
+ /**
+ * Unit Testing
+ */
+ friend class TestUnifiedViewer;
+#endif
};
#endif
--- a/messagingapp/msgui/unifiedviewer/inc/univiewerattachmentwidget.h Tue Sep 07 13:28:39 2010 +0530
+++ b/messagingapp/msgui/unifiedviewer/inc/univiewerattachmentwidget.h Tue Sep 14 12:19:12 2010 +0530
@@ -85,9 +85,6 @@
*/
void handleOpen();
-
-
-
/**
* Slot to regrab gesture after some delay (300 ms) to avoid multiple gesture
* events back to back.
--- a/messagingapp/msgui/unifiedviewer/inc/univieweraudiowidget.h Tue Sep 07 13:28:39 2010 +0530
+++ b/messagingapp/msgui/unifiedviewer/inc/univieweraudiowidget.h Tue Sep 14 12:19:12 2010 +0530
@@ -88,9 +88,6 @@
*/
void handleOpen();
-
-
-
/**
* Slot to regrab gesture after some delay (300 ms) to avoid multiple gesture
* events back to back.
--- a/messagingapp/msgui/unifiedviewer/inc/univiewerpixmapwidget.h Tue Sep 07 13:28:39 2010 +0530
+++ b/messagingapp/msgui/unifiedviewer/inc/univiewerpixmapwidget.h Tue Sep 14 12:19:12 2010 +0530
@@ -87,9 +87,6 @@
*/
void handleOpen();
-
-
-
/**
* Slot to regrab gesture after some delay (300 ms) to avoid multiple gesture
* events back to back.
--- a/messagingapp/msgui/unifiedviewer/src/unifiedviewer.cpp Tue Sep 07 13:28:39 2010 +0530
+++ b/messagingapp/msgui/unifiedviewer/src/unifiedviewer.cpp Tue Sep 14 12:19:12 2010 +0530
@@ -29,6 +29,7 @@
#include <ccsdefs.h>
#include <xqappmgr.h>
#include <xqaiwrequest.h>
+#include <sqldb.h>
// USER INCLUDES
#include "uniscrollarea.h"
@@ -64,14 +65,12 @@
// UnifiedViewer::UnifiedViewer
// constructor
//----------------------------------------------------------------------------
-UnifiedViewer::UnifiedViewer(const qint32 messageId,
- QGraphicsItem *parent) :
+UnifiedViewer::UnifiedViewer(const qint32 messageId, QGraphicsItem *parent) :
MsgBaseView(parent), mConversationID(-1)
{
QDEBUG_WRITE("UnifiedViewer contruction start");
- if (!HbStyleLoader::registerFilePath(":/layouts"))
- {
+ if (!HbStyleLoader::registerFilePath(":/layouts")) {
QDEBUG_WRITE("ERROR: UnifiedViewer -> HbStyleLoader::registerFilePath");
}
@@ -81,13 +80,12 @@
mScrollArea = new UniScrollArea(this);
this->setWidget(mScrollArea);
- mContentsWidget = new UniContentsWidget(mViewFeeder,this);
+ mContentsWidget = new UniContentsWidget(mViewFeeder, this);
- connect(mContentsWidget,SIGNAL(sendMessage(const QString&,const QString&)),
- this, SLOT(sendMessage(const QString&,const QString&)));
+ connect(mContentsWidget, SIGNAL(sendMessage(const QString&,const QString&)), this,
+ SLOT(sendMessage(const QString&,const QString&)));
- connect(mScrollArea, SIGNAL(scrolledToNextSlide()),
- mContentsWidget, SLOT(populateNextSlide()));
+ connect(mScrollArea, SIGNAL(scrolledToNextSlide()), mContentsWidget, SLOT(populateNextSlide()));
mScrollArea->setContentWidget(mContentsWidget);
mScrollArea->setHorizontalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
--- a/messagingapp/msgui/unifiedviewer/src/univiewerattachmentwidget.cpp Tue Sep 07 13:28:39 2010 +0530
+++ b/messagingapp/msgui/unifiedviewer/src/univiewerattachmentwidget.cpp Tue Sep 14 12:19:12 2010 +0530
@@ -180,8 +180,6 @@
QTimer::singleShot(300,this,SLOT(regrabGesture()));
}
-
-
//----------------------------------------------------------------------------
// UniViewerAttachmentWidget::handleShortTap
// @see header file
--- a/messagingapp/msgui/unifiedviewer/src/univieweraudiowidget.cpp Tue Sep 07 13:28:39 2010 +0530
+++ b/messagingapp/msgui/unifiedviewer/src/univieweraudiowidget.cpp Tue Sep 14 12:19:12 2010 +0530
@@ -159,8 +159,6 @@
QTimer::singleShot(300,this,SLOT(regrabGesture()));
}
-
-
//---------------------------------------------------------------
// UniViewerAudioWidget::regrabGesture
// @see header file
--- a/messagingapp/msgui/unifiedviewer/src/univiewerpixmapwidget.cpp Tue Sep 07 13:28:39 2010 +0530
+++ b/messagingapp/msgui/unifiedviewer/src/univiewerpixmapwidget.cpp Tue Sep 14 12:19:12 2010 +0530
@@ -170,8 +170,6 @@
QTimer::singleShot(300,this,SLOT(regrabGesture()));
}
-
-
//---------------------------------------------------------------
// UniViewerPixmapWidget::regrabGesture
// @see header file
--- a/messagingapp/shareui/inc/shareuiprivate.h Tue Sep 07 13:28:39 2010 +0530
+++ b/messagingapp/shareui/inc/shareuiprivate.h Tue Sep 14 12:19:12 2010 +0530
@@ -35,6 +35,7 @@
class HbListViewItem;
class HbTextItem;
class HbIconItem;
+class QTranslator;
#define SERVICE_INTERFACE "com.nokia.symbian.IFileShare"
#define SHARE_OP "send(QVariant)"
@@ -228,6 +229,18 @@
XQApplicationManager mAppManager;
/**
+ * Translator member variable
+ * Owned
+ */
+ QTranslator* mTranslator;
+
+ /**
+ * Translator member variable
+ * Owned
+ */
+ QTranslator* mTranslator_comm;
+
+ /**
* Whether to launch the sending application as embedded or not.
*/
bool mIsEmbedded;
--- a/messagingapp/shareui/src/shareui.cpp Tue Sep 07 13:28:39 2010 +0530
+++ b/messagingapp/shareui/src/shareui.cpp Tue Sep 14 12:19:12 2010 +0530
@@ -20,9 +20,6 @@
#include "shareuiprivate.h"
#include <QDir>
-#include <QTranslator>
-#include <QLocale>
-#include <hbapplication.h>
/**
* Default Constructor.
*
@@ -30,16 +27,6 @@
ShareUi::ShareUi() : d_ptr(NULL)
{
- QString locale = QLocale::system().name();
- QString path = "z:/resource/qt/translations/";
-
- mTranslator = new QTranslator();
- mTranslator_comm = new QTranslator();
-
- bool result = mTranslator->load(path + QString("share_") + locale);
- result = mTranslator_comm->load(path + QString("common_") + locale);
- qApp->installTranslator(mTranslator);
- qApp->installTranslator(mTranslator_comm);
}
@@ -52,10 +39,7 @@
if(d_ptr)
{
delete d_ptr;
- }
- delete mTranslator;
- delete mTranslator_comm;
-
+ }
}
/**
--- a/messagingapp/shareui/src/shareuiprivate.cpp Tue Sep 07 13:28:39 2010 +0530
+++ b/messagingapp/shareui/src/shareuiprivate.cpp Tue Sep 14 12:19:12 2010 +0530
@@ -23,6 +23,9 @@
#include <QStringList>
#include <QGraphicsLinearLayout>
+#include <QTranslator>
+#include <QLocale>
+#include <hbapplication.h>
#include <HbAction>
#include <HbDialog>
#include <HbLabel>
@@ -56,6 +59,18 @@
mContentItemModel = 0;
mContentListView = 0;
mSharePopup = 0;
+
+ QString locale = QLocale::system().name();
+ QString path = "z:/resource/qt/translations/";
+
+ mTranslator = new QTranslator();
+ mTranslator_comm = new QTranslator();
+
+ bool result = mTranslator->load(path + QString("share_") + locale);
+ result = mTranslator_comm->load(path + QString("common_") + locale);
+ qApp->installTranslator(mTranslator);
+ qApp->installTranslator(mTranslator_comm);
+
}
/**
@@ -63,6 +78,8 @@
*/
ShareUiPrivate::~ShareUiPrivate()
{
+ delete mTranslator;
+ delete mTranslator_comm;
}
/**
--- a/mmsengine/mmsengine.pro Tue Sep 07 13:28:39 2010 +0530
+++ b/mmsengine/mmsengine.pro Tue Sep 14 12:19:12 2010 +0530
@@ -46,8 +46,7 @@
#### loc file needed for rsc generation
"./loc/MmsUi.loc APP_LAYER_LOC_EXPORT_PATH(mmsui.loc)" \
#### Export confml and crml files ####
- "./conf/mmsengine.confml APP_LAYER_CONFML(mmsengine.confml)" \
- "./conf/CI_mmsengine.confml APP_LAYER_CONFML(CI_mmsengine.confml)" \
+ "./conf/mmsengine.confml APP_LAYER_CONFML(mmsengine.confml)" \
"./conf/mmsengine_100058DB.crml APP_LAYER_CRML(mmsengine_100058db.crml)" \
"./conf/mmsengine_101FB0D5.crml APP_LAYER_CRML(mmsengine_101fb0d5.crml)" \
"./conf/mmsengine_101FB0D5.crml APP_LAYER_CRML(mmsengine_101fb0d9.crml)"
--- a/msg_plat/shareui_api/inc/shareui.h Tue Sep 07 13:28:39 2010 +0530
+++ b/msg_plat/shareui_api/inc/shareui.h Tue Sep 14 12:19:12 2010 +0530
@@ -34,7 +34,6 @@
// FORWARD DECLARATIONS
class ShareUiPrivate;
-class QTranslator;
/**
* This class offers message creation and sending services.
@@ -70,21 +69,7 @@
* Owned
*/
ShareUiPrivate* d_ptr;
-
- /**
- * Translator member variable
- * Owned
- */
- QTranslator* mTranslator;
-
- /**
- * Translator member variable
- * Owned
- */
- QTranslator* mTranslator_comm;
-
Q_DECLARE_PRIVATE_D(d_ptr,ShareUi)
-
};