From 07fdef2c2ea1153d39d7114b3d5bd4abc4f4c861 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Fri, 08 Oct 2004 23:38:07 +0000
Subject: some bugfixes

---
(limited to 'korganizer')

diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 7f9b5c6..16186c0 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -2,6 +2,7 @@
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
+#include <qcopchannel_qws.h> 
 #include <qpe/global.h>
 #include <stdlib.h>
 #else
@@ -79,6 +80,8 @@ int main( int argc, char **argv )
       KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "korganizer")));
       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 );
 #else
@@ -96,6 +99,9 @@ int main( int argc, char **argv )
           
       }
       a.exec();
+#ifndef DESKTOP_VERSION
+      delete c1;
+#endif
 
   }
   qDebug("KO: Bye! ");
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 2d17986..3c16458 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -130,7 +130,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
 #ifdef DESKTOP_VERSION
     setFont( QFont("Arial"), 14 );
 #endif
-    mServerSocket = 0;
     mClosed = false;
     //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
     QString confFile = locateLocal("config","korganizerrc");
@@ -279,10 +278,8 @@ MainWindow::~MainWindow()
 {
     //qDebug("MainWindow::~MainWindow() ");
     //save toolbar location
-    delete mServerSocket;
     delete mCalendar;
-    delete KOPrefs::instance();
-    delete KIncidenceFormatter::instance();
+    delete mSyncManager;
 
 
 }
@@ -482,7 +479,6 @@ void MainWindow::initActions()
         //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
         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
@@ -92,8 +92,6 @@ class MainWindow : public QMainWindow
     void syncFileRequest();
   private:
     KSyncManager* mSyncManager;
-    //QTimer* mTimerCommandSocket;
-    KServerSocket * mServerSocket;
     bool mClosed;
     void saveOnClose();
     bool  mFlagKeyPressed;
--
cgit v0.9.0.2