X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Ftimetabledialog.cpp;h=8a185cd156f85b7e072deda6b202280c88630f1d;hb=29433673a88dffd61ecb8e6c8fe6ab38e2012586;hp=1c7c907d25959904f5dc326a345a058af50f12b9;hpb=2073ac9922720867bdc6871d4a9b4cfcaf6a3b97;p=r2c2.git

diff --git a/source/engineer/timetabledialog.cpp b/source/engineer/timetabledialog.cpp
index 1c7c907..8a185cd 100644
--- a/source/engineer/timetabledialog.cpp
+++ b/source/engineer/timetabledialog.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/gltk/button.h>
 #include <msp/io/print.h>
 #include <msp/strings/utils.h>
@@ -12,31 +5,29 @@ Distributed under the GPL
 
 using namespace std;
 using namespace Msp;
-using namespace Marklin;
+using namespace R2C2;
 
-TimetableDialog::TimetableDialog(const GLtk::Resources &r, Timetable &tt):
-	GLtk::Widget(r),
-	GLtk::Dialog(r),
+TimetableDialog::TimetableDialog(Timetable &tt):
 	timetable(tt)
 {
 	set_size(250, 200);
 
 	GLtk::Button *btn;
 
-	add_button(*(btn = new GLtk::Button(res, "Cncl")), 0);
+	add_button(*(btn = new GLtk::Button("Cncl")), 0);
 	btn->set_geometry(GLtk::Geometry(geom.w-80, 10, 30, 25));
 	btn->set_style("red");
 
-	add_button(*(btn = new GLtk::Button(res, "OK")), 1);
+	add_button(*(btn = new GLtk::Button("OK")), 1);
 	btn->set_geometry(GLtk::Geometry(geom.w-40, 10, 30, 25));
 	btn->set_style("green");
 
-	add(*(tgl_enabled = new GLtk::Toggle(res, "On")));
+	add(*(tgl_enabled = new GLtk::Toggle("On")));
 	tgl_enabled->set_geometry(GLtk::Geometry(10, 10, 40, 27));
 	tgl_enabled->set_value(timetable.is_enabled());
 	tgl_enabled->signal_toggled.connect(sigc::mem_fun(this, &TimetableDialog::enabled_toggled));
 
-	add(*(ent_timetable = new GLtk::Entry(res)));
+	add(*(ent_timetable = new GLtk::Entry));
 	ent_timetable->set_geometry(GLtk::Geometry(10, 45, geom.w-20, geom.h-55));
 	ent_timetable->set_style("multiline");
 	ent_timetable->set_multiline(true);
@@ -72,7 +63,7 @@ void TimetableDialog::on_response(int code)
 			for(vector<Timetable::Row>::const_iterator i=rows.begin(); i!=rows.end(); ++i)
 				timetable.append(*i);
 		}
-		catch(const Exception &e)
+		catch(const exception &e)
 		{
 			// XXX Need a better way to report errors.  Also, should not let the dialog close.
 			IO::print("%s\n", e.what());