diff --git a/filterlog.cpp b/filterlog.cpp
index a4a516c21..913df944b 100644
--- a/filterlog.cpp
+++ b/filterlog.cpp
@@ -153,7 +153,7 @@ bool FilterLog::saveToFile( QString fileName )
               it != mLogEntries.end(); ++it ) 
         {
           QString tmpString = *it + '\n';
-          Q3CString cstr( tmpString.local8Bit() );
+          Q3CString cstr( tmpString.toLocal8Bit() );
           ds.writeRawBytes( cstr, cstr.size() );
         }
       }
diff --git a/kmedit.cpp b/kmedit.cpp
index 5ae01588e..00d177466 100644
--- a/kmedit.cpp
+++ b/kmedit.cpp
@@ -378,7 +378,7 @@ bool KMEdit::eventFilter(QObject*o, QEvent* e)
       sysLine += " ";
       while (!sysLine.isEmpty())
       {
-        *mExtEditorProcess << sysLine.left(sysLine.find(" ")).local8Bit();
+        *mExtEditorProcess << sysLine.left(sysLine.find(" ")).toLocal8Bit();
         sysLine.remove(0, sysLine.find(" ") + 1);
       }
       connect(mExtEditorProcess, SIGNAL(processExited(KProcess*)),
diff --git a/kmfoldermaildir.cpp b/kmfoldermaildir.cpp
index 10697f5f1..d02f18365 100644
--- a/kmfoldermaildir.cpp
+++ b/kmfoldermaildir.cpp
@@ -732,7 +732,7 @@ void KMFolderMaildir::readFileHeaderIntern( const QString& dir,
                 0, status,
                 xmarkStr.trimmed(),
                 replyToIdStr, replyToAuxIdStr, msgIdStr,
-				file.local8Bit(),
+				file.toLocal8Bit(),
                 KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown,
                 KMMsgMDNStateUnknown, f.size() );
 
diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index 2268e7dd6..26aed7406 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -3343,7 +3343,7 @@ void KMMainWidget::initializeFilterActions()
         icon = "gear";
       filterAction = new KAction(as, icon, (*it)->shortcut(), filterCommand,
                                  SLOT(start()), actionCollection(),
-                                 normalizedName.local8Bit());
+                                 normalizedName.toLocal8Bit());
       if(!addedSeparator) {
         mApplyFilterActionsMenu->popupMenu()->insertSeparator();
         addedSeparator = !addedSeparator;
@@ -3425,7 +3425,7 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder )
   QString normalizedName = actionname.replace(" ", "_");
   KAction* action =
     new KAction(actionlabel, folder->shortcut(), c, SLOT(start()),
-                actionCollection(), normalizedName.local8Bit());
+                actionCollection(), normalizedName.toLocal8Bit());
   action->setIcon( folder->unreadIconPath() );
   c->setAction( action ); // will be deleted along with the command
 }
diff --git a/kmmsgbase.cpp b/kmmsgbase.cpp
index f7975dbe2..d4ba11f09 100644
--- a/kmmsgbase.cpp
+++ b/kmmsgbase.cpp
@@ -599,7 +599,7 @@ Q3CString KMMsgBase::encodeRFC2231String( const QString& _str,
   else if ( codec )
     latin = codec->fromUnicode( _str );
   else
-    latin = _str.local8Bit();
+    latin = _str.toLocal8Bit();
 
   char *l;
   for ( l = latin.data(); *l; ++l ) {
diff --git a/messagecomposer.cpp b/messagecomposer.cpp
index e86a8b796..53b37cdf7 100644
--- a/messagecomposer.cpp
+++ b/messagecomposer.cpp
@@ -2051,7 +2051,7 @@ Q3CString MessageComposer::plainTextFromMarkup( const QString& markupText )
     textbody = KMMsgBase::toUsAscii( text );
   } else if( codec == 0 ) {
     kDebug(5006) << "Something is wrong and I can not get a codec." << endl;
-    textbody = text.local8Bit();
+    textbody = text.toLocal8Bit();
   } else {
     textbody = codec->fromUnicode( text );
   }
@@ -2081,7 +2081,7 @@ Q3CString MessageComposer::breakLinesAndApplyCodec()
     newText = QString::fromLatin1( cText );
   } else if( codec == 0 ) {
     kDebug(5006) << "Something is wrong and I can not get a codec." << endl;
-    cText = text.local8Bit();
+    cText = text.toLocal8Bit();
     newText = QString::fromLocal8Bit( cText );
   } else {
     cText = codec->fromUnicode( text );