Merge lp:~brandontschaefer/unity/lp.1350052-fix into lp:unity

Proposed by Brandon Schaefer
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3845
Proposed branch: lp:~brandontschaefer/unity/lp.1350052-fix
Merge into: lp:unity
Diff against target: 672 lines (+17/-111)
34 files modified
UnityCore/CheckOptionFilter.cpp (+0/-3)
UnityCore/Filter.cpp (+0/-3)
UnityCore/MultiRangeFilter.cpp (+0/-3)
UnityCore/MusicPreview.cpp (+0/-1)
UnityCore/RadioOptionFilter.cpp (+0/-3)
UnityCore/Scope.cpp (+6/-0)
UnityCore/Scope.h (+2/-7)
dash/ScopeBar.cpp (+0/-2)
dash/previews/ActionButton.cpp (+0/-2)
dash/previews/PreviewContainer.cpp (+0/-2)
dash/previews/PreviewInfoHintWidget.cpp (+0/-2)
dash/previews/PreviewNavigator.cpp (+0/-2)
dash/previews/SocialPreviewComments.cpp (+0/-2)
dash/previews/SocialPreviewContent.cpp (+0/-2)
dash/previews/Track.cpp (+0/-2)
decorations/DecoratedWindow.cpp (+0/-2)
decorations/DecorationsInputMixer.cpp (+0/-5)
decorations/DecorationsManager.cpp (+0/-3)
hud/HudButton.cpp (+0/-2)
launcher/LauncherHideMachine.cpp (+0/-4)
launcher/SimpleLauncherIcon.cpp (+0/-4)
launcher/VolumeLauncherIcon.cpp (+0/-2)
panel/PanelController.cpp (+0/-2)
panel/PanelView.cpp (+0/-3)
plugins/unityshell/src/unityshell.cpp (+6/-0)
tests/test_glib_object.cpp (+0/-5)
tests/test_icon_loader.cpp (+0/-9)
tests/test_result_renderer.cpp (+0/-23)
unity-shared/OverlayWindowButtons.cpp (+1/-1)
unity-shared/OverlayWindowButtons.h (+1/-1)
unity-shared/StandaloneAppManager.cpp (+0/-2)
unity-shared/StandaloneWindowManager.cpp (+0/-3)
unity-shared/TextureCache.cpp (+0/-2)
unity-shared/UBusServer.cpp (+1/-2)
To merge this branch: bzr merge lp:~brandontschaefer/unity/lp.1350052-fix
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+228781@code.launchpad.net

Commit message

Fixes FTBFS caused by gcc 4.9. Mostly unused functions.

Description of the change

