[Kst] branches/work/kst/portto4/kst/src/datasources/dmc

[Peter Kümmel]

SVN commit 1213515 by kuemmel:

some cleanup


 M  +10 -7     dmcdata.h  
 M  +8 -6      dmcobj.h  
 M  +2 -2      dmcplugin.h  
 M  +0 -4      dmcsource.h  


--- branches/work/kst/portto4/kst/src/datasources/dmc/dmcdata.h #1213514:1213515
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef _KST_DMC_H
-#define _KST_DMC_H
+#ifndef KST_DMCDATA_H
+#define KST_DMCDATA_H
 
 #include <config.h>
 
@@ -26,15 +26,18 @@
 #include <HL2_DMC/PIODB.h>
 }
 
-#include <qsize.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <QSize>
+#include <QString>
+#include <QStringList>
 
-namespace DMC {
+
+namespace DMC
+{
     extern bool haveDMC();
     extern bool validDatabase(const QString&);
 
-class Source : public Kst::Shared {
+class Source : public Kst::Shared
+{
   public:
     Source();
     virtual ~Source();
--- branches/work/kst/portto4/kst/src/datasources/dmc/dmcobj.h #1213514:1213515
@@ -15,20 +15,22 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef _KST_DMCOBJ_H
-#define _KST_DMCOBJ_H
+#ifndef KST_DMOBJECT_H
+#define KST_DMOBJECT_H
 
-
 #include "dmcdata.h"
-#include <qmap.h>
 
+#include <QMap>
 
-namespace DMC {
+
+namespace DMC
+{
     enum TimeType { Undetermined = -1, Unknown = 0, TimeSec = 1, TimesOfSamples = 2 };
 
 class ObjectGroup;
 
-class Object : public Source {
+class Object : public Source
+{
   public:
     Object();
     virtual ~Object();
--- branches/work/kst/portto4/kst/src/datasources/dmc/dmcplugin.h #1213514:1213515
@@ -14,8 +14,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef DMC_PLUGIN_H
-#define DMC_PLUGIN_H
+#ifndef KST_DMC_PLUGIN_H
+#define KST_DMC_PLUGIN_H
 
 
 #include "datasource.h"
--- branches/work/kst/portto4/kst/src/datasources/dmc/dmcsource.h #1213514:1213515
@@ -26,11 +26,7 @@
 #include "dataplugin.h"
 
 
-
-class DataInterfaceDmcScalar;
-class DataInterfaceDmcString;
 class DataInterfaceDmcVector;
-class DataInterfaceDmcMatrix;
 
 class DmcSource : public Kst::DataSource {
   public: