2 files changed, 14 insertions, 14 deletions

diff --git a/facetracknoir/global-settings.cpp b/facetracknoir/global-settings.cpp
index 36c14f09..9c84945b 100644
--- a/facetracknoir/global-settings.cpp
+++ b/facetracknoir/global-settings.cpp
@@ -31,34 +31,34 @@ SelectedLibraries::SelectedLibraries(IDynamicLibraryProvider* mainApp) :
     correct = false;
     if (!mainApp)
         return;
-    NULLARY_DYNAMIC_FUNCTION ptr;
+    CTOR_FUNPTR ptr;
     DynamicLibrary* lib;
 
     lib = mainApp->current_tracker1();
 
     if (lib && lib->Constructor) {
-        ptr = (NULLARY_DYNAMIC_FUNCTION) lib->Constructor;
+        ptr = (CTOR_FUNPTR) lib->Constructor;
         pTracker = (ITracker*) ptr();
     }
 
     lib = mainApp->current_tracker2();
 
     if (lib && lib->Constructor) {
-        ptr = (NULLARY_DYNAMIC_FUNCTION) lib->Constructor;
+        ptr = (CTOR_FUNPTR) lib->Constructor;
         pSecondTracker = (ITracker*) ptr();
     }
 
     lib = mainApp->current_protocol();
 
     if (lib && lib->Constructor) {
-        ptr = (NULLARY_DYNAMIC_FUNCTION) lib->Constructor;
+        ptr = (CTOR_FUNPTR) lib->Constructor;
         pProtocol = (IProtocol*) ptr();
     }
 
     lib = mainApp->current_filter();
 
     if (lib && lib->Constructor) {
-        ptr = (NULLARY_DYNAMIC_FUNCTION) lib->Constructor;
+        ptr = (CTOR_FUNPTR) lib->Constructor;
         pFilter = (IFilter*) ptr();
     }
 
@@ -109,13 +109,13 @@ DynamicLibrary::DynamicLibrary(const QString& filename)
     {
         fprintf(stderr, "Error, if any: %s\n", dlerror());
         fflush(stderr);
-        Dialog = (SETTINGS_FUNCTION) dlsym(handle, "GetDialog");
+        Dialog = (DIALOG_FUNPTR) dlsym(handle, "GetDialog");
         fprintf(stderr, "Error, if any: %s\n", dlerror());
         fflush(stderr);
-        Constructor = (NULLARY_DYNAMIC_FUNCTION) dlsym(handle, "GetConstructor");
+        Constructor = (CTOR_FUNPTR) dlsym(handle, "GetConstructor");
         fprintf(stderr, "Error, if any: %s\n", dlerror());
         fflush(stderr);
-        Metadata = (METADATA_FUNCTION) dlsym(handle, "GetMetadata");
+        Metadata = (METADATA_FUNPTR) dlsym(handle, "GetMetadata");
         fprintf(stderr, "Error, if any: %s\n", dlerror());
         fflush(stderr);
     } else {
diff --git a/facetracknoir/global-settings.h b/facetracknoir/global-settings.h
index 6b04b73b..4394d1a0 100644
--- a/facetracknoir/global-settings.h
+++ b/facetracknoir/global-settings.h
@@ -52,17 +52,17 @@ extern SelectedLibraries* Libraries;
 
 struct Metadata;
 
-extern "C" typedef void* (CALLING_CONVENTION * NULLARY_DYNAMIC_FUNCTION)(void);
-extern "C" typedef Metadata* (CALLING_CONVENTION* METADATA_FUNCTION)(void);
-extern "C" typedef void* (CALLING_CONVENTION* SETTINGS_FUNCTION)(void);
+extern "C" typedef void* (CALLING_CONVENTION * CTOR_FUNPTR)(void);
+extern "C" typedef Metadata* (CALLING_CONVENTION* METADATA_FUNPTR)(void);
+extern "C" typedef void* (CALLING_CONVENTION* DIALOG_FUNPTR)(void);
 
 class DynamicLibrary {
 public:
     DynamicLibrary(const QString& filename);
     virtual ~DynamicLibrary();
-    SETTINGS_FUNCTION Dialog;
-    NULLARY_DYNAMIC_FUNCTION Constructor;
-    METADATA_FUNCTION Metadata;
+    DIALOG_FUNPTR Dialog;
+    CTOR_FUNPTR Constructor;
+    METADATA_FUNPTR Metadata;
     QString filename;
 private:
 #if defined(_WIN32)