From kde-commits  Tue Sep 30 23:04:03 2003
From: Dirk Mueller <mueller () kde ! org>
Date: Tue, 30 Sep 2003 23:04:03 +0000
To: kde-commits
Subject: kdeutils/khexedit/lib
X-MARC-Message: https://marc.info/?l=kde-commits&m=106496307501348

CVS commit by mueller: 

unbreak compilation


  A            helper.h   1.1 [no copyright]
  M +1 -4      kbuffercoltextexport.cpp   1.4
  M +1 -12     kbuffercolumn.cpp   1.14
  M +2 -2      kfixedsizebuffer.h   1.2
  M +1 -4      khexcoltextexport.cpp   1.2
  M +1 -10     khexcolumn.cpp   1.4
  M +1 -4      ktextcoltextexport.cpp   1.2


--- kdeutils/khexedit/lib/kbuffercoltextexport.cpp  #1.3:1.4
@@ -22,10 +22,7 @@
 #include "kbufferlayout.h"
 #include "kbuffercoltextexport.h"
+#include "helper.h"
 
 using namespace KHE;
-
-static const int DefaultByteSpacingWidth = 1;
-static const int GroupSpacingWidth = 3;
-
 
 KBufferColTextExport::KBufferColTextExport( const KBufferColumn* BufferColumn, char *D, KCoordRange CR, int ByteWidth )

--- kdeutils/khexedit/lib/kbuffercolumn.cpp  #1.13:1.14
@@ -29,4 +29,5 @@
 #include "kbufferlayout.h"
 #include "kbufferranges.h"
+#include "helper.h"
 
 using namespace KHE;
@@ -37,18 +38,6 @@ static const char EmptyByte = ' ';
 
 static const int DefaultCursorWidth = 2;
-static const int DefaultByteSpacingWidth = 3;
 static const int DefaultGroupSpacingWidth = 9;
 static const int DefaultNoOfGroupedBytes = 4;
-
-static inline QColor colorForByte( const char Byte )
-{
-  if( ispunct(Byte) )
-    return Qt::red;
-  else if( isprint(Byte) )
-    return Qt::black;
-  else
-    return Qt::blue;
-}
-
 
 KBufferColumn::KBufferColumn( KColumnsView *CV, KDataBuffer *B, KBufferLayout *L, KBufferRanges *R )

--- kdeutils/khexedit/lib/kfixedsizebuffer.h  #1.1.1.1:1.2
@@ -16,6 +16,6 @@
 
  
-#ifndef KPLAINBUFFER_H
-#define KPLAINBUFFER_H
+#ifndef KFIXEDSIZEBUFFER_H
+#define KFIXEDSIZEBUFFER_H
 
 #include <kdatabuffer.h>

--- kdeutils/khexedit/lib/khexcoltextexport.cpp  #1.1:1.2
@@ -22,10 +22,7 @@
 #include "khexcolumn.h"
 #include "khexcoltextexport.h"
+#include "helper.h"
 
 using namespace KHE;
-
-static const int DefaultByteSpacingWidth = 1;
-static const int GroupSpacingWidth = 3;
-
 
 KHexColTextExport::KHexColTextExport( const KHexColumn* HC, char *D, KCoordRange CR )

--- kdeutils/khexedit/lib/khexcolumn.cpp  #1.3:1.4
@@ -29,4 +29,5 @@
 #include "kbufferranges.h"
 #include "khexcolumn.h"
+#include "helper.h"
 
 using namespace KHE;
@@ -34,14 +35,4 @@ using namespace KHE;
 static const KCoding DefaultCoding = HexadecimalCoding;
 static const int DefaultBinaryGapWidth = 1;
-
-static inline QColor colorForByte( const char Byte )
-{
-  if( ispunct(Byte) )
-    return Qt::red;
-  else if( isprint(Byte) )
-    return Qt::black;
-  else
-    return Qt::blue;
-}
 
 KHexColumn::KHexColumn( KColumnsView *CV, KDataBuffer *B, KBufferLayout *L, KBufferRanges *R )

--- kdeutils/khexedit/lib/ktextcoltextexport.cpp  #1.1:1.2
@@ -22,10 +22,7 @@
 #include "ktextcolumn.h"
 #include "ktextcoltextexport.h"
+#include "helper.h"
 
 using namespace KHE;
-
-static const int DefaultByteSpacingWidth = 1;
-static const int GroupSpacingWidth = 3;
-
 
 KTextColTextExport::KTextColTextExport( const KTextColumn* TC, char *D, KCoordRange CR )