-rw-r--r-- | korganizer/main.cpp | 6 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 6 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/korganizer/main.cpp b/korganizer/main.cpp index 7f9b5c6..16186c0 100644 --- a/korganizer/main.cpp +++ b/korganizer/main.cpp @@ -3,4 +3,5 @@ #ifndef DESKTOP_VERSION #include <qpe/qpeapplication.h> +#include <qcopchannel_qws.h> #include <qpe/global.h> #include <stdlib.h> @@ -80,4 +81,6 @@ int main( int argc, char **argv ) MainWindow m; #ifndef DESKTOP_VERSION + QCopChannel* c1 = new QCopChannel("QPE/Application/datebook",&m, "channel" ) ; + QObject::connect( c1, SIGNAL (received ( const QCString &, const QByteArray & )),&m, SLOT(recieve( const QCString&, const QByteArray& ))); QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(recieve( const QCString&, const QByteArray& ))); a.showMainWidget(&m ); @@ -97,4 +100,7 @@ int main( int argc, char **argv ) } a.exec(); +#ifndef DESKTOP_VERSION + delete c1; +#endif } diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 2d17986..3c16458 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -131,5 +131,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : setFont( QFont("Arial"), 14 ); #endif - mServerSocket = 0; mClosed = false; //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; @@ -280,8 +279,6 @@ MainWindow::~MainWindow() //qDebug("MainWindow::~MainWindow() "); //save toolbar location - delete mServerSocket; delete mCalendar; - delete KOPrefs::instance(); - delete KIncidenceFormatter::instance(); + delete mSyncManager; @@ -483,5 +480,4 @@ void MainWindow::initActions() menuBar1->setMaximumSize( menuBar1->sizeHint( )); } - connect ( syncMenu, SIGNAL( activated ( int ) ), this, SLOT (slotSyncMenu( int ) ) ); connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); connect ( selectFilterMenu, SIGNAL( aboutToShow () ), this, SLOT (fillFilterMenu() ) ); diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index ee7bd87..e3383ed 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -93,6 +93,4 @@ class MainWindow : public QMainWindow private: KSyncManager* mSyncManager; - //QTimer* mTimerCommandSocket; - KServerSocket * mServerSocket; bool mClosed; void saveOnClose(); |