Removed the term 'course' everywhere, and replaced it by 'template'. This reduced/simplified the Template class structure a bit.

1 files changed, 9 insertions, 9 deletions

diff --git a/client/macrowindow.cc b/client/macrowindow.cc
index a96964b..7173e2a 100644
--- a/client/macrowindow.cc
+++ b/client/macrowindow.cc
@@ -44,13 +44,13 @@ extern QString user;
 extern QString host;
 extern quint16 port;
 
-MacroWindow::MacroWindow(NetCom &n, QDomNode &xml_doc, QString course,
+MacroWindow::MacroWindow(NetCom &n, QDomNode &xml_doc, QString templ,
                          bool collapsed, bool compact)
   : Collapser(), netcom(n)
 {
   waschanged = false;
 
-  this->course = course;
+  this->templ = templ;
 
   setCollapsedWidget(new ResumeWidget(compact));
 
@@ -149,7 +149,7 @@ bool MacroWindow::doCommit()
 
   // If all entries passed validation, continue commit
   if(faulty == 0) {
-    netcom.send(widgets, course, macro, version);
+    netcom.send(widgets, templ, macro, version);
     emit updateOnCommit();
     setCollapsed(true);
     return true;
@@ -222,7 +222,7 @@ void MacroWindow::cont(QString name)
     // FIXME: Hack to prevent XML clotching.
     // The server could not differentiate the commit and the request.
 
-    // TODO: Where to get the course var??
+    // TODO: Where to get the template var??
     //    new_macro("example", macro);
     //    close();
   } else {
@@ -249,7 +249,7 @@ void MacroWindow::cont_nocommit(QString name)
     // FIXME: Hack to prevent XML clotching.
     // The server could not differentiate the commit and the request.
 
-    // TODO: Where to get the course var??
+    // TODO: Where to get the template var??
     //    new_macro("example", macro);
     //    close();
   } else {
@@ -305,7 +305,7 @@ void MacroWindow::expandWrapper()
   luaprograms.clear();
   waschanged = false;
   
-  QDomDocument xml_doc = netcom.send(course, macro);
+  QDomDocument xml_doc = netcom.send(templ, macro);
   
   //
   // TODO: This is where the dependency checking should occur.
@@ -313,9 +313,9 @@ void MacroWindow::expandWrapper()
   
   // Initiate the new macro window with the xml document and push
   //  it to the window list
-  QDomNodeList courses = xml_doc.documentElement().childNodes();
-  QDomNode coursenode = courses.at(0); // There can be only one! (Swush, flomp)
-  QDomNodeList macronodes = coursenode.childNodes();
+  QDomNodeList templates = xml_doc.documentElement().childNodes();
+  QDomNode templatenode = templates.at(0); // There can be only one! (Swush, flomp)
+  QDomNodeList macronodes = templatenode.childNodes();
   for(int j = 0; j < macronodes.count(); j++) {
     QDomNode macronode = macronodes.at(j);