7 files changed, 38 insertions, 16 deletions

diff --git a/noncore/apps/opie-reader/Bkmks.cpp b/noncore/apps/opie-reader/Bkmks.cpp
index 440d8be..28f6318 100644
--- a/noncore/apps/opie-reader/Bkmks.cpp
+++ b/noncore/apps/opie-reader/Bkmks.cpp
@@ -12,3 +12,8 @@ const unsigned long BkmkFile::magic = ((unsigned long)'q' << 24) | ((unsigned lo
 
-Bkmk::Bkmk(const unsigned char* _nm, unsigned short _nmlen, const unsigned char* _anno, unsigned short _annolen, unsigned int _p)
+Bkmk::Bkmk(const unsigned char* _nm, unsigned short _nmlen, const unsigned char* _anno, unsigned short _annolen, unsigned int _p) :
+  m_name(0),
+  m_namelen(0),
+  m_anno(0),
+  m_annolen(0),
+  m_position(0)
 {
@@ -22,2 +27,13 @@ Bkmk::Bkmk(const tchar* _nm, const unsigned char* _anno, unsigned short annolen,
 
+Bkmk::Bkmk(const Bkmk& rhs) :
+  m_name(0),
+  m_namelen(0),
+  m_anno(0),
+  m_annolen(0),
+  m_position(0)
+{
+    init(rhs.name(), sizeof(tchar)*(ustrlen(rhs.name())+1), rhs.anno(),
+         sizeof(tchar)*(ustrlen(rhs.anno())+1), rhs.value());
+}
+
 Bkmk::Bkmk(const tchar* _nm, const tchar* _anno, unsigned int _p) : m_position(_p)
diff --git a/noncore/apps/opie-reader/Bkmks.h b/noncore/apps/opie-reader/Bkmks.h
index c2275e2..985e158 100644
--- a/noncore/apps/opie-reader/Bkmks.h
+++ b/noncore/apps/opie-reader/Bkmks.h
@@ -22,3 +22,3 @@ class Bkmk
  public:
-    Bkmk() : m_name(NULL), m_namelen(0), m_anno(NULL), m_annolen(0), m_position(0) {};
+    Bkmk() : m_name(0), m_namelen(0), m_anno(0), m_annolen(0), m_position(0) {};
     Bkmk(const unsigned char* _nm, unsigned short _nmlen, const unsigned char* _anno, unsigned short _annolen, unsigned int _p);
@@ -27,6 +27,3 @@ class Bkmk
     Bkmk(const tchar* _nm, const tchar* _anno, unsigned int _p, unsigned int _p2);
-    Bkmk(const Bkmk& rhs) : m_name(NULL), m_anno(NULL)
-        {
-            *this = rhs;
-        }
+    Bkmk(const Bkmk& rhs);
     ~Bkmk();
diff --git a/noncore/apps/opie-reader/StyleConsts.cpp b/noncore/apps/opie-reader/StyleConsts.cpp
index 77c9d3b..c19fa3d 100644
--- a/noncore/apps/opie-reader/StyleConsts.cpp
+++ b/noncore/apps/opie-reader/StyleConsts.cpp
@@ -6,2 +6,9 @@ GraphicLink::~GraphicLink() { delete graphic; }
 
+pmstore::pmstore(bool _canScale, QImage* p, bool isLnk, unsigned long tgt) :
+  count(1),
+  m_isScaleable(_canScale)
+{
+    graphic = new GraphicLink(p, isLnk, tgt);
+}
+
 pmstore::~pmstore()
diff --git a/noncore/apps/opie-reader/StyleConsts.h b/noncore/apps/opie-reader/StyleConsts.h
index 4b7ff4b..5fd9669 100644
--- a/noncore/apps/opie-reader/StyleConsts.h
+++ b/noncore/apps/opie-reader/StyleConsts.h
@@ -23,4 +23,5 @@ struct GraphicLink
 
-struct pmstore
+class pmstore
 {
+  public:
     unsigned int count;
@@ -28,6 +29,3 @@ struct pmstore
     GraphicLink*     graphic;
-    pmstore(bool _canScale, QImage* p, bool isLnk, unsigned long tgt) : count(1), m_isScaleable(_canScale)
-        {
-            graphic = new GraphicLink(p, isLnk, tgt);
-        }
+    pmstore(bool _canScale, QImage* p, bool isLnk, unsigned long tgt);
     ~pmstore();
diff --git a/noncore/apps/opie-write/qrichtext.cpp b/noncore/apps/opie-write/qrichtext.cpp
index c27eb1e..f040f1e 100644
--- a/noncore/apps/opie-write/qrichtext.cpp
+++ b/noncore/apps/opie-write/qrichtext.cpp
@@ -6062,3 +6062,3 @@ QTextImage::QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, co
                         QMimeSourceFactory &factory )
-    : QTextCustomItem( p )
+    : QTextCustomItem( p ), reg( 0 )
 {
@@ -6070,3 +6070,2 @@ QTextImage::QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, co
 
-    reg = 0;
     QString imageName = attr["src"];
@@ -6151,2 +6150,3 @@ QTextImage::~QTextImage()
 {
+    delete reg;
     if ( pixmap_map && pixmap_map->contains( imgId ) ) {
@@ -6162,3 +6162,2 @@ QTextImage::~QTextImage()
     }
-    delete reg;
 }
diff --git a/noncore/apps/tinykate/libkate/document/katehighlight.cpp b/noncore/apps/tinykate/libkate/document/katehighlight.cpp
index 539d356..89024f7 100644
--- a/noncore/apps/tinykate/libkate/document/katehighlight.cpp
+++ b/noncore/apps/tinykate/libkate/document/katehighlight.cpp
@@ -391,3 +391,3 @@ const QChar *HlAnyChar::checkHgl(const QChar *s, int len, bool)
 HlRegExpr::HlRegExpr(int attribute, int context,QString regexp)
-  : HlItem(attribute, context) {
+  : HlItem(attribute, context), Expr(0) {
 
@@ -398,2 +398,7 @@ HlRegExpr::HlRegExpr(int attribute, int context,QString regexp)
 
+HlRegExpr::~HlRegExpr()
+{
+    delete Expr;
+}
+
 const QChar *HlRegExpr::checkHgl(const QChar *s, int len, bool lineStart)
diff --git a/noncore/apps/tinykate/libkate/document/katehighlight.h b/noncore/apps/tinykate/libkate/document/katehighlight.h
index fddf585..f0be27b 100644
--- a/noncore/apps/tinykate/libkate/document/katehighlight.h
+++ b/noncore/apps/tinykate/libkate/document/katehighlight.h
@@ -186,3 +186,3 @@ class HlRegExpr : public HlItem {
   HlRegExpr(int attribute, int context,QString expr);
-  ~HlRegExpr(){delete Expr;};
+  ~HlRegExpr();
   virtual const QChar *checkHgl(const QChar *, int len, bool);