diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 5cb1fb71c..37a06ac74 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -502,7 +502,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 44b69e2ff..74aad1aeb 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -390,7 +390,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/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp index 0fc10f235..3c2250e6c 100644 --- a/kcontrol/randr/krandrtray.cpp +++ b/kcontrol/randr/krandrtray.cpp @@ -59,7 +59,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 KGlobalAccel(TQT_TQOBJECT(this)); KGlobalAccel* keys = globalKeys; #include "krandrbindings.cpp" @@ -408,7 +408,7 @@ void KRandRSystemTray::populateMenu(KPopupMenu* 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; @@ -568,8 +568,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 @@ -677,7 +677,7 @@ void KRandRSystemTray::findPrimaryDisplay() output_name = output_info->name; output_id = randr_screen_info->outputs[i]->id; - //printf("ACTIVE CHECK: Found output %s\n\r", output_name); + //printf("ACTIVE CHECK: Found output %s\n", output_name); randr_screen_info->cur_crtc = randr_screen_info->outputs[i]->cur_crtc; randr_screen_info->cur_output = randr_screen_info->outputs[i]; @@ -708,7 +708,7 @@ void KRandRSystemTray::addOutputMenu(KPopupMenu* menu) output_name = output_info->name; output_id = randr_screen_info->outputs[i]->id; - //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); @@ -731,7 +731,7 @@ void KRandRSystemTray::addOutputMenu(KPopupMenu* menu) output_name = output_info->name; output_id = randr_screen_info->outputs[i]->id; - //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); @@ -754,7 +754,7 @@ void KRandRSystemTray::addOutputMenu(KPopupMenu* menu) output_name = output_info->name; output_id = randr_screen_info->outputs[i]->id; - //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); @@ -798,7 +798,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]; @@ -814,7 +814,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 6a2b0f198..266a7892e 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 6991d5e13..e6f2a42b5 100644 --- a/kdesktop/kxdglauncher.cpp +++ b/kdesktop/kxdglauncher.cpp @@ -103,7 +103,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 { @@ -140,7 +140,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 { @@ -164,12 +164,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 ef13d9076..47b0a2764 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); } @@ -1961,7 +1961,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) diff --git a/kdmlib/kdmtsak.h b/kdmlib/kdmtsak.h index c9664ae34..fba73d9c5 100644 --- a/kdmlib/kdmtsak.h +++ b/kdmlib/kdmtsak.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 == "kdm")) { authorized = true; } else if (procparent == "kdeinit") { - printf("kdeinit detected\n\r"); + printf("kdeinit detected\n"); // A bit more digging is needed to see if this is an authorized process or not // Get the kdeinit command char kdeinitcmdline[8192]; @@ -117,8 +117,8 @@ inline int tde_sak_verify_calling_process() kdeinitenviron[8191] = 0; #ifdef DEBUG - printf("Called executable name is: %s\n\r", kdeinitCommand.ascii()); - printf("Environment is: %s\n\r", kdeinitEnvironment.ascii()); + printf("Called executable name is: %s\n", kdeinitCommand.ascii()); + printf("Environment is: %s\n", kdeinitEnvironment.ascii()); #endif if ((kdeinitCommand == "kdesktop [kdeinit]") && (kdeinitEnvironment.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/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp index abd175d48..b02da7ad7 100644 --- a/krootbacking/krootbacking.cpp +++ b/krootbacking/krootbacking.cpp @@ -246,7 +246,7 @@ void KRootBacking::updateBackground( KSharedPixmap *spm ) filename.prepend("/tmp/kde-"); 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/kwin/geometry.cpp b/kwin/geometry.cpp index 782a05e6f..4d477526b 100644 --- a/kwin/geometry.cpp +++ b/kwin/geometry.cpp @@ -41,7 +41,7 @@ namespace KWinInternal */ void Workspace::desktopResized() { - //printf("Workspace::desktopResized()\n\r"); + //printf("Workspace::desktopResized()\n"); TQRect geom = KApplication::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 = KApplication::desktop()->geometry(); NETSize desktop_geometry; desktop_geometry.width = geom.width(); diff --git a/kwin/kompmgr/kompmgr.c b/kwin/kompmgr/kompmgr.c index 82166766e..4434ab3bd 100644 --- a/kwin/kompmgr/kompmgr.c +++ b/kwin/kompmgr/kompmgr.c @@ -392,7 +392,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)); @@ -413,7 +413,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'; @@ -421,7 +421,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; @@ -1425,7 +1425,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"); diff --git a/tqt3integration/utils/gen.cpp b/tqt3integration/utils/gen.cpp index b5605f8ba..11abc9a36 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 );