diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2004-12-06 18:20:45 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2004-12-06 18:20:45 (GMT) |
| commit | b6ef778f99fb691dc98832a43bd14cbd7e23d820 (patch) | |
| tree | db6a4cf330b3c7b7dc387321cabe709ba675e957 /qtools | |
| parent | 02aa9b678dbeb1867c68278045b28d7bc1683f7c (diff) | |
| download | Doxygen-b6ef778f99fb691dc98832a43bd14cbd7e23d820.zip Doxygen-b6ef778f99fb691dc98832a43bd14cbd7e23d820.tar.gz Doxygen-b6ef778f99fb691dc98832a43bd14cbd7e23d820.tar.bz2 | |
Doxygen-1.3.9.1-20041206
Diffstat (limited to 'qtools')
| -rw-r--r-- | qtools/qcstring.h | 8 | ||||
| -rw-r--r-- | qtools/qstring.cpp | 8 | ||||
| -rw-r--r-- | qtools/qstring.h | 1 | ||||
| -rw-r--r-- | qtools/qtools.pro.in | 3 |
4 files changed, 19 insertions, 1 deletions
diff --git a/qtools/qcstring.h b/qtools/qcstring.h index 073a969..e735462 100644 --- a/qtools/qcstring.h +++ b/qtools/qcstring.h @@ -49,6 +49,8 @@ #include <strings.h> #endif +//#undef SMALLSTRING +#define SMALLSTRING /***************************************************************************** Fixes and workarounds for some platforms @@ -166,6 +168,11 @@ Q_EXPORT QDataStream &operator>>( QDataStream &, QByteArray & ); +#ifdef SMALLSTRING +#define SCString QCString +#include "scstring.h" +#else + /***************************************************************************** QCString class *****************************************************************************/ @@ -252,6 +259,7 @@ public: QCString &operator+=( char c ); }; +#endif /***************************************************************************** QCString stream functions diff --git a/qtools/qstring.cpp b/qtools/qstring.cpp index e13ffc8..4707fed 100644 --- a/qtools/qstring.cpp +++ b/qtools/qstring.cpp @@ -12212,6 +12212,14 @@ QString::QString( const QByteArray& ba ) d = new QStringData(uc,l,l); } +QString::QString( const QCString& ba ) +{ + Q2HELPER(stat_construct_ba++) + uint l; + QChar *uc = internalAsciiToUnicode(ba,&l); + d = new QStringData(uc,l,l); +} + /*! Constructs a string that is a deep copy of the first \a length QChar in the array \a unicode. diff --git a/qtools/qstring.h b/qtools/qstring.h index f131446..c64d756 100644 --- a/qtools/qstring.h +++ b/qtools/qstring.h @@ -353,6 +353,7 @@ public: QString( QChar ); // one-char string QString( const QString & ); // impl-shared copy QString( const QByteArray& ); // deep copy + QString( const QCString& ); // deep copy QString( const QChar* unicode, uint length ); // deep copy #ifndef QT_NO_CAST_ASCII QString( const char *str ); // deep copy diff --git a/qtools/qtools.pro.in b/qtools/qtools.pro.in index 37fc143..718803e 100644 --- a/qtools/qtools.pro.in +++ b/qtools/qtools.pro.in @@ -7,6 +7,7 @@ HEADERS = qarray.h \ qcollection.h \ qconfig.h \ qcstring.h \ + scstring.h \ qdatastream.h \ qdatetime.h \ qdict.h \ @@ -45,7 +46,7 @@ HEADERS = qarray.h \ qmodules.h SOURCES = qbuffer.cpp \ qcollection.cpp \ - qcstring.cpp \ + scstring.cpp \ qdatastream.cpp \ qdatetime.cpp \ qdir.cpp \ |