From ba1faac3696e2269a24a6d8de2b05366a234d70d Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Fri, 20 Apr 2007 12:31:03 +0000
Subject: [PATCH] rename DiogenesIcons to Diogenes_Icons

---
 include/Barrel/File.php                       | 1 -
 include/Barrel/Page.php                       | 1 -
 include/{diogenes.icons.inc.php => Icons.php} | 4 ++--
 include/VCS/RCS.php                           | 1 -
 include/admin/index.php                       | 1 -
 include/diogenes.common.inc.php               | 3 ++-
 plugins/FileList.php                          | 1 -
 7 files changed, 4 insertions(+), 8 deletions(-)
 rename include/{diogenes.icons.inc.php => Icons.php} (98%)

diff --git a/include/Barrel/File.php b/include/Barrel/File.php
index 7582c86..03b8e86 100644
--- a/include/Barrel/File.php
+++ b/include/Barrel/File.php
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
-require_once 'diogenes.icons.inc.php';
 
 /** This class describes a Barrel File.
  */
diff --git a/include/Barrel/Page.php b/include/Barrel/Page.php
index f35e739..15d4d89 100644
--- a/include/Barrel/Page.php
+++ b/include/Barrel/Page.php
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
-require_once 'diogenes.icons.inc.php';
 require_once 'Barrel/File.php';
 
 
diff --git a/include/diogenes.icons.inc.php b/include/Icons.php
similarity index 98%
rename from include/diogenes.icons.inc.php
rename to include/Icons.php
index 1954113..8ae417d 100644
--- a/include/diogenes.icons.inc.php
+++ b/include/Icons.php
@@ -21,11 +21,11 @@
 
 /** This class describes Diogenes' icons.
  */
-class DiogenesIcons
+class Diogenes_Icons
 {
   /** Construct an object to manipulate Diogenes's icons.
    */
-  function DiogenesIcons($theme = 'gartoon')
+  function Diogenes_Icons($theme = 'gartoon')
   {
     $this->theme = $theme;
   }
diff --git a/include/VCS/RCS.php b/include/VCS/RCS.php
index 81a2ace..b284e5e 100644
--- a/include/VCS/RCS.php
+++ b/include/VCS/RCS.php
@@ -20,7 +20,6 @@
 
 
 require_once 'VCS/Spool.php';
-require_once 'diogenes.icons.inc.php';
 // dependency on PEAR
 require_once 'System.php';
 
diff --git a/include/admin/index.php b/include/admin/index.php
index 64b5df2..f9fb75c 100644
--- a/include/admin/index.php
+++ b/include/admin/index.php
@@ -1,7 +1,6 @@
 <?php
 require_once 'diogenes.common.inc.php';
 require_once 'diogenes.admin.inc.php';
-require_once 'diogenes.icons.inc.php';
 require_once 'Barrel/Events.php';
 
 $page = new DiogenesAdmin;
diff --git a/include/diogenes.common.inc.php b/include/diogenes.common.inc.php
index ad1cc14..a561f68 100644
--- a/include/diogenes.common.inc.php
+++ b/include/diogenes.common.inc.php
@@ -22,6 +22,7 @@
   require_once 'diogenes.globals.inc.php';
   require_once 'diogenes/diogenes.database.inc.php';
   require_once 'diogenes.session.inc.php';
+  require_once 'Icons.php';
   require_once 'VCS/CVS.php';
   require_once 'Plugins.php';
 
@@ -43,7 +44,7 @@
   $globals->plugins = new Diogenes_Plugins($globals->db, $globals->root . "/plugins", $globals->spoolroot . "/diogenes_c");
 
   // set up the icons
-  $globals->icons = new DiogenesIcons();
+  $globals->icons = new Diogenes_Icons();
 
   // do we want to debug database calls ?
   if ($globals->debugdatabase)
diff --git a/plugins/FileList.php b/plugins/FileList.php
index 2399b79..fcdc262 100644
--- a/plugins/FileList.php
+++ b/plugins/FileList.php
@@ -19,7 +19,6 @@
  */
 
 require_once 'Plugin/Filter.php';
-require_once 'diogenes.icons.inc.php';
 
 
 /** This plugin allows you to insert a directory listing with icons 
-- 
2.1.4