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
wilder-work
Marc Mutz 25 years ago
parent 6b73159f0a
commit 345de8b5a9
  1. 4
      kmfolderseldlg.cpp
  2. 3
      kmidentity.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);

@ -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;
}

Loading…
Cancel
Save