Refactoring: replace QGString by std::ostringstream

doxygen · Mar 23, 2021 · 5d0281a · 5d0281a
1 parent 38e9ec6
commit 5d0281a
Show file tree

Hide file tree

Showing 31 changed files with 418 additions and 829 deletions.
diff --git a/qtools/CMakeLists.txt b/qtools/CMakeLists.txt
@@ -12,7 +12,6 @@ qgarray.cpp
 qgdict.cpp
 qglist.cpp
 qglobal.cpp
-qgstring.cpp
 qiodevice.cpp
 qregexp.cpp
 qstring.cpp

diff --git a/qtools/qcstring.cpp b/qtools/qcstring.cpp
@@ -14,7 +14,6 @@
  */
 
 #include "qcstring.h"
-#include "qgstring.h"
 
 #include <qstring.h>
 #include <limits.h>
@@ -585,16 +584,6 @@ QDataStream &operator>>( QDataStream &s, QCString &str )
 
 #endif //QT_NO_DATASTREAM
 
-inline QCString operator+( const QCString &s1, const QGString &s2 )
-{
-  return s1.str()+s2.data();
-}
-
-inline QCString operator+( const QGString &s1, const QCString &s2 )
-{
-  return s1.data()+s2.str();
-}
-
 /// substitute all occurrences of \a src in \a s by \a dst
 QCString substitute(const QCString &s,const QCString &src,const QCString &dst)
 {

diff --git a/qtools/qcstring.h b/qtools/qcstring.h
@@ -31,8 +31,6 @@
 #include <cstdint>
 #include <ostream>
 
-class QGString;
-
 /*****************************************************************************
   Safe and portable C string functions; extensions to standard string.h
  *****************************************************************************/
@@ -464,10 +462,6 @@ inline QCString operator+( const QCString &s1, const QCString &s2 )
 }
 
 
-inline QCString operator+( const QCString &s1, const QGString &s2 );
-inline QCString operator+( const QGString &s1, const QCString &s2 );
-
-
 inline QCString operator+( const QCString &s1, const char *s2 )
 {
     QCString tmp(s1);

diff --git a/qtools/qgstring.cpp b/qtools/qgstring.cpp