[dyntrans-cvs] qt-tr/src/tools qtrstring.cpp,1.3,1.4 qtrstring.h,1.3,1.4

[Krzysztof L. <kli...@us...>]

Update of /cvsroot/dyntrans/qt-tr/src/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11913/src/tools

Modified Files:
	qtrstring.cpp qtrstring.h 
Log Message:
* Implemented editing translation for QPopupMenu.
* Added find/findRev/contains methods to QTrString.
* Added declaration of arg() methods to QTrString.
* Added QTrString::operator!() and QTrString::null.


Index: qtrstring.h
===================================================================
RCS file: /cvsroot/dyntrans/qt-tr/src/tools/qtrstring.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qtrstring.h	26 Sep 2004 22:59:23 -0000	1.3
+++ qtrstring.h	27 Sep 2004 23:47:18 -0000	1.4
@@ -71,11 +71,74 @@
     */
     operator QString() const;
     
+    static QTrString null;
+    
     QTrString    &operator=( const QTrString & );   // deep copy
     bool        isNull()        const;
     bool        isEmpty()       const;
     uint        length()        const;
     
+    bool operator!() const
+    { 
+        return this->isNull(); 
+    }
+    
+    //arg methods
+    QTrString arg( long a, int fieldWidth = 0, int base = 10 ) const;
+    QTrString arg( ulong a, int fieldWidth = 0, int base = 10 ) const;
+    QTrString arg( Q_LLONG a, int fieldwidth=0, int base=10 ) const;
+    QTrString arg( Q_ULLONG a, int fieldwidth=0, int base=10 ) const;
+    QTrString arg( int a, int fieldWidth = 0, int base = 10 ) const;
+    QTrString arg( uint a, int fieldWidth = 0, int base = 10 ) const;
+    QTrString arg( short a, int fieldWidth = 0, int base = 10 ) const;
+    QTrString arg( ushort a, int fieldWidth = 0, int base = 10 ) const;
+    QTrString arg( double a, int fieldWidth = 0, char fmt = 'g',
+		 int prec = -1 ) const;
+    QTrString arg( char a, int fieldWidth = 0 ) const;
+    QTrString arg( QChar a, int fieldWidth = 0 ) const;
+    QTrString arg( const QString& a, int fieldWidth = 0 ) const;
+    QTrString arg( const QString& a1, const QString& a2 ) const;
+    QTrString arg( const QString& a1, const QString& a2,
+		 const QString& a3 ) const;
+    QTrString arg( const QString& a1, const QString& a2, const QString& a3,
+		 const QString& a4 ) const;
+    
+    QTrString arg( const QTrString& a, int fieldWidth = 0 ) const;
+    QTrString arg( const QTrString& a1, const QTrString& a2 ) const;
+    QTrString arg( const QTrString& a1, const QTrString& a2,
+		 const QTrString& a3 ) const;
+    QTrString arg( const QTrString& a1, const QTrString& a2, const QTrString& a3,
+		 const QTrString& a4 ) const;
+    
+    //find methods
+    int         find( QChar c, int index=0, bool cs=TRUE ) const;
+    int         find( char c, int index=0, bool cs=TRUE ) const;
+    int         find( const QString &str, int index=0, bool cs=TRUE ) const;
+#ifndef QT_NO_REGEXP
+    int         find( const QRegExp &, int index=0 ) const;
+#endif
+#ifndef QT_NO_CAST_ASCII
+    int         find( const char* str, int index=0 ) const;
+#endif
+    int         findRev( QChar c, int index=-1, bool cs=TRUE) const;
+    int         findRev( char c, int index=-1, bool cs=TRUE) const;
+    int         findRev( const QString &str, int index=-1, bool cs=TRUE) const;
+#ifndef QT_NO_REGEXP
+    int         findRev( const QRegExp &, int index=-1 ) const;
+#endif
+#ifndef QT_NO_CAST_ASCII
+    int         findRev( const char* str, int index=-1 ) const;
+#endif
+    int         contains( QChar c, bool cs=TRUE ) const;
+    int         contains( char c, bool cs=TRUE ) const;
+#ifndef QT_NO_CAST_ASCII
+    int         contains( const char* str, bool cs=TRUE ) const;
+#endif
+    int         contains( const QString &str, bool cs=TRUE ) const;
+#ifndef QT_NO_REGEXP
+    int         contains( const QRegExp & ) const;
+#endif
+    
     virtual ~QTrString();
     
 protected:
@@ -84,4 +147,89 @@
 
 QTrString operator+(QTrString const & left, QTrString const & right);
 
