X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fsystem.cpp;fp=src%2Fbase%2Fsystem.cpp;h=4b7c663c8565f93de916272aca9f125ea13a26cd;hb=16354e0421b316a62c6b9f7b0b4f3b8cf6f06284;hp=c581e717d31ee3c73fadf3f80840f52e4d21588c;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/system.cpp b/src/base/system.cpp
index c581e71..4b7c663 100644
--- a/src/base/system.cpp
+++ b/src/base/system.cpp
@@ -19,10 +19,10 @@
 #include <QTranslator>
 #include "settings.h"
 
-RS_System * RS_System::uniqueInstance = NULL;
+System * System::uniqueInstance = NULL;
 
 // Constructor
-RS_System::RS_System()
+System::System()
 {
 	initialized = false;
 }
@@ -30,10 +30,10 @@ RS_System::RS_System()
 /**
  * @return Instance to the unique system object.
  */
-/*static*/ RS_System * RS_System::instance()
+/*static*/ System * System::instance()
 {
 	if (uniqueInstance == NULL)
-		uniqueInstance = new RS_System();
+		uniqueInstance = new System();
 
 	return uniqueInstance;
 }
@@ -41,14 +41,14 @@ RS_System::RS_System()
 /**
  * Initializes the system.
  *
- * @param appName Application name (e.g. "QCad II")
+ * @param appName Application name (e.g. "Architektonas")
  * @param appVersion Application version (e.g. "1.2.3")
  * @param appDirName Application directory name used for
  *     subdirectories in /usr, /etc ~/.
  * @param appDir Absolute application directory (e.g. /opt/qcad)
  *                 defaults to current directory.
  */
