From 61075dfb79b78d75b0a60f80eea317b614d8cb22 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Tue, 24 Jul 2012 01:13:08 +0200
Subject: [PATCH] lib: Code cleanup (to prevent recursive require) & added
 autoload.

---
 lib/qasim.rb           | 9 +++++++++
 lib/qasim/config.rb    | 4 +---
 lib/qasim/constants.rb | 2 +-
 lib/qasim/map.rb       | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 lib/qasim.rb

diff --git a/lib/qasim.rb b/lib/qasim.rb
new file mode 100644
index 0000000..5967adc
--- /dev/null
+++ b/lib/qasim.rb
@@ -0,0 +1,9 @@
+
+
+require 'qasim/constants'
+
+module Qasim
+	autoload :Config, 	'qasim/config'
+	autoload :Map, 	'qasim/map'
+end
+
diff --git a/lib/qasim/config.rb b/lib/qasim/config.rb
index 171addb..4b74ef9 100644
--- a/lib/qasim/config.rb
+++ b/lib/qasim/config.rb
@@ -6,10 +6,8 @@ require 'ostruct'
 require 'pp'
 require 'find'
 
-require 'rubygems'
 #require 'rdebug/base'
-require 'qasim/constants'
-require 'qasim/map'
+require 'qasim'
 
 module Qasim
 	class Config
diff --git a/lib/qasim/constants.rb b/lib/qasim/constants.rb
index fd21c64..7fa6451 100644
--- a/lib/qasim/constants.rb
+++ b/lib/qasim/constants.rb
@@ -1,5 +1,5 @@
 module Qasim
-	APP_ICON_PATH = File.join QASIM_INCLUDE_DIR, "icons"
+	APP_ICON_PATH = File.join QASIM_DATA_DIR, "icons"
 	APP_NAME = "Qasim"
 	APP_VERSION = "0.1"
 
diff --git a/lib/qasim/map.rb b/lib/qasim/map.rb
index cdef3b0..4d6c19c 100644
--- a/lib/qasim/map.rb
+++ b/lib/qasim/map.rb
@@ -1,8 +1,8 @@
 
 require 'fileutils'
-require 'rubygems'
+
 #require 'rdebug/base'
-require 'qasim/config'
+require 'qasim'
 
 module Qasim