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
@@ -24,2 +24,3 @@
 #include <qlayout.h>
+#include <qapplication.h>
 
@@ -38,9 +39,5 @@ AddresseeEditorDialog::AddresseeEditorDialog( KABCore *core, QWidget *parent,
                  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;
 
@@ -56,2 +53,5 @@ AddresseeEditorDialog::AddresseeEditorDialog( KABCore *core, QWidget *parent,
   enableButton( KDialogBase::Apply, false );
+  if ( QApplication::desktop()->width()  < 480 ) {
+      hideButtons();
+  }
 }
@@ -60,5 +60,4 @@ AddresseeEditorDialog::~AddresseeEditorDialog()
 {
-  kdDebug(5720) << "~AddresseeEditorDialog()" << endl;
-
-  emit editorDestroyed( mEditorWidget->addressee().uid() );
+    qDebug("----------------------------------------------- ");
+    //emit editorDestroyed( mEditorWidget->addressee().uid() );
 }
@@ -94,2 +93,7 @@ void AddresseeEditorDialog::slotApply()
 
+void AddresseeEditorDialog:: accept () 
+{
+    slotOk();
+
+}
 void AddresseeEditorDialog::slotOk()
@@ -100,8 +104,2 @@ void AddresseeEditorDialog::slotOk()
   
-  // Destroy this dialog
-#ifndef KAB_EMBEDDED    
-  delayedDestruct();
-#else //KAB_EMBEDDED    
-  delete this;
-#endif //KAB_EMBEDDED    
 }
@@ -117,9 +115,3 @@ void AddresseeEditorDialog::slotCancel()
   
-  // Destroy this dialog
-#ifndef KAB_EMBEDDED    
-  delayedDestruct();
-#else //KAB_EMBEDDED    
-  delete this;
-#endif //KAB_EMBEDDED    
-  
+ 
 }