Permalink
Browse files

remove deprecated gPixmapPtr.__deref__() calls...

  • Loading branch information...
1 parent 7ea0122 commit 93ecd8e1f658d92b9ddc0064a3dc3b76735328f0 @amonzner amonzner committed Mar 14, 2013
View
@@ -170,7 +170,7 @@ def gotPicture(self, picInfo=None):
idx = self.pictures.index(self.currentphoto)
realIdx = (idx - self.offset) % self.PICS_PER_PAGE
if ptr is not None:
- self['image%d' % realIdx].instance.setPixmap(ptr.__deref__())
+ self['image%d' % realIdx].instance.setPixmap(ptr)
else:
our_print("gotPicture got invalid results for idx", idx, "("+str(realIdx)+")")
# NOTE: we could use a different picture here that indicates a failure
@@ -654,7 +654,7 @@ def gotPicture(self, picInfo=None):
our_print("picture decoded")
ptr = self.picload.getData()
if ptr is not None:
- self['pixmap'].instance.setPixmap(ptr.__deref__())
+ self['pixmap'].instance.setPixmap(ptr)
if self.nextPhoto is not None:
self.timer.start(config.plugins.ecasa.slideshow_interval.value*1000, True)
View
@@ -125,7 +125,7 @@ def setState(self, state):
def paintPosterPixmapCB(self, picInfo=None):
ptr = self.picload.getData()
if ptr != None:
- self["poster"].instance.setPixmap(ptr.__deref__())
+ self["poster"].instance.setPixmap(ptr)
self["poster"].show()
def __streamStarted(self):
@@ -75,5 +75,5 @@ def setPixmapCB(self, picInfo = None):
os_remove(self.tmpfile)
ptr = self.picload.getData()
if ptr and self.instance:
- self.instance.setPixmap(ptr.__deref__())
+ self.instance.setPixmap(ptr)
View
@@ -603,7 +603,7 @@ def IMDBPoster(self,string):
def paintPosterPixmapCB(self, picInfo=None):
ptr = self.picload.getData()
if ptr != None:
- self["poster"].instance.setPixmap(ptr.__deref__())
+ self["poster"].instance.setPixmap(ptr)
self["poster"].show()
def createSummary(self):
@@ -39,7 +39,7 @@ def onShow(self):
def paintIconPixmapCB(self, picInfo=None):
ptr = self.picload.getData()
if self.showPic and ptr != None:
- self.instance.setPixmap(ptr.__deref__())
+ self.instance.setPixmap(ptr)
self.picloaded = True
if self.callback is not None:
self.callback()
View
@@ -438,7 +438,7 @@ def setCoverArt(self,pixmap=None):
if pixmap is None:
self["info_cover"].instance.setPixmapFromFile(self.noCoverArtPNG)
else:
- self["info_cover"].instance.setPixmap(pixmap.__deref__())
+ self["info_cover"].instance.setPixmap(pixmap)
def loadPersonalStations(self):
@@ -583,7 +583,7 @@ def setCoverArt(self,pixmap=None):
if pixmap is None:
self["cover"].instance.setPixmapFromFile(self.noCoverArtPNG)
else:
- self["cover"].instance.setPixmap(pixmap.__deref__())
+ self["cover"].instance.setPixmap(pixmap)
def update(self):
if self.streamplayer.getMetadata("creator") == self.lastcreator:
@@ -2705,7 +2705,7 @@ def onShow(self):
def paintCoverArtPixmapCB(self, picInfo=None):
ptr = self.picload.getData()
if ptr != None:
- self.instance.setPixmap(ptr.__deref__())
+ self.instance.setPixmap(ptr)
def updateCoverArt(self, path):
back = False
View
@@ -464,7 +464,7 @@ def OFDBPoster(self, noPoster = False):
def paintPosterPixmapCB(self, picInfo=None):
ptr = self.picload.getData()
if ptr != None:
- self["poster"].instance.setPixmap(ptr.__deref__())
+ self["poster"].instance.setPixmap(ptr)
self["poster"].show()
def createSummary(self):
@@ -58,7 +58,7 @@ def getPic(self):
def gotPic(self, picInfo = None):
ptr = self.picload.getData()
if ptr:
- self["picture"].instance.setPixmap(ptr.__deref__())
+ self["picture"].instance.setPixmap(ptr)
def HelpView(self):
self.session.openWithCallback(self.getPic, HelpPictureView)
@@ -111,7 +111,7 @@ def getPic(self):
def gotPic(self, picInfo = None):
ptr = self.picload.getData()
if ptr:
- self["picture"].instance.setPixmap(ptr.__deref__())
+ self["picture"].instance.setPixmap(ptr)
def nextPic(self):
self.index += 1
@@ -268,7 +268,7 @@ def showThumbLand(self):
def gotThumbLand(self, picInfo = None):
ptr = self.picload.getData()
if ptr:
- self["thumbland"].instance.setPixmap(ptr.__deref__())
+ self["thumbland"].instance.setPixmap(ptr)
def showThumb(self):
picture = ""
@@ -300,7 +300,7 @@ def gotThumb(self, picInfo = None):
if ptr:
self["statuslabel"].setText("")
self["thumbnail"].show()
- self["thumbnail"].instance.setPixmap(ptr.__deref__())
+ self["thumbnail"].instance.setPixmap(ptr)
else:
self["thumbnail"].hide()
@@ -313,7 +313,7 @@ def paintIconPixmapCB(self, picInfo=None):
self.instance.setScaleDest(dest_rect)
else:
self.instance.setScale(0)
- self.instance.setPixmap(ptr.__deref__())
+ self.instance.setPixmap(ptr)
else:
self.instance.setPixmap(None)
@@ -196,7 +196,7 @@ def setPicture(self, string):
def setPictureCB(self, picInfo = None):
ptr = self.picload.getData()
if ptr is not None:
- self["pixmap"].instance.setPixmap(ptr.__deref__())
+ self["pixmap"].instance.setPixmap(ptr)
self.processing = False
if self.autoreload is True:
@@ -441,7 +441,7 @@ def updateInfoPanel(self):
def updateInfoPanelCB(self, picInfo = None):
ptr = self.picload.getData()
if ptr is not None:
- self["pixmap"].instance.setPixmap(ptr.__deref__())
+ self["pixmap"].instance.setPixmap(ptr)
else:
pass
@@ -75,5 +75,5 @@ def setPixmapCB(self, picInfo = None):
os_remove(self.tmpfile)
ptr = self.picload.getData()
if ptr and self.instance:
- self.instance.setPixmap(ptr.__deref__())
+ self.instance.setPixmap(ptr)
@@ -64,7 +64,7 @@ def setPixmapCB(self, picInfo = None):
os_remove(self.tmpfile)
ptr = self.picload.getData()
if ptr and self.instance:
- self.instance.setPixmap(ptr.__deref__())
+ self.instance.setPixmap(ptr)
class ImageswitchWidget(Widget):
@@ -151,20 +151,20 @@ def setInitialize(self):
def setPixmap(self):
- self["video_thumbnail_1"].instance.setPixmap(self.entry.thumbnail["0"].__deref__())
+ self["video_thumbnail_1"].instance.setPixmap(self.entry.thumbnail["0"])
self.entry.loadThumbnail(1, self.setThumbnail_2)
self.entry.loadThumbnail(2, self.setThumbnail_3)
self["video_thumbnail_2"].hide()
self["video_thumbnail_3"].hide()
def setThumbnail_2(self, entry):
- self["video_thumbnail_2"].instance.setPixmap(self.entry.thumbnail["1"].__deref__())
+ self["video_thumbnail_2"].instance.setPixmap(self.entry.thumbnail["1"])
self["video_thumbnail_2"].show()
def setThumbnail_3(self, entry):
- self["video_thumbnail_3"].instance.setPixmap(self.entry.thumbnail["2"].__deref__())
+ self["video_thumbnail_3"].instance.setPixmap(self.entry.thumbnail["2"])
self["video_thumbnail_3"].show()

0 comments on commit 93ecd8e

Please sign in to comment.