Merge branch '191-rename-private-header-files'

* 191-rename-private-header-files:
  Rename "*Private.(h|tpp|cpp)" into "*_p.(h|tpp|cpp)"
  Rename ctkDICOMIndexerPrivate.h into ctkDICOMIndexerPrivate_p.

Libs/DICOM/Core/CMakeLists.txt

@@ -19,7 +19,7 @@ set(KIT_SRCS
   ctkDICOMFilterProxyModel.h
   ctkDICOMIndexer.cpp
   ctkDICOMIndexer.h
-  ctkDICOMIndexerPrivate.h
+  ctkDICOMIndexer_p.h
   ctkDICOMModel.cpp
   ctkDICOMModel.h
   ctkDICOMPersonName.cpp
@@ -43,7 +43,7 @@ set(KIT_MOC_SRCS
   ctkDICOMAbstractThumbnailGenerator.h
   ctkDICOMDatabase.h
   ctkDICOMIndexer.h
-  ctkDICOMIndexerPrivate.h
+  ctkDICOMIndexer_p.h
   ctkDICOMFilterProxyModel.h
   ctkDICOMModel.h
   ctkDICOMQuery.h

Libs/DICOM/Core/ctkDICOMIndexer.cpp

@@ -36,7 +36,7 @@
 // ctkDICOM includes
 #include "ctkLogger.h"
 #include "ctkDICOMIndexer.h"
-#include "ctkDICOMIndexerPrivate.h"
+#include "ctkDICOMIndexer_p.h"
 #include "ctkDICOMDatabase.h"
 
 // DCMTK includes

Libs/PluginFramework/CMakeLists.txt

@@ -39,15 +39,15 @@ set(KIT_SRCS
   ctkPluginFrameworkLauncher.cpp
   ctkPluginFrameworkListeners.cpp
   ctkPluginFrameworkListeners_p.h
-  ctkPluginFrameworkPrivate.cpp
-  ctkPluginFrameworkPrivate_p.h
+  ctkPluginFramework_p.cpp
+  ctkPluginFramework_p.h
   ctkPluginFrameworkUtil.cpp
   ctkPluginFrameworkUtil_p.h
   ctkPluginLocalization.cpp
   ctkPluginManifest.cpp
   ctkPluginManifest_p.h
-  ctkPluginPrivate.cpp
-  ctkPluginPrivate_p.h
+  ctkPlugin_p.cpp
+  ctkPlugin_p.h
   ctkPlugins.cpp
   ctkPlugins_p.h
   ctkPluginStorage_p.h
@@ -55,17 +55,17 @@ set(KIT_SRCS
   ctkPluginStorageSQL_p.h
   ctkPluginTracker.h
   ctkPluginTracker.tpp
-  ctkPluginTrackerPrivate.h
-  ctkPluginTrackerPrivate.tpp
+  ctkPluginTracker_p.h
+  ctkPluginTracker_p.tpp
   ctkRequirePlugin.cpp
   ctkRequirePlugin_p.h
   ctkServiceEvent.cpp
   ctkServiceException.cpp
   ctkServiceFactory.h
   ctkServiceReference.cpp
-  ctkServiceReferencePrivate.cpp
+  ctkServiceReference_p.cpp
   ctkServiceRegistration.cpp
-  ctkServiceRegistrationPrivate.cpp
+  ctkServiceRegistration_p.cpp
   ctkServices.cpp
   ctkServices_p.h
   ctkServiceSlotEntry.cpp
@@ -73,8 +73,8 @@ set(KIT_SRCS
   ctkServiceTracker.h
   ctkServiceTracker.tpp
   ctkServiceTrackerCustomizer.h
-  ctkServiceTrackerPrivate.h
-  ctkServiceTrackerPrivate.tpp
+  ctkServiceTracker_p.h
+  ctkServiceTracker_p.tpp
   ctkTrackedPlugin_p.h
   ctkTrackedPlugin.tpp
   ctkTrackedPluginListener_p.h

Libs/PluginFramework/ctkLDAPSearchFilter.cpp

@@ -22,7 +22,7 @@
 #include "ctkLDAPSearchFilter.h"
 
 #include "ctkLDAPExpr_p.h"
-#include "ctkServiceReferencePrivate.h"
+#include "ctkServiceReference_p.h"
 
 //----------------------------------------------------------------------------
 class ctkLDAPSearchFilterData : public QSharedData

Libs/PluginFramework/ctkPlugin.cpp

@@ -19,19 +19,18 @@
 
 =============================================================================*/
 
-#include "ctkPlugin.h"
+#include <QStringList>
 
+#include "ctkPlugin.h"
+#include "ctkPlugin_p.h"
 #include "ctkPluginContext.h"
 #include "ctkPluginContext_p.h"
 #include "ctkPluginFrameworkUtil_p.h"
-#include "ctkPluginPrivate_p.h"
 #include "ctkPluginArchive_p.h"
 #include "ctkPluginFrameworkContext_p.h"
 #include "ctkServices_p.h"
 #include "ctkUtils.h"
 
-#include <QStringList>
-
 //----------------------------------------------------------------------------
 ctkPlugin::ctkPlugin()
 : d_ptr(0)

Libs/PluginFramework/ctkPluginContext.cpp

@@ -19,15 +19,15 @@
 
 =============================================================================*/
 
+#include "ctkPlugin_p.h"
 #include "ctkPluginContext.h"
 #include "ctkPluginContext_p.h"
-
-#include "ctkPluginPrivate_p.h"
 #include "ctkPluginFrameworkContext_p.h"
+
 #include "ctkServices_p.h"
 #include "ctkServiceRegistration.h"
 #include "ctkServiceReference.h"
-#include "ctkServiceReferencePrivate.h"
+#include "ctkServiceReference_p.h"
 
 #include <stdexcept>
 

Libs/PluginFramework/ctkPluginFramework.cpp

@@ -19,13 +19,12 @@
 
 =============================================================================*/
 
+#include "ctkPlugin_p.h"
+#include "ctkPluginArchive_p.h"
+#include "ctkPluginConstants.h"
 #include "ctkPluginFramework.h"
-
-#include "ctkPluginFrameworkPrivate_p.h"
-#include "ctkPluginPrivate_p.h"
+#include "ctkPluginFramework_p.h"
 #include "ctkPluginFrameworkContext_p.h"
-#include "ctkPluginConstants.h"
-#include "ctkPluginArchive_p.h"
 
 #include "service/event/ctkEvent.h"
 

Libs/PluginFramework/ctkPluginFrameworkContext.cpp

@@ -20,9 +20,8 @@
 =============================================================================*/
 
 #include "ctkPluginFrameworkContext_p.h"
-
 #include "ctkPluginFrameworkUtil_p.h"
-#include "ctkPluginFrameworkPrivate_p.h"
+#include "ctkPluginFramework_p.h"
 #include "ctkPluginArchive_p.h"
 #include "ctkPluginStorageSQL_p.h"
 #include "ctkPluginConstants.h"

Libs/PluginFramework/ctkPluginFrameworkListeners.cpp

@@ -25,7 +25,7 @@
 #include "ctkPluginFrameworkContext_p.h"
 #include "ctkPluginConstants.h"
 #include "ctkLDAPExpr_p.h"
-#include "ctkServiceReferencePrivate.h"
+#include "ctkServiceReference_p.h"
 
 #include <QStringListIterator>
 #include <QDebug>

Libs/PluginFramework/ctkPluginFrameworkPrivate.cpp

@@ -19,12 +19,11 @@
 
 =============================================================================*/
 
-#include "ctkPluginFrameworkPrivate_p.h"
-
-#include "ctkPluginFramework.h"
 #include "ctkPluginConstants.h"
 #include "ctkPluginContext.h"
 #include "ctkPluginContext_p.h"
+#include "ctkPluginFramework.h"
+#include "ctkPluginFramework_p.h"
 #include "ctkPluginFrameworkContext_p.h"
 #include "ctkPluginFrameworkUtil_p.h"
 

Libs/PluginFramework/ctkPluginFrameworkPrivate_p.h

@@ -22,11 +22,11 @@
 #ifndef CTKPLUGINFRAMEWORKPRIVATE_P_H
 #define CTKPLUGINFRAMEWORKPRIVATE_P_H
 
-#include "ctkPluginPrivate_p.h"
-#include "ctkPluginFramework.h"
-
 #include <QMutex>
 
+#include "ctkPlugin_p.h"
+#include "ctkPluginFramework.h"
+
 class ctkPluginFrameworkContext;
 
 /**

Libs/PluginFramework/ctkPluginTracker.tpp

@@ -21,7 +21,7 @@
 
 
 #include "ctkPluginContext.h"
-#include "ctkPluginTrackerPrivate.h"
+#include "ctkPluginTracker_p.h"
 #include "ctkTrackedPlugin_p.h"
 
 #include <QDebug>

Libs/PluginFramework/ctkPluginTrackerPrivate.h

@@ -94,6 +94,6 @@ private:
   ctkPluginTracker<T> * const q_ptr;
 };
 
-#include "ctkPluginTrackerPrivate.tpp"
+#include "ctkPluginTracker_p.tpp"
 
 #endif // CTKPLUGINTRACKERPRIVATE_H

Libs/PluginFramework/ctkPluginPrivate.cpp

@@ -19,8 +19,7 @@
 
 =============================================================================*/
 
-#include "ctkPluginPrivate_p.h"
-
+#include "ctkPlugin_p.h"
 #include "ctkPluginConstants.h"
 #include "ctkPluginDatabaseException.h"
 #include "ctkPluginArchive_p.h"
@@ -29,9 +28,9 @@
 #include "ctkPluginActivator.h"
 #include "ctkPluginContext_p.h"
 
-#include "ctkServices_p.h"
-#include "ctkServiceReferencePrivate.h"
+#include "ctkServiceReference_p.h"
 #include "ctkServiceRegistration.h"
+#include "ctkServices_p.h"
 
 // for ctk::msecsTo() - remove after switching to Qt 4.7
 #include <ctkUtils.h>

Libs/PluginFramework/ctkPlugins.cpp

@@ -19,19 +19,18 @@
 
 =============================================================================*/
 
-#include "ctkPlugins_p.h"
+#include <QUrl>
 
-#include "ctkPluginPrivate_p.h"
+#include "ctkPlugin_p.h"
 #include "ctkPluginArchive_p.h"
 #include "ctkPluginException.h"
 #include "ctkPluginFrameworkContext_p.h"
+#include "ctkPlugins_p.h"
 #include "ctkVersionRange_p.h"
 
 #include <stdexcept>
 #include <iostream>
 
-#include <QUrl>
-
 //----------------------------------------------------------------------------
 void ctkPlugins::checkIllegalState() const
 {

Libs/PluginFramework/ctkRequirePlugin.cpp

@@ -19,10 +19,9 @@
 
 =============================================================================*/
 
-#include "ctkRequirePlugin_p.h"
-
+#include "ctkPlugin_p.h"
 #include "ctkPluginConstants.h"
-#include "ctkPluginPrivate_p.h"
+#include "ctkRequirePlugin_p.h"
 
 //----------------------------------------------------------------------------
 ctkRequirePlugin::ctkRequirePlugin(ctkPluginPrivate* requestor,

Libs/PluginFramework/ctkServiceReference.cpp

@@ -19,16 +19,16 @@
 
 =============================================================================*/
 
-#include "ctkServiceReference.h"
-#include "ctkServiceReferencePrivate.h"
-#include "ctkServiceRegistrationPrivate.h"
-#include "ctkPluginPrivate_p.h"
-#include "ctkPluginConstants.h"
-
 #include <QStringList>
 #include <QMutexLocker>
 #include <QDebug>
 
+#include "ctkPlugin_p.h"
+#include "ctkPluginConstants.h"
+#include "ctkServiceReference.h"
+#include "ctkServiceReference_p.h"
+#include "ctkServiceRegistration_p.h"
+
 //----------------------------------------------------------------------------
 ctkServiceReference::ctkServiceReference()
   : d_ptr(new ctkServiceReferencePrivate(0))

Libs/PluginFramework/ctkServiceReferencePrivate.cpp

@@ -19,19 +19,18 @@
 
 =============================================================================*/
 
-#include "ctkServiceReferencePrivate.h"
+#include "ctkServiceReference_p.h"
 
 #include <QObject>
 #include <QMutexLocker>
 
+#include "ctkPlugin_p.h"
 #include "ctkPluginConstants.h"
+#include "ctkPluginFrameworkContext_p.h"
 #include "ctkServiceFactory.h"
 #include "ctkServiceException.h"
-#include "ctkPluginPrivate_p.h"
-
 #include "ctkServices_p.h"
-#include "ctkServiceRegistrationPrivate.h"
-#include "ctkPluginFrameworkContext_p.h"
+#include "ctkServiceRegistration_p.h"
 
 //----------------------------------------------------------------------------
 ctkServiceReferencePrivate::ctkServiceReferencePrivate(ctkServiceRegistrationPrivate* reg)

Libs/PluginFramework/ctkServiceRegistration.cpp

@@ -19,18 +19,17 @@
 
 =============================================================================*/
 
-#include "ctkServiceRegistration.h"
-#include "ctkServiceRegistrationPrivate.h"
+#include <QMutex>
+
 #include "ctkPluginFrameworkContext_p.h"
-#include "ctkPluginPrivate_p.h"
+#include "ctkPlugin_p.h"
 #include "ctkPluginConstants.h"
-
-#include "ctkServices_p.h"
 #include "ctkServiceFactory.h"
+#include "ctkServiceRegistration.h"
+#include "ctkServiceRegistration_p.h"
+#include "ctkServices_p.h"
 #include "ctkServiceSlotEntry_p.h"
 
-#include <QMutex>
-
 #include <stdexcept>
 
 //----------------------------------------------------------------------------

Libs/PluginFramework/ctkServiceRegistrationPrivate.cpp

@@ -19,7 +19,7 @@
 
 =============================================================================*/
 
-#include "ctkServiceRegistrationPrivate.h"
+#include "ctkServiceRegistration_p.h"
 
 //----------------------------------------------------------------------------
 ctkServiceRegistrationPrivate::ctkServiceRegistrationPrivate(

Libs/PluginFramework/ctkServiceTracker.tpp

@@ -20,7 +20,7 @@
 =============================================================================*/
 
 
-#include "ctkServiceTrackerPrivate.h"
+#include "ctkServiceTracker_p.h"
 #include "ctkTrackedService_p.h"
 #include "ctkServiceException.h"
 #include "ctkPluginConstants.h"

Libs/PluginFramework/ctkServiceTrackerPrivate.h

@@ -167,6 +167,6 @@ private:
 
 };
 
-#include "ctkServiceTrackerPrivate.tpp"
+#include "ctkServiceTracker_p.tpp"
 
 #endif // CTKSERVICETRACKERPRIVATE_H

Libs/PluginFramework/ctkServices.cpp

@@ -31,7 +31,7 @@
 #include "ctkPluginConstants.h"
 #include "ctkPluginFrameworkContext_p.h"
 #include "ctkServiceException.h"
-#include "ctkServiceRegistrationPrivate.h"
+#include "ctkServiceRegistration_p.h"
 #include "ctkLDAPExpr_p.h"
 
 //----------------------------------------------------------------------------

Libs/PluginFramework/ctkServices_p.h

@@ -28,8 +28,8 @@
 #include <QMutex>
 #include <QStringList>
 
+#include "ctkPlugin_p.h"
 #include "ctkServiceRegistration.h"
-#include "ctkPluginPrivate_p.h"
 
 
 /**