summaryrefslogtreecommitdiff
path: root/noncore/apps/opie-reader/StyleConsts.cpp
Unidiff
Diffstat (limited to 'noncore/apps/opie-reader/StyleConsts.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-reader/StyleConsts.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/noncore/apps/opie-reader/StyleConsts.cpp b/noncore/apps/opie-reader/StyleConsts.cpp
index e111dbd..9fb56b7 100644
--- a/noncore/apps/opie-reader/StyleConsts.cpp
+++ b/noncore/apps/opie-reader/StyleConsts.cpp
@@ -1,15 +1,15 @@
1 1
2#include <qpixmap.h> 2#include <qimage.h>
3#include "StyleConsts.h" 3#include "StyleConsts.h"
4 4
5GraphicLink::~GraphicLink() { delete graphic; } 5GraphicLink::~GraphicLink() { delete graphic; }
6 6
7pmstore::~pmstore() 7pmstore::~pmstore()
8{ 8{
9// qDebug("Deleting image"); 9//// qDebug("Deleting image");
10 delete graphic; 10 delete graphic;
11} 11}
12 12
13CStyle::~CStyle() 13CStyle::~CStyle()
14{ 14{
15 if (graphic != NULL) 15 if (graphic != NULL)
@@ -18,17 +18,12 @@ CStyle::~CStyle()
18 { 18 {
19 delete graphic; 19 delete graphic;
20 } 20 }
21 } 21 }
22} 22}
23 23
24CStyle::CStyle(CStyle& rhs) : graphic(NULL)
25{
26 *this = rhs;
27}
28
29CStyle::CStyle(const CStyle& rhs) : graphic(NULL) 24CStyle::CStyle(const CStyle& rhs) : graphic(NULL)
30{ 25{
31 *this = rhs; 26 *this = rhs;
32} 27}
33 28
34CStyle& CStyle::operator=(const CStyle& rhs) 29CStyle& CStyle::operator=(const CStyle& rhs)
@@ -82,18 +77,18 @@ void CStyle::unset()
82 delete graphic; 77 delete graphic;
83 } 78 }
84 graphic = NULL; 79 graphic = NULL;
85 } 80 }
86} 81}
87 82
88void CStyle::setPicture(QPixmap* _g, bool il, unsigned long tgt) 83void CStyle::setPicture(bool canScale, QImage* _g, bool il, unsigned long tgt)
89{ 84{
90 if (graphic != NULL) 85 if (graphic != NULL)
91 { 86 {
92 if (--(graphic->count) == 0) 87 if (--(graphic->count) == 0)
93 { 88 {
94 delete graphic; 89 delete graphic;
95 } 90 }
96 graphic = NULL; 91 graphic = NULL;
97 } 92 }
98 if (_g != NULL) graphic = new pmstore(_g, il, tgt); 93 if (_g != NULL) graphic = new pmstore(canScale, _g, il, tgt);
99} 94}