X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmainapp%2Fcommands.cpp;h=083d45fa6509e109976680ee8282bddea899fce8;hb=bfd926cd5fd98e95b8b172fabd5340c9b1957e01;hp=429c04e7f1c326bb5bbef6c4867d153e0229daba;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/mainapp/commands.cpp b/src/mainapp/commands.cpp
index 429c04e..083d45f 100644
--- a/src/mainapp/commands.cpp
+++ b/src/mainapp/commands.cpp
@@ -3,7 +3,9 @@
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // Extensively rewritten and refactored by James L. Hammons
-// (C) 2010 Underground Software
+// Portions copyright (C) 2001-2003 RibbonSoft
+// Copyright (C) 2010 Underground Software
+// See the README and GPLv2 files for licensing and warranty information
 //
 // JLH = James L. Hammons <jlhamm@acm.org>
 //
@@ -14,8 +16,8 @@
 
 #include "commands.h"
 
-#include "rs_dialogfactory.h"
-#include "rs_debug.h"
+#include "dialogfactory.h"
+#include "debug.h"
 
 // Class variable
 Commands * Commands::uniqueInstance = NULL;
@@ -25,7 +27,7 @@ Commands * Commands::uniqueInstance = NULL;
  */
 Commands::Commands()
 {
-	// This is NOT necessary; we don't anything out of the hash
+	// This is NOT necessary; we don't take anything out of the hash
 //	mainCommands.setAutoDelete(true);
 //	shortCommands.setAutoDelete(true);
 
@@ -207,18 +209,18 @@ RS2::ActionType Commands::cmdToAction(const QString & cmd)
 //		if (*it.current() == ret)
 		if (*it.value() == ret)
 		{
-			if (RS_DialogFactory::instance() != NULL)
+			if (DialogFactory::instance() != NULL)
 			{
-				//if (RS_DIALOGFACTORY!=NULL) {
-				RS_DEBUG->print("Commands::cmdToAction: commandMessage");
-					//RS_DIALOGFACTORY->commandMessage(tr("Command: %1")
+				//if (DIALOGFACTORY!=NULL) {
+				DEBUG->print("Commands::cmdToAction: commandMessage");
+					//DIALOGFACTORY->commandMessage(tr("Command: %1")
 					//	.arg(full));
-				RS_DialogFactory::instance()->commandMessage(tr("Command: %1").arg(full));
-				RS_DEBUG->print("Commands::cmdToAction: commandMessage: ok");
+				DialogFactory::instance()->commandMessage(tr("Command: %1").arg(full));
+				DEBUG->print("Commands::cmdToAction: commandMessage: ok");
 				//}
 			}
 			else
-				RS_DEBUG->print("Commands::cmdToAction: dialog factory instance is NULL");
+				DEBUG->print("Commands::cmdToAction: dialog factory instance is NULL");
 
 			break;
 		}
@@ -389,8 +391,8 @@ QString Commands::command(const QString & cmd)
 	else if (cmd == "undo")
 		return tr("undo");
 
-//	RS_DEBUG->print(RS_Debug::D_WARNING, "Commands::command: command '%s' unknown", cmd.latin1());
-	RS_DEBUG->print(RS_Debug::D_WARNING, "Commands::command: command '%s' unknown", cmd.toLatin1().data());
+//	DEBUG->print(Debug::D_WARNING, "Commands::command: command '%s' unknown", cmd.latin1());
+	DEBUG->print(Debug::D_WARNING, "Commands::command: command '%s' unknown", cmd.toLatin1().data());
 	return "";
 }