Some more fixes

4 files changed, 10 insertions, 10 deletions

diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 14feeee..01dd406 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -37,10 +37,10 @@
 
 
 //using namespace Opie::Core;
 //using namespace Opie::Ui;
-ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags )
-    : ComposeMailUI( parent, name, modal, flags )
+ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal )
+    : ComposeMailUI( parent, name, modal )
 {
    
     mPickLineEdit = 0;
     connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)),
diff --git a/kmicromail/composemail.h b/kmicromail/composemail.h
index 657f665..e20d9e1 100644
--- a/kmicromail/composemail.h
+++ b/kmicromail/composemail.h
@@ -17,9 +17,9 @@ class AddressPicker : public AddressPickerUI
 {
     //Q_OBJECT
 
 public:
-    AddressPicker( QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
+    AddressPicker( QWidget *parent = 0, const char *name = 0, bool modal = false );
     static QString getNames();
 
 protected:
     QString selectedNames;
@@ -34,9 +34,9 @@ class ComposeMail : public ComposeMailUI
     Q_OBJECT
 
 public:
    
-    ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
+    ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false );
     virtual ~ComposeMail();
 
     void reEditMail(const Opie::Core::OSmartPointer<RecMail>&current);
 
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index a1c5645..0c581c0 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -22,11 +22,11 @@
 //#include <qpe/qpeapplication.h>
 
 /* QT */
 
-using namespace Opie::Core;
+//using namespace Opie::Core;
 
-OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
+OpieMail::OpieMail( QWidget *parent, const char *name )
     : MainWindow( parent, name) //, WStyle_ContextHelp )
 {
     settings = new Settings();
 
@@ -112,9 +112,9 @@ void OpieMail::slotwriteMail2(const QString& namemail )
 }
 void OpieMail::slotwriteMail(const QString&name,const QString&email)
 {
     // qDebug("OpieMail::slotwriteMail ");
-    ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp );
+    ComposeMail compose( settings, this, 0, true );
     if (!email.isEmpty())
     {
         if (!name.isEmpty())
         {
@@ -416,9 +416,9 @@ void OpieMail::slotMoveCopyAllMail()
 void OpieMail::reEditMail()
 {
     if (!mailView->currentItem()) return;
 
-    ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp );
+    ComposeMail compose( settings, this, 0, true );
     compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data());
     compose.slotAdjustColumns();
     compose.showMaximized();
     compose.exec();
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index 934f232..7434e59 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -12,11 +12,11 @@ class OpieMail : public MainWindow
 {
     Q_OBJECT
 
 public:
-    OpieMail( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
+    OpieMail( QWidget *parent = 0, const char *name = 0 );
     virtual ~OpieMail();
-    static QString appName() { return QString::fromLatin1("opiemail"); }
+    static QString appName() { return QString::fromLatin1("kopiemail"); }
 
 public slots:
     virtual void slotwriteMail(const QString&name,const QString&email);
     virtual void slotwriteMail2(const QString&nameemail);