diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-30 19:38:29 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-04-02 15:14:54 +0000 |
| commit | 60212d610762c262782eaf79bfd1fa3798d8afa7 (patch) | |
| tree | 82dcc17a801d4aec6cc8de9396274141fc647751 /vcl/unx/kde | |
| parent | f574e1defdb537bdd741edd2523563aa0b03be5a (diff) | |
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>
Diffstat (limited to 'vcl/unx/kde')
| -rw-r--r-- | vcl/unx/kde/kdedata.cxx | 17 | ||||
| -rw-r--r-- | vcl/unx/kde/salnativewidgets-kde.cxx | 12 |
2 files changed, 9 insertions, 20 deletions
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(); |