Fixes FTBFS caused by gcc 4.9. Mostly unused functions.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UnityCore/CheckOptionFilter.cpp'
2--- UnityCore/CheckOptionFilter.cpp 2013-03-19 18:22:11 +0000
3+++ UnityCore/CheckOptionFilter.cpp 2014-07-31 18:27:19 +0000
4@@ -19,13 +19,10 @@
5
6 #include "CheckOptionFilter.h"
7
8-#include <NuxCore/Logger.h>
9-
10 namespace unity
11 {
12 namespace dash
13 {
14-DECLARE_LOGGER(logger, "unity.dash.filter.checkoption");
15
16 CheckOptionFilter::CheckOptionFilter(DeeModel* model, DeeModelIter* iter)
17 : Filter(model, iter)
18
19=== modified file 'UnityCore/Filter.cpp'
20--- UnityCore/Filter.cpp 2013-03-19 14:05:51 +0000
21+++ UnityCore/Filter.cpp 2014-07-31 18:27:19 +0000
22@@ -20,8 +20,6 @@
23 #include "Filter.h"
24 #include "Filters.h"
25
26-#include <NuxCore/Logger.h>
27-
28 #include "CheckOptionFilter.h"
29 #include "MultiRangeFilter.h"
30 #include "RadioOptionFilter.h"
31@@ -32,7 +30,6 @@
32 {
33 namespace dash
34 {
35-DECLARE_LOGGER(logger, "unity.dash.filter");
36
37 using unity::glib::Signal;
38
39
40=== modified file 'UnityCore/MultiRangeFilter.cpp'
41--- UnityCore/MultiRangeFilter.cpp 2013-03-19 18:22:11 +0000
42+++ UnityCore/MultiRangeFilter.cpp 2014-07-31 18:27:19 +0000
43@@ -19,13 +19,10 @@
44
45 #include "MultiRangeFilter.h"
46
47-#include <NuxCore/Logger.h>
48-
49 namespace unity
50 {
51 namespace dash
52 {
53-DECLARE_LOGGER(logger, "unity.dash.filter.multirange");
54
55 MultiRangeFilter::MultiRangeFilter(DeeModel* model, DeeModelIter* iter)
56 : Filter(model, iter)
57
58=== modified file 'UnityCore/MusicPreview.cpp'
59--- UnityCore/MusicPreview.cpp 2013-03-22 18:59:14 +0000
60+++ UnityCore/MusicPreview.cpp 2014-07-31 18:27:19 +0000
61@@ -29,7 +29,6 @@
62 {
63 namespace dash
64 {
65-DECLARE_LOGGER(logger, "unity.dash.musicpreview");
66
67 class MusicPreview::Impl
68 {
69
70=== modified file 'UnityCore/RadioOptionFilter.cpp'
71--- UnityCore/RadioOptionFilter.cpp 2013-03-19 18:22:11 +0000
72+++ UnityCore/RadioOptionFilter.cpp 2014-07-31 18:27:19 +0000
73@@ -19,13 +19,10 @@
74
75 #include "RadioOptionFilter.h"
76
77-#include <NuxCore/Logger.h>
78-
79 namespace unity
80 {
81 namespace dash
82 {
83-DECLARE_LOGGER(logger, "unity.dash.filter.radiooption");
84
85 RadioOptionFilter::RadioOptionFilter(DeeModel* model, DeeModelIter* iter)
86 : Filter(model, iter)
87
88=== modified file 'UnityCore/Scope.cpp'
89--- UnityCore/Scope.cpp 2013-11-01 07:24:38 +0000
90+++ UnityCore/Scope.cpp 2014-07-31 18:27:19 +0000
91@@ -32,6 +32,12 @@
92 {
93 DECLARE_LOGGER(logger, "unity.dash.scope");
94
95+GQuark
96+g_scope_error_quark (void)
97+{
98+ return g_quark_from_static_string ("g-scope-error-quark");
99+}
100+
101 class Scope::Impl
102 {
103 public:
104
105=== modified file 'UnityCore/Scope.h'
106--- UnityCore/Scope.h 2013-09-26 14:21:18 +0000
107+++ UnityCore/Scope.h 2014-07-31 18:27:19 +0000
108@@ -31,9 +31,8 @@
109 namespace dash
110 {
111
112-namespace
113-{
114 #define G_SCOPE_ERROR g_scope_error_quark ()
115+
116 typedef enum
117 {
118 G_SCOPE_ERROR_NO_ACTIVATION_HANDLER = (1 << 0),
119@@ -41,11 +40,7 @@
120 } GScopeError;
121
122 GQuark
123-g_scope_error_quark (void)
124-{
125- return g_quark_from_static_string ("g-scope-error-quark");
126-}
127-}
128+g_scope_error_quark (void);
129
130 class Scope : public sigc::trackable, boost::noncopyable
131 {
132
133=== modified file 'dash/ScopeBar.cpp'
134--- dash/ScopeBar.cpp 2014-07-09 11:18:45 +0000
135+++ dash/ScopeBar.cpp 2014-07-31 18:27:19 +0000
136@@ -18,7 +18,6 @@
137
138 #include <glib/gstdio.h>
139 #include "ScopeBar.h"
140-#include <NuxCore/Logger.h>
141 #include "config.h"
142 #include <Nux/HLayout.h>
143 #include <Nux/LayeredLayout.h>
144@@ -33,7 +32,6 @@
145 {
146 namespace dash
147 {
148-DECLARE_LOGGER(logger, "unity.dash.scopebar");
149 namespace
150 {
151 // according to Q design the inner area of the scopebar should be 40px
152
153=== modified file 'dash/previews/ActionButton.cpp'
154--- dash/previews/ActionButton.cpp 2014-07-09 11:17:35 +0000
155+++ dash/previews/ActionButton.cpp 2014-07-31 18:27:19 +0000
156@@ -21,7 +21,6 @@
157
158 #include "unity-shared/DashStyle.h"
159 #include "ActionButton.h"
160-#include <NuxCore/Logger.h>
161 #include <Nux/HLayout.h>
162 #include "unity-shared/IconTexture.h"
163 #include "unity-shared/StaticCairoText.h"
164@@ -38,7 +37,6 @@
165
166 namespace dash
167 {
168-DECLARE_LOGGER(logger, "unity.dash.preview.action");
169
170 ActionButton::ActionButton(std::string const& action_hint, std::string const& label, std::string const& icon_hint, NUX_FILE_LINE_DECL)
171 : nux::AbstractButton(NUX_FILE_LINE_PARAM)
172
173=== modified file 'dash/previews/PreviewContainer.cpp'
174--- dash/previews/PreviewContainer.cpp 2014-07-10 19:30:17 +0000
175+++ dash/previews/PreviewContainer.cpp 2014-07-31 18:27:19 +0000
176@@ -21,7 +21,6 @@
177 */
178
179 #include "PreviewContainer.h"
180-#include <NuxCore/Logger.h>
181 #include <Nux/HLayout.h>
182
183 #include "unity-shared/IntrospectableWrappers.h"
184@@ -39,7 +38,6 @@
185 {
186 namespace previews
187 {
188-DECLARE_LOGGER(logger, "unity.dash.preview.container");
189
190 Navigation operator&(const Navigation lhs, const Navigation rhs)
191 {
192
193=== modified file 'dash/previews/PreviewInfoHintWidget.cpp'
194--- dash/previews/PreviewInfoHintWidget.cpp 2014-07-05 16:25:03 +0000
195+++ dash/previews/PreviewInfoHintWidget.cpp 2014-07-31 18:27:19 +0000
196@@ -26,7 +26,6 @@
197
198 #include "PreviewInfoHintWidget.h"
199 #include "unity-shared/IntrospectableWrappers.h"
200-#include <NuxCore/Logger.h>
201 #include <Nux/HLayout.h>
202 #include <Nux/VLayout.h>
203 #include <unity-shared/StaticCairoText.h>
204@@ -39,7 +38,6 @@
205 {
206 namespace previews
207 {
208-DECLARE_LOGGER(logger, "unity.dash.preview.infohintwidget");
209 namespace
210 {
211 const RawPixel LAYOUT_SPACING = 12_em;
212
213=== modified file 'dash/previews/PreviewNavigator.cpp'
214--- dash/previews/PreviewNavigator.cpp 2014-07-05 17:44:50 +0000
215+++ dash/previews/PreviewNavigator.cpp 2014-07-31 18:27:19 +0000
216@@ -22,7 +22,6 @@
217
218
219 #include "PreviewNavigator.h"
220-#include <NuxCore/Logger.h>
221 #include <Nux/HLayout.h>
222 #include <Nux/VLayout.h>
223 #include <unity-shared/IconTexture.h>
224@@ -34,7 +33,6 @@
225 {
226 namespace previews
227 {
228-DECLARE_LOGGER(logger, "unity.dash.preview.navigator");
229
230 NUX_IMPLEMENT_OBJECT_TYPE(PreviewNavigator);
231
232
233=== modified file 'dash/previews/SocialPreviewComments.cpp'
234--- dash/previews/SocialPreviewComments.cpp 2014-07-05 16:17:08 +0000
235+++ dash/previews/SocialPreviewComments.cpp 2014-07-31 18:27:19 +0000
236@@ -23,7 +23,6 @@
237 #include "unity-shared/DashStyle.h"
238 #include "unity-shared/PreviewStyle.h"
239 #include <UnityCore/SocialPreview.h>
240-#include <NuxCore/Logger.h>
241 #include <Nux/Layout.h>
242 #include <Nux/VLayout.h>
243 #include <Nux/HLayout.h>
244@@ -36,7 +35,6 @@
245 {
246 namespace previews
247 {
248-DECLARE_LOGGER(logger, "unity.dash.preview.social.comments");
249
250 namespace
251 {
252
253=== modified file 'dash/previews/SocialPreviewContent.cpp'
254--- dash/previews/SocialPreviewContent.cpp 2014-07-05 16:14:33 +0000
255+++ dash/previews/SocialPreviewContent.cpp 2014-07-31 18:27:19 +0000
256@@ -23,7 +23,6 @@
257
258 #include "unity-shared/DashStyle.h"
259 #include "unity-shared/PreviewStyle.h"
260-#include <NuxCore/Logger.h>
261 #include <Nux/Layout.h>
262
263 #include "SocialPreviewContent.h"
264@@ -34,7 +33,6 @@
265 {
266 namespace previews
267 {
268-DECLARE_LOGGER(logger, "unity.dash.previews.social.content");
269
270 namespace
271 {
272
273=== modified file 'dash/previews/Track.cpp'
274--- dash/previews/Track.cpp 2014-07-07 22:16:43 +0000
275+++ dash/previews/Track.cpp 2014-07-31 18:27:19 +0000
276@@ -22,7 +22,6 @@
277
278 #include "Track.h"
279 #include "unity-shared/IntrospectableWrappers.h"
280-#include <NuxCore/Logger.h>
281 #include <Nux/HLayout.h>
282 #include <Nux/LayeredLayout.h>
283 #include <unity-shared/StaticCairoText.h>
284@@ -37,7 +36,6 @@
285 namespace previews
286 {
287
288-DECLARE_LOGGER(logger, "unity.dash.preview.music.track");
289 namespace
290 {
291 const RawPixel LAYOUT_SPACING = 6_em;
292
293=== modified file 'decorations/DecoratedWindow.cpp'
294--- decorations/DecoratedWindow.cpp 2014-04-02 12:26:14 +0000
295+++ decorations/DecoratedWindow.cpp 2014-07-31 18:27:19 +0000
296@@ -17,7 +17,6 @@
297 * Authored by: Marco Trevisan <marco.trevisan@canonical.com>
298 */
299
300-#include <NuxCore/Logger.h>
301 #include "DecorationsPriv.h"
302 #include "DecorationsForceQuitDialog.h"
303 #include "DecorationsEdgeBorders.h"
304@@ -35,7 +34,6 @@
305 {
306 namespace
307 {
308-DECLARE_LOGGER(logger, "unity.decoration.window");
309 const std::string MENUS_PANEL_NAME = "WindowLIM";
310 }
311
312
313=== modified file 'decorations/DecorationsInputMixer.cpp'
314--- decorations/DecorationsInputMixer.cpp 2014-02-14 18:42:38 +0000
315+++ decorations/DecorationsInputMixer.cpp 2014-07-31 18:27:19 +0000
316@@ -17,17 +17,12 @@
317 * Authored by: Marco Trevisan <marco.trevisan@canonical.com>
318 */
319
320-#include <NuxCore/Logger.h>
321 #include "DecorationsInputMixer.h"
322
323 namespace unity
324 {
325 namespace decoration
326 {
327-namespace
328-{
329-DECLARE_LOGGER(logger, "unity.decorations.inputmixer");
330-}
331
332 InputMixer::InputMixer()
333 : mouse_down_(false)
334
335=== modified file 'decorations/DecorationsManager.cpp'
336--- decorations/DecorationsManager.cpp 2014-04-02 09:04:37 +0000
337+++ decorations/DecorationsManager.cpp 2014-07-31 18:27:19 +0000
338@@ -20,7 +20,6 @@
339 #include "DecorationsPriv.h"
340
341 #include <core/atoms.h>
342-#include <NuxCore/Logger.h>
343 #include <NuxGraphics/CairoGraphics.h>
344 #include <UnityCore/DBusIndicators.h>
345 #include <X11/Xatom.h>
346@@ -34,8 +33,6 @@
347
348 namespace
349 {
350-DECLARE_LOGGER(logger, "unity.decoration.manager");
351-
352 namespace atom
353 {
354 Atom _NET_REQUEST_FRAME_EXTENTS = 0;
355
356=== modified file 'hud/HudButton.cpp'
357--- hud/HudButton.cpp 2014-07-11 02:06:59 +0000
358+++ hud/HudButton.cpp 2014-07-31 18:27:19 +0000
359@@ -27,7 +27,6 @@
360
361 #include <Nux/Nux.h>
362 #include <Nux/HLayout.h>
363-#include <NuxCore/Logger.h>
364 #include <NuxGraphics/CairoGraphics.h>
365 #include <NuxGraphics/NuxGraphics.h>
366 #include <UnityCore/GLibWrapper.h>
367@@ -45,7 +44,6 @@
368
369 namespace
370 {
371-DECLARE_LOGGER(logger, "unity.hud.button");
372 const RawPixel HLAYOUT_LEFT_PADDING = 46_em;
373 const RawPixel HEIGHT = 42_em;
374 const char* const button_font = "Ubuntu 13"; // 17px = 13
375
376=== modified file 'launcher/LauncherHideMachine.cpp'
377--- launcher/LauncherHideMachine.cpp 2013-11-14 03:00:29 +0000
378+++ launcher/LauncherHideMachine.cpp 2014-07-31 18:27:19 +0000
379@@ -19,14 +19,10 @@
380
381 #include "LauncherHideMachine.h"
382
383-#include <NuxCore/Logger.h>
384-
385 namespace unity
386 {
387 namespace launcher
388 {
389-DECLARE_LOGGER(logger, "unity.launcher.hide");
390-
391 namespace
392 {
393 const unsigned int HIDE_DELAY_TIMEOUT_LENGTH = 400;
394
395=== modified file 'launcher/SimpleLauncherIcon.cpp'
396--- launcher/SimpleLauncherIcon.cpp 2013-11-14 00:17:19 +0000
397+++ launcher/SimpleLauncherIcon.cpp 2014-07-31 18:27:19 +0000
398@@ -22,8 +22,6 @@
399
400 #include "SimpleLauncherIcon.h"
401
402-#include <NuxCore/Logger.h>
403-
404 #include "unity-shared/UBusWrapper.h"
405 #include "unity-shared/UBusMessages.h"
406
407@@ -31,8 +29,6 @@
408 {
409 namespace launcher
410 {
411-DECLARE_LOGGER(logger, "unity.launcher.icon");
412-
413 NUX_IMPLEMENT_OBJECT_TYPE(SimpleLauncherIcon);
414
415 SimpleLauncherIcon::SimpleLauncherIcon(IconType type)
416
417=== modified file 'launcher/VolumeLauncherIcon.cpp'
418--- launcher/VolumeLauncherIcon.cpp 2014-04-16 01:24:47 +0000
419+++ launcher/VolumeLauncherIcon.cpp 2014-07-31 18:27:19 +0000
420@@ -21,7 +21,6 @@
421
422 #include "config.h"
423 #include <glib/gi18n-lib.h>
424-#include <NuxCore/Logger.h>
425 #include <UnityCore/ConnectionManager.h>
426 #include <UnityCore/GLibSignal.h>
427
428@@ -32,7 +31,6 @@
429 {
430 namespace launcher
431 {
432-DECLARE_LOGGER(logger, "unity.launcher.icon.volume");
433
434 //
435 // Start private implementation
436
437=== modified file 'panel/PanelController.cpp'
438--- panel/PanelController.cpp 2014-02-28 16:56:19 +0000
439+++ panel/PanelController.cpp 2014-07-31 18:27:19 +0000
440@@ -21,7 +21,6 @@
441 #include "PanelController.h"
442
443 #include <vector>
444-#include <NuxCore/Logger.h>
445 #include <Nux/BaseWindow.h>
446
447 #include "unity-shared/UScreen.h"
448@@ -31,7 +30,6 @@
449 {
450 namespace panel
451 {
452-DECLARE_LOGGER(logger, "unity.panel.controller");
453
454 const char* window_title = "unity-panel";
455
456
457=== modified file 'panel/PanelView.cpp'
458--- panel/PanelView.cpp 2014-03-06 16:26:34 +0000
459+++ panel/PanelView.cpp 2014-07-31 18:27:19 +0000
460@@ -21,7 +21,6 @@
461 #include <Nux/Nux.h>
462 #include <Nux/HLayout.h>
463
464-#include <NuxCore/Logger.h>
465 #include <UnityCore/GLibWrapper.h>
466
467 #include "unity-shared/PanelStyle.h"
468@@ -34,8 +33,6 @@
469
470 #include "PanelView.h"
471
472-DECLARE_LOGGER(logger, "unity.panel.view");
473-
474 namespace
475 {
476 const int refine_gradient_midpoint = 959;
477
478=== modified file 'plugins/unityshell/src/unityshell.cpp'
479--- plugins/unityshell/src/unityshell.cpp 2014-07-10 21:19:18 +0000
480+++ plugins/unityshell/src/unityshell.cpp 2014-07-31 18:27:19 +0000
481@@ -109,8 +109,11 @@
482 GLogLevelFlags log_level,
483 const gchar* message,
484 gpointer user_data);
485+
486+#ifndef USE_GLES
487 gboolean is_extension_supported(const gchar* extensions, const gchar* extension);
488 gfloat get_opengl_version_f32(const gchar* version_string);
489+#endif
490
491 inline CompRegion CompRegionFromNuxGeo(nux::Geometry const& geo)
492 {
493@@ -4597,6 +4600,8 @@
494
495 /* Checks whether an extension is supported by the GLX or OpenGL implementation
496 * given the extension name and the list of supported extensions. */
497+
498+#ifndef USE_GLES
499 gboolean is_extension_supported(const gchar* extensions, const gchar* extension)
500 {
501 if (extensions != NULL && extension != NULL)
502@@ -4635,6 +4640,7 @@
503 else
504 return 0.0f;
505 }
506+#endif
507
508 nux::logging::Level glog_level_to_nux(GLogLevelFlags log_level)
509 {
510
511=== modified file 'tests/test_glib_object.cpp'
512--- tests/test_glib_object.cpp 2013-07-11 13:51:21 +0000
513+++ tests/test_glib_object.cpp 2014-07-31 18:27:19 +0000
514@@ -44,11 +44,6 @@
515 return IsGOBject(g_obj.RawPtr());
516 }
517
518-bool IsNotGOBject(TestGObject* t_obj)
519-{
520- return !IsGOBject(t_obj);
521-}
522-
523 bool IsNotGOBject(TestObjectWrapper const& g_obj)
524 {
525 return !IsGOBject(g_obj);
526
527=== modified file 'tests/test_icon_loader.cpp'
528--- tests/test_icon_loader.cpp 2013-10-29 22:33:02 +0000
529+++ tests/test_icon_loader.cpp 2014-07-31 18:27:19 +0000
530@@ -35,15 +35,6 @@
531 return GDK_IS_PIXBUF (pixbuf);
532 }
533
534-gboolean TimeoutReached (gpointer data)
535-{
536- bool *b = static_cast<bool*>(data);
537-
538- *b = true;
539-
540- return FALSE;
541-}
542-
543 struct LoadResult
544 {
545 glib::Object<GdkPixbuf> pixbuf;
546
547=== modified file 'tests/test_result_renderer.cpp'
548--- tests/test_result_renderer.cpp 2014-03-21 04:40:12 +0000
549+++ tests/test_result_renderer.cpp 2014-07-31 18:27:19 +0000
550@@ -41,29 +41,6 @@
551
552 #define DEFAULT_GICON ". GThemedIcon cmake"
553
554-GdkPixbuf* GetIconData(std::string icon_hint, int size)
555-{
556- GdkPixbuf *pbuf;
557- GtkIconTheme *theme;
558- glib::Error error;
559-
560- theme = gtk_icon_theme_get_default();
561- glib::Object<GIcon> icon(g_icon_new_for_string(icon_hint.c_str(), NULL));
562-
563- if (icon.IsType(G_TYPE_ICON))
564- {
565- gtk::IconInfo info(gtk_icon_theme_lookup_by_gicon(theme, icon, size, (GtkIconLookupFlags)0));
566- pbuf = gtk_icon_info_load_icon(info, &error);
567-
568- if (error)
569- {
570- pbuf = NULL;
571- }
572- }
573-
574- return pbuf;
575-}
576-
577 } // namespace [anonymous]
578
579 class TestResultRenderer : public testing::Test
580
581=== modified file 'unity-shared/OverlayWindowButtons.cpp'
582--- unity-shared/OverlayWindowButtons.cpp 2014-02-26 20:26:01 +0000
583+++ unity-shared/OverlayWindowButtons.cpp 2014-07-31 18:27:19 +0000
584@@ -45,7 +45,7 @@
585 SetBackgroundColor(nux::color::Transparent);
586 }
587
588-bool OverlayWindowButtons::IsVisibleOnMonitor(unsigned int monitor) const
589+bool OverlayWindowButtons::IsVisibleOnMonitor(int monitor) const
590 {
591 if (window_buttons_->monitor == monitor)
592 return true;
593
594=== modified file 'unity-shared/OverlayWindowButtons.h'
595--- unity-shared/OverlayWindowButtons.h 2014-02-10 15:31:44 +0000
596+++ unity-shared/OverlayWindowButtons.h 2014-07-31 18:27:19 +0000
597@@ -40,7 +40,7 @@
598 nux::Area* FindAreaUnderMouse(nux::Point const& mouse_position,
599 nux::NuxEventType event_type);
600
601- bool IsVisibleOnMonitor(unsigned int monitor) const;
602+ bool IsVisibleOnMonitor(int monitor) const;
603
604 protected:
605 void Draw(nux::GraphicsEngine& gfx_context, bool force_draw);
606
607=== modified file 'unity-shared/StandaloneAppManager.cpp'
608--- unity-shared/StandaloneAppManager.cpp 2013-08-07 16:44:55 +0000
609+++ unity-shared/StandaloneAppManager.cpp 2014-07-31 18:27:19 +0000
610@@ -31,8 +31,6 @@
611 using namespace std;
612 using namespace unity;
613
614-DECLARE_LOGGER(logger, "unity.appmanager.test");
615-
616 GMainLoop *loop;
617
618 void dump_app(ApplicationPtr const& app, std::string const& prefix = "")
619
620=== modified file 'unity-shared/StandaloneWindowManager.cpp'
621--- unity-shared/StandaloneWindowManager.cpp 2014-04-02 21:42:12 +0000
622+++ unity-shared/StandaloneWindowManager.cpp 2014-07-31 18:27:19 +0000
623@@ -24,13 +24,10 @@
624 #include "StandaloneWindowManager.h"
625 #include "UScreen.h"
626
627-#include <NuxCore/Logger.h>
628-
629 // Entirely stubs for now, unless we need this functionality at some point
630
631 namespace unity
632 {
633-DECLARE_LOGGER(logger, "unity.wm");
634
635 StandaloneWindow::StandaloneWindow(Window xid)
636 : xid(xid)
637
638=== modified file 'unity-shared/TextureCache.cpp'
639--- unity-shared/TextureCache.cpp 2014-07-11 01:26:26 +0000
640+++ unity-shared/TextureCache.cpp 2014-07-31 18:27:19 +0000
641@@ -21,12 +21,10 @@
642 #include "TextureCache.h"
643
644 #include <sstream>
645-#include <NuxCore/Logger.h>
646 #include "config.h"
647
648 namespace unity
649 {
650-DECLARE_LOGGER(logger, "unity.internal.texturecache");
651 namespace
652 {
653 // Stolen from boost
654
655=== modified file 'unity-shared/UBusServer.cpp'
656--- unity-shared/UBusServer.cpp 2013-11-14 03:00:29 +0000
657+++ unity-shared/UBusServer.cpp 2014-07-31 18:27:19 +0000
658@@ -16,13 +16,12 @@
659 * Authored by: Michal Hruby <michal.hruby@canonical.com>
660 */
661
662-#include <NuxCore/Logger.h>
663+#include <algorithm>
664
665 #include "UBusServer.h"
666
667 namespace unity
668 {
669-DECLARE_LOGGER(logger, "unity.ubus");
670
671 UBusServer::UBusServer()
672 : last_id_(0)