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

List:       kde-commits
Subject:    KDE/kdepim/kmail
From:       Laurent Montel <montel () kde ! org>
Date:       2005-12-11 16:48:43
Message-ID: 1134319723.604171.30873.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 487708 by mlaurent:

Q3CString--


 M  +2 -4      antispamconfig.cpp  
 M  +4 -8      antispamconfig.h  


--- trunk/KDE/kdepim/kmail/antispamconfig.cpp #487707:487708
@@ -37,8 +37,6 @@
 
 #include <kstaticdeleter.h>
 #include <kconfig.h>
-//Added by qt3to4:
-#include <Q3CString>
 #include <QStringList>
 
 using namespace KMail;
@@ -65,8 +63,8 @@
     KConfigGroup tool( &config, QString("Spamtool #%1").arg( i ) );
     if ( tool.hasKey( "ScoreHeader" ) ) {
       QString name      = tool.readEntry( "ScoreName" );
-      Q3CString header   = tool.readEntry( "ScoreHeader" ).toLatin1();
-      Q3CString type     = tool.readEntry( "ScoreType" ).toLatin1();
+      QByteArray header   = tool.readEntry( "ScoreHeader" ).latin1();
+      QByteArray type     = tool.readEntry( "ScoreType" ).latin1();
       QString score     = tool.readEntryUntranslated( "ScoreValueRegexp" );
       QString threshold = tool.readEntryUntranslated( "ScoreThresholdRegexp" );
       SpamAgentTypes typeE = SpamAgentNone;
--- trunk/KDE/kdepim/kmail/antispamconfig.h #487707:487708
@@ -34,13 +34,9 @@
 #ifndef __KMAIL_ANTISPAMCONFIG_H__
 #define __KMAIL_ANTISPAMCONFIG_H__
 
-#include <q3valuelist.h>
 #include <qregexp.h>
-//Added by qt3to4:
-#include <Q3CString>
-
+#include <QList>
 class QString;
-class Q3CString;
 
 namespace KMail {
 
@@ -56,21 +52,21 @@
   class SpamAgent {
   public:
     SpamAgent() : mType( SpamAgentNone ) {}
-    SpamAgent( const QString & name, SpamAgentTypes type, const Q3CString & field,
+    SpamAgent( const QString & name, SpamAgentTypes type, const QByteArray & field,
                const QRegExp & score, const QRegExp & threshold )
       : mName( name ), mType( type ), mField( field ),
         mScore( score ), mThreshold( threshold ) {}
 
     QString name() const { return mName; }
     SpamAgentTypes scoreType() const { return mType; }
-    Q3CString header() const { return mField; }
+    QByteArray header() const { return mField; }
     QRegExp scorePattern() const { return mScore; }
     QRegExp thresholdPattern() const { return mThreshold; }
 
   private:
     QString mName;
     SpamAgentTypes mType;
-    Q3CString mField;
+    QByteArray mField;
     QRegExp mScore;
     QRegExp mThreshold;
   };
[prev in list] [next in list] [prev in thread] [next in thread]