vcl: convert some fprintf to SAL_INFO

Change-Id: I4b9a20e62e8e137a1bfaa1c654307f15c33e3d3c
Reviewed-on: https://gerrit.libreoffice.org/3143
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

8 files changed, 25 insertions, 53 deletions

diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 36b0ec8cd019..af98ba210736 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -217,15 +217,12 @@ GtkSalDisplay::initScreen( SalX11Screen nXScreen ) const
         {
            pDefCol = gdk_x11_colormap_foreign_new( pVis, pSD->m_aColormap.GetXColormap() );
            gdk_screen_set_default_colormap( pScreen, pDefCol );
-           #if OSL_DEBUG_LEVEL > 1
-           fprintf( stderr, "set new gdk color map for screen %d\n", nXScreen.getXScreen() );
-           #endif
+           SAL_INFO( "vcl.gtk", "set new gdk color map for screen " << nXScreen.getXScreen() );
         }
     }
-    #if OSL_DEBUG_LEVEL > 1
     else
-        fprintf( stderr, "not GdkVisual for visual id %d\n", (int)pSD->m_aVisual.visualid );
-    #endif
+        SAL_INFO( "vcl.gtk", "not GdkVisual for visual id " << pSD->m_aVisual.visualid );
+
     return pSD;
 }
 
@@ -463,7 +460,7 @@ GdkCursor *GtkSalDisplay::getCursor( PointerStyle ePointerStyle )
             MAKE_CURSOR( POINTER_PAINTBRUSH, paintbrush_ );
 
         default:
-            fprintf( stderr, "pointer %d not implemented", ePointerStyle );
+            SAL_WARN( "vcl.gtk", "pointer " << ePointerStyle << "not implemented" );
             break;
         }
         if( !pCursor )
