| -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 @@ -35,24 +35,23 @@ int main( int argc, char **argv ) { KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/icons22/"); else KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/"); #else fileName = qApp->applicationDirPath () + "/kdepim/kmicromail/"; KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); #endif KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kmicromail"))); - OpieMail* mw = new OpieMail(); + OpieMail mw; #ifndef DESKTOP_VERSION //qDebug("CONNECT "); - QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),mw, SLOT(message( const QCString&, const QByteArray& ))); - a.showMainWidget(mw ); + QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message( const QCString&, const QByteArray& ))); + a.showMainWidget(&mw ); #else - a.setMainWidget(mw ); - m.show(); + a.setMainWidget(&mw ); + mw.show(); //m.resize( 800, 600 ); -#endif QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); +#endif int rv = a.exec(); - delete mw; return rv; } diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index a500dec..cd32c72 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp @@ -12,17 +12,17 @@ #include "defines.h" #include "mainwindow.h" #include <KDGanttMinimizeSplitter.h> #include <kabc/stdaddressbook.h> MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) - : QMainWindow( parent, name, flags ) + : QMainWindow( parent, name ) //, flags ) { setCaption( tr( "KMicroMail" ) ); setToolBarsMovable( false ); KABC::StdAddressBook::self(); toolBar = new QToolBar( this ); menuBar = new QMenuBar( toolBar ); mailMenu = new QPopupMenu( menuBar ); menuBar->insertItem( tr( "Mail" ), mailMenu ); diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index bdbd93a..70fbcb2 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp @@ -18,17 +18,17 @@ //#include <qpe/resource.h> #include <qpe/qpeapplication.h> /* QT */ using namespace Opie::Core; OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) - : MainWindow( parent, name, WStyle_ContextHelp ) + : MainWindow( parent, name) //, WStyle_ContextHelp ) { settings = new Settings(); folderView->populate( settings->getAccounts() ); } OpieMail::~OpieMail() |