From 75508e90f00e442e671e34f0285fa3bf4f893bc2 Mon Sep 17 00:00:00 2001 From: Doug McLain Date: Thu, 15 Jun 2006 00:49:16 +0000 Subject: [PATCH] Removed unused files from glade based NSD git-svn-id: svn://localhost/ardour2/trunk@599 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui_options.cc | 2 +- gtk2_ardour/glade_factory.cc | 37 ------------------------ gtk2_ardour/glade_factory.h | 45 ----------------------------- gtk2_ardour/glade_path.cc | 38 ------------------------- gtk2_ardour/glade_path.h | 49 -------------------------------- 5 files changed, 1 insertion(+), 170 deletions(-) delete mode 100644 gtk2_ardour/glade_factory.cc delete mode 100644 gtk2_ardour/glade_factory.h delete mode 100644 gtk2_ardour/glade_path.cc delete mode 100644 gtk2_ardour/glade_path.h diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 1dbf10e074..ac0028b58c 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -46,7 +46,7 @@ ARDOUR_UI::setup_config_options () struct { char* name; bool (Configuration::*method)(void) const; - char act_type; // (t)oggle or (r)adio + char act_type; //(t)oggle or (r)adio } options[] = { { "ToggleTimeMaster", &Configuration::get_jack_time_master, 't' }, { "StopPluginsWithTransport", &Configuration::get_plugins_stop_with_transport, 't' }, diff --git a/gtk2_ardour/glade_factory.cc b/gtk2_ardour/glade_factory.cc deleted file mode 100644 index 6dbced388a..0000000000 --- a/gtk2_ardour/glade_factory.cc +++ /dev/null @@ -1,37 +0,0 @@ -/* - Copyright (C) 2005 Paul Davis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ -*/ - -#include - -#include "glade_factory.h" - -Glib::RefPtr -GladeFactory::create(const std::string& full_path_to_file, - const Glib::ustring& toplevel_widget) -{ - try { - return Gnome::Glade::Xml::create(full_path_to_file, - toplevel_widget, - PACKAGE ); - } catch(const Gnome::Glade::XmlError& ex) { - std::cerr << ex.what() << std::endl; - throw ex; - } -} diff --git a/gtk2_ardour/glade_factory.h b/gtk2_ardour/glade_factory.h deleted file mode 100644 index 2fff3bd167..0000000000 --- a/gtk2_ardour/glade_factory.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - Copyright (C) 2005 Paul Davis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ -*/ - -// -*- c++ -*- - -#ifndef GLADE_FACTORY_H -#define GLADE_FACTORY_H - -#include -#include - -typedef Glib::RefPtr GladeRef; - -/** - This is the base class for all glade - factories so that the same domain is - used. -*/ -class GladeFactory { - -protected: - static GladeRef - create(const std::string& full_path, - const Glib::ustring& toplevel_widget = Glib::ustring()); -}; - - -#endif // GLADE_FACTORY_H diff --git a/gtk2_ardour/glade_path.cc b/gtk2_ardour/glade_path.cc deleted file mode 100644 index 29bca7151f..0000000000 --- a/gtk2_ardour/glade_path.cc +++ /dev/null @@ -1,38 +0,0 @@ -/* - Copyright (C) 2005 Paul Davis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ -*/ - -#include -#include - -#include - -#include "i18n.h" -#include "glade_path.h" - -#include - -std::string -GladePath::path(const std::string& glade_file) -{ - std::string full_path; - - full_path = ARDOUR::find_data_file(glade_file, "glade"); - return full_path; -} diff --git a/gtk2_ardour/glade_path.h b/gtk2_ardour/glade_path.h deleted file mode 100644 index a651b5fd1c..0000000000 --- a/gtk2_ardour/glade_path.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - Copyright (C) 2005 Paul Davis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ -*/ - -#ifndef GLADE_PATH_H -#define GLADE_PATH_H - -#include - -struct GladePath { - - /** - @return Path to glade file. - - XXX subject to change upon discussion. - - glade files are currently looked for in - three possible directories in this order. - - In the directory defined in the environment - variable ARDOUR_GLADE_PATH - - In the users .ardour/glade directory. - - In the system defined glade path. - */ - static std::string - path(const std::string& glade_filename); - -}; - -#endif // GLADE_PATH_H -