Merge pull request #183 from bobhairgrove/master

Simsys · web-flow · commit 2065e25896d2 · 2025-07-20T12:44:04.000+02:00
2nd try -- …An effort at improvements towards const correctness.
diff --git a/src/chunks.cpp b/src/chunks.cpp
@@ -62,7 +62,7 @@ bool Chunks::setIODevice(QIODevice &ioDevice)
 
 // ***************************************** Getting data out of Chunks
 
-QByteArray Chunks::data(qint64 pos, qint64 maxSize, QByteArray *highlighted)
+QByteArray Chunks::data(qint64 pos, qint64 maxSize, QByteArray *highlighted) const
 {
     qint64 ioDelta = 0;
     int chunkIdx = 0;
@@ -147,7 +147,7 @@ QByteArray Chunks::data(qint64 pos, qint64 maxSize, QByteArray *highlighted)
     return buffer;
 }
 
-bool Chunks::write(QIODevice &iODevice, qint64 pos, qint64 count)
+bool Chunks::write(QIODevice &iODevice, qint64 pos, qint64 count) const
 {
     if (count == -1)
         count = _size;
@@ -176,7 +176,7 @@ void Chunks::setDataChanged(qint64 pos, bool dataChanged)
     _chunks[chunkIdx].dataChanged[(int)posInBa] = char(dataChanged);
 }
 
-bool Chunks::dataChanged(qint64 pos)
+bool Chunks::dataChanged(qint64 pos) const
 {
     foreach (Chunk chunk, _chunks)
     {
@@ -191,7 +191,7 @@ bool Chunks::dataChanged(qint64 pos)
 
 // ***************************************** Search API
 
-qint64 Chunks::indexOf(const QByteArray &ba, qint64 from)
+qint64 Chunks::indexOf(const QByteArray &ba, qint64 from) const
 {
     qint64 result = -1;
     QByteArray buffer;
@@ -206,7 +206,7 @@ qint64 Chunks::indexOf(const QByteArray &ba, qint64 from)
     return result;
 }
 
-qint64 Chunks::lastIndexOf(const QByteArray &ba, qint64 from)
+qint64 Chunks::lastIndexOf(const QByteArray &ba, qint64 from) const
 {
     qint64 result = -1;
     QByteArray buffer;
@@ -276,22 +276,22 @@ bool Chunks::removeAt(qint64 pos)
 
 // ***************************************** Utility functions
 
-char Chunks::operator[](qint64 pos)
+char Chunks::operator[](qint64 pos) const
 {
     return data(pos, 1).at(0);
 }
 
-qint64 Chunks::pos()
+qint64 Chunks::pos() const
 {
     return _pos;
 }
 
-qint64 Chunks::size()
+qint64 Chunks::size() const
 {
     return _size;
 }
 
-int Chunks::getChunkIndex(qint64 absPos)
+int Chunks::getChunkIndex(qint64 absPos) const
 {
     // This routine checks, if there is already a copied chunk available. If os, it
     // returns a reference to it. If there is no copied chunk available, original
diff --git a/src/chunks.h b/src/chunks.h
@@ -54,35 +54,35 @@ Q_OBJECT
     bool setIODevice(QIODevice &ioDevice);
 
     // Getting data out of Chunks
-    QByteArray data(qint64 pos=0, qint64 count=-1, QByteArray *highlighted=0);
-    bool write(QIODevice &iODevice, qint64 pos=0, qint64 count=-1);
+    QByteArray data(qint64 pos=0, qint64 count=-1, QByteArray *highlighted=0) const;
+    bool write(QIODevice &iODevice, qint64 pos=0, qint64 count=-1) const;
 
     // Set and get highlighting infos
     void setDataChanged(qint64 pos, bool dataChanged);
-    bool dataChanged(qint64 pos);
+    bool dataChanged(qint64 pos) const;
 
     // Search API
-    qint64 indexOf(const QByteArray &ba, qint64 from);
-    qint64 lastIndexOf(const QByteArray &ba, qint64 from);
+    qint64 indexOf(const QByteArray &ba, qint64 from) const;
+    qint64 lastIndexOf(const QByteArray &ba, qint64 from) const;
 
     // Char manipulations
     bool insert(qint64 pos, char b);
     bool overwrite(qint64 pos, char b);
     bool removeAt(qint64 pos);
 
     // Utility functions
-    char operator[](qint64 pos);
-    qint64 pos();
-    qint64 size();
+    char operator[](qint64 pos) const;
+    qint64 pos() const;
+    qint64 size() const;
 
 
 private:
-    int getChunkIndex(qint64 absPos);
+    int getChunkIndex(qint64 absPos) const;
 
     QIODevice * _ioDevice;
     qint64 _pos;
     qint64 _size;
-    QList<Chunk> _chunks;
+    mutable QList<Chunk> _chunks;
 
 #ifdef MODUL_TEST
 public:
diff --git a/src/color_manager.cpp b/src/color_manager.cpp
@@ -47,12 +47,12 @@ ColoredArea::ColoredArea(qint64 posStart, qint64 posEnd, QPen pen, QBrush backgr
     _areaStyle = background;
 }
 
-QPen ColoredArea::fontPen()
+QPen ColoredArea::fontPen() const
 {
     return _fontColor;
 }
 
-QColor ColoredArea::fontColor()
+QColor ColoredArea::fontColor() const
 {
     return _fontColor.color();
 }
@@ -62,12 +62,12 @@ void ColoredArea::setFontColor(QColor color)
     _fontColor = QPen(color);
 }
 
-QColor ColoredArea::areaColor()
+QColor ColoredArea::areaColor() const
 {
     return _areaStyle.color();
 }
 
-QBrush ColoredArea::areaStyle()
+QBrush ColoredArea::areaStyle() const
 {
     return _areaStyle;
 }
@@ -82,21 +82,21 @@ void ColoredArea::setAreaStyle(QBrush backround)
     _areaStyle = backround;
 }
 
-qint64 ColoredArea::posStart()
+qint64 ColoredArea::posStart() const
 {
     return _posStart;
-};
+}
 
-qint64 ColoredArea::posEnd()
+qint64 ColoredArea::posEnd() const
 {
     return _posEnd;
-};
+}
 
 void ColoredArea::setRange(qint64 posStart, qint64 posEnd)
 {
     _posStart = posStart;
     _posEnd = posEnd;
-};
+}
 
 void ColoredArea::clear() 
 {
@@ -111,7 +111,7 @@ ColorManager::ColorManager()
 {
     QPalette palette = qApp->palette();
     setPalette(palette);
-};
+}
 
 void ColorManager::setPalette(const QPalette &palette)
 {
@@ -123,7 +123,7 @@ void ColorManager::setPalette(const QPalette &palette)
 }
 
 // read only, copy of relevant ColoredArea is returned: you can't change anything
