made a compiler a bit happier

Signed-off-by: Michael Krelin <hacker@klever.net>

2 files changed, 5 insertions, 5 deletions

diff --git a/src/napkin.cc b/src/napkin.cc
index d9ba0c9..78f44f8 100644
--- a/src/napkin.cc
+++ b/src/napkin.cc
@@ -1,148 +1,148 @@
 #include <fcntl.h>
 #include <iostream>
 using std::cerr;
 using std::endl;
 #include <fstream>
 using std::ofstream;
 #include <cstdlib>
 using std::min;
 #include <stdexcept>
 using std::runtime_error;
 #include <list>
 using std::list;
 #include <vector>
 using std::vector;
 #include <string>
 using std::string;
 #include <gtkmm/main.h>
 #include <gtkmm/window.h>
 #include <gtkmm/box.h>
 #include <gtkmm/statusbar.h>
 #include <gtkmm/uimanager.h>
 #include <gtkmm/stock.h>
 #include <gtkmm/toolbar.h>
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/aboutdialog.h>
 #include <napkin/exception.h>
 #include <napkin/util.h>
 #include <napkin/st/decode.h>
 #include <napkin/st/download.h>
 
 #include "db.h"
 #include "sleep_timeline.h"
 #include "dialogs.h"
 #include "sleep_history.h"
 
 #include "config.h"
 
 class napkin_ui : public Gtk::Window {
     public:
 	Gtk::VBox w_outer_box;
 	Gtk::Statusbar w_status_bar;
 	napkin::gtk::sleep_history_t w_history;
 	Glib::RefPtr<Gtk::UIManager> uiman;
 	Glib::RefPtr<Gtk::ActionGroup> agroup;
 	napkin::db_t db;
 	Glib::RefPtr<Gtk::Action> a_remove;
 
 	napkin_ui()
 	    : w_history(db)
 	{
-	    static char *ui_info =
+	    static const char *ui_info =
 		"<ui>"
 		 "<menubar name='menu_bar'>"
 		  "<menu action='menu_sleep'>"
 #ifndef NDEBUG
 		   "<menu action='menu_sleep_add'>"
 #endif
 		    "<menuitem action='sleep_add_from_sleeptracker'/>"
 #ifndef NDEBUG
 		    "<menuitem action='sleep_add_from_datafile'/>"
 		   "</menu>"
 #endif
 		   "<menuitem action='sleep_remove'/>"
 		   "<menuitem action='exit'/>"
 		  "</menu>"
 		  "<menu action='menu_help'>"
 		   "<menuitem action='help_about'/>"
 		  "</menu>"
 		 "</menubar>"
 		 "<toolbar action='tool_bar'>"
 		  "<toolitem action='sleep_add_from_sleeptracker'/>"
 		  "<toolitem action='sleep_remove'/>"
 		  "<separator expand='true'/>"
 #ifndef NDEBUG
 		  "<toolitem action='debug'/>"
 		  "<separator/>"
 #endif
 		  "<toolitem action='exit'/>"
 		 "</toolbar>"
 		"</ui>";
 	    agroup = Gtk::ActionGroup::create();
 	    agroup->add(Gtk::Action::create("menu_sleep","Sleep"));
 	    agroup->add(Gtk::Action::create("menu_sleep_add","Add"));
 	    agroup->add(Gtk::Action::create("sleep_add_from_sleeptracker",Gtk::Stock::CONNECT,
 			"from sleeptracker","import sleeptracker data from watch"),
 		    Gtk::AccelKey("<Ctrl>d"),
 		    sigc::mem_fun(*this,&napkin_ui::on_sleep_add_from_sleeptracker));
 #ifndef NDEBUG
 	    agroup->add(Gtk::Action::create("sleep_add_from_datafile",Gtk::Stock::CONVERT,
 			"from data file","import sleeptracker data stored in a file"),
 		    sigc::mem_fun(*this,&napkin_ui::on_sleep_add_from_datafile));
 #endif
 	    agroup->add(a_remove=Gtk::Action::create("sleep_remove",Gtk::Stock::REMOVE,
 			"Remove","remove highlighted sleep event from the database"),
 		    Gtk::AccelKey("delete"),
 		    sigc::mem_fun(*this,&napkin_ui::on_remove));
 	    agroup->add(Gtk::Action::create("exit",Gtk::Stock::QUIT,"Exit","Exit "PACKAGE_NAME),
 		    Gtk::AccelKey("<control>w"),
 		    sigc::mem_fun(*this,&napkin_ui::on_quit));
 	    agroup->add(Gtk::Action::create("menu_help","Help"));
 	    agroup->add(Gtk::Action::create("help_about",Gtk::Stock::ABOUT,
 			"About","About this program"),
 		    sigc::mem_fun(*this,&napkin_ui::on_help_about));
 #ifndef NDEBUG
 	    agroup->add(Gtk::Action::create("debug",Gtk::Stock::INFO,"Debug","debug action"),
 		    sigc::mem_fun(*this,&napkin_ui::on_debug));
 #endif
 	    uiman = Gtk::UIManager::create();
 	    uiman->insert_action_group(agroup);
 	    add_accel_group(uiman->get_accel_group());
 	    uiman->add_ui_from_string(ui_info);
 	    Gtk::Widget * mb = uiman->get_widget("/menu_bar");
 	    if(mb)
 		w_outer_box.pack_start(*mb,Gtk::PACK_SHRINK);
 	    Gtk::Widget * tb = uiman->get_widget("/tool_bar");
 	    if(tb) {
 		static_cast<Gtk::Toolbar*>(tb)->set_toolbar_style(Gtk::TOOLBAR_ICONS);
 		w_outer_box.pack_start(*tb,Gtk::PACK_SHRINK);
 	    }
 	    w_outer_box.pack_start(w_history,true/*expand*/,true/*fill*/);
 	    w_outer_box.pack_end(w_status_bar,false/*expand*/,false/*fill*/);
 	    add(w_outer_box);
 	    set_title(PACKAGE_STRING);
 	    set_default_size(800,600);
 	    show_all();
 	    w_status_bar.push(" "PACKAGE_STRING);
 
 	    refresh_data();
 
 	    w_history.signal_cursor_changed().connect(
 		    sigc::mem_fun(*this,&napkin_ui::on_history_cursor_changed));
 	    on_history_cursor_changed();
 	    w_history.signal_double_click().connect(
 		    sigc::mem_fun(*this,&napkin_ui::on_history_double_click));
 	}
 
 	void on_help_about() {
 	    Gtk::AboutDialog about;
 	    about.set_authors(vector<string>(1,"Michael Krelin <hacker@klever.net>"));
 	    about.set_copyright("© 2008 Klever Group");
 	    extern const char *COPYING;
 	    about.set_license(COPYING);
 	    about.set_program_name(PACKAGE_NAME);
 	    about.set_version(VERSION);
 	    about.set_website("http://kin.klever.net/");
 	    about.set_website_label("Klever Internet Nothings");
 	    about.set_comments("The Sleeptracker PRO watch support program");
diff --git a/src/widgets.cc b/src/widgets.cc
index ea85bc8..61c7da9 100644
--- a/src/widgets.cc
+++ b/src/widgets.cc
@@ -1,63 +1,63 @@
 #include <napkin/util.h>
 #include "widgets.h"
 
 namespace napkin {
     namespace gtk {
 
 	hypnoinfo_t::hypnoinfo_t()
 	    : w_upper(4,3,false/*homogeneous*/),
-	    lc_tobed("To bed:",0.5,0.5),
-	    lc_timeline("Sleep timeline:",0.5,0.5),
-	    lc_alarm("Alarm:",0.5,0.5), lc_window("Window:",0.5,0.5),
-	    l_data_a("",0.9,0.5)
+	    lc_tobed("To bed:",0.5f,0.5f),
+	    lc_timeline("Sleep timeline:",0.5f,0.5f),
+	    lc_alarm("Alarm:",0.5f,0.5f), lc_window("Window:",0.5f,0.5f),
+	    l_data_a("",0.9f,0.5f)
 	{
 	    add(l_date);
 	    add(l_hseparator);
 	     w_upper.set_col_spacings(5);
 	     w_upper.attach(lc_tobed,0,1,0,1, Gtk::SHRINK);
 	     w_upper.attach(lc_timeline,1,2,0,1, Gtk::SHRINK);
 	     w_upper.attach(lc_alarm,2,3,0,1, Gtk::SHRINK);
 	     w_upper.attach(lf_tobed,0,1,1,4, Gtk::SHRINK);
 	     w_upper.attach(st_timeline,1,2,1,4,
 		     Gtk::FILL|Gtk::EXPAND,Gtk::FILL|Gtk::EXPAND,0,0);
 	     w_upper.attach(lf_alarm,2,3,1,2, Gtk::SHRINK);
 	     w_upper.attach(lc_window,2,3,2,3, Gtk::SHRINK);
 	     w_upper.attach(lf_window,2,3,3,4, Gtk::SHRINK);
 	    add(w_upper);
 	    add(lc_almost_awakes);
 	    add(lf_almost_awakes);
 	    add(l_data_a);
 	    show_all();
 	}
 
 	void hypnoinfo_t::update_data(const hypnodata_ptr_t& hd) {
 	    l_date.set_use_markup(true);
 	    l_date.set_markup("<b>"+hd->str_date()+"</b>");
 	    lf_tobed.set_use_markup(true);
 	    lf_tobed.set_markup("<b>"+hd->str_to_bed()+"</b>");
 	    lf_alarm.set_use_markup(true);
 	    lf_alarm.set_markup("<b>"+hd->str_alarm()+"</b>");
 	    char tmp[64];
 	    snprintf(tmp,sizeof(tmp),"<b>%d mins</b>",hd->window);
 	    lf_window.set_use_markup(true);
 	    lf_window.set_markup(tmp);
 	    snprintf(tmp,sizeof(tmp),"<b>%d</b> almost awake moments:",(int)hd->almost_awakes.size());
 	    lc_almost_awakes.set_use_markup(true);
 	    lc_almost_awakes.set_markup(tmp);
 	    string awlist;
 	    for(vector<time_t>::const_iterator i=hd->almost_awakes.begin();i!=hd->almost_awakes.end();++i) {
 		if(!awlist.empty())
 		    awlist += ", ";
 		awlist += strftime("<b>%H:%M:%S</b>",*i);
 	    }
 	    lf_almost_awakes.set_use_markup(true);
 	    lf_almost_awakes.set_line_wrap(true);
 	    lf_almost_awakes.set_line_wrap_mode(Pango::WRAP_WORD);
 	    lf_almost_awakes.set_markup("<tt>"+awlist+"</tt>");
 	    l_data_a.set_use_markup(true);
 	    l_data_a.set_markup("Data A is <b>"+hd->str_data_a()+"</b>");
 	    st_timeline.set_data(hd);
 	}
 
     }
 }