Removed obsolete macro.{cc,h}. Made the passing of the Netcom class, use a pointer.

1 files changed, 2 insertions, 13 deletions

diff --git a/client/mainwindow.cc b/client/mainwindow.cc
index efd4c31..619a24e 100644
--- a/client/mainwindow.cc
+++ b/client/mainwindow.cc
@@ -82,7 +82,7 @@ void MainWindow::update()
       if(macros.find(macroname) == macros.end()) {
         bool isstatic = false;
         if(xml_elem.attribute("static", "false") == "true") isstatic = true;
-        macros[macroname] = new MacroWindow(netcom, macronode, course, !isstatic);
+        macros[macroname] = new MacroWindow(&netcom, macronode, course, !isstatic);
 
         QGroupBox *g = new QGroupBox("   " + xml_elem.attribute("caption", macroname));
         g->setCheckable(false);
@@ -90,12 +90,11 @@ void MainWindow::update()
         ((QBoxLayout*)w->layout())->addWidget(g);
 
         if(!isstatic) {
-          QPushButton *b = new QPushButton(">>", g);
+          QPushButton *b = new QPushButton("+", g);
           b->setFixedSize(16,16);
           b->show();
           b->move(0,0);
 
-          connect(b, SIGNAL(clicked()), this, SLOT(closeAll()));
           connect(b, SIGNAL(clicked()), macros[macroname], SLOT(toggleMacro()));
         }
         
@@ -118,13 +117,3 @@ void MainWindow::update()
   }
 }
 
-void MainWindow::closeAll()
-{
-  /*
-  QMap<QString, MacroWindow*>::iterator i = macros.begin();
-  while(i != macros.end()) {
-    i.value()->setCollapsed(true);
-    i++;
-  }
-  */
-}