From 345de8b5a987299d2e91edf8dd670d3cb7aae391 Mon Sep 17 00:00:00 2001
From: Marc Mutz <mutz@kde.org>
Date: Fri, 15 Jun 2001 16:56:08 +0000
Subject: [PATCH] Obviously corrent fixes to let these files compile with
 QT_NO_ASCII_CAST and QT_NO_COMPAT, resp.

svn path=/trunk/kdenetwork/kmail/; revision=102369
---
 kmfolderseldlg.cpp | 4 +---
 kmidentity.cpp     | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/kmfolderseldlg.cpp b/kmfolderseldlg.cpp
index f8fcf3286..e7a393f8b 100644
--- a/kmfolderseldlg.cpp
+++ b/kmfolderseldlg.cpp
@@ -1,4 +1,3 @@
-#undef QT_NO_ASCII_CAST
 // kmfolderseldlg.cpp
 
 #include "kmfolderseldlg.h"
@@ -10,7 +9,6 @@
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qlayout.h>
-#include <unistd.h>
 #include <kapp.h>
 #include <qaccel.h>
 #include <kbuttonbox.h>
@@ -20,7 +18,7 @@ QString KMFolderSelDlg::oldSelection;
 
 //-----------------------------------------------------------------------------
 KMFolderSelDlg::KMFolderSelDlg(QString caption):
-  KMFolderSelDlgInherited(NULL, caption, TRUE)
+  KMFolderSelDlgInherited(0, 0, TRUE) // no parent, no name, but modal
 {
   QPushButton *btnCancel, *btnOk;
   QBoxLayout* box = new QVBoxLayout(this, 2, 0);
diff --git a/kmidentity.cpp b/kmidentity.cpp
index 866f8a596..c2019ad43 100644
--- a/kmidentity.cpp
+++ b/kmidentity.cpp
@@ -1,4 +1,3 @@
-#undef QT_NO_COMPAT
 // kmidentity.cpp
 
 #include "kmidentity.h"
@@ -251,7 +250,7 @@ QString KMIdentity::signature(void) const
 
     if (rc != 0)
     {
-      QString wmsg = i18n("Failed to execute signature script\n%1:\n%2").arg(sigcmd.data()).arg(strerror(errno));
+      QString wmsg = i18n("Failed to execute signature script\n%1:\n%2").arg(sigcmd).arg(strerror(errno));
       KMessageBox::information(0, wmsg);
       return QString::null;
     }