diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index fd503d2cb..db371fc42 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -508,7 +508,7 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id, } } else { - printf("[WARNING] Display layout broken...\n\r"); fflush(stdout); + printf("[WARNING] Display layout broken...\n"); fflush(stdout); } layoutDragDropDisplay(); diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index b7c51c281..9428be40c 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -416,7 +416,7 @@ void KICCConfig::save() errorstr = randrsimple->clearIccConfiguration(); } if (errorstr != "") { - KMessageBox::error(this, TQString("Unable to apply ICC configuration:\n\r%1").arg(errorstr)); + KMessageBox::error(this, TQString("Unable to apply ICC configuration:\n%1").arg(errorstr)); } emit changed(false); diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index e4372d77b..87346818c 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -60,7 +60,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) TQToolTip::add(this, i18n("Screen resize & rotate")); my_parent = parent; - //printf("Reading configuration...\n\r"); + //printf("Reading configuration...\n"); globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); TDEGlobalAccel* keys = globalKeys; #include "tderandrbindings.cpp" @@ -465,7 +465,7 @@ void KRandRSystemTray::populateMenu(TDEPopupMenu* menu) void KRandRSystemTray::slotResolutionChanged(int parameter) { if (currentScreen()->currentSize() == parameter) { - //printf("This resolution is already in use; applying again...\n\r"); + //printf("This resolution is already in use; applying again...\n"); currentScreen()->proposeSize(parameter); currentScreen()->applyProposed(); return; @@ -619,8 +619,8 @@ void KRandRSystemTray::slotCycleDisplays() } } - //printf("Active: %d\n\r", current_on_index); - //printf("Max: %d\n\r", max_index); + //printf("Active: %d\n", current_on_index); + //printf("Max: %d\n", max_index); if ((current_on_index == -1) && (max_index == -1)) { // There is no connected display available! ABORT @@ -740,7 +740,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu) } output_name = output_info->name; - //printf("ON: Found output %s\n\r", output_name); + //printf("ON: Found output %s\n", output_name); lastIndex = menu->insertItem(i18n("%1 (Active)").arg(output_name)); menu->setItemChecked(lastIndex, true); @@ -762,7 +762,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu) } output_name = output_info->name; - //printf("CONNECTED, NOT ON: Found output %s\n\r", output_name); + //printf("CONNECTED, NOT ON: Found output %s\n", output_name); lastIndex = menu->insertItem(i18n("%1 (Connected, Inactive)").arg(output_name)); menu->setItemChecked(lastIndex, false); @@ -784,7 +784,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu) } output_name = output_info->name; - //printf("DISCONNECTED, NOT ON: Found output %s\n\r", output_name); + //printf("DISCONNECTED, NOT ON: Found output %s\n", output_name); lastIndex = menu->insertItem(i18n("%1 (Disconnected, Inactive)").arg(output_name)); menu->setItemChecked(lastIndex, false); @@ -835,7 +835,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) } if (!randr_screen_info->outputs[parameter]->cur_crtc) { - //printf("Screen was off, turning it on...\n\r"); + //printf("Screen was off, turning it on...\n"); randr_screen_info->cur_crtc = randr_screen_info->outputs[parameter]->cur_crtc; randr_screen_info->cur_output = randr_screen_info->outputs[parameter]; @@ -851,7 +851,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) } else { if (num_outputs_on > 1) { - //printf("Screen was on, turning it off...\n\r"); + //printf("Screen was on, turning it off...\n"); randr_screen_info->cur_crtc = randr_screen_info->outputs[parameter]->cur_crtc; randr_screen_info->cur_output = randr_screen_info->outputs[parameter]; randr_screen_info->cur_output->auto_set = 0; diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc index cadbef85e..ddb95c9e7 100644 --- a/kdesktop/bgmanager.cc +++ b/kdesktop/bgmanager.cc @@ -599,7 +599,7 @@ void KBackgroundManager::slotImageDone(int desk) if (current) { //KPixmap * viewport_background = new KPixmap(TQPixmap(pm->width()*s.width(), pm->height()*s.height())); - //printf("slotImageDone(): x: %d y: %d\n\r", viewport_background->size().width(), viewport_background->size().height()); + //printf("slotImageDone(): x: %d y: %d\n", viewport_background->size().width(), viewport_background->size().height()); //setPixmap(viewport_background, r->hash(), desk); //delete viewport_background; diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp index 2ef042ed9..9d689d95f 100644 --- a/kdesktop/kxdglauncher.cpp +++ b/kdesktop/kxdglauncher.cpp @@ -108,7 +108,7 @@ int main( int argc, char **argv) TQDir myqdir; if (myqdir.exists(getDocumentPath(), TRUE) == true) { if (args->isSet( "getpath" ) == true) { - printf("%s\n\r", (const char *)getDocumentPath().local8Bit()); + printf("%s\n", (const char *)getDocumentPath().local8Bit()); return 0; } else { @@ -152,7 +152,7 @@ int main( int argc, char **argv) config.writeEntry("XDG_DOCUMENTS_DIR", TQString("\"") + xdgModifiedDirectory + TQString("\""), true); config.sync(); if (args->isSet( "getpath" ) == true) { - printf("%s\n\r", (const char *)getDocumentPath().local8Bit()); + printf("%s\n", (const char *)getDocumentPath().local8Bit()); return 0; } else { @@ -177,12 +177,12 @@ int main( int argc, char **argv) } } else { - printf("[kxdglauncher] XDG variable not recognized\n\r"); + printf("[kxdglauncher] XDG variable not recognized\n"); return 1; } } else { - printf("[kxdglauncher] Please specify the desired XDG variable name with --xdgname\n\r"); + printf("[kxdglauncher] Please specify the desired XDG variable name with --xdgname\n"); return 1; } } diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 1947793c9..b99b603db 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -148,10 +148,10 @@ void print_trace() size = backtrace (array, 10); strings = backtrace_symbols (array, size); - printf ("[kdesktop_lock] Obtained %zd stack frames.\n\r", size); + printf ("[kdesktop_lock] Obtained %zd stack frames.\n", size); for (i = 0; i < size; i++) { - printf ("[kdesktop_lock] %s\n\r", strings[i]); + printf ("[kdesktop_lock] %s\n", strings[i]); } free (strings); @@ -160,7 +160,7 @@ void print_trace() static void segv_handler(int) { - printf("[kdesktop_lock] WARNING: A fatal exception was encountered. Trapping and ignoring it so as not to compromise desktop security...\n\r"); + printf("[kdesktop_lock] WARNING: A fatal exception was encountered. Trapping and ignoring it so as not to compromise desktop security...\n"); print_trace(); sleep(1); } @@ -876,7 +876,7 @@ void LockProcess::createSaverWindow() if (!(flags & CWColormap)) { XVisualInfo vinfo; if (!XMatchVisualInfo( x11Display(), x11Screen(), 32, TrueColor, &vinfo )) { - printf("[ERROR] Unable to locate matching X11 Visual; this application will not function correctly!\n\r"); + printf("[ERROR] Unable to locate matching X11 Visual; this application will not function correctly!\n"); } else { visual = vinfo.visual; @@ -1139,7 +1139,7 @@ void LockProcess::setVRoot(Window win, Window vr) Window top = win; while (1) { if (XQueryTree(tqt_xdisplay(), top, &rootReturn, &parentReturn, &children, &numChildren) == 0) { - printf("[WARNING] XQueryTree() failed!\n\r"); fflush(stdout); + printf("[WARNING] XQueryTree() failed!\n"); fflush(stdout); break; } if (children) { @@ -1953,7 +1953,7 @@ void LockProcess::slotForcePaintBackground() TQPixmap blankPixmap(mRootWidth, mRootHeight); blankPixmap.fill(Qt::black); slotPaintBackground(blankPixmap); - printf("[WARNING] Unable to obtain desktop wallpaper in a timely manner. High system load or possibly a TDE bug!\n\r"); fflush(stdout); + printf("[WARNING] Unable to obtain desktop wallpaper in a timely manner. High system load or possibly a TDE bug!\n"); fflush(stdout); } void LockProcess::slotPaintBackground(const TQPixmap &rpm) @@ -2720,7 +2720,7 @@ void ControlPipeHandlerObject::run(void) { int display_number = atoi(TQString(XDisplayString(tqt_xdisplay())).replace(":","").ascii()); if (display_number < 0) { - printf("[kdesktop_lock] Warning: unable to create control socket. Interactive logon modules may not function properly.\n\r"); + printf("[kdesktop_lock] Warning: unable to create control socket. Interactive logon modules may not function properly.\n"); TQApplication::eventLoop()->exit(-1); return; } @@ -2750,7 +2750,7 @@ void ControlPipeHandlerObject::run(void) { } if (!mParent->mPipeOpen) { - printf("[kdesktop_lock] Warning: unable to create control socket '%s'. Interactive logon modules may not function properly.\n\r", fifo_file); + printf("[kdesktop_lock] Warning: unable to create control socket '%s'. Interactive logon modules may not function properly.\n", fifo_file); TQApplication::eventLoop()->exit(-1); return; } diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp index ab4775508..9d1ef9e32 100644 --- a/krootbacking/krootbacking.cpp +++ b/krootbacking/krootbacking.cpp @@ -246,7 +246,7 @@ void KRootBacking::updateBackground( TDESharedPixmap *spm ) filename.prepend("/tmp/tde-"); filename.append("/krootbacking.png"); pm.save(filename, "PNG"); - printf("%s\n\r", filename.ascii()); fflush(stdout); + printf("%s\n", filename.ascii()); fflush(stdout); exit(0); } diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index cc278f706..8a7baeaf3 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -301,7 +301,7 @@ kg_main( const char *argv0 ) iccCommand += iccconfig.readEntry("ICCFile"); iccCommand += TQString(" &"); if (system(iccCommand.ascii()) < 0) { - printf("WARNING: Unable to execute command \"%s\"\n\r", iccCommand.ascii()); + printf("WARNING: Unable to execute command \"%s\"\n", iccCommand.ascii()); } } diff --git a/tdmlib/tdmtsak.h b/tdmlib/tdmtsak.h index 1987a8218..8ce44392a 100644 --- a/tdmlib/tdmtsak.h +++ b/tdmlib/tdmtsak.h @@ -50,7 +50,7 @@ inline int tde_sak_verify_calling_process() pid_t parentproc = getppid(); #ifdef DEBUG - printf("Parent pid is: %d\n\r", parentproc); + printf("Parent pid is: %d\n", parentproc); #endif char parentexecutable[8192]; @@ -60,28 +60,28 @@ inline int tde_sak_verify_calling_process() parentexecutable[8191] = 0; procparent = parentexecutable; #ifdef DEBUG - printf("Parent executable name and full path is: %s\n\r", procparent.ascii()); + printf("Parent executable name and full path is: %s\n", procparent.ascii()); #endif TQString tdeBinaryPath = TQString(KDE_BINDIR "/"); #ifdef DEBUG - printf("The TDE binary path is: %s\n\r", tdeBinaryPath.ascii()); + printf("The TDE binary path is: %s\n", tdeBinaryPath.ascii()); #endif if (!procparent.startsWith(tdeBinaryPath)) { - printf("Unauthorized path detected in calling process\n\r"); + printf("Unauthorized path detected in calling process\n"); return 2; } else { procparent = procparent.mid(tdeBinaryPath.length()); #ifdef DEBUG - printf("Parent executable name is: %s\n\r", procparent.ascii()); + printf("Parent executable name is: %s\n", procparent.ascii()); #endif if ((procparent == "kdesktop") || (procparent == "kdesktop_lock") || (procparent == "tdm")) { authorized = true; } else if (procparent == "tdeinit") { - printf("tdeinit detected\n\r"); + printf("tdeinit detected\n"); // A bit more digging is needed to see if this is an authorized process or not // Get the tdeinit command char tdeinitcmdline[8192]; @@ -117,8 +117,8 @@ inline int tde_sak_verify_calling_process() tdeinitenviron[8191] = 0; #ifdef DEBUG - printf("Called executable name is: %s\n\r", tdeinitCommand.ascii()); - printf("Environment is: %s\n\r", tdeinitEnvironment.ascii()); + printf("Called executable name is: %s\n", tdeinitCommand.ascii()); + printf("Environment is: %s\n", tdeinitEnvironment.ascii()); #endif if ((tdeinitCommand == "kdesktop [tdeinit]") && (tdeinitEnvironment.startsWith(KDE_BINDIR))) { @@ -129,7 +129,7 @@ inline int tde_sak_verify_calling_process() } } else { - printf("Unauthorized calling process detected\n\r"); + printf("Unauthorized calling process detected\n"); return 3; } diff --git a/tqt3integration/utils/gen.cpp b/tqt3integration/utils/gen.cpp index 85507573e..80e597742 100644 --- a/tqt3integration/utils/gen.cpp +++ b/tqt3integration/utils/gen.cpp @@ -137,7 +137,7 @@ void openInputFile( const TQString& filename ) { check( input_file == NULL ); input_file = new TQFile( filename ); - printf("[INFO] Reading bindings definitions from file %s\n\r", filename.ascii()); + printf("[INFO] Reading bindings definitions from file %s\n", filename.ascii()); if( !input_file->open( IO_ReadOnly )) error(); input_stream = new TQTextStream( input_file ); diff --git a/twin/geometry.cpp b/twin/geometry.cpp index f49052e37..84f3fa25f 100644 --- a/twin/geometry.cpp +++ b/twin/geometry.cpp @@ -41,7 +41,7 @@ namespace KWinInternal */ void Workspace::desktopResized() { - //printf("Workspace::desktopResized()\n\r"); + //printf("Workspace::desktopResized()\n"); TQRect geom = TDEApplication::desktop()->geometry(); NETSize desktop_geometry; desktop_geometry.width = geom.width(); @@ -57,7 +57,7 @@ void Workspace::desktopResized() */ void Workspace::kDestopResized() { - //printf("Workspace::kDesktopResized()\n\r"); + //printf("Workspace::kDesktopResized()\n"); TQRect geom = TDEApplication::desktop()->geometry(); NETSize desktop_geometry; desktop_geometry.width = geom.width(); diff --git a/twin/kompmgr/kompmgr.c b/twin/kompmgr/kompmgr.c index f203c32d0..34ebb86e1 100644 --- a/twin/kompmgr/kompmgr.c +++ b/twin/kompmgr/kompmgr.c @@ -401,7 +401,7 @@ void delete_pid_file() #if WORK_AROUND_FGLRX if ((my_exit_code == 3) && (restartOnSigterm)) { - printf("kompmgr lost connection to X server, restarting...\n\r"); fflush(stdout); + printf("kompmgr lost connection to X server, restarting...\n"); fflush(stdout); sleep(1); char me[2048]; int chars = readlink("/proc/self/exe", me, sizeof(me)); @@ -443,7 +443,7 @@ void handle_siguser (int sig) if (sig == SIGUSR1) { char newuid[1024]; #ifndef NDEBUG - printf("Enter the new user ID:\n\r"); fflush(stdout); + printf("Enter the new user ID:\n"); fflush(stdout); #endif char *eof; newuid[0] = '\0'; @@ -451,7 +451,7 @@ void handle_siguser (int sig) eof = fgets(newuid, sizeof(newuid), stdin); uidnum = atoi(newuid); #ifndef NDEBUG - printf("Setting kompmgr process uid to %d...\n\r", uidnum); fflush(stdout); + printf("Setting kompmgr process uid to %d...\n", uidnum); fflush(stdout); #endif my_exit_code=4; @@ -1467,7 +1467,7 @@ paint_all (Display *dpy, XserverRegion region) t = w; } #if DEBUG_WINDOWS - printf("window count: %d\n\r", window_count); + printf("window count: %d\n", window_count); #endif #if DEBUG_REPAINT printf ("\n");