X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fmainpanel.cpp;h=0071f4b9a58a615afe9e19a2741bf8fd59659033;hb=ca9d278f9472206ad9a01190dcef9f0eb1bcc274;hp=8a292b44ff851dbb4a02c84eacc04ad2a7a6cd00;hpb=62ce775d9af8f3321dbdebd6243b551fbbb0b976;p=r2c2.git diff --git a/source/engineer/mainpanel.cpp b/source/engineer/mainpanel.cpp index 8a292b4..0071f4b 100644 --- a/source/engineer/mainpanel.cpp +++ b/source/engineer/mainpanel.cpp @@ -1,12 +1,5 @@ -/* $Id$ - -This file is part of the MSP Märklin suite -Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - #include -#include "libmarklin/driver.h" +#include "libr2c2/driver.h" #include "engineer.h" #include "mainpanel.h" #include "trainproperties.h" @@ -59,7 +52,7 @@ MainPanel::MainPanel(Engineer &e): lbl_status->set_geometry(GLtk::Geometry(10, 10, 180, 20)); lbl_status->set_style("digital"); - Marklin::Driver &driver = engineer.get_layout().get_driver(); + R2C2::Driver &driver = engineer.get_layout().get_driver(); if(driver.get_power()) ind_on->set_active(true); else @@ -86,7 +79,7 @@ void MainPanel::power_off() void MainPanel::toggle_halt() { - Marklin::Driver &driver = engineer.get_layout().get_driver(); + R2C2::Driver &driver = engineer.get_layout().get_driver(); driver.halt(!driver.is_halted()); }