[Kst] kdeextragear-2/kst/kst

[Andrew Walker]

CVS commit by arwalker: 

Remove conflicts


  M +11 -15    kst2dplot.cpp   1.347
  M +5 -9      kst2dplot.h   1.137
  M +1 -5      kstplotgroup.h   1.15


--- kdeextragear-2/kst/kst/kst2dplot.cpp  #1.346:1.347
@@ -383,12 +383,8 @@ Kst2DPlot::Kst2DPlot(Kst2DPlot& plot)
   QString name;
   int n = 0;
-<<<<<<< kst2dplot.cpp
   unsigned int i;
   
   _type = "Kst2DPlot";
 
-=======
-
->>>>>>> 1.345
   name = i18n("%1-copy").arg(plot.tagName());
   if (KST::dataObjectList.findTag(name) != KST::dataObjectList.end()) {

--- kdeextragear-2/kst/kst/kst2dplot.h  #1.136:1.137
@@ -183,10 +183,6 @@ public:
 
   virtual void copyObject();
-<<<<<<< kst2dplot.h
   virtual void copyObjectQuietly(KstViewObject& parent);
   
-=======
-
->>>>>>> 1.135
   virtual void move(const QPoint&);
   virtual void resize(const QSize&);

--- kdeextragear-2/kst/kst/kstplotgroup.h  #1.14:1.15
@@ -31,11 +31,7 @@ class KstPlotGroup : public KstMetaPlot 
     virtual void save(QTextStream& ts, const QString& indent = QString::null);
     virtual void saveTag(QTextStream& ts, const QString& indent = QString::null);
-<<<<<<< kstplotgroup.h
 
     virtual void copyObject();
     virtual void copyObjectQuietly(KstViewObject& parent);
-=======
-
->>>>>>> 1.13
     virtual bool removeChild(KstViewObjectPtr obj, bool recursive = false);
     virtual bool popupMenu(KPopupMenu *menu, const QPoint& pos, KstViewObjectPtr topLevelParent);