summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-04-01 14:06:10 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-04-01 14:06:30 +0200
commit2e850f9fdfba19122efaeac8814a8147ed680ed2 (patch)
tree7cc746f0a28e561b1653dacab06d5531c0c3faa9
parenta591ae90fd81d5e8d2255e716c61df55f8ff60b5 (diff)
pragmatic approach to silence warnings
-rw-r--r--framework/source/lomenubar/DesktopJob.cxx4
-rw-r--r--framework/source/lomenubar/FrameHelper.cxx3
-rw-r--r--framework/source/lomenubar/FrameHelper.hxx3
-rw-r--r--framework/source/lomenubar/FrameJob.cxx4
4 files changed, 12 insertions, 2 deletions
diff --git a/framework/source/lomenubar/DesktopJob.cxx b/framework/source/lomenubar/DesktopJob.cxx
index 2913215c40..c813bb4212 100644
--- a/framework/source/lomenubar/DesktopJob.cxx
+++ b/framework/source/lomenubar/DesktopJob.cxx
@@ -25,7 +25,11 @@
#include "FrameJob.hxx"
#include <gio/gio.h>
+//#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
#include <libdbusmenu-glib/server.h>
+#pragma GCC diagnostic error "-Wignored-qualifiers"
+//#pragma GCC diagnostic pop
#include <rtl/process.h>
#include <osl/diagnose.h>
diff --git a/framework/source/lomenubar/FrameHelper.cxx b/framework/source/lomenubar/FrameHelper.cxx
index f9998deafa..7008cb3bee 100644
--- a/framework/source/lomenubar/FrameHelper.cxx
+++ b/framework/source/lomenubar/FrameHelper.cxx
@@ -63,8 +63,9 @@
#include <gio/gio.h>
//#pragma GCC diagnostic push
-//#pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
#include <libdbusmenu-glib/client.h>
+#pragma GCC diagnostic error "-Wignored-qualifiers"
//#pragma GCC diagnostic pop
#include <libdbusmenu-gtk/menuitem.h>
diff --git a/framework/source/lomenubar/FrameHelper.hxx b/framework/source/lomenubar/FrameHelper.hxx
index d34220f4b1..9c37a08020 100644
--- a/framework/source/lomenubar/FrameHelper.hxx
+++ b/framework/source/lomenubar/FrameHelper.hxx
@@ -44,8 +44,9 @@
#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
//#pragma GCC diagnostic push
-//#pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
#include <libdbusmenu-glib/server.h>
+#pragma GCC diagnostic error "-Wignored-qualifiers"
//#pragma GCC diagnostic pop
#include <libdbusmenu-glib/menuitem.h>
diff --git a/framework/source/lomenubar/FrameJob.cxx b/framework/source/lomenubar/FrameJob.cxx
index bbf53ce06a..3014573866 100644
--- a/framework/source/lomenubar/FrameJob.cxx
+++ b/framework/source/lomenubar/FrameJob.cxx
@@ -62,8 +62,12 @@
#include <fstream>
#include <gio/gio.h>
+//#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
#include <libdbusmenu-glib/server.h>
#include <libdbusmenu-glib/client.h>
+#pragma GCC diagnostic error "-Wignored-qualifiers"
+//#pragma GCC diagnostic pop
#include <rtl/process.h>
#include <osl/diagnose.h>