Q3StyleSheet--

svn path=/trunk/KDE/kdepim/; revision=667334

imapaccountbase.cpp

@@ -942,9 +942,9 @@ bool ImapAccountBase::handlePutError( KIO::Job *job, jobData &jd, KMFolder *fold
   QString myError = "<p><b>" +
                     i18n("Error while uploading message") +
                     "</b></p><p>" +
-                    i18n("Could not upload the message dated %1 from %2 with subject %3 on the server.", msg->dateStr(), Qt::escape( from ), Q3StyleSheet::escape( subject ) ) +
+                    i18n("Could not upload the message dated %1 from %2 with subject %3 on the server.", msg->dateStr(), Qt::escape( from ), Qt::escape( subject ) ) +
                     "</p><p>" +
-                    i18n("The destination folder was %1, which has the URL %2.", Qt::escape( folder->label() ), Q3StyleSheet::escape( jd.htmlURL() ) ) +
+                    i18n("The destination folder was %1, which has the URL %2.", Qt::escape( folder->label() ), Qt::escape( jd.htmlURL() ) ) +
                     "</p><p>" +
                     i18n("The error message from the server communication is here:") +
                     "</p>";

kmacctimap.cpp

@@ -51,9 +51,9 @@ using KPIM::ProgressManager;
 #include <kio/slave.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
+#include <qtextdocument.h>
 
 #include <QList>
-#include <Q3StyleSheet>
 
 #include <errno.h>
 
@@ -297,7 +297,7 @@ void KMAcctImap::processNewMail(bool interactive)
   mMailCheckProgressItem =
     ProgressManager::createProgressItem(
         "MailCheckAccount" + name(),
-        i18n( "Checking account: %1", Q3StyleSheet::escape( name() ) ),
+        i18n( "Checking account: %1", Qt::escape( name() ) ),
         QString(), // status
         true, // can be canceled
         useSSL() || useTLS() );

kmfolderimap.cpp

@@ -62,7 +62,7 @@ using KMail::RenameJob;
 #include <QList>
 #include <QTextCodec>
 #include <QByteArray>
-#include <Q3StyleSheet>
+#include <qtextdocument.h>
 
 #include <assert.h>
 
@@ -270,7 +270,7 @@ void KMFolderImap::remove()
   jd.progressItem = ProgressManager::createProgressItem(
                       "ImapFolderRemove" + ProgressManager::getUniqueID(),
                       i18n("Removing folder"),
-                      i18n( "URL: %1", Q3StyleSheet::escape( folder()->prettyUrl() ) ),
+                      i18n( "URL: %1", Qt::escape( folder()->prettyUrl() ) ),
                       false,
                       account()->useSSL() || account()->useTLS() );
   account()->insertJob(job, jd);
@@ -514,7 +514,7 @@ int KMFolderImap::addMsg(QList<KMMessage*>& msgList, QList<int>& aIndex_ret)
       mAddMessageProgressItem = ProgressManager::createProgressItem(
           "Uploading"+ProgressManager::getUniqueID(),
           i18n("Uploading message data"),
-          i18n("Destination folder: %1", Q3StyleSheet::escape( folder()->prettyUrl() ) ),
+          i18n("Destination folder: %1", Qt::escape( folder()->prettyUrl() ) ),
           true,
           account()->useSSL() || account()->useTLS() );
       mAddMessageProgressItem->setTotalItems( msgList.count() );