Global-Layer-Renaming: rename namespaces

This commit is contained in:
Fischlurch 2018-11-15 23:55:13 +01:00
parent 72b15b8e45
commit 555ca0bff9
670 changed files with 1306 additions and 1306 deletions

View file

@ -44,7 +44,7 @@
#include <string>
namespace gui {
namespace stage {
using std::string;
using std::unique_ptr;
@ -212,4 +212,4 @@ namespace gui {
}
} // namespace gui
} // namespace stage

View file

@ -35,7 +35,7 @@
#include "include/gui-notification-facade.h"
#include "include/interfaceproxy.hpp"
namespace gui {
namespace stage {
/** static storage for the facade access front-end */
lib::Depend<GuiNotification> GuiNotification::facade;
}

View file

@ -29,7 +29,7 @@
#include "include/ui-protocol.hpp"
namespace gui {
namespace stage {
const Symbol META_kind{"kind"};
@ -60,4 +60,4 @@ namespace gui {
}// namespace gui
}// namespace stage

View file

@ -43,7 +43,7 @@
namespace proc {
namespace steam {
namespace play {
class ProcessImpl;

View file

@ -54,7 +54,7 @@ namespace lib {
class GenNode;
class MutationMessage;
} }
namespace gui {
namespace stage {
using std::string;
using lib::diff::GenNode;
@ -124,7 +124,7 @@ namespace gui {
} // namespace gui
} // namespace stage
extern "C" {

View file

@ -51,7 +51,7 @@
namespace proc {
namespace steam {
namespace play {
class PlayProcess;

View file

@ -58,7 +58,7 @@
#include <string>
namespace proc {
namespace steam {
namespace control {
using lib::Symbol;
@ -115,7 +115,7 @@ namespace control {
}} // namespace proc::control
}} // namespace steam::control
extern "C" {

View file

@ -62,7 +62,7 @@ namespace diff{
namespace Glib {
//class ustring; /////////////////////////////TODO needed?
}
namespace gui {
namespace stage {
//using lib::Literal;
using lib::Symbol;
@ -96,5 +96,5 @@ namespace gui {
extern const Symbol MARK_Message;
}// namespace gui
}// namespace stage
#endif /*STAGE_INTERFACE_UI_PROTOCOL_H*/

View file

@ -82,7 +82,7 @@ namespace lib{
class TimeValue;
class Duration;
}}
namespace proc {
namespace steam {
namespace mobject{
template<class X, class B> class Placement;
}}

View file

@ -40,7 +40,7 @@
#include "lib/p.hpp"
namespace proc {
namespace steam {
namespace asset { class Asset; }
namespace mobject { class MObject; }

View file

@ -32,7 +32,7 @@
#include "stage/config-keys.hpp"
namespace gui {
namespace stage {
Literal KEY_TITLE = "Lumiera.title";
@ -47,4 +47,4 @@ namespace gui {
}// namespace gui
}// namespace stage

View file

@ -51,7 +51,7 @@
namespace gui {
namespace stage {
using lib::Literal;
using lumiera::Config;
@ -67,5 +67,5 @@ namespace gui {
extern Literal KEY_ICON_PATH;
}// namespace gui
}// namespace stage
#endif /*STAGE_CONFIG_KEYS_H*/

View file

@ -52,7 +52,7 @@
#include <string>
namespace gui {
namespace stage {
namespace ctrl {
namespace error = lumiera::error;
@ -374,5 +374,5 @@ namespace ctrl {
};
}}// namespace gui::ctrl
}}// namespace stage::ctrl
#endif /*STAGE_CTRL_ACTIONS_H*/

View file

@ -71,7 +71,7 @@
namespace lib {
namespace diff { class MutationMessage; }
}
namespace gui {
namespace stage {
namespace model {
class Tangible;
}
@ -177,5 +177,5 @@ namespace ctrl{
}} // namespace gui::ctrl
}} // namespace stage::ctrl
#endif /*STAGE_CTRL_BUS_TERM_H*/

View file

@ -95,7 +95,7 @@
#include "stage/ctrl/nexus.hpp"
namespace gui {
namespace stage {
namespace ctrl{
using proc::control::SessionCommand;
@ -156,5 +156,5 @@ namespace ctrl{
}} // namespace gui::ctrl
}} // namespace stage::ctrl
#endif /*STAGE_CTRL_CORE_SERVICE_H*/

View file

@ -49,7 +49,7 @@
namespace gui {
namespace stage {
namespace ctrl {
@ -86,5 +86,5 @@ namespace ctrl {
}}// namespace gui::ctrl
}}// namespace stage::ctrl
#endif /*STAGE_CTRL_FACADE_H*/

View file

@ -62,7 +62,7 @@
#include "lib/nocopy.hpp"
namespace gui {
namespace stage {
namespace ctrl {
using interact::InteractionDirector;
@ -106,5 +106,5 @@ namespace ctrl {
}}// namespace gui::ctrl
}}// namespace stage::ctrl
#endif /*STAGE_CTRL_GLOBAL_CTX_H*/

View file

@ -52,7 +52,7 @@
#include <unordered_map>
namespace gui {
namespace stage {
namespace ctrl{
@ -192,5 +192,5 @@ namespace ctrl{
}} // namespace gui::ctrl
}} // namespace stage::ctrl
#endif /*STAGE_CTRL_NEXUS_H*/

View file

@ -70,7 +70,7 @@
#include <functional>
namespace gui {
namespace stage {
namespace ctrl {
using lib::diff::TreeMutator;
@ -204,5 +204,5 @@ namespace ctrl {
}}// namespace gui::ctrl
}}// namespace stage::ctrl
#endif /*STAGE_CTRL_NOTIFICATION_HUB_H*/

View file

@ -60,7 +60,7 @@
#include <list>
namespace gui {
namespace stage {
namespace workspace {
class WorkspaceWindow;
}
@ -133,5 +133,5 @@ namespace ctrl {
}}// namespace gui::ctrl
}}// namespace stage::ctrl
#endif /*STAGE_CTRL_PANEL_LOCATOR_H*/

View file

@ -35,7 +35,7 @@
#include "include/logging.h"
namespace gui {
namespace stage {
namespace ctrl {
namespace error = lumiera::error;
@ -119,5 +119,5 @@ namespace ctrl {
}
}} // namespace gui::ctrl
}} // namespace stage::ctrl

View file

@ -46,7 +46,7 @@
namespace gui {
namespace stage {
namespace ctrl {
@ -86,6 +86,6 @@ namespace ctrl {
};
}} // namespace gui::ctrl
}} // namespace stage::ctrl
#endif // PLAYBACK_CONTROLLER_HPP

View file

@ -60,7 +60,7 @@
#include <string>
namespace gui {
namespace stage {
namespace ctrl {
using std::string;
@ -109,5 +109,5 @@ namespace ctrl {
}} // namespace gui::ctrl
}} // namespace stage::ctrl
#endif /*STAGE_CTRL_STATE_MANAGER_H*/

View file

@ -48,7 +48,7 @@
#include <set>
namespace gui {
namespace stage {
namespace ctrl {
using lib::idi::BareEntryID;
@ -222,5 +222,5 @@ namespace ctrl {
}} // namespace gui::ctrl
}} // namespace stage::ctrl
#endif /*STAGE_CTRL_STATE_MAP_GROUPING_STORAGE_H*/

View file

@ -64,7 +64,7 @@
#include <string>
namespace gui {
namespace stage {
namespace ctrl {
using gui::ctrl::BusTerm;
@ -207,5 +207,5 @@ namespace ctrl {
}} // namespace gui::ctrl
}} // namespace stage::ctrl
#endif /*STAGE_CTRL_STATE_RECORDER_H*/

View file

@ -83,7 +83,7 @@
#include <utility>
namespace gui {
namespace stage {
namespace ctrl {
using std::move;
@ -154,5 +154,5 @@ namespace ctrl {
}}// namespace gui::ctrl
}}// namespace stage::ctrl
#endif /*STAGE_CTRL_UI_DISPATCHER_H*/

View file

@ -49,7 +49,7 @@ using util::cStr;
using util::isnil;
namespace gui {
namespace stage {
namespace ctrl {
using Gtk::IconSize;
@ -190,4 +190,4 @@ namespace ctrl {
}
}}// namespace gui::ctrl
}}// namespace stage::ctrl

View file

@ -55,7 +55,7 @@
#include <string>
namespace gui {
namespace stage {
class UiBus;
@ -152,5 +152,5 @@ namespace ctrl {
}}// namespace gui::ctrl
}}// namespace stage::ctrl
#endif /*STAGE_CTRL_UI_MANAGER_H*/

View file

@ -37,7 +37,7 @@
//using util::isnil;
namespace gui {
namespace stage {
namespace ctrl {
using interact::FocusTracker;
@ -66,4 +66,4 @@ namespace ctrl {
}}// namespace gui::ctrl
}}// namespace stage::ctrl

View file

@ -61,7 +61,7 @@
//#include <memory>
namespace gui {
namespace stage {
namespace interact { class FocusTracker; }
namespace ctrl {
@ -97,5 +97,5 @@ namespace ctrl {
}}// namespace gui::workspace
}}// namespace stage::workspace
#endif /*STAGE_CTRL_UI_MANAGER_H*/

View file

@ -42,7 +42,7 @@ using util::isnil;
using std::list;
namespace gui {
namespace stage {
namespace ctrl {
using workspace::WorkspaceWindow;
@ -204,4 +204,4 @@ namespace ctrl {
}}// namespace gui::ctrl
}}// namespace stage::ctrl

View file

@ -44,7 +44,7 @@
#include <list>
namespace gui {
namespace stage {
namespace model { class Project; } ////////////////////////////////////////////////////TICKET #1048 : rectify UI lifecycle
namespace controller { class Controller; } ////////////////////////////////////////////////////TICKET #1048 : rectify UI lifecycle
@ -123,5 +123,5 @@ namespace ctrl {
}}// namespace gui::ctrl
}}// namespace stage::ctrl
#endif /*STAGE_CTRL_WINDOW_LOCATOR_H*/

View file

@ -29,7 +29,7 @@
#ifndef STAGE_DIALOG_DIALOG_H
#define STAGE_DIALOG_DIALOG_H
namespace gui {
namespace stage {
namespace dialog {
/**
@ -43,5 +43,5 @@ namespace dialog {
static const int BoxSpacing = 6;
}} // namespace gui::dialog
}} // namespace stage::dialog
#endif /*STAGE_DIALOG_DIALOG_H*/

View file

@ -34,7 +34,7 @@
using namespace Gtk; //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
using namespace Glib; //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
namespace gui {
namespace stage {
namespace dialog {
NameChooser::NameChooser (Window &parent,
@ -70,4 +70,4 @@ namespace dialog {
}} // namespace gui::dialog
}} // namespace stage::dialog

View file

@ -32,7 +32,7 @@
#include "stage/gtk-base.hpp"
namespace gui {
namespace stage {
namespace dialog {
/**
@ -69,5 +69,5 @@ namespace dialog {
};
}} // namespace gui::dialog
}} // namespace stage::dialog
#endif /*STAGE_DIALOG_NAME_CHOOSER_H*/

View file

@ -36,7 +36,7 @@
#include "stage/gtk-base.hpp"
#include "stage/dialog/dialog.hpp"
namespace gui {
namespace stage {
namespace dialog {
@ -79,5 +79,5 @@ namespace dialog {
};
}} // namespace gui::dialog
}} // namespace stage::dialog
#endif /*STAGE_DIALOG_PREFERENCES_DIALOG_H*/

View file

@ -36,7 +36,7 @@
using namespace Gtk; //////////////////////////////////////////////////////////////////////////////////TICKET #1071 no wildcard includes please!
namespace gui {
namespace stage {
namespace dialog {
Render::Render (Window& parent)
@ -108,4 +108,4 @@ namespace dialog {
}
}} // namespace gui::dialog
}} // namespace stage::dialog

View file

@ -32,7 +32,7 @@
#include "stage/gtk-base.hpp"
namespace gui {
namespace stage {
namespace dialog {
@ -66,5 +66,5 @@ namespace dialog {
};
}} // namespace gui::dialog
}} // namespace stage::dialog
#endif /*STAGE_DIALOG_RENDER_H*/

View file

@ -60,7 +60,7 @@
#include <utility>
#include <string>
namespace gui {
namespace stage {
namespace dialog {
using std::string;
@ -358,5 +358,5 @@ namespace dialog {
};
}} // namespace gui::dialog
}} // namespace stage::dialog
#endif /*STAGE_DIALOG_TEST_CONTROL_H*/

View file

@ -40,7 +40,7 @@ extern "C" {
}
namespace gui {
namespace stage {
@ -259,4 +259,4 @@ namespace gui {
}
} // namespace proc
} // namespace stage

View file

@ -62,7 +62,7 @@
#include <vector>
namespace gui {
namespace stage {
using std::string;
using std::vector;
@ -185,5 +185,5 @@ namespace gui {
} // namespace gui
} // namespace stage
#endif

View file

@ -28,7 +28,7 @@
#include "stage/draw/cairo-util.hpp"
namespace gui {
namespace stage {
namespace draw {
RefPtr<SolidPattern>
@ -83,4 +83,4 @@ namespace draw {
return Cairo::SolidPattern::create_rgba (red, blue, green, alpha);
}
}}// namespace gui::draw
}}// namespace stage::draw

View file

@ -35,7 +35,7 @@ using Cairo::RefPtr;
using Cairo::SolidPattern;
namespace gui {
namespace stage {
namespace draw {
/**
@ -78,5 +78,5 @@ namespace draw {
};
}}// namespace gui::draw
}}// namespace stage::draw
#endif /*STAGE_DRAW_CAIRO_H*/

View file

@ -32,7 +32,7 @@
using std::max;
using std::min;
namespace gui {
namespace stage {
namespace draw{
bool
@ -57,4 +57,4 @@ namespace draw{
}
}}// namespace gui::draw
}}// namespace stage::draw

View file

@ -31,7 +31,7 @@
#include "stage/gtk-base.hpp"
namespace gui {
namespace stage {
namespace draw {
/** determine whether point is within the bounding box of a rectangle */
@ -42,5 +42,5 @@ namespace draw {
bool rects_overlap(Gdk::Rectangle const& a, Gdk::Rectangle const& b);
}}// namespace gui::draw
}}// namespace stage::draw
#endif /*STAGE_DRAW_RECTANGLE_H*/

View file

@ -85,7 +85,7 @@
/* ======= Namespace Definitions ======= */
/** Lumiera GTK UI implementation root. */
namespace gui {
namespace stage {
typedef Glib::ustring uString;
typedef const uString cuString;
@ -158,5 +158,5 @@ namespace gui {
namespace idi {}
}// namespace gui
}// namespace stage
#endif /*STAGE_GTK_BASE_H*/

View file

@ -73,7 +73,7 @@ using gui::LUMIERA_INTERFACE_INAME(lumieraorg_Gui, 1);
using std::string;
namespace gui {
namespace stage {
namespace { // implementation details
@ -157,7 +157,7 @@ namespace gui {
} // note: lumiera_error state remains set
}
} // namespace gui
} // namespace stage

View file

@ -47,7 +47,7 @@ extern "C" {
namespace gui {
namespace stage {
@ -101,5 +101,5 @@ namespace gui {
);
} // namespace gui
} // namespace stage
#endif

View file

@ -60,7 +60,7 @@
/* === forward declarations === */
namespace proc {
namespace steam {
namespace asset {
class Timeline;
@ -70,7 +70,7 @@ namespace proc {
}
}
namespace gui {
namespace stage {
namespace timeline {
class TimelineController;
}
@ -166,6 +166,6 @@ locate = currentWindow().panel(infobox)
*/
}//namespace gui::idi
} // namespace gui
}//namespace stage::idi
} // namespace stage
#endif /*STAGE_ID_SCHEME_H*/

View file

@ -43,7 +43,7 @@
//using util::contains;
//using util::isnil;
namespace gui {
namespace stage {
namespace interact {
namespace { // internal details
@ -80,4 +80,4 @@ namespace interact {
/** nonsense */
}} // namespace gui::interact
}} // namespace stage::interact

View file

@ -65,7 +65,7 @@
#include <string>
namespace gui {
namespace stage {
namespace interact {
// using lib::HashVal;
@ -137,5 +137,5 @@ namespace interact {
};
}} // namespace gui::interact
}} // namespace stage::interact
#endif /*STAGE_INTERACT_CMD_CONTEXT_H*/

View file

@ -53,7 +53,7 @@
namespace gui {
namespace stage {
namespace ctrl{
// using util::isnil;
@ -110,5 +110,5 @@ namespace ctrl{
}} // namespace gui::ctrl
}} // namespace stage::ctrl
#endif /*STAGE_CTRL_ELEM_ACCESS_DIR_H*/

View file

@ -38,7 +38,7 @@
//using util::isnil;
namespace gui {
namespace stage {
namespace interact {
@ -57,4 +57,4 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact

View file

@ -61,7 +61,7 @@
//#include <memory>
namespace gui {
namespace stage {
namespace interact {
// using std::unique_ptr;
@ -95,5 +95,5 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact
#endif /*STAGE_INTERACT_FOCUS_TRACKER_H*/

View file

@ -73,7 +73,7 @@ using std::make_unique;
using util::toString;
namespace gui {
namespace stage {
namespace interact {
namespace session = proc::mobject::session;
@ -370,4 +370,4 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact

View file

@ -62,7 +62,7 @@
#include <memory>
namespace gui {
namespace stage {
class UiBus;
@ -159,5 +159,5 @@ namespace interact {
}}// namespace gui::workspace
}}// namespace stage::workspace
#endif /*STAGE_INTERACT_INTERACTION_DIRECTOR_H*/

View file

@ -43,7 +43,7 @@
//using util::contains;
//using util::isnil;
namespace gui {
namespace stage {
namespace interact {
namespace { // internal details
@ -59,4 +59,4 @@ namespace interact {
/** nonsense */
}} // namespace gui::interact
}} // namespace stage::interact

View file

@ -48,7 +48,7 @@
#include <string>
namespace gui {
namespace stage {
namespace interact {
// using lib::HashVal;
@ -73,5 +73,5 @@ namespace interact {
}} // namespace gui::interact
}} // namespace stage::interact
#endif /*STAGE_INTERACT_INTERACTION_STATE_H*/

View file

@ -43,7 +43,7 @@
//using util::isnil;
namespace gui {
namespace stage {
namespace interact {
@ -87,4 +87,4 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact

View file

@ -46,7 +46,7 @@
//#include <memory>
namespace gui {
namespace stage {
namespace interact {
// using std::unique_ptr;
@ -86,5 +86,5 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact
#endif /*STAGE_INTERACT_NAVIGATOR_H*/

View file

@ -36,7 +36,7 @@
//using util::isnil;
namespace gui {
namespace stage {
namespace interact {
@ -54,4 +54,4 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact

View file

@ -46,7 +46,7 @@
//#include <memory>
namespace gui {
namespace stage {
namespace interact {
// using std::unique_ptr;
@ -75,5 +75,5 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact
#endif /*STAGE_INTERACT_SPOT_LOCATOR_H*/

View file

@ -36,7 +36,7 @@ using lib::Symbol;
using lib::treeExplore;
namespace gui {
namespace stage {
namespace interact {
// emit typeinfo and VTables here....
@ -205,4 +205,4 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact

View file

@ -128,7 +128,7 @@
#include <memory>
namespace gui {
namespace stage {
namespace interact {
namespace error = lumiera::error;
@ -597,5 +597,5 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact
#endif /*STAGE_INTERACT_UI_COORD_RESOLVER_H*/

View file

@ -94,7 +94,7 @@
#include <utility>
namespace gui {
namespace stage {
namespace interact {
namespace error = lumiera::error;
@ -767,5 +767,5 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact
#endif /*STAGE_INTERACT_UI_COORD_H*/

View file

@ -80,7 +80,7 @@
#include <string>
namespace gui {
namespace stage {
namespace interact {
using lib::Literal;
@ -323,5 +323,5 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact
#endif /*STAGE_INTERACT_UI_LOCATION_SOLVER_H*/

View file

@ -58,7 +58,7 @@ using lib::Symbol;
using gui::model::ElementAccess;
namespace gui {
namespace stage {
namespace error = lumiera::error;
@ -108,4 +108,4 @@ namespace gui {
}}// namespace gui::interact
}}// namespace stage::interact

View file

@ -77,7 +77,7 @@
#include <memory>
namespace gui {
namespace stage {
namespace ctrl{
class PanelLocator;
}
@ -137,5 +137,5 @@ namespace interact {
}
}}// namespace gui::interact
}}// namespace stage::interact
#endif /*STAGE_INTERACT_VIEW_LOCATOR_H*/

View file

@ -111,7 +111,7 @@
#include <string>
namespace gui {
namespace stage {
namespace interact {
using std::forward;
@ -287,5 +287,5 @@ namespace idi {
}
}}// namespace gui::idi
}}// namespace stage::idi
#endif /*STAGE_INTERACT_VIEW_SPEC_DSL_H*/

View file

@ -52,7 +52,7 @@ using std::vector;
using std::string;
namespace gui {
namespace stage {
namespace interact {
using boost::algorithm::is_any_of;
@ -134,4 +134,4 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact

View file

@ -49,7 +49,7 @@
#include <memory>
namespace proc {
namespace steam {
namespace asset {
namespace meta {
class ErrorLog;
@ -57,7 +57,7 @@ namespace proc {
extern lib::idi::EntryID<ErrorLog> theErrorLog_ID;
} } }
namespace gui {
namespace stage {
using ID = lib::idi::BareEntryID const&;
namespace ctrl {
@ -103,5 +103,5 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact
#endif /*STAGE_INTERACT_WIZARD_H*/

View file

@ -36,7 +36,7 @@
//using util::isnil;
namespace gui {
namespace stage {
namespace interact {
@ -57,4 +57,4 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact

View file

@ -47,7 +47,7 @@
//#include <memory>
namespace gui {
namespace stage {
namespace interact {
// using std::unique_ptr;
@ -76,5 +76,5 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact
#endif /*STAGE_INTERACT_WORK_SITE_H*/

View file

@ -37,7 +37,7 @@
//using util::isnil;
namespace gui {
namespace stage {
namespace interact {
@ -58,4 +58,4 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact

View file

@ -52,7 +52,7 @@
//#include <memory>
namespace gui {
namespace stage {
namespace interact {
// using std::unique_ptr;
@ -83,5 +83,5 @@ namespace interact {
}}// namespace gui::interact
}}// namespace stage::interact
#endif /*STAGE_INTERACT_WORK_SITE_H*/

View file

@ -32,7 +32,7 @@
#include "clip.hpp"
namespace gui {
namespace stage {
namespace model {
ClipTrack::ClipTrack()
@ -63,4 +63,4 @@ namespace model {
}
} // namespace model
} // namespace gui
} // namespace stage

View file

@ -34,7 +34,7 @@
#include "stage/model/track.hpp"
#include "lib/observable-list.hpp"
namespace gui {
namespace stage {
namespace model {
class Clip;
@ -66,6 +66,6 @@ namespace model {
};
} // namespace timeline
} // namespace gui
} // namespace stage
#endif // CLIP_TRACK_HPP

View file

@ -36,7 +36,7 @@ using lib::time::FSecs;
using lib::time::Mutation;
namespace gui {
namespace stage {
namespace model {
Clip::Clip()
@ -72,5 +72,5 @@ namespace model {
}
} // namespace model
} // namespace gui
} // namespace stage

View file

@ -36,7 +36,7 @@
#include <string>
namespace gui {
namespace stage {
namespace model {
using std::string;
@ -103,5 +103,5 @@ namespace model {
};
}} // namespace gui::model
}} // namespace stage::model
#endif // CLIP_HPP

View file

@ -47,7 +47,7 @@
//#include <string>
namespace gui {
namespace stage {
namespace model {
// using lib::HashVal;
@ -120,5 +120,5 @@ namespace model {
}} // namespace gui::model
}} // namespace stage::model
#endif /*STAGE_MODEL_CONTROLLER_H*/

View file

@ -47,7 +47,7 @@
namespace gui {
namespace stage {
namespace model {
// using util::isnil;
@ -116,5 +116,5 @@ namespace model {
}} // namespace gui::model
}} // namespace stage::model
#endif /*STAGE_MODEL_DIAGNOSTICS_H*/

View file

@ -67,7 +67,7 @@
namespace Gtk {
class Widget;
}
namespace gui {
namespace stage {
namespace model {
namespace error = lumiera::error;
@ -198,5 +198,5 @@ namespace model {
}} // namespace gui::model
}} // namespace stage::model
#endif /*STAGE_MODEL_ELEMENT_ACCESS_H*/

View file

@ -69,7 +69,7 @@
#include <utility>
namespace gui {
namespace stage {
namespace model {
using std::move;
@ -185,5 +185,5 @@ namespace model {
}} // namespace gui::model
}} // namespace stage::model
#endif /*STAGE_MODEL_EXPANDER_REVEALER_H*/

View file

@ -45,7 +45,7 @@
#include "stage/style-scheme.hpp"
namespace gui {
namespace stage {
namespace model {
@ -86,5 +86,5 @@ namespace model {
};
}} // namespace gui::model
}} // namespace stage::model
#endif /*STAGE_MODEL_FLASH_DECO_H*/

View file

@ -30,7 +30,7 @@
#include "group-track.hpp"
namespace gui {
namespace stage {
namespace model {
GroupTrack::GroupTrack()
@ -48,4 +48,4 @@ GroupTrack::print_track()
}
} // namespace model
} // namespace gui
} // namespace stage

View file

@ -34,7 +34,7 @@
#include "stage/model/parent-track.hpp"
namespace gui {
namespace stage {
namespace model {
/**
@ -58,6 +58,6 @@ public:
};
} // namespace model
} // namespace gui
} // namespace stage
#endif // GROUP_TRACK_HPP

View file

@ -33,7 +33,7 @@
using std::shared_ptr;
namespace gui {
namespace stage {
namespace model {
ParentTrack::ParentTrack()
@ -96,4 +96,4 @@ ParentTrack::find_descendant_track_parent(shared_ptr<Track> child)
}
} // namespace model
} // namespace gui
} // namespace stage

View file

@ -34,7 +34,7 @@
#include "stage/model/track.hpp"
#include "lib/observable-list.hpp"
namespace gui {
namespace stage {
namespace model {
/**
@ -98,6 +98,6 @@ protected:
};
} // namespace model
} // namespace gui
} // namespace stage
#endif // PARENT_TRACK_HPP

View file

@ -36,7 +36,7 @@
#include <memory>
namespace gui {
namespace stage {
namespace model {
Project::Project()
@ -66,4 +66,4 @@ Project::add_new_sequence(uString name)
}
} // namespace model
} // namespace gui
} // namespace stage

View file

@ -37,7 +37,7 @@
#include "stage/model/sequence.hpp"
#include "lib/observable-list.hpp"
namespace gui {
namespace stage {
namespace model {
/**
@ -61,6 +61,6 @@ private:
};
} // namespace model
} // namespace gui
} // namespace stage
#endif // PROJECT_HPP

View file

@ -37,7 +37,7 @@
#include "stage/model/clip-track.hpp"
namespace gui {
namespace stage {
namespace model {
@ -85,4 +85,4 @@ Sequence::print_track()
}
} // namespace model
} // namespace gui
} // namespace stage

View file

@ -39,7 +39,7 @@
#include <string>
namespace gui {
namespace stage {
namespace model {
class Track;
@ -75,6 +75,6 @@ class Sequence
} // namespace model
} // namespace gui
} // namespace stage
#endif // SEQUENCE_HPP

View file

@ -51,7 +51,7 @@
//using util::isnil;
namespace gui {
namespace stage {
namespace model {
namespace { // internal details
@ -91,4 +91,4 @@ namespace model {
}} // namespace gui::model
}} // namespace stage::model

View file

@ -46,7 +46,7 @@
#include <string>
namespace gui {
namespace stage {
namespace model {
// using lib::HashVal;
@ -87,5 +87,5 @@ namespace model {
}} // namespace gui::model
}} // namespace stage::model
#endif /*SESSION_FACADE_H*/

View file

@ -37,7 +37,7 @@
#include "lib/diff/gen-node.hpp"
namespace gui {
namespace stage {
namespace model {
@ -302,4 +302,4 @@ namespace model {
}} // namespace gui::model
}} // namespace stage::model

View file

@ -143,7 +143,7 @@
#include <string>
namespace gui {
namespace stage {
namespace model {
using std::string;
@ -300,5 +300,5 @@ namespace model {
}} // namespace gui::model
}} // namespace stage::model
#endif /*STAGE_MODEL_TANGIBLE_H*/

View file

@ -37,7 +37,7 @@
#include <string>
#include <list>
namespace gui {
namespace stage {
namespace model {
using std::list;
@ -156,4 +156,4 @@ Track::print_branch_recursive (const unsigned int indentation)
}
} // namespace model
} // namespace gui
} // namespace stage

View file

@ -36,7 +36,7 @@
#ifndef TRACK_HPP
#define TRACK_HPP
namespace gui {
namespace stage {
namespace model {
using std::shared_ptr;
@ -209,6 +209,6 @@ private:
};
} // namespace model
} // namespace gui
} // namespace stage
#endif // TRACK_HPP

View file

@ -65,7 +65,7 @@
#include <sigc++/trackable.h>
namespace gui {
namespace stage {
namespace model {
namespace error = lumiera::error;
@ -240,5 +240,5 @@ namespace model {
};
}} // namespace gui::model
}} // namespace stage::model
#endif /*STAGE_MODEL_W_LINK_H*/

View file

@ -44,7 +44,7 @@
//#include <string>
namespace gui {
namespace stage {
namespace model {
// using lib::HashVal;
@ -111,5 +111,5 @@ namespace model {
}} // namespace gui::model
}} // namespace stage::model
#endif /*STAGE_MODEL_WIDGET_H*/

Some files were not shown because too many files have changed in this diff Show more