diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-06-11 11:00:45 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-06-15 23:12:25 (GMT) |
commit | cd9df3b8144c4c41f7b57f0075fbb98ef7561296 (patch) | |
tree | 10ffc1692e4afbcb2c74b9db8c8a44b434ef62ca /src/ScreenPlacement.hh | |
parent | 787c7a994d4328a9c90a037dd464f8007351b0c0 (diff) | |
download | fluxbox_pavel-cd9df3b8144c4c41f7b57f0075fbb98ef7561296.zip fluxbox_pavel-cd9df3b8144c4c41f7b57f0075fbb98ef7561296.tar.bz2 |
Simplify FbTk::Resource template class
by outsourcing the conversion from string/lua to the specific type (and back) to a separate
class. This change touches a lot of files because the interface of FbTk::Resource changed
slightly. However, the changes are minor.
Diffstat (limited to 'src/ScreenPlacement.hh')
-rw-r--r-- | src/ScreenPlacement.hh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ScreenPlacement.hh b/src/ScreenPlacement.hh index 05db90d..cbe1528 100644 --- a/src/ScreenPlacement.hh +++ b/src/ScreenPlacement.hh | |||
@@ -76,9 +76,12 @@ public: | |||
76 | ColumnDirection colDirection() const { return *m_col_direction; } | 76 | ColumnDirection colDirection() const { return *m_col_direction; } |
77 | 77 | ||
78 | private: | 78 | private: |
79 | FbTk::Resource<RowDirection> m_row_direction; ///< row direction resource | 79 | /// row direction resource |
80 | FbTk::Resource<ColumnDirection> m_col_direction; ///< column direction resource | 80 | FbTk::Resource<RowDirection, FbTk::EnumTraits<RowDirection> > m_row_direction; |
81 | FbTk::Resource<PlacementPolicy> m_placement_policy; ///< placement policy resource | 81 | /// column direction resource |
82 | FbTk::Resource<ColumnDirection, FbTk::EnumTraits<ColumnDirection> > m_col_direction; | ||
83 | /// placement policy resource | ||
84 | FbTk::Resource<PlacementPolicy, FbTk::EnumTraits<PlacementPolicy> > m_placement_policy; | ||
82 | PlacementPolicy m_old_policy; ///< holds old policy, used to determine if resources has changed | 85 | PlacementPolicy m_old_policy; ///< holds old policy, used to determine if resources has changed |
83 | std::auto_ptr<PlacementStrategy> m_strategy; ///< main strategy | 86 | std::auto_ptr<PlacementStrategy> m_strategy; ///< main strategy |
84 | std::auto_ptr<PlacementStrategy> m_fallback_strategy; ///< a fallback strategy if the main strategy fails | 87 | std::auto_ptr<PlacementStrategy> m_fallback_strategy; ///< a fallback strategy if the main strategy fails |