*** empty log message ***

[adress.git] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 68afb4353941166251e07141d5a7e1ec3d0c1127..4552b94bf9ea299409901b76f8a61cdce61e8346 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,10 +1,4 @@
 #include "mainwindow.h"
-#include <qfile.h>
-#include <qfiledialog.h>
-#include <qtextstream.h>
-#include <qstring.h>
-#include <qlistview.h>
-#include "contact.h"
 #include <iostream>
 
 /* BRÖÖL
@@ -30,13 +24,19 @@ MainWindow::~MainWindow()
  */
 void MainWindow::slotSave()
 {
-       if (filename == "")
-               return;
+       if (filename.isNull())
+       {
+               filename = QFileDialog::getSaveFileName( 0, "Adresslista (*.adr)");
+               if (filename.isNull())
+               {
+                       return;
+               }
+       }                     
 
        QFile f(filename);
 
        if ( !f.open( IO_WriteOnly ) )
-                   return false;
+                   return;
              
        QTextStream t(&f);
        QString s;
@@ -71,14 +71,17 @@ void MainWindow::slotDel()
  */
 void MainWindow::slotLoad()
 {
-       slotSave();
+       filename = QFileDialog::getOpenFileName(0, "Adressfiler (*.adr)", this); 
+
        QFile f(filename);
-       do
+       if ( !f.open( IO_ReadOnly ) )
+               return;
+                       
+       while (CContact::getNum() != 0)
        {
-               filename(QFileDialog::getOpenFileName(0, "Adressfiler (*.adr)", this)); 
+               delete CContact::getFirst();
        }
-       while ( !f.open( IO_ReadOnly ) );
-                       
+       
        QTextStream t(&f);
 
        while (!t.eof())