Changeset 2831 for trunk/packages/vizservers/nanovis/imgLoaders/ImageLoaderFactory.h

Timestamp:

Mar 9, 2012, 10:12:14 AM (13 years ago)

Author:

ldelgass

Message:

Refactor texture classes, misc. cleanups, cut down on header pollution -- still
need to fix header deps in Makefile.in

File:

• trunk/packages/vizservers/nanovis/imgLoaders/ImageLoaderFactory.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/imgLoaders/ImageLoaderFactory.h

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#ifndef __IMAGE_LOADER_FACTORY_H__
-#define __IMAGE_LOADER_FACTORY_H__
+#ifndef IMAGE_LOADER_FACTORY_H
+#define IMAGE_LOADER_FACTORY_H
 
 #include <map>
@@ -10 +10 @@
 class ImageLoader;
 
-class ImageLoaderFactory {
-    std::map< std::string, ImageLoaderImpl*> _loaderImpls;
+class ImageLoaderFactory
+{
+public:
+    void addLoaderImpl(const std::string& ext, ImageLoaderImpl *loaderImpl);
+    ImageLoader *createLoader(const std::string& ext);
 
-    static ImageLoaderFactory* _instance;
+    static ImageLoaderFactory *getInstance();
+
 protected :
     ImageLoaderFactory();
     ~ImageLoaderFactory();
 
-public :
-    static ImageLoaderFactory* getInstance();
-
-public :
-    void addLoaderImpl(const std::string& ext, ImageLoaderImpl* loaderImpl);
-    ImageLoader* createLoader(const std::string& ext);
+private:
+    std::map<std::string, ImageLoaderImpl *> _loaderImpls;
+    static ImageLoaderFactory *_instance;
 };
 
-#endif //
+#endif