Cleanup: move constants out of Object.

bin/qasim-cli

@@ -3,10 +3,6 @@
 #$DEBUG = true
 #$VERBOSE = true
 
-QASIM_INCLUDE_DIR = "lib"
-QASIM_DATA_DIR = "."
-
-
 #
 # external libraries
 #

bin/qasim-gui

@@ -10,10 +10,7 @@ require 'set'
 require 'fcntl'
 require 'pathname'
 
-QASIM_INCLUDE_DIR = Pathname.new(File.dirname(__FILE__)).parent + "lib"
-QASIM_DATA_DIR = Pathname.new(File.dirname(__FILE__)).parent + "data"
-
-$:.push QASIM_INCLUDE_DIR
+$:.push "lib"
 
 require 'qasim'
 require 'qasim/qasim_qrc'

lib/qasim/constants.rb

@@ -1,4 +1,6 @@
 module Qasim
+  APP_DATA_DIR = Pathname.new(File.dirname(__FILE__)).parent.parent.parent + "data"
+
 	APP_ICON_PATH = File.join QASIM_DATA_DIR, "icons"
 
 	APP_SYSCONFIG_DIR = "/etc/qasim/maps.d"