Removed strange handling of addresseeeditor

1 files changed, 13 insertions, 21 deletions

diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index 102138e..790f148 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -22,6 +22,7 @@
 */                                                                      
 
 #include <qlayout.h>
+#include <qapplication.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -36,13 +37,9 @@ AddresseeEditorDialog::AddresseeEditorDialog( KABCore *core, QWidget *parent,
                                               const char *name )
   : KDialogBase( KDialogBase::Plain, i18n( "Edit Contact" ), 
                  KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply,
-                 KDialogBase::Ok, parent, name, false )
+                 KDialogBase::Ok, parent, name, true )
 {
-#ifdef KAB_EMBEDDED  
-  resize( KMIN(KGlobal::getDesktopWidth()-10, 490), KMIN(KGlobal::getDesktopHeight()-50, 300));
-#endif //KAB_EMBEDDED  
 
-  kdDebug(5720) << "AddresseeEditorDialog()" << endl;
 
   QWidget *page = plainPage();
   
@@ -54,13 +51,15 @@ AddresseeEditorDialog::AddresseeEditorDialog( KABCore *core, QWidget *parent,
   layout->addWidget( mEditorWidget );
   
   enableButton( KDialogBase::Apply, false );
+  if ( QApplication::desktop()->width()  < 480 ) {
+      hideButtons();
+  }
 }
 
 AddresseeEditorDialog::~AddresseeEditorDialog()
 {
-  kdDebug(5720) << "~AddresseeEditorDialog()" << endl;
-
-  emit editorDestroyed( mEditorWidget->addressee().uid() );
+    qDebug("----------------------------------------------- ");
+    //emit editorDestroyed( mEditorWidget->addressee().uid() );
 }
 
 void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr )
@@ -92,18 +91,17 @@ void AddresseeEditorDialog::slotApply()
   KDialogBase::slotApply();
 }
 
+void AddresseeEditorDialog:: accept () 
+{
+    slotOk();
+
+}
 void AddresseeEditorDialog::slotOk()
 {
   slotApply();
   
   KDialogBase::slotOk();
   
-  // Destroy this dialog
-#ifndef KAB_EMBEDDED    
-  delayedDestruct();
-#else //KAB_EMBEDDED    
-  delete this;
-#endif //KAB_EMBEDDED    
 }
 
 void AddresseeEditorDialog::widgetModified()
@@ -115,13 +113,7 @@ void AddresseeEditorDialog::slotCancel()
 {
   KDialogBase::slotCancel();
   
-  // Destroy this dialog
-#ifndef KAB_EMBEDDED    
-  delayedDestruct();
-#else //KAB_EMBEDDED    
-  delete this;
-#endif //KAB_EMBEDDED    
-  
+ 
 }
 
 #ifndef KAB_EMBEDDED