From: Ed Page <eopage@byu.net>
Date: Thu, 24 Mar 2011 23:22:53 +0000 (-0500)
Subject: Adding support for PySide's handling of QString
X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=commitdiff_plain;h=aa3c7b486d195c53a20114a66eaf81ae1cf3e8e9;hp=15b71884d9c5f1aca07719462ed0030b2d62684f

Adding support for PySide's handling of QString
---

diff --git a/src/dialogs.py b/src/dialogs.py
index f9f8226..77aa100 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -913,7 +913,7 @@ class SMSEntryWindow(qwrappers.WindowWrapper):
 		self._scroll_to_bottom()
 
 	def _update_letter_count(self):
-		count = self._smsEntry.toPlainText().size()
+		count = len(self._smsEntry.toPlainText())
 		numTexts, numCharInText = divmod(count, self.MAX_CHAR)
 		numTexts += 1
 		numCharsLeftInText = self.MAX_CHAR - numCharInText
@@ -925,7 +925,7 @@ class SMSEntryWindow(qwrappers.WindowWrapper):
 			self._dialButton.setEnabled(False)
 			self._smsButton.setEnabled(False)
 		elif self._session.draft.get_num_contacts() == 1:
-			count = self._smsEntry.toPlainText().size()
+			count = len(self._smsEntry.toPlainText())
 			if count == 0:
 				self._dialButton.setEnabled(True)
 				self._smsButton.setEnabled(False)
@@ -934,7 +934,7 @@ class SMSEntryWindow(qwrappers.WindowWrapper):
 				self._smsButton.setEnabled(True)
 		else:
 			self._dialButton.setEnabled(False)
-			count = self._smsEntry.toPlainText().size()
+			count = len(self._smsEntry.toPlainText())
 			if count == 0:
 				self._smsButton.setEnabled(False)
 			else:
diff --git a/src/gv_views.py b/src/gv_views.py
index ab3fad4..1698907 100644
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -439,7 +439,7 @@ class History(object):
 			contactDetails = detailsItem.data().toPyObject()
 
 			title = unicode(fromItem.text())
-			number = str(contactDetails[QtCore.QString("number")])
+			number = str(contactDetails["number"])
 			contactId = number # ids don't seem too unique so using numbers
 
 			descriptionRows = []
@@ -448,17 +448,17 @@ class History(object):
 				for i in xrange(randomTimeItem.rowCount()):
 					iItem = randomTimeItem.child(i, 0)
 					iContactDetails = iItem.data().toPyObject()
-					iNumber = str(iContactDetails[QtCore.QString("number")])
+					iNumber = str(iContactDetails["number"])
 					if number != iNumber:
 						continue
-					relTime = misc_utils.abbrev_relative_date(iContactDetails[QtCore.QString("relTime")])
-					action = str(iContactDetails[QtCore.QString("action")])
-					number = str(iContactDetails[QtCore.QString("number")])
+					relTime = misc_utils.abbrev_relative_date(iContactDetails["relTime"])
+					action = str(iContactDetails["action"])
+					number = str(iContactDetails["number"])
 					prettyNumber = misc_utils.make_pretty(number)
 					rowItems = relTime, action, prettyNumber
 					descriptionRows.append("<tr><td>%s</td></tr>" % "</td><td>".join(rowItems))
 			description = "<table>%s</table>" % "".join(descriptionRows)
-			numbersWithDescriptions = [(str(contactDetails[QtCore.QString("number")]), "")]
+			numbersWithDescriptions = [(str(contactDetails["number"]), "")]
 			self._session.draft.add_contact(contactId, None, title, description, numbersWithDescriptions)
 
 
@@ -697,20 +697,20 @@ class Messages(object):
 			item = self._categoryManager.get_item(timeRow, row, 0)
 			contactDetails = item.data().toPyObject()
 
-			name = unicode(contactDetails[QtCore.QString("name")])
-			number = str(contactDetails[QtCore.QString("number")])
+			name = unicode(contactDetails["name"])
+			number = str(contactDetails["number"])
 			if not name or name == number:
-				name = unicode(contactDetails[QtCore.QString("location")])
+				name = unicode(contactDetails["location"])
 			if not name:
 				name = "Unknown"
 
-			if str(contactDetails[QtCore.QString("type")]) == "Voicemail":
-				messageId = str(contactDetails[QtCore.QString("id")])
+			if str(contactDetails["type"]) == "Voicemail":
+				messageId = str(contactDetails["id"])
 			else:
 				messageId = None
-			contactId = str(contactDetails[QtCore.QString("contactId")])
+			contactId = str(contactDetails["contactId"])
 			title = name
-			description = unicode(contactDetails[QtCore.QString("expandedMessages")])
+			description = unicode(contactDetails["expandedMessages"])
 			numbersWithDescriptions = [(number, "")]
 			self._session.draft.add_contact(contactId, messageId, title, description, numbersWithDescriptions)
 
@@ -930,14 +930,14 @@ class Contacts(object):
 			item = letterItem.child(rowIndex, 0)
 			contactDetails = item.data().toPyObject()
 
-			name = unicode(contactDetails[QtCore.QString("name")])
+			name = unicode(contactDetails["name"])
 			if not name:
-				name = unicode(contactDetails[QtCore.QString("location")])
+				name = unicode(contactDetails["location"])
 			if not name:
 				name = "Unknown"
 
-			contactId = str(contactDetails[QtCore.QString("contactId")])
-			numbers = contactDetails[QtCore.QString("numbers")]
+			contactId = str(contactDetails["contactId"])
+			numbers = contactDetails["numbers"]
 			numbers = [
 				dict(
 					(str(k), str(v))
diff --git a/src/util/qt_compat.py b/src/util/qt_compat.py
index 066e339..1a7e8c2 100644
--- a/src/util/qt_compat.py
+++ b/src/util/qt_compat.py
@@ -8,6 +8,8 @@ try:
 	QtCore = _QtCore
 	USES_PYSIDE = True
 except ImportError:
+	import sip
+	sip.setapi('QString', 2)
 	import PyQt4.QtCore as _QtCore
 	QtCore = _QtCore
 	USES_PYSIDE = False
@@ -37,6 +39,7 @@ else:
 	Property = QtCore.pyqtProperty
 
 
+
 if __name__ == "__main__":
 	pass