rename BScreen::get* functions appropriately

bbidulock · Aug 23, 2004 · ae45d5d · ae45d5d
1 parent 02f08ad
commit ae45d5d
Show file tree

Hide file tree

Showing 9 changed files with 192 additions and 190 deletions.
diff --git a/src/BlackboxResource.cc b/src/BlackboxResource.cc
@@ -480,7 +480,7 @@ void ScreenResource::load(bt::Resource& res, unsigned int screen) {
 
 
 void ScreenResource::loadStyle(BScreen* screen, const std::string& style) {
-  const bt::Display& display = screen->getBlackbox()->display();
+  const bt::Display& display = screen->blackbox()->display();
   unsigned int screen_num = screen->screenNumber();
 
   // use the user selected style
@@ -489,7 +489,7 @@ void ScreenResource::loadStyle(BScreen* screen, const std::string& style) {
     res.load(DEFAULTSTYLE);
 
   // load menu style
-  bt::MenuStyle::get(*screen->getBlackbox(), screen_num)->load(res);
+  bt::MenuStyle::get(*screen->blackbox(), screen_num)->load(res);
 
   // load window style
   wstyle.font.setFontName(res.read("window.font", "Window.Font"));

diff --git a/src/Clientmenu.cc b/src/Clientmenu.cc
@@ -38,7 +38,7 @@ Clientmenu::Clientmenu(bt::Application &app, BScreen& screen,
 
 
 void Clientmenu::itemClicked(unsigned int id, unsigned int button) {
-  BlackboxWindow *win = _screen.getWindow(_workspace, id);
+  BlackboxWindow *win = _screen.window(_workspace, id);
 
   if (button == 2) {
     // move win to current workspace

diff --git a/src/Rootmenu.cc b/src/Rootmenu.cc
@@ -57,24 +57,24 @@ void Rootmenu::itemClicked(unsigned int id, unsigned int) {
     break;
 
   case BScreen::Restart:
-    _bscreen->getBlackbox()->restart();
+    _bscreen->blackbox()->restart();
     break;
 
   case BScreen::RestartOther:
     if (! it->second.string.empty())
-      _bscreen->getBlackbox()->restart(it->second.string);
+      _bscreen->blackbox()->restart(it->second.string);
     break;
 
   case BScreen::Exit:
-    _bscreen->getBlackbox()->quit();
+    _bscreen->blackbox()->quit();
     break;
 
   case BScreen::SetStyle:
     if (! it->second.string.empty())
-      _bscreen->getBlackbox()->resource().saveStyleFilename(it->second.string);
+      _bscreen->blackbox()->resource().saveStyleFilename(it->second.string);
 
   case BScreen::Reconfigure:
-    _bscreen->getBlackbox()->reconfigure();
+    _bscreen->blackbox()->reconfigure();
     return;
   } // switch
 }