-rw-r--r-- | kmicromail/main.cpp | 13 | ||||
-rw-r--r-- | kmicromail/mainwindow.cpp | 2 | ||||
-rw-r--r-- | kmicromail/opiemail.cpp | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp index a4f6a06..8a093c6 100644 --- a/kmicromail/main.cpp +++ b/kmicromail/main.cpp | |||
@@ -41,17 +41,16 @@ int main( int argc, char **argv ) { | |||
41 | #endif | 41 | #endif |
42 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kmicromail"))); | 42 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kmicromail"))); |
43 | OpieMail* mw = new OpieMail(); | 43 | OpieMail mw; |
44 | #ifndef DESKTOP_VERSION | 44 | #ifndef DESKTOP_VERSION |
45 | //qDebug("CONNECT "); | 45 | //qDebug("CONNECT "); |
46 | QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),mw, SLOT(message( const QCString&, const QByteArray& ))); | 46 | QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message( const QCString&, const QByteArray& ))); |
47 | a.showMainWidget(mw ); | 47 | a.showMainWidget(&mw ); |
48 | #else | 48 | #else |
49 | a.setMainWidget(mw ); | 49 | a.setMainWidget(&mw ); |
50 | m.show(); | 50 | mw.show(); |
51 | //m.resize( 800, 600 ); | 51 | //m.resize( 800, 600 ); |
52 | #endif | ||
53 | QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); | 52 | QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); |
53 | #endif | ||
54 | int rv = a.exec(); | 54 | int rv = a.exec(); |
55 | delete mw; | ||
56 | return rv; | 55 | return rv; |
57 | 56 | ||
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index a500dec..cd32c72 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp | |||
@@ -18,5 +18,5 @@ | |||
18 | 18 | ||
19 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | 19 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) |
20 | : QMainWindow( parent, name, flags ) | 20 | : QMainWindow( parent, name ) //, flags ) |
21 | { | 21 | { |
22 | setCaption( tr( "KMicroMail" ) ); | 22 | setCaption( tr( "KMicroMail" ) ); |
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index bdbd93a..70fbcb2 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -24,5 +24,5 @@ using namespace Opie::Core; | |||
24 | 24 | ||
25 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) | 25 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) |
26 | : MainWindow( parent, name, WStyle_ContextHelp ) | 26 | : MainWindow( parent, name) //, WStyle_ContextHelp ) |
27 | { | 27 | { |
28 | settings = new Settings(); | 28 | settings = new Settings(); |