From 0b36b45ddb8cb6a515c6a75630f2b43c73d40222 Mon Sep 17 00:00:00 2001 From: karxi Date: Thu, 22 Dec 2016 11:19:16 -0500 Subject: [PATCH] Fixed some mistakes pertaining to Pesterchum's inheritance structure. --- convo.py | 2 +- memos.py | 2 +- pesterchum.py | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/convo.py b/convo.py index 9023759..d28d41e 100644 --- a/convo.py +++ b/convo.py @@ -276,7 +276,7 @@ class PesterMovie(QtGui.QMovie): class PesterText(QtGui.QTextEdit): def __init__(self, theme, parent=None): - QtGui.QTextEdit.__init__(self, parent) + super(PesterText, self).__init__(parent) if hasattr(self.parent(), 'mainwindow'): self.mainwindow = self.parent().mainwindow else: diff --git a/memos.py b/memos.py index 9e219ac..a1230f2 100644 --- a/memos.py +++ b/memos.py @@ -244,7 +244,7 @@ _ctag_begin = re.compile(r'') class MemoText(PesterText): def __init__(self, theme, parent=None): - super(MemoText, self).__init__(parent) + super(MemoText, self).__init__(theme, parent) if hasattr(self.parent(), 'mainwindow'): self.mainwindow = self.parent().mainwindow else: diff --git a/pesterchum.py b/pesterchum.py index e6c0b73..479d4ee 100644 --- a/pesterchum.py +++ b/pesterchum.py @@ -888,7 +888,9 @@ class chumArea(RightClickTree): class trollSlum(chumArea): def __init__(self, trolls, mainwindow, parent=None): - super(trollSlum, self).__init__(parent) + #~super(trollSlum, self).__init__(parent) + # TODO: Rework inheritance here. + QtGui.QTreeWidgetItem.__init__(self, parent) self.mainwindow = mainwindow theme = self.mainwindow.theme self.setStyleSheet(theme["main/trollslum/chumroll/style"])