-ColoredArea ColorManager::markedArea(qint64 pos, Area area, Chunks *chunks)
+ColoredArea ColorManager::markedArea(qint64 pos, Area area, Chunks *chunks) const
 {
     // prio 1 selection
     if (pos >= _selection.posStart() && pos < _selection.posEnd())
@@ -145,9 +145,9 @@ ColoredArea ColorManager::markedArea(qint64 pos, Area area, Chunks *chunks)
     }
     // nothing found -> standard colors
     return this->notMarked(area);
-};
+}
 
-ColoredArea& ColorManager::notMarked(Area area)
+const ColoredArea &ColorManager::notMarked(Area area) const
 {
     switch (area) {
         case Area::Address:
@@ -163,15 +163,25 @@ ColoredArea& ColorManager::notMarked(Area area)
     return _hex; // should never happen
 }
 
-ColoredArea& ColorManager::selection()
+const ColoredArea &ColorManager::selection() const
+{
+    return _selection;
+}
+
+ColoredArea &ColorManager::selection()
 {
     return _selection;
-};
+}
+
+const ColoredArea& ColorManager::highlighting() const
+{
+    return _highlighting;
+}
 
 ColoredArea& ColorManager::highlighting()
 {
     return _highlighting;
-};
+}
 
 void ColorManager::addUserArea(qint64 posStart, qint64 posEnd, QColor fontColor, QBrush areaStyle)
 {
@@ -182,4 +192,4 @@ void ColorManager::addUserArea(qint64 posStart, qint64 posEnd, QColor fontColor,
 void ColorManager::clearUserAreas()
 {
     _userAreas.clear();
-}
+}
diff --git a/src/color_manager.h b/src/color_manager.h
@@ -47,25 +47,25 @@ enum Area {
 class ColoredArea
 {
 public:
-    // Cunstructors
+    // Constructors
     ColoredArea();
     ColoredArea(QPen pen, QBrush background);
     ColoredArea(qint64 posStart, qint64 posEnd, QPen pen, QBrush background);
 
     // Property to set/get font color
-    QColor fontColor();
+    QColor fontColor() const;
     void setFontColor(QColor color);
 
     // Property to set/get area style
-    QColor areaColor();
-    QBrush areaStyle();
+    QColor areaColor() const;
+    QBrush areaStyle() const;
     void setAreaColor(QColor color);
     void setAreaStyle(QBrush background);
 
     // other Methods to acces and set internal data
-    QPen fontPen();
-    qint64 posStart();
-    qint64 posEnd();
+    QPen fontPen() const;
+    qint64 posStart() const;
+    qint64 posEnd() const;
     void setRange(qint64 posStart, qint64 posEnd);
     void clear();
 
@@ -87,15 +87,17 @@ class ColorManager
     void setPalette(const QPalette &palette);
 
     // Method returns color definitions for data at position pos in area area
-    ColoredArea markedArea(qint64 pos, Area area, Chunks *chunks);
+    ColoredArea markedArea(qint64 pos, Area area, Chunks *chunks) const;
 
     // Method returns standard collors (without marking)
-    ColoredArea& notMarked(Area);
+    const ColoredArea& notMarked(Area) const;
 
     // Get the selection color definitions
+    const ColoredArea& selection() const;
     ColoredArea& selection();
 
     // Get the highlighting color definitions
+    const ColoredArea& highlighting() const;
     ColoredArea& highlighting();
 
     // Add a user defined area
@@ -116,4 +118,4 @@ class ColorManager
 
 /** \endcond docNever */
 
-#endif // COLOR_MANAGER_H
+#endif // COLOR_MANAGER_H
diff --git a/src/commands.cpp b/src/commands.cpp
@@ -113,7 +113,6 @@ UndoStack::UndoStack(Chunks * chunks, QObject * parent)
     : QUndoStack(parent)
 {
     _chunks = chunks;
-    _parent = parent;
     this->setUndoLimit(1000);
 }
 
diff --git a/src/commands.h b/src/commands.h
@@ -57,7 +57,6 @@ class UndoStack : public QUndoStack
 
 private:
     Chunks * _chunks;
-    QObject * _parent;
 };
 
 /** \endcond docNever */
diff --git a/src/qhexedit.cpp b/src/qhexedit.cpp
diff --git a/src/qhexedit.h b/src/qhexedit.h

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ bool Chunks::setIODevice(QIODevice &ioDevice)`
`62`	`62`
`63`	`63`	`// ***************************************** Getting data out of Chunks`
`64`	`64`
`65`		`-QByteArray Chunks::data(qint64 pos, qint64 maxSize, QByteArray *highlighted)`
	`65`	`+QByteArray Chunks::data(qint64 pos, qint64 maxSize, QByteArray *highlighted) const`
`66`	`66`	`{`
`67`	`67`	`qint64 ioDelta = 0;`
`68`	`68`	`int chunkIdx = 0;`
`@@ -147,7 +147,7 @@ QByteArray Chunks::data(qint64 pos, qint64 maxSize, QByteArray *highlighted)`
`147`	`147`	`return buffer;`
`148`	`148`	`}`
`149`	`149`
`150`		`-bool Chunks::write(QIODevice &iODevice, qint64 pos, qint64 count)`
	`150`	`+bool Chunks::write(QIODevice &iODevice, qint64 pos, qint64 count) const`
`151`	`151`	`{`
`152`	`152`	`if (count == -1)`
`153`	`153`	`count = _size;`
`@@ -176,7 +176,7 @@ void Chunks::setDataChanged(qint64 pos, bool dataChanged)`
`176`	`176`	`_chunks[chunkIdx].dataChanged[(int)posInBa] = char(dataChanged);`
`177`	`177`	`}`
`178`	`178`
`179`		`-bool Chunks::dataChanged(qint64 pos)`
	`179`	`+bool Chunks::dataChanged(qint64 pos) const`
`180`	`180`	`{`
`181`	`181`	`foreach (Chunk chunk, _chunks)`
`182`	`182`	`{`
`@@ -191,7 +191,7 @@ bool Chunks::dataChanged(qint64 pos)`
`191`	`191`
`192`	`192`	`// ***************************************** Search API`
`193`	`193`
`194`		`-qint64 Chunks::indexOf(const QByteArray &ba, qint64 from)`
	`194`	`+qint64 Chunks::indexOf(const QByteArray &ba, qint64 from) const`
`195`	`195`	`{`
`196`	`196`	`qint64 result = -1;`
`197`	`197`	`QByteArray buffer;`
`@@ -206,7 +206,7 @@ qint64 Chunks::indexOf(const QByteArray &ba, qint64 from)`
`206`	`206`	`return result;`
`207`	`207`	`}`
`208`	`208`
`209`		`-qint64 Chunks::lastIndexOf(const QByteArray &ba, qint64 from)`
	`209`	`+qint64 Chunks::lastIndexOf(const QByteArray &ba, qint64 from) const`
`210`	`210`	`{`
`211`	`211`	`qint64 result = -1;`
`212`	`212`	`QByteArray buffer;`
`@@ -276,22 +276,22 @@ bool Chunks::removeAt(qint64 pos)`
`276`	`276`
`277`	`277`	`// ***************************************** Utility functions`
`278`	`278`
`279`		`-char Chunks::operator[](qint64 pos)`
	`279`	`+char Chunks::operator[](qint64 pos) const`
`280`	`280`	`{`
`281`	`281`	`return data(pos, 1).at(0);`
`282`	`282`	`}`
`283`	`283`
`284`		`-qint64 Chunks::pos()`
	`284`	`+qint64 Chunks::pos() const`
`285`	`285`	`{`
`286`	`286`	`return _pos;`
`287`	`287`	`}`
`288`	`288`
`289`		`-qint64 Chunks::size()`
	`289`	`+qint64 Chunks::size() const`
`290`	`290`	`{`
`291`	`291`	`return _size;`
`292`	`292`	`}`
`293`	`293`
`294`		`-int Chunks::getChunkIndex(qint64 absPos)`
	`294`	`+int Chunks::getChunkIndex(qint64 absPos) const`
`295`	`295`	`{`
`296`	`296`	`// This routine checks, if there is already a copied chunk available. If os, it`
`297`	`297`	`// returns a reference to it. If there is no copied chunk available, original`
Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,12 @@ ColoredArea::ColoredArea(qint64 posStart, qint64 posEnd, QPen pen, QBrush backgr`
`47`	`47`	`_areaStyle = background;`
`48`	`48`	`}`
`49`	`49`
`50`		`-QPen ColoredArea::fontPen()`
	`50`	`+QPen ColoredArea::fontPen() const`
`51`	`51`	`{`
`52`	`52`	`return _fontColor;`
`53`	`53`	`}`
`54`	`54`
`55`		`-QColor ColoredArea::fontColor()`
	`55`	`+QColor ColoredArea::fontColor() const`
`56`	`56`	`{`
`57`	`57`	`return _fontColor.color();`
`58`	`58`	`}`
`@@ -62,12 +62,12 @@ void ColoredArea::setFontColor(QColor color)`
`62`	`62`	`_fontColor = QPen(color);`
`63`	`63`	`}`
`64`	`64`
`65`		`-QColor ColoredArea::areaColor()`
	`65`	`+QColor ColoredArea::areaColor() const`
`66`	`66`	`{`
`67`	`67`	`return _areaStyle.color();`
`68`	`68`	`}`
`69`	`69`
`70`		`-QBrush ColoredArea::areaStyle()`
	`70`	`+QBrush ColoredArea::areaStyle() const`
`71`	`71`	`{`
`72`	`72`	`return _areaStyle;`
`73`	`73`	`}`
`@@ -82,21 +82,21 @@ void ColoredArea::setAreaStyle(QBrush backround)`
`82`	`82`	`_areaStyle = backround;`
`83`	`83`	`}`
`84`	`84`
`85`		`-qint64 ColoredArea::posStart()`
	`85`	`+qint64 ColoredArea::posStart() const`
`86`	`86`	`{`
`87`	`87`	`return _posStart;`
`88`		`-};`
	`88`	`+}`
`89`	`89`
`90`		`-qint64 ColoredArea::posEnd()`
	`90`	`+qint64 ColoredArea::posEnd() const`
`91`	`91`	`{`
`92`	`92`	`return _posEnd;`
`93`		`-};`
	`93`	`+}`
`94`	`94`
`95`	`95`	`void ColoredArea::setRange(qint64 posStart, qint64 posEnd)`
`96`	`96`	`{`
`97`	`97`	`_posStart = posStart;`
`98`	`98`	`_posEnd = posEnd;`
`99`		`-};`
	`99`	`+}`
`100`	`100`
`101`	`101`	`void ColoredArea::clear()`
`102`	`102`	`{`
`@@ -111,7 +111,7 @@ ColorManager::ColorManager()`
`111`	`111`	`{`
`112`	`112`	`QPalette palette = qApp->palette();`
`113`	`113`	`setPalette(palette);`
`114`		`-};`
	`114`	`+}`
`115`	`115`
`116`	`116`	`void ColorManager::setPalette(const QPalette &palette)`
`117`	`117`	`{`
`@@ -123,7 +123,7 @@ void ColorManager::setPalette(const QPalette &palette)`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`// read only, copy of relevant ColoredArea is returned: you can't change anything`
`126`		`-ColoredArea ColorManager::markedArea(qint64 pos, Area area, Chunks *chunks)`
	`126`	`+ColoredArea ColorManager::markedArea(qint64 pos, Area area, Chunks *chunks) const`
`127`	`127`	`{`
`128`	`128`	`// prio 1 selection`
`129`	`129`	`if (pos >= _selection.posStart() && pos < _selection.posEnd())`
`@@ -145,9 +145,9 @@ ColoredArea ColorManager::markedArea(qint64 pos, Area area, Chunks *chunks)`
`145`	`145`	`}`
`146`	`146`	`// nothing found -> standard colors`
`147`	`147`	`return this->notMarked(area);`
`148`		`-};`
	`148`	`+}`
`149`	`149`
`150`		`-ColoredArea& ColorManager::notMarked(Area area)`
	`150`	`+const ColoredArea &ColorManager::notMarked(Area area) const`
`151`	`151`	`{`
`152`	`152`	`switch (area) {`
`153`	`153`	`case Area::Address:`
`@@ -163,15 +163,25 @@ ColoredArea& ColorManager::notMarked(Area area)`
`163`	`163`	`return _hex; // should never happen`
`164`	`164`	`}`
`165`	`165`
`166`		`-ColoredArea& ColorManager::selection()`
	`166`	`+const ColoredArea &ColorManager::selection() const`
	`167`	`+{`
	`168`	`+ return _selection;`
	`169`	`+}`
	`170`	`+`
	`171`	`+ColoredArea &ColorManager::selection()`
`167`	`172`	`{`
`168`	`173`	`return _selection;`
`169`		`-};`
	`174`	`+}`
	`175`	`+`
	`176`	`+const ColoredArea& ColorManager::highlighting() const`
	`177`	`+{`
	`178`	`+ return _highlighting;`
	`179`	`+}`
`170`	`180`
`171`	`181`	`ColoredArea& ColorManager::highlighting()`
`172`	`182`	`{`
`173`	`183`	`return _highlighting;`
`174`		`-};`
	`184`	`+}`
`175`	`185`
`176`	`186`	`void ColorManager::addUserArea(qint64 posStart, qint64 posEnd, QColor fontColor, QBrush areaStyle)`
`177`	`187`	`{`
`@@ -182,4 +192,4 @@ void ColorManager::addUserArea(qint64 posStart, qint64 posEnd, QColor fontColor,`
`182`	`192`	`void ColorManager::clearUserAreas()`
`183`	`193`	`{`
`184`	`194`	`_userAreas.clear();`
`185`		`-}`
	`195`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,6 @@ UndoStack::UndoStack(Chunks * chunks, QObject * parent)`
`113`	`113`	`: QUndoStack(parent)`
`114`	`114`	`{`
`115`	`115`	`_chunks = chunks;`
`116`		`- _parent = parent;`
`117`	`116`	`this->setUndoLimit(1000);`
`118`	`117`	`}`
`119`	`118`