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

List:       kde-commits
Subject:    kdeedu/kig
From:       Dominique Devriese <devriese () kde ! org>
Date:       2003-08-31 23:06:12
[Download RAW message or body]

CVS commit by domi: 

remove the defective operator| and operator& implementations for the
Objects class


  M +5 -0      ChangeLog   1.81
  M +0 -18     misc/objects.h   1.29
  M +1 -1      modes/normal.cc   1.38


--- kdeedu/kig/modes/normal.cc  #1.37:1.38
@@ -168,5 +168,5 @@ void NormalMode::dragObject( const Objec
 {
   // first determine what to move...
-  if( ( oco & sos ).empty() )
+  if( !sos.contains( oco.front() ) )
   {
     // the user clicked on something that is currently not

--- kdeedu/kig/misc/objects.h  #1.28:1.29
@@ -131,22 +131,4 @@ void myvector<T>::remove( const T& o )
 }
 
-template<class T>
-myvector<T> operator&( const myvector<T>& o, const myvector<T>& s )
-{
-  myvector<T> result;
-  std::set_intersection( o.begin(), o.end(), s.begin(), s.end(),
-                         std::back_inserter( result ) );
-  return result;
-}
-
-template<class T>
-myvector<T> operator|( const myvector<T>& o, const myvector<T>& s )
-{
-  myvector<T> result;
-  std::set_union( o.begin(), o.end(), s.begin(), s.end(),
-                       std::back_inserter( result ) );
-  return result;
-}
-
 template<class iter>
 void delete_all( iter current, iter end )

--- kdeedu/kig/ChangeLog  #1.80:1.81
@@ -1,2 +1,7 @@
+2003-09-01  Dominique Devriese  <devriese@kde.org>
+
+        * remove the defective operator| and operator& implementations for
+        the Objects class
+        
 2003-08-31  Dominique Devriese  <devriese@kde.org>
 


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