From c0ca8beceaa7a366a2d74a82504cad19f4ccd642 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Tue, 24 May 2005 22:30:39 +0000
Subject: todo fix

---
diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro
index 55bfdec..c8aa3f0 100644
--- a/gammu/emb/gammu/gammu.pro
+++ b/gammu/emb/gammu/gammu.pro
@@ -10,9 +10,10 @@ DEPENDPATH += msvc06.mak \
               depend/siemens \
               depend/nokia/dct3trac
 INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens
-CONFIG			=  warn_off release console
+CONFIG			+=  warn_off console
 # Input
 
+include( ../../../variables.pri )
 HEADERS += gammu.h \
            sniff.h \
            smsd/s_files.h \
@@ -52,7 +53,7 @@ LIBS +=      ../../../bin/libmicrogammu.so /usr/lib/libpthread.so
 OBJECTS_DIR = obj/unix
 }
 win32 : {
-CONFIG		= qt warn_on 
+CONFIG		+= qt warn_on 
 #LIBS += mfc71u.lib
 LIBS += libc.lib
 #LIBS += msvcrt.lib
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index 7203eb3..f9d22d5 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -51,8 +51,12 @@ OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 #olimport section 
 #blabla: {
-
+debug: {
+LIBS += mfc71ud.lib
+}
+release: {
 LIBS += mfc71u.lib
+}
 DEFINES +=  _OL_IMPORT_
 HEADERS = ../outport/msoutl9.h \
  kaimportoldialog.h 
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 904bbe2..a8ad467 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1658,8 +1658,10 @@ bool CalendarView::openCalendar(QString filename, bool merge)
     }
 
     globalFlagBlockAgenda = 1;
-    if (!merge) mCalendar->close();
-
+    if (!merge) {
+      mCalendar->close();
+      mTodoList->clearList();
+    }
     mStorage->setFileName( filename );
 
     if ( mStorage->load() ) {
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index d88c300..32ad10a 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -56,17 +56,23 @@ LIBS += ../libical/lib/ical.lib
 LIBS += ../libical/lib/icalss.lib
 #LIBS += atls.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
-#QMAKE_LINK += /NODEFAULTLIB:MSVCRT
-#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
+QMAKE_LINK += /NODEFAULTLIB:MSVCRT
+QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 #olimport section 
 #blabla: {
+debug: {
+LIBS += mfc71ud.lib
+}
+release: {
 LIBS += mfc71u.lib
+}
 DEFINES +=  _OL_IMPORT_
 
 HEADERS += ../outport/msoutl9.h \
  koimportoldialog.h 
+
 SOURCES += ../outport/msoutl9.cpp \
  koimportoldialog.cpp
 #}
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index d368513..1ffc34a 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -139,6 +139,7 @@ class KOTodoView : public KOrg::BaseView
     QPopupMenu *getCategoryPopupMenu (KOTodoViewItem *todoItem);
     void setNavigator( DateNavigator* nav ) {mNavigator = nav;}
     QString getWhatsThisText(QPoint p);
+    void clearList() {mTodoListView->clear(); }
 
   public slots:
     void updateView();
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 2e5a943..fb4de37 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -831,5 +831,8 @@ void KOViewManager::addView(KOrg::BaseView *view)
 
 void KOViewManager::setDocumentId( const QString &id )
 {
-    if (mTodoView) mTodoView->setDocumentId( id );
+    if (mTodoView) {
+      mTodoView->clearList();
+      mTodoView->setDocumentId( id );
+    }
 }
--
cgit v0.9.0.2