Fixed a few bugs introduced introduced by the change to the QVariant v2 API.

Wed, 30 Dec 2009 16:43:09 +0000

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 30 Dec 2009 16:43:09 +0000
changeset 8
0ae9bd4d2993
parent 7
c679fb30c8f3
child 9
911a9f7aef1e

Fixed a few bugs introduced introduced by the change to the QVariant v2 API.

Debugger/DebugViewer.py file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Helpviewer/HelpLanguagesDialog.py file | annotate | diff | comparison | revisions
Helpviewer/HelpWindow.py file | annotate | diff | comparison | revisions
Helpviewer/Network/NetworkAccessManager.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py file | annotate | diff | comparison | revisions
Plugins/ViewManagerPlugins/Tabview/Tabview.py file | annotate | diff | comparison | revisions
Tools/TRPreviewer.py file | annotate | diff | comparison | revisions
--- a/Debugger/DebugViewer.py	Wed Dec 30 15:40:33 2009 +0000
+++ b/Debugger/DebugViewer.py	Wed Dec 30 16:43:09 2009 +0000
@@ -432,6 +432,5 @@
         @param previous reference to the previous current item (QTreeWidgetItem)
         """
         if current is not None and self.__doThreadListUpdate:
-            tid, ok = int(current.text(0))
-            if ok:
-                self.debugServer.remoteSetThread(tid)
+            tid = int(current.text(0))
+            self.debugServer.remoteSetThread(tid)
Binary file Documentation/Help/source.qch has changed
--- a/Helpviewer/HelpLanguagesDialog.py	Wed Dec 30 15:40:33 2009 +0000
+++ b/Helpviewer/HelpLanguagesDialog.py	Wed Dec 30 16:43:09 2009 +0000
@@ -33,7 +33,7 @@
             SIGNAL("currentChanged(const QModelIndex&, const QModelIndex&)"), 
             self.__currentChanged)
         
-        languages = Preferences.Prefs.settings.value(Preferences.toList(
+        languages = Preferences.toList(Preferences.Prefs.settings.value(
             "Help/AcceptLanguages", self.defaultAcceptLanguages()))
         self.__model.setStringList(languages)
         
--- a/Helpviewer/HelpWindow.py	Wed Dec 30 15:40:33 2009 +0000
+++ b/Helpviewer/HelpWindow.py	Wed Dec 30 16:43:09 2009 +0000
@@ -234,6 +234,7 @@
             self.__class__.helpwindows.append(self)
             
             QDesktopServices.setUrlHandler("http", self.__linkActivated)
+            QDesktopServices.setUrlHandler("https", self.__linkActivated)
             
             # setup connections
             # TOC window
--- a/Helpviewer/Network/NetworkAccessManager.py	Wed Dec 30 15:40:33 2009 +0000
+++ b/Helpviewer/Network/NetworkAccessManager.py	Wed Dec 30 16:43:09 2009 +0000
@@ -336,9 +336,9 @@
         """
         Public slot to (re-)load the list of accepted languages.
         """
-        languages = Preferences.Prefs.settings.value(Preferences.toList(
-            "Help/AcceptLanguages", 
-            HelpLanguagesDialog.defaultAcceptLanguages()))
+        languages = Preferences.toList(
+            Preferences.Prefs.settings.value("Help/AcceptLanguages", 
+                HelpLanguagesDialog.defaultAcceptLanguages()))
         self.__acceptLanguage = HelpLanguagesDialog.httpString(languages)
     
     def __setDiskCache(self):
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Wed Dec 30 15:40:33 2009 +0000
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Wed Dec 30 16:43:09 2009 +0000
@@ -61,8 +61,8 @@
             if msg in self.recentCommitMessages:
                 self.recentCommitMessages.remove(msg)
             self.recentCommitMessages.insert(0, msg)
-            no = Preferences.Prefs.settings\
-                .value('Subversion/CommitMessages', 20)
+            no = int(Preferences.Prefs.settings\
+                .value('Subversion/CommitMessages', 20))
             del self.recentCommitMessages[no:]
             Preferences.Prefs.settings.setValue('Subversion/Commits', 
                 self.recentCommitMessages)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Wed Dec 30 15:40:33 2009 +0000
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Wed Dec 30 16:43:09 2009 +0000
@@ -57,8 +57,8 @@
             if msg in self.recentCommitMessages:
                 self.recentCommitMessages.remove(msg)
             self.recentCommitMessages.insert(0, msg)
-            no = Preferences.Prefs.settings\
-                .value('Subversion/CommitMessages', 20)
+            no = int(Preferences.Prefs.settings\
+                .value('Subversion/CommitMessages', 20))
             del self.recentCommitMessages[no:]
             Preferences.Prefs.settings.setValue('Subversion/Commits', 
                 self.recentCommitMessages)
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Wed Dec 30 15:40:33 2009 +0000
+++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Wed Dec 30 16:43:09 2009 +0000
@@ -292,8 +292,8 @@
         
         @param act reference to the selected action (QAction)
         """
-        index, ok = act.data()
-        if ok:
+        index = act.data()
+        if index is not None:
             self.setCurrentIndex(index)
         
     def showIndicator(self, on):
--- a/Tools/TRPreviewer.py	Wed Dec 30 15:40:33 2009 +0000
+++ b/Tools/TRPreviewer.py	Wed Dec 30 16:43:09 2009 +0000
@@ -837,9 +837,8 @@
         
         @param act reference to the action that triggered (QAction)
         """
-        idx, ok = act.data()
-        if ok:
-            self.__toggleWidget(self.widgets[idx])
+        idx = act.data()
+        self.__toggleWidget(self.widgets[idx])
     
     def __toggleWidget(self, w):
         """

eric ide

mercurial