diff -r 84197e66a4bd -r 35b64624a9e7 messagingapp/smartmessaging/ringbc/src/ringbc_p.cpp --- a/messagingapp/smartmessaging/ringbc/src/ringbc_p.cpp Fri Jun 11 13:35:48 2010 +0300 +++ b/messagingapp/smartmessaging/ringbc/src/ringbc_p.cpp Wed Jun 23 18:09:17 2010 +0300 @@ -25,7 +25,7 @@ // USER INCLUDES #include "ringbc_p.h" #include "ringbctoneconverter.h" -#include "s60qconversions.h" +#include #include "debugtraces.h" //CONSTANTS @@ -129,7 +129,7 @@ CleanupClosePushL(fsSession); - HBufC* fileName = S60QConversions::qStringToS60Desc(path); + HBufC* fileName = XQConversions::qStringToS60Desc(path); RFile file; User::LeaveIfError(file.Open(fsSession, fileName->Des(), @@ -151,7 +151,7 @@ TFileName path = PathInfo::PhoneMemoryRootPath(); path.Append(PathInfo::SimpleSoundsPath()); path.Append(*title); - HBufC* fileExtension = S60QConversions::qStringToS60Desc(extension); + HBufC* fileExtension = XQConversions::qStringToS60Desc(extension); path.Append(fileExtension->Des()); CFileMan* fileMan = CFileMan::NewL(fsSession); @@ -183,7 +183,7 @@ QStringList pathList = path.split("."); QString extension = pathList.at(pathList.count() - 1); - HBufC* fileName = S60QConversions::qStringToS60Desc(path); + HBufC* fileName = XQConversions::qStringToS60Desc(path); TRAP_IGNORE( title = titleL(*fileName)); title.append(QChar('.')); @@ -226,7 +226,7 @@ if (valid) { HBufC* toneTitle = mConverter->TitleLC(data); - title = S60QConversions::s60DescToQString(*toneTitle); + title = XQConversions::s60DescToQString(*toneTitle); CleanupStack::PopAndDestroy(); //title } CleanupStack::PopAndDestroy(); //dataBuf