+inline int QTrString::find( QChar c, int index, bool cs) const
+{
+    return this->getTranslation().find(c, index, cs);
+}
+
+inline int QTrString::find( char c, int index, bool cs) const
+{
+    return this->getTranslation().find(c, index, cs);
+}
+
+inline int QTrString::find( const QString &str, int index, bool cs) const
+{
+    return this->getTranslation().find(str, index, cs);
+}
+
+#ifndef QT_NO_REGEXP
+inline int QTrString::find( const QRegExp &regexp, int index) const
+{
+    return this->getTranslation().find(regexp, index);
+}
+#endif
+#ifndef QT_NO_CAST_ASCII
+inline int QTrString::find( const char* str, int index) const
+{
+    return this->getTranslation().find(str, index);
+}
+#endif
+inline int QTrString::findRev( QChar c, int index, bool cs) const
+{
+    return this->getTranslation().findRev(c, index, cs);
+}
+
+inline int QTrString::findRev( char c, int index, bool cs) const
+{
+    return this->getTranslation().findRev(c, index, cs);
+}
+
+inline int QTrString::findRev( const QString &str, int index, bool cs) const
+{
+    return this->getTranslation().findRev(str, index, cs);
+}
+
+#ifndef QT_NO_REGEXP
+inline int QTrString::findRev( const QRegExp & regexp, int index) const
+{
+    return this->getTranslation().findRev(regexp, index);
+}
+
+#endif
+#ifndef QT_NO_CAST_ASCII
+inline int QTrString::findRev( const char* str, int index) const
+{
+    return this->getTranslation().findRev(str, index);
+}
+
+#endif
+inline int QTrString::contains( QChar c, bool cs) const
+{
+    return this->getTranslation().contains(c, cs);
+}
+
+inline int QTrString::contains( char c, bool cs) const
+{
+    return this->getTranslation().contains(c, cs);
+}
+
+#ifndef QT_NO_CAST_ASCII
+inline int QTrString::contains( const char* str, bool cs) const
+{
+    return this->getTranslation().contains(str, cs);
+}
+#endif
+inline int QTrString::contains( const QString &str, bool cs) const
+{
+    return this->getTranslation().contains(str, cs);
+}
+
+#ifndef QT_NO_REGEXP
+inline int QTrString::contains( const QRegExp & regexp) const
+{
+    return this->getTranslation().contains(regexp);
+}
+#endif
+
+
 #endif //#ifdef _QTRSTRING_H_00333

Index: qtrstring.cpp
===================================================================
RCS file: /cvsroot/dyntrans/qt-tr/src/tools/qtrstring.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qtrstring.cpp	26 Sep 2004 22:59:23 -0000	1.3
+++ qtrstring.cpp	27 Sep 2004 23:47:18 -0000	1.4
@@ -21,10 +21,12 @@
 QTrString::QTrString(
 	QString const & qstring
 	):
-	element(new QUntranslatedTrStringElement(qstring))
+	element(new QUntranslatedTrStringElement(qstring.isNull() ? "" : qstring))
 {
 }
 
+QTrString QTrString::null = QTrString();
+
 QTrString::QTrString(
 	char const* const string
 	):
@@ -39,12 +41,12 @@
 {
 }
 
-QString QTrString::getTranslation() const
+QString QTrString::getTranslation(QString variantTag) const
 {
-	return this->element->getTranslation();
+	return this->element->getTranslation(variantTag);
 }
 
-bool QTrString::translationValid() const
+bool QTrString::translationValid(QString variantTag) const
 {
 	return this->element->translationValid();
 }
@@ -75,7 +77,11 @@
 
 bool QTrString::isNull() const
 {
-	return this->getTranslation().isNull();
+	if (this == (&QTrString::null))
+    {
+        return TRUE;
+    }
+    return FALSE;
 }
 
 bool QTrString::isEmpty() const
@@ -101,3 +107,33 @@
         );
 }
 
+#if 0
+//FIXME: implement arg methods
+    //arg methods
+    QTrString arg( long a, int fieldWidth = 0, int base = 10 ) const;
+    QTrString arg( ulong a, int fieldWidth = 0, int base = 10 ) const;
+    QTrString arg( Q_LLONG a, int fieldwidth=0, int base=10 ) const;
+    QTrString arg( Q_ULLONG a, int fieldwidth=0, int base=10 ) const;
+    QTrString arg( int a, int fieldWidth = 0, int base = 10 ) const;
+    QTrString arg( uint a, int fieldWidth = 0, int base = 10 ) const;
+    QTrString arg( short a, int fieldWidth = 0, int base = 10 ) const;
+    QTrString arg( ushort a, int fieldWidth = 0, int base = 10 ) const;
+    QTrString arg( double a, int fieldWidth = 0, char fmt = 'g',
+		 int prec = -1 ) const;
+    QTrString arg( char a, int fieldWidth = 0 ) const;
+    QTrString arg( QChar a, int fieldWidth = 0 ) const;
+    QTrString arg( const QString& a, int fieldWidth = 0 ) const;
+    QTrString arg( const QString& a1, const QString& a2 ) const;
+    QTrString arg( const QString& a1, const QString& a2,
+		 const QString& a3 ) const;
+    QTrString arg( const QString& a1, const QString& a2, const QString& a3,
+		 const QString& a4 ) const;
+    
+    QTrString arg( const QTrString& a, int fieldWidth = 0 ) const;
+    QTrString arg( const QTrString& a1, const QTrString& a2 ) const;
+    QTrString arg( const QTrString& a1, const QTrString& a2,
+		 const QTrString& a3 ) const;
+    QTrString arg( const QTrString& a1, const QTrString& a2, const QTrString& a3,
+		 const QTrString& a4 ) const;
+
+#endif