@@ -609,9 +606,7 @@ void GtkData::Yield( bool bWait, bool bHandleAllCurrentEvents )
 void GtkData::Init()
 {
     int i;
-#if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "GtkMainloop::Init()\n" );
-#endif
+    SAL_INFO( "vcl.gtk", "GtkMainloop::Init()" );
     XrmInitialize();
 
 #if !GTK_CHECK_VERSION(3,0,0)
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 3558993a3a3d..eebfe68c3b01 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -1820,10 +1820,7 @@ case_insensitive_filter (const GtkFileFilterInfo *filter_info, gpointer data)
     if( !g_ascii_strcasecmp( pFilter, pExtn ) )
         bRetval = sal_True;
 
-#if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "'%s' match extn '%s' vs '%s' yeilds %d\n",
-        filter_info->uri, pExtn, pFilter, bRetval );
-#endif
+    SAL_INFO( "vcl.gtk", "'" << filter_info->uri << "' match extn '" << pExtn << "' vs '" << pFilter << "' yeilds " << bRetval );
 
     return bRetval;
 }
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 3f870cee2780..281be6f42c3e 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -623,7 +623,7 @@ void GtkSalGraphics::PaintSpinButton(GtkStyleContext *context,
     {
         if ( !pSpinVal )
         {
-            fprintf( stderr, "Tried to draw CTRL_SPINBUTTONS, but the SpinButtons data structure didn't exist!\n" );
+            SAL_WARN( "vcl.gtk", "Tried to draw CTRL_SPINBUTTONS, but the SpinButtons data structure didn't exist!" );
             return;
         }
         areaRect = pSpinVal->maUpperRect;
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 4eb00ffe25be..07706b2ec921 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -179,9 +179,7 @@ void KDEXLib::doStartup()
     {
         KStartupInfo::appStarted();
         m_bStartupDone = true;
-        #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "called KStartupInfo::appStarted()\n" );
-        #endif
+        SAL_INFO( "vcl.kde", "called KStartupInfo::appStarted()" );
     }
 }
 
@@ -217,9 +215,8 @@ extern "C" {
             XInitThreads();
 
         rtl::OString aVersion( qVersion() );
-#if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "qt version string is \"%s\"\n", aVersion.getStr() );
-#endif
+        SAL_INFO( "vcl.kde", "qt version string is \"" << aVersion << "\"" );
+
         sal_Int32 nIndex = 0, nMajor = 0, nMinor = 0, nMicro = 0;
         nMajor = aVersion.getToken( 0, '.', nIndex ).toInt32();
         if( nIndex > 0 )
@@ -228,16 +225,12 @@ extern "C" {
             nMicro = aVersion.getToken( 0, '.', nIndex ).toInt32();
         if( nMajor != 3 || nMinor < 2 || (nMinor == 2 && nMicro < 2) )
         {
-#if OSL_DEBUG_LEVEL > 1
-            fprintf( stderr, "unsuitable qt version %d.%d.%d\n", (int)nMajor, (int)nMinor, (int)nMicro );
-#endif
+            SAL_INFO( "vcl.kde", "unsuitable qt version " << nMajor << "." << nMinor << "." << nMicro );
             return NULL;
         }
 
         KDESalInstance* pInstance = new KDESalInstance( new SalYieldMutex() );
-#if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "created KDESalInstance 0x%p\n", pInstance );
-#endif
+        SAL_INFO( "vcl.kde", "created KDESalInstance " << &pInstance );
 
         // initialize SalData
         KDEData *pSalData = new KDEData( pInstance );
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 1f9971038019..dcce289cd323 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1800,18 +1800,14 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r
     else
         aInfo.m_eWidth = WIDTH_ULTRA_EXPANDED;
 
-#if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "font name BEFORE system match: \"%s\"\n", OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
-#endif
+    SAL_INFO( "vcl.kde", "font name BEFORE system match: \"" << aInfo.m_aFamilyName << "\"" );
 
     // match font to e.g. resolve "Sans"
     psp::PrintFontManager::get().matchFont( aInfo, rLocale );
 
-#if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
-             aInfo.m_nID != 0 ? "succeeded" : "failed",
-             OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
-#endif
+    SAL_INFO( "vcl.kde", "font match " <<
+              (aInfo.m_nID != 0 ? "succeeded" : "failed") <<
+              ", name AFTER: \"" << aInfo.m_aFamilyName << "\"" );
 
     // font height
     int nPointHeight = qFontInfo.pointSize();
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 6039daa6bd22..d25ee466548d 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -129,18 +129,14 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r
     else
         aInfo.m_eWidth = WIDTH_ULTRA_EXPANDED;
 
-#if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "font name BEFORE system match: \"%s\"\n", OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
-#endif
+    SAL_INFO( "vcl.kde4", "font name BEFORE system match: \"" << aInfo.m_aFamilyName << "\"" );
 
     // match font to e.g. resolve "Sans"
     psp::PrintFontManager::get().matchFont( aInfo, rLocale );
 
-#if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
-             aInfo.m_nID != 0 ? "succeeded" : "failed",
-             OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
-#endif
+    SAL_INFO( "vcl.kde4", "font match " <<
+              (aInfo.m_nID != 0 ? "succeeded" : "failed") <<
+              ", name AFTER: \"" << aInfo.m_aFamilyName << "\"" );
 
     // font height
     int nPointHeight = qFontInfo.pointSize();
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 1917df9771b4..73915ee74cfe 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -392,9 +392,7 @@ void KDEXLib::doStartup()
     {
         KStartupInfo::appStarted();
         m_bStartupDone = true;
-        #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "called KStartupInfo::appStarted()\n" );
-        #endif
+        SAL_INFO( "vcl.kde4", "called KStartupInfo::appStarted()" );
     }
 }
 
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index a934c437b297..45c158437b4f 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -61,9 +61,8 @@ extern "C" {
 #if QT_VERSION < 0x050000
         // Qt 4.x support needs >= 4.1.0
         rtl::OString aVersion( qVersion() );
-#if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "qt version string is \"%s\"\n", aVersion.getStr() );
-#endif
+        SAL_INFO( "vcl.kde4", "qt version string is " << aVersion );
+
         sal_Int32 nIndex = 0, nMajor = 0, nMinor = 0;
         nMajor = aVersion.getToken( 0, '.', nIndex ).toInt32();
         if( nIndex > 0 )
@@ -74,16 +73,14 @@ extern "C" {
             sal_Int32 nMicro = 0;
             if( nIndex > 0 )
                 nMicro = aVersion.getToken( 0, '.', nIndex ).toInt32();
-            fprintf( stderr, "unsuitable qt version %d.%d.%d\n", nMajor, nMinor, nMicro );
+            SAL_INFO( "vcl.kde4", "unsuitable qt version " << nMajor << "." << nMinor << "." << nMicro );
 #endif
             return NULL;
         }
 #endif
 
         KDESalInstance* pInstance = new KDESalInstance( new SalYieldMutex() );
-#if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "created KDESalInstance 0x%p\n", pInstance );
-#endif
+        SAL_INFO( "vcl.kde4", "created KDESalInstance " << &pInstance );
 
         // initialize SalData
         KDEData *salData = new KDEData( pInstance );