author | groucho <groucho> | 2003-05-07 09:01:39 (UTC) |
---|---|---|
committer | groucho <groucho> | 2003-05-07 09:01:39 (UTC) |
commit | 118d03d815a7615b9c53363218a7ac45b3f4c514 (patch) (side-by-side diff) | |
tree | 356953e2413cddcec0f35bd47bb6439767da7051 /noncore/apps/opie-reader/StyleConsts.cpp | |
parent | 00894537decf01c5a5cdc565b2740b5e67a2e90f (diff) | |
download | opie-118d03d815a7615b9c53363218a7ac45b3f4c514.zip opie-118d03d815a7615b9c53363218a7ac45b3f4c514.tar.gz opie-118d03d815a7615b9c53363218a7ac45b3f4c514.tar.bz2 |
Incorporated TimWs current source tree and make it compile
Diffstat (limited to 'noncore/apps/opie-reader/StyleConsts.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-reader/StyleConsts.cpp | 13 |
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,13 +1,13 @@ -#include <qpixmap.h> +#include <qimage.h> #include "StyleConsts.h" GraphicLink::~GraphicLink() { delete graphic; } pmstore::~pmstore() { -// qDebug("Deleting image"); +//// qDebug("Deleting image"); delete graphic; } CStyle::~CStyle() @@ -20,13 +20,8 @@ CStyle::~CStyle() } } } -CStyle::CStyle(CStyle& rhs) : graphic(NULL) -{ - *this = rhs; -} - CStyle::CStyle(const CStyle& rhs) : graphic(NULL) { *this = rhs; } @@ -84,9 +79,9 @@ void CStyle::unset() graphic = NULL; } } -void CStyle::setPicture(QPixmap* _g, bool il, unsigned long tgt) +void CStyle::setPicture(bool canScale, QImage* _g, bool il, unsigned long tgt) { if (graphic != NULL) { if (--(graphic->count) == 0) @@ -94,6 +89,6 @@ void CStyle::setPicture(QPixmap* _g, bool il, unsigned long tgt) delete graphic; } graphic = NULL; } - if (_g != NULL) graphic = new pmstore(_g, il, tgt); + if (_g != NULL) graphic = new pmstore(canScale, _g, il, tgt); } |