[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim/kontact/plugins/knotes
From:       Michael Brade <brade () kde ! org>
Date:       2006-02-20 20:12:13
Message-ID: 1140466333.523877.23382.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 511741 by brade:

Sorry, didn't mean to commit that.


 M  +0 -2      Makefile.am  
 M  +3 -20     knotes_part.cpp  


--- branches/KDE/3.5/kdepim/kontact/plugins/knotes/Makefile.am #511740:511741
@@ -5,8 +5,6 @@
 libkontact_knotesplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \
                                     $(LIB_KPARTS) $(top_builddir)/libkdepim/libkdepim.la \
                                     $(top_builddir)/libkcal/libkcal.la -lkresources \
-                                    $(top_builddir)/knotes/libknoteslegacy.la \
-                                    $(top_builddir)/knotes/libknotesconfig.la \
                                     $(top_builddir)/knotes/libknotesresources.la \
                                     $(top_builddir)/knotes/libknoteseditor.la
 
--- branches/KDE/3.5/kdepim/kontact/plugins/knotes/knotes_part.cpp #511740:511741
@@ -30,9 +30,6 @@
 #include <libkdepim/infoextension.h>
 #include <libkdepim/sidebarextension.h>
 
-#include <libkcal/calendarlocal.h>
-
-#include "knotes/knoteslegacy.h"
 #include "knotes/resourcemanager.h"
 
 #include "knotes_part.h"
@@ -52,13 +49,14 @@
   setInstance( new KInstance( "knotes" ) );
 
   // create the actions
-  new KAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, SLOT( newNote() ),
+  new KAction( i18n( "&New..." ), "knotes", CTRL+Key_N, this, SLOT( newNote() ),
                actionCollection(), "file_new" );
-  new KAction( i18n( "Rename..." ), "text", this, SLOT( renameNote() ),
+  new KAction( i18n( "Rename" ), "text", this, SLOT( renameNote() ),
                actionCollection(), "edit_rename" );
   new KAction( i18n( "Delete" ), "editdelete", Key_Delete, this, SLOT( killSelectedNotes() ),
                actionCollection(), "edit_delete" );
 
+  // TODO styleguide: s/New.../New/, s/Rename/Rename.../
   // TODO icons: s/editdelete/knotes_delete/ or the other way round in knotes
 
   // set the view up
@@ -90,9 +88,6 @@
   setWidget( mNotesView );
   setXMLFile( "knotes_part.rc" );
 
-  // clean up old config files
-  KNotesLegacy::cleanUp();
-  
   // connect the resource manager
   connect( mManager, SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
            this, SLOT( createNote( KCal::Journal* ) ) );
@@ -101,18 +96,6 @@
 
   // read the notes
   mManager->load();
-
-  // read the old config files, convert and add them
-  KCal::CalendarLocal calendar( QString::fromLatin1( "UTC" ) );
-  if ( KNotesLegacy::convert( &calendar ) )
-  {
-    KCal::Journal::List notes = calendar.journals();
-    KCal::Journal::List::ConstIterator it;
-    for ( it = notes.begin(); it != notes.end(); ++it )
-      mManager->addNewNote( *it );
-
-    mManager->save();
-  }
 }
 
 KNotesPart::~KNotesPart()
[prev in list] [next in list] [prev in thread] [next in thread]