[Uml-devel] branches/work/soc-umbrello (silent)

[Gopala Krishna A]

SVN commit 896492 by gopala:


Preparing for the new year hacking on soc umbrello code!

SVN_SILENT: svnmerge
----------
Merged revisions 871091 via svnmerge from
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r871091 | fischer | 2008-10-14 02:50:14 +0530 (Tue, 14 Oct 2008) | 1 line

  Replacing q3 widgets.
........


 _M            . (directory)  
 M  +6 -12     umbrello/clipboard/idchangelog.cpp  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129
   + /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091
--- branches/work/soc-umbrello/umbrello/clipboard/idchangelog.cpp #896491:896492
@@ -99,10 +99,8 @@
     }
 }
 
-/**
- * Returns the old ID of an UMLobject given its new one.
- */
-Uml::IDType IDChangeLog::findOldID(Uml::IDType NewID) {
+Uml::IDType IDChangeLog::findOldID(Uml::IDType NewID)
+{
     uint count = m_LogArray.size();
     for (uint i = 0; i < count; i++) {
         if ((m_LogArray.point(i))->x() ==  NewID) {
@@ -113,10 +111,8 @@
     return Uml::id_None;
 }
 
-/**
- * Finds a specific change in the log.
- */
-bool IDChangeLog::findIDChange(Uml::IDType OldID, Uml::IDType NewID, uint& pos) {
+bool IDChangeLog::findIDChange(Uml::IDType OldID, Uml::IDType NewID, uint& pos)
+{
     uint count = m_LogArray.size();
     for (uint i = 0; i < count; i++) {
         if (((m_LogArray.point(i))->y() ==  OldID) && ((m_LogArray.point(i))->x() ==  NewID)) {
@@ -128,10 +124,8 @@
     return false;
 }
 
-/**
- * Removes a change giving an New ID.
- */
-void IDChangeLog::removeChangeByNewID(Uml::IDType OldID) {
+void IDChangeLog::removeChangeByNewID(Uml::IDType OldID)
+{
     uint count = m_LogArray.size();
     for (uint i = 0; i < count; i++) {
         if ((m_LogArray.point(i))->y() ==  OldID) {