todo fix

6 files changed, 25 insertions, 8 deletions

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
@@ -12,5 +12,6 @@ DEPENDPATH += msvc06.mak \
 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 \
@@ -54,3 +55,3 @@ OBJECTS_DIR = obj/unix
 win32 : {
-CONFIG		= qt warn_on 
+CONFIG		+= qt warn_on 
 #LIBS += mfc71u.lib
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index 7203eb3..f9d22d5 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -53,4 +53,8 @@ MOC_DIR = moc/win
 #blabla: {
-
+debug: {
+LIBS += mfc71ud.lib
+}
+release: {
 LIBS += mfc71u.lib
+}
 DEFINES +=  _OL_IMPORT_
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 904bbe2..a8ad467 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1660,4 +1660,6 @@ bool CalendarView::openCalendar(QString filename, bool merge)
     globalFlagBlockAgenda = 1;
-    if (!merge) mCalendar->close();
-
+    if (!merge) {
+      mCalendar->close();
+      mTodoList->clearList();
+    }
     mStorage->setFileName( filename );
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index d88c300..32ad10a 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -58,4 +58,4 @@ LIBS += ../libical/lib/icalss.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
@@ -64,3 +64,8 @@ MOC_DIR = moc/win
 #blabla: {
+debug: {
+LIBS += mfc71ud.lib
+}
+release: {
 LIBS += mfc71u.lib
+}
 DEFINES +=  _OL_IMPORT_
@@ -69,2 +74,3 @@ HEADERS += ../outport/msoutl9.h \
  koimportoldialog.h 
+
 SOURCES += ../outport/msoutl9.cpp \
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index d368513..1ffc34a 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -141,2 +141,3 @@ class KOTodoView : public KOrg::BaseView
     QString getWhatsThisText(QPoint p);
+    void clearList() {mTodoListView->clear(); }
 
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 2e5a943..fb4de37 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -833,3 +833,6 @@ void KOViewManager::setDocumentId( const QString &id )
 {
-    if (mTodoView) mTodoView->setDocumentId( id );
+    if (mTodoView) {
+      mTodoView->clearList();
+      mTodoView->setDocumentId( id );
+    }
 }