From f123d99fd32a3eba6fc18c6c762db23fb5d431d6 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sat, 7 Sep 2013 18:27:24 -0500 Subject: [PATCH] Add source code module name to stdout/stderr messages to improve readability. --- kcontrol/access/main.cpp | 8 ++--- kdesktop/main.cc | 2 +- kxkb/extension.cpp | 32 +++++++++---------- .../system/kdedmodule/systemdirnotify.cpp | 2 +- tdm/kfrontend/kgapp.cpp | 8 ++--- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/kcontrol/access/main.cpp b/kcontrol/access/main.cpp index e6bb96ca9..aede70579 100644 --- a/kcontrol/access/main.cpp +++ b/kcontrol/access/main.cpp @@ -22,10 +22,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] ) int minor = XkbMinorVersion; if (!XkbLibraryVersion(&major, &minor)) { - kdError() << "Xlib XKB extension does not match" << endl; + kdError() << "[kcontrol-access] Xlib XKB extension does not match" << endl; return 1; } - kdDebug() << "Xlib XKB extension major=" << major << " minor=" << minor << endl; + kdDebug() << "[kcontrol-access] Xlib XKB extension major=" << major << " minor=" << minor << endl; // we need an application object for tqt_xdisplay() KAccessApp app; @@ -38,10 +38,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] ) if (!XkbQueryExtension(tqt_xdisplay(), &opcode_rtrn, &xkb_opcode, &error_rtrn, &major, &minor)) { - kdError() << "X server has not matching XKB extension" << endl; + kdError() << "[kcontrol-access] X server has not matching XKB extension" << endl; return 1; } - kdDebug() << "X server XKB extension major=" << major << " minor=" << minor << endl; + kdDebug() << "[kcontrol-access] X server XKB extension major=" << major << " minor=" << minor << endl; app.setXkbOpcode(xkb_opcode); app.disableSessionManagement(); diff --git a/kdesktop/main.cc b/kdesktop/main.cc index 0cff73420..4228df0c8 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -231,7 +231,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) XRenderFindVisualFormat( dpy, xvi[i].visual ); if ( format->type == PictTypeDirect && format->direct.alphaMask ) { visual = xvi[i].visual; - kdDebug() << "found visual with alpha support" << endl; + kdDebug() << "[kdesktop] Found visual with alpha support" << endl; argb_visual = true; break; } diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp index ca66224d3..29435e620 100644 --- a/kxkb/extension.cpp +++ b/kxkb/extension.cpp @@ -55,7 +55,7 @@ bool XKBExtension::init() if (!XkbLibraryVersion(&major, &minor)) { - kdError() << "Xlib XKB extension " << major << '.' << minor << + kdError() << "[kxkb-extension] Xlib XKB extension " << major << '.' << minor << " != " << XkbMajorVersion << '.' << XkbMinorVersion << endl; return false; } @@ -68,7 +68,7 @@ bool XKBExtension::init() if (!XkbQueryExtension(m_dpy, &opcode_rtrn, &xkb_opcode, &error_rtrn, &major, &minor)) { - kdError() << "X server XKB extension " << major << '.' << minor << + kdError() << "[kxkb-extension] X server XKB extension " << major << '.' << minor << " != " << XkbMajorVersion << '.' << XkbMinorVersion << endl; return false; } @@ -127,14 +127,14 @@ bool XKBExtension::setLayout(const TQString& model, bool res; if( fileCache.contains(layoutKey) ) { res = setCompiledLayout( layoutKey ); - kdDebug() << "setCompiledLayout " << layoutKey << ": " << res << endl; + kdDebug() << "[kxkb-extension] setCompiledLayout " << layoutKey << ": " << res << endl; if( res ) return res; } // else { res = setLayoutInternal( model, layout, variant, includeGroup ); - kdDebug() << "setRawLayout " << layoutKey << ": " << res << endl; + kdDebug() << "[kxkb-extension] setRawLayout " << layoutKey << ": " << res << endl; if( res ) compileCurrentLayout( layoutKey ); @@ -152,7 +152,7 @@ bool XKBExtension::setLayoutInternal(const TQString& model, TQString exe = TDEGlobal::dirs()->findExe("setxkbmap"); if( exe.isEmpty() ) { - kdError() << "Can't find setxkbmap" << endl; + kdError() << "[kxkb-extension] Can't find setxkbmap" << endl; return false; } @@ -197,7 +197,7 @@ bool XKBExtension::setLayoutInternal(const TQString& model, bool XKBExtension::setGroup(unsigned int group) { - kdDebug() << "Setting group " << group << endl; + kdDebug() << "[kxkb-extension] Setting group " << group << endl; return XkbLockGroup( m_dpy, XkbUseCoreKbd, group ); } @@ -223,9 +223,9 @@ bool XKBExtension::compileCurrentLayout(const TQString &layoutKey) const TQString fileName = getPrecompiledLayoutFilename(layoutKey); - kdDebug() << "compiling layout " << this << " cache size: " << fileCache.count() << endl; + kdDebug() << "[kxkb-extension] compiling layout " << this << " cache size: " << fileCache.count() << endl; if( fileCache.contains(layoutKey) ) { - kdDebug() << "trashing old compiled layout for " << fileName << endl; + kdDebug() << "[kxkb-extension] trashing old compiled layout for " << fileName << endl; if( fileCache[ layoutKey ] != NULL ) fclose( fileCache[ layoutKey ] ); // recompiling - trash the old file fileCache.remove(fileName); @@ -235,13 +235,13 @@ bool XKBExtension::compileCurrentLayout(const TQString &layoutKey) if ( output == NULL ) { - kdWarning() << "Could not open " << fileName << " to precompile: " << strerror(errno) << endl; + kdWarning() << "[kxkb-extension] Could not open " << fileName << " to precompile: " << strerror(errno) << endl; XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True); return false; } if( !XkbWriteXKMFile(output, &result) ) { - kdWarning() << "Could not write compiled layout to " << fileName << endl; + kdWarning() << "[kxkb-extension] Could not write compiled layout to " << fileName << endl; fclose(output); return false; } @@ -268,13 +268,13 @@ bool XKBExtension::setCompiledLayout(const TQString &layoutKey) } if( input == NULL ) { - kdWarning() << "setCompiledLayout trying to reopen xkb file" << endl; // should never happen + kdWarning() << "[kxkb-extension] setCompiledLayout trying to reopen xkb file" << endl; // should never happen const TQString fileName = getPrecompiledLayoutFilename(layoutKey); input = fopen(TQFile::encodeName(fileName), "r"); // FILE *input = fopen(TQFile::encodeName(fileName), "r"); if ( input == NULL ) { - kdDebug() << "Unable to open " << fileName << ": " << strerror(errno) << endl; + kdDebug() << "[kxkb-extension] Unable to open " << fileName << ": " << strerror(errno) << endl; fileCache.remove(layoutKey); return false; } @@ -286,7 +286,7 @@ bool XKBExtension::setCompiledLayout(const TQString &layoutKey) XkbFileInfo result; memset(&result, 0, sizeof(result)); if ((result.xkb = XkbAllocKeyboard())==NULL) { - kdWarning() << "Unable to allocate memory for keyboard description" << endl; + kdWarning() << "[kxkb-extension] Unable to allocate memory for keyboard description" << endl; // fclose(input); // fileCache.remove(layoutKey); return false; @@ -296,7 +296,7 @@ bool XKBExtension::setCompiledLayout(const TQString &layoutKey) if (retVal == XkmKeymapLegal) { // this means reading the Xkm didn't manage to read any section - kdWarning() << "Unable to load map from file" << endl; + kdWarning() << "[kxkb-extension] Unable to load map from file" << endl; XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True); fclose(input); fileCache.remove(layoutKey); @@ -309,14 +309,14 @@ bool XKBExtension::setCompiledLayout(const TQString &layoutKey) { if (!XkbWriteToServer(&result)) { - kdWarning() << "Unable to write the keyboard layout to X display" << endl; + kdWarning() << "[kxkb-extension] Unable to write the keyboard layout to X display" << endl; XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True); return false; } } else { - kdWarning() << "Unable prepare the keyboard layout for X display" << endl; + kdWarning() << "[kxkb-extension] Unable prepare the keyboard layout for X display" << endl; } XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True); diff --git a/tdeioslave/system/kdedmodule/systemdirnotify.cpp b/tdeioslave/system/kdedmodule/systemdirnotify.cpp index 7d7d615b3..059c7cfc9 100644 --- a/tdeioslave/system/kdedmodule/systemdirnotify.cpp +++ b/tdeioslave/system/kdedmodule/systemdirnotify.cpp @@ -38,7 +38,7 @@ void SystemDirNotify::init() if( mInited ) { // FIXME Work around a probable race condition by inserting printf delay before following // code is executed -- the root cause of the race needs investigation and resolution. - printf("[systemdirnotify] SystemDirNotify::init(mInited)"); + printf("[systemdirnotify] SystemDirNotify::init(mInited)\n"); return; } mInited = true; diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index 9a765cb68..508717275 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -205,7 +205,7 @@ kg_main( const char *argv0 ) static char *argv[] = { (char *)"tdmgreet", 0 }; TDECmdLineArgs::init( 1, argv, *argv, 0, 0, 0, true ); - kdDebug() << timestamp() << "start" << endl; + kdDebug() << "[tdm-kfrontend] " << timestamp() << "start" << endl; kde_have_kipc = false; TDEApplication::disableAutoDcopRegistration(); TDECrash::setSafer( true ); @@ -279,7 +279,7 @@ kg_main( const char *argv0 ) if ( format->type == PictTypeDirect && format->direct.alphaMask ) { visual = xvi[i].visual; colormap = XCreateColormap( dpyi, RootWindow( dpyi, screen ), visual, AllocNone ); - kdDebug() << "found visual with alpha support" << endl; + kdDebug() << "[tdm-kfrontend] Found visual with alpha support" << endl; argb_visual_available = true; break; } @@ -387,7 +387,7 @@ kg_main( const char *argv0 ) GSendInt( G_Ready ); - kdDebug() << timestamp() << " main1" << endl; + kdDebug() << "[tdm-kfrontend] " << timestamp() << " main1" << endl; setCursor( dpy, app->desktop()->winId(), XC_left_ptr ); for (;;) { @@ -437,7 +437,7 @@ kg_main( const char *argv0 ) twin->kill(SIGKILL); } dialog = tgrt = new KThemedGreeter; - kdDebug() << timestamp() << " themed" << endl; + kdDebug() << "[tdm-kfrontend] " << timestamp() << " themed" << endl; if (!tgrt->isOK()) { is_themed = false; has_twin = has_twin_bkp;