[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/digikam/libs
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2010-09-07 12:23:00
Message-ID: 20100907122300.28548AC769 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1172518 by cgilles:

use more private internal container


 M  +4 -4      histogram/imagehistogram.cpp  
 M  +4 -4      histogram/imagehistogram.h  
 M  +1 -1      jpegutils/jpegutils.h  
 M  +3 -2      jpegutils/jpegwin.cpp  
 U             jpegutils/jpegwin.h  
 M  +1 -1      template/templatemanager.cpp  
 M  +2 -1      template/templatemanager.h  
 M  +1 -1      template/templatepanel.cpp  
 M  +1 -2      template/templatepanel.h  
 M  +1 -1      template/templateselector.cpp  
 M  +1 -1      template/templateselector.h  
 M  +1 -1      template/templateviewer.cpp  
 M  +1 -1      template/templateviewer.h  


--- trunk/extragear/graphics/digikam/libs/histogram/imagehistogram.cpp #1172517:1172518
@@ -6,7 +6,7 @@
  * Date        : 2004-07-21
  * Description : image histogram manipulation methods.
  *
- * Copyright (C) 2004-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2004-2010 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * Some code parts are inspired from gimp 2.0
  * Copyright (C) 1995 Spencer Kimball and Peter Mattis
@@ -49,7 +49,7 @@
 namespace Digikam
 {
 
-class ImageHistogramPriv
+class ImageHistogram::ImageHistogramPriv
 {
 
 public:
@@ -124,12 +124,12 @@
     return d->histoSegments == NUM_SEGMENTS_16BIT;
 }
 
-int ImageHistogram::getHistogramSegments(void)
+int ImageHistogram::getHistogramSegments()
 {
     return d->histoSegments;
 }
 
-int ImageHistogram::getMaxSegmentIndex(void)
+int ImageHistogram::getMaxSegmentIndex()
 {
     return d->histoSegments - 1;
 }
--- trunk/extragear/graphics/digikam/libs/histogram/imagehistogram.h #1172517:1172518
@@ -6,7 +6,7 @@
  * Date        : 2004-07-21
  * Description : image histogram manipulation methods.
  *
- * Copyright (C) 2004-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2004-2010 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -39,7 +39,6 @@
 namespace Digikam
 {
 
-class ImageHistogramPriv;
 class DImg;
 
 class DIGIKAM_EXPORT ImageHistogram : public DynamicThread
@@ -70,8 +69,8 @@
     double getValue(int channel, int bin);
     double getMaximum(int channel, int start, int end);
 
-    int    getHistogramSegments(void);
-    int    getMaxSegmentIndex(void);
+    int    getHistogramSegments();
+    int    getMaxSegmentIndex();
     int    getMedian(int channel, int start, int end);
 
 Q_SIGNALS:
@@ -90,6 +89,7 @@
 
 private:
 
+    class ImageHistogramPriv;
     ImageHistogramPriv* const d;
 };
 
--- trunk/extragear/graphics/digikam/libs/jpegutils/jpegutils.h #1172517:1172518
@@ -55,6 +55,6 @@
 DIGIKAM_EXPORT bool isJpegImage(const QString& file);
 DIGIKAM_EXPORT bool copyFile(const QString& src, const QString& dst);
 
-}
+} // namespace Digikam
 
 #endif /* JPEGUTILS_H */
--- trunk/extragear/graphics/digikam/libs/jpegutils/jpegwin.cpp #1172517:1172518
@@ -36,6 +36,8 @@
 #include <QFile>
 #include <QByteArray>
 
+// Local includes
+
 #include "jpegwin.h"
 
 namespace Digikam 
@@ -80,7 +82,7 @@
 
 void jpeg_memory_src (j_decompress_ptr cinfo, const JOCTET * buffer, size_t bufsize)
 {
-    digikam_source_mgr* src;
+    digikam_source_mgr* src=0;
 
     if (cinfo->src == NULL) 
     {
@@ -94,7 +96,6 @@
     src->pub.skip_input_data = skip_input_data;
     src->pub.resync_to_restart = jpeg_resync_to_restart;    // default
     src->pub.term_source = term_source;
-
     src->pub.next_input_byte = buffer;
     src->pub.bytes_in_buffer = bufsize;
 }
--- trunk/extragear/graphics/digikam/libs/template/templatemanager.cpp #1172517:1172518
@@ -52,7 +52,7 @@
     return m_defaultManager;
 }
 
-class TemplateManagerPrivate
+class TemplateManager::TemplateManagerPrivate
 {
 public:
 
--- trunk/extragear/graphics/digikam/libs/template/templatemanager.h #1172517:1172518
@@ -35,7 +35,6 @@
 {
 
 class Template;
-class TemplateManagerPrivate;
 
 class TemplateManager : public QObject
 {
@@ -74,6 +73,8 @@
 private:
 
     static TemplateManager* m_defaultManager;
+
+    class TemplateManagerPrivate;
     TemplateManagerPrivate* const d;
 };
 
--- trunk/extragear/graphics/digikam/libs/template/templatepanel.cpp #1172517:1172518
@@ -51,7 +51,7 @@
 namespace Digikam
 {
 
-class TemplatePanelPriv
+class TemplatePanel::TemplatePanelPriv
 {
 
 public:
--- trunk/extragear/graphics/digikam/libs/template/templatepanel.h #1172517:1172518
@@ -35,8 +35,6 @@
 namespace Digikam
 {
 
-class TemplatePanelPriv;
-
 class TemplatePanel : public KTabWidget
 {
 public:
@@ -61,6 +59,7 @@
 
 private:
 
+    class TemplatePanelPriv;
     TemplatePanelPriv* const d;
 };
 
--- trunk/extragear/graphics/digikam/libs/template/templateselector.cpp #1172517:1172518
@@ -52,7 +52,7 @@
 namespace Digikam
 {
 
-class TemplateSelectorPriv
+class TemplateSelector::TemplateSelectorPriv
 {
 public:
 
--- trunk/extragear/graphics/digikam/libs/template/templateselector.h #1172517:1172518
@@ -32,7 +32,6 @@
 {
 
 class Template;
-class TemplateSelectorPriv;
 
 class TemplateSelector : public KHBox
 {
@@ -72,6 +71,7 @@
 
 private:
 
+    class TemplateSelectorPriv;
     TemplateSelectorPriv* const d;
 };
 
--- trunk/extragear/graphics/digikam/libs/template/templateviewer.cpp #1172517:1172518
@@ -51,7 +51,7 @@
 namespace Digikam
 {
 
-class TemplateViewerPriv
+class TemplateViewer::TemplateViewerPriv
 {
 public:
 
--- trunk/extragear/graphics/digikam/libs/template/templateviewer.h #1172517:1172518
@@ -38,7 +38,6 @@
 {
 
 class Template;
-class TemplateViewerPriv;
 
 class TemplateViewer : public RExpanderBox
 {
@@ -58,6 +57,7 @@
 
 private:
 
+    class TemplateViewerPriv;
     TemplateViewerPriv* const d;
 };
 
[prev in list] [next in list] [prev in thread] [next in thread]