-void RS_System::init(const QString & appName, const QString & appVersion,
+void System::init(const QString & appName, const QString & appVersion,
 	const QString & appDirName, const QString & appDir)
 {
 	this->appName = appName;
@@ -65,8 +65,8 @@ void RS_System::init(const QString & appName, const QString & appVersion,
 		this->appDir = appDir;
 	}
 
-	RS_DEBUG->print("RS_System::init: System %s initialized.", appName.toLatin1().data());
-	RS_DEBUG->print("RS_System::init: App dir: %s", appDir.toLatin1().data());
+	DEBUG->print("System::init: System %s initialized.", appName.toLatin1().data());
+	DEBUG->print("System::init: App dir: %s", appDir.toLatin1().data());
 	initialized = true;
 
 	initLanguageList();
@@ -75,9 +75,9 @@ void RS_System::init(const QString & appName, const QString & appVersion,
 /**
  * Initializes the list of available translations.
  */
-void RS_System::initLanguageList()
+void System::initLanguageList()
 {
-	RS_DEBUG->print("RS_System::initLanguageList");
+	DEBUG->print("System::initLanguageList");
 	QStringList lst = getFileList("qm", "qm");
 
 	settings.beginGroup("Paths");
@@ -87,7 +87,7 @@ void RS_System::initLanguageList()
 
 	for(QStringList::Iterator it=lst.begin(); it!=lst.end(); ++it)
 	{
-		RS_DEBUG->print("RS_System::initLanguageList: qm file: %s", (*it).toLatin1().data());
+		DEBUG->print("System::initLanguageList: qm file: %s", (*it).toLatin1().data());
 
 //		int i1 = (*it).findRev('_');
 		int i1 = (*it).lastIndexOf('_');
@@ -98,18 +98,18 @@ void RS_System::initLanguageList()
 //		if (languageList.find(l) == languageList.end())
 		if (languageList.indexOf(l) == -1)
 		{
-			RS_DEBUG->print("RS_System::initLanguageList: append language: %s", l.toLatin1().data());
+			DEBUG->print("System::initLanguageList: append language: %s", l.toLatin1().data());
 			languageList.append(l);
 		}
 	}
 
-	RS_DEBUG->print("RS_System::initLanguageList: OK");
+	DEBUG->print("System::initLanguageList: OK");
 }
 
 /**
  * Loads a different translation for the application GUI.
  */
-void RS_System::loadTranslation(const QString & lang, const QString & langCmd)
+void System::loadTranslation(const QString & lang, const QString & langCmd)
 {
 	static QTranslator * tQt = NULL;
 	static QTranslator * tQCad = NULL;
@@ -258,12 +258,12 @@ void RS_System::loadTranslation(const QString & lang, const QString & langCmd)
  * Checks if the system has been initialized and prints a warning
  * otherwise to stderr.
  */
-bool RS_System::checkInit()
+bool System::checkInit()
 {
 	if (!initialized)
 	{
-		RS_DEBUG->print(RS_Debug::D_WARNING, "RS_System::checkInit: System not initialized.\n"
-			"Use RS_SYSTEM->init(appname, appdirname) to do so.");
+		DEBUG->print(Debug::D_WARNING, "System::checkInit: System not initialized.\n"
+			"Use SYSTEM->init(appname, appdirname) to do so.");
 	}
 
 	return initialized;
@@ -272,7 +272,7 @@ bool RS_System::checkInit()
 /**
  * Creates all given directories in the user's home.
  */
-bool RS_System::createHomePath(const QString & p)
+bool System::createHomePath(const QString & p)
 {
 	QDir dr;
 
@@ -287,12 +287,12 @@ bool RS_System::createHomePath(const QString & p)
 //		if (created.isEmpty() || QFileInfo(created).isDir() || dr.mkdir(created, true))
 		if (created.isEmpty() || QFileInfo(created).isDir() || dr.mkdir(created))
 		{
-			RS_DEBUG->print("RS_System::createHomePath: Created directory '%s'",
+			DEBUG->print("System::createHomePath: Created directory '%s'",
 				created.toLatin1().data());
 		}
 		else
 		{
-			RS_DEBUG->print(RS_Debug::D_ERROR, "RS_System::createHomePath: Cannot create directory '%s'",
+			DEBUG->print(Debug::D_ERROR, "System::createHomePath: Cannot create directory '%s'",
 				created.toLatin1().data());
 			return false;
 		}
@@ -304,7 +304,7 @@ bool RS_System::createHomePath(const QString & p)
 /**
  * @return Users home directory.
  */
-QString RS_System::getHomeDir()
+QString System::getHomeDir()
 {
 //	return QDir::homeDirPath();
 	return QDir::homePath();
@@ -313,7 +313,7 @@ QString RS_System::getHomeDir()
 /**
  * @return Current directory.
  */
-QString RS_System::getCurrentDir()
+QString System::getCurrentDir()
 {
 //	return QDir::currentDirPath();
 	return QDir::currentPath();
@@ -322,7 +322,7 @@ QString RS_System::getCurrentDir()
 /**
  * @return Application directory.
  */
-QString RS_System::getAppDir()
+QString System::getAppDir()
 {
 	return appDir;
 }
@@ -330,7 +330,7 @@ QString RS_System::getAppDir()
 /**
  * @return A list of absolute paths to all font files found.
  */
-QStringList RS_System::getFontList()
+QStringList System::getFontList()
 {
 	QStringList ret = getFileList("fonts", "cxf");
 	return ret;
@@ -339,7 +339,7 @@ QStringList RS_System::getFontList()
 /**
  * @return A list of absolute paths to all hatch pattern files found.
  */
-QStringList RS_System::getPatternList()
+QStringList System::getPatternList()
 {
 	QStringList ret = getFileList("patterns", "dxf");
 	return ret;
@@ -348,7 +348,7 @@ QStringList RS_System::getPatternList()
 /**
  * @return A list of absolute paths to all script files found.
  */
-QStringList RS_System::getScriptList()
+QStringList System::getScriptList()
 {
 	QStringList ret = getFileList("scripts/qsa", "qs");
 	return ret;
@@ -357,7 +357,7 @@ QStringList RS_System::getScriptList()
 /**
  * @return A list of absolute paths to all machine configuration files found.
  */
-QStringList RS_System::getMachineList()
+QStringList System::getMachineList()
 {
 	QStringList ret = getFileList("machines", "cxm");
 	return ret;
@@ -366,7 +366,7 @@ QStringList RS_System::getMachineList()
 /**
  * @return Absolute path to the documentation.
  */
-QString RS_System::getDocPath()
+QString System::getDocPath()
 {
 	QStringList lst = getDirectoryList("doc");
 	return lst.first();
@@ -375,7 +375,7 @@ QString RS_System::getDocPath()
 /**
  * @return The application name.
  */
-QString RS_System::getAppName()
+QString System::getAppName()
 {
 	return appName;
 }
@@ -383,7 +383,7 @@ QString RS_System::getAppName()
 /**
  * @return The application version.
  */
-QString RS_System::getAppVersion()
+QString System::getAppVersion()
 {
 	return appVersion;
 }
@@ -394,7 +394,7 @@ QString RS_System::getAppVersion()
  *
  * @return List of the absolute paths of the files found.
  */
-QStringList RS_System::getFileList(const QString & subDirectory, const QString & fileExtension)
+QStringList System::getFileList(const QString & subDirectory, const QString & fileExtension)
 {
 	checkInit();
 
@@ -448,7 +448,7 @@ QStringList RS_System::getFileList(const QString & subDirectory, const QString &
  * @return List of all directories in subdirectory 'subDirectory' in
  * all possible QCad directories.
  */
-QStringList RS_System::getDirectoryList(const QString & subDirectory)
+QStringList System::getDirectoryList(const QString & subDirectory)
 {
 	QStringList dirList;
 
@@ -513,14 +513,14 @@ QStringList RS_System::getDirectoryList(const QString & subDirectory)
 
 	QStringList ret;
 
-	RS_DEBUG->print("RS_System::getDirectoryList: Paths:");
+	DEBUG->print("System::getDirectoryList: Paths:");
 
 	for(QStringList::Iterator it=dirList.begin(); it!=dirList.end(); ++it)
 	{
 		if (QFileInfo(*it).isDir())
 		{
 			ret += (*it);
-			RS_DEBUG->print((*it).toLatin1().data());
+			DEBUG->print((*it).toLatin1().data());
 //printf("System: *it=\"%s\"\n", (*it).toAscii().data());
 		}
 	}
@@ -528,7 +528,7 @@ QStringList RS_System::getDirectoryList(const QString & subDirectory)
 	return ret;
 }
 
-QStringList RS_System::getLanguageList()
+QStringList System::getLanguageList()
 {
 	return languageList;
 }
@@ -538,7 +538,7 @@ QStringList RS_System::getLanguageList()
  *
  * Supported languages: http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt
  */
-QString RS_System::languageToSymbol(const QString& lang)
+QString System::languageToSymbol(const QString& lang)
 {
     QString l = lang.toLower();
 
@@ -972,7 +972,7 @@ QString RS_System::languageToSymbol(const QString& lang)
  * Converst a language two-letter-code into a readable string
  * (e.g. 'de' to Deutsch)
  */
-QString RS_System::symbolToLanguage(const QString & symb)
+QString System::symbolToLanguage(const QString & symb)
 {
 	QString l = symb.toLower();
 
@@ -1403,7 +1403,7 @@ QString RS_System::symbolToLanguage(const QString & symb)
 /**
  * Tries to convert the given encoding string to an encoding Qt knows.
  */
-QString RS_System::getEncoding(const QString & str)
+QString System::getEncoding(const QString & str)
 {
     QString l=str.toLower();
 
@@ -1516,7 +1516,7 @@ QString RS_System::getEncoding(const QString & str)
 */
 static QMap<QString, QString> loc_map;
 
-QString RS_System::localeToISO(const QString & locale)
+QString System::localeToISO(const QString & locale)
 {
 	if (loc_map.isEmpty())
 	{