* Fixes FTBFS when moving to gcc 4.9. Mainly remove unused functions.

Fixes LP: #1350052 (bzr r3844.1.1)

6 files changed, 2 insertions, 12 deletions

diff --git a/unity-shared/OverlayWindowButtons.cpp b/unity-shared/OverlayWindowButtons.cpp
index 857bde245..089d0e319 100644
--- a/unity-shared/OverlayWindowButtons.cpp
+++ b/unity-shared/OverlayWindowButtons.cpp
@@ -45,7 +45,7 @@ OverlayWindowButtons::OverlayWindowButtons()
 SetBackgroundColor(nux::color::Transparent);
 }
 
-bool OverlayWindowButtons::IsVisibleOnMonitor(unsigned int monitor) const
+bool OverlayWindowButtons::IsVisibleOnMonitor(int monitor) const
 {
 if (window_buttons_->monitor == monitor)
 return true;
diff --git a/unity-shared/OverlayWindowButtons.h b/unity-shared/OverlayWindowButtons.h
index 5c0666bc2..fe3bf4c55 100644
--- a/unity-shared/OverlayWindowButtons.h
+++ b/unity-shared/OverlayWindowButtons.h
@@ -40,7 +40,7 @@ public:
 nux::Area* FindAreaUnderMouse(nux::Point const& mouse_position,
 nux::NuxEventType event_type);
 
- bool IsVisibleOnMonitor(unsigned int monitor) const;
+ bool IsVisibleOnMonitor(int monitor) const;
 
 protected:
 void Draw(nux::GraphicsEngine& gfx_context, bool force_draw);
diff --git a/unity-shared/StandaloneAppManager.cpp b/unity-shared/StandaloneAppManager.cpp
index 35c3a14b8..9bb830e8c 100644
--- a/unity-shared/StandaloneAppManager.cpp
+++ b/unity-shared/StandaloneAppManager.cpp
@@ -31,8 +31,6 @@
 using namespace std;
 using namespace unity;
 
-DECLARE_LOGGER(logger, "unity.appmanager.test");
-
 GMainLoop *loop;
 
 void dump_app(ApplicationPtr const& app, std::string const& prefix = "")
diff --git a/unity-shared/StandaloneWindowManager.cpp b/unity-shared/StandaloneWindowManager.cpp
index 8ae2e4d09..a25ede2ce 100644
--- a/unity-shared/StandaloneWindowManager.cpp
+++ b/unity-shared/StandaloneWindowManager.cpp
@@ -24,13 +24,10 @@
 #include "StandaloneWindowManager.h"
 #include "UScreen.h"
 
-#include <NuxCore/Logger.h>
-
 // Entirely stubs for now, unless we need this functionality at some point
 
 namespace unity
 {
-DECLARE_LOGGER(logger, "unity.wm");
 
 StandaloneWindow::StandaloneWindow(Window xid)
 : xid(xid)
diff --git a/unity-shared/TextureCache.cpp b/unity-shared/TextureCache.cpp
index 232cfd52e..42d3be63f 100644
--- a/unity-shared/TextureCache.cpp
+++ b/unity-shared/TextureCache.cpp
@@ -21,12 +21,10 @@
 #include "TextureCache.h"
 
 #include <sstream>
-#include <NuxCore/Logger.h>
 #include "config.h"
 
 namespace unity
 {
-DECLARE_LOGGER(logger, "unity.internal.texturecache");
 namespace
 {
 // Stolen from boost
diff --git a/unity-shared/UBusServer.cpp b/unity-shared/UBusServer.cpp
index 105983bfc..2734f7eaf 100644
--- a/unity-shared/UBusServer.cpp
+++ b/unity-shared/UBusServer.cpp
@@ -16,13 +16,10 @@
 * Authored by: Michal Hruby <michal.hruby@canonical.com>
 */
 
-#include <NuxCore/Logger.h>
-
 #include "UBusServer.h"
 
 namespace unity
 {
-DECLARE_LOGGER(logger, "unity.ubus");
 
 UBusServer::UBusServer()
 : last_id_(0)