Quellcode durchsuchen

Fix style in ctkDicomAbstractHost

Private member starts with uppercase letter and use "this->" when
needed.
Jean-Christophe Fillion-Robin vor 14 Jahren
Ursprung
Commit
90afa588b3
1 geänderte Dateien mit 43 neuen und 25 gelöschten Zeilen
  1. 43 25
      Plugins/org.commontk.dah.host/ctkDicomAbstractHost.cpp

+ 43 - 25
Plugins/org.commontk.dah.host/ctkDicomAbstractHost.cpp

@@ -27,57 +27,75 @@ class ctkDicomAbstractHostPrivate
 {
 public:
 
-  ctkDicomAbstractHostPrivate(ctkDicomAbstractHost* hostInterface, int hostPort, int appPort) : hostPort(hostPort), appPort(appPort)
-  {
-    // start server
-    if (hostPort==0)
+  ctkDicomAbstractHostPrivate(ctkDicomAbstractHost* hostInterface, int HostPort, int AppPort);
+  ~ctkDicomAbstractHostPrivate();
+
+  int HostPort;
+  int AppPort;
+  ctkDicomHostServer* Server;
+  ctkDicomAppInterface* AppService;
+  // ctkDicomAppHosting::Status
+};
+
+//----------------------------------------------------------------------------
+// ctkDicomAbstractHostPrivate methods
+
+//----------------------------------------------------------------------------
+ctkDicomAbstractHostPrivate::ctkDicomAbstractHostPrivate(
+  ctkDicomAbstractHost* hostInterface, int hostPort, int appPort) : HostPort(hostPort), AppPort(appPort)
+{
+  // start server
+  if (this->HostPort==0)
     {
-      hostPort = 8080;
+    this->HostPort = 8080;
     }
-    if (appPort==0)
+  if (this->AppPort==0)
     {
-      appPort = 8081;
+    this->AppPort = 8081;
     }
 
-    server = new ctkDicomHostServer(hostInterface,hostPort);
-    appService = new ctkDicomAppService(appPort, "/ApplicationInterface");
-  }
+  this->Server = new ctkDicomHostServer(hostInterface,hostPort);
+  this->AppService = new ctkDicomAppService(appPort, "/ApplicationInterface");
+}
 
-  ~ctkDicomAbstractHostPrivate()
-  {
-    delete server;
-    delete appService;
-  }
+//----------------------------------------------------------------------------
+ctkDicomAbstractHostPrivate::~ctkDicomAbstractHostPrivate()
+{
+  delete this->Server;
+  delete this->AppService;
+}
 
-  int hostPort;
-  int appPort;
-  ctkDicomHostServer* server;
-  ctkDicomAppInterface* appService;
-  // ctkDicomAppHosting::Status
-};
+//----------------------------------------------------------------------------
+// ctkDicomAbstractHost methods
 
-ctkDicomAbstractHost::ctkDicomAbstractHost(int hostPort, int appPort) : d_ptr(new ctkDicomAbstractHostPrivate(this,hostPort,appPort))
+//----------------------------------------------------------------------------
+ctkDicomAbstractHost::ctkDicomAbstractHost(int hostPort, int appPort) :
+  d_ptr(new ctkDicomAbstractHostPrivate(this, hostPort, appPort))
 {
 }
 
+//----------------------------------------------------------------------------
 int ctkDicomAbstractHost::getHostPort() const
 {
   Q_D(const ctkDicomAbstractHost);
-  return d->hostPort;
+  return d->HostPort;
 }
 
+//----------------------------------------------------------------------------
 int ctkDicomAbstractHost::getAppPort() const
 {
   Q_D(const ctkDicomAbstractHost);
-  return d->appPort;
+  return d->AppPort;
 }
 
+//----------------------------------------------------------------------------
 ctkDicomAbstractHost::~ctkDicomAbstractHost()
 {
 }
 
+//----------------------------------------------------------------------------
 ctkDicomAppInterface* ctkDicomAbstractHost::getDicomAppService() const
 {
   Q_D(const ctkDicomAbstractHost);
-  return d->appService;
+  return d->AppService;
 }