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

List:       kde-commits
Subject:    KDE/kdelibs/kate/utils
From:       Milian Wolff <mail () milianw ! de>
Date:       2010-03-22 23:12:15
Message-ID: 20100322231215.876AFAC876 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1106483 by mwolff:

merge two inserts into one undoSafePoint

 M  +5 -8      katetemplatehandler.cpp  


--- trunk/KDE/kdelibs/kate/utils/katetemplatehandler.cpp #1106482:1106483
@@ -74,10 +74,7 @@
       // what indent-style to use.
       m_doc->align(m_doc->activeKateView(), *m_wholeTemplateRange);
     }
-
-    m_doc->undoSafePoint();
   }
-  m_doc->editEnd();
 
   ///TODO: maybe support delayed actions, i.e.:
   /// - create doc
@@ -88,6 +85,8 @@
     // only do complex stuff when required
 
     handleTemplateString(initialValues);
+    m_doc->undoSafePoint();
+    m_doc->editEnd();
 
     if ( !m_templateRanges.isEmpty() ) {
       foreach ( View* view, m_doc->views() ) {
@@ -113,6 +112,8 @@
       cleanupAndExit();
     }
   } else {
+    m_doc->undoSafePoint();
+    m_doc->editEnd();
     // simple templates just need to be (which gets done in handleTemplateString())
     cleanupAndExit();
   }
@@ -416,11 +417,7 @@
     }
   }
 
-  m_doc->editStart();
-  if ( m_doc->replaceText(*m_wholeTemplateRange, templateString) ) {
-    m_doc->undoSafePoint();
-  }
-  m_doc->editEnd();
+  m_doc->replaceText(*m_wholeTemplateRange, templateString);
 
   Q_ASSERT(!m_wholeTemplateRange->isEmpty());
 
[prev in list] [next in list] [prev in thread] [next in thread]