summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2012-10-03 00:30:40 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2012-11-14 13:52:53 +0100
commit80124d87e900fed5fed862b13dfb72c0732cdd8e (patch)
treee585a4286e59006f862156aa565eae62d8589aed /vcl/unx
parent03010b90d215c3525fe86cddff61c2b353a90db6 (diff)
use sal/log.hxx style logging
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/gtk/window/gtkframe.cxx4
-rw-r--r--vcl/unx/gtk/window/gtksalmenu.cxx15
2 files changed, 8 insertions, 11 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index df98065276bd..6eb294a18be4 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -527,7 +527,7 @@ void ensure_dbus_setup(GdkWindow* gdkWindow, GtkSalFrame* pSalFrame)
pSessionBus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
if( pSessionBus == NULL )
return;
- std::cout << "exporting menu model at " << pMenuModel << " for window " << windowId << std::endl;
+ SAL_INFO("vcl.unity", "exporting menu model at " << pMenuModel << " for window " << windowId);
pSalFrame->m_nMenuExportId = g_dbus_connection_export_menu_model (pSessionBus, aDBusMenubarPath, pMenuModel, NULL);
pSalFrame->m_nActionGroupExportId = g_dbus_connection_export_action_group( pSessionBus, aDBusPath, pActionGroup, NULL);
@@ -579,7 +579,7 @@ void on_registrar_unavailable (GDBusConnection * /*connection*/,
gpointer user_data)
{
SolarMutexGuard aGuard;
- std::cout << "on_registrar_unavailable" << std::endl;
+ SAL_INFO("vcl.unity", "on_registrar_unavailable");
pSessionBus = NULL;
GtkSalFrame* pSalFrame = reinterpret_cast< GtkSalFrame* >( user_data );
SalMenu* pSalMenu = pSalFrame->GetMenu();
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index 4ecfad212f00..fc568d329fb0 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -30,10 +30,7 @@
#include <framework/menuconfiguration.hxx>
-#include <iostream>
-
-using namespace std;
-
+#include <sal/log.hxx>
static gchar* GetCommandForSpecialItem( GtkSalMenuItem* pSalMenuItem )
{
@@ -80,13 +77,13 @@ bool GtkSalMenu::PrepUpdate()
const GtkSalFrame* pFrame = GetFrame();
if (!pFrame)
{
- std::cout << "not updating menu model, I have no frame " << mpMenuModel << std::endl;
+ SAL_INFO("vcl.unity", "not updating menu model, I have no frame " << mpMenuModel);
return false;
}
const GObject* pWindow = G_OBJECT(gtk_widget_get_window( GTK_WIDGET(pFrame->getWindow()) ));
if(!pWindow)
{
- std::cout << "not updating menu model, I have no frame " << mpMenuModel << std::endl;
+ SAL_INFO("vcl.unity", "not updating menu model, I have no frame " << mpMenuModel);
return false;
}
// the root menu does not have its own model and has to use the one owned by the frame
@@ -97,7 +94,7 @@ bool GtkSalMenu::PrepUpdate()
}
if(!mpMenuModel || !mpActionGroup)
return false;
- std::cout << "updating menu model" << mpMenuModel << std::endl;
+ SAL_INFO("vcl.unity", "updating menu model" << mpMenuModel);
return true;
}
@@ -214,7 +211,7 @@ void GtkSalMenu::UpdateNativeMenu( )
++nSection;
if ( nSection < g_menu_model_get_n_items( G_MENU_MODEL( pLOMenu ) ) )
{
- std::cout << "nSection " << nSection << " model sections " << g_menu_model_get_n_items( G_MENU_MODEL( pLOMenu ) ) << std::endl;
+ SAL_INFO("vcl.unity", "nSection " << nSection << " model sections " << g_menu_model_get_n_items( G_MENU_MODEL( pLOMenu ) ));
g_lo_menu_remove(pLOMenu, nSection );
}
}
@@ -302,7 +299,7 @@ void GtkSalMenu::SetFrame( const SalFrame* pFrame )
{
SolarMutexGuard aGuard;
assert(mbMenuBar);
- std::cout << "GtkSalMenu set to frame" << std::endl;
+ SAL_INFO("vcl.unity", "GtkSalMenu set to frame");
mpFrame = static_cast< const GtkSalFrame* >( pFrame );
GtkSalFrame* pFrameNonConst = const_cast<GtkSalFrame*>(mpFrame);
// if we had a menu on the GtkSalMenu we have to free it as we generate a