[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim
From:       Laurent Montel <montel () kde ! org>
Date:       2005-12-27 15:48:41
Message-ID: 1135698521.833086.14049.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 491788 by mlaurent:

Q3Cstring--


 M  +4 -5      kaddressbook/kabcore.cpp  
 M  +1 -2      kaddressbook/xxport/bookmark_xxport.h  
 M  +1 -4      kaddressbook/xxport/gnokii_xxport.cpp  
 M  +9 -9      kioslave/imap4/mailaddress.cc  
 M  +11 -11    kioslave/imap4/mailaddress.h  
 M  +1 -1      libkmime/kmime_util.cpp  
 M  +1 -1      libkmime/kmime_util.h  


--- trunk/KDE/kdepim/kaddressbook/kabcore.cpp #491787:491788
@@ -32,7 +32,6 @@
 #include <QVBoxLayout>
 #include <QList>
 #include <QHBoxLayout>
-#include <Q3CString>
 
 #include <kabc/addresseelist.h>
 #include <kabc/errorhandler.h>
@@ -1279,14 +1278,14 @@
 bool KABCore::handleCommandLine( KAddressBookIface* iface )
 {
   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-  Q3CString addrStr = args->getOption( "addr" );
-  Q3CString uidStr = args->getOption( "uid" );
+  QString addrStr = args->getOption( "addr" );
+  QString uidStr = args->getOption( "uid" );
 
   QString addr, uid, vcard;
   if ( !addrStr.isEmpty() )
-    addr = QString::fromLocal8Bit( addrStr );
+    addr = addrStr ;
   if ( !uidStr.isEmpty() )
-    uid = QString::fromLocal8Bit( uidStr );
+    uid = uidStr;
 
   bool doneSomething = false;
 
--- trunk/KDE/kdepim/kaddressbook/xxport/bookmark_xxport.h #491787:491788
@@ -27,7 +27,6 @@
 
 #include <xxport.h>
 //Added by qt3to4:
-#include <Q3CString>
 
 class BookmarkXXPort : public KAB::XXPort
 {
@@ -46,7 +45,7 @@
       The following signals are used for building a bookmarks file
       using KBookmarkDomBuilder.
      */
-    void newBookmark( const QString &text, const Q3CString &url, const QString &additionnalInfo );
+    void newBookmark( const QString &text, const QString &url, const QString &additionnalInfo );
     void newFolder( const QString &text, bool open, const QString &additionnalInfo );
     void newSeparator();
     void endFolder();
--- trunk/KDE/kdepim/kaddressbook/xxport/gnokii_xxport.cpp #491787:491788
@@ -34,9 +34,6 @@
 #include "config.h"
 
 #include <qcursor.h>
-//Added by qt3to4:
-#include <Q3CString>
-
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -160,7 +157,7 @@
 	data.revision = revision;
 	data.imei = imei;
 
-	Q3CString unknown(GN_TO(i18n("Unknown")));
+	QByteArray unknown(GN_TO(i18n("Unknown")));
 	qstrncpy(manufacturer, unknown, sizeof(manufacturer)-1);
 	qstrncpy(model, unknown, sizeof(model)-1);
 	qstrncpy(revision, unknown, sizeof(revision)-1);
--- trunk/KDE/kdepim/kioslave/imap4/mailaddress.cc #491787:491788
@@ -27,7 +27,7 @@
 #include "mimehdrline.h"
 #include <kmime_util.h>
 //Added by qt3to4:
-#include <Q3CString>
+#include <QByteArray>
 #include <Q3PtrList>
 
 mailAddress::mailAddress ()
@@ -96,15 +96,15 @@
       {
       case '"':
         advance = mimeHdrLine::parseQuoted ('"', '"', aCStr);
-        rawFullName += Q3CString (aCStr, advance + 1);
+        rawFullName += QByteArray (aCStr, advance + 1);
         break;
       case '(':
         advance = mimeHdrLine::parseQuoted ('(', ')', aCStr);
-        rawComment += Q3CString (aCStr, advance + 1);
+        rawComment += QByteArray (aCStr, advance + 1);
         break;
       case '<':
         advance = mimeHdrLine::parseQuoted ('<', '>', aCStr);
-        user = Q3CString (aCStr, advance + 1); // copy it
+        user = QByteArray (aCStr, advance + 1); // copy it
         len = advance;
         user = user.mid (1, len - 2);  // strip <>
         len -= 2;
@@ -119,7 +119,7 @@
         {
           if (*aCStr != ',')
           {
-            rawFullName += Q3CString (aCStr, advance + 1);
+            rawFullName += QByteArray (aCStr, advance + 1);
             if (mimeHdrLine::skipWS ((const char *) &aCStr[advance]) > 0)
             {
               rawFullName += ' ';
@@ -199,10 +199,10 @@
   return retVal;
 }
 
-const Q3CString
+const QByteArray
 mailAddress::getStr ()
 {
-  Q3CString retVal(128); // Should be generally big enough
+  QByteArray retVal(128); // Should be generally big enough
 
   if (!rawFullName.isEmpty ())
   {
@@ -245,7 +245,7 @@
 }
 
 void
-mailAddress::setCommentRaw (const Q3CString & _str)
+mailAddress::setCommentRaw (const QByteArray & _str)
 {
   rawComment = _str;
 }
@@ -261,7 +261,7 @@
   return rfcDecoder::decodeRFC2047String (rawComment);
 }
 
-const Q3CString &
+const QByteArray &
 mailAddress::getCommentRaw () const
 {
   return rawComment;
--- trunk/KDE/kdepim/kioslave/imap4/mailaddress.h #491787:491788
@@ -37,19 +37,19 @@
     mailAddress (const mailAddress &);
     mailAddress & operator = (const mailAddress &);
 
-  void setUser (const Q3CString & aUser)
+  void setUser (const QByteArray & aUser)
   {
     user = aUser;
   }
-  const Q3CString & getUser () const
+  const QByteArray & getUser () const
   {
     return user;
   }
-  void setHost (const Q3CString & aHost)
+  void setHost (const QByteArray & aHost)
   {
     host = aHost;
   }
-  const Q3CString & getHost () const
+  const QByteArray & getHost () const
   {
     return host;
   }
@@ -58,12 +58,12 @@
   const QString getFullName () const;
 
   void setComment (const QString & aComment);
-  void setCommentRaw (const Q3CString &);
+  void setCommentRaw (const QByteArray &);
   const QString getComment () const;
-  const Q3CString & getCommentRaw () const;
+  const QByteArray & getCommentRaw () const;
 
   int parseAddress (const char *);
-  const Q3CString getStr ();
+  const QByteArray getStr ();
   bool isEmpty () const;
 
   static QString emailAddrAsAnchor (const mailAddress &, bool);
@@ -72,10 +72,10 @@
   void clear();
 
 private:
-  Q3CString user;
-  Q3CString host;
-  Q3CString rawFullName;
-  Q3CString rawComment;
+  QByteArray user;
+  QByteArray host;
+  QByteArray rawFullName;
+  QByteArray rawComment;
 };
 
 #endif
--- trunk/KDE/kdepim/libkmime/kmime_util.cpp #491787:491788
@@ -472,7 +472,7 @@
 }
 
 
-void addQuotes(Q3CString &str, bool forceQuotes)
+void addQuotes(QByteArray &str, bool forceQuotes)
 {
   bool needsQuotes=false;
   for (int i=0; i < str.length(); i++) {
--- trunk/KDE/kdepim/libkmime/kmime_util.h #491787:491788
@@ -165,7 +165,7 @@
       @param str us-ascii string to work on.
       @param forceQuotes if @p true, always add quote characters.
   */
-  KDE_EXPORT extern void addQuotes(Q3CString &str, bool forceQuotes);
+  KDE_EXPORT extern void addQuotes(QByteArray &str, bool forceQuotes);
 
 
   /**
[prev in list] [next in list] [prev in thread] [next in thread]