1 files changed, 15 insertions, 12 deletions

diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 0b4c322..f1e0225 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -1,42 +1,45 @@
 // CHANGED 2004-08-06 Lutz Rogowski
+
+
+
+#include <kfiledialog.h>
+#include "koprefs.h"
+#include <klocale.h>
+#include <kglobal.h>
+#include <kapplication.h>
+
+#ifdef  MINIKDE_KDIALOG_H
+#undef MINIKDE_KDIALOG_H
+#endif
+
 #include "composemail.h"
 #include "viewmail.h"
 
 #include <libmailwrapper/settings.h>
 #include <libmailwrapper/abstractmail.h>
 #include <libmailwrapper/mailtypes.h>
-#include <kapplication.h>
-
-/* OPIE */
-//#include <opie2/odebug.h>
-//#include <opie2/ofiledialog.h>
-//#include <opie2/oimagescrollview.h>
 
-#include <kfiledialog.h>
-#include <kdialog.h>
+#include <qdialog.h>
 
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qtextbrowser.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qfile.h>
 #include <qlayout.h>
-#include "koprefs.h"
-#include <klocale.h>
-#include <kglobal.h>
 
 //using namespace Opie::Ui;
 //using namespace Opie::Core;
 
 AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
                        const QString&fsize,int num,const QValueList<int>&path)
         : QListViewItem(parent,after),_partNum(num)
 {
     _path=path;
     setText(0, mime);
     setText(1, desc);
     setText(2, file);
@@ -504,25 +507,25 @@ void ViewMail::slotForward()
 
 void ViewMail::slotDeleteMail( )
 {
     if ( QMessageBox::warning(this, i18n("Delete Mail"), QString( i18n("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
     {
         m_recMail->Wrapper()->deleteMail( m_recMail );
         hide();
         deleted = true;
     }
 }
 
 MailImageDlg::MailImageDlg(const QString&fname,QWidget *parent, const char *name, bool modal, WFlags f)
-    : KDialog(parent,name,modal)
+    : QDialog(parent,name,modal)
 {
     QVBoxLayout*dlglayout = new QVBoxLayout(this);
     dlglayout->setSpacing(2);
     dlglayout->setMargin(1);
     //m_imageview = new Opie::MM::OImageScrollView(this);
     //dlglayout->addWidget(m_imageview);
 }
 
 MailImageDlg::~MailImageDlg()
 {
 }