Use mlite and mlocale instead of libmeegotouch

mlite as of 0.0.7 supports MNotificationGroup and the rest of the notification API, so we can drop the libmeegotouch dependency.
sailfishos · Oct 25, 2012 · a7ff47e · a7ff47e
1 parent bff9f2b
commit a7ff47e
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 14 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -132,13 +132,13 @@ int main(int argc, char **argv)
     QObject::connect(snTerm, SIGNAL(activated(int)), &app, SLOT(quit()));
     setupSigtermHandler();
 
-    MLocale locale;
+    ML10N::MLocale locale;
     locale.installTrCatalog("messaging");
     locale.installTrCatalog("telephony");
     locale.installTrCatalog("mms");
     locale.installTrCatalog("presence");
     locale.installTrCatalog("recipientedit");
-    MLocale::setDefault(locale);
+    ML10N::MLocale::setDefault(locale);
 
     qDebug() << "Translation catalogs loaded";
 

diff --git a/src/notificationmanager.cpp b/src/notificationmanager.cpp
@@ -836,7 +836,7 @@ void NotificationManager::updateNotificationGroup(const NotificationGroup &group
         // get group action
         QString groupAction = action(group, notification, grouped);
 
-        MLocale tempLocale;
+        ML10N::MLocale tempLocale;
         // update group
         if (group.type() != CommHistory::Event::VoicemailEvent && group.type() != VOICEMAIL_SMS_EVENT_TYPE)
             name = tempLocale.joinStringList( contactNames(group) );
@@ -1162,7 +1162,7 @@ QString NotificationManager::contactName(const QString &localUid,
             if (normalizePhoneNumber(remoteUid).isEmpty()) {
                 result = remoteUid;
             } else {
-                MLocale locale;
+                ML10N::MLocale locale;
                 result = locale.toLocalizedNumbers(remoteUid);
             }
         }

diff --git a/src/src.pro b/src/src.pro
@@ -37,15 +37,16 @@ MOBILITY += contacts \
 CONFIG += debug \
           qdbus \
           link_pkgconfig \
-          mobility
+          mobility \
+          mlocale
 
 QT += sql \
       gui
 
 PKGCONFIG += TelepathyQt4 \
              commhistory \
              contextsubscriber-1.0 \
-             meegotouch \
+             mlite \
              qmsystem2
 
 # -----------------------------------------------------------------------------

diff --git a/src/textchannellistener.cpp b/src/textchannellistener.cpp
@@ -1317,7 +1317,7 @@ void TextChannelListener::handleMessageFailed(const Tp::ReceivedMessage &message
                 recipient = event.remoteUid();
             } else {
                 // phone number
-                MLocale locale;
+                ML10N::MLocale locale;
                 recipient = locale.toLocalizedNumbers(event.remoteUid());
                 recipient.insert(0, QChar(0x202A)); // left-to-right embedding
                 recipient.append(QChar(0x202C)); // pop directional formatting

diff --git a/tests/tests.pri b/tests/tests.pri
@@ -30,7 +30,7 @@ MOBILITY += contacts versit
 CONFIG += mobility
 COMMHISTORYDSRCDIR = ../../src
 DEPENDPATH  += $${INCLUDEPATH}
-PKGCONFIG += meegotouch commhistory
+PKGCONFIG += mlite commhistory
 
 !include( ../common-installs-config.pri ) : \
     error( "Unable to include common-installs-config.pri!" )

diff --git a/tests/ut_messagereviver/ut_messagereviver.pro b/tests/ut_messagereviver/ut_messagereviver.pro
@@ -45,7 +45,7 @@ CONFIG += link_pkgconfig \
           mobility
 LIBS += -lQtContacts -lQtVersit
 PKGCONFIG += contextsubscriber-1.0 \
-             meegotouch
+             mlite
 
 TEST_SOURCES += $$COMMHISTORYDSRCDIR/messagereviver.cpp \
                 connectionutils.cpp

diff --git a/tests/ut_notificationmanager/ut_notificationmanager.pro b/tests/ut_notificationmanager/ut_notificationmanager.pro
@@ -37,9 +37,10 @@
 #-----------------------------------------------------------------------------
 TARGET = ut_notificationmanager
 CONFIG += link_pkgconfig \
-          mobility
+          mobility \
+          mlocale
 PKGCONFIG += contextsubscriber-1.0 \
-             meegotouch \
+             mlite \
              TelepathyQt4 \
              qmsystem2
 

diff --git a/tests/ut_streamchannellistener/ut_streamchannellistener.pro b/tests/ut_streamchannellistener/ut_streamchannellistener.pro
@@ -45,7 +45,7 @@ CONFIG += link_pkgconfig \
           mobility
 LIBS += -lQtContacts -lQtVersit
 PKGCONFIG += contextsubscriber-1.0 \
-             meegotouch
+             mlite
 
 TEST_SOURCES += $$COMMHISTORYDSRCDIR/streamchannellistener.cpp \
                 $$COMMHISTORYDSRCDIR/channellistener.cpp

diff --git a/tests/ut_textchannellistener/ut_textchannellistener.pro b/tests/ut_textchannellistener/ut_textchannellistener.pro
@@ -42,10 +42,11 @@ INCLUDEPATH = ../stubs/ \
 
 TARGET = ut_textchannellistener
 CONFIG += link_pkgconfig \
-          mobility
+          mobility \
+          mlocale
 LIBS += -lQtContacts -lQtVersit
 PKGCONFIG += contextsubscriber-1.0 \
-             meegotouch
+             mlite
 
 TEST_SOURCES += $$COMMHISTORYDSRCDIR/textchannellistener.cpp \
                 $$COMMHISTORYDSRCDIR/channellistener.cpp