From 36dd99ae68825bb28b7428f8018fbfdfb003bf36 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Sat, 2 Feb 2013 12:29:34 +0100
Subject: cppcheck

(bzr r12092)
---
 src/dom/odf/odfdocument.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/dom/odf/odfdocument.cpp')

diff --git a/src/dom/odf/odfdocument.cpp b/src/dom/odf/odfdocument.cpp
index 1e7a61e4e..cf460c964 100644
--- a/src/dom/odf/odfdocument.cpp
+++ b/src/dom/odf/odfdocument.cpp
@@ -44,18 +44,20 @@ namespace odf
  */
 ImageData::ImageData(const std::string &fname,
               const std::vector<unsigned char> &buf)
+    : fileName (fname),
+      data (buf)
+
 {
-    fileName = fname;
-    data     = buf;
 }
 
 /**
  *
  */
 ImageData::ImageData(const ImageData &other)
+    : fileName (other.fileName),
+      data (other.data)
+
 {
-    fileName = other.fileName;
-    data     = other.data;
 }
 
 /**
@@ -120,10 +122,10 @@ OdfDocument::OdfDocument() :
 /**
  *
  */
-OdfDocument::OdfDocument(const OdfDocument &other)
+OdfDocument::OdfDocument(const OdfDocument &other) :
+    content (other.content),
+    images (other.images)
 {
-    content = other.content;
-    images  = other.images;
 }
 
 
-- 
cgit v1.2.3


From c7c7405b0417093650d312ce00a3e9009ca49ee6 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Fri, 8 Feb 2013 20:59:10 +0100
Subject: removed some unused files

(bzr r12109)
---
 src/dom/odf/odfdocument.cpp | 167 --------------------------------------------
 1 file changed, 167 deletions(-)
 delete mode 100644 src/dom/odf/odfdocument.cpp

(limited to 'src/dom/odf/odfdocument.cpp')

diff --git a/src/dom/odf/odfdocument.cpp b/src/dom/odf/odfdocument.cpp
deleted file mode 100644
index cf460c964..000000000
--- a/src/dom/odf/odfdocument.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *
- * This class contains an ODF Document.
- * Initially, we are just concerned with .odg content.xml + resources
- *
- * ---------------------------------------------------------------------
- *
- * Copyright (C) 2006-2008 Bob Jamison
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * For more information, please write to rwjj@earthlink.net
- *
- *  RWJ :  080207: Changed to GPL2 by me
- *
- */
-
-#include "odfdocument.h"
-
-
-namespace odf
-{
-
-
-//########################################################################
-//# I M A G E    D A T A
-//########################################################################
-
-
-/**
- *
- */
-ImageData::ImageData(const std::string &fname,
-              const std::vector<unsigned char> &buf)
-    : fileName (fname),
-      data (buf)
-
-{
-}
-
-/**
- *
- */
-ImageData::ImageData(const ImageData &other)
-    : fileName (other.fileName),
-      data (other.data)
-
-{
-}
-
-/**
- *
- */
-ImageData::~ImageData()
-{
-}
-
-/**
- *
- */
-std::string ImageData::getFileName()
-{
-    return fileName;
-}
-
-/**
- *
- */
-void ImageData::setFileName(const std::string &val)
-{
-    fileName = val;
-}
-
-/**
- *
- */
-std::vector<unsigned char> &ImageData::getData()
-{
-    return data;
-}
-
-/**
- *
- */
-void ImageData::setData(const std::vector<unsigned char> &buf)
-{
-    data = buf;
-}
-
-
-
-
-
-//########################################################################
-//# O D F    D O C U M E N T
-//########################################################################
-
-
-
-/**
- *
- */
-OdfDocument::OdfDocument() :
-    content(0),
-    images()
-{
-}
-
-
-/**
- *
- */
-OdfDocument::OdfDocument(const OdfDocument &other) :
-    content (other.content),
-    images (other.images)
-{
-}
-
-
-/**
- *
- */
-OdfDocument::~OdfDocument()
-{
-}
-
-/**
- *
- */
-bool OdfDocument::readFile(const std::string &/*fileName*/)
-{
-    return true;
-}
-
-/**
- *
- */
-bool OdfDocument::writeFile(const std::string &/*fileName*/)
-{
-    return true;
-}
-
-
-
-
-
-} //namespace odf
-
-
-
-
-//########################################################################
-//# E N D    O F    F I L E
-//########################################################################
-
-- 
cgit v1.2.3